diff --git a/Cargo.toml b/Cargo.toml
index cd88448d..b513a85a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [workspace]
 members = [
+    "modules/*",
     "core/rust/*",
-    "core/rust.*",
     "services/rust.*"
 ]
 resolver = "2"
diff --git a/core/rust.bot_modules.core/Cargo.lock b/modules/rust.bot_modules.core/Cargo.lock
similarity index 100%
rename from core/rust.bot_modules.core/Cargo.lock
rename to modules/rust.bot_modules.core/Cargo.lock
diff --git a/core/rust.bot_modules.core/Cargo.toml b/modules/rust.bot_modules.core/Cargo.toml
similarity index 65%
rename from core/rust.bot_modules.core/Cargo.toml
rename to modules/rust.bot_modules.core/Cargo.toml
index 9a82055e..08523eb7 100644
--- a/core/rust.bot_modules.core/Cargo.toml
+++ b/modules/rust.bot_modules.core/Cargo.toml
@@ -15,16 +15,16 @@ serde_json = "1.0"
 indexmap = { version = "2", features = ["serde"] }
 
 # Anti-Raid specific
-silverpelt = { path = "../rust/rust.silverpelt" }
-permissions = { path = "../rust/rust.permissions" }
-permission_checks = { path = "../rust/rust.permissions.checks" }
-config = { path = "../rust/rust.config" }
-sandwich_driver = { path = "../rust/rust.sandwich_driver" }
+silverpelt = { path = "../../core/rust/rust.silverpelt" }
+permissions = { path = "../../core/rust/rust.permissions" }
+permission_checks = { path = "../../core/rust/rust.permissions.checks" }
+config = { path = "../../core/rust/rust.config" }
+sandwich_driver = { path = "../../core/rust/rust.sandwich_driver" }
 rust_buildstats = { path = "../rust.buildstats" }
-ar_settings = { path = "../rust/rust.settings" }
-splashcore_rs = { path = "../rust/rust.std" }
-templating = { path = "../rust/rust.templating" }
-gwevent = { path = "../rust/rust.gwevent" }
+ar_settings = { path = "../../core/rust/rust.settings" }
+splashcore_rs = { path = "../../core/rust/rust.std" }
+templating = { path = "../../core/rust/rust.templating" }
+gwevent = { path = "../../core/rust/rust.gwevent" }
 log = "0.4"
 
 [dependencies.serenity]
diff --git a/core/rust.bot_modules.core/src/commands.rs b/modules/rust.bot_modules.core/src/commands.rs
similarity index 100%
rename from core/rust.bot_modules.core/src/commands.rs
rename to modules/rust.bot_modules.core/src/commands.rs
diff --git a/core/rust.bot_modules.core/src/events.rs b/modules/rust.bot_modules.core/src/events.rs
similarity index 100%
rename from core/rust.bot_modules.core/src/events.rs
rename to modules/rust.bot_modules.core/src/events.rs
diff --git a/core/rust.bot_modules.core/src/help.rs b/modules/rust.bot_modules.core/src/help.rs
similarity index 100%
rename from core/rust.bot_modules.core/src/help.rs
rename to modules/rust.bot_modules.core/src/help.rs
diff --git a/core/rust.bot_modules.core/src/lib.rs b/modules/rust.bot_modules.core/src/lib.rs
similarity index 100%
rename from core/rust.bot_modules.core/src/lib.rs
rename to modules/rust.bot_modules.core/src/lib.rs
diff --git a/core/rust.bot_modules.core/src/modules.rs b/modules/rust.bot_modules.core/src/modules.rs
similarity index 100%
rename from core/rust.bot_modules.core/src/modules.rs
rename to modules/rust.bot_modules.core/src/modules.rs
diff --git a/core/rust.bot_modules.core/src/ping.rs b/modules/rust.bot_modules.core/src/ping.rs
similarity index 100%
rename from core/rust.bot_modules.core/src/ping.rs
rename to modules/rust.bot_modules.core/src/ping.rs
diff --git a/core/rust.bot_modules.core/src/settings.rs b/modules/rust.bot_modules.core/src/settings.rs
similarity index 100%
rename from core/rust.bot_modules.core/src/settings.rs
rename to modules/rust.bot_modules.core/src/settings.rs
diff --git a/core/rust.bot_modules.core/src/stats.rs b/modules/rust.bot_modules.core/src/stats.rs
similarity index 100%
rename from core/rust.bot_modules.core/src/stats.rs
rename to modules/rust.bot_modules.core/src/stats.rs
diff --git a/core/rust.bot_modules.core/src/tasks.rs b/modules/rust.bot_modules.core/src/tasks.rs
similarity index 100%
rename from core/rust.bot_modules.core/src/tasks.rs
rename to modules/rust.bot_modules.core/src/tasks.rs
diff --git a/core/rust.bot_modules.core/src/web.rs b/modules/rust.bot_modules.core/src/web.rs
similarity index 100%
rename from core/rust.bot_modules.core/src/web.rs
rename to modules/rust.bot_modules.core/src/web.rs
diff --git a/core/rust.bot_modules.core/src/whois.rs b/modules/rust.bot_modules.core/src/whois.rs
similarity index 100%
rename from core/rust.bot_modules.core/src/whois.rs
rename to modules/rust.bot_modules.core/src/whois.rs
diff --git a/core/rust.bot_modules.lockdown/Cargo.lock b/modules/rust.bot_modules.lockdown/Cargo.lock
similarity index 100%
rename from core/rust.bot_modules.lockdown/Cargo.lock
rename to modules/rust.bot_modules.lockdown/Cargo.lock
diff --git a/core/rust.bot_modules.lockdown/Cargo.toml b/modules/rust.bot_modules.lockdown/Cargo.toml
similarity index 76%
rename from core/rust.bot_modules.lockdown/Cargo.toml
rename to modules/rust.bot_modules.lockdown/Cargo.toml
index 97e88a5a..fa8eab33 100644
--- a/core/rust.bot_modules.lockdown/Cargo.toml
+++ b/modules/rust.bot_modules.lockdown/Cargo.toml
@@ -14,11 +14,11 @@ indexmap = { version = "2", features = ["serde"] }
 async-trait = "0.1.80"
 
 # Anti-Raid specific
