diff --git a/Directory.Build.props b/Directory.Build.props
index f1c513da69c3e2d0cae7488f22c09db731bfa674..33711f8063a5c362c3e870e313fdab0dcb3c7f6f 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -39,7 +39,7 @@
 
   <PropertyGroup>
     <!-- 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\build\netstandard2.0\Microsoft.AspNetCore.Mvc.Testing.targets</MvcTestingTargets>
+    <MvcTestingTargets>$(MSBuildThisFileDirectory)src\Mvc\Mvc.Testing\src\build\netstandard2.0\Microsoft.AspNetCore.Mvc.Testing.targets</MvcTestingTargets>
   </PropertyGroup>
 
   <Import Project="eng\Dependencies.props" />
diff --git a/eng/ProjectReferences.props b/eng/ProjectReferences.props
index 3147f6a65a996caeda9a6a61107e9a437fcd43f7..319662235a1462e3a39989f8745654f091e8da24 100644
--- a/eng/ProjectReferences.props
+++ b/eng/ProjectReferences.props
@@ -100,25 +100,25 @@
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib" ProjectPath="$(RepositoryRoot)src\Razor\test\testassets\Razor.Test.MvcShim.ClassLib\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X" ProjectPath="$(RepositoryRoot)src\Razor\test\testassets\Razor.Test.MvcShim.Version1_X\Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Razor.Test.MvcShim" ProjectPath="$(RepositoryRoot)src\Razor\test\testassets\Razor.Test.MvcShim\Microsoft.AspNetCore.Razor.Test.MvcShim.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.Analyzers.Experimental" ProjectPath="$(RepositoryRoot)src\Mvc\src\Microsoft.AspNetCore.Mvc.Analyzers.Experimental\Microsoft.AspNetCore.Mvc.Analyzers.Experimental.csproj" />
-    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.Analyzers" ProjectPath="$(RepositoryRoot)src\Mvc\src\Microsoft.AspNetCore.Mvc.Analyzers\Microsoft.AspNetCore.Mvc.Analyzers.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.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.WebApiCompatShim" ProjectPath="$(RepositoryRoot)src\Mvc\src\Microsoft.AspNetCore.Mvc.WebApiCompatShim\Microsoft.AspNetCore.Mvc.WebApiCompatShim.csproj" />
-    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc" ProjectPath="$(RepositoryRoot)src\Mvc\src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj" />
-    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.TestCommon" ProjectPath="$(RepositoryRoot)src\Mvc\test\Microsoft.AspNetCore.Mvc.TestCommon\Microsoft.AspNetCore.Mvc.TestCommon.csproj" />
-    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.TestDiagnosticListener" ProjectPath="$(RepositoryRoot)src\Mvc\test\Microsoft.AspNetCore.Mvc.TestDiagnosticListener\Microsoft.AspNetCore.Mvc.TestDiagnosticListener.csproj" />
+    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.Abstractions" ProjectPath="$(RepositoryRoot)src\Mvc\Mvc.Abstractions\src\Microsoft.AspNetCore.Mvc.Abstractions.csproj" />
+    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.Analyzers.Experimental" ProjectPath="$(RepositoryRoot)src\Mvc\Mvc.Analyzers.Experimental\src\Microsoft.AspNetCore.Mvc.Analyzers.Experimental.csproj" />
+    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.Analyzers" ProjectPath="$(RepositoryRoot)src\Mvc\Mvc.Analyzers\src\Microsoft.AspNetCore.Mvc.Analyzers.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.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.WebApiCompatShim" ProjectPath="$(RepositoryRoot)src\Mvc\Mvc.WebApiCompatShim\src\Microsoft.AspNetCore.Mvc.WebApiCompatShim.csproj" />
+    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc" ProjectPath="$(RepositoryRoot)src\Mvc\Mvc\src\Microsoft.AspNetCore.Mvc.csproj" />
+    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.TestCommon" ProjectPath="$(RepositoryRoot)src\Mvc\shared\Mvc.TestCommon\Microsoft.AspNetCore.Mvc.TestCommon.csproj" />
+    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.TestDiagnosticListener" ProjectPath="$(RepositoryRoot)src\Mvc\shared\Mvc.TestDiagnosticListener\Microsoft.AspNetCore.Mvc.TestDiagnosticListener.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.Razor.ViewCompilation" ProjectPath="$(RepositoryRoot)src\Mvc\ViewCompilation\src\Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.ApplicationInsights.HostingStartup" ProjectPath="$(RepositoryRoot)src\Azure\ApplicationInsights.HostingStartup\src\Microsoft.AspNetCore.ApplicationInsights.HostingStartup.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Authentication.AzureAD.UI" ProjectPath="$(RepositoryRoot)src\Azure\AzureAD\Authentication.AzureAD.UI\src\Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj" />
diff --git a/src/Azure/Azure.sln b/src/Azure/Azure.sln
index 52aeadf5e3d91c7c3e893fb11b922c7133b87013..99ecc332e016a9d5f3ba51a45032f9fe2ecbb872 100644
--- a/src/Azure/Azure.sln
+++ b/src/Azure/Azure.sln
@@ -45,9 +45,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}") = "ApplicationInsights.HostingStartup", "ApplicationInsights.HostingStartup", "{EE98F905-C0E0-4A09-8B0E-5F8728EB14CF}"
 EndProject
diff --git a/src/Identity/Identity.sln b/src/Identity/Identity.sln
index ea87790dda6dda3d0fad3dbcf39b83e22c6c5f39..f0de34ce2f6ed8252473d57c07aba81ac31de2fe 100644
--- a/src/Identity/Identity.sln
+++ b/src/Identity/Identity.sln
@@ -51,7 +51,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authen
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.StaticFiles", "..\Middleware\StaticFiles\src\Microsoft.AspNetCore.StaticFiles.csproj", "{031CB4EE-B043-4FC6-9D02-18EC60D47B87}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Testing", "..\Mvc\src\Microsoft.AspNetCore.Mvc.Testing\Microsoft.AspNetCore.Mvc.Testing.csproj", "{D3EEC342-6362-4C61-9E42-957063901C10}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Testing", "..\Mvc\Mvc.Testing\src\Microsoft.AspNetCore.Mvc.Testing.csproj", "{D3EEC342-6362-4C61-9E42-957063901C10}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Core", "..\Servers\Kestrel\Core\src\Microsoft.AspNetCore.Server.Kestrel.Core.csproj", "{3305D777-062C-4F8B-BCA6-23C1871504F8}"
 EndProject
@@ -67,9 +67,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.DataPr
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Google", "..\Security\Authentication\Google\src\Microsoft.AspNetCore.Authentication.Google.csproj", "{9866C7F8-CFAD-48EF-8FA7-8E513D4EEB94}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc", "..\Mvc\src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj", "{0A7B4840-5C94-4AA4-B5FA-4B6FE1F24509}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc", "..\Mvc\Mvc\src\Microsoft.AspNetCore.Mvc.csproj", "{0A7B4840-5C94-4AA4-B5FA-4B6FE1F24509}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Core", "..\Mvc\src\Microsoft.AspNetCore.Mvc.Core\Microsoft.AspNetCore.Mvc.Core.csproj", "{89D4ADBA-8124-4B4B-9E25-12FBF6976EE1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Core", "..\Mvc\Mvc.Core\src\Microsoft.AspNetCore.Mvc.Core.csproj", "{89D4ADBA-8124-4B4B-9E25-12FBF6976EE1}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore", "..\Middleware\Diagnostics.EntityFrameworkCore\src\Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.csproj", "{2ABD07B2-9CA8-4A8D-BD8D-275B5B6E4E28}"
 EndProject
diff --git a/src/Mvc/test/Directory.Build.props b/src/Mvc/Directory.Build.props
similarity index 86%
rename from src/Mvc/test/Directory.Build.props
rename to src/Mvc/Directory.Build.props
index 89ce3386f597c4fd3c31b8258ee9395e9b0ae970..c1c5d2d1e05259c1813fd2d77271b608491a86b2 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>
     <WarningsNotAsErrors>xUnit1026:$(WarningsNotAsErrors)</WarningsNotAsErrors>
     <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)MvcTests.ruleset</CodeAnalysisRuleSet>
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 100%
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
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.Experimental/ActionsMustNotBeAsyncVoidAnalyzer.cs b/src/Mvc/Mvc.Analyzers.Experimental/src/ActionsMustNotBeAsyncVoidAnalyzer.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/ActionsMustNotBeAsyncVoidAnalyzer.cs
rename to src/Mvc/Mvc.Analyzers.Experimental/src/ActionsMustNotBeAsyncVoidAnalyzer.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/ActionsMustNotBeAsyncVoidFixProvider.cs b/src/Mvc/Mvc.Analyzers.Experimental/src/ActionsMustNotBeAsyncVoidFixProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/ActionsMustNotBeAsyncVoidFixProvider.cs
rename to src/Mvc/Mvc.Analyzers.Experimental/src/ActionsMustNotBeAsyncVoidFixProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/ApiActionsAreAttributeRoutedAnalyzer.cs b/src/Mvc/Mvc.Analyzers.Experimental/src/ApiActionsAreAttributeRoutedAnalyzer.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/ApiActionsAreAttributeRoutedAnalyzer.cs
rename to src/Mvc/Mvc.Analyzers.Experimental/src/ApiActionsAreAttributeRoutedAnalyzer.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/ApiActionsAreAttributeRoutedFixProvider.cs b/src/Mvc/Mvc.Analyzers.Experimental/src/ApiActionsAreAttributeRoutedFixProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/ApiActionsAreAttributeRoutedFixProvider.cs
rename to src/Mvc/Mvc.Analyzers.Experimental/src/ApiActionsAreAttributeRoutedFixProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzer.cs b/src/Mvc/Mvc.Analyzers.Experimental/src/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzer.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzer.cs
rename to src/Mvc/Mvc.Analyzers.Experimental/src/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzer.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProvider.cs b/src/Mvc/Mvc.Analyzers.Experimental/src/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProvider.cs
rename to src/Mvc/Mvc.Analyzers.Experimental/src/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/ApiActionsShouldUseActionResultOfTAnalyzer.cs b/src/Mvc/Mvc.Analyzers.Experimental/src/ApiActionsShouldUseActionResultOfTAnalyzer.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/ApiActionsShouldUseActionResultOfTAnalyzer.cs
rename to src/Mvc/Mvc.Analyzers.Experimental/src/ApiActionsShouldUseActionResultOfTAnalyzer.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/ApiActionsShouldUseActionResultOfTCodeFixProvider.cs b/src/Mvc/Mvc.Analyzers.Experimental/src/ApiActionsShouldUseActionResultOfTCodeFixProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/ApiActionsShouldUseActionResultOfTCodeFixProvider.cs
rename to src/Mvc/Mvc.Analyzers.Experimental/src/ApiActionsShouldUseActionResultOfTCodeFixProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/ApiControllerAnalyzerBase.cs b/src/Mvc/Mvc.Analyzers.Experimental/src/ApiControllerAnalyzerBase.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/ApiControllerAnalyzerBase.cs
rename to src/Mvc/Mvc.Analyzers.Experimental/src/ApiControllerAnalyzerBase.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/ApiControllerAnalyzerContext.cs b/src/Mvc/Mvc.Analyzers.Experimental/src/ApiControllerAnalyzerContext.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/ApiControllerAnalyzerContext.cs
rename to src/Mvc/Mvc.Analyzers.Experimental/src/ApiControllerAnalyzerContext.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/CodeAnalysisExtensions.cs b/src/Mvc/Mvc.Analyzers.Experimental/src/CodeAnalysisExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/CodeAnalysisExtensions.cs
rename to src/Mvc/Mvc.Analyzers.Experimental/src/CodeAnalysisExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/ControllerAnalyzerBase.cs b/src/Mvc/Mvc.Analyzers.Experimental/src/ControllerAnalyzerBase.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/ControllerAnalyzerBase.cs
rename to src/Mvc/Mvc.Analyzers.Experimental/src/ControllerAnalyzerBase.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/ControllerAnalyzerContext.cs b/src/Mvc/Mvc.Analyzers.Experimental/src/ControllerAnalyzerContext.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/ControllerAnalyzerContext.cs
rename to src/Mvc/Mvc.Analyzers.Experimental/src/ControllerAnalyzerContext.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/DiagnosticDescriptors.cs b/src/Mvc/Mvc.Analyzers.Experimental/src/DiagnosticDescriptors.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/DiagnosticDescriptors.cs
rename to src/Mvc/Mvc.Analyzers.Experimental/src/DiagnosticDescriptors.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/Microsoft.AspNetCore.Mvc.Analyzers.Experimental.csproj b/src/Mvc/Mvc.Analyzers.Experimental/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental.csproj
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/Microsoft.AspNetCore.Mvc.Analyzers.Experimental.csproj
rename to src/Mvc/Mvc.Analyzers.Experimental/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental.csproj
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/TypeNames.cs b/src/Mvc/Mvc.Analyzers.Experimental/src/TypeNames.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/TypeNames.cs
rename to src/Mvc/Mvc.Analyzers.Experimental/src/TypeNames.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Experimental.Test/ActionsMustNotBeAsyncVoidFacts.cs b/src/Mvc/Mvc.Analyzers.Experimental/test/ActionsMustNotBeAsyncVoidFacts.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Experimental.Test/ActionsMustNotBeAsyncVoidFacts.cs
rename to src/Mvc/Mvc.Analyzers.Experimental/test/ActionsMustNotBeAsyncVoidFacts.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Experimental.Test/ApActionsDoNotRequireExplicitModelValidationCheckFacts.cs b/src/Mvc/Mvc.Analyzers.Experimental/test/ApActionsDoNotRequireExplicitModelValidationCheckFacts.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Experimental.Test/ApActionsDoNotRequireExplicitModelValidationCheckFacts.cs
rename to src/Mvc/Mvc.Analyzers.Experimental/test/ApActionsDoNotRequireExplicitModelValidationCheckFacts.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Experimental.Test/ApiActionsAreAttributeRoutedFacts.cs b/src/Mvc/Mvc.Analyzers.Experimental/test/ApiActionsAreAttributeRoutedFacts.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Experimental.Test/ApiActionsAreAttributeRoutedFacts.cs
rename to src/Mvc/Mvc.Analyzers.Experimental/test/ApiActionsAreAttributeRoutedFacts.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Experimental.Test/ApiActionsShouldUseActionResultOfTFacts.cs b/src/Mvc/Mvc.Analyzers.Experimental/test/ApiActionsShouldUseActionResultOfTFacts.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Experimental.Test/ApiActionsShouldUseActionResultOfTFacts.cs
rename to src/Mvc/Mvc.Analyzers.Experimental/test/ApiActionsShouldUseActionResultOfTFacts.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Experimental.Test/Microsoft.AspNetCore.Mvc.Analyzers.Experimental.Test.csproj b/src/Mvc/Mvc.Analyzers.Experimental/test/Microsoft.AspNetCore.Mvc.Analyzers.Experimental.Test.csproj
similarity index 80%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Experimental.Test/Microsoft.AspNetCore.Mvc.Analyzers.Experimental.Test.csproj
rename to src/Mvc/Mvc.Analyzers.Experimental/test/Microsoft.AspNetCore.Mvc.Analyzers.Experimental.Test.csproj
index 28d57650e697c4ee1b9fb47246c2695757bd61e2..cef6b16b2bce15f2bdbfcffacc35536a6b5d452a 100644
--- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Experimental.Test/Microsoft.AspNetCore.Mvc.Analyzers.Experimental.Test.csproj
+++ b/src/Mvc/Mvc.Analyzers.Experimental/test/Microsoft.AspNetCore.Mvc.Analyzers.Experimental.Test.csproj
@@ -7,7 +7,7 @@
 
   <ItemGroup>
     <None Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
