diff --git a/angular-cli-build.js b/angular-cli-build.js
index f92b0d416d70..f7225769f49c 100644
--- a/angular-cli-build.js
+++ b/angular-cli-build.js
@@ -101,10 +101,10 @@ function _buildAppTree(defaults) {
     vendorNpmFiles: [
       'systemjs/dist/system-polyfills.js',
       'systemjs/dist/system.src.js',
-      'zone.js/dist/*.js',
+      'zone.js/dist/*.+(js|js.map)',
       'core-js/client/core.js',
-      'rxjs/**/*.js',
-      '@angular/**/*.js',
+      'rxjs/**/*.+(js|js.map)',
+      '@angular/**/*.+(js|js.map)',
       'hammerjs/*.min.+(js|js.map)'
     ]
   });
diff --git a/src/demo-app/system-config.ts b/src/demo-app/system-config.ts
index 3782a58b29f6..8184dc7181e6 100644
--- a/src/demo-app/system-config.ts
+++ b/src/demo-app/system-config.ts
@@ -23,7 +23,6 @@ const components = [
   'toolbar'
 ];
 
-
 /** Map relative paths to URLs. */
 const map: any = {
   '@angular2-material/core': 'core',
@@ -45,6 +44,7 @@ components.forEach(name => {
   };
 });
 
+
 ////////////////////////////////////////////////////////////////////////////////////////////////
 /***********************************************************************************************
  * Everything underneath this line is managed by the CLI.
@@ -63,8 +63,13 @@ const barrels: string[] = [
   'rxjs',
 
   // App specific barrels.
-  'app',
-  'app/shared',
+  'demo-app',
+  'button-toggle',
+  'gestures',
+  'live-announcer',
+  'portal',
+  'overlay',
+  ...components
   /** @cli-barrel */
 ];
 
diff --git a/src/demo-app/tsconfig.json b/src/demo-app/tsconfig.json
index e5e1c4d8eea7..505c35e4ff02 100644
--- a/src/demo-app/tsconfig.json
+++ b/src/demo-app/tsconfig.json
@@ -3,7 +3,7 @@
     "declaration": true,
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
-    "mapRoot": "",
+    "mapRoot": "/",
     "module": "commonjs",
     "moduleResolution": "node",
     "noEmitOnError": true,
diff --git a/src/e2e-app/system-config.ts b/src/e2e-app/system-config.ts
index 53bd96fe04c6..f40f6bcb01a5 100644
--- a/src/e2e-app/system-config.ts
+++ b/src/e2e-app/system-config.ts
@@ -62,8 +62,7 @@ const barrels: string[] = [
   'rxjs',
 
   // App specific barrels.
-  'app',
-  'app/shared',
+  'e2e-app',
   /** @cli-barrel */
 ];