diff --git a/addon/components/breadcrumbs/component.ts b/addon/components/breadcrumbs/component.ts
index b0bdb52c..583ec20b 100644
--- a/addon/components/breadcrumbs/component.ts
+++ b/addon/components/breadcrumbs/component.ts
@@ -1,5 +1,5 @@
 import Component from '@glimmer/component';
-import { defaultArgs } from "../../decorators";
+import { defaultArgs } from '../../decorators';
 
 /** @documenter yuidoc */
 
diff --git a/app/components/carbon/breadcrumbs.js b/app/components/carbon/breadcrumbs.js
new file mode 100644
index 00000000..396fd5f1
--- /dev/null
+++ b/app/components/carbon/breadcrumbs.js
@@ -0,0 +1 @@
+export { default } from 'carbon-components-ember/components/breadcrumbs/component';
diff --git a/app/components/carbon/button.js b/app/components/carbon/button.js
new file mode 100644
index 00000000..916604a0
--- /dev/null
+++ b/app/components/carbon/button.js
@@ -0,0 +1 @@
+export { default } from 'carbon-components-ember/components/button/component';
diff --git a/app/components/carbon/card.js b/app/components/carbon/card.js
new file mode 100644
index 00000000..86b21884
--- /dev/null
+++ b/app/components/carbon/card.js
@@ -0,0 +1 @@
+export { default } from 'carbon-components-ember/components/card/component';
diff --git a/app/components/carbon/charts.js b/app/components/carbon/charts.js
new file mode 100644
index 00000000..7f7205c3
--- /dev/null
+++ b/app/components/carbon/charts.js
@@ -0,0 +1 @@
+export { default } from 'carbon-components-ember/components/charts/component';
diff --git a/app/components/carbon/checkbox.js b/app/components/carbon/checkbox.js
new file mode 100644
index 00000000..cf5b948a
--- /dev/null
+++ b/app/components/carbon/checkbox.js
@@ -0,0 +1 @@
+export { default } from 'carbon-components-ember/components/checkbox/component';
diff --git a/app/components/carbon/code-snippet.js b/app/components/carbon/code-snippet.js
new file mode 100644
index 00000000..778a213d
--- /dev/null
+++ b/app/components/carbon/code-snippet.js
@@ -0,0 +1 @@
+export { default } from 'carbon-components-ember/components/code-snippet/component';
diff --git a/app/components/carbon/copy-button.js b/app/components/carbon/copy-button.js
new file mode 100644
index 00000000..419c22ce
--- /dev/null
+++ b/app/components/carbon/copy-button.js
@@ -0,0 +1 @@
+export { default } from 'carbon-components-ember/components/copy-button/component';
diff --git a/app/components/carbon/data-table.js b/app/components/carbon/data-table.js
new file mode 100644
index 00000000..85819f3b
--- /dev/null
+++ b/app/components/carbon/data-table.js
@@ -0,0 +1 @@
+export { default } from 'carbon-components-ember/components/data-table/component';
diff --git a/app/components/carbon/dialogs.js b/app/components/carbon/dialogs.js
new file mode 100644
index 00000000..82337fa5
--- /dev/null
+++ b/app/components/carbon/dialogs.js
@@ -0,0 +1 @@
+export { default } from 'carbon-components-ember/components/dialogs/component';
diff --git a/app/components/carbon/form-input.js b/app/components/carbon/form-input.js
new file mode 100644
index 00000000..77c91363
--- /dev/null
+++ b/app/components/carbon/form-input.js
@@ -0,0 +1 @@
+export { default } from 'carbon-components-ember/components/form-input/component';
diff --git a/app/components/carbon/icon.js b/app/components/carbon/icon.js
new file mode 100644
index 00000000..19ce8f88
--- /dev/null
+++ b/app/components/carbon/icon.js
@@ -0,0 +1 @@
+export { default } from 'carbon-components-ember/components/icon/component';
diff --git a/app/components/carbon/list.js b/app/components/carbon/list.js
new file mode 100644
index 00000000..10bb06be
--- /dev/null
+++ b/app/components/carbon/list.js
@@ -0,0 +1 @@
+export { default } from 'carbon-components-ember/components/list/component';
diff --git a/app/components/carbon/loading.js b/app/components/carbon/loading.js
new file mode 100644
index 00000000..802dda23
--- /dev/null
+++ b/app/components/carbon/loading.js
@@ -0,0 +1 @@
+export { default } from 'carbon-components-ember/components/loading/component';
diff --git a/app/components/carbon/menu.js b/app/components/carbon/menu.js
new file mode 100644
index 00000000..d2b65151
--- /dev/null
+++ b/app/components/carbon/menu.js
@@ -0,0 +1 @@
+export { default } from 'carbon-components-ember/components/menu/component';
diff --git a/app/components/carbon/modal.js b/app/components/carbon/modal.js
new file mode 100644
index 00000000..311b4b70
--- /dev/null
+++ b/app/components/carbon/modal.js
@@ -0,0 +1 @@
+export { default } from 'carbon-components-ember/components/modal/component';
diff --git a/app/components/carbon/notification.js b/app/components/carbon/notification.js
new file mode 100644
index 00000000..235aac86
--- /dev/null
+++ b/app/components/carbon/notification.js
@@ -0,0 +1 @@
+export { default } from 'carbon-components-ember/components/notification/component';
diff --git a/app/components/carbon/pagination.js b/app/components/carbon/pagination.js
new file mode 100644
index 00000000..a3765d04
--- /dev/null
+++ b/app/components/carbon/pagination.js
@@ -0,0 +1 @@
+export { default } from 'carbon-components-ember/components/pagination/component';
diff --git a/app/components/carbon/search-input.js b/app/components/carbon/search-input.js
new file mode 100644
index 00000000..b50b432e
--- /dev/null
+++ b/app/components/carbon/search-input.js
@@ -0,0 +1 @@
+export { default } from 'carbon-components-ember/components/search-input/component';
diff --git a/app/components/carbon/select.js b/app/components/carbon/select.js
new file mode 100644
index 00000000..9c0ce5be
--- /dev/null
+++ b/app/components/carbon/select.js
@@ -0,0 +1 @@
+export { default } from 'carbon-components-ember/components/select/component';
diff --git a/app/components/carbon/tabs.js b/app/components/carbon/tabs.js
new file mode 100644
index 00000000..32e82f75
--- /dev/null
+++ b/app/components/carbon/tabs.js
@@ -0,0 +1 @@
+export { default } from 'carbon-components-ember/components/tabs/component';
diff --git a/app/components/carbon/tag.js b/app/components/carbon/tag.js
new file mode 100644
index 00000000..b75643fe
--- /dev/null
+++ b/app/components/carbon/tag.js
@@ -0,0 +1 @@
+export { default } from 'carbon-components-ember/components/tag/component';
diff --git a/app/components/carbon/tile.js b/app/components/carbon/tile.js
new file mode 100644
index 00000000..591f0792
--- /dev/null
+++ b/app/components/carbon/tile.js
@@ -0,0 +1 @@
+export { default } from 'carbon-components-ember/components/tile/component';
diff --git a/app/components/carbon/toggle.js b/app/components/carbon/toggle.js
new file mode 100644
index 00000000..0a4d168e
--- /dev/null
+++ b/app/components/carbon/toggle.js
@@ -0,0 +1 @@
+export { default } from 'carbon-components-ember/components/toggle/component';
diff --git a/app/components/carbon/ui-shell.js b/app/components/carbon/ui-shell.js
new file mode 100644
index 00000000..a30c15e7
--- /dev/null
+++ b/app/components/carbon/ui-shell.js
@@ -0,0 +1 @@
+export { default } from 'carbon-components-ember/components/ui-shell/component';
diff --git a/app/services/carbon/dialog-manager.js b/app/services/carbon/dialog-manager.js
new file mode 100644
index 00000000..1ab1c0a6
--- /dev/null
+++ b/app/services/carbon/dialog-manager.js
@@ -0,0 +1 @@
+export { default } from 'carbon-components-ember/services/dialog-manager';
diff --git a/app/services/carbon/notifications.js b/app/services/carbon/notifications.js
new file mode 100644
index 00000000..6bd85df4
--- /dev/null
+++ b/app/services/carbon/notifications.js
@@ -0,0 +1 @@
+export { default } from 'carbon-components-ember/services/notifications';
diff --git a/package.json b/package.json
index fc17cfb2..d7d2be45 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.3.17",
+  "version": "0.3.18",
   "name": "carbon-components-ember",
   "keywords": [
     "ember-addon"
diff --git a/tests/dummy/app/pods/application/controller.js b/tests/dummy/app/pods/application/controller.js
index 0d7a4735..7c6d8eab 100644
--- a/tests/dummy/app/pods/application/controller.js
+++ b/tests/dummy/app/pods/application/controller.js
@@ -4,5 +4,5 @@ import Controller from '@ember/controller';
 
 export default class ApplicationController extends Controller {
   @service('carbon-components-ember@dialog-manager') dialogManager;
-  @service('carbon-components-ember@notifications') notifications;
+  @service('carbon/notifications') notifications;
 }
diff --git a/tests/dummy/app/pods/docs/components/notification/controller.js b/tests/dummy/app/pods/docs/components/notification/controller.js
index 9f639a7a..97776c7f 100644
--- a/tests/dummy/app/pods/docs/components/notification/controller.js
+++ b/tests/dummy/app/pods/docs/components/notification/controller.js
@@ -7,7 +7,7 @@ export default class NotificationController extends Controller {
   /**
    * @type {NotificationService}
    */
-  @service('carbon-components-ember@notifications') notifications;
+  @service('carbon/notifications') notifications;
   @action
   showNotification(type) {
     this.notifications.info({
diff --git a/tests/dummy/app/pods/docs/components/tag/template.hbs b/tests/dummy/app/pods/docs/components/tag/template.hbs
new file mode 100644
index 00000000..32759917
--- /dev/null
+++ b/tests/dummy/app/pods/docs/components/tag/template.hbs
@@ -0,0 +1,18 @@
+{{import Tag from 'carbon-components-ember/components/tag'}}
+{{import Demo from 'ember-cli-addon-docs/components/docs-demo'}}
+
+
+<h1>Carbon Tag</h1>
+
+<Demo as |demo|>
+  {{#demo.example name='tag.hbs'}}
+    {{!import Tag from 'carbon-components-ember/components/tag'}}
+
+    {{#each (array 'red' 'magenta' 'purple' 'blue' 'cyan' 'teal' 'green' 'gray' 'cool-gray' 'warm-gray') as |type|}}
+      <Carbon::Tag></Carbon::Tag>
+      <Tag @type={{type}}></Tag>
+    {{/each}}
+
+  {{/demo.example}}
+  <demo.snippet @name="tag.hbs" />
+</Demo>
\ No newline at end of file