-silverpelt = { path = "../rust/rust.silverpelt" }
-splashcore_rs = { path = "../rust/rust.std" }
-ar_settings = { path = "../rust/rust.settings" }
-lockdowns = { path = "../rust/rust.lockdowns" }
-permission_checks = { path = "../rust/rust.permissions.checks" }
+silverpelt = { path = "../../core/rust/rust.silverpelt" }
+splashcore_rs = { path = "../../core/rust/rust.std" }
+ar_settings = { path = "../../core/rust/rust.settings" }
+lockdowns = { path = "../../core/rust/rust.lockdowns" }
+permission_checks = { path = "../../core/rust/rust.permissions.checks" }
 
 [dependencies.serenity]
 git = "https://github.com/Anti-Raid/serenity"
diff --git a/core/rust.bot_modules.lockdown/src/cmds.rs b/modules/rust.bot_modules.lockdown/src/cmds.rs
similarity index 100%
rename from core/rust.bot_modules.lockdown/src/cmds.rs
rename to modules/rust.bot_modules.lockdown/src/cmds.rs
diff --git a/core/rust.bot_modules.lockdown/src/lib.rs b/modules/rust.bot_modules.lockdown/src/lib.rs
similarity index 100%
rename from core/rust.bot_modules.lockdown/src/lib.rs
rename to modules/rust.bot_modules.lockdown/src/lib.rs
diff --git a/core/rust.bot_modules.lockdown/src/settings.rs b/modules/rust.bot_modules.lockdown/src/settings.rs
similarity index 100%
rename from core/rust.bot_modules.lockdown/src/settings.rs
rename to modules/rust.bot_modules.lockdown/src/settings.rs
diff --git a/core/rust.bot_modules.moderation/Cargo.lock b/modules/rust.bot_modules.moderation/Cargo.lock
similarity index 100%
rename from core/rust.bot_modules.moderation/Cargo.lock
rename to modules/rust.bot_modules.moderation/Cargo.lock
diff --git a/core/rust.bot_modules.moderation/Cargo.toml b/modules/rust.bot_modules.moderation/Cargo.toml
similarity index 64%
rename from core/rust.bot_modules.moderation/Cargo.toml
rename to modules/rust.bot_modules.moderation/Cargo.toml
index 0e01f011..2e9f11c0 100644
--- a/core/rust.bot_modules.moderation/Cargo.toml
+++ b/modules/rust.bot_modules.moderation/Cargo.toml
@@ -13,12 +13,12 @@ indexmap = { version = "2", features = ["serde"] }
 futures-util = "0.3"
 
 # Anti-Raid specific
