diff --git a/.gitmodules b/.gitmodules
index 26d30c99b3488c547f4f028e6242a9021e59871b..1f31381c06eb37a64b75dc9099898a9e06ce5067 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,3 @@
-[submodule "modules/AADIntegration"]
-	path = modules/AADIntegration
-	url = https://github.com/aspnet/AADIntegration.git
-	branch = release/2.2
 [submodule "modules/Antiforgery"]
 	path = modules/Antiforgery
 	url = https://github.com/aspnet/Antiforgery.git
@@ -34,18 +30,10 @@
 	path = modules/Identity
 	url = https://github.com/aspnet/Identity.git
 	branch = release/2.2
-[submodule "modules/JavaScriptServices"]
-	path = modules/JavaScriptServices
-	url = https://github.com/aspnet/JavaScriptServices.git
-	branch = release/2.2
 [submodule "modules/Localization"]
 	path = modules/Localization
 	url = https://github.com/aspnet/Localization.git
 	branch = release/2.2
-[submodule "modules/MetaPackages"]
-	path = modules/MetaPackages
-	url = https://github.com/aspnet/MetaPackages.git
-	branch = release/2.2
 [submodule "modules/Mvc"]
 	path = modules/Mvc
 	url = https://github.com/aspnet/Mvc.git
diff --git a/build/buildorder.props b/build/buildorder.props
index 19d9365340cc8973ce09586a5a95ab573de08845..2827dec9ba459475baa58cdfcef3477171ad5c0c 100644
--- a/build/buildorder.props
+++ b/build/buildorder.props
@@ -23,11 +23,11 @@
     <RepositoryBuildOrder Include="Diagnostics" Order="12" />
     <RepositoryBuildOrder Include="Localization" Order="13" />
     <RepositoryBuildOrder Include="Security" Order="13" />
-    <RepositoryBuildOrder Include="MetaPackages" Order="13" />
+    <RepositoryBuildOrder Include="MetaPackages" Order="13" RootPath="$(RepositoryRoot)src\MetaPackages\" />
     <RepositoryBuildOrder Include="Mvc" Order="14" />
-    <RepositoryBuildOrder Include="AADIntegration" Order="15" />
+    <RepositoryBuildOrder Include="AADIntegration" Order="15" RootPath="$(RepositoryRoot)src\AADIntegration\" />
     <RepositoryBuildOrder Include="Identity" Order="15" />
-    <RepositoryBuildOrder Include="JavaScriptServices" Order="15" />
+    <RepositoryBuildOrder Include="JavaScriptServices" Order="15" RootPath="$(RepositoryRoot)src\JavaScriptServices\" />
     <RepositoryBuildOrder Include="MvcPrecompilation" Order="15" />
     <RepositoryBuildOrder Include="Scaffolding" Order="15" />
     <RepositoryBuildOrder Include="AzureIntegration" Order="15" RootPath="$(RepositoryRoot)src\AzureIntegration\" />
diff --git a/build/submodules.props b/build/submodules.props
index 48a9f0e58d78c86351ccf95846dfa58bc612844d..eef36d2df0adfe026d6aa88d219e54b3b634ed00 100644
--- a/build/submodules.props
+++ b/build/submodules.props
@@ -47,7 +47,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ShippedRepository Include="AADIntegration" />
+    <ShippedRepository Include="AADIntegration" RootPath="$(RepositoryRoot)src\AADIntegration\" />
     <ShippedRepository Include="Antiforgery" />
     <ShippedRepository Include="AzureIntegration" RootPath="$(RepositoryRoot)src\AzureIntegration\" />
     <ShippedRepository Include="BasicMiddleware" />
@@ -57,9 +57,9 @@
     <ShippedRepository Include="EntityFrameworkCore" />
     <ShippedRepository Include="HttpSysServer" />
     <ShippedRepository Include="Identity" />
-    <ShippedRepository Include="JavaScriptServices" />
+    <ShippedRepository Include="JavaScriptServices" RootPath="$(RepositoryRoot)src\JavaScriptServices\" />
     <ShippedRepository Include="Localization" />
-    <ShippedRepository Include="MetaPackages" PatchPolicy="CascadeVersions" />
+    <ShippedRepository Include="MetaPackages" RootPath="$(RepositoryRoot)src\MetaPackages\" PatchPolicy="CascadeVersions" />
     <ShippedRepository Include="Mvc" />
     <ShippedRepository Include="MvcPrecompilation" />
     <ShippedRepository Include="Razor" />
diff --git a/modules/AADIntegration b/modules/AADIntegration
deleted file mode 160000
index 0efa96de73e3235fbfc55cfe51d9547a693010cc..0000000000000000000000000000000000000000
--- a/modules/AADIntegration
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0efa96de73e3235fbfc55cfe51d9547a693010cc
diff --git a/modules/JavaScriptServices b/modules/JavaScriptServices
deleted file mode 160000
index 7819c2f95024e3b9bc4868b9c55f9ad00ec103f7..0000000000000000000000000000000000000000
--- a/modules/JavaScriptServices
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7819c2f95024e3b9bc4868b9c55f9ad00ec103f7
diff --git a/modules/MetaPackages b/modules/MetaPackages
deleted file mode 160000
index 27efce1042914569097d6c68db404e5286ad7b20..0000000000000000000000000000000000000000
--- a/modules/MetaPackages
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 27efce1042914569097d6c68db404e5286ad7b20