diff --git a/.gitmodules b/.gitmodules
index c8eaaa43..30e01692 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -5,11 +5,11 @@
 # * Changes below may be lost in significant template updates.
 
 [submodule "template"]
-	path = template
+	path = submodules/template
 	url = https://github.com/blakeNaccarato/copier-python.git
 [submodule "typings"]
-	path = typings
+	path = submodules/typings
 	url = https://github.com/blakeNaccarato/pylance-stubs-unofficial.git
 [submodule "boilercore"]
-	path = boilercore
+	path = submodules/boilercore
 	url = https://github.com/blakeNaccarato/boilercore
diff --git a/boilercore b/boilercore
deleted file mode 160000
index 178d0cac..00000000
--- a/boilercore
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 178d0cac2fe3014a2b170d527b442f8fc34065de
diff --git a/submodules/boilercore b/submodules/boilercore
new file mode 160000
index 00000000..bb331983
--- /dev/null
+++ b/submodules/boilercore
@@ -0,0 +1 @@
+Subproject commit bb331983f66a6d37fd53b07f8cc0162d5f465d62
diff --git a/template b/submodules/template
similarity index 100%
rename from template
rename to submodules/template
diff --git a/submodules/typings b/submodules/typings
new file mode 160000
index 00000000..394873fa
--- /dev/null
+++ b/submodules/typings
@@ -0,0 +1 @@
+Subproject commit 394873fa3ab7fb8337390aab685495f922504737
diff --git a/typings b/typings
deleted file mode 160000
index 7b8fecdf..00000000
--- a/typings
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7b8fecdf6cb8f55ca7aca7e598bbd0b92581b879