diff --git a/app/components/collection-create-container.js b/app/components/collection/create-container.js
similarity index 100%
rename from app/components/collection-create-container.js
rename to app/components/collection/create-container.js
diff --git a/app/components/collection-detail-container.js b/app/components/collection/detail-container.js
similarity index 100%
rename from app/components/collection-detail-container.js
rename to app/components/collection/detail-container.js
diff --git a/app/components/collections-container.js b/app/components/collection/list-container.js
similarity index 100%
rename from app/components/collections-container.js
rename to app/components/collection/list-container.js
diff --git a/app/controllers/application.js b/app/controllers/application.js
index 59d2822..1542788 100644
--- a/app/controllers/application.js
+++ b/app/controllers/application.js
@@ -1,6 +1,6 @@
 import Ember from 'ember';
 
-const { Controller, inject: { service }} = Ember;
+const { Controller, inject: { service } } = Ember;
 
 export default Controller.extend({
   session: service('session'),
diff --git a/app/controllers/collections/create.js b/app/controllers/collections/create.js
index f95fad7..9959ebe 100644
--- a/app/controllers/collections/create.js
+++ b/app/controllers/collections/create.js
@@ -1,7 +1,7 @@
 import Ember from 'ember';
-import CollectionValidations from '../../validations/collection';
-import { schema } from '../../models/collection';
-import ValidationMixin from '../../mixins/validation';
+import CollectionValidations from 'ccdb-web/validations/collection';
+import { schema } from 'ccdb-web/models/collection';
+import ValidationMixin from 'ccdb-web/mixins/validation';
 
 const { Controller } = Ember;
 
diff --git a/app/controllers/collections/detail/edit.js b/app/controllers/collections/detail/edit.js
index d830e10..39367c4 100644
--- a/app/controllers/collections/detail/edit.js
+++ b/app/controllers/collections/detail/edit.js
@@ -1,7 +1,7 @@
 import Ember from 'ember';
-import CollectionValidations from '../../../validations/collection';
-import { schema } from '../../../models/collection';
-import ValidationMixin from '../../../mixins/validation';
+import CollectionValidations from 'ccdb-web/validations/collection';
+import { schema } from 'ccdb-web/models/collection';
+import ValidationMixin from 'ccdb-web/mixins/validation';
 
 const { Controller } = Ember;
 
diff --git a/app/templates/application.hbs b/app/templates/application.hbs
index 28f30f7..4b555ce 100644
--- a/app/templates/application.hbs
+++ b/app/templates/application.hbs
@@ -6,7 +6,6 @@
         {{#link-to 'index' tagName='li' href=false}}
           {{link-to 'Overview' 'index'}}
         {{/link-to}}
-        <li><a href="#">Experiments</a></li>
         {{#link-to 'collections' tagName='li' href=false}}
           {{link-to 'Collections' 'collections'}}
         {{/link-to}}
diff --git a/app/templates/collections/create.hbs b/app/templates/collections/create.hbs
index 64fc896..f2e746f 100644
--- a/app/templates/collections/create.hbs
+++ b/app/templates/collections/create.hbs
@@ -1,5 +1,5 @@
 {{
-  collection-create-container
+  collection/create-container
   model=model
   validations=CollectionValidations
   projectOptions=projectOptions
diff --git a/app/templates/collections/detail/edit.hbs b/app/templates/collections/detail/edit.hbs
index 64fc896..f2e746f 100644
--- a/app/templates/collections/detail/edit.hbs
+++ b/app/templates/collections/detail/edit.hbs
@@ -1,5 +1,5 @@
 {{
-  collection-create-container
+  collection/create-container
   model=model
   validations=CollectionValidations
   projectOptions=projectOptions
diff --git a/app/templates/collections/detail/index.hbs b/app/templates/collections/detail/index.hbs
index 78d67aa..ba72a06 100644
--- a/app/templates/collections/detail/index.hbs
+++ b/app/templates/collections/detail/index.hbs
@@ -1,5 +1,5 @@
 {{
-  collection-detail-container
+  collection/detail-container
   model=model
   editCollection=(action 'editCollection')
 }}
diff --git a/app/templates/collections/index.hbs b/app/templates/collections/index.hbs
index 91783b3..07d407b 100644
--- a/app/templates/collections/index.hbs
+++ b/app/templates/collections/index.hbs
@@ -1,5 +1,5 @@
 {{
-  collections-container
+  collection/list-container
   model=model
   changePage=(action 'changePage')
   onRowClick=(action 'rowClick')
diff --git a/app/templates/components/collection-create-container.hbs b/app/templates/components/collection/create-container.hbs
similarity index 100%
rename from app/templates/components/collection-create-container.hbs
rename to app/templates/components/collection/create-container.hbs
diff --git a/app/templates/components/collection-detail-container.hbs b/app/templates/components/collection/detail-container.hbs
similarity index 100%
rename from app/templates/components/collection-detail-container.hbs
rename to app/templates/components/collection/detail-container.hbs
diff --git a/app/templates/components/collections-container.hbs b/app/templates/components/collection/list-container.hbs
similarity index 100%
rename from app/templates/components/collections-container.hbs
rename to app/templates/components/collection/list-container.hbs
diff --git a/app/templates/index.hbs b/app/templates/index.hbs
index 8b13789..f55b254 100644
--- a/app/templates/index.hbs
+++ b/app/templates/index.hbs
@@ -1 +1 @@
-
+TBA