diff --git a/.gitignore b/.gitignore
index 900c1cb07d8b..6b471693cad8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -213,4 +213,4 @@ project.lock.json
 __pycache__/
 
 #Mac OSX 
-.DS_Store
\ No newline at end of file
+.DS_Store
diff --git a/aspnetcore/client-side/angular.md b/aspnetcore/client-side/angular.md
index 84b7bf5a9c4c..0694debe23b0 100644
--- a/aspnetcore/client-side/angular.md
+++ b/aspnetcore/client-side/angular.md
@@ -1,8 +1,8 @@
 ---
-title: Using Angular for Single Page Applications (SPAs) | Microsoft Docs
+title: Using AngularJS for Single Page Applications (SPAs) | Microsoft Docs
 author: rick-anderson
 description: Learn how to build a SPA-style ASP.NET application using AngularJS
-keywords: ASP.NET Core, Angular, SPA
+keywords: ASP.NET Core, AngularJS, SPA
 ms.author: riande
 manager: wpickett
 ms.date: 10/14/2016
@@ -12,10 +12,8 @@ ms.technology: aspnet
 ms.prod: aspnet-core
 uid: client-side/angular
 ---
-# Using Angular for Single Page Applications (SPAs)
+# Using AngularJS for Single Page Applications (SPAs)
 
