diff --git a/.gitmodules b/.gitmodules
index fa4eb43..dd5e744 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "clamavmirror"]
-	path = clamavmirror
+	path = modules/clamavmirror
 	url = https://github.com/akissa/clamavmirror
 [submodule "debmirror"]
-	path = debmirror
+	path = modules/debmirror
 	url = https://salsa.debian.org/debian/debmirror
diff --git a/docs/README.md b/docs/README.md
index fd13fe9..142da8c 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -30,20 +30,20 @@ needed. Note that not all required setup steps are listed here.
 
 > TODO: Add a proper setup guide.
 
-Filename               | Description
----                    | ---
-`syncrepo.sh`          | New all-in-one repository sync script
-`syncrepo.service`     | Systemd service unit for syncrepo script
-`syncrepo.timer`       | Systemd timer unit for syncrepo script
-`syncrepo-vhost.conf`  | Apache vhost config for repository
-`syncrepo-log.conf`    | Logrotate config file
-`rsyncd.conf`          | Rsync config for repository
-`rsyncd.service`       | Systemd service unit for rsyncd service
-`centos-local.repo`    | Centos package config for clients
-`debian-sources.list`  | Debian package sources for clients
-`ubuntu-sources.list`  | Ubuntu package sources for clients
-`debmirror/*`          | The [`debmirror`][debmirror] tool submodule
-`clamavmirror/*`       | The [`clamavmirror`][clamavmirror] tool submodule
+Filename                    | Description
+---                         | ---
+`src/syncrepo.sh`           | New all-in-one repository sync script
+`src/syncrepo.service`      | Systemd service unit for syncrepo script
+`src/syncrepo.timer`        | Systemd timer unit for syncrepo script
+`src/syncrepo-vhost.conf`   | Apache vhost config for repository
+`src/syncrepo-log.conf`     | Logrotate config file
+`src/rsyncd.conf`           | Rsync config for repository
+`src/rsyncd.service`        | Systemd service unit for rsyncd service
+`src/centos-local.repo`     | Centos package config for clients
+`src/debian-sources.list`   | Debian package sources for clients
+`src/ubuntu-sources.list`   | Ubuntu package sources for clients
+`modules/debmirror/`        | The [`debmirror`][debmirror] tool submodule
+`modules/clamavmirror/`     | The [`clamavmirror`][clamavmirror] tool submodule
 
 > **Note:** The `dev` branch is where the latest changes happen.
 > It's not guaranteed to be completely functional all the time.
diff --git a/clamavmirror b/modules/clamavmirror
similarity index 100%
rename from clamavmirror
rename to modules/clamavmirror
diff --git a/debmirror b/modules/debmirror
similarity index 100%
rename from debmirror
rename to modules/debmirror
diff --git a/centos-local.repo b/src/centos-local.repo
similarity index 100%
rename from centos-local.repo
rename to src/centos-local.repo
diff --git a/debian-sources.list b/src/debian-sources.list
similarity index 100%
rename from debian-sources.list
rename to src/debian-sources.list
diff --git a/rsyncd.conf b/src/rsyncd.conf
similarity index 100%
rename from rsyncd.conf
rename to src/rsyncd.conf
diff --git a/rsyncd.service b/src/rsyncd.service
similarity index 100%
rename from rsyncd.service
rename to src/rsyncd.service
diff --git a/syncrepo-log.conf b/src/syncrepo-log.conf
similarity index 100%
rename from syncrepo-log.conf
rename to src/syncrepo-log.conf
diff --git a/syncrepo-vhost.conf b/src/syncrepo-vhost.conf
similarity index 100%
rename from syncrepo-vhost.conf
rename to src/syncrepo-vhost.conf
diff --git a/syncrepo.service b/src/syncrepo.service
similarity index 100%
rename from syncrepo.service
rename to src/syncrepo.service
diff --git a/syncrepo.sh b/src/syncrepo.sh
similarity index 100%
rename from syncrepo.sh
rename to src/syncrepo.sh
diff --git a/syncrepo.timer b/src/syncrepo.timer
similarity index 100%
rename from syncrepo.timer
rename to src/syncrepo.timer
diff --git a/ubuntu-sources.list b/src/ubuntu-sources.list
similarity index 100%
rename from ubuntu-sources.list
rename to src/ubuntu-sources.list