diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/.gitignore b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/.gitignore
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/.gitignore
rename to templates/Microsoft.AspNetCore.SpaTemplates/aurelia/.gitignore
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/.template.config/dotnetcli.host.json b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/.template.config/dotnetcli.host.json
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/.template.config/dotnetcli.host.json
rename to templates/Microsoft.AspNetCore.SpaTemplates/aurelia/.template.config/dotnetcli.host.json
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/.template.config/icon.png b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/.template.config/icon.png
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/.template.config/icon.png
rename to templates/Microsoft.AspNetCore.SpaTemplates/aurelia/.template.config/icon.png
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/.template.config/template.json b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/.template.config/template.json
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/.template.config/template.json
rename to templates/Microsoft.AspNetCore.SpaTemplates/aurelia/.template.config/template.json
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/.template.config/vs-2017.3.host.json b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/.template.config/vs-2017.3.host.json
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/.template.config/vs-2017.3.host.json
rename to templates/Microsoft.AspNetCore.SpaTemplates/aurelia/.template.config/vs-2017.3.host.json
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/AureliaSpa.csproj b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/AureliaSpa.csproj
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/AureliaSpa.csproj
rename to templates/Microsoft.AspNetCore.SpaTemplates/aurelia/AureliaSpa.csproj
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/app/app.css b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/app/app.css
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/app/app.css
rename to templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/app/app.css
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/app/app.html b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/app/app.html
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/app/app.html
rename to templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/app/app.html
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/app/app.ts b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/app/app.ts
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/app/app.ts
rename to templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/app/app.ts
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/counter/counter.html b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/counter/counter.html
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/counter/counter.html
rename to templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/counter/counter.html
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/counter/counter.ts b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/counter/counter.ts
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/counter/counter.ts
rename to templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/counter/counter.ts
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/fetchdata/fetchdata.html b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/fetchdata/fetchdata.html
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/fetchdata/fetchdata.html
rename to templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/fetchdata/fetchdata.html
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/fetchdata/fetchdata.ts b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/fetchdata/fetchdata.ts
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/fetchdata/fetchdata.ts
rename to templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/fetchdata/fetchdata.ts
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/home/home.html b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/home/home.html
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/home/home.html
rename to templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/home/home.html
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/home/home.ts b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/home/home.ts
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/home/home.ts
rename to templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/home/home.ts
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/navmenu/navmenu.css b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/navmenu/navmenu.css
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/navmenu/navmenu.css
rename to templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/navmenu/navmenu.css
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/navmenu/navmenu.html b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/navmenu/navmenu.html
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/navmenu/navmenu.html
rename to templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/navmenu/navmenu.html
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/boot.ts b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/boot.ts
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/boot.ts
rename to templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/boot.ts
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Controllers/HomeController.cs b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Controllers/HomeController.cs
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Controllers/HomeController.cs
rename to templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Controllers/HomeController.cs
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Controllers/SampleDataController.cs b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Controllers/SampleDataController.cs
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Controllers/SampleDataController.cs
rename to templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Controllers/SampleDataController.cs
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Program.cs b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Program.cs
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Program.cs
rename to templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Program.cs
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Startup.cs b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Startup.cs
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Startup.cs
rename to templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Startup.cs
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Views/Home/Index.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Views/Home/Index.cshtml
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Views/Home/Index.cshtml
rename to templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Views/Home/Index.cshtml
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Views/Shared/Error.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Views/Shared/Error.cshtml
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Views/Shared/Error.cshtml
rename to templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Views/Shared/Error.cshtml
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Views/Shared/_Layout.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Views/Shared/_Layout.cshtml
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Views/Shared/_Layout.cshtml
rename to templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Views/Shared/_Layout.cshtml
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Views/_ViewImports.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Views/_ViewImports.cshtml
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Views/_ViewImports.cshtml
rename to templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Views/_ViewImports.cshtml
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Views/_ViewStart.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Views/_ViewStart.cshtml
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Views/_ViewStart.cshtml
rename to templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Views/_ViewStart.cshtml
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/appsettings.Development.json b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/appsettings.Development.json
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/appsettings.Development.json
rename to templates/Microsoft.AspNetCore.SpaTemplates/aurelia/appsettings.Development.json
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/appsettings.json b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/appsettings.json
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/appsettings.json
rename to templates/Microsoft.AspNetCore.SpaTemplates/aurelia/appsettings.json
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/npm-shrinkwrap.json b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/npm-shrinkwrap.json
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/npm-shrinkwrap.json
rename to templates/Microsoft.AspNetCore.SpaTemplates/aurelia/npm-shrinkwrap.json
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/package.json b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/package.json
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/package.json
rename to templates/Microsoft.AspNetCore.SpaTemplates/aurelia/package.json
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/tsconfig.json b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/tsconfig.json
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/tsconfig.json
rename to templates/Microsoft.AspNetCore.SpaTemplates/aurelia/tsconfig.json
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/webpack.config.js b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/webpack.config.js
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/webpack.config.js
rename to templates/Microsoft.AspNetCore.SpaTemplates/aurelia/webpack.config.js
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/webpack.config.vendor.js b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/webpack.config.vendor.js
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/webpack.config.vendor.js
rename to templates/Microsoft.AspNetCore.SpaTemplates/aurelia/webpack.config.vendor.js
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/wwwroot/favicon.ico b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/wwwroot/favicon.ico
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/wwwroot/favicon.ico
rename to templates/Microsoft.AspNetCore.SpaTemplates/aurelia/wwwroot/favicon.ico
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/.gitignore b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/.gitignore
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/.gitignore
rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/.gitignore
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/.template.config/dotnetcli.host.json b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/.template.config/dotnetcli.host.json
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/.template.config/dotnetcli.host.json
rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/.template.config/dotnetcli.host.json
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/.template.config/icon.png b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/.template.config/icon.png
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/.template.config/icon.png
rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/.template.config/icon.png
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/.template.config/template.json b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/.template.config/template.json
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/.template.config/template.json
rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/.template.config/template.json
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/.template.config/vs-2017.3.host.json b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/.template.config/vs-2017.3.host.json
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/.template.config/vs-2017.3.host.json
rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/.template.config/vs-2017.3.host.json
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/boot.ts b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/boot.ts
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/boot.ts
rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/boot.ts
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/app-root/app-root.html b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/app-root/app-root.html
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/app-root/app-root.html
rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/app-root/app-root.html
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/app-root/app-root.ts b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/app-root/app-root.ts
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/app-root/app-root.ts
rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/app-root/app-root.ts
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/counter-example/counter-example.html b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/counter-example/counter-example.html
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/counter-example/counter-example.html
rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/counter-example/counter-example.html
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/counter-example/counter-example.ts b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/counter-example/counter-example.ts
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/counter-example/counter-example.ts
rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/counter-example/counter-example.ts
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/fetch-data/fetch-data.html b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/fetch-data/fetch-data.html
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/fetch-data/fetch-data.html
rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/fetch-data/fetch-data.html
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/fetch-data/fetch-data.ts b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/fetch-data/fetch-data.ts
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/fetch-data/fetch-data.ts
rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/fetch-data/fetch-data.ts
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/home-page/home-page.html b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/home-page/home-page.html
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/home-page/home-page.html
rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/home-page/home-page.html
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/home-page/home-page.ts b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/home-page/home-page.ts
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/home-page/home-page.ts
rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/home-page/home-page.ts
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/nav-menu/nav-menu.html b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/nav-menu/nav-menu.html
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/nav-menu/nav-menu.html
rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/nav-menu/nav-menu.html
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/nav-menu/nav-menu.ts b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/nav-menu/nav-menu.ts
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/nav-menu/nav-menu.ts
rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/components/nav-menu/nav-menu.ts
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/css/site.css b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/css/site.css
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/css/site.css
rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/css/site.css
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/router.ts b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/router.ts
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/router.ts
rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/router.ts
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/webpack-component-loader.ts b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/webpack-component-loader.ts
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/webpack-component-loader.ts
rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/ClientApp/webpack-component-loader.ts
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Controllers/HomeController.cs b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/Controllers/HomeController.cs
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Controllers/HomeController.cs
rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/Controllers/HomeController.cs
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Controllers/SampleDataController.cs b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/Controllers/SampleDataController.cs
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Controllers/SampleDataController.cs
rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/Controllers/SampleDataController.cs
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/KnockoutSpa.csproj b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/KnockoutSpa.csproj
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/KnockoutSpa.csproj
rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/KnockoutSpa.csproj
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Program.cs b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/Program.cs
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Program.cs
rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/Program.cs
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Startup.cs b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/Startup.cs
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Startup.cs
rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/Startup.cs
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Views/Home/Index.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/Views/Home/Index.cshtml
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Views/Home/Index.cshtml
rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/Views/Home/Index.cshtml
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Views/Shared/Error.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/Views/Shared/Error.cshtml
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Views/Shared/Error.cshtml
rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/Views/Shared/Error.cshtml
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Views/Shared/_Layout.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/Views/Shared/_Layout.cshtml
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Views/Shared/_Layout.cshtml
rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/Views/Shared/_Layout.cshtml
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Views/_ViewImports.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/Views/_ViewImports.cshtml
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Views/_ViewImports.cshtml
rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/Views/_ViewImports.cshtml
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Views/_ViewStart.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/Views/_ViewStart.cshtml
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Views/_ViewStart.cshtml
rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/Views/_ViewStart.cshtml
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/appsettings.Development.json b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/appsettings.Development.json
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/appsettings.Development.json
rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/appsettings.Development.json
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/appsettings.json b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/appsettings.json
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/appsettings.json
rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/appsettings.json
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/npm-shrinkwrap.json b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/npm-shrinkwrap.json
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/npm-shrinkwrap.json
rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/npm-shrinkwrap.json
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/package.json b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/package.json
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/package.json
rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/package.json
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/tsconfig.json b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/tsconfig.json
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/tsconfig.json
rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/tsconfig.json
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/webpack.config.js b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/webpack.config.js
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/webpack.config.js
rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/webpack.config.js
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/webpack.config.vendor.js b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/webpack.config.vendor.js
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/webpack.config.vendor.js
rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/webpack.config.vendor.js
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/wwwroot/favicon.ico b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/wwwroot/favicon.ico
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/wwwroot/favicon.ico
rename to templates/Microsoft.AspNetCore.SpaTemplates/knockout/wwwroot/favicon.ico
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/.gitignore b/templates/Microsoft.AspNetCore.SpaTemplates/vue/.gitignore
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/.gitignore
rename to templates/Microsoft.AspNetCore.SpaTemplates/vue/.gitignore
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/.template.config/dotnetcli.host.json b/templates/Microsoft.AspNetCore.SpaTemplates/vue/.template.config/dotnetcli.host.json
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/.template.config/dotnetcli.host.json
rename to templates/Microsoft.AspNetCore.SpaTemplates/vue/.template.config/dotnetcli.host.json
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/.template.config/icon.png b/templates/Microsoft.AspNetCore.SpaTemplates/vue/.template.config/icon.png
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/.template.config/icon.png
rename to templates/Microsoft.AspNetCore.SpaTemplates/vue/.template.config/icon.png
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/.template.config/template.json b/templates/Microsoft.AspNetCore.SpaTemplates/vue/.template.config/template.json
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/.template.config/template.json
rename to templates/Microsoft.AspNetCore.SpaTemplates/vue/.template.config/template.json
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/.template.config/vs-2017.3.host.json b/templates/Microsoft.AspNetCore.SpaTemplates/vue/.template.config/vs-2017.3.host.json
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/.template.config/vs-2017.3.host.json
rename to templates/Microsoft.AspNetCore.SpaTemplates/vue/.template.config/vs-2017.3.host.json
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/boot.ts b/templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/boot.ts
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/boot.ts
rename to templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/boot.ts
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/app/app.ts b/templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/app/app.ts
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/app/app.ts
rename to templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/app/app.ts
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/app/app.vue.html b/templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/app/app.vue.html
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/app/app.vue.html
rename to templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/app/app.vue.html
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/counter/counter.ts b/templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/counter/counter.ts
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/counter/counter.ts
rename to templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/counter/counter.ts
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/counter/counter.vue.html b/templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/counter/counter.vue.html
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/counter/counter.vue.html
rename to templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/counter/counter.vue.html
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/fetchdata/fetchdata.ts b/templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/fetchdata/fetchdata.ts
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/fetchdata/fetchdata.ts
rename to templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/fetchdata/fetchdata.ts
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/fetchdata/fetchdata.vue.html b/templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/fetchdata/fetchdata.vue.html
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/fetchdata/fetchdata.vue.html
rename to templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/fetchdata/fetchdata.vue.html
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/home/home.vue.html b/templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/home/home.vue.html
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/home/home.vue.html
rename to templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/home/home.vue.html
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/navmenu/navmenu.css b/templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/navmenu/navmenu.css
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/navmenu/navmenu.css
rename to templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/navmenu/navmenu.css
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/navmenu/navmenu.vue.html b/templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/navmenu/navmenu.vue.html
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/navmenu/navmenu.vue.html
rename to templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/components/navmenu/navmenu.vue.html
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/css/site.css b/templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/css/site.css
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/css/site.css
rename to templates/Microsoft.AspNetCore.SpaTemplates/vue/ClientApp/css/site.css
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Controllers/HomeController.cs b/templates/Microsoft.AspNetCore.SpaTemplates/vue/Controllers/HomeController.cs
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Controllers/HomeController.cs
rename to templates/Microsoft.AspNetCore.SpaTemplates/vue/Controllers/HomeController.cs
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Controllers/SampleDataController.cs b/templates/Microsoft.AspNetCore.SpaTemplates/vue/Controllers/SampleDataController.cs
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Controllers/SampleDataController.cs
rename to templates/Microsoft.AspNetCore.SpaTemplates/vue/Controllers/SampleDataController.cs
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Program.cs b/templates/Microsoft.AspNetCore.SpaTemplates/vue/Program.cs
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Program.cs
rename to templates/Microsoft.AspNetCore.SpaTemplates/vue/Program.cs
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Startup.cs b/templates/Microsoft.AspNetCore.SpaTemplates/vue/Startup.cs
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Startup.cs
rename to templates/Microsoft.AspNetCore.SpaTemplates/vue/Startup.cs
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Views/Home/Index.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/vue/Views/Home/Index.cshtml
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Views/Home/Index.cshtml
rename to templates/Microsoft.AspNetCore.SpaTemplates/vue/Views/Home/Index.cshtml
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Views/Shared/Error.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/vue/Views/Shared/Error.cshtml
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Views/Shared/Error.cshtml
rename to templates/Microsoft.AspNetCore.SpaTemplates/vue/Views/Shared/Error.cshtml
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Views/Shared/_Layout.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/vue/Views/Shared/_Layout.cshtml
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Views/Shared/_Layout.cshtml
rename to templates/Microsoft.AspNetCore.SpaTemplates/vue/Views/Shared/_Layout.cshtml
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Views/_ViewImports.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/vue/Views/_ViewImports.cshtml
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Views/_ViewImports.cshtml
rename to templates/Microsoft.AspNetCore.SpaTemplates/vue/Views/_ViewImports.cshtml
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Views/_ViewStart.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/vue/Views/_ViewStart.cshtml
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Views/_ViewStart.cshtml
rename to templates/Microsoft.AspNetCore.SpaTemplates/vue/Views/_ViewStart.cshtml
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/VueSpa.csproj b/templates/Microsoft.AspNetCore.SpaTemplates/vue/VueSpa.csproj
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/VueSpa.csproj
rename to templates/Microsoft.AspNetCore.SpaTemplates/vue/VueSpa.csproj
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/appsettings.Development.json b/templates/Microsoft.AspNetCore.SpaTemplates/vue/appsettings.Development.json
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/appsettings.Development.json
rename to templates/Microsoft.AspNetCore.SpaTemplates/vue/appsettings.Development.json
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/appsettings.json b/templates/Microsoft.AspNetCore.SpaTemplates/vue/appsettings.json
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/appsettings.json
rename to templates/Microsoft.AspNetCore.SpaTemplates/vue/appsettings.json
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/npm-shrinkwrap.json b/templates/Microsoft.AspNetCore.SpaTemplates/vue/npm-shrinkwrap.json
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/npm-shrinkwrap.json
rename to templates/Microsoft.AspNetCore.SpaTemplates/vue/npm-shrinkwrap.json
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/package.json b/templates/Microsoft.AspNetCore.SpaTemplates/vue/package.json
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/package.json
rename to templates/Microsoft.AspNetCore.SpaTemplates/vue/package.json
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/tsconfig.json b/templates/Microsoft.AspNetCore.SpaTemplates/vue/tsconfig.json
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/tsconfig.json
rename to templates/Microsoft.AspNetCore.SpaTemplates/vue/tsconfig.json
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/webpack.config.js b/templates/Microsoft.AspNetCore.SpaTemplates/vue/webpack.config.js
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/webpack.config.js
rename to templates/Microsoft.AspNetCore.SpaTemplates/vue/webpack.config.js
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/webpack.config.vendor.js b/templates/Microsoft.AspNetCore.SpaTemplates/vue/webpack.config.vendor.js
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/webpack.config.vendor.js
rename to templates/Microsoft.AspNetCore.SpaTemplates/vue/webpack.config.vendor.js
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/wwwroot/favicon.ico b/templates/Microsoft.AspNetCore.SpaTemplates/vue/wwwroot/favicon.ico
similarity index 100%
rename from templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/wwwroot/favicon.ico
rename to templates/Microsoft.AspNetCore.SpaTemplates/vue/wwwroot/favicon.ico
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/.gitignore b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/.gitignore
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/.gitignore
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/.gitignore
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/.template.config/dotnetcli.host.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/.template.config/dotnetcli.host.json
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/.template.config/dotnetcli.host.json
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/.template.config/dotnetcli.host.json
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/.template.config/icon.png b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/.template.config/icon.png
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/.template.config/icon.png
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/.template.config/icon.png
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/.template.config/template.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/.template.config/template.json
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/.template.config/template.json
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/.template.config/template.json
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/.template.config/vs-2017.3.host.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/.template.config/vs-2017.3.host.json
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/.template.config/vs-2017.3.host.json
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/.template.config/vs-2017.3.host.json
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/AngularSpa.csproj b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/AngularSpa.csproj
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/AngularSpa.csproj
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/AngularSpa.csproj
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/app.module.browser.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/app.module.browser.ts
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/app.module.browser.ts
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/app.module.browser.ts
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/app.module.server.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/app.module.server.ts
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/app.module.server.ts
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/app.module.server.ts
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/app.module.shared.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/app.module.shared.ts
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/app.module.shared.ts
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/app.module.shared.ts
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/app/app.component.css b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/app/app.component.css
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/app/app.component.css
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/app/app.component.css
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/app/app.component.html b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/app/app.component.html
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/app/app.component.html
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/app/app.component.html
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/app/app.component.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/app/app.component.ts
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/app/app.component.ts
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/app/app.component.ts
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/counter/counter.component.html b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/counter/counter.component.html
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/counter/counter.component.html
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/counter/counter.component.html
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/counter/counter.component.spec.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/counter/counter.component.spec.ts
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/counter/counter.component.spec.ts
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/counter/counter.component.spec.ts
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/counter/counter.component.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/counter/counter.component.ts
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/counter/counter.component.ts
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/counter/counter.component.ts
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/fetchdata/fetchdata.component.html b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/fetchdata/fetchdata.component.html
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/fetchdata/fetchdata.component.html
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/fetchdata/fetchdata.component.html
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/fetchdata/fetchdata.component.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/fetchdata/fetchdata.component.ts
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/fetchdata/fetchdata.component.ts
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/fetchdata/fetchdata.component.ts
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/home/home.component.html b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/home/home.component.html
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/home/home.component.html
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/home/home.component.html
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/home/home.component.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/home/home.component.ts
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/home/home.component.ts
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/home/home.component.ts
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/navmenu/navmenu.component.css b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/navmenu/navmenu.component.css
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/navmenu/navmenu.component.css
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/navmenu/navmenu.component.css
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/navmenu/navmenu.component.html b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/navmenu/navmenu.component.html
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/navmenu/navmenu.component.html
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/navmenu/navmenu.component.html
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/navmenu/navmenu.component.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/navmenu/navmenu.component.ts
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/navmenu/navmenu.component.ts
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/navmenu/navmenu.component.ts
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/boot.browser.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/boot.browser.ts
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/boot.browser.ts
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/boot.browser.ts
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/boot.server.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/boot.server.ts
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/boot.server.ts
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/boot.server.ts
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/test/boot-tests.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/test/boot-tests.ts
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/test/boot-tests.ts
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/test/boot-tests.ts
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/test/karma.conf.js b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/test/karma.conf.js
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/test/karma.conf.js
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/test/karma.conf.js
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Controllers/HomeController.cs b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/Controllers/HomeController.cs
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Controllers/HomeController.cs
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/Controllers/HomeController.cs
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Controllers/SampleDataController.cs b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/Controllers/SampleDataController.cs
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Controllers/SampleDataController.cs
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/Controllers/SampleDataController.cs
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Program.cs b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/Program.cs
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Program.cs
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/Program.cs
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Startup.cs b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/Startup.cs
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Startup.cs
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/Startup.cs
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Views/Home/Index.cshtml b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/Views/Home/Index.cshtml
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Views/Home/Index.cshtml
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/Views/Home/Index.cshtml
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Views/Shared/Error.cshtml b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/Views/Shared/Error.cshtml
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Views/Shared/Error.cshtml
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/Views/Shared/Error.cshtml
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Views/Shared/_Layout.cshtml b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/Views/Shared/_Layout.cshtml
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Views/Shared/_Layout.cshtml
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/Views/Shared/_Layout.cshtml
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Views/_ViewImports.cshtml b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/Views/_ViewImports.cshtml
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Views/_ViewImports.cshtml
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/Views/_ViewImports.cshtml
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Views/_ViewStart.cshtml b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/Views/_ViewStart.cshtml
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Views/_ViewStart.cshtml
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/Views/_ViewStart.cshtml
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/appsettings.Development.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/appsettings.Development.json
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/appsettings.Development.json
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/appsettings.Development.json
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/appsettings.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/appsettings.json
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/appsettings.json
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/appsettings.json
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/npm-shrinkwrap.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/npm-shrinkwrap.json
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/npm-shrinkwrap.json
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/npm-shrinkwrap.json
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/package.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/package.json
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/package.json
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/package.json
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/tsconfig.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/tsconfig.json
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/tsconfig.json
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/tsconfig.json
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/webpack.config.js b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/webpack.config.js
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/webpack.config.js
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/webpack.config.js
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/webpack.config.vendor.js b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/webpack.config.vendor.js
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/webpack.config.vendor.js
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/webpack.config.vendor.js
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/wwwroot/favicon.ico b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/wwwroot/favicon.ico
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/wwwroot/favicon.ico
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/wwwroot/favicon.ico
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/.gitignore b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/.gitignore
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/.gitignore
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/.gitignore
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/.template.config/dotnetcli.host.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/.template.config/dotnetcli.host.json
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/.template.config/dotnetcli.host.json
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/.template.config/dotnetcli.host.json
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/.template.config/icon.png b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/.template.config/icon.png
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/.template.config/icon.png
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/.template.config/icon.png
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/.template.config/template.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/.template.config/template.json
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/.template.config/template.json
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/.template.config/template.json
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/.template.config/vs-2017.3.host.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/.template.config/vs-2017.3.host.json
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/.template.config/vs-2017.3.host.json
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/.template.config/vs-2017.3.host.json
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ClientApp/boot.tsx b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/ClientApp/boot.tsx
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ClientApp/boot.tsx
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/ClientApp/boot.tsx
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ClientApp/components/Counter.tsx b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/ClientApp/components/Counter.tsx
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ClientApp/components/Counter.tsx
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/ClientApp/components/Counter.tsx
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ClientApp/components/FetchData.tsx b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/ClientApp/components/FetchData.tsx
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ClientApp/components/FetchData.tsx
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/ClientApp/components/FetchData.tsx
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ClientApp/components/Home.tsx b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/ClientApp/components/Home.tsx
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ClientApp/components/Home.tsx
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/ClientApp/components/Home.tsx
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ClientApp/components/Layout.tsx b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/ClientApp/components/Layout.tsx
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ClientApp/components/Layout.tsx
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/ClientApp/components/Layout.tsx
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ClientApp/components/NavMenu.tsx b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/ClientApp/components/NavMenu.tsx
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ClientApp/components/NavMenu.tsx
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/ClientApp/components/NavMenu.tsx
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ClientApp/css/site.css b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/ClientApp/css/site.css
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ClientApp/css/site.css
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/ClientApp/css/site.css
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ClientApp/routes.tsx b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/ClientApp/routes.tsx
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ClientApp/routes.tsx
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/ClientApp/routes.tsx
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Controllers/HomeController.cs b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/Controllers/HomeController.cs
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Controllers/HomeController.cs
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/Controllers/HomeController.cs
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Controllers/SampleDataController.cs b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/Controllers/SampleDataController.cs
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Controllers/SampleDataController.cs
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/Controllers/SampleDataController.cs
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Program.cs b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/Program.cs
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Program.cs
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/Program.cs
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ReactSpa.csproj b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/ReactSpa.csproj
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ReactSpa.csproj
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/ReactSpa.csproj
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Startup.cs b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/Startup.cs
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Startup.cs
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/Startup.cs
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Views/Home/Index.cshtml b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/Views/Home/Index.cshtml
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Views/Home/Index.cshtml
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/Views/Home/Index.cshtml
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Views/Shared/Error.cshtml b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/Views/Shared/Error.cshtml
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Views/Shared/Error.cshtml
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/Views/Shared/Error.cshtml
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Views/Shared/_Layout.cshtml b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/Views/Shared/_Layout.cshtml
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Views/Shared/_Layout.cshtml
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/Views/Shared/_Layout.cshtml
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Views/_ViewImports.cshtml b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/Views/_ViewImports.cshtml
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Views/_ViewImports.cshtml
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/Views/_ViewImports.cshtml
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Views/_ViewStart.cshtml b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/Views/_ViewStart.cshtml
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Views/_ViewStart.cshtml
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/Views/_ViewStart.cshtml
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/appsettings.Development.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/appsettings.Development.json
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/appsettings.Development.json
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/appsettings.Development.json
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/appsettings.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/appsettings.json
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/appsettings.json
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/appsettings.json
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/npm-shrinkwrap.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/npm-shrinkwrap.json
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/npm-shrinkwrap.json
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/npm-shrinkwrap.json
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/package.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/package.json
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/package.json
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/package.json
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/tsconfig.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/tsconfig.json
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/tsconfig.json
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/tsconfig.json
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/webpack.config.js b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/webpack.config.js
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/webpack.config.js
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/webpack.config.js
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/webpack.config.vendor.js b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/webpack.config.vendor.js
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/webpack.config.vendor.js
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/webpack.config.vendor.js
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/wwwroot/favicon.ico b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/wwwroot/favicon.ico
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/wwwroot/favicon.ico
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/react/wwwroot/favicon.ico
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/.gitignore b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/.gitignore
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/.gitignore
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/.gitignore
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/.template.config/dotnetcli.host.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/.template.config/dotnetcli.host.json
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/.template.config/dotnetcli.host.json
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/.template.config/dotnetcli.host.json
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/.template.config/icon.png b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/.template.config/icon.png
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/.template.config/icon.png
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/.template.config/icon.png
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/.template.config/template.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/.template.config/template.json
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/.template.config/template.json
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/.template.config/template.json
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/.template.config/vs-2017.3.host.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/.template.config/vs-2017.3.host.json
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/.template.config/vs-2017.3.host.json
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/.template.config/vs-2017.3.host.json
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/boot-client.tsx b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/ClientApp/boot-client.tsx
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/boot-client.tsx
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/ClientApp/boot-client.tsx
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/boot-server.tsx b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/ClientApp/boot-server.tsx
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/boot-server.tsx
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/ClientApp/boot-server.tsx
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/components/Counter.tsx b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/ClientApp/components/Counter.tsx
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/components/Counter.tsx
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/ClientApp/components/Counter.tsx
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/components/FetchData.tsx b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/ClientApp/components/FetchData.tsx
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/components/FetchData.tsx
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/ClientApp/components/FetchData.tsx
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/components/Home.tsx b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/ClientApp/components/Home.tsx
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/components/Home.tsx
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/ClientApp/components/Home.tsx
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/components/Layout.tsx b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/ClientApp/components/Layout.tsx
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/components/Layout.tsx
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/ClientApp/components/Layout.tsx
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/components/NavMenu.tsx b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/ClientApp/components/NavMenu.tsx
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/components/NavMenu.tsx
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/ClientApp/components/NavMenu.tsx
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/configureStore.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/ClientApp/configureStore.ts
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/configureStore.ts
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/ClientApp/configureStore.ts
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/css/site.css b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/ClientApp/css/site.css
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/css/site.css
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/ClientApp/css/site.css
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/routes.tsx b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/ClientApp/routes.tsx
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/routes.tsx
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/ClientApp/routes.tsx
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/store/Counter.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/ClientApp/store/Counter.ts
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/store/Counter.ts
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/ClientApp/store/Counter.ts
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/store/WeatherForecasts.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/ClientApp/store/WeatherForecasts.ts
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/store/WeatherForecasts.ts
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/ClientApp/store/WeatherForecasts.ts
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/store/index.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/ClientApp/store/index.ts
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/store/index.ts
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/ClientApp/store/index.ts
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Controllers/HomeController.cs b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/Controllers/HomeController.cs
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Controllers/HomeController.cs
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/Controllers/HomeController.cs
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Controllers/SampleDataController.cs b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/Controllers/SampleDataController.cs
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Controllers/SampleDataController.cs
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/Controllers/SampleDataController.cs
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Program.cs b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/Program.cs
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Program.cs
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/Program.cs
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ReactReduxSpa.csproj b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/ReactReduxSpa.csproj
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ReactReduxSpa.csproj
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/ReactReduxSpa.csproj
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Startup.cs b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/Startup.cs
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Startup.cs
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/Startup.cs
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Views/Home/Index.cshtml b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/Views/Home/Index.cshtml
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Views/Home/Index.cshtml
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/Views/Home/Index.cshtml
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Views/Shared/Error.cshtml b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/Views/Shared/Error.cshtml
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Views/Shared/Error.cshtml
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/Views/Shared/Error.cshtml
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Views/Shared/_Layout.cshtml b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/Views/Shared/_Layout.cshtml
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Views/Shared/_Layout.cshtml
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/Views/Shared/_Layout.cshtml
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Views/_ViewImports.cshtml b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/Views/_ViewImports.cshtml
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Views/_ViewImports.cshtml
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/Views/_ViewImports.cshtml
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Views/_ViewStart.cshtml b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/Views/_ViewStart.cshtml
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Views/_ViewStart.cshtml
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/Views/_ViewStart.cshtml
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/appsettings.Development.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/appsettings.Development.json
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/appsettings.Development.json
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/appsettings.Development.json
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/appsettings.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/appsettings.json
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/appsettings.json
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/appsettings.json
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/npm-shrinkwrap.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/npm-shrinkwrap.json
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/npm-shrinkwrap.json
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/npm-shrinkwrap.json
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/package.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/package.json
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/package.json
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/package.json
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/tsconfig.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/tsconfig.json
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/tsconfig.json
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/tsconfig.json
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/webpack.config.js b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/webpack.config.js
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/webpack.config.js
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/webpack.config.js
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/webpack.config.vendor.js b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/webpack.config.vendor.js
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/webpack.config.vendor.js
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/webpack.config.vendor.js
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/wwwroot/favicon.ico b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/wwwroot/favicon.ico
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/wwwroot/favicon.ico
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/redux/wwwroot/favicon.ico