diff --git a/package.json b/package.json
index 1ea23b302..a42797e21 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
     "babel-plugin-transform-flow-strip-types": "^6.7.0",
     "bluebird": "^3.3.5",
     "chalk": "^1.1.0",
-    "generator-ng-component": "~0.3.0",
+    "generator-ng-component": "~1.0.1",
     "glob": "^7.0.3",
     "gulp-babel": "^6.1.2",
     "gulp-beautify": "^2.0.0",
diff --git a/src/generators/app/index.js b/src/generators/app/index.js
index 761c097b2..a27480543 100644
--- a/src/generators/app/index.js
+++ b/src/generators/app/index.js
@@ -415,6 +415,7 @@ export class Generator extends Base {
         if(this.filters.less) extensions.push('less');
 
         filters.push('es6'); // Generate ES6 syntax code
+        filters.push('webpack');  // Generate ES6 Module imports/exports
 
         this.composeWith('ng-component', {
           options: {
@@ -428,7 +429,7 @@ export class Generator extends Base {
             'basePath': 'client',
             'forceConfig': this.forceConfig
           }
-        }, { local: require.resolve('generator-ng-component/app/index.js') });
+        }, { local: require.resolve('generator-ng-component/generators/app/index.js') });
       },
       ngModules: function() {
         var angModules = [
@@ -535,6 +536,7 @@ export class Generator extends Base {
             ['ngResource', 'angular-resource'],
             ['ngSanitize', 'angular-sanitize'],
             ['uiRouter', 'angular-ui-router'],
+            ['ngRoute', 'angular-route'],
             ['uiBootstrap', 'angular-ui-bootstrap'],
             ['ngMessages', 'angular-messages'],
             ['io', 'socket.io-client']
diff --git a/src/generators/component/index.js b/src/generators/component/index.js
index 9d742dca4..d27d3430c 100644
--- a/src/generators/component/index.js
+++ b/src/generators/component/index.js
@@ -6,7 +6,7 @@ class Generator extends Base {
     this.composeWith('ng-component:component', {
       arguments: this.arguments
     }, {
-      local: require.resolve('generator-ng-component/component')
+      local: require.resolve('generator-ng-component/generators/component')
     });
   }
 }
diff --git a/src/generators/controller/index.js b/src/generators/controller/index.js
index 0c9a53d87..8504e5f2b 100644
--- a/src/generators/controller/index.js
+++ b/src/generators/controller/index.js
@@ -3,7 +3,7 @@ var yeoman = require('yeoman-generator');
 
 var Generator = yeoman.Base.extend({
   compose: function() {
-    this.composeWith('ng-component:controller', {arguments: this.arguments}, { local: require.resolve('generator-ng-component/controller') });
+    this.composeWith('ng-component:controller', {arguments: this.arguments}, { local: require.resolve('generator-ng-component/generators/controller') });
   }
 });
 
diff --git a/src/generators/decorator/index.js b/src/generators/decorator/index.js
index 578427ae2..070232031 100644
--- a/src/generators/decorator/index.js
+++ b/src/generators/decorator/index.js
@@ -3,7 +3,7 @@ var yeoman = require('yeoman-generator');
 
 var Generator = yeoman.Base.extend({
   compose: function() {
-    this.composeWith('ng-component:decorator', {arguments: this.arguments}, { local: require.resolve('generator-ng-component/decorator') });
+    this.composeWith('ng-component:decorator', {arguments: this.arguments}, { local: require.resolve('generator-ng-component/generators/decorator') });
   }
 });
 
diff --git a/src/generators/directive/index.js b/src/generators/directive/index.js
index 5ac3c7c0e..3213835ec 100644
--- a/src/generators/directive/index.js
+++ b/src/generators/directive/index.js
@@ -3,7 +3,7 @@ var yeoman = require('yeoman-generator');
 
 var Generator = yeoman.Base.extend({
   compose: function() {
-    this.composeWith('ng-component:directive', {arguments: this.arguments}, { local: require.resolve('generator-ng-component/directive') });
+    this.composeWith('ng-component:directive', {arguments: this.arguments}, { local: require.resolve('generator-ng-component/generators/directive') });
   }
 });
 
diff --git a/src/generators/filter/index.js b/src/generators/filter/index.js
index badbe02a1..0226dc8cf 100644
--- a/src/generators/filter/index.js
+++ b/src/generators/filter/index.js
@@ -3,7 +3,7 @@ var yeoman = require('yeoman-generator');
 
 var Generator = yeoman.Base.extend({
   compose: function() {
-    this.composeWith('ng-component:filter', {arguments: this.arguments}, { local: require.resolve('generator-ng-component/filter') });
+    this.composeWith('ng-component:filter', {arguments: this.arguments}, { local: require.resolve('generator-ng-component/generators/filter') });
   }
 });
 
diff --git a/src/generators/provider/index.js b/src/generators/provider/index.js
index 8e0213799..1410cfe4b 100644
--- a/src/generators/provider/index.js
+++ b/src/generators/provider/index.js
@@ -3,7 +3,7 @@ var yeoman = require('yeoman-generator');
 
 var Generator = yeoman.Base.extend({
   compose: function() {
-    this.composeWith('ng-component:provider', {arguments: this.arguments}, { local: require.resolve('generator-ng-component/provider') });
+    this.composeWith('ng-component:provider', {arguments: this.arguments}, { local: require.resolve('generator-ng-component/generators/provider') });
   }
 });
 
diff --git a/src/generators/route/index.js b/src/generators/route/index.js
index 9f6f1f12d..bfe6e4c26 100644
--- a/src/generators/route/index.js
+++ b/src/generators/route/index.js
@@ -3,7 +3,7 @@ var yeoman = require('yeoman-generator');
 
 var Generator = yeoman.Base.extend({
   compose: function() {
-    this.composeWith('ng-component:route', {arguments: this.arguments}, { local: require.resolve('generator-ng-component/route') });
+    this.composeWith('ng-component:route', {arguments: this.arguments}, { local: require.resolve('generator-ng-component/generators/route') });
   }
 });
 
diff --git a/src/generators/service/index.js b/src/generators/service/index.js
index 7ef1e214a..93f9fc266 100644
--- a/src/generators/service/index.js
+++ b/src/generators/service/index.js
@@ -3,7 +3,7 @@ var yeoman = require('yeoman-generator');
 
 var Generator = yeoman.Base.extend({
   compose: function() {
-    this.composeWith('ng-component:service', {arguments: this.arguments}, { local: require.resolve('generator-ng-component/service') });
+    this.composeWith('ng-component:service', {arguments: this.arguments}, { local: require.resolve('generator-ng-component/generators/service') });
   }
 });
 
diff --git a/src/test/fixtures/.yo-rc.json b/src/test/fixtures/.yo-rc.json
index b6bc72cce..edb9b4f06 100644
--- a/src/test/fixtures/.yo-rc.json
+++ b/src/test/fixtures/.yo-rc.json
@@ -46,7 +46,8 @@
       "expect",
       "should",
       "uirouter",
-      "es6"
+      "es6",
+      "modules"
     ],
     "extensions": [
       "babel",
diff --git a/src/test/main.test.js b/src/test/main.test.js
index e73eaaa04..c34b1ade0 100644
--- a/src/test/main.test.js
+++ b/src/test/main.test.js
@@ -50,7 +50,7 @@ function runEndpointGen(name, opt={}) {
 
     gen
       .on('error', reject)
-      .on('end', () => resolve())
+      .on('end', () => resolve());
   });
 }
 
