diff --git a/templates/yeoman/.gitignore b/templates/package-builder/.gitignore
similarity index 100%
rename from templates/yeoman/.gitignore
rename to templates/package-builder/.gitignore
diff --git a/templates/yeoman/README.md b/templates/package-builder/README.md
similarity index 100%
rename from templates/yeoman/README.md
rename to templates/package-builder/README.md
diff --git a/templates/yeoman/package.json b/templates/package-builder/package.json
similarity index 82%
rename from templates/yeoman/package.json
rename to templates/package-builder/package.json
index e97d33f..b61181b 100644
--- a/templates/yeoman/package.json
+++ b/templates/package-builder/package.json
@@ -1,7 +1,7 @@
 {
   "name": "generator-aspnetcore-spa-generator",
   "version": "1.0.0",
-  "description": "Creates the Yeoman generator for ASP.NET Core SPA templates",
+  "description": "Creates the Yeoman generator and 'dotnet new' package for ASP.NET Core SPA templates",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
diff --git a/templates/yeoman/src/build/build.ts b/templates/package-builder/src/build/build.ts
similarity index 98%
rename from templates/yeoman/src/build/build.ts
rename to templates/package-builder/src/build/build.ts
index 72f0f37..546ff89 100644
--- a/templates/yeoman/src/build/build.ts
+++ b/templates/package-builder/src/build/build.ts
@@ -9,7 +9,7 @@ import * as childProcess from 'child_process';
 
 const isWindows = /^win/.test(process.platform);
 const textFileExtensions = ['.gitignore', 'template_gitignore', '.config', '.cs', '.cshtml', 'Dockerfile', '.html', '.js', '.json', '.jsx', '.md', '.nuspec', '.ts', '.tsx', '.xproj'];
-const yeomanGeneratorSource = './src/generator';
+const yeomanGeneratorSource = './src/yeoman';
 
 const templates: { [key: string]: { dir: string, dotNetNewId: string, displayName: string } } = {
     'angular-2': { dir: '../../templates/Angular2Spa/', dotNetNewId: 'Angular', displayName: 'Angular 2' },
@@ -94,7 +94,7 @@ function buildYeomanNpmPackage() {
 
     // Also copy the generator files (that's the compiled .js files, plus all other non-.ts files)
     const tempRoot = './tmp';
-    copyRecursive(path.join(tempRoot, 'generator'), outputRoot, '**/*.js');
+    copyRecursive(path.join(tempRoot, 'yeoman'), outputRoot, '**/*.js');
     copyRecursive(yeomanGeneratorSource, outputRoot, '**/!(*.ts)');
 
     // Clean up
diff --git a/templates/yeoman/src/dotnetnew/Microsoft.AspNetCore.Spa.Templates.nuspec b/templates/package-builder/src/dotnetnew/Microsoft.AspNetCore.Spa.Templates.nuspec
similarity index 100%
rename from templates/yeoman/src/dotnetnew/Microsoft.AspNetCore.Spa.Templates.nuspec
rename to templates/package-builder/src/dotnetnew/Microsoft.AspNetCore.Spa.Templates.nuspec
diff --git a/templates/yeoman/src/generator/.gitignore b/templates/package-builder/src/yeoman/.gitignore
similarity index 100%
rename from templates/yeoman/src/generator/.gitignore
rename to templates/package-builder/src/yeoman/.gitignore
diff --git a/templates/yeoman/src/generator/app/index.ts b/templates/package-builder/src/yeoman/app/index.ts
similarity index 100%
rename from templates/yeoman/src/generator/app/index.ts
rename to templates/package-builder/src/yeoman/app/index.ts
diff --git a/templates/yeoman/src/generator/package.json b/templates/package-builder/src/yeoman/package.json
similarity index 100%
rename from templates/yeoman/src/generator/package.json
rename to templates/package-builder/src/yeoman/package.json
diff --git a/templates/yeoman/tsconfig.json b/templates/package-builder/tsconfig.json
similarity index 100%
rename from templates/yeoman/tsconfig.json
rename to templates/package-builder/tsconfig.json
diff --git a/templates/yeoman/tsd.json b/templates/package-builder/tsd.json
similarity index 100%
rename from templates/yeoman/tsd.json
rename to templates/package-builder/tsd.json
diff --git a/templates/yeoman/typings/gitignore-parser/gitignore-parser.d.ts b/templates/package-builder/typings/gitignore-parser/gitignore-parser.d.ts
similarity index 100%
rename from templates/yeoman/typings/gitignore-parser/gitignore-parser.d.ts
rename to templates/package-builder/typings/gitignore-parser/gitignore-parser.d.ts
diff --git a/templates/yeoman/typings/glob/glob.d.ts b/templates/package-builder/typings/glob/glob.d.ts
similarity index 100%
rename from templates/yeoman/typings/glob/glob.d.ts
rename to templates/package-builder/typings/glob/glob.d.ts
diff --git a/templates/yeoman/typings/lodash/lodash.d.ts b/templates/package-builder/typings/lodash/lodash.d.ts
similarity index 100%
rename from templates/yeoman/typings/lodash/lodash.d.ts
rename to templates/package-builder/typings/lodash/lodash.d.ts
diff --git a/templates/yeoman/typings/minimatch/minimatch.d.ts b/templates/package-builder/typings/minimatch/minimatch.d.ts
similarity index 100%
rename from templates/yeoman/typings/minimatch/minimatch.d.ts
rename to templates/package-builder/typings/minimatch/minimatch.d.ts
diff --git a/templates/yeoman/typings/mkdirp/mkdirp.d.ts b/templates/package-builder/typings/mkdirp/mkdirp.d.ts
similarity index 100%
rename from templates/yeoman/typings/mkdirp/mkdirp.d.ts
rename to templates/package-builder/typings/mkdirp/mkdirp.d.ts
diff --git a/templates/yeoman/typings/node-uuid/node-uuid-base.d.ts b/templates/package-builder/typings/node-uuid/node-uuid-base.d.ts
similarity index 100%
rename from templates/yeoman/typings/node-uuid/node-uuid-base.d.ts
rename to templates/package-builder/typings/node-uuid/node-uuid-base.d.ts
diff --git a/templates/yeoman/typings/node-uuid/node-uuid-cjs.d.ts b/templates/package-builder/typings/node-uuid/node-uuid-cjs.d.ts
similarity index 100%
rename from templates/yeoman/typings/node-uuid/node-uuid-cjs.d.ts
rename to templates/package-builder/typings/node-uuid/node-uuid-cjs.d.ts
diff --git a/templates/yeoman/typings/node-uuid/node-uuid.d.ts b/templates/package-builder/typings/node-uuid/node-uuid.d.ts
similarity index 100%
rename from templates/yeoman/typings/node-uuid/node-uuid.d.ts
rename to templates/package-builder/typings/node-uuid/node-uuid.d.ts
diff --git a/templates/yeoman/typings/node/node.d.ts b/templates/package-builder/typings/node/node.d.ts
similarity index 100%
rename from templates/yeoman/typings/node/node.d.ts
rename to templates/package-builder/typings/node/node.d.ts
diff --git a/templates/yeoman/typings/rimraf/rimraf.d.ts b/templates/package-builder/typings/rimraf/rimraf.d.ts
similarity index 100%
rename from templates/yeoman/typings/rimraf/rimraf.d.ts
rename to templates/package-builder/typings/rimraf/rimraf.d.ts
diff --git a/templates/yeoman/typings/tsd.d.ts b/templates/package-builder/typings/tsd.d.ts
similarity index 100%
rename from templates/yeoman/typings/tsd.d.ts
rename to templates/package-builder/typings/tsd.d.ts
diff --git a/templates/yeoman/typings/yeoman-generator/yeoman-generator.d.ts b/templates/package-builder/typings/yeoman-generator/yeoman-generator.d.ts
similarity index 100%
rename from templates/yeoman/typings/yeoman-generator/yeoman-generator.d.ts
rename to templates/package-builder/typings/yeoman-generator/yeoman-generator.d.ts