diff --git a/.gitmodules b/.gitmodules
index 7623451119..b556710392 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -6,14 +6,6 @@
 	path = modules/Antiforgery
 	url = https://github.com/aspnet/Antiforgery.git
 	branch = master
-[submodule "modules/AuthSamples"]
-	path = modules/AuthSamples
-	url = https://github.com/aspnet/AuthSamples.git
-	branch = master
-[submodule "modules/AzureIntegration"]
-	path = modules/AzureIntegration
-	url = https://github.com/aspnet/AzureIntegration.git
-	branch = master
 [submodule "modules/BasicMiddleware"]
 	path = modules/BasicMiddleware
 	url = https://github.com/aspnet/BasicMiddleware.git
@@ -98,10 +90,6 @@
 	path = modules/StaticFiles
 	url = https://github.com/aspnet/StaticFiles.git
 	branch = master
-[submodule "modules/Templating"]
-	path = modules/Templating
-	url = https://github.com/aspnet/Templating.git
-	branch = master
 [submodule "src/IISIntegration/test/gtest/googletest"]
 	path = src/IISIntegration/test/gtest/googletest
 	url = https://github.com/google/googletest
diff --git a/build/buildorder.props b/build/buildorder.props
index 88db303dfe..d00e997bb8 100644
--- a/build/buildorder.props
+++ b/build/buildorder.props
@@ -29,10 +29,10 @@
     <RepositoryBuildOrder Include="AADIntegration" Order="15" />
     <RepositoryBuildOrder Include="Identity" Order="15" />
     <RepositoryBuildOrder Include="JavaScriptServices" Order="15" />
-    <RepositoryBuildOrder Include="AzureIntegration" Order="15" />
+    <RepositoryBuildOrder Include="AzureIntegration" Order="15" RootPath="$(RepositoryRoot)src\AzureIntegration\" />
     <RepositoryBuildOrder Include="MusicStore" Order="16" />
     <RepositoryBuildOrder Include="SignalR" Order="16" />
-    <RepositoryBuildOrder Include="AuthSamples" Order="16" />
-    <RepositoryBuildOrder Include="Templating" Order="17" />
+    <RepositoryBuildOrder Include="AuthSamples" Order="16" RootPath="$(RepositoryRoot)src\AuthSamples\" />
+    <RepositoryBuildOrder Include="Templating" Order="17" RootPath="$(RepositoryRoot)src\Templating\" />
   </ItemGroup>
 </Project>
diff --git a/build/submodules.props b/build/submodules.props
index f10ee25d3c..1b84d934ba 100644
--- a/build/submodules.props
+++ b/build/submodules.props
@@ -38,7 +38,7 @@
   <ItemGroup>
     <Repository Include="AADIntegration" />
     <Repository Include="Antiforgery" />
-    <Repository Include="AzureIntegration" />
+    <Repository Include="AzureIntegration" RootPath="$(RepositoryRoot)src\AzureIntegration\" />
     <Repository Include="BasicMiddleware" />
     <Repository Include="CORS" />
     <Repository Include="Diagnostics" />
@@ -59,10 +59,10 @@
     <Repository Include="Session" />
     <Repository Include="SignalR" />
     <Repository Include="StaticFiles" />
-    <Repository Include="Templating" PatchPolicy="AlwaysUpdateAndCascadeVersions" />
+    <Repository Include="Templating" RootPath="$(RepositoryRoot)src\Templating\" PatchPolicy="AlwaysUpdateAndCascadeVersions" />
 
     <!-- Test-only repos -->
-    <Repository Include="AuthSamples" PatchPolicy="AlwaysUpdateAndCascadeVersions" />
+    <Repository Include="AuthSamples" RootPath="$(RepositoryRoot)src\AuthSamples\" PatchPolicy="AlwaysUpdateAndCascadeVersions" />
     <Repository Include="MusicStore" PatchPolicy="AlwaysUpdateAndCascadeVersions" />
     <Repository Include="ServerTests" PatchPolicy="AlwaysUpdateAndCascadeVersions" />
   </ItemGroup>
diff --git a/modules/AuthSamples b/modules/AuthSamples
deleted file mode 160000
index 906f316d2b..0000000000
--- a/modules/AuthSamples
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 906f316d2bef72ae9142dff54e41e7970a623822
diff --git a/modules/AzureIntegration b/modules/AzureIntegration
deleted file mode 160000
index 75e3133cdb..0000000000
--- a/modules/AzureIntegration
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 75e3133cdb13f7a4e9779c0640bbd7c05296771c
diff --git a/modules/Templating b/modules/Templating
deleted file mode 160000
index 0af2acd6ff..0000000000
--- a/modules/Templating
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0af2acd6fff0f51ec42183f5a5b01f8f0712af5f