diff --git a/.gitmodules b/.gitmodules
index 1470da1..b8aa717 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,75 +1,49 @@
-[submodule "fosscord/api"]
-	path = api
-	url = https://github.com/fosscord/fosscord-api
-[submodule "fosscord/gateway"]
-	path = gateway
-	url = https://github.com/fosscord/fosscord-gateway
-[submodule "fosscord/themes"]
-	path = themes
-	url = https://github.com/fosscord/fosscord-themes
-[submodule "fosscord/plugins"]
-	path = plugins
-	url = https://github.com/fosscord/fosscord-plugins
-[submodule "fosscord/media"]
-	path = media
-	url = https://github.com/fosscord/fosscord-media
-[submodule "fosscord/server-util"]
-	path = server-util
-	url = https://github.com/fosscord/fosscord-server-util
-[submodule "fosscord/cdn"]
-	path = cdn
-	url = https://github.com/fosscord/fosscord-cdn
-[submodule "fosscord/ui"]
-	path = ui
-	url = https://github.com/fosscord/fosscord-ui
-[submodule "fosscord/client"]
-	path = client
-	url = https://github.com/fosscord/fosscord-client
-[submodule "fosscord/dashboard"]
-	path = dashboard
-	url = https://github.com/fosscord/fosscord-dashboard
-[submodule "fosscord/support"]
-	path = support
-	url = https://github.com/fosscord/fosscord-support
-[submodule "fosscord/landingpage"]
-	path = landingpage
-	url = https://github.com/fosscord/fosscord-landingpage
 [submodule "docs"]
-	path = docs
 	url = https://github.com/fosscord/fosscord-docs
 	branch = master
 [submodule "fosscord.js"]
-	path = fosscord.js
 	url = https://github.com/fosscord/fosscord.js/
+	branch = master
 [submodule "collection"]
 	path = collection
 	url = https://github.com/fosscord/fosscord.js-collection
 	branch = master
 [submodule "api"]
+	url = https://github.com/fosscord/fosscord-api
 	branch = master
 [submodule "cdn"]
+	url = https://github.com/fosscord/fosscord-cdn
 	branch = master
 [submodule "client"]
+	url = https://github.com/fosscord/fosscord-client
 	branch = master
 [submodule "dashboard"]
+	url = https://github.com/fosscord/fosscord-dashboard
 	branch = master
 [submodule "gateway"]
+	url = https://github.com/fosscord/fosscord-gateway
 	branch = master
 [submodule "landingpage"]
-	branch = master
-[submodule "media"]
+	url = https://github.com/fosscord/fosscord-landingpage
 	branch = master
 [submodule "plugins"]
+	url = https://github.com/fosscord/fosscord-plugins
 	branch = master
 [submodule "server-util"]
+	url = https://github.com/fosscord/fosscord-server-util
 	branch = master
 [submodule "support"]
+	url = https://github.com/fosscord/fosscord-support
 	branch = master
 [submodule "themes"]
+	url = https://github.com/fosscord/fosscord-themes
 	branch = master
 [submodule "ui"]
+	url = https://github.com/fosscord/fosscord-ui
 	branch = master
 [submodule "voice-gateway"]
+	url = https://github.com/fosscord/fosscord-voice-gateway
 	branch = master
 [submodule "rtc"]
+	url = https://github.com/fosscord/fosscord-rtc
 	branch = master