diff --git a/.gitmodules b/.gitmodules
index f2cf422..489e67d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,19 +1,18 @@
-[submodule "include/commandline"]
-    path = include/commandline
+[submodule "deps/commandline"]
+    path = deps/commandline
     url = https://github.com/lionkor/commandline
-[submodule "asio"]
-	path = asio
+[submodule "deps/asio"]
+	path = deps/asio
 	url = https://github.com/chriskohlhoff/asio
-[submodule "rapidjson"]
-	path = rapidjson
+[submodule "deps/rapidjson"]
+	path = deps/rapidjson
 	url = https://github.com/Tencent/rapidjson
-[submodule "include/toml11"]
-	path = include/toml11
-	url = https://github.com/ToruNiina/toml11
-[submodule "include/sentry-native"]
-	path = include/sentry-native
+[submodule "deps/toml11"]
 	path = deps/toml11
-    url = https://github.com/ToruNiina/toml11
+	url = https://github.com/ToruNiina/toml11
+[submodule "deps/sentry-native"]
+	path = deps/sentry-native
+	url = https://github.com/getsentry/sentry-native
 [submodule "deps/sol2"]
-	path = deps/sol2
-	url = https://github.com/getsentry/sentry-native
\ No newline at end of file
+    path = deps/sol2
+    url = https://github.com/ThePhD/sol2
diff --git a/deps/toml11 b/deps/toml11
deleted file mode 160000
index 6473810..0000000
--- a/deps/toml11
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 647381020ef04b5d41d540ec489eba45e82d90a7
diff --git a/include/toml11 b/include/toml11
deleted file mode 160000
index 6473810..0000000
--- a/include/toml11
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 647381020ef04b5d41d540ec489eba45e82d90a7