-    <Compile Include="..\Microsoft.AspNetCore.Mvc.Analyzers.Test\Infrastructure\*.cs" Link="Infrastructure\%(FileName)%(Extension)" />
+    <Compile Include="..\..\Mvc.Analyzers\test\Infrastructure\*.cs" Link="Infrastructure\%(FileName)%(Extension)" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Experimental.Test/xunit.runner.json b/src/Mvc/Mvc.Analyzers.Experimental/test/xunit.runner.json
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Experimental.Test/xunit.runner.json
rename to src/Mvc/Mvc.Analyzers.Experimental/test/xunit.runner.json
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/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/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/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/Microsoft.AspNetCore.Mvc.Analyzers.Test/AvoidHtmlPartialAnalyzerTest.cs b/src/Mvc/Mvc.Analyzers/test/AvoidHtmlPartialAnalyzerTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/AvoidHtmlPartialAnalyzerTest.cs
rename to src/Mvc/Mvc.Analyzers/test/AvoidHtmlPartialAnalyzerTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/Infrastructure/AnalyzerTestBase.cs b/src/Mvc/Mvc.Analyzers/test/Infrastructure/AnalyzerTestBase.cs
similarity index 99%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/Infrastructure/AnalyzerTestBase.cs
rename to src/Mvc/Mvc.Analyzers/test/Infrastructure/AnalyzerTestBase.cs
index 73f2cae3f624bb35ddbf0d4deec6a919ca71040a..7fcdd90ff3964e49d0fcde01c02b51cc186d5fce 100644
--- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/Infrastructure/AnalyzerTestBase.cs
+++ b/src/Mvc/Mvc.Analyzers/test/Infrastructure/AnalyzerTestBase.cs
@@ -37,7 +37,7 @@ namespace Microsoft.AspNetCore.Mvc.Analyzers.Infrastructure
         protected Project CreateProjectFromFile([CallerMemberName] string fileName = "")
         {
             var solutionDirectory = TestPathUtilities.GetSolutionRootDirectory("Mvc");
-            var projectDirectory = Path.Combine(solutionDirectory, "test", GetType().Assembly.GetName().Name);
+            var projectDirectory = Path.Combine(solutionDirectory, "Mvc.Analyzers", "test");
 
             var filePath = Path.Combine(projectDirectory, "TestFiles", fileName + ".cs");
             if (!File.Exists(filePath))
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/Infrastructure/Assert.cs b/src/Mvc/Mvc.Analyzers/test/Infrastructure/Assert.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/Infrastructure/Assert.cs
rename to src/Mvc/Mvc.Analyzers/test/Infrastructure/Assert.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/Infrastructure/DiagnosticResult.cs b/src/Mvc/Mvc.Analyzers/test/Infrastructure/DiagnosticResult.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/Infrastructure/DiagnosticResult.cs
rename to src/Mvc/Mvc.Analyzers/test/Infrastructure/DiagnosticResult.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/Microsoft.AspNetCore.Mvc.Analyzers.Test.csproj b/src/Mvc/Mvc.Analyzers/test/Microsoft.AspNetCore.Mvc.Analyzers.Test.csproj
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/Microsoft.AspNetCore.Mvc.Analyzers.Test.csproj
rename to src/Mvc/Mvc.Analyzers/test/Microsoft.AspNetCore.Mvc.Analyzers.Test.csproj
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/TestFiles/DiagnosticsAreReturned_ForUseOfHtmlPartial.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/DiagnosticsAreReturned_ForUseOfHtmlPartial.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/TestFiles/DiagnosticsAreReturned_ForUseOfHtmlPartial.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/DiagnosticsAreReturned_ForUseOfHtmlPartial.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/TestFiles/DiagnosticsAreReturned_ForUseOfHtmlPartial_InSections.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/DiagnosticsAreReturned_ForUseOfHtmlPartial_InSections.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/TestFiles/DiagnosticsAreReturned_ForUseOfHtmlPartial_InSections.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/DiagnosticsAreReturned_ForUseOfHtmlPartial_InSections.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/TestFiles/DiagnosticsAreReturned_ForUseOfHtmlPartial_WithAdditionalParameters.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/DiagnosticsAreReturned_ForUseOfHtmlPartial_WithAdditionalParameters.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/TestFiles/DiagnosticsAreReturned_ForUseOfHtmlPartial_WithAdditionalParameters.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/DiagnosticsAreReturned_ForUseOfHtmlPartial_WithAdditionalParameters.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/TestFiles/DiagnosticsAreReturned_ForUseOfRenderPartial.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/DiagnosticsAreReturned_ForUseOfRenderPartial.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/TestFiles/DiagnosticsAreReturned_ForUseOfRenderPartial.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/DiagnosticsAreReturned_ForUseOfRenderPartial.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/TestFiles/DiagnosticsAreReturned_ForUseOfRenderPartial_InSections.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/DiagnosticsAreReturned_ForUseOfRenderPartial_InSections.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/TestFiles/DiagnosticsAreReturned_ForUseOfRenderPartial_InSections.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/DiagnosticsAreReturned_ForUseOfRenderPartial_InSections.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/TestFiles/DiagnosticsAreReturned_ForUseOfRenderPartial_WithAdditionalParameters.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/DiagnosticsAreReturned_ForUseOfRenderPartial_WithAdditionalParameters.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/TestFiles/DiagnosticsAreReturned_ForUseOfRenderPartial_WithAdditionalParameters.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/DiagnosticsAreReturned_ForUseOfRenderPartial_WithAdditionalParameters.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/TestFiles/NoDiagnosticsAreReturned_ForNonUseOfHtmlPartial.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/NoDiagnosticsAreReturned_ForNonUseOfHtmlPartial.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/TestFiles/NoDiagnosticsAreReturned_ForNonUseOfHtmlPartial.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/NoDiagnosticsAreReturned_ForNonUseOfHtmlPartial.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/TestFiles/NoDiagnosticsAreReturned_ForUseOfHtmlPartialAsync.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/NoDiagnosticsAreReturned_ForUseOfHtmlPartialAsync.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/TestFiles/NoDiagnosticsAreReturned_ForUseOfHtmlPartialAsync.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/NoDiagnosticsAreReturned_ForUseOfHtmlPartialAsync.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/TestFiles/NoDiagnosticsAreReturned_ForUseOfRenderPartialAsync.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/NoDiagnosticsAreReturned_ForUseOfRenderPartialAsync.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/TestFiles/NoDiagnosticsAreReturned_ForUseOfRenderPartialAsync.cs
rename to src/Mvc/Mvc.Analyzers/test/TestFiles/NoDiagnosticsAreReturned_ForUseOfRenderPartialAsync.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/xunit.runner.json b/src/Mvc/Mvc.Analyzers/test/xunit.runner.json
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/xunit.runner.json
rename to src/Mvc/Mvc.Analyzers/test/xunit.runner.json
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/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/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 100%
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
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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/Internal/AcceptHeaderParser.cs b/src/Mvc/Mvc.Core/src/Internal/AcceptHeaderParser.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/AcceptHeaderParser.cs
rename to src/Mvc/Mvc.Core/src/Internal/AcceptHeaderParser.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ActionAttributeRouteModel.cs b/src/Mvc/Mvc.Core/src/Internal/ActionAttributeRouteModel.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ActionAttributeRouteModel.cs
rename to src/Mvc/Mvc.Core/src/Internal/ActionAttributeRouteModel.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ActionConstraintCache.cs b/src/Mvc/Mvc.Core/src/Internal/ActionConstraintCache.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ActionConstraintCache.cs
rename to src/Mvc/Mvc.Core/src/Internal/ActionConstraintCache.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ActionDescriptorCollectionProvider.cs b/src/Mvc/Mvc.Core/src/Internal/ActionDescriptorCollectionProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ActionDescriptorCollectionProvider.cs
rename to src/Mvc/Mvc.Core/src/Internal/ActionDescriptorCollectionProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ActionInvokerFactory.cs b/src/Mvc/Mvc.Core/src/Internal/ActionInvokerFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ActionInvokerFactory.cs
rename to src/Mvc/Mvc.Core/src/Internal/ActionInvokerFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ActionMethodExecutor.cs b/src/Mvc/Mvc.Core/src/Internal/ActionMethodExecutor.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ActionMethodExecutor.cs
rename to src/Mvc/Mvc.Core/src/Internal/ActionMethodExecutor.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ActionResultTypeMapper.cs b/src/Mvc/Mvc.Core/src/Internal/ActionResultTypeMapper.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ActionResultTypeMapper.cs
rename to src/Mvc/Mvc.Core/src/Internal/ActionResultTypeMapper.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ActionSelector.cs b/src/Mvc/Mvc.Core/src/Internal/ActionSelector.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ActionSelector.cs
rename to src/Mvc/Mvc.Core/src/Internal/ActionSelector.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/AmbiguousActionException.cs b/src/Mvc/Mvc.Core/src/Internal/AmbiguousActionException.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/AmbiguousActionException.cs
rename to src/Mvc/Mvc.Core/src/Internal/AmbiguousActionException.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ApiBehaviorApplicationModelProvider.cs b/src/Mvc/Mvc.Core/src/Internal/ApiBehaviorApplicationModelProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ApiBehaviorApplicationModelProvider.cs
rename to src/Mvc/Mvc.Core/src/Internal/ApiBehaviorApplicationModelProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ApiBehaviorOptionsSetup.cs b/src/Mvc/Mvc.Core/src/Internal/ApiBehaviorOptionsSetup.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ApiBehaviorOptionsSetup.cs
rename to src/Mvc/Mvc.Core/src/Internal/ApiBehaviorOptionsSetup.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ApiDescriptionActionData.cs b/src/Mvc/Mvc.Core/src/Internal/ApiDescriptionActionData.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ApiDescriptionActionData.cs
rename to src/Mvc/Mvc.Core/src/Internal/ApiDescriptionActionData.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ApplicationModelConventions.cs b/src/Mvc/Mvc.Core/src/Internal/ApplicationModelConventions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ApplicationModelConventions.cs
rename to src/Mvc/Mvc.Core/src/Internal/ApplicationModelConventions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/AttributeRoute.cs b/src/Mvc/Mvc.Core/src/Internal/AttributeRoute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/AttributeRoute.cs
rename to src/Mvc/Mvc.Core/src/Internal/AttributeRoute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/AttributeRouting.cs b/src/Mvc/Mvc.Core/src/Internal/AttributeRouting.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/AttributeRouting.cs
rename to src/Mvc/Mvc.Core/src/Internal/AttributeRouting.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/AuthorizationApplicationModelProvider.cs b/src/Mvc/Mvc.Core/src/Internal/AuthorizationApplicationModelProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/AuthorizationApplicationModelProvider.cs
rename to src/Mvc/Mvc.Core/src/Internal/AuthorizationApplicationModelProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ClientValidatorCache.cs b/src/Mvc/Mvc.Core/src/Internal/ClientValidatorCache.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ClientValidatorCache.cs
rename to src/Mvc/Mvc.Core/src/Internal/ClientValidatorCache.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerActionDescriptorBuilder.cs b/src/Mvc/Mvc.Core/src/Internal/ControllerActionDescriptorBuilder.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerActionDescriptorBuilder.cs
rename to src/Mvc/Mvc.Core/src/Internal/ControllerActionDescriptorBuilder.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerActionDescriptorProvider.cs b/src/Mvc/Mvc.Core/src/Internal/ControllerActionDescriptorProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerActionDescriptorProvider.cs
rename to src/Mvc/Mvc.Core/src/Internal/ControllerActionDescriptorProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerActionFilter.cs b/src/Mvc/Mvc.Core/src/Internal/ControllerActionFilter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerActionFilter.cs
rename to src/Mvc/Mvc.Core/src/Internal/ControllerActionFilter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerActionInvoker.cs b/src/Mvc/Mvc.Core/src/Internal/ControllerActionInvoker.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerActionInvoker.cs
rename to src/Mvc/Mvc.Core/src/Internal/ControllerActionInvoker.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerActionInvokerCache.cs b/src/Mvc/Mvc.Core/src/Internal/ControllerActionInvokerCache.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerActionInvokerCache.cs
rename to src/Mvc/Mvc.Core/src/Internal/ControllerActionInvokerCache.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerActionInvokerCacheEntry.cs b/src/Mvc/Mvc.Core/src/Internal/ControllerActionInvokerCacheEntry.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerActionInvokerCacheEntry.cs
rename to src/Mvc/Mvc.Core/src/Internal/ControllerActionInvokerCacheEntry.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerActionInvokerProvider.cs b/src/Mvc/Mvc.Core/src/Internal/ControllerActionInvokerProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerActionInvokerProvider.cs
rename to src/Mvc/Mvc.Core/src/Internal/ControllerActionInvokerProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerBinderDelegate.cs b/src/Mvc/Mvc.Core/src/Internal/ControllerBinderDelegate.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerBinderDelegate.cs
rename to src/Mvc/Mvc.Core/src/Internal/ControllerBinderDelegate.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerBinderDelegateProvider.cs b/src/Mvc/Mvc.Core/src/Internal/ControllerBinderDelegateProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerBinderDelegateProvider.cs
rename to src/Mvc/Mvc.Core/src/Internal/ControllerBinderDelegateProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerResultFilter.cs b/src/Mvc/Mvc.Core/src/Internal/ControllerResultFilter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerResultFilter.cs
rename to src/Mvc/Mvc.Core/src/Internal/ControllerResultFilter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/CopyOnWriteList.cs b/src/Mvc/Mvc.Core/src/Internal/CopyOnWriteList.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/CopyOnWriteList.cs
rename to src/Mvc/Mvc.Core/src/Internal/CopyOnWriteList.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultActionConstraintProvider.cs b/src/Mvc/Mvc.Core/src/Internal/DefaultActionConstraintProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultActionConstraintProvider.cs
rename to src/Mvc/Mvc.Core/src/Internal/DefaultActionConstraintProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultApplicationModelProvider.cs b/src/Mvc/Mvc.Core/src/Internal/DefaultApplicationModelProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultApplicationModelProvider.cs
rename to src/Mvc/Mvc.Core/src/Internal/DefaultApplicationModelProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultBindingMetadataProvider.cs b/src/Mvc/Mvc.Core/src/Internal/DefaultBindingMetadataProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultBindingMetadataProvider.cs
rename to src/Mvc/Mvc.Core/src/Internal/DefaultBindingMetadataProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultCollectionValidationStrategy.cs b/src/Mvc/Mvc.Core/src/Internal/DefaultCollectionValidationStrategy.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultCollectionValidationStrategy.cs
rename to src/Mvc/Mvc.Core/src/Internal/DefaultCollectionValidationStrategy.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultComplexObjectValidationStrategy.cs b/src/Mvc/Mvc.Core/src/Internal/DefaultComplexObjectValidationStrategy.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultComplexObjectValidationStrategy.cs
rename to src/Mvc/Mvc.Core/src/Internal/DefaultComplexObjectValidationStrategy.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultCompositeMetadataDetailsProvider.cs b/src/Mvc/Mvc.Core/src/Internal/DefaultCompositeMetadataDetailsProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultCompositeMetadataDetailsProvider.cs
rename to src/Mvc/Mvc.Core/src/Internal/DefaultCompositeMetadataDetailsProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultControllerPropertyActivator.cs b/src/Mvc/Mvc.Core/src/Internal/DefaultControllerPropertyActivator.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultControllerPropertyActivator.cs
rename to src/Mvc/Mvc.Core/src/Internal/DefaultControllerPropertyActivator.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultFilterProvider.cs b/src/Mvc/Mvc.Core/src/Internal/DefaultFilterProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultFilterProvider.cs
rename to src/Mvc/Mvc.Core/src/Internal/DefaultFilterProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultModelBindingContext.cs b/src/Mvc/Mvc.Core/src/Internal/DefaultModelBindingContext.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultModelBindingContext.cs
rename to src/Mvc/Mvc.Core/src/Internal/DefaultModelBindingContext.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultModelValidatorProvider.cs b/src/Mvc/Mvc.Core/src/Internal/DefaultModelValidatorProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultModelValidatorProvider.cs
rename to src/Mvc/Mvc.Core/src/Internal/DefaultModelValidatorProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultObjectValidator.cs b/src/Mvc/Mvc.Core/src/Internal/DefaultObjectValidator.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultObjectValidator.cs
rename to src/Mvc/Mvc.Core/src/Internal/DefaultObjectValidator.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultValidationMetadataProvider.cs b/src/Mvc/Mvc.Core/src/Internal/DefaultValidationMetadataProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultValidationMetadataProvider.cs
rename to src/Mvc/Mvc.Core/src/Internal/DefaultValidationMetadataProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/DisableRequestSizeLimitFilter.cs b/src/Mvc/Mvc.Core/src/Internal/DisableRequestSizeLimitFilter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/DisableRequestSizeLimitFilter.cs
rename to src/Mvc/Mvc.Core/src/Internal/DisableRequestSizeLimitFilter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ElementalValueProvider.cs b/src/Mvc/Mvc.Core/src/Internal/ElementalValueProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ElementalValueProvider.cs
rename to src/Mvc/Mvc.Core/src/Internal/ElementalValueProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ExplicitIndexCollectionValidationStrategy.cs b/src/Mvc/Mvc.Core/src/Internal/ExplicitIndexCollectionValidationStrategy.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ExplicitIndexCollectionValidationStrategy.cs
rename to src/Mvc/Mvc.Core/src/Internal/ExplicitIndexCollectionValidationStrategy.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/FilterCursor.cs b/src/Mvc/Mvc.Core/src/Internal/FilterCursor.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/FilterCursor.cs
rename to src/Mvc/Mvc.Core/src/Internal/FilterCursor.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/FilterCursorItem.cs b/src/Mvc/Mvc.Core/src/Internal/FilterCursorItem.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/FilterCursorItem.cs
rename to src/Mvc/Mvc.Core/src/Internal/FilterCursorItem.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/FilterDescriptorOrderComparer.cs b/src/Mvc/Mvc.Core/src/Internal/FilterDescriptorOrderComparer.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/FilterDescriptorOrderComparer.cs
rename to src/Mvc/Mvc.Core/src/Internal/FilterDescriptorOrderComparer.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/FilterFactory.cs b/src/Mvc/Mvc.Core/src/Internal/FilterFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/FilterFactory.cs
rename to src/Mvc/Mvc.Core/src/Internal/FilterFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/FilterFactoryResult.cs b/src/Mvc/Mvc.Core/src/Internal/FilterFactoryResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/FilterFactoryResult.cs
rename to src/Mvc/Mvc.Core/src/Internal/FilterFactoryResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/HttpMethodActionConstraint.cs b/src/Mvc/Mvc.Core/src/Internal/HttpMethodActionConstraint.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/HttpMethodActionConstraint.cs
rename to src/Mvc/Mvc.Core/src/Internal/HttpMethodActionConstraint.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/HttpParseResult.cs b/src/Mvc/Mvc.Core/src/Internal/HttpParseResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/HttpParseResult.cs
rename to src/Mvc/Mvc.Core/src/Internal/HttpParseResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/HttpTokenParsingRules.cs b/src/Mvc/Mvc.Core/src/Internal/HttpTokenParsingRules.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/HttpTokenParsingRules.cs
rename to src/Mvc/Mvc.Core/src/Internal/HttpTokenParsingRules.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/IApiBehaviorMetadata.cs b/src/Mvc/Mvc.Core/src/Internal/IApiBehaviorMetadata.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/IApiBehaviorMetadata.cs
rename to src/Mvc/Mvc.Core/src/Internal/IApiBehaviorMetadata.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/IConsumesActionConstraint.cs b/src/Mvc/Mvc.Core/src/Internal/IConsumesActionConstraint.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/IConsumesActionConstraint.cs
rename to src/Mvc/Mvc.Core/src/Internal/IConsumesActionConstraint.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/IControllerPropertyActivatorFactory.cs b/src/Mvc/Mvc.Core/src/Internal/IControllerPropertyActivatorFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/IControllerPropertyActivatorFactory.cs
rename to src/Mvc/Mvc.Core/src/Internal/IControllerPropertyActivatorFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/IFormatFilter.cs b/src/Mvc/Mvc.Core/src/Internal/IFormatFilter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/IFormatFilter.cs
rename to src/Mvc/Mvc.Core/src/Internal/IFormatFilter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/IMiddlewareFilterFeature.cs b/src/Mvc/Mvc.Core/src/Internal/IMiddlewareFilterFeature.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/IMiddlewareFilterFeature.cs
rename to src/Mvc/Mvc.Core/src/Internal/IMiddlewareFilterFeature.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/IParameterInfoParameterDescriptor.cs b/src/Mvc/Mvc.Core/src/Internal/IParameterInfoParameterDescriptor.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/IParameterInfoParameterDescriptor.cs
rename to src/Mvc/Mvc.Core/src/Internal/IParameterInfoParameterDescriptor.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/IPropertyInfoParameterDescriptor.cs b/src/Mvc/Mvc.Core/src/Internal/IPropertyInfoParameterDescriptor.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/IPropertyInfoParameterDescriptor.cs
rename to src/Mvc/Mvc.Core/src/Internal/IPropertyInfoParameterDescriptor.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/IResponseCacheFilter.cs b/src/Mvc/Mvc.Core/src/Internal/IResponseCacheFilter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/IResponseCacheFilter.cs
rename to src/Mvc/Mvc.Core/src/Internal/IResponseCacheFilter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ITypeActivatorCache.cs b/src/Mvc/Mvc.Core/src/Internal/ITypeActivatorCache.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ITypeActivatorCache.cs
rename to src/Mvc/Mvc.Core/src/Internal/ITypeActivatorCache.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MediaTypeSegmentWithQuality.cs b/src/Mvc/Mvc.Core/src/Internal/MediaTypeSegmentWithQuality.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MediaTypeSegmentWithQuality.cs
rename to src/Mvc/Mvc.Core/src/Internal/MediaTypeSegmentWithQuality.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MemoryPoolHttpRequestStreamReaderFactory.cs b/src/Mvc/Mvc.Core/src/Internal/MemoryPoolHttpRequestStreamReaderFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MemoryPoolHttpRequestStreamReaderFactory.cs
rename to src/Mvc/Mvc.Core/src/Internal/MemoryPoolHttpRequestStreamReaderFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MemoryPoolHttpResponseStreamWriterFactory.cs b/src/Mvc/Mvc.Core/src/Internal/MemoryPoolHttpResponseStreamWriterFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MemoryPoolHttpResponseStreamWriterFactory.cs
rename to src/Mvc/Mvc.Core/src/Internal/MemoryPoolHttpResponseStreamWriterFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MiddlewareFilter.cs b/src/Mvc/Mvc.Core/src/Internal/MiddlewareFilter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MiddlewareFilter.cs
rename to src/Mvc/Mvc.Core/src/Internal/MiddlewareFilter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MiddlewareFilterBuilder.cs b/src/Mvc/Mvc.Core/src/Internal/MiddlewareFilterBuilder.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MiddlewareFilterBuilder.cs
rename to src/Mvc/Mvc.Core/src/Internal/MiddlewareFilterBuilder.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MiddlewareFilterConfigurationProvider.cs b/src/Mvc/Mvc.Core/src/Internal/MiddlewareFilterConfigurationProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MiddlewareFilterConfigurationProvider.cs
rename to src/Mvc/Mvc.Core/src/Internal/MiddlewareFilterConfigurationProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MiddlewareFilterFeature.cs b/src/Mvc/Mvc.Core/src/Internal/MiddlewareFilterFeature.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MiddlewareFilterFeature.cs
rename to src/Mvc/Mvc.Core/src/Internal/MiddlewareFilterFeature.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MvcAttributeRouteHandler.cs b/src/Mvc/Mvc.Core/src/Internal/MvcAttributeRouteHandler.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MvcAttributeRouteHandler.cs
rename to src/Mvc/Mvc.Core/src/Internal/MvcAttributeRouteHandler.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MvcBuilder.cs b/src/Mvc/Mvc.Core/src/Internal/MvcBuilder.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MvcBuilder.cs
rename to src/Mvc/Mvc.Core/src/Internal/MvcBuilder.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MvcCoreBuilder.cs b/src/Mvc/Mvc.Core/src/Internal/MvcCoreBuilder.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MvcCoreBuilder.cs
rename to src/Mvc/Mvc.Core/src/Internal/MvcCoreBuilder.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MvcCoreDiagnosticSourceExtensions.cs b/src/Mvc/Mvc.Core/src/Internal/MvcCoreDiagnosticSourceExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MvcCoreDiagnosticSourceExtensions.cs
rename to src/Mvc/Mvc.Core/src/Internal/MvcCoreDiagnosticSourceExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MvcCoreLoggerExtensions.cs b/src/Mvc/Mvc.Core/src/Internal/MvcCoreLoggerExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MvcCoreLoggerExtensions.cs
rename to src/Mvc/Mvc.Core/src/Internal/MvcCoreLoggerExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MvcCoreMvcOptionsSetup.cs b/src/Mvc/Mvc.Core/src/Internal/MvcCoreMvcOptionsSetup.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MvcCoreMvcOptionsSetup.cs
rename to src/Mvc/Mvc.Core/src/Internal/MvcCoreMvcOptionsSetup.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MvcCoreRouteOptionsSetup.cs b/src/Mvc/Mvc.Core/src/Internal/MvcCoreRouteOptionsSetup.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MvcCoreRouteOptionsSetup.cs
rename to src/Mvc/Mvc.Core/src/Internal/MvcCoreRouteOptionsSetup.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MvcMarkerService.cs b/src/Mvc/Mvc.Core/src/Internal/MvcMarkerService.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MvcMarkerService.cs
rename to src/Mvc/Mvc.Core/src/Internal/MvcMarkerService.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MvcRouteHandler.cs b/src/Mvc/Mvc.Core/src/Internal/MvcRouteHandler.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MvcRouteHandler.cs
rename to src/Mvc/Mvc.Core/src/Internal/MvcRouteHandler.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/NoOpBinder.cs b/src/Mvc/Mvc.Core/src/Internal/NoOpBinder.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/NoOpBinder.cs
rename to src/Mvc/Mvc.Core/src/Internal/NoOpBinder.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/NonDisposableStream.cs b/src/Mvc/Mvc.Core/src/Internal/NonDisposableStream.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/NonDisposableStream.cs
rename to src/Mvc/Mvc.Core/src/Internal/NonDisposableStream.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/NormalizedRouteValue.cs b/src/Mvc/Mvc.Core/src/Internal/NormalizedRouteValue.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/NormalizedRouteValue.cs
rename to src/Mvc/Mvc.Core/src/Internal/NormalizedRouteValue.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ParameterDefaultValues.cs b/src/Mvc/Mvc.Core/src/Internal/ParameterDefaultValues.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ParameterDefaultValues.cs
rename to src/Mvc/Mvc.Core/src/Internal/ParameterDefaultValues.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/PlaceholderBinder.cs b/src/Mvc/Mvc.Core/src/Internal/PlaceholderBinder.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/PlaceholderBinder.cs
rename to src/Mvc/Mvc.Core/src/Internal/PlaceholderBinder.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/PrefixContainer.cs b/src/Mvc/Mvc.Core/src/Internal/PrefixContainer.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/PrefixContainer.cs
rename to src/Mvc/Mvc.Core/src/Internal/PrefixContainer.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/PropertyValueSetter.cs b/src/Mvc/Mvc.Core/src/Internal/PropertyValueSetter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/PropertyValueSetter.cs
rename to src/Mvc/Mvc.Core/src/Internal/PropertyValueSetter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ReferenceEqualityComparer.cs b/src/Mvc/Mvc.Core/src/Internal/ReferenceEqualityComparer.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ReferenceEqualityComparer.cs
rename to src/Mvc/Mvc.Core/src/Internal/ReferenceEqualityComparer.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/RequestFormLimitsFilter.cs b/src/Mvc/Mvc.Core/src/Internal/RequestFormLimitsFilter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/RequestFormLimitsFilter.cs
rename to src/Mvc/Mvc.Core/src/Internal/RequestFormLimitsFilter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/RequestSizeLimitFilter.cs b/src/Mvc/Mvc.Core/src/Internal/RequestSizeLimitFilter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/RequestSizeLimitFilter.cs
rename to src/Mvc/Mvc.Core/src/Internal/RequestSizeLimitFilter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ResourceInvoker.cs b/src/Mvc/Mvc.Core/src/Internal/ResourceInvoker.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ResourceInvoker.cs
rename to src/Mvc/Mvc.Core/src/Internal/ResourceInvoker.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ResponseCacheFilter.cs b/src/Mvc/Mvc.Core/src/Internal/ResponseCacheFilter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ResponseCacheFilter.cs
rename to src/Mvc/Mvc.Core/src/Internal/ResponseCacheFilter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ResponseCacheFilterExecutor.cs b/src/Mvc/Mvc.Core/src/Internal/ResponseCacheFilterExecutor.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ResponseCacheFilterExecutor.cs
rename to src/Mvc/Mvc.Core/src/Internal/ResponseCacheFilterExecutor.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ResponseContentTypeHelper.cs b/src/Mvc/Mvc.Core/src/Internal/ResponseContentTypeHelper.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ResponseContentTypeHelper.cs
rename to src/Mvc/Mvc.Core/src/Internal/ResponseContentTypeHelper.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ShortFormDictionaryValidationStrategy.cs b/src/Mvc/Mvc.Core/src/Internal/ShortFormDictionaryValidationStrategy.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ShortFormDictionaryValidationStrategy.cs
rename to src/Mvc/Mvc.Core/src/Internal/ShortFormDictionaryValidationStrategy.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/TypeActivatorCache.cs b/src/Mvc/Mvc.Core/src/Internal/TypeActivatorCache.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/TypeActivatorCache.cs
rename to src/Mvc/Mvc.Core/src/Internal/TypeActivatorCache.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ValidatorCache.cs b/src/Mvc/Mvc.Core/src/Internal/ValidatorCache.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ValidatorCache.cs
rename to src/Mvc/Mvc.Core/src/Internal/ValidatorCache.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ViewEnginePath.cs b/src/Mvc/Mvc.Core/src/Internal/ViewEnginePath.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ViewEnginePath.cs
rename to src/Mvc/Mvc.Core/src/Internal/ViewEnginePath.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/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/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/Internal/ModelBindingHelper.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Internal/ModelBindingHelper.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Internal/ModelBindingHelper.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Internal/ModelBindingHelper.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Internal/ValidationStack.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Internal/ValidationStack.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Internal/ValidationStack.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Internal/ValidationStack.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/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/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/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/IModelMetadataProvider2.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Metadata/IModelMetadataProvider2.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/IModelMetadataProvider2.cs
rename to src/Mvc/Mvc.Core/src/ModelBinding/Metadata/IModelMetadataProvider2.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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/ApplicationModel/ActionModelTest.cs b/src/Mvc/Mvc.Core/test/ApplicationModel/ActionModelTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModel/ActionModelTest.cs
rename to src/Mvc/Mvc.Core/test/ApplicationModel/ActionModelTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModel/AttributeRouteModelTests.cs b/src/Mvc/Mvc.Core/test/ApplicationModel/AttributeRouteModelTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModel/AttributeRouteModelTests.cs
rename to src/Mvc/Mvc.Core/test/ApplicationModel/AttributeRouteModelTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModel/ControllerModelTest.cs b/src/Mvc/Mvc.Core/test/ApplicationModel/ControllerModelTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModel/ControllerModelTest.cs
rename to src/Mvc/Mvc.Core/test/ApplicationModel/ControllerModelTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModel/ParameterModelTest.cs b/src/Mvc/Mvc.Core/test/ApplicationModel/ParameterModelTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModel/ParameterModelTest.cs
rename to src/Mvc/Mvc.Core/test/ApplicationModel/ParameterModelTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModel/PropertyModelTest.cs b/src/Mvc/Mvc.Core/test/ApplicationModel/PropertyModelTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModel/PropertyModelTest.cs
rename to src/Mvc/Mvc.Core/test/ApplicationModel/PropertyModelTest.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/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/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/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/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/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/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/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/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/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/MvcRouteHandlerTests.cs b/src/Mvc/Mvc.Core/test/Infrastructure/MvcRouteHandlerTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/MvcRouteHandlerTests.cs
rename to src/Mvc/Mvc.Core/test/Infrastructure/MvcRouteHandlerTests.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/Internal/AcceptHeaderParserTest.cs b/src/Mvc/Mvc.Core/test/Internal/AcceptHeaderParserTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/AcceptHeaderParserTest.cs
rename to src/Mvc/Mvc.Core/test/Internal/AcceptHeaderParserTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ActionConstraintCacheTest.cs b/src/Mvc/Mvc.Core/test/Internal/ActionConstraintCacheTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ActionConstraintCacheTest.cs
rename to src/Mvc/Mvc.Core/test/Internal/ActionConstraintCacheTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ActionDescriptorCollectionProviderTest.cs b/src/Mvc/Mvc.Core/test/Internal/ActionDescriptorCollectionProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ActionDescriptorCollectionProviderTest.cs
rename to src/Mvc/Mvc.Core/test/Internal/ActionDescriptorCollectionProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ActionMethodExecutorTest.cs b/src/Mvc/Mvc.Core/test/Internal/ActionMethodExecutorTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ActionMethodExecutorTest.cs
rename to src/Mvc/Mvc.Core/test/Internal/ActionMethodExecutorTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ActionResultTypeMapperTest.cs b/src/Mvc/Mvc.Core/test/Internal/ActionResultTypeMapperTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ActionResultTypeMapperTest.cs
rename to src/Mvc/Mvc.Core/test/Internal/ActionResultTypeMapperTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ActionSelectorTest.cs b/src/Mvc/Mvc.Core/test/Internal/ActionSelectorTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ActionSelectorTest.cs
rename to src/Mvc/Mvc.Core/test/Internal/ActionSelectorTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ApiBehaviorApplicationModelProviderTest.cs b/src/Mvc/Mvc.Core/test/Internal/ApiBehaviorApplicationModelProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ApiBehaviorApplicationModelProviderTest.cs
rename to src/Mvc/Mvc.Core/test/Internal/ApiBehaviorApplicationModelProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/AttributeRouteTest.cs b/src/Mvc/Mvc.Core/test/Internal/AttributeRouteTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/AttributeRouteTest.cs
rename to src/Mvc/Mvc.Core/test/Internal/AttributeRouteTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/AttributeRoutingTest.cs b/src/Mvc/Mvc.Core/test/Internal/AttributeRoutingTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/AttributeRoutingTest.cs
rename to src/Mvc/Mvc.Core/test/Internal/AttributeRoutingTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/AuthorizationApplicationModelProviderTest.cs b/src/Mvc/Mvc.Core/test/Internal/AuthorizationApplicationModelProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/AuthorizationApplicationModelProviderTest.cs
rename to src/Mvc/Mvc.Core/test/Internal/AuthorizationApplicationModelProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ClientValidatorCacheTest.cs b/src/Mvc/Mvc.Core/test/Internal/ClientValidatorCacheTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ClientValidatorCacheTest.cs
rename to src/Mvc/Mvc.Core/test/Internal/ClientValidatorCacheTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ControllerActionDescriptorBuilderTest.cs b/src/Mvc/Mvc.Core/test/Internal/ControllerActionDescriptorBuilderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ControllerActionDescriptorBuilderTest.cs
rename to src/Mvc/Mvc.Core/test/Internal/ControllerActionDescriptorBuilderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ControllerActionDescriptorProviderTests.cs b/src/Mvc/Mvc.Core/test/Internal/ControllerActionDescriptorProviderTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ControllerActionDescriptorProviderTests.cs
rename to src/Mvc/Mvc.Core/test/Internal/ControllerActionDescriptorProviderTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ControllerActionInvokerCacheTest.cs b/src/Mvc/Mvc.Core/test/Internal/ControllerActionInvokerCacheTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ControllerActionInvokerCacheTest.cs
rename to src/Mvc/Mvc.Core/test/Internal/ControllerActionInvokerCacheTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ControllerActionInvokerTest.cs b/src/Mvc/Mvc.Core/test/Internal/ControllerActionInvokerTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ControllerActionInvokerTest.cs
rename to src/Mvc/Mvc.Core/test/Internal/ControllerActionInvokerTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ControllerBinderDelegateProviderTest.cs b/src/Mvc/Mvc.Core/test/Internal/ControllerBinderDelegateProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ControllerBinderDelegateProviderTest.cs
rename to src/Mvc/Mvc.Core/test/Internal/ControllerBinderDelegateProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/DefaultApplicationModelProviderTest.cs b/src/Mvc/Mvc.Core/test/Internal/DefaultApplicationModelProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/DefaultApplicationModelProviderTest.cs
rename to src/Mvc/Mvc.Core/test/Internal/DefaultApplicationModelProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/DefaultBindingMetadataProviderTest.cs b/src/Mvc/Mvc.Core/test/Internal/DefaultBindingMetadataProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/DefaultBindingMetadataProviderTest.cs
rename to src/Mvc/Mvc.Core/test/Internal/DefaultBindingMetadataProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/DefaultCollectionValidationStrategyTest.cs b/src/Mvc/Mvc.Core/test/Internal/DefaultCollectionValidationStrategyTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/DefaultCollectionValidationStrategyTest.cs
rename to src/Mvc/Mvc.Core/test/Internal/DefaultCollectionValidationStrategyTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/DefaultComplexObjectValidationStrategyTest.cs b/src/Mvc/Mvc.Core/test/Internal/DefaultComplexObjectValidationStrategyTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/DefaultComplexObjectValidationStrategyTest.cs
rename to src/Mvc/Mvc.Core/test/Internal/DefaultComplexObjectValidationStrategyTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/DefaultModelValidatorProviderTest.cs b/src/Mvc/Mvc.Core/test/Internal/DefaultModelValidatorProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/DefaultModelValidatorProviderTest.cs
rename to src/Mvc/Mvc.Core/test/Internal/DefaultModelValidatorProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/DefaultObjectValidatorTests.cs b/src/Mvc/Mvc.Core/test/Internal/DefaultObjectValidatorTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/DefaultObjectValidatorTests.cs
rename to src/Mvc/Mvc.Core/test/Internal/DefaultObjectValidatorTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/DisableRequestSizeLimitFilterTest.cs b/src/Mvc/Mvc.Core/test/Internal/DisableRequestSizeLimitFilterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/DisableRequestSizeLimitFilterTest.cs
rename to src/Mvc/Mvc.Core/test/Internal/DisableRequestSizeLimitFilterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ElementalValueProviderTests.cs b/src/Mvc/Mvc.Core/test/Internal/ElementalValueProviderTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ElementalValueProviderTests.cs
rename to src/Mvc/Mvc.Core/test/Internal/ElementalValueProviderTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ExplicitIndexCollectionValidationStrategyTest.cs b/src/Mvc/Mvc.Core/test/Internal/ExplicitIndexCollectionValidationStrategyTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ExplicitIndexCollectionValidationStrategyTest.cs
rename to src/Mvc/Mvc.Core/test/Internal/ExplicitIndexCollectionValidationStrategyTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/FilterFactoryTest.cs b/src/Mvc/Mvc.Core/test/Internal/FilterFactoryTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/FilterFactoryTest.cs
rename to src/Mvc/Mvc.Core/test/Internal/FilterFactoryTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/FilterProviderTest.cs b/src/Mvc/Mvc.Core/test/Internal/FilterProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/FilterProviderTest.cs
rename to src/Mvc/Mvc.Core/test/Internal/FilterProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/HttpMethodActionConstraintTest.cs b/src/Mvc/Mvc.Core/test/Internal/HttpMethodActionConstraintTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/HttpMethodActionConstraintTest.cs
rename to src/Mvc/Mvc.Core/test/Internal/HttpMethodActionConstraintTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/MiddlewareFilterBuilderTest.cs b/src/Mvc/Mvc.Core/test/Internal/MiddlewareFilterBuilderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/MiddlewareFilterBuilderTest.cs
rename to src/Mvc/Mvc.Core/test/Internal/MiddlewareFilterBuilderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/MiddlewareFilterConfigurationProviderTest.cs b/src/Mvc/Mvc.Core/test/Internal/MiddlewareFilterConfigurationProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/MiddlewareFilterConfigurationProviderTest.cs
rename to src/Mvc/Mvc.Core/test/Internal/MiddlewareFilterConfigurationProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/MiddlewareFilterTest.cs b/src/Mvc/Mvc.Core/test/Internal/MiddlewareFilterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/MiddlewareFilterTest.cs
rename to src/Mvc/Mvc.Core/test/Internal/MiddlewareFilterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/MvcCoreLoggerExtensionsTest.cs b/src/Mvc/Mvc.Core/test/Internal/MvcCoreLoggerExtensionsTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/MvcCoreLoggerExtensionsTest.cs
rename to src/Mvc/Mvc.Core/test/Internal/MvcCoreLoggerExtensionsTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ParameterDefaultValuesTest.cs b/src/Mvc/Mvc.Core/test/Internal/ParameterDefaultValuesTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ParameterDefaultValuesTest.cs
rename to src/Mvc/Mvc.Core/test/Internal/ParameterDefaultValuesTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/PrefixContainerTest.cs b/src/Mvc/Mvc.Core/test/Internal/PrefixContainerTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/PrefixContainerTest.cs
rename to src/Mvc/Mvc.Core/test/Internal/PrefixContainerTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ReferenceEqualityComparerTest.cs b/src/Mvc/Mvc.Core/test/Internal/ReferenceEqualityComparerTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ReferenceEqualityComparerTest.cs
rename to src/Mvc/Mvc.Core/test/Internal/ReferenceEqualityComparerTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/RequestFormLimitsFilterTest.cs b/src/Mvc/Mvc.Core/test/Internal/RequestFormLimitsFilterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/RequestFormLimitsFilterTest.cs
rename to src/Mvc/Mvc.Core/test/Internal/RequestFormLimitsFilterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/RequestSizeLimitFilterTest.cs b/src/Mvc/Mvc.Core/test/Internal/RequestSizeLimitFilterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/RequestSizeLimitFilterTest.cs
rename to src/Mvc/Mvc.Core/test/Internal/RequestSizeLimitFilterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ResponseCacheFilterExecutorTest.cs b/src/Mvc/Mvc.Core/test/Internal/ResponseCacheFilterExecutorTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ResponseCacheFilterExecutorTest.cs
rename to src/Mvc/Mvc.Core/test/Internal/ResponseCacheFilterExecutorTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ResponseContentTypeHelperTest.cs b/src/Mvc/Mvc.Core/test/Internal/ResponseContentTypeHelperTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ResponseContentTypeHelperTest.cs
rename to src/Mvc/Mvc.Core/test/Internal/ResponseContentTypeHelperTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ShortFormDictionaryValidationStrategyTest.cs b/src/Mvc/Mvc.Core/test/Internal/ShortFormDictionaryValidationStrategyTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ShortFormDictionaryValidationStrategyTest.cs
rename to src/Mvc/Mvc.Core/test/Internal/ShortFormDictionaryValidationStrategyTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ValidatorCacheTest.cs b/src/Mvc/Mvc.Core/test/Internal/ValidatorCacheTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ValidatorCacheTest.cs
rename to src/Mvc/Mvc.Core/test/Internal/ValidatorCacheTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ViewEnginePathTest.cs b/src/Mvc/Mvc.Core/test/Internal/ViewEnginePathTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ViewEnginePathTest.cs
rename to src/Mvc/Mvc.Core/test/Internal/ViewEnginePathTest.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 100%
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
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/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/Internal/ValidationStackTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Internal/ValidationStackTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Internal/ValidationStackTest.cs
rename to src/Mvc/Mvc.Core/test/ModelBinding/Internal/ValidationStackTest.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/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/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/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/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/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/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/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/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/NonDisposableStreamTest.cs b/src/Mvc/Mvc.Core/test/NonDisposableStreamTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/NonDisposableStreamTest.cs
rename to src/Mvc/Mvc.Core/test/NonDisposableStreamTest.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/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/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/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/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/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/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.Core.Test/xunit.runner.json b/src/Mvc/Mvc.Core/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.Core/test/xunit.runner.json
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/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/Internal/CorsApplicationModelProvider.cs b/src/Mvc/Mvc.Cors/src/Internal/CorsApplicationModelProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/Internal/CorsApplicationModelProvider.cs
rename to src/Mvc/Mvc.Cors/src/Internal/CorsApplicationModelProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/Internal/CorsAuthorizationFilterFactory.cs b/src/Mvc/Mvc.Cors/src/Internal/CorsAuthorizationFilterFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/Internal/CorsAuthorizationFilterFactory.cs
rename to src/Mvc/Mvc.Cors/src/Internal/CorsAuthorizationFilterFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/Internal/CorsHttpMethodActionConstraint.cs b/src/Mvc/Mvc.Cors/src/Internal/CorsHttpMethodActionConstraint.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/Internal/CorsHttpMethodActionConstraint.cs
rename to src/Mvc/Mvc.Cors/src/Internal/CorsHttpMethodActionConstraint.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/Internal/CorsLoggerExtensions.cs b/src/Mvc/Mvc.Cors/src/Internal/CorsLoggerExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/Internal/CorsLoggerExtensions.cs
rename to src/Mvc/Mvc.Cors/src/Internal/CorsLoggerExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/Internal/DisableCorsAuthorizationFilter.cs b/src/Mvc/Mvc.Cors/src/Internal/DisableCorsAuthorizationFilter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/Internal/DisableCorsAuthorizationFilter.cs
rename to src/Mvc/Mvc.Cors/src/Internal/DisableCorsAuthorizationFilter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/Internal/ICorsAuthorizationFilter.cs b/src/Mvc/Mvc.Cors/src/Internal/ICorsAuthorizationFilter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/Internal/ICorsAuthorizationFilter.cs
rename to src/Mvc/Mvc.Cors/src/Internal/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/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/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/Internal/CorsApplicationModelProviderTest.cs b/src/Mvc/Mvc.Cors/test/Internal/CorsApplicationModelProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Cors.Test/Internal/CorsApplicationModelProviderTest.cs
rename to src/Mvc/Mvc.Cors/test/Internal/CorsApplicationModelProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Cors.Test/Internal/CorsHttpMethodActionConstraintTest.cs b/src/Mvc/Mvc.Cors/test/Internal/CorsHttpMethodActionConstraintTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Cors.Test/Internal/CorsHttpMethodActionConstraintTest.cs
rename to src/Mvc/Mvc.Cors/test/Internal/CorsHttpMethodActionConstraintTest.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 100%
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
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/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/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/Internal/CompareAttributeAdapter.cs b/src/Mvc/Mvc.DataAnnotations/src/Internal/CompareAttributeAdapter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/CompareAttributeAdapter.cs
rename to src/Mvc/Mvc.DataAnnotations/src/Internal/CompareAttributeAdapter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/DataAnnotationsClientModelValidatorProvider.cs b/src/Mvc/Mvc.DataAnnotations/src/Internal/DataAnnotationsClientModelValidatorProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/DataAnnotationsClientModelValidatorProvider.cs
rename to src/Mvc/Mvc.DataAnnotations/src/Internal/DataAnnotationsClientModelValidatorProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/DataAnnotationsLocalizationServices.cs b/src/Mvc/Mvc.DataAnnotations/src/Internal/DataAnnotationsLocalizationServices.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/DataAnnotationsLocalizationServices.cs
rename to src/Mvc/Mvc.DataAnnotations/src/Internal/DataAnnotationsLocalizationServices.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/DataAnnotationsMetadataProvider.cs b/src/Mvc/Mvc.DataAnnotations/src/Internal/DataAnnotationsMetadataProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/DataAnnotationsMetadataProvider.cs
rename to src/Mvc/Mvc.DataAnnotations/src/Internal/DataAnnotationsMetadataProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/DataAnnotationsModelValidator.cs b/src/Mvc/Mvc.DataAnnotations/src/Internal/DataAnnotationsModelValidator.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/DataAnnotationsModelValidator.cs
rename to src/Mvc/Mvc.DataAnnotations/src/Internal/DataAnnotationsModelValidator.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/DataAnnotationsModelValidatorProvider.cs b/src/Mvc/Mvc.DataAnnotations/src/Internal/DataAnnotationsModelValidatorProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/DataAnnotationsModelValidatorProvider.cs
rename to src/Mvc/Mvc.DataAnnotations/src/Internal/DataAnnotationsModelValidatorProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/DataTypeAttributeAdapter.cs b/src/Mvc/Mvc.DataAnnotations/src/Internal/DataTypeAttributeAdapter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/DataTypeAttributeAdapter.cs
rename to src/Mvc/Mvc.DataAnnotations/src/Internal/DataTypeAttributeAdapter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/DefaultClientModelValidatorProvider.cs b/src/Mvc/Mvc.DataAnnotations/src/Internal/DefaultClientModelValidatorProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/DefaultClientModelValidatorProvider.cs
rename to src/Mvc/Mvc.DataAnnotations/src/Internal/DefaultClientModelValidatorProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/FileExtensionsAttributeAdapter.cs b/src/Mvc/Mvc.DataAnnotations/src/Internal/FileExtensionsAttributeAdapter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/FileExtensionsAttributeAdapter.cs
rename to src/Mvc/Mvc.DataAnnotations/src/Internal/FileExtensionsAttributeAdapter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/MaxLengthAttributeAdapter.cs b/src/Mvc/Mvc.DataAnnotations/src/Internal/MaxLengthAttributeAdapter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/MaxLengthAttributeAdapter.cs
rename to src/Mvc/Mvc.DataAnnotations/src/Internal/MaxLengthAttributeAdapter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/MinLengthAttributeAdapter.cs b/src/Mvc/Mvc.DataAnnotations/src/Internal/MinLengthAttributeAdapter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/MinLengthAttributeAdapter.cs
rename to src/Mvc/Mvc.DataAnnotations/src/Internal/MinLengthAttributeAdapter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/MvcDataAnnotationsLocalizationOptionsSetup.cs b/src/Mvc/Mvc.DataAnnotations/src/Internal/MvcDataAnnotationsLocalizationOptionsSetup.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/MvcDataAnnotationsLocalizationOptionsSetup.cs
rename to src/Mvc/Mvc.DataAnnotations/src/Internal/MvcDataAnnotationsLocalizationOptionsSetup.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/MvcDataAnnotationsMvcOptionsSetup.cs b/src/Mvc/Mvc.DataAnnotations/src/Internal/MvcDataAnnotationsMvcOptionsSetup.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/MvcDataAnnotationsMvcOptionsSetup.cs
rename to src/Mvc/Mvc.DataAnnotations/src/Internal/MvcDataAnnotationsMvcOptionsSetup.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/NumericClientModelValidator.cs b/src/Mvc/Mvc.DataAnnotations/src/Internal/NumericClientModelValidator.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/NumericClientModelValidator.cs
rename to src/Mvc/Mvc.DataAnnotations/src/Internal/NumericClientModelValidator.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/NumericClientModelValidatorProvider.cs b/src/Mvc/Mvc.DataAnnotations/src/Internal/NumericClientModelValidatorProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/NumericClientModelValidatorProvider.cs
rename to src/Mvc/Mvc.DataAnnotations/src/Internal/NumericClientModelValidatorProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/RangeAttributeAdapter.cs b/src/Mvc/Mvc.DataAnnotations/src/Internal/RangeAttributeAdapter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/RangeAttributeAdapter.cs
rename to src/Mvc/Mvc.DataAnnotations/src/Internal/RangeAttributeAdapter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/RegularExpressionAttributeAdapter.cs b/src/Mvc/Mvc.DataAnnotations/src/Internal/RegularExpressionAttributeAdapter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/RegularExpressionAttributeAdapter.cs
rename to src/Mvc/Mvc.DataAnnotations/src/Internal/RegularExpressionAttributeAdapter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/RequiredAttributeAdapter.cs b/src/Mvc/Mvc.DataAnnotations/src/Internal/RequiredAttributeAdapter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/RequiredAttributeAdapter.cs
rename to src/Mvc/Mvc.DataAnnotations/src/Internal/RequiredAttributeAdapter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/StringLengthAttributeAdapter.cs b/src/Mvc/Mvc.DataAnnotations/src/Internal/StringLengthAttributeAdapter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/StringLengthAttributeAdapter.cs
rename to src/Mvc/Mvc.DataAnnotations/src/Internal/StringLengthAttributeAdapter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/ValidatableObjectAdapter.cs b/src/Mvc/Mvc.DataAnnotations/src/Internal/ValidatableObjectAdapter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/ValidatableObjectAdapter.cs
rename to src/Mvc/Mvc.DataAnnotations/src/Internal/ValidatableObjectAdapter.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/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/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/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/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/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/Internal/CompareAttributeAdapterTest.cs b/src/Mvc/Mvc.DataAnnotations/test/Internal/CompareAttributeAdapterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/CompareAttributeAdapterTest.cs
rename to src/Mvc/Mvc.DataAnnotations/test/Internal/CompareAttributeAdapterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/DataAnnotationsClientModelValidatorProviderTest.cs b/src/Mvc/Mvc.DataAnnotations/test/Internal/DataAnnotationsClientModelValidatorProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/DataAnnotationsClientModelValidatorProviderTest.cs
rename to src/Mvc/Mvc.DataAnnotations/test/Internal/DataAnnotationsClientModelValidatorProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/DataAnnotationsMetadataProviderTest.cs b/src/Mvc/Mvc.DataAnnotations/test/Internal/DataAnnotationsMetadataProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/DataAnnotationsMetadataProviderTest.cs
rename to src/Mvc/Mvc.DataAnnotations/test/Internal/DataAnnotationsMetadataProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/DataAnnotationsModelValidatorProviderTest.cs b/src/Mvc/Mvc.DataAnnotations/test/Internal/DataAnnotationsModelValidatorProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/DataAnnotationsModelValidatorProviderTest.cs
rename to src/Mvc/Mvc.DataAnnotations/test/Internal/DataAnnotationsModelValidatorProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/DataAnnotationsModelValidatorTest.cs b/src/Mvc/Mvc.DataAnnotations/test/Internal/DataAnnotationsModelValidatorTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/DataAnnotationsModelValidatorTest.cs
rename to src/Mvc/Mvc.DataAnnotations/test/Internal/DataAnnotationsModelValidatorTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/DataMemberRequiredBindingMetadataProviderTest.cs b/src/Mvc/Mvc.DataAnnotations/test/Internal/DataMemberRequiredBindingMetadataProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/DataMemberRequiredBindingMetadataProviderTest.cs
rename to src/Mvc/Mvc.DataAnnotations/test/Internal/DataMemberRequiredBindingMetadataProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/DataTypeClientModelValidatorProviderTest.cs b/src/Mvc/Mvc.DataAnnotations/test/Internal/DataTypeClientModelValidatorProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/DataTypeClientModelValidatorProviderTest.cs
rename to src/Mvc/Mvc.DataAnnotations/test/Internal/DataTypeClientModelValidatorProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/DefaultModelClientValidatorProviderTest.cs b/src/Mvc/Mvc.DataAnnotations/test/Internal/DefaultModelClientValidatorProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/DefaultModelClientValidatorProviderTest.cs
rename to src/Mvc/Mvc.DataAnnotations/test/Internal/DefaultModelClientValidatorProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/FileExtensionsAttributeAdapterTest.cs b/src/Mvc/Mvc.DataAnnotations/test/Internal/FileExtensionsAttributeAdapterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/FileExtensionsAttributeAdapterTest.cs
rename to src/Mvc/Mvc.DataAnnotations/test/Internal/FileExtensionsAttributeAdapterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/MaxLengthAttributeAdapterTest.cs b/src/Mvc/Mvc.DataAnnotations/test/Internal/MaxLengthAttributeAdapterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/MaxLengthAttributeAdapterTest.cs
rename to src/Mvc/Mvc.DataAnnotations/test/Internal/MaxLengthAttributeAdapterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/MinLengthAttributeAdapterTest.cs b/src/Mvc/Mvc.DataAnnotations/test/Internal/MinLengthAttributeAdapterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/MinLengthAttributeAdapterTest.cs
rename to src/Mvc/Mvc.DataAnnotations/test/Internal/MinLengthAttributeAdapterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/ModelMetadataProviderTest.cs b/src/Mvc/Mvc.DataAnnotations/test/Internal/ModelMetadataProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/ModelMetadataProviderTest.cs
rename to src/Mvc/Mvc.DataAnnotations/test/Internal/ModelMetadataProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/ModelValidationResultComparer.cs b/src/Mvc/Mvc.DataAnnotations/test/Internal/ModelValidationResultComparer.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/ModelValidationResultComparer.cs
rename to src/Mvc/Mvc.DataAnnotations/test/Internal/ModelValidationResultComparer.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/MvcDataAnnotationsMvcOptionsSetup.cs b/src/Mvc/Mvc.DataAnnotations/test/Internal/MvcDataAnnotationsMvcOptionsSetup.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/MvcDataAnnotationsMvcOptionsSetup.cs
rename to src/Mvc/Mvc.DataAnnotations/test/Internal/MvcDataAnnotationsMvcOptionsSetup.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/NumericClientModelValidatorTest.cs b/src/Mvc/Mvc.DataAnnotations/test/Internal/NumericClientModelValidatorTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/NumericClientModelValidatorTest.cs
rename to src/Mvc/Mvc.DataAnnotations/test/Internal/NumericClientModelValidatorTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/RangeAttributeAdapterTest.cs b/src/Mvc/Mvc.DataAnnotations/test/Internal/RangeAttributeAdapterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/RangeAttributeAdapterTest.cs
rename to src/Mvc/Mvc.DataAnnotations/test/Internal/RangeAttributeAdapterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/RequiredAttributeAdapterTest.cs b/src/Mvc/Mvc.DataAnnotations/test/Internal/RequiredAttributeAdapterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/RequiredAttributeAdapterTest.cs
rename to src/Mvc/Mvc.DataAnnotations/test/Internal/RequiredAttributeAdapterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/StringLengthAttributeAdapterTest.cs b/src/Mvc/Mvc.DataAnnotations/test/Internal/StringLengthAttributeAdapterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/StringLengthAttributeAdapterTest.cs
rename to src/Mvc/Mvc.DataAnnotations/test/Internal/StringLengthAttributeAdapterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/TestModelNameProvider.cs b/src/Mvc/Mvc.DataAnnotations/test/Internal/TestModelNameProvider.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/TestModelNameProvider.cs
rename to src/Mvc/Mvc.DataAnnotations/test/Internal/TestModelNameProvider.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/TestResources.cs b/src/Mvc/Mvc.DataAnnotations/test/Internal/TestResources.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/TestResources.cs
rename to src/Mvc/Mvc.DataAnnotations/test/Internal/TestResources.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/ValidatableObjectAdapterTest.cs b/src/Mvc/Mvc.DataAnnotations/test/Internal/ValidatableObjectAdapterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/ValidatableObjectAdapterTest.cs
rename to src/Mvc/Mvc.DataAnnotations/test/Internal/ValidatableObjectAdapterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/ValidationAttributeAdapterOfTAttributeTest.cs b/src/Mvc/Mvc.DataAnnotations/test/Internal/ValidationAttributeAdapterOfTAttributeTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/ValidationAttributeAdapterOfTAttributeTest.cs
rename to src/Mvc/Mvc.DataAnnotations/test/Internal/ValidationAttributeAdapterOfTAttributeTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/ValidationAttributeAdapterProviderTest.cs b/src/Mvc/Mvc.DataAnnotations/test/Internal/ValidationAttributeAdapterProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/ValidationAttributeAdapterProviderTest.cs
rename to src/Mvc/Mvc.DataAnnotations/test/Internal/ValidationAttributeAdapterProviderTest.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 100%
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
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/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/src/Microsoft.AspNetCore.Mvc.Formatters.Json/DependencyInjection/MvcJsonMvcBuilderExtensions.cs b/src/Mvc/Mvc.Formatters.Json/src/DependencyInjection/MvcJsonMvcBuilderExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/DependencyInjection/MvcJsonMvcBuilderExtensions.cs
rename to src/Mvc/Mvc.Formatters.Json/src/DependencyInjection/MvcJsonMvcBuilderExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/DependencyInjection/MvcJsonMvcCoreBuilderExtensions.cs b/src/Mvc/Mvc.Formatters.Json/src/DependencyInjection/MvcJsonMvcCoreBuilderExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/DependencyInjection/MvcJsonMvcCoreBuilderExtensions.cs
rename to src/Mvc/Mvc.Formatters.Json/src/DependencyInjection/MvcJsonMvcCoreBuilderExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/Internal/JsonArrayPool.cs b/src/Mvc/Mvc.Formatters.Json/src/Internal/JsonArrayPool.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/Internal/JsonArrayPool.cs
rename to src/Mvc/Mvc.Formatters.Json/src/Internal/JsonArrayPool.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/Internal/JsonResultExecutor.cs b/src/Mvc/Mvc.Formatters.Json/src/Internal/JsonResultExecutor.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/Internal/JsonResultExecutor.cs
rename to src/Mvc/Mvc.Formatters.Json/src/Internal/JsonResultExecutor.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/Internal/JsonSerializerObjectPolicy.cs b/src/Mvc/Mvc.Formatters.Json/src/Internal/JsonSerializerObjectPolicy.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/Internal/JsonSerializerObjectPolicy.cs
rename to src/Mvc/Mvc.Formatters.Json/src/Internal/JsonSerializerObjectPolicy.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/Internal/MediaTypeHeaderValues.cs b/src/Mvc/Mvc.Formatters.Json/src/Internal/MediaTypeHeaderValues.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/Internal/MediaTypeHeaderValues.cs
rename to src/Mvc/Mvc.Formatters.Json/src/Internal/MediaTypeHeaderValues.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/Internal/MvcJsonLoggerExtensions.cs b/src/Mvc/Mvc.Formatters.Json/src/Internal/MvcJsonLoggerExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/Internal/MvcJsonLoggerExtensions.cs
rename to src/Mvc/Mvc.Formatters.Json/src/Internal/MvcJsonLoggerExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/Internal/MvcJsonMvcOptionsSetup.cs b/src/Mvc/Mvc.Formatters.Json/src/Internal/MvcJsonMvcOptionsSetup.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/Internal/MvcJsonMvcOptionsSetup.cs
rename to src/Mvc/Mvc.Formatters.Json/src/Internal/MvcJsonMvcOptionsSetup.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonInputFormatter.cs b/src/Mvc/Mvc.Formatters.Json/src/JsonInputFormatter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonInputFormatter.cs
rename to src/Mvc/Mvc.Formatters.Json/src/JsonInputFormatter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonOutputFormatter.cs b/src/Mvc/Mvc.Formatters.Json/src/JsonOutputFormatter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonOutputFormatter.cs
rename to src/Mvc/Mvc.Formatters.Json/src/JsonOutputFormatter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonPatchExtensions.cs b/src/Mvc/Mvc.Formatters.Json/src/JsonPatchExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonPatchExtensions.cs
rename to src/Mvc/Mvc.Formatters.Json/src/JsonPatchExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonPatchInputFormatter.cs b/src/Mvc/Mvc.Formatters.Json/src/JsonPatchInputFormatter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonPatchInputFormatter.cs
rename to src/Mvc/Mvc.Formatters.Json/src/JsonPatchInputFormatter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonPatchOperationsArrayProvider.cs b/src/Mvc/Mvc.Formatters.Json/src/JsonPatchOperationsArrayProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonPatchOperationsArrayProvider.cs
rename to src/Mvc/Mvc.Formatters.Json/src/JsonPatchOperationsArrayProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonResult.cs b/src/Mvc/Mvc.Formatters.Json/src/JsonResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonResult.cs
rename to src/Mvc/Mvc.Formatters.Json/src/JsonResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonSerializerSettingsProvider.cs b/src/Mvc/Mvc.Formatters.Json/src/JsonSerializerSettingsProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonSerializerSettingsProvider.cs
rename to src/Mvc/Mvc.Formatters.Json/src/JsonSerializerSettingsProvider.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/MvcJsonOptions.cs b/src/Mvc/Mvc.Formatters.Json/src/MvcJsonOptions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/MvcJsonOptions.cs
rename to src/Mvc/Mvc.Formatters.Json/src/MvcJsonOptions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/MvcJsonOptionsConfigureCompatibilityOptions.cs b/src/Mvc/Mvc.Formatters.Json/src/MvcJsonOptionsConfigureCompatibilityOptions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/MvcJsonOptionsConfigureCompatibilityOptions.cs
rename to src/Mvc/Mvc.Formatters.Json/src/MvcJsonOptionsConfigureCompatibilityOptions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/baseline.netcore.json b/src/Mvc/Mvc.Formatters.Json/src/baseline.netcore.json
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/baseline.netcore.json
rename to src/Mvc/Mvc.Formatters.Json/src/baseline.netcore.json
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/Internal/JsonResultExecutorTest.cs b/src/Mvc/Mvc.Formatters.Json/test/Internal/JsonResultExecutorTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/Internal/JsonResultExecutorTest.cs
rename to src/Mvc/Mvc.Formatters.Json/test/Internal/JsonResultExecutorTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/JsonInputFormatterTest.cs b/src/Mvc/Mvc.Formatters.Json/test/JsonInputFormatterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/JsonInputFormatterTest.cs
rename to src/Mvc/Mvc.Formatters.Json/test/JsonInputFormatterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/JsonOutputFormatterTests.cs b/src/Mvc/Mvc.Formatters.Json/test/JsonOutputFormatterTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/JsonOutputFormatterTests.cs
rename to src/Mvc/Mvc.Formatters.Json/test/JsonOutputFormatterTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/JsonPatchInputFormatterTest.cs b/src/Mvc/Mvc.Formatters.Json/test/JsonPatchInputFormatterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/JsonPatchInputFormatterTest.cs
rename to src/Mvc/Mvc.Formatters.Json/test/JsonPatchInputFormatterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/JsonPatchOperationsArrayProviderTests.cs b/src/Mvc/Mvc.Formatters.Json/test/JsonPatchOperationsArrayProviderTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/JsonPatchOperationsArrayProviderTests.cs
rename to src/Mvc/Mvc.Formatters.Json/test/JsonPatchOperationsArrayProviderTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/JsonResultTest.cs b/src/Mvc/Mvc.Formatters.Json/test/JsonResultTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/JsonResultTest.cs
rename to src/Mvc/Mvc.Formatters.Json/test/JsonResultTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test.csproj b/src/Mvc/Mvc.Formatters.Json/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test.csproj
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test.csproj
rename to src/Mvc/Mvc.Formatters.Json/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test.csproj
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/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/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/Internal/FormattingUtilities.cs b/src/Mvc/Mvc.Formatters.Xml/src/Internal/FormattingUtilities.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Internal/FormattingUtilities.cs
rename to src/Mvc/Mvc.Formatters.Xml/src/Internal/FormattingUtilities.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Internal/MediaTypeHeaderValues.cs b/src/Mvc/Mvc.Formatters.Xml/src/Internal/MediaTypeHeaderValues.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Internal/MediaTypeHeaderValues.cs
rename to src/Mvc/Mvc.Formatters.Xml/src/Internal/MediaTypeHeaderValues.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Internal/MvcXmlDataContractSerializerMvcOptionsSetup.cs b/src/Mvc/Mvc.Formatters.Xml/src/Internal/MvcXmlDataContractSerializerMvcOptionsSetup.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Internal/MvcXmlDataContractSerializerMvcOptionsSetup.cs
rename to src/Mvc/Mvc.Formatters.Xml/src/Internal/MvcXmlDataContractSerializerMvcOptionsSetup.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Internal/MvcXmlSerializerMvcOptionsSetup.cs b/src/Mvc/Mvc.Formatters.Xml/src/Internal/MvcXmlSerializerMvcOptionsSetup.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Internal/MvcXmlSerializerMvcOptionsSetup.cs
rename to src/Mvc/Mvc.Formatters.Xml/src/Internal/MvcXmlSerializerMvcOptionsSetup.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/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/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/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/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/Internal/DelegatingEnumerableTest.cs b/src/Mvc/Mvc.Formatters.Xml/test/Internal/DelegatingEnumerableTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Internal/DelegatingEnumerableTest.cs
rename to src/Mvc/Mvc.Formatters.Xml/test/Internal/DelegatingEnumerableTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Internal/DelegatingEnumeratorTest.cs b/src/Mvc/Mvc.Formatters.Xml/test/Internal/DelegatingEnumeratorTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Internal/DelegatingEnumeratorTest.cs
rename to src/Mvc/Mvc.Formatters.Xml/test/Internal/DelegatingEnumeratorTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Internal/EnumerableWrapperProviderFactoryTest.cs b/src/Mvc/Mvc.Formatters.Xml/test/Internal/EnumerableWrapperProviderFactoryTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Internal/EnumerableWrapperProviderFactoryTest.cs
rename to src/Mvc/Mvc.Formatters.Xml/test/Internal/EnumerableWrapperProviderFactoryTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Internal/EnumerableWrapperProviderTest.cs b/src/Mvc/Mvc.Formatters.Xml/test/Internal/EnumerableWrapperProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Internal/EnumerableWrapperProviderTest.cs
rename to src/Mvc/Mvc.Formatters.Xml/test/Internal/EnumerableWrapperProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Internal/MvcXmlDataContractSerializerMvcOptionsSetupTest.cs b/src/Mvc/Mvc.Formatters.Xml/test/Internal/MvcXmlDataContractSerializerMvcOptionsSetupTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Internal/MvcXmlDataContractSerializerMvcOptionsSetupTest.cs
rename to src/Mvc/Mvc.Formatters.Xml/test/Internal/MvcXmlDataContractSerializerMvcOptionsSetupTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Internal/MvcXmlSerializerMvcOptionsSetupTest.cs b/src/Mvc/Mvc.Formatters.Xml/test/Internal/MvcXmlSerializerMvcOptionsSetupTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Internal/MvcXmlSerializerMvcOptionsSetupTest.cs
rename to src/Mvc/Mvc.Formatters.Xml/test/Internal/MvcXmlSerializerMvcOptionsSetupTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Internal/PersonWrapper.cs b/src/Mvc/Mvc.Formatters.Xml/test/Internal/PersonWrapper.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Internal/PersonWrapper.cs
rename to src/Mvc/Mvc.Formatters.Xml/test/Internal/PersonWrapper.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Internal/PersonWrapperProvider.cs b/src/Mvc/Mvc.Formatters.Xml/test/Internal/PersonWrapperProvider.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Internal/PersonWrapperProvider.cs
rename to src/Mvc/Mvc.Formatters.Xml/test/Internal/PersonWrapperProvider.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Internal/PersonWrapperProviderFactory.cs b/src/Mvc/Mvc.Formatters.Xml/test/Internal/PersonWrapperProviderFactory.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Internal/PersonWrapperProviderFactory.cs
rename to src/Mvc/Mvc.Formatters.Xml/test/Internal/PersonWrapperProviderFactory.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Internal/SerializableErrorWrapperProviderTest.cs b/src/Mvc/Mvc.Formatters.Xml/test/Internal/SerializableErrorWrapperProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Internal/SerializableErrorWrapperProviderTest.cs
rename to src/Mvc/Mvc.Formatters.Xml/test/Internal/SerializableErrorWrapperProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Internal/SerializableErrorWrapperTests.cs b/src/Mvc/Mvc.Formatters.Xml/test/Internal/SerializableErrorWrapperTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Internal/SerializableErrorWrapperTests.cs
rename to src/Mvc/Mvc.Formatters.Xml/test/Internal/SerializableErrorWrapperTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Internal/SerializableWrapperProviderFactoryTest.cs b/src/Mvc/Mvc.Formatters.Xml/test/Internal/SerializableWrapperProviderFactoryTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Internal/SerializableWrapperProviderFactoryTest.cs
rename to src/Mvc/Mvc.Formatters.Xml/test/Internal/SerializableWrapperProviderFactoryTest.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 100%
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
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/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/Internal/MvcLocalizationServices.cs b/src/Mvc/Mvc.Localization/src/Internal/MvcLocalizationServices.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/Internal/MvcLocalizationServices.cs
rename to src/Mvc/Mvc.Localization/src/Internal/MvcLocalizationServices.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/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/Internal/MvcLocalizationServiceCollectionExtensionsTest.cs b/src/Mvc/Mvc.Localization/test/Internal/MvcLocalizationServiceCollectionExtensionsTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Localization.Test/Internal/MvcLocalizationServiceCollectionExtensionsTest.cs
rename to src/Mvc/Mvc.Localization/test/Internal/MvcLocalizationServiceCollectionExtensionsTest.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 100%
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
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/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/Mvc.NoFun.sln b/src/Mvc/Mvc.NoFun.sln
index 33f4a84d2fe3b98f947966ac76ad8eb01971a84c..dbe9db5973ea172697648f75280ce8bc864d06d9 100644
--- a/src/Mvc/Mvc.NoFun.sln
+++ b/src/Mvc/Mvc.NoFun.sln
@@ -1,116 +1,218 @@
+
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27130.2036
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.28531.58
 MinimumVisualStudioVersion = 15.0.26730.03
 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}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MvcSandbox", "samples\MvcSandbox\MvcSandbox.csproj", "{14ED4476-9F24-4776-8417-EA6927F6C9C9}"
