diff --git a/MusicStore.sln b/MusicStore.sln
index e5a1419ef9..c62bc5a6c8 100644
--- a/MusicStore.sln
+++ b/MusicStore.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.22125.1
+VisualStudioVersion = 14.0.22112.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{44621553-AA7D-4893-8834-79582A7D8348}"
 EndProject
@@ -12,8 +12,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B7B176B6-8D4D-4EF1-BBD2-DDA650C78FFF}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "MusicStore.Spa", "src\MusicStore.Spa\MusicStore.Spa.kproj", "{9BCEB29B-7E09-4B4C-A466-498EFC602331}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvcMusicStore", "src\MvcMusicStore\MvcMusicStore.csproj", "{25CE8290-EF24-4818-B009-68DC903163D3}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvcMusicStore.Spa", "src\MvcMusicStore.Spa\MvcMusicStore.Spa.csproj", "{408AC102-7FB1-4ADD-A16A-9AACBAFFC2F7}"
@@ -24,6 +22,8 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "E2ETests", "test\E2ETests\E
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "MusicStore", "src\MusicStore\MusicStore.kproj", "{3CFBED5D-2ED8-49DB-96FB-BDAA748DC5A0}"
 EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "MusicStore.Spa", "src\MusicStore.Spa\MusicStore.Spa.kproj", "{93891170-A8D5-46FD-A291-40F90CF258C2}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -34,16 +34,6 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{9BCEB29B-7E09-4B4C-A466-498EFC602331}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9BCEB29B-7E09-4B4C-A466-498EFC602331}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9BCEB29B-7E09-4B4C-A466-498EFC602331}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{9BCEB29B-7E09-4B4C-A466-498EFC602331}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{9BCEB29B-7E09-4B4C-A466-498EFC602331}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{9BCEB29B-7E09-4B4C-A466-498EFC602331}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9BCEB29B-7E09-4B4C-A466-498EFC602331}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9BCEB29B-7E09-4B4C-A466-498EFC602331}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{9BCEB29B-7E09-4B4C-A466-498EFC602331}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{9BCEB29B-7E09-4B4C-A466-498EFC602331}.Release|x86.ActiveCfg = Release|Any CPU
 		{25CE8290-EF24-4818-B009-68DC903163D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{25CE8290-EF24-4818-B009-68DC903163D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{25CE8290-EF24-4818-B009-68DC903163D3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -84,15 +74,25 @@ Global
 		{3CFBED5D-2ED8-49DB-96FB-BDAA748DC5A0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{3CFBED5D-2ED8-49DB-96FB-BDAA748DC5A0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{3CFBED5D-2ED8-49DB-96FB-BDAA748DC5A0}.Release|x86.ActiveCfg = Release|Any CPU
+		{93891170-A8D5-46FD-A291-40F90CF258C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{93891170-A8D5-46FD-A291-40F90CF258C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{93891170-A8D5-46FD-A291-40F90CF258C2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{93891170-A8D5-46FD-A291-40F90CF258C2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{93891170-A8D5-46FD-A291-40F90CF258C2}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{93891170-A8D5-46FD-A291-40F90CF258C2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{93891170-A8D5-46FD-A291-40F90CF258C2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{93891170-A8D5-46FD-A291-40F90CF258C2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{93891170-A8D5-46FD-A291-40F90CF258C2}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{93891170-A8D5-46FD-A291-40F90CF258C2}.Release|x86.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{9BCEB29B-7E09-4B4C-A466-498EFC602331} = {B7B176B6-8D4D-4EF1-BBD2-DDA650C78FFF}
 		{25CE8290-EF24-4818-B009-68DC903163D3} = {B7B176B6-8D4D-4EF1-BBD2-DDA650C78FFF}
 		{408AC102-7FB1-4ADD-A16A-9AACBAFFC2F7} = {B7B176B6-8D4D-4EF1-BBD2-DDA650C78FFF}
 		{A319ACCE-060B-4385-9534-9F2202F6180E} = {363D2681-31A6-48C9-90BB-9ACFF4A41F06}
 		{3CFBED5D-2ED8-49DB-96FB-BDAA748DC5A0} = {B7B176B6-8D4D-4EF1-BBD2-DDA650C78FFF}
+		{93891170-A8D5-46FD-A291-40F90CF258C2} = {B7B176B6-8D4D-4EF1-BBD2-DDA650C78FFF}
 	EndGlobalSection
 EndGlobal
diff --git a/src/MusicStore.Spa/MusicStore.Spa.kproj b/src/MusicStore.Spa/MusicStore.Spa.kproj
index 8c818cba3c..0f32db022b 100644
--- a/src/MusicStore.Spa/MusicStore.Spa.kproj
+++ b/src/MusicStore.Spa/MusicStore.Spa.kproj
@@ -1,208 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="__ToolsVersion__" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">12.0</VisualStudioVersion>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
   </PropertyGroup>
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-  </PropertyGroup>
   <Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
-    <ProjectGuid>9bceb29b-7e09-4b4c-a466-498efc602331</ProjectGuid>
+    <ProjectGuid>93891170-a8d5-46fd-a291-40f90cf258c2</ProjectGuid>
     <OutputType>Web</OutputType>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'" Label="Configuration">
   </PropertyGroup>
-  <PropertyGroup Label="Configuration">
-    <RootNamespace>MusicStore</RootNamespace>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'" Label="Configuration">
   </PropertyGroup>
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
+    <DevelopmentServerPort>5001</DevelopmentServerPort>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <DevelopmentServerPort>2452</DevelopmentServerPort>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="Apis\AlbumsApiController.cs" />
-    <Compile Include="Apis\ArtistsApiController.cs" />
-    <Compile Include="Apis\GenresApiController.cs" />
-    <Compile Include="Controllers\AccountController.cs" />
-    <Compile Include="Controllers\HomeController.cs" />
-    <Compile Include="Controllers\TemplateController.cs" />
-    <Compile Include="Helpers\AngularExtensions.cs" />
-    <Compile Include="Helpers\AngularHtmlHelper%27T.cs" />
-    <Compile Include="Helpers\GeneralExtensions.cs" />
-    <Compile Include="Helpers\JsonExtensions.cs" />
-    <Compile Include="Infrastructure\ApiResult.cs" />
-    <Compile Include="Infrastructure\ForcedModelError.cs" />
-    <Compile Include="Infrastructure\PagedList.cs" />
-    <Compile Include="Infrastructure\SmartJsonResult.cs" />
-    <Compile Include="Infrastructure\SortDirection.cs" />
-    <Compile Include="Infrastructure\SortExpression.cs" />
-    <Compile Include="Models\AccountViewModels.cs" />
-    <Compile Include="Models\Album.cs" />
-    <Compile Include="Models\Artist.cs" />
-    <Compile Include="Models\CartItem.cs" />
-    <Compile Include="Models\Genre.cs" />
-    <Compile Include="Models\IdentityModels.cs" />
-    <Compile Include="Models\MusicStoreContext.cs" />
-    <Compile Include="Models\Order.cs" />
-    <Compile Include="Models\OrderDetail.cs" />
-    <Compile Include="Models\SampleData.cs" />
-    <Compile Include="Models\ShoppingCart.cs" />
-    <Compile Include="Startup.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="bower.json" />
-    <Content Include="Client\favicon.ico" />
-    <Content Include="Client\images\home-showcase.png" />
-    <Content Include="Client\images\logo.png" />
-    <Content Include="Client\images\logo.svg" />
-    <Content Include="Client\images\placeholder.png" />
-    <Content Include="Client\images\placeholder.svg" />
-    <Content Include="Client\ng-apps\components\AlbumApi\AlbumApiService.ts" />
-    <Content Include="Client\ng-apps\components\ArtistApi\ArtistApiService.ts" />
-    <Content Include="Client\ng-apps\components\GenreApi\GenreApiService.ts" />
-    <Content Include="Client\ng-apps\components\GenreMenu\GenreMenuController.ts" />
-    <Content Include="Client\ng-apps\components\GenreMenu\GenreMenuDirective.ts" />
-    <Content Include="Client\ng-apps\components\InlineData\InlineDataDirective.ts" />
-    <Content Include="Client\ng-apps\components\LoginLink\LoginLinkDirective.ts" />
-    <Content Include="Client\ng-apps\components\Models\IAlbum.ts" />
-    <Content Include="Client\ng-apps\components\Models\IAlert.ts" />
-    <Content Include="Client\ng-apps\components\Models\IApiResult.ts" />
-    <Content Include="Client\ng-apps\components\Models\IArtist.ts" />
-    <Content Include="Client\ng-apps\components\Models\IGenre.ts" />
-    <Content Include="Client\ng-apps\components\Models\IGenreLookup.ts" />
-    <Content Include="Client\ng-apps\components\Models\IModelError.ts" />
-    <Content Include="Client\ng-apps\components\Models\IPagedList.ts" />
-    <Content Include="Client\ng-apps\components\Models\IUserDetails.ts" />
-    <Content Include="Client\ng-apps\components\PreventSubmit\PreventSubmitDirective.ts" />
-    <Content Include="Client\ng-apps\components\TitleCase\TitleCaseFilter.ts" />
-    <Content Include="Client\ng-apps\components\Truncate\TruncateFilter.ts" />
-    <Content Include="Client\ng-apps\components\UrlResolver\UrlResolverService.ts" />
-    <Content Include="Client\ng-apps\components\UserDetails\UserDetailsService.ts" />
-    <Content Include="Client\ng-apps\components\ViewMessage\ViewAlertService.ts" />
-    <Content Include="Client\ng-apps\components\Visited\VisitedDirective.ts" />
-    <Content Include="Client\ng-apps\MusicStore.Admin\Catalog\AlbumDeleteModalController.ts" />
-    <Content Include="Client\ng-apps\MusicStore.Admin\Catalog\AlbumDetailsController.ts" />
-    <Content Include="Client\ng-apps\MusicStore.Admin\Catalog\AlbumEditController.ts" />
-    <Content Include="Client\ng-apps\MusicStore.Admin\Catalog\AlbumListController.ts" />
-    <Content Include="Client\ng-apps\MusicStore.Admin\MusicStore.Admin.app.ts" />
-    <Content Include="Client\ng-apps\MusicStore.Store\Catalog\AlbumDetailsController.ts" />
-    <Content Include="Client\ng-apps\MusicStore.Store\Catalog\GenreDetailsController.ts" />
-    <Content Include="Client\ng-apps\MusicStore.Store\Catalog\GenreListController.ts" />
-    <Content Include="Client\ng-apps\MusicStore.Store\Home\HomeController.ts" />
-    <Content Include="Client\ng-apps\MusicStore.Store\MusicStore.Store.app.ts" />
-    <Content Include="Client\ng-apps\references.ts" />
-    <TypeScriptCompile Include="Client\ng-apps\components\AlbumApi\AlbumApiService.ts" />
-    <TypeScriptCompile Include="Client\ng-apps\components\ArtistApi\ArtistApiService.ts" />
-    <TypeScriptCompile Include="Client\ng-apps\components\GenreApi\GenreApiService.ts" />
-    <TypeScriptCompile Include="Client\ng-apps\components\GenreMenu\GenreMenuController.ts" />
-    <TypeScriptCompile Include="Client\ng-apps\components\GenreMenu\GenreMenuDirective.ts" />
-    <TypeScriptCompile Include="Client\ng-apps\components\InlineData\InlineDataDirective.ts" />
-    <TypeScriptCompile Include="Client\ng-apps\components\LoginLink\LoginLinkDirective.ts" />
-    <TypeScriptCompile Include="Client\ng-apps\components\Models\IAlbum.ts" />
-    <TypeScriptCompile Include="Client\ng-apps\components\Models\IAlert.ts" />
-    <TypeScriptCompile Include="Client\ng-apps\components\Models\IApiResult.ts" />
-    <TypeScriptCompile Include="Client\ng-apps\components\Models\IArtist.ts" />
-    <TypeScriptCompile Include="Client\ng-apps\components\Models\IGenre.ts" />
-    <TypeScriptCompile Include="Client\ng-apps\components\Models\IGenreLookup.ts" />
-    <TypeScriptCompile Include="Client\ng-apps\components\Models\IModelError.ts" />
-    <TypeScriptCompile Include="Client\ng-apps\components\Models\IPagedList.ts" />
-    <TypeScriptCompile Include="Client\ng-apps\components\Models\IUserDetails.ts" />
-    <TypeScriptCompile Include="Client\ng-apps\components\PreventSubmit\PreventSubmitDirective.ts" />
-    <TypeScriptCompile Include="Client\ng-apps\components\TitleCase\TitleCaseFilter.ts" />
-    <TypeScriptCompile Include="Client\ng-apps\components\Truncate\TruncateFilter.ts" />
-    <TypeScriptCompile Include="Client\ng-apps\components\UrlResolver\UrlResolverService.ts" />
-    <TypeScriptCompile Include="Client\ng-apps\components\UserDetails\UserDetailsService.ts" />
-    <TypeScriptCompile Include="Client\ng-apps\components\ViewMessage\ViewAlertService.ts" />
-    <TypeScriptCompile Include="Client\ng-apps\components\Visited\VisitedDirective.ts" />
-    <TypeScriptCompile Include="Client\ng-apps\MusicStore.Admin\Catalog\AlbumDeleteModalController.ts" />
-    <TypeScriptCompile Include="Client\ng-apps\MusicStore.Admin\Catalog\AlbumDetailsController.ts" />
-    <TypeScriptCompile Include="Client\ng-apps\MusicStore.Admin\Catalog\AlbumEditController.ts" />
-    <TypeScriptCompile Include="Client\ng-apps\MusicStore.Admin\Catalog\AlbumListController.ts" />
-    <TypeScriptCompile Include="Client\ng-apps\MusicStore.Admin\MusicStore.Admin.app.ts" />
-    <TypeScriptCompile Include="Client\ng-apps\MusicStore.Store\Catalog\AlbumDetailsController.ts" />
-    <TypeScriptCompile Include="Client\ng-apps\MusicStore.Store\Catalog\GenreDetailsController.ts" />
-    <TypeScriptCompile Include="Client\ng-apps\MusicStore.Store\Catalog\GenreListController.ts" />
-    <TypeScriptCompile Include="Client\ng-apps\MusicStore.Store\Home\HomeController.ts" />
-    <TypeScriptCompile Include="Client\ng-apps\MusicStore.Store\MusicStore.Store.app.ts" />
-    <TypeScriptCompile Include="Client\ng-apps\references.ts" />
-    <Content Include="Views\Account\Login.cshtml" />
-    <Content Include="Views\Account\Manage.cshtml" />
-    <Content Include="Views\Account\Register.cshtml" />
-    <Content Include="Views\Account\_ChangePasswordPartial.cshtml" />
-    <TypeScriptCompile Include="Client\ng-apps\components\AlbumApi\AlbumApiService.ts" />
-    <TypeScriptCompile Include="Client\ng-apps\components\ArtistApi\ArtistApiService.ts" />
-    <TypeScriptCompile Include="Client\ng-apps\components\GenreApi\GenreApiService.ts" />
-    <Content Include="Client\ng-apps\components\GenreMenu\GenreMenu.html" />
-    <TypeScriptCompile Include="Client\ng-apps\components\GenreMenu\GenreMenuController.ts" />
-    <TypeScriptCompile Include="Client\ng-apps\components\GenreMenu\GenreMenuDirective.ts" />
-    <TypeScriptCompile Include="Client\ng-apps\components\InlineData\InlineDataDirective.ts" />
-    <TypeScriptCompile Include="Client\ng-apps\components\LoginLink\LoginLinkDirective.ts" />
-    <TypeScriptCompile Include="Client\ng-apps\components\Models\IAlbum.ts" />
-    <TypeScriptCompile Include="Client\ng-apps\components\Models\IAlert.ts" />
-    <TypeScriptCompile Include="Client\ng-apps\components\Models\IApiResult.ts" />
-    <TypeScriptCompile Include="Client\ng-apps\components\Models\IArtist.ts" />
-    <TypeScriptCompile Include="Client\ng-apps\components\Models\IGenre.ts" />
-    <TypeScriptCompile Include="Client\ng-apps\components\Models\IGenreLookup.ts" />
-    <TypeScriptCompile Include="Client\ng-apps\components\Models\IModelError.ts" />
-    <TypeScriptCompile Include="Client\ng-apps\components\Models\IPagedList.ts" />
-    <TypeScriptCompile Include="Client\ng-apps\components\Models\IUserDetails.ts" />
-    <TypeScriptCompile Include="Client\ng-apps\components\PreventSubmit\PreventSubmitDirective.ts" />
-    <TypeScriptCompile Include="Client\ng-apps\components\TitleCase\TitleCaseFilter.ts" />
-    <TypeScriptCompile Include="Client\ng-apps\components\Truncate\TruncateFilter.ts" />
-    <TypeScriptCompile Include="Client\ng-apps\components\UrlResolver\UrlResolverService.ts" />
-    <TypeScriptCompile Include="Client\ng-apps\components\UserDetails\UserDetailsService.ts" />
-    <TypeScriptCompile Include="Client\ng-apps\components\ViewMessage\ViewAlertService.ts" />
-    <TypeScriptCompile Include="Client\ng-apps\components\Visited\VisitedDirective.ts" />
-    <Content Include="Client\ng-apps\MusicStore.Admin\Catalog\AlbumDeleteModal.cshtml" />
-    <TypeScriptCompile Include="Client\ng-apps\MusicStore.Admin\Catalog\AlbumDeleteModalController.ts" />
-    <Content Include="Client\ng-apps\MusicStore.Admin\Catalog\AlbumDetails.cshtml" />
-    <TypeScriptCompile Include="Client\ng-apps\MusicStore.Admin\Catalog\AlbumDetailsController.ts" />
-    <Content Include="Client\ng-apps\MusicStore.Admin\Catalog\AlbumEdit.cshtml" />
-    <TypeScriptCompile Include="Client\ng-apps\MusicStore.Admin\Catalog\AlbumEditController.ts" />
-    <Content Include="Client\ng-apps\MusicStore.Admin\Catalog\AlbumList.cshtml" />
-    <TypeScriptCompile Include="Client\ng-apps\MusicStore.Admin\Catalog\AlbumListController.ts" />
-    <TypeScriptCompile Include="Client\ng-apps\MusicStore.Admin\MusicStore.Admin.app.ts" />
-    <Content Include="Client\ng-apps\MusicStore.Store\Catalog\AlbumDetails.html" />
-    <TypeScriptCompile Include="Client\ng-apps\MusicStore.Store\Catalog\AlbumDetailsController.ts" />
-    <Content Include="Client\ng-apps\MusicStore.Store\Catalog\GenreDetails.html" />
-    <TypeScriptCompile Include="Client\ng-apps\MusicStore.Store\Catalog\GenreDetailsController.ts" />
-    <Content Include="Client\ng-apps\MusicStore.Store\Catalog\GenreList.html" />
-    <TypeScriptCompile Include="Client\ng-apps\MusicStore.Store\Catalog\GenreListController.ts" />
-    <Content Include="Client\ng-apps\MusicStore.Store\Home\Home.html" />
-    <TypeScriptCompile Include="Client\ng-apps\MusicStore.Store\Home\HomeController.ts" />
-    <TypeScriptCompile Include="Client\ng-apps\MusicStore.Store\MusicStore.Store.app.ts" />
-    <TypeScriptCompile Include="Client\ng-apps\references.ts" />
-    <None Include="Client\Site.less" />
-    <Content Include="Default.html" />
-    <Content Include="Gruntfile.js" />
-    <Content Include="Config.json" />
-    <Content Include="package.json" />
-    <Content Include="project.json" />
-    <Content Include="tslint.json" />
-    <Content Include="Views\Home\Index.cshtml" />
-    <Content Include="Views\Shared\_Layout.cshtml" />
-    <Content Include="Views\Shared\_LoginPartial.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Views\Account\" />
-  </ItemGroup>
-  <Import Project="$(VSToolsPath)\TypeScript\Microsoft.TypeScript.jsproj.targets" Condition="Exists('$(VSToolsPath)\TypeScript\Microsoft.TypeScript.jsproj.targets')" />
   <Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.targets" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
-    <TypeScriptRemoveComments>false</TypeScriptRemoveComments>
-    <TypeScriptSourceMap>true</TypeScriptSourceMap>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)' == 'Release'">
-    <TypeScriptRemoveComments>true</TypeScriptRemoveComments>
-    <TypeScriptSourceMap>false</TypeScriptSourceMap>
-  </PropertyGroup>
-  <PropertyGroup>
-    <TypeScriptEnabled>true</TypeScriptEnabled>
-  </PropertyGroup>
-  <!--<Import Project="$(VSToolsPath)\TypeScript\Microsoft.TypeScript.targets" Condition="Exists('$(VSToolsPath)\TypeScript\Microsoft.TypeScript.targets')" />-->
 </Project>
\ No newline at end of file
diff --git a/src/MusicStore.Spa/Startup.cs b/src/MusicStore.Spa/Startup.cs
index b8e686b1ce..605d509f3f 100644
--- a/src/MusicStore.Spa/Startup.cs
+++ b/src/MusicStore.Spa/Startup.cs
@@ -42,9 +42,8 @@ namespace MusicStore.Spa
                 services.AddEntityFramework()
                     .AddSqlServer();
 
-                // Add Identity services to the service container
-                services.AddIdentitySqlServer<ApplicationDbContext, ApplicationUser>()
-                    .AddAuthentication();
+                // Add Identity services to the services container
+                services.AddDefaultIdentity<ApplicationDbContext, ApplicationUser, IdentityRole>(configuration);
 
                 // Add application services to the service container
                 services.AddScoped<MusicStoreContext>();
@@ -58,11 +57,7 @@ namespace MusicStore.Spa
             // Configure the HTTP request pipeline
 
             // Add cookie auth
-            app.UseCookieAuthentication(new CookieAuthenticationOptions
-            {
-                AuthenticationType = ClaimsIdentityOptions.DefaultAuthenticationType,
-                LoginPath = new PathString("/Account/Login")
-            });
+            app.UseIdentity();
 
             // Add static files
             app.UseStaticFiles();
diff --git a/src/MusicStore.Spa/project.json b/src/MusicStore.Spa/project.json
index 670c8c1858..ac9a5c150f 100644
--- a/src/MusicStore.Spa/project.json
+++ b/src/MusicStore.Spa/project.json
@@ -6,6 +6,7 @@
     "description": "Music store application on K as a SPA",
     "compilationOptions": { "define": [ "DEBUG" ] },
     "dependencies": {
+        "Kestrel": "1.0.0-*",
         "Microsoft.AspNet.Server.IIS": "1.0.0-*",
         "Microsoft.AspNet.Mvc": "6.0.0-*",
         "Microsoft.AspNet.Server.WebListener": "1.0.0-*",
@@ -13,13 +14,13 @@
         "EntityFramework.InMemory": "7.0.0-*",
         "EntityFramework.SqlServer": "7.0.0-*",
         "Microsoft.AspNet.Security.Cookies": "1.0.0-*",
-        "Microsoft.AspNet.Identity.Authentication": "3.0.0-*",
         "Microsoft.AspNet.Identity.SqlServer": "3.0.0-*",
         "Microsoft.Framework.ConfigurationModel": "1.0.0-*",
         "Microsoft.Framework.ConfigurationModel.Json": "1.0.0-*"
     },
     "commands": {
-        "web": "Microsoft.AspNet.Hosting --server Microsoft.AspNet.Server.WebListener --server.urls http://localhost:5002",
+        "WebListener": "Microsoft.AspNet.Hosting --server Microsoft.AspNet.Server.WebListener --server.urls http://localhost:5002",
+        "Kestrel": "Microsoft.AspNet.Hosting --server Kestrel --server.urls http://localhost:5004",
         "run": "run server.urls=http://localhost:5003"
     },
     "frameworks": {