-splashcore_rs = { path = "../rust/rust.std" }
-silverpelt = { path = "../rust/rust.silverpelt" }
-permissions = { path = "../rust/rust.permissions" }
-config = { path = "../rust/rust.config" }
-sandwich_driver = { path = "../rust/rust.sandwich_driver" }
-jobserver = { path = "../rust/rust.jobserver" }
+splashcore_rs = { path = "../../core/rust/rust.std" }
+silverpelt = { path = "../../core/rust/rust.silverpelt" }
+permissions = { path = "../../core/rust/rust.permissions" }
+config = { path = "../../core/rust/rust.config" }
+sandwich_driver = { path = "../../core/rust/rust.sandwich_driver" }
+jobserver = { path = "../../core/rust/rust.jobserver" }
 
 [dependencies.serenity]
 git = "https://github.com/Anti-Raid/serenity"
diff --git a/core/rust.bot_modules.moderation/src/cmd.rs b/modules/rust.bot_modules.moderation/src/cmd.rs
similarity index 100%
rename from core/rust.bot_modules.moderation/src/cmd.rs
rename to modules/rust.bot_modules.moderation/src/cmd.rs
diff --git a/core/rust.bot_modules.moderation/src/lib.rs b/modules/rust.bot_modules.moderation/src/lib.rs
similarity index 100%
rename from core/rust.bot_modules.moderation/src/lib.rs
rename to modules/rust.bot_modules.moderation/src/lib.rs
diff --git a/core/rust.bot_modules.server_backups/Cargo.lock b/modules/rust.bot_modules.server_backups/Cargo.lock
similarity index 100%
rename from core/rust.bot_modules.server_backups/Cargo.lock
rename to modules/rust.bot_modules.server_backups/Cargo.lock
diff --git a/core/rust.bot_modules.server_backups/Cargo.toml b/modules/rust.bot_modules.server_backups/Cargo.toml
similarity index 69%
rename from core/rust.bot_modules.server_backups/Cargo.toml
rename to modules/rust.bot_modules.server_backups/Cargo.toml
index 6a627956..dc7c6489 100644
--- a/core/rust.bot_modules.server_backups/Cargo.toml
+++ b/modules/rust.bot_modules.server_backups/Cargo.toml
@@ -14,11 +14,11 @@ futures-util = "0.3"
 indexmap = { version = "2", features = ["serde"] }
 
 # Anti-Raid specific
-silverpelt = { path = "../rust/rust.silverpelt" }
-permission_checks = { path = "../rust/rust.permissions.checks" }
-splashcore_rs = { path = "../rust/rust.std" }
-config = { path = "../rust/rust.config" }
-jobserver = { path = "../rust/rust.jobserver" }
+silverpelt = { path = "../../core/rust/rust.silverpelt" }
+permission_checks = { path = "../../core/rust/rust.permissions.checks" }
+splashcore_rs = { path = "../../core/rust/rust.std" }
+config = { path = "../../core/rust/rust.config" }
+jobserver = { path = "../../core/rust/rust.jobserver" }
 
 [dependencies.serenity]
 git = "https://github.com/Anti-Raid/serenity"
diff --git a/core/rust.bot_modules.server_backups/src/cmds.rs b/modules/rust.bot_modules.server_backups/src/cmds.rs
similarity index 100%
rename from core/rust.bot_modules.server_backups/src/cmds.rs
rename to modules/rust.bot_modules.server_backups/src/cmds.rs
diff --git a/core/rust.bot_modules.server_backups/src/lib.rs b/modules/rust.bot_modules.server_backups/src/lib.rs
similarity index 100%
rename from core/rust.bot_modules.server_backups/src/lib.rs
rename to modules/rust.bot_modules.server_backups/src/lib.rs
diff --git a/core/rust.bot_modules.temporary_punishments/Cargo.lock b/modules/rust.bot_modules.temporary_punishments/Cargo.lock
similarity index 100%
rename from core/rust.bot_modules.temporary_punishments/Cargo.lock
rename to modules/rust.bot_modules.temporary_punishments/Cargo.lock
diff --git a/core/rust.bot_modules.temporary_punishments/Cargo.toml b/modules/rust.bot_modules.temporary_punishments/Cargo.toml
similarity index 71%
rename from core/rust.bot_modules.temporary_punishments/Cargo.toml
rename to modules/rust.bot_modules.temporary_punishments/Cargo.toml
index cde13ca7..0ab6c9a1 100644
--- a/core/rust.bot_modules.temporary_punishments/Cargo.toml
+++ b/modules/rust.bot_modules.temporary_punishments/Cargo.toml
@@ -6,9 +6,9 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-silverpelt = { path = "../rust/rust.silverpelt" }
-sandwich_driver = { path = "../rust/rust.sandwich_driver" }
-splashcore_rs = { path = "../rust/rust.std" }
+silverpelt = { path = "../../core/rust/rust.silverpelt" }
+sandwich_driver = { path = "../../core/rust/rust.sandwich_driver" }
+splashcore_rs = { path = "../../core/rust/rust.std" }
 async-trait = "0.1.80"
 
 [dependencies.serenity]
