diff --git a/app/adapters/application.js b/app/adapters/application.js
index 924f2e53c..e0c2a6d7e 100644
--- a/app/adapters/application.js
+++ b/app/adapters/application.js
@@ -1,4 +1,4 @@
-import EmbeddedRelationAdapter from 'ghost/adapters/embedded-relation-adapter';
+import EmbeddedRelationAdapter from 'ghost-admin/adapters/embedded-relation-adapter';
 
 export default EmbeddedRelationAdapter.extend({
 
diff --git a/app/adapters/base.js b/app/adapters/base.js
index 7c8395eec..4e5c06b19 100644
--- a/app/adapters/base.js
+++ b/app/adapters/base.js
@@ -1,8 +1,8 @@
 import Ember from 'ember';
 import RESTAdapter from 'ember-data/adapters/rest';
-import ghostPaths from 'ghost/utils/ghost-paths';
+import ghostPaths from 'ghost-admin/utils/ghost-paths';
 import DataAdapterMixin from 'ember-simple-auth/mixins/data-adapter-mixin';
-import config from 'ghost/config/environment';
+import config from 'ghost-admin/config/environment';
 
 const {
     inject: {service}
diff --git a/app/adapters/embedded-relation-adapter.js b/app/adapters/embedded-relation-adapter.js
index f971405c3..a1ab43875 100644
--- a/app/adapters/embedded-relation-adapter.js
+++ b/app/adapters/embedded-relation-adapter.js
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import BaseAdapter from 'ghost/adapters/base';
+import BaseAdapter from 'ghost-admin/adapters/base';
 
 const {get, isNone} = Ember;
 
diff --git a/app/adapters/setting.js b/app/adapters/setting.js
index ccc266e88..03dd333d3 100644
--- a/app/adapters/setting.js
+++ b/app/adapters/setting.js
@@ -1,4 +1,4 @@
-import ApplicationAdapter from 'ghost/adapters/application';
+import ApplicationAdapter from 'ghost-admin/adapters/application';
 
 export default ApplicationAdapter.extend({
     updateRecord(store, type, record) {
diff --git a/app/adapters/tag.js b/app/adapters/tag.js
index 5dc33f7e8..a3dd71549 100644
--- a/app/adapters/tag.js
+++ b/app/adapters/tag.js
@@ -1,4 +1,4 @@
-import ApplicationAdapter from 'ghost/adapters/application';
-import SlugUrl from 'ghost/mixins/slug-url';
+import ApplicationAdapter from 'ghost-admin/adapters/application';
+import SlugUrl from 'ghost-admin/mixins/slug-url';
 
 export default ApplicationAdapter.extend(SlugUrl);
diff --git a/app/adapters/user.js b/app/adapters/user.js
index 578f737cc..68fd85054 100644
--- a/app/adapters/user.js
+++ b/app/adapters/user.js
@@ -1,5 +1,5 @@
-import ApplicationAdapter from 'ghost/adapters/application';
-import SlugUrl from 'ghost/mixins/slug-url';
+import ApplicationAdapter from 'ghost-admin/adapters/application';
+import SlugUrl from 'ghost-admin/mixins/slug-url';
 
 export default ApplicationAdapter.extend(SlugUrl, {
     find(store, type, id) {
diff --git a/app/app.js b/app/app.js
index ed5c21167..a77c99e4e 100755
--- a/app/app.js
+++ b/app/app.js
@@ -1,8 +1,8 @@
 import Ember from 'ember';
 import Resolver from './resolver';
 import loadInitializers from 'ember-load-initializers';
-import 'ghost/utils/link-component';
-import 'ghost/utils/text-field';
+import 'ghost-admin/utils/link-component';
+import 'ghost-admin/utils/text-field';
 import config from './config/environment';
 
 const {Application} = Ember;
diff --git a/app/components/gh-datetime-input.js b/app/components/gh-datetime-input.js
index f24e59405..fe800aefb 100644
--- a/app/components/gh-datetime-input.js
+++ b/app/components/gh-datetime-input.js
@@ -1,7 +1,7 @@
 import Ember from 'ember';
-import TextInputMixin from 'ghost/mixins/text-input';
-import boundOneWay from 'ghost/utils/bound-one-way';
-import {formatDate} from 'ghost/utils/date-formatting';
+import TextInputMixin from 'ghost-admin/mixins/text-input';
+import boundOneWay from 'ghost-admin/utils/bound-one-way';
+import {formatDate} from 'ghost-admin/utils/date-formatting';
 import {invokeAction} from 'ember-invoke-action';
 
 const {
diff --git a/app/components/gh-dropdown-button.js b/app/components/gh-dropdown-button.js
index a9429be82..59fd4fd7d 100644
--- a/app/components/gh-dropdown-button.js
+++ b/app/components/gh-dropdown-button.js
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import DropdownMixin from 'ghost/mixins/dropdown-mixin';
+import DropdownMixin from 'ghost-admin/mixins/dropdown-mixin';
 
 const {
     Component,
diff --git a/app/components/gh-dropdown.js b/app/components/gh-dropdown.js
index b7f01a589..995080b87 100644
--- a/app/components/gh-dropdown.js
+++ b/app/components/gh-dropdown.js
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import DropdownMixin from 'ghost/mixins/dropdown-mixin';
+import DropdownMixin from 'ghost-admin/mixins/dropdown-mixin';
 
 const {
     Component,
diff --git a/app/components/gh-ed-editor.js b/app/components/gh-ed-editor.js
index a927458bc..9c69de582 100644
--- a/app/components/gh-ed-editor.js
+++ b/app/components/gh-ed-editor.js
@@ -1,7 +1,7 @@
 import Ember from 'ember';
-import EditorAPI from 'ghost/mixins/ed-editor-api';
-import EditorShortcuts from 'ghost/mixins/ed-editor-shortcuts';
-import EditorScroll from 'ghost/mixins/ed-editor-scroll';
+import EditorAPI from 'ghost-admin/mixins/ed-editor-api';
+import EditorShortcuts from 'ghost-admin/mixins/ed-editor-shortcuts';
+import EditorScroll from 'ghost-admin/mixins/ed-editor-scroll';
 import {invokeAction} from 'ember-invoke-action';
 
 const {TextArea, run} = Ember;
diff --git a/app/components/gh-ed-preview.js b/app/components/gh-ed-preview.js
index f28d47d19..ed0455c4c 100644
--- a/app/components/gh-ed-preview.js
+++ b/app/components/gh-ed-preview.js
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import {formatMarkdown} from 'ghost/helpers/gh-format-markdown';
+import {formatMarkdown} from 'ghost-admin/helpers/gh-format-markdown';
 
 const {
     Component,
diff --git a/app/components/gh-editor.js b/app/components/gh-editor.js
index 5b0fec698..5e86c4019 100644
--- a/app/components/gh-editor.js
+++ b/app/components/gh-editor.js
@@ -1,7 +1,7 @@
 import Ember from 'ember';
-import ShortcutsMixin from 'ghost/mixins/shortcuts';
-import imageManager from 'ghost/utils/ed-image-manager';
-import editorShortcuts from 'ghost/utils/editor-shortcuts';
+import ShortcutsMixin from 'ghost-admin/mixins/shortcuts';
+import imageManager from 'ghost-admin/utils/ed-image-manager';
+import editorShortcuts from 'ghost-admin/utils/editor-shortcuts';
 import {invokeAction} from 'ember-invoke-action';
 
 const {Component, computed, run} = Ember;
diff --git a/app/components/gh-file-uploader.js b/app/components/gh-file-uploader.js
index f17feb3e5..1a02c7f24 100644
--- a/app/components/gh-file-uploader.js
+++ b/app/components/gh-file-uploader.js
@@ -3,7 +3,7 @@ import { invoke, invokeAction } from 'ember-invoke-action';
 import {
     RequestEntityTooLargeError,
     UnsupportedMediaTypeError
-} from 'ghost/services/ajax';
+} from 'ghost-admin/services/ajax';
 
 const {
     Component,
diff --git a/app/components/gh-form-group.js b/app/components/gh-form-group.js
index 5445314cc..745f33936 100644
--- a/app/components/gh-form-group.js
+++ b/app/components/gh-form-group.js
@@ -1,4 +1,4 @@
-import ValidationStatusContainer from 'ghost/components/gh-validation-status-container';
+import ValidationStatusContainer from 'ghost-admin/components/gh-validation-status-container';
 
 export default ValidationStatusContainer.extend({
     classNames: 'form-group'
diff --git a/app/components/gh-image-uploader.js b/app/components/gh-image-uploader.js
index 1141b38fc..42c8824c5 100644
--- a/app/components/gh-image-uploader.js
+++ b/app/components/gh-image-uploader.js
@@ -1,6 +1,6 @@
 import Ember from 'ember';
-import ghostPaths from 'ghost/utils/ghost-paths';
-import {RequestEntityTooLargeError, UnsupportedMediaTypeError} from 'ghost/services/ajax';
+import ghostPaths from 'ghost-admin/utils/ghost-paths';
+import {RequestEntityTooLargeError, UnsupportedMediaTypeError} from 'ghost-admin/services/ajax';
 
 const {
     Component,
diff --git a/app/components/gh-infinite-scroll.js b/app/components/gh-infinite-scroll.js
index 56746ba1f..643e6f280 100644
--- a/app/components/gh-infinite-scroll.js
+++ b/app/components/gh-infinite-scroll.js
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import InfiniteScrollMixin from 'ghost/mixins/infinite-scroll';
+import InfiniteScrollMixin from 'ghost-admin/mixins/infinite-scroll';
 
 const {Component} = Ember;
 
diff --git a/app/components/gh-input.js b/app/components/gh-input.js
index 43d8ef131..9ad3a4b2f 100644
--- a/app/components/gh-input.js
+++ b/app/components/gh-input.js
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import TextInputMixin from 'ghost/mixins/text-input';
+import TextInputMixin from 'ghost-admin/mixins/text-input';
 
 const {TextField} = Ember;
 
diff --git a/app/components/gh-navitem.js b/app/components/gh-navitem.js
index 341ea1a9d..3e4b6bf6b 100644
--- a/app/components/gh-navitem.js
+++ b/app/components/gh-navitem.js
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import ValidationState from 'ghost/mixins/validation-state';
+import ValidationState from 'ghost-admin/mixins/validation-state';
 import SortableItem from 'ember-sortable/mixins/sortable-item';
 
 const {Component, computed, run} = Ember;
diff --git a/app/components/gh-popover-button.js b/app/components/gh-popover-button.js
index ac852680f..3c843e32f 100644
--- a/app/components/gh-popover-button.js
+++ b/app/components/gh-popover-button.js
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import DropdownButton from 'ghost/components/gh-dropdown-button';
+import DropdownButton from 'ghost-admin/components/gh-dropdown-button';
 
 const {
     inject: {service}
diff --git a/app/components/gh-popover.js b/app/components/gh-popover.js
index c724003f0..57da98a0f 100644
--- a/app/components/gh-popover.js
+++ b/app/components/gh-popover.js
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import GhostDropdown from 'ghost/components/gh-dropdown';
+import GhostDropdown from 'ghost-admin/components/gh-dropdown';
 
 const {
     inject: {service}
diff --git a/app/components/gh-posts-list-item.js b/app/components/gh-posts-list-item.js
index 51c92c81c..9f2eaf2ef 100644
--- a/app/components/gh-posts-list-item.js
+++ b/app/components/gh-posts-list-item.js
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import ActiveLinkWrapper from 'ghost/mixins/active-link-wrapper';
+import ActiveLinkWrapper from 'ghost-admin/mixins/active-link-wrapper';
 import {invokeAction} from 'ember-invoke-action';
 
 const {
diff --git a/app/components/gh-profile-image.js b/app/components/gh-profile-image.js
index 00f038e8b..9906faf32 100644
--- a/app/components/gh-profile-image.js
+++ b/app/components/gh-profile-image.js
@@ -1,6 +1,6 @@
 import Ember from 'ember';
 import AjaxService from 'ember-ajax/services/ajax';
-import {NotFoundError} from 'ghost/services/ajax';
+import {NotFoundError} from 'ghost-admin/services/ajax';
 
 const {
     Component,
diff --git a/app/components/gh-tag-settings-form.js b/app/components/gh-tag-settings-form.js
index b892cf314..c4612b9f0 100644
--- a/app/components/gh-tag-settings-form.js
+++ b/app/components/gh-tag-settings-form.js
@@ -1,6 +1,6 @@
 /* global key */
 import Ember from 'ember';
-import boundOneWay from 'ghost/utils/bound-one-way';
+import boundOneWay from 'ghost-admin/utils/bound-one-way';
 import {invokeAction} from 'ember-invoke-action';
 
 const {
diff --git a/app/components/gh-textarea.js b/app/components/gh-textarea.js
index e668dd220..92fa0e407 100644
--- a/app/components/gh-textarea.js
+++ b/app/components/gh-textarea.js
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import TextInputMixin from 'ghost/mixins/text-input';
+import TextInputMixin from 'ghost-admin/mixins/text-input';
 
 const {TextArea} = Ember;
 
diff --git a/app/components/gh-validation-status-container.js b/app/components/gh-validation-status-container.js
index 5ddfb3ba1..7c3e14f70 100644
--- a/app/components/gh-validation-status-container.js
+++ b/app/components/gh-validation-status-container.js
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import ValidationStateMixin from 'ghost/mixins/validation-state';
+import ValidationStateMixin from 'ghost-admin/mixins/validation-state';
 
 const {Component, computed} = Ember;
 
diff --git a/app/components/modals/copy-html.js b/app/components/modals/copy-html.js
index 078b0b12b..a7f2bed5f 100644
--- a/app/components/modals/copy-html.js
+++ b/app/components/modals/copy-html.js
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import ModalComponent from 'ghost/components/modals/base';
+import ModalComponent from 'ghost-admin/components/modals/base';
 
 const {computed} = Ember;
 const {alias} = computed;
diff --git a/app/components/modals/delete-all.js b/app/components/modals/delete-all.js
index 11b1748df..a386f3b57 100644
--- a/app/components/modals/delete-all.js
+++ b/app/components/modals/delete-all.js
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import ModalComponent from 'ghost/components/modals/base';
+import ModalComponent from 'ghost-admin/components/modals/base';
 
 const {
     inject: {service}
diff --git a/app/components/modals/delete-post.js b/app/components/modals/delete-post.js
index a45280588..b5980e130 100644
--- a/app/components/modals/delete-post.js
+++ b/app/components/modals/delete-post.js
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import ModalComponent from 'ghost/components/modals/base';
+import ModalComponent from 'ghost-admin/components/modals/base';
 
 const {
     computed,
diff --git a/app/components/modals/delete-subscriber.js b/app/components/modals/delete-subscriber.js
index ec8b58c76..769770f21 100644
--- a/app/components/modals/delete-subscriber.js
+++ b/app/components/modals/delete-subscriber.js
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import ModalComponent from 'ghost/components/modals/base';
+import ModalComponent from 'ghost-admin/components/modals/base';
 import {invokeAction} from 'ember-invoke-action';
 
 const {computed} = Ember;
diff --git a/app/components/modals/delete-tag.js b/app/components/modals/delete-tag.js
index 3e36d72ed..40b0f87aa 100644
--- a/app/components/modals/delete-tag.js
+++ b/app/components/modals/delete-tag.js
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import ModalComponent from 'ghost/components/modals/base';
+import ModalComponent from 'ghost-admin/components/modals/base';
 import {invokeAction} from 'ember-invoke-action';
 
 const {computed} = Ember;
diff --git a/app/components/modals/delete-user.js b/app/components/modals/delete-user.js
index 801adac23..da95a832a 100644
--- a/app/components/modals/delete-user.js
+++ b/app/components/modals/delete-user.js
@@ -1,4 +1,4 @@
-import ModalComponent from 'ghost/components/modals/base';
+import ModalComponent from 'ghost-admin/components/modals/base';
 import {invokeAction} from 'ember-invoke-action';
 
 export default ModalComponent.extend({
diff --git a/app/components/modals/import-subscribers.js b/app/components/modals/import-subscribers.js
index 272c643be..366aed773 100644
--- a/app/components/modals/import-subscribers.js
+++ b/app/components/modals/import-subscribers.js
@@ -1,7 +1,7 @@
 import Ember from 'ember';
 import { invokeAction } from 'ember-invoke-action';
-import ModalComponent from 'ghost/components/modals/base';
-import ghostPaths from 'ghost/utils/ghost-paths';
+import ModalComponent from 'ghost-admin/components/modals/base';
+import ghostPaths from 'ghost-admin/utils/ghost-paths';
 
 const {computed} = Ember;
 
diff --git a/app/components/modals/invite-new-user.js b/app/components/modals/invite-new-user.js
index 14bd9cb99..d02f13b4a 100644
--- a/app/components/modals/invite-new-user.js
+++ b/app/components/modals/invite-new-user.js
@@ -1,6 +1,6 @@
 import Ember from 'ember';
-import ModalComponent from 'ghost/components/modals/base';
-import ValidationEngine from 'ghost/mixins/validation-engine';
+import ModalComponent from 'ghost-admin/components/modals/base';
+import ValidationEngine from 'ghost-admin/mixins/validation-engine';
 
 const {
     RSVP: {Promise},
diff --git a/app/components/modals/leave-editor.js b/app/components/modals/leave-editor.js
index 98dd69064..8545edfb3 100644
--- a/app/components/modals/leave-editor.js
+++ b/app/components/modals/leave-editor.js
@@ -1,4 +1,4 @@
-import ModalComponent from 'ghost/components/modals/base';
+import ModalComponent from 'ghost-admin/components/modals/base';
 import {invokeAction} from 'ember-invoke-action';
 
 export default ModalComponent.extend({
diff --git a/app/components/modals/markdown-help.js b/app/components/modals/markdown-help.js
index 7827870b6..450e5b9a6 100644
--- a/app/components/modals/markdown-help.js
+++ b/app/components/modals/markdown-help.js
@@ -1,4 +1,4 @@
-import ModalComponent from 'ghost/components/modals/base';
+import ModalComponent from 'ghost-admin/components/modals/base';
 
 export default ModalComponent.extend({
 });
diff --git a/app/components/modals/new-subscriber.js b/app/components/modals/new-subscriber.js
index 246d24b7f..a15a4e759 100644
--- a/app/components/modals/new-subscriber.js
+++ b/app/components/modals/new-subscriber.js
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import ModalComponent from 'ghost/components/modals/base';
+import ModalComponent from 'ghost-admin/components/modals/base';
 
 export default ModalComponent.extend({
     actions: {
diff --git a/app/components/modals/re-authenticate.js b/app/components/modals/re-authenticate.js
index 9c59e12ef..3c70a5466 100644
--- a/app/components/modals/re-authenticate.js
+++ b/app/components/modals/re-authenticate.js
@@ -1,6 +1,6 @@
 import Ember from 'ember';
-import ModalComponent from 'ghost/components/modals/base';
-import ValidationEngine from 'ghost/mixins/validation-engine';
+import ModalComponent from 'ghost-admin/components/modals/base';
+import ValidationEngine from 'ghost-admin/mixins/validation-engine';
 
 const {
     $,
diff --git a/app/components/modals/transfer-owner.js b/app/components/modals/transfer-owner.js
index 8753c22f7..92d7c0a2c 100644
--- a/app/components/modals/transfer-owner.js
+++ b/app/components/modals/transfer-owner.js
@@ -1,4 +1,4 @@
-import ModalComponent from 'ghost/components/modals/base';
+import ModalComponent from 'ghost-admin/components/modals/base';
 import {invokeAction} from 'ember-invoke-action';
 
 export default ModalComponent.extend({
diff --git a/app/components/modals/upload-image.js b/app/components/modals/upload-image.js
index 8c063cc5b..62760f2d5 100644
--- a/app/components/modals/upload-image.js
+++ b/app/components/modals/upload-image.js
@@ -1,6 +1,6 @@
 import Ember from 'ember';
-import ModalComponent from 'ghost/components/modals/base';
-import cajaSanitizers from 'ghost/utils/caja-sanitizers';
+import ModalComponent from 'ghost-admin/components/modals/base';
+import cajaSanitizers from 'ghost-admin/utils/caja-sanitizers';
 
 const {
     computed,
diff --git a/app/controllers/editor/edit.js b/app/controllers/editor/edit.js
index 7cb7b5752..9193b60e9 100644
--- a/app/controllers/editor/edit.js
+++ b/app/controllers/editor/edit.js
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import EditorControllerMixin from 'ghost/mixins/editor-base-controller';
+import EditorControllerMixin from 'ghost-admin/mixins/editor-base-controller';
 
 const {Controller} = Ember;
 
diff --git a/app/controllers/editor/new.js b/app/controllers/editor/new.js
index 6dc2ea504..9105d13bf 100644
--- a/app/controllers/editor/new.js
+++ b/app/controllers/editor/new.js
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import EditorControllerMixin from 'ghost/mixins/editor-base-controller';
+import EditorControllerMixin from 'ghost-admin/mixins/editor-base-controller';
 
 const {Controller} = Ember;
 
diff --git a/app/controllers/post-settings-menu.js b/app/controllers/post-settings-menu.js
index d8100c838..0b4b1ea85 100644
--- a/app/controllers/post-settings-menu.js
+++ b/app/controllers/post-settings-menu.js
@@ -1,8 +1,8 @@
 import Ember from 'ember';
-import {parseDateString} from 'ghost/utils/date-formatting';
-import SettingsMenuMixin from 'ghost/mixins/settings-menu-controller';
-import boundOneWay from 'ghost/utils/bound-one-way';
-import isNumber from 'ghost/utils/isNumber';
+import {parseDateString} from 'ghost-admin/utils/date-formatting';
+import SettingsMenuMixin from 'ghost-admin/mixins/settings-menu-controller';
+import boundOneWay from 'ghost-admin/utils/bound-one-way';
+import isNumber from 'ghost-admin/utils/isNumber';
 
 const {
     $,
diff --git a/app/controllers/reset.js b/app/controllers/reset.js
index e1a94d8e0..73deac35a 100644
--- a/app/controllers/reset.js
+++ b/app/controllers/reset.js
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import ValidationEngine from 'ghost/mixins/validation-engine';
+import ValidationEngine from 'ghost-admin/mixins/validation-engine';
 
 const {
     Controller,
diff --git a/app/controllers/settings/code-injection.js b/app/controllers/settings/code-injection.js
index 576b611bb..9105ab6d9 100644
--- a/app/controllers/settings/code-injection.js
+++ b/app/controllers/settings/code-injection.js
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import SettingsSaveMixin from 'ghost/mixins/settings-save';
+import SettingsSaveMixin from 'ghost-admin/mixins/settings-save';
 
 const {
     Controller,
diff --git a/app/controllers/settings/general.js b/app/controllers/settings/general.js
index 5cd4b1dee..cecb31585 100644
--- a/app/controllers/settings/general.js
+++ b/app/controllers/settings/general.js
@@ -1,6 +1,6 @@
 import Ember from 'ember';
-import SettingsSaveMixin from 'ghost/mixins/settings-save';
-import randomPassword from 'ghost/utils/random-password';
+import SettingsSaveMixin from 'ghost-admin/mixins/settings-save';
+import randomPassword from 'ghost-admin/utils/random-password';
 
 const {
     Controller,
diff --git a/app/controllers/settings/navigation.js b/app/controllers/settings/navigation.js
index ee91b8447..c1489fd31 100644
--- a/app/controllers/settings/navigation.js
+++ b/app/controllers/settings/navigation.js
@@ -1,6 +1,6 @@
 import Ember from 'ember';
-import SettingsSaveMixin from 'ghost/mixins/settings-save';
-import NavigationItem from 'ghost/models/navigation-item';
+import SettingsSaveMixin from 'ghost-admin/mixins/settings-save';
+import NavigationItem from 'ghost-admin/models/navigation-item';
 
 const {
     Controller,
diff --git a/app/controllers/setup/two.js b/app/controllers/setup/two.js
index 5f9ca4168..5626cb17e 100644
--- a/app/controllers/setup/two.js
+++ b/app/controllers/setup/two.js
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import ValidationEngine from 'ghost/mixins/validation-engine';
+import ValidationEngine from 'ghost-admin/mixins/validation-engine';
 
 const {
     Controller,
diff --git a/app/controllers/signin.js b/app/controllers/signin.js
index 026696b43..bbefb9d3e 100644
--- a/app/controllers/signin.js
+++ b/app/controllers/signin.js
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import ValidationEngine from 'ghost/mixins/validation-engine';
+import ValidationEngine from 'ghost-admin/mixins/validation-engine';
 
 const {
     $,
diff --git a/app/controllers/signup.js b/app/controllers/signup.js
index f578d672a..ce658ca9f 100644
--- a/app/controllers/signup.js
+++ b/app/controllers/signup.js
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import ValidationEngine from 'ghost/mixins/validation-engine';
+import ValidationEngine from 'ghost-admin/mixins/validation-engine';
 
 const {
     Controller,
diff --git a/app/controllers/subscribers.js b/app/controllers/subscribers.js
index 1c39bcf0f..865a6e103 100644
--- a/app/controllers/subscribers.js
+++ b/app/controllers/subscribers.js
@@ -1,7 +1,7 @@
 import Ember from 'ember';
 import Table from 'ember-light-table';
-import PaginationMixin from 'ghost/mixins/pagination';
-import ghostPaths from 'ghost/utils/ghost-paths';
+import PaginationMixin from 'ghost-admin/mixins/pagination';
+import ghostPaths from 'ghost-admin/utils/ghost-paths';
 
 const {
     $,
diff --git a/app/controllers/team/user.js b/app/controllers/team/user.js
index 580a3ffc6..a1d82c7c5 100644
--- a/app/controllers/team/user.js
+++ b/app/controllers/team/user.js
@@ -1,6 +1,6 @@
 import Ember from 'ember';
-import isNumber from 'ghost/utils/isNumber';
-import boundOneWay from 'ghost/utils/bound-one-way';
+import isNumber from 'ghost-admin/utils/isNumber';
+import boundOneWay from 'ghost-admin/utils/bound-one-way';
 import { invoke } from 'ember-invoke-action';
 
 const {
diff --git a/app/helpers/gh-count-words.js b/app/helpers/gh-count-words.js
index 2d33cea1a..e94d6e019 100644
--- a/app/helpers/gh-count-words.js
+++ b/app/helpers/gh-count-words.js
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import counter from 'ghost/utils/word-count';
+import counter from 'ghost-admin/utils/word-count';
 
 const {Helper} = Ember;
 
diff --git a/app/helpers/gh-format-html.js b/app/helpers/gh-format-html.js
index c01945ebc..db0118057 100644
--- a/app/helpers/gh-format-html.js
+++ b/app/helpers/gh-format-html.js
@@ -1,6 +1,6 @@
 /* global html_sanitize*/
 import Ember from 'ember';
-import cajaSanitizers from 'ghost/utils/caja-sanitizers';
+import cajaSanitizers from 'ghost-admin/utils/caja-sanitizers';
 
 const {Helper} = Ember;
 
diff --git a/app/helpers/gh-format-markdown.js b/app/helpers/gh-format-markdown.js
index 7e09cddbf..06e93627e 100644
--- a/app/helpers/gh-format-markdown.js
+++ b/app/helpers/gh-format-markdown.js
@@ -1,6 +1,6 @@
 /* global Showdown, html_sanitize*/
 import Ember from 'ember';
-import cajaSanitizers from 'ghost/utils/caja-sanitizers';
+import cajaSanitizers from 'ghost-admin/utils/caja-sanitizers';
 
 const {Helper} = Ember;
 
diff --git a/app/helpers/gh-path.js b/app/helpers/gh-path.js
index 3e9f416a8..ce380c755 100644
--- a/app/helpers/gh-path.js
+++ b/app/helpers/gh-path.js
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import ghostPaths from 'ghost/utils/ghost-paths';
+import ghostPaths from 'ghost-admin/utils/ghost-paths';
 
 // Handlebars Helper {{gh-path}}
 // Usage: Assume 'http://www.myghostblog.org/myblog/'
diff --git a/app/mixins/ed-editor-shortcuts.js b/app/mixins/ed-editor-shortcuts.js
index e204f2870..73ea54572 100644
--- a/app/mixins/ed-editor-shortcuts.js
+++ b/app/mixins/ed-editor-shortcuts.js
@@ -1,6 +1,6 @@
 /* global moment, Showdown */
 import Ember from 'ember';
-import titleize from 'ghost/utils/titleize';
+import titleize from 'ghost-admin/utils/titleize';
 
 const {Mixin} = Ember;
 
diff --git a/app/mixins/editor-base-controller.js b/app/mixins/editor-base-controller.js
index 01086f057..cced35403 100644
--- a/app/mixins/editor-base-controller.js
+++ b/app/mixins/editor-base-controller.js
@@ -1,6 +1,6 @@
 import Ember from 'ember';
-import PostModel from 'ghost/models/post';
-import boundOneWay from 'ghost/utils/bound-one-way';
+import PostModel from 'ghost-admin/models/post';
+import boundOneWay from 'ghost-admin/utils/bound-one-way';
 
 const {
     Mixin,
diff --git a/app/mixins/editor-base-route.js b/app/mixins/editor-base-route.js
index 01d35785d..c304a2a82 100644
--- a/app/mixins/editor-base-route.js
+++ b/app/mixins/editor-base-route.js
@@ -1,7 +1,7 @@
 import Ember from 'ember';
-import ShortcutsRoute from 'ghost/mixins/shortcuts-route';
-import styleBody from 'ghost/mixins/style-body';
-import ctrlOrCmd from 'ghost/utils/ctrl-or-cmd';
+import ShortcutsRoute from 'ghost-admin/mixins/shortcuts-route';
+import styleBody from 'ghost-admin/mixins/style-body';
+import ctrlOrCmd from 'ghost-admin/utils/ctrl-or-cmd';
 
 const {$, Mixin, RSVP, run} = Ember;
 
diff --git a/app/mixins/pagination.js b/app/mixins/pagination.js
index f316f6eb3..4714a8802 100644
--- a/app/mixins/pagination.js
+++ b/app/mixins/pagination.js
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import getRequestErrorMessage from 'ghost/utils/ajax';
+import getRequestErrorMessage from 'ghost-admin/utils/ajax';
 
 const {
     Mixin,
diff --git a/app/mixins/shortcuts-route.js b/app/mixins/shortcuts-route.js
index f80eb5ef1..000962413 100644
--- a/app/mixins/shortcuts-route.js
+++ b/app/mixins/shortcuts-route.js
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import ShortcutsMixin from 'ghost/mixins/shortcuts';
+import ShortcutsMixin from 'ghost-admin/mixins/shortcuts';
 
 const {Mixin} = Ember;
 
diff --git a/app/mixins/validation-engine.js b/app/mixins/validation-engine.js
index fdb6e254e..a4700f768 100644
--- a/app/mixins/validation-engine.js
+++ b/app/mixins/validation-engine.js
@@ -1,22 +1,22 @@
 import Ember from 'ember';
 import DS from 'ember-data';
 import Model from 'ember-data/model';
-import getRequestErrorMessage from 'ghost/utils/ajax';
+import getRequestErrorMessage from 'ghost-admin/utils/ajax';
 
-import InviteUserValidator from 'ghost/validators/invite-user';
-import NavItemValidator from 'ghost/validators/nav-item';
-import PostValidator from 'ghost/validators/post';
-import ResetValidator from 'ghost/validators/reset';
-import SettingValidator from 'ghost/validators/setting';
-import SetupValidator from 'ghost/validators/setup';
-import SigninValidator from 'ghost/validators/signin';
-import SignupValidator from 'ghost/validators/signup';
-import SlackIntegrationValidator from 'ghost/validators/slack-integration';
-import SubscriberValidator from 'ghost/validators/subscriber';
-import TagSettingsValidator from 'ghost/validators/tag-settings';
-import UserValidator from 'ghost/validators/user';
+import InviteUserValidator from 'ghost-admin/validators/invite-user';
+import NavItemValidator from 'ghost-admin/validators/nav-item';
+import PostValidator from 'ghost-admin/validators/post';
+import ResetValidator from 'ghost-admin/validators/reset';
+import SettingValidator from 'ghost-admin/validators/setting';
+import SetupValidator from 'ghost-admin/validators/setup';
+import SigninValidator from 'ghost-admin/validators/signin';
+import SignupValidator from 'ghost-admin/validators/signup';
+import SlackIntegrationValidator from 'ghost-admin/validators/slack-integration';
+import SubscriberValidator from 'ghost-admin/validators/subscriber';
+import TagSettingsValidator from 'ghost-admin/validators/tag-settings';
+import UserValidator from 'ghost-admin/validators/user';
 
-import ValidatorExtensions from 'ghost/utils/validator-extensions';
+import ValidatorExtensions from 'ghost-admin/utils/validator-extensions';
 
 const {Mixin, RSVP, isArray} = Ember;
 const {Errors} = DS;
diff --git a/app/models/navigation-item.js b/app/models/navigation-item.js
index 372246105..bec383c8d 100644
--- a/app/models/navigation-item.js
+++ b/app/models/navigation-item.js
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import ValidationEngine from 'ghost/mixins/validation-engine';
+import ValidationEngine from 'ghost-admin/mixins/validation-engine';
 
 const {
     computed,
diff --git a/app/models/post.js b/app/models/post.js
index 019350c79..7e7adb67c 100644
--- a/app/models/post.js
+++ b/app/models/post.js
@@ -3,7 +3,7 @@ import Ember from 'ember';
 import Model from 'ember-data/model';
 import attr from 'ember-data/attr';
 import { belongsTo, hasMany } from 'ember-data/relationships';
-import ValidationEngine from 'ghost/mixins/validation-engine';
+import ValidationEngine from 'ghost-admin/mixins/validation-engine';
 
 const {
     computed,
diff --git a/app/models/setting.js b/app/models/setting.js
index 33386a7da..dfb96cffb 100644
--- a/app/models/setting.js
+++ b/app/models/setting.js
@@ -1,7 +1,7 @@
 /* jscs:disable requireCamelCaseOrUpperCaseIdentifiers */
 import Model from 'ember-data/model';
 import attr from 'ember-data/attr';
-import ValidationEngine from 'ghost/mixins/validation-engine';
+import ValidationEngine from 'ghost-admin/mixins/validation-engine';
 
 export default Model.extend(ValidationEngine, {
     validationType: 'setting',
diff --git a/app/models/slack-integration.js b/app/models/slack-integration.js
index 6b4931dcc..f74ea4da5 100644
--- a/app/models/slack-integration.js
+++ b/app/models/slack-integration.js
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import ValidationEngine from 'ghost/mixins/validation-engine';
+import ValidationEngine from 'ghost-admin/mixins/validation-engine';
 
 const {
     computed,
diff --git a/app/models/subscriber.js b/app/models/subscriber.js
index 4de582c3c..090183b19 100644
--- a/app/models/subscriber.js
+++ b/app/models/subscriber.js
@@ -1,7 +1,7 @@
 import Model from 'ember-data/model';
 import attr from 'ember-data/attr';
 import {belongsTo} from 'ember-data/relationships';
-import ValidationEngine from 'ghost/mixins/validation-engine';
+import ValidationEngine from 'ghost-admin/mixins/validation-engine';
 
 export default Model.extend(ValidationEngine, {
     validationType: 'subscriber',
diff --git a/app/models/tag.js b/app/models/tag.js
index 2decf8b10..abadebd4b 100644
--- a/app/models/tag.js
+++ b/app/models/tag.js
@@ -1,7 +1,7 @@
 /* jscs:disable requireCamelCaseOrUpperCaseIdentifiers */
 import Model from 'ember-data/model';
 import attr from 'ember-data/attr';
-import ValidationEngine from 'ghost/mixins/validation-engine';
+import ValidationEngine from 'ghost-admin/mixins/validation-engine';
 
 export default Model.extend(ValidationEngine, {
     validationType: 'tag',
diff --git a/app/models/user.js b/app/models/user.js
index 95ad59018..7537d35f9 100644
--- a/app/models/user.js
+++ b/app/models/user.js
@@ -3,7 +3,7 @@ import Ember from 'ember';
 import Model from 'ember-data/model';
 import attr from 'ember-data/attr';
 import { hasMany } from 'ember-data/relationships';
-import ValidationEngine from 'ghost/mixins/validation-engine';
+import ValidationEngine from 'ghost-admin/mixins/validation-engine';
 
 const {
     computed,
diff --git a/app/router.js b/app/router.js
index 5541d7299..0c570bbd3 100644
--- a/app/router.js
+++ b/app/router.js
@@ -1,6 +1,6 @@
 import Ember from 'ember';
-import ghostPaths from 'ghost/utils/ghost-paths';
-import documentTitle from 'ghost/utils/document-title';
+import ghostPaths from 'ghost-admin/utils/ghost-paths';
+import documentTitle from 'ghost-admin/utils/document-title';
 import config from './config/environment';
 
 const {
diff --git a/app/routes/about.js b/app/routes/about.js
index 36a7a9bc4..3894198ad 100644
--- a/app/routes/about.js
+++ b/app/routes/about.js
@@ -1,6 +1,6 @@
 import Ember from 'ember';
-import AuthenticatedRoute from 'ghost/routes/authenticated';
-import styleBody from 'ghost/mixins/style-body';
+import AuthenticatedRoute from 'ghost-admin/routes/authenticated';
+import styleBody from 'ghost-admin/mixins/style-body';
 
 const {
     inject: {service}
diff --git a/app/routes/application.js b/app/routes/application.js
index 5753a8b13..83dcfbb30 100644
--- a/app/routes/application.js
+++ b/app/routes/application.js
@@ -1,9 +1,9 @@
 import Ember from 'ember';
 import AuthConfiguration from 'ember-simple-auth/configuration';
 import ApplicationRouteMixin from 'ember-simple-auth/mixins/application-route-mixin';
-import ShortcutsRoute from 'ghost/mixins/shortcuts-route';
-import ctrlOrCmd from 'ghost/utils/ctrl-or-cmd';
-import windowProxy from 'ghost/utils/window-proxy';
+import ShortcutsRoute from 'ghost-admin/mixins/shortcuts-route';
+import ctrlOrCmd from 'ghost-admin/utils/ctrl-or-cmd';
+import windowProxy from 'ghost-admin/utils/window-proxy';
 
 const {
     Route,
diff --git a/app/routes/editor/edit.js b/app/routes/editor/edit.js
index cd589093e..fb89ab41c 100644
--- a/app/routes/editor/edit.js
+++ b/app/routes/editor/edit.js
@@ -1,9 +1,9 @@
 /* jscs:disable requireCamelCaseOrUpperCaseIdentifiers */
-import AuthenticatedRoute from 'ghost/routes/authenticated';
-import base from 'ghost/mixins/editor-base-route';
-import NotFoundHandler from 'ghost/mixins/404-handler';
-import isNumber from 'ghost/utils/isNumber';
-import isFinite from 'ghost/utils/isFinite';
+import AuthenticatedRoute from 'ghost-admin/routes/authenticated';
+import base from 'ghost-admin/mixins/editor-base-route';
+import NotFoundHandler from 'ghost-admin/mixins/404-handler';
+import isNumber from 'ghost-admin/utils/isNumber';
+import isFinite from 'ghost-admin/utils/isFinite';
 
 export default AuthenticatedRoute.extend(base, NotFoundHandler, {
     titleToken: 'Editor',
diff --git a/app/routes/editor/new.js b/app/routes/editor/new.js
index 0da50705a..d41ba2f28 100644
--- a/app/routes/editor/new.js
+++ b/app/routes/editor/new.js
@@ -1,5 +1,5 @@
-import AuthenticatedRoute from 'ghost/routes/authenticated';
-import base from 'ghost/mixins/editor-base-route';
+import AuthenticatedRoute from 'ghost-admin/routes/authenticated';
+import base from 'ghost-admin/mixins/editor-base-route';
 
 export default AuthenticatedRoute.extend(base, {
     titleToken: 'Editor',
diff --git a/app/routes/posts.js b/app/routes/posts.js
index 5edfb161a..2881b2943 100644
--- a/app/routes/posts.js
+++ b/app/routes/posts.js
@@ -1,7 +1,7 @@
 import Ember from 'ember';
-import AuthenticatedRoute from 'ghost/routes/authenticated';
-import ShortcutsRoute from 'ghost/mixins/shortcuts-route';
-import PaginationMixin from 'ghost/mixins/pagination';
+import AuthenticatedRoute from 'ghost-admin/routes/authenticated';
+import ShortcutsRoute from 'ghost-admin/mixins/shortcuts-route';
+import PaginationMixin from 'ghost-admin/mixins/pagination';
 
 export default AuthenticatedRoute.extend(ShortcutsRoute, PaginationMixin, {
     titleToken: 'Content',
diff --git a/app/routes/posts/index.js b/app/routes/posts/index.js
index 78b5a9e44..419f00ced 100644
--- a/app/routes/posts/index.js
+++ b/app/routes/posts/index.js
@@ -1,6 +1,6 @@
 import Ember from 'ember';
 import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
-import MobileIndexRoute from 'ghost/routes/mobile-index-route';
+import MobileIndexRoute from 'ghost-admin/routes/mobile-index-route';
 
 const {
     computed,
diff --git a/app/routes/posts/post.js b/app/routes/posts/post.js
index a7643a21e..b39a643d3 100644
--- a/app/routes/posts/post.js
+++ b/app/routes/posts/post.js
@@ -1,8 +1,8 @@
-import AuthenticatedRoute from 'ghost/routes/authenticated';
-import ShortcutsRoute from 'ghost/mixins/shortcuts-route';
-import NotFoundHandler from 'ghost/mixins/404-handler';
-import isNumber from 'ghost/utils/isNumber';
-import isFinite from 'ghost/utils/isFinite';
+import AuthenticatedRoute from 'ghost-admin/routes/authenticated';
+import ShortcutsRoute from 'ghost-admin/mixins/shortcuts-route';
+import NotFoundHandler from 'ghost-admin/mixins/404-handler';
+import isNumber from 'ghost-admin/utils/isNumber';
+import isFinite from 'ghost-admin/utils/isFinite';
 
 export default AuthenticatedRoute.extend(ShortcutsRoute, NotFoundHandler, {
     model(params) {
diff --git a/app/routes/reset.js b/app/routes/reset.js
index 66ffcdc06..47e637a9e 100644
--- a/app/routes/reset.js
+++ b/app/routes/reset.js
@@ -1,6 +1,6 @@
 import Ember from 'ember';
 import Configuration from 'ember-simple-auth/configuration';
-import styleBody from 'ghost/mixins/style-body';
+import styleBody from 'ghost-admin/mixins/style-body';
 
 const {
     Route,
diff --git a/app/routes/settings/apps.js b/app/routes/settings/apps.js
index 97d672d2b..37e9500c0 100644
--- a/app/routes/settings/apps.js
+++ b/app/routes/settings/apps.js
@@ -1,6 +1,6 @@
-import AuthenticatedRoute from 'ghost/routes/authenticated';
-import CurrentUserSettings from 'ghost/mixins/current-user-settings';
-import styleBody from 'ghost/mixins/style-body';
+import AuthenticatedRoute from 'ghost-admin/routes/authenticated';
+import CurrentUserSettings from 'ghost-admin/mixins/current-user-settings';
+import styleBody from 'ghost-admin/mixins/style-body';
 
 export default AuthenticatedRoute.extend(styleBody, CurrentUserSettings, {
     titleToken: 'Settings - Apps',
diff --git a/app/routes/settings/apps/slack.js b/app/routes/settings/apps/slack.js
index a0fd3801b..13965c4b9 100644
--- a/app/routes/settings/apps/slack.js
+++ b/app/routes/settings/apps/slack.js
@@ -1,6 +1,6 @@
-import AuthenticatedRoute from 'ghost/routes/authenticated';
-import CurrentUserSettings from 'ghost/mixins/current-user-settings';
-import styleBody from 'ghost/mixins/style-body';
+import AuthenticatedRoute from 'ghost-admin/routes/authenticated';
+import CurrentUserSettings from 'ghost-admin/mixins/current-user-settings';
+import styleBody from 'ghost-admin/mixins/style-body';
 
 export default AuthenticatedRoute.extend(styleBody, CurrentUserSettings, {
     titleToken: 'Settings - Apps - Slack',
diff --git a/app/routes/settings/code-injection.js b/app/routes/settings/code-injection.js
index b293ad41b..0bd44e695 100644
--- a/app/routes/settings/code-injection.js
+++ b/app/routes/settings/code-injection.js
@@ -1,6 +1,6 @@
-import AuthenticatedRoute from 'ghost/routes/authenticated';
-import CurrentUserSettings from 'ghost/mixins/current-user-settings';
-import styleBody from 'ghost/mixins/style-body';
+import AuthenticatedRoute from 'ghost-admin/routes/authenticated';
+import CurrentUserSettings from 'ghost-admin/mixins/current-user-settings';
+import styleBody from 'ghost-admin/mixins/style-body';
 
 export default AuthenticatedRoute.extend(styleBody, CurrentUserSettings, {
     titleToken: 'Settings - Code Injection',
diff --git a/app/routes/settings/general.js b/app/routes/settings/general.js
index 02a1cdf31..53ff0edc1 100644
--- a/app/routes/settings/general.js
+++ b/app/routes/settings/general.js
@@ -1,7 +1,7 @@
 import Ember from 'ember';
-import AuthenticatedRoute from 'ghost/routes/authenticated';
-import CurrentUserSettings from 'ghost/mixins/current-user-settings';
-import styleBody from 'ghost/mixins/style-body';
+import AuthenticatedRoute from 'ghost-admin/routes/authenticated';
+import CurrentUserSettings from 'ghost-admin/mixins/current-user-settings';
+import styleBody from 'ghost-admin/mixins/style-body';
 
 const {
     RSVP,
diff --git a/app/routes/settings/labs.js b/app/routes/settings/labs.js
index 0facca73d..7da345cc7 100644
--- a/app/routes/settings/labs.js
+++ b/app/routes/settings/labs.js
@@ -1,6 +1,6 @@
-import AuthenticatedRoute from 'ghost/routes/authenticated';
-import styleBody from 'ghost/mixins/style-body';
-import CurrentUserSettings from 'ghost/mixins/current-user-settings';
+import AuthenticatedRoute from 'ghost-admin/routes/authenticated';
+import styleBody from 'ghost-admin/mixins/style-body';
+import CurrentUserSettings from 'ghost-admin/mixins/current-user-settings';
 
 export default AuthenticatedRoute.extend(styleBody, CurrentUserSettings, {
     titleToken: 'Settings - Labs',
diff --git a/app/routes/settings/navigation.js b/app/routes/settings/navigation.js
index dca80d7b9..537617b3c 100644
--- a/app/routes/settings/navigation.js
+++ b/app/routes/settings/navigation.js
@@ -1,7 +1,7 @@
 import Ember from 'ember';
-import AuthenticatedRoute from 'ghost/routes/authenticated';
-import CurrentUserSettings from 'ghost/mixins/current-user-settings';
-import styleBody from 'ghost/mixins/style-body';
+import AuthenticatedRoute from 'ghost-admin/routes/authenticated';
+import CurrentUserSettings from 'ghost-admin/mixins/current-user-settings';
+import styleBody from 'ghost-admin/mixins/style-body';
 
 const {$} = Ember;
 
diff --git a/app/routes/settings/tags.js b/app/routes/settings/tags.js
index 58fdaec99..1631c374f 100644
--- a/app/routes/settings/tags.js
+++ b/app/routes/settings/tags.js
@@ -1,9 +1,9 @@
 /* global key */
 import Ember from 'ember';
-import AuthenticatedRoute from 'ghost/routes/authenticated';
-import CurrentUserSettings from 'ghost/mixins/current-user-settings';
-import ShortcutsRoute from 'ghost/mixins/shortcuts-route';
-import PaginationMixin from 'ghost/mixins/pagination';
+import AuthenticatedRoute from 'ghost-admin/routes/authenticated';
+import CurrentUserSettings from 'ghost-admin/mixins/current-user-settings';
+import ShortcutsRoute from 'ghost-admin/mixins/shortcuts-route';
+import PaginationMixin from 'ghost-admin/mixins/pagination';
 
 export default AuthenticatedRoute.extend(CurrentUserSettings, PaginationMixin, ShortcutsRoute, {
     titleToken: 'Settings - Tags',
diff --git a/app/routes/settings/tags/index.js b/app/routes/settings/tags/index.js
index b86f114db..609004839 100644
--- a/app/routes/settings/tags/index.js
+++ b/app/routes/settings/tags/index.js
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import AuthenticatedRoute from 'ghost/routes/authenticated';
+import AuthenticatedRoute from 'ghost-admin/routes/authenticated';
 
 const {
     inject: {service}
diff --git a/app/routes/settings/tags/new.js b/app/routes/settings/tags/new.js
index d19a359cd..bf216ccf2 100644
--- a/app/routes/settings/tags/new.js
+++ b/app/routes/settings/tags/new.js
@@ -1,4 +1,4 @@
-import AuthenticatedRoute from 'ghost/routes/authenticated';
+import AuthenticatedRoute from 'ghost-admin/routes/authenticated';
 
 export default AuthenticatedRoute.extend({
 
diff --git a/app/routes/settings/tags/tag.js b/app/routes/settings/tags/tag.js
index 6bfba4cb0..628be8d08 100644
--- a/app/routes/settings/tags/tag.js
+++ b/app/routes/settings/tags/tag.js
@@ -1,6 +1,6 @@
 /* jscs:disable requireCamelCaseOrUpperCaseIdentifiers */
-import AuthenticatedRoute from 'ghost/routes/authenticated';
-import NotFoundHandler from 'ghost/mixins/404-handler';
+import AuthenticatedRoute from 'ghost-admin/routes/authenticated';
+import NotFoundHandler from 'ghost-admin/mixins/404-handler';
 
 export default AuthenticatedRoute.extend(NotFoundHandler, {
 
diff --git a/app/routes/setup.js b/app/routes/setup.js
index 4f11e75ca..7c83dca92 100644
--- a/app/routes/setup.js
+++ b/app/routes/setup.js
@@ -1,6 +1,6 @@
 import Ember from 'ember';
 import Configuration from 'ember-simple-auth/configuration';
-import styleBody from 'ghost/mixins/style-body';
+import styleBody from 'ghost-admin/mixins/style-body';
 
 const {
     Route,
diff --git a/app/routes/signin.js b/app/routes/signin.js
index 89c978762..e68cfe433 100644
--- a/app/routes/signin.js
+++ b/app/routes/signin.js
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import styleBody from 'ghost/mixins/style-body';
+import styleBody from 'ghost-admin/mixins/style-body';
 import Configuration from 'ember-simple-auth/configuration';
 import DS from 'ember-data';
 
diff --git a/app/routes/signout.js b/app/routes/signout.js
index ab1a1abea..79e15deb8 100644
--- a/app/routes/signout.js
+++ b/app/routes/signout.js
@@ -1,6 +1,6 @@
 import Ember from 'ember';
-import AuthenticatedRoute from 'ghost/routes/authenticated';
-import styleBody from 'ghost/mixins/style-body';
+import AuthenticatedRoute from 'ghost-admin/routes/authenticated';
+import styleBody from 'ghost-admin/mixins/style-body';
 
 const {
     canInvoke,
diff --git a/app/routes/signup.js b/app/routes/signup.js
index c1f6d0d82..0b9f11899 100644
--- a/app/routes/signup.js
+++ b/app/routes/signup.js
@@ -1,7 +1,7 @@
 import Ember from 'ember';
 import DS from 'ember-data';
 import Configuration from 'ember-simple-auth/configuration';
-import styleBody from 'ghost/mixins/style-body';
+import styleBody from 'ghost-admin/mixins/style-body';
 
 const {
     Route,
diff --git a/app/routes/subscribers.js b/app/routes/subscribers.js
index 76ed5febd..9b4efca89 100644
--- a/app/routes/subscribers.js
+++ b/app/routes/subscribers.js
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import AuthenticatedRoute from 'ghost/routes/authenticated';
+import AuthenticatedRoute from 'ghost-admin/routes/authenticated';
 
 const {
     RSVP,
diff --git a/app/routes/team/index.js b/app/routes/team/index.js
index f96514b8b..40c19d7c8 100644
--- a/app/routes/team/index.js
+++ b/app/routes/team/index.js
@@ -1,7 +1,7 @@
-import AuthenticatedRoute from 'ghost/routes/authenticated';
-import CurrentUserSettings from 'ghost/mixins/current-user-settings';
-import PaginationMixin from 'ghost/mixins/pagination';
-import styleBody from 'ghost/mixins/style-body';
+import AuthenticatedRoute from 'ghost-admin/routes/authenticated';
+import CurrentUserSettings from 'ghost-admin/mixins/current-user-settings';
+import PaginationMixin from 'ghost-admin/mixins/pagination';
+import styleBody from 'ghost-admin/mixins/style-body';
 
 export default AuthenticatedRoute.extend(styleBody, CurrentUserSettings, PaginationMixin, {
     titleToken: 'Team',
diff --git a/app/routes/team/user.js b/app/routes/team/user.js
index a6f464ea6..12fddeade 100644
--- a/app/routes/team/user.js
+++ b/app/routes/team/user.js
@@ -1,8 +1,8 @@
 /* jscs:disable requireCamelCaseOrUpperCaseIdentifiers */
-import AuthenticatedRoute from 'ghost/routes/authenticated';
-import CurrentUserSettings from 'ghost/mixins/current-user-settings';
-import styleBody from 'ghost/mixins/style-body';
-import NotFoundHandler from 'ghost/mixins/404-handler';
+import AuthenticatedRoute from 'ghost-admin/routes/authenticated';
+import CurrentUserSettings from 'ghost-admin/mixins/current-user-settings';
+import styleBody from 'ghost-admin/mixins/style-body';
+import NotFoundHandler from 'ghost-admin/mixins/404-handler';
 
 export default AuthenticatedRoute.extend(styleBody, CurrentUserSettings, NotFoundHandler, {
     titleToken: 'Team - User',
diff --git a/app/serializers/post.js b/app/serializers/post.js
index e80f54ff8..7f34f04dc 100644
--- a/app/serializers/post.js
+++ b/app/serializers/post.js
@@ -1,6 +1,6 @@
 /* jscs:disable requireCamelCaseOrUpperCaseIdentifiers */
 import Ember from 'ember';
-import ApplicationSerializer from 'ghost/serializers/application';
+import ApplicationSerializer from 'ghost-admin/serializers/application';
 import EmbeddedRecordsMixin from 'ember-data/serializers/embedded-records-mixin';
 
 export default ApplicationSerializer.extend(EmbeddedRecordsMixin, {
diff --git a/app/serializers/setting.js b/app/serializers/setting.js
index 634ae484c..f0b8d9629 100644
--- a/app/serializers/setting.js
+++ b/app/serializers/setting.js
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import ApplicationSerializer from 'ghost/serializers/application';
+import ApplicationSerializer from 'ghost-admin/serializers/application';
 
 export default ApplicationSerializer.extend({
     serializeIntoHash(hash, type, record, options) {
diff --git a/app/serializers/tag.js b/app/serializers/tag.js
index 4e33b03cb..029762c74 100644
--- a/app/serializers/tag.js
+++ b/app/serializers/tag.js
@@ -1,6 +1,6 @@
 /* jscs:disable requireCamelCaseOrUpperCaseIdentifiers */
 import Ember from 'ember';
-import ApplicationSerializer from 'ghost/serializers/application';
+import ApplicationSerializer from 'ghost-admin/serializers/application';
 
 export default ApplicationSerializer.extend({
     serializeIntoHash(hash, type, record, options) {
diff --git a/app/serializers/user.js b/app/serializers/user.js
index 79587bbe0..18820c534 100644
--- a/app/serializers/user.js
+++ b/app/serializers/user.js
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import ApplicationSerializer from 'ghost/serializers/application';
+import ApplicationSerializer from 'ghost-admin/serializers/application';
 import EmbeddedRecordsMixin from 'ember-data/serializers/embedded-records-mixin';
 
 export default ApplicationSerializer.extend(EmbeddedRecordsMixin, {
diff --git a/app/services/ajax.js b/app/services/ajax.js
index 9db200abe..2d572af99 100644
--- a/app/services/ajax.js
+++ b/app/services/ajax.js
@@ -1,7 +1,7 @@
 import Ember from 'ember';
 import AjaxService from 'ember-ajax/services/ajax';
 import {AjaxError} from 'ember-ajax/errors';
-import config from 'ghost/config/environment';
+import config from 'ghost-admin/config/environment';
 
 const {inject, computed} = Ember;
 
diff --git a/app/services/dropdown.js b/app/services/dropdown.js
index 4941faeac..24730cc81 100644
--- a/app/services/dropdown.js
+++ b/app/services/dropdown.js
@@ -1,6 +1,6 @@
 import Ember from 'ember';
 // This is used by the dropdown initializer (and subsequently popovers) to manage closing & toggling
-import BodyEventListener from 'ghost/mixins/body-event-listener';
+import BodyEventListener from 'ghost-admin/mixins/body-event-listener';
 
 const {Service, Evented} = Ember;
 
diff --git a/app/services/ghost-paths.js b/app/services/ghost-paths.js
index 620c250d9..9d81b832e 100644
--- a/app/services/ghost-paths.js
+++ b/app/services/ghost-paths.js
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import ghostPaths from 'ghost/utils/ghost-paths';
+import ghostPaths from 'ghost-admin/utils/ghost-paths';
 
 const {Service, _ProxyMixin} = Ember;
 
diff --git a/app/session-stores/application.js b/app/session-stores/application.js
index 61920f330..b45735a2a 100644
--- a/app/session-stores/application.js
+++ b/app/session-stores/application.js
@@ -1,5 +1,5 @@
 import AdaptiveStore from 'ember-simple-auth/session-stores/adaptive';
-import ghostPaths from 'ghost/utils/ghost-paths';
+import ghostPaths from 'ghost-admin/utils/ghost-paths';
 
 const paths = ghostPaths();
 const keyName = `ghost${(paths.subdir.indexOf('/') === 0 ? `-${paths.subdir.substr(1)}` : ``) }:session`;
diff --git a/app/transforms/navigation-settings.js b/app/transforms/navigation-settings.js
index 07dc4aa38..67068ca28 100644
--- a/app/transforms/navigation-settings.js
+++ b/app/transforms/navigation-settings.js
@@ -1,6 +1,6 @@
 import Ember from 'ember';
 import Transform from 'ember-data/transform';
-import NavigationItem from 'ghost/models/navigation-item';
+import NavigationItem from 'ghost-admin/models/navigation-item';
 
 const {isArray} = Ember;
 const emberA = Ember.A;
diff --git a/app/transforms/slack-settings.js b/app/transforms/slack-settings.js
index 4d242d79c..a13a04c97 100644
--- a/app/transforms/slack-settings.js
+++ b/app/transforms/slack-settings.js
@@ -1,7 +1,7 @@
 /* jscs:disable requireCamelCaseOrUpperCaseIdentifiers */
 import Ember from 'ember';
 import Transform from 'ember-data/transform';
-import SlackObject from 'ghost/models/slack-integration';
+import SlackObject from 'ghost-admin/models/slack-integration';
 
 const {isArray} = Ember;
 const emberA = Ember.A;
diff --git a/app/utils/editor-shortcuts.js b/app/utils/editor-shortcuts.js
index 54b62879b..90b6a909b 100644
--- a/app/utils/editor-shortcuts.js
+++ b/app/utils/editor-shortcuts.js
@@ -1,7 +1,7 @@
 // # Editor shortcuts
 // Loaded by gh-editor component
 // This map is used to ensure the right action is called by each shortcut
-import ctrlOrCmd from 'ghost/utils/ctrl-or-cmd';
+import ctrlOrCmd from 'ghost-admin/utils/ctrl-or-cmd';
 
 let shortcuts = {};
 
diff --git a/app/validators/setup.js b/app/validators/setup.js
index 62b380b5f..e88644f97 100644
--- a/app/validators/setup.js
+++ b/app/validators/setup.js
@@ -1,4 +1,4 @@
-import NewUserValidator from 'ghost/validators/new-user';
+import NewUserValidator from 'ghost-admin/validators/new-user';
 
 export default NewUserValidator.create({
     properties: ['name', 'email', 'password', 'blogTitle'],
diff --git a/app/validators/signup.js b/app/validators/signup.js
index 0e0a53771..312b42f0d 100644
--- a/app/validators/signup.js
+++ b/app/validators/signup.js
@@ -1,3 +1,3 @@
-import NewUserValidator from 'ghost/validators/new-user';
+import NewUserValidator from 'ghost-admin/validators/new-user';
 
 export default NewUserValidator.create();
diff --git a/config/environment.js b/config/environment.js
index 454b7a0ce..0c5b4d867 100644
--- a/config/environment.js
+++ b/config/environment.js
@@ -3,7 +3,7 @@
 
 module.exports = function (environment) {
     var ENV = {
-        modulePrefix: 'ghost',
+        modulePrefix: 'ghost-admin',
         environment: environment,
         baseURL: '/',
         locationType: 'trailing-history',
diff --git a/package.json b/package.json
index 0bdc04cc2..b518e7422 100644
--- a/package.json
+++ b/package.json
@@ -1,10 +1,18 @@
 {
-  "name": "ghost",
+  "name": "ghost-admin",
   "version": "0.8.0",
-  "description": "Small description for ghost goes here",
+  "description": "Ember.js admin client for Ghost",
+  "author": "Ghost Foundation",
+  "homepage": "http://ghost.org",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/TryGhost/Ghost-Admin.git"
+  },
+  "bugs": "https://github.com/TryGhost/Ghost/issues",
+  "contributors": "https://github.com/TryGhost/Ghost-Admin/graphs/contributors",
+  "license": "MIT",
   "private": true,
   "directories": {
-    "doc": "doc",
     "test": "tests"
   },
   "scripts": {
@@ -12,12 +20,9 @@
     "build": "ember build",
     "test": "ember test"
   },
-  "repository": "",
   "engines": {
     "node": ">= 0.10.0"
   },
-  "author": "",
-  "license": "MIT",
   "devDependencies": {
     "broccoli-asset-rev": "2.4.2",
     "csscomb": "3.1.8",
diff --git a/tests/acceptance/authentication-test.js b/tests/acceptance/authentication-test.js
index f6b7ba87a..5d0e4ccb1 100644
--- a/tests/acceptance/authentication-test.js
+++ b/tests/acceptance/authentication-test.js
@@ -9,10 +9,10 @@ import { expect } from 'chai';
 import Ember from 'ember';
 import startApp from '../helpers/start-app';
 import destroyApp from '../helpers/destroy-app';
-import { authenticateSession, currentSession, invalidateSession } from 'ghost/tests/helpers/ember-simple-auth';
+import { authenticateSession, currentSession, invalidateSession } from 'ghost-admin/tests/helpers/ember-simple-auth';
 import Mirage from 'ember-cli-mirage';
-import windowProxy from 'ghost/utils/window-proxy';
-import ghostPaths from 'ghost/utils/ghost-paths';
+import windowProxy from 'ghost-admin/utils/window-proxy';
+import ghostPaths from 'ghost-admin/utils/ghost-paths';
 
 const Ghost = ghostPaths();
 
diff --git a/tests/acceptance/editor-test.js b/tests/acceptance/editor-test.js
index 5f1b548e9..dd0562092 100644
--- a/tests/acceptance/editor-test.js
+++ b/tests/acceptance/editor-test.js
@@ -8,7 +8,7 @@ import {
 import { expect } from 'chai';
 import startApp from '../helpers/start-app';
 import destroyApp from '../helpers/destroy-app';
-import { invalidateSession, authenticateSession } from 'ghost/tests/helpers/ember-simple-auth';
+import { invalidateSession, authenticateSession } from 'ghost-admin/tests/helpers/ember-simple-auth';
 import Mirage from 'ember-cli-mirage';
 
 describe('Acceptance: Editor', function() {
diff --git a/tests/acceptance/posts/post-test.js b/tests/acceptance/posts/post-test.js
index cbc43ddf7..9fca6ff4e 100644
--- a/tests/acceptance/posts/post-test.js
+++ b/tests/acceptance/posts/post-test.js
@@ -9,8 +9,8 @@ import {
 import { expect } from 'chai';
 import startApp from '../../helpers/start-app';
 import destroyApp from '../../helpers/destroy-app';
-import { invalidateSession, authenticateSession } from 'ghost/tests/helpers/ember-simple-auth';
-import { errorOverride, errorReset } from 'ghost/tests/helpers/adapter-error';
+import { invalidateSession, authenticateSession } from 'ghost-admin/tests/helpers/ember-simple-auth';
+import { errorOverride, errorReset } from 'ghost-admin/tests/helpers/adapter-error';
 import Mirage from 'ember-cli-mirage';
 
 describe('Acceptance: Posts - Post', function() {
diff --git a/tests/acceptance/settings/apps-test.js b/tests/acceptance/settings/apps-test.js
index ed38bbc15..caf3ea1a1 100644
--- a/tests/acceptance/settings/apps-test.js
+++ b/tests/acceptance/settings/apps-test.js
@@ -9,7 +9,7 @@ import { expect } from 'chai';
 import Ember from 'ember';
 import startApp from '../../helpers/start-app';
 import destroyApp from '../../helpers/destroy-app';
-import { invalidateSession, authenticateSession } from 'ghost/tests/helpers/ember-simple-auth';
+import { invalidateSession, authenticateSession } from 'ghost-admin/tests/helpers/ember-simple-auth';
 
 const {run} = Ember;
 
diff --git a/tests/acceptance/settings/code-injection-test.js b/tests/acceptance/settings/code-injection-test.js
index 8caaf78c4..10bfb2eb3 100644
--- a/tests/acceptance/settings/code-injection-test.js
+++ b/tests/acceptance/settings/code-injection-test.js
@@ -8,7 +8,7 @@ import {
 import { expect } from 'chai';
 import startApp from '../../helpers/start-app';
 import destroyApp from '../../helpers/destroy-app';
-import { invalidateSession, authenticateSession } from 'ghost/tests/helpers/ember-simple-auth';
+import { invalidateSession, authenticateSession } from 'ghost-admin/tests/helpers/ember-simple-auth';
 
 describe('Acceptance: Settings - Code-Injection', function() {
     let application;
diff --git a/tests/acceptance/settings/general-test.js b/tests/acceptance/settings/general-test.js
index d86b1e4b4..13cef972c 100644
--- a/tests/acceptance/settings/general-test.js
+++ b/tests/acceptance/settings/general-test.js
@@ -9,7 +9,7 @@ import { expect } from 'chai';
 import Ember from 'ember';
 import startApp from '../../helpers/start-app';
 import destroyApp from '../../helpers/destroy-app';
-import { invalidateSession, authenticateSession } from 'ghost/tests/helpers/ember-simple-auth';
+import { invalidateSession, authenticateSession } from 'ghost-admin/tests/helpers/ember-simple-auth';
 
 const {run} = Ember;
 
diff --git a/tests/acceptance/settings/labs-test.js b/tests/acceptance/settings/labs-test.js
index 0b3a5cb59..4ef8a5dc7 100644
--- a/tests/acceptance/settings/labs-test.js
+++ b/tests/acceptance/settings/labs-test.js
@@ -8,7 +8,7 @@ import {
 import { expect } from 'chai';
 import startApp from '../../helpers/start-app';
 import destroyApp from '../../helpers/destroy-app';
-import { invalidateSession, authenticateSession } from 'ghost/tests/helpers/ember-simple-auth';
+import { invalidateSession, authenticateSession } from 'ghost-admin/tests/helpers/ember-simple-auth';
 
 describe('Acceptance: Settings - Labs', function() {
     let application;
diff --git a/tests/acceptance/settings/navigation-test.js b/tests/acceptance/settings/navigation-test.js
index 6f47ca812..1450aed7f 100644
--- a/tests/acceptance/settings/navigation-test.js
+++ b/tests/acceptance/settings/navigation-test.js
@@ -9,7 +9,7 @@ import {
 import { expect } from 'chai';
 import startApp from '../../helpers/start-app';
 import destroyApp from '../../helpers/destroy-app';
-import { invalidateSession, authenticateSession } from 'ghost/tests/helpers/ember-simple-auth';
+import { invalidateSession, authenticateSession } from 'ghost-admin/tests/helpers/ember-simple-auth';
 
 describe('Acceptance: Settings - Navigation', function () {
     let application;
diff --git a/tests/acceptance/settings/slack-test.js b/tests/acceptance/settings/slack-test.js
index 4f42a88ab..0eb24eaf9 100644
--- a/tests/acceptance/settings/slack-test.js
+++ b/tests/acceptance/settings/slack-test.js
@@ -10,7 +10,7 @@ import Ember from 'ember';
 import startApp from '../../helpers/start-app';
 import destroyApp from '../../helpers/destroy-app';
 import Mirage from 'ember-cli-mirage';
-import { invalidateSession, authenticateSession } from 'ghost/tests/helpers/ember-simple-auth';
+import { invalidateSession, authenticateSession } from 'ghost-admin/tests/helpers/ember-simple-auth';
 
 const {run} = Ember;
 
diff --git a/tests/acceptance/settings/tags-test.js b/tests/acceptance/settings/tags-test.js
index 36fda24dd..96050da13 100644
--- a/tests/acceptance/settings/tags-test.js
+++ b/tests/acceptance/settings/tags-test.js
@@ -10,8 +10,8 @@ import { expect } from 'chai';
 import Ember from 'ember';
 import startApp from '../../helpers/start-app';
 import destroyApp from '../../helpers/destroy-app';
-import { invalidateSession, authenticateSession } from 'ghost/tests/helpers/ember-simple-auth';
-import { errorOverride, errorReset } from 'ghost/tests/helpers/adapter-error';
+import { invalidateSession, authenticateSession } from 'ghost-admin/tests/helpers/ember-simple-auth';
+import { errorOverride, errorReset } from 'ghost-admin/tests/helpers/adapter-error';
 import Mirage from 'ember-cli-mirage';
 
 const {run} = Ember;
diff --git a/tests/acceptance/setup-test.js b/tests/acceptance/setup-test.js
index cc42e0bcf..74d216e71 100644
--- a/tests/acceptance/setup-test.js
+++ b/tests/acceptance/setup-test.js
@@ -7,9 +7,9 @@ import {
 } from 'mocha';
 import { expect } from 'chai';
 import Ember from 'ember';
-import startApp from 'ghost/tests/helpers/start-app';
-import destroyApp from 'ghost/tests/helpers/destroy-app';
-import { invalidateSession, authenticateSession } from 'ghost/tests/helpers/ember-simple-auth';
+import startApp from 'ghost-admin/tests/helpers/start-app';
+import destroyApp from 'ghost-admin/tests/helpers/destroy-app';
+import { invalidateSession, authenticateSession } from 'ghost-admin/tests/helpers/ember-simple-auth';
 import Mirage from 'ember-cli-mirage';
 
 describe('Acceptance: Setup', function () {
diff --git a/tests/acceptance/signin-test.js b/tests/acceptance/signin-test.js
index 511f90a75..71beba88a 100644
--- a/tests/acceptance/signin-test.js
+++ b/tests/acceptance/signin-test.js
@@ -8,7 +8,7 @@ import {
 import { expect } from 'chai';
 import startApp from '../helpers/start-app';
 import destroyApp from '../helpers/destroy-app';
-import { invalidateSession, authenticateSession } from 'ghost/tests/helpers/ember-simple-auth';
+import { invalidateSession, authenticateSession } from 'ghost-admin/tests/helpers/ember-simple-auth';
 import Mirage from 'ember-cli-mirage';
 
 describe('Acceptance: Signin', function() {
diff --git a/tests/acceptance/subscribers-test.js b/tests/acceptance/subscribers-test.js
index a3a4abf43..4a70ad364 100644
--- a/tests/acceptance/subscribers-test.js
+++ b/tests/acceptance/subscribers-test.js
@@ -8,7 +8,7 @@ import {
 import { expect } from 'chai';
 import startApp from '../helpers/start-app';
 import destroyApp from '../helpers/destroy-app';
-import { invalidateSession, authenticateSession } from 'ghost/tests/helpers/ember-simple-auth';
+import { invalidateSession, authenticateSession } from 'ghost-admin/tests/helpers/ember-simple-auth';
 
 describe('Acceptance: Subscribers', function() {
     let application;
diff --git a/tests/acceptance/team-test.js b/tests/acceptance/team-test.js
index 62910d1c2..1187242f9 100644
--- a/tests/acceptance/team-test.js
+++ b/tests/acceptance/team-test.js
@@ -9,8 +9,8 @@ import { expect } from 'chai';
 import Ember from 'ember';
 import startApp from '../helpers/start-app';
 import destroyApp from '../helpers/destroy-app';
-import { invalidateSession, authenticateSession } from 'ghost/tests/helpers/ember-simple-auth';
-import { errorOverride, errorReset } from 'ghost/tests/helpers/adapter-error';
+import { invalidateSession, authenticateSession } from 'ghost-admin/tests/helpers/ember-simple-auth';
+import { errorOverride, errorReset } from 'ghost-admin/tests/helpers/adapter-error';
 import Mirage from 'ember-cli-mirage';
 
 describe('Acceptance: Team', function () {
diff --git a/tests/integration/components/gh-navigation-test.js b/tests/integration/components/gh-navigation-test.js
index a407cd8e2..0a74fef49 100644
--- a/tests/integration/components/gh-navigation-test.js
+++ b/tests/integration/components/gh-navigation-test.js
@@ -3,7 +3,7 @@ import { expect } from 'chai';
 import { describeComponent, it } from 'ember-mocha';
 import hbs from 'htmlbars-inline-precompile';
 import Ember from 'ember';
-import NavItem from 'ghost/models/navigation-item';
+import NavItem from 'ghost-admin/models/navigation-item';
 
 const {run} = Ember;
 
diff --git a/tests/integration/components/gh-navitem-test.js b/tests/integration/components/gh-navitem-test.js
index 1ae7b09f4..ea26aad5c 100644
--- a/tests/integration/components/gh-navitem-test.js
+++ b/tests/integration/components/gh-navitem-test.js
@@ -3,7 +3,7 @@ import { expect } from 'chai';
 import { describeComponent, it } from 'ember-mocha';
 import hbs from 'htmlbars-inline-precompile';
 import Ember from 'ember';
-import NavItem from 'ghost/models/navigation-item';
+import NavItem from 'ghost-admin/models/navigation-item';
 
 const {run} = Ember;
 
diff --git a/tests/integration/services/ajax-test.js b/tests/integration/services/ajax-test.js
index 7dc448006..922186e79 100644
--- a/tests/integration/services/ajax-test.js
+++ b/tests/integration/services/ajax-test.js
@@ -5,8 +5,8 @@ import {
 } from 'ember-mocha';
 import Pretender from 'pretender';
 import {AjaxError, UnauthorizedError} from 'ember-ajax/errors';
-import {RequestEntityTooLargeError, UnsupportedMediaTypeError} from 'ghost/services/ajax';
-import config from 'ghost/config/environment';
+import {RequestEntityTooLargeError, UnsupportedMediaTypeError} from 'ghost-admin/services/ajax';
+import config from 'ghost-admin/config/environment';
 
 function stubAjaxEndpoint(server, response = {}, code = 200) {
     server.get('/test/', function () {
diff --git a/tests/integration/services/feature-test.js b/tests/integration/services/feature-test.js
index 00d2dac7c..24fa1c7d3 100644
--- a/tests/integration/services/feature-test.js
+++ b/tests/integration/services/feature-test.js
@@ -4,9 +4,9 @@ import {
 } from 'ember-mocha';
 import Pretender from 'pretender';
 import wait from 'ember-test-helpers/wait';
-import FeatureService, {feature} from 'ghost/services/feature';
+import FeatureService, {feature} from 'ghost-admin/services/feature';
 import Ember from 'ember';
-import { errorOverride, errorReset } from 'ghost/tests/helpers/adapter-error';
+import { errorOverride, errorReset } from 'ghost-admin/tests/helpers/adapter-error';
 
 const {RSVP, merge, run} = Ember;
 const EmberError = Ember.Error;
diff --git a/tests/integration/services/store-test.js b/tests/integration/services/store-test.js
index 2fea6a541..8c1facb34 100644
--- a/tests/integration/services/store-test.js
+++ b/tests/integration/services/store-test.js
@@ -4,7 +4,7 @@ import {
     it
 } from 'ember-mocha';
 import Pretender from 'pretender';
-import config from 'ghost/config/environment';
+import config from 'ghost-admin/config/environment';
 
 describeModule(
     'service:store',
diff --git a/tests/unit/controllers/settings/navigation-test.js b/tests/unit/controllers/settings/navigation-test.js
index c4a780111..a2994f1c2 100644
--- a/tests/unit/controllers/settings/navigation-test.js
+++ b/tests/unit/controllers/settings/navigation-test.js
@@ -2,7 +2,7 @@
 import { expect, assert } from 'chai';
 import { describeModule, it } from 'ember-mocha';
 import Ember from 'ember';
-import NavItem from 'ghost/models/navigation-item';
+import NavItem from 'ghost-admin/models/navigation-item';
 
 const {run} = Ember;
 
diff --git a/tests/unit/helpers/gh-format-timeago-test.js b/tests/unit/helpers/gh-format-timeago-test.js
index a1b54e0a3..78806de6e 100644
--- a/tests/unit/helpers/gh-format-timeago-test.js
+++ b/tests/unit/helpers/gh-format-timeago-test.js
@@ -6,7 +6,7 @@ import {
 } from 'mocha';
 import {
     timeAgo
-} from 'ghost/helpers/gh-format-timeago';
+} from 'ghost-admin/helpers/gh-format-timeago';
 import sinon from 'sinon';
 
 describe('Unit: Helper: gh-format-timeago', function () {
diff --git a/tests/unit/helpers/gh-user-can-admin-test.js b/tests/unit/helpers/gh-user-can-admin-test.js
index 2a6a6ed61..5221deb27 100644
--- a/tests/unit/helpers/gh-user-can-admin-test.js
+++ b/tests/unit/helpers/gh-user-can-admin-test.js
@@ -2,7 +2,7 @@ import {
     describeModule,
     it
 } from 'ember-mocha';
-import { ghUserCanAdmin } from 'ghost/helpers/gh-user-can-admin';
+import { ghUserCanAdmin } from 'ghost-admin/helpers/gh-user-can-admin';
 
 describe('Unit: Helper: gh-user-can-admin', function () {
     // Mock up roles and test for truthy
diff --git a/tests/unit/helpers/highlighted-text-test.js b/tests/unit/helpers/highlighted-text-test.js
index 2075efca2..00f54ba2a 100644
--- a/tests/unit/helpers/highlighted-text-test.js
+++ b/tests/unit/helpers/highlighted-text-test.js
@@ -6,7 +6,7 @@ import {
 } from 'mocha';
 import {
   highlightedText
-} from 'ghost/helpers/highlighted-text';
+} from 'ghost-admin/helpers/highlighted-text';
 
 describe('Unit: Helper: highlighted-text', function() {
 
diff --git a/tests/unit/helpers/is-equal-test.js b/tests/unit/helpers/is-equal-test.js
index d7cffefa8..fce1f9822 100644
--- a/tests/unit/helpers/is-equal-test.js
+++ b/tests/unit/helpers/is-equal-test.js
@@ -6,7 +6,7 @@ import {
 } from 'mocha';
 import {
     isEqual
-} from 'ghost/helpers/is-equal';
+} from 'ghost-admin/helpers/is-equal';
 
 describe('Unit: Helper: is-equal', function () {
     // Replace this with your real tests.
diff --git a/tests/unit/helpers/is-not-test.js b/tests/unit/helpers/is-not-test.js
index 7e2cc1f75..2ce053f76 100644
--- a/tests/unit/helpers/is-not-test.js
+++ b/tests/unit/helpers/is-not-test.js
@@ -6,7 +6,7 @@ import {
 } from 'mocha';
 import {
     isNot
-} from 'ghost/helpers/is-not';
+} from 'ghost-admin/helpers/is-not';
 
 describe('Unit: Helper: is-not', function () {
     // Replace this with your real tests.
diff --git a/tests/unit/mixins/infinite-scroll-test.js b/tests/unit/mixins/infinite-scroll-test.js
index 88ba7f1ae..6ee49c670 100644
--- a/tests/unit/mixins/infinite-scroll-test.js
+++ b/tests/unit/mixins/infinite-scroll-test.js
@@ -5,7 +5,7 @@ import {
     it
 } from 'mocha';
 import Ember from 'ember';
-import InfiniteScrollMixin from 'ghost/mixins/infinite-scroll';
+import InfiniteScrollMixin from 'ghost-admin/mixins/infinite-scroll';
 
 describe('Unit: Mixin: infinite-scroll', function () {
     // Replace this with your real tests.
diff --git a/tests/unit/mixins/validation-engine-test.js b/tests/unit/mixins/validation-engine-test.js
index 63e6f5a68..c0ec7dfac 100644
--- a/tests/unit/mixins/validation-engine-test.js
+++ b/tests/unit/mixins/validation-engine-test.js
@@ -5,7 +5,7 @@ import {
     it
 } from 'mocha';
 import Ember from 'ember';
-import ValidationEngineMixin from 'ghost/mixins/validation-engine';
+import ValidationEngineMixin from 'ghost-admin/mixins/validation-engine';
 
 describe('ValidationEngineMixin', function () {
     // Replace this with your real tests.
diff --git a/tests/unit/transforms/navigation-settings-test.js b/tests/unit/transforms/navigation-settings-test.js
index 3e6e82d27..559346356 100644
--- a/tests/unit/transforms/navigation-settings-test.js
+++ b/tests/unit/transforms/navigation-settings-test.js
@@ -2,7 +2,7 @@
 import { expect } from 'chai';
 import { describeModule, it } from 'ember-mocha';
 import Ember from 'ember';
-import NavigationItem from 'ghost/models/navigation-item';
+import NavigationItem from 'ghost-admin/models/navigation-item';
 
 const emberA = Ember.A;
 
diff --git a/tests/unit/transforms/slack-settings-test.js b/tests/unit/transforms/slack-settings-test.js
index dc154c06d..fc8fa2b30 100644
--- a/tests/unit/transforms/slack-settings-test.js
+++ b/tests/unit/transforms/slack-settings-test.js
@@ -2,7 +2,7 @@
 import { expect } from 'chai';
 import { describeModule, it } from 'ember-mocha';
 import Ember from 'ember';
-import SlackIntegration from 'ghost/models/slack-integration';
+import SlackIntegration from 'ghost-admin/models/slack-integration';
 
 const emberA = Ember.A;
 
diff --git a/tests/unit/utils/date-formatting-test.js b/tests/unit/utils/date-formatting-test.js
index 3067852bc..e53737165 100644
--- a/tests/unit/utils/date-formatting-test.js
+++ b/tests/unit/utils/date-formatting-test.js
@@ -1,4 +1,4 @@
-import {formatDate, parseDateString} from 'ghost/utils/date-formatting';
+import {formatDate, parseDateString} from 'ghost-admin/utils/date-formatting';
 
 describe('Unit: Util: date-formatting', function () {
     it('parses a string into a moment');
diff --git a/tests/unit/utils/ghost-paths-test.js b/tests/unit/utils/ghost-paths-test.js
index a2b4f05de..4adc91a8e 100644
--- a/tests/unit/utils/ghost-paths-test.js
+++ b/tests/unit/utils/ghost-paths-test.js
@@ -1,4 +1,4 @@
-import ghostPaths from 'ghost/utils/ghost-paths';
+import ghostPaths from 'ghost-admin/utils/ghost-paths';
 
 describe('Unit: Util: ghost-paths', function () {
     describe('join', function () {
diff --git a/tests/unit/validators/nav-item-test.js b/tests/unit/validators/nav-item-test.js
index 11adff632..c32b8f03a 100644
--- a/tests/unit/validators/nav-item-test.js
+++ b/tests/unit/validators/nav-item-test.js
@@ -4,8 +4,8 @@ import {
     describe,
     it
 } from 'mocha';
-import validator from 'ghost/validators/nav-item';
-import NavItem from 'ghost/models/navigation-item';
+import validator from 'ghost-admin/validators/nav-item';
+import NavItem from 'ghost-admin/models/navigation-item';
 
 const testInvalidUrl = function (url) {
     let navItem = NavItem.create({url});
diff --git a/tests/unit/validators/slack-integration-test.js b/tests/unit/validators/slack-integration-test.js
index 1912cdd30..f34016e6f 100644
--- a/tests/unit/validators/slack-integration-test.js
+++ b/tests/unit/validators/slack-integration-test.js
@@ -4,8 +4,8 @@ import {
     describe,
     it
 } from 'mocha';
-import validator from 'ghost/validators/slack-integration';
-import SlackObject from 'ghost/models/slack-integration';
+import validator from 'ghost-admin/validators/slack-integration';
+import SlackObject from 'ghost-admin/models/slack-integration';
 
 const testInvalidUrl = function (url) {
     let slackObject = SlackObject.create({url});
diff --git a/tests/unit/validators/subscriber-test.js b/tests/unit/validators/subscriber-test.js
index 0f8ba5fb4..328f0935c 100644
--- a/tests/unit/validators/subscriber-test.js
+++ b/tests/unit/validators/subscriber-test.js
@@ -5,7 +5,7 @@ import {
     it
 } from 'mocha';
 import Ember from 'ember';
-import ValidationEngine from 'ghost/mixins/validation-engine';
+import ValidationEngine from 'ghost-admin/mixins/validation-engine';
 
 const {run} = Ember;
 
diff --git a/tests/unit/validators/tag-settings-test.js b/tests/unit/validators/tag-settings-test.js
index cd9d77baa..6c7258f4d 100644
--- a/tests/unit/validators/tag-settings-test.js
+++ b/tests/unit/validators/tag-settings-test.js
@@ -6,8 +6,8 @@ import {
 } from 'mocha';
 import sinon from 'sinon';
 import Ember from 'ember';
-// import validator from 'ghost/validators/tag-settings';
-import ValidationEngine from 'ghost/mixins/validation-engine';
+// import validator from 'ghost-admin/validators/tag-settings';
+import ValidationEngine from 'ghost-admin/mixins/validation-engine';
 
 const {run} = Ember;