diff --git a/gulpfile.js b/gulpfile.js
index e3d21ad880..f46d8879a4 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -83,7 +83,7 @@ gulp.task('ionic-js', ['ionic-compile'], function() {
 })
 
 gulp.task('sass', function(done) {
-  gulp.src('src/components/app/ionic.scss')
+  gulp.src('src/ionic.scss')
     .pipe(sass({
       onError: function(err) {
         console.log(err)
diff --git a/scripts/build/config.js b/scripts/build/config.js
index 4105f453e0..202609e3f1 100644
--- a/scripts/build/config.js
+++ b/scripts/build/config.js
@@ -6,7 +6,7 @@ module.exports = {
     js: ['src/**/*.js', '!src/**/test/**/*.js'],
     e2e: ['src/components/*/test/*/**/*'],
     html: 'src/**/*.html',
-    scss: 'src/components/**/*.scss',
+    scss: 'src/**/*.scss',
   },
 
   dependencies: [
diff --git a/src/ionic.scss b/src/ionic.scss
index 59f9723c71..cb4a14c41e 100644
--- a/src/ionic.scss
+++ b/src/ionic.scss
@@ -24,56 +24,57 @@
 
 // Core Components
 @import
-  "components/app/action-menu/action-menu",
-  "components/app/alert/alert",
-  "components/app/aside/aside",
-  "components/app/badge/badge",
-  "components/app/button/button",
-  "components/app/card/card",
-  "components/app/checkbox/checkbox",
-  "components/app/content/content",
-  "components/app/item/item",
-  "components/app/list/list",
-  "components/app/modal/modal",
-  "components/app/nav-pane/nav-pane",
-  "components/app/radio/radio",
-  "components/app/search-bar/search-bar",
-  "components/app/switch/switch",
-  "components/app/tabs/tabs",
-  "components/app/toolbar/toolbar";
+  "components/action-menu/action-menu",
+  "components/alert/alert",
+  "components/aside/aside",
+  "components/badge/badge",
+  "components/button/button",
+  "components/card/card",
+  "components/checkbox/checkbox",
+  "components/content/content",
+  "components/item/item",
+  "components/list/list",
+  "components/modal/modal",
+  "components/nav-pane/nav-pane",
+  "components/radio/radio",
+  "components/search-bar/search-bar",
+  "components/switch/switch",
+  "components/tabs/tabs",
+  "components/toolbar/toolbar";
 
 
 // iOS Components
 @import
-  "components/app/toolbar/extensions/ios",
-  "components/app/action-menu/extensions/ios",
-  "components/app/alert/extensions/ios",
-  "components/app/button/extensions/ios",
-  "components/app/card/extensions/ios",
-  "components/app/checkbox/extensions/ios",
-  "components/app/list/extensions/ios",
-  "components/app/item/extensions/ios",
-  "components/app/radio/extensions/ios",
-  "components/app/search-bar/extensions/ios",
-  "components/app/switch/extensions/ios",
-  "components/app/tabs/extensions/ios";
+  "components/toolbar/extensions/ios",
+  "components/action-menu/extensions/ios",
+  "components/alert/extensions/ios",
+  "components/button/extensions/ios",
+  "components/card/extensions/ios",
+  "components/checkbox/extensions/ios",
+  "components/list/extensions/ios",
+  "components/item/extensions/ios",
+  "components/radio/extensions/ios",
+  "components/search-bar/extensions/ios",
+  "components/switch/extensions/ios",
+  "components/tabs/extensions/ios";
 
 
 // Material Design Components
 @import
-  "components/app/alert/extensions/android",
-  "components/app/button/extensions/android",
-  "components/app/list/extensions/android",
-  "components/app/item/extensions/android",
-  "components/app/tabs/extensions/android",
-  "components/app/toolbar/extensions/android";
+  "components/alert/extensions/android",
+  "components/button/extensions/android",
+  "components/list/extensions/android",
+  "components/item/extensions/android",
+  "components/tabs/extensions/android",
+  "components/toolbar/extensions/android";
 
 
 // Web View Adaptors
 @import
-  "webview/cordova/cordova";
+  "webview/cordova/cordova",
+  "webview/node-webkit/node-webkit";
 
 
 // Icons
 @import
-  "components/app/icon/icon";
+  "components/icon/icon";