diff --git a/packages/schematics/angular/angular-app/helper-files/app.component.html b/packages/schematics/angular/angular-app/helper-files/app.component.html
new file mode 100644
index 0000000000..c102540142
--- /dev/null
+++ b/packages/schematics/angular/angular-app/helper-files/app.component.html
@@ -0,0 +1,21 @@
+<!--The whole content below can be removed with the new code.-->
+<div style="text-align:center">
+  <h1>
+    Welcome to {{title}}!!
+  </h1>
+  <img width="300" src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3RyYXRvciAxOS4xLjAsIFNWRyBFeHBvcnQgUGx1Zy1JbiAuIFNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDApICAtLT4NCjxzdmcgdmVyc2lvbj0iMS4xIiBpZD0iTGF5ZXJfMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgeD0iMHB4IiB5PSIwcHgiDQoJIHZpZXdCb3g9IjAgMCAyNTAgMjUwIiBzdHlsZT0iZW5hYmxlLWJhY2tncm91bmQ6bmV3IDAgMCAyNTAgMjUwOyIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSI+DQo8c3R5bGUgdHlwZT0idGV4dC9jc3MiPg0KCS5zdDB7ZmlsbDojREQwMDMxO30NCgkuc3Qxe2ZpbGw6I0MzMDAyRjt9DQoJLnN0MntmaWxsOiNGRkZGRkY7fQ0KPC9zdHlsZT4NCjxnPg0KCTxwb2x5Z29uIGNsYXNzPSJzdDAiIHBvaW50cz0iMTI1LDMwIDEyNSwzMCAxMjUsMzAgMzEuOSw2My4yIDQ2LjEsMTg2LjMgMTI1LDIzMCAxMjUsMjMwIDEyNSwyMzAgMjAzLjksMTg2LjMgMjE4LjEsNjMuMiAJIi8+DQoJPHBvbHlnb24gY2xhc3M9InN0MSIgcG9pbnRzPSIxMjUsMzAgMTI1LDUyLjIgMTI1LDUyLjEgMTI1LDE1My40IDEyNSwxNTMuNCAxMjUsMjMwIDEyNSwyMzAgMjAzLjksMTg2LjMgMjE4LjEsNjMuMiAxMjUsMzAgCSIvPg0KCTxwYXRoIGNsYXNzPSJzdDIiIGQ9Ik0xMjUsNTIuMUw2Ni44LDE4Mi42aDBoMjEuN2gwbDExLjctMjkuMmg0OS40bDExLjcsMjkuMmgwaDIxLjdoMEwxMjUsNTIuMUwxMjUsNTIuMUwxMjUsNTIuMUwxMjUsNTIuMQ0KCQlMMTI1LDUyLjF6IE0xNDIsMTM1LjRIMTA4bDE3LTQwLjlMMTQyLDEzNS40eiIvPg0KPC9nPg0KPC9zdmc+DQo=" />
+</div>
+<h2>Here are some links to help you start: </h2>
+<ul>
+  <li>
+    <h2><a target="_blank" href="https://angular.io/tutorial">Tour of Heroes</a></h2>
+  </li>
+  <li>
+    <h2><a target="_blank" href="https://github.com/angular/angular-cli/wiki">CLI Documentation</a></h2>
+  </li>
+  <li>
+    <h2><a target="_blank" href="http://angularjs.blogspot.ca/">Angular blog</a></h2>
+  </li>
+</ul>
+<% if (routing) { %>
+<router-outlet></router-outlet><% } %>
diff --git a/packages/schematics/angular/angular-app/index.ts b/packages/schematics/angular/angular-app/index.ts
index e39121807f..f66ecda616 100644
--- a/packages/schematics/angular/angular-app/index.ts
+++ b/packages/schematics/angular/angular-app/index.ts
@@ -8,6 +8,7 @@
 // TODO: replace `options: any` with an actual type generated from the schema.
 // tslint:disable:no-any
 import {
+  MergeStrategy,
   Rule,
   Tree,
   apply,
@@ -76,5 +77,10 @@ export default function (options: any): Rule {
       flat: true,
     }),
     addBootstrapToNgModule(options.directory),
+    mergeWith(
+      apply(url('./helper-files'), [
+        template({ utils: stringUtils, ...options }),
+        move(options.directory + '/' + options.sourceDir + '/app'),
+      ]), MergeStrategy.Overwrite),
   ]);
 };
diff --git a/packages/schematics/angular/component/index.ts b/packages/schematics/angular/component/index.ts
index 67d38c06a0..3e7f68724b 100644
--- a/packages/schematics/angular/component/index.ts
+++ b/packages/schematics/angular/component/index.ts
@@ -27,7 +27,7 @@ import * as stringUtils from '../strings';
 
 import 'rxjs/add/operator/merge';
 import * as ts from 'typescript';
-import {buildRelativePath, findModule} from '../utility/find-module';
+import { buildRelativePath, findModule } from '../utility/find-module';
 
 
 function addDeclarationToNgModule(options: any): Rule {
@@ -36,7 +36,15 @@ function addDeclarationToNgModule(options: any): Rule {
       return host;
     }
 
-    const modulePath = findModule(host, options.sourceDir + '/' + options.path);
+    let modulePath;
+    if (options.module) {
+      if (!host.exists(options.module)) {
+        throw new Error(`Module specified (${options.module}) does not exist.`);
+      }
+      modulePath = options.module;
+    } else {
+      modulePath = findModule(host, options.sourceDir + '/' + options.path);
+    }
 
     const sourceText = host.read(modulePath) !.toString('utf-8');
     const source = ts.createSourceFile(modulePath, sourceText, ts.ScriptTarget.Latest, true);
diff --git a/packages/schematics/angular/component/schema.json b/packages/schematics/angular/component/schema.json
index c98461aab5..48c52200d1 100644
--- a/packages/schematics/angular/component/schema.json
+++ b/packages/schematics/angular/component/schema.json
@@ -68,6 +68,12 @@
     },
     "selector": {
       "type": "string"
+    },
+    "module":  {
+      "type": "string",
+      "description": "Allows specification of the declaring module.",
+      "alias": "m",
+      "subtype": "filepath"
     }
   },
   "required": [