diff --git a/Directory.Build.props b/Directory.Build.props
index 055573fd02..57ff94d85b 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -169,7 +169,7 @@
     -->
     <DeterministicSourcePaths Condition="'$(IsSampleProject)' == 'true' OR '$(IsTestAssetProject)' == 'true'">false</DeterministicSourcePaths>
     <!-- Projects which reference Microsoft.AspNetCore.Mvc.Testing should import this targets file to ensure dependency .deps.json files are copied into test output. -->
-    <MvcTestingTargets>$(MSBuildThisFileDirectory)src\Mvc\src\Microsoft.AspNetCore.Mvc.Testing\Microsoft.AspNetCore.Mvc.Testing.targets</MvcTestingTargets>
+    <MvcTestingTargets>$(MSBuildThisFileDirectory)src\Mvc\Mvc.Testing\src\Microsoft.AspNetCore.Mvc.Testing.targets</MvcTestingTargets>
     <!-- IIS native projects can only be built on Windows for x86 and x64. -->
     <BuildIisNativeProjects Condition="'$(BuildNative)' != 'false' AND '$(TargetOsName)' == 'win' AND ('$(TargetArchitecture)' == 'x86' OR '$(TargetArchitecture)' == 'x64')">true</BuildIisNativeProjects>
   </PropertyGroup>
diff --git a/eng/ProjectReferences.props b/eng/ProjectReferences.props
index 00b1fae2ba..df24c4a301 100644
--- a/eng/ProjectReferences.props
+++ b/eng/ProjectReferences.props
@@ -89,23 +89,23 @@
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.WebSockets" ProjectPath="$(RepositoryRoot)src\Middleware\WebSockets\src\Microsoft.AspNetCore.WebSockets.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Razor.Runtime" ProjectPath="$(RepositoryRoot)src\Razor\Razor.Runtime\src\Microsoft.AspNetCore.Razor.Runtime.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Razor" ProjectPath="$(RepositoryRoot)src\Razor\Razor\src\Microsoft.AspNetCore.Razor.csproj" />
-    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.Abstractions" ProjectPath="$(RepositoryRoot)src\Mvc\src\Microsoft.AspNetCore.Mvc.Abstractions\Microsoft.AspNetCore.Mvc.Abstractions.csproj" />
-    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.ApiExplorer" ProjectPath="$(RepositoryRoot)src\Mvc\src\Microsoft.AspNetCore.Mvc.ApiExplorer\Microsoft.AspNetCore.Mvc.ApiExplorer.csproj" />
-    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.Core" ProjectPath="$(RepositoryRoot)src\Mvc\src\Microsoft.AspNetCore.Mvc.Core\Microsoft.AspNetCore.Mvc.Core.csproj" />
-    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.Cors" ProjectPath="$(RepositoryRoot)src\Mvc\src\Microsoft.AspNetCore.Mvc.Cors\Microsoft.AspNetCore.Mvc.Cors.csproj" />
-    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.DataAnnotations" ProjectPath="$(RepositoryRoot)src\Mvc\src\Microsoft.AspNetCore.Mvc.DataAnnotations\Microsoft.AspNetCore.Mvc.DataAnnotations.csproj" />
-    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.Formatters.Json" ProjectPath="$(RepositoryRoot)src\Mvc\src\Microsoft.AspNetCore.Mvc.Formatters.Json\Microsoft.AspNetCore.Mvc.Formatters.Json.csproj" />
-    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.Formatters.Xml" ProjectPath="$(RepositoryRoot)src\Mvc\src\Microsoft.AspNetCore.Mvc.Formatters.Xml\Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj" />
-    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.Localization" ProjectPath="$(RepositoryRoot)src\Mvc\src\Microsoft.AspNetCore.Mvc.Localization\Microsoft.AspNetCore.Mvc.Localization.csproj" />
-    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" ProjectPath="$(RepositoryRoot)src\Mvc\src\Microsoft.AspNetCore.Mvc.NewtonsoftJson\Microsoft.AspNetCore.Mvc.NewtonsoftJson.csproj" />
-    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" ProjectPath="$(RepositoryRoot)src\Mvc\src\Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation\Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj" />
-    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.RazorPages" ProjectPath="$(RepositoryRoot)src\Mvc\src\Microsoft.AspNetCore.Mvc.RazorPages\Microsoft.AspNetCore.Mvc.RazorPages.csproj" />
-    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.Razor" ProjectPath="$(RepositoryRoot)src\Mvc\src\Microsoft.AspNetCore.Mvc.Razor\Microsoft.AspNetCore.Mvc.Razor.csproj" />
-    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.TagHelpers" ProjectPath="$(RepositoryRoot)src\Mvc\src\Microsoft.AspNetCore.Mvc.TagHelpers\Microsoft.AspNetCore.Mvc.TagHelpers.csproj" />
-    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.Testing" ProjectPath="$(RepositoryRoot)src\Mvc\src\Microsoft.AspNetCore.Mvc.Testing\Microsoft.AspNetCore.Mvc.Testing.csproj" />
-    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.ViewFeatures" ProjectPath="$(RepositoryRoot)src\Mvc\src\Microsoft.AspNetCore.Mvc.ViewFeatures\Microsoft.AspNetCore.Mvc.ViewFeatures.csproj" />
-    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc" ProjectPath="$(RepositoryRoot)src\Mvc\src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj" />
-    <ProjectReferenceProvider Include="Microsoft.Extensions.ApiDescription.Tasks" ProjectPath="$(RepositoryRoot)src\Mvc\src\Microsoft.Extensions.ApiDescription.Design\Microsoft.Extensions.ApiDescription.Design.csproj" />
+    <ProjectReferenceProvider Include="Microsoft.Extensions.ApiDescription.Tasks" ProjectPath="$(RepositoryRoot)src\Mvc\Extensions.ApiDescription.Design\src\Microsoft.Extensions.ApiDescription.Design.csproj" />
+    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.Abstractions" ProjectPath="$(RepositoryRoot)src\Mvc\Mvc.Abstractions\src\Microsoft.AspNetCore.Mvc.Abstractions.csproj" />
+    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.ApiExplorer" ProjectPath="$(RepositoryRoot)src\Mvc\Mvc.ApiExplorer\src\Microsoft.AspNetCore.Mvc.ApiExplorer.csproj" />
+    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.Core" ProjectPath="$(RepositoryRoot)src\Mvc\Mvc.Core\src\Microsoft.AspNetCore.Mvc.Core.csproj" />
+    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.Cors" ProjectPath="$(RepositoryRoot)src\Mvc\Mvc.Cors\src\Microsoft.AspNetCore.Mvc.Cors.csproj" />
+    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.DataAnnotations" ProjectPath="$(RepositoryRoot)src\Mvc\Mvc.DataAnnotations\src\Microsoft.AspNetCore.Mvc.DataAnnotations.csproj" />
+    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.Formatters.Json" ProjectPath="$(RepositoryRoot)src\Mvc\Mvc.Formatters.Json\src\Microsoft.AspNetCore.Mvc.Formatters.Json.csproj" />
+    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.Formatters.Xml" ProjectPath="$(RepositoryRoot)src\Mvc\Mvc.Formatters.Xml\src\Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj" />
+    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.Localization" ProjectPath="$(RepositoryRoot)src\Mvc\Mvc.Localization\src\Microsoft.AspNetCore.Mvc.Localization.csproj" />
+    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" ProjectPath="$(RepositoryRoot)src\Mvc\Mvc.NewtonsoftJson\src\Microsoft.AspNetCore.Mvc.NewtonsoftJson.csproj" />
+    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" ProjectPath="$(RepositoryRoot)src\Mvc\Mvc.Razor.RuntimeCompilation\src\Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj" />
+    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.RazorPages" ProjectPath="$(RepositoryRoot)src\Mvc\Mvc.RazorPages\src\Microsoft.AspNetCore.Mvc.RazorPages.csproj" />
+    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.Razor" ProjectPath="$(RepositoryRoot)src\Mvc\Mvc.Razor\src\Microsoft.AspNetCore.Mvc.Razor.csproj" />
+    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.TagHelpers" ProjectPath="$(RepositoryRoot)src\Mvc\Mvc.TagHelpers\src\Microsoft.AspNetCore.Mvc.TagHelpers.csproj" />
+    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.Testing" ProjectPath="$(RepositoryRoot)src\Mvc\Mvc.Testing\src\Microsoft.AspNetCore.Mvc.Testing.csproj" />
+    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.ViewFeatures" ProjectPath="$(RepositoryRoot)src\Mvc\Mvc.ViewFeatures\src\Microsoft.AspNetCore.Mvc.ViewFeatures.csproj" />
+    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc" ProjectPath="$(RepositoryRoot)src\Mvc\Mvc\src\Microsoft.AspNetCore.Mvc.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Authentication.AzureAD.UI" ProjectPath="$(RepositoryRoot)src\Azure\AzureAD\Authentication.AzureAD.UI\src\Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" ProjectPath="$(RepositoryRoot)src\Azure\AzureAD\Authentication.AzureADB2C.UI\src\Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.AzureAppServices.HostingStartup" ProjectPath="$(RepositoryRoot)src\Azure\AzureAppServices.HostingStartup\src\Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj" />
diff --git a/src/Azure/Azure.sln b/src/Azure/Azure.sln
index f3724c7bc7..a1666b7e32 100644
--- a/src/Azure/Azure.sln
+++ b/src/Azure/Azure.sln
@@ -43,9 +43,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.DataProtection.Extensions", "..\DataProtection\Extensions\src\Microsoft.AspNetCore.DataProtection.Extensions.csproj", "{240BBDB1-3501-4637-8A17-996EA4EBB20B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc", "..\Mvc\src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj", "{88EF760A-99A2-48C8-920F-78632A3BB57A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc", "..\Mvc\Mvc\src\Microsoft.AspNetCore.Mvc.csproj", "{88EF760A-99A2-48C8-920F-78632A3BB57A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Testing", "..\Mvc\src\Microsoft.AspNetCore.Mvc.Testing\Microsoft.AspNetCore.Mvc.Testing.csproj", "{9593691E-1B65-4EB1-97AA-F8B292B0082A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Testing", "..\Mvc\Mvc.Testing\src\Microsoft.AspNetCore.Mvc.Testing.csproj", "{9593691E-1B65-4EB1-97AA-F8B292B0082A}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AzureAppServices.HostingStartup", "AzureAppServices.HostingStartup", "{9EC158BE-EB9C-4627-931D-B1B95D3210B6}"
 EndProject
diff --git a/src/Components/Components.sln b/src/Components/Components.sln
index 28cff399d5..5193181c77 100644
--- a/src/Components/Components.sln
+++ b/src/Components/Components.sln
@@ -141,29 +141,29 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Static
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.WebSockets", "..\Middleware\WebSockets\src\Microsoft.AspNetCore.WebSockets.csproj", "{AB827016-9D0A-4443-BFF0-80CB9E947D39}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Abstractions", "..\Mvc\src\Microsoft.AspNetCore.Mvc.Abstractions\Microsoft.AspNetCore.Mvc.Abstractions.csproj", "{707BB7F9-3E71-4364-8AD0-949735B5D33C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Abstractions", "..\Mvc\Mvc.Abstractions\src\Microsoft.AspNetCore.Mvc.Abstractions.csproj", "{707BB7F9-3E71-4364-8AD0-949735B5D33C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Analyzers", "..\Mvc\src\Microsoft.AspNetCore.Mvc.Analyzers\Microsoft.AspNetCore.Mvc.Analyzers.csproj", "{E09006B7-2022-43CD-A0D9-127282F95A57}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Analyzers", "..\Mvc\Mvc.Analyzers\src\Microsoft.AspNetCore.Mvc.Analyzers.csproj", "{E09006B7-2022-43CD-A0D9-127282F95A57}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.ApiExplorer", "..\Mvc\src\Microsoft.AspNetCore.Mvc.ApiExplorer\Microsoft.AspNetCore.Mvc.ApiExplorer.csproj", "{61E8C8E2-1CF4-42DA-8822-AFEC7FA47F16}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.ApiExplorer", "..\Mvc\Mvc.ApiExplorer\src\Microsoft.AspNetCore.Mvc.ApiExplorer.csproj", "{61E8C8E2-1CF4-42DA-8822-AFEC7FA47F16}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Core", "..\Mvc\src\Microsoft.AspNetCore.Mvc.Core\Microsoft.AspNetCore.Mvc.Core.csproj", "{1F501D4D-CEA4-445B-86C9-7215A6811368}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Core", "..\Mvc\Mvc.Core\src\Microsoft.AspNetCore.Mvc.Core.csproj", "{1F501D4D-CEA4-445B-86C9-7215A6811368}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Cors", "..\Mvc\src\Microsoft.AspNetCore.Mvc.Cors\Microsoft.AspNetCore.Mvc.Cors.csproj", "{B5037DC9-2690-42FA-8725-514E4A9EFEAD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Cors", "..\Mvc\Mvc.Cors\src\Microsoft.AspNetCore.Mvc.Cors.csproj", "{B5037DC9-2690-42FA-8725-514E4A9EFEAD}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.DataAnnotations", "..\Mvc\src\Microsoft.AspNetCore.Mvc.DataAnnotations\Microsoft.AspNetCore.Mvc.DataAnnotations.csproj", "{AC7782F2-1F03-4615-A600-A7FE0FDEC5E5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.DataAnnotations", "..\Mvc\Mvc.DataAnnotations\src\Microsoft.AspNetCore.Mvc.DataAnnotations.csproj", "{AC7782F2-1F03-4615-A600-A7FE0FDEC5E5}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Localization", "..\Mvc\src\Microsoft.AspNetCore.Mvc.Localization\Microsoft.AspNetCore.Mvc.Localization.csproj", "{D5C02B69-4E7B-4628-8BDA-B622A2FB2A97}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Localization", "..\Mvc\Mvc.Localization\src\Microsoft.AspNetCore.Mvc.Localization.csproj", "{D5C02B69-4E7B-4628-8BDA-B622A2FB2A97}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Razor", "..\Mvc\src\Microsoft.AspNetCore.Mvc.Razor\Microsoft.AspNetCore.Mvc.Razor.csproj", "{74F10D31-161F-49A4-ACD7-282211447CE4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Razor", "..\Mvc\Mvc.Razor\src\Microsoft.AspNetCore.Mvc.Razor.csproj", "{74F10D31-161F-49A4-ACD7-282211447CE4}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.RazorPages", "..\Mvc\src\Microsoft.AspNetCore.Mvc.RazorPages\Microsoft.AspNetCore.Mvc.RazorPages.csproj", "{DBA8E5FE-DE74-4E24-A9A2-0FBBCC1C2792}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.RazorPages", "..\Mvc\Mvc.RazorPages\src\Microsoft.AspNetCore.Mvc.RazorPages.csproj", "{DBA8E5FE-DE74-4E24-A9A2-0FBBCC1C2792}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.TagHelpers", "..\Mvc\src\Microsoft.AspNetCore.Mvc.TagHelpers\Microsoft.AspNetCore.Mvc.TagHelpers.csproj", "{2BBA2091-C991-4696-B70F-5C2D114D5674}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.TagHelpers", "..\Mvc\Mvc.TagHelpers\src\Microsoft.AspNetCore.Mvc.TagHelpers.csproj", "{2BBA2091-C991-4696-B70F-5C2D114D5674}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.ViewFeatures", "..\Mvc\src\Microsoft.AspNetCore.Mvc.ViewFeatures\Microsoft.AspNetCore.Mvc.ViewFeatures.csproj", "{D9E125B3-8FFD-47CE-9C0E-FF5CEAF633AE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.ViewFeatures", "..\Mvc\Mvc.ViewFeatures\src\Microsoft.AspNetCore.Mvc.ViewFeatures.csproj", "{D9E125B3-8FFD-47CE-9C0E-FF5CEAF633AE}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc", "..\Mvc\src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj", "{DA1687B8-10E4-4F50-B074-60D20912A9BD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc", "..\Mvc\Mvc\src\Microsoft.AspNetCore.Mvc.csproj", "{DA1687B8-10E4-4F50-B074-60D20912A9BD}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.Runtime", "..\Razor\Razor.Runtime\src\Microsoft.AspNetCore.Razor.Runtime.csproj", "{97CE175F-9290-479F-A6EB-EEF4C6816624}"
 EndProject
@@ -203,7 +203,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Signal
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dependencies", "dependencies", "{2FC10057-7A0A-4E34-8302-879925BC0102}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.NewtonsoftJson", "..\Mvc\src\Microsoft.AspNetCore.Mvc.NewtonsoftJson\Microsoft.AspNetCore.Mvc.NewtonsoftJson.csproj", "{04262990-929C-42BF-85A9-21C25FA95617}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.NewtonsoftJson", "..\Mvc\Mvc.NewtonsoftJson\src\Microsoft.AspNetCore.Mvc.NewtonsoftJson.csproj", "{04262990-929C-42BF-85A9-21C25FA95617}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.JsonPatch", "..\Features\JsonPatch\src\Microsoft.AspNetCore.JsonPatch.csproj", "{DC47C40A-FC38-44E4-94A4-ADE794E76309}"
 EndProject
diff --git a/src/Identity/Identity.sln b/src/Identity/Identity.sln
index 17cea337e7..5aa2abf45a 100644
--- a/src/Identity/Identity.sln
+++ b/src/Identity/Identity.sln
@@ -65,7 +65,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Rewrit
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.StaticFiles", "..\Middleware\StaticFiles\src\Microsoft.AspNetCore.StaticFiles.csproj", "{0FB4E0D1-6822-44EB-99EB-EBAADEDFFFBE}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc", "..\Mvc\src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj", "{A20AC82F-1F82-41ED-86AD-FF12A157DA0D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc", "..\Mvc\Mvc\src\Microsoft.AspNetCore.Mvc.csproj", "{A20AC82F-1F82-41ED-86AD-FF12A157DA0D}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Antiforgery", "..\Antiforgery\src\Microsoft.AspNetCore.Antiforgery.csproj", "{40D18785-1336-41AD-8577-EF20D3F96EC8}"
 EndProject
@@ -117,27 +117,27 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.HttpOv
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Localization", "..\Middleware\Localization\src\Microsoft.AspNetCore.Localization.csproj", "{5F5CCADC-2485-4CD1-8311-A68293FD415F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Abstractions", "..\Mvc\src\Microsoft.AspNetCore.Mvc.Abstractions\Microsoft.AspNetCore.Mvc.Abstractions.csproj", "{E577FDF3-AC0A-4D07-8A6D-1DAFA9379261}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Abstractions", "..\Mvc\Mvc.Abstractions\src\Microsoft.AspNetCore.Mvc.Abstractions.csproj", "{E577FDF3-AC0A-4D07-8A6D-1DAFA9379261}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Analyzers", "..\Mvc\src\Microsoft.AspNetCore.Mvc.Analyzers\Microsoft.AspNetCore.Mvc.Analyzers.csproj", "{20FF8D33-45D1-40F4-BEAF-A529290C1A17}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Analyzers", "..\Mvc\Mvc.Analyzers\src\Microsoft.AspNetCore.Mvc.Analyzers.csproj", "{20FF8D33-45D1-40F4-BEAF-A529290C1A17}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.ApiExplorer", "..\Mvc\src\Microsoft.AspNetCore.Mvc.ApiExplorer\Microsoft.AspNetCore.Mvc.ApiExplorer.csproj", "{174C92E9-EA25-4416-BF1E-19F48FE2A472}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.ApiExplorer", "..\Mvc\Mvc.ApiExplorer\src\Microsoft.AspNetCore.Mvc.ApiExplorer.csproj", "{174C92E9-EA25-4416-BF1E-19F48FE2A472}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Core", "..\Mvc\src\Microsoft.AspNetCore.Mvc.Core\Microsoft.AspNetCore.Mvc.Core.csproj", "{03EE3372-4CA3-4615-BDCA-1B34F098CE82}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Core", "..\Mvc\Mvc.Core\src\Microsoft.AspNetCore.Mvc.Core.csproj", "{03EE3372-4CA3-4615-BDCA-1B34F098CE82}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Cors", "..\Mvc\src\Microsoft.AspNetCore.Mvc.Cors\Microsoft.AspNetCore.Mvc.Cors.csproj", "{E36B945B-B787-4BD3-8293-10FED0D6479E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Cors", "..\Mvc\Mvc.Cors\src\Microsoft.AspNetCore.Mvc.Cors.csproj", "{E36B945B-B787-4BD3-8293-10FED0D6479E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.DataAnnotations", "..\Mvc\src\Microsoft.AspNetCore.Mvc.DataAnnotations\Microsoft.AspNetCore.Mvc.DataAnnotations.csproj", "{87A10D30-9188-4596-9479-750D7D459FF1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.DataAnnotations", "..\Mvc\Mvc.DataAnnotations\src\Microsoft.AspNetCore.Mvc.DataAnnotations.csproj", "{87A10D30-9188-4596-9479-750D7D459FF1}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Localization", "..\Mvc\src\Microsoft.AspNetCore.Mvc.Localization\Microsoft.AspNetCore.Mvc.Localization.csproj", "{344224B0-FBFB-4253-B9A8-27F6A8310AFE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Localization", "..\Mvc\Mvc.Localization\src\Microsoft.AspNetCore.Mvc.Localization.csproj", "{344224B0-FBFB-4253-B9A8-27F6A8310AFE}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Razor", "..\Mvc\src\Microsoft.AspNetCore.Mvc.Razor\Microsoft.AspNetCore.Mvc.Razor.csproj", "{AE76EC89-F6D1-4DC6-9005-416CE844DFD7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Razor", "..\Mvc\Mvc.Razor\src\Microsoft.AspNetCore.Mvc.Razor.csproj", "{AE76EC89-F6D1-4DC6-9005-416CE844DFD7}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.RazorPages", "..\Mvc\src\Microsoft.AspNetCore.Mvc.RazorPages\Microsoft.AspNetCore.Mvc.RazorPages.csproj", "{F7E6FF46-9C2F-4436-9D08-1C53116324A9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.RazorPages", "..\Mvc\Mvc.RazorPages\src\Microsoft.AspNetCore.Mvc.RazorPages.csproj", "{F7E6FF46-9C2F-4436-9D08-1C53116324A9}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.TagHelpers", "..\Mvc\src\Microsoft.AspNetCore.Mvc.TagHelpers\Microsoft.AspNetCore.Mvc.TagHelpers.csproj", "{C00BD37E-E4BE-4395-8367-37E0A48193FF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.TagHelpers", "..\Mvc\Mvc.TagHelpers\src\Microsoft.AspNetCore.Mvc.TagHelpers.csproj", "{C00BD37E-E4BE-4395-8367-37E0A48193FF}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.ViewFeatures", "..\Mvc\src\Microsoft.AspNetCore.Mvc.ViewFeatures\Microsoft.AspNetCore.Mvc.ViewFeatures.csproj", "{C6E58980-524F-4EA5-B1F4-8E4921F7FDB1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.ViewFeatures", "..\Mvc\Mvc.ViewFeatures\src\Microsoft.AspNetCore.Mvc.ViewFeatures.csproj", "{C6E58980-524F-4EA5-B1F4-8E4921F7FDB1}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor", "..\Razor\Razor\src\Microsoft.AspNetCore.Razor.csproj", "{B00267C8-5CE0-4262-8305-BD483C769F12}"
 EndProject
@@ -169,11 +169,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authen
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.OAuth", "..\Security\Authentication\OAuth\src\Microsoft.AspNetCore.Authentication.OAuth.csproj", "{6851694F-D440-41A1-8B89-37FB5919850B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.NewtonsoftJson", "..\Mvc\src\Microsoft.AspNetCore.Mvc.NewtonsoftJson\Microsoft.AspNetCore.Mvc.NewtonsoftJson.csproj", "{5F087B72-577F-4280-8718-E3ADB325A0C1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.NewtonsoftJson", "..\Mvc\Mvc.NewtonsoftJson\src\Microsoft.AspNetCore.Mvc.NewtonsoftJson.csproj", "{5F087B72-577F-4280-8718-E3ADB325A0C1}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.JsonPatch", "..\Features\JsonPatch\src\Microsoft.AspNetCore.JsonPatch.csproj", "{DEE09DF3-DFBF-4651-A562-88C2592C9E16}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Testing", "..\Mvc\src\Microsoft.AspNetCore.Mvc.Testing\Microsoft.AspNetCore.Mvc.Testing.csproj", "{0B3EC292-625E-4C3A-984A-DF41A3501CEE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Testing", "..\Mvc\Mvc.Testing\src\Microsoft.AspNetCore.Mvc.Testing.csproj", "{0B3EC292-625E-4C3A-984A-DF41A3501CEE}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_dependencies", "_dependencies", "{22A687BB-5170-4312-97CD-0FECA1C3FE98}"
 EndProject
diff --git a/src/MusicStore/MusicStore.sln b/src/MusicStore/MusicStore.sln
index 5e27218a86..87c90e5701 100644
--- a/src/MusicStore/MusicStore.sln
+++ b/src/MusicStore/MusicStore.sln
@@ -79,29 +79,29 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Sessio
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.StaticFiles", "..\Middleware\StaticFiles\src\Microsoft.AspNetCore.StaticFiles.csproj", "{C76336AB-F5C5-4DC2-91AD-A1C891F6FA6D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Abstractions", "..\Mvc\src\Microsoft.AspNetCore.Mvc.Abstractions\Microsoft.AspNetCore.Mvc.Abstractions.csproj", "{4ECBDB74-B257-4B06-9872-28BD4D778735}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Abstractions", "..\Mvc\Mvc.Abstractions\src\Microsoft.AspNetCore.Mvc.Abstractions.csproj", "{4ECBDB74-B257-4B06-9872-28BD4D778735}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Analyzers", "..\Mvc\src\Microsoft.AspNetCore.Mvc.Analyzers\Microsoft.AspNetCore.Mvc.Analyzers.csproj", "{BBD295AC-C95C-481C-B44B-9EB7C9EB85E8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Analyzers", "..\Mvc\Mvc.Analyzers\src\Microsoft.AspNetCore.Mvc.Analyzers.csproj", "{BBD295AC-C95C-481C-B44B-9EB7C9EB85E8}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.ApiExplorer", "..\Mvc\src\Microsoft.AspNetCore.Mvc.ApiExplorer\Microsoft.AspNetCore.Mvc.ApiExplorer.csproj", "{3E75B412-69C0-4BD0-9DF0-2A2C865DAEB3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.ApiExplorer", "..\Mvc\Mvc.ApiExplorer\src\Microsoft.AspNetCore.Mvc.ApiExplorer.csproj", "{3E75B412-69C0-4BD0-9DF0-2A2C865DAEB3}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Core", "..\Mvc\src\Microsoft.AspNetCore.Mvc.Core\Microsoft.AspNetCore.Mvc.Core.csproj", "{896752D7-939A-4BE0-BB75-1132A516D41D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Core", "..\Mvc\Mvc.Core\src\Microsoft.AspNetCore.Mvc.Core.csproj", "{896752D7-939A-4BE0-BB75-1132A516D41D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Cors", "..\Mvc\src\Microsoft.AspNetCore.Mvc.Cors\Microsoft.AspNetCore.Mvc.Cors.csproj", "{D8ED97C5-C491-4D4B-8B01-435835E7AAA9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Cors", "..\Mvc\Mvc.Cors\src\Microsoft.AspNetCore.Mvc.Cors.csproj", "{D8ED97C5-C491-4D4B-8B01-435835E7AAA9}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.DataAnnotations", "..\Mvc\src\Microsoft.AspNetCore.Mvc.DataAnnotations\Microsoft.AspNetCore.Mvc.DataAnnotations.csproj", "{6192109A-C3D2-4BFC-84FC-BEF2AD074DBE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.DataAnnotations", "..\Mvc\Mvc.DataAnnotations\src\Microsoft.AspNetCore.Mvc.DataAnnotations.csproj", "{6192109A-C3D2-4BFC-84FC-BEF2AD074DBE}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Localization", "..\Mvc\src\Microsoft.AspNetCore.Mvc.Localization\Microsoft.AspNetCore.Mvc.Localization.csproj", "{B6F13159-2E4D-4F86-A2F2-AFD3536105DA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Localization", "..\Mvc\Mvc.Localization\src\Microsoft.AspNetCore.Mvc.Localization.csproj", "{B6F13159-2E4D-4F86-A2F2-AFD3536105DA}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Razor", "..\Mvc\src\Microsoft.AspNetCore.Mvc.Razor\Microsoft.AspNetCore.Mvc.Razor.csproj", "{3E89B6A4-A54F-4ADD-93A0-066D4165F3D1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Razor", "..\Mvc\Mvc.Razor\src\Microsoft.AspNetCore.Mvc.Razor.csproj", "{3E89B6A4-A54F-4ADD-93A0-066D4165F3D1}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.RazorPages", "..\Mvc\src\Microsoft.AspNetCore.Mvc.RazorPages\Microsoft.AspNetCore.Mvc.RazorPages.csproj", "{688FC3EF-7A2A-4E20-8AEA-BF9EE02211C4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.RazorPages", "..\Mvc\Mvc.RazorPages\src\Microsoft.AspNetCore.Mvc.RazorPages.csproj", "{688FC3EF-7A2A-4E20-8AEA-BF9EE02211C4}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.TagHelpers", "..\Mvc\src\Microsoft.AspNetCore.Mvc.TagHelpers\Microsoft.AspNetCore.Mvc.TagHelpers.csproj", "{E2589D5F-F774-413F-B26A-DF2173565B6C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.TagHelpers", "..\Mvc\Mvc.TagHelpers\src\Microsoft.AspNetCore.Mvc.TagHelpers.csproj", "{E2589D5F-F774-413F-B26A-DF2173565B6C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.ViewFeatures", "..\Mvc\src\Microsoft.AspNetCore.Mvc.ViewFeatures\Microsoft.AspNetCore.Mvc.ViewFeatures.csproj", "{D564FC69-B6C2-4EA3-ADF0-DAA3C95057B3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.ViewFeatures", "..\Mvc\Mvc.ViewFeatures\src\Microsoft.AspNetCore.Mvc.ViewFeatures.csproj", "{D564FC69-B6C2-4EA3-ADF0-DAA3C95057B3}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc", "..\Mvc\src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj", "{3FA0A685-B35C-4B9A-B933-BBCFBC945D2F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc", "..\Mvc\Mvc\src\Microsoft.AspNetCore.Mvc.csproj", "{3FA0A685-B35C-4B9A-B933-BBCFBC945D2F}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.Runtime", "..\Razor\Razor.Runtime\src\Microsoft.AspNetCore.Razor.Runtime.csproj", "{C2C58C19-DF71-4E78-A658-84AF01146637}"
 EndProject
diff --git a/src/Mvc/test/Directory.Build.props b/src/Mvc/Directory.Build.props
similarity index 83%
rename from src/Mvc/test/Directory.Build.props
rename to src/Mvc/Directory.Build.props
index 4d50744c74..69911cea29 100644
--- a/src/Mvc/test/Directory.Build.props
+++ b/src/Mvc/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.props))\Directory.Build.props" />
 
-  <PropertyGroup>
+  <PropertyGroup Condition=" '$(IsTestProject)' == 'true' ">
     <IsPackable>false</IsPackable>
     <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)MvcTests.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
diff --git a/src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/DownloadFile.cs b/src/Mvc/Extensions.ApiDescription.Design/src/DownloadFile.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/DownloadFile.cs
rename to src/Mvc/Extensions.ApiDescription.Design/src/DownloadFile.cs
diff --git a/src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/GetCurrentItems.cs b/src/Mvc/Extensions.ApiDescription.Design/src/GetCurrentItems.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/GetCurrentItems.cs
rename to src/Mvc/Extensions.ApiDescription.Design/src/GetCurrentItems.cs
diff --git a/src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/GetFileReferenceMetadata.cs b/src/Mvc/Extensions.ApiDescription.Design/src/GetFileReferenceMetadata.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/GetFileReferenceMetadata.cs
rename to src/Mvc/Extensions.ApiDescription.Design/src/GetFileReferenceMetadata.cs
diff --git a/src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/GetProjectReferenceMetadata.cs b/src/Mvc/Extensions.ApiDescription.Design/src/GetProjectReferenceMetadata.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/GetProjectReferenceMetadata.cs
rename to src/Mvc/Extensions.ApiDescription.Design/src/GetProjectReferenceMetadata.cs
diff --git a/src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/GetUriReferenceMetadata.cs b/src/Mvc/Extensions.ApiDescription.Design/src/GetUriReferenceMetadata.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/GetUriReferenceMetadata.cs
rename to src/Mvc/Extensions.ApiDescription.Design/src/GetUriReferenceMetadata.cs
diff --git a/src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/MetadataSerializer.cs b/src/Mvc/Extensions.ApiDescription.Design/src/MetadataSerializer.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/MetadataSerializer.cs
rename to src/Mvc/Extensions.ApiDescription.Design/src/MetadataSerializer.cs
diff --git a/src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/Microsoft.Extensions.ApiDescription.Design.csproj b/src/Mvc/Extensions.ApiDescription.Design/src/Microsoft.Extensions.ApiDescription.Design.csproj
similarity index 96%
rename from src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/Microsoft.Extensions.ApiDescription.Design.csproj
rename to src/Mvc/Extensions.ApiDescription.Design/src/Microsoft.Extensions.ApiDescription.Design.csproj
index 3d40d120d8..a517e2b339 100644
--- a/src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/Microsoft.Extensions.ApiDescription.Design.csproj
+++ b/src/Mvc/Extensions.ApiDescription.Design/src/Microsoft.Extensions.ApiDescription.Design.csproj
@@ -30,7 +30,7 @@
   </ItemGroup>
 
   <Target Name="PopulateNuspec">
-    <MSBuild Projects="../dotnet-getdocument/dotnet-getdocument.csproj"
+    <MSBuild Projects="../../dotnet-getdocument/src/dotnet-getdocument.csproj"
         BuildInParallel="$(BuildInParallel)"
         RemoveProperties="RuntimeIdentifier;TargetFrameworks;TargetFramework"
         Targets="Publish" />
diff --git a/src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/Microsoft.Extensions.ApiDescription.Design.nuspec b/src/Mvc/Extensions.ApiDescription.Design/src/Microsoft.Extensions.ApiDescription.Design.nuspec
similarity index 69%
rename from src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/Microsoft.Extensions.ApiDescription.Design.nuspec
rename to src/Mvc/Extensions.ApiDescription.Design/src/Microsoft.Extensions.ApiDescription.Design.nuspec
index e9867f8691..2e660f3d8b 100644
--- a/src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/Microsoft.Extensions.ApiDescription.Design.nuspec
+++ b/src/Mvc/Extensions.ApiDescription.Design/src/Microsoft.Extensions.ApiDescription.Design.nuspec
@@ -21,9 +21,9 @@
     <file src="buildMultiTargeting\*" target="buildMultiTargeting" />
     <file src="bin\$configuration$\net461\Microsoft.Extensions.ApiDescription.Tasks.*" target="tasks\net461" />
     <file src="bin\$configuration$\netstandard2.0\Microsoft.Extensions.ApiDescription.Tasks.*" target="tasks\netstandard2.0" />
-    <file src="..\dotnet-getdocument\bin\$configuration$\netcoreapp2.1\publish\*.*" target="tools" />
-    <file src="..\GetDocumentInsider\bin\$configuration$\net461\GetDocument.Insider.*" target="tools\net461" />
-    <file src="..\GetDocumentInsider\bin\x86\$configuration$\net461\GetDocument.Insider.*" target="tools\net461-x86" />
-    <file src="..\GetDocumentInsider\bin\$configuration$\netcoreapp2.0\GetDocument.Insider.*" target="tools\netcoreapp2.0" />
+    <file src="..\..\dotnet-getdocument\src\bin\$configuration$\netcoreapp2.1\publish\*.*" target="tools" />
+    <file src="..\..\GetDocumentInsider\src\bin\$configuration$\net461\GetDocument.Insider.*" target="tools\net461" />
+    <file src="..\..\GetDocumentInsider\src\bin\x86\$configuration$\net461\GetDocument.Insider.*" target="tools\net461-x86" />
+    <file src="..\..\GetDocumentInsider\src\bin\$configuration$\netcoreapp2.0\GetDocument.Insider.*" target="tools\netcoreapp2.0" />
   </files>
 </package>
diff --git a/src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/Properties/Resources.Designer.cs b/src/Mvc/Extensions.ApiDescription.Design/src/Properties/Resources.Designer.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/Properties/Resources.Designer.cs
rename to src/Mvc/Extensions.ApiDescription.Design/src/Properties/Resources.Designer.cs
diff --git a/src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/Resources.resx b/src/Mvc/Extensions.ApiDescription.Design/src/Resources.resx
similarity index 100%
rename from src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/Resources.resx
rename to src/Mvc/Extensions.ApiDescription.Design/src/Resources.resx
diff --git a/src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/build/Microsoft.Extensions.ApiDescription.Design.props b/src/Mvc/Extensions.ApiDescription.Design/src/build/Microsoft.Extensions.ApiDescription.Design.props
similarity index 100%
rename from src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/build/Microsoft.Extensions.ApiDescription.Design.props
rename to src/Mvc/Extensions.ApiDescription.Design/src/build/Microsoft.Extensions.ApiDescription.Design.props
diff --git a/src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/build/Microsoft.Extensions.ApiDescription.Design.targets b/src/Mvc/Extensions.ApiDescription.Design/src/build/Microsoft.Extensions.ApiDescription.Design.targets
similarity index 100%
rename from src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/build/Microsoft.Extensions.ApiDescription.Design.targets
rename to src/Mvc/Extensions.ApiDescription.Design/src/build/Microsoft.Extensions.ApiDescription.Design.targets
diff --git a/src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/buildMultiTargeting/Microsoft.Extensions.ApiDescription.Design.targets b/src/Mvc/Extensions.ApiDescription.Design/src/buildMultiTargeting/Microsoft.Extensions.ApiDescription.Design.targets
similarity index 100%
rename from src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/buildMultiTargeting/Microsoft.Extensions.ApiDescription.Design.targets
rename to src/Mvc/Extensions.ApiDescription.Design/src/buildMultiTargeting/Microsoft.Extensions.ApiDescription.Design.targets
diff --git a/src/Mvc/src/GetDocumentInsider/AnsiConsole.cs b/src/Mvc/GetDocumentInsider/src/AnsiConsole.cs
similarity index 100%
rename from src/Mvc/src/GetDocumentInsider/AnsiConsole.cs
rename to src/Mvc/GetDocumentInsider/src/AnsiConsole.cs
diff --git a/src/Mvc/src/GetDocumentInsider/AnsiConstants.cs b/src/Mvc/GetDocumentInsider/src/AnsiConstants.cs
similarity index 100%
rename from src/Mvc/src/GetDocumentInsider/AnsiConstants.cs
rename to src/Mvc/GetDocumentInsider/src/AnsiConstants.cs
diff --git a/src/Mvc/src/GetDocumentInsider/AnsiTextWriter.cs b/src/Mvc/GetDocumentInsider/src/AnsiTextWriter.cs
similarity index 100%
rename from src/Mvc/src/GetDocumentInsider/AnsiTextWriter.cs
rename to src/Mvc/GetDocumentInsider/src/AnsiTextWriter.cs
diff --git a/src/Mvc/src/GetDocumentInsider/CommandException.cs b/src/Mvc/GetDocumentInsider/src/CommandException.cs
similarity index 100%
rename from src/Mvc/src/GetDocumentInsider/CommandException.cs
rename to src/Mvc/GetDocumentInsider/src/CommandException.cs
diff --git a/src/Mvc/src/GetDocumentInsider/CommandLineUtils/CommandArgument.cs b/src/Mvc/GetDocumentInsider/src/CommandLineUtils/CommandArgument.cs
similarity index 100%
rename from src/Mvc/src/GetDocumentInsider/CommandLineUtils/CommandArgument.cs
rename to src/Mvc/GetDocumentInsider/src/CommandLineUtils/CommandArgument.cs
diff --git a/src/Mvc/src/GetDocumentInsider/CommandLineUtils/CommandLineApplication.cs b/src/Mvc/GetDocumentInsider/src/CommandLineUtils/CommandLineApplication.cs
similarity index 100%
rename from src/Mvc/src/GetDocumentInsider/CommandLineUtils/CommandLineApplication.cs
rename to src/Mvc/GetDocumentInsider/src/CommandLineUtils/CommandLineApplication.cs
diff --git a/src/Mvc/src/GetDocumentInsider/CommandLineUtils/CommandLineApplicationExtensions.cs b/src/Mvc/GetDocumentInsider/src/CommandLineUtils/CommandLineApplicationExtensions.cs
similarity index 100%
rename from src/Mvc/src/GetDocumentInsider/CommandLineUtils/CommandLineApplicationExtensions.cs
rename to src/Mvc/GetDocumentInsider/src/CommandLineUtils/CommandLineApplicationExtensions.cs
diff --git a/src/Mvc/src/GetDocumentInsider/CommandLineUtils/CommandOption.cs b/src/Mvc/GetDocumentInsider/src/CommandLineUtils/CommandOption.cs
similarity index 100%
rename from src/Mvc/src/GetDocumentInsider/CommandLineUtils/CommandOption.cs
rename to src/Mvc/GetDocumentInsider/src/CommandLineUtils/CommandOption.cs
diff --git a/src/Mvc/src/GetDocumentInsider/CommandLineUtils/CommandOptionType.cs b/src/Mvc/GetDocumentInsider/src/CommandLineUtils/CommandOptionType.cs
similarity index 100%
rename from src/Mvc/src/GetDocumentInsider/CommandLineUtils/CommandOptionType.cs
rename to src/Mvc/GetDocumentInsider/src/CommandLineUtils/CommandOptionType.cs
diff --git a/src/Mvc/src/GetDocumentInsider/CommandLineUtils/CommandParsingException.cs b/src/Mvc/GetDocumentInsider/src/CommandLineUtils/CommandParsingException.cs
similarity index 100%
rename from src/Mvc/src/GetDocumentInsider/CommandLineUtils/CommandParsingException.cs
rename to src/Mvc/GetDocumentInsider/src/CommandLineUtils/CommandParsingException.cs
diff --git a/src/Mvc/src/GetDocumentInsider/Commands/CommandBase.cs b/src/Mvc/GetDocumentInsider/src/Commands/CommandBase.cs
similarity index 100%
rename from src/Mvc/src/GetDocumentInsider/Commands/CommandBase.cs
rename to src/Mvc/GetDocumentInsider/src/Commands/CommandBase.cs
diff --git a/src/Mvc/src/GetDocumentInsider/Commands/GetDocumentCommand.cs b/src/Mvc/GetDocumentInsider/src/Commands/GetDocumentCommand.cs
similarity index 100%
rename from src/Mvc/src/GetDocumentInsider/Commands/GetDocumentCommand.cs
rename to src/Mvc/GetDocumentInsider/src/Commands/GetDocumentCommand.cs
diff --git a/src/Mvc/src/GetDocumentInsider/Commands/GetDocumentCommandContext.cs b/src/Mvc/GetDocumentInsider/src/Commands/GetDocumentCommandContext.cs
similarity index 100%
rename from src/Mvc/src/GetDocumentInsider/Commands/GetDocumentCommandContext.cs
rename to src/Mvc/GetDocumentInsider/src/Commands/GetDocumentCommandContext.cs
diff --git a/src/Mvc/src/GetDocumentInsider/Commands/GetDocumentCommandWorker.cs b/src/Mvc/GetDocumentInsider/src/Commands/GetDocumentCommandWorker.cs
similarity index 100%
rename from src/Mvc/src/GetDocumentInsider/Commands/GetDocumentCommandWorker.cs
rename to src/Mvc/GetDocumentInsider/src/Commands/GetDocumentCommandWorker.cs
diff --git a/src/Mvc/src/GetDocumentInsider/Commands/HelpCommandBase.cs b/src/Mvc/GetDocumentInsider/src/Commands/HelpCommandBase.cs
similarity index 100%
rename from src/Mvc/src/GetDocumentInsider/Commands/HelpCommandBase.cs
rename to src/Mvc/GetDocumentInsider/src/Commands/HelpCommandBase.cs
diff --git a/src/Mvc/src/GetDocumentInsider/Commands/ProjectCommandBase.cs b/src/Mvc/GetDocumentInsider/src/Commands/ProjectCommandBase.cs
similarity index 100%
rename from src/Mvc/src/GetDocumentInsider/Commands/ProjectCommandBase.cs
rename to src/Mvc/GetDocumentInsider/src/Commands/ProjectCommandBase.cs
diff --git a/src/Mvc/src/GetDocumentInsider/GetDocumentInsider.csproj b/src/Mvc/GetDocumentInsider/src/GetDocumentInsider.csproj
similarity index 100%
rename from src/Mvc/src/GetDocumentInsider/GetDocumentInsider.csproj
rename to src/Mvc/GetDocumentInsider/src/GetDocumentInsider.csproj
diff --git a/src/Mvc/src/GetDocumentInsider/ProductInfo.cs b/src/Mvc/GetDocumentInsider/src/ProductInfo.cs
similarity index 100%
rename from src/Mvc/src/GetDocumentInsider/ProductInfo.cs
rename to src/Mvc/GetDocumentInsider/src/ProductInfo.cs
diff --git a/src/Mvc/src/GetDocumentInsider/Program.cs b/src/Mvc/GetDocumentInsider/src/Program.cs
similarity index 100%
rename from src/Mvc/src/GetDocumentInsider/Program.cs
rename to src/Mvc/GetDocumentInsider/src/Program.cs
diff --git a/src/Mvc/src/GetDocumentInsider/Properties/Resources.Designer.cs b/src/Mvc/GetDocumentInsider/src/Properties/Resources.Designer.cs
similarity index 100%
rename from src/Mvc/src/GetDocumentInsider/Properties/Resources.Designer.cs
rename to src/Mvc/GetDocumentInsider/src/Properties/Resources.Designer.cs
diff --git a/src/Mvc/src/GetDocumentInsider/Reporter.cs b/src/Mvc/GetDocumentInsider/src/Reporter.cs
similarity index 100%
rename from src/Mvc/src/GetDocumentInsider/Reporter.cs
rename to src/Mvc/GetDocumentInsider/src/Reporter.cs
diff --git a/src/Mvc/src/GetDocumentInsider/Resources.resx b/src/Mvc/GetDocumentInsider/src/Resources.resx
similarity index 100%
rename from src/Mvc/src/GetDocumentInsider/Resources.resx
rename to src/Mvc/GetDocumentInsider/src/Resources.resx
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/ActionDescriptor.cs b/src/Mvc/Mvc.Abstractions/src/Abstractions/ActionDescriptor.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/ActionDescriptor.cs
rename to src/Mvc/Mvc.Abstractions/src/Abstractions/ActionDescriptor.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/ActionDescriptorExtensions.cs b/src/Mvc/Mvc.Abstractions/src/Abstractions/ActionDescriptorExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/ActionDescriptorExtensions.cs
rename to src/Mvc/Mvc.Abstractions/src/Abstractions/ActionDescriptorExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/ActionDescriptorProviderContext.cs b/src/Mvc/Mvc.Abstractions/src/Abstractions/ActionDescriptorProviderContext.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/ActionDescriptorProviderContext.cs
rename to src/Mvc/Mvc.Abstractions/src/Abstractions/ActionDescriptorProviderContext.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/ActionInvokerProviderContext.cs b/src/Mvc/Mvc.Abstractions/src/Abstractions/ActionInvokerProviderContext.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/ActionInvokerProviderContext.cs
rename to src/Mvc/Mvc.Abstractions/src/Abstractions/ActionInvokerProviderContext.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/IActionDescriptorProvider.cs b/src/Mvc/Mvc.Abstractions/src/Abstractions/IActionDescriptorProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/IActionDescriptorProvider.cs
rename to src/Mvc/Mvc.Abstractions/src/Abstractions/IActionDescriptorProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/IActionInvoker.cs b/src/Mvc/Mvc.Abstractions/src/Abstractions/IActionInvoker.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/IActionInvoker.cs
rename to src/Mvc/Mvc.Abstractions/src/Abstractions/IActionInvoker.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/IActionInvokerProvider.cs b/src/Mvc/Mvc.Abstractions/src/Abstractions/IActionInvokerProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/IActionInvokerProvider.cs
rename to src/Mvc/Mvc.Abstractions/src/Abstractions/IActionInvokerProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/ParameterDescriptor.cs b/src/Mvc/Mvc.Abstractions/src/Abstractions/ParameterDescriptor.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/ParameterDescriptor.cs
rename to src/Mvc/Mvc.Abstractions/src/Abstractions/ParameterDescriptor.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/ActionConstraintContext.cs b/src/Mvc/Mvc.Abstractions/src/ActionConstraints/ActionConstraintContext.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/ActionConstraintContext.cs
rename to src/Mvc/Mvc.Abstractions/src/ActionConstraints/ActionConstraintContext.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/ActionConstraintItem.cs b/src/Mvc/Mvc.Abstractions/src/ActionConstraints/ActionConstraintItem.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/ActionConstraintItem.cs
rename to src/Mvc/Mvc.Abstractions/src/ActionConstraints/ActionConstraintItem.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/ActionConstraintProviderContext.cs b/src/Mvc/Mvc.Abstractions/src/ActionConstraints/ActionConstraintProviderContext.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/ActionConstraintProviderContext.cs
rename to src/Mvc/Mvc.Abstractions/src/ActionConstraints/ActionConstraintProviderContext.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/ActionSelectorCandidate.cs b/src/Mvc/Mvc.Abstractions/src/ActionConstraints/ActionSelectorCandidate.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/ActionSelectorCandidate.cs
rename to src/Mvc/Mvc.Abstractions/src/ActionConstraints/ActionSelectorCandidate.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/IActionConstraint.cs b/src/Mvc/Mvc.Abstractions/src/ActionConstraints/IActionConstraint.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/IActionConstraint.cs
rename to src/Mvc/Mvc.Abstractions/src/ActionConstraints/IActionConstraint.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/IActionConstraintFactory.cs b/src/Mvc/Mvc.Abstractions/src/ActionConstraints/IActionConstraintFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/IActionConstraintFactory.cs
rename to src/Mvc/Mvc.Abstractions/src/ActionConstraints/IActionConstraintFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/IActionConstraintMetadata.cs b/src/Mvc/Mvc.Abstractions/src/ActionConstraints/IActionConstraintMetadata.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/IActionConstraintMetadata.cs
rename to src/Mvc/Mvc.Abstractions/src/ActionConstraints/IActionConstraintMetadata.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/IActionConstraintProvider.cs b/src/Mvc/Mvc.Abstractions/src/ActionConstraints/IActionConstraintProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/IActionConstraintProvider.cs
rename to src/Mvc/Mvc.Abstractions/src/ActionConstraints/IActionConstraintProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionContext.cs b/src/Mvc/Mvc.Abstractions/src/ActionContext.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionContext.cs
rename to src/Mvc/Mvc.Abstractions/src/ActionContext.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/ApiDescription.cs b/src/Mvc/Mvc.Abstractions/src/ApiExplorer/ApiDescription.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/ApiDescription.cs
rename to src/Mvc/Mvc.Abstractions/src/ApiExplorer/ApiDescription.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/ApiDescriptionProviderContext.cs b/src/Mvc/Mvc.Abstractions/src/ApiExplorer/ApiDescriptionProviderContext.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/ApiDescriptionProviderContext.cs
rename to src/Mvc/Mvc.Abstractions/src/ApiExplorer/ApiDescriptionProviderContext.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/ApiParameterDescription.cs b/src/Mvc/Mvc.Abstractions/src/ApiExplorer/ApiParameterDescription.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/ApiParameterDescription.cs
rename to src/Mvc/Mvc.Abstractions/src/ApiExplorer/ApiParameterDescription.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/ApiParameterRouteInfo.cs b/src/Mvc/Mvc.Abstractions/src/ApiExplorer/ApiParameterRouteInfo.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/ApiParameterRouteInfo.cs
rename to src/Mvc/Mvc.Abstractions/src/ApiExplorer/ApiParameterRouteInfo.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/ApiRequestFormat.cs b/src/Mvc/Mvc.Abstractions/src/ApiExplorer/ApiRequestFormat.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/ApiRequestFormat.cs
rename to src/Mvc/Mvc.Abstractions/src/ApiExplorer/ApiRequestFormat.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/ApiResponseFormat.cs b/src/Mvc/Mvc.Abstractions/src/ApiExplorer/ApiResponseFormat.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/ApiResponseFormat.cs
rename to src/Mvc/Mvc.Abstractions/src/ApiExplorer/ApiResponseFormat.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/ApiResponseType.cs b/src/Mvc/Mvc.Abstractions/src/ApiExplorer/ApiResponseType.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/ApiResponseType.cs
rename to src/Mvc/Mvc.Abstractions/src/ApiExplorer/ApiResponseType.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/IApiDescriptionProvider.cs b/src/Mvc/Mvc.Abstractions/src/ApiExplorer/IApiDescriptionProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/IApiDescriptionProvider.cs
rename to src/Mvc/Mvc.Abstractions/src/ApiExplorer/IApiDescriptionProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Authorization/IAllowAnonymousFilter.cs b/src/Mvc/Mvc.Abstractions/src/Authorization/IAllowAnonymousFilter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Authorization/IAllowAnonymousFilter.cs
rename to src/Mvc/Mvc.Abstractions/src/Authorization/IAllowAnonymousFilter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ActionExecutedContext.cs b/src/Mvc/Mvc.Abstractions/src/Filters/ActionExecutedContext.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ActionExecutedContext.cs
rename to src/Mvc/Mvc.Abstractions/src/Filters/ActionExecutedContext.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ActionExecutingContext.cs b/src/Mvc/Mvc.Abstractions/src/Filters/ActionExecutingContext.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ActionExecutingContext.cs
rename to src/Mvc/Mvc.Abstractions/src/Filters/ActionExecutingContext.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ActionExecutionDelegate.cs b/src/Mvc/Mvc.Abstractions/src/Filters/ActionExecutionDelegate.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ActionExecutionDelegate.cs
rename to src/Mvc/Mvc.Abstractions/src/Filters/ActionExecutionDelegate.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/AuthorizationFilterContext.cs b/src/Mvc/Mvc.Abstractions/src/Filters/AuthorizationFilterContext.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/AuthorizationFilterContext.cs
rename to src/Mvc/Mvc.Abstractions/src/Filters/AuthorizationFilterContext.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ExceptionContext.cs b/src/Mvc/Mvc.Abstractions/src/Filters/ExceptionContext.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ExceptionContext.cs
rename to src/Mvc/Mvc.Abstractions/src/Filters/ExceptionContext.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/FilterContext.cs b/src/Mvc/Mvc.Abstractions/src/Filters/FilterContext.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/FilterContext.cs
rename to src/Mvc/Mvc.Abstractions/src/Filters/FilterContext.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/FilterDescriptor.cs b/src/Mvc/Mvc.Abstractions/src/Filters/FilterDescriptor.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/FilterDescriptor.cs
rename to src/Mvc/Mvc.Abstractions/src/Filters/FilterDescriptor.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/FilterItem.cs b/src/Mvc/Mvc.Abstractions/src/Filters/FilterItem.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/FilterItem.cs
rename to src/Mvc/Mvc.Abstractions/src/Filters/FilterItem.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/FilterProviderContext.cs b/src/Mvc/Mvc.Abstractions/src/Filters/FilterProviderContext.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/FilterProviderContext.cs
rename to src/Mvc/Mvc.Abstractions/src/Filters/FilterProviderContext.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IActionFilter.cs b/src/Mvc/Mvc.Abstractions/src/Filters/IActionFilter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IActionFilter.cs
rename to src/Mvc/Mvc.Abstractions/src/Filters/IActionFilter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAlwaysRunResultFilter.cs b/src/Mvc/Mvc.Abstractions/src/Filters/IAlwaysRunResultFilter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAlwaysRunResultFilter.cs
rename to src/Mvc/Mvc.Abstractions/src/Filters/IAlwaysRunResultFilter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAsyncActionFilter.cs b/src/Mvc/Mvc.Abstractions/src/Filters/IAsyncActionFilter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAsyncActionFilter.cs
rename to src/Mvc/Mvc.Abstractions/src/Filters/IAsyncActionFilter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAsyncAlwaysRunResultFilter.cs b/src/Mvc/Mvc.Abstractions/src/Filters/IAsyncAlwaysRunResultFilter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAsyncAlwaysRunResultFilter.cs
rename to src/Mvc/Mvc.Abstractions/src/Filters/IAsyncAlwaysRunResultFilter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAsyncAuthorizationFilter.cs b/src/Mvc/Mvc.Abstractions/src/Filters/IAsyncAuthorizationFilter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAsyncAuthorizationFilter.cs
rename to src/Mvc/Mvc.Abstractions/src/Filters/IAsyncAuthorizationFilter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAsyncExceptionFilter.cs b/src/Mvc/Mvc.Abstractions/src/Filters/IAsyncExceptionFilter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAsyncExceptionFilter.cs
rename to src/Mvc/Mvc.Abstractions/src/Filters/IAsyncExceptionFilter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAsyncResourceFilter.cs b/src/Mvc/Mvc.Abstractions/src/Filters/IAsyncResourceFilter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAsyncResourceFilter.cs
rename to src/Mvc/Mvc.Abstractions/src/Filters/IAsyncResourceFilter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAsyncResultFilter.cs b/src/Mvc/Mvc.Abstractions/src/Filters/IAsyncResultFilter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAsyncResultFilter.cs
rename to src/Mvc/Mvc.Abstractions/src/Filters/IAsyncResultFilter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAuthorizationFilter.cs b/src/Mvc/Mvc.Abstractions/src/Filters/IAuthorizationFilter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAuthorizationFilter.cs
rename to src/Mvc/Mvc.Abstractions/src/Filters/IAuthorizationFilter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IExceptionFilter.cs b/src/Mvc/Mvc.Abstractions/src/Filters/IExceptionFilter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IExceptionFilter.cs
rename to src/Mvc/Mvc.Abstractions/src/Filters/IExceptionFilter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IFilterContainer.cs b/src/Mvc/Mvc.Abstractions/src/Filters/IFilterContainer.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IFilterContainer.cs
rename to src/Mvc/Mvc.Abstractions/src/Filters/IFilterContainer.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IFilterFactory.cs b/src/Mvc/Mvc.Abstractions/src/Filters/IFilterFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IFilterFactory.cs
rename to src/Mvc/Mvc.Abstractions/src/Filters/IFilterFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IFilterMetadata.cs b/src/Mvc/Mvc.Abstractions/src/Filters/IFilterMetadata.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IFilterMetadata.cs
rename to src/Mvc/Mvc.Abstractions/src/Filters/IFilterMetadata.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IFilterProvider.cs b/src/Mvc/Mvc.Abstractions/src/Filters/IFilterProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IFilterProvider.cs
rename to src/Mvc/Mvc.Abstractions/src/Filters/IFilterProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IOrderedFilter.cs b/src/Mvc/Mvc.Abstractions/src/Filters/IOrderedFilter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IOrderedFilter.cs
rename to src/Mvc/Mvc.Abstractions/src/Filters/IOrderedFilter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IResourceFilter.cs b/src/Mvc/Mvc.Abstractions/src/Filters/IResourceFilter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IResourceFilter.cs
rename to src/Mvc/Mvc.Abstractions/src/Filters/IResourceFilter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IResultFilter.cs b/src/Mvc/Mvc.Abstractions/src/Filters/IResultFilter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IResultFilter.cs
rename to src/Mvc/Mvc.Abstractions/src/Filters/IResultFilter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ResourceExecutedContext.cs b/src/Mvc/Mvc.Abstractions/src/Filters/ResourceExecutedContext.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ResourceExecutedContext.cs
rename to src/Mvc/Mvc.Abstractions/src/Filters/ResourceExecutedContext.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ResourceExecutingContext.cs b/src/Mvc/Mvc.Abstractions/src/Filters/ResourceExecutingContext.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ResourceExecutingContext.cs
rename to src/Mvc/Mvc.Abstractions/src/Filters/ResourceExecutingContext.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ResourceExecutionDelegate.cs b/src/Mvc/Mvc.Abstractions/src/Filters/ResourceExecutionDelegate.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ResourceExecutionDelegate.cs
rename to src/Mvc/Mvc.Abstractions/src/Filters/ResourceExecutionDelegate.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ResultExecutedContext.cs b/src/Mvc/Mvc.Abstractions/src/Filters/ResultExecutedContext.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ResultExecutedContext.cs
rename to src/Mvc/Mvc.Abstractions/src/Filters/ResultExecutedContext.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ResultExecutingContext.cs b/src/Mvc/Mvc.Abstractions/src/Filters/ResultExecutingContext.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ResultExecutingContext.cs
rename to src/Mvc/Mvc.Abstractions/src/Filters/ResultExecutingContext.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ResultExecutionDelegate.cs b/src/Mvc/Mvc.Abstractions/src/Filters/ResultExecutionDelegate.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ResultExecutionDelegate.cs
rename to src/Mvc/Mvc.Abstractions/src/Filters/ResultExecutionDelegate.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/FormatterCollection.cs b/src/Mvc/Mvc.Abstractions/src/Formatters/FormatterCollection.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/FormatterCollection.cs
rename to src/Mvc/Mvc.Abstractions/src/Formatters/FormatterCollection.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/IInputFormatter.cs b/src/Mvc/Mvc.Abstractions/src/Formatters/IInputFormatter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/IInputFormatter.cs
rename to src/Mvc/Mvc.Abstractions/src/Formatters/IInputFormatter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/IInputFormatterExceptionPolicy.cs b/src/Mvc/Mvc.Abstractions/src/Formatters/IInputFormatterExceptionPolicy.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/IInputFormatterExceptionPolicy.cs
rename to src/Mvc/Mvc.Abstractions/src/Formatters/IInputFormatterExceptionPolicy.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/IOutputFormatter.cs b/src/Mvc/Mvc.Abstractions/src/Formatters/IOutputFormatter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/IOutputFormatter.cs
rename to src/Mvc/Mvc.Abstractions/src/Formatters/IOutputFormatter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/InputFormatterContext.cs b/src/Mvc/Mvc.Abstractions/src/Formatters/InputFormatterContext.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/InputFormatterContext.cs
rename to src/Mvc/Mvc.Abstractions/src/Formatters/InputFormatterContext.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/InputFormatterException.cs b/src/Mvc/Mvc.Abstractions/src/Formatters/InputFormatterException.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/InputFormatterException.cs
rename to src/Mvc/Mvc.Abstractions/src/Formatters/InputFormatterException.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/InputFormatterExceptionPolicy.cs b/src/Mvc/Mvc.Abstractions/src/Formatters/InputFormatterExceptionPolicy.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/InputFormatterExceptionPolicy.cs
rename to src/Mvc/Mvc.Abstractions/src/Formatters/InputFormatterExceptionPolicy.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/InputFormatterResult.cs b/src/Mvc/Mvc.Abstractions/src/Formatters/InputFormatterResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/InputFormatterResult.cs
rename to src/Mvc/Mvc.Abstractions/src/Formatters/InputFormatterResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/OutputFormatterCanWriteContext.cs b/src/Mvc/Mvc.Abstractions/src/Formatters/OutputFormatterCanWriteContext.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/OutputFormatterCanWriteContext.cs
rename to src/Mvc/Mvc.Abstractions/src/Formatters/OutputFormatterCanWriteContext.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/OutputFormatterWriteContext.cs b/src/Mvc/Mvc.Abstractions/src/Formatters/OutputFormatterWriteContext.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/OutputFormatterWriteContext.cs
rename to src/Mvc/Mvc.Abstractions/src/Formatters/OutputFormatterWriteContext.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/IActionResult.cs b/src/Mvc/Mvc.Abstractions/src/IActionResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/IActionResult.cs
rename to src/Mvc/Mvc.Abstractions/src/IActionResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/IUrlHelper.cs b/src/Mvc/Mvc.Abstractions/src/IUrlHelper.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/IUrlHelper.cs
rename to src/Mvc/Mvc.Abstractions/src/IUrlHelper.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Microsoft.AspNetCore.Mvc.Abstractions.csproj b/src/Mvc/Mvc.Abstractions/src/Microsoft.AspNetCore.Mvc.Abstractions.csproj
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Microsoft.AspNetCore.Mvc.Abstractions.csproj
rename to src/Mvc/Mvc.Abstractions/src/Microsoft.AspNetCore.Mvc.Abstractions.csproj
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/BindingInfo.cs b/src/Mvc/Mvc.Abstractions/src/ModelBinding/BindingInfo.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/BindingInfo.cs
rename to src/Mvc/Mvc.Abstractions/src/ModelBinding/BindingInfo.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/BindingSource.cs b/src/Mvc/Mvc.Abstractions/src/ModelBinding/BindingSource.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/BindingSource.cs
rename to src/Mvc/Mvc.Abstractions/src/ModelBinding/BindingSource.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/CompositeBindingSource.cs b/src/Mvc/Mvc.Abstractions/src/ModelBinding/CompositeBindingSource.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/CompositeBindingSource.cs
rename to src/Mvc/Mvc.Abstractions/src/ModelBinding/CompositeBindingSource.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/EnumGroupAndName.cs b/src/Mvc/Mvc.Abstractions/src/ModelBinding/EnumGroupAndName.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/EnumGroupAndName.cs
rename to src/Mvc/Mvc.Abstractions/src/ModelBinding/EnumGroupAndName.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IBinderTypeProviderMetadata.cs b/src/Mvc/Mvc.Abstractions/src/ModelBinding/IBinderTypeProviderMetadata.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IBinderTypeProviderMetadata.cs
rename to src/Mvc/Mvc.Abstractions/src/ModelBinding/IBinderTypeProviderMetadata.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IBindingSourceMetadata.cs b/src/Mvc/Mvc.Abstractions/src/ModelBinding/IBindingSourceMetadata.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IBindingSourceMetadata.cs
rename to src/Mvc/Mvc.Abstractions/src/ModelBinding/IBindingSourceMetadata.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IModelBinder.cs b/src/Mvc/Mvc.Abstractions/src/ModelBinding/IModelBinder.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IModelBinder.cs
rename to src/Mvc/Mvc.Abstractions/src/ModelBinding/IModelBinder.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IModelBinderProvider.cs b/src/Mvc/Mvc.Abstractions/src/ModelBinding/IModelBinderProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IModelBinderProvider.cs
rename to src/Mvc/Mvc.Abstractions/src/ModelBinding/IModelBinderProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IModelMetadataProvider.cs b/src/Mvc/Mvc.Abstractions/src/ModelBinding/IModelMetadataProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IModelMetadataProvider.cs
rename to src/Mvc/Mvc.Abstractions/src/ModelBinding/IModelMetadataProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IModelNameProvider.cs b/src/Mvc/Mvc.Abstractions/src/ModelBinding/IModelNameProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IModelNameProvider.cs
rename to src/Mvc/Mvc.Abstractions/src/ModelBinding/IModelNameProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IPropertyFilterProvider.cs b/src/Mvc/Mvc.Abstractions/src/ModelBinding/IPropertyFilterProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IPropertyFilterProvider.cs
rename to src/Mvc/Mvc.Abstractions/src/ModelBinding/IPropertyFilterProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IRequestPredicateProvider.cs b/src/Mvc/Mvc.Abstractions/src/ModelBinding/IRequestPredicateProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IRequestPredicateProvider.cs
rename to src/Mvc/Mvc.Abstractions/src/ModelBinding/IRequestPredicateProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IValueProvider.cs b/src/Mvc/Mvc.Abstractions/src/ModelBinding/IValueProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IValueProvider.cs
rename to src/Mvc/Mvc.Abstractions/src/ModelBinding/IValueProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IValueProviderFactory.cs b/src/Mvc/Mvc.Abstractions/src/ModelBinding/IValueProviderFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IValueProviderFactory.cs
rename to src/Mvc/Mvc.Abstractions/src/ModelBinding/IValueProviderFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Metadata/ModelBindingMessageProvider.cs b/src/Mvc/Mvc.Abstractions/src/ModelBinding/Metadata/ModelBindingMessageProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Metadata/ModelBindingMessageProvider.cs
rename to src/Mvc/Mvc.Abstractions/src/ModelBinding/Metadata/ModelBindingMessageProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Metadata/ModelMetadataIdentity.cs b/src/Mvc/Mvc.Abstractions/src/ModelBinding/Metadata/ModelMetadataIdentity.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Metadata/ModelMetadataIdentity.cs
rename to src/Mvc/Mvc.Abstractions/src/ModelBinding/Metadata/ModelMetadataIdentity.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Metadata/ModelMetadataKind.cs b/src/Mvc/Mvc.Abstractions/src/ModelBinding/Metadata/ModelMetadataKind.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Metadata/ModelMetadataKind.cs
rename to src/Mvc/Mvc.Abstractions/src/ModelBinding/Metadata/ModelMetadataKind.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelBinderProviderContext.cs b/src/Mvc/Mvc.Abstractions/src/ModelBinding/ModelBinderProviderContext.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelBinderProviderContext.cs
rename to src/Mvc/Mvc.Abstractions/src/ModelBinding/ModelBinderProviderContext.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelBindingContext.cs b/src/Mvc/Mvc.Abstractions/src/ModelBinding/ModelBindingContext.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelBindingContext.cs
rename to src/Mvc/Mvc.Abstractions/src/ModelBinding/ModelBindingContext.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelBindingResult.cs b/src/Mvc/Mvc.Abstractions/src/ModelBinding/ModelBindingResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelBindingResult.cs
rename to src/Mvc/Mvc.Abstractions/src/ModelBinding/ModelBindingResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelError.cs b/src/Mvc/Mvc.Abstractions/src/ModelBinding/ModelError.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelError.cs
rename to src/Mvc/Mvc.Abstractions/src/ModelBinding/ModelError.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelErrorCollection.cs b/src/Mvc/Mvc.Abstractions/src/ModelBinding/ModelErrorCollection.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelErrorCollection.cs
rename to src/Mvc/Mvc.Abstractions/src/ModelBinding/ModelErrorCollection.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelMetadata.cs b/src/Mvc/Mvc.Abstractions/src/ModelBinding/ModelMetadata.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelMetadata.cs
rename to src/Mvc/Mvc.Abstractions/src/ModelBinding/ModelMetadata.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelMetadataProvider.cs b/src/Mvc/Mvc.Abstractions/src/ModelBinding/ModelMetadataProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelMetadataProvider.cs
rename to src/Mvc/Mvc.Abstractions/src/ModelBinding/ModelMetadataProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelPropertyCollection.cs b/src/Mvc/Mvc.Abstractions/src/ModelBinding/ModelPropertyCollection.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelPropertyCollection.cs
rename to src/Mvc/Mvc.Abstractions/src/ModelBinding/ModelPropertyCollection.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelStateDictionary.cs b/src/Mvc/Mvc.Abstractions/src/ModelBinding/ModelStateDictionary.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelStateDictionary.cs
rename to src/Mvc/Mvc.Abstractions/src/ModelBinding/ModelStateDictionary.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelStateEntry.cs b/src/Mvc/Mvc.Abstractions/src/ModelBinding/ModelStateEntry.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelStateEntry.cs
rename to src/Mvc/Mvc.Abstractions/src/ModelBinding/ModelStateEntry.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelValidationState.cs b/src/Mvc/Mvc.Abstractions/src/ModelBinding/ModelValidationState.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelValidationState.cs
rename to src/Mvc/Mvc.Abstractions/src/ModelBinding/ModelValidationState.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/TooManyModelErrorsException.cs b/src/Mvc/Mvc.Abstractions/src/ModelBinding/TooManyModelErrorsException.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/TooManyModelErrorsException.cs
rename to src/Mvc/Mvc.Abstractions/src/ModelBinding/TooManyModelErrorsException.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ClientModelValidationContext.cs b/src/Mvc/Mvc.Abstractions/src/ModelBinding/Validation/ClientModelValidationContext.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ClientModelValidationContext.cs
rename to src/Mvc/Mvc.Abstractions/src/ModelBinding/Validation/ClientModelValidationContext.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ClientValidatorItem.cs b/src/Mvc/Mvc.Abstractions/src/ModelBinding/Validation/ClientValidatorItem.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ClientValidatorItem.cs
rename to src/Mvc/Mvc.Abstractions/src/ModelBinding/Validation/ClientValidatorItem.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ClientValidatorProviderContext.cs b/src/Mvc/Mvc.Abstractions/src/ModelBinding/Validation/ClientValidatorProviderContext.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ClientValidatorProviderContext.cs
rename to src/Mvc/Mvc.Abstractions/src/ModelBinding/Validation/ClientValidatorProviderContext.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/IClientModelValidator.cs b/src/Mvc/Mvc.Abstractions/src/ModelBinding/Validation/IClientModelValidator.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/IClientModelValidator.cs
rename to src/Mvc/Mvc.Abstractions/src/ModelBinding/Validation/IClientModelValidator.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/IClientModelValidatorProvider.cs b/src/Mvc/Mvc.Abstractions/src/ModelBinding/Validation/IClientModelValidatorProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/IClientModelValidatorProvider.cs
rename to src/Mvc/Mvc.Abstractions/src/ModelBinding/Validation/IClientModelValidatorProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/IModelValidator.cs b/src/Mvc/Mvc.Abstractions/src/ModelBinding/Validation/IModelValidator.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/IModelValidator.cs
rename to src/Mvc/Mvc.Abstractions/src/ModelBinding/Validation/IModelValidator.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/IModelValidatorProvider.cs b/src/Mvc/Mvc.Abstractions/src/ModelBinding/Validation/IModelValidatorProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/IModelValidatorProvider.cs
rename to src/Mvc/Mvc.Abstractions/src/ModelBinding/Validation/IModelValidatorProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/IPropertyValidationFilter.cs b/src/Mvc/Mvc.Abstractions/src/ModelBinding/Validation/IPropertyValidationFilter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/IPropertyValidationFilter.cs
rename to src/Mvc/Mvc.Abstractions/src/ModelBinding/Validation/IPropertyValidationFilter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/IValidationStrategy.cs b/src/Mvc/Mvc.Abstractions/src/ModelBinding/Validation/IValidationStrategy.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/IValidationStrategy.cs
rename to src/Mvc/Mvc.Abstractions/src/ModelBinding/Validation/IValidationStrategy.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ModelValidationContext.cs b/src/Mvc/Mvc.Abstractions/src/ModelBinding/Validation/ModelValidationContext.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ModelValidationContext.cs
rename to src/Mvc/Mvc.Abstractions/src/ModelBinding/Validation/ModelValidationContext.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ModelValidationContextBase.cs b/src/Mvc/Mvc.Abstractions/src/ModelBinding/Validation/ModelValidationContextBase.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ModelValidationContextBase.cs
rename to src/Mvc/Mvc.Abstractions/src/ModelBinding/Validation/ModelValidationContextBase.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ModelValidationResult.cs b/src/Mvc/Mvc.Abstractions/src/ModelBinding/Validation/ModelValidationResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ModelValidationResult.cs
rename to src/Mvc/Mvc.Abstractions/src/ModelBinding/Validation/ModelValidationResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ModelValidatorProviderContext.cs b/src/Mvc/Mvc.Abstractions/src/ModelBinding/Validation/ModelValidatorProviderContext.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ModelValidatorProviderContext.cs
rename to src/Mvc/Mvc.Abstractions/src/ModelBinding/Validation/ModelValidatorProviderContext.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ValidationEntry.cs b/src/Mvc/Mvc.Abstractions/src/ModelBinding/Validation/ValidationEntry.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ValidationEntry.cs
rename to src/Mvc/Mvc.Abstractions/src/ModelBinding/Validation/ValidationEntry.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ValidationStateDictionary.cs b/src/Mvc/Mvc.Abstractions/src/ModelBinding/Validation/ValidationStateDictionary.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ValidationStateDictionary.cs
rename to src/Mvc/Mvc.Abstractions/src/ModelBinding/Validation/ValidationStateDictionary.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ValidationStateEntry.cs b/src/Mvc/Mvc.Abstractions/src/ModelBinding/Validation/ValidationStateEntry.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ValidationStateEntry.cs
rename to src/Mvc/Mvc.Abstractions/src/ModelBinding/Validation/ValidationStateEntry.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ValidatorItem.cs b/src/Mvc/Mvc.Abstractions/src/ModelBinding/Validation/ValidatorItem.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ValidatorItem.cs
rename to src/Mvc/Mvc.Abstractions/src/ModelBinding/Validation/ValidatorItem.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ValueProviderFactoryContext.cs b/src/Mvc/Mvc.Abstractions/src/ModelBinding/ValueProviderFactoryContext.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ValueProviderFactoryContext.cs
rename to src/Mvc/Mvc.Abstractions/src/ModelBinding/ValueProviderFactoryContext.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ValueProviderResult.cs b/src/Mvc/Mvc.Abstractions/src/ModelBinding/ValueProviderResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ValueProviderResult.cs
rename to src/Mvc/Mvc.Abstractions/src/ModelBinding/ValueProviderResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Properties/AssemblyInfo.cs b/src/Mvc/Mvc.Abstractions/src/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Properties/AssemblyInfo.cs
rename to src/Mvc/Mvc.Abstractions/src/Properties/AssemblyInfo.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Properties/Resources.Designer.cs b/src/Mvc/Mvc.Abstractions/src/Properties/Resources.Designer.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Properties/Resources.Designer.cs
rename to src/Mvc/Mvc.Abstractions/src/Properties/Resources.Designer.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Resources.resx b/src/Mvc/Mvc.Abstractions/src/Resources.resx
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Resources.resx
rename to src/Mvc/Mvc.Abstractions/src/Resources.resx
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Routing/AttributeRouteInfo.cs b/src/Mvc/Mvc.Abstractions/src/Routing/AttributeRouteInfo.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Routing/AttributeRouteInfo.cs
rename to src/Mvc/Mvc.Abstractions/src/Routing/AttributeRouteInfo.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Routing/UrlActionContext.cs b/src/Mvc/Mvc.Abstractions/src/Routing/UrlActionContext.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Routing/UrlActionContext.cs
rename to src/Mvc/Mvc.Abstractions/src/Routing/UrlActionContext.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Routing/UrlRouteContext.cs b/src/Mvc/Mvc.Abstractions/src/Routing/UrlRouteContext.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Routing/UrlRouteContext.cs
rename to src/Mvc/Mvc.Abstractions/src/Routing/UrlRouteContext.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/baseline.netcore.json b/src/Mvc/Mvc.Abstractions/src/baseline.netcore.json
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/baseline.netcore.json
rename to src/Mvc/Mvc.Abstractions/src/baseline.netcore.json
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/Filters/FilterContextTest.cs b/src/Mvc/Mvc.Abstractions/test/Filters/FilterContextTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/Filters/FilterContextTest.cs
rename to src/Mvc/Mvc.Abstractions/test/Filters/FilterContextTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/Microsoft.AspNetCore.Mvc.Abstractions.Test.csproj b/src/Mvc/Mvc.Abstractions/test/Microsoft.AspNetCore.Mvc.Abstractions.Test.csproj
similarity index 56%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/Microsoft.AspNetCore.Mvc.Abstractions.Test.csproj
rename to src/Mvc/Mvc.Abstractions/test/Microsoft.AspNetCore.Mvc.Abstractions.Test.csproj
index bed078c835..28eee994cd 100644
--- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/Microsoft.AspNetCore.Mvc.Abstractions.Test.csproj
+++ b/src/Mvc/Mvc.Abstractions/test/Microsoft.AspNetCore.Mvc.Abstractions.Test.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.Core.TestCommon\Microsoft.AspNetCore.Mvc.Core.TestCommon.csproj" />
+    <ProjectReference Include="..\..\shared\Mvc.Core.TestCommon\Microsoft.AspNetCore.Mvc.Core.TestCommon.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/ModelBinding/BindingInfoTest.cs b/src/Mvc/Mvc.Abstractions/test/ModelBinding/BindingInfoTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/ModelBinding/BindingInfoTest.cs
rename to src/Mvc/Mvc.Abstractions/test/ModelBinding/BindingInfoTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/ModelBinding/ModelMetadataTest.cs b/src/Mvc/Mvc.Abstractions/test/ModelBinding/ModelMetadataTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/ModelBinding/ModelMetadataTest.cs
rename to src/Mvc/Mvc.Abstractions/test/ModelBinding/ModelMetadataTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/ModelBinding/ModelStateDictionaryTest.cs b/src/Mvc/Mvc.Abstractions/test/ModelBinding/ModelStateDictionaryTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/ModelBinding/ModelStateDictionaryTest.cs
rename to src/Mvc/Mvc.Abstractions/test/ModelBinding/ModelStateDictionaryTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/ModelBinding/ValueProviderResultTest.cs b/src/Mvc/Mvc.Abstractions/test/ModelBinding/ValueProviderResultTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/ModelBinding/ValueProviderResultTest.cs
rename to src/Mvc/Mvc.Abstractions/test/ModelBinding/ValueProviderResultTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/Properties/AssemblyInfo.cs b/src/Mvc/Mvc.Abstractions/test/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/Properties/AssemblyInfo.cs
rename to src/Mvc/Mvc.Abstractions/test/Properties/AssemblyInfo.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/AttributesShouldNotBeAppliedToPageModelAnalyzer.cs b/src/Mvc/Mvc.Analyzers/src/AttributesShouldNotBeAppliedToPageModelAnalyzer.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/AttributesShouldNotBeAppliedToPageModelAnalyzer.cs
rename to src/Mvc/Mvc.Analyzers/src/AttributesShouldNotBeAppliedToPageModelAnalyzer.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/AvoidHtmlPartialAnalyzer.cs b/src/Mvc/Mvc.Analyzers/src/AvoidHtmlPartialAnalyzer.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/AvoidHtmlPartialAnalyzer.cs
rename to src/Mvc/Mvc.Analyzers/src/AvoidHtmlPartialAnalyzer.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/CodeAnalysisExtensions.cs b/src/Mvc/Mvc.Analyzers/src/CodeAnalysisExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/CodeAnalysisExtensions.cs
rename to src/Mvc/Mvc.Analyzers/src/CodeAnalysisExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/DiagnosticDescriptors.cs b/src/Mvc/Mvc.Analyzers/src/DiagnosticDescriptors.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/DiagnosticDescriptors.cs
rename to src/Mvc/Mvc.Analyzers/src/DiagnosticDescriptors.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/Microsoft.AspNetCore.Mvc.Analyzers.csproj b/src/Mvc/Mvc.Analyzers/src/Microsoft.AspNetCore.Mvc.Analyzers.csproj
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/Microsoft.AspNetCore.Mvc.Analyzers.csproj
rename to src/Mvc/Mvc.Analyzers/src/Microsoft.AspNetCore.Mvc.Analyzers.csproj
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/Microsoft.AspNetCore.Mvc.Analyzers.nuspec b/src/Mvc/Mvc.Analyzers/src/Microsoft.AspNetCore.Mvc.Analyzers.nuspec
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/Microsoft.AspNetCore.Mvc.Analyzers.nuspec
rename to src/Mvc/Mvc.Analyzers/src/Microsoft.AspNetCore.Mvc.Analyzers.nuspec
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/MvcFacts.cs b/src/Mvc/Mvc.Analyzers/src/MvcFacts.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/MvcFacts.cs
rename to src/Mvc/Mvc.Analyzers/src/MvcFacts.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/Properties/AssemblyInfo.cs b/src/Mvc/Mvc.Analyzers/src/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/Properties/AssemblyInfo.cs
rename to src/Mvc/Mvc.Analyzers/src/Properties/AssemblyInfo.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/SymbolNames.cs b/src/Mvc/Mvc.Analyzers/src/SymbolNames.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/SymbolNames.cs
rename to src/Mvc/Mvc.Analyzers/src/SymbolNames.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/TopLevelParameterNameAnalyzer.cs b/src/Mvc/Mvc.Analyzers/src/TopLevelParameterNameAnalyzer.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/TopLevelParameterNameAnalyzer.cs
rename to src/Mvc/Mvc.Analyzers/src/TopLevelParameterNameAnalyzer.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/ViewFeatureAnalyzerBase.cs b/src/Mvc/Mvc.Analyzers/src/ViewFeatureAnalyzerBase.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/ViewFeatureAnalyzerBase.cs
rename to src/Mvc/Mvc.Analyzers/src/ViewFeatureAnalyzerBase.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/ViewFeaturesAnalyzerContext.cs b/src/Mvc/Mvc.Analyzers/src/ViewFeaturesAnalyzerContext.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/ViewFeaturesAnalyzerContext.cs
rename to src/Mvc/Mvc.Analyzers/src/ViewFeaturesAnalyzerContext.cs
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/AttributesShouldNotBeAppliedToPageModelAnalyzerTest.cs b/src/Mvc/Mvc.Analyzers/test/AttributesShouldNotBeAppliedToPageModelAnalyzerTest.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Analyzers.Test/AttributesShouldNotBeAppliedToPageModelAnalyzerTest.cs
rename to src/Mvc/Mvc.Analyzers/test/AttributesShouldNotBeAppliedToPageModelAnalyzerTest.cs
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/AvoidHtmlPartialAnalyzerTest.cs b/src/Mvc/Mvc.Analyzers/test/AvoidHtmlPartialAnalyzerTest.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Analyzers.Test/AvoidHtmlPartialAnalyzerTest.cs
rename to src/Mvc/Mvc.Analyzers/test/AvoidHtmlPartialAnalyzerTest.cs
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/CodeAnalysisExtensionsTest.cs b/src/Mvc/Mvc.Analyzers/test/CodeAnalysisExtensionsTest.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Analyzers.Test/CodeAnalysisExtensionsTest.cs
rename to src/Mvc/Mvc.Analyzers/test/CodeAnalysisExtensionsTest.cs
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/Infrastructure/MvcDiagnosticAnalyzerRunner.cs b/src/Mvc/Mvc.Analyzers/test/Infrastructure/MvcDiagnosticAnalyzerRunner.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Analyzers.Test/Infrastructure/MvcDiagnosticAnalyzerRunner.cs
rename to src/Mvc/Mvc.Analyzers/test/Infrastructure/MvcDiagnosticAnalyzerRunner.cs
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/Infrastructure/MvcTestSource.cs b/src/Mvc/Mvc.Analyzers/test/Infrastructure/MvcTestSource.cs
similarity index 92%
rename from src/Mvc/test/Mvc.Analyzers.Test/Infrastructure/MvcTestSource.cs
rename to src/Mvc/Mvc.Analyzers/test/Infrastructure/MvcTestSource.cs
index e0e2df6493..72366b83b0 100644
--- a/src/Mvc/test/Mvc.Analyzers.Test/Infrastructure/MvcTestSource.cs
+++ b/src/Mvc/Mvc.Analyzers/test/Infrastructure/MvcTestSource.cs
@@ -26,8 +26,7 @@ namespace Microsoft.AspNetCore.Mvc
         private static string GetProjectDirectory()
         {
             var solutionDirectory = TestPathUtilities.GetSolutionRootDirectory("Mvc");
-            var assemblyName = typeof(MvcTestSource).Assembly.GetName().Name;
-            var projectDirectory = Path.Combine(solutionDirectory, "test", assemblyName);
+            var projectDirectory = Path.Combine(solutionDirectory, "Mvc.Analyzers", "test");
             return projectDirectory;
         }
     }
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/Mvc.Analyzers.Test.csproj b/src/Mvc/Mvc.Analyzers/test/Mvc.Analyzers.Test.csproj
similarity index 81%
rename from src/Mvc/test/Mvc.Analyzers.Test/Mvc.Analyzers.Test.csproj
rename to src/Mvc/Mvc.Analyzers/test/Mvc.Analyzers.Test.csproj
index 39effb2f18..396f76d882 100644
--- a/src/Mvc/test/Mvc.Analyzers.Test/Mvc.Analyzers.Test.csproj
+++ b/src/Mvc/Mvc.Analyzers/test/Mvc.Analyzers.Test.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
@@ -13,7 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Mvc.Analyzers\Microsoft.AspNetCore.Mvc.Analyzers.csproj" />
+    <ProjectReference Include="..\..\Mvc.Analyzers\src\Microsoft.AspNetCore.Mvc.Analyzers.csproj" />
     <Reference Include="Microsoft.AspNetCore.Mvc" />
     <Reference Include="Microsoft.AspNetCore.Analyzer.Testing" />
     <Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" />
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/DiagnosticsAreReturned_IfAllowAnonymousIsAppliedToPageHandlerMethod.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/DiagnosticsAreReturned_IfAllowAnonymousIsAppliedToPageHandlerMethod.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/DiagnosticsAreReturned_IfAllowAnonymousIsAppliedToPageHandlerMethod.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/DiagnosticsAreReturned_IfAllowAnonymousIsAppliedToPageHandlerMethod.cs
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/DiagnosticsAreReturned_IfAttributeIsAppliedToBaseType.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/DiagnosticsAreReturned_IfAttributeIsAppliedToBaseType.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/DiagnosticsAreReturned_IfAttributeIsAppliedToBaseType.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/DiagnosticsAreReturned_IfAttributeIsAppliedToBaseType.cs
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/DiagnosticsAreReturned_IfAuthorizeAttributeIsAppliedToPageHandlerMethod.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/DiagnosticsAreReturned_IfAuthorizeAttributeIsAppliedToPageHandlerMethod.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/DiagnosticsAreReturned_IfAuthorizeAttributeIsAppliedToPageHandlerMethod.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/DiagnosticsAreReturned_IfAuthorizeAttributeIsAppliedToPageHandlerMethod.cs
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/DiagnosticsAreReturned_IfFiltersAreAppliedToPageHandlerMethod.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/DiagnosticsAreReturned_IfFiltersAreAppliedToPageHandlerMethod.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/DiagnosticsAreReturned_IfFiltersAreAppliedToPageHandlerMethod.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/DiagnosticsAreReturned_IfFiltersAreAppliedToPageHandlerMethod.cs
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/DiagnosticsAreReturned_IfFiltersAreAppliedToPageHandlerMethodDerivingFromCustomModel.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/DiagnosticsAreReturned_IfFiltersAreAppliedToPageHandlerMethodDerivingFromCustomModel.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/DiagnosticsAreReturned_IfFiltersAreAppliedToPageHandlerMethodDerivingFromCustomModel.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/DiagnosticsAreReturned_IfFiltersAreAppliedToPageHandlerMethodDerivingFromCustomModel.cs
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/DiagnosticsAreReturned_IfFiltersAreAppliedToPageHandlerMethodForTypeWithPageModelAttribute.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/DiagnosticsAreReturned_IfFiltersAreAppliedToPageHandlerMethodForTypeWithPageModelAttribute.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/DiagnosticsAreReturned_IfFiltersAreAppliedToPageHandlerMethodForTypeWithPageModelAttribute.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/DiagnosticsAreReturned_IfFiltersAreAppliedToPageHandlerMethodForTypeWithPageModelAttribute.cs
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/DiagnosticsAreReturned_IfRouteAttribute_IsAppliedToPageModel.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/DiagnosticsAreReturned_IfRouteAttribute_IsAppliedToPageModel.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/DiagnosticsAreReturned_IfRouteAttribute_IsAppliedToPageModel.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/DiagnosticsAreReturned_IfRouteAttribute_IsAppliedToPageModel.cs
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/DiagnosticsAreReturned_IfRouteAttributesAreAppliedToPageHandlerMethod.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/DiagnosticsAreReturned_IfRouteAttributesAreAppliedToPageHandlerMethod.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/DiagnosticsAreReturned_IfRouteAttributesAreAppliedToPageHandlerMethod.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/DiagnosticsAreReturned_IfRouteAttributesAreAppliedToPageHandlerMethod.cs
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/NoDiagnosticsAreReturned_ForControllerActions.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/NoDiagnosticsAreReturned_ForControllerActions.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/NoDiagnosticsAreReturned_ForControllerActions.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/NoDiagnosticsAreReturned_ForControllerActions.cs
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/NoDiagnosticsAreReturned_ForControllerBaseActions.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/NoDiagnosticsAreReturned_ForControllerBaseActions.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/NoDiagnosticsAreReturned_ForControllerBaseActions.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/NoDiagnosticsAreReturned_ForControllerBaseActions.cs
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/NoDiagnosticsAreReturned_ForNonHandlerMethodsWithAttributes.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/NoDiagnosticsAreReturned_ForNonHandlerMethodsWithAttributes.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/NoDiagnosticsAreReturned_ForNonHandlerMethodsWithAttributes.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/NoDiagnosticsAreReturned_ForNonHandlerMethodsWithAttributes.cs
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/NoDiagnosticsAreReturned_ForPageHandlersWithNonFilterAttributes.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/NoDiagnosticsAreReturned_ForPageHandlersWithNonFilterAttributes.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/NoDiagnosticsAreReturned_ForPageHandlersWithNonFilterAttributes.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/NoDiagnosticsAreReturned_ForPageHandlersWithNonFilterAttributes.cs
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/NoDiagnosticsAreReturned_IfAllowAnonymousIsAppliedToPageModel.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/NoDiagnosticsAreReturned_IfAllowAnonymousIsAppliedToPageModel.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/NoDiagnosticsAreReturned_IfAllowAnonymousIsAppliedToPageModel.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/NoDiagnosticsAreReturned_IfAllowAnonymousIsAppliedToPageModel.cs
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/NoDiagnosticsAreReturned_IfAuthorizeAttributeIsAppliedToPageModel.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/NoDiagnosticsAreReturned_IfAuthorizeAttributeIsAppliedToPageModel.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/NoDiagnosticsAreReturned_IfAuthorizeAttributeIsAppliedToPageModel.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/NoDiagnosticsAreReturned_IfAuthorizeAttributeIsAppliedToPageModel.cs
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/NoDiagnosticsAreReturned_IfFiltersAreAppliedToPageModel.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/NoDiagnosticsAreReturned_IfFiltersAreAppliedToPageModel.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/NoDiagnosticsAreReturned_IfFiltersAreAppliedToPageModel.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/NoDiagnosticsAreReturned_IfFiltersAreAppliedToPageModel.cs
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AvoidHtmlPartialAnalyzerTest/DiagnosticsAreReturned_ForUseOfHtmlPartial.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/AvoidHtmlPartialAnalyzerTest/DiagnosticsAreReturned_ForUseOfHtmlPartial.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AvoidHtmlPartialAnalyzerTest/DiagnosticsAreReturned_ForUseOfHtmlPartial.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/AvoidHtmlPartialAnalyzerTest/DiagnosticsAreReturned_ForUseOfHtmlPartial.cs
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AvoidHtmlPartialAnalyzerTest/DiagnosticsAreReturned_ForUseOfHtmlPartial_InSections.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/AvoidHtmlPartialAnalyzerTest/DiagnosticsAreReturned_ForUseOfHtmlPartial_InSections.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AvoidHtmlPartialAnalyzerTest/DiagnosticsAreReturned_ForUseOfHtmlPartial_InSections.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/AvoidHtmlPartialAnalyzerTest/DiagnosticsAreReturned_ForUseOfHtmlPartial_InSections.cs
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AvoidHtmlPartialAnalyzerTest/DiagnosticsAreReturned_ForUseOfHtmlPartial_WithAdditionalParameters.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/AvoidHtmlPartialAnalyzerTest/DiagnosticsAreReturned_ForUseOfHtmlPartial_WithAdditionalParameters.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AvoidHtmlPartialAnalyzerTest/DiagnosticsAreReturned_ForUseOfHtmlPartial_WithAdditionalParameters.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/AvoidHtmlPartialAnalyzerTest/DiagnosticsAreReturned_ForUseOfHtmlPartial_WithAdditionalParameters.cs
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AvoidHtmlPartialAnalyzerTest/DiagnosticsAreReturned_ForUseOfRenderPartial.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/AvoidHtmlPartialAnalyzerTest/DiagnosticsAreReturned_ForUseOfRenderPartial.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AvoidHtmlPartialAnalyzerTest/DiagnosticsAreReturned_ForUseOfRenderPartial.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/AvoidHtmlPartialAnalyzerTest/DiagnosticsAreReturned_ForUseOfRenderPartial.cs
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AvoidHtmlPartialAnalyzerTest/DiagnosticsAreReturned_ForUseOfRenderPartial_InSections.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/AvoidHtmlPartialAnalyzerTest/DiagnosticsAreReturned_ForUseOfRenderPartial_InSections.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AvoidHtmlPartialAnalyzerTest/DiagnosticsAreReturned_ForUseOfRenderPartial_InSections.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/AvoidHtmlPartialAnalyzerTest/DiagnosticsAreReturned_ForUseOfRenderPartial_InSections.cs
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AvoidHtmlPartialAnalyzerTest/DiagnosticsAreReturned_ForUseOfRenderPartial_WithAdditionalParameters.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/AvoidHtmlPartialAnalyzerTest/DiagnosticsAreReturned_ForUseOfRenderPartial_WithAdditionalParameters.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AvoidHtmlPartialAnalyzerTest/DiagnosticsAreReturned_ForUseOfRenderPartial_WithAdditionalParameters.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/AvoidHtmlPartialAnalyzerTest/DiagnosticsAreReturned_ForUseOfRenderPartial_WithAdditionalParameters.cs
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AvoidHtmlPartialAnalyzerTest/NoDiagnosticsAreReturned_ForNonUseOfHtmlPartial.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/AvoidHtmlPartialAnalyzerTest/NoDiagnosticsAreReturned_ForNonUseOfHtmlPartial.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AvoidHtmlPartialAnalyzerTest/NoDiagnosticsAreReturned_ForNonUseOfHtmlPartial.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/AvoidHtmlPartialAnalyzerTest/NoDiagnosticsAreReturned_ForNonUseOfHtmlPartial.cs
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AvoidHtmlPartialAnalyzerTest/NoDiagnosticsAreReturned_ForUseOfHtmlPartialAsync.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/AvoidHtmlPartialAnalyzerTest/NoDiagnosticsAreReturned_ForUseOfHtmlPartialAsync.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AvoidHtmlPartialAnalyzerTest/NoDiagnosticsAreReturned_ForUseOfHtmlPartialAsync.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/AvoidHtmlPartialAnalyzerTest/NoDiagnosticsAreReturned_ForUseOfHtmlPartialAsync.cs
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AvoidHtmlPartialAnalyzerTest/NoDiagnosticsAreReturned_ForUseOfRenderPartialAsync.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/AvoidHtmlPartialAnalyzerTest/NoDiagnosticsAreReturned_ForUseOfRenderPartialAsync.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AvoidHtmlPartialAnalyzerTest/NoDiagnosticsAreReturned_ForUseOfRenderPartialAsync.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/AvoidHtmlPartialAnalyzerTest/NoDiagnosticsAreReturned_ForUseOfRenderPartialAsync.cs
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/GetAttributes_BaseTypeWithAttributes.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/CodeAnalysisExtensionsTest/GetAttributes_BaseTypeWithAttributes.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/GetAttributes_BaseTypeWithAttributes.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/CodeAnalysisExtensionsTest/GetAttributes_BaseTypeWithAttributes.cs
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/GetAttributes_OnMethodWithoutAttributes.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/CodeAnalysisExtensionsTest/GetAttributes_OnMethodWithoutAttributes.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/GetAttributes_OnMethodWithoutAttributes.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/CodeAnalysisExtensionsTest/GetAttributes_OnMethodWithoutAttributes.cs
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/GetAttributes_OnTypeWithAttributes.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/CodeAnalysisExtensionsTest/GetAttributes_OnTypeWithAttributes.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/GetAttributes_OnTypeWithAttributes.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/CodeAnalysisExtensionsTest/GetAttributes_OnTypeWithAttributes.cs
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/GetAttributes_OnTypeWithoutAttributes.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/CodeAnalysisExtensionsTest/GetAttributes_OnTypeWithoutAttributes.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/GetAttributes_OnTypeWithoutAttributes.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/CodeAnalysisExtensionsTest/GetAttributes_OnTypeWithoutAttributes.cs
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/GetAttributes_WithMethodOverridding.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/CodeAnalysisExtensionsTest/GetAttributes_WithMethodOverridding.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/GetAttributes_WithMethodOverridding.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/CodeAnalysisExtensionsTest/GetAttributes_WithMethodOverridding.cs
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/GetAttributes_WithNewMethod.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/CodeAnalysisExtensionsTest/GetAttributes_WithNewMethod.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/GetAttributes_WithNewMethod.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/CodeAnalysisExtensionsTest/GetAttributes_WithNewMethod.cs
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/GetAttributes_WithoutMethodOverriding.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/CodeAnalysisExtensionsTest/GetAttributes_WithoutMethodOverriding.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/GetAttributes_WithoutMethodOverriding.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/CodeAnalysisExtensionsTest/GetAttributes_WithoutMethodOverriding.cs
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/HasAttribute_ReturnsFalseIfSymbolDoesNotHaveAttribute.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/CodeAnalysisExtensionsTest/HasAttribute_ReturnsFalseIfSymbolDoesNotHaveAttribute.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/HasAttribute_ReturnsFalseIfSymbolDoesNotHaveAttribute.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/CodeAnalysisExtensionsTest/HasAttribute_ReturnsFalseIfSymbolDoesNotHaveAttribute.cs
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/HasAttribute_ReturnsTrueForAttributesOnMethods.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/CodeAnalysisExtensionsTest/HasAttribute_ReturnsTrueForAttributesOnMethods.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/HasAttribute_ReturnsTrueForAttributesOnMethods.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/CodeAnalysisExtensionsTest/HasAttribute_ReturnsTrueForAttributesOnMethods.cs
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/HasAttribute_ReturnsTrueForAttributesOnOverriddenMethods.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/CodeAnalysisExtensionsTest/HasAttribute_ReturnsTrueForAttributesOnOverriddenMethods.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/HasAttribute_ReturnsTrueForAttributesOnOverriddenMethods.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/CodeAnalysisExtensionsTest/HasAttribute_ReturnsTrueForAttributesOnOverriddenMethods.cs
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/HasAttribute_ReturnsTrueForAttributesOnOverridenProperties.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/CodeAnalysisExtensionsTest/HasAttribute_ReturnsTrueForAttributesOnOverridenProperties.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/HasAttribute_ReturnsTrueForAttributesOnOverridenProperties.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/CodeAnalysisExtensionsTest/HasAttribute_ReturnsTrueForAttributesOnOverridenProperties.cs
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/HasAttribute_ReturnsTrueForAttributesOnProperties.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/CodeAnalysisExtensionsTest/HasAttribute_ReturnsTrueForAttributesOnProperties.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/HasAttribute_ReturnsTrueForAttributesOnProperties.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/CodeAnalysisExtensionsTest/HasAttribute_ReturnsTrueForAttributesOnProperties.cs
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/HasAttribute_ReturnsTrueForInterfaceContractOnAttribute.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/CodeAnalysisExtensionsTest/HasAttribute_ReturnsTrueForInterfaceContractOnAttribute.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/HasAttribute_ReturnsTrueForInterfaceContractOnAttribute.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/CodeAnalysisExtensionsTest/HasAttribute_ReturnsTrueForInterfaceContractOnAttribute.cs
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/HasAttribute_ReturnsTrueIfBaseTypeHasAttribute.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/CodeAnalysisExtensionsTest/HasAttribute_ReturnsTrueIfBaseTypeHasAttribute.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/HasAttribute_ReturnsTrueIfBaseTypeHasAttribute.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/CodeAnalysisExtensionsTest/HasAttribute_ReturnsTrueIfBaseTypeHasAttribute.cs
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/HasAttribute_ReturnsTrueIfTypeHasAttribute.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/CodeAnalysisExtensionsTest/HasAttribute_ReturnsTrueIfTypeHasAttribute.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/HasAttribute_ReturnsTrueIfTypeHasAttribute.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/CodeAnalysisExtensionsTest/HasAttribute_ReturnsTrueIfTypeHasAttribute.cs
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/IsAssignable_ReturnsFalseForDifferentTypes.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/CodeAnalysisExtensionsTest/IsAssignable_ReturnsFalseForDifferentTypes.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/IsAssignable_ReturnsFalseForDifferentTypes.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/CodeAnalysisExtensionsTest/IsAssignable_ReturnsFalseForDifferentTypes.cs
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/IsAssignable_ReturnsTrueIfAncestorTypeImplementsInterface.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/CodeAnalysisExtensionsTest/IsAssignable_ReturnsTrueIfAncestorTypeImplementsInterface.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/IsAssignable_ReturnsTrueIfAncestorTypeImplementsInterface.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/CodeAnalysisExtensionsTest/IsAssignable_ReturnsTrueIfAncestorTypeImplementsInterface.cs
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/IsAssignable_ReturnsTrueIfTypeImplementsInterface.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/CodeAnalysisExtensionsTest/IsAssignable_ReturnsTrueIfTypeImplementsInterface.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/IsAssignable_ReturnsTrueIfTypeImplementsInterface.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/CodeAnalysisExtensionsTest/IsAssignable_ReturnsTrueIfTypeImplementsInterface.cs
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/IsAssignable_ReturnsTrueIfTypeIsBaseClass.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/CodeAnalysisExtensionsTest/IsAssignable_ReturnsTrueIfTypeIsBaseClass.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/IsAssignable_ReturnsTrueIfTypeIsBaseClass.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/CodeAnalysisExtensionsTest/IsAssignable_ReturnsTrueIfTypeIsBaseClass.cs
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/IsAssignable_ReturnsTrueIfTypesAreExact.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/CodeAnalysisExtensionsTest/IsAssignable_ReturnsTrueIfTypesAreExact.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/IsAssignable_ReturnsTrueIfTypesAreExact.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/CodeAnalysisExtensionsTest/IsAssignable_ReturnsTrueIfTypesAreExact.cs
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/DiagnosticsAreReturned_ForControllerActionsWithParametersThatMatchProperties.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/TopLevelParameterNameAnalyzerTest/DiagnosticsAreReturned_ForControllerActionsWithParametersThatMatchProperties.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/DiagnosticsAreReturned_ForControllerActionsWithParametersThatMatchProperties.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/TopLevelParameterNameAnalyzerTest/DiagnosticsAreReturned_ForControllerActionsWithParametersThatMatchProperties.cs
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/DiagnosticsAreReturned_ForModelBoundParameters.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/TopLevelParameterNameAnalyzerTest/DiagnosticsAreReturned_ForModelBoundParameters.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/DiagnosticsAreReturned_ForModelBoundParameters.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/TopLevelParameterNameAnalyzerTest/DiagnosticsAreReturned_ForModelBoundParameters.cs
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/DiagnosticsAreReturned_IfModelNameProviderIsUsedToModifyParameterName.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/TopLevelParameterNameAnalyzerTest/DiagnosticsAreReturned_IfModelNameProviderIsUsedToModifyParameterName.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/DiagnosticsAreReturned_IfModelNameProviderIsUsedToModifyParameterName.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/TopLevelParameterNameAnalyzerTest/DiagnosticsAreReturned_IfModelNameProviderIsUsedToModifyParameterName.cs
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/GetNameTests.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/TopLevelParameterNameAnalyzerTest/GetNameTests.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/GetNameTests.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/TopLevelParameterNameAnalyzerTest/GetNameTests.cs
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_IgnoresFields.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_IgnoresFields.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_IgnoresFields.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_IgnoresFields.cs
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_IgnoresMethods.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_IgnoresMethods.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_IgnoresMethods.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_IgnoresMethods.cs
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_IgnoresNonPublicProperties.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_IgnoresNonPublicProperties.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_IgnoresNonPublicProperties.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_IgnoresNonPublicProperties.cs
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_IgnoresStaticProperties.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_IgnoresStaticProperties.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_IgnoresStaticProperties.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_IgnoresStaticProperties.cs
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_ReturnsFalse_ForFromBodyParameter.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_ReturnsFalse_ForFromBodyParameter.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_ReturnsFalse_ForFromBodyParameter.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_ReturnsFalse_ForFromBodyParameter.cs
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_ReturnsFalse_ForParametersWithCustomModelBinder.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_ReturnsFalse_ForParametersWithCustomModelBinder.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_ReturnsFalse_ForParametersWithCustomModelBinder.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_ReturnsFalse_ForParametersWithCustomModelBinder.cs
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_ReturnsFalse_IfBindingSourceAttributeIsUsedToRenameParameter.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_ReturnsFalse_IfBindingSourceAttributeIsUsedToRenameParameter.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_ReturnsFalse_IfBindingSourceAttributeIsUsedToRenameParameter.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_ReturnsFalse_IfBindingSourceAttributeIsUsedToRenameParameter.cs
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_ReturnsFalse_IfBindingSourceAttributeIsUsedToRenameProperty.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_ReturnsFalse_IfBindingSourceAttributeIsUsedToRenameProperty.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_ReturnsFalse_IfBindingSourceAttributeIsUsedToRenameProperty.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_ReturnsFalse_IfBindingSourceAttributeIsUsedToRenameProperty.cs
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_ReturnsTrue_IfModelBinderAttributeIsUsedToRenameParameter.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_ReturnsTrue_IfModelBinderAttributeIsUsedToRenameParameter.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_ReturnsTrue_IfModelBinderAttributeIsUsedToRenameParameter.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_ReturnsTrue_IfModelBinderAttributeIsUsedToRenameParameter.cs
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_ReturnsTrue_IfParameterNameIsTheSameAsModelProperty.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_ReturnsTrue_IfParameterNameIsTheSameAsModelProperty.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_ReturnsTrue_IfParameterNameIsTheSameAsModelProperty.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_ReturnsTrue_IfParameterNameIsTheSameAsModelProperty.cs
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_ReturnsTrue_IfParameterNameWithBinderAttributeIsTheSameNameAsModelProperty.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_ReturnsTrue_IfParameterNameWithBinderAttributeIsTheSameNameAsModelProperty.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_ReturnsTrue_IfParameterNameWithBinderAttributeIsTheSameNameAsModelProperty.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_ReturnsTrue_IfParameterNameWithBinderAttributeIsTheSameNameAsModelProperty.cs
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_ReturnsTrue_IfPropertyWithModelBindingAttributeHasSameNameAsParameter.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_ReturnsTrue_IfPropertyWithModelBindingAttributeHasSameNameAsParameter.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_ReturnsTrue_IfPropertyWithModelBindingAttributeHasSameNameAsParameter.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_ReturnsTrue_IfPropertyWithModelBindingAttributeHasSameNameAsParameter.cs
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/NoDiagnosticsAreReturnedForApiControllers.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/TopLevelParameterNameAnalyzerTest/NoDiagnosticsAreReturnedForApiControllers.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/NoDiagnosticsAreReturnedForApiControllers.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/TopLevelParameterNameAnalyzerTest/NoDiagnosticsAreReturnedForApiControllers.cs
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/NoDiagnosticsAreReturnedForNonActions.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/TopLevelParameterNameAnalyzerTest/NoDiagnosticsAreReturnedForNonActions.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/NoDiagnosticsAreReturnedForNonActions.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/TopLevelParameterNameAnalyzerTest/NoDiagnosticsAreReturnedForNonActions.cs
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/NoDiagnosticsAreReturnedIfParameterIsRenamedUsingBindingAttribute.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/TopLevelParameterNameAnalyzerTest/NoDiagnosticsAreReturnedIfParameterIsRenamedUsingBindingAttribute.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/NoDiagnosticsAreReturnedIfParameterIsRenamedUsingBindingAttribute.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/TopLevelParameterNameAnalyzerTest/NoDiagnosticsAreReturnedIfParameterIsRenamedUsingBindingAttribute.cs
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/SpecifiesModelTypeTests.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/TopLevelParameterNameAnalyzerTest/SpecifiesModelTypeTests.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/SpecifiesModelTypeTests.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/TopLevelParameterNameAnalyzerTest/SpecifiesModelTypeTests.cs
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/TopLevelParameterNameAnalyzerTest.cs b/src/Mvc/Mvc.Analyzers/test/TopLevelParameterNameAnalyzerTest.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Analyzers.Test/TopLevelParameterNameAnalyzerTest.cs
rename to src/Mvc/Mvc.Analyzers/test/TopLevelParameterNameAnalyzerTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/xunit.runner.json b/src/Mvc/Mvc.Analyzers/test/xunit.runner.json
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/xunit.runner.json
rename to src/Mvc/Mvc.Analyzers/test/xunit.runner.json
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/ActualApiResponseMetadata.cs b/src/Mvc/Mvc.Api.Analyzers/src/ActualApiResponseMetadata.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/ActualApiResponseMetadata.cs
rename to src/Mvc/Mvc.Api.Analyzers/src/ActualApiResponseMetadata.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/ActualApiResponseMetadataFactory.cs b/src/Mvc/Mvc.Api.Analyzers/src/ActualApiResponseMetadataFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/ActualApiResponseMetadataFactory.cs
rename to src/Mvc/Mvc.Api.Analyzers/src/ActualApiResponseMetadataFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/AddResponseTypeAttributeCodeFixAction.cs b/src/Mvc/Mvc.Api.Analyzers/src/AddResponseTypeAttributeCodeFixAction.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/AddResponseTypeAttributeCodeFixAction.cs
rename to src/Mvc/Mvc.Api.Analyzers/src/AddResponseTypeAttributeCodeFixAction.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/AddResponseTypeAttributeCodeFixProvider.cs b/src/Mvc/Mvc.Api.Analyzers/src/AddResponseTypeAttributeCodeFixProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/AddResponseTypeAttributeCodeFixProvider.cs
rename to src/Mvc/Mvc.Api.Analyzers/src/AddResponseTypeAttributeCodeFixProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzer.cs b/src/Mvc/Mvc.Api.Analyzers/src/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzer.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzer.cs
rename to src/Mvc/Mvc.Api.Analyzers/src/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzer.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/ApiActionsDoNotRequireExplicitModelValidationCodeFixProvider.cs b/src/Mvc/Mvc.Api.Analyzers/src/ApiActionsDoNotRequireExplicitModelValidationCodeFixProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/ApiActionsDoNotRequireExplicitModelValidationCodeFixProvider.cs
rename to src/Mvc/Mvc.Api.Analyzers/src/ApiActionsDoNotRequireExplicitModelValidationCodeFixProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/ApiControllerFacts.cs b/src/Mvc/Mvc.Api.Analyzers/src/ApiControllerFacts.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/ApiControllerFacts.cs
rename to src/Mvc/Mvc.Api.Analyzers/src/ApiControllerFacts.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/ApiControllerSymbolCache.cs b/src/Mvc/Mvc.Api.Analyzers/src/ApiControllerSymbolCache.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/ApiControllerSymbolCache.cs
rename to src/Mvc/Mvc.Api.Analyzers/src/ApiControllerSymbolCache.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/ApiConventionAnalyzer.cs b/src/Mvc/Mvc.Api.Analyzers/src/ApiConventionAnalyzer.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/ApiConventionAnalyzer.cs
rename to src/Mvc/Mvc.Api.Analyzers/src/ApiConventionAnalyzer.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/ApiDiagnosticDescriptors.cs b/src/Mvc/Mvc.Api.Analyzers/src/ApiDiagnosticDescriptors.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/ApiDiagnosticDescriptors.cs
rename to src/Mvc/Mvc.Api.Analyzers/src/ApiDiagnosticDescriptors.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/ApiSymbolNames.cs b/src/Mvc/Mvc.Api.Analyzers/src/ApiSymbolNames.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/ApiSymbolNames.cs
rename to src/Mvc/Mvc.Api.Analyzers/src/ApiSymbolNames.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/DeclaredApiResponseMetadata.cs b/src/Mvc/Mvc.Api.Analyzers/src/DeclaredApiResponseMetadata.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/DeclaredApiResponseMetadata.cs
rename to src/Mvc/Mvc.Api.Analyzers/src/DeclaredApiResponseMetadata.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/Microsoft.AspNetCore.Mvc.Api.Analyzers.csproj b/src/Mvc/Mvc.Api.Analyzers/src/Microsoft.AspNetCore.Mvc.Api.Analyzers.csproj
similarity index 89%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/Microsoft.AspNetCore.Mvc.Api.Analyzers.csproj
rename to src/Mvc/Mvc.Api.Analyzers/src/Microsoft.AspNetCore.Mvc.Api.Analyzers.csproj
index 9336651e1d..89fef738b4 100644
--- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/Microsoft.AspNetCore.Mvc.Api.Analyzers.csproj
+++ b/src/Mvc/Mvc.Api.Analyzers/src/Microsoft.AspNetCore.Mvc.Api.Analyzers.csproj
@@ -12,8 +12,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="..\Microsoft.AspNetCore.Mvc.Analyzers\CodeAnalysisExtensions.cs" />
-    <Compile Include="..\Microsoft.AspNetCore.Mvc.Analyzers\MvcFacts.cs" />
+    <Compile Include="..\..\Mvc.Analyzers\src\CodeAnalysisExtensions.cs" />
+    <Compile Include="..\..\Mvc.Analyzers\src\MvcFacts.cs" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/Microsoft.AspNetCore.Mvc.Api.Analyzers.nuspec b/src/Mvc/Mvc.Api.Analyzers/src/Microsoft.AspNetCore.Mvc.Api.Analyzers.nuspec
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/Microsoft.AspNetCore.Mvc.Api.Analyzers.nuspec
rename to src/Mvc/Mvc.Api.Analyzers/src/Microsoft.AspNetCore.Mvc.Api.Analyzers.nuspec
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/Properties/AssemblyInfo.cs b/src/Mvc/Mvc.Api.Analyzers/src/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/Properties/AssemblyInfo.cs
rename to src/Mvc/Mvc.Api.Analyzers/src/Properties/AssemblyInfo.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/SymbolApiConventionMatcher.cs b/src/Mvc/Mvc.Api.Analyzers/src/SymbolApiConventionMatcher.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/SymbolApiConventionMatcher.cs
rename to src/Mvc/Mvc.Api.Analyzers/src/SymbolApiConventionMatcher.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/SymbolApiResponseMetadataProvider.cs b/src/Mvc/Mvc.Api.Analyzers/src/SymbolApiResponseMetadataProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/SymbolApiResponseMetadataProvider.cs
rename to src/Mvc/Mvc.Api.Analyzers/src/SymbolApiResponseMetadataProvider.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/ActualApiResponseMetadataFactoryTest.cs b/src/Mvc/Mvc.Api.Analyzers/test/ActualApiResponseMetadataFactoryTest.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/ActualApiResponseMetadataFactoryTest.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/ActualApiResponseMetadataFactoryTest.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/AddResponseTypeAttributeCodeFixProviderIntegrationTest.cs b/src/Mvc/Mvc.Api.Analyzers/test/AddResponseTypeAttributeCodeFixProviderIntegrationTest.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/AddResponseTypeAttributeCodeFixProviderIntegrationTest.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/AddResponseTypeAttributeCodeFixProviderIntegrationTest.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest.cs b/src/Mvc/Mvc.Api.Analyzers/test/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTest.cs b/src/Mvc/Mvc.Api.Analyzers/test/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTest.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTest.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/ApiControllerFactsTest.cs b/src/Mvc/Mvc.Api.Analyzers/test/ApiControllerFactsTest.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/ApiControllerFactsTest.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/ApiControllerFactsTest.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/ApiConventionAnalyzerIntegrationTest.cs b/src/Mvc/Mvc.Api.Analyzers/test/ApiConventionAnalyzerIntegrationTest.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/ApiConventionAnalyzerIntegrationTest.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/ApiConventionAnalyzerIntegrationTest.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/DeclaredApiResponseMetadataTest.cs b/src/Mvc/Mvc.Api.Analyzers/test/DeclaredApiResponseMetadataTest.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/DeclaredApiResponseMetadataTest.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/DeclaredApiResponseMetadataTest.cs
diff --git a/src/Mvc/Mvc.Api.Analyzers/test/Infrastructure/MvcTestSource.cs b/src/Mvc/Mvc.Api.Analyzers/test/Infrastructure/MvcTestSource.cs
new file mode 100644
index 0000000000..cb0ca8025e
--- /dev/null
+++ b/src/Mvc/Mvc.Api.Analyzers/test/Infrastructure/MvcTestSource.cs
@@ -0,0 +1,33 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.IO;
+using Microsoft.AspNetCore.Analyzer.Testing;
+using Microsoft.AspNetCore.Testing;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public static class MvcTestSource
+    {
+        private static readonly string ProjectDirectory = GetProjectDirectory();
+
+        public static TestSource Read(string testClassName, string testMethod)
+        {
+            var filePath = Path.Combine(ProjectDirectory, "TestFiles", testClassName, testMethod + ".cs");
+            if (!File.Exists(filePath))
+            {
+                throw new FileNotFoundException($"TestFile {testMethod} could not be found at {filePath}.", filePath);
+            }
+
+            var fileContent = File.ReadAllText(filePath);
+            return TestSource.Read(fileContent);
+        }
+
+        private static string GetProjectDirectory()
+        {
+            var solutionDirectory = TestPathUtilities.GetSolutionRootDirectory("Mvc");
+            var projectDirectory = Path.Combine(solutionDirectory, "Mvc.Api.Analyzers", "test");
+            return projectDirectory;
+        }
+    }
+}
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/Mvc.Api.Analyzers.Test.csproj b/src/Mvc/Mvc.Api.Analyzers/test/Mvc.Api.Analyzers.Test.csproj
similarity index 55%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/Mvc.Api.Analyzers.Test.csproj
rename to src/Mvc/Mvc.Api.Analyzers/test/Mvc.Api.Analyzers.Test.csproj
index 711bd72f74..104b0e79a6 100644
--- a/src/Mvc/test/Mvc.Api.Analyzers.Test/Mvc.Api.Analyzers.Test.csproj
+++ b/src/Mvc/Mvc.Api.Analyzers/test/Mvc.Api.Analyzers.Test.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
@@ -8,12 +8,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="..\Mvc.Analyzers.Test\Infrastructure\MvcDiagnosticAnalyzerRunner.cs" Link="Infrastructure\MvcDiagnosticAnalyzerRunner.cs" />
-    <Compile Include="..\Mvc.Analyzers.Test\Infrastructure\MvcTestSource.cs" Link="Infrastructure\MvcTestSource.cs" />
+    <Compile Include="..\..\Mvc.Analyzers\test\Infrastructure\MvcDiagnosticAnalyzerRunner.cs" Link="Infrastructure\MvcDiagnosticAnalyzerRunner.cs" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Mvc.Api.Analyzers\Microsoft.AspNetCore.Mvc.Api.Analyzers.csproj" />
+    <ProjectReference Include="..\..\Mvc.Api.Analyzers\src\Microsoft.AspNetCore.Mvc.Api.Analyzers.csproj" />
     <Reference Include="Microsoft.AspNetCore.Mvc" />
     <Reference Include="Microsoft.AspNetCore.Analyzer.Testing" />
     <Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" />
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/MvcFactsTest.cs b/src/Mvc/Mvc.Api.Analyzers/test/MvcFactsTest.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/MvcFactsTest.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/MvcFactsTest.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/SymbolApiConventionMatcherTest.cs b/src/Mvc/Mvc.Api.Analyzers/test/SymbolApiConventionMatcherTest.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/SymbolApiConventionMatcherTest.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/SymbolApiConventionMatcherTest.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/SymbolApiResponseMetadataProviderTest.cs b/src/Mvc/Mvc.Api.Analyzers/test/SymbolApiResponseMetadataProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/SymbolApiResponseMetadataProviderTest.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/SymbolApiResponseMetadataProviderTest.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ActualApiResponseMetadataFactoryTest/GetDefaultStatusCodeTest.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ActualApiResponseMetadataFactoryTest/GetDefaultStatusCodeTest.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ActualApiResponseMetadataFactoryTest/GetDefaultStatusCodeTest.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ActualApiResponseMetadataFactoryTest/GetDefaultStatusCodeTest.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ActualApiResponseMetadataFactoryTest/InspectReturnExpressionTests.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ActualApiResponseMetadataFactoryTest/InspectReturnExpressionTests.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ActualApiResponseMetadataFactoryTest/InspectReturnExpressionTests.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ActualApiResponseMetadataFactoryTest/InspectReturnExpressionTests.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ActualApiResponseMetadataFactoryTest/TryGetActualResponseMetadataTests.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ActualApiResponseMetadataFactoryTest/TryGetActualResponseMetadataTests.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ActualApiResponseMetadataFactoryTest/TryGetActualResponseMetadataTests.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ActualApiResponseMetadataFactoryTest/TryGetActualResponseMetadataTests.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsFullyQualifiedProducesResponseType.Input.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsFullyQualifiedProducesResponseType.Input.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsFullyQualifiedProducesResponseType.Input.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsFullyQualifiedProducesResponseType.Input.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsFullyQualifiedProducesResponseType.Output.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsFullyQualifiedProducesResponseType.Output.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsFullyQualifiedProducesResponseType.Output.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsFullyQualifiedProducesResponseType.Output.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsMissingStatusCodes.Input.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsMissingStatusCodes.Input.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsMissingStatusCodes.Input.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsMissingStatusCodes.Input.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsMissingStatusCodes.Output.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsMissingStatusCodes.Output.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsMissingStatusCodes.Output.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsMissingStatusCodes.Output.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsMissingStatusCodesAndTypes.Input.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsMissingStatusCodesAndTypes.Input.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsMissingStatusCodesAndTypes.Input.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsMissingStatusCodesAndTypes.Input.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsMissingStatusCodesAndTypes.Output.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsMissingStatusCodesAndTypes.Output.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsMissingStatusCodesAndTypes.Output.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsMissingStatusCodesAndTypes.Output.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsNumericLiteralForNonExistingStatusCodeConstants.Input.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsNumericLiteralForNonExistingStatusCodeConstants.Input.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsNumericLiteralForNonExistingStatusCodeConstants.Input.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsNumericLiteralForNonExistingStatusCodeConstants.Input.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsNumericLiteralForNonExistingStatusCodeConstants.Output.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsNumericLiteralForNonExistingStatusCodeConstants.Output.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsNumericLiteralForNonExistingStatusCodeConstants.Output.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsNumericLiteralForNonExistingStatusCodeConstants.Output.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsResponseTypeWhenDifferentFromErrorType.Input.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsResponseTypeWhenDifferentFromErrorType.Input.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsResponseTypeWhenDifferentFromErrorType.Input.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsResponseTypeWhenDifferentFromErrorType.Input.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsResponseTypeWhenDifferentFromErrorType.Output.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsResponseTypeWhenDifferentFromErrorType.Output.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsResponseTypeWhenDifferentFromErrorType.Output.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsResponseTypeWhenDifferentFromErrorType.Output.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsStatusCodes.Input.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsStatusCodes.Input.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsStatusCodes.Input.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsStatusCodes.Input.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsStatusCodes.Output.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsStatusCodes.Output.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsStatusCodes.Output.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsStatusCodes.Output.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsStatusCodesFromConstructorParameters.Input.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsStatusCodesFromConstructorParameters.Input.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsStatusCodesFromConstructorParameters.Input.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsStatusCodesFromConstructorParameters.Input.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsStatusCodesFromConstructorParameters.Output.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsStatusCodesFromConstructorParameters.Output.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsStatusCodesFromConstructorParameters.Output.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsStatusCodesFromConstructorParameters.Output.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsStatusCodesFromMethodParameters.Input.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsStatusCodesFromMethodParameters.Input.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsStatusCodesFromMethodParameters.Input.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsStatusCodesFromMethodParameters.Input.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsStatusCodesFromMethodParameters.Output.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsStatusCodesFromMethodParameters.Output.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsStatusCodesFromMethodParameters.Output.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsStatusCodesFromMethodParameters.Output.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsStatusCodesFromObjectInitializer.Input.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsStatusCodesFromObjectInitializer.Input.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsStatusCodesFromObjectInitializer.Input.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsStatusCodesFromObjectInitializer.Input.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsStatusCodesFromObjectInitializer.Output.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsStatusCodesFromObjectInitializer.Output.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsStatusCodesFromObjectInitializer.Output.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsStatusCodesFromObjectInitializer.Output.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsSuccessStatusCode.Input.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsSuccessStatusCode.Input.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsSuccessStatusCode.Input.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsSuccessStatusCode.Input.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsSuccessStatusCode.Output.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsSuccessStatusCode.Output.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsSuccessStatusCode.Output.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsSuccessStatusCode.Output.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixWithConventionAddsMissingStatusCodes.Input.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixWithConventionAddsMissingStatusCodes.Input.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixWithConventionAddsMissingStatusCodes.Input.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixWithConventionAddsMissingStatusCodes.Input.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixWithConventionAddsMissingStatusCodes.Output.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixWithConventionAddsMissingStatusCodes.Output.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixWithConventionAddsMissingStatusCodes.Output.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixWithConventionAddsMissingStatusCodes.Output.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixWithConventionMethodAddsMissingStatusCodes.Input.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixWithConventionMethodAddsMissingStatusCodes.Input.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixWithConventionMethodAddsMissingStatusCodes.Input.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixWithConventionMethodAddsMissingStatusCodes.Input.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixWithConventionMethodAddsMissingStatusCodes.Output.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixWithConventionMethodAddsMissingStatusCodes.Output.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixWithConventionMethodAddsMissingStatusCodes.Output.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixWithConventionMethodAddsMissingStatusCodes.Output.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixWorksWhenMultipleIdenticalStatusCodesAreInError.Input.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixWorksWhenMultipleIdenticalStatusCodesAreInError.Input.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixWorksWhenMultipleIdenticalStatusCodesAreInError.Input.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixWorksWhenMultipleIdenticalStatusCodesAreInError.Input.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixWorksWhenMultipleIdenticalStatusCodesAreInError.Output.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixWorksWhenMultipleIdenticalStatusCodesAreInError.Output.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixWorksWhenMultipleIdenticalStatusCodesAreInError.Output.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixWorksWhenMultipleIdenticalStatusCodesAreInError.Output.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/DiagnosticsAreReturned_ForApiActionsWithModelStateChecks.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/DiagnosticsAreReturned_ForApiActionsWithModelStateChecks.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/DiagnosticsAreReturned_ForApiActionsWithModelStateChecks.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/DiagnosticsAreReturned_ForApiActionsWithModelStateChecks.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/DiagnosticsAreReturned_ForApiActionsWithModelStateChecksUsingEquality.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/DiagnosticsAreReturned_ForApiActionsWithModelStateChecksUsingEquality.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/DiagnosticsAreReturned_ForApiActionsWithModelStateChecksUsingEquality.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/DiagnosticsAreReturned_ForApiActionsWithModelStateChecksUsingEquality.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/DiagnosticsAreReturned_ForApiActionsWithModelStateChecksWithoutBracing.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/DiagnosticsAreReturned_ForApiActionsWithModelStateChecksWithoutBracing.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/DiagnosticsAreReturned_ForApiActionsWithModelStateChecksWithoutBracing.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/DiagnosticsAreReturned_ForApiActionsWithModelStateChecksWithoutBracing.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForApiActionsCheckingAdditionalConditions.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForApiActionsCheckingAdditionalConditions.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForApiActionsCheckingAdditionalConditions.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForApiActionsCheckingAdditionalConditions.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForApiActionsReturning400FromNonModelStateIsValidBlocks.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForApiActionsReturning400FromNonModelStateIsValidBlocks.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForApiActionsReturning400FromNonModelStateIsValidBlocks.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForApiActionsReturning400FromNonModelStateIsValidBlocks.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForApiActionsReturningNot400FromNonModelStateIsValidBlock.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForApiActionsReturningNot400FromNonModelStateIsValidBlock.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForApiActionsReturningNot400FromNonModelStateIsValidBlock.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForApiActionsReturningNot400FromNonModelStateIsValidBlock.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForApiActionsWithoutModelStateChecks.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForApiActionsWithoutModelStateChecks.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForApiActionsWithoutModelStateChecks.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForApiActionsWithoutModelStateChecks.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForNonApiController.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForNonApiController.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForNonApiController.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForNonApiController.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForRazorPageModels.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForRazorPageModels.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForRazorPageModels.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForRazorPageModels.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTest/CodeFixRemovesIfBlockWithoutBraces.Input.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTest/CodeFixRemovesIfBlockWithoutBraces.Input.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTest/CodeFixRemovesIfBlockWithoutBraces.Input.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTest/CodeFixRemovesIfBlockWithoutBraces.Input.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTest/CodeFixRemovesIfBlockWithoutBraces.Output.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTest/CodeFixRemovesIfBlockWithoutBraces.Output.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTest/CodeFixRemovesIfBlockWithoutBraces.Output.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTest/CodeFixRemovesIfBlockWithoutBraces.Output.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTest/CodeFixRemovesModelStateIsInvalidBlockWithEqualityCheck.Input.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTest/CodeFixRemovesModelStateIsInvalidBlockWithEqualityCheck.Input.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTest/CodeFixRemovesModelStateIsInvalidBlockWithEqualityCheck.Input.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTest/CodeFixRemovesModelStateIsInvalidBlockWithEqualityCheck.Input.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTest/CodeFixRemovesModelStateIsInvalidBlockWithEqualityCheck.Output.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTest/CodeFixRemovesModelStateIsInvalidBlockWithEqualityCheck.Output.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTest/CodeFixRemovesModelStateIsInvalidBlockWithEqualityCheck.Output.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTest/CodeFixRemovesModelStateIsInvalidBlockWithEqualityCheck.Output.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTest/CodeFixRemovesModelStateIsInvalidBlockWithIfNotCheck.Input.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTest/CodeFixRemovesModelStateIsInvalidBlockWithIfNotCheck.Input.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTest/CodeFixRemovesModelStateIsInvalidBlockWithIfNotCheck.Input.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTest/CodeFixRemovesModelStateIsInvalidBlockWithIfNotCheck.Input.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTest/CodeFixRemovesModelStateIsInvalidBlockWithIfNotCheck.Output.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTest/CodeFixRemovesModelStateIsInvalidBlockWithIfNotCheck.Output.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTest/CodeFixRemovesModelStateIsInvalidBlockWithIfNotCheck.Output.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTest/CodeFixRemovesModelStateIsInvalidBlockWithIfNotCheck.Output.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiControllerFactsTest/IsApiControllerAction_ReturnsTrue_IfAttributeIsDeclaredOnAssembly.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiControllerFactsTest/IsApiControllerAction_ReturnsTrue_IfAttributeIsDeclaredOnAssembly.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiControllerFactsTest/IsApiControllerAction_ReturnsTrue_IfAttributeIsDeclaredOnAssembly.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiControllerFactsTest/IsApiControllerAction_ReturnsTrue_IfAttributeIsDeclaredOnAssembly.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiControllerFactsTest/TestFile.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiControllerFactsTest/TestFile.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiControllerFactsTest/TestFile.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiControllerFactsTest/TestFile.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_ForActionResultOfTReturningMethodWithoutAnyAttributes.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_ForActionResultOfTReturningMethodWithoutAnyAttributes.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_ForActionResultOfTReturningMethodWithoutAnyAttributes.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_ForActionResultOfTReturningMethodWithoutAnyAttributes.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_ForActionResultOfTReturningMethodWithoutSomeAttributes.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_ForActionResultOfTReturningMethodWithoutSomeAttributes.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_ForActionResultOfTReturningMethodWithoutSomeAttributes.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_ForActionResultOfTReturningMethodWithoutSomeAttributes.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_ForControllerWithCustomConvention.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_ForControllerWithCustomConvention.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_ForControllerWithCustomConvention.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_ForControllerWithCustomConvention.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfAsyncMethodReturningValueTaskWithProducesResponseTypeAttribute_ReturnsUndocumentedStatusCode.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfAsyncMethodReturningValueTaskWithProducesResponseTypeAttribute_ReturnsUndocumentedStatusCode.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfAsyncMethodReturningValueTaskWithProducesResponseTypeAttribute_ReturnsUndocumentedStatusCode.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfAsyncMethodReturningValueTaskWithProducesResponseTypeAttribute_ReturnsUndocumentedStatusCode.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfAsyncMethodWithProducesResponseTypeAttribute_ReturnsUndocumentedStatusCode.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfAsyncMethodWithProducesResponseTypeAttribute_ReturnsUndocumentedStatusCode.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfAsyncMethodWithProducesResponseTypeAttribute_ReturnsUndocumentedStatusCode.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfAsyncMethodWithProducesResponseTypeAttribute_ReturnsUndocumentedStatusCode.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithApiConventionMethod_ReturnsUndocumentedStatusCode.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithApiConventionMethod_ReturnsUndocumentedStatusCode.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithApiConventionMethod_ReturnsUndocumentedStatusCode.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithApiConventionMethod_ReturnsUndocumentedStatusCode.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithAttributeAsynchronouslyReturnsValue_WithoutDocumentation.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithAttributeAsynchronouslyReturnsValue_WithoutDocumentation.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithAttributeAsynchronouslyReturnsValue_WithoutDocumentation.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithAttributeAsynchronouslyReturnsValue_WithoutDocumentation.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithAttributeReturnsValue_WithoutDocumentation.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithAttributeReturnsValue_WithoutDocumentation.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithAttributeReturnsValue_WithoutDocumentation.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithAttributeReturnsValue_WithoutDocumentation.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithAttribute_ReturnsDerivedType.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithAttribute_ReturnsDerivedType.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithAttribute_ReturnsDerivedType.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithAttribute_ReturnsDerivedType.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithConvention_DoesNotReturnDocumentedStatusCode.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithConvention_DoesNotReturnDocumentedStatusCode.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithConvention_DoesNotReturnDocumentedStatusCode.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithConvention_DoesNotReturnDocumentedStatusCode.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithConvention_ReturnsUndocumentedStatusCode.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithConvention_ReturnsUndocumentedStatusCode.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithConvention_ReturnsUndocumentedStatusCode.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithConvention_ReturnsUndocumentedStatusCode.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithProducesResponseTypeAttribute_DoesNotDocumentSuccessStatusCode.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithProducesResponseTypeAttribute_DoesNotDocumentSuccessStatusCode.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithProducesResponseTypeAttribute_DoesNotDocumentSuccessStatusCode.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithProducesResponseTypeAttribute_DoesNotDocumentSuccessStatusCode.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithProducesResponseTypeAttribute_DoesNotReturnDocumentedStatusCode.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithProducesResponseTypeAttribute_DoesNotReturnDocumentedStatusCode.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithProducesResponseTypeAttribute_DoesNotReturnDocumentedStatusCode.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithProducesResponseTypeAttribute_DoesNotReturnDocumentedStatusCode.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithProducesResponseTypeAttribute_ReturnsUndocumentedStatusCode.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithProducesResponseTypeAttribute_ReturnsUndocumentedStatusCode.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithProducesResponseTypeAttribute_ReturnsUndocumentedStatusCode.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithProducesResponseTypeAttribute_ReturnsUndocumentedStatusCode.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForApiController_IfStatusCodesCannotBeInferred.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiConventionAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForApiController_IfStatusCodesCannotBeInferred.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForApiController_IfStatusCodesCannotBeInferred.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiConventionAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForApiController_IfStatusCodesCannotBeInferred.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForApiController_WithAllDocumentedStatusCodes.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiConventionAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForApiController_WithAllDocumentedStatusCodes.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForApiController_WithAllDocumentedStatusCodes.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiConventionAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForApiController_WithAllDocumentedStatusCodes.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForNonApiController.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiConventionAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForNonApiController.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForNonApiController.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiConventionAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForNonApiController.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForOkResultReturningAction.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiConventionAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForOkResultReturningAction.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForOkResultReturningAction.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiConventionAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForOkResultReturningAction.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForRazorPageModels.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiConventionAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForRazorPageModels.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForRazorPageModels.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiConventionAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForRazorPageModels.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForReturnStatementsInLambdas.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiConventionAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForReturnStatementsInLambdas.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForReturnStatementsInLambdas.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiConventionAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForReturnStatementsInLambdas.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForReturnStatementsInLocalFunctions.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiConventionAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForReturnStatementsInLocalFunctions.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForReturnStatementsInLocalFunctions.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/ApiConventionAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForReturnStatementsInLocalFunctions.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/MvcFactsTest/IsControllerActionTests.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/MvcFactsTest/IsControllerActionTests.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/MvcFactsTest/IsControllerActionTests.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/MvcFactsTest/IsControllerActionTests.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/MvcFactsTest/IsControllerTests.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/MvcFactsTest/IsControllerTests.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/MvcFactsTest/IsControllerTests.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/MvcFactsTest/IsControllerTests.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/SymbolApiConventionMatcherTest/SymbolApiConventionMatcherTestFile.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/SymbolApiConventionMatcherTest/SymbolApiConventionMatcherTestFile.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/SymbolApiConventionMatcherTest/SymbolApiConventionMatcherTestFile.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/SymbolApiConventionMatcherTest/SymbolApiConventionMatcherTestFile.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/SymbolApiResponseMetadataProviderTest/GetErrorResponseType_ReturnsProblemDetails_IfNoAttributeIsDiscovered.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/SymbolApiResponseMetadataProviderTest/GetErrorResponseType_ReturnsProblemDetails_IfNoAttributeIsDiscovered.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/SymbolApiResponseMetadataProviderTest/GetErrorResponseType_ReturnsProblemDetails_IfNoAttributeIsDiscovered.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/SymbolApiResponseMetadataProviderTest/GetErrorResponseType_ReturnsProblemDetails_IfNoAttributeIsDiscovered.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/SymbolApiResponseMetadataProviderTest/GetErrorResponseType_ReturnsTypeDefinedAtAction.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/SymbolApiResponseMetadataProviderTest/GetErrorResponseType_ReturnsTypeDefinedAtAction.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/SymbolApiResponseMetadataProviderTest/GetErrorResponseType_ReturnsTypeDefinedAtAction.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/SymbolApiResponseMetadataProviderTest/GetErrorResponseType_ReturnsTypeDefinedAtAction.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/SymbolApiResponseMetadataProviderTest/GetErrorResponseType_ReturnsTypeDefinedAtAssembly.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/SymbolApiResponseMetadataProviderTest/GetErrorResponseType_ReturnsTypeDefinedAtAssembly.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/SymbolApiResponseMetadataProviderTest/GetErrorResponseType_ReturnsTypeDefinedAtAssembly.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/SymbolApiResponseMetadataProviderTest/GetErrorResponseType_ReturnsTypeDefinedAtAssembly.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/SymbolApiResponseMetadataProviderTest/GetErrorResponseType_ReturnsTypeDefinedAtController.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/SymbolApiResponseMetadataProviderTest/GetErrorResponseType_ReturnsTypeDefinedAtController.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/SymbolApiResponseMetadataProviderTest/GetErrorResponseType_ReturnsTypeDefinedAtController.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/SymbolApiResponseMetadataProviderTest/GetErrorResponseType_ReturnsTypeDefinedAtController.cs
diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/SymbolApiResponseMetadataProviderTest/GetResponseMetadataTests.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/SymbolApiResponseMetadataProviderTest/GetResponseMetadataTests.cs
similarity index 100%
rename from src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/SymbolApiResponseMetadataProviderTest/GetResponseMetadataTests.cs
rename to src/Mvc/Mvc.Api.Analyzers/test/TestFiles/SymbolApiResponseMetadataProviderTest/GetResponseMetadataTests.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/ApiDescriptionExtensions.cs b/src/Mvc/Mvc.ApiExplorer/src/ApiDescriptionExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/ApiDescriptionExtensions.cs
rename to src/Mvc/Mvc.ApiExplorer/src/ApiDescriptionExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/ApiDescriptionGroup.cs b/src/Mvc/Mvc.ApiExplorer/src/ApiDescriptionGroup.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/ApiDescriptionGroup.cs
rename to src/Mvc/Mvc.ApiExplorer/src/ApiDescriptionGroup.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/ApiDescriptionGroupCollection.cs b/src/Mvc/Mvc.ApiExplorer/src/ApiDescriptionGroupCollection.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/ApiDescriptionGroupCollection.cs
rename to src/Mvc/Mvc.ApiExplorer/src/ApiDescriptionGroupCollection.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/ApiDescriptionGroupCollectionProvider.cs b/src/Mvc/Mvc.ApiExplorer/src/ApiDescriptionGroupCollectionProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/ApiDescriptionGroupCollectionProvider.cs
rename to src/Mvc/Mvc.ApiExplorer/src/ApiDescriptionGroupCollectionProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/ApiParameterContext.cs b/src/Mvc/Mvc.ApiExplorer/src/ApiParameterContext.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/ApiParameterContext.cs
rename to src/Mvc/Mvc.ApiExplorer/src/ApiParameterContext.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/ApiResponseTypeProvider.cs b/src/Mvc/Mvc.ApiExplorer/src/ApiResponseTypeProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/ApiResponseTypeProvider.cs
rename to src/Mvc/Mvc.ApiExplorer/src/ApiResponseTypeProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/DefaultApiDescriptionProvider.cs b/src/Mvc/Mvc.ApiExplorer/src/DefaultApiDescriptionProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/DefaultApiDescriptionProvider.cs
rename to src/Mvc/Mvc.ApiExplorer/src/DefaultApiDescriptionProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/DependencyInjection/MvcApiExplorerMvcCoreBuilderExtensions.cs b/src/Mvc/Mvc.ApiExplorer/src/DependencyInjection/MvcApiExplorerMvcCoreBuilderExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/DependencyInjection/MvcApiExplorerMvcCoreBuilderExtensions.cs
rename to src/Mvc/Mvc.ApiExplorer/src/DependencyInjection/MvcApiExplorerMvcCoreBuilderExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/IApiDescriptionGroupCollectionProvider.cs b/src/Mvc/Mvc.ApiExplorer/src/IApiDescriptionGroupCollectionProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/IApiDescriptionGroupCollectionProvider.cs
rename to src/Mvc/Mvc.ApiExplorer/src/IApiDescriptionGroupCollectionProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/Microsoft.AspNetCore.Mvc.ApiExplorer.csproj b/src/Mvc/Mvc.ApiExplorer/src/Microsoft.AspNetCore.Mvc.ApiExplorer.csproj
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/Microsoft.AspNetCore.Mvc.ApiExplorer.csproj
rename to src/Mvc/Mvc.ApiExplorer/src/Microsoft.AspNetCore.Mvc.ApiExplorer.csproj
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/Properties/AssemblyInfo.cs b/src/Mvc/Mvc.ApiExplorer/src/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/Properties/AssemblyInfo.cs
rename to src/Mvc/Mvc.ApiExplorer/src/Properties/AssemblyInfo.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/baseline.netcore.json b/src/Mvc/Mvc.ApiExplorer/src/baseline.netcore.json
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/baseline.netcore.json
rename to src/Mvc/Mvc.ApiExplorer/src/baseline.netcore.json
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/ApiResponseTypeProviderTest.cs b/src/Mvc/Mvc.ApiExplorer/test/ApiResponseTypeProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/ApiResponseTypeProviderTest.cs
rename to src/Mvc/Mvc.ApiExplorer/test/ApiResponseTypeProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/DefaultApiDescriptionProviderTest.cs b/src/Mvc/Mvc.ApiExplorer/test/DefaultApiDescriptionProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/DefaultApiDescriptionProviderTest.cs
rename to src/Mvc/Mvc.ApiExplorer/test/DefaultApiDescriptionProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test.csproj b/src/Mvc/Mvc.ApiExplorer/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test.csproj
similarity index 70%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test.csproj
rename to src/Mvc/Mvc.ApiExplorer/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test.csproj
index 73c86843b0..df8bb63d3b 100644
--- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test.csproj
+++ b/src/Mvc/Mvc.ApiExplorer/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test.csproj
@@ -7,6 +7,6 @@
   <ItemGroup>
     <Reference Include="Microsoft.AspNetCore.Mvc.ApiExplorer" />
     <Reference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" />
-    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.Core.TestCommon\Microsoft.AspNetCore.Mvc.Core.TestCommon.csproj" />
+    <ProjectReference Include="..\..\shared\Mvc.Core.TestCommon\Microsoft.AspNetCore.Mvc.Core.TestCommon.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/AcceptVerbsAttribute.cs b/src/Mvc/Mvc.Core/src/AcceptVerbsAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/AcceptVerbsAttribute.cs
rename to src/Mvc/Mvc.Core/src/AcceptVerbsAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/AcceptedAtActionResult.cs b/src/Mvc/Mvc.Core/src/AcceptedAtActionResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/AcceptedAtActionResult.cs
rename to src/Mvc/Mvc.Core/src/AcceptedAtActionResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/AcceptedAtRouteResult.cs b/src/Mvc/Mvc.Core/src/AcceptedAtRouteResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/AcceptedAtRouteResult.cs
rename to src/Mvc/Mvc.Core/src/AcceptedAtRouteResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/AcceptedResult.cs b/src/Mvc/Mvc.Core/src/AcceptedResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/AcceptedResult.cs
rename to src/Mvc/Mvc.Core/src/AcceptedResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ActionConstraints/ActionConstraintCache.cs b/src/Mvc/Mvc.Core/src/ActionConstraints/ActionConstraintCache.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ActionConstraints/ActionConstraintCache.cs
rename to src/Mvc/Mvc.Core/src/ActionConstraints/ActionConstraintCache.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ActionConstraints/ActionMethodSelectorAttribute.cs b/src/Mvc/Mvc.Core/src/ActionConstraints/ActionMethodSelectorAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ActionConstraints/ActionMethodSelectorAttribute.cs
rename to src/Mvc/Mvc.Core/src/ActionConstraints/ActionMethodSelectorAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ActionConstraints/DefaultActionConstraintProvider.cs b/src/Mvc/Mvc.Core/src/ActionConstraints/DefaultActionConstraintProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ActionConstraints/DefaultActionConstraintProvider.cs
rename to src/Mvc/Mvc.Core/src/ActionConstraints/DefaultActionConstraintProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ActionConstraints/HttpMethodActionConstraint.cs b/src/Mvc/Mvc.Core/src/ActionConstraints/HttpMethodActionConstraint.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ActionConstraints/HttpMethodActionConstraint.cs
rename to src/Mvc/Mvc.Core/src/ActionConstraints/HttpMethodActionConstraint.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ActionConstraints/IConsumesActionConstraint.cs b/src/Mvc/Mvc.Core/src/ActionConstraints/IConsumesActionConstraint.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ActionConstraints/IConsumesActionConstraint.cs
rename to src/Mvc/Mvc.Core/src/ActionConstraints/IConsumesActionConstraint.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ActionContextAttribute.cs b/src/Mvc/Mvc.Core/src/ActionContextAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ActionContextAttribute.cs
rename to src/Mvc/Mvc.Core/src/ActionContextAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ActionNameAttribute.cs b/src/Mvc/Mvc.Core/src/ActionNameAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ActionNameAttribute.cs
rename to src/Mvc/Mvc.Core/src/ActionNameAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ActionResult.cs b/src/Mvc/Mvc.Core/src/ActionResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ActionResult.cs
rename to src/Mvc/Mvc.Core/src/ActionResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ActionResultOfT.cs b/src/Mvc/Mvc.Core/src/ActionResultOfT.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ActionResultOfT.cs
rename to src/Mvc/Mvc.Core/src/ActionResultOfT.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/AntiforgeryValidationFailedResult.cs b/src/Mvc/Mvc.Core/src/AntiforgeryValidationFailedResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/AntiforgeryValidationFailedResult.cs
rename to src/Mvc/Mvc.Core/src/AntiforgeryValidationFailedResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiBehaviorOptions.cs b/src/Mvc/Mvc.Core/src/ApiBehaviorOptions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiBehaviorOptions.cs
rename to src/Mvc/Mvc.Core/src/ApiBehaviorOptions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiControllerAttribute.cs b/src/Mvc/Mvc.Core/src/ApiControllerAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiControllerAttribute.cs
rename to src/Mvc/Mvc.Core/src/ApiControllerAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiConventionMethodAttribute.cs b/src/Mvc/Mvc.Core/src/ApiConventionMethodAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiConventionMethodAttribute.cs
rename to src/Mvc/Mvc.Core/src/ApiConventionMethodAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiConventionTypeAttribute.cs b/src/Mvc/Mvc.Core/src/ApiConventionTypeAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiConventionTypeAttribute.cs
rename to src/Mvc/Mvc.Core/src/ApiConventionTypeAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/ApiConventionMatcher.cs b/src/Mvc/Mvc.Core/src/ApiExplorer/ApiConventionMatcher.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/ApiConventionMatcher.cs
rename to src/Mvc/Mvc.Core/src/ApiExplorer/ApiConventionMatcher.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/ApiConventionNameMatchAttribute.cs b/src/Mvc/Mvc.Core/src/ApiExplorer/ApiConventionNameMatchAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/ApiConventionNameMatchAttribute.cs
rename to src/Mvc/Mvc.Core/src/ApiExplorer/ApiConventionNameMatchAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/ApiConventionNameMatchBehavior.cs b/src/Mvc/Mvc.Core/src/ApiExplorer/ApiConventionNameMatchBehavior.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/ApiConventionNameMatchBehavior.cs
rename to src/Mvc/Mvc.Core/src/ApiExplorer/ApiConventionNameMatchBehavior.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/ApiConventionResult.cs b/src/Mvc/Mvc.Core/src/ApiExplorer/ApiConventionResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/ApiConventionResult.cs
rename to src/Mvc/Mvc.Core/src/ApiExplorer/ApiConventionResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/ApiConventionTypeMatchAttribute.cs b/src/Mvc/Mvc.Core/src/ApiExplorer/ApiConventionTypeMatchAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/ApiConventionTypeMatchAttribute.cs
rename to src/Mvc/Mvc.Core/src/ApiExplorer/ApiConventionTypeMatchAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/ApiConventionTypeMatchBehavior.cs b/src/Mvc/Mvc.Core/src/ApiExplorer/ApiConventionTypeMatchBehavior.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/ApiConventionTypeMatchBehavior.cs
rename to src/Mvc/Mvc.Core/src/ApiExplorer/ApiConventionTypeMatchBehavior.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/ApiDescriptionActionData.cs b/src/Mvc/Mvc.Core/src/ApiExplorer/ApiDescriptionActionData.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/ApiDescriptionActionData.cs
rename to src/Mvc/Mvc.Core/src/ApiExplorer/ApiDescriptionActionData.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/IApiDefaultResponseMetadataProvider.cs b/src/Mvc/Mvc.Core/src/ApiExplorer/IApiDefaultResponseMetadataProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/IApiDefaultResponseMetadataProvider.cs
rename to src/Mvc/Mvc.Core/src/ApiExplorer/IApiDefaultResponseMetadataProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/IApiDescriptionGroupNameProvider.cs b/src/Mvc/Mvc.Core/src/ApiExplorer/IApiDescriptionGroupNameProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/IApiDescriptionGroupNameProvider.cs
rename to src/Mvc/Mvc.Core/src/ApiExplorer/IApiDescriptionGroupNameProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/IApiDescriptionVisibilityProvider.cs b/src/Mvc/Mvc.Core/src/ApiExplorer/IApiDescriptionVisibilityProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/IApiDescriptionVisibilityProvider.cs
rename to src/Mvc/Mvc.Core/src/ApiExplorer/IApiDescriptionVisibilityProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/IApiRequestFormatMetadataProvider.cs b/src/Mvc/Mvc.Core/src/ApiExplorer/IApiRequestFormatMetadataProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/IApiRequestFormatMetadataProvider.cs
rename to src/Mvc/Mvc.Core/src/ApiExplorer/IApiRequestFormatMetadataProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/IApiRequestMetadataProvider.cs b/src/Mvc/Mvc.Core/src/ApiExplorer/IApiRequestMetadataProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/IApiRequestMetadataProvider.cs
rename to src/Mvc/Mvc.Core/src/ApiExplorer/IApiRequestMetadataProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/IApiResponseMetadataProvider.cs b/src/Mvc/Mvc.Core/src/ApiExplorer/IApiResponseMetadataProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/IApiResponseMetadataProvider.cs
rename to src/Mvc/Mvc.Core/src/ApiExplorer/IApiResponseMetadataProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/IApiResponseTypeMetadataProvider.cs b/src/Mvc/Mvc.Core/src/ApiExplorer/IApiResponseTypeMetadataProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/IApiResponseTypeMetadataProvider.cs
rename to src/Mvc/Mvc.Core/src/ApiExplorer/IApiResponseTypeMetadataProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorerSettingsAttribute.cs b/src/Mvc/Mvc.Core/src/ApiExplorerSettingsAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorerSettingsAttribute.cs
rename to src/Mvc/Mvc.Core/src/ApiExplorerSettingsAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ActionAttributeRouteModel.cs b/src/Mvc/Mvc.Core/src/ApplicationModels/ActionAttributeRouteModel.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ActionAttributeRouteModel.cs
rename to src/Mvc/Mvc.Core/src/ApplicationModels/ActionAttributeRouteModel.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ActionModel.cs b/src/Mvc/Mvc.Core/src/ApplicationModels/ActionModel.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ActionModel.cs
rename to src/Mvc/Mvc.Core/src/ApplicationModels/ActionModel.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ApiBehaviorApplicationModelProvider.cs b/src/Mvc/Mvc.Core/src/ApplicationModels/ApiBehaviorApplicationModelProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ApiBehaviorApplicationModelProvider.cs
rename to src/Mvc/Mvc.Core/src/ApplicationModels/ApiBehaviorApplicationModelProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ApiConventionApplicationModelConvention.cs b/src/Mvc/Mvc.Core/src/ApplicationModels/ApiConventionApplicationModelConvention.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ApiConventionApplicationModelConvention.cs
rename to src/Mvc/Mvc.Core/src/ApplicationModels/ApiConventionApplicationModelConvention.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ApiExplorerModel.cs b/src/Mvc/Mvc.Core/src/ApplicationModels/ApiExplorerModel.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ApiExplorerModel.cs
rename to src/Mvc/Mvc.Core/src/ApplicationModels/ApiExplorerModel.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ApiVisibilityConvention.cs b/src/Mvc/Mvc.Core/src/ApplicationModels/ApiVisibilityConvention.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ApiVisibilityConvention.cs
rename to src/Mvc/Mvc.Core/src/ApplicationModels/ApiVisibilityConvention.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ApplicationModel.cs b/src/Mvc/Mvc.Core/src/ApplicationModels/ApplicationModel.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ApplicationModel.cs
rename to src/Mvc/Mvc.Core/src/ApplicationModels/ApplicationModel.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ApplicationModelConventions.cs b/src/Mvc/Mvc.Core/src/ApplicationModels/ApplicationModelConventions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ApplicationModelConventions.cs
rename to src/Mvc/Mvc.Core/src/ApplicationModels/ApplicationModelConventions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ApplicationModelFactory.cs b/src/Mvc/Mvc.Core/src/ApplicationModels/ApplicationModelFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ApplicationModelFactory.cs
rename to src/Mvc/Mvc.Core/src/ApplicationModels/ApplicationModelFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ApplicationModelProviderContext.cs b/src/Mvc/Mvc.Core/src/ApplicationModels/ApplicationModelProviderContext.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ApplicationModelProviderContext.cs
rename to src/Mvc/Mvc.Core/src/ApplicationModels/ApplicationModelProviderContext.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/AttributeRouteModel.cs b/src/Mvc/Mvc.Core/src/ApplicationModels/AttributeRouteModel.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/AttributeRouteModel.cs
rename to src/Mvc/Mvc.Core/src/ApplicationModels/AttributeRouteModel.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/AuthorizationApplicationModelProvider.cs b/src/Mvc/Mvc.Core/src/ApplicationModels/AuthorizationApplicationModelProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/AuthorizationApplicationModelProvider.cs
rename to src/Mvc/Mvc.Core/src/ApplicationModels/AuthorizationApplicationModelProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ClientErrorResultFilterConvention.cs b/src/Mvc/Mvc.Core/src/ApplicationModels/ClientErrorResultFilterConvention.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ClientErrorResultFilterConvention.cs
rename to src/Mvc/Mvc.Core/src/ApplicationModels/ClientErrorResultFilterConvention.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ConsumesConstraintForFormFileParameterConvention.cs b/src/Mvc/Mvc.Core/src/ApplicationModels/ConsumesConstraintForFormFileParameterConvention.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ConsumesConstraintForFormFileParameterConvention.cs
rename to src/Mvc/Mvc.Core/src/ApplicationModels/ConsumesConstraintForFormFileParameterConvention.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ControllerActionDescriptorBuilder.cs b/src/Mvc/Mvc.Core/src/ApplicationModels/ControllerActionDescriptorBuilder.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ControllerActionDescriptorBuilder.cs
rename to src/Mvc/Mvc.Core/src/ApplicationModels/ControllerActionDescriptorBuilder.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ControllerActionDescriptorProvider.cs b/src/Mvc/Mvc.Core/src/ApplicationModels/ControllerActionDescriptorProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ControllerActionDescriptorProvider.cs
rename to src/Mvc/Mvc.Core/src/ApplicationModels/ControllerActionDescriptorProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ControllerModel.cs b/src/Mvc/Mvc.Core/src/ApplicationModels/ControllerModel.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ControllerModel.cs
rename to src/Mvc/Mvc.Core/src/ApplicationModels/ControllerModel.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/DefaultApplicationModelProvider.cs b/src/Mvc/Mvc.Core/src/ApplicationModels/DefaultApplicationModelProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/DefaultApplicationModelProvider.cs
rename to src/Mvc/Mvc.Core/src/ApplicationModels/DefaultApplicationModelProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IActionModelConvention.cs b/src/Mvc/Mvc.Core/src/ApplicationModels/IActionModelConvention.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IActionModelConvention.cs
rename to src/Mvc/Mvc.Core/src/ApplicationModels/IActionModelConvention.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IApiExplorerModel.cs b/src/Mvc/Mvc.Core/src/ApplicationModels/IApiExplorerModel.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IApiExplorerModel.cs
rename to src/Mvc/Mvc.Core/src/ApplicationModels/IApiExplorerModel.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IApplicationModelConvention.cs b/src/Mvc/Mvc.Core/src/ApplicationModels/IApplicationModelConvention.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IApplicationModelConvention.cs
rename to src/Mvc/Mvc.Core/src/ApplicationModels/IApplicationModelConvention.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IApplicationModelProvider.cs b/src/Mvc/Mvc.Core/src/ApplicationModels/IApplicationModelProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IApplicationModelProvider.cs
rename to src/Mvc/Mvc.Core/src/ApplicationModels/IApplicationModelProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IBindingModel.cs b/src/Mvc/Mvc.Core/src/ApplicationModels/IBindingModel.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IBindingModel.cs
rename to src/Mvc/Mvc.Core/src/ApplicationModels/IBindingModel.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ICommonModel.cs b/src/Mvc/Mvc.Core/src/ApplicationModels/ICommonModel.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ICommonModel.cs
rename to src/Mvc/Mvc.Core/src/ApplicationModels/ICommonModel.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IControllerModelConvention.cs b/src/Mvc/Mvc.Core/src/ApplicationModels/IControllerModelConvention.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IControllerModelConvention.cs
rename to src/Mvc/Mvc.Core/src/ApplicationModels/IControllerModelConvention.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IFilterModel.cs b/src/Mvc/Mvc.Core/src/ApplicationModels/IFilterModel.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IFilterModel.cs
rename to src/Mvc/Mvc.Core/src/ApplicationModels/IFilterModel.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IParameterModelBaseConvention.cs b/src/Mvc/Mvc.Core/src/ApplicationModels/IParameterModelBaseConvention.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IParameterModelBaseConvention.cs
rename to src/Mvc/Mvc.Core/src/ApplicationModels/IParameterModelBaseConvention.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IParameterModelConvention.cs b/src/Mvc/Mvc.Core/src/ApplicationModels/IParameterModelConvention.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IParameterModelConvention.cs
rename to src/Mvc/Mvc.Core/src/ApplicationModels/IParameterModelConvention.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IPropertyModel.cs b/src/Mvc/Mvc.Core/src/ApplicationModels/IPropertyModel.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IPropertyModel.cs
rename to src/Mvc/Mvc.Core/src/ApplicationModels/IPropertyModel.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/InferParameterBindingInfoConvention.cs b/src/Mvc/Mvc.Core/src/ApplicationModels/InferParameterBindingInfoConvention.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/InferParameterBindingInfoConvention.cs
rename to src/Mvc/Mvc.Core/src/ApplicationModels/InferParameterBindingInfoConvention.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/InvalidModelStateFilterConvention.cs b/src/Mvc/Mvc.Core/src/ApplicationModels/InvalidModelStateFilterConvention.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/InvalidModelStateFilterConvention.cs
rename to src/Mvc/Mvc.Core/src/ApplicationModels/InvalidModelStateFilterConvention.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ParameterModel.cs b/src/Mvc/Mvc.Core/src/ApplicationModels/ParameterModel.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ParameterModel.cs
rename to src/Mvc/Mvc.Core/src/ApplicationModels/ParameterModel.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ParameterModelBase.cs b/src/Mvc/Mvc.Core/src/ApplicationModels/ParameterModelBase.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ParameterModelBase.cs
rename to src/Mvc/Mvc.Core/src/ApplicationModels/ParameterModelBase.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/PropertyModel.cs b/src/Mvc/Mvc.Core/src/ApplicationModels/PropertyModel.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/PropertyModel.cs
rename to src/Mvc/Mvc.Core/src/ApplicationModels/PropertyModel.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/RouteTokenTransformerConvention.cs b/src/Mvc/Mvc.Core/src/ApplicationModels/RouteTokenTransformerConvention.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/RouteTokenTransformerConvention.cs
rename to src/Mvc/Mvc.Core/src/ApplicationModels/RouteTokenTransformerConvention.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/SelectorModel.cs b/src/Mvc/Mvc.Core/src/ApplicationModels/SelectorModel.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/SelectorModel.cs
rename to src/Mvc/Mvc.Core/src/ApplicationModels/SelectorModel.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/ApplicationAssembliesProvider.cs b/src/Mvc/Mvc.Core/src/ApplicationParts/ApplicationAssembliesProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/ApplicationAssembliesProvider.cs
rename to src/Mvc/Mvc.Core/src/ApplicationParts/ApplicationAssembliesProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/ApplicationPart.cs b/src/Mvc/Mvc.Core/src/ApplicationParts/ApplicationPart.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/ApplicationPart.cs
rename to src/Mvc/Mvc.Core/src/ApplicationParts/ApplicationPart.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/ApplicationPartFactory.cs b/src/Mvc/Mvc.Core/src/ApplicationParts/ApplicationPartFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/ApplicationPartFactory.cs
rename to src/Mvc/Mvc.Core/src/ApplicationParts/ApplicationPartFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/ApplicationPartManager.cs b/src/Mvc/Mvc.Core/src/ApplicationParts/ApplicationPartManager.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/ApplicationPartManager.cs
rename to src/Mvc/Mvc.Core/src/ApplicationParts/ApplicationPartManager.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/AssemblyPart.cs b/src/Mvc/Mvc.Core/src/ApplicationParts/AssemblyPart.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/AssemblyPart.cs
rename to src/Mvc/Mvc.Core/src/ApplicationParts/AssemblyPart.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/DefaultApplicationPartFactory.cs b/src/Mvc/Mvc.Core/src/ApplicationParts/DefaultApplicationPartFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/DefaultApplicationPartFactory.cs
rename to src/Mvc/Mvc.Core/src/ApplicationParts/DefaultApplicationPartFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/IApplicationFeatureProvider.cs b/src/Mvc/Mvc.Core/src/ApplicationParts/IApplicationFeatureProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/IApplicationFeatureProvider.cs
rename to src/Mvc/Mvc.Core/src/ApplicationParts/IApplicationFeatureProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/IApplicationFeatureProviderOfT.cs b/src/Mvc/Mvc.Core/src/ApplicationParts/IApplicationFeatureProviderOfT.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/IApplicationFeatureProviderOfT.cs
rename to src/Mvc/Mvc.Core/src/ApplicationParts/IApplicationFeatureProviderOfT.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/IApplicationPartTypeProvider.cs b/src/Mvc/Mvc.Core/src/ApplicationParts/IApplicationPartTypeProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/IApplicationPartTypeProvider.cs
rename to src/Mvc/Mvc.Core/src/ApplicationParts/IApplicationPartTypeProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/ICompilationReferencesProvider.cs b/src/Mvc/Mvc.Core/src/ApplicationParts/ICompilationReferencesProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/ICompilationReferencesProvider.cs
rename to src/Mvc/Mvc.Core/src/ApplicationParts/ICompilationReferencesProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/NullApplicationPartFactory.cs b/src/Mvc/Mvc.Core/src/ApplicationParts/NullApplicationPartFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/NullApplicationPartFactory.cs
rename to src/Mvc/Mvc.Core/src/ApplicationParts/NullApplicationPartFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/ProvideApplicationPartFactoryAttribute.cs b/src/Mvc/Mvc.Core/src/ApplicationParts/ProvideApplicationPartFactoryAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/ProvideApplicationPartFactoryAttribute.cs
rename to src/Mvc/Mvc.Core/src/ApplicationParts/ProvideApplicationPartFactoryAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/RelatedAssemblyAttribute.cs b/src/Mvc/Mvc.Core/src/ApplicationParts/RelatedAssemblyAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/RelatedAssemblyAttribute.cs
rename to src/Mvc/Mvc.Core/src/ApplicationParts/RelatedAssemblyAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/AreaAttribute.cs b/src/Mvc/Mvc.Core/src/AreaAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/AreaAttribute.cs
rename to src/Mvc/Mvc.Core/src/AreaAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Authorization/AllowAnonymousFilter.cs b/src/Mvc/Mvc.Core/src/Authorization/AllowAnonymousFilter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Authorization/AllowAnonymousFilter.cs
rename to src/Mvc/Mvc.Core/src/Authorization/AllowAnonymousFilter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Authorization/AuthorizeFilter.cs b/src/Mvc/Mvc.Core/src/Authorization/AuthorizeFilter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Authorization/AuthorizeFilter.cs
rename to src/Mvc/Mvc.Core/src/Authorization/AuthorizeFilter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/BadRequestObjectResult.cs b/src/Mvc/Mvc.Core/src/BadRequestObjectResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/BadRequestObjectResult.cs
rename to src/Mvc/Mvc.Core/src/BadRequestObjectResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/BadRequestResult.cs b/src/Mvc/Mvc.Core/src/BadRequestResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/BadRequestResult.cs
rename to src/Mvc/Mvc.Core/src/BadRequestResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/BindAttribute.cs b/src/Mvc/Mvc.Core/src/BindAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/BindAttribute.cs
rename to src/Mvc/Mvc.Core/src/BindAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/BindPropertiesAttribute.cs b/src/Mvc/Mvc.Core/src/BindPropertiesAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/BindPropertiesAttribute.cs
rename to src/Mvc/Mvc.Core/src/BindPropertiesAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/BindPropertyAttribute.cs b/src/Mvc/Mvc.Core/src/BindPropertyAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/BindPropertyAttribute.cs
rename to src/Mvc/Mvc.Core/src/BindPropertyAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Builder/ControllerEndpointRouteBuilderExtensions.cs b/src/Mvc/Mvc.Core/src/Builder/ControllerEndpointRouteBuilderExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Builder/ControllerEndpointRouteBuilderExtensions.cs
rename to src/Mvc/Mvc.Core/src/Builder/ControllerEndpointRouteBuilderExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Builder/MvcApplicationBuilderExtensions.cs b/src/Mvc/Mvc.Core/src/Builder/MvcApplicationBuilderExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Builder/MvcApplicationBuilderExtensions.cs
rename to src/Mvc/Mvc.Core/src/Builder/MvcApplicationBuilderExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Builder/MvcAreaRouteBuilderExtensions.cs b/src/Mvc/Mvc.Core/src/Builder/MvcAreaRouteBuilderExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Builder/MvcAreaRouteBuilderExtensions.cs
rename to src/Mvc/Mvc.Core/src/Builder/MvcAreaRouteBuilderExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/CacheProfile.cs b/src/Mvc/Mvc.Core/src/CacheProfile.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/CacheProfile.cs
rename to src/Mvc/Mvc.Core/src/CacheProfile.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ChallengeResult.cs b/src/Mvc/Mvc.Core/src/ChallengeResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ChallengeResult.cs
rename to src/Mvc/Mvc.Core/src/ChallengeResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ClientErrorData.cs b/src/Mvc/Mvc.Core/src/ClientErrorData.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ClientErrorData.cs
rename to src/Mvc/Mvc.Core/src/ClientErrorData.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/CompatibilityVersion.cs b/src/Mvc/Mvc.Core/src/CompatibilityVersion.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/CompatibilityVersion.cs
rename to src/Mvc/Mvc.Core/src/CompatibilityVersion.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ConflictObjectResult.cs b/src/Mvc/Mvc.Core/src/ConflictObjectResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ConflictObjectResult.cs
rename to src/Mvc/Mvc.Core/src/ConflictObjectResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ConflictResult.cs b/src/Mvc/Mvc.Core/src/ConflictResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ConflictResult.cs
rename to src/Mvc/Mvc.Core/src/ConflictResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ConsumesAttribute.cs b/src/Mvc/Mvc.Core/src/ConsumesAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ConsumesAttribute.cs
rename to src/Mvc/Mvc.Core/src/ConsumesAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ContentResult.cs b/src/Mvc/Mvc.Core/src/ContentResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ContentResult.cs
rename to src/Mvc/Mvc.Core/src/ContentResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ControllerAttribute.cs b/src/Mvc/Mvc.Core/src/ControllerAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ControllerAttribute.cs
rename to src/Mvc/Mvc.Core/src/ControllerAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ControllerBase.cs b/src/Mvc/Mvc.Core/src/ControllerBase.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ControllerBase.cs
rename to src/Mvc/Mvc.Core/src/ControllerBase.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ControllerContext.cs b/src/Mvc/Mvc.Core/src/ControllerContext.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ControllerContext.cs
rename to src/Mvc/Mvc.Core/src/ControllerContext.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ControllerContextAttribute.cs b/src/Mvc/Mvc.Core/src/ControllerContextAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ControllerContextAttribute.cs
rename to src/Mvc/Mvc.Core/src/ControllerContextAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerActionDescriptor.cs b/src/Mvc/Mvc.Core/src/Controllers/ControllerActionDescriptor.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerActionDescriptor.cs
rename to src/Mvc/Mvc.Core/src/Controllers/ControllerActionDescriptor.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerActivatorProvider.cs b/src/Mvc/Mvc.Core/src/Controllers/ControllerActivatorProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerActivatorProvider.cs
rename to src/Mvc/Mvc.Core/src/Controllers/ControllerActivatorProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerBinderDelegate.cs b/src/Mvc/Mvc.Core/src/Controllers/ControllerBinderDelegate.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerBinderDelegate.cs
rename to src/Mvc/Mvc.Core/src/Controllers/ControllerBinderDelegate.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerBinderDelegateProvider.cs b/src/Mvc/Mvc.Core/src/Controllers/ControllerBinderDelegateProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerBinderDelegateProvider.cs
rename to src/Mvc/Mvc.Core/src/Controllers/ControllerBinderDelegateProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerBoundPropertyDescriptor.cs b/src/Mvc/Mvc.Core/src/Controllers/ControllerBoundPropertyDescriptor.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerBoundPropertyDescriptor.cs
rename to src/Mvc/Mvc.Core/src/Controllers/ControllerBoundPropertyDescriptor.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerFactoryProvider.cs b/src/Mvc/Mvc.Core/src/Controllers/ControllerFactoryProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerFactoryProvider.cs
rename to src/Mvc/Mvc.Core/src/Controllers/ControllerFactoryProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerFeature.cs b/src/Mvc/Mvc.Core/src/Controllers/ControllerFeature.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerFeature.cs
rename to src/Mvc/Mvc.Core/src/Controllers/ControllerFeature.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerFeatureProvider.cs b/src/Mvc/Mvc.Core/src/Controllers/ControllerFeatureProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerFeatureProvider.cs
rename to src/Mvc/Mvc.Core/src/Controllers/ControllerFeatureProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerParameterDescriptor.cs b/src/Mvc/Mvc.Core/src/Controllers/ControllerParameterDescriptor.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerParameterDescriptor.cs
rename to src/Mvc/Mvc.Core/src/Controllers/ControllerParameterDescriptor.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/DefaultControllerActivator.cs b/src/Mvc/Mvc.Core/src/Controllers/DefaultControllerActivator.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/DefaultControllerActivator.cs
rename to src/Mvc/Mvc.Core/src/Controllers/DefaultControllerActivator.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/DefaultControllerFactory.cs b/src/Mvc/Mvc.Core/src/Controllers/DefaultControllerFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/DefaultControllerFactory.cs
rename to src/Mvc/Mvc.Core/src/Controllers/DefaultControllerFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/DefaultControllerPropertyActivator.cs b/src/Mvc/Mvc.Core/src/Controllers/DefaultControllerPropertyActivator.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/DefaultControllerPropertyActivator.cs
rename to src/Mvc/Mvc.Core/src/Controllers/DefaultControllerPropertyActivator.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/IControllerActivator.cs b/src/Mvc/Mvc.Core/src/Controllers/IControllerActivator.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/IControllerActivator.cs
rename to src/Mvc/Mvc.Core/src/Controllers/IControllerActivator.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/IControllerActivatorProvider.cs b/src/Mvc/Mvc.Core/src/Controllers/IControllerActivatorProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/IControllerActivatorProvider.cs
rename to src/Mvc/Mvc.Core/src/Controllers/IControllerActivatorProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/IControllerFactory.cs b/src/Mvc/Mvc.Core/src/Controllers/IControllerFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/IControllerFactory.cs
rename to src/Mvc/Mvc.Core/src/Controllers/IControllerFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/IControllerFactoryProvider.cs b/src/Mvc/Mvc.Core/src/Controllers/IControllerFactoryProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/IControllerFactoryProvider.cs
rename to src/Mvc/Mvc.Core/src/Controllers/IControllerFactoryProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/IControllerPropertyActivatorFactory.cs b/src/Mvc/Mvc.Core/src/Controllers/IControllerPropertyActivatorFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/IControllerPropertyActivatorFactory.cs
rename to src/Mvc/Mvc.Core/src/Controllers/IControllerPropertyActivatorFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ServiceBasedControllerActivator.cs b/src/Mvc/Mvc.Core/src/Controllers/ServiceBasedControllerActivator.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ServiceBasedControllerActivator.cs
rename to src/Mvc/Mvc.Core/src/Controllers/ServiceBasedControllerActivator.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/CreatedAtActionResult.cs b/src/Mvc/Mvc.Core/src/CreatedAtActionResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/CreatedAtActionResult.cs
rename to src/Mvc/Mvc.Core/src/CreatedAtActionResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/CreatedAtRouteResult.cs b/src/Mvc/Mvc.Core/src/CreatedAtRouteResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/CreatedAtRouteResult.cs
rename to src/Mvc/Mvc.Core/src/CreatedAtRouteResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/CreatedResult.cs b/src/Mvc/Mvc.Core/src/CreatedResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/CreatedResult.cs
rename to src/Mvc/Mvc.Core/src/CreatedResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DefaultApiConventions.cs b/src/Mvc/Mvc.Core/src/DefaultApiConventions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DefaultApiConventions.cs
rename to src/Mvc/Mvc.Core/src/DefaultApiConventions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/ApiBehaviorOptionsSetup.cs b/src/Mvc/Mvc.Core/src/DependencyInjection/ApiBehaviorOptionsSetup.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/ApiBehaviorOptionsSetup.cs
rename to src/Mvc/Mvc.Core/src/DependencyInjection/ApiBehaviorOptionsSetup.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/ApplicationModelConventionExtensions.cs b/src/Mvc/Mvc.Core/src/DependencyInjection/ApplicationModelConventionExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/ApplicationModelConventionExtensions.cs
rename to src/Mvc/Mvc.Core/src/DependencyInjection/ApplicationModelConventionExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/IMvcBuilder.cs b/src/Mvc/Mvc.Core/src/DependencyInjection/IMvcBuilder.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/IMvcBuilder.cs
rename to src/Mvc/Mvc.Core/src/DependencyInjection/IMvcBuilder.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/IMvcCoreBuilder.cs b/src/Mvc/Mvc.Core/src/DependencyInjection/IMvcCoreBuilder.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/IMvcCoreBuilder.cs
rename to src/Mvc/Mvc.Core/src/DependencyInjection/IMvcCoreBuilder.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/MvcBuilder.cs b/src/Mvc/Mvc.Core/src/DependencyInjection/MvcBuilder.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/MvcBuilder.cs
rename to src/Mvc/Mvc.Core/src/DependencyInjection/MvcBuilder.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/MvcCoreBuilder.cs b/src/Mvc/Mvc.Core/src/DependencyInjection/MvcCoreBuilder.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/MvcCoreBuilder.cs
rename to src/Mvc/Mvc.Core/src/DependencyInjection/MvcCoreBuilder.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/MvcCoreMvcBuilderExtensions.cs b/src/Mvc/Mvc.Core/src/DependencyInjection/MvcCoreMvcBuilderExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/MvcCoreMvcBuilderExtensions.cs
rename to src/Mvc/Mvc.Core/src/DependencyInjection/MvcCoreMvcBuilderExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/MvcCoreMvcCoreBuilderExtensions.cs b/src/Mvc/Mvc.Core/src/DependencyInjection/MvcCoreMvcCoreBuilderExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/MvcCoreMvcCoreBuilderExtensions.cs
rename to src/Mvc/Mvc.Core/src/DependencyInjection/MvcCoreMvcCoreBuilderExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/MvcCoreRouteOptionsSetup.cs b/src/Mvc/Mvc.Core/src/DependencyInjection/MvcCoreRouteOptionsSetup.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/MvcCoreRouteOptionsSetup.cs
rename to src/Mvc/Mvc.Core/src/DependencyInjection/MvcCoreRouteOptionsSetup.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/MvcCoreServiceCollectionExtensions.cs b/src/Mvc/Mvc.Core/src/DependencyInjection/MvcCoreServiceCollectionExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/MvcCoreServiceCollectionExtensions.cs
rename to src/Mvc/Mvc.Core/src/DependencyInjection/MvcCoreServiceCollectionExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/MvcMarkerService.cs b/src/Mvc/Mvc.Core/src/DependencyInjection/MvcMarkerService.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/MvcMarkerService.cs
rename to src/Mvc/Mvc.Core/src/DependencyInjection/MvcMarkerService.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DisableRequestSizeLimitAttribute.cs b/src/Mvc/Mvc.Core/src/DisableRequestSizeLimitAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DisableRequestSizeLimitAttribute.cs
rename to src/Mvc/Mvc.Core/src/DisableRequestSizeLimitAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/EmptyResult.cs b/src/Mvc/Mvc.Core/src/EmptyResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/EmptyResult.cs
rename to src/Mvc/Mvc.Core/src/EmptyResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/FileContentResult.cs b/src/Mvc/Mvc.Core/src/FileContentResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/FileContentResult.cs
rename to src/Mvc/Mvc.Core/src/FileContentResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/FileResult.cs b/src/Mvc/Mvc.Core/src/FileResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/FileResult.cs
rename to src/Mvc/Mvc.Core/src/FileResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/FileStreamResult.cs b/src/Mvc/Mvc.Core/src/FileStreamResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/FileStreamResult.cs
rename to src/Mvc/Mvc.Core/src/FileStreamResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/ActionFilterAttribute.cs b/src/Mvc/Mvc.Core/src/Filters/ActionFilterAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/ActionFilterAttribute.cs
rename to src/Mvc/Mvc.Core/src/Filters/ActionFilterAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/ControllerActionFilter.cs b/src/Mvc/Mvc.Core/src/Filters/ControllerActionFilter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/ControllerActionFilter.cs
rename to src/Mvc/Mvc.Core/src/Filters/ControllerActionFilter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/ControllerResultFilter.cs b/src/Mvc/Mvc.Core/src/Filters/ControllerResultFilter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/ControllerResultFilter.cs
rename to src/Mvc/Mvc.Core/src/Filters/ControllerResultFilter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/DefaultFilterProvider.cs b/src/Mvc/Mvc.Core/src/Filters/DefaultFilterProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/DefaultFilterProvider.cs
rename to src/Mvc/Mvc.Core/src/Filters/DefaultFilterProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/DisableRequestSizeLimitFilter.cs b/src/Mvc/Mvc.Core/src/Filters/DisableRequestSizeLimitFilter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/DisableRequestSizeLimitFilter.cs
rename to src/Mvc/Mvc.Core/src/Filters/DisableRequestSizeLimitFilter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/ExceptionFilterAttribute.cs b/src/Mvc/Mvc.Core/src/Filters/ExceptionFilterAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/ExceptionFilterAttribute.cs
rename to src/Mvc/Mvc.Core/src/Filters/ExceptionFilterAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/FilterCollection.cs b/src/Mvc/Mvc.Core/src/Filters/FilterCollection.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/FilterCollection.cs
rename to src/Mvc/Mvc.Core/src/Filters/FilterCollection.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/FilterCursor.cs b/src/Mvc/Mvc.Core/src/Filters/FilterCursor.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/FilterCursor.cs
rename to src/Mvc/Mvc.Core/src/Filters/FilterCursor.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/FilterCursorItem.cs b/src/Mvc/Mvc.Core/src/Filters/FilterCursorItem.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/FilterCursorItem.cs
rename to src/Mvc/Mvc.Core/src/Filters/FilterCursorItem.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/FilterDescriptorOrderComparer.cs b/src/Mvc/Mvc.Core/src/Filters/FilterDescriptorOrderComparer.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/FilterDescriptorOrderComparer.cs
rename to src/Mvc/Mvc.Core/src/Filters/FilterDescriptorOrderComparer.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/FilterFactory.cs b/src/Mvc/Mvc.Core/src/Filters/FilterFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/FilterFactory.cs
rename to src/Mvc/Mvc.Core/src/Filters/FilterFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/FilterFactoryResult.cs b/src/Mvc/Mvc.Core/src/Filters/FilterFactoryResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/FilterFactoryResult.cs
rename to src/Mvc/Mvc.Core/src/Filters/FilterFactoryResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/FilterScope.cs b/src/Mvc/Mvc.Core/src/Filters/FilterScope.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/FilterScope.cs
rename to src/Mvc/Mvc.Core/src/Filters/FilterScope.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/IMiddlewareFilterFeature.cs b/src/Mvc/Mvc.Core/src/Filters/IMiddlewareFilterFeature.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/IMiddlewareFilterFeature.cs
rename to src/Mvc/Mvc.Core/src/Filters/IMiddlewareFilterFeature.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/IResponseCacheFilter.cs b/src/Mvc/Mvc.Core/src/Filters/IResponseCacheFilter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/IResponseCacheFilter.cs
rename to src/Mvc/Mvc.Core/src/Filters/IResponseCacheFilter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/MiddlewareFilter.cs b/src/Mvc/Mvc.Core/src/Filters/MiddlewareFilter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/MiddlewareFilter.cs
rename to src/Mvc/Mvc.Core/src/Filters/MiddlewareFilter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/MiddlewareFilterAttribute.cs b/src/Mvc/Mvc.Core/src/Filters/MiddlewareFilterAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/MiddlewareFilterAttribute.cs
rename to src/Mvc/Mvc.Core/src/Filters/MiddlewareFilterAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/MiddlewareFilterBuilder.cs b/src/Mvc/Mvc.Core/src/Filters/MiddlewareFilterBuilder.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/MiddlewareFilterBuilder.cs
rename to src/Mvc/Mvc.Core/src/Filters/MiddlewareFilterBuilder.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/MiddlewareFilterBuilderStartupFilter.cs b/src/Mvc/Mvc.Core/src/Filters/MiddlewareFilterBuilderStartupFilter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/MiddlewareFilterBuilderStartupFilter.cs
rename to src/Mvc/Mvc.Core/src/Filters/MiddlewareFilterBuilderStartupFilter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/MiddlewareFilterConfigurationProvider.cs b/src/Mvc/Mvc.Core/src/Filters/MiddlewareFilterConfigurationProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/MiddlewareFilterConfigurationProvider.cs
rename to src/Mvc/Mvc.Core/src/Filters/MiddlewareFilterConfigurationProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/MiddlewareFilterFeature.cs b/src/Mvc/Mvc.Core/src/Filters/MiddlewareFilterFeature.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/MiddlewareFilterFeature.cs
rename to src/Mvc/Mvc.Core/src/Filters/MiddlewareFilterFeature.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/RequestFormLimitsFilter.cs b/src/Mvc/Mvc.Core/src/Filters/RequestFormLimitsFilter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/RequestFormLimitsFilter.cs
rename to src/Mvc/Mvc.Core/src/Filters/RequestFormLimitsFilter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/RequestSizeLimitFilter.cs b/src/Mvc/Mvc.Core/src/Filters/RequestSizeLimitFilter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/RequestSizeLimitFilter.cs
rename to src/Mvc/Mvc.Core/src/Filters/RequestSizeLimitFilter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/ResponseCacheFilter.cs b/src/Mvc/Mvc.Core/src/Filters/ResponseCacheFilter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/ResponseCacheFilter.cs
rename to src/Mvc/Mvc.Core/src/Filters/ResponseCacheFilter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/ResponseCacheFilterExecutor.cs b/src/Mvc/Mvc.Core/src/Filters/ResponseCacheFilterExecutor.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/ResponseCacheFilterExecutor.cs
rename to src/Mvc/Mvc.Core/src/Filters/ResponseCacheFilterExecutor.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/ResultFilterAttribute.cs b/src/Mvc/Mvc.Core/src/Filters/ResultFilterAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/ResultFilterAttribute.cs
rename to src/Mvc/Mvc.Core/src/Filters/ResultFilterAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ForbidResult.cs b/src/Mvc/Mvc.Core/src/ForbidResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ForbidResult.cs
rename to src/Mvc/Mvc.Core/src/ForbidResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/FormatFilterAttribute.cs b/src/Mvc/Mvc.Core/src/FormatFilterAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/FormatFilterAttribute.cs
rename to src/Mvc/Mvc.Core/src/FormatFilterAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/AcceptHeaderParser.cs b/src/Mvc/Mvc.Core/src/Formatters/AcceptHeaderParser.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/AcceptHeaderParser.cs
rename to src/Mvc/Mvc.Core/src/Formatters/AcceptHeaderParser.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/FormatFilter.cs b/src/Mvc/Mvc.Core/src/Formatters/FormatFilter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/FormatFilter.cs
rename to src/Mvc/Mvc.Core/src/Formatters/FormatFilter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/FormatterMappings.cs b/src/Mvc/Mvc.Core/src/Formatters/FormatterMappings.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/FormatterMappings.cs
rename to src/Mvc/Mvc.Core/src/Formatters/FormatterMappings.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/HttpNoContentOutputFormatter.cs b/src/Mvc/Mvc.Core/src/Formatters/HttpNoContentOutputFormatter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/HttpNoContentOutputFormatter.cs
rename to src/Mvc/Mvc.Core/src/Formatters/HttpNoContentOutputFormatter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/HttpParseResult.cs b/src/Mvc/Mvc.Core/src/Formatters/HttpParseResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/HttpParseResult.cs
rename to src/Mvc/Mvc.Core/src/Formatters/HttpParseResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/HttpTokenParsingRules.cs b/src/Mvc/Mvc.Core/src/Formatters/HttpTokenParsingRules.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/HttpTokenParsingRules.cs
rename to src/Mvc/Mvc.Core/src/Formatters/HttpTokenParsingRules.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/IFormatFilter.cs b/src/Mvc/Mvc.Core/src/Formatters/IFormatFilter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/IFormatFilter.cs
rename to src/Mvc/Mvc.Core/src/Formatters/IFormatFilter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/InputFormatter.cs b/src/Mvc/Mvc.Core/src/Formatters/InputFormatter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/InputFormatter.cs
rename to src/Mvc/Mvc.Core/src/Formatters/InputFormatter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/MediaType.cs b/src/Mvc/Mvc.Core/src/Formatters/MediaType.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/MediaType.cs
rename to src/Mvc/Mvc.Core/src/Formatters/MediaType.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/MediaTypeCollection.cs b/src/Mvc/Mvc.Core/src/Formatters/MediaTypeCollection.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/MediaTypeCollection.cs
rename to src/Mvc/Mvc.Core/src/Formatters/MediaTypeCollection.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/MediaTypeSegmentWithQuality.cs b/src/Mvc/Mvc.Core/src/Formatters/MediaTypeSegmentWithQuality.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/MediaTypeSegmentWithQuality.cs
rename to src/Mvc/Mvc.Core/src/Formatters/MediaTypeSegmentWithQuality.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/OutputFormatter.cs b/src/Mvc/Mvc.Core/src/Formatters/OutputFormatter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/OutputFormatter.cs
rename to src/Mvc/Mvc.Core/src/Formatters/OutputFormatter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/ResponseContentTypeHelper.cs b/src/Mvc/Mvc.Core/src/Formatters/ResponseContentTypeHelper.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/ResponseContentTypeHelper.cs
rename to src/Mvc/Mvc.Core/src/Formatters/ResponseContentTypeHelper.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/StreamOutputFormatter.cs b/src/Mvc/Mvc.Core/src/Formatters/StreamOutputFormatter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/StreamOutputFormatter.cs
rename to src/Mvc/Mvc.Core/src/Formatters/StreamOutputFormatter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/StringOutputFormatter.cs b/src/Mvc/Mvc.Core/src/Formatters/StringOutputFormatter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/StringOutputFormatter.cs
rename to src/Mvc/Mvc.Core/src/Formatters/StringOutputFormatter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/TextInputFormatter.cs b/src/Mvc/Mvc.Core/src/Formatters/TextInputFormatter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/TextInputFormatter.cs
rename to src/Mvc/Mvc.Core/src/Formatters/TextInputFormatter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/TextOutputFormatter.cs b/src/Mvc/Mvc.Core/src/Formatters/TextOutputFormatter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/TextOutputFormatter.cs
rename to src/Mvc/Mvc.Core/src/Formatters/TextOutputFormatter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/FromBodyAttribute.cs b/src/Mvc/Mvc.Core/src/FromBodyAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/FromBodyAttribute.cs
rename to src/Mvc/Mvc.Core/src/FromBodyAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/FromFormAttribute.cs b/src/Mvc/Mvc.Core/src/FromFormAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/FromFormAttribute.cs
rename to src/Mvc/Mvc.Core/src/FromFormAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/FromHeaderAttribute.cs b/src/Mvc/Mvc.Core/src/FromHeaderAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/FromHeaderAttribute.cs
rename to src/Mvc/Mvc.Core/src/FromHeaderAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/FromQueryAttribute.cs b/src/Mvc/Mvc.Core/src/FromQueryAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/FromQueryAttribute.cs
rename to src/Mvc/Mvc.Core/src/FromQueryAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/FromRouteAttribute.cs b/src/Mvc/Mvc.Core/src/FromRouteAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/FromRouteAttribute.cs
rename to src/Mvc/Mvc.Core/src/FromRouteAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/FromServicesAttribute.cs b/src/Mvc/Mvc.Core/src/FromServicesAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/FromServicesAttribute.cs
rename to src/Mvc/Mvc.Core/src/FromServicesAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/HttpDeleteAttribute.cs b/src/Mvc/Mvc.Core/src/HttpDeleteAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/HttpDeleteAttribute.cs
rename to src/Mvc/Mvc.Core/src/HttpDeleteAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/HttpGetAttribute.cs b/src/Mvc/Mvc.Core/src/HttpGetAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/HttpGetAttribute.cs
rename to src/Mvc/Mvc.Core/src/HttpGetAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/HttpHeadAttribute.cs b/src/Mvc/Mvc.Core/src/HttpHeadAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/HttpHeadAttribute.cs
rename to src/Mvc/Mvc.Core/src/HttpHeadAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/HttpOptionsAttribute.cs b/src/Mvc/Mvc.Core/src/HttpOptionsAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/HttpOptionsAttribute.cs
rename to src/Mvc/Mvc.Core/src/HttpOptionsAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/HttpPatchAttribute.cs b/src/Mvc/Mvc.Core/src/HttpPatchAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/HttpPatchAttribute.cs
rename to src/Mvc/Mvc.Core/src/HttpPatchAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/HttpPostAttribute.cs b/src/Mvc/Mvc.Core/src/HttpPostAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/HttpPostAttribute.cs
rename to src/Mvc/Mvc.Core/src/HttpPostAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/HttpPutAttribute.cs b/src/Mvc/Mvc.Core/src/HttpPutAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/HttpPutAttribute.cs
rename to src/Mvc/Mvc.Core/src/HttpPutAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/IApiBehaviorMetadata.cs b/src/Mvc/Mvc.Core/src/IApiBehaviorMetadata.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/IApiBehaviorMetadata.cs
rename to src/Mvc/Mvc.Core/src/IApiBehaviorMetadata.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/IDesignTimeMvcBuilderConfiguration.cs b/src/Mvc/Mvc.Core/src/IDesignTimeMvcBuilderConfiguration.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/IDesignTimeMvcBuilderConfiguration.cs
rename to src/Mvc/Mvc.Core/src/IDesignTimeMvcBuilderConfiguration.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/IRequestFormLimitsPolicy.cs b/src/Mvc/Mvc.Core/src/IRequestFormLimitsPolicy.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/IRequestFormLimitsPolicy.cs
rename to src/Mvc/Mvc.Core/src/IRequestFormLimitsPolicy.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/IRequestSizePolicy.cs b/src/Mvc/Mvc.Core/src/IRequestSizePolicy.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/IRequestSizePolicy.cs
rename to src/Mvc/Mvc.Core/src/IRequestSizePolicy.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ActionContextAccessor.cs b/src/Mvc/Mvc.Core/src/Infrastructure/ActionContextAccessor.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ActionContextAccessor.cs
rename to src/Mvc/Mvc.Core/src/Infrastructure/ActionContextAccessor.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ActionDescriptorCollection.cs b/src/Mvc/Mvc.Core/src/Infrastructure/ActionDescriptorCollection.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ActionDescriptorCollection.cs
rename to src/Mvc/Mvc.Core/src/Infrastructure/ActionDescriptorCollection.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ActionDescriptorCollectionProvider.cs b/src/Mvc/Mvc.Core/src/Infrastructure/ActionDescriptorCollectionProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ActionDescriptorCollectionProvider.cs
rename to src/Mvc/Mvc.Core/src/Infrastructure/ActionDescriptorCollectionProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ActionInvokerFactory.cs b/src/Mvc/Mvc.Core/src/Infrastructure/ActionInvokerFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ActionInvokerFactory.cs
rename to src/Mvc/Mvc.Core/src/Infrastructure/ActionInvokerFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ActionMethodExecutor.cs b/src/Mvc/Mvc.Core/src/Infrastructure/ActionMethodExecutor.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ActionMethodExecutor.cs
rename to src/Mvc/Mvc.Core/src/Infrastructure/ActionMethodExecutor.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ActionResultObjectValueAttribute.cs b/src/Mvc/Mvc.Core/src/Infrastructure/ActionResultObjectValueAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ActionResultObjectValueAttribute.cs
rename to src/Mvc/Mvc.Core/src/Infrastructure/ActionResultObjectValueAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ActionResultStatusCodeAttribute.cs b/src/Mvc/Mvc.Core/src/Infrastructure/ActionResultStatusCodeAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ActionResultStatusCodeAttribute.cs
rename to src/Mvc/Mvc.Core/src/Infrastructure/ActionResultStatusCodeAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ActionResultTypeMapper.cs b/src/Mvc/Mvc.Core/src/Infrastructure/ActionResultTypeMapper.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ActionResultTypeMapper.cs
rename to src/Mvc/Mvc.Core/src/Infrastructure/ActionResultTypeMapper.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ActionSelector.cs b/src/Mvc/Mvc.Core/src/Infrastructure/ActionSelector.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ActionSelector.cs
rename to src/Mvc/Mvc.Core/src/Infrastructure/ActionSelector.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/AmbiguousActionException.cs b/src/Mvc/Mvc.Core/src/Infrastructure/AmbiguousActionException.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/AmbiguousActionException.cs
rename to src/Mvc/Mvc.Core/src/Infrastructure/AmbiguousActionException.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ClientErrorResultFilter.cs b/src/Mvc/Mvc.Core/src/Infrastructure/ClientErrorResultFilter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ClientErrorResultFilter.cs
rename to src/Mvc/Mvc.Core/src/Infrastructure/ClientErrorResultFilter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ClientErrorResultFilterFactory.cs b/src/Mvc/Mvc.Core/src/Infrastructure/ClientErrorResultFilterFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ClientErrorResultFilterFactory.cs
rename to src/Mvc/Mvc.Core/src/Infrastructure/ClientErrorResultFilterFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/CompatibilitySwitch.cs b/src/Mvc/Mvc.Core/src/Infrastructure/CompatibilitySwitch.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/CompatibilitySwitch.cs
rename to src/Mvc/Mvc.Core/src/Infrastructure/CompatibilitySwitch.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ConfigureCompatibilityOptions.cs b/src/Mvc/Mvc.Core/src/Infrastructure/ConfigureCompatibilityOptions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ConfigureCompatibilityOptions.cs
rename to src/Mvc/Mvc.Core/src/Infrastructure/ConfigureCompatibilityOptions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ContentResultExecutor.cs b/src/Mvc/Mvc.Core/src/Infrastructure/ContentResultExecutor.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ContentResultExecutor.cs
rename to src/Mvc/Mvc.Core/src/Infrastructure/ContentResultExecutor.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ControllerActionInvoker.cs b/src/Mvc/Mvc.Core/src/Infrastructure/ControllerActionInvoker.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ControllerActionInvoker.cs
rename to src/Mvc/Mvc.Core/src/Infrastructure/ControllerActionInvoker.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ControllerActionInvokerCache.cs b/src/Mvc/Mvc.Core/src/Infrastructure/ControllerActionInvokerCache.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ControllerActionInvokerCache.cs
rename to src/Mvc/Mvc.Core/src/Infrastructure/ControllerActionInvokerCache.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ControllerActionInvokerCacheEntry.cs b/src/Mvc/Mvc.Core/src/Infrastructure/ControllerActionInvokerCacheEntry.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ControllerActionInvokerCacheEntry.cs
rename to src/Mvc/Mvc.Core/src/Infrastructure/ControllerActionInvokerCacheEntry.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ControllerActionInvokerProvider.cs b/src/Mvc/Mvc.Core/src/Infrastructure/ControllerActionInvokerProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ControllerActionInvokerProvider.cs
rename to src/Mvc/Mvc.Core/src/Infrastructure/ControllerActionInvokerProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/CopyOnWriteList.cs b/src/Mvc/Mvc.Core/src/Infrastructure/CopyOnWriteList.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/CopyOnWriteList.cs
rename to src/Mvc/Mvc.Core/src/Infrastructure/CopyOnWriteList.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/DefaultActionDescriptorCollectionProvider.cs b/src/Mvc/Mvc.Core/src/Infrastructure/DefaultActionDescriptorCollectionProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/DefaultActionDescriptorCollectionProvider.cs
rename to src/Mvc/Mvc.Core/src/Infrastructure/DefaultActionDescriptorCollectionProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/DefaultOutputFormatterSelector.cs b/src/Mvc/Mvc.Core/src/Infrastructure/DefaultOutputFormatterSelector.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/DefaultOutputFormatterSelector.cs
rename to src/Mvc/Mvc.Core/src/Infrastructure/DefaultOutputFormatterSelector.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/DefaultStatusCodeAttribute.cs b/src/Mvc/Mvc.Core/src/Infrastructure/DefaultStatusCodeAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/DefaultStatusCodeAttribute.cs
rename to src/Mvc/Mvc.Core/src/Infrastructure/DefaultStatusCodeAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/FileContentResultExecutor.cs b/src/Mvc/Mvc.Core/src/Infrastructure/FileContentResultExecutor.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/FileContentResultExecutor.cs
rename to src/Mvc/Mvc.Core/src/Infrastructure/FileContentResultExecutor.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/FileResultExecutorBase.cs b/src/Mvc/Mvc.Core/src/Infrastructure/FileResultExecutorBase.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/FileResultExecutorBase.cs
rename to src/Mvc/Mvc.Core/src/Infrastructure/FileResultExecutorBase.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/FileStreamResultExecutor.cs b/src/Mvc/Mvc.Core/src/Infrastructure/FileStreamResultExecutor.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/FileStreamResultExecutor.cs
rename to src/Mvc/Mvc.Core/src/Infrastructure/FileStreamResultExecutor.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IActionContextAccessor.cs b/src/Mvc/Mvc.Core/src/Infrastructure/IActionContextAccessor.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IActionContextAccessor.cs
rename to src/Mvc/Mvc.Core/src/Infrastructure/IActionContextAccessor.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IActionDescriptorChangeProvider.cs b/src/Mvc/Mvc.Core/src/Infrastructure/IActionDescriptorChangeProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IActionDescriptorChangeProvider.cs
rename to src/Mvc/Mvc.Core/src/Infrastructure/IActionDescriptorChangeProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IActionDescriptorCollectionProvider.cs b/src/Mvc/Mvc.Core/src/Infrastructure/IActionDescriptorCollectionProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IActionDescriptorCollectionProvider.cs
rename to src/Mvc/Mvc.Core/src/Infrastructure/IActionDescriptorCollectionProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IActionInvokerFactory.cs b/src/Mvc/Mvc.Core/src/Infrastructure/IActionInvokerFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IActionInvokerFactory.cs
rename to src/Mvc/Mvc.Core/src/Infrastructure/IActionInvokerFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IActionResultExecutor.cs b/src/Mvc/Mvc.Core/src/Infrastructure/IActionResultExecutor.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IActionResultExecutor.cs
rename to src/Mvc/Mvc.Core/src/Infrastructure/IActionResultExecutor.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IActionResultTypeMapper.cs b/src/Mvc/Mvc.Core/src/Infrastructure/IActionResultTypeMapper.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IActionResultTypeMapper.cs
rename to src/Mvc/Mvc.Core/src/Infrastructure/IActionResultTypeMapper.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IActionSelector.cs b/src/Mvc/Mvc.Core/src/Infrastructure/IActionSelector.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IActionSelector.cs
rename to src/Mvc/Mvc.Core/src/Infrastructure/IActionSelector.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IAntiforgeryValidationFailedResult.cs b/src/Mvc/Mvc.Core/src/Infrastructure/IAntiforgeryValidationFailedResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IAntiforgeryValidationFailedResult.cs
rename to src/Mvc/Mvc.Core/src/Infrastructure/IAntiforgeryValidationFailedResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IClientErrorActionResult.cs b/src/Mvc/Mvc.Core/src/Infrastructure/IClientErrorActionResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IClientErrorActionResult.cs
rename to src/Mvc/Mvc.Core/src/Infrastructure/IClientErrorActionResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IClientErrorFactory.cs b/src/Mvc/Mvc.Core/src/Infrastructure/IClientErrorFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IClientErrorFactory.cs
rename to src/Mvc/Mvc.Core/src/Infrastructure/IClientErrorFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ICompatibilitySwitch.cs b/src/Mvc/Mvc.Core/src/Infrastructure/ICompatibilitySwitch.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ICompatibilitySwitch.cs
rename to src/Mvc/Mvc.Core/src/Infrastructure/ICompatibilitySwitch.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IConvertToActionResult.cs b/src/Mvc/Mvc.Core/src/Infrastructure/IConvertToActionResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IConvertToActionResult.cs
rename to src/Mvc/Mvc.Core/src/Infrastructure/IConvertToActionResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IHttpRequestStreamReaderFactory.cs b/src/Mvc/Mvc.Core/src/Infrastructure/IHttpRequestStreamReaderFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IHttpRequestStreamReaderFactory.cs
rename to src/Mvc/Mvc.Core/src/Infrastructure/IHttpRequestStreamReaderFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IHttpResponseStreamWriterFactory.cs b/src/Mvc/Mvc.Core/src/Infrastructure/IHttpResponseStreamWriterFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IHttpResponseStreamWriterFactory.cs
rename to src/Mvc/Mvc.Core/src/Infrastructure/IHttpResponseStreamWriterFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IParameterInfoParameterDescriptor.cs b/src/Mvc/Mvc.Core/src/Infrastructure/IParameterInfoParameterDescriptor.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IParameterInfoParameterDescriptor.cs
rename to src/Mvc/Mvc.Core/src/Infrastructure/IParameterInfoParameterDescriptor.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IPropertyInfoParameterDescriptor.cs b/src/Mvc/Mvc.Core/src/Infrastructure/IPropertyInfoParameterDescriptor.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IPropertyInfoParameterDescriptor.cs
rename to src/Mvc/Mvc.Core/src/Infrastructure/IPropertyInfoParameterDescriptor.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IStatusCodeActionResult.cs b/src/Mvc/Mvc.Core/src/Infrastructure/IStatusCodeActionResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IStatusCodeActionResult.cs
rename to src/Mvc/Mvc.Core/src/Infrastructure/IStatusCodeActionResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ITypeActivatorCache.cs b/src/Mvc/Mvc.Core/src/Infrastructure/ITypeActivatorCache.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ITypeActivatorCache.cs
rename to src/Mvc/Mvc.Core/src/Infrastructure/ITypeActivatorCache.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/LocalRedirectResultExecutor.cs b/src/Mvc/Mvc.Core/src/Infrastructure/LocalRedirectResultExecutor.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/LocalRedirectResultExecutor.cs
rename to src/Mvc/Mvc.Core/src/Infrastructure/LocalRedirectResultExecutor.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/MemoryPoolHttpRequestStreamReaderFactory.cs b/src/Mvc/Mvc.Core/src/Infrastructure/MemoryPoolHttpRequestStreamReaderFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/MemoryPoolHttpRequestStreamReaderFactory.cs
rename to src/Mvc/Mvc.Core/src/Infrastructure/MemoryPoolHttpRequestStreamReaderFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/MemoryPoolHttpResponseStreamWriterFactory.cs b/src/Mvc/Mvc.Core/src/Infrastructure/MemoryPoolHttpResponseStreamWriterFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/MemoryPoolHttpResponseStreamWriterFactory.cs
rename to src/Mvc/Mvc.Core/src/Infrastructure/MemoryPoolHttpResponseStreamWriterFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ModelStateInvalidFilter.cs b/src/Mvc/Mvc.Core/src/Infrastructure/ModelStateInvalidFilter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ModelStateInvalidFilter.cs
rename to src/Mvc/Mvc.Core/src/Infrastructure/ModelStateInvalidFilter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ModelStateInvalidFilterFactory.cs b/src/Mvc/Mvc.Core/src/Infrastructure/ModelStateInvalidFilterFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ModelStateInvalidFilterFactory.cs
rename to src/Mvc/Mvc.Core/src/Infrastructure/ModelStateInvalidFilterFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/MvcCompatibilityOptions.cs b/src/Mvc/Mvc.Core/src/Infrastructure/MvcCompatibilityOptions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/MvcCompatibilityOptions.cs
rename to src/Mvc/Mvc.Core/src/Infrastructure/MvcCompatibilityOptions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/MvcCoreMvcOptionsSetup.cs b/src/Mvc/Mvc.Core/src/Infrastructure/MvcCoreMvcOptionsSetup.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/MvcCoreMvcOptionsSetup.cs
rename to src/Mvc/Mvc.Core/src/Infrastructure/MvcCoreMvcOptionsSetup.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/MvcOptionsConfigureCompatibilityOptions.cs b/src/Mvc/Mvc.Core/src/Infrastructure/MvcOptionsConfigureCompatibilityOptions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/MvcOptionsConfigureCompatibilityOptions.cs
rename to src/Mvc/Mvc.Core/src/Infrastructure/MvcOptionsConfigureCompatibilityOptions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/NonDisposableStream.cs b/src/Mvc/Mvc.Core/src/Infrastructure/NonDisposableStream.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/NonDisposableStream.cs
rename to src/Mvc/Mvc.Core/src/Infrastructure/NonDisposableStream.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/NullableCompatibilitySwitch.cs b/src/Mvc/Mvc.Core/src/Infrastructure/NullableCompatibilitySwitch.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/NullableCompatibilitySwitch.cs
rename to src/Mvc/Mvc.Core/src/Infrastructure/NullableCompatibilitySwitch.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ObjectResultExecutor.cs b/src/Mvc/Mvc.Core/src/Infrastructure/ObjectResultExecutor.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ObjectResultExecutor.cs
rename to src/Mvc/Mvc.Core/src/Infrastructure/ObjectResultExecutor.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/OutputFormatterSelector.cs b/src/Mvc/Mvc.Core/src/Infrastructure/OutputFormatterSelector.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/OutputFormatterSelector.cs
rename to src/Mvc/Mvc.Core/src/Infrastructure/OutputFormatterSelector.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ParameterDefaultValues.cs b/src/Mvc/Mvc.Core/src/Infrastructure/ParameterDefaultValues.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ParameterDefaultValues.cs
rename to src/Mvc/Mvc.Core/src/Infrastructure/ParameterDefaultValues.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/PhysicalFileResultExecutor.cs b/src/Mvc/Mvc.Core/src/Infrastructure/PhysicalFileResultExecutor.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/PhysicalFileResultExecutor.cs
rename to src/Mvc/Mvc.Core/src/Infrastructure/PhysicalFileResultExecutor.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ProblemDetailsClientErrorFactory.cs b/src/Mvc/Mvc.Core/src/Infrastructure/ProblemDetailsClientErrorFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ProblemDetailsClientErrorFactory.cs
rename to src/Mvc/Mvc.Core/src/Infrastructure/ProblemDetailsClientErrorFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/RedirectResultExecutor.cs b/src/Mvc/Mvc.Core/src/Infrastructure/RedirectResultExecutor.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/RedirectResultExecutor.cs
rename to src/Mvc/Mvc.Core/src/Infrastructure/RedirectResultExecutor.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/RedirectToActionResultExecutor.cs b/src/Mvc/Mvc.Core/src/Infrastructure/RedirectToActionResultExecutor.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/RedirectToActionResultExecutor.cs
rename to src/Mvc/Mvc.Core/src/Infrastructure/RedirectToActionResultExecutor.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/RedirectToPageResultExecutor.cs b/src/Mvc/Mvc.Core/src/Infrastructure/RedirectToPageResultExecutor.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/RedirectToPageResultExecutor.cs
rename to src/Mvc/Mvc.Core/src/Infrastructure/RedirectToPageResultExecutor.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/RedirectToRouteResultExecutor.cs b/src/Mvc/Mvc.Core/src/Infrastructure/RedirectToRouteResultExecutor.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/RedirectToRouteResultExecutor.cs
rename to src/Mvc/Mvc.Core/src/Infrastructure/RedirectToRouteResultExecutor.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ResourceInvoker.cs b/src/Mvc/Mvc.Core/src/Infrastructure/ResourceInvoker.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ResourceInvoker.cs
rename to src/Mvc/Mvc.Core/src/Infrastructure/ResourceInvoker.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/TypeActivatorCache.cs b/src/Mvc/Mvc.Core/src/Infrastructure/TypeActivatorCache.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/TypeActivatorCache.cs
rename to src/Mvc/Mvc.Core/src/Infrastructure/TypeActivatorCache.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/VirtualFileResultExecutor.cs b/src/Mvc/Mvc.Core/src/Infrastructure/VirtualFileResultExecutor.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/VirtualFileResultExecutor.cs
rename to src/Mvc/Mvc.Core/src/Infrastructure/VirtualFileResultExecutor.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/JsonResult.cs b/src/Mvc/Mvc.Core/src/JsonResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/JsonResult.cs
rename to src/Mvc/Mvc.Core/src/JsonResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/LocalRedirectResult.cs b/src/Mvc/Mvc.Core/src/LocalRedirectResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/LocalRedirectResult.cs
rename to src/Mvc/Mvc.Core/src/LocalRedirectResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Microsoft.AspNetCore.Mvc.Core.csproj b/src/Mvc/Mvc.Core/src/Microsoft.AspNetCore.Mvc.Core.csproj
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Microsoft.AspNetCore.Mvc.Core.csproj
rename to src/Mvc/Mvc.Core/src/Microsoft.AspNetCore.Mvc.Core.csproj
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinderAttribute.cs b/src/Mvc/Mvc.Core/src/ModelBinderAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinderAttribute.cs
rename to src/Mvc/Mvc.Core/src/ModelBinderAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/BindNeverAttribute.cs b/src/Mvc/Mvc.Core/src/ModelBinding/BindNeverAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/BindNeverAttribute.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/BindNeverAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/BindRequiredAttribute.cs b/src/Mvc/Mvc.Core/src/ModelBinding/BindRequiredAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/BindRequiredAttribute.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/BindRequiredAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ArrayModelBinder.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Binders/ArrayModelBinder.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ArrayModelBinder.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Binders/ArrayModelBinder.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ArrayModelBinderProvider.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Binders/ArrayModelBinderProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ArrayModelBinderProvider.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Binders/ArrayModelBinderProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/BinderTypeModelBinder.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Binders/BinderTypeModelBinder.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/BinderTypeModelBinder.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Binders/BinderTypeModelBinder.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/BinderTypeModelBinderProvider.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Binders/BinderTypeModelBinderProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/BinderTypeModelBinderProvider.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Binders/BinderTypeModelBinderProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/BodyModelBinder.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Binders/BodyModelBinder.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/BodyModelBinder.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Binders/BodyModelBinder.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/BodyModelBinderProvider.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Binders/BodyModelBinderProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/BodyModelBinderProvider.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Binders/BodyModelBinderProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ByteArrayModelBinder.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Binders/ByteArrayModelBinder.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ByteArrayModelBinder.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Binders/ByteArrayModelBinder.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ByteArrayModelBinderProvider.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Binders/ByteArrayModelBinderProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ByteArrayModelBinderProvider.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Binders/ByteArrayModelBinderProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/CancellationTokenModelBinder.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Binders/CancellationTokenModelBinder.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/CancellationTokenModelBinder.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Binders/CancellationTokenModelBinder.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/CancellationTokenModelBinderProvider.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Binders/CancellationTokenModelBinderProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/CancellationTokenModelBinderProvider.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Binders/CancellationTokenModelBinderProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/CollectionModelBinder.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Binders/CollectionModelBinder.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/CollectionModelBinder.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Binders/CollectionModelBinder.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/CollectionModelBinderProvider.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Binders/CollectionModelBinderProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/CollectionModelBinderProvider.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Binders/CollectionModelBinderProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ComplexTypeModelBinder.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Binders/ComplexTypeModelBinder.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ComplexTypeModelBinder.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Binders/ComplexTypeModelBinder.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ComplexTypeModelBinderProvider.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Binders/ComplexTypeModelBinderProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ComplexTypeModelBinderProvider.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Binders/ComplexTypeModelBinderProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/DecimalModelBinder.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Binders/DecimalModelBinder.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/DecimalModelBinder.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Binders/DecimalModelBinder.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/DictionaryModelBinder.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Binders/DictionaryModelBinder.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/DictionaryModelBinder.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Binders/DictionaryModelBinder.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/DictionaryModelBinderProvider.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Binders/DictionaryModelBinderProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/DictionaryModelBinderProvider.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Binders/DictionaryModelBinderProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/DoubleModelBinder.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Binders/DoubleModelBinder.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/DoubleModelBinder.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Binders/DoubleModelBinder.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/EnumTypeModelBinder.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Binders/EnumTypeModelBinder.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/EnumTypeModelBinder.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Binders/EnumTypeModelBinder.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/EnumTypeModelBinderProvider.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Binders/EnumTypeModelBinderProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/EnumTypeModelBinderProvider.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Binders/EnumTypeModelBinderProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/FloatModelBinder.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Binders/FloatModelBinder.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/FloatModelBinder.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Binders/FloatModelBinder.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/FloatingPointTypeModelBinderProvider.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Binders/FloatingPointTypeModelBinderProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/FloatingPointTypeModelBinderProvider.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Binders/FloatingPointTypeModelBinderProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/FormCollectionModelBinder.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Binders/FormCollectionModelBinder.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/FormCollectionModelBinder.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Binders/FormCollectionModelBinder.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/FormCollectionModelBinderProvider.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Binders/FormCollectionModelBinderProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/FormCollectionModelBinderProvider.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Binders/FormCollectionModelBinderProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/FormFileModelBinder.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Binders/FormFileModelBinder.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/FormFileModelBinder.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Binders/FormFileModelBinder.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/FormFileModelBinderProvider.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Binders/FormFileModelBinderProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/FormFileModelBinderProvider.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Binders/FormFileModelBinderProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/HeaderModelBinder.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Binders/HeaderModelBinder.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/HeaderModelBinder.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Binders/HeaderModelBinder.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/HeaderModelBinderProvider.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Binders/HeaderModelBinderProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/HeaderModelBinderProvider.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Binders/HeaderModelBinderProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/KeyValuePairModelBinder.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Binders/KeyValuePairModelBinder.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/KeyValuePairModelBinder.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Binders/KeyValuePairModelBinder.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/KeyValuePairModelBinderProvider.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Binders/KeyValuePairModelBinderProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/KeyValuePairModelBinderProvider.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Binders/KeyValuePairModelBinderProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ServicesModelBinder.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Binders/ServicesModelBinder.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ServicesModelBinder.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Binders/ServicesModelBinder.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ServicesModelBinderProvider.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Binders/ServicesModelBinderProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ServicesModelBinderProvider.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Binders/ServicesModelBinderProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/SimpleTypeModelBinder.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Binders/SimpleTypeModelBinder.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/SimpleTypeModelBinder.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Binders/SimpleTypeModelBinder.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/SimpleTypeModelBinderProvider.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Binders/SimpleTypeModelBinderProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/SimpleTypeModelBinderProvider.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Binders/SimpleTypeModelBinderProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/BindingBehavior.cs b/src/Mvc/Mvc.Core/src/ModelBinding/BindingBehavior.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/BindingBehavior.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/BindingBehavior.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/BindingBehaviorAttribute.cs b/src/Mvc/Mvc.Core/src/ModelBinding/BindingBehaviorAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/BindingBehaviorAttribute.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/BindingBehaviorAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/BindingSourceValueProvider.cs b/src/Mvc/Mvc.Core/src/ModelBinding/BindingSourceValueProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/BindingSourceValueProvider.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/BindingSourceValueProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/CompositeValueProvider.cs b/src/Mvc/Mvc.Core/src/ModelBinding/CompositeValueProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/CompositeValueProvider.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/CompositeValueProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/DefaultModelBindingContext.cs b/src/Mvc/Mvc.Core/src/ModelBinding/DefaultModelBindingContext.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/DefaultModelBindingContext.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/DefaultModelBindingContext.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/DefaultPropertyFilterProvider.cs b/src/Mvc/Mvc.Core/src/ModelBinding/DefaultPropertyFilterProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/DefaultPropertyFilterProvider.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/DefaultPropertyFilterProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ElementalValueProvider.cs b/src/Mvc/Mvc.Core/src/ModelBinding/ElementalValueProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ElementalValueProvider.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/ElementalValueProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/EmptyModelMetadataProvider.cs b/src/Mvc/Mvc.Core/src/ModelBinding/EmptyModelMetadataProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/EmptyModelMetadataProvider.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/EmptyModelMetadataProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/FormValueProvider.cs b/src/Mvc/Mvc.Core/src/ModelBinding/FormValueProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/FormValueProvider.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/FormValueProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/FormValueProviderFactory.cs b/src/Mvc/Mvc.Core/src/ModelBinding/FormValueProviderFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/FormValueProviderFactory.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/FormValueProviderFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/IBindingSourceValueProvider.cs b/src/Mvc/Mvc.Core/src/ModelBinding/IBindingSourceValueProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/IBindingSourceValueProvider.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/IBindingSourceValueProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ICollectionModelBinder.cs b/src/Mvc/Mvc.Core/src/ModelBinding/ICollectionModelBinder.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ICollectionModelBinder.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/ICollectionModelBinder.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/IEnumerableValueProvider.cs b/src/Mvc/Mvc.Core/src/ModelBinding/IEnumerableValueProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/IEnumerableValueProvider.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/IEnumerableValueProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/IKeyRewriterValueProvider.cs b/src/Mvc/Mvc.Core/src/ModelBinding/IKeyRewriterValueProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/IKeyRewriterValueProvider.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/IKeyRewriterValueProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/IModelBinderFactory.cs b/src/Mvc/Mvc.Core/src/ModelBinding/IModelBinderFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/IModelBinderFactory.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/IModelBinderFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/JQueryFormValueProvider.cs b/src/Mvc/Mvc.Core/src/ModelBinding/JQueryFormValueProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/JQueryFormValueProvider.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/JQueryFormValueProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/JQueryFormValueProviderFactory.cs b/src/Mvc/Mvc.Core/src/ModelBinding/JQueryFormValueProviderFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/JQueryFormValueProviderFactory.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/JQueryFormValueProviderFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/JQueryKeyValuePairNormalizer.cs b/src/Mvc/Mvc.Core/src/ModelBinding/JQueryKeyValuePairNormalizer.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/JQueryKeyValuePairNormalizer.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/JQueryKeyValuePairNormalizer.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/JQueryQueryStringValueProvider.cs b/src/Mvc/Mvc.Core/src/ModelBinding/JQueryQueryStringValueProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/JQueryQueryStringValueProvider.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/JQueryQueryStringValueProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/JQueryQueryStringValueProviderFactory.cs b/src/Mvc/Mvc.Core/src/ModelBinding/JQueryQueryStringValueProviderFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/JQueryQueryStringValueProviderFactory.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/JQueryQueryStringValueProviderFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/JQueryValueProvider.cs b/src/Mvc/Mvc.Core/src/ModelBinding/JQueryValueProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/JQueryValueProvider.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/JQueryValueProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/BindingMetadata.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Metadata/BindingMetadata.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/BindingMetadata.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Metadata/BindingMetadata.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/BindingMetadataProviderContext.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Metadata/BindingMetadataProviderContext.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/BindingMetadataProviderContext.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Metadata/BindingMetadataProviderContext.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/BindingSourceMetadataProvider.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Metadata/BindingSourceMetadataProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/BindingSourceMetadataProvider.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Metadata/BindingSourceMetadataProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DefaultBindingMetadataProvider.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Metadata/DefaultBindingMetadataProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DefaultBindingMetadataProvider.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Metadata/DefaultBindingMetadataProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DefaultCompositeMetadataDetailsProvider.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Metadata/DefaultCompositeMetadataDetailsProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DefaultCompositeMetadataDetailsProvider.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Metadata/DefaultCompositeMetadataDetailsProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DefaultMetadataDetails.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Metadata/DefaultMetadataDetails.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DefaultMetadataDetails.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Metadata/DefaultMetadataDetails.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DefaultModelBindingMessageProvider.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Metadata/DefaultModelBindingMessageProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DefaultModelBindingMessageProvider.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Metadata/DefaultModelBindingMessageProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DefaultModelMetadata.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Metadata/DefaultModelMetadata.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DefaultModelMetadata.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Metadata/DefaultModelMetadata.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DefaultModelMetadataProvider.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Metadata/DefaultModelMetadataProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DefaultModelMetadataProvider.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Metadata/DefaultModelMetadataProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DefaultValidationMetadataProvider.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Metadata/DefaultValidationMetadataProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DefaultValidationMetadataProvider.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Metadata/DefaultValidationMetadataProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DisplayMetadata.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Metadata/DisplayMetadata.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DisplayMetadata.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Metadata/DisplayMetadata.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DisplayMetadataProviderContext.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Metadata/DisplayMetadataProviderContext.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DisplayMetadataProviderContext.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Metadata/DisplayMetadataProviderContext.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/ExcludeBindingMetadataProvider.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Metadata/ExcludeBindingMetadataProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/ExcludeBindingMetadataProvider.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Metadata/ExcludeBindingMetadataProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/HasValidatorsValidationMetadataProvider.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Metadata/HasValidatorsValidationMetadataProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/HasValidatorsValidationMetadataProvider.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Metadata/HasValidatorsValidationMetadataProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/IBindingMetadataProvider.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Metadata/IBindingMetadataProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/IBindingMetadataProvider.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Metadata/IBindingMetadataProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/ICompositeMetadataDetailsProvider.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Metadata/ICompositeMetadataDetailsProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/ICompositeMetadataDetailsProvider.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Metadata/ICompositeMetadataDetailsProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/IDisplayMetadataProvider.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Metadata/IDisplayMetadataProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/IDisplayMetadataProvider.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Metadata/IDisplayMetadataProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/IMetadataDetailsProvider.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Metadata/IMetadataDetailsProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/IMetadataDetailsProvider.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Metadata/IMetadataDetailsProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/IValidationMetadataProvider.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Metadata/IValidationMetadataProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/IValidationMetadataProvider.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Metadata/IValidationMetadataProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/MetadataDetailsProviderExtensions.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Metadata/MetadataDetailsProviderExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/MetadataDetailsProviderExtensions.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Metadata/MetadataDetailsProviderExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/ModelAttributes.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Metadata/ModelAttributes.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/ModelAttributes.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Metadata/ModelAttributes.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/ValidationMetadata.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Metadata/ValidationMetadata.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/ValidationMetadata.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Metadata/ValidationMetadata.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/ValidationMetadataProviderContext.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Metadata/ValidationMetadataProviderContext.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/ValidationMetadataProviderContext.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Metadata/ValidationMetadataProviderContext.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ModelBinderFactory.cs b/src/Mvc/Mvc.Core/src/ModelBinding/ModelBinderFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ModelBinderFactory.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/ModelBinderFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ModelBinderFactoryContext.cs b/src/Mvc/Mvc.Core/src/ModelBinding/ModelBinderFactoryContext.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ModelBinderFactoryContext.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/ModelBinderFactoryContext.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ModelBinderProviderExtensions.cs b/src/Mvc/Mvc.Core/src/ModelBinding/ModelBinderProviderExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ModelBinderProviderExtensions.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/ModelBinderProviderExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ModelBindingHelper.cs b/src/Mvc/Mvc.Core/src/ModelBinding/ModelBindingHelper.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ModelBindingHelper.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/ModelBindingHelper.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ModelMetadataProviderExtensions.cs b/src/Mvc/Mvc.Core/src/ModelBinding/ModelMetadataProviderExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ModelMetadataProviderExtensions.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/ModelMetadataProviderExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ModelNames.cs b/src/Mvc/Mvc.Core/src/ModelBinding/ModelNames.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ModelNames.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/ModelNames.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/NoOpBinder.cs b/src/Mvc/Mvc.Core/src/ModelBinding/NoOpBinder.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/NoOpBinder.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/NoOpBinder.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ObjectModelValidator.cs b/src/Mvc/Mvc.Core/src/ModelBinding/ObjectModelValidator.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ObjectModelValidator.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/ObjectModelValidator.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ParameterBinder.cs b/src/Mvc/Mvc.Core/src/ModelBinding/ParameterBinder.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ParameterBinder.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/ParameterBinder.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/PlaceholderBinder.cs b/src/Mvc/Mvc.Core/src/ModelBinding/PlaceholderBinder.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/PlaceholderBinder.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/PlaceholderBinder.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/PrefixContainer.cs b/src/Mvc/Mvc.Core/src/ModelBinding/PrefixContainer.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/PrefixContainer.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/PrefixContainer.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/PropertyValueSetter.cs b/src/Mvc/Mvc.Core/src/ModelBinding/PropertyValueSetter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/PropertyValueSetter.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/PropertyValueSetter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/QueryStringValueProvider.cs b/src/Mvc/Mvc.Core/src/ModelBinding/QueryStringValueProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/QueryStringValueProvider.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/QueryStringValueProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/QueryStringValueProviderFactory.cs b/src/Mvc/Mvc.Core/src/ModelBinding/QueryStringValueProviderFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/QueryStringValueProviderFactory.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/QueryStringValueProviderFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ReferenceEqualityComparer.cs b/src/Mvc/Mvc.Core/src/ModelBinding/ReferenceEqualityComparer.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ReferenceEqualityComparer.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/ReferenceEqualityComparer.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/RouteValueProvider.cs b/src/Mvc/Mvc.Core/src/ModelBinding/RouteValueProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/RouteValueProvider.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/RouteValueProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/RouteValueProviderFactory.cs b/src/Mvc/Mvc.Core/src/ModelBinding/RouteValueProviderFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/RouteValueProviderFactory.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/RouteValueProviderFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/SuppressChildValidationMetadataProvider.cs b/src/Mvc/Mvc.Core/src/ModelBinding/SuppressChildValidationMetadataProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/SuppressChildValidationMetadataProvider.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/SuppressChildValidationMetadataProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/UnsupportedContentTypeException.cs b/src/Mvc/Mvc.Core/src/ModelBinding/UnsupportedContentTypeException.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/UnsupportedContentTypeException.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/UnsupportedContentTypeException.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/UnsupportedContentTypeFilter.cs b/src/Mvc/Mvc.Core/src/ModelBinding/UnsupportedContentTypeFilter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/UnsupportedContentTypeFilter.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/UnsupportedContentTypeFilter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/ClientValidatorCache.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Validation/ClientValidatorCache.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/ClientValidatorCache.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Validation/ClientValidatorCache.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/CompositeClientModelValidatorProvider.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Validation/CompositeClientModelValidatorProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/CompositeClientModelValidatorProvider.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Validation/CompositeClientModelValidatorProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/CompositeModelValidatorProvider.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Validation/CompositeModelValidatorProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/CompositeModelValidatorProvider.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Validation/CompositeModelValidatorProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/DefaultCollectionValidationStrategy.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Validation/DefaultCollectionValidationStrategy.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/DefaultCollectionValidationStrategy.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Validation/DefaultCollectionValidationStrategy.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/DefaultComplexObjectValidationStrategy.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Validation/DefaultComplexObjectValidationStrategy.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/DefaultComplexObjectValidationStrategy.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Validation/DefaultComplexObjectValidationStrategy.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/DefaultModelValidatorProvider.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Validation/DefaultModelValidatorProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/DefaultModelValidatorProvider.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Validation/DefaultModelValidatorProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/DefaultObjectValidator.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Validation/DefaultObjectValidator.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/DefaultObjectValidator.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Validation/DefaultObjectValidator.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/ExplicitIndexCollectionValidationStrategy.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Validation/ExplicitIndexCollectionValidationStrategy.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/ExplicitIndexCollectionValidationStrategy.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Validation/ExplicitIndexCollectionValidationStrategy.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/IMetadataBasedModelValidatorProvider.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Validation/IMetadataBasedModelValidatorProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/IMetadataBasedModelValidatorProvider.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Validation/IMetadataBasedModelValidatorProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/IObjectModelValidator.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Validation/IObjectModelValidator.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/IObjectModelValidator.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Validation/IObjectModelValidator.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/ModelValidatorProviderExtensions.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Validation/ModelValidatorProviderExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/ModelValidatorProviderExtensions.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Validation/ModelValidatorProviderExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/ShortFormDictionaryValidationStrategy.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Validation/ShortFormDictionaryValidationStrategy.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/ShortFormDictionaryValidationStrategy.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Validation/ShortFormDictionaryValidationStrategy.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/ValidateNeverAttribute.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Validation/ValidateNeverAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/ValidateNeverAttribute.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Validation/ValidateNeverAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/ValidationStack.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Validation/ValidationStack.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/ValidationStack.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Validation/ValidationStack.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/ValidationVisitor.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Validation/ValidationVisitor.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/ValidationVisitor.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Validation/ValidationVisitor.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/ValidatorCache.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Validation/ValidatorCache.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/ValidatorCache.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Validation/ValidatorCache.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ValueProviderFactoryExtensions.cs b/src/Mvc/Mvc.Core/src/ModelBinding/ValueProviderFactoryExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ValueProviderFactoryExtensions.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/ValueProviderFactoryExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelMetadataTypeAttribute.cs b/src/Mvc/Mvc.Core/src/ModelMetadataTypeAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelMetadataTypeAttribute.cs
rename to src/Mvc/Mvc.Core/src/ModelMetadataTypeAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/MvcCoreDiagnosticSourceExtensions.cs b/src/Mvc/Mvc.Core/src/MvcCoreDiagnosticSourceExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/MvcCoreDiagnosticSourceExtensions.cs
rename to src/Mvc/Mvc.Core/src/MvcCoreDiagnosticSourceExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/MvcCoreLoggerExtensions.cs b/src/Mvc/Mvc.Core/src/MvcCoreLoggerExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/MvcCoreLoggerExtensions.cs
rename to src/Mvc/Mvc.Core/src/MvcCoreLoggerExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/MvcOptions.cs b/src/Mvc/Mvc.Core/src/MvcOptions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/MvcOptions.cs
rename to src/Mvc/Mvc.Core/src/MvcOptions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/NoContentResult.cs b/src/Mvc/Mvc.Core/src/NoContentResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/NoContentResult.cs
rename to src/Mvc/Mvc.Core/src/NoContentResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/NonActionAttribute.cs b/src/Mvc/Mvc.Core/src/NonActionAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/NonActionAttribute.cs
rename to src/Mvc/Mvc.Core/src/NonActionAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/NonControllerAttribute.cs b/src/Mvc/Mvc.Core/src/NonControllerAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/NonControllerAttribute.cs
rename to src/Mvc/Mvc.Core/src/NonControllerAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/NonViewComponentAttribute.cs b/src/Mvc/Mvc.Core/src/NonViewComponentAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/NonViewComponentAttribute.cs
rename to src/Mvc/Mvc.Core/src/NonViewComponentAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/NotFoundObjectResult.cs b/src/Mvc/Mvc.Core/src/NotFoundObjectResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/NotFoundObjectResult.cs
rename to src/Mvc/Mvc.Core/src/NotFoundObjectResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/NotFoundResult.cs b/src/Mvc/Mvc.Core/src/NotFoundResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/NotFoundResult.cs
rename to src/Mvc/Mvc.Core/src/NotFoundResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ObjectResult.cs b/src/Mvc/Mvc.Core/src/ObjectResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ObjectResult.cs
rename to src/Mvc/Mvc.Core/src/ObjectResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/OkObjectResult.cs b/src/Mvc/Mvc.Core/src/OkObjectResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/OkObjectResult.cs
rename to src/Mvc/Mvc.Core/src/OkObjectResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/OkResult.cs b/src/Mvc/Mvc.Core/src/OkResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/OkResult.cs
rename to src/Mvc/Mvc.Core/src/OkResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/PhysicalFileResult.cs b/src/Mvc/Mvc.Core/src/PhysicalFileResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/PhysicalFileResult.cs
rename to src/Mvc/Mvc.Core/src/PhysicalFileResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ProblemDetails.cs b/src/Mvc/Mvc.Core/src/ProblemDetails.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ProblemDetails.cs
rename to src/Mvc/Mvc.Core/src/ProblemDetails.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ProducesAttribute.cs b/src/Mvc/Mvc.Core/src/ProducesAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ProducesAttribute.cs
rename to src/Mvc/Mvc.Core/src/ProducesAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ProducesDefaultResponseTypeAttribute.cs b/src/Mvc/Mvc.Core/src/ProducesDefaultResponseTypeAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ProducesDefaultResponseTypeAttribute.cs
rename to src/Mvc/Mvc.Core/src/ProducesDefaultResponseTypeAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ProducesErrorResponseTypeAttribute.cs b/src/Mvc/Mvc.Core/src/ProducesErrorResponseTypeAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ProducesErrorResponseTypeAttribute.cs
rename to src/Mvc/Mvc.Core/src/ProducesErrorResponseTypeAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ProducesResponseTypeAttribute.cs b/src/Mvc/Mvc.Core/src/ProducesResponseTypeAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ProducesResponseTypeAttribute.cs
rename to src/Mvc/Mvc.Core/src/ProducesResponseTypeAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Properties/AssemblyInfo.cs b/src/Mvc/Mvc.Core/src/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Properties/AssemblyInfo.cs
rename to src/Mvc/Mvc.Core/src/Properties/AssemblyInfo.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Properties/Resources.Designer.cs b/src/Mvc/Mvc.Core/src/Properties/Resources.Designer.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Properties/Resources.Designer.cs
rename to src/Mvc/Mvc.Core/src/Properties/Resources.Designer.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/RedirectResult.cs b/src/Mvc/Mvc.Core/src/RedirectResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/RedirectResult.cs
rename to src/Mvc/Mvc.Core/src/RedirectResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/RedirectToActionResult.cs b/src/Mvc/Mvc.Core/src/RedirectToActionResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/RedirectToActionResult.cs
rename to src/Mvc/Mvc.Core/src/RedirectToActionResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/RedirectToPageResult.cs b/src/Mvc/Mvc.Core/src/RedirectToPageResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/RedirectToPageResult.cs
rename to src/Mvc/Mvc.Core/src/RedirectToPageResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/RedirectToRouteResult.cs b/src/Mvc/Mvc.Core/src/RedirectToRouteResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/RedirectToRouteResult.cs
rename to src/Mvc/Mvc.Core/src/RedirectToRouteResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/RequestFormLimitsAttribute.cs b/src/Mvc/Mvc.Core/src/RequestFormLimitsAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/RequestFormLimitsAttribute.cs
rename to src/Mvc/Mvc.Core/src/RequestFormLimitsAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/RequestSizeLimitAttribute.cs b/src/Mvc/Mvc.Core/src/RequestSizeLimitAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/RequestSizeLimitAttribute.cs
rename to src/Mvc/Mvc.Core/src/RequestSizeLimitAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/RequireHttpsAttribute.cs b/src/Mvc/Mvc.Core/src/RequireHttpsAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/RequireHttpsAttribute.cs
rename to src/Mvc/Mvc.Core/src/RequireHttpsAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Resources.resx b/src/Mvc/Mvc.Core/src/Resources.resx
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Resources.resx
rename to src/Mvc/Mvc.Core/src/Resources.resx
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ResponseCacheAttribute.cs b/src/Mvc/Mvc.Core/src/ResponseCacheAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ResponseCacheAttribute.cs
rename to src/Mvc/Mvc.Core/src/ResponseCacheAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ResponseCacheLocation.cs b/src/Mvc/Mvc.Core/src/ResponseCacheLocation.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ResponseCacheLocation.cs
rename to src/Mvc/Mvc.Core/src/ResponseCacheLocation.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/RouteAttribute.cs b/src/Mvc/Mvc.Core/src/RouteAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/RouteAttribute.cs
rename to src/Mvc/Mvc.Core/src/RouteAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/ActionConstraintMatcherPolicy.cs b/src/Mvc/Mvc.Core/src/Routing/ActionConstraintMatcherPolicy.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/ActionConstraintMatcherPolicy.cs
rename to src/Mvc/Mvc.Core/src/Routing/ActionConstraintMatcherPolicy.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/ActionEndpointDataSource.cs b/src/Mvc/Mvc.Core/src/Routing/ActionEndpointDataSource.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/ActionEndpointDataSource.cs
rename to src/Mvc/Mvc.Core/src/Routing/ActionEndpointDataSource.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/ActionEndpointDataSourceBase.cs b/src/Mvc/Mvc.Core/src/Routing/ActionEndpointDataSourceBase.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/ActionEndpointDataSourceBase.cs
rename to src/Mvc/Mvc.Core/src/Routing/ActionEndpointDataSourceBase.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/ActionEndpointFactory.cs b/src/Mvc/Mvc.Core/src/Routing/ActionEndpointFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/ActionEndpointFactory.cs
rename to src/Mvc/Mvc.Core/src/Routing/ActionEndpointFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/AttributeRoute.cs b/src/Mvc/Mvc.Core/src/Routing/AttributeRoute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/AttributeRoute.cs
rename to src/Mvc/Mvc.Core/src/Routing/AttributeRoute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/AttributeRouting.cs b/src/Mvc/Mvc.Core/src/Routing/AttributeRouting.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/AttributeRouting.cs
rename to src/Mvc/Mvc.Core/src/Routing/AttributeRouting.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/ConsumesMatcherPolicy.cs b/src/Mvc/Mvc.Core/src/Routing/ConsumesMatcherPolicy.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/ConsumesMatcherPolicy.cs
rename to src/Mvc/Mvc.Core/src/Routing/ConsumesMatcherPolicy.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/ConsumesMetadata.cs b/src/Mvc/Mvc.Core/src/Routing/ConsumesMetadata.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/ConsumesMetadata.cs
rename to src/Mvc/Mvc.Core/src/Routing/ConsumesMetadata.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/ControllerActionEndpointDataSource.cs b/src/Mvc/Mvc.Core/src/Routing/ControllerActionEndpointDataSource.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/ControllerActionEndpointDataSource.cs
rename to src/Mvc/Mvc.Core/src/Routing/ControllerActionEndpointDataSource.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/ControllerLinkGeneratorExtensions.cs b/src/Mvc/Mvc.Core/src/Routing/ControllerLinkGeneratorExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/ControllerLinkGeneratorExtensions.cs
rename to src/Mvc/Mvc.Core/src/Routing/ControllerLinkGeneratorExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/ConventionalRouteEntry.cs b/src/Mvc/Mvc.Core/src/Routing/ConventionalRouteEntry.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/ConventionalRouteEntry.cs
rename to src/Mvc/Mvc.Core/src/Routing/ConventionalRouteEntry.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/EndpointRoutingUrlHelper.cs b/src/Mvc/Mvc.Core/src/Routing/EndpointRoutingUrlHelper.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/EndpointRoutingUrlHelper.cs
rename to src/Mvc/Mvc.Core/src/Routing/EndpointRoutingUrlHelper.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/HttpMethodAttribute.cs b/src/Mvc/Mvc.Core/src/Routing/HttpMethodAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/HttpMethodAttribute.cs
rename to src/Mvc/Mvc.Core/src/Routing/HttpMethodAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/IActionHttpMethodProvider.cs b/src/Mvc/Mvc.Core/src/Routing/IActionHttpMethodProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/IActionHttpMethodProvider.cs
rename to src/Mvc/Mvc.Core/src/Routing/IActionHttpMethodProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/IConsumesMetadata.cs b/src/Mvc/Mvc.Core/src/Routing/IConsumesMetadata.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/IConsumesMetadata.cs
rename to src/Mvc/Mvc.Core/src/Routing/IConsumesMetadata.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/IRouteTemplateProvider.cs b/src/Mvc/Mvc.Core/src/Routing/IRouteTemplateProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/IRouteTemplateProvider.cs
rename to src/Mvc/Mvc.Core/src/Routing/IRouteTemplateProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/IRouteValueProvider.cs b/src/Mvc/Mvc.Core/src/Routing/IRouteValueProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/IRouteValueProvider.cs
rename to src/Mvc/Mvc.Core/src/Routing/IRouteValueProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/IUrlHelperFactory.cs b/src/Mvc/Mvc.Core/src/Routing/IUrlHelperFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/IUrlHelperFactory.cs
rename to src/Mvc/Mvc.Core/src/Routing/IUrlHelperFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/KnownRouteValueConstraint.cs b/src/Mvc/Mvc.Core/src/Routing/KnownRouteValueConstraint.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/KnownRouteValueConstraint.cs
rename to src/Mvc/Mvc.Core/src/Routing/KnownRouteValueConstraint.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/MvcAttributeRouteHandler.cs b/src/Mvc/Mvc.Core/src/Routing/MvcAttributeRouteHandler.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/MvcAttributeRouteHandler.cs
rename to src/Mvc/Mvc.Core/src/Routing/MvcAttributeRouteHandler.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/MvcRouteHandler.cs b/src/Mvc/Mvc.Core/src/Routing/MvcRouteHandler.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/MvcRouteHandler.cs
rename to src/Mvc/Mvc.Core/src/Routing/MvcRouteHandler.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/NormalizedRouteValue.cs b/src/Mvc/Mvc.Core/src/Routing/NormalizedRouteValue.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/NormalizedRouteValue.cs
rename to src/Mvc/Mvc.Core/src/Routing/NormalizedRouteValue.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/NullRouter.cs b/src/Mvc/Mvc.Core/src/Routing/NullRouter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/NullRouter.cs
rename to src/Mvc/Mvc.Core/src/Routing/NullRouter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/PageLinkGeneratorExtensions.cs b/src/Mvc/Mvc.Core/src/Routing/PageLinkGeneratorExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/PageLinkGeneratorExtensions.cs
rename to src/Mvc/Mvc.Core/src/Routing/PageLinkGeneratorExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/RoutePatternWriter.cs b/src/Mvc/Mvc.Core/src/Routing/RoutePatternWriter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/RoutePatternWriter.cs
rename to src/Mvc/Mvc.Core/src/Routing/RoutePatternWriter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/RouteValueAttribute.cs b/src/Mvc/Mvc.Core/src/Routing/RouteValueAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/RouteValueAttribute.cs
rename to src/Mvc/Mvc.Core/src/Routing/RouteValueAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/UrlHelper.cs b/src/Mvc/Mvc.Core/src/Routing/UrlHelper.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/UrlHelper.cs
rename to src/Mvc/Mvc.Core/src/Routing/UrlHelper.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/UrlHelperBase.cs b/src/Mvc/Mvc.Core/src/Routing/UrlHelperBase.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/UrlHelperBase.cs
rename to src/Mvc/Mvc.Core/src/Routing/UrlHelperBase.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/UrlHelperFactory.cs b/src/Mvc/Mvc.Core/src/Routing/UrlHelperFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/UrlHelperFactory.cs
rename to src/Mvc/Mvc.Core/src/Routing/UrlHelperFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/ViewEnginePath.cs b/src/Mvc/Mvc.Core/src/Routing/ViewEnginePath.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/ViewEnginePath.cs
rename to src/Mvc/Mvc.Core/src/Routing/ViewEnginePath.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/SerializableError.cs b/src/Mvc/Mvc.Core/src/SerializableError.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/SerializableError.cs
rename to src/Mvc/Mvc.Core/src/SerializableError.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ServiceFilterAttribute.cs b/src/Mvc/Mvc.Core/src/ServiceFilterAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ServiceFilterAttribute.cs
rename to src/Mvc/Mvc.Core/src/ServiceFilterAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/SignInResult.cs b/src/Mvc/Mvc.Core/src/SignInResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/SignInResult.cs
rename to src/Mvc/Mvc.Core/src/SignInResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/SignOutResult.cs b/src/Mvc/Mvc.Core/src/SignOutResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/SignOutResult.cs
rename to src/Mvc/Mvc.Core/src/SignOutResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/StatusCodeResult.cs b/src/Mvc/Mvc.Core/src/StatusCodeResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/StatusCodeResult.cs
rename to src/Mvc/Mvc.Core/src/StatusCodeResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/TypeFilterAttribute.cs b/src/Mvc/Mvc.Core/src/TypeFilterAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/TypeFilterAttribute.cs
rename to src/Mvc/Mvc.Core/src/TypeFilterAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/UnauthorizedObjectResult.cs b/src/Mvc/Mvc.Core/src/UnauthorizedObjectResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/UnauthorizedObjectResult.cs
rename to src/Mvc/Mvc.Core/src/UnauthorizedObjectResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/UnauthorizedResult.cs b/src/Mvc/Mvc.Core/src/UnauthorizedResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/UnauthorizedResult.cs
rename to src/Mvc/Mvc.Core/src/UnauthorizedResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/UnprocessableEntityObjectResult.cs b/src/Mvc/Mvc.Core/src/UnprocessableEntityObjectResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/UnprocessableEntityObjectResult.cs
rename to src/Mvc/Mvc.Core/src/UnprocessableEntityObjectResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/UnprocessableEntityResult.cs b/src/Mvc/Mvc.Core/src/UnprocessableEntityResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/UnprocessableEntityResult.cs
rename to src/Mvc/Mvc.Core/src/UnprocessableEntityResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/UnsupportedMediaTypeResult.cs b/src/Mvc/Mvc.Core/src/UnsupportedMediaTypeResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/UnsupportedMediaTypeResult.cs
rename to src/Mvc/Mvc.Core/src/UnsupportedMediaTypeResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/UrlHelperExtensions.cs b/src/Mvc/Mvc.Core/src/UrlHelperExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/UrlHelperExtensions.cs
rename to src/Mvc/Mvc.Core/src/UrlHelperExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ValidationProblemDetails.cs b/src/Mvc/Mvc.Core/src/ValidationProblemDetails.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ValidationProblemDetails.cs
rename to src/Mvc/Mvc.Core/src/ValidationProblemDetails.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ViewFeatures/IKeepTempDataResult.cs b/src/Mvc/Mvc.Core/src/ViewFeatures/IKeepTempDataResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ViewFeatures/IKeepTempDataResult.cs
rename to src/Mvc/Mvc.Core/src/ViewFeatures/IKeepTempDataResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/VirtualFileResult.cs b/src/Mvc/Mvc.Core/src/VirtualFileResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/VirtualFileResult.cs
rename to src/Mvc/Mvc.Core/src/VirtualFileResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/baseline.netcore.json b/src/Mvc/Mvc.Core/src/baseline.netcore.json
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/baseline.netcore.json
rename to src/Mvc/Mvc.Core/src/baseline.netcore.json
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/breakingchanges.netcore.json b/src/Mvc/Mvc.Core/src/breakingchanges.netcore.json
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/breakingchanges.netcore.json
rename to src/Mvc/Mvc.Core/src/breakingchanges.netcore.json
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/AcceptedAtActionResultTests.cs b/src/Mvc/Mvc.Core/test/AcceptedAtActionResultTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/AcceptedAtActionResultTests.cs
rename to src/Mvc/Mvc.Core/test/AcceptedAtActionResultTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/AcceptedAtRouteResultTests.cs b/src/Mvc/Mvc.Core/test/AcceptedAtRouteResultTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/AcceptedAtRouteResultTests.cs
rename to src/Mvc/Mvc.Core/test/AcceptedAtRouteResultTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/AcceptedResultTests.cs b/src/Mvc/Mvc.Core/test/AcceptedResultTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/AcceptedResultTests.cs
rename to src/Mvc/Mvc.Core/test/AcceptedResultTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ActionConstraints/ActionConstraintCacheTest.cs b/src/Mvc/Mvc.Core/test/ActionConstraints/ActionConstraintCacheTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ActionConstraints/ActionConstraintCacheTest.cs
rename to src/Mvc/Mvc.Core/test/ActionConstraints/ActionConstraintCacheTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ActionConstraints/HttpMethodActionConstraintTest.cs b/src/Mvc/Mvc.Core/test/ActionConstraints/HttpMethodActionConstraintTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ActionConstraints/HttpMethodActionConstraintTest.cs
rename to src/Mvc/Mvc.Core/test/ActionConstraints/HttpMethodActionConstraintTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ActionResultOfTTest.cs b/src/Mvc/Mvc.Core/test/ActionResultOfTTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ActionResultOfTTest.cs
rename to src/Mvc/Mvc.Core/test/ActionResultOfTTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApiConventionMethodAttributeTest.cs b/src/Mvc/Mvc.Core/test/ApiConventionMethodAttributeTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApiConventionMethodAttributeTest.cs
rename to src/Mvc/Mvc.Core/test/ApiConventionMethodAttributeTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApiConventionTypeAttributeTest.cs b/src/Mvc/Mvc.Core/test/ApiConventionTypeAttributeTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApiConventionTypeAttributeTest.cs
rename to src/Mvc/Mvc.Core/test/ApiConventionTypeAttributeTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApiExplorer/ApiConventionMatcherTest.cs b/src/Mvc/Mvc.Core/test/ApiExplorer/ApiConventionMatcherTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApiExplorer/ApiConventionMatcherTest.cs
rename to src/Mvc/Mvc.Core/test/ApiExplorer/ApiConventionMatcherTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApiExplorer/ApiConventionResultTest.cs b/src/Mvc/Mvc.Core/test/ApiExplorer/ApiConventionResultTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApiExplorer/ApiConventionResultTest.cs
rename to src/Mvc/Mvc.Core/test/ApiExplorer/ApiConventionResultTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/ActionModelTest.cs b/src/Mvc/Mvc.Core/test/ApplicationModels/ActionModelTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/ActionModelTest.cs
rename to src/Mvc/Mvc.Core/test/ApplicationModels/ActionModelTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/ApiBehaviorApplicationModelProviderTest.cs b/src/Mvc/Mvc.Core/test/ApplicationModels/ApiBehaviorApplicationModelProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/ApiBehaviorApplicationModelProviderTest.cs
rename to src/Mvc/Mvc.Core/test/ApplicationModels/ApiBehaviorApplicationModelProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/ApiConventionApplicationModelConventionTest.cs b/src/Mvc/Mvc.Core/test/ApplicationModels/ApiConventionApplicationModelConventionTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/ApiConventionApplicationModelConventionTest.cs
rename to src/Mvc/Mvc.Core/test/ApplicationModels/ApiConventionApplicationModelConventionTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/ApiVisibilityConventionTest.cs b/src/Mvc/Mvc.Core/test/ApplicationModels/ApiVisibilityConventionTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/ApiVisibilityConventionTest.cs
rename to src/Mvc/Mvc.Core/test/ApplicationModels/ApiVisibilityConventionTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/AttributeRouteModelTests.cs b/src/Mvc/Mvc.Core/test/ApplicationModels/AttributeRouteModelTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/AttributeRouteModelTests.cs
rename to src/Mvc/Mvc.Core/test/ApplicationModels/AttributeRouteModelTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/AuthorizationApplicationModelProviderTest.cs b/src/Mvc/Mvc.Core/test/ApplicationModels/AuthorizationApplicationModelProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/AuthorizationApplicationModelProviderTest.cs
rename to src/Mvc/Mvc.Core/test/ApplicationModels/AuthorizationApplicationModelProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/ClientErrorResultFilterConventionTest.cs b/src/Mvc/Mvc.Core/test/ApplicationModels/ClientErrorResultFilterConventionTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/ClientErrorResultFilterConventionTest.cs
rename to src/Mvc/Mvc.Core/test/ApplicationModels/ClientErrorResultFilterConventionTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/ConsumesConstraintForFormFileParameterConventionTest.cs b/src/Mvc/Mvc.Core/test/ApplicationModels/ConsumesConstraintForFormFileParameterConventionTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/ConsumesConstraintForFormFileParameterConventionTest.cs
rename to src/Mvc/Mvc.Core/test/ApplicationModels/ConsumesConstraintForFormFileParameterConventionTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/ControllerActionDescriptorBuilderTest.cs b/src/Mvc/Mvc.Core/test/ApplicationModels/ControllerActionDescriptorBuilderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/ControllerActionDescriptorBuilderTest.cs
rename to src/Mvc/Mvc.Core/test/ApplicationModels/ControllerActionDescriptorBuilderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/ControllerActionDescriptorProviderTests.cs b/src/Mvc/Mvc.Core/test/ApplicationModels/ControllerActionDescriptorProviderTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/ControllerActionDescriptorProviderTests.cs
rename to src/Mvc/Mvc.Core/test/ApplicationModels/ControllerActionDescriptorProviderTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/ControllerModelTest.cs b/src/Mvc/Mvc.Core/test/ApplicationModels/ControllerModelTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/ControllerModelTest.cs
rename to src/Mvc/Mvc.Core/test/ApplicationModels/ControllerModelTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/DefaultApplicationModelProviderTest.cs b/src/Mvc/Mvc.Core/test/ApplicationModels/DefaultApplicationModelProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/DefaultApplicationModelProviderTest.cs
rename to src/Mvc/Mvc.Core/test/ApplicationModels/DefaultApplicationModelProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/InferParameterBindingInfoConventionTest.cs b/src/Mvc/Mvc.Core/test/ApplicationModels/InferParameterBindingInfoConventionTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/InferParameterBindingInfoConventionTest.cs
rename to src/Mvc/Mvc.Core/test/ApplicationModels/InferParameterBindingInfoConventionTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/InvalidModelStateFilterConventionTest.cs b/src/Mvc/Mvc.Core/test/ApplicationModels/InvalidModelStateFilterConventionTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/InvalidModelStateFilterConventionTest.cs
rename to src/Mvc/Mvc.Core/test/ApplicationModels/InvalidModelStateFilterConventionTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/ParameterModelTest.cs b/src/Mvc/Mvc.Core/test/ApplicationModels/ParameterModelTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/ParameterModelTest.cs
rename to src/Mvc/Mvc.Core/test/ApplicationModels/ParameterModelTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/PropertyModelTest.cs b/src/Mvc/Mvc.Core/test/ApplicationModels/PropertyModelTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/PropertyModelTest.cs
rename to src/Mvc/Mvc.Core/test/ApplicationModels/PropertyModelTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/RouteTokenTransformerConventionTest.cs b/src/Mvc/Mvc.Core/test/ApplicationModels/RouteTokenTransformerConventionTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/RouteTokenTransformerConventionTest.cs
rename to src/Mvc/Mvc.Core/test/ApplicationModels/RouteTokenTransformerConventionTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationParts/ApplicationAssembliesProviderTest.cs b/src/Mvc/Mvc.Core/test/ApplicationParts/ApplicationAssembliesProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationParts/ApplicationAssembliesProviderTest.cs
rename to src/Mvc/Mvc.Core/test/ApplicationParts/ApplicationAssembliesProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationParts/ApplicationPartManagerTest.cs b/src/Mvc/Mvc.Core/test/ApplicationParts/ApplicationPartManagerTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationParts/ApplicationPartManagerTest.cs
rename to src/Mvc/Mvc.Core/test/ApplicationParts/ApplicationPartManagerTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationParts/AssemblyPartTest.cs b/src/Mvc/Mvc.Core/test/ApplicationParts/AssemblyPartTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationParts/AssemblyPartTest.cs
rename to src/Mvc/Mvc.Core/test/ApplicationParts/AssemblyPartTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationParts/RelatedAssemblyPartTest.cs b/src/Mvc/Mvc.Core/test/ApplicationParts/RelatedAssemblyPartTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationParts/RelatedAssemblyPartTest.cs
rename to src/Mvc/Mvc.Core/test/ApplicationParts/RelatedAssemblyPartTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Authorization/AuthorizeFilterTest.cs b/src/Mvc/Mvc.Core/test/Authorization/AuthorizeFilterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Authorization/AuthorizeFilterTest.cs
rename to src/Mvc/Mvc.Core/test/Authorization/AuthorizeFilterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/BadRequestObjectResultTests.cs b/src/Mvc/Mvc.Core/test/BadRequestObjectResultTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/BadRequestObjectResultTests.cs
rename to src/Mvc/Mvc.Core/test/BadRequestObjectResultTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/BadRequestResultTests.cs b/src/Mvc/Mvc.Core/test/BadRequestResultTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/BadRequestResultTests.cs
rename to src/Mvc/Mvc.Core/test/BadRequestResultTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/BindAttributeTest.cs b/src/Mvc/Mvc.Core/test/BindAttributeTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/BindAttributeTest.cs
rename to src/Mvc/Mvc.Core/test/BindAttributeTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Builder/MvcApplicationBuilderExtensionsTest.cs b/src/Mvc/Mvc.Core/test/Builder/MvcApplicationBuilderExtensionsTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Builder/MvcApplicationBuilderExtensionsTest.cs
rename to src/Mvc/Mvc.Core/test/Builder/MvcApplicationBuilderExtensionsTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Builder/MvcAreaRouteBuilderExtensionsTest.cs b/src/Mvc/Mvc.Core/test/Builder/MvcAreaRouteBuilderExtensionsTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Builder/MvcAreaRouteBuilderExtensionsTest.cs
rename to src/Mvc/Mvc.Core/test/Builder/MvcAreaRouteBuilderExtensionsTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ChallengeResultTest.cs b/src/Mvc/Mvc.Core/test/ChallengeResultTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ChallengeResultTest.cs
rename to src/Mvc/Mvc.Core/test/ChallengeResultTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ConflictObjectResultTest.cs b/src/Mvc/Mvc.Core/test/ConflictObjectResultTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ConflictObjectResultTest.cs
rename to src/Mvc/Mvc.Core/test/ConflictObjectResultTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ConflictResultTest.cs b/src/Mvc/Mvc.Core/test/ConflictResultTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ConflictResultTest.cs
rename to src/Mvc/Mvc.Core/test/ConflictResultTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ConsumesAttributeTests.cs b/src/Mvc/Mvc.Core/test/ConsumesAttributeTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ConsumesAttributeTests.cs
rename to src/Mvc/Mvc.Core/test/ConsumesAttributeTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ContentResultTest.cs b/src/Mvc/Mvc.Core/test/ContentResultTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ContentResultTest.cs
rename to src/Mvc/Mvc.Core/test/ContentResultTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ControllerBaseTest.cs b/src/Mvc/Mvc.Core/test/ControllerBaseTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ControllerBaseTest.cs
rename to src/Mvc/Mvc.Core/test/ControllerBaseTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Controllers/ControllerActivatorProviderTest.cs b/src/Mvc/Mvc.Core/test/Controllers/ControllerActivatorProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Controllers/ControllerActivatorProviderTest.cs
rename to src/Mvc/Mvc.Core/test/Controllers/ControllerActivatorProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Controllers/ControllerBinderDelegateProviderTest.cs b/src/Mvc/Mvc.Core/test/Controllers/ControllerBinderDelegateProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Controllers/ControllerBinderDelegateProviderTest.cs
rename to src/Mvc/Mvc.Core/test/Controllers/ControllerBinderDelegateProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Controllers/ControllerFactoryProviderTest.cs b/src/Mvc/Mvc.Core/test/Controllers/ControllerFactoryProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Controllers/ControllerFactoryProviderTest.cs
rename to src/Mvc/Mvc.Core/test/Controllers/ControllerFactoryProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Controllers/ControllerFeatureProviderTest.cs b/src/Mvc/Mvc.Core/test/Controllers/ControllerFeatureProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Controllers/ControllerFeatureProviderTest.cs
rename to src/Mvc/Mvc.Core/test/Controllers/ControllerFeatureProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Controllers/DefaultControllerActivatorTest.cs b/src/Mvc/Mvc.Core/test/Controllers/DefaultControllerActivatorTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Controllers/DefaultControllerActivatorTest.cs
rename to src/Mvc/Mvc.Core/test/Controllers/DefaultControllerActivatorTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Controllers/DefaultControllerFactoryTest.cs b/src/Mvc/Mvc.Core/test/Controllers/DefaultControllerFactoryTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Controllers/DefaultControllerFactoryTest.cs
rename to src/Mvc/Mvc.Core/test/Controllers/DefaultControllerFactoryTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Controllers/ServiceBasedControllerActivatorTest.cs b/src/Mvc/Mvc.Core/test/Controllers/ServiceBasedControllerActivatorTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Controllers/ServiceBasedControllerActivatorTest.cs
rename to src/Mvc/Mvc.Core/test/Controllers/ServiceBasedControllerActivatorTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/CreatedAtActionResultTests.cs b/src/Mvc/Mvc.Core/test/CreatedAtActionResultTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/CreatedAtActionResultTests.cs
rename to src/Mvc/Mvc.Core/test/CreatedAtActionResultTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/CreatedAtRouteResultTests.cs b/src/Mvc/Mvc.Core/test/CreatedAtRouteResultTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/CreatedAtRouteResultTests.cs
rename to src/Mvc/Mvc.Core/test/CreatedAtRouteResultTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/CreatedResultTests.cs b/src/Mvc/Mvc.Core/test/CreatedResultTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/CreatedResultTests.cs
rename to src/Mvc/Mvc.Core/test/CreatedResultTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/DependencyInjection/ApiBehaviorOptionsSetupTest.cs b/src/Mvc/Mvc.Core/test/DependencyInjection/ApiBehaviorOptionsSetupTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/DependencyInjection/ApiBehaviorOptionsSetupTest.cs
rename to src/Mvc/Mvc.Core/test/DependencyInjection/ApiBehaviorOptionsSetupTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/DependencyInjection/ApplicationModelConventionExtensionsTest.cs b/src/Mvc/Mvc.Core/test/DependencyInjection/ApplicationModelConventionExtensionsTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/DependencyInjection/ApplicationModelConventionExtensionsTest.cs
rename to src/Mvc/Mvc.Core/test/DependencyInjection/ApplicationModelConventionExtensionsTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/DependencyInjection/MvcBuilderExtensionsTest.cs b/src/Mvc/Mvc.Core/test/DependencyInjection/MvcBuilderExtensionsTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/DependencyInjection/MvcBuilderExtensionsTest.cs
rename to src/Mvc/Mvc.Core/test/DependencyInjection/MvcBuilderExtensionsTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/DependencyInjection/MvcCoreBuilderExtensionsTest.cs b/src/Mvc/Mvc.Core/test/DependencyInjection/MvcCoreBuilderExtensionsTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/DependencyInjection/MvcCoreBuilderExtensionsTest.cs
rename to src/Mvc/Mvc.Core/test/DependencyInjection/MvcCoreBuilderExtensionsTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/DependencyInjection/MvcCoreServiceCollectionExtensionsTest.cs b/src/Mvc/Mvc.Core/test/DependencyInjection/MvcCoreServiceCollectionExtensionsTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/DependencyInjection/MvcCoreServiceCollectionExtensionsTest.cs
rename to src/Mvc/Mvc.Core/test/DependencyInjection/MvcCoreServiceCollectionExtensionsTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/EmptyResultTests.cs b/src/Mvc/Mvc.Core/test/EmptyResultTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/EmptyResultTests.cs
rename to src/Mvc/Mvc.Core/test/EmptyResultTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/FileContentResultTest.cs b/src/Mvc/Mvc.Core/test/FileContentResultTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/FileContentResultTest.cs
rename to src/Mvc/Mvc.Core/test/FileContentResultTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/FileResultTest.cs b/src/Mvc/Mvc.Core/test/FileResultTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/FileResultTest.cs
rename to src/Mvc/Mvc.Core/test/FileResultTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/FileStreamResultTest.cs b/src/Mvc/Mvc.Core/test/FileStreamResultTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/FileStreamResultTest.cs
rename to src/Mvc/Mvc.Core/test/FileStreamResultTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/ActionFilterAttributeTests.cs b/src/Mvc/Mvc.Core/test/Filters/ActionFilterAttributeTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/ActionFilterAttributeTests.cs
rename to src/Mvc/Mvc.Core/test/Filters/ActionFilterAttributeTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/DisableRequestSizeLimitFilterTest.cs b/src/Mvc/Mvc.Core/test/Filters/DisableRequestSizeLimitFilterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/DisableRequestSizeLimitFilterTest.cs
rename to src/Mvc/Mvc.Core/test/Filters/DisableRequestSizeLimitFilterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/FilterCollectionTest.cs b/src/Mvc/Mvc.Core/test/Filters/FilterCollectionTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/FilterCollectionTest.cs
rename to src/Mvc/Mvc.Core/test/Filters/FilterCollectionTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/FilterFactoryTest.cs b/src/Mvc/Mvc.Core/test/Filters/FilterFactoryTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/FilterFactoryTest.cs
rename to src/Mvc/Mvc.Core/test/Filters/FilterFactoryTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/FilterProviderTest.cs b/src/Mvc/Mvc.Core/test/Filters/FilterProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/FilterProviderTest.cs
rename to src/Mvc/Mvc.Core/test/Filters/FilterProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/MiddlewareFilterAttributeTest.cs b/src/Mvc/Mvc.Core/test/Filters/MiddlewareFilterAttributeTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/MiddlewareFilterAttributeTest.cs
rename to src/Mvc/Mvc.Core/test/Filters/MiddlewareFilterAttributeTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/MiddlewareFilterBuilderTest.cs b/src/Mvc/Mvc.Core/test/Filters/MiddlewareFilterBuilderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/MiddlewareFilterBuilderTest.cs
rename to src/Mvc/Mvc.Core/test/Filters/MiddlewareFilterBuilderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/MiddlewareFilterConfigurationProviderTest.cs b/src/Mvc/Mvc.Core/test/Filters/MiddlewareFilterConfigurationProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/MiddlewareFilterConfigurationProviderTest.cs
rename to src/Mvc/Mvc.Core/test/Filters/MiddlewareFilterConfigurationProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/MiddlewareFilterTest.cs b/src/Mvc/Mvc.Core/test/Filters/MiddlewareFilterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/MiddlewareFilterTest.cs
rename to src/Mvc/Mvc.Core/test/Filters/MiddlewareFilterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/RequestFormLimitsFilterTest.cs b/src/Mvc/Mvc.Core/test/Filters/RequestFormLimitsFilterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/RequestFormLimitsFilterTest.cs
rename to src/Mvc/Mvc.Core/test/Filters/RequestFormLimitsFilterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/RequestSizeLimitFilterTest.cs b/src/Mvc/Mvc.Core/test/Filters/RequestSizeLimitFilterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/RequestSizeLimitFilterTest.cs
rename to src/Mvc/Mvc.Core/test/Filters/RequestSizeLimitFilterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/ResponseCacheFilterExecutorTest.cs b/src/Mvc/Mvc.Core/test/Filters/ResponseCacheFilterExecutorTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/ResponseCacheFilterExecutorTest.cs
rename to src/Mvc/Mvc.Core/test/Filters/ResponseCacheFilterExecutorTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/ResultFilterAttributeTest.cs b/src/Mvc/Mvc.Core/test/Filters/ResultFilterAttributeTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/ResultFilterAttributeTest.cs
rename to src/Mvc/Mvc.Core/test/Filters/ResultFilterAttributeTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/FlushReportingStream.cs b/src/Mvc/Mvc.Core/test/FlushReportingStream.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/FlushReportingStream.cs
rename to src/Mvc/Mvc.Core/test/FlushReportingStream.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ForbidResultTest.cs b/src/Mvc/Mvc.Core/test/ForbidResultTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ForbidResultTest.cs
rename to src/Mvc/Mvc.Core/test/ForbidResultTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/AcceptHeaderParserTest.cs b/src/Mvc/Mvc.Core/test/Formatters/AcceptHeaderParserTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/AcceptHeaderParserTest.cs
rename to src/Mvc/Mvc.Core/test/Formatters/AcceptHeaderParserTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/FormatFilterTest.cs b/src/Mvc/Mvc.Core/test/Formatters/FormatFilterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/FormatFilterTest.cs
rename to src/Mvc/Mvc.Core/test/Formatters/FormatFilterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/FormatterCollectionTest.cs b/src/Mvc/Mvc.Core/test/Formatters/FormatterCollectionTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/FormatterCollectionTest.cs
rename to src/Mvc/Mvc.Core/test/Formatters/FormatterCollectionTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/FormatterMappingsTest.cs b/src/Mvc/Mvc.Core/test/Formatters/FormatterMappingsTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/FormatterMappingsTest.cs
rename to src/Mvc/Mvc.Core/test/Formatters/FormatterMappingsTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/InputFormatterTest.cs b/src/Mvc/Mvc.Core/test/Formatters/InputFormatterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/InputFormatterTest.cs
rename to src/Mvc/Mvc.Core/test/Formatters/InputFormatterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/MediaTypeTest.cs b/src/Mvc/Mvc.Core/test/Formatters/MediaTypeTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/MediaTypeTest.cs
rename to src/Mvc/Mvc.Core/test/Formatters/MediaTypeTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/NoContentFormatterTests.cs b/src/Mvc/Mvc.Core/test/Formatters/NoContentFormatterTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/NoContentFormatterTests.cs
rename to src/Mvc/Mvc.Core/test/Formatters/NoContentFormatterTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/OutputFormatterTests.cs b/src/Mvc/Mvc.Core/test/Formatters/OutputFormatterTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/OutputFormatterTests.cs
rename to src/Mvc/Mvc.Core/test/Formatters/OutputFormatterTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/ResponseContentTypeHelperTest.cs b/src/Mvc/Mvc.Core/test/Formatters/ResponseContentTypeHelperTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/ResponseContentTypeHelperTest.cs
rename to src/Mvc/Mvc.Core/test/Formatters/ResponseContentTypeHelperTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/StreamOutputFormatterTest.cs b/src/Mvc/Mvc.Core/test/Formatters/StreamOutputFormatterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/StreamOutputFormatterTest.cs
rename to src/Mvc/Mvc.Core/test/Formatters/StreamOutputFormatterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/StringOutputFormatterTests.cs b/src/Mvc/Mvc.Core/test/Formatters/StringOutputFormatterTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/StringOutputFormatterTests.cs
rename to src/Mvc/Mvc.Core/test/Formatters/StringOutputFormatterTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/TextInputFormatterTest.cs b/src/Mvc/Mvc.Core/test/Formatters/TextInputFormatterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/TextInputFormatterTest.cs
rename to src/Mvc/Mvc.Core/test/Formatters/TextInputFormatterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/TextOutputFormatterTests.cs b/src/Mvc/Mvc.Core/test/Formatters/TextOutputFormatterTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/TextOutputFormatterTests.cs
rename to src/Mvc/Mvc.Core/test/Formatters/TextOutputFormatterTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpNotFoundObjectResultTest.cs b/src/Mvc/Mvc.Core/test/HttpNotFoundObjectResultTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpNotFoundObjectResultTest.cs
rename to src/Mvc/Mvc.Core/test/HttpNotFoundObjectResultTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpNotFoundResultTests.cs b/src/Mvc/Mvc.Core/test/HttpNotFoundResultTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpNotFoundResultTests.cs
rename to src/Mvc/Mvc.Core/test/HttpNotFoundResultTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpOkObjectResultTest.cs b/src/Mvc/Mvc.Core/test/HttpOkObjectResultTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpOkObjectResultTest.cs
rename to src/Mvc/Mvc.Core/test/HttpOkObjectResultTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpOkResultTest.cs b/src/Mvc/Mvc.Core/test/HttpOkResultTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpOkResultTest.cs
rename to src/Mvc/Mvc.Core/test/HttpOkResultTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpStatusCodeResultTests.cs b/src/Mvc/Mvc.Core/test/HttpStatusCodeResultTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpStatusCodeResultTests.cs
rename to src/Mvc/Mvc.Core/test/HttpStatusCodeResultTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpUnauthorizedResultTests.cs b/src/Mvc/Mvc.Core/test/HttpUnauthorizedResultTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpUnauthorizedResultTests.cs
rename to src/Mvc/Mvc.Core/test/HttpUnauthorizedResultTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ActionMethodExecutorTest.cs b/src/Mvc/Mvc.Core/test/Infrastructure/ActionMethodExecutorTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ActionMethodExecutorTest.cs
rename to src/Mvc/Mvc.Core/test/Infrastructure/ActionMethodExecutorTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ActionResultTypeMapperTest.cs b/src/Mvc/Mvc.Core/test/Infrastructure/ActionResultTypeMapperTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ActionResultTypeMapperTest.cs
rename to src/Mvc/Mvc.Core/test/Infrastructure/ActionResultTypeMapperTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ActionSelectorTest.cs b/src/Mvc/Mvc.Core/test/Infrastructure/ActionSelectorTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ActionSelectorTest.cs
rename to src/Mvc/Mvc.Core/test/Infrastructure/ActionSelectorTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ClientErrorResultFilterTest.cs b/src/Mvc/Mvc.Core/test/Infrastructure/ClientErrorResultFilterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ClientErrorResultFilterTest.cs
rename to src/Mvc/Mvc.Core/test/Infrastructure/ClientErrorResultFilterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/CompatibilitySwitchTest.cs b/src/Mvc/Mvc.Core/test/Infrastructure/CompatibilitySwitchTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/CompatibilitySwitchTest.cs
rename to src/Mvc/Mvc.Core/test/Infrastructure/CompatibilitySwitchTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ConfigureCompatibilityOptionsTest.cs b/src/Mvc/Mvc.Core/test/Infrastructure/ConfigureCompatibilityOptionsTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ConfigureCompatibilityOptionsTest.cs
rename to src/Mvc/Mvc.Core/test/Infrastructure/ConfigureCompatibilityOptionsTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ControllerActionInvokerCacheTest.cs b/src/Mvc/Mvc.Core/test/Infrastructure/ControllerActionInvokerCacheTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ControllerActionInvokerCacheTest.cs
rename to src/Mvc/Mvc.Core/test/Infrastructure/ControllerActionInvokerCacheTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ControllerActionInvokerTest.cs b/src/Mvc/Mvc.Core/test/Infrastructure/ControllerActionInvokerTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ControllerActionInvokerTest.cs
rename to src/Mvc/Mvc.Core/test/Infrastructure/ControllerActionInvokerTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/DefaultActionDescriptorCollectionProviderTest.cs b/src/Mvc/Mvc.Core/test/Infrastructure/DefaultActionDescriptorCollectionProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/DefaultActionDescriptorCollectionProviderTest.cs
rename to src/Mvc/Mvc.Core/test/Infrastructure/DefaultActionDescriptorCollectionProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/DefaultOutputFormatterSelectorTest.cs b/src/Mvc/Mvc.Core/test/Infrastructure/DefaultOutputFormatterSelectorTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/DefaultOutputFormatterSelectorTest.cs
rename to src/Mvc/Mvc.Core/test/Infrastructure/DefaultOutputFormatterSelectorTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ModelStateInvalidFilterTest.cs b/src/Mvc/Mvc.Core/test/Infrastructure/ModelStateInvalidFilterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ModelStateInvalidFilterTest.cs
rename to src/Mvc/Mvc.Core/test/Infrastructure/ModelStateInvalidFilterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/NonDisposableStreamTest.cs b/src/Mvc/Mvc.Core/test/Infrastructure/NonDisposableStreamTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/NonDisposableStreamTest.cs
rename to src/Mvc/Mvc.Core/test/Infrastructure/NonDisposableStreamTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/NullableCompatibilitySwitchTest.cs b/src/Mvc/Mvc.Core/test/Infrastructure/NullableCompatibilitySwitchTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/NullableCompatibilitySwitchTest.cs
rename to src/Mvc/Mvc.Core/test/Infrastructure/NullableCompatibilitySwitchTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ObjectResultExecutorTest.cs b/src/Mvc/Mvc.Core/test/Infrastructure/ObjectResultExecutorTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ObjectResultExecutorTest.cs
rename to src/Mvc/Mvc.Core/test/Infrastructure/ObjectResultExecutorTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ParameterDefaultValuesTest.cs b/src/Mvc/Mvc.Core/test/Infrastructure/ParameterDefaultValuesTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ParameterDefaultValuesTest.cs
rename to src/Mvc/Mvc.Core/test/Infrastructure/ParameterDefaultValuesTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ProblemDetalsClientErrorFactoryTest.cs b/src/Mvc/Mvc.Core/test/Infrastructure/ProblemDetalsClientErrorFactoryTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ProblemDetalsClientErrorFactoryTest.cs
rename to src/Mvc/Mvc.Core/test/Infrastructure/ProblemDetalsClientErrorFactoryTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/JsonResultTest.cs b/src/Mvc/Mvc.Core/test/JsonResultTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/JsonResultTest.cs
rename to src/Mvc/Mvc.Core/test/JsonResultTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/LocalRedirectResultTest.cs b/src/Mvc/Mvc.Core/test/LocalRedirectResultTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/LocalRedirectResultTest.cs
rename to src/Mvc/Mvc.Core/test/LocalRedirectResultTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/MediaTypeCollectionTest.cs b/src/Mvc/Mvc.Core/test/MediaTypeCollectionTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/MediaTypeCollectionTest.cs
rename to src/Mvc/Mvc.Core/test/MediaTypeCollectionTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Microsoft.AspNetCore.Mvc.Core.Test.csproj b/src/Mvc/Mvc.Core/test/Microsoft.AspNetCore.Mvc.Core.Test.csproj
similarity index 66%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Microsoft.AspNetCore.Mvc.Core.Test.csproj
rename to src/Mvc/Mvc.Core/test/Microsoft.AspNetCore.Mvc.Core.Test.csproj
index a5f3780bbf..b3f8e2c9a5 100644
--- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Microsoft.AspNetCore.Mvc.Core.Test.csproj
+++ b/src/Mvc/Mvc.Core/test/Microsoft.AspNetCore.Mvc.Core.Test.csproj
@@ -11,8 +11,8 @@
 
   <ItemGroup>
     <Reference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" />
-    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.Core.TestCommon\Microsoft.AspNetCore.Mvc.Core.TestCommon.csproj" />
-    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.TestDiagnosticListener\Microsoft.AspNetCore.Mvc.TestDiagnosticListener.csproj" />
+    <ProjectReference Include="..\..\shared\Mvc.Core.TestCommon\Microsoft.AspNetCore.Mvc.Core.TestCommon.csproj" />
+    <ProjectReference Include="..\..\shared\Mvc.TestDiagnosticListener\Microsoft.AspNetCore.Mvc.TestDiagnosticListener.csproj" />
 
     <Reference Include="Microsoft.AspNetCore.ResponseCaching" />
     <Reference Include="Microsoft.Extensions.Logging.Testing" />
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ArrayModelBinderProviderTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Binders/ArrayModelBinderProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ArrayModelBinderProviderTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/Binders/ArrayModelBinderProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ArrayModelBinderTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Binders/ArrayModelBinderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ArrayModelBinderTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/Binders/ArrayModelBinderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/BinderTypeModelBinderProviderTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Binders/BinderTypeModelBinderProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/BinderTypeModelBinderProviderTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/Binders/BinderTypeModelBinderProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/BinderTypeModelBinderTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Binders/BinderTypeModelBinderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/BinderTypeModelBinderTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/Binders/BinderTypeModelBinderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/BodyModelBinderProviderTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Binders/BodyModelBinderProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/BodyModelBinderProviderTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/Binders/BodyModelBinderProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/BodyModelBinderTests.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Binders/BodyModelBinderTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/BodyModelBinderTests.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/Binders/BodyModelBinderTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ByteArrayModelBinderProviderTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Binders/ByteArrayModelBinderProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ByteArrayModelBinderProviderTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/Binders/ByteArrayModelBinderProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ByteArrayModelBinderTests.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Binders/ByteArrayModelBinderTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ByteArrayModelBinderTests.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/Binders/ByteArrayModelBinderTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/CancellationTokenModelBinderProviderTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Binders/CancellationTokenModelBinderProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/CancellationTokenModelBinderProviderTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/Binders/CancellationTokenModelBinderProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/CancellationTokenModelBinderTests.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Binders/CancellationTokenModelBinderTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/CancellationTokenModelBinderTests.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/Binders/CancellationTokenModelBinderTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/CollectionModelBinderProviderTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Binders/CollectionModelBinderProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/CollectionModelBinderProviderTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/Binders/CollectionModelBinderProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/CollectionModelBinderTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Binders/CollectionModelBinderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/CollectionModelBinderTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/Binders/CollectionModelBinderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ComplexTypeModelBinderProviderTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Binders/ComplexTypeModelBinderProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ComplexTypeModelBinderProviderTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/Binders/ComplexTypeModelBinderProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ComplexTypeModelBinderTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Binders/ComplexTypeModelBinderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ComplexTypeModelBinderTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/Binders/ComplexTypeModelBinderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/DecimalModelBinderTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Binders/DecimalModelBinderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/DecimalModelBinderTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/Binders/DecimalModelBinderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/DictionaryModelBinderProviderTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Binders/DictionaryModelBinderProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/DictionaryModelBinderProviderTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/Binders/DictionaryModelBinderProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/DictionaryModelBinderTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Binders/DictionaryModelBinderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/DictionaryModelBinderTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/Binders/DictionaryModelBinderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/DoubleModelBinderTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Binders/DoubleModelBinderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/DoubleModelBinderTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/Binders/DoubleModelBinderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/EnumTypeModelBinderProviderTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Binders/EnumTypeModelBinderProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/EnumTypeModelBinderProviderTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/Binders/EnumTypeModelBinderProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/EnumTypeModelBinderTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Binders/EnumTypeModelBinderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/EnumTypeModelBinderTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/Binders/EnumTypeModelBinderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/FloatModelBinderTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Binders/FloatModelBinderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/FloatModelBinderTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/Binders/FloatModelBinderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/FloatingPointTypeModelBinderProviderTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Binders/FloatingPointTypeModelBinderProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/FloatingPointTypeModelBinderProviderTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/Binders/FloatingPointTypeModelBinderProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/FloatingPointTypeModelBinderTestOfT.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Binders/FloatingPointTypeModelBinderTestOfT.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/FloatingPointTypeModelBinderTestOfT.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/Binders/FloatingPointTypeModelBinderTestOfT.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/FormCollectionModelBinderProviderTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Binders/FormCollectionModelBinderProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/FormCollectionModelBinderProviderTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/Binders/FormCollectionModelBinderProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/FormCollectionModelBinderTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Binders/FormCollectionModelBinderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/FormCollectionModelBinderTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/Binders/FormCollectionModelBinderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/FormFileModelBinderProviderTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Binders/FormFileModelBinderProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/FormFileModelBinderProviderTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/Binders/FormFileModelBinderProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/FormFileModelBinderTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Binders/FormFileModelBinderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/FormFileModelBinderTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/Binders/FormFileModelBinderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/HeaderModelBinderProviderTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Binders/HeaderModelBinderProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/HeaderModelBinderProviderTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/Binders/HeaderModelBinderProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/HeaderModelBinderTests.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Binders/HeaderModelBinderTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/HeaderModelBinderTests.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/Binders/HeaderModelBinderTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/KeyValuePairModelBinderProviderTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Binders/KeyValuePairModelBinderProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/KeyValuePairModelBinderProviderTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/Binders/KeyValuePairModelBinderProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/KeyValuePairModelBinderTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Binders/KeyValuePairModelBinderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/KeyValuePairModelBinderTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/Binders/KeyValuePairModelBinderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ServicesModelBinderProviderTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Binders/ServicesModelBinderProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ServicesModelBinderProviderTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/Binders/ServicesModelBinderProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ServicesModelBinderTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Binders/ServicesModelBinderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ServicesModelBinderTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/Binders/ServicesModelBinderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/SimpleTypeModelBinderProviderTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Binders/SimpleTypeModelBinderProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/SimpleTypeModelBinderProviderTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/Binders/SimpleTypeModelBinderProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/SimpleTypeModelBinderTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Binders/SimpleTypeModelBinderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/SimpleTypeModelBinderTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/Binders/SimpleTypeModelBinderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/BindingSourceValueProviderTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/BindingSourceValueProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/BindingSourceValueProviderTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/BindingSourceValueProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/CompositeValueProviderTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/CompositeValueProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/CompositeValueProviderTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/CompositeValueProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/DefaultModelBindingContextTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/DefaultModelBindingContextTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/DefaultModelBindingContextTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/DefaultModelBindingContextTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/ElementalValueProviderTests.cs b/src/Mvc/Mvc.Core/test/ModelBinding/ElementalValueProviderTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/ElementalValueProviderTests.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/ElementalValueProviderTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/EnumerableValueProviderTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/EnumerableValueProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/EnumerableValueProviderTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/EnumerableValueProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/FormValueProviderFactoryTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/FormValueProviderFactoryTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/FormValueProviderFactoryTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/FormValueProviderFactoryTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/FormValueProviderTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/FormValueProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/FormValueProviderTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/FormValueProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/JQueryFormValueProviderFactoryTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/JQueryFormValueProviderFactoryTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/JQueryFormValueProviderFactoryTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/JQueryFormValueProviderFactoryTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/JQueryFormValueProviderTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/JQueryFormValueProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/JQueryFormValueProviderTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/JQueryFormValueProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/JQueryQueryStringValueProviderFactoryTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/JQueryQueryStringValueProviderFactoryTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/JQueryQueryStringValueProviderFactoryTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/JQueryQueryStringValueProviderFactoryTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/JQueryQueryStringValueProviderTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/JQueryQueryStringValueProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/JQueryQueryStringValueProviderTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/JQueryQueryStringValueProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/BindingSourceMetadataProviderTests.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Metadata/BindingSourceMetadataProviderTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/BindingSourceMetadataProviderTests.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/Metadata/BindingSourceMetadataProviderTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/BindingSourceTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Metadata/BindingSourceTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/BindingSourceTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/Metadata/BindingSourceTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/CompositeBindingSourceTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Metadata/CompositeBindingSourceTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/CompositeBindingSourceTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/Metadata/CompositeBindingSourceTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/DefaultBindingMetadataProviderTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Metadata/DefaultBindingMetadataProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/DefaultBindingMetadataProviderTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/Metadata/DefaultBindingMetadataProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/DefaultModelMetadataProviderTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Metadata/DefaultModelMetadataProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/DefaultModelMetadataProviderTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/Metadata/DefaultModelMetadataProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/DefaultModelMetadataTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Metadata/DefaultModelMetadataTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/DefaultModelMetadataTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/Metadata/DefaultModelMetadataTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/DefaultValidationMetadataProviderTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Metadata/DefaultValidationMetadataProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/DefaultValidationMetadataProviderTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/Metadata/DefaultValidationMetadataProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/DisplayMetadataTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Metadata/DisplayMetadataTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/DisplayMetadataTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/Metadata/DisplayMetadataTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/EmptyCompositeMetadataDetailsProvider.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Metadata/EmptyCompositeMetadataDetailsProvider.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/EmptyCompositeMetadataDetailsProvider.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/Metadata/EmptyCompositeMetadataDetailsProvider.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/ExcludeBindingMetadataProviderTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Metadata/ExcludeBindingMetadataProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/ExcludeBindingMetadataProviderTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/Metadata/ExcludeBindingMetadataProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/HasValidatorsValidationMetadataProviderTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Metadata/HasValidatorsValidationMetadataProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/HasValidatorsValidationMetadataProviderTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/Metadata/HasValidatorsValidationMetadataProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/MetadataDetailsProviderExtensionsTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Metadata/MetadataDetailsProviderExtensionsTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/MetadataDetailsProviderExtensionsTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/Metadata/MetadataDetailsProviderExtensionsTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/ModelAttributesTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Metadata/ModelAttributesTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/ModelAttributesTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/Metadata/ModelAttributesTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/ModelBinderAttributeTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Metadata/ModelBinderAttributeTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/ModelBinderAttributeTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/Metadata/ModelBinderAttributeTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/ModelMetadataProviderExtensionsTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Metadata/ModelMetadataProviderExtensionsTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/ModelMetadataProviderExtensionsTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/Metadata/ModelMetadataProviderExtensionsTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/ModelBinderFactoryTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/ModelBinderFactoryTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/ModelBinderFactoryTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/ModelBinderFactoryTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/ModelBinderProviderExtensionsTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/ModelBinderProviderExtensionsTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/ModelBinderProviderExtensionsTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/ModelBinderProviderExtensionsTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/ModelBindingHelperTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/ModelBindingHelperTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/ModelBindingHelperTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/ModelBindingHelperTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/ModelBindingResultTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/ModelBindingResultTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/ModelBindingResultTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/ModelBindingResultTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/ParameterBinderTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/ParameterBinderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/ParameterBinderTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/ParameterBinderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/PrefixContainerTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/PrefixContainerTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/PrefixContainerTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/PrefixContainerTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/QueryStringValueProviderFactoryTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/QueryStringValueProviderFactoryTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/QueryStringValueProviderFactoryTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/QueryStringValueProviderFactoryTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/QueryStringValueProviderTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/QueryStringValueProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/QueryStringValueProviderTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/QueryStringValueProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/ReferenceEqualityComparerTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/ReferenceEqualityComparerTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/ReferenceEqualityComparerTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/ReferenceEqualityComparerTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/RouteValueProviderTests.cs b/src/Mvc/Mvc.Core/test/ModelBinding/RouteValueProviderTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/RouteValueProviderTests.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/RouteValueProviderTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/StubModelBinder.cs b/src/Mvc/Mvc.Core/test/ModelBinding/StubModelBinder.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/StubModelBinder.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/StubModelBinder.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/TestModelBinderProviderContext.cs b/src/Mvc/Mvc.Core/test/ModelBinding/TestModelBinderProviderContext.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/TestModelBinderProviderContext.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/TestModelBinderProviderContext.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/TestValueProvider.cs b/src/Mvc/Mvc.Core/test/ModelBinding/TestValueProvider.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/TestValueProvider.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/TestValueProvider.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/UnsupportedContentTypeFilterTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/UnsupportedContentTypeFilterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/UnsupportedContentTypeFilterTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/UnsupportedContentTypeFilterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/ClientValidatorCacheTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Validation/ClientValidatorCacheTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/ClientValidatorCacheTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/Validation/ClientValidatorCacheTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/CompositeModelValidatorProviderTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Validation/CompositeModelValidatorProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/CompositeModelValidatorProviderTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/Validation/CompositeModelValidatorProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/DefaultCollectionValidationStrategyTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Validation/DefaultCollectionValidationStrategyTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/DefaultCollectionValidationStrategyTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/Validation/DefaultCollectionValidationStrategyTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/DefaultComplexObjectValidationStrategyTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Validation/DefaultComplexObjectValidationStrategyTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/DefaultComplexObjectValidationStrategyTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/Validation/DefaultComplexObjectValidationStrategyTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/DefaultModelValidatorProviderTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Validation/DefaultModelValidatorProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/DefaultModelValidatorProviderTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/Validation/DefaultModelValidatorProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/DefaultObjectValidatorTests.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Validation/DefaultObjectValidatorTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/DefaultObjectValidatorTests.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/Validation/DefaultObjectValidatorTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/ExplicitIndexCollectionValidationStrategyTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Validation/ExplicitIndexCollectionValidationStrategyTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/ExplicitIndexCollectionValidationStrategyTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/Validation/ExplicitIndexCollectionValidationStrategyTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/ModelValidatorProviderExtensionsTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Validation/ModelValidatorProviderExtensionsTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/ModelValidatorProviderExtensionsTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/Validation/ModelValidatorProviderExtensionsTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/ShortFormDictionaryValidationStrategyTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Validation/ShortFormDictionaryValidationStrategyTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/ShortFormDictionaryValidationStrategyTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/Validation/ShortFormDictionaryValidationStrategyTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/ValidationStackTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Validation/ValidationStackTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/ValidationStackTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/Validation/ValidationStackTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/ValidatorCacheTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Validation/ValidatorCacheTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/ValidatorCacheTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/Validation/ValidatorCacheTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/ValueProviderFactoryExtensionsTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/ValueProviderFactoryExtensionsTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/ValueProviderFactoryExtensionsTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/ValueProviderFactoryExtensionsTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/MvcCoreLoggerExtensionsTest.cs b/src/Mvc/Mvc.Core/test/MvcCoreLoggerExtensionsTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/MvcCoreLoggerExtensionsTest.cs
rename to src/Mvc/Mvc.Core/test/MvcCoreLoggerExtensionsTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/MvcOptionsTest.cs b/src/Mvc/Mvc.Core/test/MvcOptionsTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/MvcOptionsTest.cs
rename to src/Mvc/Mvc.Core/test/MvcOptionsTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ObjectResultTests.cs b/src/Mvc/Mvc.Core/test/ObjectResultTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ObjectResultTests.cs
rename to src/Mvc/Mvc.Core/test/ObjectResultTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/PhysicalFileResultTest.cs b/src/Mvc/Mvc.Core/test/PhysicalFileResultTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/PhysicalFileResultTest.cs
rename to src/Mvc/Mvc.Core/test/PhysicalFileResultTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ProducesAttributeTests.cs b/src/Mvc/Mvc.Core/test/ProducesAttributeTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ProducesAttributeTests.cs
rename to src/Mvc/Mvc.Core/test/ProducesAttributeTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Properties/AssemblyInfo.cs b/src/Mvc/Mvc.Core/test/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Properties/AssemblyInfo.cs
rename to src/Mvc/Mvc.Core/test/Properties/AssemblyInfo.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/RedirectResultTest.cs b/src/Mvc/Mvc.Core/test/RedirectResultTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/RedirectResultTest.cs
rename to src/Mvc/Mvc.Core/test/RedirectResultTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/RedirectToActionResultTest.cs b/src/Mvc/Mvc.Core/test/RedirectToActionResultTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/RedirectToActionResultTest.cs
rename to src/Mvc/Mvc.Core/test/RedirectToActionResultTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/RedirectToPageResultTest.cs b/src/Mvc/Mvc.Core/test/RedirectToPageResultTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/RedirectToPageResultTest.cs
rename to src/Mvc/Mvc.Core/test/RedirectToPageResultTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/RedirectToRouteResultTest.cs b/src/Mvc/Mvc.Core/test/RedirectToRouteResultTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/RedirectToRouteResultTest.cs
rename to src/Mvc/Mvc.Core/test/RedirectToRouteResultTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/RequestFormLimitsAttributeTest.cs b/src/Mvc/Mvc.Core/test/RequestFormLimitsAttributeTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/RequestFormLimitsAttributeTest.cs
rename to src/Mvc/Mvc.Core/test/RequestFormLimitsAttributeTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/RequireHttpsAttributeTests.cs b/src/Mvc/Mvc.Core/test/RequireHttpsAttributeTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/RequireHttpsAttributeTests.cs
rename to src/Mvc/Mvc.Core/test/RequireHttpsAttributeTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ResponseCacheAttributeTest.cs b/src/Mvc/Mvc.Core/test/ResponseCacheAttributeTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ResponseCacheAttributeTest.cs
rename to src/Mvc/Mvc.Core/test/ResponseCacheAttributeTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/ActionEndpointDataSourceBaseTest.cs b/src/Mvc/Mvc.Core/test/Routing/ActionEndpointDataSourceBaseTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/ActionEndpointDataSourceBaseTest.cs
rename to src/Mvc/Mvc.Core/test/Routing/ActionEndpointDataSourceBaseTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/ActionEndpointDataSourceTest.cs b/src/Mvc/Mvc.Core/test/Routing/ActionEndpointDataSourceTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/ActionEndpointDataSourceTest.cs
rename to src/Mvc/Mvc.Core/test/Routing/ActionEndpointDataSourceTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/ActionEndpointFactoryTest.cs b/src/Mvc/Mvc.Core/test/Routing/ActionEndpointFactoryTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/ActionEndpointFactoryTest.cs
rename to src/Mvc/Mvc.Core/test/Routing/ActionEndpointFactoryTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/AttributeRouteTest.cs b/src/Mvc/Mvc.Core/test/Routing/AttributeRouteTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/AttributeRouteTest.cs
rename to src/Mvc/Mvc.Core/test/Routing/AttributeRouteTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/AttributeRoutingTest.cs b/src/Mvc/Mvc.Core/test/Routing/AttributeRoutingTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/AttributeRoutingTest.cs
rename to src/Mvc/Mvc.Core/test/Routing/AttributeRoutingTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/ConsumesMatcherPolicyTest.cs b/src/Mvc/Mvc.Core/test/Routing/ConsumesMatcherPolicyTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/ConsumesMatcherPolicyTest.cs
rename to src/Mvc/Mvc.Core/test/Routing/ConsumesMatcherPolicyTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/ControllerActionEndpointDataSourceTest.cs b/src/Mvc/Mvc.Core/test/Routing/ControllerActionEndpointDataSourceTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/ControllerActionEndpointDataSourceTest.cs
rename to src/Mvc/Mvc.Core/test/Routing/ControllerActionEndpointDataSourceTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/ControllerLinkGeneratorExtensionsTest.cs b/src/Mvc/Mvc.Core/test/Routing/ControllerLinkGeneratorExtensionsTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/ControllerLinkGeneratorExtensionsTest.cs
rename to src/Mvc/Mvc.Core/test/Routing/ControllerLinkGeneratorExtensionsTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/EndpointRoutingUrlHelperTest.cs b/src/Mvc/Mvc.Core/test/Routing/EndpointRoutingUrlHelperTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/EndpointRoutingUrlHelperTest.cs
rename to src/Mvc/Mvc.Core/test/Routing/EndpointRoutingUrlHelperTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/HttpMethodProviderAttributesTests.cs b/src/Mvc/Mvc.Core/test/Routing/HttpMethodProviderAttributesTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/HttpMethodProviderAttributesTests.cs
rename to src/Mvc/Mvc.Core/test/Routing/HttpMethodProviderAttributesTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/KnownRouteValueConstraintTests.cs b/src/Mvc/Mvc.Core/test/Routing/KnownRouteValueConstraintTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/KnownRouteValueConstraintTests.cs
rename to src/Mvc/Mvc.Core/test/Routing/KnownRouteValueConstraintTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/MvcRouteHandlerTests.cs b/src/Mvc/Mvc.Core/test/Routing/MvcRouteHandlerTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/MvcRouteHandlerTests.cs
rename to src/Mvc/Mvc.Core/test/Routing/MvcRouteHandlerTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/PageLinkGeneratorExtensionsTest.cs b/src/Mvc/Mvc.Core/test/Routing/PageLinkGeneratorExtensionsTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/PageLinkGeneratorExtensionsTest.cs
rename to src/Mvc/Mvc.Core/test/Routing/PageLinkGeneratorExtensionsTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/RoutePatternWriterTests.cs b/src/Mvc/Mvc.Core/test/Routing/RoutePatternWriterTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/RoutePatternWriterTests.cs
rename to src/Mvc/Mvc.Core/test/Routing/RoutePatternWriterTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/RouteTemplateProviderAttributesTest.cs b/src/Mvc/Mvc.Core/test/Routing/RouteTemplateProviderAttributesTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/RouteTemplateProviderAttributesTest.cs
rename to src/Mvc/Mvc.Core/test/Routing/RouteTemplateProviderAttributesTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/UrlHelperBaseTest.cs b/src/Mvc/Mvc.Core/test/Routing/UrlHelperBaseTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/UrlHelperBaseTest.cs
rename to src/Mvc/Mvc.Core/test/Routing/UrlHelperBaseTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/UrlHelperExtensionsTest.cs b/src/Mvc/Mvc.Core/test/Routing/UrlHelperExtensionsTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/UrlHelperExtensionsTest.cs
rename to src/Mvc/Mvc.Core/test/Routing/UrlHelperExtensionsTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/UrlHelperTest.cs b/src/Mvc/Mvc.Core/test/Routing/UrlHelperTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/UrlHelperTest.cs
rename to src/Mvc/Mvc.Core/test/Routing/UrlHelperTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/UrlHelperTestBase.cs b/src/Mvc/Mvc.Core/test/Routing/UrlHelperTestBase.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/UrlHelperTestBase.cs
rename to src/Mvc/Mvc.Core/test/Routing/UrlHelperTestBase.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/ViewEnginePathTest.cs b/src/Mvc/Mvc.Core/test/Routing/ViewEnginePathTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/ViewEnginePathTest.cs
rename to src/Mvc/Mvc.Core/test/Routing/ViewEnginePathTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/SerializableErrorTests.cs b/src/Mvc/Mvc.Core/test/SerializableErrorTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/SerializableErrorTests.cs
rename to src/Mvc/Mvc.Core/test/SerializableErrorTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ServiceFilterAttributeTest.cs b/src/Mvc/Mvc.Core/test/ServiceFilterAttributeTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ServiceFilterAttributeTest.cs
rename to src/Mvc/Mvc.Core/test/ServiceFilterAttributeTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/SignInResultTest.cs b/src/Mvc/Mvc.Core/test/SignInResultTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/SignInResultTest.cs
rename to src/Mvc/Mvc.Core/test/SignInResultTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/SignOutResultTest.cs b/src/Mvc/Mvc.Core/test/SignOutResultTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/SignOutResultTest.cs
rename to src/Mvc/Mvc.Core/test/SignOutResultTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/TestApplicationPart.cs b/src/Mvc/Mvc.Core/test/TestApplicationPart.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/TestApplicationPart.cs
rename to src/Mvc/Mvc.Core/test/TestApplicationPart.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/TestFeatureProvider.cs b/src/Mvc/Mvc.Core/test/TestFeatureProvider.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/TestFeatureProvider.cs
rename to src/Mvc/Mvc.Core/test/TestFeatureProvider.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/TypeFilterAttributeTest.cs b/src/Mvc/Mvc.Core/test/TypeFilterAttributeTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/TypeFilterAttributeTest.cs
rename to src/Mvc/Mvc.Core/test/TypeFilterAttributeTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/UnprocessableEntityObjectResultTests.cs b/src/Mvc/Mvc.Core/test/UnprocessableEntityObjectResultTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/UnprocessableEntityObjectResultTests.cs
rename to src/Mvc/Mvc.Core/test/UnprocessableEntityObjectResultTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/UnprocessableEntityResultTests.cs b/src/Mvc/Mvc.Core/test/UnprocessableEntityResultTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/UnprocessableEntityResultTests.cs
rename to src/Mvc/Mvc.Core/test/UnprocessableEntityResultTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ValidationProblemDetailsTest.cs b/src/Mvc/Mvc.Core/test/ValidationProblemDetailsTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ValidationProblemDetailsTest.cs
rename to src/Mvc/Mvc.Core/test/ValidationProblemDetailsTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/VirtualFileResultTest.cs b/src/Mvc/Mvc.Core/test/VirtualFileResultTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/VirtualFileResultTest.cs
rename to src/Mvc/Mvc.Core/test/VirtualFileResultTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/xunit.runner.json b/src/Mvc/Mvc.Core/test/xunit.runner.json
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/xunit.runner.json
rename to src/Mvc/Mvc.Core/test/xunit.runner.json
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/CorsApplicationModelProvider.cs b/src/Mvc/Mvc.Cors/src/CorsApplicationModelProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/CorsApplicationModelProvider.cs
rename to src/Mvc/Mvc.Cors/src/CorsApplicationModelProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/CorsAuthorizationFilter.cs b/src/Mvc/Mvc.Cors/src/CorsAuthorizationFilter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/CorsAuthorizationFilter.cs
rename to src/Mvc/Mvc.Cors/src/CorsAuthorizationFilter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/CorsAuthorizationFilterFactory.cs b/src/Mvc/Mvc.Cors/src/CorsAuthorizationFilterFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/CorsAuthorizationFilterFactory.cs
rename to src/Mvc/Mvc.Cors/src/CorsAuthorizationFilterFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/CorsHttpMethodActionConstraint.cs b/src/Mvc/Mvc.Cors/src/CorsHttpMethodActionConstraint.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/CorsHttpMethodActionConstraint.cs
rename to src/Mvc/Mvc.Cors/src/CorsHttpMethodActionConstraint.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/CorsLoggerExtensions.cs b/src/Mvc/Mvc.Cors/src/CorsLoggerExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/CorsLoggerExtensions.cs
rename to src/Mvc/Mvc.Cors/src/CorsLoggerExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/DependencyInjection/MvcCorsMvcCoreBuilderExtensions.cs b/src/Mvc/Mvc.Cors/src/DependencyInjection/MvcCorsMvcCoreBuilderExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/DependencyInjection/MvcCorsMvcCoreBuilderExtensions.cs
rename to src/Mvc/Mvc.Cors/src/DependencyInjection/MvcCorsMvcCoreBuilderExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/DisableCorsAuthorizationFilter.cs b/src/Mvc/Mvc.Cors/src/DisableCorsAuthorizationFilter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/DisableCorsAuthorizationFilter.cs
rename to src/Mvc/Mvc.Cors/src/DisableCorsAuthorizationFilter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/ICorsAuthorizationFilter.cs b/src/Mvc/Mvc.Cors/src/ICorsAuthorizationFilter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/ICorsAuthorizationFilter.cs
rename to src/Mvc/Mvc.Cors/src/ICorsAuthorizationFilter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/Microsoft.AspNetCore.Mvc.Cors.csproj b/src/Mvc/Mvc.Cors/src/Microsoft.AspNetCore.Mvc.Cors.csproj
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/Microsoft.AspNetCore.Mvc.Cors.csproj
rename to src/Mvc/Mvc.Cors/src/Microsoft.AspNetCore.Mvc.Cors.csproj
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/Properties/AssemblyInfo.cs b/src/Mvc/Mvc.Cors/src/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/Properties/AssemblyInfo.cs
rename to src/Mvc/Mvc.Cors/src/Properties/AssemblyInfo.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/Properties/Resources.Designer.cs b/src/Mvc/Mvc.Cors/src/Properties/Resources.Designer.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/Properties/Resources.Designer.cs
rename to src/Mvc/Mvc.Cors/src/Properties/Resources.Designer.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/Resources.resx b/src/Mvc/Mvc.Cors/src/Resources.resx
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/Resources.resx
rename to src/Mvc/Mvc.Cors/src/Resources.resx
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/baseline.netcore.json b/src/Mvc/Mvc.Cors/src/baseline.netcore.json
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/baseline.netcore.json
rename to src/Mvc/Mvc.Cors/src/baseline.netcore.json
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/breakingchanges.netcore.json b/src/Mvc/Mvc.Cors/src/breakingchanges.netcore.json
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/breakingchanges.netcore.json
rename to src/Mvc/Mvc.Cors/src/breakingchanges.netcore.json
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Cors.Test/CorsApplicationModelProviderTest.cs b/src/Mvc/Mvc.Cors/test/CorsApplicationModelProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Cors.Test/CorsApplicationModelProviderTest.cs
rename to src/Mvc/Mvc.Cors/test/CorsApplicationModelProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Cors.Test/CorsAuthorizationFilterTest.cs b/src/Mvc/Mvc.Cors/test/CorsAuthorizationFilterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Cors.Test/CorsAuthorizationFilterTest.cs
rename to src/Mvc/Mvc.Cors/test/CorsAuthorizationFilterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Cors.Test/CorsHttpMethodActionConstraintTest.cs b/src/Mvc/Mvc.Cors/test/CorsHttpMethodActionConstraintTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Cors.Test/CorsHttpMethodActionConstraintTest.cs
rename to src/Mvc/Mvc.Cors/test/CorsHttpMethodActionConstraintTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Cors.Test/DisableCorsAuthorizationFilterTest.cs b/src/Mvc/Mvc.Cors/test/DisableCorsAuthorizationFilterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Cors.Test/DisableCorsAuthorizationFilterTest.cs
rename to src/Mvc/Mvc.Cors/test/DisableCorsAuthorizationFilterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Cors.Test/Microsoft.AspNetCore.Mvc.Cors.Test.csproj b/src/Mvc/Mvc.Cors/test/Microsoft.AspNetCore.Mvc.Cors.Test.csproj
similarity index 63%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Cors.Test/Microsoft.AspNetCore.Mvc.Cors.Test.csproj
rename to src/Mvc/Mvc.Cors/test/Microsoft.AspNetCore.Mvc.Cors.Test.csproj
index 1a437fad37..ce15e8efbc 100644
--- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Cors.Test/Microsoft.AspNetCore.Mvc.Cors.Test.csproj
+++ b/src/Mvc/Mvc.Cors/test/Microsoft.AspNetCore.Mvc.Cors.Test.csproj
@@ -6,7 +6,7 @@
 
   <ItemGroup>
     <Reference Include="Microsoft.AspNetCore.Mvc.Cors" />
-    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.Core.TestCommon\Microsoft.AspNetCore.Mvc.Core.TestCommon.csproj" />
+    <ProjectReference Include="..\..\shared\Mvc.Core.TestCommon\Microsoft.AspNetCore.Mvc.Core.TestCommon.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/AttributeAdapterBase.cs b/src/Mvc/Mvc.DataAnnotations/src/AttributeAdapterBase.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/AttributeAdapterBase.cs
rename to src/Mvc/Mvc.DataAnnotations/src/AttributeAdapterBase.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/CompareAttributeAdapter.cs b/src/Mvc/Mvc.DataAnnotations/src/CompareAttributeAdapter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/CompareAttributeAdapter.cs
rename to src/Mvc/Mvc.DataAnnotations/src/CompareAttributeAdapter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/DataAnnotationsClientModelValidatorProvider.cs b/src/Mvc/Mvc.DataAnnotations/src/DataAnnotationsClientModelValidatorProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/DataAnnotationsClientModelValidatorProvider.cs
rename to src/Mvc/Mvc.DataAnnotations/src/DataAnnotationsClientModelValidatorProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/DataAnnotationsLocalizationServices.cs b/src/Mvc/Mvc.DataAnnotations/src/DataAnnotationsLocalizationServices.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/DataAnnotationsLocalizationServices.cs
rename to src/Mvc/Mvc.DataAnnotations/src/DataAnnotationsLocalizationServices.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/DataAnnotationsMetadataProvider.cs b/src/Mvc/Mvc.DataAnnotations/src/DataAnnotationsMetadataProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/DataAnnotationsMetadataProvider.cs
rename to src/Mvc/Mvc.DataAnnotations/src/DataAnnotationsMetadataProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/DataAnnotationsModelValidator.cs b/src/Mvc/Mvc.DataAnnotations/src/DataAnnotationsModelValidator.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/DataAnnotationsModelValidator.cs
rename to src/Mvc/Mvc.DataAnnotations/src/DataAnnotationsModelValidator.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/DataAnnotationsModelValidatorProvider.cs b/src/Mvc/Mvc.DataAnnotations/src/DataAnnotationsModelValidatorProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/DataAnnotationsModelValidatorProvider.cs
rename to src/Mvc/Mvc.DataAnnotations/src/DataAnnotationsModelValidatorProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/DataTypeAttributeAdapter.cs b/src/Mvc/Mvc.DataAnnotations/src/DataTypeAttributeAdapter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/DataTypeAttributeAdapter.cs
rename to src/Mvc/Mvc.DataAnnotations/src/DataTypeAttributeAdapter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/DefaultClientModelValidatorProvider.cs b/src/Mvc/Mvc.DataAnnotations/src/DefaultClientModelValidatorProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/DefaultClientModelValidatorProvider.cs
rename to src/Mvc/Mvc.DataAnnotations/src/DefaultClientModelValidatorProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/DependencyInjection/MvcDataAnnotationsLocalizationOptionsSetup.cs b/src/Mvc/Mvc.DataAnnotations/src/DependencyInjection/MvcDataAnnotationsLocalizationOptionsSetup.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/DependencyInjection/MvcDataAnnotationsLocalizationOptionsSetup.cs
rename to src/Mvc/Mvc.DataAnnotations/src/DependencyInjection/MvcDataAnnotationsLocalizationOptionsSetup.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/DependencyInjection/MvcDataAnnotationsMvcBuilderExtensions.cs b/src/Mvc/Mvc.DataAnnotations/src/DependencyInjection/MvcDataAnnotationsMvcBuilderExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/DependencyInjection/MvcDataAnnotationsMvcBuilderExtensions.cs
rename to src/Mvc/Mvc.DataAnnotations/src/DependencyInjection/MvcDataAnnotationsMvcBuilderExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/DependencyInjection/MvcDataAnnotationsMvcCoreBuilderExtensions.cs b/src/Mvc/Mvc.DataAnnotations/src/DependencyInjection/MvcDataAnnotationsMvcCoreBuilderExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/DependencyInjection/MvcDataAnnotationsMvcCoreBuilderExtensions.cs
rename to src/Mvc/Mvc.DataAnnotations/src/DependencyInjection/MvcDataAnnotationsMvcCoreBuilderExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/DependencyInjection/MvcDataAnnotationsMvcOptionsSetup.cs b/src/Mvc/Mvc.DataAnnotations/src/DependencyInjection/MvcDataAnnotationsMvcOptionsSetup.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/DependencyInjection/MvcDataAnnotationsMvcOptionsSetup.cs
rename to src/Mvc/Mvc.DataAnnotations/src/DependencyInjection/MvcDataAnnotationsMvcOptionsSetup.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/FileExtensionsAttributeAdapter.cs b/src/Mvc/Mvc.DataAnnotations/src/FileExtensionsAttributeAdapter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/FileExtensionsAttributeAdapter.cs
rename to src/Mvc/Mvc.DataAnnotations/src/FileExtensionsAttributeAdapter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/HiddenInputAttribute.cs b/src/Mvc/Mvc.DataAnnotations/src/HiddenInputAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/HiddenInputAttribute.cs
rename to src/Mvc/Mvc.DataAnnotations/src/HiddenInputAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/IAttributeAdapter.cs b/src/Mvc/Mvc.DataAnnotations/src/IAttributeAdapter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/IAttributeAdapter.cs
rename to src/Mvc/Mvc.DataAnnotations/src/IAttributeAdapter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/IValidationAttributeAdapterProvider.cs b/src/Mvc/Mvc.DataAnnotations/src/IValidationAttributeAdapterProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/IValidationAttributeAdapterProvider.cs
rename to src/Mvc/Mvc.DataAnnotations/src/IValidationAttributeAdapterProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/MaxLengthAttributeAdapter.cs b/src/Mvc/Mvc.DataAnnotations/src/MaxLengthAttributeAdapter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/MaxLengthAttributeAdapter.cs
rename to src/Mvc/Mvc.DataAnnotations/src/MaxLengthAttributeAdapter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Microsoft.AspNetCore.Mvc.DataAnnotations.csproj b/src/Mvc/Mvc.DataAnnotations/src/Microsoft.AspNetCore.Mvc.DataAnnotations.csproj
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Microsoft.AspNetCore.Mvc.DataAnnotations.csproj
rename to src/Mvc/Mvc.DataAnnotations/src/Microsoft.AspNetCore.Mvc.DataAnnotations.csproj
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/MinLengthAttributeAdapter.cs b/src/Mvc/Mvc.DataAnnotations/src/MinLengthAttributeAdapter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/MinLengthAttributeAdapter.cs
rename to src/Mvc/Mvc.DataAnnotations/src/MinLengthAttributeAdapter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/MvcDataAnnotationsLocalizationOptions.cs b/src/Mvc/Mvc.DataAnnotations/src/MvcDataAnnotationsLocalizationOptions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/MvcDataAnnotationsLocalizationOptions.cs
rename to src/Mvc/Mvc.DataAnnotations/src/MvcDataAnnotationsLocalizationOptions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/NumericClientModelValidator.cs b/src/Mvc/Mvc.DataAnnotations/src/NumericClientModelValidator.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/NumericClientModelValidator.cs
rename to src/Mvc/Mvc.DataAnnotations/src/NumericClientModelValidator.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/NumericClientModelValidatorProvider.cs b/src/Mvc/Mvc.DataAnnotations/src/NumericClientModelValidatorProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/NumericClientModelValidatorProvider.cs
rename to src/Mvc/Mvc.DataAnnotations/src/NumericClientModelValidatorProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Properties/AssemblyInfo.cs b/src/Mvc/Mvc.DataAnnotations/src/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Properties/AssemblyInfo.cs
rename to src/Mvc/Mvc.DataAnnotations/src/Properties/AssemblyInfo.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Properties/Resources.Designer.cs b/src/Mvc/Mvc.DataAnnotations/src/Properties/Resources.Designer.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Properties/Resources.Designer.cs
rename to src/Mvc/Mvc.DataAnnotations/src/Properties/Resources.Designer.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/RangeAttributeAdapter.cs b/src/Mvc/Mvc.DataAnnotations/src/RangeAttributeAdapter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/RangeAttributeAdapter.cs
rename to src/Mvc/Mvc.DataAnnotations/src/RangeAttributeAdapter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/RegularExpressionAttributeAdapter.cs b/src/Mvc/Mvc.DataAnnotations/src/RegularExpressionAttributeAdapter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/RegularExpressionAttributeAdapter.cs
rename to src/Mvc/Mvc.DataAnnotations/src/RegularExpressionAttributeAdapter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/RequiredAttributeAdapter.cs b/src/Mvc/Mvc.DataAnnotations/src/RequiredAttributeAdapter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/RequiredAttributeAdapter.cs
rename to src/Mvc/Mvc.DataAnnotations/src/RequiredAttributeAdapter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Resources.resx b/src/Mvc/Mvc.DataAnnotations/src/Resources.resx
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Resources.resx
rename to src/Mvc/Mvc.DataAnnotations/src/Resources.resx
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/StringLengthAttributeAdapter.cs b/src/Mvc/Mvc.DataAnnotations/src/StringLengthAttributeAdapter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/StringLengthAttributeAdapter.cs
rename to src/Mvc/Mvc.DataAnnotations/src/StringLengthAttributeAdapter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/ValidatableObjectAdapter.cs b/src/Mvc/Mvc.DataAnnotations/src/ValidatableObjectAdapter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/ValidatableObjectAdapter.cs
rename to src/Mvc/Mvc.DataAnnotations/src/ValidatableObjectAdapter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/ValidationAttributeAdapterOfTAttribute.cs b/src/Mvc/Mvc.DataAnnotations/src/ValidationAttributeAdapterOfTAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/ValidationAttributeAdapterOfTAttribute.cs
rename to src/Mvc/Mvc.DataAnnotations/src/ValidationAttributeAdapterOfTAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/ValidationAttributeAdapterProvider.cs b/src/Mvc/Mvc.DataAnnotations/src/ValidationAttributeAdapterProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/ValidationAttributeAdapterProvider.cs
rename to src/Mvc/Mvc.DataAnnotations/src/ValidationAttributeAdapterProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/ValidationProviderAttribute.cs b/src/Mvc/Mvc.DataAnnotations/src/ValidationProviderAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/ValidationProviderAttribute.cs
rename to src/Mvc/Mvc.DataAnnotations/src/ValidationProviderAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/baseline.netcore.json b/src/Mvc/Mvc.DataAnnotations/src/baseline.netcore.json
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/baseline.netcore.json
rename to src/Mvc/Mvc.DataAnnotations/src/baseline.netcore.json
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/CompareAttributeAdapterTest.cs b/src/Mvc/Mvc.DataAnnotations/test/CompareAttributeAdapterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/CompareAttributeAdapterTest.cs
rename to src/Mvc/Mvc.DataAnnotations/test/CompareAttributeAdapterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/DataAnnotationsClientModelValidatorProviderTest.cs b/src/Mvc/Mvc.DataAnnotations/test/DataAnnotationsClientModelValidatorProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/DataAnnotationsClientModelValidatorProviderTest.cs
rename to src/Mvc/Mvc.DataAnnotations/test/DataAnnotationsClientModelValidatorProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/DataAnnotationsMetadataProviderTest.cs b/src/Mvc/Mvc.DataAnnotations/test/DataAnnotationsMetadataProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/DataAnnotationsMetadataProviderTest.cs
rename to src/Mvc/Mvc.DataAnnotations/test/DataAnnotationsMetadataProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/DataAnnotationsModelValidatorProviderTest.cs b/src/Mvc/Mvc.DataAnnotations/test/DataAnnotationsModelValidatorProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/DataAnnotationsModelValidatorProviderTest.cs
rename to src/Mvc/Mvc.DataAnnotations/test/DataAnnotationsModelValidatorProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/DataAnnotationsModelValidatorTest.cs b/src/Mvc/Mvc.DataAnnotations/test/DataAnnotationsModelValidatorTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/DataAnnotationsModelValidatorTest.cs
rename to src/Mvc/Mvc.DataAnnotations/test/DataAnnotationsModelValidatorTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/DataMemberRequiredBindingMetadataProviderTest.cs b/src/Mvc/Mvc.DataAnnotations/test/DataMemberRequiredBindingMetadataProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/DataMemberRequiredBindingMetadataProviderTest.cs
rename to src/Mvc/Mvc.DataAnnotations/test/DataMemberRequiredBindingMetadataProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/DataTypeClientModelValidatorProviderTest.cs b/src/Mvc/Mvc.DataAnnotations/test/DataTypeClientModelValidatorProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/DataTypeClientModelValidatorProviderTest.cs
rename to src/Mvc/Mvc.DataAnnotations/test/DataTypeClientModelValidatorProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/DefaultModelClientValidatorProviderTest.cs b/src/Mvc/Mvc.DataAnnotations/test/DefaultModelClientValidatorProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/DefaultModelClientValidatorProviderTest.cs
rename to src/Mvc/Mvc.DataAnnotations/test/DefaultModelClientValidatorProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/FileExtensionsAttributeAdapterTest.cs b/src/Mvc/Mvc.DataAnnotations/test/FileExtensionsAttributeAdapterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/FileExtensionsAttributeAdapterTest.cs
rename to src/Mvc/Mvc.DataAnnotations/test/FileExtensionsAttributeAdapterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/MaxLengthAttributeAdapterTest.cs b/src/Mvc/Mvc.DataAnnotations/test/MaxLengthAttributeAdapterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/MaxLengthAttributeAdapterTest.cs
rename to src/Mvc/Mvc.DataAnnotations/test/MaxLengthAttributeAdapterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test.csproj b/src/Mvc/Mvc.DataAnnotations/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test.csproj
similarity index 64%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test.csproj
rename to src/Mvc/Mvc.DataAnnotations/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test.csproj
index 3bf662bbd4..e841d748dd 100644
--- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test.csproj
+++ b/src/Mvc/Mvc.DataAnnotations/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.Core.TestCommon\Microsoft.AspNetCore.Mvc.Core.TestCommon.csproj" />
+    <ProjectReference Include="..\..\shared\Mvc.Core.TestCommon\Microsoft.AspNetCore.Mvc.Core.TestCommon.csproj" />
 
     <Reference Include="Microsoft.Extensions.Logging.Testing" />
   </ItemGroup>
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/MinLengthAttributeAdapterTest.cs b/src/Mvc/Mvc.DataAnnotations/test/MinLengthAttributeAdapterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/MinLengthAttributeAdapterTest.cs
rename to src/Mvc/Mvc.DataAnnotations/test/MinLengthAttributeAdapterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/ModelMetadataProviderTest.cs b/src/Mvc/Mvc.DataAnnotations/test/ModelMetadataProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/ModelMetadataProviderTest.cs
rename to src/Mvc/Mvc.DataAnnotations/test/ModelMetadataProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/ModelValidationResultComparer.cs b/src/Mvc/Mvc.DataAnnotations/test/ModelValidationResultComparer.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/ModelValidationResultComparer.cs
rename to src/Mvc/Mvc.DataAnnotations/test/ModelValidationResultComparer.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/MvcDataAnnotationsMvcOptionsSetup.cs b/src/Mvc/Mvc.DataAnnotations/test/MvcDataAnnotationsMvcOptionsSetup.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/MvcDataAnnotationsMvcOptionsSetup.cs
rename to src/Mvc/Mvc.DataAnnotations/test/MvcDataAnnotationsMvcOptionsSetup.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/NumericClientModelValidatorTest.cs b/src/Mvc/Mvc.DataAnnotations/test/NumericClientModelValidatorTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/NumericClientModelValidatorTest.cs
rename to src/Mvc/Mvc.DataAnnotations/test/NumericClientModelValidatorTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Properties/Resources.Designer.cs b/src/Mvc/Mvc.DataAnnotations/test/Properties/Resources.Designer.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Properties/Resources.Designer.cs
rename to src/Mvc/Mvc.DataAnnotations/test/Properties/Resources.Designer.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/RangeAttributeAdapterTest.cs b/src/Mvc/Mvc.DataAnnotations/test/RangeAttributeAdapterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/RangeAttributeAdapterTest.cs
rename to src/Mvc/Mvc.DataAnnotations/test/RangeAttributeAdapterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/RequiredAttributeAdapterTest.cs b/src/Mvc/Mvc.DataAnnotations/test/RequiredAttributeAdapterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/RequiredAttributeAdapterTest.cs
rename to src/Mvc/Mvc.DataAnnotations/test/RequiredAttributeAdapterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Resources.resx b/src/Mvc/Mvc.DataAnnotations/test/Resources.resx
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Resources.resx
rename to src/Mvc/Mvc.DataAnnotations/test/Resources.resx
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/StringLengthAttributeAdapterTest.cs b/src/Mvc/Mvc.DataAnnotations/test/StringLengthAttributeAdapterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/StringLengthAttributeAdapterTest.cs
rename to src/Mvc/Mvc.DataAnnotations/test/StringLengthAttributeAdapterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/TestModelNameProvider.cs b/src/Mvc/Mvc.DataAnnotations/test/TestModelNameProvider.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/TestModelNameProvider.cs
rename to src/Mvc/Mvc.DataAnnotations/test/TestModelNameProvider.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/TestResources.cs b/src/Mvc/Mvc.DataAnnotations/test/TestResources.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/TestResources.cs
rename to src/Mvc/Mvc.DataAnnotations/test/TestResources.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/ValidatableObjectAdapterTest.cs b/src/Mvc/Mvc.DataAnnotations/test/ValidatableObjectAdapterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/ValidatableObjectAdapterTest.cs
rename to src/Mvc/Mvc.DataAnnotations/test/ValidatableObjectAdapterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/ValidationAttributeAdapterOfTAttributeTest.cs b/src/Mvc/Mvc.DataAnnotations/test/ValidationAttributeAdapterOfTAttributeTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/ValidationAttributeAdapterOfTAttributeTest.cs
rename to src/Mvc/Mvc.DataAnnotations/test/ValidationAttributeAdapterOfTAttributeTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/ValidationAttributeAdapterProviderTest.cs b/src/Mvc/Mvc.DataAnnotations/test/ValidationAttributeAdapterProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/ValidationAttributeAdapterProviderTest.cs
rename to src/Mvc/Mvc.DataAnnotations/test/ValidationAttributeAdapterProviderTest.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/Microsoft.AspNetCore.Mvc.Formatters.Json.csproj b/src/Mvc/Mvc.Formatters.Json/src/Microsoft.AspNetCore.Mvc.Formatters.Json.csproj
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/Microsoft.AspNetCore.Mvc.Formatters.Json.csproj
rename to src/Mvc/Mvc.Formatters.Json/src/Microsoft.AspNetCore.Mvc.Formatters.Json.csproj
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/Properties/AssemblyInfo.cs b/src/Mvc/Mvc.Formatters.Json/src/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/Properties/AssemblyInfo.cs
rename to src/Mvc/Mvc.Formatters.Json/src/Properties/AssemblyInfo.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/DelegatingEnumerable.cs b/src/Mvc/Mvc.Formatters.Xml/src/DelegatingEnumerable.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/DelegatingEnumerable.cs
rename to src/Mvc/Mvc.Formatters.Xml/src/DelegatingEnumerable.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/DelegatingEnumerator.cs b/src/Mvc/Mvc.Formatters.Xml/src/DelegatingEnumerator.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/DelegatingEnumerator.cs
rename to src/Mvc/Mvc.Formatters.Xml/src/DelegatingEnumerator.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/DependencyInjection/MvcXmlMvcBuilderExtensions.cs b/src/Mvc/Mvc.Formatters.Xml/src/DependencyInjection/MvcXmlMvcBuilderExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/DependencyInjection/MvcXmlMvcBuilderExtensions.cs
rename to src/Mvc/Mvc.Formatters.Xml/src/DependencyInjection/MvcXmlMvcBuilderExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/DependencyInjection/MvcXmlMvcCoreBuilderExtensions.cs b/src/Mvc/Mvc.Formatters.Xml/src/DependencyInjection/MvcXmlMvcCoreBuilderExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/DependencyInjection/MvcXmlMvcCoreBuilderExtensions.cs
rename to src/Mvc/Mvc.Formatters.Xml/src/DependencyInjection/MvcXmlMvcCoreBuilderExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/DependencyInjection/XmlDataContractSerializerMvcOptionsSetup.cs b/src/Mvc/Mvc.Formatters.Xml/src/DependencyInjection/XmlDataContractSerializerMvcOptionsSetup.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/DependencyInjection/XmlDataContractSerializerMvcOptionsSetup.cs
rename to src/Mvc/Mvc.Formatters.Xml/src/DependencyInjection/XmlDataContractSerializerMvcOptionsSetup.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/DependencyInjection/XmlSerializerMvcOptionsSetup.cs b/src/Mvc/Mvc.Formatters.Xml/src/DependencyInjection/XmlSerializerMvcOptionsSetup.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/DependencyInjection/XmlSerializerMvcOptionsSetup.cs
rename to src/Mvc/Mvc.Formatters.Xml/src/DependencyInjection/XmlSerializerMvcOptionsSetup.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/EnumerableWrapperProvider.cs b/src/Mvc/Mvc.Formatters.Xml/src/EnumerableWrapperProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/EnumerableWrapperProvider.cs
rename to src/Mvc/Mvc.Formatters.Xml/src/EnumerableWrapperProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/EnumerableWrapperProviderFactory.cs b/src/Mvc/Mvc.Formatters.Xml/src/EnumerableWrapperProviderFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/EnumerableWrapperProviderFactory.cs
rename to src/Mvc/Mvc.Formatters.Xml/src/EnumerableWrapperProviderFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/FormattingUtilities.cs b/src/Mvc/Mvc.Formatters.Xml/src/FormattingUtilities.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/FormattingUtilities.cs
rename to src/Mvc/Mvc.Formatters.Xml/src/FormattingUtilities.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/IUnwrappable.cs b/src/Mvc/Mvc.Formatters.Xml/src/IUnwrappable.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/IUnwrappable.cs
rename to src/Mvc/Mvc.Formatters.Xml/src/IUnwrappable.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/IWrapperProvider.cs b/src/Mvc/Mvc.Formatters.Xml/src/IWrapperProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/IWrapperProvider.cs
rename to src/Mvc/Mvc.Formatters.Xml/src/IWrapperProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/IWrapperProviderFactory.cs b/src/Mvc/Mvc.Formatters.Xml/src/IWrapperProviderFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/IWrapperProviderFactory.cs
rename to src/Mvc/Mvc.Formatters.Xml/src/IWrapperProviderFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/LoggerExtensions.cs b/src/Mvc/Mvc.Formatters.Xml/src/LoggerExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/LoggerExtensions.cs
rename to src/Mvc/Mvc.Formatters.Xml/src/LoggerExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/MediaTypeHeaderValues.cs b/src/Mvc/Mvc.Formatters.Xml/src/MediaTypeHeaderValues.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/MediaTypeHeaderValues.cs
rename to src/Mvc/Mvc.Formatters.Xml/src/MediaTypeHeaderValues.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj b/src/Mvc/Mvc.Formatters.Xml/src/Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj
rename to src/Mvc/Mvc.Formatters.Xml/src/Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/ModelBinding/DataMemberRequiredBindingMetadataProvider.cs b/src/Mvc/Mvc.Formatters.Xml/src/ModelBinding/DataMemberRequiredBindingMetadataProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/ModelBinding/DataMemberRequiredBindingMetadataProvider.cs
rename to src/Mvc/Mvc.Formatters.Xml/src/ModelBinding/DataMemberRequiredBindingMetadataProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/MvcXmlOptions.cs b/src/Mvc/Mvc.Formatters.Xml/src/MvcXmlOptions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/MvcXmlOptions.cs
rename to src/Mvc/Mvc.Formatters.Xml/src/MvcXmlOptions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/ProblemDetailsWrapper.cs b/src/Mvc/Mvc.Formatters.Xml/src/ProblemDetailsWrapper.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/ProblemDetailsWrapper.cs
rename to src/Mvc/Mvc.Formatters.Xml/src/ProblemDetailsWrapper.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/ProblemDetailsWrapperProviderFactory.cs b/src/Mvc/Mvc.Formatters.Xml/src/ProblemDetailsWrapperProviderFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/ProblemDetailsWrapperProviderFactory.cs
rename to src/Mvc/Mvc.Formatters.Xml/src/ProblemDetailsWrapperProviderFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Properties/AssemblyInfo.cs b/src/Mvc/Mvc.Formatters.Xml/src/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Properties/AssemblyInfo.cs
rename to src/Mvc/Mvc.Formatters.Xml/src/Properties/AssemblyInfo.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Properties/Resources.Designer.cs b/src/Mvc/Mvc.Formatters.Xml/src/Properties/Resources.Designer.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Properties/Resources.Designer.cs
rename to src/Mvc/Mvc.Formatters.Xml/src/Properties/Resources.Designer.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Resources.resx b/src/Mvc/Mvc.Formatters.Xml/src/Resources.resx
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Resources.resx
rename to src/Mvc/Mvc.Formatters.Xml/src/Resources.resx
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/SerializableErrorWrapper.cs b/src/Mvc/Mvc.Formatters.Xml/src/SerializableErrorWrapper.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/SerializableErrorWrapper.cs
rename to src/Mvc/Mvc.Formatters.Xml/src/SerializableErrorWrapper.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/SerializableErrorWrapperProvider.cs b/src/Mvc/Mvc.Formatters.Xml/src/SerializableErrorWrapperProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/SerializableErrorWrapperProvider.cs
rename to src/Mvc/Mvc.Formatters.Xml/src/SerializableErrorWrapperProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/SerializableErrorWrapperProviderFactory.cs b/src/Mvc/Mvc.Formatters.Xml/src/SerializableErrorWrapperProviderFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/SerializableErrorWrapperProviderFactory.cs
rename to src/Mvc/Mvc.Formatters.Xml/src/SerializableErrorWrapperProviderFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/ValidationProblemDetailsWrapper.cs b/src/Mvc/Mvc.Formatters.Xml/src/ValidationProblemDetailsWrapper.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/ValidationProblemDetailsWrapper.cs
rename to src/Mvc/Mvc.Formatters.Xml/src/ValidationProblemDetailsWrapper.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/WrapperProviderContext.cs b/src/Mvc/Mvc.Formatters.Xml/src/WrapperProviderContext.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/WrapperProviderContext.cs
rename to src/Mvc/Mvc.Formatters.Xml/src/WrapperProviderContext.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/WrapperProviderFactoriesExtensions.cs b/src/Mvc/Mvc.Formatters.Xml/src/WrapperProviderFactoriesExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/WrapperProviderFactoriesExtensions.cs
rename to src/Mvc/Mvc.Formatters.Xml/src/WrapperProviderFactoriesExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/XmlDataContractSerializerInputFormatter.cs b/src/Mvc/Mvc.Formatters.Xml/src/XmlDataContractSerializerInputFormatter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/XmlDataContractSerializerInputFormatter.cs
rename to src/Mvc/Mvc.Formatters.Xml/src/XmlDataContractSerializerInputFormatter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/XmlDataContractSerializerOutputFormatter.cs b/src/Mvc/Mvc.Formatters.Xml/src/XmlDataContractSerializerOutputFormatter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/XmlDataContractSerializerOutputFormatter.cs
rename to src/Mvc/Mvc.Formatters.Xml/src/XmlDataContractSerializerOutputFormatter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/XmlSerializerInputFormatter.cs b/src/Mvc/Mvc.Formatters.Xml/src/XmlSerializerInputFormatter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/XmlSerializerInputFormatter.cs
rename to src/Mvc/Mvc.Formatters.Xml/src/XmlSerializerInputFormatter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/XmlSerializerOutputFormatter.cs b/src/Mvc/Mvc.Formatters.Xml/src/XmlSerializerOutputFormatter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/XmlSerializerOutputFormatter.cs
rename to src/Mvc/Mvc.Formatters.Xml/src/XmlSerializerOutputFormatter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/baseline.netcore.json b/src/Mvc/Mvc.Formatters.Xml/src/baseline.netcore.json
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/baseline.netcore.json
rename to src/Mvc/Mvc.Formatters.Xml/src/baseline.netcore.json
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/DelegatingEnumerableTest.cs b/src/Mvc/Mvc.Formatters.Xml/test/DelegatingEnumerableTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/DelegatingEnumerableTest.cs
rename to src/Mvc/Mvc.Formatters.Xml/test/DelegatingEnumerableTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/DelegatingEnumeratorTest.cs b/src/Mvc/Mvc.Formatters.Xml/test/DelegatingEnumeratorTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/DelegatingEnumeratorTest.cs
rename to src/Mvc/Mvc.Formatters.Xml/test/DelegatingEnumeratorTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/DependencyInjection/XmlDataContractSerializerMvcOptionsSetupTest.cs b/src/Mvc/Mvc.Formatters.Xml/test/DependencyInjection/XmlDataContractSerializerMvcOptionsSetupTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/DependencyInjection/XmlDataContractSerializerMvcOptionsSetupTest.cs
rename to src/Mvc/Mvc.Formatters.Xml/test/DependencyInjection/XmlDataContractSerializerMvcOptionsSetupTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/DependencyInjection/XmlSerializerMvcOptionsSetupTest.cs b/src/Mvc/Mvc.Formatters.Xml/test/DependencyInjection/XmlSerializerMvcOptionsSetupTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/DependencyInjection/XmlSerializerMvcOptionsSetupTest.cs
rename to src/Mvc/Mvc.Formatters.Xml/test/DependencyInjection/XmlSerializerMvcOptionsSetupTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/EnumerableWrapperProviderFactoryTest.cs b/src/Mvc/Mvc.Formatters.Xml/test/EnumerableWrapperProviderFactoryTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/EnumerableWrapperProviderFactoryTest.cs
rename to src/Mvc/Mvc.Formatters.Xml/test/EnumerableWrapperProviderFactoryTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/EnumerableWrapperProviderTest.cs b/src/Mvc/Mvc.Formatters.Xml/test/EnumerableWrapperProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/EnumerableWrapperProviderTest.cs
rename to src/Mvc/Mvc.Formatters.Xml/test/EnumerableWrapperProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/FlushReportingStream.cs b/src/Mvc/Mvc.Formatters.Xml/test/FlushReportingStream.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/FlushReportingStream.cs
rename to src/Mvc/Mvc.Formatters.Xml/test/FlushReportingStream.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test.csproj b/src/Mvc/Mvc.Formatters.Xml/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test.csproj
similarity index 64%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test.csproj
rename to src/Mvc/Mvc.Formatters.Xml/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test.csproj
index 39ff3fd9ea..b51ba4d2df 100644
--- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test.csproj
+++ b/src/Mvc/Mvc.Formatters.Xml/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.Core.TestCommon\Microsoft.AspNetCore.Mvc.Core.TestCommon.csproj" />
+    <ProjectReference Include="..\..\shared\Mvc.Core.TestCommon\Microsoft.AspNetCore.Mvc.Core.TestCommon.csproj" />
 
     <Reference Include="Microsoft.Extensions.Logging.Testing" />
   </ItemGroup>
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Models/Person.cs b/src/Mvc/Mvc.Formatters.Xml/test/Models/Person.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Models/Person.cs
rename to src/Mvc/Mvc.Formatters.Xml/test/Models/Person.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Models/PersonList.cs b/src/Mvc/Mvc.Formatters.Xml/test/Models/PersonList.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Models/PersonList.cs
rename to src/Mvc/Mvc.Formatters.Xml/test/Models/PersonList.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/PersonWrapper.cs b/src/Mvc/Mvc.Formatters.Xml/test/PersonWrapper.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/PersonWrapper.cs
rename to src/Mvc/Mvc.Formatters.Xml/test/PersonWrapper.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/PersonWrapperProvider.cs b/src/Mvc/Mvc.Formatters.Xml/test/PersonWrapperProvider.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/PersonWrapperProvider.cs
rename to src/Mvc/Mvc.Formatters.Xml/test/PersonWrapperProvider.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/PersonWrapperProviderFactory.cs b/src/Mvc/Mvc.Formatters.Xml/test/PersonWrapperProviderFactory.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/PersonWrapperProviderFactory.cs
rename to src/Mvc/Mvc.Formatters.Xml/test/PersonWrapperProviderFactory.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/ProblemDetailsWrapperProviderFactoryTest.cs b/src/Mvc/Mvc.Formatters.Xml/test/ProblemDetailsWrapperProviderFactoryTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/ProblemDetailsWrapperProviderFactoryTest.cs
rename to src/Mvc/Mvc.Formatters.Xml/test/ProblemDetailsWrapperProviderFactoryTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/ProblemDetailsWrapperTest.cs b/src/Mvc/Mvc.Formatters.Xml/test/ProblemDetailsWrapperTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/ProblemDetailsWrapperTest.cs
rename to src/Mvc/Mvc.Formatters.Xml/test/ProblemDetailsWrapperTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/SerializableErrorWrapperProviderTest.cs b/src/Mvc/Mvc.Formatters.Xml/test/SerializableErrorWrapperProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/SerializableErrorWrapperProviderTest.cs
rename to src/Mvc/Mvc.Formatters.Xml/test/SerializableErrorWrapperProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/SerializableErrorWrapperTests.cs b/src/Mvc/Mvc.Formatters.Xml/test/SerializableErrorWrapperTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/SerializableErrorWrapperTests.cs
rename to src/Mvc/Mvc.Formatters.Xml/test/SerializableErrorWrapperTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/SerializableWrapperProviderFactoryTest.cs b/src/Mvc/Mvc.Formatters.Xml/test/SerializableWrapperProviderFactoryTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/SerializableWrapperProviderFactoryTest.cs
rename to src/Mvc/Mvc.Formatters.Xml/test/SerializableWrapperProviderFactoryTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/ValidationProblemDetailsWrapperTest.cs b/src/Mvc/Mvc.Formatters.Xml/test/ValidationProblemDetailsWrapperTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/ValidationProblemDetailsWrapperTest.cs
rename to src/Mvc/Mvc.Formatters.Xml/test/ValidationProblemDetailsWrapperTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlAssert.cs b/src/Mvc/Mvc.Formatters.Xml/test/XmlAssert.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlAssert.cs
rename to src/Mvc/Mvc.Formatters.Xml/test/XmlAssert.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlAssertTest.cs b/src/Mvc/Mvc.Formatters.Xml/test/XmlAssertTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlAssertTest.cs
rename to src/Mvc/Mvc.Formatters.Xml/test/XmlAssertTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlDataContractSerializerInputFormatterTest.cs b/src/Mvc/Mvc.Formatters.Xml/test/XmlDataContractSerializerInputFormatterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlDataContractSerializerInputFormatterTest.cs
rename to src/Mvc/Mvc.Formatters.Xml/test/XmlDataContractSerializerInputFormatterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlDataContractSerializerOutputFormatterTest.cs b/src/Mvc/Mvc.Formatters.Xml/test/XmlDataContractSerializerOutputFormatterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlDataContractSerializerOutputFormatterTest.cs
rename to src/Mvc/Mvc.Formatters.Xml/test/XmlDataContractSerializerOutputFormatterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlSerializerInputFormatterTest.cs b/src/Mvc/Mvc.Formatters.Xml/test/XmlSerializerInputFormatterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlSerializerInputFormatterTest.cs
rename to src/Mvc/Mvc.Formatters.Xml/test/XmlSerializerInputFormatterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlSerializerOutputFormatterTest.cs b/src/Mvc/Mvc.Formatters.Xml/test/XmlSerializerOutputFormatterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlSerializerOutputFormatterTest.cs
rename to src/Mvc/Mvc.Formatters.Xml/test/XmlSerializerOutputFormatterTest.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/DependencyInjection/MvcLocalizationMvcBuilderExtensions.cs b/src/Mvc/Mvc.Localization/src/DependencyInjection/MvcLocalizationMvcBuilderExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/DependencyInjection/MvcLocalizationMvcBuilderExtensions.cs
rename to src/Mvc/Mvc.Localization/src/DependencyInjection/MvcLocalizationMvcBuilderExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/DependencyInjection/MvcLocalizationMvcCoreBuilderExtensions.cs b/src/Mvc/Mvc.Localization/src/DependencyInjection/MvcLocalizationMvcCoreBuilderExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/DependencyInjection/MvcLocalizationMvcCoreBuilderExtensions.cs
rename to src/Mvc/Mvc.Localization/src/DependencyInjection/MvcLocalizationMvcCoreBuilderExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/HtmlLocalizer.cs b/src/Mvc/Mvc.Localization/src/HtmlLocalizer.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/HtmlLocalizer.cs
rename to src/Mvc/Mvc.Localization/src/HtmlLocalizer.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/HtmlLocalizerExtensions.cs b/src/Mvc/Mvc.Localization/src/HtmlLocalizerExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/HtmlLocalizerExtensions.cs
rename to src/Mvc/Mvc.Localization/src/HtmlLocalizerExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/HtmlLocalizerFactory.cs b/src/Mvc/Mvc.Localization/src/HtmlLocalizerFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/HtmlLocalizerFactory.cs
rename to src/Mvc/Mvc.Localization/src/HtmlLocalizerFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/HtmlLocalizerOfT.cs b/src/Mvc/Mvc.Localization/src/HtmlLocalizerOfT.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/HtmlLocalizerOfT.cs
rename to src/Mvc/Mvc.Localization/src/HtmlLocalizerOfT.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/IHtmlLocalizer.cs b/src/Mvc/Mvc.Localization/src/IHtmlLocalizer.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/IHtmlLocalizer.cs
rename to src/Mvc/Mvc.Localization/src/IHtmlLocalizer.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/IHtmlLocalizerFactory.cs b/src/Mvc/Mvc.Localization/src/IHtmlLocalizerFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/IHtmlLocalizerFactory.cs
rename to src/Mvc/Mvc.Localization/src/IHtmlLocalizerFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/IHtmlLocalizerOfT.cs b/src/Mvc/Mvc.Localization/src/IHtmlLocalizerOfT.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/IHtmlLocalizerOfT.cs
rename to src/Mvc/Mvc.Localization/src/IHtmlLocalizerOfT.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/IViewLocalizer.cs b/src/Mvc/Mvc.Localization/src/IViewLocalizer.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/IViewLocalizer.cs
rename to src/Mvc/Mvc.Localization/src/IViewLocalizer.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/LocalizedHtmlString.cs b/src/Mvc/Mvc.Localization/src/LocalizedHtmlString.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/LocalizedHtmlString.cs
rename to src/Mvc/Mvc.Localization/src/LocalizedHtmlString.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/Microsoft.AspNetCore.Mvc.Localization.csproj b/src/Mvc/Mvc.Localization/src/Microsoft.AspNetCore.Mvc.Localization.csproj
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/Microsoft.AspNetCore.Mvc.Localization.csproj
rename to src/Mvc/Mvc.Localization/src/Microsoft.AspNetCore.Mvc.Localization.csproj
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/MvcLocalizationServices.cs b/src/Mvc/Mvc.Localization/src/MvcLocalizationServices.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/MvcLocalizationServices.cs
rename to src/Mvc/Mvc.Localization/src/MvcLocalizationServices.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/Properties/AssemblyInfo.cs b/src/Mvc/Mvc.Localization/src/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/Properties/AssemblyInfo.cs
rename to src/Mvc/Mvc.Localization/src/Properties/AssemblyInfo.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/Properties/Resources.Designer.cs b/src/Mvc/Mvc.Localization/src/Properties/Resources.Designer.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/Properties/Resources.Designer.cs
rename to src/Mvc/Mvc.Localization/src/Properties/Resources.Designer.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/ViewLocalizer.cs b/src/Mvc/Mvc.Localization/src/ViewLocalizer.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/ViewLocalizer.cs
rename to src/Mvc/Mvc.Localization/src/ViewLocalizer.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/baseline.netcore.json b/src/Mvc/Mvc.Localization/src/baseline.netcore.json
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/baseline.netcore.json
rename to src/Mvc/Mvc.Localization/src/baseline.netcore.json
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Localization.Test/HtmlLocalizerOfTTest.cs b/src/Mvc/Mvc.Localization/test/HtmlLocalizerOfTTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Localization.Test/HtmlLocalizerOfTTest.cs
rename to src/Mvc/Mvc.Localization/test/HtmlLocalizerOfTTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Localization.Test/HtmlLocalizerTest.cs b/src/Mvc/Mvc.Localization/test/HtmlLocalizerTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Localization.Test/HtmlLocalizerTest.cs
rename to src/Mvc/Mvc.Localization/test/HtmlLocalizerTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Localization.Test/Microsoft.AspNetCore.Mvc.Localization.Test.csproj b/src/Mvc/Mvc.Localization/test/Microsoft.AspNetCore.Mvc.Localization.Test.csproj
similarity index 64%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Localization.Test/Microsoft.AspNetCore.Mvc.Localization.Test.csproj
rename to src/Mvc/Mvc.Localization/test/Microsoft.AspNetCore.Mvc.Localization.Test.csproj
index 384660efe3..db22eeedb5 100644
--- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Localization.Test/Microsoft.AspNetCore.Mvc.Localization.Test.csproj
+++ b/src/Mvc/Mvc.Localization/test/Microsoft.AspNetCore.Mvc.Localization.Test.csproj
@@ -6,7 +6,7 @@
 
   <ItemGroup>
     <Reference Include="Microsoft.AspNetCore.Mvc.Localization" />
-    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.Core.TestCommon\Microsoft.AspNetCore.Mvc.Core.TestCommon.csproj" />
+    <ProjectReference Include="..\..\shared\Mvc.Core.TestCommon\Microsoft.AspNetCore.Mvc.Core.TestCommon.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Localization.Test/MvcLocalizationMvcBuilderExtensionsTest.cs b/src/Mvc/Mvc.Localization/test/MvcLocalizationMvcBuilderExtensionsTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Localization.Test/MvcLocalizationMvcBuilderExtensionsTest.cs
rename to src/Mvc/Mvc.Localization/test/MvcLocalizationMvcBuilderExtensionsTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Localization.Test/MvcLocalizationMvcCoreBuilderExtensionsTest.cs b/src/Mvc/Mvc.Localization/test/MvcLocalizationMvcCoreBuilderExtensionsTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Localization.Test/MvcLocalizationMvcCoreBuilderExtensionsTest.cs
rename to src/Mvc/Mvc.Localization/test/MvcLocalizationMvcCoreBuilderExtensionsTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Localization.Test/MvcLocalizationServiceCollectionExtensionsTest.cs b/src/Mvc/Mvc.Localization/test/MvcLocalizationServiceCollectionExtensionsTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Localization.Test/MvcLocalizationServiceCollectionExtensionsTest.cs
rename to src/Mvc/Mvc.Localization/test/MvcLocalizationServiceCollectionExtensionsTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Localization.Test/TestStringLocalizer.cs b/src/Mvc/Mvc.Localization/test/TestStringLocalizer.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Localization.Test/TestStringLocalizer.cs
rename to src/Mvc/Mvc.Localization/test/TestStringLocalizer.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Localization.Test/ViewLocalizerTest.cs b/src/Mvc/Mvc.Localization/test/ViewLocalizerTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Localization.Test/ViewLocalizerTest.cs
rename to src/Mvc/Mvc.Localization/test/ViewLocalizerTest.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson/AnnotatedProblemDetails.cs b/src/Mvc/Mvc.NewtonsoftJson/src/AnnotatedProblemDetails.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson/AnnotatedProblemDetails.cs
rename to src/Mvc/Mvc.NewtonsoftJson/src/AnnotatedProblemDetails.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson/BsonTempDataSerializer.cs b/src/Mvc/Mvc.NewtonsoftJson/src/BsonTempDataSerializer.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson/BsonTempDataSerializer.cs
rename to src/Mvc/Mvc.NewtonsoftJson/src/BsonTempDataSerializer.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson/DependencyInjection/MvcNewtonsoftJsonOptionsExtensions.cs b/src/Mvc/Mvc.NewtonsoftJson/src/DependencyInjection/MvcNewtonsoftJsonOptionsExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson/DependencyInjection/MvcNewtonsoftJsonOptionsExtensions.cs
rename to src/Mvc/Mvc.NewtonsoftJson/src/DependencyInjection/MvcNewtonsoftJsonOptionsExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson/DependencyInjection/NewtonsoftJsonMvcBuilderExtensions.cs b/src/Mvc/Mvc.NewtonsoftJson/src/DependencyInjection/NewtonsoftJsonMvcBuilderExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson/DependencyInjection/NewtonsoftJsonMvcBuilderExtensions.cs
rename to src/Mvc/Mvc.NewtonsoftJson/src/DependencyInjection/NewtonsoftJsonMvcBuilderExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson/DependencyInjection/NewtonsoftJsonMvcCoreBuilderExtensions.cs b/src/Mvc/Mvc.NewtonsoftJson/src/DependencyInjection/NewtonsoftJsonMvcCoreBuilderExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson/DependencyInjection/NewtonsoftJsonMvcCoreBuilderExtensions.cs
rename to src/Mvc/Mvc.NewtonsoftJson/src/DependencyInjection/NewtonsoftJsonMvcCoreBuilderExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson/DependencyInjection/NewtonsoftJsonMvcOptionsSetup.cs b/src/Mvc/Mvc.NewtonsoftJson/src/DependencyInjection/NewtonsoftJsonMvcOptionsSetup.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson/DependencyInjection/NewtonsoftJsonMvcOptionsSetup.cs
rename to src/Mvc/Mvc.NewtonsoftJson/src/DependencyInjection/NewtonsoftJsonMvcOptionsSetup.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson/JsonArrayPool.cs b/src/Mvc/Mvc.NewtonsoftJson/src/JsonArrayPool.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson/JsonArrayPool.cs
rename to src/Mvc/Mvc.NewtonsoftJson/src/JsonArrayPool.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson/JsonHelperExtensions.cs b/src/Mvc/Mvc.NewtonsoftJson/src/JsonHelperExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson/JsonHelperExtensions.cs
rename to src/Mvc/Mvc.NewtonsoftJson/src/JsonHelperExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson/JsonPatchExtensions.cs b/src/Mvc/Mvc.NewtonsoftJson/src/JsonPatchExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson/JsonPatchExtensions.cs
rename to src/Mvc/Mvc.NewtonsoftJson/src/JsonPatchExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson/JsonPatchOperationsArrayProvider.cs b/src/Mvc/Mvc.NewtonsoftJson/src/JsonPatchOperationsArrayProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson/JsonPatchOperationsArrayProvider.cs
rename to src/Mvc/Mvc.NewtonsoftJson/src/JsonPatchOperationsArrayProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson/JsonResultExecutor.cs b/src/Mvc/Mvc.NewtonsoftJson/src/JsonResultExecutor.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson/JsonResultExecutor.cs
rename to src/Mvc/Mvc.NewtonsoftJson/src/JsonResultExecutor.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson/JsonSerializerObjectPolicy.cs b/src/Mvc/Mvc.NewtonsoftJson/src/JsonSerializerObjectPolicy.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson/JsonSerializerObjectPolicy.cs
rename to src/Mvc/Mvc.NewtonsoftJson/src/JsonSerializerObjectPolicy.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson/JsonSerializerSettingsProvider.cs b/src/Mvc/Mvc.NewtonsoftJson/src/JsonSerializerSettingsProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson/JsonSerializerSettingsProvider.cs
rename to src/Mvc/Mvc.NewtonsoftJson/src/JsonSerializerSettingsProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson/MediaTypeHeaderValues.cs b/src/Mvc/Mvc.NewtonsoftJson/src/MediaTypeHeaderValues.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson/MediaTypeHeaderValues.cs
rename to src/Mvc/Mvc.NewtonsoftJson/src/MediaTypeHeaderValues.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson/Microsoft.AspNetCore.Mvc.NewtonsoftJson.csproj b/src/Mvc/Mvc.NewtonsoftJson/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson.csproj
similarity index 89%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson/Microsoft.AspNetCore.Mvc.NewtonsoftJson.csproj
rename to src/Mvc/Mvc.NewtonsoftJson/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson.csproj
index e1645892c9..8fddf8f725 100644
--- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson/Microsoft.AspNetCore.Mvc.NewtonsoftJson.csproj
+++ b/src/Mvc/Mvc.NewtonsoftJson/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson.csproj
@@ -21,6 +21,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Include="..\Microsoft.AspNetCore.Mvc.Core\Formatters\ResponseContentTypeHelper.cs" />
+    <Compile Include="..\..\Mvc.Core\src\Formatters\ResponseContentTypeHelper.cs" />
   </ItemGroup>
 </Project>
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson/MvcNewtonsoftJsonOptions.cs b/src/Mvc/Mvc.NewtonsoftJson/src/MvcNewtonsoftJsonOptions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson/MvcNewtonsoftJsonOptions.cs
rename to src/Mvc/Mvc.NewtonsoftJson/src/MvcNewtonsoftJsonOptions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson/NewtonsoftJsonHelper.cs b/src/Mvc/Mvc.NewtonsoftJson/src/NewtonsoftJsonHelper.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson/NewtonsoftJsonHelper.cs
rename to src/Mvc/Mvc.NewtonsoftJson/src/NewtonsoftJsonHelper.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson/NewtonsoftJsonInputFormatter.cs b/src/Mvc/Mvc.NewtonsoftJson/src/NewtonsoftJsonInputFormatter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson/NewtonsoftJsonInputFormatter.cs
rename to src/Mvc/Mvc.NewtonsoftJson/src/NewtonsoftJsonInputFormatter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson/NewtonsoftJsonLoggerExtensions.cs b/src/Mvc/Mvc.NewtonsoftJson/src/NewtonsoftJsonLoggerExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson/NewtonsoftJsonLoggerExtensions.cs
rename to src/Mvc/Mvc.NewtonsoftJson/src/NewtonsoftJsonLoggerExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson/NewtonsoftJsonOutputFormatter.cs b/src/Mvc/Mvc.NewtonsoftJson/src/NewtonsoftJsonOutputFormatter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson/NewtonsoftJsonOutputFormatter.cs
rename to src/Mvc/Mvc.NewtonsoftJson/src/NewtonsoftJsonOutputFormatter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson/NewtonsoftJsonPatchInputFormatter.cs b/src/Mvc/Mvc.NewtonsoftJson/src/NewtonsoftJsonPatchInputFormatter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson/NewtonsoftJsonPatchInputFormatter.cs
rename to src/Mvc/Mvc.NewtonsoftJson/src/NewtonsoftJsonPatchInputFormatter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson/ProblemDetailsConverter.cs b/src/Mvc/Mvc.NewtonsoftJson/src/ProblemDetailsConverter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson/ProblemDetailsConverter.cs
rename to src/Mvc/Mvc.NewtonsoftJson/src/ProblemDetailsConverter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson/Properties/AssemblyInfo.cs b/src/Mvc/Mvc.NewtonsoftJson/src/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson/Properties/AssemblyInfo.cs
rename to src/Mvc/Mvc.NewtonsoftJson/src/Properties/AssemblyInfo.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson/Properties/Resources.Designer.cs b/src/Mvc/Mvc.NewtonsoftJson/src/Properties/Resources.Designer.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson/Properties/Resources.Designer.cs
rename to src/Mvc/Mvc.NewtonsoftJson/src/Properties/Resources.Designer.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson/Resources.resx b/src/Mvc/Mvc.NewtonsoftJson/src/Resources.resx
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson/Resources.resx
rename to src/Mvc/Mvc.NewtonsoftJson/src/Resources.resx
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson/ValidationProblemDetailsConverter.cs b/src/Mvc/Mvc.NewtonsoftJson/src/ValidationProblemDetailsConverter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson/ValidationProblemDetailsConverter.cs
rename to src/Mvc/Mvc.NewtonsoftJson/src/ValidationProblemDetailsConverter.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.NewtonsoftJson.Test/BsonTempDataSerializerTest.cs b/src/Mvc/Mvc.NewtonsoftJson/test/BsonTempDataSerializerTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.NewtonsoftJson.Test/BsonTempDataSerializerTest.cs
rename to src/Mvc/Mvc.NewtonsoftJson/test/BsonTempDataSerializerTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.NewtonsoftJson.Test/DependencyInjection/MvcNewtonsoftJsonOptionsExtensionsTest.cs b/src/Mvc/Mvc.NewtonsoftJson/test/DependencyInjection/MvcNewtonsoftJsonOptionsExtensionsTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.NewtonsoftJson.Test/DependencyInjection/MvcNewtonsoftJsonOptionsExtensionsTest.cs
rename to src/Mvc/Mvc.NewtonsoftJson/test/DependencyInjection/MvcNewtonsoftJsonOptionsExtensionsTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.NewtonsoftJson.Test/DependencyInjection/NewtonsoftJsonMvcBuilderExtensionsTest.cs b/src/Mvc/Mvc.NewtonsoftJson/test/DependencyInjection/NewtonsoftJsonMvcBuilderExtensionsTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.NewtonsoftJson.Test/DependencyInjection/NewtonsoftJsonMvcBuilderExtensionsTest.cs
rename to src/Mvc/Mvc.NewtonsoftJson/test/DependencyInjection/NewtonsoftJsonMvcBuilderExtensionsTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.NewtonsoftJson.Test/DependencyInjection/NewtonsoftJsonMvcCoreBuilderExtensionsTest.cs b/src/Mvc/Mvc.NewtonsoftJson/test/DependencyInjection/NewtonsoftJsonMvcCoreBuilderExtensionsTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.NewtonsoftJson.Test/DependencyInjection/NewtonsoftJsonMvcCoreBuilderExtensionsTest.cs
rename to src/Mvc/Mvc.NewtonsoftJson/test/DependencyInjection/NewtonsoftJsonMvcCoreBuilderExtensionsTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.NewtonsoftJson.Test/JsonPatchExtensionsTest.cs b/src/Mvc/Mvc.NewtonsoftJson/test/JsonPatchExtensionsTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.NewtonsoftJson.Test/JsonPatchExtensionsTest.cs
rename to src/Mvc/Mvc.NewtonsoftJson/test/JsonPatchExtensionsTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.NewtonsoftJson.Test/JsonPatchOperationsArrayProviderTests.cs b/src/Mvc/Mvc.NewtonsoftJson/test/JsonPatchOperationsArrayProviderTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.NewtonsoftJson.Test/JsonPatchOperationsArrayProviderTests.cs
rename to src/Mvc/Mvc.NewtonsoftJson/test/JsonPatchOperationsArrayProviderTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.NewtonsoftJson.Test/JsonResultExecutorTest.cs b/src/Mvc/Mvc.NewtonsoftJson/test/JsonResultExecutorTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.NewtonsoftJson.Test/JsonResultExecutorTest.cs
rename to src/Mvc/Mvc.NewtonsoftJson/test/JsonResultExecutorTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.NewtonsoftJson.Test/JsonResultTest.cs b/src/Mvc/Mvc.NewtonsoftJson/test/JsonResultTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.NewtonsoftJson.Test/JsonResultTest.cs
rename to src/Mvc/Mvc.NewtonsoftJson/test/JsonResultTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.NewtonsoftJson.Test/Microsoft.AspNetCore.Mvc.NewtonsoftJson.Test.csproj b/src/Mvc/Mvc.NewtonsoftJson/test/Microsoft.AspNetCore.Mvc.NewtonsoftJson.Test.csproj
similarity index 61%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.NewtonsoftJson.Test/Microsoft.AspNetCore.Mvc.NewtonsoftJson.Test.csproj
rename to src/Mvc/Mvc.NewtonsoftJson/test/Microsoft.AspNetCore.Mvc.NewtonsoftJson.Test.csproj
index 746c84dfcf..03621c7963 100644
--- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.NewtonsoftJson.Test/Microsoft.AspNetCore.Mvc.NewtonsoftJson.Test.csproj
+++ b/src/Mvc/Mvc.NewtonsoftJson/test/Microsoft.AspNetCore.Mvc.NewtonsoftJson.Test.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
@@ -7,7 +7,7 @@
   <ItemGroup>
     <Reference Include="Microsoft.AspNetCore.Mvc" />
     <Reference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" />
-    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.Core.TestCommon\Microsoft.AspNetCore.Mvc.Core.TestCommon.csproj" />
+    <ProjectReference Include="..\..\shared\Mvc.Core.TestCommon\Microsoft.AspNetCore.Mvc.Core.TestCommon.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.NewtonsoftJson.Test/NewtonsoftJsonHelperTest.cs b/src/Mvc/Mvc.NewtonsoftJson/test/NewtonsoftJsonHelperTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.NewtonsoftJson.Test/NewtonsoftJsonHelperTest.cs
rename to src/Mvc/Mvc.NewtonsoftJson/test/NewtonsoftJsonHelperTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.NewtonsoftJson.Test/NewtonsoftJsonInputFormatterTest.cs b/src/Mvc/Mvc.NewtonsoftJson/test/NewtonsoftJsonInputFormatterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.NewtonsoftJson.Test/NewtonsoftJsonInputFormatterTest.cs
rename to src/Mvc/Mvc.NewtonsoftJson/test/NewtonsoftJsonInputFormatterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.NewtonsoftJson.Test/NewtonsoftJsonOutputFormatterTest.cs b/src/Mvc/Mvc.NewtonsoftJson/test/NewtonsoftJsonOutputFormatterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.NewtonsoftJson.Test/NewtonsoftJsonOutputFormatterTest.cs
rename to src/Mvc/Mvc.NewtonsoftJson/test/NewtonsoftJsonOutputFormatterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.NewtonsoftJson.Test/NewtonsoftJsonPatchInputFormatterTest.cs b/src/Mvc/Mvc.NewtonsoftJson/test/NewtonsoftJsonPatchInputFormatterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.NewtonsoftJson.Test/NewtonsoftJsonPatchInputFormatterTest.cs
rename to src/Mvc/Mvc.NewtonsoftJson/test/NewtonsoftJsonPatchInputFormatterTest.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/CSharpCompiler.cs b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/CSharpCompiler.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/CSharpCompiler.cs
rename to src/Mvc/Mvc.Razor.RuntimeCompilation/src/CSharpCompiler.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/ChecksumValidator.cs b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/ChecksumValidator.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/ChecksumValidator.cs
rename to src/Mvc/Mvc.Razor.RuntimeCompilation/src/ChecksumValidator.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/CompilationFailedException.cs b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/CompilationFailedException.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/CompilationFailedException.cs
rename to src/Mvc/Mvc.Razor.RuntimeCompilation/src/CompilationFailedException.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/CompilationFailedExceptionFactory.cs b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/CompilationFailedExceptionFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/CompilationFailedExceptionFactory.cs
rename to src/Mvc/Mvc.Razor.RuntimeCompilation/src/CompilationFailedExceptionFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/DependencyInjection/MvcRazorRuntimeCompilationOptionsSetup.cs b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/DependencyInjection/MvcRazorRuntimeCompilationOptionsSetup.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/DependencyInjection/MvcRazorRuntimeCompilationOptionsSetup.cs
rename to src/Mvc/Mvc.Razor.RuntimeCompilation/src/DependencyInjection/MvcRazorRuntimeCompilationOptionsSetup.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/DependencyInjection/RazorRuntimeCompilationMvcBuilderExtensions.cs b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/DependencyInjection/RazorRuntimeCompilationMvcBuilderExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/DependencyInjection/RazorRuntimeCompilationMvcBuilderExtensions.cs
rename to src/Mvc/Mvc.Razor.RuntimeCompilation/src/DependencyInjection/RazorRuntimeCompilationMvcBuilderExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/DependencyInjection/RazorRuntimeCompilationMvcCoreBuilderExtensions.cs b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/DependencyInjection/RazorRuntimeCompilationMvcCoreBuilderExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/DependencyInjection/RazorRuntimeCompilationMvcCoreBuilderExtensions.cs
rename to src/Mvc/Mvc.Razor.RuntimeCompilation/src/DependencyInjection/RazorRuntimeCompilationMvcCoreBuilderExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/FileProviderRazorProjectFileSystem.cs b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/FileProviderRazorProjectFileSystem.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/FileProviderRazorProjectFileSystem.cs
rename to src/Mvc/Mvc.Razor.RuntimeCompilation/src/FileProviderRazorProjectFileSystem.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/FileProviderRazorProjectItem.cs b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/FileProviderRazorProjectItem.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/FileProviderRazorProjectItem.cs
rename to src/Mvc/Mvc.Razor.RuntimeCompilation/src/FileProviderRazorProjectItem.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/LazyMetadataReferenceFeature.cs b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/LazyMetadataReferenceFeature.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/LazyMetadataReferenceFeature.cs
rename to src/Mvc/Mvc.Razor.RuntimeCompilation/src/LazyMetadataReferenceFeature.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj
similarity index 81%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj
rename to src/Mvc/Mvc.Razor.RuntimeCompilation/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj
index 680bed7d5a..fe50490e5c 100644
--- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj
+++ b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj
@@ -17,7 +17,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Include="..\Microsoft.AspNetCore.Mvc.Razor\ViewPath.cs" />
-    <Compile Include="..\Microsoft.AspNetCore.Mvc.RazorPages\ApplicationModels\PageRouteModelFactory.cs" />
+    <Compile Include="..\..\Mvc.Razor\src\ViewPath.cs" />
+    <Compile Include="..\..\Mvc.RazorPages\src\ApplicationModels\PageRouteModelFactory.cs" />
   </ItemGroup>
 </Project>
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/MvcRazorRuntimeCompilationOptions.cs b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/MvcRazorRuntimeCompilationOptions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/MvcRazorRuntimeCompilationOptions.cs
rename to src/Mvc/Mvc.Razor.RuntimeCompilation/src/MvcRazorRuntimeCompilationOptions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/PageActionDescriptorChangeProvider.cs b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/PageActionDescriptorChangeProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/PageActionDescriptorChangeProvider.cs
rename to src/Mvc/Mvc.Razor.RuntimeCompilation/src/PageActionDescriptorChangeProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/PageDirectiveFeature.cs b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/PageDirectiveFeature.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/PageDirectiveFeature.cs
rename to src/Mvc/Mvc.Razor.RuntimeCompilation/src/PageDirectiveFeature.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/Properties/AssemblyInfo.cs b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/Properties/AssemblyInfo.cs
rename to src/Mvc/Mvc.Razor.RuntimeCompilation/src/Properties/AssemblyInfo.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/Properties/Resources.Designer.cs b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/Properties/Resources.Designer.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/Properties/Resources.Designer.cs
rename to src/Mvc/Mvc.Razor.RuntimeCompilation/src/Properties/Resources.Designer.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/RazorProjectPageRouteModelProvider.cs b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/RazorProjectPageRouteModelProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/RazorProjectPageRouteModelProvider.cs
rename to src/Mvc/Mvc.Razor.RuntimeCompilation/src/RazorProjectPageRouteModelProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/RazorReferenceManager.cs b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/RazorReferenceManager.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/RazorReferenceManager.cs
rename to src/Mvc/Mvc.Razor.RuntimeCompilation/src/RazorReferenceManager.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/RazorRuntimeCompilationLoggerExtensions.cs b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/RazorRuntimeCompilationLoggerExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/RazorRuntimeCompilationLoggerExtensions.cs
rename to src/Mvc/Mvc.Razor.RuntimeCompilation/src/RazorRuntimeCompilationLoggerExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/Resources.resx b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/Resources.resx
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/Resources.resx
rename to src/Mvc/Mvc.Razor.RuntimeCompilation/src/Resources.resx
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/RuntimeCompilationFileProvider.cs b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/RuntimeCompilationFileProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/RuntimeCompilationFileProvider.cs
rename to src/Mvc/Mvc.Razor.RuntimeCompilation/src/RuntimeCompilationFileProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/RuntimeViewCompiler.cs b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/RuntimeViewCompiler.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/RuntimeViewCompiler.cs
rename to src/Mvc/Mvc.Razor.RuntimeCompilation/src/RuntimeViewCompiler.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/RuntimeViewCompilerProvider.cs b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/RuntimeViewCompilerProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/RuntimeViewCompilerProvider.cs
rename to src/Mvc/Mvc.Razor.RuntimeCompilation/src/RuntimeViewCompilerProvider.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/CSharpCompilerTest.cs b/src/Mvc/Mvc.Razor.RuntimeCompilation/test/CSharpCompilerTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/CSharpCompilerTest.cs
rename to src/Mvc/Mvc.Razor.RuntimeCompilation/test/CSharpCompilerTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/ChecksumValidatorTest.cs b/src/Mvc/Mvc.Razor.RuntimeCompilation/test/ChecksumValidatorTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/ChecksumValidatorTest.cs
rename to src/Mvc/Mvc.Razor.RuntimeCompilation/test/ChecksumValidatorTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/CompilerFailedExceptionFactoryTest.cs b/src/Mvc/Mvc.Razor.RuntimeCompilation/test/CompilerFailedExceptionFactoryTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/CompilerFailedExceptionFactoryTest.cs
rename to src/Mvc/Mvc.Razor.RuntimeCompilation/test/CompilerFailedExceptionFactoryTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/DependencyInjection/RazorRuntimeCompilationMvcCoreBuilderExtensionsTest.cs b/src/Mvc/Mvc.Razor.RuntimeCompilation/test/DependencyInjection/RazorRuntimeCompilationMvcCoreBuilderExtensionsTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/DependencyInjection/RazorRuntimeCompilationMvcCoreBuilderExtensionsTest.cs
rename to src/Mvc/Mvc.Razor.RuntimeCompilation/test/DependencyInjection/RazorRuntimeCompilationMvcCoreBuilderExtensionsTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/FileProviderRazorProjectFileSystemTest.cs b/src/Mvc/Mvc.Razor.RuntimeCompilation/test/FileProviderRazorProjectFileSystemTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/FileProviderRazorProjectFileSystemTest.cs
rename to src/Mvc/Mvc.Razor.RuntimeCompilation/test/FileProviderRazorProjectFileSystemTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test.csproj b/src/Mvc/Mvc.Razor.RuntimeCompilation/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test.csproj
similarity index 70%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test.csproj
rename to src/Mvc/Mvc.Razor.RuntimeCompilation/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test.csproj
index 70b0187a85..734825c240 100644
--- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test.csproj
+++ b/src/Mvc/Mvc.Razor.RuntimeCompilation/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test.csproj
@@ -7,7 +7,7 @@
 
   <ItemGroup>
     <Reference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" />
-    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.Views.TestCommon\Microsoft.AspNetCore.Mvc.Views.TestCommon.csproj" />
+    <ProjectReference Include="..\..\shared\Mvc.Views.TestCommon\Microsoft.AspNetCore.Mvc.Views.TestCommon.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/RazorReferenceManagerTest.cs b/src/Mvc/Mvc.Razor.RuntimeCompilation/test/RazorReferenceManagerTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/RazorReferenceManagerTest.cs
rename to src/Mvc/Mvc.Razor.RuntimeCompilation/test/RazorReferenceManagerTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/RuntimeCompilationFileProviderTest.cs b/src/Mvc/Mvc.Razor.RuntimeCompilation/test/RuntimeCompilationFileProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/RuntimeCompilationFileProviderTest.cs
rename to src/Mvc/Mvc.Razor.RuntimeCompilation/test/RuntimeCompilationFileProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/RuntimeViewCompilerTest.cs b/src/Mvc/Mvc.Razor.RuntimeCompilation/test/RuntimeViewCompilerTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/RuntimeViewCompilerTest.cs
rename to src/Mvc/Mvc.Razor.RuntimeCompilation/test/RuntimeViewCompilerTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/TestInfrastructure/DirectoryNode.cs b/src/Mvc/Mvc.Razor.RuntimeCompilation/test/TestInfrastructure/DirectoryNode.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/TestInfrastructure/DirectoryNode.cs
rename to src/Mvc/Mvc.Razor.RuntimeCompilation/test/TestInfrastructure/DirectoryNode.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/TestInfrastructure/FileNode.cs b/src/Mvc/Mvc.Razor.RuntimeCompilation/test/TestInfrastructure/FileNode.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/TestInfrastructure/FileNode.cs
rename to src/Mvc/Mvc.Razor.RuntimeCompilation/test/TestInfrastructure/FileNode.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/TestInfrastructure/NotFoundProjectItem.cs b/src/Mvc/Mvc.Razor.RuntimeCompilation/test/TestInfrastructure/NotFoundProjectItem.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/TestInfrastructure/NotFoundProjectItem.cs
rename to src/Mvc/Mvc.Razor.RuntimeCompilation/test/TestInfrastructure/NotFoundProjectItem.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/TestInfrastructure/TestRazorProjectItem.cs b/src/Mvc/Mvc.Razor.RuntimeCompilation/test/TestInfrastructure/TestRazorProjectItem.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/TestInfrastructure/TestRazorProjectItem.cs
rename to src/Mvc/Mvc.Razor.RuntimeCompilation/test/TestInfrastructure/TestRazorProjectItem.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/TestInfrastructure/TestRazorReferenceManager.cs b/src/Mvc/Mvc.Razor.RuntimeCompilation/test/TestInfrastructure/TestRazorReferenceManager.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/TestInfrastructure/TestRazorReferenceManager.cs
rename to src/Mvc/Mvc.Razor.RuntimeCompilation/test/TestInfrastructure/TestRazorReferenceManager.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/TestInfrastructure/VirtualRazorProjectFileSystem.cs b/src/Mvc/Mvc.Razor.RuntimeCompilation/test/TestInfrastructure/VirtualRazorProjectFileSystem.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/TestInfrastructure/VirtualRazorProjectFileSystem.cs
rename to src/Mvc/Mvc.Razor.RuntimeCompilation/test/TestInfrastructure/VirtualRazorProjectFileSystem.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ApplicationParts/CompiledRazorAssemblyApplicationPartFactory.cs b/src/Mvc/Mvc.Razor/src/ApplicationParts/CompiledRazorAssemblyApplicationPartFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ApplicationParts/CompiledRazorAssemblyApplicationPartFactory.cs
rename to src/Mvc/Mvc.Razor/src/ApplicationParts/CompiledRazorAssemblyApplicationPartFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ApplicationParts/CompiledRazorAssemblyPart.cs b/src/Mvc/Mvc.Razor/src/ApplicationParts/CompiledRazorAssemblyPart.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ApplicationParts/CompiledRazorAssemblyPart.cs
rename to src/Mvc/Mvc.Razor/src/ApplicationParts/CompiledRazorAssemblyPart.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ApplicationParts/IRazorCompiledItemProvider.cs b/src/Mvc/Mvc.Razor/src/ApplicationParts/IRazorCompiledItemProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ApplicationParts/IRazorCompiledItemProvider.cs
rename to src/Mvc/Mvc.Razor/src/ApplicationParts/IRazorCompiledItemProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ApplicationParts/RazorCompiledItemFeatureProvider.cs b/src/Mvc/Mvc.Razor/src/ApplicationParts/RazorCompiledItemFeatureProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ApplicationParts/RazorCompiledItemFeatureProvider.cs
rename to src/Mvc/Mvc.Razor/src/ApplicationParts/RazorCompiledItemFeatureProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/CompiledViewDescriptor.cs b/src/Mvc/Mvc.Razor/src/Compilation/CompiledViewDescriptor.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/CompiledViewDescriptor.cs
rename to src/Mvc/Mvc.Razor/src/Compilation/CompiledViewDescriptor.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/DefaultRazorPageFactoryProvider.cs b/src/Mvc/Mvc.Razor/src/Compilation/DefaultRazorPageFactoryProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/DefaultRazorPageFactoryProvider.cs
rename to src/Mvc/Mvc.Razor/src/Compilation/DefaultRazorPageFactoryProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/DefaultViewCompiler.cs b/src/Mvc/Mvc.Razor/src/Compilation/DefaultViewCompiler.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/DefaultViewCompiler.cs
rename to src/Mvc/Mvc.Razor/src/Compilation/DefaultViewCompiler.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/DefaultViewCompilerProvider.cs b/src/Mvc/Mvc.Razor/src/Compilation/DefaultViewCompilerProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/DefaultViewCompilerProvider.cs
rename to src/Mvc/Mvc.Razor/src/Compilation/DefaultViewCompilerProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/IViewCompiler.cs b/src/Mvc/Mvc.Razor/src/Compilation/IViewCompiler.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/IViewCompiler.cs
rename to src/Mvc/Mvc.Razor/src/Compilation/IViewCompiler.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/IViewCompilerProvider.cs b/src/Mvc/Mvc.Razor/src/Compilation/IViewCompilerProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/IViewCompilerProvider.cs
rename to src/Mvc/Mvc.Razor/src/Compilation/IViewCompilerProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/RazorViewAttribute.cs b/src/Mvc/Mvc.Razor/src/Compilation/RazorViewAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/RazorViewAttribute.cs
rename to src/Mvc/Mvc.Razor/src/Compilation/RazorViewAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/ViewsFeature.cs b/src/Mvc/Mvc.Razor/src/Compilation/ViewsFeature.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/ViewsFeature.cs
rename to src/Mvc/Mvc.Razor/src/Compilation/ViewsFeature.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/DefaultTagHelperFactory.cs b/src/Mvc/Mvc.Razor/src/DefaultTagHelperFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/DefaultTagHelperFactory.cs
rename to src/Mvc/Mvc.Razor/src/DefaultTagHelperFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/DependencyInjection/MvcRazorMvcBuilderExtensions.cs b/src/Mvc/Mvc.Razor/src/DependencyInjection/MvcRazorMvcBuilderExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/DependencyInjection/MvcRazorMvcBuilderExtensions.cs
rename to src/Mvc/Mvc.Razor/src/DependencyInjection/MvcRazorMvcBuilderExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/DependencyInjection/MvcRazorMvcCoreBuilderExtensions.cs b/src/Mvc/Mvc.Razor/src/DependencyInjection/MvcRazorMvcCoreBuilderExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/DependencyInjection/MvcRazorMvcCoreBuilderExtensions.cs
rename to src/Mvc/Mvc.Razor/src/DependencyInjection/MvcRazorMvcCoreBuilderExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/DependencyInjection/MvcRazorMvcViewOptionsSetup.cs b/src/Mvc/Mvc.Razor/src/DependencyInjection/MvcRazorMvcViewOptionsSetup.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/DependencyInjection/MvcRazorMvcViewOptionsSetup.cs
rename to src/Mvc/Mvc.Razor/src/DependencyInjection/MvcRazorMvcViewOptionsSetup.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/DependencyInjection/TagHelpersAsServices.cs b/src/Mvc/Mvc.Razor/src/DependencyInjection/TagHelpersAsServices.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/DependencyInjection/TagHelpersAsServices.cs
rename to src/Mvc/Mvc.Razor/src/DependencyInjection/TagHelpersAsServices.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/HelperResult.cs b/src/Mvc/Mvc.Razor/src/HelperResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/HelperResult.cs
rename to src/Mvc/Mvc.Razor/src/HelperResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/IModelTypeProvider.cs b/src/Mvc/Mvc.Razor/src/IModelTypeProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/IModelTypeProvider.cs
rename to src/Mvc/Mvc.Razor/src/IModelTypeProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/IRazorPage.cs b/src/Mvc/Mvc.Razor/src/IRazorPage.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/IRazorPage.cs
rename to src/Mvc/Mvc.Razor/src/IRazorPage.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/IRazorPageActivator.cs b/src/Mvc/Mvc.Razor/src/IRazorPageActivator.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/IRazorPageActivator.cs
rename to src/Mvc/Mvc.Razor/src/IRazorPageActivator.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/IRazorPageFactoryProvider.cs b/src/Mvc/Mvc.Razor/src/IRazorPageFactoryProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/IRazorPageFactoryProvider.cs
rename to src/Mvc/Mvc.Razor/src/IRazorPageFactoryProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/IRazorViewEngine.cs b/src/Mvc/Mvc.Razor/src/IRazorViewEngine.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/IRazorViewEngine.cs
rename to src/Mvc/Mvc.Razor/src/IRazorViewEngine.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ITagHelperActivator.cs b/src/Mvc/Mvc.Razor/src/ITagHelperActivator.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ITagHelperActivator.cs
rename to src/Mvc/Mvc.Razor/src/ITagHelperActivator.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ITagHelperFactory.cs b/src/Mvc/Mvc.Razor/src/ITagHelperFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ITagHelperFactory.cs
rename to src/Mvc/Mvc.Razor/src/ITagHelperFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ITagHelperInitializerOfT.cs b/src/Mvc/Mvc.Razor/src/ITagHelperInitializerOfT.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ITagHelperInitializerOfT.cs
rename to src/Mvc/Mvc.Razor/src/ITagHelperInitializerOfT.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/IViewLocationExpander.cs b/src/Mvc/Mvc.Razor/src/IViewLocationExpander.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/IViewLocationExpander.cs
rename to src/Mvc/Mvc.Razor/src/IViewLocationExpander.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Infrastructure/CryptographyAlgorithms.cs b/src/Mvc/Mvc.Razor/src/Infrastructure/CryptographyAlgorithms.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Infrastructure/CryptographyAlgorithms.cs
rename to src/Mvc/Mvc.Razor/src/Infrastructure/CryptographyAlgorithms.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Infrastructure/DefaultFileVersionProvider.cs b/src/Mvc/Mvc.Razor/src/Infrastructure/DefaultFileVersionProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Infrastructure/DefaultFileVersionProvider.cs
rename to src/Mvc/Mvc.Razor/src/Infrastructure/DefaultFileVersionProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Infrastructure/DefaultTagHelperActivator.cs b/src/Mvc/Mvc.Razor/src/Infrastructure/DefaultTagHelperActivator.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Infrastructure/DefaultTagHelperActivator.cs
rename to src/Mvc/Mvc.Razor/src/Infrastructure/DefaultTagHelperActivator.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Infrastructure/TagHelperMemoryCacheProvider.cs b/src/Mvc/Mvc.Razor/src/Infrastructure/TagHelperMemoryCacheProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Infrastructure/TagHelperMemoryCacheProvider.cs
rename to src/Mvc/Mvc.Razor/src/Infrastructure/TagHelperMemoryCacheProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/RazorInjectAttribute.cs b/src/Mvc/Mvc.Razor/src/Internal/RazorInjectAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/RazorInjectAttribute.cs
rename to src/Mvc/Mvc.Razor/src/Internal/RazorInjectAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/LanguageViewLocationExpander.cs b/src/Mvc/Mvc.Razor/src/LanguageViewLocationExpander.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/LanguageViewLocationExpander.cs
rename to src/Mvc/Mvc.Razor/src/LanguageViewLocationExpander.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/LanguageViewLocationExpanderFormat.cs b/src/Mvc/Mvc.Razor/src/LanguageViewLocationExpanderFormat.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/LanguageViewLocationExpanderFormat.cs
rename to src/Mvc/Mvc.Razor/src/LanguageViewLocationExpanderFormat.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Microsoft.AspNetCore.Mvc.Razor.csproj b/src/Mvc/Mvc.Razor/src/Microsoft.AspNetCore.Mvc.Razor.csproj
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Microsoft.AspNetCore.Mvc.Razor.csproj
rename to src/Mvc/Mvc.Razor/src/Microsoft.AspNetCore.Mvc.Razor.csproj
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/MvcRazorDiagnosticSourceExtensions.cs b/src/Mvc/Mvc.Razor/src/MvcRazorDiagnosticSourceExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/MvcRazorDiagnosticSourceExtensions.cs
rename to src/Mvc/Mvc.Razor/src/MvcRazorDiagnosticSourceExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/MvcRazorLoggerExtensions.cs b/src/Mvc/Mvc.Razor/src/MvcRazorLoggerExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/MvcRazorLoggerExtensions.cs
rename to src/Mvc/Mvc.Razor/src/MvcRazorLoggerExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Properties/AssemblyInfo.cs b/src/Mvc/Mvc.Razor/src/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Properties/AssemblyInfo.cs
rename to src/Mvc/Mvc.Razor/src/Properties/AssemblyInfo.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Properties/Resources.Designer.cs b/src/Mvc/Mvc.Razor/src/Properties/Resources.Designer.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Properties/Resources.Designer.cs
rename to src/Mvc/Mvc.Razor/src/Properties/Resources.Designer.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorFileHierarchy.cs b/src/Mvc/Mvc.Razor/src/RazorFileHierarchy.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorFileHierarchy.cs
rename to src/Mvc/Mvc.Razor/src/RazorFileHierarchy.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorPage.cs b/src/Mvc/Mvc.Razor/src/RazorPage.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorPage.cs
rename to src/Mvc/Mvc.Razor/src/RazorPage.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorPageActivator.cs b/src/Mvc/Mvc.Razor/src/RazorPageActivator.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorPageActivator.cs
rename to src/Mvc/Mvc.Razor/src/RazorPageActivator.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorPageBase.cs b/src/Mvc/Mvc.Razor/src/RazorPageBase.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorPageBase.cs
rename to src/Mvc/Mvc.Razor/src/RazorPageBase.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorPageFactoryResult.cs b/src/Mvc/Mvc.Razor/src/RazorPageFactoryResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorPageFactoryResult.cs
rename to src/Mvc/Mvc.Razor/src/RazorPageFactoryResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorPageOfT.cs b/src/Mvc/Mvc.Razor/src/RazorPageOfT.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorPageOfT.cs
rename to src/Mvc/Mvc.Razor/src/RazorPageOfT.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorPagePropertyActivator.cs b/src/Mvc/Mvc.Razor/src/RazorPagePropertyActivator.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorPagePropertyActivator.cs
rename to src/Mvc/Mvc.Razor/src/RazorPagePropertyActivator.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorPageResult.cs b/src/Mvc/Mvc.Razor/src/RazorPageResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorPageResult.cs
rename to src/Mvc/Mvc.Razor/src/RazorPageResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorView.cs b/src/Mvc/Mvc.Razor/src/RazorView.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorView.cs
rename to src/Mvc/Mvc.Razor/src/RazorView.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorViewEngine.cs b/src/Mvc/Mvc.Razor/src/RazorViewEngine.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorViewEngine.cs
rename to src/Mvc/Mvc.Razor/src/RazorViewEngine.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorViewEngineOptions.cs b/src/Mvc/Mvc.Razor/src/RazorViewEngineOptions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorViewEngineOptions.cs
rename to src/Mvc/Mvc.Razor/src/RazorViewEngineOptions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorViewEngineOptionsSetup.cs b/src/Mvc/Mvc.Razor/src/RazorViewEngineOptionsSetup.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorViewEngineOptionsSetup.cs
rename to src/Mvc/Mvc.Razor/src/RazorViewEngineOptionsSetup.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RenderAsyncDelegate.cs b/src/Mvc/Mvc.Razor/src/RenderAsyncDelegate.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RenderAsyncDelegate.cs
rename to src/Mvc/Mvc.Razor/src/RenderAsyncDelegate.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Resources.resx b/src/Mvc/Mvc.Razor/src/Resources.resx
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Resources.resx
rename to src/Mvc/Mvc.Razor/src/Resources.resx
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ServiceBasedTagHelperActivator.cs b/src/Mvc/Mvc.Razor/src/ServiceBasedTagHelperActivator.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ServiceBasedTagHelperActivator.cs
rename to src/Mvc/Mvc.Razor/src/ServiceBasedTagHelperActivator.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelperComponentManager.cs b/src/Mvc/Mvc.Razor/src/TagHelperComponentManager.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelperComponentManager.cs
rename to src/Mvc/Mvc.Razor/src/TagHelperComponentManager.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelperInitializerOfT.cs b/src/Mvc/Mvc.Razor/src/TagHelperInitializerOfT.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelperInitializerOfT.cs
rename to src/Mvc/Mvc.Razor/src/TagHelperInitializerOfT.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/BodyTagHelper.cs b/src/Mvc/Mvc.Razor/src/TagHelpers/BodyTagHelper.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/BodyTagHelper.cs
rename to src/Mvc/Mvc.Razor/src/TagHelpers/BodyTagHelper.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/HeadTagHelper.cs b/src/Mvc/Mvc.Razor/src/TagHelpers/HeadTagHelper.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/HeadTagHelper.cs
rename to src/Mvc/Mvc.Razor/src/TagHelpers/HeadTagHelper.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/ITagHelperComponentManager.cs b/src/Mvc/Mvc.Razor/src/TagHelpers/ITagHelperComponentManager.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/ITagHelperComponentManager.cs
rename to src/Mvc/Mvc.Razor/src/TagHelpers/ITagHelperComponentManager.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/ITagHelperComponentPropertyActivator.cs b/src/Mvc/Mvc.Razor/src/TagHelpers/ITagHelperComponentPropertyActivator.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/ITagHelperComponentPropertyActivator.cs
rename to src/Mvc/Mvc.Razor/src/TagHelpers/ITagHelperComponentPropertyActivator.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/TagHelperComponentPropertyActivator.cs b/src/Mvc/Mvc.Razor/src/TagHelpers/TagHelperComponentPropertyActivator.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/TagHelperComponentPropertyActivator.cs
rename to src/Mvc/Mvc.Razor/src/TagHelpers/TagHelperComponentPropertyActivator.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/TagHelperComponentTagHelper.cs b/src/Mvc/Mvc.Razor/src/TagHelpers/TagHelperComponentTagHelper.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/TagHelperComponentTagHelper.cs
rename to src/Mvc/Mvc.Razor/src/TagHelpers/TagHelperComponentTagHelper.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/TagHelperFeature.cs b/src/Mvc/Mvc.Razor/src/TagHelpers/TagHelperFeature.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/TagHelperFeature.cs
rename to src/Mvc/Mvc.Razor/src/TagHelpers/TagHelperFeature.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/TagHelperFeatureProvider.cs b/src/Mvc/Mvc.Razor/src/TagHelpers/TagHelperFeatureProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/TagHelperFeatureProvider.cs
rename to src/Mvc/Mvc.Razor/src/TagHelpers/TagHelperFeatureProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/UrlResolutionTagHelper.cs b/src/Mvc/Mvc.Razor/src/TagHelpers/UrlResolutionTagHelper.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/UrlResolutionTagHelper.cs
rename to src/Mvc/Mvc.Razor/src/TagHelpers/UrlResolutionTagHelper.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ViewLocationCacheItem.cs b/src/Mvc/Mvc.Razor/src/ViewLocationCacheItem.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ViewLocationCacheItem.cs
rename to src/Mvc/Mvc.Razor/src/ViewLocationCacheItem.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ViewLocationCacheKey.cs b/src/Mvc/Mvc.Razor/src/ViewLocationCacheKey.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ViewLocationCacheKey.cs
rename to src/Mvc/Mvc.Razor/src/ViewLocationCacheKey.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ViewLocationCacheResult.cs b/src/Mvc/Mvc.Razor/src/ViewLocationCacheResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ViewLocationCacheResult.cs
rename to src/Mvc/Mvc.Razor/src/ViewLocationCacheResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ViewLocationExpanderContext.cs b/src/Mvc/Mvc.Razor/src/ViewLocationExpanderContext.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ViewLocationExpanderContext.cs
rename to src/Mvc/Mvc.Razor/src/ViewLocationExpanderContext.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ViewPath.cs b/src/Mvc/Mvc.Razor/src/ViewPath.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ViewPath.cs
rename to src/Mvc/Mvc.Razor/src/ViewPath.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/baseline.netcore.json b/src/Mvc/Mvc.Razor/src/baseline.netcore.json
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/baseline.netcore.json
rename to src/Mvc/Mvc.Razor/src/baseline.netcore.json
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/breakingchanges.netcore.json b/src/Mvc/Mvc.Razor/src/breakingchanges.netcore.json
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/breakingchanges.netcore.json
rename to src/Mvc/Mvc.Razor/src/breakingchanges.netcore.json
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/ApplicationParts/RazorCompiledItemFeatureProviderTest.cs b/src/Mvc/Mvc.Razor/test/ApplicationParts/RazorCompiledItemFeatureProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/ApplicationParts/RazorCompiledItemFeatureProviderTest.cs
rename to src/Mvc/Mvc.Razor/test/ApplicationParts/RazorCompiledItemFeatureProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/DefaultRazorPageFactoryProviderTest.cs b/src/Mvc/Mvc.Razor/test/Compilation/DefaultRazorPageFactoryProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/DefaultRazorPageFactoryProviderTest.cs
rename to src/Mvc/Mvc.Razor/test/Compilation/DefaultRazorPageFactoryProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/DefaultViewCompilerTest.cs b/src/Mvc/Mvc.Razor/test/Compilation/DefaultViewCompilerTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/DefaultViewCompilerTest.cs
rename to src/Mvc/Mvc.Razor/test/Compilation/DefaultViewCompilerTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/RazorPagePropertyActivatorTest.cs b/src/Mvc/Mvc.Razor/test/Compilation/RazorPagePropertyActivatorTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/RazorPagePropertyActivatorTest.cs
rename to src/Mvc/Mvc.Razor/test/Compilation/RazorPagePropertyActivatorTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/DefaultTagHelperFactoryTest.cs b/src/Mvc/Mvc.Razor/test/DefaultTagHelperFactoryTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/DefaultTagHelperFactoryTest.cs
rename to src/Mvc/Mvc.Razor/test/DefaultTagHelperFactoryTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/DependencyInjection/MvcRazorMvcBuilderExtensionsTest.cs b/src/Mvc/Mvc.Razor/test/DependencyInjection/MvcRazorMvcBuilderExtensionsTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/DependencyInjection/MvcRazorMvcBuilderExtensionsTest.cs
rename to src/Mvc/Mvc.Razor/test/DependencyInjection/MvcRazorMvcBuilderExtensionsTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/DependencyInjection/MvcRazorMvcCoreBuilderExtensionsTest.cs b/src/Mvc/Mvc.Razor/test/DependencyInjection/MvcRazorMvcCoreBuilderExtensionsTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/DependencyInjection/MvcRazorMvcCoreBuilderExtensionsTest.cs
rename to src/Mvc/Mvc.Razor/test/DependencyInjection/MvcRazorMvcCoreBuilderExtensionsTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Infrastructure/DefaultTagHelperActivatorTest.cs b/src/Mvc/Mvc.Razor/test/Infrastructure/DefaultTagHelperActivatorTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Infrastructure/DefaultTagHelperActivatorTest.cs
rename to src/Mvc/Mvc.Razor/test/Infrastructure/DefaultTagHelperActivatorTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/LanguageViewLocationExpanderTest.cs b/src/Mvc/Mvc.Razor/test/LanguageViewLocationExpanderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/LanguageViewLocationExpanderTest.cs
rename to src/Mvc/Mvc.Razor/test/LanguageViewLocationExpanderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Microsoft.AspNetCore.Mvc.Razor.Test.csproj b/src/Mvc/Mvc.Razor/test/Microsoft.AspNetCore.Mvc.Razor.Test.csproj
similarity index 68%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Microsoft.AspNetCore.Mvc.Razor.Test.csproj
rename to src/Mvc/Mvc.Razor/test/Microsoft.AspNetCore.Mvc.Razor.Test.csproj
index 090685b9c3..0a8a4e0fc1 100644
--- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Microsoft.AspNetCore.Mvc.Razor.Test.csproj
+++ b/src/Mvc/Mvc.Razor/test/Microsoft.AspNetCore.Mvc.Razor.Test.csproj
@@ -13,8 +13,8 @@
 
   <ItemGroup>
     <Reference Include="Microsoft.AspNetCore.Mvc" />
-    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.Views.TestCommon\Microsoft.AspNetCore.Mvc.Views.TestCommon.csproj" />
-    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.TestDiagnosticListener\Microsoft.AspNetCore.Mvc.TestDiagnosticListener.csproj" />
+    <ProjectReference Include="..\..\shared\Mvc.Views.TestCommon\Microsoft.AspNetCore.Mvc.Views.TestCommon.csproj" />
+    <ProjectReference Include="..\..\shared\Mvc.TestDiagnosticListener\Microsoft.AspNetCore.Mvc.TestDiagnosticListener.csproj" />
 
     <Reference Include="Microsoft.Extensions.Logging.Testing" />
   </ItemGroup>
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Properties/AssemblyInfo.cs b/src/Mvc/Mvc.Razor/test/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Properties/AssemblyInfo.cs
rename to src/Mvc/Mvc.Razor/test/Properties/AssemblyInfo.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorFileHierarchyTest.cs b/src/Mvc/Mvc.Razor/test/RazorFileHierarchyTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorFileHierarchyTest.cs
rename to src/Mvc/Mvc.Razor/test/RazorFileHierarchyTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorPageActivatorTest.cs b/src/Mvc/Mvc.Razor/test/RazorPageActivatorTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorPageActivatorTest.cs
rename to src/Mvc/Mvc.Razor/test/RazorPageActivatorTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorPageCreateModelExpressionTest.cs b/src/Mvc/Mvc.Razor/test/RazorPageCreateModelExpressionTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorPageCreateModelExpressionTest.cs
rename to src/Mvc/Mvc.Razor/test/RazorPageCreateModelExpressionTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorPageCreateTagHelperTest.cs b/src/Mvc/Mvc.Razor/test/RazorPageCreateTagHelperTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorPageCreateTagHelperTest.cs
rename to src/Mvc/Mvc.Razor/test/RazorPageCreateTagHelperTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorPageTest.cs b/src/Mvc/Mvc.Razor/test/RazorPageTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorPageTest.cs
rename to src/Mvc/Mvc.Razor/test/RazorPageTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorViewEngineOptionsTest.cs b/src/Mvc/Mvc.Razor/test/RazorViewEngineOptionsTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorViewEngineOptionsTest.cs
rename to src/Mvc/Mvc.Razor/test/RazorViewEngineOptionsTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorViewEngineTest.cs b/src/Mvc/Mvc.Razor/test/RazorViewEngineTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorViewEngineTest.cs
rename to src/Mvc/Mvc.Razor/test/RazorViewEngineTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorViewTest.cs b/src/Mvc/Mvc.Razor/test/RazorViewTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorViewTest.cs
rename to src/Mvc/Mvc.Razor/test/RazorViewTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/TagHelpers/TagHelperComponentPropertyActivatorTest.cs b/src/Mvc/Mvc.Razor/test/TagHelpers/TagHelperComponentPropertyActivatorTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/TagHelpers/TagHelperComponentPropertyActivatorTest.cs
rename to src/Mvc/Mvc.Razor/test/TagHelpers/TagHelperComponentPropertyActivatorTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/TagHelpers/TagHelperComponentTagHelperTest.cs b/src/Mvc/Mvc.Razor/test/TagHelpers/TagHelperComponentTagHelperTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/TagHelpers/TagHelperComponentTagHelperTest.cs
rename to src/Mvc/Mvc.Razor/test/TagHelpers/TagHelperComponentTagHelperTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/TagHelpers/UrlResolutionTagHelperTest.cs b/src/Mvc/Mvc.Razor/test/TagHelpers/UrlResolutionTagHelperTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/TagHelpers/UrlResolutionTagHelperTest.cs
rename to src/Mvc/Mvc.Razor/test/TagHelpers/UrlResolutionTagHelperTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/TestApplicationPart.cs b/src/Mvc/Mvc.Razor/test/TestApplicationPart.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/TestApplicationPart.cs
rename to src/Mvc/Mvc.Razor/test/TestApplicationPart.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/ViewPathTest.cs b/src/Mvc/Mvc.Razor/test/ViewPathTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/ViewPathTest.cs
rename to src/Mvc/Mvc.Razor/test/ViewPathTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/xunit.runner.json b/src/Mvc/Mvc.Razor/test/xunit.runner.json
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/xunit.runner.json
rename to src/Mvc/Mvc.Razor/test/xunit.runner.json
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/AuthorizationPageApplicationModelProvider.cs b/src/Mvc/Mvc.RazorPages/src/ApplicationModels/AuthorizationPageApplicationModelProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/AuthorizationPageApplicationModelProvider.cs
rename to src/Mvc/Mvc.RazorPages/src/ApplicationModels/AuthorizationPageApplicationModelProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/AutoValidateAntiforgeryPageApplicationModelProvider.cs b/src/Mvc/Mvc.RazorPages/src/ApplicationModels/AutoValidateAntiforgeryPageApplicationModelProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/AutoValidateAntiforgeryPageApplicationModelProvider.cs
rename to src/Mvc/Mvc.RazorPages/src/ApplicationModels/AutoValidateAntiforgeryPageApplicationModelProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/CompiledPageActionDescriptorBuilder.cs b/src/Mvc/Mvc.RazorPages/src/ApplicationModels/CompiledPageActionDescriptorBuilder.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/CompiledPageActionDescriptorBuilder.cs
rename to src/Mvc/Mvc.RazorPages/src/ApplicationModels/CompiledPageActionDescriptorBuilder.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/CompiledPageRouteModelProvider.cs b/src/Mvc/Mvc.RazorPages/src/ApplicationModels/CompiledPageRouteModelProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/CompiledPageRouteModelProvider.cs
rename to src/Mvc/Mvc.RazorPages/src/ApplicationModels/CompiledPageRouteModelProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/DefaultPageApplicationModelProvider.cs b/src/Mvc/Mvc.RazorPages/src/ApplicationModels/DefaultPageApplicationModelProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/DefaultPageApplicationModelProvider.cs
rename to src/Mvc/Mvc.RazorPages/src/ApplicationModels/DefaultPageApplicationModelProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/IPageApplicationModelConvention.cs b/src/Mvc/Mvc.RazorPages/src/ApplicationModels/IPageApplicationModelConvention.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/IPageApplicationModelConvention.cs
rename to src/Mvc/Mvc.RazorPages/src/ApplicationModels/IPageApplicationModelConvention.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/IPageApplicationModelProvider.cs b/src/Mvc/Mvc.RazorPages/src/ApplicationModels/IPageApplicationModelProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/IPageApplicationModelProvider.cs
rename to src/Mvc/Mvc.RazorPages/src/ApplicationModels/IPageApplicationModelProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/IPageConvention.cs b/src/Mvc/Mvc.RazorPages/src/ApplicationModels/IPageConvention.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/IPageConvention.cs
rename to src/Mvc/Mvc.RazorPages/src/ApplicationModels/IPageConvention.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/IPageHandlerModelConvention.cs b/src/Mvc/Mvc.RazorPages/src/ApplicationModels/IPageHandlerModelConvention.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/IPageHandlerModelConvention.cs
rename to src/Mvc/Mvc.RazorPages/src/ApplicationModels/IPageHandlerModelConvention.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/IPageRouteModelConvention.cs b/src/Mvc/Mvc.RazorPages/src/ApplicationModels/IPageRouteModelConvention.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/IPageRouteModelConvention.cs
rename to src/Mvc/Mvc.RazorPages/src/ApplicationModels/IPageRouteModelConvention.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/IPageRouteModelProvider.cs b/src/Mvc/Mvc.RazorPages/src/ApplicationModels/IPageRouteModelProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/IPageRouteModelProvider.cs
rename to src/Mvc/Mvc.RazorPages/src/ApplicationModels/IPageRouteModelProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageApplicationModel.cs b/src/Mvc/Mvc.RazorPages/src/ApplicationModels/PageApplicationModel.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageApplicationModel.cs
rename to src/Mvc/Mvc.RazorPages/src/ApplicationModels/PageApplicationModel.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageApplicationModelProviderContext.cs b/src/Mvc/Mvc.RazorPages/src/ApplicationModels/PageApplicationModelProviderContext.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageApplicationModelProviderContext.cs
rename to src/Mvc/Mvc.RazorPages/src/ApplicationModels/PageApplicationModelProviderContext.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageConventionCollection.cs b/src/Mvc/Mvc.RazorPages/src/ApplicationModels/PageConventionCollection.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageConventionCollection.cs
rename to src/Mvc/Mvc.RazorPages/src/ApplicationModels/PageConventionCollection.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageHandlerModel.cs b/src/Mvc/Mvc.RazorPages/src/ApplicationModels/PageHandlerModel.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageHandlerModel.cs
rename to src/Mvc/Mvc.RazorPages/src/ApplicationModels/PageHandlerModel.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageParameterModel.cs b/src/Mvc/Mvc.RazorPages/src/ApplicationModels/PageParameterModel.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageParameterModel.cs
rename to src/Mvc/Mvc.RazorPages/src/ApplicationModels/PageParameterModel.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PagePropertyModel.cs b/src/Mvc/Mvc.RazorPages/src/ApplicationModels/PagePropertyModel.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PagePropertyModel.cs
rename to src/Mvc/Mvc.RazorPages/src/ApplicationModels/PagePropertyModel.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageRouteMetadata.cs b/src/Mvc/Mvc.RazorPages/src/ApplicationModels/PageRouteMetadata.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageRouteMetadata.cs
rename to src/Mvc/Mvc.RazorPages/src/ApplicationModels/PageRouteMetadata.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageRouteModel.cs b/src/Mvc/Mvc.RazorPages/src/ApplicationModels/PageRouteModel.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageRouteModel.cs
rename to src/Mvc/Mvc.RazorPages/src/ApplicationModels/PageRouteModel.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageRouteModelFactory.cs b/src/Mvc/Mvc.RazorPages/src/ApplicationModels/PageRouteModelFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageRouteModelFactory.cs
rename to src/Mvc/Mvc.RazorPages/src/ApplicationModels/PageRouteModelFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageRouteModelProviderContext.cs b/src/Mvc/Mvc.RazorPages/src/ApplicationModels/PageRouteModelProviderContext.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageRouteModelProviderContext.cs
rename to src/Mvc/Mvc.RazorPages/src/ApplicationModels/PageRouteModelProviderContext.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageRouteTransformerConvention.cs b/src/Mvc/Mvc.RazorPages/src/ApplicationModels/PageRouteTransformerConvention.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageRouteTransformerConvention.cs
rename to src/Mvc/Mvc.RazorPages/src/ApplicationModels/PageRouteTransformerConvention.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/ResponseCacheFilterApplicationModelProvider.cs b/src/Mvc/Mvc.RazorPages/src/ApplicationModels/ResponseCacheFilterApplicationModelProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/ResponseCacheFilterApplicationModelProvider.cs
rename to src/Mvc/Mvc.RazorPages/src/ApplicationModels/ResponseCacheFilterApplicationModelProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/TempDataFilterPageApplicationModelProvider.cs b/src/Mvc/Mvc.RazorPages/src/ApplicationModels/TempDataFilterPageApplicationModelProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/TempDataFilterPageApplicationModelProvider.cs
rename to src/Mvc/Mvc.RazorPages/src/ApplicationModels/TempDataFilterPageApplicationModelProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/ViewDataAttributePageApplicationModelProvider.cs b/src/Mvc/Mvc.RazorPages/src/ApplicationModels/ViewDataAttributePageApplicationModelProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/ViewDataAttributePageApplicationModelProvider.cs
rename to src/Mvc/Mvc.RazorPages/src/ApplicationModels/ViewDataAttributePageApplicationModelProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Builder/RazorPagesEndpointRouteBuilderExtensions.cs b/src/Mvc/Mvc.RazorPages/src/Builder/RazorPagesEndpointRouteBuilderExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Builder/RazorPagesEndpointRouteBuilderExtensions.cs
rename to src/Mvc/Mvc.RazorPages/src/Builder/RazorPagesEndpointRouteBuilderExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/CompiledPageActionDescriptor.cs b/src/Mvc/Mvc.RazorPages/src/CompiledPageActionDescriptor.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/CompiledPageActionDescriptor.cs
rename to src/Mvc/Mvc.RazorPages/src/CompiledPageActionDescriptor.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/DependencyInjection/MvcRazorPagesMvcBuilderExtensions.cs b/src/Mvc/Mvc.RazorPages/src/DependencyInjection/MvcRazorPagesMvcBuilderExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/DependencyInjection/MvcRazorPagesMvcBuilderExtensions.cs
rename to src/Mvc/Mvc.RazorPages/src/DependencyInjection/MvcRazorPagesMvcBuilderExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/DependencyInjection/MvcRazorPagesMvcCoreBuilderExtensions.cs b/src/Mvc/Mvc.RazorPages/src/DependencyInjection/MvcRazorPagesMvcCoreBuilderExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/DependencyInjection/MvcRazorPagesMvcCoreBuilderExtensions.cs
rename to src/Mvc/Mvc.RazorPages/src/DependencyInjection/MvcRazorPagesMvcCoreBuilderExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/DependencyInjection/PageConventionCollectionExtensions.cs b/src/Mvc/Mvc.RazorPages/src/DependencyInjection/PageConventionCollectionExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/DependencyInjection/PageConventionCollectionExtensions.cs
rename to src/Mvc/Mvc.RazorPages/src/DependencyInjection/PageConventionCollectionExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/DependencyInjection/RazorPagesRazorViewEngineOptionsSetup.cs b/src/Mvc/Mvc.RazorPages/src/DependencyInjection/RazorPagesRazorViewEngineOptionsSetup.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/DependencyInjection/RazorPagesRazorViewEngineOptionsSetup.cs
rename to src/Mvc/Mvc.RazorPages/src/DependencyInjection/RazorPagesRazorViewEngineOptionsSetup.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/IAsyncPageFilter.cs b/src/Mvc/Mvc.RazorPages/src/Filters/IAsyncPageFilter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/IAsyncPageFilter.cs
rename to src/Mvc/Mvc.RazorPages/src/Filters/IAsyncPageFilter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/IPageFilter.cs b/src/Mvc/Mvc.RazorPages/src/Filters/IPageFilter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/IPageFilter.cs
rename to src/Mvc/Mvc.RazorPages/src/Filters/IPageFilter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageHandlerExecutedContext.cs b/src/Mvc/Mvc.RazorPages/src/Filters/PageHandlerExecutedContext.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageHandlerExecutedContext.cs
rename to src/Mvc/Mvc.RazorPages/src/Filters/PageHandlerExecutedContext.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageHandlerExecutingContext.cs b/src/Mvc/Mvc.RazorPages/src/Filters/PageHandlerExecutingContext.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageHandlerExecutingContext.cs
rename to src/Mvc/Mvc.RazorPages/src/Filters/PageHandlerExecutingContext.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageHandlerExecutionDelegate.cs b/src/Mvc/Mvc.RazorPages/src/Filters/PageHandlerExecutionDelegate.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageHandlerExecutionDelegate.cs
rename to src/Mvc/Mvc.RazorPages/src/Filters/PageHandlerExecutionDelegate.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageHandlerPageFilter.cs b/src/Mvc/Mvc.RazorPages/src/Filters/PageHandlerPageFilter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageHandlerPageFilter.cs
rename to src/Mvc/Mvc.RazorPages/src/Filters/PageHandlerPageFilter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageHandlerResultFIlter.cs b/src/Mvc/Mvc.RazorPages/src/Filters/PageHandlerResultFIlter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageHandlerResultFIlter.cs
rename to src/Mvc/Mvc.RazorPages/src/Filters/PageHandlerResultFIlter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageHandlerSelectedContext.cs b/src/Mvc/Mvc.RazorPages/src/Filters/PageHandlerSelectedContext.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageHandlerSelectedContext.cs
rename to src/Mvc/Mvc.RazorPages/src/Filters/PageHandlerSelectedContext.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageResponseCacheFilter.cs b/src/Mvc/Mvc.RazorPages/src/Filters/PageResponseCacheFilter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageResponseCacheFilter.cs
rename to src/Mvc/Mvc.RazorPages/src/Filters/PageResponseCacheFilter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageSaveTempDataPropertyFilter.cs b/src/Mvc/Mvc.RazorPages/src/Filters/PageSaveTempDataPropertyFilter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageSaveTempDataPropertyFilter.cs
rename to src/Mvc/Mvc.RazorPages/src/Filters/PageSaveTempDataPropertyFilter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageSaveTempDataPropertyFilterFactory.cs b/src/Mvc/Mvc.RazorPages/src/Filters/PageSaveTempDataPropertyFilterFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageSaveTempDataPropertyFilterFactory.cs
rename to src/Mvc/Mvc.RazorPages/src/Filters/PageSaveTempDataPropertyFilterFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageViewDataAttributeFilter.cs b/src/Mvc/Mvc.RazorPages/src/Filters/PageViewDataAttributeFilter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageViewDataAttributeFilter.cs
rename to src/Mvc/Mvc.RazorPages/src/Filters/PageViewDataAttributeFilter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageViewDataAttributeFilterFactory.cs b/src/Mvc/Mvc.RazorPages/src/Filters/PageViewDataAttributeFilterFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageViewDataAttributeFilterFactory.cs
rename to src/Mvc/Mvc.RazorPages/src/Filters/PageViewDataAttributeFilterFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/IPageActivatorProvider.cs b/src/Mvc/Mvc.RazorPages/src/IPageActivatorProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/IPageActivatorProvider.cs
rename to src/Mvc/Mvc.RazorPages/src/IPageActivatorProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/IPageFactoryProvider.cs b/src/Mvc/Mvc.RazorPages/src/IPageFactoryProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/IPageFactoryProvider.cs
rename to src/Mvc/Mvc.RazorPages/src/IPageFactoryProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/IPageModelActivatorProvider.cs b/src/Mvc/Mvc.RazorPages/src/IPageModelActivatorProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/IPageModelActivatorProvider.cs
rename to src/Mvc/Mvc.RazorPages/src/IPageModelActivatorProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/IPageModelFactoryProvider.cs b/src/Mvc/Mvc.RazorPages/src/IPageModelFactoryProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/IPageModelFactoryProvider.cs
rename to src/Mvc/Mvc.RazorPages/src/IPageModelFactoryProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/DefaultPageActivatorProvider.cs b/src/Mvc/Mvc.RazorPages/src/Infrastructure/DefaultPageActivatorProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/DefaultPageActivatorProvider.cs
rename to src/Mvc/Mvc.RazorPages/src/Infrastructure/DefaultPageActivatorProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/DefaultPageFactoryProvider.cs b/src/Mvc/Mvc.RazorPages/src/Infrastructure/DefaultPageFactoryProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/DefaultPageFactoryProvider.cs
rename to src/Mvc/Mvc.RazorPages/src/Infrastructure/DefaultPageFactoryProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/DefaultPageHandlerMethodSelector.cs b/src/Mvc/Mvc.RazorPages/src/Infrastructure/DefaultPageHandlerMethodSelector.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/DefaultPageHandlerMethodSelector.cs
rename to src/Mvc/Mvc.RazorPages/src/Infrastructure/DefaultPageHandlerMethodSelector.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/DefaultPageLoader.cs b/src/Mvc/Mvc.RazorPages/src/Infrastructure/DefaultPageLoader.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/DefaultPageLoader.cs
rename to src/Mvc/Mvc.RazorPages/src/Infrastructure/DefaultPageLoader.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/DefaultPageModelActivatorProvider.cs b/src/Mvc/Mvc.RazorPages/src/Infrastructure/DefaultPageModelActivatorProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/DefaultPageModelActivatorProvider.cs
rename to src/Mvc/Mvc.RazorPages/src/Infrastructure/DefaultPageModelActivatorProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/DefaultPageModelFactoryProvider.cs b/src/Mvc/Mvc.RazorPages/src/Infrastructure/DefaultPageModelFactoryProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/DefaultPageModelFactoryProvider.cs
rename to src/Mvc/Mvc.RazorPages/src/Infrastructure/DefaultPageModelFactoryProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/ExecutorFactory.cs b/src/Mvc/Mvc.RazorPages/src/Infrastructure/ExecutorFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/ExecutorFactory.cs
rename to src/Mvc/Mvc.RazorPages/src/Infrastructure/ExecutorFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/HandleOptionsRequestsPageFilter.cs b/src/Mvc/Mvc.RazorPages/src/Infrastructure/HandleOptionsRequestsPageFilter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/HandleOptionsRequestsPageFilter.cs
rename to src/Mvc/Mvc.RazorPages/src/Infrastructure/HandleOptionsRequestsPageFilter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/HandlerMethodDescriptor.cs b/src/Mvc/Mvc.RazorPages/src/Infrastructure/HandlerMethodDescriptor.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/HandlerMethodDescriptor.cs
rename to src/Mvc/Mvc.RazorPages/src/Infrastructure/HandlerMethodDescriptor.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/HandlerParameterDescriptor.cs b/src/Mvc/Mvc.RazorPages/src/Infrastructure/HandlerParameterDescriptor.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/HandlerParameterDescriptor.cs
rename to src/Mvc/Mvc.RazorPages/src/Infrastructure/HandlerParameterDescriptor.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/IPageHandlerMethodSelector.cs b/src/Mvc/Mvc.RazorPages/src/Infrastructure/IPageHandlerMethodSelector.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/IPageHandlerMethodSelector.cs
rename to src/Mvc/Mvc.RazorPages/src/Infrastructure/IPageHandlerMethodSelector.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/IPageLoader.cs b/src/Mvc/Mvc.RazorPages/src/Infrastructure/IPageLoader.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/IPageLoader.cs
rename to src/Mvc/Mvc.RazorPages/src/Infrastructure/IPageLoader.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageActionDescriptorProvider.cs b/src/Mvc/Mvc.RazorPages/src/Infrastructure/PageActionDescriptorProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageActionDescriptorProvider.cs
rename to src/Mvc/Mvc.RazorPages/src/Infrastructure/PageActionDescriptorProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageActionEndpointDataSource.cs b/src/Mvc/Mvc.RazorPages/src/Infrastructure/PageActionEndpointDataSource.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageActionEndpointDataSource.cs
rename to src/Mvc/Mvc.RazorPages/src/Infrastructure/PageActionEndpointDataSource.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageActionInvoker.cs b/src/Mvc/Mvc.RazorPages/src/Infrastructure/PageActionInvoker.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageActionInvoker.cs
rename to src/Mvc/Mvc.RazorPages/src/Infrastructure/PageActionInvoker.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageActionInvokerCacheEntry.cs b/src/Mvc/Mvc.RazorPages/src/Infrastructure/PageActionInvokerCacheEntry.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageActionInvokerCacheEntry.cs
rename to src/Mvc/Mvc.RazorPages/src/Infrastructure/PageActionInvokerCacheEntry.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageActionInvokerProvider.cs b/src/Mvc/Mvc.RazorPages/src/Infrastructure/PageActionInvokerProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageActionInvokerProvider.cs
rename to src/Mvc/Mvc.RazorPages/src/Infrastructure/PageActionInvokerProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageBinderFactory.cs b/src/Mvc/Mvc.RazorPages/src/Infrastructure/PageBinderFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageBinderFactory.cs
rename to src/Mvc/Mvc.RazorPages/src/Infrastructure/PageBinderFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageBoundPropertyDescriptor.cs b/src/Mvc/Mvc.RazorPages/src/Infrastructure/PageBoundPropertyDescriptor.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageBoundPropertyDescriptor.cs
rename to src/Mvc/Mvc.RazorPages/src/Infrastructure/PageBoundPropertyDescriptor.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageHandlerBinderDelegate.cs b/src/Mvc/Mvc.RazorPages/src/Infrastructure/PageHandlerBinderDelegate.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageHandlerBinderDelegate.cs
rename to src/Mvc/Mvc.RazorPages/src/Infrastructure/PageHandlerBinderDelegate.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageHandlerExecutorDelegate.cs b/src/Mvc/Mvc.RazorPages/src/Infrastructure/PageHandlerExecutorDelegate.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageHandlerExecutorDelegate.cs
rename to src/Mvc/Mvc.RazorPages/src/Infrastructure/PageHandlerExecutorDelegate.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageLoaderMatcherPolicy.cs b/src/Mvc/Mvc.RazorPages/src/Infrastructure/PageLoaderMatcherPolicy.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageLoaderMatcherPolicy.cs
rename to src/Mvc/Mvc.RazorPages/src/Infrastructure/PageLoaderMatcherPolicy.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageModelAttribute.cs b/src/Mvc/Mvc.RazorPages/src/Infrastructure/PageModelAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageModelAttribute.cs
rename to src/Mvc/Mvc.RazorPages/src/Infrastructure/PageModelAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageResultExecutor.cs b/src/Mvc/Mvc.RazorPages/src/Infrastructure/PageResultExecutor.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageResultExecutor.cs
rename to src/Mvc/Mvc.RazorPages/src/Infrastructure/PageResultExecutor.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageViewLocationExpander.cs b/src/Mvc/Mvc.RazorPages/src/Infrastructure/PageViewLocationExpander.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageViewLocationExpander.cs
rename to src/Mvc/Mvc.RazorPages/src/Infrastructure/PageViewLocationExpander.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/RazorPageAdapter.cs b/src/Mvc/Mvc.RazorPages/src/Infrastructure/RazorPageAdapter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/RazorPageAdapter.cs
rename to src/Mvc/Mvc.RazorPages/src/Infrastructure/RazorPageAdapter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/RazorPageAttribute.cs b/src/Mvc/Mvc.RazorPages/src/Infrastructure/RazorPageAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/RazorPageAttribute.cs
rename to src/Mvc/Mvc.RazorPages/src/Infrastructure/RazorPageAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/ServiceBasedPageModelActivatorProvider.cs b/src/Mvc/Mvc.RazorPages/src/Infrastructure/ServiceBasedPageModelActivatorProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/ServiceBasedPageModelActivatorProvider.cs
rename to src/Mvc/Mvc.RazorPages/src/Infrastructure/ServiceBasedPageModelActivatorProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Microsoft.AspNetCore.Mvc.RazorPages.csproj b/src/Mvc/Mvc.RazorPages/src/Microsoft.AspNetCore.Mvc.RazorPages.csproj
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Microsoft.AspNetCore.Mvc.RazorPages.csproj
rename to src/Mvc/Mvc.RazorPages/src/Microsoft.AspNetCore.Mvc.RazorPages.csproj
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/MvcRazorPagesDiagnosticSourceExtensions.cs b/src/Mvc/Mvc.RazorPages/src/MvcRazorPagesDiagnosticSourceExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/MvcRazorPagesDiagnosticSourceExtensions.cs
rename to src/Mvc/Mvc.RazorPages/src/MvcRazorPagesDiagnosticSourceExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/NonHandlerAttribute.cs b/src/Mvc/Mvc.RazorPages/src/NonHandlerAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/NonHandlerAttribute.cs
rename to src/Mvc/Mvc.RazorPages/src/NonHandlerAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Page.cs b/src/Mvc/Mvc.RazorPages/src/Page.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Page.cs
rename to src/Mvc/Mvc.RazorPages/src/Page.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/PageActionDescriptor.cs b/src/Mvc/Mvc.RazorPages/src/PageActionDescriptor.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/PageActionDescriptor.cs
rename to src/Mvc/Mvc.RazorPages/src/PageActionDescriptor.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/PageBase.cs b/src/Mvc/Mvc.RazorPages/src/PageBase.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/PageBase.cs
rename to src/Mvc/Mvc.RazorPages/src/PageBase.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/PageContext.cs b/src/Mvc/Mvc.RazorPages/src/PageContext.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/PageContext.cs
rename to src/Mvc/Mvc.RazorPages/src/PageContext.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/PageContextAttribute.cs b/src/Mvc/Mvc.RazorPages/src/PageContextAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/PageContextAttribute.cs
rename to src/Mvc/Mvc.RazorPages/src/PageContextAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/PageLoggerExtensions.cs b/src/Mvc/Mvc.RazorPages/src/PageLoggerExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/PageLoggerExtensions.cs
rename to src/Mvc/Mvc.RazorPages/src/PageLoggerExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/PageModel.cs b/src/Mvc/Mvc.RazorPages/src/PageModel.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/PageModel.cs
rename to src/Mvc/Mvc.RazorPages/src/PageModel.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/PageResult.cs b/src/Mvc/Mvc.RazorPages/src/PageResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/PageResult.cs
rename to src/Mvc/Mvc.RazorPages/src/PageResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Properties/AssemblyInfo.cs b/src/Mvc/Mvc.RazorPages/src/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Properties/AssemblyInfo.cs
rename to src/Mvc/Mvc.RazorPages/src/Properties/AssemblyInfo.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Properties/Resources.Designer.cs b/src/Mvc/Mvc.RazorPages/src/Properties/Resources.Designer.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Properties/Resources.Designer.cs
rename to src/Mvc/Mvc.RazorPages/src/Properties/Resources.Designer.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/RazorPagesOptions.cs b/src/Mvc/Mvc.RazorPages/src/RazorPagesOptions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/RazorPagesOptions.cs
rename to src/Mvc/Mvc.RazorPages/src/RazorPagesOptions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Resources.resx b/src/Mvc/Mvc.RazorPages/src/Resources.resx
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Resources.resx
rename to src/Mvc/Mvc.RazorPages/src/Resources.resx
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/baseline.netcore.json b/src/Mvc/Mvc.RazorPages/src/baseline.netcore.json
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/baseline.netcore.json
rename to src/Mvc/Mvc.RazorPages/src/baseline.netcore.json
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/breakingchanges.netcore.json b/src/Mvc/Mvc.RazorPages/src/breakingchanges.netcore.json
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/breakingchanges.netcore.json
rename to src/Mvc/Mvc.RazorPages/src/breakingchanges.netcore.json
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/AuthorizationPageApplicationModelProviderTest.cs b/src/Mvc/Mvc.RazorPages/test/ApplicationModels/AuthorizationPageApplicationModelProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/AuthorizationPageApplicationModelProviderTest.cs
rename to src/Mvc/Mvc.RazorPages/test/ApplicationModels/AuthorizationPageApplicationModelProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/CompiledPageActionDescriptorBuilderTest.cs b/src/Mvc/Mvc.RazorPages/test/ApplicationModels/CompiledPageActionDescriptorBuilderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/CompiledPageActionDescriptorBuilderTest.cs
rename to src/Mvc/Mvc.RazorPages/test/ApplicationModels/CompiledPageActionDescriptorBuilderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/CompiledPageRouteModelProviderTest.cs b/src/Mvc/Mvc.RazorPages/test/ApplicationModels/CompiledPageRouteModelProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/CompiledPageRouteModelProviderTest.cs
rename to src/Mvc/Mvc.RazorPages/test/ApplicationModels/CompiledPageRouteModelProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/DefaultPageApplicationModelProviderTest.cs b/src/Mvc/Mvc.RazorPages/test/ApplicationModels/DefaultPageApplicationModelProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/DefaultPageApplicationModelProviderTest.cs
rename to src/Mvc/Mvc.RazorPages/test/ApplicationModels/DefaultPageApplicationModelProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/PageConventionCollectionTest.cs b/src/Mvc/Mvc.RazorPages/test/ApplicationModels/PageConventionCollectionTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/PageConventionCollectionTest.cs
rename to src/Mvc/Mvc.RazorPages/test/ApplicationModels/PageConventionCollectionTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/PageRouteModelFactoryTest.cs b/src/Mvc/Mvc.RazorPages/test/ApplicationModels/PageRouteModelFactoryTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/PageRouteModelFactoryTest.cs
rename to src/Mvc/Mvc.RazorPages/test/ApplicationModels/PageRouteModelFactoryTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/PageRouteTransformerConventionTest.cs b/src/Mvc/Mvc.RazorPages/test/ApplicationModels/PageRouteTransformerConventionTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/PageRouteTransformerConventionTest.cs
rename to src/Mvc/Mvc.RazorPages/test/ApplicationModels/PageRouteTransformerConventionTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/ResponseCacheFilterApplicationModelProviderTest.cs b/src/Mvc/Mvc.RazorPages/test/ApplicationModels/ResponseCacheFilterApplicationModelProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/ResponseCacheFilterApplicationModelProviderTest.cs
rename to src/Mvc/Mvc.RazorPages/test/ApplicationModels/ResponseCacheFilterApplicationModelProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/TempDataFilterPageApplicationModelProviderTest.cs b/src/Mvc/Mvc.RazorPages/test/ApplicationModels/TempDataFilterPageApplicationModelProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/TempDataFilterPageApplicationModelProviderTest.cs
rename to src/Mvc/Mvc.RazorPages/test/ApplicationModels/TempDataFilterPageApplicationModelProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/ViewDataAttributePageApplicationModelProviderTest.cs b/src/Mvc/Mvc.RazorPages/test/ApplicationModels/ViewDataAttributePageApplicationModelProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/ViewDataAttributePageApplicationModelProviderTest.cs
rename to src/Mvc/Mvc.RazorPages/test/ApplicationModels/ViewDataAttributePageApplicationModelProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/DependencyInjection/MvcRazorPagesMvcBuilderExtensionsTest.cs b/src/Mvc/Mvc.RazorPages/test/DependencyInjection/MvcRazorPagesMvcBuilderExtensionsTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/DependencyInjection/MvcRazorPagesMvcBuilderExtensionsTest.cs
rename to src/Mvc/Mvc.RazorPages/test/DependencyInjection/MvcRazorPagesMvcBuilderExtensionsTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/DependencyInjection/PageConventionCollectionExtensionsTest.cs b/src/Mvc/Mvc.RazorPages/test/DependencyInjection/PageConventionCollectionExtensionsTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/DependencyInjection/PageConventionCollectionExtensionsTest.cs
rename to src/Mvc/Mvc.RazorPages/test/DependencyInjection/PageConventionCollectionExtensionsTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/DependencyInjection/RazorPagesRazorViewEngineOptionsSetupTest.cs b/src/Mvc/Mvc.RazorPages/test/DependencyInjection/RazorPagesRazorViewEngineOptionsSetupTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/DependencyInjection/RazorPagesRazorViewEngineOptionsSetupTest.cs
rename to src/Mvc/Mvc.RazorPages/test/DependencyInjection/RazorPagesRazorViewEngineOptionsSetupTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Filters/AutoValidateAntiforgeryPageApplicationModelProviderTest.cs b/src/Mvc/Mvc.RazorPages/test/Filters/AutoValidateAntiforgeryPageApplicationModelProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Filters/AutoValidateAntiforgeryPageApplicationModelProviderTest.cs
rename to src/Mvc/Mvc.RazorPages/test/Filters/AutoValidateAntiforgeryPageApplicationModelProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Filters/PageHandlerResultFilterTest.cs b/src/Mvc/Mvc.RazorPages/test/Filters/PageHandlerResultFilterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Filters/PageHandlerResultFilterTest.cs
rename to src/Mvc/Mvc.RazorPages/test/Filters/PageHandlerResultFilterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Filters/PageSaveTempDataPropertyFilterFactoryTest.cs b/src/Mvc/Mvc.RazorPages/test/Filters/PageSaveTempDataPropertyFilterFactoryTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Filters/PageSaveTempDataPropertyFilterFactoryTest.cs
rename to src/Mvc/Mvc.RazorPages/test/Filters/PageSaveTempDataPropertyFilterFactoryTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Filters/PageSaveTempDataPropertyFilterTest.cs b/src/Mvc/Mvc.RazorPages/test/Filters/PageSaveTempDataPropertyFilterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Filters/PageSaveTempDataPropertyFilterTest.cs
rename to src/Mvc/Mvc.RazorPages/test/Filters/PageSaveTempDataPropertyFilterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Filters/PageViewDataAttributeFilterFactoryTest.cs b/src/Mvc/Mvc.RazorPages/test/Filters/PageViewDataAttributeFilterFactoryTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Filters/PageViewDataAttributeFilterFactoryTest.cs
rename to src/Mvc/Mvc.RazorPages/test/Filters/PageViewDataAttributeFilterFactoryTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Filters/PageViewDataAttributeFilterTest.cs b/src/Mvc/Mvc.RazorPages/test/Filters/PageViewDataAttributeFilterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Filters/PageViewDataAttributeFilterTest.cs
rename to src/Mvc/Mvc.RazorPages/test/Filters/PageViewDataAttributeFilterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/DefaultPageActivatorProviderTest.cs b/src/Mvc/Mvc.RazorPages/test/Infrastructure/DefaultPageActivatorProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/DefaultPageActivatorProviderTest.cs
rename to src/Mvc/Mvc.RazorPages/test/Infrastructure/DefaultPageActivatorProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/DefaultPageFactoryProviderTest.cs b/src/Mvc/Mvc.RazorPages/test/Infrastructure/DefaultPageFactoryProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/DefaultPageFactoryProviderTest.cs
rename to src/Mvc/Mvc.RazorPages/test/Infrastructure/DefaultPageFactoryProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/DefaultPageHandlerMethodSelectorTest.cs b/src/Mvc/Mvc.RazorPages/test/Infrastructure/DefaultPageHandlerMethodSelectorTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/DefaultPageHandlerMethodSelectorTest.cs
rename to src/Mvc/Mvc.RazorPages/test/Infrastructure/DefaultPageHandlerMethodSelectorTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/DefaultPageLoaderTest.cs b/src/Mvc/Mvc.RazorPages/test/Infrastructure/DefaultPageLoaderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/DefaultPageLoaderTest.cs
rename to src/Mvc/Mvc.RazorPages/test/Infrastructure/DefaultPageLoaderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/DefaultPageModelActivatorProviderTest.cs b/src/Mvc/Mvc.RazorPages/test/Infrastructure/DefaultPageModelActivatorProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/DefaultPageModelActivatorProviderTest.cs
rename to src/Mvc/Mvc.RazorPages/test/Infrastructure/DefaultPageModelActivatorProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/DefaultPageModelFactoryProviderTest.cs b/src/Mvc/Mvc.RazorPages/test/Infrastructure/DefaultPageModelFactoryProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/DefaultPageModelFactoryProviderTest.cs
rename to src/Mvc/Mvc.RazorPages/test/Infrastructure/DefaultPageModelFactoryProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/DisallowOptionsRequestsPageFilterTest.cs b/src/Mvc/Mvc.RazorPages/test/Infrastructure/DisallowOptionsRequestsPageFilterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/DisallowOptionsRequestsPageFilterTest.cs
rename to src/Mvc/Mvc.RazorPages/test/Infrastructure/DisallowOptionsRequestsPageFilterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/ExecutorFactoryTest.cs b/src/Mvc/Mvc.RazorPages/test/Infrastructure/ExecutorFactoryTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/ExecutorFactoryTest.cs
rename to src/Mvc/Mvc.RazorPages/test/Infrastructure/ExecutorFactoryTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/PageActionDescriptorProviderTest.cs b/src/Mvc/Mvc.RazorPages/test/Infrastructure/PageActionDescriptorProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/PageActionDescriptorProviderTest.cs
rename to src/Mvc/Mvc.RazorPages/test/Infrastructure/PageActionDescriptorProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/PageActionEndpointDataSourceTest.cs b/src/Mvc/Mvc.RazorPages/test/Infrastructure/PageActionEndpointDataSourceTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/PageActionEndpointDataSourceTest.cs
rename to src/Mvc/Mvc.RazorPages/test/Infrastructure/PageActionEndpointDataSourceTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/PageActionInvokerProviderTest.cs b/src/Mvc/Mvc.RazorPages/test/Infrastructure/PageActionInvokerProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/PageActionInvokerProviderTest.cs
rename to src/Mvc/Mvc.RazorPages/test/Infrastructure/PageActionInvokerProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/PageActionInvokerTest.cs b/src/Mvc/Mvc.RazorPages/test/Infrastructure/PageActionInvokerTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/PageActionInvokerTest.cs
rename to src/Mvc/Mvc.RazorPages/test/Infrastructure/PageActionInvokerTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/PageBinderFactoryTest.cs b/src/Mvc/Mvc.RazorPages/test/Infrastructure/PageBinderFactoryTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/PageBinderFactoryTest.cs
rename to src/Mvc/Mvc.RazorPages/test/Infrastructure/PageBinderFactoryTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/PageHandlerPageFilterTest.cs b/src/Mvc/Mvc.RazorPages/test/Infrastructure/PageHandlerPageFilterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/PageHandlerPageFilterTest.cs
rename to src/Mvc/Mvc.RazorPages/test/Infrastructure/PageHandlerPageFilterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/PageViewLocationExpanderTest.cs b/src/Mvc/Mvc.RazorPages/test/Infrastructure/PageViewLocationExpanderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/PageViewLocationExpanderTest.cs
rename to src/Mvc/Mvc.RazorPages/test/Infrastructure/PageViewLocationExpanderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/ServiceBasedPageModelActivatorProviderTest.cs b/src/Mvc/Mvc.RazorPages/test/Infrastructure/ServiceBasedPageModelActivatorProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/ServiceBasedPageModelActivatorProviderTest.cs
rename to src/Mvc/Mvc.RazorPages/test/Infrastructure/ServiceBasedPageModelActivatorProviderTest.cs
diff --git a/src/Mvc/Mvc.RazorPages/test/Microsoft.AspNetCore.Mvc.RazorPages.Test.csproj b/src/Mvc/Mvc.RazorPages/test/Microsoft.AspNetCore.Mvc.RazorPages.Test.csproj
new file mode 100644
index 0000000000..3b4c6d6e73
--- /dev/null
+++ b/src/Mvc/Mvc.RazorPages/test/Microsoft.AspNetCore.Mvc.RazorPages.Test.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="..\..\Mvc.Core\test\Routing\ActionEndpointDataSourceBaseTest.cs" Link="Infrastructure\ActionEndpointDataSourceBaseTest.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="Microsoft.AspNetCore.Mvc.RazorPages" />
+    <ProjectReference Include="..\..\shared\Mvc.Views.TestCommon\Microsoft.AspNetCore.Mvc.Views.TestCommon.csproj" />
+    <ProjectReference Include="..\..\shared\Mvc.TestDiagnosticListener\Microsoft.AspNetCore.Mvc.TestDiagnosticListener.csproj" />
+
+    <Reference Include="Microsoft.Extensions.Logging.Testing" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/PageModelTest.cs b/src/Mvc/Mvc.RazorPages/test/PageModelTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/PageModelTest.cs
rename to src/Mvc/Mvc.RazorPages/test/PageModelTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/PageTest.cs b/src/Mvc/Mvc.RazorPages/test/PageTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/PageTest.cs
rename to src/Mvc/Mvc.RazorPages/test/PageTest.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/AnchorTagHelper.cs b/src/Mvc/Mvc.TagHelpers/src/AnchorTagHelper.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/AnchorTagHelper.cs
rename to src/Mvc/Mvc.TagHelpers/src/AnchorTagHelper.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/AttributeMatcher.cs b/src/Mvc/Mvc.TagHelpers/src/AttributeMatcher.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/AttributeMatcher.cs
rename to src/Mvc/Mvc.TagHelpers/src/AttributeMatcher.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/CacheTagKey.cs b/src/Mvc/Mvc.TagHelpers/src/Cache/CacheTagKey.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/CacheTagKey.cs
rename to src/Mvc/Mvc.TagHelpers/src/Cache/CacheTagKey.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/DistributedCacheTagHelperFormatter.cs b/src/Mvc/Mvc.TagHelpers/src/Cache/DistributedCacheTagHelperFormatter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/DistributedCacheTagHelperFormatter.cs
rename to src/Mvc/Mvc.TagHelpers/src/Cache/DistributedCacheTagHelperFormatter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/DistributedCacheTagHelperFormattingContext.cs b/src/Mvc/Mvc.TagHelpers/src/Cache/DistributedCacheTagHelperFormattingContext.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/DistributedCacheTagHelperFormattingContext.cs
rename to src/Mvc/Mvc.TagHelpers/src/Cache/DistributedCacheTagHelperFormattingContext.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/DistributedCacheTagHelperService.cs b/src/Mvc/Mvc.TagHelpers/src/Cache/DistributedCacheTagHelperService.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/DistributedCacheTagHelperService.cs
rename to src/Mvc/Mvc.TagHelpers/src/Cache/DistributedCacheTagHelperService.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/DistributedCacheTagHelperStorage.cs b/src/Mvc/Mvc.TagHelpers/src/Cache/DistributedCacheTagHelperStorage.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/DistributedCacheTagHelperStorage.cs
rename to src/Mvc/Mvc.TagHelpers/src/Cache/DistributedCacheTagHelperStorage.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/IDistributedCacheTagHelperFormatter.cs b/src/Mvc/Mvc.TagHelpers/src/Cache/IDistributedCacheTagHelperFormatter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/IDistributedCacheTagHelperFormatter.cs
rename to src/Mvc/Mvc.TagHelpers/src/Cache/IDistributedCacheTagHelperFormatter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/IDistributedCacheTagHelperService.cs b/src/Mvc/Mvc.TagHelpers/src/Cache/IDistributedCacheTagHelperService.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/IDistributedCacheTagHelperService.cs
rename to src/Mvc/Mvc.TagHelpers/src/Cache/IDistributedCacheTagHelperService.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/IDistributedCacheTagHelperStorage.cs b/src/Mvc/Mvc.TagHelpers/src/Cache/IDistributedCacheTagHelperStorage.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/IDistributedCacheTagHelperStorage.cs
rename to src/Mvc/Mvc.TagHelpers/src/Cache/IDistributedCacheTagHelperStorage.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/CacheTagHelper.cs b/src/Mvc/Mvc.TagHelpers/src/CacheTagHelper.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/CacheTagHelper.cs
rename to src/Mvc/Mvc.TagHelpers/src/CacheTagHelper.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/CacheTagHelperBase.cs b/src/Mvc/Mvc.TagHelpers/src/CacheTagHelperBase.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/CacheTagHelperBase.cs
rename to src/Mvc/Mvc.TagHelpers/src/CacheTagHelperBase.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/CacheTagHelperMemoryCacheFactory.cs b/src/Mvc/Mvc.TagHelpers/src/CacheTagHelperMemoryCacheFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/CacheTagHelperMemoryCacheFactory.cs
rename to src/Mvc/Mvc.TagHelpers/src/CacheTagHelperMemoryCacheFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/CacheTagHelperOptions.cs b/src/Mvc/Mvc.TagHelpers/src/CacheTagHelperOptions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/CacheTagHelperOptions.cs
rename to src/Mvc/Mvc.TagHelpers/src/CacheTagHelperOptions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/CurrentValues.cs b/src/Mvc/Mvc.TagHelpers/src/CurrentValues.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/CurrentValues.cs
rename to src/Mvc/Mvc.TagHelpers/src/CurrentValues.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/DependencyInjection/TagHelperExtensions.cs b/src/Mvc/Mvc.TagHelpers/src/DependencyInjection/TagHelperExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/DependencyInjection/TagHelperExtensions.cs
rename to src/Mvc/Mvc.TagHelpers/src/DependencyInjection/TagHelperExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/DistributedCacheTagHelper.cs b/src/Mvc/Mvc.TagHelpers/src/DistributedCacheTagHelper.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/DistributedCacheTagHelper.cs
rename to src/Mvc/Mvc.TagHelpers/src/DistributedCacheTagHelper.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/EnvironmentTagHelper.cs b/src/Mvc/Mvc.TagHelpers/src/EnvironmentTagHelper.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/EnvironmentTagHelper.cs
rename to src/Mvc/Mvc.TagHelpers/src/EnvironmentTagHelper.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/FileProviderGlobbingDirectory.cs b/src/Mvc/Mvc.TagHelpers/src/FileProviderGlobbingDirectory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/FileProviderGlobbingDirectory.cs
rename to src/Mvc/Mvc.TagHelpers/src/FileProviderGlobbingDirectory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/FileProviderGlobbingFile.cs b/src/Mvc/Mvc.TagHelpers/src/FileProviderGlobbingFile.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/FileProviderGlobbingFile.cs
rename to src/Mvc/Mvc.TagHelpers/src/FileProviderGlobbingFile.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/FormActionTagHelper.cs b/src/Mvc/Mvc.TagHelpers/src/FormActionTagHelper.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/FormActionTagHelper.cs
rename to src/Mvc/Mvc.TagHelpers/src/FormActionTagHelper.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/FormTagHelper.cs b/src/Mvc/Mvc.TagHelpers/src/FormTagHelper.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/FormTagHelper.cs
rename to src/Mvc/Mvc.TagHelpers/src/FormTagHelper.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/GlobbingUrlBuilder.cs b/src/Mvc/Mvc.TagHelpers/src/GlobbingUrlBuilder.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/GlobbingUrlBuilder.cs
rename to src/Mvc/Mvc.TagHelpers/src/GlobbingUrlBuilder.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/ImageTagHelper.cs b/src/Mvc/Mvc.TagHelpers/src/ImageTagHelper.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/ImageTagHelper.cs
rename to src/Mvc/Mvc.TagHelpers/src/ImageTagHelper.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/InputTagHelper.cs b/src/Mvc/Mvc.TagHelpers/src/InputTagHelper.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/InputTagHelper.cs
rename to src/Mvc/Mvc.TagHelpers/src/InputTagHelper.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/JavaScriptResources.cs b/src/Mvc/Mvc.TagHelpers/src/JavaScriptResources.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/JavaScriptResources.cs
rename to src/Mvc/Mvc.TagHelpers/src/JavaScriptResources.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/LabelTagHelper.cs b/src/Mvc/Mvc.TagHelpers/src/LabelTagHelper.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/LabelTagHelper.cs
rename to src/Mvc/Mvc.TagHelpers/src/LabelTagHelper.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/LinkTagHelper.cs b/src/Mvc/Mvc.TagHelpers/src/LinkTagHelper.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/LinkTagHelper.cs
rename to src/Mvc/Mvc.TagHelpers/src/LinkTagHelper.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Microsoft.AspNetCore.Mvc.TagHelpers.csproj b/src/Mvc/Mvc.TagHelpers/src/Microsoft.AspNetCore.Mvc.TagHelpers.csproj
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Microsoft.AspNetCore.Mvc.TagHelpers.csproj
rename to src/Mvc/Mvc.TagHelpers/src/Microsoft.AspNetCore.Mvc.TagHelpers.csproj
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/ModeAttributesOfT.cs b/src/Mvc/Mvc.TagHelpers/src/ModeAttributesOfT.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/ModeAttributesOfT.cs
rename to src/Mvc/Mvc.TagHelpers/src/ModeAttributesOfT.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/MvcTagHelpersLoggerExtensions.cs b/src/Mvc/Mvc.TagHelpers/src/MvcTagHelpersLoggerExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/MvcTagHelpersLoggerExtensions.cs
rename to src/Mvc/Mvc.TagHelpers/src/MvcTagHelpersLoggerExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/OptionTagHelper.cs b/src/Mvc/Mvc.TagHelpers/src/OptionTagHelper.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/OptionTagHelper.cs
rename to src/Mvc/Mvc.TagHelpers/src/OptionTagHelper.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/PartialTagHelper.cs b/src/Mvc/Mvc.TagHelpers/src/PartialTagHelper.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/PartialTagHelper.cs
rename to src/Mvc/Mvc.TagHelpers/src/PartialTagHelper.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Properties/AssemblyInfo.cs b/src/Mvc/Mvc.TagHelpers/src/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Properties/AssemblyInfo.cs
rename to src/Mvc/Mvc.TagHelpers/src/Properties/AssemblyInfo.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Properties/Resources.Designer.cs b/src/Mvc/Mvc.TagHelpers/src/Properties/Resources.Designer.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Properties/Resources.Designer.cs
rename to src/Mvc/Mvc.TagHelpers/src/Properties/Resources.Designer.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/RenderAtEndOfFormTagHelper.cs b/src/Mvc/Mvc.TagHelpers/src/RenderAtEndOfFormTagHelper.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/RenderAtEndOfFormTagHelper.cs
rename to src/Mvc/Mvc.TagHelpers/src/RenderAtEndOfFormTagHelper.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Rendering/ValidationSummary.cs b/src/Mvc/Mvc.TagHelpers/src/Rendering/ValidationSummary.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Rendering/ValidationSummary.cs
rename to src/Mvc/Mvc.TagHelpers/src/Rendering/ValidationSummary.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Resources.resx b/src/Mvc/Mvc.TagHelpers/src/Resources.resx
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Resources.resx
rename to src/Mvc/Mvc.TagHelpers/src/Resources.resx
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/ScriptTagHelper.cs b/src/Mvc/Mvc.TagHelpers/src/ScriptTagHelper.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/ScriptTagHelper.cs
rename to src/Mvc/Mvc.TagHelpers/src/ScriptTagHelper.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/SelectTagHelper.cs b/src/Mvc/Mvc.TagHelpers/src/SelectTagHelper.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/SelectTagHelper.cs
rename to src/Mvc/Mvc.TagHelpers/src/SelectTagHelper.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/TagHelperOutputExtensions.cs b/src/Mvc/Mvc.TagHelpers/src/TagHelperOutputExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/TagHelperOutputExtensions.cs
rename to src/Mvc/Mvc.TagHelpers/src/TagHelperOutputExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/TextAreaTagHelper.cs b/src/Mvc/Mvc.TagHelpers/src/TextAreaTagHelper.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/TextAreaTagHelper.cs
rename to src/Mvc/Mvc.TagHelpers/src/TextAreaTagHelper.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/ValidationMessageTagHelper.cs b/src/Mvc/Mvc.TagHelpers/src/ValidationMessageTagHelper.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/ValidationMessageTagHelper.cs
rename to src/Mvc/Mvc.TagHelpers/src/ValidationMessageTagHelper.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/ValidationSummaryTagHelper.cs b/src/Mvc/Mvc.TagHelpers/src/ValidationSummaryTagHelper.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/ValidationSummaryTagHelper.cs
rename to src/Mvc/Mvc.TagHelpers/src/ValidationSummaryTagHelper.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/_grunt.readme b/src/Mvc/Mvc.TagHelpers/src/_grunt.readme
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/_grunt.readme
rename to src/Mvc/Mvc.TagHelpers/src/_grunt.readme
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/_gruntfile.js b/src/Mvc/Mvc.TagHelpers/src/_gruntfile.js
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/_gruntfile.js
rename to src/Mvc/Mvc.TagHelpers/src/_gruntfile.js
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/_package.json b/src/Mvc/Mvc.TagHelpers/src/_package.json
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/_package.json
rename to src/Mvc/Mvc.TagHelpers/src/_package.json
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/baseline.netcore.json b/src/Mvc/Mvc.TagHelpers/src/baseline.netcore.json
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/baseline.netcore.json
rename to src/Mvc/Mvc.TagHelpers/src/baseline.netcore.json
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/breakingchanges.netcore.json b/src/Mvc/Mvc.TagHelpers/src/breakingchanges.netcore.json
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/breakingchanges.netcore.json
rename to src/Mvc/Mvc.TagHelpers/src/breakingchanges.netcore.json
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/compiler/resources/LinkTagHelper_FallbackJavaScript.js b/src/Mvc/Mvc.TagHelpers/src/compiler/resources/LinkTagHelper_FallbackJavaScript.js
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/compiler/resources/LinkTagHelper_FallbackJavaScript.js
rename to src/Mvc/Mvc.TagHelpers/src/compiler/resources/LinkTagHelper_FallbackJavaScript.js
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/js/LinkTagHelper_FallbackJavaScript.js b/src/Mvc/Mvc.TagHelpers/src/js/LinkTagHelper_FallbackJavaScript.js
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/js/LinkTagHelper_FallbackJavaScript.js
rename to src/Mvc/Mvc.TagHelpers/src/js/LinkTagHelper_FallbackJavaScript.js
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/AnchorTagHelperTest.cs b/src/Mvc/Mvc.TagHelpers/test/AnchorTagHelperTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/AnchorTagHelperTest.cs
rename to src/Mvc/Mvc.TagHelpers/test/AnchorTagHelperTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/AttributeMatcherTest.cs b/src/Mvc/Mvc.TagHelpers/test/AttributeMatcherTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/AttributeMatcherTest.cs
rename to src/Mvc/Mvc.TagHelpers/test/AttributeMatcherTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/CacheTagHelperTest.cs b/src/Mvc/Mvc.TagHelpers/test/CacheTagHelperTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/CacheTagHelperTest.cs
rename to src/Mvc/Mvc.TagHelpers/test/CacheTagHelperTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/CacheTagKeyTest.cs b/src/Mvc/Mvc.TagHelpers/test/CacheTagKeyTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/CacheTagKeyTest.cs
rename to src/Mvc/Mvc.TagHelpers/test/CacheTagKeyTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/DefaultFileVersionProviderTest.cs b/src/Mvc/Mvc.TagHelpers/test/DefaultFileVersionProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/DefaultFileVersionProviderTest.cs
rename to src/Mvc/Mvc.TagHelpers/test/DefaultFileVersionProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/DefaultTagHelperActivatorTest.cs b/src/Mvc/Mvc.TagHelpers/test/DefaultTagHelperActivatorTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/DefaultTagHelperActivatorTest.cs
rename to src/Mvc/Mvc.TagHelpers/test/DefaultTagHelperActivatorTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/DistributedCacheTagHelperTest.cs b/src/Mvc/Mvc.TagHelpers/test/DistributedCacheTagHelperTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/DistributedCacheTagHelperTest.cs
rename to src/Mvc/Mvc.TagHelpers/test/DistributedCacheTagHelperTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/EnvironmentTagHelperTest.cs b/src/Mvc/Mvc.TagHelpers/test/EnvironmentTagHelperTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/EnvironmentTagHelperTest.cs
rename to src/Mvc/Mvc.TagHelpers/test/EnvironmentTagHelperTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/FormActionTagHelperTest.cs b/src/Mvc/Mvc.TagHelpers/test/FormActionTagHelperTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/FormActionTagHelperTest.cs
rename to src/Mvc/Mvc.TagHelpers/test/FormActionTagHelperTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/FormTagHelperTest.cs b/src/Mvc/Mvc.TagHelpers/test/FormTagHelperTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/FormTagHelperTest.cs
rename to src/Mvc/Mvc.TagHelpers/test/FormTagHelperTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/GlobbingUrlBuilderTest.cs b/src/Mvc/Mvc.TagHelpers/test/GlobbingUrlBuilderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/GlobbingUrlBuilderTest.cs
rename to src/Mvc/Mvc.TagHelpers/test/GlobbingUrlBuilderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/ImageTagHelperTest.cs b/src/Mvc/Mvc.TagHelpers/test/ImageTagHelperTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/ImageTagHelperTest.cs
rename to src/Mvc/Mvc.TagHelpers/test/ImageTagHelperTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/InputTagHelperTest.cs b/src/Mvc/Mvc.TagHelpers/test/InputTagHelperTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/InputTagHelperTest.cs
rename to src/Mvc/Mvc.TagHelpers/test/InputTagHelperTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/JavaScriptResourcesTest.cs b/src/Mvc/Mvc.TagHelpers/test/JavaScriptResourcesTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/JavaScriptResourcesTest.cs
rename to src/Mvc/Mvc.TagHelpers/test/JavaScriptResourcesTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/LabelTagHelperTest.cs b/src/Mvc/Mvc.TagHelpers/test/LabelTagHelperTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/LabelTagHelperTest.cs
rename to src/Mvc/Mvc.TagHelpers/test/LabelTagHelperTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/LinkTagHelperTest.cs b/src/Mvc/Mvc.TagHelpers/test/LinkTagHelperTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/LinkTagHelperTest.cs
rename to src/Mvc/Mvc.TagHelpers/test/LinkTagHelperTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/Microsoft.AspNetCore.Mvc.TagHelpers.Test.csproj b/src/Mvc/Mvc.TagHelpers/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test.csproj
similarity index 71%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/Microsoft.AspNetCore.Mvc.TagHelpers.Test.csproj
rename to src/Mvc/Mvc.TagHelpers/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test.csproj
index 31127474e4..32e1fe2107 100644
--- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/Microsoft.AspNetCore.Mvc.TagHelpers.Test.csproj
+++ b/src/Mvc/Mvc.TagHelpers/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test.csproj
@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <Reference Include="Microsoft.AspNetCore.Mvc.TagHelpers" />
-    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.Views.TestCommon\Microsoft.AspNetCore.Mvc.Views.TestCommon.csproj" />
+    <ProjectReference Include="..\..\shared\Mvc.Views.TestCommon\Microsoft.AspNetCore.Mvc.Views.TestCommon.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/OptionTagHelperTest.cs b/src/Mvc/Mvc.TagHelpers/test/OptionTagHelperTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/OptionTagHelperTest.cs
rename to src/Mvc/Mvc.TagHelpers/test/OptionTagHelperTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/PartialTagHelperTest.cs b/src/Mvc/Mvc.TagHelpers/test/PartialTagHelperTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/PartialTagHelperTest.cs
rename to src/Mvc/Mvc.TagHelpers/test/PartialTagHelperTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/RenderAtEndOfFormTagHelperTest.cs b/src/Mvc/Mvc.TagHelpers/test/RenderAtEndOfFormTagHelperTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/RenderAtEndOfFormTagHelperTest.cs
rename to src/Mvc/Mvc.TagHelpers/test/RenderAtEndOfFormTagHelperTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/ScriptTagHelperTest.cs b/src/Mvc/Mvc.TagHelpers/test/ScriptTagHelperTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/ScriptTagHelperTest.cs
rename to src/Mvc/Mvc.TagHelpers/test/ScriptTagHelperTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/SelectTagHelperTest.cs b/src/Mvc/Mvc.TagHelpers/test/SelectTagHelperTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/SelectTagHelperTest.cs
rename to src/Mvc/Mvc.TagHelpers/test/SelectTagHelperTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/TagHelperLogger.cs b/src/Mvc/Mvc.TagHelpers/test/TagHelperLogger.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/TagHelperLogger.cs
rename to src/Mvc/Mvc.TagHelpers/test/TagHelperLogger.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/TagHelperOutputExtensionsTest.cs b/src/Mvc/Mvc.TagHelpers/test/TagHelperOutputExtensionsTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/TagHelperOutputExtensionsTest.cs
rename to src/Mvc/Mvc.TagHelpers/test/TagHelperOutputExtensionsTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/TestableHtmlGenerator.cs b/src/Mvc/Mvc.TagHelpers/test/TestableHtmlGenerator.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/TestableHtmlGenerator.cs
rename to src/Mvc/Mvc.TagHelpers/test/TestableHtmlGenerator.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/TextAreaTagHelperTest.cs b/src/Mvc/Mvc.TagHelpers/test/TextAreaTagHelperTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/TextAreaTagHelperTest.cs
rename to src/Mvc/Mvc.TagHelpers/test/TextAreaTagHelperTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/ValidationMessageTagHelperTest.cs b/src/Mvc/Mvc.TagHelpers/test/ValidationMessageTagHelperTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/ValidationMessageTagHelperTest.cs
rename to src/Mvc/Mvc.TagHelpers/test/ValidationMessageTagHelperTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/ValidationSummaryTagHelperTest.cs b/src/Mvc/Mvc.TagHelpers/test/ValidationSummaryTagHelperTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/ValidationSummaryTagHelperTest.cs
rename to src/Mvc/Mvc.TagHelpers/test/ValidationSummaryTagHelperTest.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/Handlers/CookieContainerHandler.cs b/src/Mvc/Mvc.Testing/src/Handlers/CookieContainerHandler.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/Handlers/CookieContainerHandler.cs
rename to src/Mvc/Mvc.Testing/src/Handlers/CookieContainerHandler.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/Handlers/RedirectHandler.cs b/src/Mvc/Mvc.Testing/src/Handlers/RedirectHandler.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/Handlers/RedirectHandler.cs
rename to src/Mvc/Mvc.Testing/src/Handlers/RedirectHandler.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/Microsoft.AspNetCore.Mvc.Testing.csproj b/src/Mvc/Mvc.Testing/src/Microsoft.AspNetCore.Mvc.Testing.csproj
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/Microsoft.AspNetCore.Mvc.Testing.csproj
rename to src/Mvc/Mvc.Testing/src/Microsoft.AspNetCore.Mvc.Testing.csproj
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/Microsoft.AspNetCore.Mvc.Testing.targets b/src/Mvc/Mvc.Testing/src/Microsoft.AspNetCore.Mvc.Testing.targets
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/Microsoft.AspNetCore.Mvc.Testing.targets
rename to src/Mvc/Mvc.Testing/src/Microsoft.AspNetCore.Mvc.Testing.targets
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/Properties/Resources.Designer.cs b/src/Mvc/Mvc.Testing/src/Properties/Resources.Designer.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/Properties/Resources.Designer.cs
rename to src/Mvc/Mvc.Testing/src/Properties/Resources.Designer.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/Resources.resx b/src/Mvc/Mvc.Testing/src/Resources.resx
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/Resources.resx
rename to src/Mvc/Mvc.Testing/src/Resources.resx
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/WebApplicationFactory.cs b/src/Mvc/Mvc.Testing/src/WebApplicationFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/WebApplicationFactory.cs
rename to src/Mvc/Mvc.Testing/src/WebApplicationFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/WebApplicationFactoryClientOptions.cs b/src/Mvc/Mvc.Testing/src/WebApplicationFactoryClientOptions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/WebApplicationFactoryClientOptions.cs
rename to src/Mvc/Mvc.Testing/src/WebApplicationFactoryClientOptions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/WebApplicationFactoryContentRootAttribute.cs b/src/Mvc/Mvc.Testing/src/WebApplicationFactoryContentRootAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/WebApplicationFactoryContentRootAttribute.cs
rename to src/Mvc/Mvc.Testing/src/WebApplicationFactoryContentRootAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/baseline.netcore.json b/src/Mvc/Mvc.Testing/src/baseline.netcore.json
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/baseline.netcore.json
rename to src/Mvc/Mvc.Testing/src/baseline.netcore.json
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/AntiforgeryExtensions.cs b/src/Mvc/Mvc.ViewFeatures/src/AntiforgeryExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/AntiforgeryExtensions.cs
rename to src/Mvc/Mvc.ViewFeatures/src/AntiforgeryExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/AttributeDictionary.cs b/src/Mvc/Mvc.ViewFeatures/src/AttributeDictionary.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/AttributeDictionary.cs
rename to src/Mvc/Mvc.ViewFeatures/src/AttributeDictionary.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/AutoValidateAntiforgeryTokenAttribute.cs b/src/Mvc/Mvc.ViewFeatures/src/AutoValidateAntiforgeryTokenAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/AutoValidateAntiforgeryTokenAttribute.cs
rename to src/Mvc/Mvc.ViewFeatures/src/AutoValidateAntiforgeryTokenAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/ArrayPoolBufferSource.cs b/src/Mvc/Mvc.ViewFeatures/src/Buffers/ArrayPoolBufferSource.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/ArrayPoolBufferSource.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Buffers/ArrayPoolBufferSource.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/CharArrayBufferSource.cs b/src/Mvc/Mvc.ViewFeatures/src/Buffers/CharArrayBufferSource.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/CharArrayBufferSource.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Buffers/CharArrayBufferSource.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/ICharBufferSource.cs b/src/Mvc/Mvc.ViewFeatures/src/Buffers/ICharBufferSource.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/ICharBufferSource.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Buffers/ICharBufferSource.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/IViewBufferScope.cs b/src/Mvc/Mvc.ViewFeatures/src/Buffers/IViewBufferScope.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/IViewBufferScope.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Buffers/IViewBufferScope.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/MemoryPoolViewBufferScope.cs b/src/Mvc/Mvc.ViewFeatures/src/Buffers/MemoryPoolViewBufferScope.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/MemoryPoolViewBufferScope.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Buffers/MemoryPoolViewBufferScope.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/PagedBufferedTextWriter.cs b/src/Mvc/Mvc.ViewFeatures/src/Buffers/PagedBufferedTextWriter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/PagedBufferedTextWriter.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Buffers/PagedBufferedTextWriter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/PagedCharBuffer.cs b/src/Mvc/Mvc.ViewFeatures/src/Buffers/PagedCharBuffer.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/PagedCharBuffer.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Buffers/PagedCharBuffer.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/ViewBuffer.cs b/src/Mvc/Mvc.ViewFeatures/src/Buffers/ViewBuffer.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/ViewBuffer.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Buffers/ViewBuffer.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/ViewBufferPage.cs b/src/Mvc/Mvc.ViewFeatures/src/Buffers/ViewBufferPage.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/ViewBufferPage.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Buffers/ViewBufferPage.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/ViewBufferTextWriter.cs b/src/Mvc/Mvc.ViewFeatures/src/Buffers/ViewBufferTextWriter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/ViewBufferTextWriter.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Buffers/ViewBufferTextWriter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/ViewBufferValue.cs b/src/Mvc/Mvc.ViewFeatures/src/Buffers/ViewBufferValue.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/ViewBufferValue.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Buffers/ViewBufferValue.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/CachedExpressionCompiler.cs b/src/Mvc/Mvc.ViewFeatures/src/CachedExpressionCompiler.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/CachedExpressionCompiler.cs
rename to src/Mvc/Mvc.ViewFeatures/src/CachedExpressionCompiler.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Controller.cs b/src/Mvc/Mvc.ViewFeatures/src/Controller.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Controller.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Controller.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/CookieTempDataProvider.cs b/src/Mvc/Mvc.ViewFeatures/src/CookieTempDataProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/CookieTempDataProvider.cs
rename to src/Mvc/Mvc.ViewFeatures/src/CookieTempDataProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/CookieTempDataProviderOptions.cs b/src/Mvc/Mvc.ViewFeatures/src/CookieTempDataProviderOptions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/CookieTempDataProviderOptions.cs
rename to src/Mvc/Mvc.ViewFeatures/src/CookieTempDataProviderOptions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DefaultDisplayTemplates.cs b/src/Mvc/Mvc.ViewFeatures/src/DefaultDisplayTemplates.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DefaultDisplayTemplates.cs
rename to src/Mvc/Mvc.ViewFeatures/src/DefaultDisplayTemplates.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DefaultEditorTemplates.cs b/src/Mvc/Mvc.ViewFeatures/src/DefaultEditorTemplates.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DefaultEditorTemplates.cs
rename to src/Mvc/Mvc.ViewFeatures/src/DefaultEditorTemplates.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DefaultHtmlGenerator.cs b/src/Mvc/Mvc.ViewFeatures/src/DefaultHtmlGenerator.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DefaultHtmlGenerator.cs
rename to src/Mvc/Mvc.ViewFeatures/src/DefaultHtmlGenerator.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DefaultHtmlGeneratorExtensions.cs b/src/Mvc/Mvc.ViewFeatures/src/DefaultHtmlGeneratorExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DefaultHtmlGeneratorExtensions.cs
rename to src/Mvc/Mvc.ViewFeatures/src/DefaultHtmlGeneratorExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DefaultValidationHtmlAttributeProvider.cs b/src/Mvc/Mvc.ViewFeatures/src/DefaultValidationHtmlAttributeProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DefaultValidationHtmlAttributeProvider.cs
rename to src/Mvc/Mvc.ViewFeatures/src/DefaultValidationHtmlAttributeProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DependencyInjection/MvcViewFeaturesMvcBuilderExtensions.cs b/src/Mvc/Mvc.ViewFeatures/src/DependencyInjection/MvcViewFeaturesMvcBuilderExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DependencyInjection/MvcViewFeaturesMvcBuilderExtensions.cs
rename to src/Mvc/Mvc.ViewFeatures/src/DependencyInjection/MvcViewFeaturesMvcBuilderExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DependencyInjection/MvcViewFeaturesMvcCoreBuilderExtensions.cs b/src/Mvc/Mvc.ViewFeatures/src/DependencyInjection/MvcViewFeaturesMvcCoreBuilderExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DependencyInjection/MvcViewFeaturesMvcCoreBuilderExtensions.cs
rename to src/Mvc/Mvc.ViewFeatures/src/DependencyInjection/MvcViewFeaturesMvcCoreBuilderExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DependencyInjection/MvcViewOptionsSetup.cs b/src/Mvc/Mvc.ViewFeatures/src/DependencyInjection/MvcViewOptionsSetup.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DependencyInjection/MvcViewOptionsSetup.cs
rename to src/Mvc/Mvc.ViewFeatures/src/DependencyInjection/MvcViewOptionsSetup.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DependencyInjection/TempDataMvcOptionsSetup.cs b/src/Mvc/Mvc.ViewFeatures/src/DependencyInjection/TempDataMvcOptionsSetup.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DependencyInjection/TempDataMvcOptionsSetup.cs
rename to src/Mvc/Mvc.ViewFeatures/src/DependencyInjection/TempDataMvcOptionsSetup.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DynamicViewData.cs b/src/Mvc/Mvc.ViewFeatures/src/DynamicViewData.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DynamicViewData.cs
rename to src/Mvc/Mvc.ViewFeatures/src/DynamicViewData.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ExpressionHelper.cs b/src/Mvc/Mvc.ViewFeatures/src/ExpressionHelper.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ExpressionHelper.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ExpressionHelper.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ExpressionMetadataProvider.cs b/src/Mvc/Mvc.ViewFeatures/src/ExpressionMetadataProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ExpressionMetadataProvider.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ExpressionMetadataProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/AutoValidateAntiforgeryTokenAuthorizationFilter.cs b/src/Mvc/Mvc.ViewFeatures/src/Filters/AutoValidateAntiforgeryTokenAuthorizationFilter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/AutoValidateAntiforgeryTokenAuthorizationFilter.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Filters/AutoValidateAntiforgeryTokenAuthorizationFilter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ControllerSaveTempDataPropertyFilter.cs b/src/Mvc/Mvc.ViewFeatures/src/Filters/ControllerSaveTempDataPropertyFilter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ControllerSaveTempDataPropertyFilter.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Filters/ControllerSaveTempDataPropertyFilter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ControllerSaveTempDataPropertyFilterFactory.cs b/src/Mvc/Mvc.ViewFeatures/src/Filters/ControllerSaveTempDataPropertyFilterFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ControllerSaveTempDataPropertyFilterFactory.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Filters/ControllerSaveTempDataPropertyFilterFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ControllerViewDataAttributeFilter.cs b/src/Mvc/Mvc.ViewFeatures/src/Filters/ControllerViewDataAttributeFilter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ControllerViewDataAttributeFilter.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Filters/ControllerViewDataAttributeFilter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ControllerViewDataAttributeFilterFactory.cs b/src/Mvc/Mvc.ViewFeatures/src/Filters/ControllerViewDataAttributeFilterFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ControllerViewDataAttributeFilterFactory.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Filters/ControllerViewDataAttributeFilterFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ISaveTempDataCallback.cs b/src/Mvc/Mvc.ViewFeatures/src/Filters/ISaveTempDataCallback.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ISaveTempDataCallback.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Filters/ISaveTempDataCallback.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/IViewDataValuesProviderFeature.cs b/src/Mvc/Mvc.ViewFeatures/src/Filters/IViewDataValuesProviderFeature.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/IViewDataValuesProviderFeature.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Filters/IViewDataValuesProviderFeature.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/LifecycleProperty.cs b/src/Mvc/Mvc.ViewFeatures/src/Filters/LifecycleProperty.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/LifecycleProperty.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Filters/LifecycleProperty.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/SaveTempDataFilter.cs b/src/Mvc/Mvc.ViewFeatures/src/Filters/SaveTempDataFilter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/SaveTempDataFilter.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Filters/SaveTempDataFilter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/SaveTempDataPropertyFilterBase.cs b/src/Mvc/Mvc.ViewFeatures/src/Filters/SaveTempDataPropertyFilterBase.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/SaveTempDataPropertyFilterBase.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Filters/SaveTempDataPropertyFilterBase.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/TempDataApplicationModelProvider.cs b/src/Mvc/Mvc.ViewFeatures/src/Filters/TempDataApplicationModelProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/TempDataApplicationModelProvider.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Filters/TempDataApplicationModelProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ValidateAntiforgeryTokenAuthorizationFilter.cs b/src/Mvc/Mvc.ViewFeatures/src/Filters/ValidateAntiforgeryTokenAuthorizationFilter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ValidateAntiforgeryTokenAuthorizationFilter.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Filters/ValidateAntiforgeryTokenAuthorizationFilter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ViewDataAttributeApplicationModelProvider.cs b/src/Mvc/Mvc.ViewFeatures/src/Filters/ViewDataAttributeApplicationModelProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ViewDataAttributeApplicationModelProvider.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Filters/ViewDataAttributeApplicationModelProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ViewDataAttributePropertyProvider.cs b/src/Mvc/Mvc.ViewFeatures/src/Filters/ViewDataAttributePropertyProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ViewDataAttributePropertyProvider.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Filters/ViewDataAttributePropertyProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/FormContext.cs b/src/Mvc/Mvc.ViewFeatures/src/FormContext.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/FormContext.cs
rename to src/Mvc/Mvc.ViewFeatures/src/FormContext.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/FormatWeekHelper.cs b/src/Mvc/Mvc.ViewFeatures/src/FormatWeekHelper.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/FormatWeekHelper.cs
rename to src/Mvc/Mvc.ViewFeatures/src/FormatWeekHelper.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/HtmlAttributePropertyHelper.cs b/src/Mvc/Mvc.ViewFeatures/src/HtmlAttributePropertyHelper.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/HtmlAttributePropertyHelper.cs
rename to src/Mvc/Mvc.ViewFeatures/src/HtmlAttributePropertyHelper.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/HtmlHelper.cs b/src/Mvc/Mvc.ViewFeatures/src/HtmlHelper.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/HtmlHelper.cs
rename to src/Mvc/Mvc.ViewFeatures/src/HtmlHelper.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/HtmlHelperComponentExtensions.cs b/src/Mvc/Mvc.ViewFeatures/src/HtmlHelperComponentExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/HtmlHelperComponentExtensions.cs
rename to src/Mvc/Mvc.ViewFeatures/src/HtmlHelperComponentExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/HtmlHelperOfT.cs b/src/Mvc/Mvc.ViewFeatures/src/HtmlHelperOfT.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/HtmlHelperOfT.cs
rename to src/Mvc/Mvc.ViewFeatures/src/HtmlHelperOfT.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/HtmlHelperOptions.cs b/src/Mvc/Mvc.ViewFeatures/src/HtmlHelperOptions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/HtmlHelperOptions.cs
rename to src/Mvc/Mvc.ViewFeatures/src/HtmlHelperOptions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/IAntiforgeryPolicy.cs b/src/Mvc/Mvc.ViewFeatures/src/IAntiforgeryPolicy.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/IAntiforgeryPolicy.cs
rename to src/Mvc/Mvc.ViewFeatures/src/IAntiforgeryPolicy.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/IFileVersionProvider.cs b/src/Mvc/Mvc.ViewFeatures/src/IFileVersionProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/IFileVersionProvider.cs
rename to src/Mvc/Mvc.ViewFeatures/src/IFileVersionProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/IHtmlGenerator.cs b/src/Mvc/Mvc.ViewFeatures/src/IHtmlGenerator.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/IHtmlGenerator.cs
rename to src/Mvc/Mvc.ViewFeatures/src/IHtmlGenerator.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/IModelExpressionProvider.cs b/src/Mvc/Mvc.ViewFeatures/src/IModelExpressionProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/IModelExpressionProvider.cs
rename to src/Mvc/Mvc.ViewFeatures/src/IModelExpressionProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ITempDataDictionary.cs b/src/Mvc/Mvc.ViewFeatures/src/ITempDataDictionary.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ITempDataDictionary.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ITempDataDictionary.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ITempDataDictionaryFactory.cs b/src/Mvc/Mvc.ViewFeatures/src/ITempDataDictionaryFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ITempDataDictionaryFactory.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ITempDataDictionaryFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ITempDataProvider.cs b/src/Mvc/Mvc.ViewFeatures/src/ITempDataProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ITempDataProvider.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ITempDataProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/IViewComponentHelper.cs b/src/Mvc/Mvc.ViewFeatures/src/IViewComponentHelper.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/IViewComponentHelper.cs
rename to src/Mvc/Mvc.ViewFeatures/src/IViewComponentHelper.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/IViewComponentResult.cs b/src/Mvc/Mvc.ViewFeatures/src/IViewComponentResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/IViewComponentResult.cs
rename to src/Mvc/Mvc.ViewFeatures/src/IViewComponentResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/IViewContextAware.cs b/src/Mvc/Mvc.ViewFeatures/src/IViewContextAware.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/IViewContextAware.cs
rename to src/Mvc/Mvc.ViewFeatures/src/IViewContextAware.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/IgnoreAntiforgeryTokenAttribute.cs b/src/Mvc/Mvc.ViewFeatures/src/IgnoreAntiforgeryTokenAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/IgnoreAntiforgeryTokenAttribute.cs
rename to src/Mvc/Mvc.ViewFeatures/src/IgnoreAntiforgeryTokenAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Infrastructure/DefaultTempDataSerializer.cs b/src/Mvc/Mvc.ViewFeatures/src/Infrastructure/DefaultTempDataSerializer.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Infrastructure/DefaultTempDataSerializer.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Infrastructure/DefaultTempDataSerializer.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Infrastructure/TempDataSerializer.cs b/src/Mvc/Mvc.ViewFeatures/src/Infrastructure/TempDataSerializer.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Infrastructure/TempDataSerializer.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Infrastructure/TempDataSerializer.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/InputType.cs b/src/Mvc/Mvc.ViewFeatures/src/InputType.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/InputType.cs
rename to src/Mvc/Mvc.ViewFeatures/src/InputType.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/LambdaExpressionComparer.cs b/src/Mvc/Mvc.ViewFeatures/src/LambdaExpressionComparer.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/LambdaExpressionComparer.cs
rename to src/Mvc/Mvc.ViewFeatures/src/LambdaExpressionComparer.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/MemberExpressionCacheKey.cs b/src/Mvc/Mvc.ViewFeatures/src/MemberExpressionCacheKey.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/MemberExpressionCacheKey.cs
rename to src/Mvc/Mvc.ViewFeatures/src/MemberExpressionCacheKey.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/MemberExpressionCacheKeyComparer.cs b/src/Mvc/Mvc.ViewFeatures/src/MemberExpressionCacheKeyComparer.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/MemberExpressionCacheKeyComparer.cs
rename to src/Mvc/Mvc.ViewFeatures/src/MemberExpressionCacheKeyComparer.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj b/src/Mvc/Mvc.ViewFeatures/src/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj
rename to src/Mvc/Mvc.ViewFeatures/src/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelExplorer.cs b/src/Mvc/Mvc.ViewFeatures/src/ModelExplorer.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelExplorer.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ModelExplorer.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelExplorerExtensions.cs b/src/Mvc/Mvc.ViewFeatures/src/ModelExplorerExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelExplorerExtensions.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ModelExplorerExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelExpression.cs b/src/Mvc/Mvc.ViewFeatures/src/ModelExpression.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelExpression.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ModelExpression.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelExpressionProvider.cs b/src/Mvc/Mvc.ViewFeatures/src/ModelExpressionProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelExpressionProvider.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ModelExpressionProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelMetadataProviderExtensions.cs b/src/Mvc/Mvc.ViewFeatures/src/ModelMetadataProviderExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelMetadataProviderExtensions.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ModelMetadataProviderExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelStateDictionaryExtensions.cs b/src/Mvc/Mvc.ViewFeatures/src/ModelStateDictionaryExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelStateDictionaryExtensions.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ModelStateDictionaryExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/MvcViewFeaturesDiagnosticSourceExtensions.cs b/src/Mvc/Mvc.ViewFeatures/src/MvcViewFeaturesDiagnosticSourceExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/MvcViewFeaturesDiagnosticSourceExtensions.cs
rename to src/Mvc/Mvc.ViewFeatures/src/MvcViewFeaturesDiagnosticSourceExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/MvcViewFeaturesLoggerExtensions.cs b/src/Mvc/Mvc.ViewFeatures/src/MvcViewFeaturesLoggerExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/MvcViewFeaturesLoggerExtensions.cs
rename to src/Mvc/Mvc.ViewFeatures/src/MvcViewFeaturesLoggerExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/MvcViewOptions.cs b/src/Mvc/Mvc.ViewFeatures/src/MvcViewOptions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/MvcViewOptions.cs
rename to src/Mvc/Mvc.ViewFeatures/src/MvcViewOptions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/NameAndIdProvider.cs b/src/Mvc/Mvc.ViewFeatures/src/NameAndIdProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/NameAndIdProvider.cs
rename to src/Mvc/Mvc.ViewFeatures/src/NameAndIdProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/NullView.cs b/src/Mvc/Mvc.ViewFeatures/src/NullView.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/NullView.cs
rename to src/Mvc/Mvc.ViewFeatures/src/NullView.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/PageRemoteAttribute.cs b/src/Mvc/Mvc.ViewFeatures/src/PageRemoteAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/PageRemoteAttribute.cs
rename to src/Mvc/Mvc.ViewFeatures/src/PageRemoteAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/PartialViewResult.cs b/src/Mvc/Mvc.ViewFeatures/src/PartialViewResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/PartialViewResult.cs
rename to src/Mvc/Mvc.ViewFeatures/src/PartialViewResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/PartialViewResultExecutor.cs b/src/Mvc/Mvc.ViewFeatures/src/PartialViewResultExecutor.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/PartialViewResultExecutor.cs
rename to src/Mvc/Mvc.ViewFeatures/src/PartialViewResultExecutor.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Properties/AssemblyInfo.cs b/src/Mvc/Mvc.ViewFeatures/src/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Properties/AssemblyInfo.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Properties/AssemblyInfo.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Properties/Resources.Designer.cs b/src/Mvc/Mvc.ViewFeatures/src/Properties/Resources.Designer.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Properties/Resources.Designer.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Properties/Resources.Designer.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/RemoteAttribute.cs b/src/Mvc/Mvc.ViewFeatures/src/RemoteAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/RemoteAttribute.cs
rename to src/Mvc/Mvc.ViewFeatures/src/RemoteAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/RemoteAttributeBase.cs b/src/Mvc/Mvc.ViewFeatures/src/RemoteAttributeBase.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/RemoteAttributeBase.cs
rename to src/Mvc/Mvc.ViewFeatures/src/RemoteAttributeBase.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/DefaultJsonHelper.cs b/src/Mvc/Mvc.ViewFeatures/src/Rendering/DefaultJsonHelper.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/DefaultJsonHelper.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Rendering/DefaultJsonHelper.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/FormMethod.cs b/src/Mvc/Mvc.ViewFeatures/src/Rendering/FormMethod.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/FormMethod.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Rendering/FormMethod.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/Html5DateRenderingMode.cs b/src/Mvc/Mvc.ViewFeatures/src/Rendering/Html5DateRenderingMode.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/Html5DateRenderingMode.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Rendering/Html5DateRenderingMode.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperDisplayExtensions.cs b/src/Mvc/Mvc.ViewFeatures/src/Rendering/HtmlHelperDisplayExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperDisplayExtensions.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Rendering/HtmlHelperDisplayExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperDisplayNameExtensions.cs b/src/Mvc/Mvc.ViewFeatures/src/Rendering/HtmlHelperDisplayNameExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperDisplayNameExtensions.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Rendering/HtmlHelperDisplayNameExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperEditorExtensions.cs b/src/Mvc/Mvc.ViewFeatures/src/Rendering/HtmlHelperEditorExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperEditorExtensions.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Rendering/HtmlHelperEditorExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperFormExtensions.cs b/src/Mvc/Mvc.ViewFeatures/src/Rendering/HtmlHelperFormExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperFormExtensions.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Rendering/HtmlHelperFormExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperInputExtensions.cs b/src/Mvc/Mvc.ViewFeatures/src/Rendering/HtmlHelperInputExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperInputExtensions.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Rendering/HtmlHelperInputExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperLabelExtensions.cs b/src/Mvc/Mvc.ViewFeatures/src/Rendering/HtmlHelperLabelExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperLabelExtensions.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Rendering/HtmlHelperLabelExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperLinkExtensions.cs b/src/Mvc/Mvc.ViewFeatures/src/Rendering/HtmlHelperLinkExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperLinkExtensions.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Rendering/HtmlHelperLinkExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperNameExtensions.cs b/src/Mvc/Mvc.ViewFeatures/src/Rendering/HtmlHelperNameExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperNameExtensions.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Rendering/HtmlHelperNameExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperPartialExtensions.cs b/src/Mvc/Mvc.ViewFeatures/src/Rendering/HtmlHelperPartialExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperPartialExtensions.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Rendering/HtmlHelperPartialExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperSelectExtensions.cs b/src/Mvc/Mvc.ViewFeatures/src/Rendering/HtmlHelperSelectExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperSelectExtensions.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Rendering/HtmlHelperSelectExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperValidationExtensions.cs b/src/Mvc/Mvc.ViewFeatures/src/Rendering/HtmlHelperValidationExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperValidationExtensions.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Rendering/HtmlHelperValidationExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperValueExtensions.cs b/src/Mvc/Mvc.ViewFeatures/src/Rendering/HtmlHelperValueExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperValueExtensions.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Rendering/HtmlHelperValueExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/IHtmlHelper.cs b/src/Mvc/Mvc.ViewFeatures/src/Rendering/IHtmlHelper.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/IHtmlHelper.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Rendering/IHtmlHelper.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/IHtmlHelperOfT.cs b/src/Mvc/Mvc.ViewFeatures/src/Rendering/IHtmlHelperOfT.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/IHtmlHelperOfT.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Rendering/IHtmlHelperOfT.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/IJsonHelper.cs b/src/Mvc/Mvc.ViewFeatures/src/Rendering/IJsonHelper.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/IJsonHelper.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Rendering/IJsonHelper.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/MultiSelectList.cs b/src/Mvc/Mvc.ViewFeatures/src/Rendering/MultiSelectList.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/MultiSelectList.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Rendering/MultiSelectList.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/MvcForm.cs b/src/Mvc/Mvc.ViewFeatures/src/Rendering/MvcForm.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/MvcForm.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Rendering/MvcForm.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/SelectList.cs b/src/Mvc/Mvc.ViewFeatures/src/Rendering/SelectList.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/SelectList.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Rendering/SelectList.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/SelectListGroup.cs b/src/Mvc/Mvc.ViewFeatures/src/Rendering/SelectListGroup.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/SelectListGroup.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Rendering/SelectListGroup.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/SelectListItem.cs b/src/Mvc/Mvc.ViewFeatures/src/Rendering/SelectListItem.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/SelectListItem.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Rendering/SelectListItem.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/TagBuilder.cs b/src/Mvc/Mvc.ViewFeatures/src/Rendering/TagBuilder.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/TagBuilder.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Rendering/TagBuilder.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/TagRenderMode.cs b/src/Mvc/Mvc.ViewFeatures/src/Rendering/TagRenderMode.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/TagRenderMode.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Rendering/TagRenderMode.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/ViewComponentHelperExtensions.cs b/src/Mvc/Mvc.ViewFeatures/src/Rendering/ViewComponentHelperExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/ViewComponentHelperExtensions.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Rendering/ViewComponentHelperExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/ViewContext.cs b/src/Mvc/Mvc.ViewFeatures/src/Rendering/ViewContext.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/ViewContext.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Rendering/ViewContext.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Resources.resx b/src/Mvc/Mvc.ViewFeatures/src/Resources.resx
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Resources.resx
rename to src/Mvc/Mvc.ViewFeatures/src/Resources.resx
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/SaveTempDataAttribute.cs b/src/Mvc/Mvc.ViewFeatures/src/SaveTempDataAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/SaveTempDataAttribute.cs
rename to src/Mvc/Mvc.ViewFeatures/src/SaveTempDataAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/SessionStateTempDataProvider.cs b/src/Mvc/Mvc.ViewFeatures/src/SessionStateTempDataProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/SessionStateTempDataProvider.cs
rename to src/Mvc/Mvc.ViewFeatures/src/SessionStateTempDataProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/SkipStatusCodePagesAttribute.cs b/src/Mvc/Mvc.ViewFeatures/src/SkipStatusCodePagesAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/SkipStatusCodePagesAttribute.cs
rename to src/Mvc/Mvc.ViewFeatures/src/SkipStatusCodePagesAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/StringHtmlContent.cs b/src/Mvc/Mvc.ViewFeatures/src/StringHtmlContent.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/StringHtmlContent.cs
rename to src/Mvc/Mvc.ViewFeatures/src/StringHtmlContent.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/TempDataAttribute.cs b/src/Mvc/Mvc.ViewFeatures/src/TempDataAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/TempDataAttribute.cs
rename to src/Mvc/Mvc.ViewFeatures/src/TempDataAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/TempDataDictionary.cs b/src/Mvc/Mvc.ViewFeatures/src/TempDataDictionary.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/TempDataDictionary.cs
rename to src/Mvc/Mvc.ViewFeatures/src/TempDataDictionary.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/TempDataDictionaryFactory.cs b/src/Mvc/Mvc.ViewFeatures/src/TempDataDictionaryFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/TempDataDictionaryFactory.cs
rename to src/Mvc/Mvc.ViewFeatures/src/TempDataDictionaryFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/TemplateBuilder.cs b/src/Mvc/Mvc.ViewFeatures/src/TemplateBuilder.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/TemplateBuilder.cs
rename to src/Mvc/Mvc.ViewFeatures/src/TemplateBuilder.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/TemplateInfo.cs b/src/Mvc/Mvc.ViewFeatures/src/TemplateInfo.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/TemplateInfo.cs
rename to src/Mvc/Mvc.ViewFeatures/src/TemplateInfo.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/TemplateRenderer.cs b/src/Mvc/Mvc.ViewFeatures/src/TemplateRenderer.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/TemplateRenderer.cs
rename to src/Mvc/Mvc.ViewFeatures/src/TemplateRenderer.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/TryGetValueDelegate.cs b/src/Mvc/Mvc.ViewFeatures/src/TryGetValueDelegate.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/TryGetValueDelegate.cs
rename to src/Mvc/Mvc.ViewFeatures/src/TryGetValueDelegate.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/TryGetValueProvider.cs b/src/Mvc/Mvc.ViewFeatures/src/TryGetValueProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/TryGetValueProvider.cs
rename to src/Mvc/Mvc.ViewFeatures/src/TryGetValueProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ValidateAntiForgeryTokenAttribute.cs b/src/Mvc/Mvc.ViewFeatures/src/ValidateAntiForgeryTokenAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ValidateAntiForgeryTokenAttribute.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ValidateAntiForgeryTokenAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ValidationHelpers.cs b/src/Mvc/Mvc.ViewFeatures/src/ValidationHelpers.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ValidationHelpers.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ValidationHelpers.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ValidationHtmlAttributeProvider.cs b/src/Mvc/Mvc.ViewFeatures/src/ValidationHtmlAttributeProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ValidationHtmlAttributeProvider.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ValidationHtmlAttributeProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponent.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewComponent.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponent.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewComponent.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponentAttribute.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewComponentAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponentAttribute.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewComponentAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponentResult.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewComponentResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponentResult.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewComponentResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponentResultExecutor.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewComponentResultExecutor.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponentResultExecutor.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewComponentResultExecutor.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ContentViewComponentResult.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewComponents/ContentViewComponentResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ContentViewComponentResult.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewComponents/ContentViewComponentResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentActivator.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewComponents/DefaultViewComponentActivator.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentActivator.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewComponents/DefaultViewComponentActivator.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentDescriptorCollectionProvider.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewComponents/DefaultViewComponentDescriptorCollectionProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentDescriptorCollectionProvider.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewComponents/DefaultViewComponentDescriptorCollectionProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentDescriptorProvider.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewComponents/DefaultViewComponentDescriptorProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentDescriptorProvider.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewComponents/DefaultViewComponentDescriptorProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentFactory.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewComponents/DefaultViewComponentFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentFactory.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewComponents/DefaultViewComponentFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentHelper.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewComponents/DefaultViewComponentHelper.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentHelper.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewComponents/DefaultViewComponentHelper.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentInvoker.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewComponents/DefaultViewComponentInvoker.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentInvoker.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewComponents/DefaultViewComponentInvoker.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentInvokerFactory.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewComponents/DefaultViewComponentInvokerFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentInvokerFactory.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewComponents/DefaultViewComponentInvokerFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentSelector.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewComponents/DefaultViewComponentSelector.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentSelector.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewComponents/DefaultViewComponentSelector.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/HtmlContentViewComponentResult.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewComponents/HtmlContentViewComponentResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/HtmlContentViewComponentResult.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewComponents/HtmlContentViewComponentResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/IViewComponentActivator.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewComponents/IViewComponentActivator.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/IViewComponentActivator.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewComponents/IViewComponentActivator.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/IViewComponentDescriptorCollectionProvider.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewComponents/IViewComponentDescriptorCollectionProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/IViewComponentDescriptorCollectionProvider.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewComponents/IViewComponentDescriptorCollectionProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/IViewComponentDescriptorProvider.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewComponents/IViewComponentDescriptorProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/IViewComponentDescriptorProvider.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewComponents/IViewComponentDescriptorProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/IViewComponentFactory.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewComponents/IViewComponentFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/IViewComponentFactory.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewComponents/IViewComponentFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/IViewComponentInvoker.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewComponents/IViewComponentInvoker.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/IViewComponentInvoker.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewComponents/IViewComponentInvoker.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/IViewComponentInvokerFactory.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewComponents/IViewComponentInvokerFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/IViewComponentInvokerFactory.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewComponents/IViewComponentInvokerFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/IViewComponentSelector.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewComponents/IViewComponentSelector.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/IViewComponentSelector.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewComponents/IViewComponentSelector.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ServiceBasedViewComponentActivator.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewComponents/ServiceBasedViewComponentActivator.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ServiceBasedViewComponentActivator.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewComponents/ServiceBasedViewComponentActivator.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentContext.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewComponents/ViewComponentContext.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentContext.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewComponents/ViewComponentContext.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentContextAttribute.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewComponents/ViewComponentContextAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentContextAttribute.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewComponents/ViewComponentContextAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentConventions.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewComponents/ViewComponentConventions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentConventions.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewComponents/ViewComponentConventions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentDescriptor.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewComponents/ViewComponentDescriptor.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentDescriptor.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewComponents/ViewComponentDescriptor.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentDescriptorCollection.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewComponents/ViewComponentDescriptorCollection.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentDescriptorCollection.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewComponents/ViewComponentDescriptorCollection.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentFeature.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewComponents/ViewComponentFeature.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentFeature.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewComponents/ViewComponentFeature.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentFeatureProvider.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewComponents/ViewComponentFeatureProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentFeatureProvider.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewComponents/ViewComponentFeatureProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentInvokerCache.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewComponents/ViewComponentInvokerCache.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentInvokerCache.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewComponents/ViewComponentInvokerCache.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewViewComponentResult.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewComponents/ViewViewComponentResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewViewComponentResult.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewComponents/ViewViewComponentResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewContextAttribute.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewContextAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewContextAttribute.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewContextAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataAttribute.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewDataAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataAttribute.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewDataAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionary.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewDataDictionary.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionary.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewDataDictionary.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionaryAttribute.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewDataDictionaryAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionaryAttribute.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewDataDictionaryAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionaryControllerPropertyActivator.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewDataDictionaryControllerPropertyActivator.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionaryControllerPropertyActivator.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewDataDictionaryControllerPropertyActivator.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionaryFactory.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewDataDictionaryFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionaryFactory.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewDataDictionaryFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionaryOfT.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewDataDictionaryOfT.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionaryOfT.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewDataDictionaryOfT.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataEvaluator.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewDataEvaluator.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataEvaluator.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewDataEvaluator.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataInfo.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewDataInfo.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataInfo.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewDataInfo.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewEngines/CompositeViewEngine.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewEngines/CompositeViewEngine.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewEngines/CompositeViewEngine.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewEngines/CompositeViewEngine.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewEngines/ICompositeViewEngine.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewEngines/ICompositeViewEngine.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewEngines/ICompositeViewEngine.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewEngines/ICompositeViewEngine.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewEngines/IView.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewEngines/IView.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewEngines/IView.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewEngines/IView.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewEngines/IViewEngine.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewEngines/IViewEngine.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewEngines/IViewEngine.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewEngines/IViewEngine.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewEngines/ViewEngineResult.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewEngines/ViewEngineResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewEngines/ViewEngineResult.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewEngines/ViewEngineResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewExecutor.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewExecutor.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewExecutor.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewExecutor.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewResult.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewResult.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewResultExecutor.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewResultExecutor.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewResultExecutor.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewResultExecutor.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/baseline.netcore.json b/src/Mvc/Mvc.ViewFeatures/src/baseline.netcore.json
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/baseline.netcore.json
rename to src/Mvc/Mvc.ViewFeatures/src/baseline.netcore.json
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/breakingchanges.netcore.json b/src/Mvc/Mvc.ViewFeatures/src/breakingchanges.netcore.json
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/breakingchanges.netcore.json
rename to src/Mvc/Mvc.ViewFeatures/src/breakingchanges.netcore.json
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/AntiforgeryExtensionsTest.cs b/src/Mvc/Mvc.ViewFeatures/test/AntiforgeryExtensionsTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/AntiforgeryExtensionsTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/AntiforgeryExtensionsTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/AttributeDictionaryTest.cs b/src/Mvc/Mvc.ViewFeatures/test/AttributeDictionaryTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/AttributeDictionaryTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/AttributeDictionaryTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Buffers/PagedBufferedTextWriterTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Buffers/PagedBufferedTextWriterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Buffers/PagedBufferedTextWriterTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Buffers/PagedBufferedTextWriterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Buffers/PagedCharBufferTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Buffers/PagedCharBufferTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Buffers/PagedCharBufferTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Buffers/PagedCharBufferTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Buffers/ViewBufferTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Buffers/ViewBufferTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Buffers/ViewBufferTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Buffers/ViewBufferTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Buffers/ViewBufferTextWriterTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Buffers/ViewBufferTextWriterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Buffers/ViewBufferTextWriterTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Buffers/ViewBufferTextWriterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/CachedExpressionCompilerTest.cs b/src/Mvc/Mvc.ViewFeatures/test/CachedExpressionCompilerTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/CachedExpressionCompilerTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/CachedExpressionCompilerTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ControllerTest.cs b/src/Mvc/Mvc.ViewFeatures/test/ControllerTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ControllerTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/ControllerTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ControllerUnitTestabilityTests.cs b/src/Mvc/Mvc.ViewFeatures/test/ControllerUnitTestabilityTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ControllerUnitTestabilityTests.cs
rename to src/Mvc/Mvc.ViewFeatures/test/ControllerUnitTestabilityTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/CookieTempDataProviderTest.cs b/src/Mvc/Mvc.ViewFeatures/test/CookieTempDataProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/CookieTempDataProviderTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/CookieTempDataProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/DefaultDisplayTemplatesTest.cs b/src/Mvc/Mvc.ViewFeatures/test/DefaultDisplayTemplatesTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/DefaultDisplayTemplatesTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/DefaultDisplayTemplatesTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/DefaultEditorTemplatesTest.cs b/src/Mvc/Mvc.ViewFeatures/test/DefaultEditorTemplatesTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/DefaultEditorTemplatesTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/DefaultEditorTemplatesTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/DefaultHtmlGeneratorTest.cs b/src/Mvc/Mvc.ViewFeatures/test/DefaultHtmlGeneratorTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/DefaultHtmlGeneratorTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/DefaultHtmlGeneratorTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/DefaultValidationHtmlAttributeProviderTest.cs b/src/Mvc/Mvc.ViewFeatures/test/DefaultValidationHtmlAttributeProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/DefaultValidationHtmlAttributeProviderTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/DefaultValidationHtmlAttributeProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/DependencyInjection/MvcViewFeaturesMvcBuilderExtensionsTest.cs b/src/Mvc/Mvc.ViewFeatures/test/DependencyInjection/MvcViewFeaturesMvcBuilderExtensionsTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/DependencyInjection/MvcViewFeaturesMvcBuilderExtensionsTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/DependencyInjection/MvcViewFeaturesMvcBuilderExtensionsTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/DependencyInjection/MvcViewFeaturesMvcCoreBuilderExtensionsTest.cs b/src/Mvc/Mvc.ViewFeatures/test/DependencyInjection/MvcViewFeaturesMvcCoreBuilderExtensionsTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/DependencyInjection/MvcViewFeaturesMvcCoreBuilderExtensionsTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/DependencyInjection/MvcViewFeaturesMvcCoreBuilderExtensionsTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ExpressionHelperTest.cs b/src/Mvc/Mvc.ViewFeatures/test/ExpressionHelperTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ExpressionHelperTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/ExpressionHelperTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ExpressionMetadataProviderTest.cs b/src/Mvc/Mvc.ViewFeatures/test/ExpressionMetadataProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ExpressionMetadataProviderTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/ExpressionMetadataProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/AutoValidateAntiforgeryTokenAuthorizationFilterTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Filters/AutoValidateAntiforgeryTokenAuthorizationFilterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/AutoValidateAntiforgeryTokenAuthorizationFilterTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Filters/AutoValidateAntiforgeryTokenAuthorizationFilterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/ControllerSaveTempDataPropertyFilterFactoryTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Filters/ControllerSaveTempDataPropertyFilterFactoryTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/ControllerSaveTempDataPropertyFilterFactoryTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Filters/ControllerSaveTempDataPropertyFilterFactoryTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/ControllerSaveTempDataPropertyFilterTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Filters/ControllerSaveTempDataPropertyFilterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/ControllerSaveTempDataPropertyFilterTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Filters/ControllerSaveTempDataPropertyFilterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/ControllerViewDataAttributeFilterFactoryTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Filters/ControllerViewDataAttributeFilterFactoryTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/ControllerViewDataAttributeFilterFactoryTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Filters/ControllerViewDataAttributeFilterFactoryTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/ControllerViewDataAttributeFilterTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Filters/ControllerViewDataAttributeFilterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/ControllerViewDataAttributeFilterTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Filters/ControllerViewDataAttributeFilterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/LifecyclePropertyTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Filters/LifecyclePropertyTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/LifecyclePropertyTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Filters/LifecyclePropertyTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/SaveTempDataFilterTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Filters/SaveTempDataFilterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/SaveTempDataFilterTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Filters/SaveTempDataFilterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/TempDataApplicationModelProviderTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Filters/TempDataApplicationModelProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/TempDataApplicationModelProviderTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Filters/TempDataApplicationModelProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/ValidateAntiforgeryTokenAuthorizationFilterTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Filters/ValidateAntiforgeryTokenAuthorizationFilterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/ValidateAntiforgeryTokenAuthorizationFilterTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Filters/ValidateAntiforgeryTokenAuthorizationFilterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/ViewDataAttributeApplicationModelProviderTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Filters/ViewDataAttributeApplicationModelProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/ViewDataAttributeApplicationModelProviderTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Filters/ViewDataAttributeApplicationModelProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/ViewDataAttributePropertyProviderTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Filters/ViewDataAttributePropertyProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/ViewDataAttributePropertyProviderTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Filters/ViewDataAttributePropertyProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/FormatWeekHelperTest.cs b/src/Mvc/Mvc.ViewFeatures/test/FormatWeekHelperTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/FormatWeekHelperTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/FormatWeekHelperTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/HtmlAttributePropertyHelperTest.cs b/src/Mvc/Mvc.ViewFeatures/test/HtmlAttributePropertyHelperTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/HtmlAttributePropertyHelperTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/HtmlAttributePropertyHelperTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/HtmlHelperComponentExtensionsTests.cs b/src/Mvc/Mvc.ViewFeatures/test/HtmlHelperComponentExtensionsTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/HtmlHelperComponentExtensionsTests.cs
rename to src/Mvc/Mvc.ViewFeatures/test/HtmlHelperComponentExtensionsTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/MemberExpressionCacheKeyComparerTest.cs b/src/Mvc/Mvc.ViewFeatures/test/MemberExpressionCacheKeyComparerTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/MemberExpressionCacheKeyComparerTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/MemberExpressionCacheKeyComparerTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/MemberExpressionCacheKeyTest.cs b/src/Mvc/Mvc.ViewFeatures/test/MemberExpressionCacheKeyTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/MemberExpressionCacheKeyTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/MemberExpressionCacheKeyTest.cs
diff --git a/src/Mvc/Mvc.ViewFeatures/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test.csproj b/src/Mvc/Mvc.ViewFeatures/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test.csproj
new file mode 100644
index 0000000000..5cfbdb8ff4
--- /dev/null
+++ b/src/Mvc/Mvc.ViewFeatures/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test.csproj
@@ -0,0 +1,11 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\shared\Mvc.Views.TestCommon\Microsoft.AspNetCore.Mvc.Views.TestCommon.csproj" />
+    <ProjectReference Include="..\..\shared\Mvc.TestDiagnosticListener\Microsoft.AspNetCore.Mvc.TestDiagnosticListener.csproj" />
+  </ItemGroup>
+</Project>
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Model/Constants.cs b/src/Mvc/Mvc.ViewFeatures/test/Model/Constants.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Model/Constants.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Model/Constants.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Model/Model.cs b/src/Mvc/Mvc.ViewFeatures/test/Model/Model.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Model/Model.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Model/Model.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ModelExplorerExtensionsTest.cs b/src/Mvc/Mvc.ViewFeatures/test/ModelExplorerExtensionsTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ModelExplorerExtensionsTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/ModelExplorerExtensionsTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ModelExplorerTest.cs b/src/Mvc/Mvc.ViewFeatures/test/ModelExplorerTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ModelExplorerTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/ModelExplorerTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ModelStateDictionaryExtensionsTest.cs b/src/Mvc/Mvc.ViewFeatures/test/ModelStateDictionaryExtensionsTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ModelStateDictionaryExtensionsTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/ModelStateDictionaryExtensionsTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/PageRemoteAttributeTest.cs b/src/Mvc/Mvc.ViewFeatures/test/PageRemoteAttributeTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/PageRemoteAttributeTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/PageRemoteAttributeTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/PartialViewResultExecutorTest.cs b/src/Mvc/Mvc.ViewFeatures/test/PartialViewResultExecutorTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/PartialViewResultExecutorTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/PartialViewResultExecutorTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/PartialViewResultTest.cs b/src/Mvc/Mvc.ViewFeatures/test/PartialViewResultTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/PartialViewResultTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/PartialViewResultTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Properties/AssemblyInfo.cs b/src/Mvc/Mvc.ViewFeatures/test/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Properties/AssemblyInfo.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Properties/AssemblyInfo.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Properties/Resources.Designer.cs b/src/Mvc/Mvc.ViewFeatures/test/Properties/Resources.Designer.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Properties/Resources.Designer.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Properties/Resources.Designer.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/RemoteAttributeBaseTest.cs b/src/Mvc/Mvc.ViewFeatures/test/RemoteAttributeBaseTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/RemoteAttributeBaseTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/RemoteAttributeBaseTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/RemoteAttributeTest.cs b/src/Mvc/Mvc.ViewFeatures/test/RemoteAttributeTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/RemoteAttributeTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/RemoteAttributeTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/DefaultTemplatesUtilities.cs b/src/Mvc/Mvc.ViewFeatures/test/Rendering/DefaultTemplatesUtilities.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/DefaultTemplatesUtilities.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Rendering/DefaultTemplatesUtilities.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperCheckboxTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperCheckboxTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperCheckboxTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperCheckboxTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperDisplayExtensionsTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperDisplayExtensionsTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperDisplayExtensionsTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperDisplayExtensionsTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperDisplayNameExtensionsTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperDisplayNameExtensionsTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperDisplayNameExtensionsTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperDisplayNameExtensionsTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperDisplayTextTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperDisplayTextTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperDisplayTextTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperDisplayTextTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperDropDownListExtensionsTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperDropDownListExtensionsTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperDropDownListExtensionsTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperDropDownListExtensionsTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperEditorExtensionsTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperEditorExtensionsTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperEditorExtensionsTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperEditorExtensionsTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperFormExtensionsTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperFormExtensionsTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperFormExtensionsTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperFormExtensionsTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperFormTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperFormTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperFormTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperFormTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperHiddenTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperHiddenTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperHiddenTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperHiddenTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperLabelExtensionsTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperLabelExtensionsTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperLabelExtensionsTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperLabelExtensionsTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperLinkGenerationTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperLinkGenerationTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperLinkGenerationTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperLinkGenerationTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperListBoxExtensionsTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperListBoxExtensionsTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperListBoxExtensionsTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperListBoxExtensionsTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperNameExtensionsTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperNameExtensionsTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperNameExtensionsTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperNameExtensionsTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperPartialExtensionsTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperPartialExtensionsTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperPartialExtensionsTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperPartialExtensionsTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperPasswordTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperPasswordTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperPasswordTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperPasswordTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperRadioButtonExtensionsTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperRadioButtonExtensionsTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperRadioButtonExtensionsTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperRadioButtonExtensionsTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperSelectTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperSelectTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperSelectTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperSelectTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperTextAreaExtensionsTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperTextAreaExtensionsTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperTextAreaExtensionsTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperTextAreaExtensionsTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperTextAreaTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperTextAreaTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperTextAreaTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperTextAreaTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperTextBoxExtensionsTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperTextBoxExtensionsTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperTextBoxExtensionsTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperTextBoxExtensionsTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperTextBoxTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperTextBoxTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperTextBoxTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperTextBoxTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperValidationMessageExtensionsTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperValidationMessageExtensionsTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperValidationMessageExtensionsTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperValidationMessageExtensionsTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperValidationSummaryTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperValidationSummaryTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperValidationSummaryTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperValidationSummaryTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperValueExtensionsTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperValueExtensionsTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperValueExtensionsTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperValueExtensionsTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperValueTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperValueTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperValueTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperValueTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlStringTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlStringTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlStringTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlStringTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/TagBuilderTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Rendering/TagBuilderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/TagBuilderTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Rendering/TagBuilderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/TestResources.cs b/src/Mvc/Mvc.ViewFeatures/test/Rendering/TestResources.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/TestResources.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Rendering/TestResources.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/ViewContextTests.cs b/src/Mvc/Mvc.ViewFeatures/test/Rendering/ViewContextTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/ViewContextTests.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Rendering/ViewContextTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Resources.resx b/src/Mvc/Mvc.ViewFeatures/test/Resources.resx
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Resources.resx
rename to src/Mvc/Mvc.ViewFeatures/test/Resources.resx
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/SessionStateTempDataProviderTest.cs b/src/Mvc/Mvc.ViewFeatures/test/SessionStateTempDataProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/SessionStateTempDataProviderTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/SessionStateTempDataProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/SkipStatusCodePagesAttributeTest.cs b/src/Mvc/Mvc.ViewFeatures/test/SkipStatusCodePagesAttributeTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/SkipStatusCodePagesAttributeTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/SkipStatusCodePagesAttributeTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/StringHtmlContentTest.cs b/src/Mvc/Mvc.ViewFeatures/test/StringHtmlContentTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/StringHtmlContentTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/StringHtmlContentTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/TempDataDictionaryFactoryTest.cs b/src/Mvc/Mvc.ViewFeatures/test/TempDataDictionaryFactoryTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/TempDataDictionaryFactoryTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/TempDataDictionaryFactoryTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/TempDataDictionaryTest.cs b/src/Mvc/Mvc.ViewFeatures/test/TempDataDictionaryTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/TempDataDictionaryTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/TempDataDictionaryTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/TemplateRendererTest.cs b/src/Mvc/Mvc.ViewFeatures/test/TemplateRendererTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/TemplateRendererTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/TemplateRendererTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/TestApplicationPart.cs b/src/Mvc/Mvc.ViewFeatures/test/TestApplicationPart.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/TestApplicationPart.cs
rename to src/Mvc/Mvc.ViewFeatures/test/TestApplicationPart.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponentResultTest.cs b/src/Mvc/Mvc.ViewFeatures/test/ViewComponentResultTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponentResultTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/ViewComponentResultTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponentTests.cs b/src/Mvc/Mvc.ViewFeatures/test/ViewComponentTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponentTests.cs
rename to src/Mvc/Mvc.ViewFeatures/test/ViewComponentTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/ContentViewComponentResultTest.cs b/src/Mvc/Mvc.ViewFeatures/test/ViewComponents/ContentViewComponentResultTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/ContentViewComponentResultTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/ViewComponents/ContentViewComponentResultTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentActivatorTests.cs b/src/Mvc/Mvc.ViewFeatures/test/ViewComponents/DefaultViewComponentActivatorTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentActivatorTests.cs
rename to src/Mvc/Mvc.ViewFeatures/test/ViewComponents/DefaultViewComponentActivatorTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentDescriptorProviderTest.cs b/src/Mvc/Mvc.ViewFeatures/test/ViewComponents/DefaultViewComponentDescriptorProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentDescriptorProviderTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/ViewComponents/DefaultViewComponentDescriptorProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentFactoryTest.cs b/src/Mvc/Mvc.ViewFeatures/test/ViewComponents/DefaultViewComponentFactoryTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentFactoryTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/ViewComponents/DefaultViewComponentFactoryTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentHelperTest.cs b/src/Mvc/Mvc.ViewFeatures/test/ViewComponents/DefaultViewComponentHelperTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentHelperTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/ViewComponents/DefaultViewComponentHelperTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentSelectorTest.cs b/src/Mvc/Mvc.ViewFeatures/test/ViewComponents/DefaultViewComponentSelectorTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentSelectorTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/ViewComponents/DefaultViewComponentSelectorTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/HtmlContentViewComponentResultTest.cs b/src/Mvc/Mvc.ViewFeatures/test/ViewComponents/HtmlContentViewComponentResultTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/HtmlContentViewComponentResultTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/ViewComponents/HtmlContentViewComponentResultTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/ViewComponentContextTest.cs b/src/Mvc/Mvc.ViewFeatures/test/ViewComponents/ViewComponentContextTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/ViewComponentContextTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/ViewComponents/ViewComponentContextTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/ViewComponentConventionsTest.cs b/src/Mvc/Mvc.ViewFeatures/test/ViewComponents/ViewComponentConventionsTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/ViewComponentConventionsTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/ViewComponents/ViewComponentConventionsTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/ViewComponentFeatureProviderTest.cs b/src/Mvc/Mvc.ViewFeatures/test/ViewComponents/ViewComponentFeatureProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/ViewComponentFeatureProviderTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/ViewComponents/ViewComponentFeatureProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/ViewViewComponentResultTest.cs b/src/Mvc/Mvc.ViewFeatures/test/ViewComponents/ViewViewComponentResultTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/ViewViewComponentResultTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/ViewComponents/ViewViewComponentResultTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewDataDictionaryOfTModelTest.cs b/src/Mvc/Mvc.ViewFeatures/test/ViewDataDictionaryOfTModelTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewDataDictionaryOfTModelTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/ViewDataDictionaryOfTModelTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewDataDictionaryTest.cs b/src/Mvc/Mvc.ViewFeatures/test/ViewDataDictionaryTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewDataDictionaryTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/ViewDataDictionaryTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewDataOfTTest.cs b/src/Mvc/Mvc.ViewFeatures/test/ViewDataOfTTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewDataOfTTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/ViewDataOfTTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewEngines/CompositeViewEngineTest.cs b/src/Mvc/Mvc.ViewFeatures/test/ViewEngines/CompositeViewEngineTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewEngines/CompositeViewEngineTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/ViewEngines/CompositeViewEngineTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewExecutorTest.cs b/src/Mvc/Mvc.ViewFeatures/test/ViewExecutorTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewExecutorTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/ViewExecutorTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewResultExecutorTest.cs b/src/Mvc/Mvc.ViewFeatures/test/ViewResultExecutorTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewResultExecutorTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/ViewResultExecutorTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewResultTest.cs b/src/Mvc/Mvc.ViewFeatures/test/ViewResultTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewResultTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/ViewResultTest.cs
diff --git a/src/Mvc/Mvc.sln b/src/Mvc/Mvc.sln
index 5616cb59d6..c5a783de80 100644
--- a/src/Mvc/Mvc.sln
+++ b/src/Mvc/Mvc.sln
@@ -5,40 +5,17 @@ VisualStudioVersion = 16.0.28531.181
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{DAAE4C74-D06F-4874-A166-33305D2643CE}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{32285FA4-6B46-4D6B-A840-2B13E4C8B58E}"
-	ProjectSection(SolutionItems) = preProject
-		src\Directory.Build.props = src\Directory.Build.props
-	EndProjectSection
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}"
-	ProjectSection(SolutionItems) = preProject
-		test\Directory.Build.props = test\Directory.Build.props
-		test\MvcTests.ruleset = test\MvcTests.ruleset
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc", "src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj", "{079EFA1F-0B0A-4853-B27B-5780D111CD85}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Razor", "src\Microsoft.AspNetCore.Mvc.Razor\Microsoft.AspNetCore.Mvc.Razor.csproj", "{314E9AD6-2FFC-4A92-A8AD-510658C64F1E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Core", "src\Microsoft.AspNetCore.Mvc.Core\Microsoft.AspNetCore.Mvc.Core.csproj", "{C48DA9D7-ACB5-4408-AA79-27ECB60A67EF}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Razor.Test", "test\Microsoft.AspNetCore.Mvc.Razor.Test\Microsoft.AspNetCore.Mvc.Razor.Test.csproj", "{3F6E355E-4869-41D9-943B-D54771221A7F}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Core.Test", "test\Microsoft.AspNetCore.Mvc.Core.Test\Microsoft.AspNetCore.Mvc.Core.Test.csproj", "{A8AA326E-8EE8-4F11-B750-23028E0949D7}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebSites", "WebSites", "{16703B76-C9F7-4C75-AE6C-53D92E308E3C}"
 	ProjectSection(SolutionItems) = preProject
 		test\WebSites\Directory.Build.props = test\WebSites\Directory.Build.props
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.FunctionalTests", "test\Microsoft.AspNetCore.Mvc.FunctionalTests\Microsoft.AspNetCore.Mvc.FunctionalTests.csproj", "{323D0C04-B518-4A8F-8A8E-3546AD153D34}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BasicWebSite", "test\WebSites\BasicWebSite\BasicWebSite.csproj", "{34DF1487-12C6-476C-BE0A-F31DF1939AE5}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RoutingWebSite", "test\WebSites\RoutingWebSite\RoutingWebSite.csproj", "{42CDBF4A-E238-4C0F-A416-44588363EB4C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Test", "test\Microsoft.AspNetCore.Mvc.Test\Microsoft.AspNetCore.Mvc.Test.csproj", "{5F945B82-FE5F-425C-956C-8BC2F2020254}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RazorWebSite", "test\WebSites\RazorWebSite\RazorWebSite.csproj", "{B07CAF59-11ED-40E3-A5DB-E1178F84FA78}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FormatterWebSite", "test\WebSites\FormatterWebSite\FormatterWebSite.csproj", "{62735776-46FF-4170-9392-02E128A69B89}"
@@ -53,10 +30,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilesWebSite", "test\WebSit
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationModelWebSite", "test\WebSites\ApplicationModelWebSite\ApplicationModelWebSite.csproj", "{CAE52CB7-0FAC-4B5B-8251-B0FF837DB657}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.TagHelpers", "src\Microsoft.AspNetCore.Mvc.TagHelpers\Microsoft.AspNetCore.Mvc.TagHelpers.csproj", "{B2347320-308E-4D2B-AEC8-005DFA68B0C9}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.TagHelpers.Test", "test\Microsoft.AspNetCore.Mvc.TagHelpers.Test\Microsoft.AspNetCore.Mvc.TagHelpers.Test.csproj", "{860119ED-3DB1-424D-8D0A-30132A8A7D96}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HtmlGenerationWebSite", "test\WebSites\HtmlGenerationWebSite\HtmlGenerationWebSite.csproj", "{920F8A0E-6F7D-4BBE-84FF-840B89099BE6}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ErrorPageMiddlewareWebSite", "test\WebSites\ErrorPageMiddlewareWebSite\ErrorPageMiddlewareWebSite.csproj", "{AD545A5B-2BA5-4314-88AC-FC2ACF2CC718}"
@@ -67,81 +40,27 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ControllersFromServicesWebS
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ControllersFromServicesClassLibrary", "test\WebSites\ControllersFromServicesClassLibrary\ControllersFromServicesClassLibrary.csproj", "{551DC89E-2A13-4CF2-83D7-1ADD802443D5}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Core.TestCommon", "test\Microsoft.AspNetCore.Mvc.Core.TestCommon\Microsoft.AspNetCore.Mvc.Core.TestCommon.csproj", "{F504357E-C2E1-4818-BA5C-9A2EAC25FEE5}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CorsWebSite", "test\WebSites\CorsWebSite\CorsWebSite.csproj", "{94BA134D-04B3-48AA-BA55-5A4DB8640F2D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.IntegrationTests", "test\Microsoft.AspNetCore.Mvc.IntegrationTests\Microsoft.AspNetCore.Mvc.IntegrationTests.csproj", "{864FA09D-1E48-403A-A6C8-4F079D2A30F0}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Abstractions", "src\Microsoft.AspNetCore.Mvc.Abstractions\Microsoft.AspNetCore.Mvc.Abstractions.csproj", "{1154203C-7579-4525-906E-BC55268421C1}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.ApiExplorer", "src\Microsoft.AspNetCore.Mvc.ApiExplorer\Microsoft.AspNetCore.Mvc.ApiExplorer.csproj", "{A2B72833-5D70-4C42-AE85-E0319926FB8A}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.ApiExplorer.Test", "test\Microsoft.AspNetCore.Mvc.ApiExplorer.Test\Microsoft.AspNetCore.Mvc.ApiExplorer.Test.csproj", "{4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Abstractions.Test", "test\Microsoft.AspNetCore.Mvc.Abstractions.Test\Microsoft.AspNetCore.Mvc.Abstractions.Test.csproj", "{DA000953-7532-4DF5-8DB9-8143DF98D999}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.ViewFeatures", "src\Microsoft.AspNetCore.Mvc.ViewFeatures\Microsoft.AspNetCore.Mvc.ViewFeatures.csproj", "{3F8B8FC1-9FE4-4788-8991-367113E8D7AD}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.NewtonsoftJson", "src\Microsoft.AspNetCore.Mvc.NewtonsoftJson\Microsoft.AspNetCore.Mvc.NewtonsoftJson.csproj", "{3FC8D9D6-9352-43A3-8E81-422F270085B7}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Formatters.Xml", "src\Microsoft.AspNetCore.Mvc.Formatters.Xml\Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj", "{42C81540-CD47-4C68-A7A3-2A93B9C3B210}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.NewtonsoftJson.Test", "test\Microsoft.AspNetCore.Mvc.NewtonsoftJson.Test\Microsoft.AspNetCore.Mvc.NewtonsoftJson.Test.csproj", "{493780DA-E696-40FF-BD12-4A5C5736F292}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Formatters.Xml.Test", "test\Microsoft.AspNetCore.Mvc.Formatters.Xml.Test\Microsoft.AspNetCore.Mvc.Formatters.Xml.Test.csproj", "{22019146-BDFA-442E-8C8E-345FB9644578}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Cors", "src\Microsoft.AspNetCore.Mvc.Cors\Microsoft.AspNetCore.Mvc.Cors.csproj", "{9A07EEA2-942E-4969-9D41-799B6E2D1FF5}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.DataAnnotations", "src\Microsoft.AspNetCore.Mvc.DataAnnotations\Microsoft.AspNetCore.Mvc.DataAnnotations.csproj", "{2DD786CA-7AF7-437A-B499-801A589B9A1C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Cors.Test", "test\Microsoft.AspNetCore.Mvc.Cors.Test\Microsoft.AspNetCore.Mvc.Cors.Test.csproj", "{6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.DataAnnotations.Test", "test\Microsoft.AspNetCore.Mvc.DataAnnotations.Test\Microsoft.AspNetCore.Mvc.DataAnnotations.Test.csproj", "{827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.ViewFeatures.Test", "test\Microsoft.AspNetCore.Mvc.ViewFeatures.Test\Microsoft.AspNetCore.Mvc.ViewFeatures.Test.csproj", "{60873DFA-97B9-419E-BAA3-940FC9B07085}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Localization", "src\Microsoft.AspNetCore.Mvc.Localization\Microsoft.AspNetCore.Mvc.Localization.csproj", "{50893B10-5735-4F35-9995-F81DA3F0189E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Localization.Test", "test\Microsoft.AspNetCore.Mvc.Localization.Test\Microsoft.AspNetCore.Mvc.Localization.Test.csproj", "{8FC726B5-E766-44E0-8B38-1313B6D8D9A7}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.TestDiagnosticListener", "test\Microsoft.AspNetCore.Mvc.TestDiagnosticListener\Microsoft.AspNetCore.Mvc.TestDiagnosticListener.csproj", "{9879B5D5-2325-4A81-B4DF-F279FE8FEEB4}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MvcSandbox", "samples\MvcSandbox\MvcSandbox.csproj", "{14ED4476-9F24-4776-8417-EA6927F6C9C9}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleWebSite", "test\WebSites\SimpleWebSite\SimpleWebSite.csproj", "{396B40D7-AC70-49A7-B33C-ED42129FEBE3}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SecurityWebSite", "test\WebSites\SecurityWebSite\SecurityWebSite.csproj", "{D28CAC79-7004-4B69-993B-EDEB4653BFA8}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.RazorPages", "src\Microsoft.AspNetCore.Mvc.RazorPages\Microsoft.AspNetCore.Mvc.RazorPages.csproj", "{CF322BE1-E1FE-4CFD-8FCA-16A14B905D53}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.RazorPages.Test", "test\Microsoft.AspNetCore.Mvc.RazorPages.Test\Microsoft.AspNetCore.Mvc.RazorPages.Test.csproj", "{0AB46520-F441-4E01-B444-08F4D23F8B1B}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RazorPagesWebSite", "test\WebSites\RazorPagesWebSite\RazorPagesWebSite.csproj", "{4BA6EC9A-B6D9-41F2-BFDA-D82B22D80352}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Performance", "benchmarks\Microsoft.AspNetCore.Mvc.Performance\Microsoft.AspNetCore.Mvc.Performance.csproj", "{F16CEE0D-A28E-43BD-802F-99BAFE4BA7CE}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Testing", "src\Microsoft.AspNetCore.Mvc.Testing\Microsoft.AspNetCore.Mvc.Testing.csproj", "{7500B228-1769-4CFB-A571-3DFAC6678A06}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{631720EE-11CC-41C9-9819-441417ECBEAA}"
 	ProjectSection(SolutionItems) = preProject
-		.appveyor.yml = .appveyor.yml
 		.editorconfig = .editorconfig
-		.gitattributes = .gitattributes
-		.gitignore = .gitignore
-		.travis.yml = .travis.yml
-		build.cmd = build.cmd
-		build.ps1 = build.ps1
-		build.sh = build.sh
 		CONTRIBUTING.md = CONTRIBUTING.md
 		Directory.Build.props = Directory.Build.props
-		Directory.Build.targets = Directory.Build.targets
 		LICENSE.txt = LICENSE.txt
-		NuGet.config = NuGet.config
-		NuGetPackageVerifier.json = NuGetPackageVerifier.json
+		MvcTests.ruleset = MvcTests.ruleset
 		README.md = README.md
 		Settings.StyleCop = Settings.StyleCop
-		version.xml = version.xml
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmarks", "benchmarks", "{FDC66952-A3EA-4074-899E-C29816BF7C1F}"
@@ -150,23 +69,23 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RazorBuildWebSite", "test\W
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RazorBuildWebSite.Views", "test\WebSites\RazorBuildWebSite.Views\RazorBuildWebSite.Views.csproj", "{8916DDCA-EC2A-4193-B9F3-78CAA1A96D5A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Analyzers", "src\Microsoft.AspNetCore.Mvc.Analyzers\Microsoft.AspNetCore.Mvc.Analyzers.csproj", "{87A3E227-C45E-4141-A59F-402908E651FD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Analyzers", "Mvc.Analyzers\src\Microsoft.AspNetCore.Mvc.Analyzers.csproj", "{87A3E227-C45E-4141-A59F-402908E651FD}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mvc.Analyzers.Test", "test\Mvc.Analyzers.Test\Mvc.Analyzers.Test.csproj", "{E3E09D2F-1FCF-4396-9B09-5A62CA8CC831}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mvc.Analyzers.Test", "Mvc.Analyzers\test\Mvc.Analyzers.Test.csproj", "{E3E09D2F-1FCF-4396-9B09-5A62CA8CC831}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RazorPagesClassLibrary", "test\WebSites\RazorPagesClassLibrary\RazorPagesClassLibrary.csproj", "{17122147-ADFD-41C8-87D9-CCC582CCA8F9}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Views.TestCommon", "test\Microsoft.AspNetCore.Mvc.Views.TestCommon\Microsoft.AspNetCore.Mvc.Views.TestCommon.csproj", "{51E3E785-A9D1-4196-BAFE-A17FF4304B89}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Views.TestCommon", "shared\Mvc.Views.TestCommon\Microsoft.AspNetCore.Mvc.Views.TestCommon.csproj", "{51E3E785-A9D1-4196-BAFE-A17FF4304B89}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mvc.Api.Analyzers.Test", "test\Mvc.Api.Analyzers.Test\Mvc.Api.Analyzers.Test.csproj", "{DD7B9F20-354C-4D9E-8C8A-8AE6E7595A87}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mvc.Api.Analyzers.Test", "Mvc.Api.Analyzers\test\Mvc.Api.Analyzers.Test.csproj", "{DD7B9F20-354C-4D9E-8C8A-8AE6E7595A87}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Api.Analyzers", "src\Microsoft.AspNetCore.Mvc.Api.Analyzers\Microsoft.AspNetCore.Mvc.Api.Analyzers.csproj", "{3B550487-10E4-4E6D-9CEF-B1B4CA1253DA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Api.Analyzers", "Mvc.Api.Analyzers\src\Microsoft.AspNetCore.Mvc.Api.Analyzers.csproj", "{3B550487-10E4-4E6D-9CEF-B1B4CA1253DA}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-getdocument", "src\dotnet-getdocument\dotnet-getdocument.csproj", "{4EDC489F-3EC5-4AE3-9841-A285F40F5FF6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-getdocument", "dotnet-getdocument\src\dotnet-getdocument.csproj", "{4EDC489F-3EC5-4AE3-9841-A285F40F5FF6}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GetDocumentInsider", "src\GetDocumentInsider\GetDocumentInsider.csproj", "{2F683CF8-B055-46AE-BF83-9D1307F8D45F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GetDocumentInsider", "GetDocumentInsider\src\GetDocumentInsider.csproj", "{2F683CF8-B055-46AE-BF83-9D1307F8D45F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.ApiDescription.Design", "src\Microsoft.Extensions.ApiDescription.Design\Microsoft.Extensions.ApiDescription.Design.csproj", "{34E3C302-B767-40C8-B538-3EE2BD4000C4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.ApiDescription.Design", "Extensions.ApiDescription.Design\src\Microsoft.Extensions.ApiDescription.Design.csproj", "{34E3C302-B767-40C8-B538-3EE2BD4000C4}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_dependencies", "_dependencies", "{5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}"
 EndProject
@@ -264,13 +183,115 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.DataPr
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GenericHostWebSite", "test\WebSites\GenericHostWebSite\GenericHostWebSite.csproj", "{D9BE3E50-5CE8-4D8D-BA19-AA219D009752}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation", "src\Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation\Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj", "{F2D4A859-7B84-403E-9745-01032EC705C5}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test", "test\Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test\Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test.csproj", "{23A6033D-2AA6-4629-BC1B-14694E3794FF}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components", "..\Components\Components\src\Microsoft.AspNetCore.Components.csproj", "{69E18B21-E4B9-4866-ABDA-3C2D9664D24C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Formatters.Json", "src\Microsoft.AspNetCore.Mvc.Formatters.Json\Microsoft.AspNetCore.Mvc.Formatters.Json.csproj", "{7B35EA78-7D47-4AFA-982C-899E7C55CBF1}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mvc", "Mvc", "{F34AEDAF-43B2-499D-98A1-1E2910C38D06}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc", "Mvc\src\Microsoft.AspNetCore.Mvc.csproj", "{39D6EF6C-6447-41ED-B8F3-F2D61C40B848}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Test", "Mvc\test\Microsoft.AspNetCore.Mvc.Test.csproj", "{4BFD08A5-678D-473A-BA94-D2EE1BAC3297}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mvc.Abstractions", "Mvc.Abstractions", "{A9DB755B-C3B9-4C61-9DB8-8994F3719823}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Abstractions", "Mvc.Abstractions\src\Microsoft.AspNetCore.Mvc.Abstractions.csproj", "{AE2F658D-40AB-426D-A595-CF62130619A4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Abstractions.Test", "Mvc.Abstractions\test\Microsoft.AspNetCore.Mvc.Abstractions.Test.csproj", "{F3DC0845-ED54-457F-AAAA-7CEE04E6408F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mvc.ApiExplorer", "Mvc.ApiExplorer", "{BFE129DA-E9C4-4C01-A9B5-497B580A82AE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.ApiExplorer", "Mvc.ApiExplorer\src\Microsoft.AspNetCore.Mvc.ApiExplorer.csproj", "{0EAA75EF-8AF6-4FA4-8148-CA93CC280214}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.ApiExplorer.Test", "Mvc.ApiExplorer\test\Microsoft.AspNetCore.Mvc.ApiExplorer.Test.csproj", "{D35B7C96-72AB-4FE0-B6E0-0BBB5768F79E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mvc.Core", "Mvc.Core", "{5F0CA71A-F66C-4CBB-A1B3-F722604F1DF3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Core", "Mvc.Core\src\Microsoft.AspNetCore.Mvc.Core.csproj", "{527B9345-18B4-4F86-B649-20C87B8E0CCF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Core.Test", "Mvc.Core\test\Microsoft.AspNetCore.Mvc.Core.Test.csproj", "{1205911F-2257-4B96-BE06-8EED94971802}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mvc.Cors", "Mvc.Cors", "{AD36DD83-D7DA-4CCE-BA06-15B0F15EECAE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Cors", "Mvc.Cors\src\Microsoft.AspNetCore.Mvc.Cors.csproj", "{36710582-0138-4C05-BA8F-0EAC1FCB5F0A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Cors.Test", "Mvc.Cors\test\Microsoft.AspNetCore.Mvc.Cors.Test.csproj", "{9FA55001-CBE6-497E-B0B9-EAF3732B249A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mvc.DataAnnotations", "Mvc.DataAnnotations", "{986DBF1A-50CE-43E7-985C-620173868471}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.DataAnnotations", "Mvc.DataAnnotations\src\Microsoft.AspNetCore.Mvc.DataAnnotations.csproj", "{DB0203AB-3DAA-412D-9BDE-28DFB95955C9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.DataAnnotations.Test", "Mvc.DataAnnotations\test\Microsoft.AspNetCore.Mvc.DataAnnotations.Test.csproj", "{19422AC5-68A0-4973-81EE-968E07FC8F3B}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mvc.Formatters.Json", "Mvc.Formatters.Json", "{15162260-8660-42FA-A883-5F5DEF7EA42B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Formatters.Json", "Mvc.Formatters.Json\src\Microsoft.AspNetCore.Mvc.Formatters.Json.csproj", "{CB0E0224-C20F-448B-9659-B65BCF8513E2}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mvc.Formatters.Xml", "Mvc.Formatters.Xml", "{AFC973E5-41B2-450D-BB44-C463B667105C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Formatters.Xml", "Mvc.Formatters.Xml\src\Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj", "{7EB7A926-6E68-4B7B-97D8-770AFAD785E8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Formatters.Xml.Test", "Mvc.Formatters.Xml\test\Microsoft.AspNetCore.Mvc.Formatters.Xml.Test.csproj", "{BB14E7F3-16A5-42BC-9CFA-5913E11FF1CC}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mvc.Localization", "Mvc.Localization", "{1B6A26FB-F90D-492A-A7D0-D15A68C7D91E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Localization", "Mvc.Localization\src\Microsoft.AspNetCore.Mvc.Localization.csproj", "{8D973121-CCE5-4A1E-98FE-320A46CBF711}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Localization.Test", "Mvc.Localization\test\Microsoft.AspNetCore.Mvc.Localization.Test.csproj", "{F52387D9-A302-4902-B76E-17D9EE2C16A1}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mvc.Razor", "Mvc.Razor", "{20558003-24FB-46DA-B461-942299891598}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Razor", "Mvc.Razor\src\Microsoft.AspNetCore.Mvc.Razor.csproj", "{926588E9-8EC0-4090-8F13-30F9513D5AAD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Razor.Test", "Mvc.Razor\test\Microsoft.AspNetCore.Mvc.Razor.Test.csproj", "{EC89ADE7-9CD6-4F62-9814-186778C07C1F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mvc.RazorPages", "Mvc.RazorPages", "{4A9B03C7-566C-4BD1-BF2C-9DB652497359}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.RazorPages", "Mvc.RazorPages\src\Microsoft.AspNetCore.Mvc.RazorPages.csproj", "{E507C1A7-A301-4CC4-B8F8-96DFBF34A5E3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.RazorPages.Test", "Mvc.RazorPages\test\Microsoft.AspNetCore.Mvc.RazorPages.Test.csproj", "{80F94B80-10E9-484B-9FC4-24F01CD0A59D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mvc.TagHelpers", "Mvc.TagHelpers", "{459F92E4-34AA-49B8-9F91-0361BC8E2147}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.TagHelpers", "Mvc.TagHelpers\src\Microsoft.AspNetCore.Mvc.TagHelpers.csproj", "{2FA999E4-8440-4ABD-8D79-EACC776B14D4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.TagHelpers.Test", "Mvc.TagHelpers\test\Microsoft.AspNetCore.Mvc.TagHelpers.Test.csproj", "{E823D7AA-F298-4637-9D82-133C19CD7063}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mvc.ViewFeatures", "Mvc.ViewFeatures", "{20BBA1DE-12BA-4D09-8878-308868B103B1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.ViewFeatures", "Mvc.ViewFeatures\src\Microsoft.AspNetCore.Mvc.ViewFeatures.csproj", "{656B084B-856D-46FE-8966-6EBFDA0C90BD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.ViewFeatures.Test", "Mvc.ViewFeatures\test\Microsoft.AspNetCore.Mvc.ViewFeatures.Test.csproj", "{04492A1A-EF58-4CA9-A0F4-FF35DF7604CE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.FunctionalTests", "test\Mvc.FunctionalTests\Microsoft.AspNetCore.Mvc.FunctionalTests.csproj", "{FD6F906C-4926-4F65-A183-81700C6BCDE9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.IntegrationTests", "test\Mvc.IntegrationTests\Microsoft.AspNetCore.Mvc.IntegrationTests.csproj", "{36C22DEA-EFC4-4BC0-B1C6-C50D99146DC6}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "shared", "shared", "{75A3249D-E8DB-42F1-9B4E-1DCC662856A0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.TestDiagnosticListener", "shared\Mvc.TestDiagnosticListener\Microsoft.AspNetCore.Mvc.TestDiagnosticListener.csproj", "{DDF72F95-F556-4918-8243-AF2284BD2302}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mvc.Testing", "Mvc.Testing", "{FDCA02D4-871E-4255-AC53-12CDF1D5B510}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Testing", "Mvc.Testing\src\Microsoft.AspNetCore.Mvc.Testing.csproj", "{8F724554-E7EF-48D2-B27B-00C238078EAF}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mvc.Analyzers", "Mvc.Analyzers", "{D43C3904-2B2E-4572-99CC-7CB4615A4CD3}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mvc.Api.Analyzers", "Mvc.Api.Analyzers", "{49887FD5-2E52-4567-929E-9151DC88E4D4}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extensions.ApiDescription.Design", "Extensions.ApiDescription.Design", "{62CF82C1-B75D-4041-A7E9-EF39FF7B885F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Core.TestCommon", "shared\Mvc.Core.TestCommon\Microsoft.AspNetCore.Mvc.Core.TestCommon.csproj", "{2906BF70-82BE-4427-870A-E87281D01008}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mvc.NewtonsoftJson", "Mvc.NewtonsoftJson", "{25C08DED-1C7D-4C6D-B1CC-F340C1B21DE7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.NewtonsoftJson", "Mvc.NewtonsoftJson\src\Microsoft.AspNetCore.Mvc.NewtonsoftJson.csproj", "{9D96CF0B-9E2B-4A99-9859-417FC96FE69C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.NewtonsoftJson.Test", "Mvc.NewtonsoftJson\test\Microsoft.AspNetCore.Mvc.NewtonsoftJson.Test.csproj", "{F49A6E01-BFC5-4CEB-9A2C-19DDD3539510}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mvc.Razor.RuntimeCompilation", "Mvc.Razor.RuntimeCompilation", "{1261FF02-C7F8-4395-AA8A-29F69FC9870B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation", "Mvc.Razor.RuntimeCompilation\src\Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj", "{0CE75D4A-4EFD-434A-99CD-7776AE2BFD39}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test", "Mvc.Razor.RuntimeCompilation\test\Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test.csproj", "{2FFB927A-C039-4A1F-83A5-CBBB664A0E81}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -282,66 +303,6 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{079EFA1F-0B0A-4853-B27B-5780D111CD85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{079EFA1F-0B0A-4853-B27B-5780D111CD85}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{079EFA1F-0B0A-4853-B27B-5780D111CD85}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{079EFA1F-0B0A-4853-B27B-5780D111CD85}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{079EFA1F-0B0A-4853-B27B-5780D111CD85}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{079EFA1F-0B0A-4853-B27B-5780D111CD85}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{079EFA1F-0B0A-4853-B27B-5780D111CD85}.Release|Any CPU.Build.0 = Release|Any CPU
-		{079EFA1F-0B0A-4853-B27B-5780D111CD85}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{079EFA1F-0B0A-4853-B27B-5780D111CD85}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{079EFA1F-0B0A-4853-B27B-5780D111CD85}.Release|x86.ActiveCfg = Release|Any CPU
-		{314E9AD6-2FFC-4A92-A8AD-510658C64F1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{314E9AD6-2FFC-4A92-A8AD-510658C64F1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{314E9AD6-2FFC-4A92-A8AD-510658C64F1E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{314E9AD6-2FFC-4A92-A8AD-510658C64F1E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{314E9AD6-2FFC-4A92-A8AD-510658C64F1E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{314E9AD6-2FFC-4A92-A8AD-510658C64F1E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{314E9AD6-2FFC-4A92-A8AD-510658C64F1E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{314E9AD6-2FFC-4A92-A8AD-510658C64F1E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{314E9AD6-2FFC-4A92-A8AD-510658C64F1E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{314E9AD6-2FFC-4A92-A8AD-510658C64F1E}.Release|x86.ActiveCfg = Release|Any CPU
-		{C48DA9D7-ACB5-4408-AA79-27ECB60A67EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C48DA9D7-ACB5-4408-AA79-27ECB60A67EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C48DA9D7-ACB5-4408-AA79-27ECB60A67EF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C48DA9D7-ACB5-4408-AA79-27ECB60A67EF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C48DA9D7-ACB5-4408-AA79-27ECB60A67EF}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{C48DA9D7-ACB5-4408-AA79-27ECB60A67EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C48DA9D7-ACB5-4408-AA79-27ECB60A67EF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C48DA9D7-ACB5-4408-AA79-27ECB60A67EF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{C48DA9D7-ACB5-4408-AA79-27ECB60A67EF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{C48DA9D7-ACB5-4408-AA79-27ECB60A67EF}.Release|x86.ActiveCfg = Release|Any CPU
-		{3F6E355E-4869-41D9-943B-D54771221A7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3F6E355E-4869-41D9-943B-D54771221A7F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3F6E355E-4869-41D9-943B-D54771221A7F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3F6E355E-4869-41D9-943B-D54771221A7F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3F6E355E-4869-41D9-943B-D54771221A7F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3F6E355E-4869-41D9-943B-D54771221A7F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3F6E355E-4869-41D9-943B-D54771221A7F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3F6E355E-4869-41D9-943B-D54771221A7F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{3F6E355E-4869-41D9-943B-D54771221A7F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{3F6E355E-4869-41D9-943B-D54771221A7F}.Release|x86.ActiveCfg = Release|Any CPU
-		{A8AA326E-8EE8-4F11-B750-23028E0949D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A8AA326E-8EE8-4F11-B750-23028E0949D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A8AA326E-8EE8-4F11-B750-23028E0949D7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A8AA326E-8EE8-4F11-B750-23028E0949D7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A8AA326E-8EE8-4F11-B750-23028E0949D7}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A8AA326E-8EE8-4F11-B750-23028E0949D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A8AA326E-8EE8-4F11-B750-23028E0949D7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A8AA326E-8EE8-4F11-B750-23028E0949D7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{A8AA326E-8EE8-4F11-B750-23028E0949D7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{A8AA326E-8EE8-4F11-B750-23028E0949D7}.Release|x86.ActiveCfg = Release|Any CPU
-		{323D0C04-B518-4A8F-8A8E-3546AD153D34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{323D0C04-B518-4A8F-8A8E-3546AD153D34}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{323D0C04-B518-4A8F-8A8E-3546AD153D34}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{323D0C04-B518-4A8F-8A8E-3546AD153D34}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{323D0C04-B518-4A8F-8A8E-3546AD153D34}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{323D0C04-B518-4A8F-8A8E-3546AD153D34}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{323D0C04-B518-4A8F-8A8E-3546AD153D34}.Release|Any CPU.Build.0 = Release|Any CPU
-		{323D0C04-B518-4A8F-8A8E-3546AD153D34}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{323D0C04-B518-4A8F-8A8E-3546AD153D34}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{323D0C04-B518-4A8F-8A8E-3546AD153D34}.Release|x86.ActiveCfg = Release|Any CPU
 		{34DF1487-12C6-476C-BE0A-F31DF1939AE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{34DF1487-12C6-476C-BE0A-F31DF1939AE5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{34DF1487-12C6-476C-BE0A-F31DF1939AE5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -362,16 +323,6 @@ Global
 		{42CDBF4A-E238-4C0F-A416-44588363EB4C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{42CDBF4A-E238-4C0F-A416-44588363EB4C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{42CDBF4A-E238-4C0F-A416-44588363EB4C}.Release|x86.ActiveCfg = Release|Any CPU
-		{5F945B82-FE5F-425C-956C-8BC2F2020254}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5F945B82-FE5F-425C-956C-8BC2F2020254}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5F945B82-FE5F-425C-956C-8BC2F2020254}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5F945B82-FE5F-425C-956C-8BC2F2020254}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5F945B82-FE5F-425C-956C-8BC2F2020254}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{5F945B82-FE5F-425C-956C-8BC2F2020254}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5F945B82-FE5F-425C-956C-8BC2F2020254}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5F945B82-FE5F-425C-956C-8BC2F2020254}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{5F945B82-FE5F-425C-956C-8BC2F2020254}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{5F945B82-FE5F-425C-956C-8BC2F2020254}.Release|x86.ActiveCfg = Release|Any CPU
 		{B07CAF59-11ED-40E3-A5DB-E1178F84FA78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B07CAF59-11ED-40E3-A5DB-E1178F84FA78}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B07CAF59-11ED-40E3-A5DB-E1178F84FA78}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -442,26 +393,6 @@ Global
 		{CAE52CB7-0FAC-4B5B-8251-B0FF837DB657}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{CAE52CB7-0FAC-4B5B-8251-B0FF837DB657}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{CAE52CB7-0FAC-4B5B-8251-B0FF837DB657}.Release|x86.ActiveCfg = Release|Any CPU
-		{B2347320-308E-4D2B-AEC8-005DFA68B0C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B2347320-308E-4D2B-AEC8-005DFA68B0C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B2347320-308E-4D2B-AEC8-005DFA68B0C9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B2347320-308E-4D2B-AEC8-005DFA68B0C9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B2347320-308E-4D2B-AEC8-005DFA68B0C9}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B2347320-308E-4D2B-AEC8-005DFA68B0C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B2347320-308E-4D2B-AEC8-005DFA68B0C9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B2347320-308E-4D2B-AEC8-005DFA68B0C9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{B2347320-308E-4D2B-AEC8-005DFA68B0C9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{B2347320-308E-4D2B-AEC8-005DFA68B0C9}.Release|x86.ActiveCfg = Release|Any CPU
-		{860119ED-3DB1-424D-8D0A-30132A8A7D96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{860119ED-3DB1-424D-8D0A-30132A8A7D96}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{860119ED-3DB1-424D-8D0A-30132A8A7D96}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{860119ED-3DB1-424D-8D0A-30132A8A7D96}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{860119ED-3DB1-424D-8D0A-30132A8A7D96}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{860119ED-3DB1-424D-8D0A-30132A8A7D96}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{860119ED-3DB1-424D-8D0A-30132A8A7D96}.Release|Any CPU.Build.0 = Release|Any CPU
-		{860119ED-3DB1-424D-8D0A-30132A8A7D96}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{860119ED-3DB1-424D-8D0A-30132A8A7D96}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{860119ED-3DB1-424D-8D0A-30132A8A7D96}.Release|x86.ActiveCfg = Release|Any CPU
 		{920F8A0E-6F7D-4BBE-84FF-840B89099BE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{920F8A0E-6F7D-4BBE-84FF-840B89099BE6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{920F8A0E-6F7D-4BBE-84FF-840B89099BE6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -522,18 +453,6 @@ Global
 		{551DC89E-2A13-4CF2-83D7-1ADD802443D5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{551DC89E-2A13-4CF2-83D7-1ADD802443D5}.Release|x86.ActiveCfg = Release|Any CPU
 		{551DC89E-2A13-4CF2-83D7-1ADD802443D5}.Release|x86.Build.0 = Release|Any CPU
-		{F504357E-C2E1-4818-BA5C-9A2EAC25FEE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F504357E-C2E1-4818-BA5C-9A2EAC25FEE5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F504357E-C2E1-4818-BA5C-9A2EAC25FEE5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F504357E-C2E1-4818-BA5C-9A2EAC25FEE5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F504357E-C2E1-4818-BA5C-9A2EAC25FEE5}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F504357E-C2E1-4818-BA5C-9A2EAC25FEE5}.Debug|x86.Build.0 = Debug|Any CPU
-		{F504357E-C2E1-4818-BA5C-9A2EAC25FEE5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F504357E-C2E1-4818-BA5C-9A2EAC25FEE5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F504357E-C2E1-4818-BA5C-9A2EAC25FEE5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{F504357E-C2E1-4818-BA5C-9A2EAC25FEE5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{F504357E-C2E1-4818-BA5C-9A2EAC25FEE5}.Release|x86.ActiveCfg = Release|Any CPU
-		{F504357E-C2E1-4818-BA5C-9A2EAC25FEE5}.Release|x86.Build.0 = Release|Any CPU
 		{94BA134D-04B3-48AA-BA55-5A4DB8640F2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{94BA134D-04B3-48AA-BA55-5A4DB8640F2D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{94BA134D-04B3-48AA-BA55-5A4DB8640F2D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -546,222 +465,6 @@ Global
 		{94BA134D-04B3-48AA-BA55-5A4DB8640F2D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{94BA134D-04B3-48AA-BA55-5A4DB8640F2D}.Release|x86.ActiveCfg = Release|Any CPU
 		{94BA134D-04B3-48AA-BA55-5A4DB8640F2D}.Release|x86.Build.0 = Release|Any CPU
-		{864FA09D-1E48-403A-A6C8-4F079D2A30F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{864FA09D-1E48-403A-A6C8-4F079D2A30F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{864FA09D-1E48-403A-A6C8-4F079D2A30F0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{864FA09D-1E48-403A-A6C8-4F079D2A30F0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{864FA09D-1E48-403A-A6C8-4F079D2A30F0}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{864FA09D-1E48-403A-A6C8-4F079D2A30F0}.Debug|x86.Build.0 = Debug|Any CPU
-		{864FA09D-1E48-403A-A6C8-4F079D2A30F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{864FA09D-1E48-403A-A6C8-4F079D2A30F0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{864FA09D-1E48-403A-A6C8-4F079D2A30F0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{864FA09D-1E48-403A-A6C8-4F079D2A30F0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{864FA09D-1E48-403A-A6C8-4F079D2A30F0}.Release|x86.ActiveCfg = Release|Any CPU
-		{864FA09D-1E48-403A-A6C8-4F079D2A30F0}.Release|x86.Build.0 = Release|Any CPU
-		{1154203C-7579-4525-906E-BC55268421C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1154203C-7579-4525-906E-BC55268421C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1154203C-7579-4525-906E-BC55268421C1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{1154203C-7579-4525-906E-BC55268421C1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{1154203C-7579-4525-906E-BC55268421C1}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{1154203C-7579-4525-906E-BC55268421C1}.Debug|x86.Build.0 = Debug|Any CPU
-		{1154203C-7579-4525-906E-BC55268421C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1154203C-7579-4525-906E-BC55268421C1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1154203C-7579-4525-906E-BC55268421C1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{1154203C-7579-4525-906E-BC55268421C1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{1154203C-7579-4525-906E-BC55268421C1}.Release|x86.ActiveCfg = Release|Any CPU
-		{1154203C-7579-4525-906E-BC55268421C1}.Release|x86.Build.0 = Release|Any CPU
-		{A2B72833-5D70-4C42-AE85-E0319926FB8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A2B72833-5D70-4C42-AE85-E0319926FB8A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A2B72833-5D70-4C42-AE85-E0319926FB8A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A2B72833-5D70-4C42-AE85-E0319926FB8A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A2B72833-5D70-4C42-AE85-E0319926FB8A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A2B72833-5D70-4C42-AE85-E0319926FB8A}.Debug|x86.Build.0 = Debug|Any CPU
-		{A2B72833-5D70-4C42-AE85-E0319926FB8A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A2B72833-5D70-4C42-AE85-E0319926FB8A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A2B72833-5D70-4C42-AE85-E0319926FB8A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{A2B72833-5D70-4C42-AE85-E0319926FB8A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{A2B72833-5D70-4C42-AE85-E0319926FB8A}.Release|x86.ActiveCfg = Release|Any CPU
-		{A2B72833-5D70-4C42-AE85-E0319926FB8A}.Release|x86.Build.0 = Release|Any CPU
-		{4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Debug|x86.Build.0 = Debug|Any CPU
-		{4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Release|x86.ActiveCfg = Release|Any CPU
-		{4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Release|x86.Build.0 = Release|Any CPU
-		{DA000953-7532-4DF5-8DB9-8143DF98D999}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DA000953-7532-4DF5-8DB9-8143DF98D999}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DA000953-7532-4DF5-8DB9-8143DF98D999}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{DA000953-7532-4DF5-8DB9-8143DF98D999}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{DA000953-7532-4DF5-8DB9-8143DF98D999}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{DA000953-7532-4DF5-8DB9-8143DF98D999}.Debug|x86.Build.0 = Debug|Any CPU
-		{DA000953-7532-4DF5-8DB9-8143DF98D999}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DA000953-7532-4DF5-8DB9-8143DF98D999}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DA000953-7532-4DF5-8DB9-8143DF98D999}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{DA000953-7532-4DF5-8DB9-8143DF98D999}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{DA000953-7532-4DF5-8DB9-8143DF98D999}.Release|x86.ActiveCfg = Release|Any CPU
-		{DA000953-7532-4DF5-8DB9-8143DF98D999}.Release|x86.Build.0 = Release|Any CPU
-		{3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Debug|x86.Build.0 = Debug|Any CPU
-		{3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Release|x86.ActiveCfg = Release|Any CPU
-		{3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Release|x86.Build.0 = Release|Any CPU
-		{3FC8D9D6-9352-43A3-8E81-422F270085B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3FC8D9D6-9352-43A3-8E81-422F270085B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3FC8D9D6-9352-43A3-8E81-422F270085B7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3FC8D9D6-9352-43A3-8E81-422F270085B7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3FC8D9D6-9352-43A3-8E81-422F270085B7}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3FC8D9D6-9352-43A3-8E81-422F270085B7}.Debug|x86.Build.0 = Debug|Any CPU
-		{3FC8D9D6-9352-43A3-8E81-422F270085B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3FC8D9D6-9352-43A3-8E81-422F270085B7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3FC8D9D6-9352-43A3-8E81-422F270085B7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{3FC8D9D6-9352-43A3-8E81-422F270085B7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{3FC8D9D6-9352-43A3-8E81-422F270085B7}.Release|x86.ActiveCfg = Release|Any CPU
-		{3FC8D9D6-9352-43A3-8E81-422F270085B7}.Release|x86.Build.0 = Release|Any CPU
-		{42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Debug|x86.Build.0 = Debug|Any CPU
-		{42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Release|Any CPU.Build.0 = Release|Any CPU
-		{42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Release|x86.ActiveCfg = Release|Any CPU
-		{42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Release|x86.Build.0 = Release|Any CPU
-		{493780DA-E696-40FF-BD12-4A5C5736F292}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{493780DA-E696-40FF-BD12-4A5C5736F292}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{493780DA-E696-40FF-BD12-4A5C5736F292}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{493780DA-E696-40FF-BD12-4A5C5736F292}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{493780DA-E696-40FF-BD12-4A5C5736F292}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{493780DA-E696-40FF-BD12-4A5C5736F292}.Debug|x86.Build.0 = Debug|Any CPU
-		{493780DA-E696-40FF-BD12-4A5C5736F292}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{493780DA-E696-40FF-BD12-4A5C5736F292}.Release|Any CPU.Build.0 = Release|Any CPU
-		{493780DA-E696-40FF-BD12-4A5C5736F292}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{493780DA-E696-40FF-BD12-4A5C5736F292}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{493780DA-E696-40FF-BD12-4A5C5736F292}.Release|x86.ActiveCfg = Release|Any CPU
-		{493780DA-E696-40FF-BD12-4A5C5736F292}.Release|x86.Build.0 = Release|Any CPU
-		{22019146-BDFA-442E-8C8E-345FB9644578}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{22019146-BDFA-442E-8C8E-345FB9644578}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{22019146-BDFA-442E-8C8E-345FB9644578}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{22019146-BDFA-442E-8C8E-345FB9644578}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{22019146-BDFA-442E-8C8E-345FB9644578}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{22019146-BDFA-442E-8C8E-345FB9644578}.Debug|x86.Build.0 = Debug|Any CPU
-		{22019146-BDFA-442E-8C8E-345FB9644578}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{22019146-BDFA-442E-8C8E-345FB9644578}.Release|Any CPU.Build.0 = Release|Any CPU
-		{22019146-BDFA-442E-8C8E-345FB9644578}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{22019146-BDFA-442E-8C8E-345FB9644578}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{22019146-BDFA-442E-8C8E-345FB9644578}.Release|x86.ActiveCfg = Release|Any CPU
-		{22019146-BDFA-442E-8C8E-345FB9644578}.Release|x86.Build.0 = Release|Any CPU
-		{9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Debug|x86.Build.0 = Debug|Any CPU
-		{9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Release|x86.ActiveCfg = Release|Any CPU
-		{9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Release|x86.Build.0 = Release|Any CPU
-		{2DD786CA-7AF7-437A-B499-801A589B9A1C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2DD786CA-7AF7-437A-B499-801A589B9A1C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2DD786CA-7AF7-437A-B499-801A589B9A1C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2DD786CA-7AF7-437A-B499-801A589B9A1C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2DD786CA-7AF7-437A-B499-801A589B9A1C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{2DD786CA-7AF7-437A-B499-801A589B9A1C}.Debug|x86.Build.0 = Debug|Any CPU
-		{2DD786CA-7AF7-437A-B499-801A589B9A1C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2DD786CA-7AF7-437A-B499-801A589B9A1C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2DD786CA-7AF7-437A-B499-801A589B9A1C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{2DD786CA-7AF7-437A-B499-801A589B9A1C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{2DD786CA-7AF7-437A-B499-801A589B9A1C}.Release|x86.ActiveCfg = Release|Any CPU
-		{2DD786CA-7AF7-437A-B499-801A589B9A1C}.Release|x86.Build.0 = Release|Any CPU
-		{6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Debug|x86.Build.0 = Debug|Any CPU
-		{6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Release|x86.ActiveCfg = Release|Any CPU
-		{6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Release|x86.Build.0 = Release|Any CPU
-		{827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Debug|x86.Build.0 = Debug|Any CPU
-		{827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Release|x86.ActiveCfg = Release|Any CPU
-		{827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Release|x86.Build.0 = Release|Any CPU
-		{60873DFA-97B9-419E-BAA3-940FC9B07085}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{60873DFA-97B9-419E-BAA3-940FC9B07085}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{60873DFA-97B9-419E-BAA3-940FC9B07085}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{60873DFA-97B9-419E-BAA3-940FC9B07085}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{60873DFA-97B9-419E-BAA3-940FC9B07085}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{60873DFA-97B9-419E-BAA3-940FC9B07085}.Debug|x86.Build.0 = Debug|Any CPU
-		{60873DFA-97B9-419E-BAA3-940FC9B07085}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{60873DFA-97B9-419E-BAA3-940FC9B07085}.Release|Any CPU.Build.0 = Release|Any CPU
-		{60873DFA-97B9-419E-BAA3-940FC9B07085}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{60873DFA-97B9-419E-BAA3-940FC9B07085}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{60873DFA-97B9-419E-BAA3-940FC9B07085}.Release|x86.ActiveCfg = Release|Any CPU
-		{60873DFA-97B9-419E-BAA3-940FC9B07085}.Release|x86.Build.0 = Release|Any CPU
-		{50893B10-5735-4F35-9995-F81DA3F0189E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{50893B10-5735-4F35-9995-F81DA3F0189E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{50893B10-5735-4F35-9995-F81DA3F0189E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{50893B10-5735-4F35-9995-F81DA3F0189E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{50893B10-5735-4F35-9995-F81DA3F0189E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{50893B10-5735-4F35-9995-F81DA3F0189E}.Debug|x86.Build.0 = Debug|Any CPU
-		{50893B10-5735-4F35-9995-F81DA3F0189E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{50893B10-5735-4F35-9995-F81DA3F0189E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{50893B10-5735-4F35-9995-F81DA3F0189E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{50893B10-5735-4F35-9995-F81DA3F0189E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{50893B10-5735-4F35-9995-F81DA3F0189E}.Release|x86.ActiveCfg = Release|Any CPU
-		{50893B10-5735-4F35-9995-F81DA3F0189E}.Release|x86.Build.0 = Release|Any CPU
-		{8FC726B5-E766-44E0-8B38-1313B6D8D9A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8FC726B5-E766-44E0-8B38-1313B6D8D9A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8FC726B5-E766-44E0-8B38-1313B6D8D9A7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{8FC726B5-E766-44E0-8B38-1313B6D8D9A7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{8FC726B5-E766-44E0-8B38-1313B6D8D9A7}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{8FC726B5-E766-44E0-8B38-1313B6D8D9A7}.Debug|x86.Build.0 = Debug|Any CPU
-		{8FC726B5-E766-44E0-8B38-1313B6D8D9A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8FC726B5-E766-44E0-8B38-1313B6D8D9A7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8FC726B5-E766-44E0-8B38-1313B6D8D9A7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{8FC726B5-E766-44E0-8B38-1313B6D8D9A7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{8FC726B5-E766-44E0-8B38-1313B6D8D9A7}.Release|x86.ActiveCfg = Release|Any CPU
-		{8FC726B5-E766-44E0-8B38-1313B6D8D9A7}.Release|x86.Build.0 = Release|Any CPU
-		{9879B5D5-2325-4A81-B4DF-F279FE8FEEB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9879B5D5-2325-4A81-B4DF-F279FE8FEEB4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9879B5D5-2325-4A81-B4DF-F279FE8FEEB4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{9879B5D5-2325-4A81-B4DF-F279FE8FEEB4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{9879B5D5-2325-4A81-B4DF-F279FE8FEEB4}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{9879B5D5-2325-4A81-B4DF-F279FE8FEEB4}.Debug|x86.Build.0 = Debug|Any CPU
-		{9879B5D5-2325-4A81-B4DF-F279FE8FEEB4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9879B5D5-2325-4A81-B4DF-F279FE8FEEB4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9879B5D5-2325-4A81-B4DF-F279FE8FEEB4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{9879B5D5-2325-4A81-B4DF-F279FE8FEEB4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{9879B5D5-2325-4A81-B4DF-F279FE8FEEB4}.Release|x86.ActiveCfg = Release|Any CPU
-		{9879B5D5-2325-4A81-B4DF-F279FE8FEEB4}.Release|x86.Build.0 = Release|Any CPU
 		{14ED4476-9F24-4776-8417-EA6927F6C9C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{14ED4476-9F24-4776-8417-EA6927F6C9C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{14ED4476-9F24-4776-8417-EA6927F6C9C9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -798,30 +501,6 @@ Global
 		{D28CAC79-7004-4B69-993B-EDEB4653BFA8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D28CAC79-7004-4B69-993B-EDEB4653BFA8}.Release|x86.ActiveCfg = Release|Any CPU
 		{D28CAC79-7004-4B69-993B-EDEB4653BFA8}.Release|x86.Build.0 = Release|Any CPU
-		{CF322BE1-E1FE-4CFD-8FCA-16A14B905D53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CF322BE1-E1FE-4CFD-8FCA-16A14B905D53}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CF322BE1-E1FE-4CFD-8FCA-16A14B905D53}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{CF322BE1-E1FE-4CFD-8FCA-16A14B905D53}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{CF322BE1-E1FE-4CFD-8FCA-16A14B905D53}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{CF322BE1-E1FE-4CFD-8FCA-16A14B905D53}.Debug|x86.Build.0 = Debug|Any CPU
-		{CF322BE1-E1FE-4CFD-8FCA-16A14B905D53}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CF322BE1-E1FE-4CFD-8FCA-16A14B905D53}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CF322BE1-E1FE-4CFD-8FCA-16A14B905D53}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{CF322BE1-E1FE-4CFD-8FCA-16A14B905D53}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{CF322BE1-E1FE-4CFD-8FCA-16A14B905D53}.Release|x86.ActiveCfg = Release|Any CPU
-		{CF322BE1-E1FE-4CFD-8FCA-16A14B905D53}.Release|x86.Build.0 = Release|Any CPU
-		{0AB46520-F441-4E01-B444-08F4D23F8B1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0AB46520-F441-4E01-B444-08F4D23F8B1B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0AB46520-F441-4E01-B444-08F4D23F8B1B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0AB46520-F441-4E01-B444-08F4D23F8B1B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0AB46520-F441-4E01-B444-08F4D23F8B1B}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{0AB46520-F441-4E01-B444-08F4D23F8B1B}.Debug|x86.Build.0 = Debug|Any CPU
-		{0AB46520-F441-4E01-B444-08F4D23F8B1B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0AB46520-F441-4E01-B444-08F4D23F8B1B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0AB46520-F441-4E01-B444-08F4D23F8B1B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{0AB46520-F441-4E01-B444-08F4D23F8B1B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{0AB46520-F441-4E01-B444-08F4D23F8B1B}.Release|x86.ActiveCfg = Release|Any CPU
-		{0AB46520-F441-4E01-B444-08F4D23F8B1B}.Release|x86.Build.0 = Release|Any CPU
 		{4BA6EC9A-B6D9-41F2-BFDA-D82B22D80352}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4BA6EC9A-B6D9-41F2-BFDA-D82B22D80352}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4BA6EC9A-B6D9-41F2-BFDA-D82B22D80352}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -846,18 +525,6 @@ Global
 		{F16CEE0D-A28E-43BD-802F-99BAFE4BA7CE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{F16CEE0D-A28E-43BD-802F-99BAFE4BA7CE}.Release|x86.ActiveCfg = Release|Any CPU
 		{F16CEE0D-A28E-43BD-802F-99BAFE4BA7CE}.Release|x86.Build.0 = Release|Any CPU
-		{7500B228-1769-4CFB-A571-3DFAC6678A06}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7500B228-1769-4CFB-A571-3DFAC6678A06}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7500B228-1769-4CFB-A571-3DFAC6678A06}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{7500B228-1769-4CFB-A571-3DFAC6678A06}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{7500B228-1769-4CFB-A571-3DFAC6678A06}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{7500B228-1769-4CFB-A571-3DFAC6678A06}.Debug|x86.Build.0 = Debug|Any CPU
-		{7500B228-1769-4CFB-A571-3DFAC6678A06}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7500B228-1769-4CFB-A571-3DFAC6678A06}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7500B228-1769-4CFB-A571-3DFAC6678A06}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{7500B228-1769-4CFB-A571-3DFAC6678A06}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{7500B228-1769-4CFB-A571-3DFAC6678A06}.Release|x86.ActiveCfg = Release|Any CPU
-		{7500B228-1769-4CFB-A571-3DFAC6678A06}.Release|x86.Build.0 = Release|Any CPU
 		{BF8A3392-C3D2-4813-855A-E906564600E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BF8A3392-C3D2-4813-855A-E906564600E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BF8A3392-C3D2-4813-855A-E906564600E1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -1554,30 +1221,6 @@ Global
 		{D9BE3E50-5CE8-4D8D-BA19-AA219D009752}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D9BE3E50-5CE8-4D8D-BA19-AA219D009752}.Release|x86.ActiveCfg = Release|Any CPU
 		{D9BE3E50-5CE8-4D8D-BA19-AA219D009752}.Release|x86.Build.0 = Release|Any CPU
-		{F2D4A859-7B84-403E-9745-01032EC705C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F2D4A859-7B84-403E-9745-01032EC705C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F2D4A859-7B84-403E-9745-01032EC705C5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F2D4A859-7B84-403E-9745-01032EC705C5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F2D4A859-7B84-403E-9745-01032EC705C5}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F2D4A859-7B84-403E-9745-01032EC705C5}.Debug|x86.Build.0 = Debug|Any CPU
-		{F2D4A859-7B84-403E-9745-01032EC705C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F2D4A859-7B84-403E-9745-01032EC705C5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F2D4A859-7B84-403E-9745-01032EC705C5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{F2D4A859-7B84-403E-9745-01032EC705C5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{F2D4A859-7B84-403E-9745-01032EC705C5}.Release|x86.ActiveCfg = Release|Any CPU
-		{F2D4A859-7B84-403E-9745-01032EC705C5}.Release|x86.Build.0 = Release|Any CPU
-		{23A6033D-2AA6-4629-BC1B-14694E3794FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{23A6033D-2AA6-4629-BC1B-14694E3794FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{23A6033D-2AA6-4629-BC1B-14694E3794FF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{23A6033D-2AA6-4629-BC1B-14694E3794FF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{23A6033D-2AA6-4629-BC1B-14694E3794FF}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{23A6033D-2AA6-4629-BC1B-14694E3794FF}.Debug|x86.Build.0 = Debug|Any CPU
-		{23A6033D-2AA6-4629-BC1B-14694E3794FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{23A6033D-2AA6-4629-BC1B-14694E3794FF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{23A6033D-2AA6-4629-BC1B-14694E3794FF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{23A6033D-2AA6-4629-BC1B-14694E3794FF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{23A6033D-2AA6-4629-BC1B-14694E3794FF}.Release|x86.ActiveCfg = Release|Any CPU
-		{23A6033D-2AA6-4629-BC1B-14694E3794FF}.Release|x86.Build.0 = Release|Any CPU
 		{69E18B21-E4B9-4866-ABDA-3C2D9664D24C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{69E18B21-E4B9-4866-ABDA-3C2D9664D24C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{69E18B21-E4B9-4866-ABDA-3C2D9664D24C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -1590,33 +1233,422 @@ Global
 		{69E18B21-E4B9-4866-ABDA-3C2D9664D24C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{69E18B21-E4B9-4866-ABDA-3C2D9664D24C}.Release|x86.ActiveCfg = Release|Any CPU
 		{69E18B21-E4B9-4866-ABDA-3C2D9664D24C}.Release|x86.Build.0 = Release|Any CPU
-		{7B35EA78-7D47-4AFA-982C-899E7C55CBF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7B35EA78-7D47-4AFA-982C-899E7C55CBF1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7B35EA78-7D47-4AFA-982C-899E7C55CBF1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{7B35EA78-7D47-4AFA-982C-899E7C55CBF1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{7B35EA78-7D47-4AFA-982C-899E7C55CBF1}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{7B35EA78-7D47-4AFA-982C-899E7C55CBF1}.Debug|x86.Build.0 = Debug|Any CPU
-		{7B35EA78-7D47-4AFA-982C-899E7C55CBF1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7B35EA78-7D47-4AFA-982C-899E7C55CBF1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7B35EA78-7D47-4AFA-982C-899E7C55CBF1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{7B35EA78-7D47-4AFA-982C-899E7C55CBF1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{7B35EA78-7D47-4AFA-982C-899E7C55CBF1}.Release|x86.ActiveCfg = Release|Any CPU
-		{7B35EA78-7D47-4AFA-982C-899E7C55CBF1}.Release|x86.Build.0 = Release|Any CPU
+		{39D6EF6C-6447-41ED-B8F3-F2D61C40B848}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{39D6EF6C-6447-41ED-B8F3-F2D61C40B848}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{39D6EF6C-6447-41ED-B8F3-F2D61C40B848}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{39D6EF6C-6447-41ED-B8F3-F2D61C40B848}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{39D6EF6C-6447-41ED-B8F3-F2D61C40B848}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{39D6EF6C-6447-41ED-B8F3-F2D61C40B848}.Debug|x86.Build.0 = Debug|Any CPU
+		{39D6EF6C-6447-41ED-B8F3-F2D61C40B848}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{39D6EF6C-6447-41ED-B8F3-F2D61C40B848}.Release|Any CPU.Build.0 = Release|Any CPU
+		{39D6EF6C-6447-41ED-B8F3-F2D61C40B848}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{39D6EF6C-6447-41ED-B8F3-F2D61C40B848}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{39D6EF6C-6447-41ED-B8F3-F2D61C40B848}.Release|x86.ActiveCfg = Release|Any CPU
+		{39D6EF6C-6447-41ED-B8F3-F2D61C40B848}.Release|x86.Build.0 = Release|Any CPU
+		{4BFD08A5-678D-473A-BA94-D2EE1BAC3297}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4BFD08A5-678D-473A-BA94-D2EE1BAC3297}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4BFD08A5-678D-473A-BA94-D2EE1BAC3297}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4BFD08A5-678D-473A-BA94-D2EE1BAC3297}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4BFD08A5-678D-473A-BA94-D2EE1BAC3297}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4BFD08A5-678D-473A-BA94-D2EE1BAC3297}.Debug|x86.Build.0 = Debug|Any CPU
+		{4BFD08A5-678D-473A-BA94-D2EE1BAC3297}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4BFD08A5-678D-473A-BA94-D2EE1BAC3297}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4BFD08A5-678D-473A-BA94-D2EE1BAC3297}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{4BFD08A5-678D-473A-BA94-D2EE1BAC3297}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{4BFD08A5-678D-473A-BA94-D2EE1BAC3297}.Release|x86.ActiveCfg = Release|Any CPU
+		{4BFD08A5-678D-473A-BA94-D2EE1BAC3297}.Release|x86.Build.0 = Release|Any CPU
+		{AE2F658D-40AB-426D-A595-CF62130619A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AE2F658D-40AB-426D-A595-CF62130619A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AE2F658D-40AB-426D-A595-CF62130619A4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{AE2F658D-40AB-426D-A595-CF62130619A4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{AE2F658D-40AB-426D-A595-CF62130619A4}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{AE2F658D-40AB-426D-A595-CF62130619A4}.Debug|x86.Build.0 = Debug|Any CPU
+		{AE2F658D-40AB-426D-A595-CF62130619A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AE2F658D-40AB-426D-A595-CF62130619A4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AE2F658D-40AB-426D-A595-CF62130619A4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{AE2F658D-40AB-426D-A595-CF62130619A4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{AE2F658D-40AB-426D-A595-CF62130619A4}.Release|x86.ActiveCfg = Release|Any CPU
+		{AE2F658D-40AB-426D-A595-CF62130619A4}.Release|x86.Build.0 = Release|Any CPU
+		{F3DC0845-ED54-457F-AAAA-7CEE04E6408F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F3DC0845-ED54-457F-AAAA-7CEE04E6408F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F3DC0845-ED54-457F-AAAA-7CEE04E6408F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F3DC0845-ED54-457F-AAAA-7CEE04E6408F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F3DC0845-ED54-457F-AAAA-7CEE04E6408F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F3DC0845-ED54-457F-AAAA-7CEE04E6408F}.Debug|x86.Build.0 = Debug|Any CPU
+		{F3DC0845-ED54-457F-AAAA-7CEE04E6408F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F3DC0845-ED54-457F-AAAA-7CEE04E6408F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F3DC0845-ED54-457F-AAAA-7CEE04E6408F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{F3DC0845-ED54-457F-AAAA-7CEE04E6408F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{F3DC0845-ED54-457F-AAAA-7CEE04E6408F}.Release|x86.ActiveCfg = Release|Any CPU
+		{F3DC0845-ED54-457F-AAAA-7CEE04E6408F}.Release|x86.Build.0 = Release|Any CPU
+		{0EAA75EF-8AF6-4FA4-8148-CA93CC280214}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0EAA75EF-8AF6-4FA4-8148-CA93CC280214}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0EAA75EF-8AF6-4FA4-8148-CA93CC280214}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0EAA75EF-8AF6-4FA4-8148-CA93CC280214}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0EAA75EF-8AF6-4FA4-8148-CA93CC280214}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0EAA75EF-8AF6-4FA4-8148-CA93CC280214}.Debug|x86.Build.0 = Debug|Any CPU
+		{0EAA75EF-8AF6-4FA4-8148-CA93CC280214}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0EAA75EF-8AF6-4FA4-8148-CA93CC280214}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0EAA75EF-8AF6-4FA4-8148-CA93CC280214}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{0EAA75EF-8AF6-4FA4-8148-CA93CC280214}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{0EAA75EF-8AF6-4FA4-8148-CA93CC280214}.Release|x86.ActiveCfg = Release|Any CPU
+		{0EAA75EF-8AF6-4FA4-8148-CA93CC280214}.Release|x86.Build.0 = Release|Any CPU
+		{D35B7C96-72AB-4FE0-B6E0-0BBB5768F79E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D35B7C96-72AB-4FE0-B6E0-0BBB5768F79E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D35B7C96-72AB-4FE0-B6E0-0BBB5768F79E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D35B7C96-72AB-4FE0-B6E0-0BBB5768F79E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D35B7C96-72AB-4FE0-B6E0-0BBB5768F79E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D35B7C96-72AB-4FE0-B6E0-0BBB5768F79E}.Debug|x86.Build.0 = Debug|Any CPU
+		{D35B7C96-72AB-4FE0-B6E0-0BBB5768F79E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D35B7C96-72AB-4FE0-B6E0-0BBB5768F79E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D35B7C96-72AB-4FE0-B6E0-0BBB5768F79E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{D35B7C96-72AB-4FE0-B6E0-0BBB5768F79E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{D35B7C96-72AB-4FE0-B6E0-0BBB5768F79E}.Release|x86.ActiveCfg = Release|Any CPU
+		{D35B7C96-72AB-4FE0-B6E0-0BBB5768F79E}.Release|x86.Build.0 = Release|Any CPU
+		{527B9345-18B4-4F86-B649-20C87B8E0CCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{527B9345-18B4-4F86-B649-20C87B8E0CCF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{527B9345-18B4-4F86-B649-20C87B8E0CCF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{527B9345-18B4-4F86-B649-20C87B8E0CCF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{527B9345-18B4-4F86-B649-20C87B8E0CCF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{527B9345-18B4-4F86-B649-20C87B8E0CCF}.Debug|x86.Build.0 = Debug|Any CPU
+		{527B9345-18B4-4F86-B649-20C87B8E0CCF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{527B9345-18B4-4F86-B649-20C87B8E0CCF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{527B9345-18B4-4F86-B649-20C87B8E0CCF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{527B9345-18B4-4F86-B649-20C87B8E0CCF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{527B9345-18B4-4F86-B649-20C87B8E0CCF}.Release|x86.ActiveCfg = Release|Any CPU
+		{527B9345-18B4-4F86-B649-20C87B8E0CCF}.Release|x86.Build.0 = Release|Any CPU
+		{1205911F-2257-4B96-BE06-8EED94971802}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1205911F-2257-4B96-BE06-8EED94971802}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1205911F-2257-4B96-BE06-8EED94971802}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{1205911F-2257-4B96-BE06-8EED94971802}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{1205911F-2257-4B96-BE06-8EED94971802}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1205911F-2257-4B96-BE06-8EED94971802}.Debug|x86.Build.0 = Debug|Any CPU
+		{1205911F-2257-4B96-BE06-8EED94971802}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1205911F-2257-4B96-BE06-8EED94971802}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1205911F-2257-4B96-BE06-8EED94971802}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{1205911F-2257-4B96-BE06-8EED94971802}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{1205911F-2257-4B96-BE06-8EED94971802}.Release|x86.ActiveCfg = Release|Any CPU
+		{1205911F-2257-4B96-BE06-8EED94971802}.Release|x86.Build.0 = Release|Any CPU
+		{36710582-0138-4C05-BA8F-0EAC1FCB5F0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{36710582-0138-4C05-BA8F-0EAC1FCB5F0A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{36710582-0138-4C05-BA8F-0EAC1FCB5F0A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{36710582-0138-4C05-BA8F-0EAC1FCB5F0A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{36710582-0138-4C05-BA8F-0EAC1FCB5F0A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{36710582-0138-4C05-BA8F-0EAC1FCB5F0A}.Debug|x86.Build.0 = Debug|Any CPU
+		{36710582-0138-4C05-BA8F-0EAC1FCB5F0A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{36710582-0138-4C05-BA8F-0EAC1FCB5F0A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{36710582-0138-4C05-BA8F-0EAC1FCB5F0A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{36710582-0138-4C05-BA8F-0EAC1FCB5F0A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{36710582-0138-4C05-BA8F-0EAC1FCB5F0A}.Release|x86.ActiveCfg = Release|Any CPU
+		{36710582-0138-4C05-BA8F-0EAC1FCB5F0A}.Release|x86.Build.0 = Release|Any CPU
+		{9FA55001-CBE6-497E-B0B9-EAF3732B249A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9FA55001-CBE6-497E-B0B9-EAF3732B249A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9FA55001-CBE6-497E-B0B9-EAF3732B249A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9FA55001-CBE6-497E-B0B9-EAF3732B249A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9FA55001-CBE6-497E-B0B9-EAF3732B249A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9FA55001-CBE6-497E-B0B9-EAF3732B249A}.Debug|x86.Build.0 = Debug|Any CPU
+		{9FA55001-CBE6-497E-B0B9-EAF3732B249A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9FA55001-CBE6-497E-B0B9-EAF3732B249A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9FA55001-CBE6-497E-B0B9-EAF3732B249A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{9FA55001-CBE6-497E-B0B9-EAF3732B249A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{9FA55001-CBE6-497E-B0B9-EAF3732B249A}.Release|x86.ActiveCfg = Release|Any CPU
+		{9FA55001-CBE6-497E-B0B9-EAF3732B249A}.Release|x86.Build.0 = Release|Any CPU
+		{DB0203AB-3DAA-412D-9BDE-28DFB95955C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DB0203AB-3DAA-412D-9BDE-28DFB95955C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DB0203AB-3DAA-412D-9BDE-28DFB95955C9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{DB0203AB-3DAA-412D-9BDE-28DFB95955C9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{DB0203AB-3DAA-412D-9BDE-28DFB95955C9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DB0203AB-3DAA-412D-9BDE-28DFB95955C9}.Debug|x86.Build.0 = Debug|Any CPU
+		{DB0203AB-3DAA-412D-9BDE-28DFB95955C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DB0203AB-3DAA-412D-9BDE-28DFB95955C9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DB0203AB-3DAA-412D-9BDE-28DFB95955C9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{DB0203AB-3DAA-412D-9BDE-28DFB95955C9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{DB0203AB-3DAA-412D-9BDE-28DFB95955C9}.Release|x86.ActiveCfg = Release|Any CPU
+		{DB0203AB-3DAA-412D-9BDE-28DFB95955C9}.Release|x86.Build.0 = Release|Any CPU
+		{19422AC5-68A0-4973-81EE-968E07FC8F3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{19422AC5-68A0-4973-81EE-968E07FC8F3B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{19422AC5-68A0-4973-81EE-968E07FC8F3B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{19422AC5-68A0-4973-81EE-968E07FC8F3B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{19422AC5-68A0-4973-81EE-968E07FC8F3B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{19422AC5-68A0-4973-81EE-968E07FC8F3B}.Debug|x86.Build.0 = Debug|Any CPU
+		{19422AC5-68A0-4973-81EE-968E07FC8F3B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{19422AC5-68A0-4973-81EE-968E07FC8F3B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{19422AC5-68A0-4973-81EE-968E07FC8F3B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{19422AC5-68A0-4973-81EE-968E07FC8F3B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{19422AC5-68A0-4973-81EE-968E07FC8F3B}.Release|x86.ActiveCfg = Release|Any CPU
+		{19422AC5-68A0-4973-81EE-968E07FC8F3B}.Release|x86.Build.0 = Release|Any CPU
+		{CB0E0224-C20F-448B-9659-B65BCF8513E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CB0E0224-C20F-448B-9659-B65BCF8513E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CB0E0224-C20F-448B-9659-B65BCF8513E2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{CB0E0224-C20F-448B-9659-B65BCF8513E2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{CB0E0224-C20F-448B-9659-B65BCF8513E2}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CB0E0224-C20F-448B-9659-B65BCF8513E2}.Debug|x86.Build.0 = Debug|Any CPU
+		{CB0E0224-C20F-448B-9659-B65BCF8513E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CB0E0224-C20F-448B-9659-B65BCF8513E2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CB0E0224-C20F-448B-9659-B65BCF8513E2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{CB0E0224-C20F-448B-9659-B65BCF8513E2}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{CB0E0224-C20F-448B-9659-B65BCF8513E2}.Release|x86.ActiveCfg = Release|Any CPU
+		{CB0E0224-C20F-448B-9659-B65BCF8513E2}.Release|x86.Build.0 = Release|Any CPU
+		{7EB7A926-6E68-4B7B-97D8-770AFAD785E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7EB7A926-6E68-4B7B-97D8-770AFAD785E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7EB7A926-6E68-4B7B-97D8-770AFAD785E8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{7EB7A926-6E68-4B7B-97D8-770AFAD785E8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{7EB7A926-6E68-4B7B-97D8-770AFAD785E8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7EB7A926-6E68-4B7B-97D8-770AFAD785E8}.Debug|x86.Build.0 = Debug|Any CPU
+		{7EB7A926-6E68-4B7B-97D8-770AFAD785E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7EB7A926-6E68-4B7B-97D8-770AFAD785E8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7EB7A926-6E68-4B7B-97D8-770AFAD785E8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{7EB7A926-6E68-4B7B-97D8-770AFAD785E8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{7EB7A926-6E68-4B7B-97D8-770AFAD785E8}.Release|x86.ActiveCfg = Release|Any CPU
+		{7EB7A926-6E68-4B7B-97D8-770AFAD785E8}.Release|x86.Build.0 = Release|Any CPU
+		{BB14E7F3-16A5-42BC-9CFA-5913E11FF1CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BB14E7F3-16A5-42BC-9CFA-5913E11FF1CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BB14E7F3-16A5-42BC-9CFA-5913E11FF1CC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BB14E7F3-16A5-42BC-9CFA-5913E11FF1CC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BB14E7F3-16A5-42BC-9CFA-5913E11FF1CC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{BB14E7F3-16A5-42BC-9CFA-5913E11FF1CC}.Debug|x86.Build.0 = Debug|Any CPU
+		{BB14E7F3-16A5-42BC-9CFA-5913E11FF1CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BB14E7F3-16A5-42BC-9CFA-5913E11FF1CC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BB14E7F3-16A5-42BC-9CFA-5913E11FF1CC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{BB14E7F3-16A5-42BC-9CFA-5913E11FF1CC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{BB14E7F3-16A5-42BC-9CFA-5913E11FF1CC}.Release|x86.ActiveCfg = Release|Any CPU
+		{BB14E7F3-16A5-42BC-9CFA-5913E11FF1CC}.Release|x86.Build.0 = Release|Any CPU
+		{8D973121-CCE5-4A1E-98FE-320A46CBF711}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8D973121-CCE5-4A1E-98FE-320A46CBF711}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8D973121-CCE5-4A1E-98FE-320A46CBF711}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{8D973121-CCE5-4A1E-98FE-320A46CBF711}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8D973121-CCE5-4A1E-98FE-320A46CBF711}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8D973121-CCE5-4A1E-98FE-320A46CBF711}.Debug|x86.Build.0 = Debug|Any CPU
+		{8D973121-CCE5-4A1E-98FE-320A46CBF711}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8D973121-CCE5-4A1E-98FE-320A46CBF711}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8D973121-CCE5-4A1E-98FE-320A46CBF711}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{8D973121-CCE5-4A1E-98FE-320A46CBF711}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{8D973121-CCE5-4A1E-98FE-320A46CBF711}.Release|x86.ActiveCfg = Release|Any CPU
+		{8D973121-CCE5-4A1E-98FE-320A46CBF711}.Release|x86.Build.0 = Release|Any CPU
+		{F52387D9-A302-4902-B76E-17D9EE2C16A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F52387D9-A302-4902-B76E-17D9EE2C16A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F52387D9-A302-4902-B76E-17D9EE2C16A1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F52387D9-A302-4902-B76E-17D9EE2C16A1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F52387D9-A302-4902-B76E-17D9EE2C16A1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F52387D9-A302-4902-B76E-17D9EE2C16A1}.Debug|x86.Build.0 = Debug|Any CPU
+		{F52387D9-A302-4902-B76E-17D9EE2C16A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F52387D9-A302-4902-B76E-17D9EE2C16A1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F52387D9-A302-4902-B76E-17D9EE2C16A1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{F52387D9-A302-4902-B76E-17D9EE2C16A1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{F52387D9-A302-4902-B76E-17D9EE2C16A1}.Release|x86.ActiveCfg = Release|Any CPU
+		{F52387D9-A302-4902-B76E-17D9EE2C16A1}.Release|x86.Build.0 = Release|Any CPU
+		{926588E9-8EC0-4090-8F13-30F9513D5AAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{926588E9-8EC0-4090-8F13-30F9513D5AAD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{926588E9-8EC0-4090-8F13-30F9513D5AAD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{926588E9-8EC0-4090-8F13-30F9513D5AAD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{926588E9-8EC0-4090-8F13-30F9513D5AAD}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{926588E9-8EC0-4090-8F13-30F9513D5AAD}.Debug|x86.Build.0 = Debug|Any CPU
+		{926588E9-8EC0-4090-8F13-30F9513D5AAD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{926588E9-8EC0-4090-8F13-30F9513D5AAD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{926588E9-8EC0-4090-8F13-30F9513D5AAD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{926588E9-8EC0-4090-8F13-30F9513D5AAD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{926588E9-8EC0-4090-8F13-30F9513D5AAD}.Release|x86.ActiveCfg = Release|Any CPU
+		{926588E9-8EC0-4090-8F13-30F9513D5AAD}.Release|x86.Build.0 = Release|Any CPU
+		{EC89ADE7-9CD6-4F62-9814-186778C07C1F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EC89ADE7-9CD6-4F62-9814-186778C07C1F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EC89ADE7-9CD6-4F62-9814-186778C07C1F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{EC89ADE7-9CD6-4F62-9814-186778C07C1F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{EC89ADE7-9CD6-4F62-9814-186778C07C1F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{EC89ADE7-9CD6-4F62-9814-186778C07C1F}.Debug|x86.Build.0 = Debug|Any CPU
+		{EC89ADE7-9CD6-4F62-9814-186778C07C1F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EC89ADE7-9CD6-4F62-9814-186778C07C1F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EC89ADE7-9CD6-4F62-9814-186778C07C1F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{EC89ADE7-9CD6-4F62-9814-186778C07C1F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{EC89ADE7-9CD6-4F62-9814-186778C07C1F}.Release|x86.ActiveCfg = Release|Any CPU
+		{EC89ADE7-9CD6-4F62-9814-186778C07C1F}.Release|x86.Build.0 = Release|Any CPU
+		{E507C1A7-A301-4CC4-B8F8-96DFBF34A5E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E507C1A7-A301-4CC4-B8F8-96DFBF34A5E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E507C1A7-A301-4CC4-B8F8-96DFBF34A5E3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E507C1A7-A301-4CC4-B8F8-96DFBF34A5E3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E507C1A7-A301-4CC4-B8F8-96DFBF34A5E3}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E507C1A7-A301-4CC4-B8F8-96DFBF34A5E3}.Debug|x86.Build.0 = Debug|Any CPU
+		{E507C1A7-A301-4CC4-B8F8-96DFBF34A5E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E507C1A7-A301-4CC4-B8F8-96DFBF34A5E3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E507C1A7-A301-4CC4-B8F8-96DFBF34A5E3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{E507C1A7-A301-4CC4-B8F8-96DFBF34A5E3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{E507C1A7-A301-4CC4-B8F8-96DFBF34A5E3}.Release|x86.ActiveCfg = Release|Any CPU
+		{E507C1A7-A301-4CC4-B8F8-96DFBF34A5E3}.Release|x86.Build.0 = Release|Any CPU
+		{80F94B80-10E9-484B-9FC4-24F01CD0A59D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{80F94B80-10E9-484B-9FC4-24F01CD0A59D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{80F94B80-10E9-484B-9FC4-24F01CD0A59D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{80F94B80-10E9-484B-9FC4-24F01CD0A59D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{80F94B80-10E9-484B-9FC4-24F01CD0A59D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{80F94B80-10E9-484B-9FC4-24F01CD0A59D}.Debug|x86.Build.0 = Debug|Any CPU
+		{80F94B80-10E9-484B-9FC4-24F01CD0A59D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{80F94B80-10E9-484B-9FC4-24F01CD0A59D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{80F94B80-10E9-484B-9FC4-24F01CD0A59D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{80F94B80-10E9-484B-9FC4-24F01CD0A59D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{80F94B80-10E9-484B-9FC4-24F01CD0A59D}.Release|x86.ActiveCfg = Release|Any CPU
+		{80F94B80-10E9-484B-9FC4-24F01CD0A59D}.Release|x86.Build.0 = Release|Any CPU
+		{2FA999E4-8440-4ABD-8D79-EACC776B14D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2FA999E4-8440-4ABD-8D79-EACC776B14D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2FA999E4-8440-4ABD-8D79-EACC776B14D4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2FA999E4-8440-4ABD-8D79-EACC776B14D4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2FA999E4-8440-4ABD-8D79-EACC776B14D4}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2FA999E4-8440-4ABD-8D79-EACC776B14D4}.Debug|x86.Build.0 = Debug|Any CPU
+		{2FA999E4-8440-4ABD-8D79-EACC776B14D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2FA999E4-8440-4ABD-8D79-EACC776B14D4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2FA999E4-8440-4ABD-8D79-EACC776B14D4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{2FA999E4-8440-4ABD-8D79-EACC776B14D4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{2FA999E4-8440-4ABD-8D79-EACC776B14D4}.Release|x86.ActiveCfg = Release|Any CPU
+		{2FA999E4-8440-4ABD-8D79-EACC776B14D4}.Release|x86.Build.0 = Release|Any CPU
+		{E823D7AA-F298-4637-9D82-133C19CD7063}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E823D7AA-F298-4637-9D82-133C19CD7063}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E823D7AA-F298-4637-9D82-133C19CD7063}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E823D7AA-F298-4637-9D82-133C19CD7063}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E823D7AA-F298-4637-9D82-133C19CD7063}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E823D7AA-F298-4637-9D82-133C19CD7063}.Debug|x86.Build.0 = Debug|Any CPU
+		{E823D7AA-F298-4637-9D82-133C19CD7063}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E823D7AA-F298-4637-9D82-133C19CD7063}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E823D7AA-F298-4637-9D82-133C19CD7063}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{E823D7AA-F298-4637-9D82-133C19CD7063}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{E823D7AA-F298-4637-9D82-133C19CD7063}.Release|x86.ActiveCfg = Release|Any CPU
+		{E823D7AA-F298-4637-9D82-133C19CD7063}.Release|x86.Build.0 = Release|Any CPU
+		{656B084B-856D-46FE-8966-6EBFDA0C90BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{656B084B-856D-46FE-8966-6EBFDA0C90BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{656B084B-856D-46FE-8966-6EBFDA0C90BD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{656B084B-856D-46FE-8966-6EBFDA0C90BD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{656B084B-856D-46FE-8966-6EBFDA0C90BD}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{656B084B-856D-46FE-8966-6EBFDA0C90BD}.Debug|x86.Build.0 = Debug|Any CPU
+		{656B084B-856D-46FE-8966-6EBFDA0C90BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{656B084B-856D-46FE-8966-6EBFDA0C90BD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{656B084B-856D-46FE-8966-6EBFDA0C90BD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{656B084B-856D-46FE-8966-6EBFDA0C90BD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{656B084B-856D-46FE-8966-6EBFDA0C90BD}.Release|x86.ActiveCfg = Release|Any CPU
+		{656B084B-856D-46FE-8966-6EBFDA0C90BD}.Release|x86.Build.0 = Release|Any CPU
+		{04492A1A-EF58-4CA9-A0F4-FF35DF7604CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{04492A1A-EF58-4CA9-A0F4-FF35DF7604CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{04492A1A-EF58-4CA9-A0F4-FF35DF7604CE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{04492A1A-EF58-4CA9-A0F4-FF35DF7604CE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{04492A1A-EF58-4CA9-A0F4-FF35DF7604CE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{04492A1A-EF58-4CA9-A0F4-FF35DF7604CE}.Debug|x86.Build.0 = Debug|Any CPU
+		{04492A1A-EF58-4CA9-A0F4-FF35DF7604CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{04492A1A-EF58-4CA9-A0F4-FF35DF7604CE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{04492A1A-EF58-4CA9-A0F4-FF35DF7604CE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{04492A1A-EF58-4CA9-A0F4-FF35DF7604CE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{04492A1A-EF58-4CA9-A0F4-FF35DF7604CE}.Release|x86.ActiveCfg = Release|Any CPU
+		{04492A1A-EF58-4CA9-A0F4-FF35DF7604CE}.Release|x86.Build.0 = Release|Any CPU
+		{FD6F906C-4926-4F65-A183-81700C6BCDE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FD6F906C-4926-4F65-A183-81700C6BCDE9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FD6F906C-4926-4F65-A183-81700C6BCDE9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{FD6F906C-4926-4F65-A183-81700C6BCDE9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{FD6F906C-4926-4F65-A183-81700C6BCDE9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{FD6F906C-4926-4F65-A183-81700C6BCDE9}.Debug|x86.Build.0 = Debug|Any CPU
+		{FD6F906C-4926-4F65-A183-81700C6BCDE9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FD6F906C-4926-4F65-A183-81700C6BCDE9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FD6F906C-4926-4F65-A183-81700C6BCDE9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{FD6F906C-4926-4F65-A183-81700C6BCDE9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{FD6F906C-4926-4F65-A183-81700C6BCDE9}.Release|x86.ActiveCfg = Release|Any CPU
+		{FD6F906C-4926-4F65-A183-81700C6BCDE9}.Release|x86.Build.0 = Release|Any CPU
+		{36C22DEA-EFC4-4BC0-B1C6-C50D99146DC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{36C22DEA-EFC4-4BC0-B1C6-C50D99146DC6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{36C22DEA-EFC4-4BC0-B1C6-C50D99146DC6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{36C22DEA-EFC4-4BC0-B1C6-C50D99146DC6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{36C22DEA-EFC4-4BC0-B1C6-C50D99146DC6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{36C22DEA-EFC4-4BC0-B1C6-C50D99146DC6}.Debug|x86.Build.0 = Debug|Any CPU
+		{36C22DEA-EFC4-4BC0-B1C6-C50D99146DC6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{36C22DEA-EFC4-4BC0-B1C6-C50D99146DC6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{36C22DEA-EFC4-4BC0-B1C6-C50D99146DC6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{36C22DEA-EFC4-4BC0-B1C6-C50D99146DC6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{36C22DEA-EFC4-4BC0-B1C6-C50D99146DC6}.Release|x86.ActiveCfg = Release|Any CPU
+		{36C22DEA-EFC4-4BC0-B1C6-C50D99146DC6}.Release|x86.Build.0 = Release|Any CPU
+		{DDF72F95-F556-4918-8243-AF2284BD2302}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DDF72F95-F556-4918-8243-AF2284BD2302}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DDF72F95-F556-4918-8243-AF2284BD2302}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{DDF72F95-F556-4918-8243-AF2284BD2302}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{DDF72F95-F556-4918-8243-AF2284BD2302}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DDF72F95-F556-4918-8243-AF2284BD2302}.Debug|x86.Build.0 = Debug|Any CPU
+		{DDF72F95-F556-4918-8243-AF2284BD2302}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DDF72F95-F556-4918-8243-AF2284BD2302}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DDF72F95-F556-4918-8243-AF2284BD2302}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{DDF72F95-F556-4918-8243-AF2284BD2302}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{DDF72F95-F556-4918-8243-AF2284BD2302}.Release|x86.ActiveCfg = Release|Any CPU
+		{DDF72F95-F556-4918-8243-AF2284BD2302}.Release|x86.Build.0 = Release|Any CPU
+		{8F724554-E7EF-48D2-B27B-00C238078EAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8F724554-E7EF-48D2-B27B-00C238078EAF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8F724554-E7EF-48D2-B27B-00C238078EAF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{8F724554-E7EF-48D2-B27B-00C238078EAF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8F724554-E7EF-48D2-B27B-00C238078EAF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8F724554-E7EF-48D2-B27B-00C238078EAF}.Debug|x86.Build.0 = Debug|Any CPU
+		{8F724554-E7EF-48D2-B27B-00C238078EAF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8F724554-E7EF-48D2-B27B-00C238078EAF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8F724554-E7EF-48D2-B27B-00C238078EAF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{8F724554-E7EF-48D2-B27B-00C238078EAF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{8F724554-E7EF-48D2-B27B-00C238078EAF}.Release|x86.ActiveCfg = Release|Any CPU
+		{8F724554-E7EF-48D2-B27B-00C238078EAF}.Release|x86.Build.0 = Release|Any CPU
+		{2906BF70-82BE-4427-870A-E87281D01008}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2906BF70-82BE-4427-870A-E87281D01008}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2906BF70-82BE-4427-870A-E87281D01008}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2906BF70-82BE-4427-870A-E87281D01008}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2906BF70-82BE-4427-870A-E87281D01008}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2906BF70-82BE-4427-870A-E87281D01008}.Debug|x86.Build.0 = Debug|Any CPU
+		{2906BF70-82BE-4427-870A-E87281D01008}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2906BF70-82BE-4427-870A-E87281D01008}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2906BF70-82BE-4427-870A-E87281D01008}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{2906BF70-82BE-4427-870A-E87281D01008}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{2906BF70-82BE-4427-870A-E87281D01008}.Release|x86.ActiveCfg = Release|Any CPU
+		{2906BF70-82BE-4427-870A-E87281D01008}.Release|x86.Build.0 = Release|Any CPU
+		{9D96CF0B-9E2B-4A99-9859-417FC96FE69C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9D96CF0B-9E2B-4A99-9859-417FC96FE69C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9D96CF0B-9E2B-4A99-9859-417FC96FE69C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9D96CF0B-9E2B-4A99-9859-417FC96FE69C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9D96CF0B-9E2B-4A99-9859-417FC96FE69C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9D96CF0B-9E2B-4A99-9859-417FC96FE69C}.Debug|x86.Build.0 = Debug|Any CPU
+		{9D96CF0B-9E2B-4A99-9859-417FC96FE69C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9D96CF0B-9E2B-4A99-9859-417FC96FE69C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9D96CF0B-9E2B-4A99-9859-417FC96FE69C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{9D96CF0B-9E2B-4A99-9859-417FC96FE69C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{9D96CF0B-9E2B-4A99-9859-417FC96FE69C}.Release|x86.ActiveCfg = Release|Any CPU
+		{9D96CF0B-9E2B-4A99-9859-417FC96FE69C}.Release|x86.Build.0 = Release|Any CPU
+		{F49A6E01-BFC5-4CEB-9A2C-19DDD3539510}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F49A6E01-BFC5-4CEB-9A2C-19DDD3539510}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F49A6E01-BFC5-4CEB-9A2C-19DDD3539510}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F49A6E01-BFC5-4CEB-9A2C-19DDD3539510}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F49A6E01-BFC5-4CEB-9A2C-19DDD3539510}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F49A6E01-BFC5-4CEB-9A2C-19DDD3539510}.Debug|x86.Build.0 = Debug|Any CPU
+		{F49A6E01-BFC5-4CEB-9A2C-19DDD3539510}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F49A6E01-BFC5-4CEB-9A2C-19DDD3539510}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F49A6E01-BFC5-4CEB-9A2C-19DDD3539510}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{F49A6E01-BFC5-4CEB-9A2C-19DDD3539510}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{F49A6E01-BFC5-4CEB-9A2C-19DDD3539510}.Release|x86.ActiveCfg = Release|Any CPU
+		{F49A6E01-BFC5-4CEB-9A2C-19DDD3539510}.Release|x86.Build.0 = Release|Any CPU
+		{0CE75D4A-4EFD-434A-99CD-7776AE2BFD39}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0CE75D4A-4EFD-434A-99CD-7776AE2BFD39}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0CE75D4A-4EFD-434A-99CD-7776AE2BFD39}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0CE75D4A-4EFD-434A-99CD-7776AE2BFD39}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0CE75D4A-4EFD-434A-99CD-7776AE2BFD39}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0CE75D4A-4EFD-434A-99CD-7776AE2BFD39}.Debug|x86.Build.0 = Debug|Any CPU
+		{0CE75D4A-4EFD-434A-99CD-7776AE2BFD39}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0CE75D4A-4EFD-434A-99CD-7776AE2BFD39}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0CE75D4A-4EFD-434A-99CD-7776AE2BFD39}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{0CE75D4A-4EFD-434A-99CD-7776AE2BFD39}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{0CE75D4A-4EFD-434A-99CD-7776AE2BFD39}.Release|x86.ActiveCfg = Release|Any CPU
+		{0CE75D4A-4EFD-434A-99CD-7776AE2BFD39}.Release|x86.Build.0 = Release|Any CPU
+		{2FFB927A-C039-4A1F-83A5-CBBB664A0E81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2FFB927A-C039-4A1F-83A5-CBBB664A0E81}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2FFB927A-C039-4A1F-83A5-CBBB664A0E81}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2FFB927A-C039-4A1F-83A5-CBBB664A0E81}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2FFB927A-C039-4A1F-83A5-CBBB664A0E81}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2FFB927A-C039-4A1F-83A5-CBBB664A0E81}.Debug|x86.Build.0 = Debug|Any CPU
+		{2FFB927A-C039-4A1F-83A5-CBBB664A0E81}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2FFB927A-C039-4A1F-83A5-CBBB664A0E81}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2FFB927A-C039-4A1F-83A5-CBBB664A0E81}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{2FFB927A-C039-4A1F-83A5-CBBB664A0E81}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{2FFB927A-C039-4A1F-83A5-CBBB664A0E81}.Release|x86.ActiveCfg = Release|Any CPU
+		{2FFB927A-C039-4A1F-83A5-CBBB664A0E81}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{079EFA1F-0B0A-4853-B27B-5780D111CD85} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E}
-		{314E9AD6-2FFC-4A92-A8AD-510658C64F1E} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E}
-		{C48DA9D7-ACB5-4408-AA79-27ECB60A67EF} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E}
-		{3F6E355E-4869-41D9-943B-D54771221A7F} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
-		{A8AA326E-8EE8-4F11-B750-23028E0949D7} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
 		{16703B76-C9F7-4C75-AE6C-53D92E308E3C} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
-		{323D0C04-B518-4A8F-8A8E-3546AD153D34} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
 		{34DF1487-12C6-476C-BE0A-F31DF1939AE5} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C}
 		{42CDBF4A-E238-4C0F-A416-44588363EB4C} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C}
-		{5F945B82-FE5F-425C-956C-8BC2F2020254} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
 		{B07CAF59-11ED-40E3-A5DB-E1178F84FA78} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C}
 		{62735776-46FF-4170-9392-02E128A69B89} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C}
 		{61061528-071E-424E-965A-07BCC2F02672} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C}
@@ -1624,52 +1656,26 @@ Global
 		{6DB9B8D0-80F7-4E70-BBB0-0B4C04D79A47} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C}
 		{0EF9860B-10D7-452F-B0F4-A405B88BEBB3} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C}
 		{CAE52CB7-0FAC-4B5B-8251-B0FF837DB657} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C}
-		{B2347320-308E-4D2B-AEC8-005DFA68B0C9} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E}
-		{860119ED-3DB1-424D-8D0A-30132A8A7D96} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
 		{920F8A0E-6F7D-4BBE-84FF-840B89099BE6} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C}
 		{AD545A5B-2BA5-4314-88AC-FC2ACF2CC718} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C}
 		{C3123A70-41C4-4122-AD1C-D35DF8958DD7} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C}
 		{983741B2-4424-4ED1-9B03-7675A67230C8} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C}
 		{551DC89E-2A13-4CF2-83D7-1ADD802443D5} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C}
-		{F504357E-C2E1-4818-BA5C-9A2EAC25FEE5} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
 		{94BA134D-04B3-48AA-BA55-5A4DB8640F2D} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C}
-		{864FA09D-1E48-403A-A6C8-4F079D2A30F0} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
-		{1154203C-7579-4525-906E-BC55268421C1} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E}
-		{A2B72833-5D70-4C42-AE85-E0319926FB8A} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E}
-		{4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
-		{DA000953-7532-4DF5-8DB9-8143DF98D999} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
-		{3F8B8FC1-9FE4-4788-8991-367113E8D7AD} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E}
-		{3FC8D9D6-9352-43A3-8E81-422F270085B7} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E}
-		{42C81540-CD47-4C68-A7A3-2A93B9C3B210} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E}
-		{493780DA-E696-40FF-BD12-4A5C5736F292} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
-		{22019146-BDFA-442E-8C8E-345FB9644578} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
-		{9A07EEA2-942E-4969-9D41-799B6E2D1FF5} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E}
-		{2DD786CA-7AF7-437A-B499-801A589B9A1C} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E}
-		{6BB4C20B-24C0-45D6-9E4C-C2620959BDD5} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
-		{827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
-		{60873DFA-97B9-419E-BAA3-940FC9B07085} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
-		{50893B10-5735-4F35-9995-F81DA3F0189E} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E}
-		{8FC726B5-E766-44E0-8B38-1313B6D8D9A7} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
-		{9879B5D5-2325-4A81-B4DF-F279FE8FEEB4} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
 		{14ED4476-9F24-4776-8417-EA6927F6C9C9} = {DAAE4C74-D06F-4874-A166-33305D2643CE}
 		{396B40D7-AC70-49A7-B33C-ED42129FEBE3} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C}
 		{D28CAC79-7004-4B69-993B-EDEB4653BFA8} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C}
-		{CF322BE1-E1FE-4CFD-8FCA-16A14B905D53} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E}
-		{0AB46520-F441-4E01-B444-08F4D23F8B1B} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
 		{4BA6EC9A-B6D9-41F2-BFDA-D82B22D80352} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C}
 		{F16CEE0D-A28E-43BD-802F-99BAFE4BA7CE} = {FDC66952-A3EA-4074-899E-C29816BF7C1F}
-		{7500B228-1769-4CFB-A571-3DFAC6678A06} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E}
 		{BF8A3392-C3D2-4813-855A-E906564600E1} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C}
 		{8916DDCA-EC2A-4193-B9F3-78CAA1A96D5A} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C}
-		{87A3E227-C45E-4141-A59F-402908E651FD} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E}
-		{E3E09D2F-1FCF-4396-9B09-5A62CA8CC831} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
+		{87A3E227-C45E-4141-A59F-402908E651FD} = {D43C3904-2B2E-4572-99CC-7CB4615A4CD3}
+		{E3E09D2F-1FCF-4396-9B09-5A62CA8CC831} = {D43C3904-2B2E-4572-99CC-7CB4615A4CD3}
 		{17122147-ADFD-41C8-87D9-CCC582CCA8F9} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C}
-		{51E3E785-A9D1-4196-BAFE-A17FF4304B89} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
-		{DD7B9F20-354C-4D9E-8C8A-8AE6E7595A87} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
-		{3B550487-10E4-4E6D-9CEF-B1B4CA1253DA} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E}
-		{4EDC489F-3EC5-4AE3-9841-A285F40F5FF6} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E}
-		{2F683CF8-B055-46AE-BF83-9D1307F8D45F} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E}
-		{34E3C302-B767-40C8-B538-3EE2BD4000C4} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E}
+		{51E3E785-A9D1-4196-BAFE-A17FF4304B89} = {75A3249D-E8DB-42F1-9B4E-1DCC662856A0}
+		{DD7B9F20-354C-4D9E-8C8A-8AE6E7595A87} = {49887FD5-2E52-4567-929E-9151DC88E4D4}
+		{3B550487-10E4-4E6D-9CEF-B1B4CA1253DA} = {49887FD5-2E52-4567-929E-9151DC88E4D4}
+		{34E3C302-B767-40C8-B538-3EE2BD4000C4} = {62CF82C1-B75D-4041-A7E9-EF39FF7B885F}
 		{0930C2EA-FA36-4EDF-A571-215765D1F2C7} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
 		{A273BAAB-DA92-401D-B781-ADA9E3B7717C} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
 		{E07B7D3A-1D4D-4644-84C2-06FEDB64885B} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
@@ -1694,7 +1700,7 @@ Global
 		{1348A3AB-8401-4DAE-90CC-A5907ED52A36} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
 		{1C4D389D-F3BB-4328-A730-E3CC2F5D8B1B} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
 		{94A04746-8698-4DEF-BCFC-8BA2D3F8A451} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
-		{0CA44B59-6538-4668-BB5E-D586946426F3} = {FDC66952-A3EA-4074-899E-C29816BF7C1F}
+		{0CA44B59-6538-4668-BB5E-D586946426F3} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
 		{0F41EB10-BD4E-443C-868B-95109F0843E0} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
 		{68C06221-185E-41E3-B2C8-B4A1B3D20631} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
 		{9C584DF9-CDF2-4522-A0A5-55AAE36820EC} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
@@ -1717,10 +1723,41 @@ Global
 		{848E2620-EAF9-4BFD-8810-4AF71E09A8FB} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
 		{C75C6E51-4FFD-4902-8739-9109E51875B4} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
 		{D9BE3E50-5CE8-4D8D-BA19-AA219D009752} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C}
-		{F2D4A859-7B84-403E-9745-01032EC705C5} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E}
-		{23A6033D-2AA6-4629-BC1B-14694E3794FF} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
 		{69E18B21-E4B9-4866-ABDA-3C2D9664D24C} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
-		{7B35EA78-7D47-4AFA-982C-899E7C55CBF1} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E}
+		{39D6EF6C-6447-41ED-B8F3-F2D61C40B848} = {F34AEDAF-43B2-499D-98A1-1E2910C38D06}
+		{4BFD08A5-678D-473A-BA94-D2EE1BAC3297} = {F34AEDAF-43B2-499D-98A1-1E2910C38D06}
+		{AE2F658D-40AB-426D-A595-CF62130619A4} = {A9DB755B-C3B9-4C61-9DB8-8994F3719823}
+		{F3DC0845-ED54-457F-AAAA-7CEE04E6408F} = {A9DB755B-C3B9-4C61-9DB8-8994F3719823}
+		{0EAA75EF-8AF6-4FA4-8148-CA93CC280214} = {BFE129DA-E9C4-4C01-A9B5-497B580A82AE}
+		{D35B7C96-72AB-4FE0-B6E0-0BBB5768F79E} = {BFE129DA-E9C4-4C01-A9B5-497B580A82AE}
+		{527B9345-18B4-4F86-B649-20C87B8E0CCF} = {5F0CA71A-F66C-4CBB-A1B3-F722604F1DF3}
+		{1205911F-2257-4B96-BE06-8EED94971802} = {5F0CA71A-F66C-4CBB-A1B3-F722604F1DF3}
+		{36710582-0138-4C05-BA8F-0EAC1FCB5F0A} = {AD36DD83-D7DA-4CCE-BA06-15B0F15EECAE}
+		{9FA55001-CBE6-497E-B0B9-EAF3732B249A} = {AD36DD83-D7DA-4CCE-BA06-15B0F15EECAE}
+		{DB0203AB-3DAA-412D-9BDE-28DFB95955C9} = {986DBF1A-50CE-43E7-985C-620173868471}
+		{19422AC5-68A0-4973-81EE-968E07FC8F3B} = {986DBF1A-50CE-43E7-985C-620173868471}
+		{CB0E0224-C20F-448B-9659-B65BCF8513E2} = {15162260-8660-42FA-A883-5F5DEF7EA42B}
+		{7EB7A926-6E68-4B7B-97D8-770AFAD785E8} = {AFC973E5-41B2-450D-BB44-C463B667105C}
+		{BB14E7F3-16A5-42BC-9CFA-5913E11FF1CC} = {AFC973E5-41B2-450D-BB44-C463B667105C}
+		{8D973121-CCE5-4A1E-98FE-320A46CBF711} = {1B6A26FB-F90D-492A-A7D0-D15A68C7D91E}
+		{F52387D9-A302-4902-B76E-17D9EE2C16A1} = {1B6A26FB-F90D-492A-A7D0-D15A68C7D91E}
+		{926588E9-8EC0-4090-8F13-30F9513D5AAD} = {20558003-24FB-46DA-B461-942299891598}
+		{EC89ADE7-9CD6-4F62-9814-186778C07C1F} = {20558003-24FB-46DA-B461-942299891598}
+		{E507C1A7-A301-4CC4-B8F8-96DFBF34A5E3} = {4A9B03C7-566C-4BD1-BF2C-9DB652497359}
+		{80F94B80-10E9-484B-9FC4-24F01CD0A59D} = {4A9B03C7-566C-4BD1-BF2C-9DB652497359}
+		{2FA999E4-8440-4ABD-8D79-EACC776B14D4} = {459F92E4-34AA-49B8-9F91-0361BC8E2147}
+		{E823D7AA-F298-4637-9D82-133C19CD7063} = {459F92E4-34AA-49B8-9F91-0361BC8E2147}
+		{656B084B-856D-46FE-8966-6EBFDA0C90BD} = {20BBA1DE-12BA-4D09-8878-308868B103B1}
+		{04492A1A-EF58-4CA9-A0F4-FF35DF7604CE} = {20BBA1DE-12BA-4D09-8878-308868B103B1}
+		{FD6F906C-4926-4F65-A183-81700C6BCDE9} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
+		{36C22DEA-EFC4-4BC0-B1C6-C50D99146DC6} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
+		{DDF72F95-F556-4918-8243-AF2284BD2302} = {75A3249D-E8DB-42F1-9B4E-1DCC662856A0}
+		{8F724554-E7EF-48D2-B27B-00C238078EAF} = {FDCA02D4-871E-4255-AC53-12CDF1D5B510}
+		{2906BF70-82BE-4427-870A-E87281D01008} = {75A3249D-E8DB-42F1-9B4E-1DCC662856A0}
+		{9D96CF0B-9E2B-4A99-9859-417FC96FE69C} = {25C08DED-1C7D-4C6D-B1CC-F340C1B21DE7}
+		{F49A6E01-BFC5-4CEB-9A2C-19DDD3539510} = {25C08DED-1C7D-4C6D-B1CC-F340C1B21DE7}
+		{0CE75D4A-4EFD-434A-99CD-7776AE2BFD39} = {1261FF02-C7F8-4395-AA8A-29F69FC9870B}
+		{2FFB927A-C039-4A1F-83A5-CBBB664A0E81} = {1261FF02-C7F8-4395-AA8A-29F69FC9870B}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {63D344F6-F86D-40E6-85B9-0AABBE338C4A}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc/DesignTimeMvcServiceCollectionProvider.cs b/src/Mvc/Mvc/src/DesignTimeMvcServiceCollectionProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc/DesignTimeMvcServiceCollectionProvider.cs
rename to src/Mvc/Mvc/src/DesignTimeMvcServiceCollectionProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc/Microsoft.AspNetCore.Mvc.csproj b/src/Mvc/Mvc/src/Microsoft.AspNetCore.Mvc.csproj
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc/Microsoft.AspNetCore.Mvc.csproj
rename to src/Mvc/Mvc/src/Microsoft.AspNetCore.Mvc.csproj
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc/MvcServiceCollectionExtensions.cs b/src/Mvc/Mvc/src/MvcServiceCollectionExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc/MvcServiceCollectionExtensions.cs
rename to src/Mvc/Mvc/src/MvcServiceCollectionExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc/Properties/AssemblyInfo.cs b/src/Mvc/Mvc/src/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc/Properties/AssemblyInfo.cs
rename to src/Mvc/Mvc/src/Properties/AssemblyInfo.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc/baseline.netcore.json b/src/Mvc/Mvc/src/baseline.netcore.json
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc/baseline.netcore.json
rename to src/Mvc/Mvc/src/baseline.netcore.json
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Test/ApplicationParts/ApplicationAssembliesProviderTest.cs b/src/Mvc/Mvc/test/ApplicationParts/ApplicationAssembliesProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Test/ApplicationParts/ApplicationAssembliesProviderTest.cs
rename to src/Mvc/Mvc/test/ApplicationParts/ApplicationAssembliesProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Test/Microsoft.AspNetCore.Mvc.Test.csproj b/src/Mvc/Mvc/test/Microsoft.AspNetCore.Mvc.Test.csproj
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Test/Microsoft.AspNetCore.Mvc.Test.csproj
rename to src/Mvc/Mvc/test/Microsoft.AspNetCore.Mvc.Test.csproj
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Test/MvcOptionsSetupTest.cs b/src/Mvc/Mvc/test/MvcOptionsSetupTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Test/MvcOptionsSetupTest.cs
rename to src/Mvc/Mvc/test/MvcOptionsSetupTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Test/MvcServiceCollectionExtensionsTest.cs b/src/Mvc/Mvc/test/MvcServiceCollectionExtensionsTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Test/MvcServiceCollectionExtensionsTest.cs
rename to src/Mvc/Mvc/test/MvcServiceCollectionExtensionsTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Test/Routing/ActionConstraintMatcherPolicyTest.cs b/src/Mvc/Mvc/test/Routing/ActionConstraintMatcherPolicyTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Test/Routing/ActionConstraintMatcherPolicyTest.cs
rename to src/Mvc/Mvc/test/Routing/ActionConstraintMatcherPolicyTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Test/xunit.runner.json b/src/Mvc/Mvc/test/xunit.runner.json
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Test/xunit.runner.json
rename to src/Mvc/Mvc/test/xunit.runner.json
diff --git a/src/Mvc/test/MvcTests.ruleset b/src/Mvc/MvcTests.ruleset
similarity index 100%
rename from src/Mvc/test/MvcTests.ruleset
rename to src/Mvc/MvcTests.ruleset
diff --git a/src/Mvc/src/dotnet-getdocument/Commands/InvokeCommand.cs b/src/Mvc/dotnet-getdocument/src/Commands/InvokeCommand.cs
similarity index 100%
rename from src/Mvc/src/dotnet-getdocument/Commands/InvokeCommand.cs
rename to src/Mvc/dotnet-getdocument/src/Commands/InvokeCommand.cs
diff --git a/src/Mvc/src/dotnet-getdocument/Exe.cs b/src/Mvc/dotnet-getdocument/src/Exe.cs
similarity index 100%
rename from src/Mvc/src/dotnet-getdocument/Exe.cs
rename to src/Mvc/dotnet-getdocument/src/Exe.cs
diff --git a/src/Mvc/src/dotnet-getdocument/Program.cs b/src/Mvc/dotnet-getdocument/src/Program.cs
similarity index 100%
rename from src/Mvc/src/dotnet-getdocument/Program.cs
rename to src/Mvc/dotnet-getdocument/src/Program.cs
diff --git a/src/Mvc/src/dotnet-getdocument/Project.cs b/src/Mvc/dotnet-getdocument/src/Project.cs
similarity index 100%
rename from src/Mvc/src/dotnet-getdocument/Project.cs
rename to src/Mvc/dotnet-getdocument/src/Project.cs
diff --git a/src/Mvc/src/dotnet-getdocument/ProjectOptions.cs b/src/Mvc/dotnet-getdocument/src/ProjectOptions.cs
similarity index 100%
rename from src/Mvc/src/dotnet-getdocument/ProjectOptions.cs
rename to src/Mvc/dotnet-getdocument/src/ProjectOptions.cs
diff --git a/src/Mvc/src/dotnet-getdocument/Properties/Resources.Designer.cs b/src/Mvc/dotnet-getdocument/src/Properties/Resources.Designer.cs
similarity index 100%
rename from src/Mvc/src/dotnet-getdocument/Properties/Resources.Designer.cs
rename to src/Mvc/dotnet-getdocument/src/Properties/Resources.Designer.cs
diff --git a/src/Mvc/src/dotnet-getdocument/Resources.resx b/src/Mvc/dotnet-getdocument/src/Resources.resx
similarity index 100%
rename from src/Mvc/src/dotnet-getdocument/Resources.resx
rename to src/Mvc/dotnet-getdocument/src/Resources.resx
diff --git a/src/Mvc/src/dotnet-getdocument/ServiceProjectReferenceMetadata.targets b/src/Mvc/dotnet-getdocument/src/ServiceProjectReferenceMetadata.targets
similarity index 100%
rename from src/Mvc/src/dotnet-getdocument/ServiceProjectReferenceMetadata.targets
rename to src/Mvc/dotnet-getdocument/src/ServiceProjectReferenceMetadata.targets
diff --git a/src/Mvc/src/dotnet-getdocument/dotnet-getdocument.csproj b/src/Mvc/dotnet-getdocument/src/dotnet-getdocument.csproj
similarity index 56%
rename from src/Mvc/src/dotnet-getdocument/dotnet-getdocument.csproj
rename to src/Mvc/dotnet-getdocument/src/dotnet-getdocument.csproj
index a0cbaa6851..d32ab07a30 100644
--- a/src/Mvc/src/dotnet-getdocument/dotnet-getdocument.csproj
+++ b/src/Mvc/dotnet-getdocument/src/dotnet-getdocument.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AssemblyName>dotnet-getdocument</AssemblyName>
     <Description>GetDocument Command-line Tool outside man</Description>
@@ -15,13 +15,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="../GetDocumentInsider/Ansi*.cs" />
-    <Compile Include="../GetDocumentInsider/CommandException.cs" />
-    <Compile Include="../GetDocumentInsider/CommandLineUtils/*.cs" LinkBase="CommandLineUtils" />
-    <Compile Include="../GetDocumentInsider/Commands/CommandBase.cs" Link="Commands/CommandBase.cs" />
-    <Compile Include="../GetDocumentInsider/Commands/HelpCommandBase.cs" Link="Commands/HelpCommandBase.cs" />
-    <Compile Include="../GetDocumentInsider/ProductInfo.cs" />
-    <Compile Include="../GetDocumentInsider/Reporter.cs" />
+    <Compile Include="../../GetDocumentInsider/src/Ansi*.cs" />
+    <Compile Include="../../GetDocumentInsider/src/CommandException.cs" />
+    <Compile Include="../../GetDocumentInsider/src/CommandLineUtils/*.cs" LinkBase="CommandLineUtils" />
+    <Compile Include="../../GetDocumentInsider/src/Commands/CommandBase.cs" Link="Commands/CommandBase.cs" />
+    <Compile Include="../../GetDocumentInsider/src/Commands/HelpCommandBase.cs" Link="Commands/HelpCommandBase.cs" />
+    <Compile Include="../../GetDocumentInsider/src/ProductInfo.cs" />
+    <Compile Include="../../GetDocumentInsider/src/Reporter.cs" />
 
     <EmbeddedResource Include="ServiceProjectReferenceMetadata.targets" />
 
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/ActivityReplacer.cs b/src/Mvc/shared/Mvc.Core.TestCommon/ActivityReplacer.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/ActivityReplacer.cs
rename to src/Mvc/shared/Mvc.Core.TestCommon/ActivityReplacer.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/CommonFilterTest.cs b/src/Mvc/shared/Mvc.Core.TestCommon/CommonFilterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/CommonFilterTest.cs
rename to src/Mvc/shared/Mvc.Core.TestCommon/CommonFilterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/CommonResourceInvokerTest.cs b/src/Mvc/shared/Mvc.Core.TestCommon/CommonResourceInvokerTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/CommonResourceInvokerTest.cs
rename to src/Mvc/shared/Mvc.Core.TestCommon/CommonResourceInvokerTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/LinkBuilder.cs b/src/Mvc/shared/Mvc.Core.TestCommon/LinkBuilder.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/LinkBuilder.cs
rename to src/Mvc/shared/Mvc.Core.TestCommon/LinkBuilder.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/MediaTypeAssert.cs b/src/Mvc/shared/Mvc.Core.TestCommon/MediaTypeAssert.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/MediaTypeAssert.cs
rename to src/Mvc/shared/Mvc.Core.TestCommon/MediaTypeAssert.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/Microsoft.AspNetCore.Mvc.Core.TestCommon.csproj b/src/Mvc/shared/Mvc.Core.TestCommon/Microsoft.AspNetCore.Mvc.Core.TestCommon.csproj
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/Microsoft.AspNetCore.Mvc.Core.TestCommon.csproj
rename to src/Mvc/shared/Mvc.Core.TestCommon/Microsoft.AspNetCore.Mvc.Core.TestCommon.csproj
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/NonSeekableReadableStream.cs b/src/Mvc/shared/Mvc.Core.TestCommon/NonSeekableReadableStream.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/NonSeekableReadableStream.cs
rename to src/Mvc/shared/Mvc.Core.TestCommon/NonSeekableReadableStream.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/RoutingResult.cs b/src/Mvc/shared/Mvc.Core.TestCommon/RoutingResult.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/RoutingResult.cs
rename to src/Mvc/shared/Mvc.Core.TestCommon/RoutingResult.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/SimpleValueProvider.cs b/src/Mvc/shared/Mvc.Core.TestCommon/SimpleValueProvider.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/SimpleValueProvider.cs
rename to src/Mvc/shared/Mvc.Core.TestCommon/SimpleValueProvider.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/SimpleValueProviderFactory.cs b/src/Mvc/shared/Mvc.Core.TestCommon/SimpleValueProviderFactory.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/SimpleValueProviderFactory.cs
rename to src/Mvc/shared/Mvc.Core.TestCommon/SimpleValueProviderFactory.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/TestClientModelValidatorProvider.cs b/src/Mvc/shared/Mvc.Core.TestCommon/TestClientModelValidatorProvider.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/TestClientModelValidatorProvider.cs
rename to src/Mvc/shared/Mvc.Core.TestCommon/TestClientModelValidatorProvider.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/TestHttpRequestStreamReaderFactory.cs b/src/Mvc/shared/Mvc.Core.TestCommon/TestHttpRequestStreamReaderFactory.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/TestHttpRequestStreamReaderFactory.cs
rename to src/Mvc/shared/Mvc.Core.TestCommon/TestHttpRequestStreamReaderFactory.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/TestHttpResponseStreamWriterFactory.cs b/src/Mvc/shared/Mvc.Core.TestCommon/TestHttpResponseStreamWriterFactory.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/TestHttpResponseStreamWriterFactory.cs
rename to src/Mvc/shared/Mvc.Core.TestCommon/TestHttpResponseStreamWriterFactory.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/TestModelBinderFactory.cs b/src/Mvc/shared/Mvc.Core.TestCommon/TestModelBinderFactory.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/TestModelBinderFactory.cs
rename to src/Mvc/shared/Mvc.Core.TestCommon/TestModelBinderFactory.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/TestModelMetadataProvider.cs b/src/Mvc/shared/Mvc.Core.TestCommon/TestModelMetadataProvider.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/TestModelMetadataProvider.cs
rename to src/Mvc/shared/Mvc.Core.TestCommon/TestModelMetadataProvider.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/TestModelValidatorProvider.cs b/src/Mvc/shared/Mvc.Core.TestCommon/TestModelValidatorProvider.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/TestModelValidatorProvider.cs
rename to src/Mvc/shared/Mvc.Core.TestCommon/TestModelValidatorProvider.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/ValidationAttributeUtil.cs b/src/Mvc/shared/Mvc.Core.TestCommon/ValidationAttributeUtil.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/ValidationAttributeUtil.cs
rename to src/Mvc/shared/Mvc.Core.TestCommon/ValidationAttributeUtil.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyActionContext.cs b/src/Mvc/shared/Mvc.TestDiagnosticListener/IProxyActionContext.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyActionContext.cs
rename to src/Mvc/shared/Mvc.TestDiagnosticListener/IProxyActionContext.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyActionDescriptor.cs b/src/Mvc/shared/Mvc.TestDiagnosticListener/IProxyActionDescriptor.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyActionDescriptor.cs
rename to src/Mvc/shared/Mvc.TestDiagnosticListener/IProxyActionDescriptor.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyActionResult.cs b/src/Mvc/shared/Mvc.TestDiagnosticListener/IProxyActionResult.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyActionResult.cs
rename to src/Mvc/shared/Mvc.TestDiagnosticListener/IProxyActionResult.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyHttpContext.cs b/src/Mvc/shared/Mvc.TestDiagnosticListener/IProxyHttpContext.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyHttpContext.cs
rename to src/Mvc/shared/Mvc.TestDiagnosticListener/IProxyHttpContext.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyPage.cs b/src/Mvc/shared/Mvc.TestDiagnosticListener/IProxyPage.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyPage.cs
rename to src/Mvc/shared/Mvc.TestDiagnosticListener/IProxyPage.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyRouteData.cs b/src/Mvc/shared/Mvc.TestDiagnosticListener/IProxyRouteData.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyRouteData.cs
rename to src/Mvc/shared/Mvc.TestDiagnosticListener/IProxyRouteData.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyView.cs b/src/Mvc/shared/Mvc.TestDiagnosticListener/IProxyView.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyView.cs
rename to src/Mvc/shared/Mvc.TestDiagnosticListener/IProxyView.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyViewComponentContext.cs b/src/Mvc/shared/Mvc.TestDiagnosticListener/IProxyViewComponentContext.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyViewComponentContext.cs
rename to src/Mvc/shared/Mvc.TestDiagnosticListener/IProxyViewComponentContext.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyViewComponentResult.cs b/src/Mvc/shared/Mvc.TestDiagnosticListener/IProxyViewComponentResult.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyViewComponentResult.cs
rename to src/Mvc/shared/Mvc.TestDiagnosticListener/IProxyViewComponentResult.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyViewContext.cs b/src/Mvc/shared/Mvc.TestDiagnosticListener/IProxyViewContext.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyViewContext.cs
rename to src/Mvc/shared/Mvc.TestDiagnosticListener/IProxyViewContext.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/Microsoft.AspNetCore.Mvc.TestDiagnosticListener.csproj b/src/Mvc/shared/Mvc.TestDiagnosticListener/Microsoft.AspNetCore.Mvc.TestDiagnosticListener.csproj
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/Microsoft.AspNetCore.Mvc.TestDiagnosticListener.csproj
rename to src/Mvc/shared/Mvc.TestDiagnosticListener/Microsoft.AspNetCore.Mvc.TestDiagnosticListener.csproj
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/TestDiagnosticListener.cs b/src/Mvc/shared/Mvc.TestDiagnosticListener/TestDiagnosticListener.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/TestDiagnosticListener.cs
rename to src/Mvc/shared/Mvc.TestDiagnosticListener/TestDiagnosticListener.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Views.TestCommon/HtmlContentUtilities.cs b/src/Mvc/shared/Mvc.Views.TestCommon/HtmlContentUtilities.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Views.TestCommon/HtmlContentUtilities.cs
rename to src/Mvc/shared/Mvc.Views.TestCommon/HtmlContentUtilities.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Views.TestCommon/HtmlGeneratorUtilities.cs b/src/Mvc/shared/Mvc.Views.TestCommon/HtmlGeneratorUtilities.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Views.TestCommon/HtmlGeneratorUtilities.cs
rename to src/Mvc/shared/Mvc.Views.TestCommon/HtmlGeneratorUtilities.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Views.TestCommon/Microsoft.AspNetCore.Mvc.Views.TestCommon.csproj b/src/Mvc/shared/Mvc.Views.TestCommon/Microsoft.AspNetCore.Mvc.Views.TestCommon.csproj
similarity index 76%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Views.TestCommon/Microsoft.AspNetCore.Mvc.Views.TestCommon.csproj
rename to src/Mvc/shared/Mvc.Views.TestCommon/Microsoft.AspNetCore.Mvc.Views.TestCommon.csproj
index 45b15a124a..7396524b36 100644
--- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Views.TestCommon/Microsoft.AspNetCore.Mvc.Views.TestCommon.csproj
+++ b/src/Mvc/shared/Mvc.Views.TestCommon/Microsoft.AspNetCore.Mvc.Views.TestCommon.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.Core.TestCommon\Microsoft.AspNetCore.Mvc.Core.TestCommon.csproj" />
+    <ProjectReference Include="..\Mvc.Core.TestCommon\Microsoft.AspNetCore.Mvc.Core.TestCommon.csproj" />
     <Reference Include="Microsoft.AspNetCore.Mvc.ViewFeatures" />
 
     <Reference Include="Microsoft.AspNetCore.Razor.Runtime" />
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Views.TestCommon/TestDirectoryContent.cs b/src/Mvc/shared/Mvc.Views.TestCommon/TestDirectoryContent.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Views.TestCommon/TestDirectoryContent.cs
rename to src/Mvc/shared/Mvc.Views.TestCommon/TestDirectoryContent.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Views.TestCommon/TestDirectoryFileInfo.cs b/src/Mvc/shared/Mvc.Views.TestCommon/TestDirectoryFileInfo.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Views.TestCommon/TestDirectoryFileInfo.cs
rename to src/Mvc/shared/Mvc.Views.TestCommon/TestDirectoryFileInfo.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Views.TestCommon/TestFileChangeToken.cs b/src/Mvc/shared/Mvc.Views.TestCommon/TestFileChangeToken.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Views.TestCommon/TestFileChangeToken.cs
rename to src/Mvc/shared/Mvc.Views.TestCommon/TestFileChangeToken.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Views.TestCommon/TestFileInfo.cs b/src/Mvc/shared/Mvc.Views.TestCommon/TestFileInfo.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Views.TestCommon/TestFileInfo.cs
rename to src/Mvc/shared/Mvc.Views.TestCommon/TestFileInfo.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Views.TestCommon/TestFileProvider.cs b/src/Mvc/shared/Mvc.Views.TestCommon/TestFileProvider.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Views.TestCommon/TestFileProvider.cs
rename to src/Mvc/shared/Mvc.Views.TestCommon/TestFileProvider.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Views.TestCommon/TestRazorCompiledItem.cs b/src/Mvc/shared/Mvc.Views.TestCommon/TestRazorCompiledItem.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Views.TestCommon/TestRazorCompiledItem.cs
rename to src/Mvc/shared/Mvc.Views.TestCommon/TestRazorCompiledItem.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Views.TestCommon/TestViewBufferScope.cs b/src/Mvc/shared/Mvc.Views.TestCommon/TestViewBufferScope.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Views.TestCommon/TestViewBufferScope.cs
rename to src/Mvc/shared/Mvc.Views.TestCommon/TestViewBufferScope.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Microsoft.AspNetCore.Mvc.RazorPages.Test.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Microsoft.AspNetCore.Mvc.RazorPages.Test.csproj
deleted file mode 100644
index 0c21b5b6f8..0000000000
--- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Microsoft.AspNetCore.Mvc.RazorPages.Test.csproj
+++ /dev/null
@@ -1,19 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Include="..\Microsoft.AspNetCore.Mvc.Core.Test\Routing\ActionEndpointDataSourceBaseTest.cs" Link="Infrastructure\ActionEndpointDataSourceBaseTest.cs" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="Microsoft.AspNetCore.Mvc.RazorPages" />
-    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.Views.TestCommon\Microsoft.AspNetCore.Mvc.Views.TestCommon.csproj" />
-    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.TestDiagnosticListener\Microsoft.AspNetCore.Mvc.TestDiagnosticListener.csproj" />
-
-    <Reference Include="Microsoft.Extensions.Logging.Testing" />
-  </ItemGroup>
-
-</Project>
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test.csproj
deleted file mode 100644
index 15ea9fdb7c..0000000000
--- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test.csproj
+++ /dev/null
@@ -1,11 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.Views.TestCommon\Microsoft.AspNetCore.Mvc.Views.TestCommon.csproj" />
-    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.TestDiagnosticListener\Microsoft.AspNetCore.Mvc.TestDiagnosticListener.csproj" />
-  </ItemGroup>
-</Project>
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/AntiforgeryAuthTests.cs b/src/Mvc/test/Mvc.FunctionalTests/AntiforgeryAuthTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/AntiforgeryAuthTests.cs
rename to src/Mvc/test/Mvc.FunctionalTests/AntiforgeryAuthTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/AntiforgeryTestHelper.cs b/src/Mvc/test/Mvc.FunctionalTests/AntiforgeryTestHelper.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/AntiforgeryTestHelper.cs
rename to src/Mvc/test/Mvc.FunctionalTests/AntiforgeryTestHelper.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/AntiforgeryTests.cs b/src/Mvc/test/Mvc.FunctionalTests/AntiforgeryTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/AntiforgeryTests.cs
rename to src/Mvc/test/Mvc.FunctionalTests/AntiforgeryTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ApiBehaviorTest.cs b/src/Mvc/test/Mvc.FunctionalTests/ApiBehaviorTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ApiBehaviorTest.cs
rename to src/Mvc/test/Mvc.FunctionalTests/ApiBehaviorTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ApiExplorerTest.cs b/src/Mvc/test/Mvc.FunctionalTests/ApiExplorerTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ApiExplorerTest.cs
rename to src/Mvc/test/Mvc.FunctionalTests/ApiExplorerTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ApplicationModelTest.cs b/src/Mvc/test/Mvc.FunctionalTests/ApplicationModelTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ApplicationModelTest.cs
rename to src/Mvc/test/Mvc.FunctionalTests/ApplicationModelTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/AsyncActionsTests.cs b/src/Mvc/test/Mvc.FunctionalTests/AsyncActionsTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/AsyncActionsTests.cs
rename to src/Mvc/test/Mvc.FunctionalTests/AsyncActionsTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/BasicTests.cs b/src/Mvc/test/Mvc.FunctionalTests/BasicTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/BasicTests.cs
rename to src/Mvc/test/Mvc.FunctionalTests/BasicTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/CompilationOptionsTests.cs b/src/Mvc/test/Mvc.FunctionalTests/CompilationOptionsTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/CompilationOptionsTests.cs
rename to src/Mvc/test/Mvc.FunctionalTests/CompilationOptionsTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ComponentRenderingFunctionalTests.cs b/src/Mvc/test/Mvc.FunctionalTests/ComponentRenderingFunctionalTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ComponentRenderingFunctionalTests.cs
rename to src/Mvc/test/Mvc.FunctionalTests/ComponentRenderingFunctionalTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ConsumesAttributeEndpointRoutingTests.cs b/src/Mvc/test/Mvc.FunctionalTests/ConsumesAttributeEndpointRoutingTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ConsumesAttributeEndpointRoutingTests.cs
rename to src/Mvc/test/Mvc.FunctionalTests/ConsumesAttributeEndpointRoutingTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ConsumesAttributeTests.cs b/src/Mvc/test/Mvc.FunctionalTests/ConsumesAttributeTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ConsumesAttributeTests.cs
rename to src/Mvc/test/Mvc.FunctionalTests/ConsumesAttributeTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ConsumesAttributeTestsBase.cs b/src/Mvc/test/Mvc.FunctionalTests/ConsumesAttributeTestsBase.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ConsumesAttributeTestsBase.cs
rename to src/Mvc/test/Mvc.FunctionalTests/ConsumesAttributeTestsBase.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ContentNegotiationTest.cs b/src/Mvc/test/Mvc.FunctionalTests/ContentNegotiationTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ContentNegotiationTest.cs
rename to src/Mvc/test/Mvc.FunctionalTests/ContentNegotiationTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ControllerFromServicesTests.cs b/src/Mvc/test/Mvc.FunctionalTests/ControllerFromServicesTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ControllerFromServicesTests.cs
rename to src/Mvc/test/Mvc.FunctionalTests/ControllerFromServicesTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/CorsEndpointRoutingTests.cs b/src/Mvc/test/Mvc.FunctionalTests/CorsEndpointRoutingTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/CorsEndpointRoutingTests.cs
rename to src/Mvc/test/Mvc.FunctionalTests/CorsEndpointRoutingTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/CorsTests.cs b/src/Mvc/test/Mvc.FunctionalTests/CorsTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/CorsTests.cs
rename to src/Mvc/test/Mvc.FunctionalTests/CorsTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/CorsTestsBase.cs b/src/Mvc/test/Mvc.FunctionalTests/CorsTestsBase.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/CorsTestsBase.cs
rename to src/Mvc/test/Mvc.FunctionalTests/CorsTestsBase.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/DataAnnotationTests.cs b/src/Mvc/test/Mvc.FunctionalTests/DataAnnotationTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/DataAnnotationTests.cs
rename to src/Mvc/test/Mvc.FunctionalTests/DataAnnotationTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/DefaultValuesTest.cs b/src/Mvc/test/Mvc.FunctionalTests/DefaultValuesTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/DefaultValuesTest.cs
rename to src/Mvc/test/Mvc.FunctionalTests/DefaultValuesTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/DirectivesTest.cs b/src/Mvc/test/Mvc.FunctionalTests/DirectivesTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/DirectivesTest.cs
rename to src/Mvc/test/Mvc.FunctionalTests/DirectivesTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/DoNotRespectBrowserAcceptHeaderTests.cs b/src/Mvc/test/Mvc.FunctionalTests/DoNotRespectBrowserAcceptHeaderTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/DoNotRespectBrowserAcceptHeaderTests.cs
rename to src/Mvc/test/Mvc.FunctionalTests/DoNotRespectBrowserAcceptHeaderTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ErrorPageTests.cs b/src/Mvc/test/Mvc.FunctionalTests/ErrorPageTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ErrorPageTests.cs
rename to src/Mvc/test/Mvc.FunctionalTests/ErrorPageTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ExceptionInfo.cs b/src/Mvc/test/Mvc.FunctionalTests/ExceptionInfo.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ExceptionInfo.cs
rename to src/Mvc/test/Mvc.FunctionalTests/ExceptionInfo.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/FileResultTests.cs b/src/Mvc/test/Mvc.FunctionalTests/FileResultTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/FileResultTests.cs
rename to src/Mvc/test/Mvc.FunctionalTests/FileResultTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/FiltersTest.cs b/src/Mvc/test/Mvc.FunctionalTests/FiltersTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/FiltersTest.cs
rename to src/Mvc/test/Mvc.FunctionalTests/FiltersTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/FlushPointTest.cs b/src/Mvc/test/Mvc.FunctionalTests/FlushPointTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/FlushPointTest.cs
rename to src/Mvc/test/Mvc.FunctionalTests/FlushPointTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/FormFileUploadTest.cs b/src/Mvc/test/Mvc.FunctionalTests/FormFileUploadTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/FormFileUploadTest.cs
rename to src/Mvc/test/Mvc.FunctionalTests/FormFileUploadTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/GlobalAuthorizationFilterTest.cs b/src/Mvc/test/Mvc.FunctionalTests/GlobalAuthorizationFilterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/GlobalAuthorizationFilterTest.cs
rename to src/Mvc/test/Mvc.FunctionalTests/GlobalAuthorizationFilterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/HtmlGenerationTest.cs b/src/Mvc/test/Mvc.FunctionalTests/HtmlGenerationTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/HtmlGenerationTest.cs
rename to src/Mvc/test/Mvc.FunctionalTests/HtmlGenerationTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/HtmlGenerationWithCultureTest.cs b/src/Mvc/test/Mvc.FunctionalTests/HtmlGenerationWithCultureTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/HtmlGenerationWithCultureTest.cs
rename to src/Mvc/test/Mvc.FunctionalTests/HtmlGenerationWithCultureTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/HtmlHelperOptionsTest.cs b/src/Mvc/test/Mvc.FunctionalTests/HtmlHelperOptionsTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/HtmlHelperOptionsTest.cs
rename to src/Mvc/test/Mvc.FunctionalTests/HtmlHelperOptionsTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/CultureReplacerMiddleware.cs b/src/Mvc/test/Mvc.FunctionalTests/Infrastructure/CultureReplacerMiddleware.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/CultureReplacerMiddleware.cs
rename to src/Mvc/test/Mvc.FunctionalTests/Infrastructure/CultureReplacerMiddleware.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/CultureReplacerStartupFilter.cs b/src/Mvc/test/Mvc.FunctionalTests/Infrastructure/CultureReplacerStartupFilter.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/CultureReplacerStartupFilter.cs
rename to src/Mvc/test/Mvc.FunctionalTests/Infrastructure/CultureReplacerStartupFilter.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/HttpClientExtensions.cs b/src/Mvc/test/Mvc.FunctionalTests/Infrastructure/HttpClientExtensions.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/HttpClientExtensions.cs
rename to src/Mvc/test/Mvc.FunctionalTests/Infrastructure/HttpClientExtensions.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/IHtmlDocumentExtensions.cs b/src/Mvc/test/Mvc.FunctionalTests/Infrastructure/IHtmlDocumentExtensions.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/IHtmlDocumentExtensions.cs
rename to src/Mvc/test/Mvc.FunctionalTests/Infrastructure/IHtmlDocumentExtensions.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/MvcEncodedTestFixtureOfT.cs b/src/Mvc/test/Mvc.FunctionalTests/Infrastructure/MvcEncodedTestFixtureOfT.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/MvcEncodedTestFixtureOfT.cs
rename to src/Mvc/test/Mvc.FunctionalTests/Infrastructure/MvcEncodedTestFixtureOfT.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/MvcTestFixture.cs b/src/Mvc/test/Mvc.FunctionalTests/Infrastructure/MvcTestFixture.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/MvcTestFixture.cs
rename to src/Mvc/test/Mvc.FunctionalTests/Infrastructure/MvcTestFixture.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/MvcWebApplicationBuilderExtensions.cs b/src/Mvc/test/Mvc.FunctionalTests/Infrastructure/MvcWebApplicationBuilderExtensions.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/MvcWebApplicationBuilderExtensions.cs
rename to src/Mvc/test/Mvc.FunctionalTests/Infrastructure/MvcWebApplicationBuilderExtensions.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/ResourceFile.cs b/src/Mvc/test/Mvc.FunctionalTests/Infrastructure/ResourceFile.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/ResourceFile.cs
rename to src/Mvc/test/Mvc.FunctionalTests/Infrastructure/ResourceFile.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/TestCulture.cs b/src/Mvc/test/Mvc.FunctionalTests/Infrastructure/TestCulture.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/TestCulture.cs
rename to src/Mvc/test/Mvc.FunctionalTests/Infrastructure/TestCulture.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/InputFormatterTests.cs b/src/Mvc/test/Mvc.FunctionalTests/InputFormatterTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/InputFormatterTests.cs
rename to src/Mvc/test/Mvc.FunctionalTests/InputFormatterTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/InputObjectValidationTests.cs b/src/Mvc/test/Mvc.FunctionalTests/InputObjectValidationTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/InputObjectValidationTests.cs
rename to src/Mvc/test/Mvc.FunctionalTests/InputObjectValidationTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/InputValidationTests.cs b/src/Mvc/test/Mvc.FunctionalTests/InputValidationTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/InputValidationTests.cs
rename to src/Mvc/test/Mvc.FunctionalTests/InputValidationTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/JsonOutputFormatterTests.cs b/src/Mvc/test/Mvc.FunctionalTests/JsonOutputFormatterTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/JsonOutputFormatterTests.cs
rename to src/Mvc/test/Mvc.FunctionalTests/JsonOutputFormatterTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/JsonPatchInputFormatterTest.cs b/src/Mvc/test/Mvc.FunctionalTests/JsonPatchInputFormatterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/JsonPatchInputFormatterTest.cs
rename to src/Mvc/test/Mvc.FunctionalTests/JsonPatchInputFormatterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/JsonResultTest.cs b/src/Mvc/test/Mvc.FunctionalTests/JsonResultTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/JsonResultTest.cs
rename to src/Mvc/test/Mvc.FunctionalTests/JsonResultTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/LinkGenerationTests.cs b/src/Mvc/test/Mvc.FunctionalTests/LinkGenerationTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/LinkGenerationTests.cs
rename to src/Mvc/test/Mvc.FunctionalTests/LinkGenerationTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/LinkGeneratorTest.cs b/src/Mvc/test/Mvc.FunctionalTests/LinkGeneratorTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/LinkGeneratorTest.cs
rename to src/Mvc/test/Mvc.FunctionalTests/LinkGeneratorTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj b/src/Mvc/test/Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj
similarity index 94%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj
rename to src/Mvc/test/Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj
index 7381768d87..3778bbe548 100644
--- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj
+++ b/src/Mvc/test/Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj
@@ -13,7 +13,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="..\Microsoft.AspNetCore.Mvc.Formatters.Xml.Test\XmlAssert.cs" />
+    <Compile Include="..\..\Mvc.Formatters.Xml\test\XmlAssert.cs" />
     <EmbeddedResource Include="compiler\resources\**\*" />
     <None Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
@@ -30,7 +30,7 @@
     <Reference Include="Microsoft.AspNetCore.Mvc.Testing" />
     <ProjectReference Include="..\..\samples\MvcSandbox\MvcSandbox.csproj" />
 
-    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.Core.TestCommon\Microsoft.AspNetCore.Mvc.Core.TestCommon.csproj" />
+    <ProjectReference Include="..\..\shared\Mvc.Core.TestCommon\Microsoft.AspNetCore.Mvc.Core.TestCommon.csproj" />
 
     <ProjectReference Include="..\WebSites\ApiExplorerWebSite\ApiExplorerWebSite.csproj" />
     <ProjectReference Include="..\WebSites\ApplicationModelWebSite\ApplicationModelWebSite.csproj" />
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/MvcSandboxTest.cs b/src/Mvc/test/Mvc.FunctionalTests/MvcSandboxTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/MvcSandboxTest.cs
rename to src/Mvc/test/Mvc.FunctionalTests/MvcSandboxTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/OutputFormatterTest.cs b/src/Mvc/test/Mvc.FunctionalTests/OutputFormatterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/OutputFormatterTest.cs
rename to src/Mvc/test/Mvc.FunctionalTests/OutputFormatterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorBuildTest.cs b/src/Mvc/test/Mvc.FunctionalTests/RazorBuildTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorBuildTest.cs
rename to src/Mvc/test/Mvc.FunctionalTests/RazorBuildTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorPageModelTest.cs b/src/Mvc/test/Mvc.FunctionalTests/RazorPageModelTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorPageModelTest.cs
rename to src/Mvc/test/Mvc.FunctionalTests/RazorPageModelTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorPagesNamespaceTest.cs b/src/Mvc/test/Mvc.FunctionalTests/RazorPagesNamespaceTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorPagesNamespaceTest.cs
rename to src/Mvc/test/Mvc.FunctionalTests/RazorPagesNamespaceTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorPagesTest.cs b/src/Mvc/test/Mvc.FunctionalTests/RazorPagesTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorPagesTest.cs
rename to src/Mvc/test/Mvc.FunctionalTests/RazorPagesTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorPagesViewSearchTest.cs b/src/Mvc/test/Mvc.FunctionalTests/RazorPagesViewSearchTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorPagesViewSearchTest.cs
rename to src/Mvc/test/Mvc.FunctionalTests/RazorPagesViewSearchTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorPagesWithBasePathTest.cs b/src/Mvc/test/Mvc.FunctionalTests/RazorPagesWithBasePathTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorPagesWithBasePathTest.cs
rename to src/Mvc/test/Mvc.FunctionalTests/RazorPagesWithBasePathTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorPagesWithEndpointRoutingTest.cs b/src/Mvc/test/Mvc.FunctionalTests/RazorPagesWithEndpointRoutingTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorPagesWithEndpointRoutingTest.cs
rename to src/Mvc/test/Mvc.FunctionalTests/RazorPagesWithEndpointRoutingTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorViewLocationSpecificationTest.cs b/src/Mvc/test/Mvc.FunctionalTests/RazorViewLocationSpecificationTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorViewLocationSpecificationTest.cs
rename to src/Mvc/test/Mvc.FunctionalTests/RazorViewLocationSpecificationTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RemoteAttributeValidationTest.cs b/src/Mvc/test/Mvc.FunctionalTests/RemoteAttributeValidationTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RemoteAttributeValidationTest.cs
rename to src/Mvc/test/Mvc.FunctionalTests/RemoteAttributeValidationTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RequestFormLimitsTest.cs b/src/Mvc/test/Mvc.FunctionalTests/RequestFormLimitsTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RequestFormLimitsTest.cs
rename to src/Mvc/test/Mvc.FunctionalTests/RequestFormLimitsTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RequestServicesEndpointRoutingTest.cs b/src/Mvc/test/Mvc.FunctionalTests/RequestServicesEndpointRoutingTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RequestServicesEndpointRoutingTest.cs
rename to src/Mvc/test/Mvc.FunctionalTests/RequestServicesEndpointRoutingTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RequestServicesTest.cs b/src/Mvc/test/Mvc.FunctionalTests/RequestServicesTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RequestServicesTest.cs
rename to src/Mvc/test/Mvc.FunctionalTests/RequestServicesTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RequestServicesTestBase.cs b/src/Mvc/test/Mvc.FunctionalTests/RequestServicesTestBase.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RequestServicesTestBase.cs
rename to src/Mvc/test/Mvc.FunctionalTests/RequestServicesTestBase.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RequestSizeLimitTest.cs b/src/Mvc/test/Mvc.FunctionalTests/RequestSizeLimitTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RequestSizeLimitTest.cs
rename to src/Mvc/test/Mvc.FunctionalTests/RequestSizeLimitTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RespectBrowserAcceptHeaderTests.cs b/src/Mvc/test/Mvc.FunctionalTests/RespectBrowserAcceptHeaderTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RespectBrowserAcceptHeaderTests.cs
rename to src/Mvc/test/Mvc.FunctionalTests/RespectBrowserAcceptHeaderTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RoutingEndpointRoutingTest.cs b/src/Mvc/test/Mvc.FunctionalTests/RoutingEndpointRoutingTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RoutingEndpointRoutingTest.cs
rename to src/Mvc/test/Mvc.FunctionalTests/RoutingEndpointRoutingTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RoutingEndpointRoutingWithoutRazorPagesTests.cs b/src/Mvc/test/Mvc.FunctionalTests/RoutingEndpointRoutingWithoutRazorPagesTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RoutingEndpointRoutingWithoutRazorPagesTests.cs
rename to src/Mvc/test/Mvc.FunctionalTests/RoutingEndpointRoutingWithoutRazorPagesTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RoutingTests.cs b/src/Mvc/test/Mvc.FunctionalTests/RoutingTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RoutingTests.cs
rename to src/Mvc/test/Mvc.FunctionalTests/RoutingTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RoutingTestsBase.cs b/src/Mvc/test/Mvc.FunctionalTests/RoutingTestsBase.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RoutingTestsBase.cs
rename to src/Mvc/test/Mvc.FunctionalTests/RoutingTestsBase.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RoutingUseMvcWithEndpointRoutingTest.cs b/src/Mvc/test/Mvc.FunctionalTests/RoutingUseMvcWithEndpointRoutingTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RoutingUseMvcWithEndpointRoutingTest.cs
rename to src/Mvc/test/Mvc.FunctionalTests/RoutingUseMvcWithEndpointRoutingTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RoutingWithoutRazorPagesTests.cs b/src/Mvc/test/Mvc.FunctionalTests/RoutingWithoutRazorPagesTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RoutingWithoutRazorPagesTests.cs
rename to src/Mvc/test/Mvc.FunctionalTests/RoutingWithoutRazorPagesTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RoutingWithoutRazorPagesTestsBase.cs b/src/Mvc/test/Mvc.FunctionalTests/RoutingWithoutRazorPagesTestsBase.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RoutingWithoutRazorPagesTestsBase.cs
rename to src/Mvc/test/Mvc.FunctionalTests/RoutingWithoutRazorPagesTestsBase.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/SerializableErrorTests.cs b/src/Mvc/test/Mvc.FunctionalTests/SerializableErrorTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/SerializableErrorTests.cs
rename to src/Mvc/test/Mvc.FunctionalTests/SerializableErrorTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/SimpleTests.cs b/src/Mvc/test/Mvc.FunctionalTests/SimpleTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/SimpleTests.cs
rename to src/Mvc/test/Mvc.FunctionalTests/SimpleTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/StreamOutputFormatterTest.cs b/src/Mvc/test/Mvc.FunctionalTests/StreamOutputFormatterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/StreamOutputFormatterTest.cs
rename to src/Mvc/test/Mvc.FunctionalTests/StreamOutputFormatterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TagHelperComponentTagHelperTest.cs b/src/Mvc/test/Mvc.FunctionalTests/TagHelperComponentTagHelperTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TagHelperComponentTagHelperTest.cs
rename to src/Mvc/test/Mvc.FunctionalTests/TagHelperComponentTagHelperTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TagHelpersFromServicesTest.cs b/src/Mvc/test/Mvc.FunctionalTests/TagHelpersFromServicesTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TagHelpersFromServicesTest.cs
rename to src/Mvc/test/Mvc.FunctionalTests/TagHelpersFromServicesTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TagHelpersTest.cs b/src/Mvc/test/Mvc.FunctionalTests/TagHelpersTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TagHelpersTest.cs
rename to src/Mvc/test/Mvc.FunctionalTests/TagHelpersTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TempDataInCookiesTest.cs b/src/Mvc/test/Mvc.FunctionalTests/TempDataInCookiesTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TempDataInCookiesTest.cs
rename to src/Mvc/test/Mvc.FunctionalTests/TempDataInCookiesTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TempDataInCookiesUsingCookieConsentTest.cs b/src/Mvc/test/Mvc.FunctionalTests/TempDataInCookiesUsingCookieConsentTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TempDataInCookiesUsingCookieConsentTest.cs
rename to src/Mvc/test/Mvc.FunctionalTests/TempDataInCookiesUsingCookieConsentTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TempDataInSessionTest.cs b/src/Mvc/test/Mvc.FunctionalTests/TempDataInSessionTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TempDataInSessionTest.cs
rename to src/Mvc/test/Mvc.FunctionalTests/TempDataInSessionTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TempDataPropertyTest.cs b/src/Mvc/test/Mvc.FunctionalTests/TempDataPropertyTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TempDataPropertyTest.cs
rename to src/Mvc/test/Mvc.FunctionalTests/TempDataPropertyTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TempDataTestBase.cs b/src/Mvc/test/Mvc.FunctionalTests/TempDataTestBase.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TempDataTestBase.cs
rename to src/Mvc/test/Mvc.FunctionalTests/TempDataTestBase.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TestingInfrastructureInheritanceTests.cs b/src/Mvc/test/Mvc.FunctionalTests/TestingInfrastructureInheritanceTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TestingInfrastructureInheritanceTests.cs
rename to src/Mvc/test/Mvc.FunctionalTests/TestingInfrastructureInheritanceTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TestingInfrastructureTests.cs b/src/Mvc/test/Mvc.FunctionalTests/TestingInfrastructureTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TestingInfrastructureTests.cs
rename to src/Mvc/test/Mvc.FunctionalTests/TestingInfrastructureTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/UrlResolutionTest.cs b/src/Mvc/test/Mvc.FunctionalTests/UrlResolutionTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/UrlResolutionTest.cs
rename to src/Mvc/test/Mvc.FunctionalTests/UrlResolutionTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/VersioningEndpointRoutingTests.cs b/src/Mvc/test/Mvc.FunctionalTests/VersioningEndpointRoutingTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/VersioningEndpointRoutingTests.cs
rename to src/Mvc/test/Mvc.FunctionalTests/VersioningEndpointRoutingTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/VersioningTests.cs b/src/Mvc/test/Mvc.FunctionalTests/VersioningTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/VersioningTests.cs
rename to src/Mvc/test/Mvc.FunctionalTests/VersioningTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/VersioningTestsBase.cs b/src/Mvc/test/Mvc.FunctionalTests/VersioningTestsBase.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/VersioningTestsBase.cs
rename to src/Mvc/test/Mvc.FunctionalTests/VersioningTestsBase.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ViewComponentFromServicesTests.cs b/src/Mvc/test/Mvc.FunctionalTests/ViewComponentFromServicesTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ViewComponentFromServicesTests.cs
rename to src/Mvc/test/Mvc.FunctionalTests/ViewComponentFromServicesTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ViewEngineTests.cs b/src/Mvc/test/Mvc.FunctionalTests/ViewEngineTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ViewEngineTests.cs
rename to src/Mvc/test/Mvc.FunctionalTests/ViewEngineTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/XmlDataContractSerializerFormattersWrappingTest.cs b/src/Mvc/test/Mvc.FunctionalTests/XmlDataContractSerializerFormattersWrappingTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/XmlDataContractSerializerFormattersWrappingTest.cs
rename to src/Mvc/test/Mvc.FunctionalTests/XmlDataContractSerializerFormattersWrappingTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/XmlDataContractSerializerInputFormatterTest.cs b/src/Mvc/test/Mvc.FunctionalTests/XmlDataContractSerializerInputFormatterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/XmlDataContractSerializerInputFormatterTest.cs
rename to src/Mvc/test/Mvc.FunctionalTests/XmlDataContractSerializerInputFormatterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/XmlOutputFormatterTests.cs b/src/Mvc/test/Mvc.FunctionalTests/XmlOutputFormatterTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/XmlOutputFormatterTests.cs
rename to src/Mvc/test/Mvc.FunctionalTests/XmlOutputFormatterTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/XmlSerializerFormattersWrappingTest.cs b/src/Mvc/test/Mvc.FunctionalTests/XmlSerializerFormattersWrappingTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/XmlSerializerFormattersWrappingTest.cs
rename to src/Mvc/test/Mvc.FunctionalTests/XmlSerializerFormattersWrappingTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/XmlSerializerInputFormatterTests.cs b/src/Mvc/test/Mvc.FunctionalTests/XmlSerializerInputFormatterTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/XmlSerializerInputFormatterTests.cs
rename to src/Mvc/test/Mvc.FunctionalTests/XmlSerializerInputFormatterTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.Area1.RemoteAttribute_Home.Create.html b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/BasicWebSite.Area1.RemoteAttribute_Home.Create.html
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.Area1.RemoteAttribute_Home.Create.html
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/BasicWebSite.Area1.RemoteAttribute_Home.Create.html
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.Home.ActionLinkView.html b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/BasicWebSite.Home.ActionLinkView.html
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.Home.ActionLinkView.html
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/BasicWebSite.Home.ActionLinkView.html
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.Home.CSharp7View.html b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/BasicWebSite.Home.CSharp7View.html
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.Home.CSharp7View.html
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/BasicWebSite.Home.CSharp7View.html
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.Home.Index.html b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/BasicWebSite.Home.Index.html
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.Home.Index.html
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/BasicWebSite.Home.Index.html
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.Home.PlainView.html b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/BasicWebSite.Home.PlainView.html
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.Home.PlainView.html
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/BasicWebSite.Home.PlainView.html
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.Home.ViewWithPrefixedAttributeValue.html b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/BasicWebSite.Home.ViewWithPrefixedAttributeValue.html
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.Home.ViewWithPrefixedAttributeValue.html
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/BasicWebSite.Home.ViewWithPrefixedAttributeValue.html
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.PassThrough.Index.html b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/BasicWebSite.PassThrough.Index.html
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.PassThrough.Index.html
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/BasicWebSite.PassThrough.Index.html
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.Root.RemoteAttribute_Home.Create.html b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/BasicWebSite.Root.RemoteAttribute_Home.Create.html
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.Root.RemoteAttribute_Home.Create.html
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/BasicWebSite.Root.RemoteAttribute_Home.Create.html
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/CacheTagHelper_CanCachePortionsOfViewsPartialViewsAndViewComponents.Assert1.txt b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/CacheTagHelper_CanCachePortionsOfViewsPartialViewsAndViewComponents.Assert1.txt
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/CacheTagHelper_CanCachePortionsOfViewsPartialViewsAndViewComponents.Assert1.txt
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/CacheTagHelper_CanCachePortionsOfViewsPartialViewsAndViewComponents.Assert1.txt
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/CacheTagHelper_CanCachePortionsOfViewsPartialViewsAndViewComponents.Assert2.txt b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/CacheTagHelper_CanCachePortionsOfViewsPartialViewsAndViewComponents.Assert2.txt
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/CacheTagHelper_CanCachePortionsOfViewsPartialViewsAndViewComponents.Assert2.txt
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/CacheTagHelper_CanCachePortionsOfViewsPartialViewsAndViewComponents.Assert2.txt
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/CacheTagHelper_CanCachePortionsOfViewsPartialViewsAndViewComponents.Assert3.txt b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/CacheTagHelper_CanCachePortionsOfViewsPartialViewsAndViewComponents.Assert3.txt
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/CacheTagHelper_CanCachePortionsOfViewsPartialViewsAndViewComponents.Assert3.txt
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/CacheTagHelper_CanCachePortionsOfViewsPartialViewsAndViewComponents.Assert3.txt
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.CheckViewData.AtViewModel.html b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.CheckViewData.AtViewModel.html
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.CheckViewData.AtViewModel.html
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.CheckViewData.AtViewModel.html
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.CheckViewData.NullViewModel.html b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.CheckViewData.NullViewModel.html
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.CheckViewData.NullViewModel.html
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.CheckViewData.NullViewModel.html
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.CheckViewData.ViewModel.html b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.CheckViewData.ViewModel.html
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.CheckViewData.ViewModel.html
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.CheckViewData.ViewModel.html
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Customer.Index.html b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Customer.Index.html
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Customer.Index.html
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Customer.Index.html
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.AttributesWithBooleanValues.Encoded.html b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.AttributesWithBooleanValues.Encoded.html
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.AttributesWithBooleanValues.Encoded.html
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.AttributesWithBooleanValues.Encoded.html
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.AttributesWithBooleanValues.html b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.AttributesWithBooleanValues.html
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.AttributesWithBooleanValues.html
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.AttributesWithBooleanValues.html
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.CreateWarehouse.html b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.CreateWarehouse.html
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.CreateWarehouse.html
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.CreateWarehouse.html
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Customer.html b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Customer.html
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Customer.html
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Customer.html
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.EditWarehouse.Encoded.html b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.EditWarehouse.Encoded.html
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.EditWarehouse.Encoded.html
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.EditWarehouse.Encoded.html
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.EditWarehouse.html b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.EditWarehouse.html
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.EditWarehouse.html
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.EditWarehouse.html
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.EmployeeList.html b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.EmployeeList.html
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.EmployeeList.html
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.EmployeeList.html
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Environment.html b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Environment.html
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Environment.html
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Environment.html
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Form.html b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Form.html
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Form.html
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Form.html
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Image.html b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Image.html
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Image.html
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Image.html
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Index.Encoded.html b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Index.Encoded.html
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Index.Encoded.html
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Index.Encoded.html
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Index.html b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Index.html
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Index.html
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Index.html
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Index21Compat.html b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Index21Compat.html
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Index21Compat.html
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Index21Compat.html
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Input.html b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Input.html
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Input.html
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Input.html
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Link.Encoded.html b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Link.Encoded.html
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Link.Encoded.html
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Link.Encoded.html
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Link.html b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Link.html
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Link.html
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Link.html
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Order.Encoded.html b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Order.Encoded.html
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Order.Encoded.html
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Order.Encoded.html
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Order.html b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Order.html
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Order.html
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Order.html
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.OrderUsingHtmlHelpers.Encoded.html b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.OrderUsingHtmlHelpers.Encoded.html
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.OrderUsingHtmlHelpers.Encoded.html
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.OrderUsingHtmlHelpers.Encoded.html
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.OrderUsingHtmlHelpers.html b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.OrderUsingHtmlHelpers.html
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.OrderUsingHtmlHelpers.html
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.OrderUsingHtmlHelpers.html
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.PartialTagHelperWithoutModel.html b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.PartialTagHelperWithoutModel.html
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.PartialTagHelperWithoutModel.html
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.PartialTagHelperWithoutModel.html
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Product.Encoded.html b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Product.Encoded.html
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Product.Encoded.html
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Product.Encoded.html
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Product.html b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Product.html
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Product.html
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Product.html
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.ProductList.html b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.ProductList.html
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.ProductList.html
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.ProductList.html
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.ProductListUsingTagHelpers.html b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.ProductListUsingTagHelpers.html
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.ProductListUsingTagHelpers.html
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.ProductListUsingTagHelpers.html
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.ProductListUsingTagHelpersWithNullModel.html b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.ProductListUsingTagHelpersWithNullModel.html
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.ProductListUsingTagHelpersWithNullModel.html
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.ProductListUsingTagHelpersWithNullModel.html
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Script.Encoded.html b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Script.Encoded.html
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Script.Encoded.html
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Script.Encoded.html
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Script.html b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Script.html
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Script.html
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Script.html
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Warehouse.html b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Warehouse.html
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Warehouse.html
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Warehouse.html
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/ModelBindingWebSite.Vehicle.Details.html b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/ModelBindingWebSite.Vehicle.Details.html
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/ModelBindingWebSite.Vehicle.Details.html
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/ModelBindingWebSite.Vehicle.Details.html
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/ModelBindingWebSite.Vehicle.Edit.Invalid.html b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/ModelBindingWebSite.Vehicle.Edit.Invalid.html
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/ModelBindingWebSite.Vehicle.Edit.Invalid.html
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/ModelBindingWebSite.Vehicle.Edit.Invalid.html
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/ModelBindingWebSite.Vehicle.Edit.html b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/ModelBindingWebSite.Vehicle.Edit.html
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/ModelBindingWebSite.Vehicle.Edit.html
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/ModelBindingWebSite.Vehicle.Edit.html
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/RazorPagesWebSite.SimpleForms.html b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/RazorPagesWebSite.SimpleForms.html
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/RazorPagesWebSite.SimpleForms.html
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/RazorPagesWebSite.SimpleForms.html
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/RazorWebSite.AddTagHelperComponent.AddComponent.html b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/RazorWebSite.AddTagHelperComponent.AddComponent.html
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/RazorWebSite.AddTagHelperComponent.AddComponent.html
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/RazorWebSite.AddTagHelperComponent.AddComponent.html
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/RazorWebSite.TagHelperComponent.Body.html b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/RazorWebSite.TagHelperComponent.Body.html
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/RazorWebSite.TagHelperComponent.Body.html
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/RazorWebSite.TagHelperComponent.Body.html
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/RazorWebSite.TagHelperComponent.Head.html b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/RazorWebSite.TagHelperComponent.Head.html
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/RazorWebSite.TagHelperComponent.Head.html
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/RazorWebSite.TagHelperComponent.Head.html
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/RazorWebSite.UrlResolution.Index.Encoded.html b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/RazorWebSite.UrlResolution.Index.Encoded.html
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/RazorWebSite.UrlResolution.Index.Encoded.html
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/RazorWebSite.UrlResolution.Index.Encoded.html
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/RazorWebSite.UrlResolution.Index.html b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/RazorWebSite.UrlResolution.Index.html
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/RazorWebSite.UrlResolution.Index.html
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/RazorWebSite.UrlResolution.Index.html
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Employee.Create.Invalid.html b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Employee.Create.Invalid.html
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Employee.Create.Invalid.html
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Employee.Create.Invalid.html
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Employee.Create.html b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Employee.Create.html
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Employee.Create.html
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Employee.Create.html
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Employee.Details.AfterCreate.html b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Employee.Details.AfterCreate.html
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Employee.Details.AfterCreate.html
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Employee.Details.AfterCreate.html
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Employee.DuplicateAntiforgeryTokenRegistration.html b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Employee.DuplicateAntiforgeryTokenRegistration.html
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Employee.DuplicateAntiforgeryTokenRegistration.html
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Employee.DuplicateAntiforgeryTokenRegistration.html
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Encoders.CustomEncoder.html b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Encoders.CustomEncoder.html
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Encoders.CustomEncoder.html
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Encoders.CustomEncoder.html
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Encoders.Index.html b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Encoders.Index.html
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Encoders.Index.html
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Encoders.Index.html
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Encoders.NullEncoder.html b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Encoders.NullEncoder.html
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Encoders.NullEncoder.html
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Encoders.NullEncoder.html
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Encoders.ThreeEncoders.html b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Encoders.ThreeEncoders.html
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Encoders.ThreeEncoders.html
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Encoders.ThreeEncoders.html
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Encoders.TwoEncoders.html b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Encoders.TwoEncoders.html
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Encoders.TwoEncoders.html
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Encoders.TwoEncoders.html
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.About.html b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.About.html
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.About.html
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.About.html
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.Help.html b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.Help.html
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.Help.html
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.Help.html
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.Index.html b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.Index.html
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.Index.html
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.Index.html
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.UnboundDynamicAttributes.Encoded.html b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.UnboundDynamicAttributes.Encoded.html
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.UnboundDynamicAttributes.Encoded.html
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.UnboundDynamicAttributes.Encoded.html
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.UnboundDynamicAttributes.html b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.UnboundDynamicAttributes.html
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.UnboundDynamicAttributes.html
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.UnboundDynamicAttributes.html
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.ViewComponentTagHelpers.html b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.ViewComponentTagHelpers.html
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.ViewComponentTagHelpers.html
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.ViewComponentTagHelpers.html
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/UpdateDealerVehicle_PopulatesPropertyErrorsInViews.txt b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/UpdateDealerVehicle_PopulatesPropertyErrorsInViews.txt
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/UpdateDealerVehicle_PopulatesPropertyErrorsInViews.txt
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/UpdateDealerVehicle_PopulatesPropertyErrorsInViews.txt
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/UpdateDealerVehicle_PopulatesValidationSummary.txt b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/UpdateDealerVehicle_PopulatesValidationSummary.txt
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/UpdateDealerVehicle_PopulatesValidationSummary.txt
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/UpdateDealerVehicle_PopulatesValidationSummary.txt
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/UpdateDealerVehicle_UpdateSuccessful.txt b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/UpdateDealerVehicle_UpdateSuccessful.txt
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/UpdateDealerVehicle_UpdateSuccessful.txt
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/UpdateDealerVehicle_UpdateSuccessful.txt
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/ViewEngineController.ViewWithPaths.txt b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/ViewEngineController.ViewWithPaths.txt
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/ViewEngineController.ViewWithPaths.txt
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/ViewEngineController.ViewWithPaths.txt
diff --git a/src/Mvc/test/Mvc.Analyzers.Test/xunit.runner.json b/src/Mvc/test/Mvc.FunctionalTests/xunit.runner.json
similarity index 100%
rename from src/Mvc/test/Mvc.Analyzers.Test/xunit.runner.json
rename to src/Mvc/test/Mvc.FunctionalTests/xunit.runner.json
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ActionParametersIntegrationTest.cs b/src/Mvc/test/Mvc.IntegrationTests/ActionParametersIntegrationTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ActionParametersIntegrationTest.cs
rename to src/Mvc/test/Mvc.IntegrationTests/ActionParametersIntegrationTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ArrayModelBinderIntegrationTest.cs b/src/Mvc/test/Mvc.IntegrationTests/ArrayModelBinderIntegrationTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ArrayModelBinderIntegrationTest.cs
rename to src/Mvc/test/Mvc.IntegrationTests/ArrayModelBinderIntegrationTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/AuthorizeFilterIntegrationTest.cs b/src/Mvc/test/Mvc.IntegrationTests/AuthorizeFilterIntegrationTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/AuthorizeFilterIntegrationTest.cs
rename to src/Mvc/test/Mvc.IntegrationTests/AuthorizeFilterIntegrationTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/BindPropertyIntegrationTest.cs b/src/Mvc/test/Mvc.IntegrationTests/BindPropertyIntegrationTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/BindPropertyIntegrationTest.cs
rename to src/Mvc/test/Mvc.IntegrationTests/BindPropertyIntegrationTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/BinderTypeBasedModelBinderIntegrationTest.cs b/src/Mvc/test/Mvc.IntegrationTests/BinderTypeBasedModelBinderIntegrationTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/BinderTypeBasedModelBinderIntegrationTest.cs
rename to src/Mvc/test/Mvc.IntegrationTests/BinderTypeBasedModelBinderIntegrationTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/BindingSourceMetadataProviderIntegrationTest.cs b/src/Mvc/test/Mvc.IntegrationTests/BindingSourceMetadataProviderIntegrationTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/BindingSourceMetadataProviderIntegrationTest.cs
rename to src/Mvc/test/Mvc.IntegrationTests/BindingSourceMetadataProviderIntegrationTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/BodyValidationIntegrationTests.cs b/src/Mvc/test/Mvc.IntegrationTests/BodyValidationIntegrationTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/BodyValidationIntegrationTests.cs
rename to src/Mvc/test/Mvc.IntegrationTests/BodyValidationIntegrationTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ByteArrayModelBinderIntegrationTest.cs b/src/Mvc/test/Mvc.IntegrationTests/ByteArrayModelBinderIntegrationTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ByteArrayModelBinderIntegrationTest.cs
rename to src/Mvc/test/Mvc.IntegrationTests/ByteArrayModelBinderIntegrationTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/CancellationTokenModelBinderIntegrationTest.cs b/src/Mvc/test/Mvc.IntegrationTests/CancellationTokenModelBinderIntegrationTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/CancellationTokenModelBinderIntegrationTest.cs
rename to src/Mvc/test/Mvc.IntegrationTests/CancellationTokenModelBinderIntegrationTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/CollectionModelBinderIntegrationTest.cs b/src/Mvc/test/Mvc.IntegrationTests/CollectionModelBinderIntegrationTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/CollectionModelBinderIntegrationTest.cs
rename to src/Mvc/test/Mvc.IntegrationTests/CollectionModelBinderIntegrationTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/CompanyNameAttribute.cs b/src/Mvc/test/Mvc.IntegrationTests/CompanyNameAttribute.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/CompanyNameAttribute.cs
rename to src/Mvc/test/Mvc.IntegrationTests/CompanyNameAttribute.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ComplexTypeModelBinderIntegrationTest.cs b/src/Mvc/test/Mvc.IntegrationTests/ComplexTypeModelBinderIntegrationTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ComplexTypeModelBinderIntegrationTest.cs
rename to src/Mvc/test/Mvc.IntegrationTests/ComplexTypeModelBinderIntegrationTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/DictionaryModelBinderIntegrationTest.cs b/src/Mvc/test/Mvc.IntegrationTests/DictionaryModelBinderIntegrationTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/DictionaryModelBinderIntegrationTest.cs
rename to src/Mvc/test/Mvc.IntegrationTests/DictionaryModelBinderIntegrationTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ExcludeBindingMetadataProviderIntegrationTest.cs b/src/Mvc/test/Mvc.IntegrationTests/ExcludeBindingMetadataProviderIntegrationTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ExcludeBindingMetadataProviderIntegrationTest.cs
rename to src/Mvc/test/Mvc.IntegrationTests/ExcludeBindingMetadataProviderIntegrationTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/FormCollectionModelBindingIntegrationTest.cs b/src/Mvc/test/Mvc.IntegrationTests/FormCollectionModelBindingIntegrationTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/FormCollectionModelBindingIntegrationTest.cs
rename to src/Mvc/test/Mvc.IntegrationTests/FormCollectionModelBindingIntegrationTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/FormFileModelBindingIntegrationTest.cs b/src/Mvc/test/Mvc.IntegrationTests/FormFileModelBindingIntegrationTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/FormFileModelBindingIntegrationTest.cs
rename to src/Mvc/test/Mvc.IntegrationTests/FormFileModelBindingIntegrationTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/GenericModelBinderIntegrationTest.cs b/src/Mvc/test/Mvc.IntegrationTests/GenericModelBinderIntegrationTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/GenericModelBinderIntegrationTest.cs
rename to src/Mvc/test/Mvc.IntegrationTests/GenericModelBinderIntegrationTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/HasValidatorsValidationMetadataProviderIntegrationTest.cs b/src/Mvc/test/Mvc.IntegrationTests/HasValidatorsValidationMetadataProviderIntegrationTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/HasValidatorsValidationMetadataProviderIntegrationTest.cs
rename to src/Mvc/test/Mvc.IntegrationTests/HasValidatorsValidationMetadataProviderIntegrationTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/HeaderModelBinderIntegrationTest.cs b/src/Mvc/test/Mvc.IntegrationTests/HeaderModelBinderIntegrationTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/HeaderModelBinderIntegrationTest.cs
rename to src/Mvc/test/Mvc.IntegrationTests/HeaderModelBinderIntegrationTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/JQueryFormatModelBindingIntegrationTest.cs b/src/Mvc/test/Mvc.IntegrationTests/JQueryFormatModelBindingIntegrationTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/JQueryFormatModelBindingIntegrationTest.cs
rename to src/Mvc/test/Mvc.IntegrationTests/JQueryFormatModelBindingIntegrationTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/KeyValuePairModelBinderIntegrationTest.cs b/src/Mvc/test/Mvc.IntegrationTests/KeyValuePairModelBinderIntegrationTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/KeyValuePairModelBinderIntegrationTest.cs
rename to src/Mvc/test/Mvc.IntegrationTests/KeyValuePairModelBinderIntegrationTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/Microsoft.AspNetCore.Mvc.IntegrationTests.csproj b/src/Mvc/test/Mvc.IntegrationTests/Microsoft.AspNetCore.Mvc.IntegrationTests.csproj
similarity index 73%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/Microsoft.AspNetCore.Mvc.IntegrationTests.csproj
rename to src/Mvc/test/Mvc.IntegrationTests/Microsoft.AspNetCore.Mvc.IntegrationTests.csproj
index 2bd4698e33..3cd3ac71e5 100644
--- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/Microsoft.AspNetCore.Mvc.IntegrationTests.csproj
+++ b/src/Mvc/test/Mvc.IntegrationTests/Microsoft.AspNetCore.Mvc.IntegrationTests.csproj
@@ -7,7 +7,7 @@
   <ItemGroup>
     <Reference Include="Microsoft.AspNetCore.Mvc" />
     <Reference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" />
-    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.Core.TestCommon\Microsoft.AspNetCore.Mvc.Core.TestCommon.csproj" />
+    <ProjectReference Include="..\..\shared\Mvc.Core.TestCommon\Microsoft.AspNetCore.Mvc.Core.TestCommon.csproj" />
 
     <Reference Include="Microsoft.Extensions.Logging" />
   </ItemGroup>
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ModelBindingTestContext.cs b/src/Mvc/test/Mvc.IntegrationTests/ModelBindingTestContext.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ModelBindingTestContext.cs
rename to src/Mvc/test/Mvc.IntegrationTests/ModelBindingTestContext.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ModelBindingTestHelper.cs b/src/Mvc/test/Mvc.IntegrationTests/ModelBindingTestHelper.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ModelBindingTestHelper.cs
rename to src/Mvc/test/Mvc.IntegrationTests/ModelBindingTestHelper.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ModelPrefixSelectionIntegrationTest.cs b/src/Mvc/test/Mvc.IntegrationTests/ModelPrefixSelectionIntegrationTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ModelPrefixSelectionIntegrationTest.cs
rename to src/Mvc/test/Mvc.IntegrationTests/ModelPrefixSelectionIntegrationTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/Models/Product.cs b/src/Mvc/test/Mvc.IntegrationTests/Models/Product.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/Models/Product.cs
rename to src/Mvc/test/Mvc.IntegrationTests/Models/Product.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/Models/ProductDetails.cs b/src/Mvc/test/Mvc.IntegrationTests/Models/ProductDetails.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/Models/ProductDetails.cs
rename to src/Mvc/test/Mvc.IntegrationTests/Models/ProductDetails.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/Models/ProductViewModel.cs b/src/Mvc/test/Mvc.IntegrationTests/Models/ProductViewModel.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/Models/ProductViewModel.cs
rename to src/Mvc/test/Mvc.IntegrationTests/Models/ProductViewModel.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/Models/Software.cs b/src/Mvc/test/Mvc.IntegrationTests/Models/Software.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/Models/Software.cs
rename to src/Mvc/test/Mvc.IntegrationTests/Models/Software.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/Models/SoftwareViewModel.cs b/src/Mvc/test/Mvc.IntegrationTests/Models/SoftwareViewModel.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/Models/SoftwareViewModel.cs
rename to src/Mvc/test/Mvc.IntegrationTests/Models/SoftwareViewModel.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ParameterBinderExtensions.cs b/src/Mvc/test/Mvc.IntegrationTests/ParameterBinderExtensions.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ParameterBinderExtensions.cs
rename to src/Mvc/test/Mvc.IntegrationTests/ParameterBinderExtensions.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ProductValidatorAttribute.cs b/src/Mvc/test/Mvc.IntegrationTests/ProductValidatorAttribute.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ProductValidatorAttribute.cs
rename to src/Mvc/test/Mvc.IntegrationTests/ProductValidatorAttribute.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ServicesModelBinderIntegrationTest.cs b/src/Mvc/test/Mvc.IntegrationTests/ServicesModelBinderIntegrationTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ServicesModelBinderIntegrationTest.cs
rename to src/Mvc/test/Mvc.IntegrationTests/ServicesModelBinderIntegrationTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/SimpleTypeModelBinderIntegrationTest.cs b/src/Mvc/test/Mvc.IntegrationTests/SimpleTypeModelBinderIntegrationTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/SimpleTypeModelBinderIntegrationTest.cs
rename to src/Mvc/test/Mvc.IntegrationTests/SimpleTypeModelBinderIntegrationTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/TestMvcOptions.cs b/src/Mvc/test/Mvc.IntegrationTests/TestMvcOptions.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/TestMvcOptions.cs
rename to src/Mvc/test/Mvc.IntegrationTests/TestMvcOptions.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/TryUpdateModelIntegrationTest.cs b/src/Mvc/test/Mvc.IntegrationTests/TryUpdateModelIntegrationTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/TryUpdateModelIntegrationTest.cs
rename to src/Mvc/test/Mvc.IntegrationTests/TryUpdateModelIntegrationTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/TryValidateModelIntegrationTest.cs b/src/Mvc/test/Mvc.IntegrationTests/TryValidateModelIntegrationTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/TryValidateModelIntegrationTest.cs
rename to src/Mvc/test/Mvc.IntegrationTests/TryValidateModelIntegrationTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ValidationIntegrationTests.cs b/src/Mvc/test/Mvc.IntegrationTests/ValidationIntegrationTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ValidationIntegrationTests.cs
rename to src/Mvc/test/Mvc.IntegrationTests/ValidationIntegrationTests.cs
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj b/src/ProjectTemplates/Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj
index 91586b5531..b210535d72 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj
+++ b/src/ProjectTemplates/Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj
@@ -32,8 +32,8 @@
     <PackageVersionVariableReference Include="$(RepositoryRoot)src\Identity\EntityFrameworkCore\src\Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj" />
     <PackageVersionVariableReference Include="$(RepositoryRoot)src\Identity\UI\src\Microsoft.AspNetCore.Identity.UI.csproj" />
     <PackageVersionVariableReference Include="$(RepositoryRoot)src\Middleware\Diagnostics.EntityFrameworkCore\src\Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.csproj" />
-    <PackageVersionVariableReference Include="$(RepositoryRoot)src\Mvc\src\Microsoft.AspNetCore.Mvc.NewtonsoftJson\Microsoft.AspNetCore.Mvc.NewtonsoftJson.csproj" />
-    <PackageVersionVariableReference Include="$(RepositoryRoot)src\Mvc\src\Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation\Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj" />
+    <PackageVersionVariableReference Include="$(RepositoryRoot)src\Mvc\Mvc.NewtonsoftJson\src\Microsoft.AspNetCore.Mvc.NewtonsoftJson.csproj" />
+    <PackageVersionVariableReference Include="$(RepositoryRoot)src\Mvc\Mvc.Razor.RuntimeCompilation\src\Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj b/src/ProjectTemplates/Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj
index 67e73ec7b4..f82d813ea8 100644
--- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj
+++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj
@@ -11,7 +11,7 @@
 
   <ItemGroup>
     <!-- These projects product packages that the templates depend on. See GenerateContent.targets -->
-    <PackageVersionVariableReference Include="$(RepositoryRoot)src\Mvc\src\Microsoft.AspNetCore.Mvc.NewtonsoftJson\Microsoft.AspNetCore.Mvc.NewtonsoftJson.csproj" />
+    <PackageVersionVariableReference Include="$(RepositoryRoot)src\Mvc\Mvc.NewtonsoftJson\src\Microsoft.AspNetCore.Mvc.NewtonsoftJson.csproj" />
     <PackageVersionVariableReference Include="$(RepositoryRoot)src\Middleware\SpaServices.Extensions\src\Microsoft.AspNetCore.SpaServices.Extensions.csproj" />
   </ItemGroup>
 
diff --git a/src/Security/AuthSamples.sln b/src/Security/AuthSamples.sln
index c18f74b920..eb15591240 100644
--- a/src/Security/AuthSamples.sln
+++ b/src/Security/AuthSamples.sln
@@ -34,11 +34,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.TestHost", "..\Hosting\TestHost\src\Microsoft.AspNetCore.TestHost.csproj", "{3A896D09-1E29-454A-983B-7E2060370727}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Testing", "..\Mvc\src\Microsoft.AspNetCore.Mvc.Testing\Microsoft.AspNetCore.Mvc.Testing.csproj", "{941DD8A4-1611-4022-AD67-0CBDC6B5B8CB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Testing", "..\Mvc\Mvc.Testing\src\Microsoft.AspNetCore.Mvc.Testing.csproj", "{941DD8A4-1611-4022-AD67-0CBDC6B5B8CB}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Cookies", "Authentication\Cookies\src\Microsoft.AspNetCore.Authentication.Cookies.csproj", "{2944F22B-746E-467B-A6FC-C003E32C3143}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc", "..\Mvc\src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj", "{A3053CD2-9CE9-4C30-9E25-9CAEF950B137}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc", "..\Mvc\Mvc\src\Microsoft.AspNetCore.Mvc.csproj", "{A3053CD2-9CE9-4C30-9E25-9CAEF950B137}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.StaticFiles", "..\Middleware\StaticFiles\src\Microsoft.AspNetCore.StaticFiles.csproj", "{273EA5E9-9DFC-40B2-B4C2-80496ABE2675}"
 EndProject