diff --git a/config/environment.js b/config/environment.js
index bda02b22957..a1436870cbc 100644
--- a/config/environment.js
+++ b/config/environment.js
@@ -56,10 +56,10 @@ module.exports = function(environment) {
 
     SemanticUI: {
       source: {
-        css        : 'bower_components/open-event-theme/dist',
-        javascript : 'bower_components/open-event-theme/dist',
-        images     : 'bower_components/open-event-theme/dist/themes/default/assets/images',
-        fonts      : 'bower_components/open-event-theme/dist/themes/default/assets/fonts'
+        css        : 'node_modules/@bower_components/open-event-theme/dist',
+        javascript : 'node_modules/@bower_components/open-event-theme/dist',
+        images     : 'node_modules/@bower_components/open-event-theme/dist/themes/default/assets/images',
+        fonts      : 'node_modules/@bower_components/open-event-theme/dist/themes/default/assets/fonts'
       }
     },
 
@@ -175,7 +175,7 @@ module.exports = function(environment) {
       'media-src' : '\'none\''
     };
   }
-  
+
   if (environment === 'development') {
     // ENV.APP.LOG_RESOLVER = true;
     // ENV.APP.LOG_ACTIVE_GENERATION = true;
diff --git a/ember-cli-build.js b/ember-cli-build.js
index 10bb55444f9..b776b6e1ed6 100644
--- a/ember-cli-build.js
+++ b/ember-cli-build.js
@@ -59,22 +59,22 @@ module.exports = function(defaults) {
     }
   });
 
-  app.import('bower_components/semantic-ui-calendar/dist/calendar.min.css');
-  app.import('bower_components/Croppie/croppie.css');
+  app.import('node_modules/@bower_components/semantic-ui-calendar/dist/calendar.min.css');
+  app.import('node_modules/@bower_components/Croppie/croppie.css');
 
-  app.import('bower_components/semantic-ui-calendar/dist/calendar.min.js', {
+  app.import('node_modules/@bower_components/semantic-ui-calendar/dist/calendar.min.js', {
     using: [{ transformation: 'fastbootShim' }]
   });
-  app.import('bower_components/wysihtml/dist/wysihtml-toolbar.min.js', {
+  app.import('node_modules/@bower_components/wysihtml/dist/wysihtml-toolbar.min.js', {
     using: [{ transformation: 'fastbootShim' }]
   });
-  app.import('bower_components/Croppie/croppie.min.js', {
+  app.import('node_modules/@bower_components/Croppie/croppie.min.js', {
     using: [{ transformation: 'fastbootShim' }]
   });
-  app.import('bower_components/tinyColorPicker/jqColorPicker.min.js', {
+  app.import('node_modules/@bower_components/tinyColorPicker/jqColorPicker.min.js', {
     using: [{ transformation: 'fastbootShim' }]
   });
-  app.import('bower_components/js-polyfills/xhr.js', {
+  app.import('node_modules/@bower_components/js-polyfills/xhr.js', {
     using: [{ transformation: 'fastbootShim' }]
   });
   app.import('vendor/jquery-ui.min.js', {