diff --git a/ghost/admin/bower.json b/ghost/admin/bower.json
index 2ff359bbdf..d445f5185f 100644
--- a/ghost/admin/bower.json
+++ b/ghost/admin/bower.json
@@ -1,7 +1,6 @@
 {
   "name": "ghost",
   "dependencies": {
-    "blueimp-md5": "2.3.0",
     "devicejs": "0.2.7",
     "ember": "2.6.1",
     "ember-cli-shims": "0.1.3",
@@ -16,10 +15,7 @@
     "jquery.simulate.drag-sortable": "0.1.0",
     "keymaster": "1.6.3",
     "lodash": "3.7.0",
-    "moment": "2.13.0",
-    "moment-timezone": "0.5.4",
     "normalize.css": "3.0.3",
-    "password-generator": "2.0.2",
     "pretender": "1.1.0",
     "rangyinputs": "1.2.0",
     "selectize": "~0.12.1",
diff --git a/ghost/admin/ember-cli-build.js b/ghost/admin/ember-cli-build.js
index 40be0e9f8f..2abbf7a50f 100644
--- a/ghost/admin/ember-cli-build.js
+++ b/ghost/admin/ember-cli-build.js
@@ -42,6 +42,9 @@ module.exports = function (defaults) {
         hinting: false,
         fingerprint: disabled,
         nodeAssets: {
+            'blueimp-md5': {
+                import: ['js/md5.js']
+            },
             codemirror: {
                 import: [
                     'lib/codemirror.js',
@@ -56,6 +59,15 @@ module.exports = function (defaults) {
             'jquery-deparam': {
                 enabled: EmberApp.env() === 'test',
                 import: ['jquery-deparam.js']
+            },
+            moment: {
+                import: ['moment.js']
+            },
+            'moment-timezone': {
+                import: ['builds/moment-timezone-with-data.js']
+            },
+            'password-generator': {
+                import: ['lib/password-generator.js']
             }
         },
         'ember-cli-selectize': {
@@ -71,8 +83,6 @@ module.exports = function (defaults) {
     app.import('bower_components/showdown-ghost/src/extensions/ghostimagepreview.js');
     app.import('bower_components/showdown-ghost/src/extensions/footnotes.js');
     app.import('bower_components/showdown-ghost/src/extensions/highlight.js');
-    app.import('bower_components/moment/moment.js');
-    app.import('bower_components/moment-timezone/builds/moment-timezone-with-data.js');
     app.import('bower_components/keymaster/keymaster.js');
     app.import('bower_components/devicejs/lib/device.js');
     app.import('bower_components/jquery-ui/jquery-ui.js');
@@ -82,8 +92,6 @@ module.exports = function (defaults) {
     app.import('bower_components/jquery-file-upload/js/jquery.fileupload-image.js');
     app.import('bower_components/google-caja/html-css-sanitizer-bundle.js');
     app.import('bower_components/jqueryui-touch-punch/jquery.ui.touch-punch.js');
-    app.import('bower_components/password-generator/lib/password-generator.js');
-    app.import('bower_components/blueimp-md5/js/md5.js');
 
     if (app.env === 'test') {
         app.import(app.bowerDirectory + '/jquery.simulate.drag-sortable/jquery.simulate.drag-sortable.js', {type: 'test'});
diff --git a/ghost/admin/package.json b/ghost/admin/package.json
index 5f5940bb95..1a2de820fe 100644
--- a/ghost/admin/package.json
+++ b/ghost/admin/package.json
@@ -25,6 +25,7 @@
   },
   "devDependencies": {
     "bluebird": "3.4.1",
+    "blueimp-md5": "2.3.0",
     "bower": "1.7.9",
     "broccoli-asset-rev": "2.4.3",
     "chalk": "1.1.3",
@@ -80,6 +81,8 @@
     "lodash": "4.13.1",
     "matchdep": "1.0.1",
     "moment": "2.13.0",
+    "moment-timezone": "0.5.4",
+    "password-generator": "2.0.2",
     "top-gh-contribs": "2.0.4",
     "walk-sync": "^0.2.6"
   },