+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("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{631720EE-11CC-41C9-9819-441417ECBEAA}"
 	ProjectSection(SolutionItems) = preProject
-		test\Directory.Build.props = test\Directory.Build.props
-		test\MvcTests.ruleset = test\MvcTests.ruleset
+		.editorconfig = .editorconfig
+		CONTRIBUTING.md = CONTRIBUTING.md
+		Directory.Build.props = Directory.Build.props
+		LICENSE.txt = LICENSE.txt
+		MvcTests.ruleset = MvcTests.ruleset
+		README.md = README.md
+		Settings.StyleCop = Settings.StyleCop
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc", "src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj", "{079EFA1F-0B0A-4853-B27B-5780D111CD85}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmarks", "benchmarks", "{FDC66952-A3EA-4074-899E-C29816BF7C1F}"
 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}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_dependencies", "_dependencies", "{5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}"
 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}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Html.Abstractions", "..\Html\Abstractions\src\Microsoft.AspNetCore.Html.Abstractions.csproj", "{0930C2EA-FA36-4EDF-A571-215765D1F2C7}"
 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}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http", "..\Http\Http\src\Microsoft.AspNetCore.Http.csproj", "{A273BAAB-DA92-401D-B781-ADA9E3B7717C}"
 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}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Cors", "..\Middleware\CORS\src\Microsoft.AspNetCore.Cors.csproj", "{E07B7D3A-1D4D-4644-84C2-06FEDB64885B}"
 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}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Hosting", "..\Hosting\Hosting\src\Microsoft.AspNetCore.Hosting.csproj", "{0F5F9381-D3B4-4E0D-9FAA-CC12520DBB4A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.WebApiCompatShim", "src\Microsoft.AspNetCore.Mvc.WebApiCompatShim\Microsoft.AspNetCore.Mvc.WebApiCompatShim.csproj", "{23D30B8C-04B1-4577-A604-ED27EA1E4A0E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.TestHost", "..\Hosting\TestHost\src\Microsoft.AspNetCore.TestHost.csproj", "{2E18C4FD-9982-4BD9-A067-3CE56E68C450}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.WebApiCompatShimTest", "test\Microsoft.AspNetCore.Mvc.WebApiCompatShimTest\Microsoft.AspNetCore.Mvc.WebApiCompatShimTest.csproj", "{5DE8E4D9-AACD-4B5F-819F-F091383FB996}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Diagnostics", "..\Middleware\Diagnostics\src\Microsoft.AspNetCore.Diagnostics.csproj", "{C79D9793-FADA-4B1A-8AD7-8AEDB2358CA2}"
 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}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IntegrationTesting", "..\Hosting\Server.IntegrationTesting\src\Microsoft.AspNetCore.Server.IntegrationTesting.csproj", "{BCD18147-D96D-4240-A89F-5F890392E58E}"
 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}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.WebUtilities", "..\Http\WebUtilities\src\Microsoft.AspNetCore.WebUtilities.csproj", "{986BF4FD-D0E3-48AE-917C-6C168D6395D3}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.TestCommon", "test\Microsoft.AspNetCore.Mvc.TestCommon\Microsoft.AspNetCore.Mvc.TestCommon.csproj", "{F504357E-C2E1-4818-BA5C-9A2EAC25FEE5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.ResponseCaching", "..\Middleware\ResponseCaching\src\Microsoft.AspNetCore.ResponseCaching.csproj", "{F4E1F1ED-2DE9-4659-B2E7-C9B6B8454AD1}"
 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}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.StaticFiles", "..\Middleware\StaticFiles\src\Microsoft.AspNetCore.StaticFiles.csproj", "{F4846AC2-384E-4C0B-8DE5-9784715E4A9F}"
 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}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Session", "..\Middleware\Session\src\Microsoft.AspNetCore.Session.csproj", "{C019C7EC-FDEE-4EAF-ABF1-89D946EFC95A}"
 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}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Localization.Routing", "..\Middleware\Localization.Routing\src\Microsoft.AspNetCore.Localization.Routing.csproj", "{68C9E09E-F7FA-4853-B512-6BCD02BB69C1}"
 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}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.Runtime", "..\Razor\Razor.Runtime\src\Microsoft.AspNetCore.Razor.Runtime.csproj", "{9F2C52EA-1869-4610-921F-5FD654582019}"
 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}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Cookies", "..\Security\Authentication\Cookies\src\Microsoft.AspNetCore.Authentication.Cookies.csproj", "{AA074523-64D3-4CA7-8C2E-EACD977D2B19}"
 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}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.NET.Sdk.Razor", "..\Razor\Sdk.Razor\src\Microsoft.NET.Sdk.Razor.csproj", "{5145333A-40F8-4754-BA47-EC1CCECBE986}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Formatters.Json", "src\Microsoft.AspNetCore.Mvc.Formatters.Json\Microsoft.AspNetCore.Mvc.Formatters.Json.csproj", "{3FC8D9D6-9352-43A3-8E81-422F270085B7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration", "..\Servers\IIS\IISIntegration\src\Microsoft.AspNetCore.Server.IISIntegration.csproj", "{47D5BF2A-7B05-4630-8C7C-A682382EA6F1}"
 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}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication", "..\Security\Authentication\Core\src\Microsoft.AspNetCore.Authentication.csproj", "{72D40CFE-93B5-4877-92DC-E79203641342}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Formatters.Json.Test", "test\Microsoft.AspNetCore.Mvc.Formatters.Json.Test\Microsoft.AspNetCore.Mvc.Formatters.Json.Test.csproj", "{493780DA-E696-40FF-BD12-4A5C5736F292}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel", "..\Servers\Kestrel\Kestrel\src\Microsoft.AspNetCore.Server.Kestrel.csproj", "{62952E87-88DB-45BA-9FE0-8A24FA983750}"
 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}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.CookiePolicy", "..\Security\CookiePolicy\src\Microsoft.AspNetCore.CookiePolicy.csproj", "{F4879FAE-CD3C-4158-9BF0-B8D9294CCD0D}"
 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}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authorization.Policy", "..\Security\Authorization\Policy\src\Microsoft.AspNetCore.Authorization.Policy.csproj", "{157F16EA-C5C1-4BDF-A81C-44A7771A13D7}"
 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}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ViewCompilation", "ViewCompilation", "{83D016A9-7233-43FC-94C1-0AF2619D136B}"
 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}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "testAssets", "testAssets", "{5C8A337A-956B-4045-A680-4A61942D0866}"
 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}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Razor.ViewCompilation", "ViewCompilation\src\Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.csproj", "{99BB0544-6AA4-4787-B396-0AE77D022547}"
 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}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Tasks", "ViewCompilation.Tasks\Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Tasks.csproj", "{0BB79FE3-F376-4352-97B3-382F7FFDDBE9}"
 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}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test", "ViewCompilation\test\UnitTests\Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test.csproj", "{4A300DA7-A19B-459D-96CA-C999B2CCABFD}"
 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}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationUsingRelativePaths", "ViewCompilation\testassets\ApplicationUsingRelativePaths\ApplicationUsingRelativePaths.csproj", "{53663DBF-D7FF-4BBF-8211-909237616049}"
 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}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationWithConfigureMvc", "ViewCompilation\testassets\ApplicationWithConfigureMvc\ApplicationWithConfigureMvc.csproj", "{134CDB3F-76CF-44D8-9621-F865092ACF20}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MvcSandbox", "samples\MvcSandbox\MvcSandbox.csproj", "{14ED4476-9F24-4776-8417-EA6927F6C9C9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationWithCustomInputFiles", "ViewCompilation\testassets\ApplicationWithCustomInputFiles\ApplicationWithCustomInputFiles.csproj", "{23F77F9B-2979-4DF0-9096-C090CE7BE09D}"
 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}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationWithParseErrors", "ViewCompilation\testassets\ApplicationWithParseErrors\ApplicationWithParseErrors.csproj", "{B079D8A1-6CC1-46D8-948A-523AA6836FF9}"
 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}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationWithRazorSdkNeitherUsed", "ViewCompilation\testassets\ApplicationWithRazorSdkNeitherUsed\ApplicationWithRazorSdkNeitherUsed.csproj", "{7CD48059-3ACF-4435-B6D5-F4F4B379F8B1}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Performance", "benchmarks\Microsoft.AspNetCore.Mvc.Performance\Microsoft.AspNetCore.Mvc.Performance.csproj", "{28D4DA20-6E13-47F9-80AE-D6AA7699CC35}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationWithRazorSdkPrecompilationUsed", "ViewCompilation\testassets\ApplicationWithRazorSdkPrecompilationUsed\ApplicationWithRazorSdkPrecompilationUsed.csproj", "{21C75A50-991B-44D2-B684-732733969C23}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4E1795C3-60C5-4AD2-A15F-93F6CE8FAD36}"
