diff --git a/addon/components/col-pick-input.js b/addon/components/col-pick-input.js
new file mode 100644
index 0000000..b827f2e
--- /dev/null
+++ b/addon/components/col-pick-input.js
@@ -0,0 +1,8 @@
+/* eslint-disable ember/no-classic-classes */
+/* eslint-disable ember/no-mixins */
+import { TextField } from '@ember/legacy-built-in-components';
+import ColPickMixin from 'ember-colpick/mixins/col-pick';
+
+export default TextField.extend(ColPickMixin, {
+  flat: false,
+});
diff --git a/addon/components/col-pick.js b/addon/components/col-pick.js
new file mode 100644
index 0000000..dc94a1b
--- /dev/null
+++ b/addon/components/col-pick.js
@@ -0,0 +1,6 @@
+/* eslint-disable ember/no-mixins */
+/* eslint-disable ember/no-classic-components */
+import Component from '@ember/component';
+import ColPickMixin from 'ember-colpick/mixins/col-pick';
+
+export default Component.extend(ColPickMixin);
diff --git a/app/components/col-pick-input.js b/app/components/col-pick-input.js
index b827f2e..af536fa 100644
--- a/app/components/col-pick-input.js
+++ b/app/components/col-pick-input.js
@@ -1,8 +1 @@
-/* eslint-disable ember/no-classic-classes */
-/* eslint-disable ember/no-mixins */
-import { TextField } from '@ember/legacy-built-in-components';
-import ColPickMixin from 'ember-colpick/mixins/col-pick';
-
-export default TextField.extend(ColPickMixin, {
-  flat: false,
-});
+export { default } from 'ember-colpick/components/col-pick-input';
diff --git a/app/components/col-pick.js b/app/components/col-pick.js
index dc94a1b..ed0b069 100644
--- a/app/components/col-pick.js
+++ b/app/components/col-pick.js
@@ -1,6 +1 @@
-/* eslint-disable ember/no-mixins */
-/* eslint-disable ember/no-classic-components */
-import Component from '@ember/component';
-import ColPickMixin from 'ember-colpick/mixins/col-pick';
-
-export default Component.extend(ColPickMixin);
+export { default } from 'ember-colpick/components/col-pick';