diff --git a/core/rust.bot_modules.temporary_punishments/src/events.rs b/modules/rust.bot_modules.temporary_punishments/src/events.rs
similarity index 100%
rename from core/rust.bot_modules.temporary_punishments/src/events.rs
rename to modules/rust.bot_modules.temporary_punishments/src/events.rs
diff --git a/core/rust.bot_modules.temporary_punishments/src/lib.rs b/modules/rust.bot_modules.temporary_punishments/src/lib.rs
similarity index 100%
rename from core/rust.bot_modules.temporary_punishments/src/lib.rs
rename to modules/rust.bot_modules.temporary_punishments/src/lib.rs
diff --git a/core/rust.bot_modules_default/Cargo.lock b/modules/rust.bot_modules_default/Cargo.lock
similarity index 100%
rename from core/rust.bot_modules_default/Cargo.lock
rename to modules/rust.bot_modules_default/Cargo.lock
diff --git a/core/rust.bot_modules_default/Cargo.toml b/modules/rust.bot_modules_default/Cargo.toml
similarity index 91%
rename from core/rust.bot_modules_default/Cargo.toml
rename to modules/rust.bot_modules_default/Cargo.toml
index 3dbf910f..de0a00ca 100644
--- a/core/rust.bot_modules_default/Cargo.toml
+++ b/modules/rust.bot_modules_default/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-silverpelt = { path = "../rust/rust.silverpelt" }
+silverpelt = { path = "../../core/rust/rust.silverpelt" }
 
 # Modules
 bot_modules_core = { path = "../rust.bot_modules.core" }
diff --git a/core/rust.bot_modules_default/src/lib.rs b/modules/rust.bot_modules_default/src/lib.rs
similarity index 100%
rename from core/rust.bot_modules_default/src/lib.rs
rename to modules/rust.bot_modules_default/src/lib.rs
diff --git a/core/rust.buildstats/Cargo.lock b/modules/rust.buildstats/Cargo.lock
similarity index 100%
rename from core/rust.buildstats/Cargo.lock
rename to modules/rust.buildstats/Cargo.lock
diff --git a/core/rust.buildstats/Cargo.toml b/modules/rust.buildstats/Cargo.toml
similarity index 100%
rename from core/rust.buildstats/Cargo.toml
rename to modules/rust.buildstats/Cargo.toml
diff --git a/core/rust.buildstats/build.rs b/modules/rust.buildstats/build.rs
similarity index 100%
rename from core/rust.buildstats/build.rs
rename to modules/rust.buildstats/build.rs
diff --git a/core/rust.buildstats/src/lib.rs b/modules/rust.buildstats/src/lib.rs
similarity index 100%
rename from core/rust.buildstats/src/lib.rs
rename to modules/rust.buildstats/src/lib.rs
diff --git a/services/rust.assetgen/Cargo.toml b/services/rust.assetgen/Cargo.toml
index ae9138d3..c061131c 100644
--- a/services/rust.assetgen/Cargo.toml
+++ b/services/rust.assetgen/Cargo.toml
@@ -22,7 +22,7 @@ permissions = { path = "../../core/rust/rust.permissions" }
 silverpelt = { path = "../../core/rust/rust.silverpelt" }
 templating = { path = "../../core/rust/rust.templating" }
 templating_docgen = { path = "../../core/rust/rust.templating.docgen" }
-bot_modules_default = { path = "../../core/rust.bot_modules_default" }
+bot_modules_default = { path = "../../modules/rust.bot_modules_default" }
 bot_binutils = { path = "../../core/rust/rust.binutils" }
 
 [dependencies.tokio]
diff --git a/services/rust.bot/Cargo.toml b/services/rust.bot/Cargo.toml
index f7e724c2..491e8ca5 100644
--- a/services/rust.bot/Cargo.toml
+++ b/services/rust.bot/Cargo.toml
@@ -16,7 +16,7 @@ async-trait = "0.1.80"
 clap = { version = "4.5.16", features = ["derive"] }
 
 # Modules
-bot_modules_default = { path = "../../core/rust.bot_modules_default" }
+bot_modules_default = { path = "../../modules/rust.bot_modules_default" }
 bot_binutils = { path = "../../core/rust/rust.binutils" }
 rust_rpc_server = { path = "../../core/rust/rust.rpc_server" }
 rust_rpc_server_bot = { path = "../../core/rust/rust.rpc_server.bot" }