diff --git a/.gitmodules b/.gitmodules
index f987e25..a3dfdb4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,10 +1,4 @@
-[submodule "argparse"]
-	path = third-party/argparse
-	url = https://github.com/cofyc/argparse
-[submodule "cJSON"]
-	path = third-party/cJSON
-	url = https://github.com/DaveGamble/cJSON
-[submodule "lib/onion"]
+[submodule "third-party/onion"]
 	path = third-party/onion
 	url = https://github.com/davidmoreno/onion
 [submodule "third-party/libscan"]
@@ -13,3 +7,6 @@
 [submodule "third-party/utf8.h"]
 	path = third-party/utf8.h
 	url = https://github.com/sheredom/utf8.h
+[submodule "third-party/argparse"]
+	path = third-party/argparse
+	url = https://github.com/cofyc/argparse
diff --git a/third-party/argparse b/third-party/argparse
new file mode 160000
index 0000000..4ed6099
--- /dev/null
+++ b/third-party/argparse
@@ -0,0 +1 @@
+Subproject commit 4ed6099cb33245b06343518b9f3c45ac56e8283c
diff --git a/third-party/onion b/third-party/onion
new file mode 160000
index 0000000..2b3b230
--- /dev/null
+++ b/third-party/onion
@@ -0,0 +1 @@
+Subproject commit 2b3b230b79ecae119b7eb847f2f9545a46bef13c
diff --git a/third-party/utf8.h b/third-party/utf8.h
new file mode 160000
index 0000000..b686b0c
--- /dev/null
+++ b/third-party/utf8.h
@@ -0,0 +1 @@
+Subproject commit b686b0c5181c2dd9f8297e6ac3692c9614b083be