diff --git a/module/index.js b/generators/module/index.js
similarity index 97%
rename from module/index.js
rename to generators/module/index.js
index db1ad2d..344cbdc 100644
--- a/module/index.js
+++ b/generators/module/index.js
@@ -1,9 +1,9 @@
 'use strict';
 var yeoman = require('yeoman-generator');
-var utils = require('../utils/utils.js');
 var mkdirp = require('mkdirp');
 
-var sampleAnswers = require('../generators/app/sources/sample-answers.js');
+var utils = require('../../utils/utils.js');
+var sampleAnswers = require('../app/sources/sample-answers.js');
 
 var MGenerator = yeoman.generators.NamedBase.extend({
 
diff --git a/module/templates/_module-debug.spec.js b/generators/module/templates/_module-debug.spec.js
similarity index 100%
rename from module/templates/_module-debug.spec.js
rename to generators/module/templates/_module-debug.spec.js
diff --git a/module/templates/_module.js b/generators/module/templates/_module.js
similarity index 100%
rename from module/templates/_module.js
rename to generators/module/templates/_module.js
diff --git a/module/templates/_module.scss b/generators/module/templates/_module.scss
similarity index 100%
rename from module/templates/_module.scss
rename to generators/module/templates/_module.scss
diff --git a/module/templates/env-dev.json b/generators/module/templates/env-dev.json
similarity index 100%
rename from module/templates/env-dev.json
rename to generators/module/templates/env-dev.json
diff --git a/module/templates/env-prod.json b/generators/module/templates/env-prod.json
similarity index 100%
rename from module/templates/env-prod.json
rename to generators/module/templates/env-prod.json
diff --git a/module/templates/yo.png b/generators/module/templates/yo.png
similarity index 100%
rename from module/templates/yo.png
rename to generators/module/templates/yo.png
diff --git a/test/app.js b/test/app.js
index f5ab7f0..d43cfd2 100644
--- a/test/app.js
+++ b/test/app.js
@@ -17,7 +17,7 @@ describe('m', function () {
     before(function (done) {
       helpers.run(path.join(__dirname, '../generators/app'))
         .withGenerators([ // configure path to subgenerators
-          path.join(__dirname, '../module'),
+          path.join(__dirname, '../generators/module'),
           path.join(__dirname, '../generators/constant'),
           path.join(__dirname, '../generators/controller'),
           path.join(__dirname, '../generators/template'),
@@ -129,7 +129,7 @@ describe('m', function () {
     before(function (done) {
       helpers.run(path.join(__dirname, '../generators/app'))
         .withGenerators([ // configure path to subgenerators
-          path.join(__dirname, '../module'),
+          path.join(__dirname, '../generators/module'),
           path.join(__dirname, '../generators/constant'),
           path.join(__dirname, '../generators/controller'),
           path.join(__dirname, '../generators/template'),
@@ -153,7 +153,7 @@ describe('m', function () {
     before(function (done) {
       helpers.run(path.join(__dirname, '../generators/app'))
         .withGenerators([ // configure path to subgenerators
-          path.join(__dirname, '../module'),
+          path.join(__dirname, '../generators/module'),
           path.join(__dirname, '../generators/constant'),
           path.join(__dirname, '../generators/controller'),
           path.join(__dirname, '../generators/template'),
@@ -177,7 +177,7 @@ describe('m', function () {
     before(function (done) {
       helpers.run(path.join(__dirname, '../generators/app'))
         .withGenerators([ // configure path to  subgenerators
-          path.join(__dirname, '../module'),
+          path.join(__dirname, '../generators/module'),
           path.join(__dirname, '../generators/constant'),
           path.join(__dirname, '../generators/controller'),
           path.join(__dirname, '../generators/template'),
@@ -220,7 +220,7 @@ describe('m', function () {
       helpers.run(path.join(__dirname, '../generators/app'))
         .withOptions({ 'skip-install': true, 'skip-sdk': true, 'skip-prompts': true}) // execute with options
         .withGenerators([ // configure path to  subgenerators
-          path.join(__dirname, '../module'),
+          path.join(__dirname, '../generators/module'),
           path.join(__dirname, '../generators/constant'),
           path.join(__dirname, '../generators/controller'),
           path.join(__dirname, '../generators/template'),
@@ -240,7 +240,7 @@ describe('m', function () {
       helpers.run(path.join(__dirname, '../generators/app'))
         .withOptions({ 'skip-install': true, 'skip-sdk': true, 'skip-prompts': true, 'ios-only': true}) // execute with options
         .withGenerators([ // configure path to  subgenerators
-          path.join(__dirname, '../module'),
+          path.join(__dirname, '../generators/module'),
           path.join(__dirname, '../generators/constant'),
           path.join(__dirname, '../generators/controller'),
           path.join(__dirname, '../generators/template'),
@@ -260,7 +260,7 @@ describe('m', function () {
       helpers.run(path.join(__dirname, '../generators/app'))
         .withOptions({ 'skip-install': true, 'skip-sdk': true, 'skip-prompts': true, 'cordova': false}) // execute with options
         .withGenerators([ // configure path to  subgenerators
-          path.join(__dirname, '../module'),
+          path.join(__dirname, '../generators/module'),
           path.join(__dirname, '../generators/constant'),
           path.join(__dirname, '../generators/controller'),
           path.join(__dirname, '../generators/template'),
diff --git a/test/module.js b/test/module.js
index 52f6713..307e20f 100644
--- a/test/module.js
+++ b/test/module.js
@@ -170,7 +170,7 @@ describe('m:module', function () {
     };
 
     before(function (done) {
-      helpers.run(path.join(__dirname, '../module'))
+      helpers.run(path.join(__dirname, '../generators/module'))
         .withGenerators([ // configure path to  subgenerators
           path.join(__dirname, '../generators/controller'),
           path.join(__dirname, '../generators/template'),
@@ -195,7 +195,7 @@ describe('m:module', function () {
     };
 
     before(function (done) {
-      helpers.run(path.join(__dirname, '../module'))
+      helpers.run(path.join(__dirname, '../generators/module'))
         .withGenerators([ // configure path to  subgenerators
           path.join(__dirname, '../generators/controller'),
           path.join(__dirname, '../generators/template'),
@@ -214,7 +214,7 @@ describe('m:module', function () {
   describe('myModule (no main, tabs)', function () {
 
     before(function (done) {
-      helpers.run(path.join(__dirname, '../module'))
+      helpers.run(path.join(__dirname, '../generators/module'))
         .withGenerators([ // configure path to  subgenerators
           path.join(__dirname, '../generators/controller'),
           path.join(__dirname, '../generators/template'),
@@ -314,7 +314,7 @@ describe('m:module', function () {
     };
 
     before(function (done) {
-      helpers.run(path.join(__dirname, '../module'))
+      helpers.run(path.join(__dirname, '../generators/module'))
         .withGenerators([ // configure path to  subgenerators
           path.join(__dirname, '../generators/controller'),
           path.join(__dirname, '../generators/template'),
@@ -335,7 +335,7 @@ describe('m:module', function () {
   describe('myModule (no main, sidemenu)', function () {
 
     before(function (done) {
-      helpers.run(path.join(__dirname, '../module'))
+      helpers.run(path.join(__dirname, '../generators/module'))
         .withGenerators([ // configure path to  subgenerators
           path.join(__dirname, '../generators/controller'),
           path.join(__dirname, '../generators/template'),
@@ -374,7 +374,7 @@ describe('m:module', function () {
     };
 
     before(function (done) {
-      helpers.run(path.join(__dirname, '../module'))
+      helpers.run(path.join(__dirname, '../generators/module'))
         .withGenerators([ // configure path to subgenerators
           path.join(__dirname, '../generators/controller'),
           path.join(__dirname, '../generators/template'),
@@ -394,7 +394,7 @@ describe('m:module', function () {
 
   describe('myModule (no main, blank)', function () {
     before(function (done) {
-      helpers.run(path.join(__dirname, '../module'))
+      helpers.run(path.join(__dirname, '../generators/module'))
         .withGenerators([ // configure path to subgenerators
           path.join(__dirname, '../generators/controller'),
           path.join(__dirname, '../generators/template'),