diff --git a/.gitmodules b/.gitmodules
index 48e94c61ff..f09f343859 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,3 @@
-[submodule "modules/AADIntegration"]
-	path = modules/AADIntegration
-	url = https://github.com/aspnet/AADIntegration.git
-	branch = master
 [submodule "modules/Antiforgery"]
 	path = modules/Antiforgery
 	url = https://github.com/aspnet/Antiforgery.git
@@ -26,18 +22,10 @@
 	path = modules/Identity
 	url = https://github.com/aspnet/Identity.git
 	branch = master
-[submodule "modules/JavaScriptServices"]
-	path = modules/JavaScriptServices
-	url = https://github.com/aspnet/JavaScriptServices.git
-	branch = master
 [submodule "modules/Localization"]
 	path = modules/Localization
 	url = https://github.com/aspnet/Localization.git
 	branch = master
-[submodule "modules/MetaPackages"]
-	path = modules/MetaPackages
-	url = https://github.com/aspnet/MetaPackages.git
-	branch = master
 [submodule "modules/Mvc"]
 	path = modules/Mvc
 	url = https://github.com/aspnet/Mvc.git
diff --git a/build/buildorder.props b/build/buildorder.props
index 67292ceaaa..a5b02ee40a 100644
--- a/build/buildorder.props
+++ b/build/buildorder.props
@@ -21,11 +21,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="AzureIntegration" Order="15" RootPath="$(RepositoryRoot)src\AzureIntegration\" />
     <RepositoryBuildOrder Include="MusicStore" Order="16" RootPath="$(RepositoryRoot)src\MusicStore\" />
     <RepositoryBuildOrder Include="SignalR" Order="16" />
diff --git a/build/submodules.props b/build/submodules.props
index 952f0e5255..6e20356d31 100644
--- a/build/submodules.props
+++ b/build/submodules.props
@@ -36,7 +36,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Repository Include="AADIntegration" />
+    <Repository Include="AADIntegration" RootPath="$(RepositoryRoot)src\AADIntegration\" />
     <Repository Include="Antiforgery" />
     <Repository Include="AzureIntegration" RootPath="$(RepositoryRoot)src\AzureIntegration\" />
     <Repository Include="BasicMiddleware" />
@@ -45,9 +45,9 @@
     <Repository Include="HttpSysServer" />
     <Repository Include="Identity" />
     <Repository Include="IISIntegration" RootPath="$(RepositoryRoot)src\IISIntegration\" />
-    <Repository Include="JavaScriptServices" />
+    <Repository Include="JavaScriptServices" RootPath="$(RepositoryRoot)src\JavaScriptServices\" />
     <Repository Include="Localization" />
-    <Repository Include="MetaPackages" PatchPolicy="CascadeVersions" />
+    <Repository Include="MetaPackages" RootPath="$(RepositoryRoot)src\MetaPackages\" PatchPolicy="CascadeVersions" />
     <Repository Include="Mvc" />
     <Repository Include="Razor" />
     <Repository Include="ResponseCaching" />
diff --git a/modules/AADIntegration b/modules/AADIntegration
deleted file mode 160000
index 3c282a4f5a..0000000000
--- a/modules/AADIntegration
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 3c282a4f5af2601166d976261d8b862994694c81
diff --git a/modules/JavaScriptServices b/modules/JavaScriptServices
deleted file mode 160000
index e657e7d79a..0000000000
--- a/modules/JavaScriptServices
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e657e7d79aa11ced73a0a2e0f4d3fbbb609ca507
diff --git a/modules/MetaPackages b/modules/MetaPackages
deleted file mode 160000
index d417aacd7c..0000000000
--- a/modules/MetaPackages
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d417aacd7c0eff202f7860fe1e686aa5beeedad7