diff --git a/.gitmodules b/.gitmodules
index 85cdacf..aaa19b0 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,24 +1,24 @@
 [submodule "twitch_fetcher"]
-	path = twitch_fetcher
+	path = twba.fetcher
 	url = git@github.com:OMGeeky/twba.twitch_fetcher.git
 [submodule "twitch_splitter"]
-	path = twitch_splitter
+	path = twba.splitter
 	url = git@github.com:OMGeeky/twba.splitter.git
 [submodule "twba_reqwest_backoff"]
-	path = twba_reqwest_backoff
+	path = twba.reqwest_backoff
 	url = git@github.com:OMGeeky/twba_reqwest_backoff.git
 [submodule "twba.uploader"]
 	path = twba.uploader
 	url = git@github.com:OMGeeky/twba.uploader.git
 [submodule "twitch_backup.local_db"]
-	path = twitch_backup.local_db
+	path = twba.local_db
 	url = git@github.com:OMGeeky/twitch_backup.local_db.git
 [submodule "twitch_data"]
 	path = twitch_data
 	url = git@github.com:OMGeeky/twitch_data.git
 [submodule "twba_downloader"]
-	path = twba_downloader
+	path = twba.downloader
 	url = git@github.com:OMGeeky/twba_downloader.git
-[submodule "downloader_config"]
-	path = downloader_config
-	url = git@github.com:OMGeeky/downloader_config.git
+[submodule "twba.backup_config"]
+	path = twba.backup_config
+	url = git@github.com:OMGeeky/backup_config.git
diff --git a/downloader_config b/downloader_config
deleted file mode 160000
index 48069a2..0000000
--- a/downloader_config
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 48069a2d27847e54b6e3d4ca0d71099409191d99
diff --git a/twba.backup_config b/twba.backup_config
new file mode 160000
index 0000000..8864594
--- /dev/null
+++ b/twba.backup_config
@@ -0,0 +1 @@
+Subproject commit 88645945830d3076478827503fef43541a2f047e
diff --git a/twba_downloader b/twba.downloader
similarity index 100%
rename from twba_downloader
rename to twba.downloader
diff --git a/twitch_fetcher b/twba.fetcher
similarity index 100%
rename from twitch_fetcher
rename to twba.fetcher
diff --git a/twitch_backup.local_db b/twba.local_db
similarity index 100%
rename from twitch_backup.local_db
rename to twba.local_db
diff --git a/twba_reqwest_backoff b/twba.reqwest_backoff
similarity index 100%
rename from twba_reqwest_backoff
rename to twba.reqwest_backoff
diff --git a/twitch_splitter b/twba.splitter
similarity index 100%
rename from twitch_splitter
rename to twba.splitter