diff --git a/.gitmodules b/.gitmodules
index 7ed88e70d1..6f499e11ac 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -14,23 +14,7 @@
 	path = modules/Localization
 	url = https://github.com/aspnet/Localization.git
 	branch = release/2.1
-[submodule "modules/Mvc"]
-	path = modules/Mvc
-	url = https://github.com/aspnet/Mvc.git
-	branch = release/2.1
-[submodule "modules/MvcPrecompilation"]
-	path = modules/MvcPrecompilation
-	url = https://github.com/aspnet/MvcPrecompilation.git
-	branch = release/2.1
-[submodule "modules/Razor"]
-	path = modules/Razor
-	url = https://github.com/aspnet/Razor.git
-	branch = release/2.1
 [submodule "modules/Scaffolding"]
 	path = modules/Scaffolding
 	url = https://github.com/aspnet/Scaffolding.git
 	branch = release/2.1
-[submodule "modules/SignalR"]
-	path = modules/SignalR
-	url = https://github.com/aspnet/SignalR.git
-	branch = release/2.1
diff --git a/build/buildorder.props b/build/buildorder.props
index a72614523e..5c986b99ca 100644
--- a/build/buildorder.props
+++ b/build/buildorder.props
@@ -7,7 +7,7 @@
   </ItemDefinitionGroup>
 
   <ItemGroup>
-    <RepositoryBuildOrder Include="Razor" Order="6" />
+    <RepositoryBuildOrder Include="Razor" Order="6" RootPath="$(RepositoryRoot)src\Razor\" />
     <RepositoryBuildOrder Include="EntityFrameworkCore" Order="8" />
     <RepositoryBuildOrder Include="HttpSysServer" Order="8" RootPath="$(RepositoryRoot)src\HttpSysServer\" />
     <RepositoryBuildOrder Include="BasicMiddleware" Order="9" />
@@ -22,15 +22,15 @@
     <RepositoryBuildOrder Include="Localization" Order="12" />
     <RepositoryBuildOrder Include="Security" Order="13" RootPath="$(RepositoryRoot)src\Security\" />
     <RepositoryBuildOrder Include="MetaPackages" Order="13" RootPath="$(RepositoryRoot)src\MetaPackages\" />
-    <RepositoryBuildOrder Include="Mvc" Order="14" />
+    <RepositoryBuildOrder Include="Mvc" Order="14" RootPath="$(RepositoryRoot)src\Mvc\" />
     <RepositoryBuildOrder Include="AADIntegration" Order="15" RootPath="$(RepositoryRoot)src\AADIntegration\" />
     <RepositoryBuildOrder Include="Identity" Order="15" />
     <RepositoryBuildOrder Include="JavaScriptServices" Order="15" RootPath="$(RepositoryRoot)src\JavaScriptServices\" />
-    <RepositoryBuildOrder Include="MvcPrecompilation" Order="15" />
+    <RepositoryBuildOrder Include="MvcPrecompilation" Order="15" RootPath="$(RepositoryRoot)src\MvcPrecompilation\" />
     <RepositoryBuildOrder Include="Scaffolding" Order="15" />
     <RepositoryBuildOrder Include="AzureIntegration" Order="15" RootPath="$(RepositoryRoot)src\AzureIntegration\" />
     <RepositoryBuildOrder Include="MusicStore" Order="16" RootPath="$(RepositoryRoot)src\MusicStore\" />
-    <RepositoryBuildOrder Include="SignalR" Order="16" />
+    <RepositoryBuildOrder Include="SignalR" Order="16" RootPath="$(RepositoryRoot)src\SignalR\" />
     <RepositoryBuildOrder Include="AuthSamples" Order="16" RootPath="$(RepositoryRoot)src\AuthSamples\" />
     <RepositoryBuildOrder Include="Templating" Order="17" RootPath="$(RepositoryRoot)src\Templating\" />
   </ItemGroup>
diff --git a/build/submodules.props b/build/submodules.props
index 589d3f65d8..926dd6cc07 100644
--- a/build/submodules.props
+++ b/build/submodules.props
@@ -59,14 +59,14 @@
     <ShippedRepository Include="JavaScriptServices" RootPath="$(RepositoryRoot)src\JavaScriptServices\" />
     <ShippedRepository Include="JsonPatch" />
     <ShippedRepository Include="Localization" />
-    <ShippedRepository Include="Mvc" />
-    <ShippedRepository Include="MvcPrecompilation" />
-    <ShippedRepository Include="Razor" />
+    <ShippedRepository Include="Mvc" RootPath="$(RepositoryRoot)src\Mvc\" />
+    <ShippedRepository Include="MvcPrecompilation" RootPath="$(RepositoryRoot)src\MvcPrecompilation\"/>
+    <ShippedRepository Include="Razor" RootPath="$(RepositoryRoot)src\Razor\" />
     <ShippedRepository Include="ResponseCaching" RootPath="$(RepositoryRoot)src\ResponseCaching\" />
     <ShippedRepository Include="Routing" RootPath="$(RepositoryRoot)src\Routing\" />
     <ShippedRepository Include="Security" RootPath="$(RepositoryRoot)src\Security\" />
     <ShippedRepository Include="Session" RootPath="$(RepositoryRoot)src\Session\" />
-    <ShippedRepository Include="SignalR" />
+    <ShippedRepository Include="SignalR" RootPath="$(RepositoryRoot)src\SignalR\" />
     <ShippedRepository Include="StaticFiles" RootPath="$(RepositoryRoot)src\StaticFiles\" />
   </ItemGroup>
 </Project>
diff --git a/modules/Mvc b/modules/Mvc
deleted file mode 160000
index 5a4fd3e792..0000000000
--- a/modules/Mvc
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 5a4fd3e792e75619e3b1de069fabdf87d2cd0983
diff --git a/modules/MvcPrecompilation b/modules/MvcPrecompilation
deleted file mode 160000
index 617586a984..0000000000
--- a/modules/MvcPrecompilation
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 617586a984b1eff9ca0ca8126dd0b1dab2ea16f2
diff --git a/modules/Razor b/modules/Razor
deleted file mode 160000
index fd4572874e..0000000000
--- a/modules/Razor
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit fd4572874e41ca3af803b0b2c71955505dd4bde5
diff --git a/modules/SignalR b/modules/SignalR
deleted file mode 160000
index bc148a0724..0000000000
--- a/modules/SignalR
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit bc148a07244a451e48b7e0efdf16db8f69f788ff