diff --git a/.gitignore b/.gitignore
index 78a6835b7..f9b1763a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,5 @@ demo
 .DS_Store
 release.txt
 test/fixtures/bower.json
-test/fixtures/package.json
\ No newline at end of file
+test/fixtures/package.json
+generators
\ No newline at end of file
diff --git a/.npmignore b/.npmignore
index c823223d9..29dc7d501 100644
--- a/.npmignore
+++ b/.npmignore
@@ -1,3 +1,11 @@
 angular-fullstack-deps
 test
 .idea
+src
+scripts
+ISSUE_TEMPLATE.md
+PULL_REQUEST_TEMPLATE.md
+.travis.yml
+gulpfile.babel.js
+Gruntfile.js
+.jshintrc
diff --git a/Gruntfile.js b/Gruntfile.js
index ca5178fc7..37efd2c0d 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -87,7 +87,7 @@ module.exports = function (grunt) {
         curly: false,
         node: true
       },
-      all: ['Gruntfile.js', '*/index.js']
+      all: ['Gruntfile.js', 'src/**/*.js']
     },
     env: {
       fast: {
@@ -276,8 +276,8 @@ module.exports = function (grunt) {
       fs.writeFileSync(path.resolve(d), JSON.stringify(json, null, 2));
     };
 
-    processJson('app/templates/_package.json', dest + 'package.json');
-    processJson('app/templates/_bower.json', dest + 'bower.json');
+    processJson('templates/app/_package.json', dest + 'package.json');
+    processJson('templates/app/_bower.json', dest + 'bower.json');
   });
 
   grunt.registerTask('installFixtures', 'install package and bower fixtures', function() {
diff --git a/app/index.js b/app/index.js
deleted file mode 100644
index e4df68f08..000000000
--- a/app/index.js
+++ /dev/null
@@ -1,9 +0,0 @@
-'use strict';
-
-// Register the Babel require hook
-require('babel-register')({
-  only: /generator-angular-fullstack\/(?!node_modules)/
-});
-
-// Export the generator
-module.exports = require('./generator').default;
diff --git a/endpoint/index.js b/endpoint/index.js
deleted file mode 100644
index e4df68f08..000000000
--- a/endpoint/index.js
+++ /dev/null
@@ -1,9 +0,0 @@
-'use strict';
-
-// Register the Babel require hook
-require('babel-register')({
-  only: /generator-angular-fullstack\/(?!node_modules)/
-});
-
-// Export the generator
-module.exports = require('./generator').default;
diff --git a/gulpfile.babel.js b/gulpfile.babel.js
new file mode 100644
index 000000000..a8c2ecfe1
--- /dev/null
+++ b/gulpfile.babel.js
@@ -0,0 +1,35 @@
+'use strict';
+// import _ from 'lodash';
+// import fs from 'fs';
+import gulp from 'gulp';
+import babel from 'gulp-babel';
+import del from 'del';
+import runSequence from 'run-sequence';
+
+gulp.task('clean', () => {
+    return del(['generators/**/*']);
+});
+
+gulp.task('babel', () => {
+    return gulp.src(['src/**/*.js'])
+        .pipe(babel())
+        .pipe(gulp.dest('generators'));
+});
+
+gulp.task('watch', () => {
+    return gulp.watch('src/**/*.js', ['babel']);
+});
+
+gulp.task('copy', () => {
+    return gulp.src(['src/**/*', '!src/**/*.js'])
+        .pipe(gulp.dest('generators'));
+});
+
+gulp.task('build', cb => {
+    return runSequence(
+        'clean',
+        'babel',
+        'copy',
+        cb
+    );
+});
diff --git a/package.json b/package.json
index e575595c9..6af1f196d 100644
--- a/package.json
+++ b/package.json
@@ -31,16 +31,12 @@
     "url": "git://github.com/angular-fullstack/generator-angular-fullstack.git"
   },
   "scripts": {
-    "test": "grunt test"
+    "test": "gulp build && grunt test"
   },
   "dependencies": {
-    "babel-core": "^6.7.0",
     "babel-plugin-syntax-class-properties": "^6.5.0",
     "babel-plugin-syntax-flow": "^6.5.0",
-    "babel-plugin-transform-class-properties": "^6.6.0",
     "babel-plugin-transform-flow-strip-types": "^6.7.0",
-    "babel-preset-es2015": "^6.6.0",
-    "babel-register": "^6.6.5",
     "chalk": "^1.1.0",
     "generator-ng-component": "~0.2.1",
     "glob": "^7.0.3",
@@ -54,7 +50,11 @@
     "yeoman-welcome": "^1.0.1"
   },
   "devDependencies": {
+    "babel-plugin-transform-class-properties": "^6.6.0",
+    "babel-preset-es2015": "^6.6.0",
+    "babel-register": "^6.6.5",
     "chai": "^3.2.0",
+    "del": "^2.2.0",
     "grunt": "^1.0.1",
     "grunt-build-control": "^0.7.0",
     "grunt-contrib-clean": "^1.0.0",
@@ -64,10 +64,12 @@
     "grunt-env": "^0.4.1",
     "grunt-mocha-test": "^0.12.7",
     "grunt-release": "^0.13.0",
+    "gulp": "^3.9.1",
     "jit-grunt": "~0.10.0",
     "mocha": "^2.2.5",
     "q": "^1.0.1",
     "recursive-readdir": "^2.0.0",
+    "run-sequence": "^1.1.5",
     "shelljs": "^0.6.0",
     "yeoman-assert": "^2.0.0",
     "yeoman-test": "^1.1.0"
diff --git a/app/USAGE b/src/app/USAGE
similarity index 100%
rename from app/USAGE
rename to src/app/USAGE
diff --git a/app/generator.js b/src/app/index.js
similarity index 99%
rename from app/generator.js
rename to src/app/index.js
index ad6904f78..1bfaa9e16 100644
--- a/app/generator.js
+++ b/src/app/index.js
@@ -11,7 +11,7 @@ import babelStream from 'gulp-babel';
 import beaufityStream from 'gulp-beautify';
 import filter from 'gulp-filter';
 
-export default class Generator extends Base {
+export class Generator extends Base {
   constructor(...args) {
     super(...args);
 
@@ -496,7 +496,7 @@ export default class Generator extends Base {
         ]);
 
         let self = this;
-        this.sourceRoot(path.join(__dirname, './templates'));
+        this.sourceRoot(path.join(__dirname, '../../templates/app'));
         this.processDirectory('.', '.');
       },
       generateEndpoint: function() {
@@ -531,3 +531,5 @@ export default class Generator extends Base {
     return {};
   }
 }
+
+module.exports = Generator;
diff --git a/controller/index.js b/src/controller/index.js
similarity index 100%
rename from controller/index.js
rename to src/controller/index.js
diff --git a/decorator/index.js b/src/decorator/index.js
similarity index 100%
rename from decorator/index.js
rename to src/decorator/index.js
diff --git a/directive/index.js b/src/directive/index.js
similarity index 100%
rename from directive/index.js
rename to src/directive/index.js
diff --git a/endpoint/generator.js b/src/endpoint/index.js
similarity index 94%
rename from endpoint/generator.js
rename to src/endpoint/index.js
index a7c968093..675e61c07 100644
--- a/endpoint/generator.js
+++ b/src/endpoint/index.js
@@ -1,14 +1,16 @@
 'use strict';
 
 import path from 'path';
-import {NamedBase} from 'yeoman-generator';
+import {Base} from 'yeoman-generator';
 import {genNamedBase} from '../generator-base';
 
-export default class Generator extends NamedBase {
+export class Generator extends Base {
 
   constructor(...args) {
     super(...args);
 
+    this.argument('name', { type: String, required: true });
+
     this.option('route', {
       desc: 'URL for the endpoint',
       type: String
@@ -99,7 +101,7 @@ export default class Generator extends NamedBase {
   }
 
   writing() {
-    this.sourceRoot(path.join(__dirname, './templates'));
+    this.sourceRoot(path.join(__dirname, '../../templates/endpoint'));
     this.processDirectory('.', this.routeDest);
   }
 
@@ -145,3 +147,5 @@ export default class Generator extends NamedBase {
     }
   }
 }
+
+module.exports = Generator;
diff --git a/factory/index.js b/src/factory/index.js
similarity index 100%
rename from factory/index.js
rename to src/factory/index.js
diff --git a/filter/index.js b/src/filter/index.js
similarity index 100%
rename from filter/index.js
rename to src/filter/index.js
diff --git a/generator-base.js b/src/generator-base.js
similarity index 100%
rename from generator-base.js
rename to src/generator-base.js
diff --git a/heroku/USAGE b/src/heroku/USAGE
similarity index 100%
rename from heroku/USAGE
rename to src/heroku/USAGE
diff --git a/heroku/index.js b/src/heroku/index.js
similarity index 100%
rename from heroku/index.js
rename to src/heroku/index.js
diff --git a/heroku/templates/Procfile b/src/heroku/templates/Procfile
similarity index 100%
rename from heroku/templates/Procfile
rename to src/heroku/templates/Procfile
diff --git a/insight-init.js b/src/insight-init.js
similarity index 92%
rename from insight-init.js
rename to src/insight-init.js
index b9fede03b..66984352d 100644
--- a/insight-init.js
+++ b/src/insight-init.js
@@ -1,6 +1,6 @@
 'use strict';
 var Insight = require('insight');
-var pkg = require('./package.json');
+var pkg = require('../package.json');
 
 var insight = new Insight({
     // Google Analytics tracking code
diff --git a/openshift/USAGE b/src/openshift/USAGE
similarity index 100%
rename from openshift/USAGE
rename to src/openshift/USAGE
diff --git a/openshift/index.js b/src/openshift/index.js
similarity index 100%
rename from openshift/index.js
rename to src/openshift/index.js
diff --git a/openshift/templates/hot_deploy b/src/openshift/templates/hot_deploy
similarity index 100%
rename from openshift/templates/hot_deploy
rename to src/openshift/templates/hot_deploy
diff --git a/provider/index.js b/src/provider/index.js
similarity index 100%
rename from provider/index.js
rename to src/provider/index.js
diff --git a/route/index.js b/src/route/index.js
similarity index 100%
rename from route/index.js
rename to src/route/index.js
diff --git a/service/index.js b/src/service/index.js
similarity index 100%
rename from service/index.js
rename to src/service/index.js
diff --git a/util.js b/src/util.js
similarity index 100%
rename from util.js
rename to src/util.js
diff --git a/app/templates/.bowerrc b/templates/app/.bowerrc
similarity index 100%
rename from app/templates/.bowerrc
rename to templates/app/.bowerrc
diff --git a/app/templates/.buildignore b/templates/app/.buildignore
similarity index 100%
rename from app/templates/.buildignore
rename to templates/app/.buildignore
diff --git a/app/templates/.editorconfig b/templates/app/.editorconfig
similarity index 100%
rename from app/templates/.editorconfig
rename to templates/app/.editorconfig
diff --git a/app/templates/.gitattributes b/templates/app/.gitattributes
similarity index 100%
rename from app/templates/.gitattributes
rename to templates/app/.gitattributes
diff --git a/app/templates/.jscsrc b/templates/app/.jscsrc
similarity index 100%
rename from app/templates/.jscsrc
rename to templates/app/.jscsrc
diff --git a/app/templates/.travis.yml b/templates/app/.travis.yml
similarity index 100%
rename from app/templates/.travis.yml
rename to templates/app/.travis.yml
diff --git a/app/templates/Gruntfile(grunt).js b/templates/app/Gruntfile(grunt).js
similarity index 100%
rename from app/templates/Gruntfile(grunt).js
rename to templates/app/Gruntfile(grunt).js
diff --git a/app/templates/README.md b/templates/app/README.md
similarity index 100%
rename from app/templates/README.md
rename to templates/app/README.md
diff --git a/app/templates/_.babelrc b/templates/app/_.babelrc
similarity index 100%
rename from app/templates/_.babelrc
rename to templates/app/_.babelrc
diff --git a/app/templates/_.gitignore b/templates/app/_.gitignore
similarity index 100%
rename from app/templates/_.gitignore
rename to templates/app/_.gitignore
diff --git a/app/templates/_bower.json b/templates/app/_bower.json
similarity index 100%
rename from app/templates/_bower.json
rename to templates/app/_bower.json
diff --git a/app/templates/_package.json b/templates/app/_package.json
similarity index 100%
rename from app/templates/_package.json
rename to templates/app/_package.json
diff --git a/app/templates/client/.htaccess b/templates/app/client/.htaccess
similarity index 100%
rename from app/templates/client/.htaccess
rename to templates/app/client/.htaccess
diff --git a/app/templates/client/.jshintrc(babel) b/templates/app/client/.jshintrc(babel)
similarity index 100%
rename from app/templates/client/.jshintrc(babel)
rename to templates/app/client/.jshintrc(babel)
diff --git a/app/templates/client/app/account(auth)/account.js b/templates/app/client/app/account(auth)/account.js
similarity index 100%
rename from app/templates/client/app/account(auth)/account.js
rename to templates/app/client/app/account(auth)/account.js
diff --git a/app/templates/client/app/account(auth)/login/login(html).html b/templates/app/client/app/account(auth)/login/login(html).html
similarity index 100%
rename from app/templates/client/app/account(auth)/login/login(html).html
rename to templates/app/client/app/account(auth)/login/login(html).html
diff --git a/app/templates/client/app/account(auth)/login/login(jade).jade b/templates/app/client/app/account(auth)/login/login(jade).jade
similarity index 100%
rename from app/templates/client/app/account(auth)/login/login(jade).jade
rename to templates/app/client/app/account(auth)/login/login(jade).jade
diff --git a/app/templates/client/app/account(auth)/login/login.controller.js b/templates/app/client/app/account(auth)/login/login.controller.js
similarity index 100%
rename from app/templates/client/app/account(auth)/login/login.controller.js
rename to templates/app/client/app/account(auth)/login/login.controller.js
diff --git a/app/templates/client/app/account(auth)/settings/settings(html).html b/templates/app/client/app/account(auth)/settings/settings(html).html
similarity index 100%
rename from app/templates/client/app/account(auth)/settings/settings(html).html
rename to templates/app/client/app/account(auth)/settings/settings(html).html
diff --git a/app/templates/client/app/account(auth)/settings/settings(jade).jade b/templates/app/client/app/account(auth)/settings/settings(jade).jade
similarity index 100%
rename from app/templates/client/app/account(auth)/settings/settings(jade).jade
rename to templates/app/client/app/account(auth)/settings/settings(jade).jade
diff --git a/app/templates/client/app/account(auth)/settings/settings.controller.js b/templates/app/client/app/account(auth)/settings/settings.controller.js
similarity index 100%
rename from app/templates/client/app/account(auth)/settings/settings.controller.js
rename to templates/app/client/app/account(auth)/settings/settings.controller.js
diff --git a/app/templates/client/app/account(auth)/signup/signup(html).html b/templates/app/client/app/account(auth)/signup/signup(html).html
similarity index 100%
rename from app/templates/client/app/account(auth)/signup/signup(html).html
rename to templates/app/client/app/account(auth)/signup/signup(html).html
diff --git a/app/templates/client/app/account(auth)/signup/signup(jade).jade b/templates/app/client/app/account(auth)/signup/signup(jade).jade
similarity index 100%
rename from app/templates/client/app/account(auth)/signup/signup(jade).jade
rename to templates/app/client/app/account(auth)/signup/signup(jade).jade
diff --git a/app/templates/client/app/account(auth)/signup/signup.controller.js b/templates/app/client/app/account(auth)/signup/signup.controller.js
similarity index 100%
rename from app/templates/client/app/account(auth)/signup/signup.controller.js
rename to templates/app/client/app/account(auth)/signup/signup.controller.js
diff --git a/app/templates/client/app/admin(auth)/admin(css).css b/templates/app/client/app/admin(auth)/admin(css).css
similarity index 100%
rename from app/templates/client/app/admin(auth)/admin(css).css
rename to templates/app/client/app/admin(auth)/admin(css).css
diff --git a/app/templates/client/app/admin(auth)/admin(html).html b/templates/app/client/app/admin(auth)/admin(html).html
similarity index 100%
rename from app/templates/client/app/admin(auth)/admin(html).html
rename to templates/app/client/app/admin(auth)/admin(html).html
diff --git a/app/templates/client/app/admin(auth)/admin(jade).jade b/templates/app/client/app/admin(auth)/admin(jade).jade
similarity index 100%
rename from app/templates/client/app/admin(auth)/admin(jade).jade
rename to templates/app/client/app/admin(auth)/admin(jade).jade
diff --git a/app/templates/client/app/admin(auth)/admin(less).less b/templates/app/client/app/admin(auth)/admin(less).less
similarity index 100%
rename from app/templates/client/app/admin(auth)/admin(less).less
rename to templates/app/client/app/admin(auth)/admin(less).less
diff --git a/app/templates/client/app/admin(auth)/admin(sass).scss b/templates/app/client/app/admin(auth)/admin(sass).scss
similarity index 100%
rename from app/templates/client/app/admin(auth)/admin(sass).scss
rename to templates/app/client/app/admin(auth)/admin(sass).scss
diff --git a/app/templates/client/app/admin(auth)/admin(stylus).styl b/templates/app/client/app/admin(auth)/admin(stylus).styl
similarity index 100%
rename from app/templates/client/app/admin(auth)/admin(stylus).styl
rename to templates/app/client/app/admin(auth)/admin(stylus).styl
diff --git a/app/templates/client/app/admin(auth)/admin.controller.js b/templates/app/client/app/admin(auth)/admin.controller.js
similarity index 100%
rename from app/templates/client/app/admin(auth)/admin.controller.js
rename to templates/app/client/app/admin(auth)/admin.controller.js
diff --git a/app/templates/client/app/admin(auth)/admin.module.js b/templates/app/client/app/admin(auth)/admin.module.js
similarity index 100%
rename from app/templates/client/app/admin(auth)/admin.module.js
rename to templates/app/client/app/admin(auth)/admin.module.js
diff --git a/app/templates/client/app/admin(auth)/admin.router.js b/templates/app/client/app/admin(auth)/admin.router.js
similarity index 100%
rename from app/templates/client/app/admin(auth)/admin.router.js
rename to templates/app/client/app/admin(auth)/admin.router.js
diff --git a/app/templates/client/app/app(css).css b/templates/app/client/app/app(css).css
similarity index 100%
rename from app/templates/client/app/app(css).css
rename to templates/app/client/app/app(css).css
diff --git a/app/templates/client/app/app(less).less b/templates/app/client/app/app(less).less
similarity index 100%
rename from app/templates/client/app/app(less).less
rename to templates/app/client/app/app(less).less
diff --git a/app/templates/client/app/app(sass).scss b/templates/app/client/app/app(sass).scss
similarity index 100%
rename from app/templates/client/app/app(sass).scss
rename to templates/app/client/app/app(sass).scss
diff --git a/app/templates/client/app/app(stylus).styl b/templates/app/client/app/app(stylus).styl
similarity index 100%
rename from app/templates/client/app/app(stylus).styl
rename to templates/app/client/app/app(stylus).styl
diff --git a/app/templates/client/app/app.js b/templates/app/client/app/app.js
similarity index 100%
rename from app/templates/client/app/app.js
rename to templates/app/client/app/app.js
diff --git a/app/templates/client/app/main/main(css).css b/templates/app/client/app/main/main(css).css
similarity index 100%
rename from app/templates/client/app/main/main(css).css
rename to templates/app/client/app/main/main(css).css
diff --git a/app/templates/client/app/main/main(html).html b/templates/app/client/app/main/main(html).html
similarity index 100%
rename from app/templates/client/app/main/main(html).html
rename to templates/app/client/app/main/main(html).html
diff --git a/app/templates/client/app/main/main(jade).jade b/templates/app/client/app/main/main(jade).jade
similarity index 100%
rename from app/templates/client/app/main/main(jade).jade
rename to templates/app/client/app/main/main(jade).jade
diff --git a/app/templates/client/app/main/main(less).less b/templates/app/client/app/main/main(less).less
similarity index 100%
rename from app/templates/client/app/main/main(less).less
rename to templates/app/client/app/main/main(less).less
diff --git a/app/templates/client/app/main/main(sass).scss b/templates/app/client/app/main/main(sass).scss
similarity index 100%
rename from app/templates/client/app/main/main(sass).scss
rename to templates/app/client/app/main/main(sass).scss
diff --git a/app/templates/client/app/main/main(stylus).styl b/templates/app/client/app/main/main(stylus).styl
similarity index 100%
rename from app/templates/client/app/main/main(stylus).styl
rename to templates/app/client/app/main/main(stylus).styl
diff --git a/app/templates/client/app/main/main.controller.js b/templates/app/client/app/main/main.controller.js
similarity index 100%
rename from app/templates/client/app/main/main.controller.js
rename to templates/app/client/app/main/main.controller.js
diff --git a/app/templates/client/app/main/main.controller.spec.js b/templates/app/client/app/main/main.controller.spec.js
similarity index 100%
rename from app/templates/client/app/main/main.controller.spec.js
rename to templates/app/client/app/main/main.controller.spec.js
diff --git a/app/templates/client/app/main/main.js b/templates/app/client/app/main/main.js
similarity index 100%
rename from app/templates/client/app/main/main.js
rename to templates/app/client/app/main/main.js
diff --git a/app/templates/client/assets/images/!yeoman.png b/templates/app/client/assets/images/!yeoman.png
similarity index 100%
rename from app/templates/client/assets/images/!yeoman.png
rename to templates/app/client/assets/images/!yeoman.png
diff --git a/app/templates/client/components/auth(auth)/auth.module.js b/templates/app/client/components/auth(auth)/auth.module.js
similarity index 100%
rename from app/templates/client/components/auth(auth)/auth.module.js
rename to templates/app/client/components/auth(auth)/auth.module.js
diff --git a/app/templates/client/components/auth(auth)/auth.service.js b/templates/app/client/components/auth(auth)/auth.service.js
similarity index 100%
rename from app/templates/client/components/auth(auth)/auth.service.js
rename to templates/app/client/components/auth(auth)/auth.service.js
diff --git a/app/templates/client/components/auth(auth)/interceptor.service.js b/templates/app/client/components/auth(auth)/interceptor.service.js
similarity index 100%
rename from app/templates/client/components/auth(auth)/interceptor.service.js
rename to templates/app/client/components/auth(auth)/interceptor.service.js
diff --git a/app/templates/client/components/auth(auth)/router.decorator.js b/templates/app/client/components/auth(auth)/router.decorator.js
similarity index 100%
rename from app/templates/client/components/auth(auth)/router.decorator.js
rename to templates/app/client/components/auth(auth)/router.decorator.js
diff --git a/app/templates/client/components/auth(auth)/user.service.js b/templates/app/client/components/auth(auth)/user.service.js
similarity index 100%
rename from app/templates/client/components/auth(auth)/user.service.js
rename to templates/app/client/components/auth(auth)/user.service.js
diff --git a/app/templates/client/components/footer/footer(css).css b/templates/app/client/components/footer/footer(css).css
similarity index 100%
rename from app/templates/client/components/footer/footer(css).css
rename to templates/app/client/components/footer/footer(css).css
diff --git a/app/templates/client/components/footer/footer(html).html b/templates/app/client/components/footer/footer(html).html
similarity index 100%
rename from app/templates/client/components/footer/footer(html).html
rename to templates/app/client/components/footer/footer(html).html
diff --git a/app/templates/client/components/footer/footer(jade).jade b/templates/app/client/components/footer/footer(jade).jade
similarity index 100%
rename from app/templates/client/components/footer/footer(jade).jade
rename to templates/app/client/components/footer/footer(jade).jade
diff --git a/app/templates/client/components/footer/footer(less).less b/templates/app/client/components/footer/footer(less).less
similarity index 100%
rename from app/templates/client/components/footer/footer(less).less
rename to templates/app/client/components/footer/footer(less).less
diff --git a/app/templates/client/components/footer/footer(sass).scss b/templates/app/client/components/footer/footer(sass).scss
similarity index 100%
rename from app/templates/client/components/footer/footer(sass).scss
rename to templates/app/client/components/footer/footer(sass).scss
diff --git a/app/templates/client/components/footer/footer(stylus).styl b/templates/app/client/components/footer/footer(stylus).styl
similarity index 100%
rename from app/templates/client/components/footer/footer(stylus).styl
rename to templates/app/client/components/footer/footer(stylus).styl
diff --git a/app/templates/client/components/footer/footer.directive.js b/templates/app/client/components/footer/footer.directive.js
similarity index 100%
rename from app/templates/client/components/footer/footer.directive.js
rename to templates/app/client/components/footer/footer.directive.js
diff --git a/app/templates/client/components/modal(uibootstrap)/modal(css).css b/templates/app/client/components/modal(uibootstrap)/modal(css).css
similarity index 100%
rename from app/templates/client/components/modal(uibootstrap)/modal(css).css
rename to templates/app/client/components/modal(uibootstrap)/modal(css).css
diff --git a/app/templates/client/components/modal(uibootstrap)/modal(html).html b/templates/app/client/components/modal(uibootstrap)/modal(html).html
similarity index 100%
rename from app/templates/client/components/modal(uibootstrap)/modal(html).html
rename to templates/app/client/components/modal(uibootstrap)/modal(html).html
diff --git a/app/templates/client/components/modal(uibootstrap)/modal(jade).jade b/templates/app/client/components/modal(uibootstrap)/modal(jade).jade
similarity index 100%
rename from app/templates/client/components/modal(uibootstrap)/modal(jade).jade
rename to templates/app/client/components/modal(uibootstrap)/modal(jade).jade
diff --git a/app/templates/client/components/modal(uibootstrap)/modal(less).less b/templates/app/client/components/modal(uibootstrap)/modal(less).less
similarity index 100%
rename from app/templates/client/components/modal(uibootstrap)/modal(less).less
rename to templates/app/client/components/modal(uibootstrap)/modal(less).less
diff --git a/app/templates/client/components/modal(uibootstrap)/modal(sass).scss b/templates/app/client/components/modal(uibootstrap)/modal(sass).scss
similarity index 100%
rename from app/templates/client/components/modal(uibootstrap)/modal(sass).scss
rename to templates/app/client/components/modal(uibootstrap)/modal(sass).scss
diff --git a/app/templates/client/components/modal(uibootstrap)/modal(stylus).styl b/templates/app/client/components/modal(uibootstrap)/modal(stylus).styl
similarity index 100%
rename from app/templates/client/components/modal(uibootstrap)/modal(stylus).styl
rename to templates/app/client/components/modal(uibootstrap)/modal(stylus).styl
diff --git a/app/templates/client/components/modal(uibootstrap)/modal.service.js b/templates/app/client/components/modal(uibootstrap)/modal.service.js
similarity index 100%
rename from app/templates/client/components/modal(uibootstrap)/modal.service.js
rename to templates/app/client/components/modal(uibootstrap)/modal.service.js
diff --git a/app/templates/client/components/mongoose-error(auth)/mongoose-error.directive.js b/templates/app/client/components/mongoose-error(auth)/mongoose-error.directive.js
similarity index 100%
rename from app/templates/client/components/mongoose-error(auth)/mongoose-error.directive.js
rename to templates/app/client/components/mongoose-error(auth)/mongoose-error.directive.js
diff --git a/app/templates/client/components/navbar/navbar(html).html b/templates/app/client/components/navbar/navbar(html).html
similarity index 100%
rename from app/templates/client/components/navbar/navbar(html).html
rename to templates/app/client/components/navbar/navbar(html).html
diff --git a/app/templates/client/components/navbar/navbar(jade).jade b/templates/app/client/components/navbar/navbar(jade).jade
similarity index 100%
rename from app/templates/client/components/navbar/navbar(jade).jade
rename to templates/app/client/components/navbar/navbar(jade).jade
diff --git a/app/templates/client/components/navbar/navbar.controller.js b/templates/app/client/components/navbar/navbar.controller.js
similarity index 100%
rename from app/templates/client/components/navbar/navbar.controller.js
rename to templates/app/client/components/navbar/navbar.controller.js
diff --git a/app/templates/client/components/navbar/navbar.directive.js b/templates/app/client/components/navbar/navbar.directive.js
similarity index 100%
rename from app/templates/client/components/navbar/navbar.directive.js
rename to templates/app/client/components/navbar/navbar.directive.js
diff --git a/app/templates/client/components/oauth-buttons(oauth)/oauth-buttons(css).css b/templates/app/client/components/oauth-buttons(oauth)/oauth-buttons(css).css
similarity index 100%
rename from app/templates/client/components/oauth-buttons(oauth)/oauth-buttons(css).css
rename to templates/app/client/components/oauth-buttons(oauth)/oauth-buttons(css).css
diff --git a/app/templates/client/components/oauth-buttons(oauth)/oauth-buttons(html).html b/templates/app/client/components/oauth-buttons(oauth)/oauth-buttons(html).html
similarity index 100%
rename from app/templates/client/components/oauth-buttons(oauth)/oauth-buttons(html).html
rename to templates/app/client/components/oauth-buttons(oauth)/oauth-buttons(html).html
diff --git a/app/templates/client/components/oauth-buttons(oauth)/oauth-buttons(jade).jade b/templates/app/client/components/oauth-buttons(oauth)/oauth-buttons(jade).jade
similarity index 100%
rename from app/templates/client/components/oauth-buttons(oauth)/oauth-buttons(jade).jade
rename to templates/app/client/components/oauth-buttons(oauth)/oauth-buttons(jade).jade
diff --git a/app/templates/client/components/oauth-buttons(oauth)/oauth-buttons(less).less b/templates/app/client/components/oauth-buttons(oauth)/oauth-buttons(less).less
similarity index 100%
rename from app/templates/client/components/oauth-buttons(oauth)/oauth-buttons(less).less
rename to templates/app/client/components/oauth-buttons(oauth)/oauth-buttons(less).less
diff --git a/app/templates/client/components/oauth-buttons(oauth)/oauth-buttons(sass).scss b/templates/app/client/components/oauth-buttons(oauth)/oauth-buttons(sass).scss
similarity index 100%
rename from app/templates/client/components/oauth-buttons(oauth)/oauth-buttons(sass).scss
rename to templates/app/client/components/oauth-buttons(oauth)/oauth-buttons(sass).scss
diff --git a/app/templates/client/components/oauth-buttons(oauth)/oauth-buttons(stylus).styl b/templates/app/client/components/oauth-buttons(oauth)/oauth-buttons(stylus).styl
similarity index 100%
rename from app/templates/client/components/oauth-buttons(oauth)/oauth-buttons(stylus).styl
rename to templates/app/client/components/oauth-buttons(oauth)/oauth-buttons(stylus).styl
diff --git a/app/templates/client/components/oauth-buttons(oauth)/oauth-buttons.controller.js b/templates/app/client/components/oauth-buttons(oauth)/oauth-buttons.controller.js
similarity index 100%
rename from app/templates/client/components/oauth-buttons(oauth)/oauth-buttons.controller.js
rename to templates/app/client/components/oauth-buttons(oauth)/oauth-buttons.controller.js
diff --git a/app/templates/client/components/oauth-buttons(oauth)/oauth-buttons.controller.spec.js b/templates/app/client/components/oauth-buttons(oauth)/oauth-buttons.controller.spec.js
similarity index 100%
rename from app/templates/client/components/oauth-buttons(oauth)/oauth-buttons.controller.spec.js
rename to templates/app/client/components/oauth-buttons(oauth)/oauth-buttons.controller.spec.js
diff --git a/app/templates/client/components/oauth-buttons(oauth)/oauth-buttons.directive.js b/templates/app/client/components/oauth-buttons(oauth)/oauth-buttons.directive.js
similarity index 100%
rename from app/templates/client/components/oauth-buttons(oauth)/oauth-buttons.directive.js
rename to templates/app/client/components/oauth-buttons(oauth)/oauth-buttons.directive.js
diff --git a/app/templates/client/components/oauth-buttons(oauth)/oauth-buttons.directive.spec.js b/templates/app/client/components/oauth-buttons(oauth)/oauth-buttons.directive.spec.js
similarity index 100%
rename from app/templates/client/components/oauth-buttons(oauth)/oauth-buttons.directive.spec.js
rename to templates/app/client/components/oauth-buttons(oauth)/oauth-buttons.directive.spec.js
diff --git a/app/templates/client/components/socket(socketio)/socket.mock.js b/templates/app/client/components/socket(socketio)/socket.mock.js
similarity index 100%
rename from app/templates/client/components/socket(socketio)/socket.mock.js
rename to templates/app/client/components/socket(socketio)/socket.mock.js
diff --git a/app/templates/client/components/socket(socketio)/socket.service.js b/templates/app/client/components/socket(socketio)/socket.service.js
similarity index 100%
rename from app/templates/client/components/socket(socketio)/socket.service.js
rename to templates/app/client/components/socket(socketio)/socket.service.js
diff --git a/app/templates/client/components/ui-router(uirouter)/ui-router.mock.js b/templates/app/client/components/ui-router(uirouter)/ui-router.mock.js
similarity index 100%
rename from app/templates/client/components/ui-router(uirouter)/ui-router.mock.js
rename to templates/app/client/components/ui-router(uirouter)/ui-router.mock.js
diff --git a/app/templates/client/components/util/util.module.js b/templates/app/client/components/util/util.module.js
similarity index 100%
rename from app/templates/client/components/util/util.module.js
rename to templates/app/client/components/util/util.module.js
diff --git a/app/templates/client/components/util/util.service.js b/templates/app/client/components/util/util.service.js
similarity index 100%
rename from app/templates/client/components/util/util.service.js
rename to templates/app/client/components/util/util.service.js
diff --git a/app/templates/client/favicon.ico b/templates/app/client/favicon.ico
similarity index 100%
rename from app/templates/client/favicon.ico
rename to templates/app/client/favicon.ico
diff --git a/app/templates/client/index.html b/templates/app/client/index.html
similarity index 100%
rename from app/templates/client/index.html
rename to templates/app/client/index.html
diff --git a/app/templates/client/robots.txt b/templates/app/client/robots.txt
similarity index 100%
rename from app/templates/client/robots.txt
rename to templates/app/client/robots.txt
diff --git a/app/templates/client/tslint.json(ts) b/templates/app/client/tslint.json(ts)
similarity index 100%
rename from app/templates/client/tslint.json(ts)
rename to templates/app/client/tslint.json(ts)
diff --git a/app/templates/e2e/account(auth)/login/login.po.js b/templates/app/e2e/account(auth)/login/login.po.js
similarity index 100%
rename from app/templates/e2e/account(auth)/login/login.po.js
rename to templates/app/e2e/account(auth)/login/login.po.js
diff --git a/app/templates/e2e/account(auth)/login/login.spec(jasmine).js b/templates/app/e2e/account(auth)/login/login.spec(jasmine).js
similarity index 100%
rename from app/templates/e2e/account(auth)/login/login.spec(jasmine).js
rename to templates/app/e2e/account(auth)/login/login.spec(jasmine).js
diff --git a/app/templates/e2e/account(auth)/login/login.spec(mocha).js b/templates/app/e2e/account(auth)/login/login.spec(mocha).js
similarity index 100%
rename from app/templates/e2e/account(auth)/login/login.spec(mocha).js
rename to templates/app/e2e/account(auth)/login/login.spec(mocha).js
diff --git a/app/templates/e2e/account(auth)/logout/logout.spec(jasmine).js b/templates/app/e2e/account(auth)/logout/logout.spec(jasmine).js
similarity index 100%
rename from app/templates/e2e/account(auth)/logout/logout.spec(jasmine).js
rename to templates/app/e2e/account(auth)/logout/logout.spec(jasmine).js
diff --git a/app/templates/e2e/account(auth)/logout/logout.spec(mocha).js b/templates/app/e2e/account(auth)/logout/logout.spec(mocha).js
similarity index 100%
rename from app/templates/e2e/account(auth)/logout/logout.spec(mocha).js
rename to templates/app/e2e/account(auth)/logout/logout.spec(mocha).js
diff --git a/app/templates/e2e/account(auth)/signup/signup.po.js b/templates/app/e2e/account(auth)/signup/signup.po.js
similarity index 100%
rename from app/templates/e2e/account(auth)/signup/signup.po.js
rename to templates/app/e2e/account(auth)/signup/signup.po.js
diff --git a/app/templates/e2e/account(auth)/signup/signup.spec(jasmine).js b/templates/app/e2e/account(auth)/signup/signup.spec(jasmine).js
similarity index 100%
rename from app/templates/e2e/account(auth)/signup/signup.spec(jasmine).js
rename to templates/app/e2e/account(auth)/signup/signup.spec(jasmine).js
diff --git a/app/templates/e2e/account(auth)/signup/signup.spec(mocha).js b/templates/app/e2e/account(auth)/signup/signup.spec(mocha).js
similarity index 100%
rename from app/templates/e2e/account(auth)/signup/signup.spec(mocha).js
rename to templates/app/e2e/account(auth)/signup/signup.spec(mocha).js
diff --git a/app/templates/e2e/components/navbar/navbar.po.js b/templates/app/e2e/components/navbar/navbar.po.js
similarity index 100%
rename from app/templates/e2e/components/navbar/navbar.po.js
rename to templates/app/e2e/components/navbar/navbar.po.js
diff --git a/app/templates/e2e/components/oauth-buttons(oauth)/oauth-buttons.po.js b/templates/app/e2e/components/oauth-buttons(oauth)/oauth-buttons.po.js
similarity index 100%
rename from app/templates/e2e/components/oauth-buttons(oauth)/oauth-buttons.po.js
rename to templates/app/e2e/components/oauth-buttons(oauth)/oauth-buttons.po.js
diff --git a/app/templates/e2e/main/main.po.js b/templates/app/e2e/main/main.po.js
similarity index 100%
rename from app/templates/e2e/main/main.po.js
rename to templates/app/e2e/main/main.po.js
diff --git a/app/templates/e2e/main/main.spec(jasmine).js b/templates/app/e2e/main/main.spec(jasmine).js
similarity index 100%
rename from app/templates/e2e/main/main.spec(jasmine).js
rename to templates/app/e2e/main/main.spec(jasmine).js
diff --git a/app/templates/e2e/main/main.spec(mocha).js b/templates/app/e2e/main/main.spec(mocha).js
similarity index 100%
rename from app/templates/e2e/main/main.spec(mocha).js
rename to templates/app/e2e/main/main.spec(mocha).js
diff --git a/app/templates/gulpfile.babel(gulp).js b/templates/app/gulpfile.babel(gulp).js
similarity index 100%
rename from app/templates/gulpfile.babel(gulp).js
rename to templates/app/gulpfile.babel(gulp).js
diff --git a/app/templates/karma.conf.js b/templates/app/karma.conf.js
similarity index 100%
rename from app/templates/karma.conf.js
rename to templates/app/karma.conf.js
diff --git a/app/templates/mocha.conf.js b/templates/app/mocha.conf.js
similarity index 100%
rename from app/templates/mocha.conf.js
rename to templates/app/mocha.conf.js
diff --git a/app/templates/mocha.global(gulp).js b/templates/app/mocha.global(gulp).js
similarity index 100%
rename from app/templates/mocha.global(gulp).js
rename to templates/app/mocha.global(gulp).js
diff --git a/app/templates/protractor.conf.js b/templates/app/protractor.conf.js
similarity index 100%
rename from app/templates/protractor.conf.js
rename to templates/app/protractor.conf.js
diff --git a/app/templates/server/.jshintrc b/templates/app/server/.jshintrc
similarity index 100%
rename from app/templates/server/.jshintrc
rename to templates/app/server/.jshintrc
diff --git a/app/templates/server/.jshintrc-spec b/templates/app/server/.jshintrc-spec
similarity index 100%
rename from app/templates/server/.jshintrc-spec
rename to templates/app/server/.jshintrc-spec
diff --git a/app/templates/server/api/user(auth)/index.js b/templates/app/server/api/user(auth)/index.js
similarity index 100%
rename from app/templates/server/api/user(auth)/index.js
rename to templates/app/server/api/user(auth)/index.js
diff --git a/app/templates/server/api/user(auth)/index.spec.js b/templates/app/server/api/user(auth)/index.spec.js
similarity index 100%
rename from app/templates/server/api/user(auth)/index.spec.js
rename to templates/app/server/api/user(auth)/index.spec.js
diff --git a/app/templates/server/api/user(auth)/user.controller.js b/templates/app/server/api/user(auth)/user.controller.js
similarity index 100%
rename from app/templates/server/api/user(auth)/user.controller.js
rename to templates/app/server/api/user(auth)/user.controller.js
diff --git a/app/templates/server/api/user(auth)/user.events.js b/templates/app/server/api/user(auth)/user.events.js
similarity index 100%
rename from app/templates/server/api/user(auth)/user.events.js
rename to templates/app/server/api/user(auth)/user.events.js
diff --git a/app/templates/server/api/user(auth)/user.integration.js b/templates/app/server/api/user(auth)/user.integration.js
similarity index 100%
rename from app/templates/server/api/user(auth)/user.integration.js
rename to templates/app/server/api/user(auth)/user.integration.js
diff --git a/app/templates/server/api/user(auth)/user.model(mongooseModels).js b/templates/app/server/api/user(auth)/user.model(mongooseModels).js
similarity index 100%
rename from app/templates/server/api/user(auth)/user.model(mongooseModels).js
rename to templates/app/server/api/user(auth)/user.model(mongooseModels).js
diff --git a/app/templates/server/api/user(auth)/user.model(sequelizeModels).js b/templates/app/server/api/user(auth)/user.model(sequelizeModels).js
similarity index 100%
rename from app/templates/server/api/user(auth)/user.model(sequelizeModels).js
rename to templates/app/server/api/user(auth)/user.model(sequelizeModels).js
diff --git a/app/templates/server/api/user(auth)/user.model.spec(mongooseModels).js b/templates/app/server/api/user(auth)/user.model.spec(mongooseModels).js
similarity index 100%
rename from app/templates/server/api/user(auth)/user.model.spec(mongooseModels).js
rename to templates/app/server/api/user(auth)/user.model.spec(mongooseModels).js
diff --git a/app/templates/server/api/user(auth)/user.model.spec(sequelizeModels).js b/templates/app/server/api/user(auth)/user.model.spec(sequelizeModels).js
similarity index 100%
rename from app/templates/server/api/user(auth)/user.model.spec(sequelizeModels).js
rename to templates/app/server/api/user(auth)/user.model.spec(sequelizeModels).js
diff --git a/app/templates/server/app.js b/templates/app/server/app.js
similarity index 100%
rename from app/templates/server/app.js
rename to templates/app/server/app.js
diff --git a/app/templates/server/auth(auth)/auth.service.js b/templates/app/server/auth(auth)/auth.service.js
similarity index 100%
rename from app/templates/server/auth(auth)/auth.service.js
rename to templates/app/server/auth(auth)/auth.service.js
diff --git a/app/templates/server/auth(auth)/facebook(facebookAuth)/index.js b/templates/app/server/auth(auth)/facebook(facebookAuth)/index.js
similarity index 100%
rename from app/templates/server/auth(auth)/facebook(facebookAuth)/index.js
rename to templates/app/server/auth(auth)/facebook(facebookAuth)/index.js
diff --git a/app/templates/server/auth(auth)/facebook(facebookAuth)/passport.js b/templates/app/server/auth(auth)/facebook(facebookAuth)/passport.js
similarity index 100%
rename from app/templates/server/auth(auth)/facebook(facebookAuth)/passport.js
rename to templates/app/server/auth(auth)/facebook(facebookAuth)/passport.js
diff --git a/app/templates/server/auth(auth)/google(googleAuth)/index.js b/templates/app/server/auth(auth)/google(googleAuth)/index.js
similarity index 100%
rename from app/templates/server/auth(auth)/google(googleAuth)/index.js
rename to templates/app/server/auth(auth)/google(googleAuth)/index.js
diff --git a/app/templates/server/auth(auth)/google(googleAuth)/passport.js b/templates/app/server/auth(auth)/google(googleAuth)/passport.js
similarity index 100%
rename from app/templates/server/auth(auth)/google(googleAuth)/passport.js
rename to templates/app/server/auth(auth)/google(googleAuth)/passport.js
diff --git a/app/templates/server/auth(auth)/index.js b/templates/app/server/auth(auth)/index.js
similarity index 100%
rename from app/templates/server/auth(auth)/index.js
rename to templates/app/server/auth(auth)/index.js
diff --git a/app/templates/server/auth(auth)/local/index.js b/templates/app/server/auth(auth)/local/index.js
similarity index 100%
rename from app/templates/server/auth(auth)/local/index.js
rename to templates/app/server/auth(auth)/local/index.js
diff --git a/app/templates/server/auth(auth)/local/passport.js b/templates/app/server/auth(auth)/local/passport.js
similarity index 100%
rename from app/templates/server/auth(auth)/local/passport.js
rename to templates/app/server/auth(auth)/local/passport.js
diff --git a/app/templates/server/auth(auth)/twitter(twitterAuth)/index.js b/templates/app/server/auth(auth)/twitter(twitterAuth)/index.js
similarity index 100%
rename from app/templates/server/auth(auth)/twitter(twitterAuth)/index.js
rename to templates/app/server/auth(auth)/twitter(twitterAuth)/index.js
diff --git a/app/templates/server/auth(auth)/twitter(twitterAuth)/passport.js b/templates/app/server/auth(auth)/twitter(twitterAuth)/passport.js
similarity index 100%
rename from app/templates/server/auth(auth)/twitter(twitterAuth)/passport.js
rename to templates/app/server/auth(auth)/twitter(twitterAuth)/passport.js
diff --git a/app/templates/server/components/errors/index.js b/templates/app/server/components/errors/index.js
similarity index 100%
rename from app/templates/server/components/errors/index.js
rename to templates/app/server/components/errors/index.js
diff --git a/app/templates/server/config/_local.env.js b/templates/app/server/config/_local.env.js
similarity index 100%
rename from app/templates/server/config/_local.env.js
rename to templates/app/server/config/_local.env.js
diff --git a/app/templates/server/config/_local.env.sample.js b/templates/app/server/config/_local.env.sample.js
similarity index 100%
rename from app/templates/server/config/_local.env.sample.js
rename to templates/app/server/config/_local.env.sample.js
diff --git a/app/templates/server/config/environment/development.js b/templates/app/server/config/environment/development.js
similarity index 100%
rename from app/templates/server/config/environment/development.js
rename to templates/app/server/config/environment/development.js
diff --git a/app/templates/server/config/environment/index.js b/templates/app/server/config/environment/index.js
similarity index 100%
rename from app/templates/server/config/environment/index.js
rename to templates/app/server/config/environment/index.js
diff --git a/app/templates/server/config/environment/production.js b/templates/app/server/config/environment/production.js
similarity index 100%
rename from app/templates/server/config/environment/production.js
rename to templates/app/server/config/environment/production.js
diff --git a/app/templates/server/config/environment/shared.js b/templates/app/server/config/environment/shared.js
similarity index 100%
rename from app/templates/server/config/environment/shared.js
rename to templates/app/server/config/environment/shared.js
diff --git a/app/templates/server/config/environment/test.js b/templates/app/server/config/environment/test.js
similarity index 100%
rename from app/templates/server/config/environment/test.js
rename to templates/app/server/config/environment/test.js
diff --git a/app/templates/server/config/express.js b/templates/app/server/config/express.js
similarity index 100%
rename from app/templates/server/config/express.js
rename to templates/app/server/config/express.js
diff --git a/app/templates/server/config/seed(models).js b/templates/app/server/config/seed(models).js
similarity index 100%
rename from app/templates/server/config/seed(models).js
rename to templates/app/server/config/seed(models).js
diff --git a/app/templates/server/config/socketio(socketio).js b/templates/app/server/config/socketio(socketio).js
similarity index 100%
rename from app/templates/server/config/socketio(socketio).js
rename to templates/app/server/config/socketio(socketio).js
diff --git a/app/templates/server/index.js b/templates/app/server/index.js
similarity index 100%
rename from app/templates/server/index.js
rename to templates/app/server/index.js
diff --git a/app/templates/server/routes.js b/templates/app/server/routes.js
similarity index 100%
rename from app/templates/server/routes.js
rename to templates/app/server/routes.js
diff --git a/app/templates/server/sqldb(sequelize)/index.js b/templates/app/server/sqldb(sequelize)/index.js
similarity index 100%
rename from app/templates/server/sqldb(sequelize)/index.js
rename to templates/app/server/sqldb(sequelize)/index.js
diff --git a/app/templates/server/views/404(html).html b/templates/app/server/views/404(html).html
similarity index 100%
rename from app/templates/server/views/404(html).html
rename to templates/app/server/views/404(html).html
diff --git a/app/templates/server/views/404(jade).jade b/templates/app/server/views/404(jade).jade
similarity index 100%
rename from app/templates/server/views/404(jade).jade
rename to templates/app/server/views/404(jade).jade
diff --git a/app/templates/tsconfig.client(ts).json b/templates/app/tsconfig.client(ts).json
similarity index 100%
rename from app/templates/tsconfig.client(ts).json
rename to templates/app/tsconfig.client(ts).json
diff --git a/app/templates/tsconfig.client.test(ts).json b/templates/app/tsconfig.client.test(ts).json
similarity index 100%
rename from app/templates/tsconfig.client.test(ts).json
rename to templates/app/tsconfig.client.test(ts).json
diff --git a/app/templates/tsd(ts).json b/templates/app/tsd(ts).json
similarity index 100%
rename from app/templates/tsd(ts).json
rename to templates/app/tsd(ts).json
diff --git a/app/templates/tsd_test(ts).json b/templates/app/tsd_test(ts).json
similarity index 100%
rename from app/templates/tsd_test(ts).json
rename to templates/app/tsd_test(ts).json
diff --git a/endpoint/templates/basename.controller.js b/templates/endpoint/basename.controller.js
similarity index 100%
rename from endpoint/templates/basename.controller.js
rename to templates/endpoint/basename.controller.js
diff --git a/endpoint/templates/basename.events(models).js b/templates/endpoint/basename.events(models).js
similarity index 100%
rename from endpoint/templates/basename.events(models).js
rename to templates/endpoint/basename.events(models).js
diff --git a/endpoint/templates/basename.integration.js b/templates/endpoint/basename.integration.js
similarity index 100%
rename from endpoint/templates/basename.integration.js
rename to templates/endpoint/basename.integration.js
diff --git a/endpoint/templates/basename.model(mongooseModels).js b/templates/endpoint/basename.model(mongooseModels).js
similarity index 100%
rename from endpoint/templates/basename.model(mongooseModels).js
rename to templates/endpoint/basename.model(mongooseModels).js
diff --git a/endpoint/templates/basename.model(sequelizeModels).js b/templates/endpoint/basename.model(sequelizeModels).js
similarity index 100%
rename from endpoint/templates/basename.model(sequelizeModels).js
rename to templates/endpoint/basename.model(sequelizeModels).js
diff --git a/endpoint/templates/basename.socket(socketio).js b/templates/endpoint/basename.socket(socketio).js
similarity index 100%
rename from endpoint/templates/basename.socket(socketio).js
rename to templates/endpoint/basename.socket(socketio).js
diff --git a/endpoint/templates/index.js b/templates/endpoint/index.js
similarity index 100%
rename from endpoint/templates/index.js
rename to templates/endpoint/index.js
diff --git a/endpoint/templates/index.spec.js b/templates/endpoint/index.spec.js
similarity index 100%
rename from endpoint/templates/index.spec.js
rename to templates/endpoint/index.spec.js
diff --git a/test/test-file-creation.js b/test/test-file-creation.js
index 80ae2538c..5c4c29e5d 100644
--- a/test/test-file-creation.js
+++ b/test/test-file-creation.js
@@ -32,7 +32,7 @@ describe('angular-fullstack generator', function () {
   function generatorTest(generatorType, name, mockPrompt, callback) {
     gen.run(function () {
       var afGenerator;
-      var deps = [path.join('../..', generatorType)];
+      var deps = [path.join('../../generators', generatorType)];
       afGenerator = helpers.createGenerator('angular-fullstack:' + generatorType, deps, [name], {
         skipInstall: true
       });
@@ -351,8 +351,8 @@ describe('angular-fullstack generator', function () {
   beforeEach(function (done) {
     this.timeout(10000);
     var deps = [
-      '../../app',
-      '../../endpoint',
+      '../../generators/app',
+      '../../generators/endpoint',
       [
         helpers.createDummyGenerator(),
         'ng-component:app'
@@ -484,8 +484,8 @@ describe('angular-fullstack generator', function () {
         this.timeout(60000);
         copySync(__dirname + '/fixtures/.yo-rc.json', __dirname + '/temp/.yo-rc.json');
         var gen = helpers.createGenerator('angular-fullstack:app', [
-          '../../app',
-          '../../endpoint',
+          '../../generators/app',
+          '../../generators/endpoint',
           [
             helpers.createDummyGenerator(),
             'ng-component:app'