diff --git a/app/controllers/entity-factory.js b/app/controllers/entity-factory.js
deleted file mode 100644
index de2731442faf60c5f793711b1eb358d3ac912dea..0000000000000000000000000000000000000000
--- a/app/controllers/entity-factory.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from 'ember-aws-ehipster/controllers/entity-factory';
diff --git a/app/templates/entity-factory.js b/app/templates/entity-factory.js
deleted file mode 100644
index 8502d099634bce43cbf961863db0022c6ecc618c..0000000000000000000000000000000000000000
--- a/app/templates/entity-factory.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from 'ember-aws-ehipster/templates/entity-factory';
diff --git a/addon/controllers/entity-factory.js b/blueprints/ember-aws-ehipster/files/__root__/controllers/entity-factory.js
similarity index 100%
rename from addon/controllers/entity-factory.js
rename to blueprints/ember-aws-ehipster/files/__root__/controllers/entity-factory.js
diff --git a/addon/styles/ember-aws-ehipster.css b/blueprints/ember-aws-ehipster/files/__root__/styles/ember-aws-ehipster.css
similarity index 100%
rename from addon/styles/ember-aws-ehipster.css
rename to blueprints/ember-aws-ehipster/files/__root__/styles/ember-aws-ehipster.css
diff --git a/addon/templates/entity-factory.hbs b/blueprints/ember-aws-ehipster/files/__root__/templates/entity-factory.hbs
similarity index 85%
rename from addon/templates/entity-factory.hbs
rename to blueprints/ember-aws-ehipster/files/__root__/templates/entity-factory.hbs
index 3976c0770c7d6167a8b000cf165f17282305bb67..4626840297cdd123e5f526b47b34b4b72c6e8ffc 100644
--- a/addon/templates/entity-factory.hbs
+++ b/blueprints/ember-aws-ehipster/files/__root__/templates/entity-factory.hbs
@@ -1,5 +1,5 @@
-<div class="container"> 
-    Available entities : 
+<div class="container">
+    Available entities :
     <select class="ember-select" onchange={{action "selectEntity" value="target.value"}}>
         {{#each entities as |entityChoice|}}
             <option value={{entityChoice}} selected={{eq entity entityChoice}}>{{entityChoice}}</option>
diff --git a/blueprints/ember-aws-ehipster/index.js b/blueprints/ember-aws-ehipster/index.js
index 13ad7a0d0e98fd54cc4591d752c9a2c914a4b751..871e833ccf8b576b9862c6aebec24704ab68ba63 100644
--- a/blueprints/ember-aws-ehipster/index.js
+++ b/blueprints/ember-aws-ehipster/index.js
@@ -14,6 +14,18 @@ module.exports = {
   //     foo: options.entity.options.foo
   //   };
   // }
+  fileMapTokens(options) {
+    return {
+      __root__() {
+        if (options.inDummy) {
+          return 'tests/dummy/app';
+        } else {
+          return 'app';
+        } 
+      },
+      __mirage__() { return '../mirage'}
+    }
+  },
 
   afterInstall(options) {
     // Perform extra work here.
@@ -39,6 +51,12 @@ module.exports = {
     let importcss = "@import 'ember-aws-ehipster.css';\n";
     let fileContents = importcss + fs.readFileSync(stylePath, 'utf-8');
     fs.writeFileSync(stylePath, fileContents, 'utf-8');
+
+    // Add master path for dealing with entities  
+    let routerPath = (options.dummy) ? "tests/dummy/app/router.js" : "app/router.js";
+    let routerLine = "\tthis.route('entity-factory', function() {\n\t});\n";
+    addLineToFile(this, routerPath, /Router\.map\(function\(\) {/, routerLine);
+
   }
 };
 
@@ -46,7 +64,7 @@ function addLineToFile(ctx, filePath, markerString, addedLine) {
   let fileContents = fs.readFileSync(filePath, 'utf-8');
 
   if (fileContents.indexOf(addedLine) === -1) {
-   ctx.ui.writeLine("\tAdd line "+addedLine+" to file "+filePath);
+   //ctx.ui.writeLine("\tAdd line "+addedLine+" to file "+filePath);
    fileContents = fileContents.replace(markerString, [
      '$&',
      addedLine,
diff --git a/blueprints/entity-factory/index.js b/blueprints/entity-factory/index.js
index 9de87424947baafca485a51ba64b5a5934ae2651..220ec00914d19ad3ddf37fc1f3eab1587e20949d 100644
--- a/blueprints/entity-factory/index.js
+++ b/blueprints/entity-factory/index.js
@@ -185,12 +185,12 @@ module.exports = {
 
     // Add route in router.js for the entity page
     let routerPath = (options.dummy) ? "tests/dummy/app/router.js" : "app/router.js";
-    let routeName = '\tthis.route\(\''+blueprintName+'/'+entityName+'\'\);';
-    addLineToFile(this, routerPath, /Router\.map\(function\(\) {/, routeName);
+    let routeName = '\tthis.route\(\''+entityName+'\'\);';
+    addLineToFile(this, routerPath, /this\.route\('entity-factory', function\(\) {/, routeName);
 
     // Add Entity select entry in the entity controller file
     let entityIndexPath = (options.dummy) ? "tests/dummy/app/controllers/entity-factory.js" : "app/controllers/entity-factory.js";
-    let entityIndexEntry= "'"+entityName+"'";
+    let entityIndexEntry= "'"+entityName+"',";
     addLineToFile(this, entityIndexPath, /entities: \[/, entityIndexEntry);
   }
 };
diff --git a/package.json b/package.json
index a896d29c4a6003b794cabbaee7ee5d2b19ae0141..82988c24edadfc2dc7422f4b082114b591bffd1a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-aws-ehipster",
-  "version": "0.2.7",
+  "version": "0.2.18",
   "description": "The default blueprint for ember-cli addons.",
   "keywords": [
     "ember-addon"
@@ -47,6 +47,7 @@
     "ember-cli-shims": "^1.2.0",
     "ember-cli-sri": "^2.1.0",
     "ember-cli-uglify": "^2.0.0",
+    "ember-cli-update": "^0.27.3",
     "ember-disable-prototype-extensions": "^1.1.2",
     "ember-export-application-global": "^2.0.0",
     "ember-load-initializers": "^1.0.0",