->[!WARNING]
-> This page documents version 1.0.0-rc1 and has not yet been updated for version 1.0.0
 
 By [Venkata Koppaka](http://blog.falafel.com/author/venkata-koppaka/) and [Scott Addie](https://scottaddie.com)
 
@@ -29,7 +27,7 @@ In this article, you will learn how to build a SPA-style ASP.NET application usi
 
 AngularJS is not a DOM manipulation library like jQuery, but it uses a subset of jQuery called jQLite. AngularJS is primarily based on declarative HTML attributes that you can add to your HTML tags. You can try AngularJS in your browser using the [Code School website](https://www.codeschool.com/courses/shaping-up-with-angular-js).
 
-This article focuses on Angular 1.X with some notes on where Angular is heading with 2.0.
+This article focuses on AngularJS with some notes on where Angular is heading.
 
 ## Getting started
 
@@ -41,21 +39,21 @@ There are several ways to add AngularJS to your application. If you’re startin
 
 <a name=angular-bower-json></a>
 
-[!code-json[Main](../client-side/angular/sample/AngularSample/src/AngularSample/bower.json?highlight=9)]
+[!code-json[Main](../client-side/angular/sample/AngularJSSample/src/AngularJSSample/bower.json?highlight=9)]
 
 Upon saving the *bower.json* file, Angular will be installed in your project's *wwwroot/lib* folder. Additionally, it will be listed within the `Dependencies/Bower` folder. See the screenshot below.
 
-![Solution Explorer with Angular Project](angular/_static/angular-solution-explorer.png)
+![Solution Explorer with AngularJS Project](angular/_static/angular-solution-explorer.png)
 
 Next, add a `<script>` reference to the bottom of the `<body>` section of your HTML page or *_Layout.cshtml* file, as shown here:
 
-[!code-html[Main](../client-side/angular/sample/AngularSample/src/AngularSample/Views/Shared/_Layout.cshtml?highlight=4&range=48-52)]
+[!code-html[Main](../client-side/angular/sample/AngularJSSample/src/AngularJSSample/Views/Shared/_Layout.cshtml?highlight=4&range=48-52)]
 
-It's recommended that production applications utilize CDNs for common libraries like Angular. You can reference Angular from one of several CDNs, such as this one:
+It's recommended that production applications utilize CDNs for common libraries like AngularJS. You can reference AngularJS from one of several CDNs, such as this one:
 
-[!code-html[Main](../client-side/angular/sample/AngularSample/src/AngularSample/Views/Shared/_Layout.cshtml?highlight=10&range=53-67)]
+[!code-html[Main](../client-side/angular/sample/AngularJSSample/src/AngularJSSample/Views/Shared/_Layout.cshtml?highlight=10&range=53-67)]
 
-Once you have a reference to the *angular.js* script file, you're ready to begin using Angular in your web pages.
+Once you have a reference to the *angular.js* script file, you're ready to begin using AngularJS in your web pages.
 
 ## Key components
 
@@ -71,7 +69,7 @@ AngularJS uses [directives](https://docs.angularjs.org/guide/directive) to exten
 
 One of the primitive directives used in all AngularJS applications is the `ng-app` directive, which bootstraps the AngularJS application. This directive can be applied to the `<body>` tag or to a child element of the body. Let's see an example in action. Assuming you're in an ASP.NET project, you can either add an HTML file to the `wwwroot` folder, or add a new controller action and an associated view. In this case, I've added a new `Directives` action method to `HomeController.cs`. The associated view is shown here:
 
-[!code-html[Main](../client-side/angular/sample/AngularSample/src/AngularSample/Views/Home/Directives.cshtml?highlight=5,7)]
+[!code-html[Main](../client-side/angular/sample/AngularJSSample/src/AngularJSSample/Views/Home/Directives.cshtml?highlight=5,7)]
 
 To keep these samples independent of one another, I'm not using the shared layout file. You can see that we decorated the body tag with the `ng-app` directive to indicate this page is an AngularJS application. The `{{2+2}}` is an Angular data binding expression that you will learn more about in a moment. Here is the result if you run this application:
 
@@ -105,7 +103,7 @@ AngularJS provides [data binding](https://docs.angularjs.org/guide/databinding)
 
 Create either an HTML file or a controller action with an accompanying view named `Databinding`. Include the following in the view:
 
-[!code-html[Main](../client-side/angular/sample/AngularSample/src/AngularSample/Views/Home/Databinding.cshtml?highlight=8,9,10)]
+[!code-html[Main](../client-side/angular/sample/AngularJSSample/src/AngularJSSample/Views/Home/Databinding.cshtml?highlight=8,9,10)]
 
 Notice that you can display model values using either directives or data binding (`ng-bind`). The resulting page should look like this:
 
@@ -117,7 +115,7 @@ Notice that you can display model values using either directives or data binding
 
 Add another view to demonstrate templates, and add the following to it:
 
-[!code-html[Main](../client-side/angular/sample/AngularSample/src/AngularSample/Views/Home/Templates.cshtml?highlight=8,9,10)]
+[!code-html[Main](../client-side/angular/sample/AngularJSSample/src/AngularJSSample/Views/Home/Templates.cshtml?highlight=8,9,10)]
 
 The template has AngularJS directives like `ng-app`, `ng-init`, `ng-model` and data binding expression syntax to bind the `personName` property. Running in the browser, the view looks like the screenshot below:
 
@@ -133,7 +131,7 @@ If you change the name by typing in the input field, you will see the text next
 
 The AngularJS expressions in the sample below bind `personName` and a simple JavaScript calculated expression:
 
-[!code-html[Main](../client-side/angular/sample/AngularSample/src/AngularSample/Views/Home/Expressions.cshtml?highlight=8,9,10)]
+[!code-html[Main](../client-side/angular/sample/AngularJSSample/src/AngularJSSample/Views/Home/Expressions.cshtml?highlight=8,9,10)]
 
 The example running in the browser displays the `personName` data and the results of the calculation:
 
@@ -143,7 +141,7 @@ The example running in the browser displays the `personName` data and the result
 
 Repeating in AngularJS is done via a primitive directive called `ng-repeat`. The `ng-repeat` directive repeats a given HTML element in a view over the length of a repeating data array. Repeaters in AngularJS can repeat over an array of strings or objects. Here is a sample usage of repeating over an array of strings:
 
-[!code-html[Main](../client-side/angular/sample/AngularSample/src/AngularSample/Views/Home/Repeaters.cshtml?highlight=8,10,11)]
+[!code-html[Main](../client-side/angular/sample/AngularJSSample/src/AngularJSSample/Views/Home/Repeaters.cshtml?highlight=8,10,11)]
 
 The [repeat directive](https://docs.angularjs.org/api/ng/directive/ngRepeat) outputs a series of list items in an unordered list, as you can see in the developer tools shown in this screenshot:
 
@@ -151,7 +149,7 @@ The [repeat directive](https://docs.angularjs.org/api/ng/directive/ngRepeat) out
 
 Here is an example that repeats over an array of objects. The `ng-init` directive establishes a `names` array, where each element is an object containing first and last names. The `ng-repeat` assignment, `name in names`, outputs a list item for every array element.
 
-[!code-html[Main](../client-side/angular/sample/AngularSample/src/AngularSample/Views/Home/Repeaters2.cshtml?highlight=8,9,10,11,13,14)]
+[!code-html[Main](../client-side/angular/sample/AngularJSSample/src/AngularJSSample/Views/Home/Repeaters2.cshtml?highlight=8,9,10,11,13,14)]
 
 The output in this case is the same as in the previous example.
 
@@ -171,7 +169,7 @@ Use `$first` in the `ng-repeat` loop to determine whether the current index in y
 
 Below is a sample that shows `$index`, `$even`, `$odd`, `$first`, and `$last` in action:
 
-[!code-html[Main](../client-side/angular/sample/AngularSample/src/AngularSample/Views/Home/Repeaters3.cshtml?highlight=14,15,16,17,18)]
+[!code-html[Main](../client-side/angular/sample/AngularJSSample/src/AngularJSSample/Views/Home/Repeaters3.cshtml?highlight=14,15,16,17,18)]
 
 Here is the resulting output:
 
@@ -186,13 +184,13 @@ Here is the resulting output:
 
 Below is a simple example showing how to set properties on `$scope` within a separate JavaScript file, *scope.js*:
 
-[!code-html[Main](../client-side/angular/sample/AngularSample/src/AngularSample/wwwroot/app/scope.js?highlight=2,3)]
+[!code-html[Main](../client-side/angular/sample/AngularJSSample/src/AngularJSSample/wwwroot/app/scope.js?highlight=2,3)]
 
 Observe the `$scope` parameter passed to the controller on line 2. This object is what the view knows about. On line 3, we are setting a property called "name" to "Mary Jane".
 
 What happens when a particular property is not found by the view? The view defined below refers to "name" and "age" properties:
 
-[!code-html[Main](../client-side/angular/sample/AngularSample/src/AngularSample/Views/Home/Scope.cshtml?highlight=9,10,14)]
+[!code-html[Main](../client-side/angular/sample/AngularJSSample/src/AngularJSSample/Views/Home/Scope.cshtml?highlight=9,10,14)]
 
 Notice on line 9 that we are asking Angular to show the "name" property using expression syntax. Line 10 then refers to "age", a property that does not exist. The running example shows the name set to "Mary Jane" and nothing for age. Missing properties are ignored.
 
@@ -220,11 +218,11 @@ Use the `ng-app` directive to represent an AngularJS module on the page. To use
 
 Below is a snippet of code that registers a new controller. The `personApp` variable in the snippet references an Angular module, which is defined on line 2.
 
-[!code-javascript[Main](../client-side/angular/sample/AngularSample/src/AngularSample/wwwroot/app/controllers.js?highlight=2,5)]
+[!code-javascript[Main](../client-side/angular/sample/AngularJSSample/src/AngularJSSample/wwwroot/app/controllers.js?highlight=2,5)]
 
 The view using the `ng-controller` directive assigns the controller name:
 
-[!code-html[Main](../client-side/angular/sample/AngularSample/src/AngularSample/Views/Home/Controllers.cshtml?highlight=8,14)]
+[!code-html[Main](../client-side/angular/sample/AngularJSSample/src/AngularJSSample/Views/Home/Controllers.cshtml?highlight=8,14)]
 
 The page shows "Mary" and "Jane" that correspond to the `firstName` and `lastName` properties attached to the `$scope` object:
 
@@ -238,15 +236,15 @@ By using the .component() method, development is simplified gaining the function
 
 Below is a snippet of code that registers a new component. The `personApp` variable in the snippet references an Angular module, which is defined on line 2.
 
-[!code-javascript[Main](../client-side/angular/sample/AngularSample/src/AngularSample/wwwroot/app/components.js?highlight=2,5,13)]
+[!code-javascript[Main](../client-side/angular/sample/AngularJSSample/src/AngularJSSample/wwwroot/app/components.js?highlight=2,5,13)]
 
 The view where we are displaying the custom HTML element.
 
-[!code-html[Main](../client-side/angular/sample/AngularSample/src/AngularSample/Views/Home/Components.cshtml?highlight=8)]
+[!code-html[Main](../client-side/angular/sample/AngularJSSample/src/AngularJSSample/Views/Home/Components.cshtml?highlight=8)]
 
 The associated template used by component:
 
-[!code-html[Main](../client-side/angular/sample/AngularSample/src/AngularSample/wwwroot/app/partials/personcomponent.html?highlight=2,3)]
+[!code-html[Main](../client-side/angular/sample/AngularJSSample/src/AngularJSSample/wwwroot/app/partials/personcomponent.html?highlight=2,3)]
 
 The page shows "Aftab" and "Ansari" that correspond to the `firstName` and `lastName` properties attached to the `vm` object:
 
@@ -258,7 +256,7 @@ The page shows "Aftab" and "Ansari" that correspond to the `firstName` and `last
 
 Below is an example that shows how to use factories in AngularJS:
 
-[!code-javascript[Main](../client-side/angular/sample/AngularSample/src/AngularSample/wwwroot/app/simpleFactory.js?highlight=1)]
+[!code-javascript[Main](../client-side/angular/sample/AngularJSSample/src/AngularJSSample/wwwroot/app/simpleFactory.js?highlight=1)]
 
 To call this factory from the controller, pass `personFactory` as a parameter to the `controller` function:
 
@@ -272,29 +270,29 @@ personApp.controller('personController', function($scope,personFactory) {
 
 Below is an end-to-end example using services in AngularJS to interact with an ASP.NET Core Web API endpoint. The example gets data from the Web API and displays the data in a view template. Let's start with the view first:
 
-[!code-html[Main](../client-side/angular/sample/AngularSample/src/AngularSample/Views/People/Index.cshtml?highlight=5,8,10,17,18,19)]
+[!code-html[Main](../client-side/angular/sample/AngularJSSample/src/AngularJSSample/Views/People/Index.cshtml?highlight=5,8,10,17,18,19)]
 
 In this view, we have an Angular module called `PersonsApp` and a controller called `personController`. We are using `ng-repeat` to iterate over the list of persons. We are referencing three custom JavaScript files on lines 17-19.
 
 The *personApp.js* file is used to register the `PersonsApp` module; and, the syntax is similar to previous examples. We are using the `angular.module` function to create a new instance of the module that we will be working with.
 
-[!code-javascript[Main](../client-side/angular/sample/AngularSample/src/AngularSample/wwwroot/app/personApp.js?highlight=3)]
+[!code-javascript[Main](../client-side/angular/sample/AngularJSSample/src/AngularJSSample/wwwroot/app/personApp.js?highlight=3)]
 
 Let's take a look at *personFactory.js*, below. We are calling the module’s `factory` method to create a factory. Line 12 shows the built-in Angular `$http` service retrieving people information from a web service.
 
-[!code-javascript[Main](../client-side/angular/sample/AngularSample/src/AngularSample/wwwroot/app/personFactory.js?highlight=6,7,12)]
+[!code-javascript[Main](../client-side/angular/sample/AngularJSSample/src/AngularJSSample/wwwroot/app/personFactory.js?highlight=6,7,12)]
 
 In *personController.js*, we are calling the module’s `controller` method to create the controller. The `$scope` object's `people` property is assigned the data returned from the personFactory (line 13).
 
-[!code-javascript[Main](../client-side/angular/sample/AngularSample/src/AngularSample/wwwroot/app/personController.js?highlight=6,7,13)]
+[!code-javascript[Main](../client-side/angular/sample/AngularJSSample/src/AngularJSSample/wwwroot/app/personController.js?highlight=6,7,13)]
 
 Let's take a quick look at the Web API and the model behind it. The `Person` model is a POCO (Plain Old CLR Object) with `Id`, `FirstName`, and `LastName` properties:
 
-[!code-csharp[Main](angular/sample/AngularSample/src/AngularSample/Models/Person.cs)]
+[!code-csharp[Main](angular/sample/AngularJSSample/src/AngularJSSample/Models/Person.cs)]
 
 The `Person` controller returns a JSON-formatted list of `Person` objects:
 
-[!code-csharp[Main](../client-side/angular/sample/AngularSample/src/AngularSample/Controllers/Api/PersonController.cs?highlight=9,10,19)]
+[!code-csharp[Main](../client-side/angular/sample/AngularJSSample/src/AngularJSSample/Controllers/Api/PersonController.cs?highlight=9,10,19)]
 
 Let's see the application in action:
 
@@ -318,23 +316,23 @@ After you install the package, add the script reference (*angular-route.js*) to
 
 Now let's take the Person App we have been building and add navigation to it. First, we will make a copy of the app by creating a new `PeopleController` action called `Spa` and a corresponding `Spa.cshtml` view by copying the Index.cshtml view in the `People` folder. Add a script reference to `angular-route` (see line 11). Also add a `div` marked with the `ng-view` directive (see line 6) as a placeholder to place views in. We are going to be using several additional *.js* files which are referenced on lines 13-16.
 
-[!code-html[Main](../client-side/angular/sample/AngularSample/src/AngularSample/Views/People/Spa.cshtml?highlight=6,11,12,13,14,15,16)]
+[!code-html[Main](../client-side/angular/sample/AngularJSSample/src/AngularJSSample/Views/People/Spa.cshtml?highlight=6,11,12,13,14,15,16)]
 
 Let's take a look at *personModule.js* file to see how we are instantiating the module with routing. We are passing `ngRoute` as a library into the module. This module handles routing in our application.
 
-[!code-javascript[Main](angular/sample/AngularSample/src/AngularSample/wwwroot/app/personModule.js)]
+[!code-javascript[Main](angular/sample/AngularJSSample/src/AngularJSSample/wwwroot/app/personModule.js)]
 
 The *personRoutes.js* file, below, defines routes based on the route provider. Lines 4-7 define navigation by effectively saying, when a URL with `/persons` is requested, use a template called `partials/personlist` by working through `personListController`. Lines 8-11 indicate a detail page with a route parameter of `personId`. If the URL doesn't match one of the patterns, Angular defaults to the `/persons` view.
 
-[!code-javascript[Main](../client-side/angular/sample/AngularSample/src/AngularSample/wwwroot/app/personRoutes.js?highlight=4,5,6,7,8,9,10,11,13)]
+[!code-javascript[Main](../client-side/angular/sample/AngularJSSample/src/AngularJSSample/wwwroot/app/personRoutes.js?highlight=4,5,6,7,8,9,10,11,13)]
 
 The `personlist.html` file is a partial view containing only the HTML needed to display person list.
 
-[!code-html[Main](../client-side/angular/sample/AngularSample/src/AngularSample/wwwroot/app/partials/personlist.html?highlight=3)]
+[!code-html[Main](../client-side/angular/sample/AngularJSSample/src/AngularJSSample/wwwroot/app/partials/personlist.html?highlight=3)]
 
 The controller is defined by using the module's `controller` function in *personListController.js*.
 
-[!code-javascript[Main](../client-side/angular/sample/AngularSample/src/AngularSample/wwwroot/app/personListController.js?highlight=1)]
+[!code-javascript[Main](../client-side/angular/sample/AngularJSSample/src/AngularJSSample/wwwroot/app/personListController.js?highlight=1)]
 
 If we run this application and navigate to the `people/spa#/persons` URL, we will see:
 
@@ -377,13 +375,13 @@ There are a number of directives in AngularJS that add event-handling capabiliti
 
 Let's look at how the `ng-click` event is wired up. Create a new JavaScript file named *eventHandlerController.js*, and add the following to it:
 
-[!code-javascript[Main](../client-side/angular/sample/AngularSample/src/AngularSample/wwwroot/app/eventHandlerController.js?highlight=5,6,7)]
+[!code-javascript[Main](../client-side/angular/sample/AngularJSSample/src/AngularJSSample/wwwroot/app/eventHandlerController.js?highlight=5,6,7)]
 
 Notice the new `sayName` function in `eventHandlerController` on line 5 above. All the method is doing for now is showing a JavaScript alert to the user with a welcome message.
 
 The view below binds a controller function to an AngularJS event. Line 9 has a button on which the `ng-click` Angular directive has been applied. It calls our `sayName` function, which is attached to the `$scope` object passed to this view.
 
-[!code-html[Main](../client-side/angular/sample/AngularSample/src/AngularSample/Views/People/Events.cshtml?highlight=9)]
+[!code-html[Main](../client-side/angular/sample/AngularJSSample/src/AngularJSSample/Views/People/Events.cshtml?highlight=9)]
 
 The running example demonstrates that the controller's `sayName` function is called automatically when the button is clicked.
 
diff --git a/aspnetcore/client-side/angular/sample/AngularSample/AngularSample.sln b/aspnetcore/client-side/angular/sample/AngularJSSample/AngularJSSample.sln
similarity index 80%
rename from aspnetcore/client-side/angular/sample/AngularSample/AngularSample.sln
rename to aspnetcore/client-side/angular/sample/AngularJSSample/AngularJSSample.sln
index b13ba146b96f..6cbaa8fdc552 100644
--- a/aspnetcore/client-side/angular/sample/AngularSample/AngularSample.sln
+++ b/aspnetcore/client-side/angular/sample/AngularJSSample/AngularJSSample.sln
@@ -1,16 +1,13 @@
 ﻿
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.24720.0
+# Visual Studio 15
+VisualStudioVersion = 15.0.26206.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{57C7AF88-2BCA-4CE9-8CBF-149EB8AD89F3}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{E76FCD00-1929-4A8F-A0DA-D615EBF09B0A}"
-	ProjectSection(SolutionItems) = preProject
-		global.json = global.json
-	EndProjectSection
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AngularSample", "src\AngularSample\AngularSample.xproj", "{FCF9D7AE-6AE9-43FD-BC27-87B49CDF7B73}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AngularJSSample", "src\AngularJSSample\AngularJSSample.csproj", "{FCF9D7AE-6AE9-43FD-BC27-87B49CDF7B73}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/.bowerrc b/aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/.bowerrc
similarity index 100%
rename from aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/.bowerrc
rename to aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/.bowerrc
diff --git a/aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/AngularJSSample.csproj b/aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/AngularJSSample.csproj
new file mode 100644
index 000000000000..7355448c6ef0
--- /dev/null
+++ b/aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/AngularJSSample.csproj
@@ -0,0 +1,49 @@
+﻿<Project Sdk="Microsoft.NET.Sdk.Web">
+  <PropertyGroup>
+    <TargetFramework>netcoreapp1.1</TargetFramework>
+    <AssemblyName>AngularJSSample</AssemblyName>
+    <PackageId>AngularJSSample</PackageId>
+	<RuntimeFrameworkVersion>1.1.0</RuntimeFrameworkVersion>
+	<PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;portable-net45+win8</PackageTargetFallback>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Remove="wwwroot\**\*;node_modules" />
+    <EmbeddedResource Remove="wwwroot\**\*;node_modules" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="1.1.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="1.1.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="1.1.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.1.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.1.0" />
+    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.1.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.1.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.0" />
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.1.0" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink.Loader" Version="14.1.0" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="1.1.0-msbuild3-final">
+      <PrivateAssets>All</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="BundlerMinifier.Core" Version="2.2.301" />
+  </ItemGroup>
+
+  <Target Name="PrepublishScript" BeforeTargets="PrepareForPublish">
+     <Exec Command="npm install" />
+    <Exec Command="bower install" />
+    <Exec Command="gulp clean" />
+    <Exec Command="gulp min" />
+  </Target>
+
+  <ItemGroup>
+    <DotNetCliToolReference Include="BundlerMinifier.Core" Version="2.2.301" />
+    <DotNetCliToolReference Include="Microsoft.Extensions.SecretManager.Tools" Version="1.0.0-msbuild3-final" />
+    <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="1.0.0-msbuild3-final" />
+  </ItemGroup>
+  
+</Project>
diff --git a/aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/Controllers/Api/PersonController.cs b/aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/Controllers/Api/PersonController.cs
similarity index 94%
rename from aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/Controllers/Api/PersonController.cs
rename to aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/Controllers/Api/PersonController.cs
index 6c918aa49dde..4560fccbdc9a 100644
--- a/aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/Controllers/Api/PersonController.cs
+++ b/aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/Controllers/Api/PersonController.cs
@@ -1,5 +1,5 @@
 ﻿using AngularSample.Models;
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using System.Collections.Generic;
 
 namespace AngularSample.Controllers.Api
diff --git a/aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/Controllers/HomeController.cs b/aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/Controllers/HomeController.cs
similarity index 97%
rename from aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/Controllers/HomeController.cs
rename to aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/Controllers/HomeController.cs
index 6be26e6fb2b7..20e6d0165559 100644
--- a/aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/Controllers/HomeController.cs
+++ b/aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/Controllers/HomeController.cs
@@ -1,4 +1,4 @@
-﻿using Microsoft.AspNet.Mvc;
+﻿using Microsoft.AspNetCore.Mvc;
 
 namespace AngularSample.Controllers
 {
diff --git a/aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/Controllers/PeopleController.cs b/aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/Controllers/PeopleController.cs
similarity index 91%
rename from aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/Controllers/PeopleController.cs
rename to aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/Controllers/PeopleController.cs
index 63d15cef0809..e26e73ded236 100644
--- a/aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/Controllers/PeopleController.cs
+++ b/aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/Controllers/PeopleController.cs
@@ -1,4 +1,4 @@
-﻿using Microsoft.AspNet.Mvc;
+﻿using Microsoft.AspNetCore.Mvc;
 
 namespace AngularSample.Controllers
 {
diff --git a/aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/Models/Person.cs b/aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/Models/Person.cs
similarity index 100%
rename from aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/Models/Person.cs
rename to aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/Models/Person.cs
diff --git a/aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/Program.cs b/aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/Program.cs
new file mode 100644
index 000000000000..b4894c120f27
--- /dev/null
+++ b/aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/Program.cs
@@ -0,0 +1,25 @@
+﻿using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Builder;
+
+namespace AngularSample
+{
+    public class Program
+    {
+        public static void Main(string[] args)
+        {
+            var host = new WebHostBuilder()
+                .UseKestrel()
+                .UseContentRoot(Directory.GetCurrentDirectory())
+                .UseIISIntegration()
+                .UseStartup<Startup>()
+                .Build();
+
+            host.Run();
+        }
+    }
+}
diff --git a/aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/Properties/launchSettings.json b/aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/Properties/launchSettings.json
similarity index 100%
rename from aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/Properties/launchSettings.json
rename to aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/Properties/launchSettings.json
diff --git a/aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/Startup.cs b/aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/Startup.cs
similarity index 75%
rename from aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/Startup.cs
rename to aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/Startup.cs
index dce477d3b445..c2bda0764c33 100644
--- a/aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/Startup.cs
+++ b/aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/Startup.cs
@@ -1,5 +1,5 @@
-﻿using Microsoft.AspNet.Builder;
-using Microsoft.AspNet.Hosting;
+﻿using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
@@ -10,10 +10,12 @@ public class Startup
     {
         public Startup(IHostingEnvironment env)
         {
-            // Setup configuration sources.
             var builder = new ConfigurationBuilder()
-                .AddJsonFile("appsettings.json")
-                .AddEnvironmentVariables();
+                .SetBasePath(env.ContentRootPath)
+                .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true)
+                .AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true);
+
+            builder.AddEnvironmentVariables();
             Configuration = builder.Build();
         }
 
@@ -29,15 +31,11 @@ public void ConfigureServices(IServiceCollection services)
         // Configure is called after ConfigureServices is called.
         public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory)
         {
-            loggerFactory.MinimumLevel = LogLevel.Information;
             loggerFactory.AddConsole();
+            loggerFactory.AddDebug();
 
-            // Configure the HTTP request pipeline.
-
-            // Add the following to the request pipeline only in development environment.
             if (env.IsDevelopment())
             {
-                app.UseBrowserLink();
                 app.UseDeveloperExceptionPage();
             }
             else
@@ -61,8 +59,5 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
                 // routes.MapWebApiRoute("DefaultApi", "api/{controller}/{id?}");
             });
         }
-
-        // Entry point for the application.
-        public static void Main(string[] args) => WebApplication.Run<Startup>(args);
     }
 }
diff --git a/aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/Views/Home/About.cshtml b/aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/Views/Home/About.cshtml
similarity index 100%
rename from aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/Views/Home/About.cshtml
rename to aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/Views/Home/About.cshtml
diff --git a/aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/Views/Home/Components.cshtml b/aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/Views/Home/Components.cshtml
similarity index 100%
rename from aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/Views/Home/Components.cshtml
rename to aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/Views/Home/Components.cshtml
diff --git a/aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/Views/Home/Contact.cshtml b/aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/Views/Home/Contact.cshtml
similarity index 100%
rename from aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/Views/Home/Contact.cshtml
rename to aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/Views/Home/Contact.cshtml
diff --git a/aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/Views/Home/Controllers.cshtml b/aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/Views/Home/Controllers.cshtml
similarity index 100%
rename from aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/Views/Home/Controllers.cshtml
rename to aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/Views/Home/Controllers.cshtml
diff --git a/aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/Views/Home/Databinding.cshtml b/aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/Views/Home/Databinding.cshtml
similarity index 100%
rename from aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/Views/Home/Databinding.cshtml
rename to aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/Views/Home/Databinding.cshtml
diff --git a/aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/Views/Home/Directives.cshtml b/aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/Views/Home/Directives.cshtml
similarity index 100%
rename from aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/Views/Home/Directives.cshtml
rename to aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/Views/Home/Directives.cshtml
diff --git a/aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/Views/Home/Expressions.cshtml b/aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/Views/Home/Expressions.cshtml
similarity index 100%
rename from aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/Views/Home/Expressions.cshtml
rename to aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/Views/Home/Expressions.cshtml
diff --git a/aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/Views/Home/Index.cshtml b/aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/Views/Home/Index.cshtml
similarity index 100%
rename from aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/Views/Home/Index.cshtml
rename to aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/Views/Home/Index.cshtml
diff --git a/aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/Views/Home/Repeaters.cshtml b/aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/Views/Home/Repeaters.cshtml
similarity index 100%
rename from aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/Views/Home/Repeaters.cshtml
rename to aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/Views/Home/Repeaters.cshtml
diff --git a/aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/Views/Home/Repeaters2.cshtml b/aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/Views/Home/Repeaters2.cshtml
similarity index 100%
rename from aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/Views/Home/Repeaters2.cshtml
rename to aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/Views/Home/Repeaters2.cshtml
diff --git a/aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/Views/Home/Repeaters3.cshtml b/aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/Views/Home/Repeaters3.cshtml
similarity index 100%
rename from aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/Views/Home/Repeaters3.cshtml
rename to aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/Views/Home/Repeaters3.cshtml
diff --git a/aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/Views/Home/Scope.cshtml b/aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/Views/Home/Scope.cshtml
similarity index 100%
rename from aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/Views/Home/Scope.cshtml
rename to aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/Views/Home/Scope.cshtml
diff --git a/aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/Views/Home/Templates.cshtml b/aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/Views/Home/Templates.cshtml
similarity index 100%
rename from aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/Views/Home/Templates.cshtml
rename to aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/Views/Home/Templates.cshtml
diff --git a/aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/Views/People/Events.cshtml b/aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/Views/People/Events.cshtml
similarity index 100%
rename from aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/Views/People/Events.cshtml
rename to aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/Views/People/Events.cshtml
diff --git a/aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/Views/People/Index.cshtml b/aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/Views/People/Index.cshtml
similarity index 100%
rename from aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/Views/People/Index.cshtml
rename to aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/Views/People/Index.cshtml
diff --git a/aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/Views/People/Spa.cshtml b/aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/Views/People/Spa.cshtml
similarity index 100%
rename from aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/Views/People/Spa.cshtml
rename to aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/Views/People/Spa.cshtml
diff --git a/aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/Views/Shared/Error.cshtml b/aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/Views/Shared/Error.cshtml
similarity index 100%
rename from aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/Views/Shared/Error.cshtml
rename to aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/Views/Shared/Error.cshtml
diff --git a/aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/Views/Shared/_Layout.cshtml b/aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/Views/Shared/_Layout.cshtml
similarity index 100%
rename from aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/Views/Shared/_Layout.cshtml
rename to aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/Views/Shared/_Layout.cshtml
diff --git a/aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/Views/_ViewImports.cshtml b/aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/Views/_ViewImports.cshtml
new file mode 100644
index 000000000000..d2ac7ac09de5
--- /dev/null
+++ b/aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/Views/_ViewImports.cshtml
@@ -0,0 +1,3 @@
+﻿@using AngularSample
+@using AngularSample.Models
+@addTagHelper "*, Microsoft.AspNetCore.Mvc.TagHelpers"
diff --git a/aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/Views/_ViewStart.cshtml b/aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/Views/_ViewStart.cshtml
similarity index 100%
rename from aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/Views/_ViewStart.cshtml
rename to aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/Views/_ViewStart.cshtml
diff --git a/aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/appsettings.json b/aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/appsettings.json
similarity index 100%
rename from aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/appsettings.json
rename to aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/appsettings.json
diff --git a/aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/bower.json b/aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/bower.json
similarity index 100%
rename from aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/bower.json
rename to aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/bower.json
diff --git a/aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/gulpfile.js b/aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/gulpfile.js
similarity index 100%
rename from aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/gulpfile.js
rename to aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/gulpfile.js
diff --git a/aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/package.json b/aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/package.json
similarity index 100%
rename from aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/package.json
rename to aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/package.json
diff --git a/aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/wwwroot/_references.js b/aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/wwwroot/_references.js
similarity index 100%
rename from aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/wwwroot/_references.js
rename to aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/wwwroot/_references.js
diff --git a/aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/wwwroot/app/Repeaters2.cshtml b/aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/wwwroot/app/Repeaters2.cshtml
similarity index 100%
rename from aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/wwwroot/app/Repeaters2.cshtml
rename to aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/wwwroot/app/Repeaters2.cshtml
diff --git a/aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/wwwroot/app/components.js b/aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/wwwroot/app/components.js
similarity index 100%
rename from aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/wwwroot/app/components.js
rename to aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/wwwroot/app/components.js
diff --git a/aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/wwwroot/app/controllers.js b/aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/wwwroot/app/controllers.js
similarity index 100%
rename from aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/wwwroot/app/controllers.js
rename to aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/wwwroot/app/controllers.js
diff --git a/aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/wwwroot/app/eventHandlerController.js b/aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/wwwroot/app/eventHandlerController.js
similarity index 100%
rename from aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/wwwroot/app/eventHandlerController.js
rename to aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/wwwroot/app/eventHandlerController.js
diff --git a/aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/wwwroot/app/partials/personcomponent.html b/aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/wwwroot/app/partials/personcomponent.html
similarity index 100%
rename from aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/wwwroot/app/partials/personcomponent.html
rename to aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/wwwroot/app/partials/personcomponent.html
diff --git a/aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/wwwroot/app/partials/persondetail.html b/aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/wwwroot/app/partials/persondetail.html
similarity index 100%
rename from aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/wwwroot/app/partials/persondetail.html
rename to aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/wwwroot/app/partials/persondetail.html
diff --git a/aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/wwwroot/app/partials/personlist.html b/aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/wwwroot/app/partials/personlist.html
similarity index 100%
rename from aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/wwwroot/app/partials/personlist.html
rename to aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/wwwroot/app/partials/personlist.html
diff --git a/aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/wwwroot/app/personApp.js b/aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/wwwroot/app/personApp.js
similarity index 100%
rename from aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/wwwroot/app/personApp.js
rename to aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/wwwroot/app/personApp.js
diff --git a/aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/wwwroot/app/personController.js b/aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/wwwroot/app/personController.js
similarity index 100%
rename from aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/wwwroot/app/personController.js
rename to aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/wwwroot/app/personController.js
diff --git a/aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/wwwroot/app/personDetailController.js b/aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/wwwroot/app/personDetailController.js
similarity index 100%
rename from aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/wwwroot/app/personDetailController.js
rename to aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/wwwroot/app/personDetailController.js
diff --git a/aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/wwwroot/app/personFactory.js b/aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/wwwroot/app/personFactory.js
similarity index 100%
rename from aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/wwwroot/app/personFactory.js
rename to aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/wwwroot/app/personFactory.js
diff --git a/aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/wwwroot/app/personListController.js b/aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/wwwroot/app/personListController.js
similarity index 100%
rename from aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/wwwroot/app/personListController.js
rename to aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/wwwroot/app/personListController.js
diff --git a/aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/wwwroot/app/personModule.js b/aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/wwwroot/app/personModule.js
similarity index 100%
rename from aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/wwwroot/app/personModule.js
rename to aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/wwwroot/app/personModule.js
diff --git a/aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/wwwroot/app/personRoutes.js b/aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/wwwroot/app/personRoutes.js
similarity index 100%
rename from aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/wwwroot/app/personRoutes.js
rename to aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/wwwroot/app/personRoutes.js
diff --git a/aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/wwwroot/app/scope.js b/aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/wwwroot/app/scope.js
similarity index 100%
rename from aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/wwwroot/app/scope.js
rename to aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/wwwroot/app/scope.js
diff --git a/aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/wwwroot/app/simpleFactory.js b/aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/wwwroot/app/simpleFactory.js
similarity index 100%
rename from aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/wwwroot/app/simpleFactory.js
rename to aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/wwwroot/app/simpleFactory.js
diff --git a/aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/wwwroot/css/site.css b/aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/wwwroot/css/site.css
similarity index 100%
rename from aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/wwwroot/css/site.css
rename to aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/wwwroot/css/site.css
diff --git a/aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/wwwroot/favicon.ico b/aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/wwwroot/favicon.ico
similarity index 100%
rename from aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/wwwroot/favicon.ico
rename to aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/wwwroot/favicon.ico
diff --git a/aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/wwwroot/images/ASP-NET-Banners-01.png b/aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/wwwroot/images/ASP-NET-Banners-01.png
similarity index 100%
rename from aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/wwwroot/images/ASP-NET-Banners-01.png
rename to aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/wwwroot/images/ASP-NET-Banners-01.png
diff --git a/aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/wwwroot/images/ASP-NET-Banners-02.png b/aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/wwwroot/images/ASP-NET-Banners-02.png
similarity index 100%
rename from aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/wwwroot/images/ASP-NET-Banners-02.png
rename to aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/wwwroot/images/ASP-NET-Banners-02.png
diff --git a/aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/wwwroot/images/Banner-01-Azure.png b/aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/wwwroot/images/Banner-01-Azure.png
similarity index 100%
rename from aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/wwwroot/images/Banner-01-Azure.png
rename to aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/wwwroot/images/Banner-01-Azure.png
diff --git a/aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/wwwroot/images/Banner-02-VS.png b/aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/wwwroot/images/Banner-02-VS.png
similarity index 100%
rename from aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/wwwroot/images/Banner-02-VS.png
rename to aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/wwwroot/images/Banner-02-VS.png
diff --git a/aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/wwwroot/js/site.js b/aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/wwwroot/js/site.js
similarity index 100%
rename from aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/wwwroot/js/site.js
rename to aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/wwwroot/js/site.js
diff --git a/aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/wwwroot/web.config b/aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/wwwroot/web.config
similarity index 100%
rename from aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/wwwroot/web.config
rename to aspnetcore/client-side/angular/sample/AngularJSSample/src/AngularJSSample/wwwroot/web.config
diff --git a/aspnetcore/client-side/angular/sample/AngularSample/NuGet.Config b/aspnetcore/client-side/angular/sample/AngularSample/NuGet.Config
deleted file mode 100644
index 95143bd09a80..000000000000
--- a/aspnetcore/client-side/angular/sample/AngularSample/NuGet.Config
+++ /dev/null
@@ -1,8 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <packageSources>
-    <!--To inherit the global NuGet package sources remove the <clear/> line below -->
-    <clear />
-    <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
-  </packageSources>
-</configuration>
diff --git a/aspnetcore/client-side/angular/sample/AngularSample/global.json b/aspnetcore/client-side/angular/sample/AngularSample/global.json
deleted file mode 100644
index d25b180bf08c..000000000000
--- a/aspnetcore/client-side/angular/sample/AngularSample/global.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "projects": [ "src", "test" ],
-  "sdk": {
-    "version": "1.0.0-rc1-update1"
-  }
-}
diff --git a/aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/AngularSample.xproj b/aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/AngularSample.xproj
deleted file mode 100644
index c3960c6aabad..000000000000
--- a/aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/AngularSample.xproj
+++ /dev/null
@@ -1,24 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>fcf9d7ae-6ae9-43fd-bc27-87b49cdf7b73</ProjectGuid>
-    <RootNamespace>AngularSample</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-    <DevelopmentServerPort>41176</DevelopmentServerPort>
-  </PropertyGroup>
-  <ItemGroup>
-    <DnxInvisibleContent Include="bower.json" />
-    <DnxInvisibleContent Include=".bowerrc" />
-    <DnxInvisibleContent Include="package.json" />
-  </ItemGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
\ No newline at end of file
diff --git a/aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/Views/_ViewImports.cshtml b/aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/Views/_ViewImports.cshtml
deleted file mode 100644
index df5064faf3a6..000000000000
--- a/aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/Views/_ViewImports.cshtml
+++ /dev/null
@@ -1,3 +0,0 @@
-﻿@using AngularSample
-@using AngularSample.Models
-@addTagHelper "*, Microsoft.AspNet.Mvc.TagHelpers"
diff --git a/aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/project.json b/aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/project.json
deleted file mode 100644
index e3f62f82fcf6..000000000000
--- a/aspnetcore/client-side/angular/sample/AngularSample/src/AngularSample/project.json
+++ /dev/null
@@ -1,43 +0,0 @@
-﻿{
-  "version": "1.0.0-*",
-  "compilationOptions": {
-    "emitEntryPoint": true
-  },
-
-  "dependencies": {
-    "Microsoft.AspNet.Diagnostics": "1.0.0-rc1-final",
-    "Microsoft.AspNet.IISPlatformHandler": "1.0.0-rc1-final",
-    "Microsoft.AspNet.Mvc": "6.0.0-rc1-final",
-    "Microsoft.AspNet.Mvc.TagHelpers": "6.0.0-rc1-final",
-    "Microsoft.AspNet.Server.Kestrel": "1.0.0-rc1-final",
-    "Microsoft.AspNet.StaticFiles": "1.0.0-rc1-final",
-    "Microsoft.AspNet.Tooling.Razor": "1.0.0-rc1-final",
-    "Microsoft.Extensions.Configuration.FileProviderExtensions": "1.0.0-rc1-final",
-    "Microsoft.Extensions.Configuration.Json": "1.0.0-rc1-final",
-    "Microsoft.Extensions.Logging": "1.0.0-rc1-final",
-    "Microsoft.Extensions.Logging.Console": "1.0.0-rc1-final",
-    "Microsoft.Extensions.Logging.Debug": "1.0.0-rc1-final",
-    "Microsoft.VisualStudio.Web.BrowserLink.Loader": "14.0.0-rc1-final"
-  },
-
-  "commands": {
-    "web": "Microsoft.AspNet.Server.Kestrel"
-  },
-
-  "frameworks": {
-    "dnx451": { },
-    "dnxcore50": { }
-  },
-
-  "exclude": [
-    "wwwroot",
-    "node_modules"
-  ],
-  "publishExclude": [
-    "**.user",
-    "**.vspscc"
-  ],
-  "scripts": {
-    "prepublish": [ "npm install", "bower install", "gulp clean", "gulp min" ]
-  }
-}
