diff --git a/ghost/admin/bower.json b/ghost/admin/bower.json
index a8b31bed4b..d445f5185f 100644
--- a/ghost/admin/bower.json
+++ b/ghost/admin/bower.json
@@ -1,27 +1,21 @@
 {
   "name": "ghost",
   "dependencies": {
-    "blueimp-md5": "2.3.0",
-    "codemirror": "5.15.2",
     "devicejs": "0.2.7",
-    "ember": "2.6.0",
-    "ember-cli-shims": "0.1.1",
+    "ember": "2.6.1",
+    "ember-cli-shims": "0.1.3",
     "ember-cli-test-loader": "0.2.2",
     "ember-mocha": "0.8.11",
     "Faker": "3.1.0",
     "fastclick": "1.0.6",
     "google-caja": "6005.0.0",
-    "jquery-deparam": "0.5.1",
     "jquery-file-upload": "9.12.3",
     "jquery-ui": "1.11.4",
     "jqueryui-touch-punch": "furf/jquery-ui-touch-punch#4bc009145202d9c7483ba85f3a236a8f3470354d",
     "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 61f8f8181b..2abbf7a50f 100644
--- a/ghost/admin/ember-cli-build.js
+++ b/ghost/admin/ember-cli-build.js
@@ -41,6 +41,35 @@ module.exports = function (defaults) {
         },
         hinting: false,
         fingerprint: disabled,
+        nodeAssets: {
+            'blueimp-md5': {
+                import: ['js/md5.js']
+            },
+            codemirror: {
+                import: [
+                    'lib/codemirror.js',
+                    'lib/codemirror.css',
+                    'theme/xq-light.css',
+                    'mode/htmlmixed/htmlmixed.js',
+                    'mode/xml/xml.js',
+                    'mode/css/css.js',
+                    'mode/javascript/javascript.js',
+                ]
+            },
+            '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': {
             theme: false
         }
@@ -54,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');
@@ -65,22 +92,10 @@ 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/codemirror/lib/codemirror.js');
-    app.import('bower_components/codemirror/mode/htmlmixed/htmlmixed.js');
-    app.import('bower_components/codemirror/mode/xml/xml.js');
-    app.import('bower_components/codemirror/mode/css/css.js');
-    app.import('bower_components/codemirror/mode/javascript/javascript.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'});
-        app.import(app.bowerDirectory + '/jquery-deparam/jquery-deparam.js', {type: 'test'});
     }
 
-    // 'dem Styles
-    app.import('bower_components/codemirror/lib/codemirror.css');
-    app.import('bower_components/codemirror/theme/xq-light.css');
-
     return app.toTree();
 };
diff --git a/ghost/admin/package.json b/ghost/admin/package.json
index 615a592d5d..1a2de820fe 100644
--- a/ghost/admin/package.json
+++ b/ghost/admin/package.json
@@ -25,9 +25,11 @@
   },
   "devDependencies": {
     "bluebird": "3.4.1",
+    "blueimp-md5": "2.3.0",
     "bower": "1.7.9",
     "broccoli-asset-rev": "2.4.3",
     "chalk": "1.1.3",
+    "codemirror": "5.16.0",
     "csscomb": "3.1.8",
     "ember-ajax": "2.4.1",
     "ember-cli": "2.6.2",
@@ -42,6 +44,7 @@
     "ember-cli-jshint": "1.0.4",
     "ember-cli-mirage": "0.1.13",
     "ember-cli-mocha": "0.10.4",
+    "ember-cli-node-assets": "0.1.3",
     "ember-cli-pretender": "0.6.0",
     "ember-cli-release": "0.2.8",
     "ember-cli-selectize": "0.5.5",
@@ -71,12 +74,15 @@
     "grunt-contrib-jshint": "1.0.0",
     "grunt-jscs": "3.0.1",
     "grunt-shell": "1.3.0",
+    "jquery-deparam": "0.5.2",
     "liquid-fire": "0.23.1",
     "liquid-tether": "1.1.1",
     "loader.js": "4.0.10",
     "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"
   },