-	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
-		README.md = README.md
-		Settings.StyleCop = Settings.StyleCop
-		version.xml = version.xml
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationWithRazorSdkUsed", "ViewCompilation\testassets\ApplicationWithRazorSdkUsed\ApplicationWithRazorSdkUsed.csproj", "{92A8AB5D-4BA1-43B4-A769-62DCDEFEB04C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationWithTagHelpers", "ViewCompilation\testassets\ApplicationWithTagHelpers\ApplicationWithTagHelpers.csproj", "{ABF8187A-F6FF-4722-B625-897B385F6CEC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClassLibraryTagHelper", "ViewCompilation\testassets\ClassLibraryTagHelper\ClassLibraryTagHelper.csproj", "{6EFC8D17-47E9-44F7-897E-4F1102B16DF4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PublishWithEmbedViewSources", "ViewCompilation\testassets\PublishWithEmbedViewSources\PublishWithEmbedViewSources.csproj", "{B2624173-3535-4138-9F90-420D83772ABC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RazorPagesApp", "ViewCompilation\testassets\RazorPagesApp\RazorPagesApp.csproj", "{1403D49E-C3DB-49E8-A888-541F0C8F9DCD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleApp", "ViewCompilation\testassets\SimpleApp\SimpleApp.csproj", "{36C62FC6-8496-492D-A2F9-BF68CC6520BB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleAppWithAssemblyRename", "ViewCompilation\testassets\SimpleAppWithAssemblyRename\SimpleAppWithAssemblyRename.csproj", "{D54A8DCC-801E-4407-A9CC-01E4C33A72EB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StrongNamedApp", "ViewCompilation\testassets\StrongNamedApp\StrongNamedApp.csproj", "{13CB4F98-F361-4989-BBC2-0B0ECDAC68F3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.FunctionalTests", "ViewCompilation\test\FunctionalTests\Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.FunctionalTests.csproj", "{0A2B5ED2-E9A7-41A5-9B0F-10007673F2D9}"
+EndProject
+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.Analyzers", "Mvc.Analyzers", "{4098228A-A3CE-4A38-9C69-B43DFD522FFE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Analyzers", "Mvc.Analyzers\src\Microsoft.AspNetCore.Mvc.Analyzers.csproj", "{A3B32436-2C1A-4894-9C48-20A375F620D9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Analyzers.Test", "Mvc.Analyzers\test\Microsoft.AspNetCore.Mvc.Analyzers.Test.csproj", "{3DC39D0E-AB52-4FD7-BCE1-BA5F27033160}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mvc.Analyzers.Experimental", "Mvc.Analyzers.Experimental", "{ED0AE513-0E3E-45E7-8C94-231000ACFAAA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Analyzers.Experimental", "Mvc.Analyzers.Experimental\src\Microsoft.AspNetCore.Mvc.Analyzers.Experimental.csproj", "{03006684-0D8B-4FD3-BDFE-70D451E0498D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Analyzers.Experimental.Test", "Mvc.Analyzers.Experimental\test\Microsoft.AspNetCore.Mvc.Analyzers.Experimental.Test.csproj", "{217336E2-74FB-4D1B-9152-AF9C85266280}"
+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("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Formatters.Json.Test", "Mvc.Formatters.Json\test\Microsoft.AspNetCore.Mvc.Formatters.Json.Test.csproj", "{7FB0CBDC-AD2D-409A-B8AD-C74395069B0F}"
+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("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mvc.WebApiCompatShim", "Mvc.WebApiCompatShim", "{2CA9D135-E011-4916-8AAB-4F282F87C9E7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.WebApiCompatShim", "Mvc.WebApiCompatShim\src\Microsoft.AspNetCore.Mvc.WebApiCompatShim.csproj", "{1E722DC2-12FB-4CA4-8E2A-A4C3FEFE2C44}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.WebApiCompatShimTest", "Mvc.WebApiCompatShim\test\Microsoft.AspNetCore.Mvc.WebApiCompatShimTest.csproj", "{A53837A6-212D-433F-9B52-878C9E980B52}"
+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}") = "benchmarks", "benchmarks", "{44546170-35BF-448F-88F5-4331AE67AEAE}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "shared", "shared", "{75A3249D-E8DB-42F1-9B4E-1DCC662856A0}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Analyzers.Experimental.Test", "test\Microsoft.AspNetCore.Mvc.Analyzers.Experimental.Test\Microsoft.AspNetCore.Mvc.Analyzers.Experimental.Test.csproj", "{2E6CDE10-8F96-4B75-B0D9-808F6A01B8BD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.TestCommon", "shared\Mvc.TestCommon\Microsoft.AspNetCore.Mvc.TestCommon.csproj", "{78D6B28C-A16E-4BDF-8653-E51FA75BDEBB}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Analyzers", "src\Microsoft.AspNetCore.Mvc.Analyzers\Microsoft.AspNetCore.Mvc.Analyzers.csproj", "{30862895-C1FA-49F5-B69A-B0F9F2ECD0F3}"
+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("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Analyzers.Experimental", "src\Microsoft.AspNetCore.Mvc.Analyzers.Experimental\Microsoft.AspNetCore.Mvc.Analyzers.Experimental.csproj", "{F8FD2D6A-DCD1-4A7B-B599-B728A12A1754}"
+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.Analyzers.Test", "test\Microsoft.AspNetCore.Mvc.Analyzers.Test\Microsoft.AspNetCore.Mvc.Analyzers.Test.csproj", "{829D9A67-2D07-4CE6-86C0-59F2549B0CFA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Testing", "Mvc.Testing\src\Microsoft.AspNetCore.Mvc.Testing.csproj", "{8F724554-E7EF-48D2-B27B-00C238078EAF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -122,334 +224,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
-		{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
-		{23D30B8C-04B1-4577-A604-ED27EA1E4A0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{23D30B8C-04B1-4577-A604-ED27EA1E4A0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{23D30B8C-04B1-4577-A604-ED27EA1E4A0E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{23D30B8C-04B1-4577-A604-ED27EA1E4A0E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{23D30B8C-04B1-4577-A604-ED27EA1E4A0E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{23D30B8C-04B1-4577-A604-ED27EA1E4A0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{23D30B8C-04B1-4577-A604-ED27EA1E4A0E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{23D30B8C-04B1-4577-A604-ED27EA1E4A0E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{23D30B8C-04B1-4577-A604-ED27EA1E4A0E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{23D30B8C-04B1-4577-A604-ED27EA1E4A0E}.Release|x86.ActiveCfg = Release|Any CPU
-		{5DE8E4D9-AACD-4B5F-819F-F091383FB996}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5DE8E4D9-AACD-4B5F-819F-F091383FB996}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5DE8E4D9-AACD-4B5F-819F-F091383FB996}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5DE8E4D9-AACD-4B5F-819F-F091383FB996}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5DE8E4D9-AACD-4B5F-819F-F091383FB996}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{5DE8E4D9-AACD-4B5F-819F-F091383FB996}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5DE8E4D9-AACD-4B5F-819F-F091383FB996}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5DE8E4D9-AACD-4B5F-819F-F091383FB996}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{5DE8E4D9-AACD-4B5F-819F-F091383FB996}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{5DE8E4D9-AACD-4B5F-819F-F091383FB996}.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
-		{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
-		{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
@@ -462,134 +236,990 @@ Global
 		{14ED4476-9F24-4776-8417-EA6927F6C9C9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{14ED4476-9F24-4776-8417-EA6927F6C9C9}.Release|x86.ActiveCfg = Release|Any CPU
 		{14ED4476-9F24-4776-8417-EA6927F6C9C9}.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
-		{28D4DA20-6E13-47F9-80AE-D6AA7699CC35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{28D4DA20-6E13-47F9-80AE-D6AA7699CC35}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{28D4DA20-6E13-47F9-80AE-D6AA7699CC35}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{28D4DA20-6E13-47F9-80AE-D6AA7699CC35}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{28D4DA20-6E13-47F9-80AE-D6AA7699CC35}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{28D4DA20-6E13-47F9-80AE-D6AA7699CC35}.Debug|x86.Build.0 = Debug|Any CPU
-		{28D4DA20-6E13-47F9-80AE-D6AA7699CC35}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{28D4DA20-6E13-47F9-80AE-D6AA7699CC35}.Release|Any CPU.Build.0 = Release|Any CPU
-		{28D4DA20-6E13-47F9-80AE-D6AA7699CC35}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{28D4DA20-6E13-47F9-80AE-D6AA7699CC35}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{28D4DA20-6E13-47F9-80AE-D6AA7699CC35}.Release|x86.ActiveCfg = Release|Any CPU
-		{28D4DA20-6E13-47F9-80AE-D6AA7699CC35}.Release|x86.Build.0 = Release|Any CPU
-		{2E6CDE10-8F96-4B75-B0D9-808F6A01B8BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2E6CDE10-8F96-4B75-B0D9-808F6A01B8BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2E6CDE10-8F96-4B75-B0D9-808F6A01B8BD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2E6CDE10-8F96-4B75-B0D9-808F6A01B8BD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2E6CDE10-8F96-4B75-B0D9-808F6A01B8BD}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{2E6CDE10-8F96-4B75-B0D9-808F6A01B8BD}.Debug|x86.Build.0 = Debug|Any CPU
-		{2E6CDE10-8F96-4B75-B0D9-808F6A01B8BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2E6CDE10-8F96-4B75-B0D9-808F6A01B8BD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2E6CDE10-8F96-4B75-B0D9-808F6A01B8BD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{2E6CDE10-8F96-4B75-B0D9-808F6A01B8BD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{2E6CDE10-8F96-4B75-B0D9-808F6A01B8BD}.Release|x86.ActiveCfg = Release|Any CPU
-		{2E6CDE10-8F96-4B75-B0D9-808F6A01B8BD}.Release|x86.Build.0 = Release|Any CPU
-		{30862895-C1FA-49F5-B69A-B0F9F2ECD0F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{30862895-C1FA-49F5-B69A-B0F9F2ECD0F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{30862895-C1FA-49F5-B69A-B0F9F2ECD0F3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{30862895-C1FA-49F5-B69A-B0F9F2ECD0F3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{30862895-C1FA-49F5-B69A-B0F9F2ECD0F3}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{30862895-C1FA-49F5-B69A-B0F9F2ECD0F3}.Debug|x86.Build.0 = Debug|Any CPU
-		{30862895-C1FA-49F5-B69A-B0F9F2ECD0F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{30862895-C1FA-49F5-B69A-B0F9F2ECD0F3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{30862895-C1FA-49F5-B69A-B0F9F2ECD0F3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{30862895-C1FA-49F5-B69A-B0F9F2ECD0F3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{30862895-C1FA-49F5-B69A-B0F9F2ECD0F3}.Release|x86.ActiveCfg = Release|Any CPU
-		{30862895-C1FA-49F5-B69A-B0F9F2ECD0F3}.Release|x86.Build.0 = Release|Any CPU
-		{F8FD2D6A-DCD1-4A7B-B599-B728A12A1754}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F8FD2D6A-DCD1-4A7B-B599-B728A12A1754}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F8FD2D6A-DCD1-4A7B-B599-B728A12A1754}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F8FD2D6A-DCD1-4A7B-B599-B728A12A1754}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F8FD2D6A-DCD1-4A7B-B599-B728A12A1754}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F8FD2D6A-DCD1-4A7B-B599-B728A12A1754}.Debug|x86.Build.0 = Debug|Any CPU
-		{F8FD2D6A-DCD1-4A7B-B599-B728A12A1754}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F8FD2D6A-DCD1-4A7B-B599-B728A12A1754}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F8FD2D6A-DCD1-4A7B-B599-B728A12A1754}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{F8FD2D6A-DCD1-4A7B-B599-B728A12A1754}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{F8FD2D6A-DCD1-4A7B-B599-B728A12A1754}.Release|x86.ActiveCfg = Release|Any CPU
-		{F8FD2D6A-DCD1-4A7B-B599-B728A12A1754}.Release|x86.Build.0 = Release|Any CPU
-		{829D9A67-2D07-4CE6-86C0-59F2549B0CFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{829D9A67-2D07-4CE6-86C0-59F2549B0CFA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{829D9A67-2D07-4CE6-86C0-59F2549B0CFA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{829D9A67-2D07-4CE6-86C0-59F2549B0CFA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{829D9A67-2D07-4CE6-86C0-59F2549B0CFA}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{829D9A67-2D07-4CE6-86C0-59F2549B0CFA}.Debug|x86.Build.0 = Debug|Any CPU
-		{829D9A67-2D07-4CE6-86C0-59F2549B0CFA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{829D9A67-2D07-4CE6-86C0-59F2549B0CFA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{829D9A67-2D07-4CE6-86C0-59F2549B0CFA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{829D9A67-2D07-4CE6-86C0-59F2549B0CFA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{829D9A67-2D07-4CE6-86C0-59F2549B0CFA}.Release|x86.ActiveCfg = Release|Any CPU
-		{829D9A67-2D07-4CE6-86C0-59F2549B0CFA}.Release|x86.Build.0 = Release|Any CPU
+		{F16CEE0D-A28E-43BD-802F-99BAFE4BA7CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F16CEE0D-A28E-43BD-802F-99BAFE4BA7CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F16CEE0D-A28E-43BD-802F-99BAFE4BA7CE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F16CEE0D-A28E-43BD-802F-99BAFE4BA7CE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F16CEE0D-A28E-43BD-802F-99BAFE4BA7CE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F16CEE0D-A28E-43BD-802F-99BAFE4BA7CE}.Debug|x86.Build.0 = Debug|Any CPU
+		{F16CEE0D-A28E-43BD-802F-99BAFE4BA7CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F16CEE0D-A28E-43BD-802F-99BAFE4BA7CE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F16CEE0D-A28E-43BD-802F-99BAFE4BA7CE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{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
+		{0930C2EA-FA36-4EDF-A571-215765D1F2C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0930C2EA-FA36-4EDF-A571-215765D1F2C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0930C2EA-FA36-4EDF-A571-215765D1F2C7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0930C2EA-FA36-4EDF-A571-215765D1F2C7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0930C2EA-FA36-4EDF-A571-215765D1F2C7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0930C2EA-FA36-4EDF-A571-215765D1F2C7}.Debug|x86.Build.0 = Debug|Any CPU
+		{0930C2EA-FA36-4EDF-A571-215765D1F2C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0930C2EA-FA36-4EDF-A571-215765D1F2C7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0930C2EA-FA36-4EDF-A571-215765D1F2C7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{0930C2EA-FA36-4EDF-A571-215765D1F2C7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{0930C2EA-FA36-4EDF-A571-215765D1F2C7}.Release|x86.ActiveCfg = Release|Any CPU
+		{0930C2EA-FA36-4EDF-A571-215765D1F2C7}.Release|x86.Build.0 = Release|Any CPU
+		{A273BAAB-DA92-401D-B781-ADA9E3B7717C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A273BAAB-DA92-401D-B781-ADA9E3B7717C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A273BAAB-DA92-401D-B781-ADA9E3B7717C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A273BAAB-DA92-401D-B781-ADA9E3B7717C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A273BAAB-DA92-401D-B781-ADA9E3B7717C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A273BAAB-DA92-401D-B781-ADA9E3B7717C}.Debug|x86.Build.0 = Debug|Any CPU
+		{A273BAAB-DA92-401D-B781-ADA9E3B7717C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A273BAAB-DA92-401D-B781-ADA9E3B7717C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A273BAAB-DA92-401D-B781-ADA9E3B7717C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{A273BAAB-DA92-401D-B781-ADA9E3B7717C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{A273BAAB-DA92-401D-B781-ADA9E3B7717C}.Release|x86.ActiveCfg = Release|Any CPU
+		{A273BAAB-DA92-401D-B781-ADA9E3B7717C}.Release|x86.Build.0 = Release|Any CPU
+		{E07B7D3A-1D4D-4644-84C2-06FEDB64885B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E07B7D3A-1D4D-4644-84C2-06FEDB64885B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E07B7D3A-1D4D-4644-84C2-06FEDB64885B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E07B7D3A-1D4D-4644-84C2-06FEDB64885B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E07B7D3A-1D4D-4644-84C2-06FEDB64885B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E07B7D3A-1D4D-4644-84C2-06FEDB64885B}.Debug|x86.Build.0 = Debug|Any CPU
+		{E07B7D3A-1D4D-4644-84C2-06FEDB64885B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E07B7D3A-1D4D-4644-84C2-06FEDB64885B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E07B7D3A-1D4D-4644-84C2-06FEDB64885B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{E07B7D3A-1D4D-4644-84C2-06FEDB64885B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{E07B7D3A-1D4D-4644-84C2-06FEDB64885B}.Release|x86.ActiveCfg = Release|Any CPU
+		{E07B7D3A-1D4D-4644-84C2-06FEDB64885B}.Release|x86.Build.0 = Release|Any CPU
+		{0F5F9381-D3B4-4E0D-9FAA-CC12520DBB4A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0F5F9381-D3B4-4E0D-9FAA-CC12520DBB4A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0F5F9381-D3B4-4E0D-9FAA-CC12520DBB4A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0F5F9381-D3B4-4E0D-9FAA-CC12520DBB4A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0F5F9381-D3B4-4E0D-9FAA-CC12520DBB4A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0F5F9381-D3B4-4E0D-9FAA-CC12520DBB4A}.Debug|x86.Build.0 = Debug|Any CPU
+		{0F5F9381-D3B4-4E0D-9FAA-CC12520DBB4A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0F5F9381-D3B4-4E0D-9FAA-CC12520DBB4A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0F5F9381-D3B4-4E0D-9FAA-CC12520DBB4A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{0F5F9381-D3B4-4E0D-9FAA-CC12520DBB4A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{0F5F9381-D3B4-4E0D-9FAA-CC12520DBB4A}.Release|x86.ActiveCfg = Release|Any CPU
+		{0F5F9381-D3B4-4E0D-9FAA-CC12520DBB4A}.Release|x86.Build.0 = Release|Any CPU
+		{2E18C4FD-9982-4BD9-A067-3CE56E68C450}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2E18C4FD-9982-4BD9-A067-3CE56E68C450}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2E18C4FD-9982-4BD9-A067-3CE56E68C450}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2E18C4FD-9982-4BD9-A067-3CE56E68C450}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2E18C4FD-9982-4BD9-A067-3CE56E68C450}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2E18C4FD-9982-4BD9-A067-3CE56E68C450}.Debug|x86.Build.0 = Debug|Any CPU
+		{2E18C4FD-9982-4BD9-A067-3CE56E68C450}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2E18C4FD-9982-4BD9-A067-3CE56E68C450}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2E18C4FD-9982-4BD9-A067-3CE56E68C450}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{2E18C4FD-9982-4BD9-A067-3CE56E68C450}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{2E18C4FD-9982-4BD9-A067-3CE56E68C450}.Release|x86.ActiveCfg = Release|Any CPU
+		{2E18C4FD-9982-4BD9-A067-3CE56E68C450}.Release|x86.Build.0 = Release|Any CPU
+		{C79D9793-FADA-4B1A-8AD7-8AEDB2358CA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C79D9793-FADA-4B1A-8AD7-8AEDB2358CA2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C79D9793-FADA-4B1A-8AD7-8AEDB2358CA2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C79D9793-FADA-4B1A-8AD7-8AEDB2358CA2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C79D9793-FADA-4B1A-8AD7-8AEDB2358CA2}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C79D9793-FADA-4B1A-8AD7-8AEDB2358CA2}.Debug|x86.Build.0 = Debug|Any CPU
+		{C79D9793-FADA-4B1A-8AD7-8AEDB2358CA2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C79D9793-FADA-4B1A-8AD7-8AEDB2358CA2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C79D9793-FADA-4B1A-8AD7-8AEDB2358CA2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{C79D9793-FADA-4B1A-8AD7-8AEDB2358CA2}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{C79D9793-FADA-4B1A-8AD7-8AEDB2358CA2}.Release|x86.ActiveCfg = Release|Any CPU
+		{C79D9793-FADA-4B1A-8AD7-8AEDB2358CA2}.Release|x86.Build.0 = Release|Any CPU
+		{BCD18147-D96D-4240-A89F-5F890392E58E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BCD18147-D96D-4240-A89F-5F890392E58E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BCD18147-D96D-4240-A89F-5F890392E58E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BCD18147-D96D-4240-A89F-5F890392E58E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BCD18147-D96D-4240-A89F-5F890392E58E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{BCD18147-D96D-4240-A89F-5F890392E58E}.Debug|x86.Build.0 = Debug|Any CPU
+		{BCD18147-D96D-4240-A89F-5F890392E58E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BCD18147-D96D-4240-A89F-5F890392E58E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BCD18147-D96D-4240-A89F-5F890392E58E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{BCD18147-D96D-4240-A89F-5F890392E58E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{BCD18147-D96D-4240-A89F-5F890392E58E}.Release|x86.ActiveCfg = Release|Any CPU
+		{BCD18147-D96D-4240-A89F-5F890392E58E}.Release|x86.Build.0 = Release|Any CPU
+		{986BF4FD-D0E3-48AE-917C-6C168D6395D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{986BF4FD-D0E3-48AE-917C-6C168D6395D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{986BF4FD-D0E3-48AE-917C-6C168D6395D3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{986BF4FD-D0E3-48AE-917C-6C168D6395D3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{986BF4FD-D0E3-48AE-917C-6C168D6395D3}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{986BF4FD-D0E3-48AE-917C-6C168D6395D3}.Debug|x86.Build.0 = Debug|Any CPU
+		{986BF4FD-D0E3-48AE-917C-6C168D6395D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{986BF4FD-D0E3-48AE-917C-6C168D6395D3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{986BF4FD-D0E3-48AE-917C-6C168D6395D3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{986BF4FD-D0E3-48AE-917C-6C168D6395D3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{986BF4FD-D0E3-48AE-917C-6C168D6395D3}.Release|x86.ActiveCfg = Release|Any CPU
+		{986BF4FD-D0E3-48AE-917C-6C168D6395D3}.Release|x86.Build.0 = Release|Any CPU
+		{F4E1F1ED-2DE9-4659-B2E7-C9B6B8454AD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F4E1F1ED-2DE9-4659-B2E7-C9B6B8454AD1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F4E1F1ED-2DE9-4659-B2E7-C9B6B8454AD1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F4E1F1ED-2DE9-4659-B2E7-C9B6B8454AD1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F4E1F1ED-2DE9-4659-B2E7-C9B6B8454AD1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F4E1F1ED-2DE9-4659-B2E7-C9B6B8454AD1}.Debug|x86.Build.0 = Debug|Any CPU
+		{F4E1F1ED-2DE9-4659-B2E7-C9B6B8454AD1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F4E1F1ED-2DE9-4659-B2E7-C9B6B8454AD1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F4E1F1ED-2DE9-4659-B2E7-C9B6B8454AD1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{F4E1F1ED-2DE9-4659-B2E7-C9B6B8454AD1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{F4E1F1ED-2DE9-4659-B2E7-C9B6B8454AD1}.Release|x86.ActiveCfg = Release|Any CPU
+		{F4E1F1ED-2DE9-4659-B2E7-C9B6B8454AD1}.Release|x86.Build.0 = Release|Any CPU
+		{F4846AC2-384E-4C0B-8DE5-9784715E4A9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F4846AC2-384E-4C0B-8DE5-9784715E4A9F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F4846AC2-384E-4C0B-8DE5-9784715E4A9F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F4846AC2-384E-4C0B-8DE5-9784715E4A9F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F4846AC2-384E-4C0B-8DE5-9784715E4A9F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F4846AC2-384E-4C0B-8DE5-9784715E4A9F}.Debug|x86.Build.0 = Debug|Any CPU
+		{F4846AC2-384E-4C0B-8DE5-9784715E4A9F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F4846AC2-384E-4C0B-8DE5-9784715E4A9F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F4846AC2-384E-4C0B-8DE5-9784715E4A9F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{F4846AC2-384E-4C0B-8DE5-9784715E4A9F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{F4846AC2-384E-4C0B-8DE5-9784715E4A9F}.Release|x86.ActiveCfg = Release|Any CPU
+		{F4846AC2-384E-4C0B-8DE5-9784715E4A9F}.Release|x86.Build.0 = Release|Any CPU
+		{C019C7EC-FDEE-4EAF-ABF1-89D946EFC95A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C019C7EC-FDEE-4EAF-ABF1-89D946EFC95A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C019C7EC-FDEE-4EAF-ABF1-89D946EFC95A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C019C7EC-FDEE-4EAF-ABF1-89D946EFC95A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C019C7EC-FDEE-4EAF-ABF1-89D946EFC95A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C019C7EC-FDEE-4EAF-ABF1-89D946EFC95A}.Debug|x86.Build.0 = Debug|Any CPU
+		{C019C7EC-FDEE-4EAF-ABF1-89D946EFC95A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C019C7EC-FDEE-4EAF-ABF1-89D946EFC95A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C019C7EC-FDEE-4EAF-ABF1-89D946EFC95A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{C019C7EC-FDEE-4EAF-ABF1-89D946EFC95A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{C019C7EC-FDEE-4EAF-ABF1-89D946EFC95A}.Release|x86.ActiveCfg = Release|Any CPU
+		{C019C7EC-FDEE-4EAF-ABF1-89D946EFC95A}.Release|x86.Build.0 = Release|Any CPU
+		{68C9E09E-F7FA-4853-B512-6BCD02BB69C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{68C9E09E-F7FA-4853-B512-6BCD02BB69C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{68C9E09E-F7FA-4853-B512-6BCD02BB69C1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{68C9E09E-F7FA-4853-B512-6BCD02BB69C1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{68C9E09E-F7FA-4853-B512-6BCD02BB69C1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{68C9E09E-F7FA-4853-B512-6BCD02BB69C1}.Debug|x86.Build.0 = Debug|Any CPU
+		{68C9E09E-F7FA-4853-B512-6BCD02BB69C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{68C9E09E-F7FA-4853-B512-6BCD02BB69C1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{68C9E09E-F7FA-4853-B512-6BCD02BB69C1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{68C9E09E-F7FA-4853-B512-6BCD02BB69C1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{68C9E09E-F7FA-4853-B512-6BCD02BB69C1}.Release|x86.ActiveCfg = Release|Any CPU
+		{68C9E09E-F7FA-4853-B512-6BCD02BB69C1}.Release|x86.Build.0 = Release|Any CPU
+		{9F2C52EA-1869-4610-921F-5FD654582019}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9F2C52EA-1869-4610-921F-5FD654582019}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9F2C52EA-1869-4610-921F-5FD654582019}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9F2C52EA-1869-4610-921F-5FD654582019}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9F2C52EA-1869-4610-921F-5FD654582019}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9F2C52EA-1869-4610-921F-5FD654582019}.Debug|x86.Build.0 = Debug|Any CPU
+		{9F2C52EA-1869-4610-921F-5FD654582019}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9F2C52EA-1869-4610-921F-5FD654582019}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9F2C52EA-1869-4610-921F-5FD654582019}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{9F2C52EA-1869-4610-921F-5FD654582019}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{9F2C52EA-1869-4610-921F-5FD654582019}.Release|x86.ActiveCfg = Release|Any CPU
+		{9F2C52EA-1869-4610-921F-5FD654582019}.Release|x86.Build.0 = Release|Any CPU
+		{AA074523-64D3-4CA7-8C2E-EACD977D2B19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AA074523-64D3-4CA7-8C2E-EACD977D2B19}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AA074523-64D3-4CA7-8C2E-EACD977D2B19}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{AA074523-64D3-4CA7-8C2E-EACD977D2B19}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{AA074523-64D3-4CA7-8C2E-EACD977D2B19}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{AA074523-64D3-4CA7-8C2E-EACD977D2B19}.Debug|x86.Build.0 = Debug|Any CPU
+		{AA074523-64D3-4CA7-8C2E-EACD977D2B19}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AA074523-64D3-4CA7-8C2E-EACD977D2B19}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AA074523-64D3-4CA7-8C2E-EACD977D2B19}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{AA074523-64D3-4CA7-8C2E-EACD977D2B19}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{AA074523-64D3-4CA7-8C2E-EACD977D2B19}.Release|x86.ActiveCfg = Release|Any CPU
+		{AA074523-64D3-4CA7-8C2E-EACD977D2B19}.Release|x86.Build.0 = Release|Any CPU
+		{5145333A-40F8-4754-BA47-EC1CCECBE986}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5145333A-40F8-4754-BA47-EC1CCECBE986}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5145333A-40F8-4754-BA47-EC1CCECBE986}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5145333A-40F8-4754-BA47-EC1CCECBE986}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5145333A-40F8-4754-BA47-EC1CCECBE986}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5145333A-40F8-4754-BA47-EC1CCECBE986}.Debug|x86.Build.0 = Debug|Any CPU
+		{5145333A-40F8-4754-BA47-EC1CCECBE986}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5145333A-40F8-4754-BA47-EC1CCECBE986}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5145333A-40F8-4754-BA47-EC1CCECBE986}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{5145333A-40F8-4754-BA47-EC1CCECBE986}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{5145333A-40F8-4754-BA47-EC1CCECBE986}.Release|x86.ActiveCfg = Release|Any CPU
+		{5145333A-40F8-4754-BA47-EC1CCECBE986}.Release|x86.Build.0 = Release|Any CPU
+		{47D5BF2A-7B05-4630-8C7C-A682382EA6F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{47D5BF2A-7B05-4630-8C7C-A682382EA6F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{47D5BF2A-7B05-4630-8C7C-A682382EA6F1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{47D5BF2A-7B05-4630-8C7C-A682382EA6F1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{47D5BF2A-7B05-4630-8C7C-A682382EA6F1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{47D5BF2A-7B05-4630-8C7C-A682382EA6F1}.Debug|x86.Build.0 = Debug|Any CPU
+		{47D5BF2A-7B05-4630-8C7C-A682382EA6F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{47D5BF2A-7B05-4630-8C7C-A682382EA6F1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{47D5BF2A-7B05-4630-8C7C-A682382EA6F1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{47D5BF2A-7B05-4630-8C7C-A682382EA6F1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{47D5BF2A-7B05-4630-8C7C-A682382EA6F1}.Release|x86.ActiveCfg = Release|Any CPU
+		{47D5BF2A-7B05-4630-8C7C-A682382EA6F1}.Release|x86.Build.0 = Release|Any CPU
+		{72D40CFE-93B5-4877-92DC-E79203641342}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{72D40CFE-93B5-4877-92DC-E79203641342}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{72D40CFE-93B5-4877-92DC-E79203641342}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{72D40CFE-93B5-4877-92DC-E79203641342}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{72D40CFE-93B5-4877-92DC-E79203641342}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{72D40CFE-93B5-4877-92DC-E79203641342}.Debug|x86.Build.0 = Debug|Any CPU
+		{72D40CFE-93B5-4877-92DC-E79203641342}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{72D40CFE-93B5-4877-92DC-E79203641342}.Release|Any CPU.Build.0 = Release|Any CPU
+		{72D40CFE-93B5-4877-92DC-E79203641342}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{72D40CFE-93B5-4877-92DC-E79203641342}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{72D40CFE-93B5-4877-92DC-E79203641342}.Release|x86.ActiveCfg = Release|Any CPU
+		{72D40CFE-93B5-4877-92DC-E79203641342}.Release|x86.Build.0 = Release|Any CPU
+		{62952E87-88DB-45BA-9FE0-8A24FA983750}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{62952E87-88DB-45BA-9FE0-8A24FA983750}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{62952E87-88DB-45BA-9FE0-8A24FA983750}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{62952E87-88DB-45BA-9FE0-8A24FA983750}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{62952E87-88DB-45BA-9FE0-8A24FA983750}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{62952E87-88DB-45BA-9FE0-8A24FA983750}.Debug|x86.Build.0 = Debug|Any CPU
+		{62952E87-88DB-45BA-9FE0-8A24FA983750}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{62952E87-88DB-45BA-9FE0-8A24FA983750}.Release|Any CPU.Build.0 = Release|Any CPU
+		{62952E87-88DB-45BA-9FE0-8A24FA983750}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{62952E87-88DB-45BA-9FE0-8A24FA983750}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{62952E87-88DB-45BA-9FE0-8A24FA983750}.Release|x86.ActiveCfg = Release|Any CPU
+		{62952E87-88DB-45BA-9FE0-8A24FA983750}.Release|x86.Build.0 = Release|Any CPU
+		{F4879FAE-CD3C-4158-9BF0-B8D9294CCD0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F4879FAE-CD3C-4158-9BF0-B8D9294CCD0D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F4879FAE-CD3C-4158-9BF0-B8D9294CCD0D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F4879FAE-CD3C-4158-9BF0-B8D9294CCD0D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F4879FAE-CD3C-4158-9BF0-B8D9294CCD0D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F4879FAE-CD3C-4158-9BF0-B8D9294CCD0D}.Debug|x86.Build.0 = Debug|Any CPU
+		{F4879FAE-CD3C-4158-9BF0-B8D9294CCD0D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F4879FAE-CD3C-4158-9BF0-B8D9294CCD0D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F4879FAE-CD3C-4158-9BF0-B8D9294CCD0D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{F4879FAE-CD3C-4158-9BF0-B8D9294CCD0D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{F4879FAE-CD3C-4158-9BF0-B8D9294CCD0D}.Release|x86.ActiveCfg = Release|Any CPU
+		{F4879FAE-CD3C-4158-9BF0-B8D9294CCD0D}.Release|x86.Build.0 = Release|Any CPU
+		{157F16EA-C5C1-4BDF-A81C-44A7771A13D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{157F16EA-C5C1-4BDF-A81C-44A7771A13D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{157F16EA-C5C1-4BDF-A81C-44A7771A13D7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{157F16EA-C5C1-4BDF-A81C-44A7771A13D7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{157F16EA-C5C1-4BDF-A81C-44A7771A13D7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{157F16EA-C5C1-4BDF-A81C-44A7771A13D7}.Debug|x86.Build.0 = Debug|Any CPU
+		{157F16EA-C5C1-4BDF-A81C-44A7771A13D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{157F16EA-C5C1-4BDF-A81C-44A7771A13D7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{157F16EA-C5C1-4BDF-A81C-44A7771A13D7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{157F16EA-C5C1-4BDF-A81C-44A7771A13D7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{157F16EA-C5C1-4BDF-A81C-44A7771A13D7}.Release|x86.ActiveCfg = Release|Any CPU
+		{157F16EA-C5C1-4BDF-A81C-44A7771A13D7}.Release|x86.Build.0 = Release|Any CPU
+		{99BB0544-6AA4-4787-B396-0AE77D022547}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{99BB0544-6AA4-4787-B396-0AE77D022547}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{99BB0544-6AA4-4787-B396-0AE77D022547}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{99BB0544-6AA4-4787-B396-0AE77D022547}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{99BB0544-6AA4-4787-B396-0AE77D022547}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{99BB0544-6AA4-4787-B396-0AE77D022547}.Debug|x86.Build.0 = Debug|Any CPU
+		{99BB0544-6AA4-4787-B396-0AE77D022547}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{99BB0544-6AA4-4787-B396-0AE77D022547}.Release|Any CPU.Build.0 = Release|Any CPU
+		{99BB0544-6AA4-4787-B396-0AE77D022547}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{99BB0544-6AA4-4787-B396-0AE77D022547}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{99BB0544-6AA4-4787-B396-0AE77D022547}.Release|x86.ActiveCfg = Release|Any CPU
+		{99BB0544-6AA4-4787-B396-0AE77D022547}.Release|x86.Build.0 = Release|Any CPU
+		{0BB79FE3-F376-4352-97B3-382F7FFDDBE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0BB79FE3-F376-4352-97B3-382F7FFDDBE9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0BB79FE3-F376-4352-97B3-382F7FFDDBE9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0BB79FE3-F376-4352-97B3-382F7FFDDBE9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0BB79FE3-F376-4352-97B3-382F7FFDDBE9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0BB79FE3-F376-4352-97B3-382F7FFDDBE9}.Debug|x86.Build.0 = Debug|Any CPU
+		{0BB79FE3-F376-4352-97B3-382F7FFDDBE9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0BB79FE3-F376-4352-97B3-382F7FFDDBE9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0BB79FE3-F376-4352-97B3-382F7FFDDBE9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{0BB79FE3-F376-4352-97B3-382F7FFDDBE9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{0BB79FE3-F376-4352-97B3-382F7FFDDBE9}.Release|x86.ActiveCfg = Release|Any CPU
+		{0BB79FE3-F376-4352-97B3-382F7FFDDBE9}.Release|x86.Build.0 = Release|Any CPU
+		{4A300DA7-A19B-459D-96CA-C999B2CCABFD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4A300DA7-A19B-459D-96CA-C999B2CCABFD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4A300DA7-A19B-459D-96CA-C999B2CCABFD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4A300DA7-A19B-459D-96CA-C999B2CCABFD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4A300DA7-A19B-459D-96CA-C999B2CCABFD}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4A300DA7-A19B-459D-96CA-C999B2CCABFD}.Debug|x86.Build.0 = Debug|Any CPU
+		{4A300DA7-A19B-459D-96CA-C999B2CCABFD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4A300DA7-A19B-459D-96CA-C999B2CCABFD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4A300DA7-A19B-459D-96CA-C999B2CCABFD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{4A300DA7-A19B-459D-96CA-C999B2CCABFD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{4A300DA7-A19B-459D-96CA-C999B2CCABFD}.Release|x86.ActiveCfg = Release|Any CPU
+		{4A300DA7-A19B-459D-96CA-C999B2CCABFD}.Release|x86.Build.0 = Release|Any CPU
+		{53663DBF-D7FF-4BBF-8211-909237616049}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{53663DBF-D7FF-4BBF-8211-909237616049}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{53663DBF-D7FF-4BBF-8211-909237616049}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{53663DBF-D7FF-4BBF-8211-909237616049}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{53663DBF-D7FF-4BBF-8211-909237616049}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{53663DBF-D7FF-4BBF-8211-909237616049}.Debug|x86.Build.0 = Debug|Any CPU
+		{53663DBF-D7FF-4BBF-8211-909237616049}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{53663DBF-D7FF-4BBF-8211-909237616049}.Release|Any CPU.Build.0 = Release|Any CPU
+		{53663DBF-D7FF-4BBF-8211-909237616049}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{53663DBF-D7FF-4BBF-8211-909237616049}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{53663DBF-D7FF-4BBF-8211-909237616049}.Release|x86.ActiveCfg = Release|Any CPU
+		{53663DBF-D7FF-4BBF-8211-909237616049}.Release|x86.Build.0 = Release|Any CPU
+		{134CDB3F-76CF-44D8-9621-F865092ACF20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{134CDB3F-76CF-44D8-9621-F865092ACF20}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{134CDB3F-76CF-44D8-9621-F865092ACF20}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{134CDB3F-76CF-44D8-9621-F865092ACF20}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{134CDB3F-76CF-44D8-9621-F865092ACF20}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{134CDB3F-76CF-44D8-9621-F865092ACF20}.Debug|x86.Build.0 = Debug|Any CPU
+		{134CDB3F-76CF-44D8-9621-F865092ACF20}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{134CDB3F-76CF-44D8-9621-F865092ACF20}.Release|Any CPU.Build.0 = Release|Any CPU
+		{134CDB3F-76CF-44D8-9621-F865092ACF20}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{134CDB3F-76CF-44D8-9621-F865092ACF20}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{134CDB3F-76CF-44D8-9621-F865092ACF20}.Release|x86.ActiveCfg = Release|Any CPU
+		{134CDB3F-76CF-44D8-9621-F865092ACF20}.Release|x86.Build.0 = Release|Any CPU
+		{23F77F9B-2979-4DF0-9096-C090CE7BE09D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{23F77F9B-2979-4DF0-9096-C090CE7BE09D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{23F77F9B-2979-4DF0-9096-C090CE7BE09D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{23F77F9B-2979-4DF0-9096-C090CE7BE09D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{23F77F9B-2979-4DF0-9096-C090CE7BE09D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{23F77F9B-2979-4DF0-9096-C090CE7BE09D}.Debug|x86.Build.0 = Debug|Any CPU
+		{23F77F9B-2979-4DF0-9096-C090CE7BE09D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{23F77F9B-2979-4DF0-9096-C090CE7BE09D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{23F77F9B-2979-4DF0-9096-C090CE7BE09D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{23F77F9B-2979-4DF0-9096-C090CE7BE09D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{23F77F9B-2979-4DF0-9096-C090CE7BE09D}.Release|x86.ActiveCfg = Release|Any CPU
+		{23F77F9B-2979-4DF0-9096-C090CE7BE09D}.Release|x86.Build.0 = Release|Any CPU
+		{B079D8A1-6CC1-46D8-948A-523AA6836FF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B079D8A1-6CC1-46D8-948A-523AA6836FF9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B079D8A1-6CC1-46D8-948A-523AA6836FF9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B079D8A1-6CC1-46D8-948A-523AA6836FF9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B079D8A1-6CC1-46D8-948A-523AA6836FF9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B079D8A1-6CC1-46D8-948A-523AA6836FF9}.Debug|x86.Build.0 = Debug|Any CPU
+		{B079D8A1-6CC1-46D8-948A-523AA6836FF9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B079D8A1-6CC1-46D8-948A-523AA6836FF9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B079D8A1-6CC1-46D8-948A-523AA6836FF9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{B079D8A1-6CC1-46D8-948A-523AA6836FF9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{B079D8A1-6CC1-46D8-948A-523AA6836FF9}.Release|x86.ActiveCfg = Release|Any CPU
+		{B079D8A1-6CC1-46D8-948A-523AA6836FF9}.Release|x86.Build.0 = Release|Any CPU
+		{7CD48059-3ACF-4435-B6D5-F4F4B379F8B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7CD48059-3ACF-4435-B6D5-F4F4B379F8B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7CD48059-3ACF-4435-B6D5-F4F4B379F8B1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{7CD48059-3ACF-4435-B6D5-F4F4B379F8B1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{7CD48059-3ACF-4435-B6D5-F4F4B379F8B1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7CD48059-3ACF-4435-B6D5-F4F4B379F8B1}.Debug|x86.Build.0 = Debug|Any CPU
+		{7CD48059-3ACF-4435-B6D5-F4F4B379F8B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7CD48059-3ACF-4435-B6D5-F4F4B379F8B1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7CD48059-3ACF-4435-B6D5-F4F4B379F8B1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{7CD48059-3ACF-4435-B6D5-F4F4B379F8B1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{7CD48059-3ACF-4435-B6D5-F4F4B379F8B1}.Release|x86.ActiveCfg = Release|Any CPU
+		{7CD48059-3ACF-4435-B6D5-F4F4B379F8B1}.Release|x86.Build.0 = Release|Any CPU
+		{21C75A50-991B-44D2-B684-732733969C23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{21C75A50-991B-44D2-B684-732733969C23}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{21C75A50-991B-44D2-B684-732733969C23}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{21C75A50-991B-44D2-B684-732733969C23}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{21C75A50-991B-44D2-B684-732733969C23}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{21C75A50-991B-44D2-B684-732733969C23}.Debug|x86.Build.0 = Debug|Any CPU
+		{21C75A50-991B-44D2-B684-732733969C23}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{21C75A50-991B-44D2-B684-732733969C23}.Release|Any CPU.Build.0 = Release|Any CPU
+		{21C75A50-991B-44D2-B684-732733969C23}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{21C75A50-991B-44D2-B684-732733969C23}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{21C75A50-991B-44D2-B684-732733969C23}.Release|x86.ActiveCfg = Release|Any CPU
+		{21C75A50-991B-44D2-B684-732733969C23}.Release|x86.Build.0 = Release|Any CPU
+		{92A8AB5D-4BA1-43B4-A769-62DCDEFEB04C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{92A8AB5D-4BA1-43B4-A769-62DCDEFEB04C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{92A8AB5D-4BA1-43B4-A769-62DCDEFEB04C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{92A8AB5D-4BA1-43B4-A769-62DCDEFEB04C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{92A8AB5D-4BA1-43B4-A769-62DCDEFEB04C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{92A8AB5D-4BA1-43B4-A769-62DCDEFEB04C}.Debug|x86.Build.0 = Debug|Any CPU
+		{92A8AB5D-4BA1-43B4-A769-62DCDEFEB04C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{92A8AB5D-4BA1-43B4-A769-62DCDEFEB04C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{92A8AB5D-4BA1-43B4-A769-62DCDEFEB04C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{92A8AB5D-4BA1-43B4-A769-62DCDEFEB04C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{92A8AB5D-4BA1-43B4-A769-62DCDEFEB04C}.Release|x86.ActiveCfg = Release|Any CPU
+		{92A8AB5D-4BA1-43B4-A769-62DCDEFEB04C}.Release|x86.Build.0 = Release|Any CPU
+		{ABF8187A-F6FF-4722-B625-897B385F6CEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ABF8187A-F6FF-4722-B625-897B385F6CEC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ABF8187A-F6FF-4722-B625-897B385F6CEC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{ABF8187A-F6FF-4722-B625-897B385F6CEC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{ABF8187A-F6FF-4722-B625-897B385F6CEC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{ABF8187A-F6FF-4722-B625-897B385F6CEC}.Debug|x86.Build.0 = Debug|Any CPU
+		{ABF8187A-F6FF-4722-B625-897B385F6CEC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ABF8187A-F6FF-4722-B625-897B385F6CEC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ABF8187A-F6FF-4722-B625-897B385F6CEC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{ABF8187A-F6FF-4722-B625-897B385F6CEC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{ABF8187A-F6FF-4722-B625-897B385F6CEC}.Release|x86.ActiveCfg = Release|Any CPU
+		{ABF8187A-F6FF-4722-B625-897B385F6CEC}.Release|x86.Build.0 = Release|Any CPU
+		{6EFC8D17-47E9-44F7-897E-4F1102B16DF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6EFC8D17-47E9-44F7-897E-4F1102B16DF4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6EFC8D17-47E9-44F7-897E-4F1102B16DF4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6EFC8D17-47E9-44F7-897E-4F1102B16DF4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6EFC8D17-47E9-44F7-897E-4F1102B16DF4}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6EFC8D17-47E9-44F7-897E-4F1102B16DF4}.Debug|x86.Build.0 = Debug|Any CPU
+		{6EFC8D17-47E9-44F7-897E-4F1102B16DF4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6EFC8D17-47E9-44F7-897E-4F1102B16DF4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6EFC8D17-47E9-44F7-897E-4F1102B16DF4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{6EFC8D17-47E9-44F7-897E-4F1102B16DF4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{6EFC8D17-47E9-44F7-897E-4F1102B16DF4}.Release|x86.ActiveCfg = Release|Any CPU
+		{6EFC8D17-47E9-44F7-897E-4F1102B16DF4}.Release|x86.Build.0 = Release|Any CPU
+		{B2624173-3535-4138-9F90-420D83772ABC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B2624173-3535-4138-9F90-420D83772ABC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B2624173-3535-4138-9F90-420D83772ABC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B2624173-3535-4138-9F90-420D83772ABC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B2624173-3535-4138-9F90-420D83772ABC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B2624173-3535-4138-9F90-420D83772ABC}.Debug|x86.Build.0 = Debug|Any CPU
+		{B2624173-3535-4138-9F90-420D83772ABC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B2624173-3535-4138-9F90-420D83772ABC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B2624173-3535-4138-9F90-420D83772ABC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{B2624173-3535-4138-9F90-420D83772ABC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{B2624173-3535-4138-9F90-420D83772ABC}.Release|x86.ActiveCfg = Release|Any CPU
+		{B2624173-3535-4138-9F90-420D83772ABC}.Release|x86.Build.0 = Release|Any CPU
+		{1403D49E-C3DB-49E8-A888-541F0C8F9DCD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1403D49E-C3DB-49E8-A888-541F0C8F9DCD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1403D49E-C3DB-49E8-A888-541F0C8F9DCD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{1403D49E-C3DB-49E8-A888-541F0C8F9DCD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{1403D49E-C3DB-49E8-A888-541F0C8F9DCD}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1403D49E-C3DB-49E8-A888-541F0C8F9DCD}.Debug|x86.Build.0 = Debug|Any CPU
+		{1403D49E-C3DB-49E8-A888-541F0C8F9DCD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1403D49E-C3DB-49E8-A888-541F0C8F9DCD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1403D49E-C3DB-49E8-A888-541F0C8F9DCD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{1403D49E-C3DB-49E8-A888-541F0C8F9DCD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{1403D49E-C3DB-49E8-A888-541F0C8F9DCD}.Release|x86.ActiveCfg = Release|Any CPU
+		{1403D49E-C3DB-49E8-A888-541F0C8F9DCD}.Release|x86.Build.0 = Release|Any CPU
+		{36C62FC6-8496-492D-A2F9-BF68CC6520BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{36C62FC6-8496-492D-A2F9-BF68CC6520BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{36C62FC6-8496-492D-A2F9-BF68CC6520BB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{36C62FC6-8496-492D-A2F9-BF68CC6520BB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{36C62FC6-8496-492D-A2F9-BF68CC6520BB}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{36C62FC6-8496-492D-A2F9-BF68CC6520BB}.Debug|x86.Build.0 = Debug|Any CPU
+		{36C62FC6-8496-492D-A2F9-BF68CC6520BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{36C62FC6-8496-492D-A2F9-BF68CC6520BB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{36C62FC6-8496-492D-A2F9-BF68CC6520BB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{36C62FC6-8496-492D-A2F9-BF68CC6520BB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{36C62FC6-8496-492D-A2F9-BF68CC6520BB}.Release|x86.ActiveCfg = Release|Any CPU
+		{36C62FC6-8496-492D-A2F9-BF68CC6520BB}.Release|x86.Build.0 = Release|Any CPU
+		{D54A8DCC-801E-4407-A9CC-01E4C33A72EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D54A8DCC-801E-4407-A9CC-01E4C33A72EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D54A8DCC-801E-4407-A9CC-01E4C33A72EB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D54A8DCC-801E-4407-A9CC-01E4C33A72EB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D54A8DCC-801E-4407-A9CC-01E4C33A72EB}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D54A8DCC-801E-4407-A9CC-01E4C33A72EB}.Debug|x86.Build.0 = Debug|Any CPU
+		{D54A8DCC-801E-4407-A9CC-01E4C33A72EB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D54A8DCC-801E-4407-A9CC-01E4C33A72EB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D54A8DCC-801E-4407-A9CC-01E4C33A72EB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{D54A8DCC-801E-4407-A9CC-01E4C33A72EB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{D54A8DCC-801E-4407-A9CC-01E4C33A72EB}.Release|x86.ActiveCfg = Release|Any CPU
+		{D54A8DCC-801E-4407-A9CC-01E4C33A72EB}.Release|x86.Build.0 = Release|Any CPU
+		{13CB4F98-F361-4989-BBC2-0B0ECDAC68F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{13CB4F98-F361-4989-BBC2-0B0ECDAC68F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{13CB4F98-F361-4989-BBC2-0B0ECDAC68F3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{13CB4F98-F361-4989-BBC2-0B0ECDAC68F3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{13CB4F98-F361-4989-BBC2-0B0ECDAC68F3}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{13CB4F98-F361-4989-BBC2-0B0ECDAC68F3}.Debug|x86.Build.0 = Debug|Any CPU
+		{13CB4F98-F361-4989-BBC2-0B0ECDAC68F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{13CB4F98-F361-4989-BBC2-0B0ECDAC68F3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{13CB4F98-F361-4989-BBC2-0B0ECDAC68F3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{13CB4F98-F361-4989-BBC2-0B0ECDAC68F3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{13CB4F98-F361-4989-BBC2-0B0ECDAC68F3}.Release|x86.ActiveCfg = Release|Any CPU
+		{13CB4F98-F361-4989-BBC2-0B0ECDAC68F3}.Release|x86.Build.0 = Release|Any CPU
+		{0A2B5ED2-E9A7-41A5-9B0F-10007673F2D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0A2B5ED2-E9A7-41A5-9B0F-10007673F2D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0A2B5ED2-E9A7-41A5-9B0F-10007673F2D9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0A2B5ED2-E9A7-41A5-9B0F-10007673F2D9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0A2B5ED2-E9A7-41A5-9B0F-10007673F2D9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0A2B5ED2-E9A7-41A5-9B0F-10007673F2D9}.Debug|x86.Build.0 = Debug|Any CPU
+		{0A2B5ED2-E9A7-41A5-9B0F-10007673F2D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0A2B5ED2-E9A7-41A5-9B0F-10007673F2D9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0A2B5ED2-E9A7-41A5-9B0F-10007673F2D9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{0A2B5ED2-E9A7-41A5-9B0F-10007673F2D9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{0A2B5ED2-E9A7-41A5-9B0F-10007673F2D9}.Release|x86.ActiveCfg = Release|Any CPU
+		{0A2B5ED2-E9A7-41A5-9B0F-10007673F2D9}.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
+		{A3B32436-2C1A-4894-9C48-20A375F620D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A3B32436-2C1A-4894-9C48-20A375F620D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A3B32436-2C1A-4894-9C48-20A375F620D9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A3B32436-2C1A-4894-9C48-20A375F620D9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A3B32436-2C1A-4894-9C48-20A375F620D9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A3B32436-2C1A-4894-9C48-20A375F620D9}.Debug|x86.Build.0 = Debug|Any CPU
+		{A3B32436-2C1A-4894-9C48-20A375F620D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A3B32436-2C1A-4894-9C48-20A375F620D9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A3B32436-2C1A-4894-9C48-20A375F620D9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{A3B32436-2C1A-4894-9C48-20A375F620D9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{A3B32436-2C1A-4894-9C48-20A375F620D9}.Release|x86.ActiveCfg = Release|Any CPU
+		{A3B32436-2C1A-4894-9C48-20A375F620D9}.Release|x86.Build.0 = Release|Any CPU
+		{3DC39D0E-AB52-4FD7-BCE1-BA5F27033160}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3DC39D0E-AB52-4FD7-BCE1-BA5F27033160}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3DC39D0E-AB52-4FD7-BCE1-BA5F27033160}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3DC39D0E-AB52-4FD7-BCE1-BA5F27033160}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3DC39D0E-AB52-4FD7-BCE1-BA5F27033160}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3DC39D0E-AB52-4FD7-BCE1-BA5F27033160}.Debug|x86.Build.0 = Debug|Any CPU
+		{3DC39D0E-AB52-4FD7-BCE1-BA5F27033160}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3DC39D0E-AB52-4FD7-BCE1-BA5F27033160}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3DC39D0E-AB52-4FD7-BCE1-BA5F27033160}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{3DC39D0E-AB52-4FD7-BCE1-BA5F27033160}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{3DC39D0E-AB52-4FD7-BCE1-BA5F27033160}.Release|x86.ActiveCfg = Release|Any CPU
+		{3DC39D0E-AB52-4FD7-BCE1-BA5F27033160}.Release|x86.Build.0 = Release|Any CPU
+		{03006684-0D8B-4FD3-BDFE-70D451E0498D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{03006684-0D8B-4FD3-BDFE-70D451E0498D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{03006684-0D8B-4FD3-BDFE-70D451E0498D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{03006684-0D8B-4FD3-BDFE-70D451E0498D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{03006684-0D8B-4FD3-BDFE-70D451E0498D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{03006684-0D8B-4FD3-BDFE-70D451E0498D}.Debug|x86.Build.0 = Debug|Any CPU
+		{03006684-0D8B-4FD3-BDFE-70D451E0498D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{03006684-0D8B-4FD3-BDFE-70D451E0498D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{03006684-0D8B-4FD3-BDFE-70D451E0498D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{03006684-0D8B-4FD3-BDFE-70D451E0498D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{03006684-0D8B-4FD3-BDFE-70D451E0498D}.Release|x86.ActiveCfg = Release|Any CPU
+		{03006684-0D8B-4FD3-BDFE-70D451E0498D}.Release|x86.Build.0 = Release|Any CPU
+		{217336E2-74FB-4D1B-9152-AF9C85266280}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{217336E2-74FB-4D1B-9152-AF9C85266280}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{217336E2-74FB-4D1B-9152-AF9C85266280}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{217336E2-74FB-4D1B-9152-AF9C85266280}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{217336E2-74FB-4D1B-9152-AF9C85266280}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{217336E2-74FB-4D1B-9152-AF9C85266280}.Debug|x86.Build.0 = Debug|Any CPU
+		{217336E2-74FB-4D1B-9152-AF9C85266280}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{217336E2-74FB-4D1B-9152-AF9C85266280}.Release|Any CPU.Build.0 = Release|Any CPU
+		{217336E2-74FB-4D1B-9152-AF9C85266280}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{217336E2-74FB-4D1B-9152-AF9C85266280}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{217336E2-74FB-4D1B-9152-AF9C85266280}.Release|x86.ActiveCfg = Release|Any CPU
+		{217336E2-74FB-4D1B-9152-AF9C85266280}.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
+		{7FB0CBDC-AD2D-409A-B8AD-C74395069B0F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7FB0CBDC-AD2D-409A-B8AD-C74395069B0F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7FB0CBDC-AD2D-409A-B8AD-C74395069B0F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{7FB0CBDC-AD2D-409A-B8AD-C74395069B0F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{7FB0CBDC-AD2D-409A-B8AD-C74395069B0F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7FB0CBDC-AD2D-409A-B8AD-C74395069B0F}.Debug|x86.Build.0 = Debug|Any CPU
+		{7FB0CBDC-AD2D-409A-B8AD-C74395069B0F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7FB0CBDC-AD2D-409A-B8AD-C74395069B0F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7FB0CBDC-AD2D-409A-B8AD-C74395069B0F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{7FB0CBDC-AD2D-409A-B8AD-C74395069B0F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{7FB0CBDC-AD2D-409A-B8AD-C74395069B0F}.Release|x86.ActiveCfg = Release|Any CPU
+		{7FB0CBDC-AD2D-409A-B8AD-C74395069B0F}.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
+		{1E722DC2-12FB-4CA4-8E2A-A4C3FEFE2C44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1E722DC2-12FB-4CA4-8E2A-A4C3FEFE2C44}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1E722DC2-12FB-4CA4-8E2A-A4C3FEFE2C44}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{1E722DC2-12FB-4CA4-8E2A-A4C3FEFE2C44}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{1E722DC2-12FB-4CA4-8E2A-A4C3FEFE2C44}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1E722DC2-12FB-4CA4-8E2A-A4C3FEFE2C44}.Debug|x86.Build.0 = Debug|Any CPU
+		{1E722DC2-12FB-4CA4-8E2A-A4C3FEFE2C44}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1E722DC2-12FB-4CA4-8E2A-A4C3FEFE2C44}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1E722DC2-12FB-4CA4-8E2A-A4C3FEFE2C44}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{1E722DC2-12FB-4CA4-8E2A-A4C3FEFE2C44}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{1E722DC2-12FB-4CA4-8E2A-A4C3FEFE2C44}.Release|x86.ActiveCfg = Release|Any CPU
+		{1E722DC2-12FB-4CA4-8E2A-A4C3FEFE2C44}.Release|x86.Build.0 = Release|Any CPU
+		{A53837A6-212D-433F-9B52-878C9E980B52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A53837A6-212D-433F-9B52-878C9E980B52}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A53837A6-212D-433F-9B52-878C9E980B52}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A53837A6-212D-433F-9B52-878C9E980B52}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A53837A6-212D-433F-9B52-878C9E980B52}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A53837A6-212D-433F-9B52-878C9E980B52}.Debug|x86.Build.0 = Debug|Any CPU
+		{A53837A6-212D-433F-9B52-878C9E980B52}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A53837A6-212D-433F-9B52-878C9E980B52}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A53837A6-212D-433F-9B52-878C9E980B52}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{A53837A6-212D-433F-9B52-878C9E980B52}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{A53837A6-212D-433F-9B52-878C9E980B52}.Release|x86.ActiveCfg = Release|Any CPU
+		{A53837A6-212D-433F-9B52-878C9E980B52}.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
+		{78D6B28C-A16E-4BDF-8653-E51FA75BDEBB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{78D6B28C-A16E-4BDF-8653-E51FA75BDEBB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{78D6B28C-A16E-4BDF-8653-E51FA75BDEBB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{78D6B28C-A16E-4BDF-8653-E51FA75BDEBB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{78D6B28C-A16E-4BDF-8653-E51FA75BDEBB}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{78D6B28C-A16E-4BDF-8653-E51FA75BDEBB}.Debug|x86.Build.0 = Debug|Any CPU
+		{78D6B28C-A16E-4BDF-8653-E51FA75BDEBB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{78D6B28C-A16E-4BDF-8653-E51FA75BDEBB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{78D6B28C-A16E-4BDF-8653-E51FA75BDEBB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{78D6B28C-A16E-4BDF-8653-E51FA75BDEBB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{78D6B28C-A16E-4BDF-8653-E51FA75BDEBB}.Release|x86.ActiveCfg = Release|Any CPU
+		{78D6B28C-A16E-4BDF-8653-E51FA75BDEBB}.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
 	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}
-		{5F945B82-FE5F-425C-956C-8BC2F2020254} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
-		{23D30B8C-04B1-4577-A604-ED27EA1E4A0E} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E}
-		{5DE8E4D9-AACD-4B5F-819F-F091383FB996} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
-		{B2347320-308E-4D2B-AEC8-005DFA68B0C9} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E}
-		{860119ED-3DB1-424D-8D0A-30132A8A7D96} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
-		{F504357E-C2E1-4818-BA5C-9A2EAC25FEE5} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
-		{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}
-		{CF322BE1-E1FE-4CFD-8FCA-16A14B905D53} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E}
-		{0AB46520-F441-4E01-B444-08F4D23F8B1B} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
-		{28D4DA20-6E13-47F9-80AE-D6AA7699CC35} = {44546170-35BF-448F-88F5-4331AE67AEAE}
-		{2E6CDE10-8F96-4B75-B0D9-808F6A01B8BD} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
-		{30862895-C1FA-49F5-B69A-B0F9F2ECD0F3} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E}
-		{F8FD2D6A-DCD1-4A7B-B599-B728A12A1754} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E}
-		{829D9A67-2D07-4CE6-86C0-59F2549B0CFA} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
+		{F16CEE0D-A28E-43BD-802F-99BAFE4BA7CE} = {FDC66952-A3EA-4074-899E-C29816BF7C1F}
+		{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}
+		{0F5F9381-D3B4-4E0D-9FAA-CC12520DBB4A} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
+		{2E18C4FD-9982-4BD9-A067-3CE56E68C450} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
+		{C79D9793-FADA-4B1A-8AD7-8AEDB2358CA2} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
+		{BCD18147-D96D-4240-A89F-5F890392E58E} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
+		{986BF4FD-D0E3-48AE-917C-6C168D6395D3} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
+		{F4E1F1ED-2DE9-4659-B2E7-C9B6B8454AD1} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
+		{F4846AC2-384E-4C0B-8DE5-9784715E4A9F} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
+		{C019C7EC-FDEE-4EAF-ABF1-89D946EFC95A} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
+		{68C9E09E-F7FA-4853-B512-6BCD02BB69C1} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
+		{9F2C52EA-1869-4610-921F-5FD654582019} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
+		{AA074523-64D3-4CA7-8C2E-EACD977D2B19} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
+		{5145333A-40F8-4754-BA47-EC1CCECBE986} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
+		{47D5BF2A-7B05-4630-8C7C-A682382EA6F1} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
+		{72D40CFE-93B5-4877-92DC-E79203641342} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
+		{62952E87-88DB-45BA-9FE0-8A24FA983750} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
+		{F4879FAE-CD3C-4158-9BF0-B8D9294CCD0D} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
+		{157F16EA-C5C1-4BDF-A81C-44A7771A13D7} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
+		{5C8A337A-956B-4045-A680-4A61942D0866} = {83D016A9-7233-43FC-94C1-0AF2619D136B}
+		{99BB0544-6AA4-4787-B396-0AE77D022547} = {83D016A9-7233-43FC-94C1-0AF2619D136B}
+		{0BB79FE3-F376-4352-97B3-382F7FFDDBE9} = {83D016A9-7233-43FC-94C1-0AF2619D136B}
+		{4A300DA7-A19B-459D-96CA-C999B2CCABFD} = {83D016A9-7233-43FC-94C1-0AF2619D136B}
+		{53663DBF-D7FF-4BBF-8211-909237616049} = {5C8A337A-956B-4045-A680-4A61942D0866}
+		{134CDB3F-76CF-44D8-9621-F865092ACF20} = {5C8A337A-956B-4045-A680-4A61942D0866}
+		{23F77F9B-2979-4DF0-9096-C090CE7BE09D} = {5C8A337A-956B-4045-A680-4A61942D0866}
+		{B079D8A1-6CC1-46D8-948A-523AA6836FF9} = {5C8A337A-956B-4045-A680-4A61942D0866}
+		{7CD48059-3ACF-4435-B6D5-F4F4B379F8B1} = {5C8A337A-956B-4045-A680-4A61942D0866}
+		{21C75A50-991B-44D2-B684-732733969C23} = {5C8A337A-956B-4045-A680-4A61942D0866}
+		{92A8AB5D-4BA1-43B4-A769-62DCDEFEB04C} = {5C8A337A-956B-4045-A680-4A61942D0866}
+		{ABF8187A-F6FF-4722-B625-897B385F6CEC} = {5C8A337A-956B-4045-A680-4A61942D0866}
+		{6EFC8D17-47E9-44F7-897E-4F1102B16DF4} = {5C8A337A-956B-4045-A680-4A61942D0866}
+		{B2624173-3535-4138-9F90-420D83772ABC} = {5C8A337A-956B-4045-A680-4A61942D0866}
+		{1403D49E-C3DB-49E8-A888-541F0C8F9DCD} = {5C8A337A-956B-4045-A680-4A61942D0866}
+		{36C62FC6-8496-492D-A2F9-BF68CC6520BB} = {5C8A337A-956B-4045-A680-4A61942D0866}
+		{D54A8DCC-801E-4407-A9CC-01E4C33A72EB} = {5C8A337A-956B-4045-A680-4A61942D0866}
+		{13CB4F98-F361-4989-BBC2-0B0ECDAC68F3} = {5C8A337A-956B-4045-A680-4A61942D0866}
+		{0A2B5ED2-E9A7-41A5-9B0F-10007673F2D9} = {83D016A9-7233-43FC-94C1-0AF2619D136B}
+		{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}
+		{A3B32436-2C1A-4894-9C48-20A375F620D9} = {4098228A-A3CE-4A38-9C69-B43DFD522FFE}
+		{3DC39D0E-AB52-4FD7-BCE1-BA5F27033160} = {4098228A-A3CE-4A38-9C69-B43DFD522FFE}
+		{03006684-0D8B-4FD3-BDFE-70D451E0498D} = {ED0AE513-0E3E-45E7-8C94-231000ACFAAA}
+		{217336E2-74FB-4D1B-9152-AF9C85266280} = {ED0AE513-0E3E-45E7-8C94-231000ACFAAA}
+		{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}
+		{7FB0CBDC-AD2D-409A-B8AD-C74395069B0F} = {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}
+		{1E722DC2-12FB-4CA4-8E2A-A4C3FEFE2C44} = {2CA9D135-E011-4916-8AAB-4F282F87C9E7}
+		{A53837A6-212D-433F-9B52-878C9E980B52} = {2CA9D135-E011-4916-8AAB-4F282F87C9E7}
+		{36C22DEA-EFC4-4BC0-B1C6-C50D99146DC6} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
+		{78D6B28C-A16E-4BDF-8653-E51FA75BDEBB} = {75A3249D-E8DB-42F1-9B4E-1DCC662856A0}
+		{DDF72F95-F556-4918-8243-AF2284BD2302} = {75A3249D-E8DB-42F1-9B4E-1DCC662856A0}
+		{8F724554-E7EF-48D2-B27B-00C238078EAF} = {FDCA02D4-871E-4255-AC53-12CDF1D5B510}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {D003597F-372F-4068-A2F0-353BE3C3B39A}
+		SolutionGuid = {63D344F6-F86D-40E6-85B9-0AABBE338C4A}
 	EndGlobalSection
 EndGlobal
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/CompilationFailedException.cs b/src/Mvc/Mvc.Razor/src/Compilation/CompilationFailedException.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/CompilationFailedException.cs
rename to src/Mvc/Mvc.Razor/src/Compilation/CompilationFailedException.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/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/MetadataReferenceFeature.cs b/src/Mvc/Mvc.Razor/src/Compilation/MetadataReferenceFeature.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/MetadataReferenceFeature.cs
rename to src/Mvc/Mvc.Razor/src/Compilation/MetadataReferenceFeature.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/MetadataReferenceFeatureProvider.cs b/src/Mvc/Mvc.Razor/src/Compilation/MetadataReferenceFeatureProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/MetadataReferenceFeatureProvider.cs
rename to src/Mvc/Mvc.Razor/src/Compilation/MetadataReferenceFeatureProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/RazorReferenceManager.cs b/src/Mvc/Mvc.Razor/src/Compilation/RazorReferenceManager.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/RazorReferenceManager.cs
rename to src/Mvc/Mvc.Razor/src/Compilation/RazorReferenceManager.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/RoslynCompilationContext.cs b/src/Mvc/Mvc.Razor/src/Compilation/RoslynCompilationContext.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/RoslynCompilationContext.cs
rename to src/Mvc/Mvc.Razor/src/Compilation/RoslynCompilationContext.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/Compilation/ViewsFeatureProvider.cs b/src/Mvc/Mvc.Razor/src/Compilation/ViewsFeatureProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/ViewsFeatureProvider.cs
rename to src/Mvc/Mvc.Razor/src/Compilation/ViewsFeatureProvider.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/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/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/Internal/CSharpCompiler.cs b/src/Mvc/Mvc.Razor/src/Internal/CSharpCompiler.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/CSharpCompiler.cs
rename to src/Mvc/Mvc.Razor/src/Internal/CSharpCompiler.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/ChecksumValidator.cs b/src/Mvc/Mvc.Razor/src/Internal/ChecksumValidator.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/ChecksumValidator.cs
rename to src/Mvc/Mvc.Razor/src/Internal/ChecksumValidator.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/CompilationFailedExceptionFactory.cs b/src/Mvc/Mvc.Razor/src/Internal/CompilationFailedExceptionFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/CompilationFailedExceptionFactory.cs
rename to src/Mvc/Mvc.Razor/src/Internal/CompilationFailedExceptionFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/DefaultRazorPageFactoryProvider.cs b/src/Mvc/Mvc.Razor/src/Internal/DefaultRazorPageFactoryProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/DefaultRazorPageFactoryProvider.cs
rename to src/Mvc/Mvc.Razor/src/Internal/DefaultRazorPageFactoryProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/DefaultRazorReferenceManager.cs b/src/Mvc/Mvc.Razor/src/Internal/DefaultRazorReferenceManager.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/DefaultRazorReferenceManager.cs
rename to src/Mvc/Mvc.Razor/src/Internal/DefaultRazorReferenceManager.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/DefaultRazorViewEngineFileProviderAccessor.cs b/src/Mvc/Mvc.Razor/src/Internal/DefaultRazorViewEngineFileProviderAccessor.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/DefaultRazorViewEngineFileProviderAccessor.cs
rename to src/Mvc/Mvc.Razor/src/Internal/DefaultRazorViewEngineFileProviderAccessor.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/DefaultTagHelperActivator.cs b/src/Mvc/Mvc.Razor/src/Internal/DefaultTagHelperActivator.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/DefaultTagHelperActivator.cs
rename to src/Mvc/Mvc.Razor/src/Internal/DefaultTagHelperActivator.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/DefaultTagHelperFactory.cs b/src/Mvc/Mvc.Razor/src/Internal/DefaultTagHelperFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/DefaultTagHelperFactory.cs
rename to src/Mvc/Mvc.Razor/src/Internal/DefaultTagHelperFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/ExpressionRewriter.cs b/src/Mvc/Mvc.Razor/src/Internal/ExpressionRewriter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/ExpressionRewriter.cs
rename to src/Mvc/Mvc.Razor/src/Internal/ExpressionRewriter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/FileProviderRazorProject.cs b/src/Mvc/Mvc.Razor/src/Internal/FileProviderRazorProject.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/FileProviderRazorProject.cs
rename to src/Mvc/Mvc.Razor/src/Internal/FileProviderRazorProject.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/FileProviderRazorProjectItem.cs b/src/Mvc/Mvc.Razor/src/Internal/FileProviderRazorProjectItem.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/FileProviderRazorProjectItem.cs
rename to src/Mvc/Mvc.Razor/src/Internal/FileProviderRazorProjectItem.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/IRazorViewEngineFileProviderAccessor.cs b/src/Mvc/Mvc.Razor/src/Internal/IRazorViewEngineFileProviderAccessor.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/IRazorViewEngineFileProviderAccessor.cs
rename to src/Mvc/Mvc.Razor/src/Internal/IRazorViewEngineFileProviderAccessor.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/LazyMetadataReferenceFeature.cs b/src/Mvc/Mvc.Razor/src/Internal/LazyMetadataReferenceFeature.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/LazyMetadataReferenceFeature.cs
rename to src/Mvc/Mvc.Razor/src/Internal/LazyMetadataReferenceFeature.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/MvcRazorDiagnosticSourceExtensions.cs b/src/Mvc/Mvc.Razor/src/Internal/MvcRazorDiagnosticSourceExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/MvcRazorDiagnosticSourceExtensions.cs
rename to src/Mvc/Mvc.Razor/src/Internal/MvcRazorDiagnosticSourceExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/MvcRazorLoggerExtensions.cs b/src/Mvc/Mvc.Razor/src/Internal/MvcRazorLoggerExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/MvcRazorLoggerExtensions.cs
rename to src/Mvc/Mvc.Razor/src/Internal/MvcRazorLoggerExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/MvcRazorMvcViewOptionsSetup.cs b/src/Mvc/Mvc.Razor/src/Internal/MvcRazorMvcViewOptionsSetup.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/MvcRazorMvcViewOptionsSetup.cs
rename to src/Mvc/Mvc.Razor/src/Internal/MvcRazorMvcViewOptionsSetup.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/Internal/RazorPagePropertyActivator.cs b/src/Mvc/Mvc.Razor/src/Internal/RazorPagePropertyActivator.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/RazorPagePropertyActivator.cs
rename to src/Mvc/Mvc.Razor/src/Internal/RazorPagePropertyActivator.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/RazorViewCompiler.cs b/src/Mvc/Mvc.Razor/src/Internal/RazorViewCompiler.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/RazorViewCompiler.cs
rename to src/Mvc/Mvc.Razor/src/Internal/RazorViewCompiler.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/RazorViewCompilerProvider.cs b/src/Mvc/Mvc.Razor/src/Internal/RazorViewCompilerProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/RazorViewCompilerProvider.cs
rename to src/Mvc/Mvc.Razor/src/Internal/RazorViewCompilerProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/RazorViewEngineOptionsSetup.cs b/src/Mvc/Mvc.Razor/src/Internal/RazorViewEngineOptionsSetup.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/RazorViewEngineOptionsSetup.cs
rename to src/Mvc/Mvc.Razor/src/Internal/RazorViewEngineOptionsSetup.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/ServiceBasedTagHelperActivator.cs b/src/Mvc/Mvc.Razor/src/Internal/ServiceBasedTagHelperActivator.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/ServiceBasedTagHelperActivator.cs
rename to src/Mvc/Mvc.Razor/src/Internal/ServiceBasedTagHelperActivator.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/SymbolsUtility.cs b/src/Mvc/Mvc.Razor/src/Internal/SymbolsUtility.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/SymbolsUtility.cs
rename to src/Mvc/Mvc.Razor/src/Internal/SymbolsUtility.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/TagHelperComponentManager.cs b/src/Mvc/Mvc.Razor/src/Internal/TagHelperComponentManager.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/TagHelperComponentManager.cs
rename to src/Mvc/Mvc.Razor/src/Internal/TagHelperComponentManager.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/TagHelpersAsServices.cs b/src/Mvc/Mvc.Razor/src/Internal/TagHelpersAsServices.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/TagHelpersAsServices.cs
rename to src/Mvc/Mvc.Razor/src/Internal/TagHelpersAsServices.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/ViewLocationCacheItem.cs b/src/Mvc/Mvc.Razor/src/Internal/ViewLocationCacheItem.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/ViewLocationCacheItem.cs
rename to src/Mvc/Mvc.Razor/src/Internal/ViewLocationCacheItem.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/ViewLocationCacheKey.cs b/src/Mvc/Mvc.Razor/src/Internal/ViewLocationCacheKey.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/ViewLocationCacheKey.cs
rename to src/Mvc/Mvc.Razor/src/Internal/ViewLocationCacheKey.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/ViewLocationCacheResult.cs b/src/Mvc/Mvc.Razor/src/Internal/ViewLocationCacheResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/ViewLocationCacheResult.cs
rename to src/Mvc/Mvc.Razor/src/Internal/ViewLocationCacheResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/ViewPath.cs b/src/Mvc/Mvc.Razor/src/Internal/ViewPath.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/ViewPath.cs
rename to src/Mvc/Mvc.Razor/src/Internal/ViewPath.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/Microsoft.AspNetCore.Mvc.Razor.nuspec b/src/Mvc/Mvc.Razor/src/Microsoft.AspNetCore.Mvc.Razor.nuspec
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Microsoft.AspNetCore.Mvc.Razor.nuspec
rename to src/Mvc/Mvc.Razor/src/Microsoft.AspNetCore.Mvc.Razor.nuspec
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/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/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/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/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/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/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/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/MetadataReferenceFeatureProviderTest.cs b/src/Mvc/Mvc.Razor/test/Compilation/MetadataReferenceFeatureProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/MetadataReferenceFeatureProviderTest.cs
rename to src/Mvc/Mvc.Razor/test/Compilation/MetadataReferenceFeatureProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/ViewsFeatureProviderTest.cs b/src/Mvc/Mvc.Razor/test/Compilation/ViewsFeatureProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/ViewsFeatureProviderTest.cs
rename to src/Mvc/Mvc.Razor/test/Compilation/ViewsFeatureProviderTest.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/Internal/CSharpCompilerTest.cs b/src/Mvc/Mvc.Razor/test/Internal/CSharpCompilerTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/CSharpCompilerTest.cs
rename to src/Mvc/Mvc.Razor/test/Internal/CSharpCompilerTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/ChecksumValidatorTest.cs b/src/Mvc/Mvc.Razor/test/Internal/ChecksumValidatorTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/ChecksumValidatorTest.cs
rename to src/Mvc/Mvc.Razor/test/Internal/ChecksumValidatorTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/CompilerFailedExceptionFactoryTest.cs b/src/Mvc/Mvc.Razor/test/Internal/CompilerFailedExceptionFactoryTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/CompilerFailedExceptionFactoryTest.cs
rename to src/Mvc/Mvc.Razor/test/Internal/CompilerFailedExceptionFactoryTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/DefaultRazorPageFactoryProviderTest.cs b/src/Mvc/Mvc.Razor/test/Internal/DefaultRazorPageFactoryProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/DefaultRazorPageFactoryProviderTest.cs
rename to src/Mvc/Mvc.Razor/test/Internal/DefaultRazorPageFactoryProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/DefaultRazorReferenceManagerTest.cs b/src/Mvc/Mvc.Razor/test/Internal/DefaultRazorReferenceManagerTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/DefaultRazorReferenceManagerTest.cs
rename to src/Mvc/Mvc.Razor/test/Internal/DefaultRazorReferenceManagerTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/DefaultRazorViewEngineFileProviderAccessorTest.cs b/src/Mvc/Mvc.Razor/test/Internal/DefaultRazorViewEngineFileProviderAccessorTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/DefaultRazorViewEngineFileProviderAccessorTest.cs
rename to src/Mvc/Mvc.Razor/test/Internal/DefaultRazorViewEngineFileProviderAccessorTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/DefaultTagHelperActivatorTest.cs b/src/Mvc/Mvc.Razor/test/Internal/DefaultTagHelperActivatorTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/DefaultTagHelperActivatorTest.cs
rename to src/Mvc/Mvc.Razor/test/Internal/DefaultTagHelperActivatorTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/DefaultTagHelperFactoryTest.cs b/src/Mvc/Mvc.Razor/test/Internal/DefaultTagHelperFactoryTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/DefaultTagHelperFactoryTest.cs
rename to src/Mvc/Mvc.Razor/test/Internal/DefaultTagHelperFactoryTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/ExpressionRewriterTest.cs b/src/Mvc/Mvc.Razor/test/Internal/ExpressionRewriterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/ExpressionRewriterTest.cs
rename to src/Mvc/Mvc.Razor/test/Internal/ExpressionRewriterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/FileProviderRazorProjectFileSystemTest.cs b/src/Mvc/Mvc.Razor/test/Internal/FileProviderRazorProjectFileSystemTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/FileProviderRazorProjectFileSystemTest.cs
rename to src/Mvc/Mvc.Razor/test/Internal/FileProviderRazorProjectFileSystemTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/RazorPagePropertyActivatorTest.cs b/src/Mvc/Mvc.Razor/test/Internal/RazorPagePropertyActivatorTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/RazorPagePropertyActivatorTest.cs
rename to src/Mvc/Mvc.Razor/test/Internal/RazorPagePropertyActivatorTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/RazorViewCompilerProviderTest.cs b/src/Mvc/Mvc.Razor/test/Internal/RazorViewCompilerProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/RazorViewCompilerProviderTest.cs
rename to src/Mvc/Mvc.Razor/test/Internal/RazorViewCompilerProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/RazorViewCompilerTest.cs b/src/Mvc/Mvc.Razor/test/Internal/RazorViewCompilerTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/RazorViewCompilerTest.cs
rename to src/Mvc/Mvc.Razor/test/Internal/RazorViewCompilerTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/RazorViewEngineOptionsSetupTest.cs b/src/Mvc/Mvc.Razor/test/Internal/RazorViewEngineOptionsSetupTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/RazorViewEngineOptionsSetupTest.cs
rename to src/Mvc/Mvc.Razor/test/Internal/RazorViewEngineOptionsSetupTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/ViewPathTest.cs b/src/Mvc/Mvc.Razor/test/Internal/ViewPathTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/ViewPathTest.cs
rename to src/Mvc/Mvc.Razor/test/Internal/ViewPathTest.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 100%
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
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/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.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/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/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/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/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/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/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/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/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/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/PageArgumentBinder.cs b/src/Mvc/Mvc.RazorPages/src/Infrastructure/PageArgumentBinder.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageArgumentBinder.cs
rename to src/Mvc/Mvc.RazorPages/src/Infrastructure/PageArgumentBinder.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/PageDirectiveFeature.cs b/src/Mvc/Mvc.RazorPages/src/Infrastructure/PageDirectiveFeature.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageDirectiveFeature.cs
rename to src/Mvc/Mvc.RazorPages/src/Infrastructure/PageDirectiveFeature.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/Internal/AuthorizationPageApplicationModelProvider.cs b/src/Mvc/Mvc.RazorPages/src/Internal/AuthorizationPageApplicationModelProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/AuthorizationPageApplicationModelProvider.cs
rename to src/Mvc/Mvc.RazorPages/src/Internal/AuthorizationPageApplicationModelProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/AutoValidateAntiforgeryPageApplicationModelProvider.cs b/src/Mvc/Mvc.RazorPages/src/Internal/AutoValidateAntiforgeryPageApplicationModelProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/AutoValidateAntiforgeryPageApplicationModelProvider.cs
rename to src/Mvc/Mvc.RazorPages/src/Internal/AutoValidateAntiforgeryPageApplicationModelProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/CompiledPageActionDescriptorBuilder.cs b/src/Mvc/Mvc.RazorPages/src/Internal/CompiledPageActionDescriptorBuilder.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/CompiledPageActionDescriptorBuilder.cs
rename to src/Mvc/Mvc.RazorPages/src/Internal/CompiledPageActionDescriptorBuilder.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/CompiledPageRouteModelProvider.cs b/src/Mvc/Mvc.RazorPages/src/Internal/CompiledPageRouteModelProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/CompiledPageRouteModelProvider.cs
rename to src/Mvc/Mvc.RazorPages/src/Internal/CompiledPageRouteModelProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/DefaultPageApplicationModelProvider.cs b/src/Mvc/Mvc.RazorPages/src/Internal/DefaultPageApplicationModelProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/DefaultPageApplicationModelProvider.cs
rename to src/Mvc/Mvc.RazorPages/src/Internal/DefaultPageApplicationModelProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/DefaultPageArgumentBinder.cs b/src/Mvc/Mvc.RazorPages/src/Internal/DefaultPageArgumentBinder.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/DefaultPageArgumentBinder.cs
rename to src/Mvc/Mvc.RazorPages/src/Internal/DefaultPageArgumentBinder.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/DefaultPageHandlerMethodSelector.cs b/src/Mvc/Mvc.RazorPages/src/Internal/DefaultPageHandlerMethodSelector.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/DefaultPageHandlerMethodSelector.cs
rename to src/Mvc/Mvc.RazorPages/src/Internal/DefaultPageHandlerMethodSelector.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/DefaultPageLoader.cs b/src/Mvc/Mvc.RazorPages/src/Internal/DefaultPageLoader.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/DefaultPageLoader.cs
rename to src/Mvc/Mvc.RazorPages/src/Internal/DefaultPageLoader.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/ExecutorFactory.cs b/src/Mvc/Mvc.RazorPages/src/Internal/ExecutorFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/ExecutorFactory.cs
rename to src/Mvc/Mvc.RazorPages/src/Internal/ExecutorFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/MvcRazorPagesDiagnosticSourceExtensions.cs b/src/Mvc/Mvc.RazorPages/src/Internal/MvcRazorPagesDiagnosticSourceExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/MvcRazorPagesDiagnosticSourceExtensions.cs
rename to src/Mvc/Mvc.RazorPages/src/Internal/MvcRazorPagesDiagnosticSourceExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageActionDescriptorChangeProvider.cs b/src/Mvc/Mvc.RazorPages/src/Internal/PageActionDescriptorChangeProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageActionDescriptorChangeProvider.cs
rename to src/Mvc/Mvc.RazorPages/src/Internal/PageActionDescriptorChangeProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageActionInvoker.cs b/src/Mvc/Mvc.RazorPages/src/Internal/PageActionInvoker.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageActionInvoker.cs
rename to src/Mvc/Mvc.RazorPages/src/Internal/PageActionInvoker.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageActionInvokerCacheEntry.cs b/src/Mvc/Mvc.RazorPages/src/Internal/PageActionInvokerCacheEntry.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageActionInvokerCacheEntry.cs
rename to src/Mvc/Mvc.RazorPages/src/Internal/PageActionInvokerCacheEntry.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageActionInvokerProvider.cs b/src/Mvc/Mvc.RazorPages/src/Internal/PageActionInvokerProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageActionInvokerProvider.cs
rename to src/Mvc/Mvc.RazorPages/src/Internal/PageActionInvokerProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageBinderFactory.cs b/src/Mvc/Mvc.RazorPages/src/Internal/PageBinderFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageBinderFactory.cs
rename to src/Mvc/Mvc.RazorPages/src/Internal/PageBinderFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageHandlerBinderDelegate.cs b/src/Mvc/Mvc.RazorPages/src/Internal/PageHandlerBinderDelegate.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageHandlerBinderDelegate.cs
rename to src/Mvc/Mvc.RazorPages/src/Internal/PageHandlerBinderDelegate.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageHandlerExecutorDelegate.cs b/src/Mvc/Mvc.RazorPages/src/Internal/PageHandlerExecutorDelegate.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageHandlerExecutorDelegate.cs
rename to src/Mvc/Mvc.RazorPages/src/Internal/PageHandlerExecutorDelegate.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageHandlerPageFilter.cs b/src/Mvc/Mvc.RazorPages/src/Internal/PageHandlerPageFilter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageHandlerPageFilter.cs
rename to src/Mvc/Mvc.RazorPages/src/Internal/PageHandlerPageFilter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageHandlerResultFIlter.cs b/src/Mvc/Mvc.RazorPages/src/Internal/PageHandlerResultFIlter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageHandlerResultFIlter.cs
rename to src/Mvc/Mvc.RazorPages/src/Internal/PageHandlerResultFIlter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageLoggerExtensions.cs b/src/Mvc/Mvc.RazorPages/src/Internal/PageLoggerExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageLoggerExtensions.cs
rename to src/Mvc/Mvc.RazorPages/src/Internal/PageLoggerExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageRouteModelFactory.cs b/src/Mvc/Mvc.RazorPages/src/Internal/PageRouteModelFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageRouteModelFactory.cs
rename to src/Mvc/Mvc.RazorPages/src/Internal/PageRouteModelFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageSaveTempDataPropertyFilter.cs b/src/Mvc/Mvc.RazorPages/src/Internal/PageSaveTempDataPropertyFilter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageSaveTempDataPropertyFilter.cs
rename to src/Mvc/Mvc.RazorPages/src/Internal/PageSaveTempDataPropertyFilter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageSaveTempDataPropertyFilterFactory.cs b/src/Mvc/Mvc.RazorPages/src/Internal/PageSaveTempDataPropertyFilterFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageSaveTempDataPropertyFilterFactory.cs
rename to src/Mvc/Mvc.RazorPages/src/Internal/PageSaveTempDataPropertyFilterFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageViewDataAttributeFilter.cs b/src/Mvc/Mvc.RazorPages/src/Internal/PageViewDataAttributeFilter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageViewDataAttributeFilter.cs
rename to src/Mvc/Mvc.RazorPages/src/Internal/PageViewDataAttributeFilter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageViewDataAttributeFilterFactory.cs b/src/Mvc/Mvc.RazorPages/src/Internal/PageViewDataAttributeFilterFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageViewDataAttributeFilterFactory.cs
rename to src/Mvc/Mvc.RazorPages/src/Internal/PageViewDataAttributeFilterFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/RazorPagesRazorViewEngineOptionsSetup.cs b/src/Mvc/Mvc.RazorPages/src/Internal/RazorPagesRazorViewEngineOptionsSetup.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/RazorPagesRazorViewEngineOptionsSetup.cs
rename to src/Mvc/Mvc.RazorPages/src/Internal/RazorPagesRazorViewEngineOptionsSetup.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/RazorProjectPageRouteModelProvider.cs b/src/Mvc/Mvc.RazorPages/src/Internal/RazorProjectPageRouteModelProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/RazorProjectPageRouteModelProvider.cs
rename to src/Mvc/Mvc.RazorPages/src/Internal/RazorProjectPageRouteModelProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/ResponseCacheFilter.cs b/src/Mvc/Mvc.RazorPages/src/Internal/ResponseCacheFilter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/ResponseCacheFilter.cs
rename to src/Mvc/Mvc.RazorPages/src/Internal/ResponseCacheFilter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/ResponseCacheFilterApplicationModelProvider.cs b/src/Mvc/Mvc.RazorPages/src/Internal/ResponseCacheFilterApplicationModelProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/ResponseCacheFilterApplicationModelProvider.cs
rename to src/Mvc/Mvc.RazorPages/src/Internal/ResponseCacheFilterApplicationModelProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/TempDataFilterPageApplicationModelProvider.cs b/src/Mvc/Mvc.RazorPages/src/Internal/TempDataFilterPageApplicationModelProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/TempDataFilterPageApplicationModelProvider.cs
rename to src/Mvc/Mvc.RazorPages/src/Internal/TempDataFilterPageApplicationModelProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/ViewDataAttributePageApplicationModelProvider.cs b/src/Mvc/Mvc.RazorPages/src/Internal/ViewDataAttributePageApplicationModelProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/ViewDataAttributePageApplicationModelProvider.cs
rename to src/Mvc/Mvc.RazorPages/src/Internal/ViewDataAttributePageApplicationModelProvider.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/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/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/RazorPagesOptionsConfigureCompatibilityOptions.cs b/src/Mvc/Mvc.RazorPages/src/RazorPagesOptionsConfigureCompatibilityOptions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/RazorPagesOptionsConfigureCompatibilityOptions.cs
rename to src/Mvc/Mvc.RazorPages/src/RazorPagesOptionsConfigureCompatibilityOptions.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/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/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/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/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/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/PageDirectiveFeatureTest.cs b/src/Mvc/Mvc.RazorPages/test/Infrastructure/PageDirectiveFeatureTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/PageDirectiveFeatureTest.cs
rename to src/Mvc/Mvc.RazorPages/test/Infrastructure/PageDirectiveFeatureTest.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/Internal/AuthorizationPageApplicationModelProviderTest.cs b/src/Mvc/Mvc.RazorPages/test/Internal/AuthorizationPageApplicationModelProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/AuthorizationPageApplicationModelProviderTest.cs
rename to src/Mvc/Mvc.RazorPages/test/Internal/AuthorizationPageApplicationModelProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/AutoValidateAntiforgeryPageApplicationModelProvider.cs b/src/Mvc/Mvc.RazorPages/test/Internal/AutoValidateAntiforgeryPageApplicationModelProvider.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/AutoValidateAntiforgeryPageApplicationModelProvider.cs
rename to src/Mvc/Mvc.RazorPages/test/Internal/AutoValidateAntiforgeryPageApplicationModelProvider.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/CompiledPageActionDescriptorBuilderTest.cs b/src/Mvc/Mvc.RazorPages/test/Internal/CompiledPageActionDescriptorBuilderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/CompiledPageActionDescriptorBuilderTest.cs
rename to src/Mvc/Mvc.RazorPages/test/Internal/CompiledPageActionDescriptorBuilderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/CompiledPageRouteModelProviderTest.cs b/src/Mvc/Mvc.RazorPages/test/Internal/CompiledPageRouteModelProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/CompiledPageRouteModelProviderTest.cs
rename to src/Mvc/Mvc.RazorPages/test/Internal/CompiledPageRouteModelProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/DefaultPageApplicationModelProviderTest.cs b/src/Mvc/Mvc.RazorPages/test/Internal/DefaultPageApplicationModelProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/DefaultPageApplicationModelProviderTest.cs
rename to src/Mvc/Mvc.RazorPages/test/Internal/DefaultPageApplicationModelProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/DefaultPageHandlerMethodSelectorTest.cs b/src/Mvc/Mvc.RazorPages/test/Internal/DefaultPageHandlerMethodSelectorTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/DefaultPageHandlerMethodSelectorTest.cs
rename to src/Mvc/Mvc.RazorPages/test/Internal/DefaultPageHandlerMethodSelectorTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/DefaultPageLoaderTest.cs b/src/Mvc/Mvc.RazorPages/test/Internal/DefaultPageLoaderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/DefaultPageLoaderTest.cs
rename to src/Mvc/Mvc.RazorPages/test/Internal/DefaultPageLoaderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/ExecutorFactoryTest.cs b/src/Mvc/Mvc.RazorPages/test/Internal/ExecutorFactoryTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/ExecutorFactoryTest.cs
rename to src/Mvc/Mvc.RazorPages/test/Internal/ExecutorFactoryTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageActionDescriptorChangeProviderTest.cs b/src/Mvc/Mvc.RazorPages/test/Internal/PageActionDescriptorChangeProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageActionDescriptorChangeProviderTest.cs
rename to src/Mvc/Mvc.RazorPages/test/Internal/PageActionDescriptorChangeProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageActionInvokerProviderTest.cs b/src/Mvc/Mvc.RazorPages/test/Internal/PageActionInvokerProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageActionInvokerProviderTest.cs
rename to src/Mvc/Mvc.RazorPages/test/Internal/PageActionInvokerProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageActionInvokerTest.cs b/src/Mvc/Mvc.RazorPages/test/Internal/PageActionInvokerTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageActionInvokerTest.cs
rename to src/Mvc/Mvc.RazorPages/test/Internal/PageActionInvokerTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageBinderFactoryTest.cs b/src/Mvc/Mvc.RazorPages/test/Internal/PageBinderFactoryTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageBinderFactoryTest.cs
rename to src/Mvc/Mvc.RazorPages/test/Internal/PageBinderFactoryTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageHandlerPageFilterTest.cs b/src/Mvc/Mvc.RazorPages/test/Internal/PageHandlerPageFilterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageHandlerPageFilterTest.cs
rename to src/Mvc/Mvc.RazorPages/test/Internal/PageHandlerPageFilterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageHandlerResultFilterTest.cs b/src/Mvc/Mvc.RazorPages/test/Internal/PageHandlerResultFilterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageHandlerResultFilterTest.cs
rename to src/Mvc/Mvc.RazorPages/test/Internal/PageHandlerResultFilterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageRouteModelFactoryTest.cs b/src/Mvc/Mvc.RazorPages/test/Internal/PageRouteModelFactoryTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageRouteModelFactoryTest.cs
rename to src/Mvc/Mvc.RazorPages/test/Internal/PageRouteModelFactoryTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageSaveTempDataPropertyFilterFactoryTest.cs b/src/Mvc/Mvc.RazorPages/test/Internal/PageSaveTempDataPropertyFilterFactoryTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageSaveTempDataPropertyFilterFactoryTest.cs
rename to src/Mvc/Mvc.RazorPages/test/Internal/PageSaveTempDataPropertyFilterFactoryTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageSaveTempDataPropertyFilterTest.cs b/src/Mvc/Mvc.RazorPages/test/Internal/PageSaveTempDataPropertyFilterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageSaveTempDataPropertyFilterTest.cs
rename to src/Mvc/Mvc.RazorPages/test/Internal/PageSaveTempDataPropertyFilterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageViewDataAttributeFilterFactoryTest.cs b/src/Mvc/Mvc.RazorPages/test/Internal/PageViewDataAttributeFilterFactoryTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageViewDataAttributeFilterFactoryTest.cs
rename to src/Mvc/Mvc.RazorPages/test/Internal/PageViewDataAttributeFilterFactoryTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageViewDataAttributeFilterTest.cs b/src/Mvc/Mvc.RazorPages/test/Internal/PageViewDataAttributeFilterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageViewDataAttributeFilterTest.cs
rename to src/Mvc/Mvc.RazorPages/test/Internal/PageViewDataAttributeFilterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/RazorPagesRazorViewEngineOptionsSetupTest.cs b/src/Mvc/Mvc.RazorPages/test/Internal/RazorPagesRazorViewEngineOptionsSetupTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/RazorPagesRazorViewEngineOptionsSetupTest.cs
rename to src/Mvc/Mvc.RazorPages/test/Internal/RazorPagesRazorViewEngineOptionsSetupTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/RazorProjectPageRouteModelProviderTest.cs b/src/Mvc/Mvc.RazorPages/test/Internal/RazorProjectPageRouteModelProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/RazorProjectPageRouteModelProviderTest.cs
rename to src/Mvc/Mvc.RazorPages/test/Internal/RazorProjectPageRouteModelProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/ResponseCacheFilterApplicationModelProviderTest.cs b/src/Mvc/Mvc.RazorPages/test/Internal/ResponseCacheFilterApplicationModelProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/ResponseCacheFilterApplicationModelProviderTest.cs
rename to src/Mvc/Mvc.RazorPages/test/Internal/ResponseCacheFilterApplicationModelProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/TempDataFilterPageApplicationModelProviderTest.cs b/src/Mvc/Mvc.RazorPages/test/Internal/TempDataFilterPageApplicationModelProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/TempDataFilterPageApplicationModelProviderTest.cs
rename to src/Mvc/Mvc.RazorPages/test/Internal/TempDataFilterPageApplicationModelProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/ViewDataAttributePageApplicationModelProviderTest.cs b/src/Mvc/Mvc.RazorPages/test/Internal/ViewDataAttributePageApplicationModelProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/ViewDataAttributePageApplicationModelProviderTest.cs
rename to src/Mvc/Mvc.RazorPages/test/Internal/ViewDataAttributePageApplicationModelProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Microsoft.AspNetCore.Mvc.RazorPages.Test.csproj b/src/Mvc/Mvc.RazorPages/test/Microsoft.AspNetCore.Mvc.RazorPages.Test.csproj
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Microsoft.AspNetCore.Mvc.RazorPages.Test.csproj
rename to src/Mvc/Mvc.RazorPages/test/Microsoft.AspNetCore.Mvc.RazorPages.Test.csproj
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/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/TestRazorProjectFileSystem.cs b/src/Mvc/Mvc.RazorPages/test/TestRazorProjectFileSystem.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/TestRazorProjectFileSystem.cs
rename to src/Mvc/Mvc.RazorPages/test/TestRazorProjectFileSystem.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/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/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/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/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/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/Internal/AttributeMatcher.cs b/src/Mvc/Mvc.TagHelpers/src/Internal/AttributeMatcher.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Internal/AttributeMatcher.cs
rename to src/Mvc/Mvc.TagHelpers/src/Internal/AttributeMatcher.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Internal/CacheTagHelperMemoryCacheFactory.cs b/src/Mvc/Mvc.TagHelpers/src/Internal/CacheTagHelperMemoryCacheFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Internal/CacheTagHelperMemoryCacheFactory.cs
rename to src/Mvc/Mvc.TagHelpers/src/Internal/CacheTagHelperMemoryCacheFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Internal/CryptographyAlgorithms.cs b/src/Mvc/Mvc.TagHelpers/src/Internal/CryptographyAlgorithms.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Internal/CryptographyAlgorithms.cs
rename to src/Mvc/Mvc.TagHelpers/src/Internal/CryptographyAlgorithms.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Internal/CurrentValues.cs b/src/Mvc/Mvc.TagHelpers/src/Internal/CurrentValues.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Internal/CurrentValues.cs
rename to src/Mvc/Mvc.TagHelpers/src/Internal/CurrentValues.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Internal/FileProviderGlobbingDirectory.cs b/src/Mvc/Mvc.TagHelpers/src/Internal/FileProviderGlobbingDirectory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Internal/FileProviderGlobbingDirectory.cs
rename to src/Mvc/Mvc.TagHelpers/src/Internal/FileProviderGlobbingDirectory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Internal/FileProviderGlobbingFile.cs b/src/Mvc/Mvc.TagHelpers/src/Internal/FileProviderGlobbingFile.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Internal/FileProviderGlobbingFile.cs
rename to src/Mvc/Mvc.TagHelpers/src/Internal/FileProviderGlobbingFile.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Internal/FileVersionProvider.cs b/src/Mvc/Mvc.TagHelpers/src/Internal/FileVersionProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Internal/FileVersionProvider.cs
rename to src/Mvc/Mvc.TagHelpers/src/Internal/FileVersionProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Internal/GlobbingUrlBuilder.cs b/src/Mvc/Mvc.TagHelpers/src/Internal/GlobbingUrlBuilder.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Internal/GlobbingUrlBuilder.cs
rename to src/Mvc/Mvc.TagHelpers/src/Internal/GlobbingUrlBuilder.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Internal/JavaScriptResources.cs b/src/Mvc/Mvc.TagHelpers/src/Internal/JavaScriptResources.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Internal/JavaScriptResources.cs
rename to src/Mvc/Mvc.TagHelpers/src/Internal/JavaScriptResources.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Internal/ModeAttributesOfT.cs b/src/Mvc/Mvc.TagHelpers/src/Internal/ModeAttributesOfT.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Internal/ModeAttributesOfT.cs
rename to src/Mvc/Mvc.TagHelpers/src/Internal/ModeAttributesOfT.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Internal/MvcTagHelpersLoggerExtensions.cs b/src/Mvc/Mvc.TagHelpers/src/Internal/MvcTagHelpersLoggerExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Internal/MvcTagHelpersLoggerExtensions.cs
rename to src/Mvc/Mvc.TagHelpers/src/Internal/MvcTagHelpersLoggerExtensions.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/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/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/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/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/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/Internal/AttributeMatcherTest.cs b/src/Mvc/Mvc.TagHelpers/test/Internal/AttributeMatcherTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/Internal/AttributeMatcherTest.cs
rename to src/Mvc/Mvc.TagHelpers/test/Internal/AttributeMatcherTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/Internal/FileVersionProviderTest.cs b/src/Mvc/Mvc.TagHelpers/test/Internal/FileVersionProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/Internal/FileVersionProviderTest.cs
rename to src/Mvc/Mvc.TagHelpers/test/Internal/FileVersionProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/Internal/GlobbingUrlBuilderTest.cs b/src/Mvc/Mvc.TagHelpers/test/Internal/GlobbingUrlBuilderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/Internal/GlobbingUrlBuilderTest.cs
rename to src/Mvc/Mvc.TagHelpers/test/Internal/GlobbingUrlBuilderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/Internal/JavaScriptResourcesTest.cs b/src/Mvc/Mvc.TagHelpers/test/Internal/JavaScriptResourcesTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/Internal/JavaScriptResourcesTest.cs
rename to src/Mvc/Mvc.TagHelpers/test/Internal/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 100%
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
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/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.Testing/build/netstandard2.0/Microsoft.AspNetCore.Mvc.Testing.targets b/src/Mvc/Mvc.Testing/src/build/netstandard2.0/Microsoft.AspNetCore.Mvc.Testing.targets
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/build/netstandard2.0/Microsoft.AspNetCore.Mvc.Testing.targets
rename to src/Mvc/Mvc.Testing/src/build/netstandard2.0/Microsoft.AspNetCore.Mvc.Testing.targets
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/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/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/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/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/Internal/ArrayPoolBufferSource.cs b/src/Mvc/Mvc.ViewFeatures/src/Internal/ArrayPoolBufferSource.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ArrayPoolBufferSource.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Internal/ArrayPoolBufferSource.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/AutoValidateAntiforgeryTokenAuthorizationFilter.cs b/src/Mvc/Mvc.ViewFeatures/src/Internal/AutoValidateAntiforgeryTokenAuthorizationFilter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/AutoValidateAntiforgeryTokenAuthorizationFilter.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Internal/AutoValidateAntiforgeryTokenAuthorizationFilter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/CachedExpressionCompiler.cs b/src/Mvc/Mvc.ViewFeatures/src/Internal/CachedExpressionCompiler.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/CachedExpressionCompiler.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Internal/CachedExpressionCompiler.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/CharArrayBufferSource.cs b/src/Mvc/Mvc.ViewFeatures/src/Internal/CharArrayBufferSource.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/CharArrayBufferSource.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Internal/CharArrayBufferSource.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ControllerSaveTempDataPropertyFilter.cs b/src/Mvc/Mvc.ViewFeatures/src/Internal/ControllerSaveTempDataPropertyFilter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ControllerSaveTempDataPropertyFilter.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Internal/ControllerSaveTempDataPropertyFilter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ControllerSaveTempDataPropertyFilterFactory.cs b/src/Mvc/Mvc.ViewFeatures/src/Internal/ControllerSaveTempDataPropertyFilterFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ControllerSaveTempDataPropertyFilterFactory.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Internal/ControllerSaveTempDataPropertyFilterFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ControllerViewDataAttributeFilter.cs b/src/Mvc/Mvc.ViewFeatures/src/Internal/ControllerViewDataAttributeFilter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ControllerViewDataAttributeFilter.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Internal/ControllerViewDataAttributeFilter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ControllerViewDataAttributeFilterFactory.cs b/src/Mvc/Mvc.ViewFeatures/src/Internal/ControllerViewDataAttributeFilterFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ControllerViewDataAttributeFilterFactory.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Internal/ControllerViewDataAttributeFilterFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/DefaultDisplayTemplates.cs b/src/Mvc/Mvc.ViewFeatures/src/Internal/DefaultDisplayTemplates.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/DefaultDisplayTemplates.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Internal/DefaultDisplayTemplates.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/DefaultEditorTemplates.cs b/src/Mvc/Mvc.ViewFeatures/src/Internal/DefaultEditorTemplates.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/DefaultEditorTemplates.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Internal/DefaultEditorTemplates.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/DynamicViewData.cs b/src/Mvc/Mvc.ViewFeatures/src/Internal/DynamicViewData.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/DynamicViewData.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Internal/DynamicViewData.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ExpressionHelper.cs b/src/Mvc/Mvc.ViewFeatures/src/Internal/ExpressionHelper.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ExpressionHelper.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Internal/ExpressionHelper.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ExpressionMetadataProvider.cs b/src/Mvc/Mvc.ViewFeatures/src/Internal/ExpressionMetadataProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ExpressionMetadataProvider.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Internal/ExpressionMetadataProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ExpressionTextCache.cs b/src/Mvc/Mvc.ViewFeatures/src/Internal/ExpressionTextCache.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ExpressionTextCache.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Internal/ExpressionTextCache.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/FormatWeekHelper.cs b/src/Mvc/Mvc.ViewFeatures/src/Internal/FormatWeekHelper.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/FormatWeekHelper.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Internal/FormatWeekHelper.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/HtmlAttributePropertyHelper.cs b/src/Mvc/Mvc.ViewFeatures/src/Internal/HtmlAttributePropertyHelper.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/HtmlAttributePropertyHelper.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Internal/HtmlAttributePropertyHelper.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ICharBufferSource.cs b/src/Mvc/Mvc.ViewFeatures/src/Internal/ICharBufferSource.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ICharBufferSource.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Internal/ICharBufferSource.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ISaveTempDataCallback.cs b/src/Mvc/Mvc.ViewFeatures/src/Internal/ISaveTempDataCallback.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ISaveTempDataCallback.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Internal/ISaveTempDataCallback.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/IViewBufferScope.cs b/src/Mvc/Mvc.ViewFeatures/src/Internal/IViewBufferScope.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/IViewBufferScope.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Internal/IViewBufferScope.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/IViewDataValuesProviderFeature.cs b/src/Mvc/Mvc.ViewFeatures/src/Internal/IViewDataValuesProviderFeature.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/IViewDataValuesProviderFeature.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Internal/IViewDataValuesProviderFeature.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/LifecycleProperty.cs b/src/Mvc/Mvc.ViewFeatures/src/Internal/LifecycleProperty.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/LifecycleProperty.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Internal/LifecycleProperty.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/MemoryPoolViewBufferScope.cs b/src/Mvc/Mvc.ViewFeatures/src/Internal/MemoryPoolViewBufferScope.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/MemoryPoolViewBufferScope.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Internal/MemoryPoolViewBufferScope.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/MvcViewFeaturesDiagnosticSourceExtensions.cs b/src/Mvc/Mvc.ViewFeatures/src/Internal/MvcViewFeaturesDiagnosticSourceExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/MvcViewFeaturesDiagnosticSourceExtensions.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Internal/MvcViewFeaturesDiagnosticSourceExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/MvcViewFeaturesLoggerExtensions.cs b/src/Mvc/Mvc.ViewFeatures/src/Internal/MvcViewFeaturesLoggerExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/MvcViewFeaturesLoggerExtensions.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Internal/MvcViewFeaturesLoggerExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/MvcViewOptionsSetup.cs b/src/Mvc/Mvc.ViewFeatures/src/Internal/MvcViewOptionsSetup.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/MvcViewOptionsSetup.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Internal/MvcViewOptionsSetup.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/NameAndIdProvider.cs b/src/Mvc/Mvc.ViewFeatures/src/Internal/NameAndIdProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/NameAndIdProvider.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Internal/NameAndIdProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/NullView.cs b/src/Mvc/Mvc.ViewFeatures/src/Internal/NullView.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/NullView.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Internal/NullView.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/PagedBufferedTextWriter.cs b/src/Mvc/Mvc.ViewFeatures/src/Internal/PagedBufferedTextWriter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/PagedBufferedTextWriter.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Internal/PagedBufferedTextWriter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/PagedCharBuffer.cs b/src/Mvc/Mvc.ViewFeatures/src/Internal/PagedCharBuffer.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/PagedCharBuffer.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Internal/PagedCharBuffer.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/SaveTempDataFilter.cs b/src/Mvc/Mvc.ViewFeatures/src/Internal/SaveTempDataFilter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/SaveTempDataFilter.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Internal/SaveTempDataFilter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/SaveTempDataPropertyFilterBase.cs b/src/Mvc/Mvc.ViewFeatures/src/Internal/SaveTempDataPropertyFilterBase.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/SaveTempDataPropertyFilterBase.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Internal/SaveTempDataPropertyFilterBase.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/TempDataApplicationModelProvider.cs b/src/Mvc/Mvc.ViewFeatures/src/Internal/TempDataApplicationModelProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/TempDataApplicationModelProvider.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Internal/TempDataApplicationModelProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/TempDataMvcOptionsSetup.cs b/src/Mvc/Mvc.ViewFeatures/src/Internal/TempDataMvcOptionsSetup.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/TempDataMvcOptionsSetup.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Internal/TempDataMvcOptionsSetup.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/TempDataSerializer.cs b/src/Mvc/Mvc.ViewFeatures/src/Internal/TempDataSerializer.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/TempDataSerializer.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Internal/TempDataSerializer.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ValidateAntiforgeryTokenAuthorizationFilter.cs b/src/Mvc/Mvc.ViewFeatures/src/Internal/ValidateAntiforgeryTokenAuthorizationFilter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ValidateAntiforgeryTokenAuthorizationFilter.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Internal/ValidateAntiforgeryTokenAuthorizationFilter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ValidationHelpers.cs b/src/Mvc/Mvc.ViewFeatures/src/Internal/ValidationHelpers.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ValidationHelpers.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Internal/ValidationHelpers.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ViewBuffer.cs b/src/Mvc/Mvc.ViewFeatures/src/Internal/ViewBuffer.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ViewBuffer.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Internal/ViewBuffer.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ViewBufferPage.cs b/src/Mvc/Mvc.ViewFeatures/src/Internal/ViewBufferPage.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ViewBufferPage.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Internal/ViewBufferPage.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ViewBufferTextWriter.cs b/src/Mvc/Mvc.ViewFeatures/src/Internal/ViewBufferTextWriter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ViewBufferTextWriter.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Internal/ViewBufferTextWriter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ViewBufferValue.cs b/src/Mvc/Mvc.ViewFeatures/src/Internal/ViewBufferValue.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ViewBufferValue.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Internal/ViewBufferValue.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ViewDataAttributeApplicationModelProvider.cs b/src/Mvc/Mvc.ViewFeatures/src/Internal/ViewDataAttributeApplicationModelProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ViewDataAttributeApplicationModelProvider.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Internal/ViewDataAttributeApplicationModelProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ViewDataAttributePropertyProvider.cs b/src/Mvc/Mvc.ViewFeatures/src/Internal/ViewDataAttributePropertyProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ViewDataAttributePropertyProvider.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Internal/ViewDataAttributePropertyProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ViewDataDictionaryFactory.cs b/src/Mvc/Mvc.ViewFeatures/src/Internal/ViewDataDictionaryFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ViewDataDictionaryFactory.cs
rename to src/Mvc/Mvc.ViewFeatures/src/Internal/ViewDataDictionaryFactory.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/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/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/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/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/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/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/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/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/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/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/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/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/ViewFeatures/AntiforgeryExtensions.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/AntiforgeryExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/AntiforgeryExtensions.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/AntiforgeryExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/AttributeDictionary.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/AttributeDictionary.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/AttributeDictionary.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/AttributeDictionary.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/CookieTempDataProvider.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/CookieTempDataProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/CookieTempDataProvider.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/CookieTempDataProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/DefaultHtmlGenerator.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/DefaultHtmlGenerator.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/DefaultHtmlGenerator.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/DefaultHtmlGenerator.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/DefaultHtmlGeneratorExtensions.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/DefaultHtmlGeneratorExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/DefaultHtmlGeneratorExtensions.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/DefaultHtmlGeneratorExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/DefaultValidationHtmlAttributeProvider.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/DefaultValidationHtmlAttributeProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/DefaultValidationHtmlAttributeProvider.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/DefaultValidationHtmlAttributeProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/FormContext.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/FormContext.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/FormContext.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/FormContext.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/HtmlHelper.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/HtmlHelper.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/HtmlHelper.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/HtmlHelper.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/HtmlHelperOfT.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/HtmlHelperOfT.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/HtmlHelperOfT.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/HtmlHelperOfT.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/HtmlHelperOptions.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/HtmlHelperOptions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/HtmlHelperOptions.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/HtmlHelperOptions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/IAntiforgeryPolicy.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/IAntiforgeryPolicy.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/IAntiforgeryPolicy.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/IAntiforgeryPolicy.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/IHtmlGenerator.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/IHtmlGenerator.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/IHtmlGenerator.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/IHtmlGenerator.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/IModelExpressionProvider.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/IModelExpressionProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/IModelExpressionProvider.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/IModelExpressionProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ITempDataDictionary.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/ITempDataDictionary.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ITempDataDictionary.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/ITempDataDictionary.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ITempDataDictionaryFactory.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/ITempDataDictionaryFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ITempDataDictionaryFactory.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/ITempDataDictionaryFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ITempDataProvider.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/ITempDataProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ITempDataProvider.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/ITempDataProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/InputType.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/InputType.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/InputType.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/InputType.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/JsonHelper.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/JsonHelper.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/JsonHelper.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/JsonHelper.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ModelExplorer.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/ModelExplorer.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ModelExplorer.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/ModelExplorer.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ModelExplorerExtensions.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/ModelExplorerExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ModelExplorerExtensions.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/ModelExplorerExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ModelExpression.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/ModelExpression.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ModelExpression.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/ModelExpression.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ModelExpressionProvider.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/ModelExpressionProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ModelExpressionProvider.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/ModelExpressionProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ModelMetadataProviderExtensions.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/ModelMetadataProviderExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ModelMetadataProviderExtensions.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/ModelMetadataProviderExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/MvcViewOptionsConfigureCompatibilityOptions.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/MvcViewOptionsConfigureCompatibilityOptions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/MvcViewOptionsConfigureCompatibilityOptions.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/MvcViewOptionsConfigureCompatibilityOptions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/PartialViewResultExecutor.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/PartialViewResultExecutor.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/PartialViewResultExecutor.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/PartialViewResultExecutor.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/SaveTempDataAttribute.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/SaveTempDataAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/SaveTempDataAttribute.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/SaveTempDataAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/SessionStateTempDataProvider.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/SessionStateTempDataProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/SessionStateTempDataProvider.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/SessionStateTempDataProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/StringHtmlContent.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/StringHtmlContent.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/StringHtmlContent.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/StringHtmlContent.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/TempDataDictionary.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/TempDataDictionary.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/TempDataDictionary.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/TempDataDictionary.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/TempDataDictionaryFactory.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/TempDataDictionaryFactory.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/TempDataDictionaryFactory.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/TempDataDictionaryFactory.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/TemplateBuilder.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/TemplateBuilder.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/TemplateBuilder.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/TemplateBuilder.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/TemplateInfo.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/TemplateInfo.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/TemplateInfo.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/TemplateInfo.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/TemplateRenderer.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/TemplateRenderer.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/TemplateRenderer.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/TemplateRenderer.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/TryGetValueDelegate.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/TryGetValueDelegate.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/TryGetValueDelegate.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/TryGetValueDelegate.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/TryGetValueProvider.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/TryGetValueProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/TryGetValueProvider.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/TryGetValueProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ValidationHtmlAttributeProvider.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/ValidationHtmlAttributeProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ValidationHtmlAttributeProvider.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/ValidationHtmlAttributeProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewComponentResultExecutor.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/ViewComponentResultExecutor.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewComponentResultExecutor.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/ViewComponentResultExecutor.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewContextAttribute.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/ViewContextAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewContextAttribute.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/ViewContextAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewDataDictionary.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/ViewDataDictionary.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewDataDictionary.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/ViewDataDictionary.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewDataDictionaryAttribute.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/ViewDataDictionaryAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewDataDictionaryAttribute.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/ViewDataDictionaryAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewDataDictionaryControllerPropertyActivator.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/ViewDataDictionaryControllerPropertyActivator.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewDataDictionaryControllerPropertyActivator.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/ViewDataDictionaryControllerPropertyActivator.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewDataDictionaryOfT.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/ViewDataDictionaryOfT.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewDataDictionaryOfT.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/ViewDataDictionaryOfT.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewDataEvaluator.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/ViewDataEvaluator.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewDataEvaluator.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/ViewDataEvaluator.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewDataInfo.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/ViewDataInfo.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewDataInfo.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/ViewDataInfo.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewExecutor.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/ViewExecutor.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewExecutor.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/ViewExecutor.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewResultExecutor.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/ViewResultExecutor.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewResultExecutor.cs
rename to src/Mvc/Mvc.ViewFeatures/src/ViewFeatures/ViewResultExecutor.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/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/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/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/Internal/AutoValidateAntiforgeryTokenAuthorizationFilterTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Internal/AutoValidateAntiforgeryTokenAuthorizationFilterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/AutoValidateAntiforgeryTokenAuthorizationFilterTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Internal/AutoValidateAntiforgeryTokenAuthorizationFilterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ControllerSaveTempDataPropertyFilterFactoryTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Internal/ControllerSaveTempDataPropertyFilterFactoryTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ControllerSaveTempDataPropertyFilterFactoryTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Internal/ControllerSaveTempDataPropertyFilterFactoryTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ControllerSaveTempDataPropertyFilterTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Internal/ControllerSaveTempDataPropertyFilterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ControllerSaveTempDataPropertyFilterTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Internal/ControllerSaveTempDataPropertyFilterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ControllerViewDataAttributeFilterFactoryTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Internal/ControllerViewDataAttributeFilterFactoryTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ControllerViewDataAttributeFilterFactoryTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Internal/ControllerViewDataAttributeFilterFactoryTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ControllerViewDataAttributeFilterTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Internal/ControllerViewDataAttributeFilterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ControllerViewDataAttributeFilterTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Internal/ControllerViewDataAttributeFilterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/DefaultDisplayTemplatesTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Internal/DefaultDisplayTemplatesTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/DefaultDisplayTemplatesTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Internal/DefaultDisplayTemplatesTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/DefaultEditorTemplatesTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Internal/DefaultEditorTemplatesTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/DefaultEditorTemplatesTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Internal/DefaultEditorTemplatesTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ExpressionHelperTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Internal/ExpressionHelperTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ExpressionHelperTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Internal/ExpressionHelperTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ExpressionMetadataProviderTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Internal/ExpressionMetadataProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ExpressionMetadataProviderTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Internal/ExpressionMetadataProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/FormatWeekHelperTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Internal/FormatWeekHelperTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/FormatWeekHelperTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Internal/FormatWeekHelperTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/HtmlAttributePropertyHelperTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Internal/HtmlAttributePropertyHelperTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/HtmlAttributePropertyHelperTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Internal/HtmlAttributePropertyHelperTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/LifecyclePropertyTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Internal/LifecyclePropertyTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/LifecyclePropertyTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Internal/LifecyclePropertyTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/PagedBufferedTextWriterTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Internal/PagedBufferedTextWriterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/PagedBufferedTextWriterTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Internal/PagedBufferedTextWriterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/PagedCharBufferTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Internal/PagedCharBufferTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/PagedCharBufferTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Internal/PagedCharBufferTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/SaveTempDataFilterTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Internal/SaveTempDataFilterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/SaveTempDataFilterTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Internal/SaveTempDataFilterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/TempDataApplicationModelProviderTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Internal/TempDataApplicationModelProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/TempDataApplicationModelProviderTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Internal/TempDataApplicationModelProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/TempDataSerializerTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Internal/TempDataSerializerTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/TempDataSerializerTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Internal/TempDataSerializerTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/TemplateRendererTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Internal/TemplateRendererTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/TemplateRendererTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Internal/TemplateRendererTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ValidateAntiforgeryTokenAuthorizationFilterTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Internal/ValidateAntiforgeryTokenAuthorizationFilterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ValidateAntiforgeryTokenAuthorizationFilterTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Internal/ValidateAntiforgeryTokenAuthorizationFilterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ViewBufferTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Internal/ViewBufferTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ViewBufferTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Internal/ViewBufferTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ViewBufferTextWriterTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Internal/ViewBufferTextWriterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ViewBufferTextWriterTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Internal/ViewBufferTextWriterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ViewDataAttributeApplicationModelProviderTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Internal/ViewDataAttributeApplicationModelProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ViewDataAttributeApplicationModelProviderTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Internal/ViewDataAttributeApplicationModelProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ViewDataAttributePropertyProviderTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Internal/ViewDataAttributePropertyProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ViewDataAttributePropertyProviderTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/Internal/ViewDataAttributePropertyProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test.csproj b/src/Mvc/Mvc.ViewFeatures/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test.csproj
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test.csproj
rename to src/Mvc/Mvc.ViewFeatures/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test.csproj
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/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/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/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/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/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/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/ViewFeatures/AntiforgeryExtensionsTest.cs b/src/Mvc/Mvc.ViewFeatures/test/ViewFeatures/AntiforgeryExtensionsTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/AntiforgeryExtensionsTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/ViewFeatures/AntiforgeryExtensionsTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/AttributeDictionaryTest.cs b/src/Mvc/Mvc.ViewFeatures/test/ViewFeatures/AttributeDictionaryTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/AttributeDictionaryTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/ViewFeatures/AttributeDictionaryTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/CookieTempDataProviderTest.cs b/src/Mvc/Mvc.ViewFeatures/test/ViewFeatures/CookieTempDataProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/CookieTempDataProviderTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/ViewFeatures/CookieTempDataProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/DefaultHtmlGeneratorTest.cs b/src/Mvc/Mvc.ViewFeatures/test/ViewFeatures/DefaultHtmlGeneratorTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/DefaultHtmlGeneratorTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/ViewFeatures/DefaultHtmlGeneratorTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/DefaultValidationHtmlAttributeProviderTest.cs b/src/Mvc/Mvc.ViewFeatures/test/ViewFeatures/DefaultValidationHtmlAttributeProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/DefaultValidationHtmlAttributeProviderTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/ViewFeatures/DefaultValidationHtmlAttributeProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/JsonHelperTest.cs b/src/Mvc/Mvc.ViewFeatures/test/ViewFeatures/JsonHelperTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/JsonHelperTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/ViewFeatures/JsonHelperTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/ModelExplorerExtensionsTest.cs b/src/Mvc/Mvc.ViewFeatures/test/ViewFeatures/ModelExplorerExtensionsTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/ModelExplorerExtensionsTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/ViewFeatures/ModelExplorerExtensionsTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/ModelExplorerTest.cs b/src/Mvc/Mvc.ViewFeatures/test/ViewFeatures/ModelExplorerTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/ModelExplorerTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/ViewFeatures/ModelExplorerTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/PartialViewResultExecutorTest.cs b/src/Mvc/Mvc.ViewFeatures/test/ViewFeatures/PartialViewResultExecutorTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/PartialViewResultExecutorTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/ViewFeatures/PartialViewResultExecutorTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/SessionStateTempDataProviderTest.cs b/src/Mvc/Mvc.ViewFeatures/test/ViewFeatures/SessionStateTempDataProviderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/SessionStateTempDataProviderTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/ViewFeatures/SessionStateTempDataProviderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/StringHtmlContentTest.cs b/src/Mvc/Mvc.ViewFeatures/test/ViewFeatures/StringHtmlContentTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/StringHtmlContentTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/ViewFeatures/StringHtmlContentTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/TempDataDictionaryFactoryTest.cs b/src/Mvc/Mvc.ViewFeatures/test/ViewFeatures/TempDataDictionaryFactoryTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/TempDataDictionaryFactoryTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/ViewFeatures/TempDataDictionaryFactoryTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/TempDataDictionaryTest.cs b/src/Mvc/Mvc.ViewFeatures/test/ViewFeatures/TempDataDictionaryTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/TempDataDictionaryTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/ViewFeatures/TempDataDictionaryTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/ViewDataDictionaryOfTModelTest.cs b/src/Mvc/Mvc.ViewFeatures/test/ViewFeatures/ViewDataDictionaryOfTModelTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/ViewDataDictionaryOfTModelTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/ViewFeatures/ViewDataDictionaryOfTModelTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/ViewDataDictionaryTest.cs b/src/Mvc/Mvc.ViewFeatures/test/ViewFeatures/ViewDataDictionaryTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/ViewDataDictionaryTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/ViewFeatures/ViewDataDictionaryTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/ViewDataOfTTest.cs b/src/Mvc/Mvc.ViewFeatures/test/ViewFeatures/ViewDataOfTTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/ViewDataOfTTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/ViewFeatures/ViewDataOfTTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/ViewExecutorTest.cs b/src/Mvc/Mvc.ViewFeatures/test/ViewFeatures/ViewExecutorTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/ViewExecutorTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/ViewFeatures/ViewExecutorTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/ViewResultExecutorTest.cs b/src/Mvc/Mvc.ViewFeatures/test/ViewFeatures/ViewResultExecutorTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/ViewResultExecutorTest.cs
rename to src/Mvc/Mvc.ViewFeatures/test/ViewFeatures/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/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ApiController.cs b/src/Mvc/Mvc.WebApiCompatShim/src/ApiController.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ApiController.cs
rename to src/Mvc/Mvc.WebApiCompatShim/src/ApiController.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/BadRequestErrorMessageResult.cs b/src/Mvc/Mvc.WebApiCompatShim/src/BadRequestErrorMessageResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/BadRequestErrorMessageResult.cs
rename to src/Mvc/Mvc.WebApiCompatShim/src/BadRequestErrorMessageResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ConflictResult.cs b/src/Mvc/Mvc.WebApiCompatShim/src/ConflictResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ConflictResult.cs
rename to src/Mvc/Mvc.WebApiCompatShim/src/ConflictResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Conventions/IUseWebApiActionConventions.cs b/src/Mvc/Mvc.WebApiCompatShim/src/Conventions/IUseWebApiActionConventions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Conventions/IUseWebApiActionConventions.cs
rename to src/Mvc/Mvc.WebApiCompatShim/src/Conventions/IUseWebApiActionConventions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Conventions/IUseWebApiOverloading.cs b/src/Mvc/Mvc.WebApiCompatShim/src/Conventions/IUseWebApiOverloading.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Conventions/IUseWebApiOverloading.cs
rename to src/Mvc/Mvc.WebApiCompatShim/src/Conventions/IUseWebApiOverloading.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Conventions/IUseWebApiParameterConventions.cs b/src/Mvc/Mvc.WebApiCompatShim/src/Conventions/IUseWebApiParameterConventions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Conventions/IUseWebApiParameterConventions.cs
rename to src/Mvc/Mvc.WebApiCompatShim/src/Conventions/IUseWebApiParameterConventions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Conventions/IUseWebApiRoutes.cs b/src/Mvc/Mvc.WebApiCompatShim/src/Conventions/IUseWebApiRoutes.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Conventions/IUseWebApiRoutes.cs
rename to src/Mvc/Mvc.WebApiCompatShim/src/Conventions/IUseWebApiRoutes.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Conventions/UseWebApiActionConventionsAttribute.cs b/src/Mvc/Mvc.WebApiCompatShim/src/Conventions/UseWebApiActionConventionsAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Conventions/UseWebApiActionConventionsAttribute.cs
rename to src/Mvc/Mvc.WebApiCompatShim/src/Conventions/UseWebApiActionConventionsAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Conventions/UseWebApiOverloadingAttribute.cs b/src/Mvc/Mvc.WebApiCompatShim/src/Conventions/UseWebApiOverloadingAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Conventions/UseWebApiOverloadingAttribute.cs
rename to src/Mvc/Mvc.WebApiCompatShim/src/Conventions/UseWebApiOverloadingAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Conventions/UseWebApiParameterConventionsAttribute.cs b/src/Mvc/Mvc.WebApiCompatShim/src/Conventions/UseWebApiParameterConventionsAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Conventions/UseWebApiParameterConventionsAttribute.cs
rename to src/Mvc/Mvc.WebApiCompatShim/src/Conventions/UseWebApiParameterConventionsAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Conventions/UseWebApiRoutesAttribute.cs b/src/Mvc/Mvc.WebApiCompatShim/src/Conventions/UseWebApiRoutesAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Conventions/UseWebApiRoutesAttribute.cs
rename to src/Mvc/Mvc.WebApiCompatShim/src/Conventions/UseWebApiRoutesAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Conventions/WebApiActionConventionsApplicationModelConvention.cs b/src/Mvc/Mvc.WebApiCompatShim/src/Conventions/WebApiActionConventionsApplicationModelConvention.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Conventions/WebApiActionConventionsApplicationModelConvention.cs
rename to src/Mvc/Mvc.WebApiCompatShim/src/Conventions/WebApiActionConventionsApplicationModelConvention.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Conventions/WebApiOverloadingApplicationModelConvention.cs b/src/Mvc/Mvc.WebApiCompatShim/src/Conventions/WebApiOverloadingApplicationModelConvention.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Conventions/WebApiOverloadingApplicationModelConvention.cs
rename to src/Mvc/Mvc.WebApiCompatShim/src/Conventions/WebApiOverloadingApplicationModelConvention.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Conventions/WebApiParameterConventionsApplicationModelConvention.cs b/src/Mvc/Mvc.WebApiCompatShim/src/Conventions/WebApiParameterConventionsApplicationModelConvention.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Conventions/WebApiParameterConventionsApplicationModelConvention.cs
rename to src/Mvc/Mvc.WebApiCompatShim/src/Conventions/WebApiParameterConventionsApplicationModelConvention.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Conventions/WebApiRoutesApplicationModelConvention.cs b/src/Mvc/Mvc.WebApiCompatShim/src/Conventions/WebApiRoutesApplicationModelConvention.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Conventions/WebApiRoutesApplicationModelConvention.cs
rename to src/Mvc/Mvc.WebApiCompatShim/src/Conventions/WebApiRoutesApplicationModelConvention.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ExceptionResult.cs b/src/Mvc/Mvc.WebApiCompatShim/src/ExceptionResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ExceptionResult.cs
rename to src/Mvc/Mvc.WebApiCompatShim/src/ExceptionResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/FormDataCollectionExtensions.cs b/src/Mvc/Mvc.WebApiCompatShim/src/FormDataCollectionExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/FormDataCollectionExtensions.cs
rename to src/Mvc/Mvc.WebApiCompatShim/src/FormDataCollectionExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Formatters/HttpResponseMessageOutputFormatter.cs b/src/Mvc/Mvc.WebApiCompatShim/src/Formatters/HttpResponseMessageOutputFormatter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Formatters/HttpResponseMessageOutputFormatter.cs
rename to src/Mvc/Mvc.WebApiCompatShim/src/Formatters/HttpResponseMessageOutputFormatter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/HttpError.cs b/src/Mvc/Mvc.WebApiCompatShim/src/HttpError.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/HttpError.cs
rename to src/Mvc/Mvc.WebApiCompatShim/src/HttpError.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/HttpErrorKeys.cs b/src/Mvc/Mvc.WebApiCompatShim/src/HttpErrorKeys.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/HttpErrorKeys.cs
rename to src/Mvc/Mvc.WebApiCompatShim/src/HttpErrorKeys.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/HttpRequestMessage/HttpRequestMessageExtensions.cs b/src/Mvc/Mvc.WebApiCompatShim/src/HttpRequestMessage/HttpRequestMessageExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/HttpRequestMessage/HttpRequestMessageExtensions.cs
rename to src/Mvc/Mvc.WebApiCompatShim/src/HttpRequestMessage/HttpRequestMessageExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/HttpRequestMessage/HttpRequestMessageFeature.cs b/src/Mvc/Mvc.WebApiCompatShim/src/HttpRequestMessage/HttpRequestMessageFeature.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/HttpRequestMessage/HttpRequestMessageFeature.cs
rename to src/Mvc/Mvc.WebApiCompatShim/src/HttpRequestMessage/HttpRequestMessageFeature.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/HttpRequestMessage/HttpRequestMessageHttpContextExtensions.cs b/src/Mvc/Mvc.WebApiCompatShim/src/HttpRequestMessage/HttpRequestMessageHttpContextExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/HttpRequestMessage/HttpRequestMessageHttpContextExtensions.cs
rename to src/Mvc/Mvc.WebApiCompatShim/src/HttpRequestMessage/HttpRequestMessageHttpContextExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/HttpRequestMessage/HttpRequestMessageModelBinder.cs b/src/Mvc/Mvc.WebApiCompatShim/src/HttpRequestMessage/HttpRequestMessageModelBinder.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/HttpRequestMessage/HttpRequestMessageModelBinder.cs
rename to src/Mvc/Mvc.WebApiCompatShim/src/HttpRequestMessage/HttpRequestMessageModelBinder.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/HttpRequestMessage/HttpRequestMessageModelBinderProvider.cs b/src/Mvc/Mvc.WebApiCompatShim/src/HttpRequestMessage/HttpRequestMessageModelBinderProvider.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/HttpRequestMessage/HttpRequestMessageModelBinderProvider.cs
rename to src/Mvc/Mvc.WebApiCompatShim/src/HttpRequestMessage/HttpRequestMessageModelBinderProvider.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/HttpRequestMessage/IHttpRequestMessageFeature.cs b/src/Mvc/Mvc.WebApiCompatShim/src/HttpRequestMessage/IHttpRequestMessageFeature.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/HttpRequestMessage/IHttpRequestMessageFeature.cs
rename to src/Mvc/Mvc.WebApiCompatShim/src/HttpRequestMessage/IHttpRequestMessageFeature.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/HttpResponseException.cs b/src/Mvc/Mvc.WebApiCompatShim/src/HttpResponseException.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/HttpResponseException.cs
rename to src/Mvc/Mvc.WebApiCompatShim/src/HttpResponseException.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/HttpResponseExceptionActionFilter.cs b/src/Mvc/Mvc.WebApiCompatShim/src/HttpResponseExceptionActionFilter.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/HttpResponseExceptionActionFilter.cs
rename to src/Mvc/Mvc.WebApiCompatShim/src/HttpResponseExceptionActionFilter.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/InternalServerErrorResult.cs b/src/Mvc/Mvc.WebApiCompatShim/src/InternalServerErrorResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/InternalServerErrorResult.cs
rename to src/Mvc/Mvc.WebApiCompatShim/src/InternalServerErrorResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/InvalidModelStateResult.cs b/src/Mvc/Mvc.WebApiCompatShim/src/InvalidModelStateResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/InvalidModelStateResult.cs
rename to src/Mvc/Mvc.WebApiCompatShim/src/InvalidModelStateResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Microsoft.AspNetCore.Mvc.WebApiCompatShim.csproj b/src/Mvc/Mvc.WebApiCompatShim/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim.csproj
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Microsoft.AspNetCore.Mvc.WebApiCompatShim.csproj
rename to src/Mvc/Mvc.WebApiCompatShim/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim.csproj
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/NegotiatedContentResult.cs b/src/Mvc/Mvc.WebApiCompatShim/src/NegotiatedContentResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/NegotiatedContentResult.cs
rename to src/Mvc/Mvc.WebApiCompatShim/src/NegotiatedContentResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/OverloadActionConstraint.cs b/src/Mvc/Mvc.WebApiCompatShim/src/OverloadActionConstraint.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/OverloadActionConstraint.cs
rename to src/Mvc/Mvc.WebApiCompatShim/src/OverloadActionConstraint.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ParameterBinding/FromUriAttribute.cs b/src/Mvc/Mvc.WebApiCompatShim/src/ParameterBinding/FromUriAttribute.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ParameterBinding/FromUriAttribute.cs
rename to src/Mvc/Mvc.WebApiCompatShim/src/ParameterBinding/FromUriAttribute.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ParameterBinding/IOptionalBinderMetadata.cs b/src/Mvc/Mvc.WebApiCompatShim/src/ParameterBinding/IOptionalBinderMetadata.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ParameterBinding/IOptionalBinderMetadata.cs
rename to src/Mvc/Mvc.WebApiCompatShim/src/ParameterBinding/IOptionalBinderMetadata.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Properties/AssemblyInfo.cs b/src/Mvc/Mvc.WebApiCompatShim/src/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Properties/AssemblyInfo.cs
rename to src/Mvc/Mvc.WebApiCompatShim/src/Properties/AssemblyInfo.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Properties/Resources.Designer.cs b/src/Mvc/Mvc.WebApiCompatShim/src/Properties/Resources.Designer.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Properties/Resources.Designer.cs
rename to src/Mvc/Mvc.WebApiCompatShim/src/Properties/Resources.Designer.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Resources.resx b/src/Mvc/Mvc.WebApiCompatShim/src/Resources.resx
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Resources.resx
rename to src/Mvc/Mvc.WebApiCompatShim/src/Resources.resx
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ResponseMessageResult.cs b/src/Mvc/Mvc.WebApiCompatShim/src/ResponseMessageResult.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ResponseMessageResult.cs
rename to src/Mvc/Mvc.WebApiCompatShim/src/ResponseMessageResult.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Routing/WebApiCompatShimRouteBuilderExtensions.cs b/src/Mvc/Mvc.WebApiCompatShim/src/Routing/WebApiCompatShimRouteBuilderExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Routing/WebApiCompatShimRouteBuilderExtensions.cs
rename to src/Mvc/Mvc.WebApiCompatShim/src/Routing/WebApiCompatShimRouteBuilderExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/WebApiCompatShimMvcBuilderExtensions.cs b/src/Mvc/Mvc.WebApiCompatShim/src/WebApiCompatShimMvcBuilderExtensions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/WebApiCompatShimMvcBuilderExtensions.cs
rename to src/Mvc/Mvc.WebApiCompatShim/src/WebApiCompatShimMvcBuilderExtensions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/WebApiCompatShimOptions.cs b/src/Mvc/Mvc.WebApiCompatShim/src/WebApiCompatShimOptions.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/WebApiCompatShimOptions.cs
rename to src/Mvc/Mvc.WebApiCompatShim/src/WebApiCompatShimOptions.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/WebApiCompatShimOptionsSetup.cs b/src/Mvc/Mvc.WebApiCompatShim/src/WebApiCompatShimOptionsSetup.cs
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/WebApiCompatShimOptionsSetup.cs
rename to src/Mvc/Mvc.WebApiCompatShim/src/WebApiCompatShimOptionsSetup.cs
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/baseline.netcore.json b/src/Mvc/Mvc.WebApiCompatShim/src/baseline.netcore.json
similarity index 100%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/baseline.netcore.json
rename to src/Mvc/Mvc.WebApiCompatShim/src/baseline.netcore.json
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/ApiControllerActionDiscoveryTest.cs b/src/Mvc/Mvc.WebApiCompatShim/test/ApiControllerActionDiscoveryTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/ApiControllerActionDiscoveryTest.cs
rename to src/Mvc/Mvc.WebApiCompatShim/test/ApiControllerActionDiscoveryTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/ApiControllerTest.cs b/src/Mvc/Mvc.WebApiCompatShim/test/ApiControllerTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/ApiControllerTest.cs
rename to src/Mvc/Mvc.WebApiCompatShim/test/ApiControllerTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/BadRequestErrorMessageResultTest.cs b/src/Mvc/Mvc.WebApiCompatShim/test/BadRequestErrorMessageResultTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/BadRequestErrorMessageResultTest.cs
rename to src/Mvc/Mvc.WebApiCompatShim/test/BadRequestErrorMessageResultTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/ConflictResultTest.cs b/src/Mvc/Mvc.WebApiCompatShim/test/ConflictResultTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/ConflictResultTest.cs
rename to src/Mvc/Mvc.WebApiCompatShim/test/ConflictResultTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/DefaultContentNegotiatorTest.cs b/src/Mvc/Mvc.WebApiCompatShim/test/DefaultContentNegotiatorTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/DefaultContentNegotiatorTest.cs
rename to src/Mvc/Mvc.WebApiCompatShim/test/DefaultContentNegotiatorTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/ExceptionResultTest.cs b/src/Mvc/Mvc.WebApiCompatShim/test/ExceptionResultTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/ExceptionResultTest.cs
rename to src/Mvc/Mvc.WebApiCompatShim/test/ExceptionResultTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/FormDataCollectionExtensionsTest.cs b/src/Mvc/Mvc.WebApiCompatShim/test/FormDataCollectionExtensionsTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/FormDataCollectionExtensionsTest.cs
rename to src/Mvc/Mvc.WebApiCompatShim/test/FormDataCollectionExtensionsTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/HttpErrorTest.cs b/src/Mvc/Mvc.WebApiCompatShim/test/HttpErrorTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/HttpErrorTest.cs
rename to src/Mvc/Mvc.WebApiCompatShim/test/HttpErrorTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/HttpRequestMessage/HttpRequestMessageExtensionsTest.cs b/src/Mvc/Mvc.WebApiCompatShim/test/HttpRequestMessage/HttpRequestMessageExtensionsTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/HttpRequestMessage/HttpRequestMessageExtensionsTest.cs
rename to src/Mvc/Mvc.WebApiCompatShim/test/HttpRequestMessage/HttpRequestMessageExtensionsTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/HttpRequestMessage/HttpRequestMessageFeatureTest.cs b/src/Mvc/Mvc.WebApiCompatShim/test/HttpRequestMessage/HttpRequestMessageFeatureTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/HttpRequestMessage/HttpRequestMessageFeatureTest.cs
rename to src/Mvc/Mvc.WebApiCompatShim/test/HttpRequestMessage/HttpRequestMessageFeatureTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/HttpRequestMessage/HttpRequestMessageModelBinderTest.cs b/src/Mvc/Mvc.WebApiCompatShim/test/HttpRequestMessage/HttpRequestMessageModelBinderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/HttpRequestMessage/HttpRequestMessageModelBinderTest.cs
rename to src/Mvc/Mvc.WebApiCompatShim/test/HttpRequestMessage/HttpRequestMessageModelBinderTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/HttpResponseExceptionActionFilterTest.cs b/src/Mvc/Mvc.WebApiCompatShim/test/HttpResponseExceptionActionFilterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/HttpResponseExceptionActionFilterTest.cs
rename to src/Mvc/Mvc.WebApiCompatShim/test/HttpResponseExceptionActionFilterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/HttpResponseExceptionTest.cs b/src/Mvc/Mvc.WebApiCompatShim/test/HttpResponseExceptionTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/HttpResponseExceptionTest.cs
rename to src/Mvc/Mvc.WebApiCompatShim/test/HttpResponseExceptionTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/HttpResponseMessageOutputFormatterTests.cs b/src/Mvc/Mvc.WebApiCompatShim/test/HttpResponseMessageOutputFormatterTests.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/HttpResponseMessageOutputFormatterTests.cs
rename to src/Mvc/Mvc.WebApiCompatShim/test/HttpResponseMessageOutputFormatterTests.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/InternalServerErrorResultTest.cs b/src/Mvc/Mvc.WebApiCompatShim/test/InternalServerErrorResultTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/InternalServerErrorResultTest.cs
rename to src/Mvc/Mvc.WebApiCompatShim/test/InternalServerErrorResultTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/InvalidModelStateResultTest.cs b/src/Mvc/Mvc.WebApiCompatShim/test/InvalidModelStateResultTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/InvalidModelStateResultTest.cs
rename to src/Mvc/Mvc.WebApiCompatShim/test/InvalidModelStateResultTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest.csproj b/src/Mvc/Mvc.WebApiCompatShim/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest.csproj
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest.csproj
rename to src/Mvc/Mvc.WebApiCompatShim/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest.csproj
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/Mocks/MockContentNegotiator.cs b/src/Mvc/Mvc.WebApiCompatShim/test/Mocks/MockContentNegotiator.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/Mocks/MockContentNegotiator.cs
rename to src/Mvc/Mvc.WebApiCompatShim/test/Mocks/MockContentNegotiator.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/Mocks/MockMediaTypeFormatter.cs b/src/Mvc/Mvc.WebApiCompatShim/test/Mocks/MockMediaTypeFormatter.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/Mocks/MockMediaTypeFormatter.cs
rename to src/Mvc/Mvc.WebApiCompatShim/test/Mocks/MockMediaTypeFormatter.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/NegotiatedContentResultTest.cs b/src/Mvc/Mvc.WebApiCompatShim/test/NegotiatedContentResultTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/NegotiatedContentResultTest.cs
rename to src/Mvc/Mvc.WebApiCompatShim/test/NegotiatedContentResultTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/OverloadActionConstraintTest.cs b/src/Mvc/Mvc.WebApiCompatShim/test/OverloadActionConstraintTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/OverloadActionConstraintTest.cs
rename to src/Mvc/Mvc.WebApiCompatShim/test/OverloadActionConstraintTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/TestUtils/FlagsEnum.cs b/src/Mvc/Mvc.WebApiCompatShim/test/TestUtils/FlagsEnum.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/TestUtils/FlagsEnum.cs
rename to src/Mvc/Mvc.WebApiCompatShim/test/TestUtils/FlagsEnum.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/TestUtils/LongEnum.cs b/src/Mvc/Mvc.WebApiCompatShim/test/TestUtils/LongEnum.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/TestUtils/LongEnum.cs
rename to src/Mvc/Mvc.WebApiCompatShim/test/TestUtils/LongEnum.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/TestUtils/MediaTypeAssert.cs b/src/Mvc/Mvc.WebApiCompatShim/test/TestUtils/MediaTypeAssert.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/TestUtils/MediaTypeAssert.cs
rename to src/Mvc/Mvc.WebApiCompatShim/test/TestUtils/MediaTypeAssert.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/TestUtils/MediaTypeConstants.cs b/src/Mvc/Mvc.WebApiCompatShim/test/TestUtils/MediaTypeConstants.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/TestUtils/MediaTypeConstants.cs
rename to src/Mvc/Mvc.WebApiCompatShim/test/TestUtils/MediaTypeConstants.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/TestUtils/MediaTypeHeaderValueComparer.cs b/src/Mvc/Mvc.WebApiCompatShim/test/TestUtils/MediaTypeHeaderValueComparer.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/TestUtils/MediaTypeHeaderValueComparer.cs
rename to src/Mvc/Mvc.WebApiCompatShim/test/TestUtils/MediaTypeHeaderValueComparer.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/TestUtils/RefTypeTestData.cs b/src/Mvc/Mvc.WebApiCompatShim/test/TestUtils/RefTypeTestData.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/TestUtils/RefTypeTestData.cs
rename to src/Mvc/Mvc.WebApiCompatShim/test/TestUtils/RefTypeTestData.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/TestUtils/SimpleEnum.cs b/src/Mvc/Mvc.WebApiCompatShim/test/TestUtils/SimpleEnum.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/TestUtils/SimpleEnum.cs
rename to src/Mvc/Mvc.WebApiCompatShim/test/TestUtils/SimpleEnum.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/TestUtils/TestData.cs b/src/Mvc/Mvc.WebApiCompatShim/test/TestUtils/TestData.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/TestUtils/TestData.cs
rename to src/Mvc/Mvc.WebApiCompatShim/test/TestUtils/TestData.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/TestUtils/TestDataHolder.cs b/src/Mvc/Mvc.WebApiCompatShim/test/TestUtils/TestDataHolder.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/TestUtils/TestDataHolder.cs
rename to src/Mvc/Mvc.WebApiCompatShim/test/TestUtils/TestDataHolder.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/TestUtils/TestDataSetAttribute.cs b/src/Mvc/Mvc.WebApiCompatShim/test/TestUtils/TestDataSetAttribute.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/TestUtils/TestDataSetAttribute.cs
rename to src/Mvc/Mvc.WebApiCompatShim/test/TestUtils/TestDataSetAttribute.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/TestUtils/TestDataVariations.cs b/src/Mvc/Mvc.WebApiCompatShim/test/TestUtils/TestDataVariations.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/TestUtils/TestDataVariations.cs
rename to src/Mvc/Mvc.WebApiCompatShim/test/TestUtils/TestDataVariations.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/TestUtils/TypeAssert.cs b/src/Mvc/Mvc.WebApiCompatShim/test/TestUtils/TypeAssert.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/TestUtils/TypeAssert.cs
rename to src/Mvc/Mvc.WebApiCompatShim/test/TestUtils/TypeAssert.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/TestUtils/ValueTypeTestData.cs b/src/Mvc/Mvc.WebApiCompatShim/test/TestUtils/ValueTypeTestData.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/TestUtils/ValueTypeTestData.cs
rename to src/Mvc/Mvc.WebApiCompatShim/test/TestUtils/ValueTypeTestData.cs
diff --git a/src/Mvc/Mvc.sln b/src/Mvc/Mvc.sln
index fdd07b6e870dc17ca0807ffd73d8d17ba7518e14..dcbddd15b8f116ccade042d0e776ec3fa3494104 100644
--- a/src/Mvc/Mvc.sln
+++ b/src/Mvc/Mvc.sln
@@ -1,44 +1,21 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27130.2036
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.28531.58
 MinimumVisualStudioVersion = 15.0.26730.03
 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}"
@@ -55,16 +32,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RazorPageExecutionInstrumen
 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.WebApiCompatShim", "src\Microsoft.AspNetCore.Mvc.WebApiCompatShim\Microsoft.AspNetCore.Mvc.WebApiCompatShim.csproj", "{23D30B8C-04B1-4577-A604-ED27EA1E4A0E}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebApiCompatShimWebSite", "test\WebSites\WebApiCompatShimWebSite\WebApiCompatShimWebSite.csproj", "{B2B7BC91-688E-4C1E-A71F-CE948D958DDF}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.WebApiCompatShimTest", "test\Microsoft.AspNetCore.Mvc.WebApiCompatShimTest\Microsoft.AspNetCore.Mvc.WebApiCompatShimTest.csproj", "{5DE8E4D9-AACD-4B5F-819F-F091383FB996}"
-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}"
@@ -75,81 +44,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.TestCommon", "test\Microsoft.AspNetCore.Mvc.TestCommon\Microsoft.AspNetCore.Mvc.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.Formatters.Json", "src\Microsoft.AspNetCore.Mvc.Formatters.Json\Microsoft.AspNetCore.Mvc.Formatters.Json.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.Formatters.Json.Test", "test\Microsoft.AspNetCore.Mvc.Formatters.Json.Test\Microsoft.AspNetCore.Mvc.Formatters.Json.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}"
@@ -160,14 +75,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RazorBuildWebSite.Precompil
 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}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Analyzers.Test", "test\Microsoft.AspNetCore.Mvc.Analyzers.Test\Microsoft.AspNetCore.Mvc.Analyzers.Test.csproj", "{E3E09D2F-1FCF-4396-9B09-5A62CA8CC831}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Analyzers.Experimental", "src\Microsoft.AspNetCore.Mvc.Analyzers.Experimental\Microsoft.AspNetCore.Mvc.Analyzers.Experimental.csproj", "{CBF23034-2249-4FE5-BD48-5F3CEAC0DF61}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Analyzers.Experimental.Test", "test\Microsoft.AspNetCore.Mvc.Analyzers.Experimental.Test\Microsoft.AspNetCore.Mvc.Analyzers.Experimental.Test.csproj", "{E83D3745-9BCF-40E8-8D34-AFBA604C2439}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RazorPagesClassLibrary", "test\WebSites\RazorPagesClassLibrary\RazorPagesClassLibrary.csproj", "{17122147-ADFD-41C8-87D9-CCC582CCA8F9}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_dependencies", "_dependencies", "{5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}"
@@ -252,6 +159,116 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StrongNamedApp", "ViewCompi
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.FunctionalTests", "ViewCompilation\test\FunctionalTests\Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.FunctionalTests.csproj", "{0A2B5ED2-E9A7-41A5-9B0F-10007673F2D9}"
 EndProject
+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.Analyzers", "Mvc.Analyzers", "{4098228A-A3CE-4A38-9C69-B43DFD522FFE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Analyzers", "Mvc.Analyzers\src\Microsoft.AspNetCore.Mvc.Analyzers.csproj", "{A3B32436-2C1A-4894-9C48-20A375F620D9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Analyzers.Test", "Mvc.Analyzers\test\Microsoft.AspNetCore.Mvc.Analyzers.Test.csproj", "{3DC39D0E-AB52-4FD7-BCE1-BA5F27033160}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mvc.Analyzers.Experimental", "Mvc.Analyzers.Experimental", "{ED0AE513-0E3E-45E7-8C94-231000ACFAAA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Analyzers.Experimental", "Mvc.Analyzers.Experimental\src\Microsoft.AspNetCore.Mvc.Analyzers.Experimental.csproj", "{03006684-0D8B-4FD3-BDFE-70D451E0498D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Analyzers.Experimental.Test", "Mvc.Analyzers.Experimental\test\Microsoft.AspNetCore.Mvc.Analyzers.Experimental.Test.csproj", "{217336E2-74FB-4D1B-9152-AF9C85266280}"
+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("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Formatters.Json.Test", "Mvc.Formatters.Json\test\Microsoft.AspNetCore.Mvc.Formatters.Json.Test.csproj", "{7FB0CBDC-AD2D-409A-B8AD-C74395069B0F}"
+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("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mvc.WebApiCompatShim", "Mvc.WebApiCompatShim", "{2CA9D135-E011-4916-8AAB-4F282F87C9E7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.WebApiCompatShim", "Mvc.WebApiCompatShim\src\Microsoft.AspNetCore.Mvc.WebApiCompatShim.csproj", "{1E722DC2-12FB-4CA4-8E2A-A4C3FEFE2C44}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.WebApiCompatShimTest", "Mvc.WebApiCompatShim\test\Microsoft.AspNetCore.Mvc.WebApiCompatShimTest.csproj", "{A53837A6-212D-433F-9B52-878C9E980B52}"
+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.TestCommon", "shared\Mvc.TestCommon\Microsoft.AspNetCore.Mvc.TestCommon.csproj", "{78D6B28C-A16E-4BDF-8653-E51FA75BDEBB}"
+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
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -262,66 +279,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
@@ -342,16 +299,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
@@ -432,16 +379,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
-		{23D30B8C-04B1-4577-A604-ED27EA1E4A0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{23D30B8C-04B1-4577-A604-ED27EA1E4A0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{23D30B8C-04B1-4577-A604-ED27EA1E4A0E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{23D30B8C-04B1-4577-A604-ED27EA1E4A0E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{23D30B8C-04B1-4577-A604-ED27EA1E4A0E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{23D30B8C-04B1-4577-A604-ED27EA1E4A0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{23D30B8C-04B1-4577-A604-ED27EA1E4A0E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{23D30B8C-04B1-4577-A604-ED27EA1E4A0E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{23D30B8C-04B1-4577-A604-ED27EA1E4A0E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{23D30B8C-04B1-4577-A604-ED27EA1E4A0E}.Release|x86.ActiveCfg = Release|Any CPU
 		{B2B7BC91-688E-4C1E-A71F-CE948D958DDF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B2B7BC91-688E-4C1E-A71F-CE948D958DDF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B2B7BC91-688E-4C1E-A71F-CE948D958DDF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -452,36 +389,6 @@ Global
 		{B2B7BC91-688E-4C1E-A71F-CE948D958DDF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{B2B7BC91-688E-4C1E-A71F-CE948D958DDF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{B2B7BC91-688E-4C1E-A71F-CE948D958DDF}.Release|x86.ActiveCfg = Release|Any CPU
-		{5DE8E4D9-AACD-4B5F-819F-F091383FB996}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5DE8E4D9-AACD-4B5F-819F-F091383FB996}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5DE8E4D9-AACD-4B5F-819F-F091383FB996}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5DE8E4D9-AACD-4B5F-819F-F091383FB996}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5DE8E4D9-AACD-4B5F-819F-F091383FB996}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{5DE8E4D9-AACD-4B5F-819F-F091383FB996}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5DE8E4D9-AACD-4B5F-819F-F091383FB996}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5DE8E4D9-AACD-4B5F-819F-F091383FB996}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{5DE8E4D9-AACD-4B5F-819F-F091383FB996}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{5DE8E4D9-AACD-4B5F-819F-F091383FB996}.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
@@ -542,18 +449,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
@@ -566,222 +461,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
@@ -818,30 +497,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
@@ -866,18 +521,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
@@ -914,54 +557,6 @@ Global
 		{8916DDCA-EC2A-4193-B9F3-78CAA1A96D5A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{8916DDCA-EC2A-4193-B9F3-78CAA1A96D5A}.Release|x86.ActiveCfg = Release|Any CPU
 		{8916DDCA-EC2A-4193-B9F3-78CAA1A96D5A}.Release|x86.Build.0 = Release|Any CPU
-		{87A3E227-C45E-4141-A59F-402908E651FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{87A3E227-C45E-4141-A59F-402908E651FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{87A3E227-C45E-4141-A59F-402908E651FD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{87A3E227-C45E-4141-A59F-402908E651FD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{87A3E227-C45E-4141-A59F-402908E651FD}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{87A3E227-C45E-4141-A59F-402908E651FD}.Debug|x86.Build.0 = Debug|Any CPU
-		{87A3E227-C45E-4141-A59F-402908E651FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{87A3E227-C45E-4141-A59F-402908E651FD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{87A3E227-C45E-4141-A59F-402908E651FD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{87A3E227-C45E-4141-A59F-402908E651FD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{87A3E227-C45E-4141-A59F-402908E651FD}.Release|x86.ActiveCfg = Release|Any CPU
-		{87A3E227-C45E-4141-A59F-402908E651FD}.Release|x86.Build.0 = Release|Any CPU
-		{E3E09D2F-1FCF-4396-9B09-5A62CA8CC831}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E3E09D2F-1FCF-4396-9B09-5A62CA8CC831}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E3E09D2F-1FCF-4396-9B09-5A62CA8CC831}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E3E09D2F-1FCF-4396-9B09-5A62CA8CC831}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E3E09D2F-1FCF-4396-9B09-5A62CA8CC831}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E3E09D2F-1FCF-4396-9B09-5A62CA8CC831}.Debug|x86.Build.0 = Debug|Any CPU
-		{E3E09D2F-1FCF-4396-9B09-5A62CA8CC831}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E3E09D2F-1FCF-4396-9B09-5A62CA8CC831}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E3E09D2F-1FCF-4396-9B09-5A62CA8CC831}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{E3E09D2F-1FCF-4396-9B09-5A62CA8CC831}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{E3E09D2F-1FCF-4396-9B09-5A62CA8CC831}.Release|x86.ActiveCfg = Release|Any CPU
-		{E3E09D2F-1FCF-4396-9B09-5A62CA8CC831}.Release|x86.Build.0 = Release|Any CPU
-		{CBF23034-2249-4FE5-BD48-5F3CEAC0DF61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CBF23034-2249-4FE5-BD48-5F3CEAC0DF61}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CBF23034-2249-4FE5-BD48-5F3CEAC0DF61}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{CBF23034-2249-4FE5-BD48-5F3CEAC0DF61}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{CBF23034-2249-4FE5-BD48-5F3CEAC0DF61}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{CBF23034-2249-4FE5-BD48-5F3CEAC0DF61}.Debug|x86.Build.0 = Debug|Any CPU
-		{CBF23034-2249-4FE5-BD48-5F3CEAC0DF61}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CBF23034-2249-4FE5-BD48-5F3CEAC0DF61}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CBF23034-2249-4FE5-BD48-5F3CEAC0DF61}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{CBF23034-2249-4FE5-BD48-5F3CEAC0DF61}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{CBF23034-2249-4FE5-BD48-5F3CEAC0DF61}.Release|x86.ActiveCfg = Release|Any CPU
-		{CBF23034-2249-4FE5-BD48-5F3CEAC0DF61}.Release|x86.Build.0 = Release|Any CPU
-		{E83D3745-9BCF-40E8-8D34-AFBA604C2439}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E83D3745-9BCF-40E8-8D34-AFBA604C2439}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E83D3745-9BCF-40E8-8D34-AFBA604C2439}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E83D3745-9BCF-40E8-8D34-AFBA604C2439}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E83D3745-9BCF-40E8-8D34-AFBA604C2439}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E83D3745-9BCF-40E8-8D34-AFBA604C2439}.Debug|x86.Build.0 = Debug|Any CPU
-		{E83D3745-9BCF-40E8-8D34-AFBA604C2439}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E83D3745-9BCF-40E8-8D34-AFBA604C2439}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E83D3745-9BCF-40E8-8D34-AFBA604C2439}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{E83D3745-9BCF-40E8-8D34-AFBA604C2439}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{E83D3745-9BCF-40E8-8D34-AFBA604C2439}.Release|x86.ActiveCfg = Release|Any CPU
-		{E83D3745-9BCF-40E8-8D34-AFBA604C2439}.Release|x86.Build.0 = Release|Any CPU
 		{17122147-ADFD-41C8-87D9-CCC582CCA8F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{17122147-ADFD-41C8-87D9-CCC582CCA8F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{17122147-ADFD-41C8-87D9-CCC582CCA8F9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -1430,21 +1025,458 @@ Global
 		{0A2B5ED2-E9A7-41A5-9B0F-10007673F2D9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{0A2B5ED2-E9A7-41A5-9B0F-10007673F2D9}.Release|x86.ActiveCfg = Release|Any CPU
 		{0A2B5ED2-E9A7-41A5-9B0F-10007673F2D9}.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
+		{A3B32436-2C1A-4894-9C48-20A375F620D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A3B32436-2C1A-4894-9C48-20A375F620D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A3B32436-2C1A-4894-9C48-20A375F620D9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A3B32436-2C1A-4894-9C48-20A375F620D9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A3B32436-2C1A-4894-9C48-20A375F620D9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A3B32436-2C1A-4894-9C48-20A375F620D9}.Debug|x86.Build.0 = Debug|Any CPU
+		{A3B32436-2C1A-4894-9C48-20A375F620D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A3B32436-2C1A-4894-9C48-20A375F620D9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A3B32436-2C1A-4894-9C48-20A375F620D9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{A3B32436-2C1A-4894-9C48-20A375F620D9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{A3B32436-2C1A-4894-9C48-20A375F620D9}.Release|x86.ActiveCfg = Release|Any CPU
+		{A3B32436-2C1A-4894-9C48-20A375F620D9}.Release|x86.Build.0 = Release|Any CPU
+		{3DC39D0E-AB52-4FD7-BCE1-BA5F27033160}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3DC39D0E-AB52-4FD7-BCE1-BA5F27033160}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3DC39D0E-AB52-4FD7-BCE1-BA5F27033160}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3DC39D0E-AB52-4FD7-BCE1-BA5F27033160}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3DC39D0E-AB52-4FD7-BCE1-BA5F27033160}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3DC39D0E-AB52-4FD7-BCE1-BA5F27033160}.Debug|x86.Build.0 = Debug|Any CPU
+		{3DC39D0E-AB52-4FD7-BCE1-BA5F27033160}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3DC39D0E-AB52-4FD7-BCE1-BA5F27033160}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3DC39D0E-AB52-4FD7-BCE1-BA5F27033160}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{3DC39D0E-AB52-4FD7-BCE1-BA5F27033160}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{3DC39D0E-AB52-4FD7-BCE1-BA5F27033160}.Release|x86.ActiveCfg = Release|Any CPU
+		{3DC39D0E-AB52-4FD7-BCE1-BA5F27033160}.Release|x86.Build.0 = Release|Any CPU
+		{03006684-0D8B-4FD3-BDFE-70D451E0498D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{03006684-0D8B-4FD3-BDFE-70D451E0498D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{03006684-0D8B-4FD3-BDFE-70D451E0498D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{03006684-0D8B-4FD3-BDFE-70D451E0498D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{03006684-0D8B-4FD3-BDFE-70D451E0498D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{03006684-0D8B-4FD3-BDFE-70D451E0498D}.Debug|x86.Build.0 = Debug|Any CPU
+		{03006684-0D8B-4FD3-BDFE-70D451E0498D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{03006684-0D8B-4FD3-BDFE-70D451E0498D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{03006684-0D8B-4FD3-BDFE-70D451E0498D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{03006684-0D8B-4FD3-BDFE-70D451E0498D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{03006684-0D8B-4FD3-BDFE-70D451E0498D}.Release|x86.ActiveCfg = Release|Any CPU
+		{03006684-0D8B-4FD3-BDFE-70D451E0498D}.Release|x86.Build.0 = Release|Any CPU
+		{217336E2-74FB-4D1B-9152-AF9C85266280}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{217336E2-74FB-4D1B-9152-AF9C85266280}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{217336E2-74FB-4D1B-9152-AF9C85266280}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{217336E2-74FB-4D1B-9152-AF9C85266280}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{217336E2-74FB-4D1B-9152-AF9C85266280}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{217336E2-74FB-4D1B-9152-AF9C85266280}.Debug|x86.Build.0 = Debug|Any CPU
+		{217336E2-74FB-4D1B-9152-AF9C85266280}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{217336E2-74FB-4D1B-9152-AF9C85266280}.Release|Any CPU.Build.0 = Release|Any CPU
+		{217336E2-74FB-4D1B-9152-AF9C85266280}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{217336E2-74FB-4D1B-9152-AF9C85266280}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{217336E2-74FB-4D1B-9152-AF9C85266280}.Release|x86.ActiveCfg = Release|Any CPU
+		{217336E2-74FB-4D1B-9152-AF9C85266280}.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
+		{7FB0CBDC-AD2D-409A-B8AD-C74395069B0F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7FB0CBDC-AD2D-409A-B8AD-C74395069B0F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7FB0CBDC-AD2D-409A-B8AD-C74395069B0F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{7FB0CBDC-AD2D-409A-B8AD-C74395069B0F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{7FB0CBDC-AD2D-409A-B8AD-C74395069B0F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7FB0CBDC-AD2D-409A-B8AD-C74395069B0F}.Debug|x86.Build.0 = Debug|Any CPU
+		{7FB0CBDC-AD2D-409A-B8AD-C74395069B0F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7FB0CBDC-AD2D-409A-B8AD-C74395069B0F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7FB0CBDC-AD2D-409A-B8AD-C74395069B0F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{7FB0CBDC-AD2D-409A-B8AD-C74395069B0F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{7FB0CBDC-AD2D-409A-B8AD-C74395069B0F}.Release|x86.ActiveCfg = Release|Any CPU
+		{7FB0CBDC-AD2D-409A-B8AD-C74395069B0F}.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
+		{1E722DC2-12FB-4CA4-8E2A-A4C3FEFE2C44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1E722DC2-12FB-4CA4-8E2A-A4C3FEFE2C44}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1E722DC2-12FB-4CA4-8E2A-A4C3FEFE2C44}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{1E722DC2-12FB-4CA4-8E2A-A4C3FEFE2C44}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{1E722DC2-12FB-4CA4-8E2A-A4C3FEFE2C44}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1E722DC2-12FB-4CA4-8E2A-A4C3FEFE2C44}.Debug|x86.Build.0 = Debug|Any CPU
+		{1E722DC2-12FB-4CA4-8E2A-A4C3FEFE2C44}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1E722DC2-12FB-4CA4-8E2A-A4C3FEFE2C44}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1E722DC2-12FB-4CA4-8E2A-A4C3FEFE2C44}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{1E722DC2-12FB-4CA4-8E2A-A4C3FEFE2C44}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{1E722DC2-12FB-4CA4-8E2A-A4C3FEFE2C44}.Release|x86.ActiveCfg = Release|Any CPU
+		{1E722DC2-12FB-4CA4-8E2A-A4C3FEFE2C44}.Release|x86.Build.0 = Release|Any CPU
+		{A53837A6-212D-433F-9B52-878C9E980B52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A53837A6-212D-433F-9B52-878C9E980B52}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A53837A6-212D-433F-9B52-878C9E980B52}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A53837A6-212D-433F-9B52-878C9E980B52}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A53837A6-212D-433F-9B52-878C9E980B52}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A53837A6-212D-433F-9B52-878C9E980B52}.Debug|x86.Build.0 = Debug|Any CPU
+		{A53837A6-212D-433F-9B52-878C9E980B52}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A53837A6-212D-433F-9B52-878C9E980B52}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A53837A6-212D-433F-9B52-878C9E980B52}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{A53837A6-212D-433F-9B52-878C9E980B52}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{A53837A6-212D-433F-9B52-878C9E980B52}.Release|x86.ActiveCfg = Release|Any CPU
+		{A53837A6-212D-433F-9B52-878C9E980B52}.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
+		{78D6B28C-A16E-4BDF-8653-E51FA75BDEBB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{78D6B28C-A16E-4BDF-8653-E51FA75BDEBB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{78D6B28C-A16E-4BDF-8653-E51FA75BDEBB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{78D6B28C-A16E-4BDF-8653-E51FA75BDEBB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{78D6B28C-A16E-4BDF-8653-E51FA75BDEBB}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{78D6B28C-A16E-4BDF-8653-E51FA75BDEBB}.Debug|x86.Build.0 = Debug|Any CPU
+		{78D6B28C-A16E-4BDF-8653-E51FA75BDEBB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{78D6B28C-A16E-4BDF-8653-E51FA75BDEBB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{78D6B28C-A16E-4BDF-8653-E51FA75BDEBB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{78D6B28C-A16E-4BDF-8653-E51FA75BDEBB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{78D6B28C-A16E-4BDF-8653-E51FA75BDEBB}.Release|x86.ActiveCfg = Release|Any CPU
+		{78D6B28C-A16E-4BDF-8653-E51FA75BDEBB}.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
 	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}
@@ -1453,51 +1485,21 @@ Global
 		{0EF9860B-10D7-452F-B0F4-A405B88BEBB3} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C}
 		{2B2B9876-903C-4065-8D62-2EE832BBA106} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C}
 		{CAE52CB7-0FAC-4B5B-8251-B0FF837DB657} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C}
-		{23D30B8C-04B1-4577-A604-ED27EA1E4A0E} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E}
 		{B2B7BC91-688E-4C1E-A71F-CE948D958DDF} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C}
-		{5DE8E4D9-AACD-4B5F-819F-F091383FB996} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
-		{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}
 		{856D7E25-E033-477D-9ABD-0B50CF428C80} = {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}
-		{CBF23034-2249-4FE5-BD48-5F3CEAC0DF61} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E}
-		{E83D3745-9BCF-40E8-8D34-AFBA604C2439} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
 		{17122147-ADFD-41C8-87D9-CCC582CCA8F9} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C}
 		{0930C2EA-FA36-4EDF-A571-215765D1F2C7} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
 		{A273BAAB-DA92-401D-B781-ADA9E3B7717C} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
@@ -1538,6 +1540,43 @@ Global
 		{D54A8DCC-801E-4407-A9CC-01E4C33A72EB} = {5C8A337A-956B-4045-A680-4A61942D0866}
 		{13CB4F98-F361-4989-BBC2-0B0ECDAC68F3} = {5C8A337A-956B-4045-A680-4A61942D0866}
 		{0A2B5ED2-E9A7-41A5-9B0F-10007673F2D9} = {83D016A9-7233-43FC-94C1-0AF2619D136B}
+		{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}
+		{A3B32436-2C1A-4894-9C48-20A375F620D9} = {4098228A-A3CE-4A38-9C69-B43DFD522FFE}
+		{3DC39D0E-AB52-4FD7-BCE1-BA5F27033160} = {4098228A-A3CE-4A38-9C69-B43DFD522FFE}
+		{03006684-0D8B-4FD3-BDFE-70D451E0498D} = {ED0AE513-0E3E-45E7-8C94-231000ACFAAA}
+		{217336E2-74FB-4D1B-9152-AF9C85266280} = {ED0AE513-0E3E-45E7-8C94-231000ACFAAA}
+		{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}
+		{7FB0CBDC-AD2D-409A-B8AD-C74395069B0F} = {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}
+		{1E722DC2-12FB-4CA4-8E2A-A4C3FEFE2C44} = {2CA9D135-E011-4916-8AAB-4F282F87C9E7}
+		{A53837A6-212D-433F-9B52-878C9E980B52} = {2CA9D135-E011-4916-8AAB-4F282F87C9E7}
+		{FD6F906C-4926-4F65-A183-81700C6BCDE9} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
+		{36C22DEA-EFC4-4BC0-B1C6-C50D99146DC6} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
+		{78D6B28C-A16E-4BDF-8653-E51FA75BDEBB} = {75A3249D-E8DB-42F1-9B4E-1DCC662856A0}
+		{DDF72F95-F556-4918-8243-AF2284BD2302} = {75A3249D-E8DB-42F1-9B4E-1DCC662856A0}
+		{8F724554-E7EF-48D2-B27B-00C238078EAF} = {FDCA02D4-871E-4255-AC53-12CDF1D5B510}
 	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/IntegrationTest/CompatibilitySwitchIntegrationTest.cs b/src/Mvc/Mvc/test/IntegrationTest/CompatibilitySwitchIntegrationTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Test/IntegrationTest/CompatibilitySwitchIntegrationTest.cs
rename to src/Mvc/Mvc/test/IntegrationTest/CompatibilitySwitchIntegrationTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Test/JsonPatchExtensionsTest.cs b/src/Mvc/Mvc/test/JsonPatchExtensionsTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Test/JsonPatchExtensionsTest.cs
rename to src/Mvc/Mvc/test/JsonPatchExtensionsTest.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/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/test/Microsoft.AspNetCore.Mvc.TestCommon/CommonFilterTest.cs b/src/Mvc/shared/Mvc.TestCommon/CommonFilterTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/CommonFilterTest.cs
rename to src/Mvc/shared/Mvc.TestCommon/CommonFilterTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/CommonResourceInvokerTest.cs b/src/Mvc/shared/Mvc.TestCommon/CommonResourceInvokerTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/CommonResourceInvokerTest.cs
rename to src/Mvc/shared/Mvc.TestCommon/CommonResourceInvokerTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/HtmlContentUtilities.cs b/src/Mvc/shared/Mvc.TestCommon/HtmlContentUtilities.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/HtmlContentUtilities.cs
rename to src/Mvc/shared/Mvc.TestCommon/HtmlContentUtilities.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/HtmlGeneratorUtilities.cs b/src/Mvc/shared/Mvc.TestCommon/HtmlGeneratorUtilities.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/HtmlGeneratorUtilities.cs
rename to src/Mvc/shared/Mvc.TestCommon/HtmlGeneratorUtilities.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/MediaTypeAssert.cs b/src/Mvc/shared/Mvc.TestCommon/MediaTypeAssert.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/MediaTypeAssert.cs
rename to src/Mvc/shared/Mvc.TestCommon/MediaTypeAssert.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/Microsoft.AspNetCore.Mvc.TestCommon.csproj b/src/Mvc/shared/Mvc.TestCommon/Microsoft.AspNetCore.Mvc.TestCommon.csproj
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/Microsoft.AspNetCore.Mvc.TestCommon.csproj
rename to src/Mvc/shared/Mvc.TestCommon/Microsoft.AspNetCore.Mvc.TestCommon.csproj
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/NonSeekableReadableStream.cs b/src/Mvc/shared/Mvc.TestCommon/NonSeekableReadableStream.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/NonSeekableReadableStream.cs
rename to src/Mvc/shared/Mvc.TestCommon/NonSeekableReadableStream.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/PlatformNormalizer.cs b/src/Mvc/shared/Mvc.TestCommon/PlatformNormalizer.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/PlatformNormalizer.cs
rename to src/Mvc/shared/Mvc.TestCommon/PlatformNormalizer.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/ResourceFile.cs b/src/Mvc/shared/Mvc.TestCommon/ResourceFile.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/ResourceFile.cs
rename to src/Mvc/shared/Mvc.TestCommon/ResourceFile.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/SimpleValueProvider.cs b/src/Mvc/shared/Mvc.TestCommon/SimpleValueProvider.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/SimpleValueProvider.cs
rename to src/Mvc/shared/Mvc.TestCommon/SimpleValueProvider.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/SimpleValueProviderFactory.cs b/src/Mvc/shared/Mvc.TestCommon/SimpleValueProviderFactory.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/SimpleValueProviderFactory.cs
rename to src/Mvc/shared/Mvc.TestCommon/SimpleValueProviderFactory.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/SolutionPathUtility.cs b/src/Mvc/shared/Mvc.TestCommon/SolutionPathUtility.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/SolutionPathUtility.cs
rename to src/Mvc/shared/Mvc.TestCommon/SolutionPathUtility.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/TestClientModelValidatorProvider.cs b/src/Mvc/shared/Mvc.TestCommon/TestClientModelValidatorProvider.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/TestClientModelValidatorProvider.cs
rename to src/Mvc/shared/Mvc.TestCommon/TestClientModelValidatorProvider.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/TestDirectoryContent.cs b/src/Mvc/shared/Mvc.TestCommon/TestDirectoryContent.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/TestDirectoryContent.cs
rename to src/Mvc/shared/Mvc.TestCommon/TestDirectoryContent.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/TestDirectoryFileInfo.cs b/src/Mvc/shared/Mvc.TestCommon/TestDirectoryFileInfo.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/TestDirectoryFileInfo.cs
rename to src/Mvc/shared/Mvc.TestCommon/TestDirectoryFileInfo.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/TestFileChangeToken.cs b/src/Mvc/shared/Mvc.TestCommon/TestFileChangeToken.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/TestFileChangeToken.cs
rename to src/Mvc/shared/Mvc.TestCommon/TestFileChangeToken.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/TestFileInfo.cs b/src/Mvc/shared/Mvc.TestCommon/TestFileInfo.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/TestFileInfo.cs
rename to src/Mvc/shared/Mvc.TestCommon/TestFileInfo.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/TestFileProvider.cs b/src/Mvc/shared/Mvc.TestCommon/TestFileProvider.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/TestFileProvider.cs
rename to src/Mvc/shared/Mvc.TestCommon/TestFileProvider.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/TestHttpRequestStreamReaderFactory.cs b/src/Mvc/shared/Mvc.TestCommon/TestHttpRequestStreamReaderFactory.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/TestHttpRequestStreamReaderFactory.cs
rename to src/Mvc/shared/Mvc.TestCommon/TestHttpRequestStreamReaderFactory.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/TestHttpResponseStreamWriterFactory.cs b/src/Mvc/shared/Mvc.TestCommon/TestHttpResponseStreamWriterFactory.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/TestHttpResponseStreamWriterFactory.cs
rename to src/Mvc/shared/Mvc.TestCommon/TestHttpResponseStreamWriterFactory.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/TestModelBinderFactory.cs b/src/Mvc/shared/Mvc.TestCommon/TestModelBinderFactory.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/TestModelBinderFactory.cs
rename to src/Mvc/shared/Mvc.TestCommon/TestModelBinderFactory.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/TestModelMetadataProvider.cs b/src/Mvc/shared/Mvc.TestCommon/TestModelMetadataProvider.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/TestModelMetadataProvider.cs
rename to src/Mvc/shared/Mvc.TestCommon/TestModelMetadataProvider.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/TestModelValidatorProvider.cs b/src/Mvc/shared/Mvc.TestCommon/TestModelValidatorProvider.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/TestModelValidatorProvider.cs
rename to src/Mvc/shared/Mvc.TestCommon/TestModelValidatorProvider.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/TestRazorCompiledItem.cs b/src/Mvc/shared/Mvc.TestCommon/TestRazorCompiledItem.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/TestRazorCompiledItem.cs
rename to src/Mvc/shared/Mvc.TestCommon/TestRazorCompiledItem.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/TestRazorProjectItem.cs b/src/Mvc/shared/Mvc.TestCommon/TestRazorProjectItem.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/TestRazorProjectItem.cs
rename to src/Mvc/shared/Mvc.TestCommon/TestRazorProjectItem.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/TestViewBufferScope.cs b/src/Mvc/shared/Mvc.TestCommon/TestViewBufferScope.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/TestViewBufferScope.cs
rename to src/Mvc/shared/Mvc.TestCommon/TestViewBufferScope.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/ValidationAttributeUtil.cs b/src/Mvc/shared/Mvc.TestCommon/ValidationAttributeUtil.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/ValidationAttributeUtil.cs
rename to src/Mvc/shared/Mvc.TestCommon/ValidationAttributeUtil.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/VirtualRazorProjectFileSystem.cs b/src/Mvc/shared/Mvc.TestCommon/VirtualRazorProjectFileSystem.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/VirtualRazorProjectFileSystem.cs
rename to src/Mvc/shared/Mvc.TestCommon/VirtualRazorProjectFileSystem.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.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/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/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/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/DefaultOrderTest.cs b/src/Mvc/test/Mvc.FunctionalTests/DefaultOrderTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/DefaultOrderTest.cs
rename to src/Mvc/test/Mvc.FunctionalTests/DefaultOrderTest.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/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/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/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/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj b/src/Mvc/test/Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj
similarity index 95%
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 d66658ef27476a78657737b27749ab25a81f04f2..a2190bb338ea4775b5d2ed3713d48474acdfdd5f 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
@@ -11,7 +11,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>
@@ -39,7 +39,7 @@
     <ProjectReference Include="..\WebSites\FilesWebSite\FilesWebSite.csproj" />
     <ProjectReference Include="..\WebSites\FormatterWebSite\FormatterWebSite.csproj" />
     <ProjectReference Include="..\WebSites\HtmlGenerationWebSite\HtmlGenerationWebSite.csproj" />
-    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.TestCommon\Microsoft.AspNetCore.Mvc.TestCommon.csproj" />
+    <ProjectReference Include="..\..\shared\Mvc.TestCommon\Microsoft.AspNetCore.Mvc.TestCommon.csproj" />
     <ProjectReference Include="..\..\samples\MvcSandbox\MvcSandbox.csproj" />
     <ProjectReference Include="..\WebSites\RazorBuildWebSite\RazorBuildWebSite.csproj" />
     <ProjectReference Include="..\WebSites\RazorPageExecutionInstrumentationWebSite\RazorPageExecutionInstrumentationWebSite.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/RazorPageExecutionInstrumentationTest.cs b/src/Mvc/test/Mvc.FunctionalTests/RazorPageExecutionInstrumentationTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorPageExecutionInstrumentationTest.cs
rename to src/Mvc/test/Mvc.FunctionalTests/RazorPageExecutionInstrumentationTest.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/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/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/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/RouteDataTest.cs b/src/Mvc/test/Mvc.FunctionalTests/RouteDataTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RouteDataTest.cs
rename to src/Mvc/test/Mvc.FunctionalTests/RouteDataTest.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/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/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/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/WebApiCompatShimActionResultTest.cs b/src/Mvc/test/Mvc.FunctionalTests/WebApiCompatShimActionResultTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/WebApiCompatShimActionResultTest.cs
rename to src/Mvc/test/Mvc.FunctionalTests/WebApiCompatShimActionResultTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/WebApiCompatShimActionSelectionTest.cs b/src/Mvc/test/Mvc.FunctionalTests/WebApiCompatShimActionSelectionTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/WebApiCompatShimActionSelectionTest.cs
rename to src/Mvc/test/Mvc.FunctionalTests/WebApiCompatShimActionSelectionTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/WebApiCompatShimBasicTest.cs b/src/Mvc/test/Mvc.FunctionalTests/WebApiCompatShimBasicTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/WebApiCompatShimBasicTest.cs
rename to src/Mvc/test/Mvc.FunctionalTests/WebApiCompatShimBasicTest.cs
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/WebApiCompatShimParameterBindingTest.cs b/src/Mvc/test/Mvc.FunctionalTests/WebApiCompatShimParameterBindingTest.cs
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/WebApiCompatShimParameterBindingTest.cs
rename to src/Mvc/test/Mvc.FunctionalTests/WebApiCompatShimParameterBindingTest.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.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/RazorPageExecutionInstrumentationWebSite.Home.ViewWithPartial.html b/src/Mvc/test/Mvc.FunctionalTests/compiler/resources/RazorPageExecutionInstrumentationWebSite.Home.ViewWithPartial.html
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/RazorPageExecutionInstrumentationWebSite.Home.ViewWithPartial.html
rename to src/Mvc/test/Mvc.FunctionalTests/compiler/resources/RazorPageExecutionInstrumentationWebSite.Home.ViewWithPartial.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/Microsoft.AspNetCore.Mvc.Razor.Test/xunit.runner.json b/src/Mvc/test/Mvc.FunctionalTests/xunit.runner.json
similarity index 100%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.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/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 100%
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
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/Security/AuthSamples.sln b/src/Security/AuthSamples.sln
index 3c5d84be5e8fcd14657bf338314d33f48aed6838..d03f1b42b7757d83c0cafbdcf9aa398f8ca09845 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