@@ -131,15 +131,15 @@ describe('angular-fullstack:app', function() {
     });
 
     if(!process.env.SKIP_E2E) {
-      // it('should run e2e tests successfully', function() {
-      //   this.retries(2);
-      //   return runCmd('gulp test:e2e').should.be.fulfilled();
-      // });
-
-      // it('should run e2e tests successfully for production app', function() {
-      //   this.retries(2);
-      //   return runCmd('gulp test:e2e:prod').should.be.fulfilled();
-      // });
+      it.skip('should run e2e tests successfully', function() {
+        this.retries(2);
+        return runCmd('gulp test:e2e').should.be.fulfilled();
+      });
+
+      it.skip('should run e2e tests successfully for production app', function() {
+        this.retries(2);
+        return runCmd('gulp test:e2e:prod').should.be.fulfilled();
+      });
     }
   });
 
@@ -243,15 +243,15 @@ describe('angular-fullstack:app', function() {
     });
 
     if(!process.env.SKIP_E2E) {
-      // it('should run e2e tests successfully', function() {
-      //   this.retries(2);
-      //   return runCmd('gulp test:e2e').should.be.fulfilled();
-      // });
-
-      // it('should run e2e tests successfully for production app', function() {
-      //   this.retries(2);
-      //   return runCmd('gulp test:e2e:prod').should.be.fulfilled();
-      // });
+      it.skip('should run e2e tests successfully', function() {
+        this.retries(2);
+        return runCmd('gulp test:e2e').should.be.fulfilled();
+      });
+
+      it.skip('should run e2e tests successfully for production app', function() {
+        this.retries(2);
+        return runCmd('gulp test:e2e:prod').should.be.fulfilled();
+      });
     }
   });
 
@@ -315,15 +315,15 @@ describe('angular-fullstack:app', function() {
     });
 
     if(!process.env.SKIP_E2E) {
-      // it('should run e2e tests successfully', function() {
-      //   this.retries(2);
-      //   return runCmd('gulp test:e2e').should.be.fulfilled();
-      // });
-
-      // it('should run e2e tests successfully for production app', function() {
-      //   this.retries(2);
-      //   return runCmd('gulp test:e2e:prod').should.be.fulfilled();
-      // });
+      it.skip('should run e2e tests successfully', function() {
+        this.retries(2);
+        return runCmd('gulp test:e2e').should.be.fulfilled();
+      });
+
+      it.skip('should run e2e tests successfully for production app', function() {
+        this.retries(2);
+        return runCmd('gulp test:e2e:prod').should.be.fulfilled();
+      });
     }
   });
 
@@ -388,15 +388,15 @@ describe('angular-fullstack:app', function() {
     });
 
     if(!process.env.SKIP_E2E) {
-      // it('should run e2e tests successfully', function() {
-      //   this.retries(2);
-      //   return runCmd('gulp test:e2e').should.be.fulfilled();
-      // });
-
-      // it('should run e2e tests successfully for production app', function() {
-      //   this.retries(2);
-      //   return runCmd('gulp test:e2e:prod').should.be.fulfilled();
-      // });
+      it.skip('should run e2e tests successfully', function() {
+        this.retries(2);
+        return runCmd('gulp test:e2e').should.be.fulfilled();
+      });
+
+      it.skip('should run e2e tests successfully for production app', function() {
+        this.retries(2);
+        return runCmd('gulp test:e2e:prod').should.be.fulfilled();
+      });
     }
   });
 });