diff --git a/Cargo.toml b/Cargo.toml
index f164d00a..6e10216c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,13 +1,6 @@
 [workspace]
 members = [
-    "./lib/libpk",
-    "./services/api",
-    "./services/dispatch",
-    "./services/gateway",
-    "./services/avatars",
-    "./services/scheduled_tasks",
-
-    "./lib/models",
+    "./crates/*"
 ]
 
 [workspace.dependencies]
diff --git a/services/api/Cargo.toml b/crates/api/Cargo.toml
similarity index 89%
rename from services/api/Cargo.toml
rename to crates/api/Cargo.toml
index 58f2944b..d2f883d7 100644
--- a/services/api/Cargo.toml
+++ b/crates/api/Cargo.toml
@@ -4,8 +4,8 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-pluralkit_models = { path = "../../lib/models" }
-libpk = { path = "../../lib/libpk" }
+pluralkit_models = { path = "../models" }
+libpk = { path = "../libpk" }
 
 anyhow = { workspace = true } 
 axum = { workspace = true }
diff --git a/services/api/src/endpoints/mod.rs b/crates/api/src/endpoints/mod.rs
similarity index 100%
rename from services/api/src/endpoints/mod.rs
rename to crates/api/src/endpoints/mod.rs
diff --git a/services/api/src/endpoints/private.rs b/crates/api/src/endpoints/private.rs
similarity index 100%
rename from services/api/src/endpoints/private.rs
rename to crates/api/src/endpoints/private.rs
diff --git a/services/api/src/error.rs b/crates/api/src/error.rs
similarity index 100%
rename from services/api/src/error.rs
rename to crates/api/src/error.rs
diff --git a/services/api/src/main.rs b/crates/api/src/main.rs
similarity index 100%
rename from services/api/src/main.rs
rename to crates/api/src/main.rs
diff --git a/services/api/src/middleware/authnz.rs b/crates/api/src/middleware/authnz.rs
similarity index 100%
rename from services/api/src/middleware/authnz.rs
rename to crates/api/src/middleware/authnz.rs
diff --git a/services/api/src/middleware/cors.rs b/crates/api/src/middleware/cors.rs
similarity index 100%
rename from services/api/src/middleware/cors.rs
rename to crates/api/src/middleware/cors.rs
diff --git a/services/api/src/middleware/ignore_invalid_routes.rs b/crates/api/src/middleware/ignore_invalid_routes.rs
similarity index 100%
rename from services/api/src/middleware/ignore_invalid_routes.rs
rename to crates/api/src/middleware/ignore_invalid_routes.rs
diff --git a/services/api/src/middleware/logger.rs b/crates/api/src/middleware/logger.rs
similarity index 100%
rename from services/api/src/middleware/logger.rs
rename to crates/api/src/middleware/logger.rs
diff --git a/services/api/src/middleware/mod.rs b/crates/api/src/middleware/mod.rs
similarity index 100%
rename from services/api/src/middleware/mod.rs
rename to crates/api/src/middleware/mod.rs
diff --git a/services/api/src/middleware/ratelimit.lua b/crates/api/src/middleware/ratelimit.lua
similarity index 100%
rename from services/api/src/middleware/ratelimit.lua
rename to crates/api/src/middleware/ratelimit.lua
diff --git a/services/api/src/middleware/ratelimit.rs b/crates/api/src/middleware/ratelimit.rs
similarity index 100%
rename from services/api/src/middleware/ratelimit.rs
rename to crates/api/src/middleware/ratelimit.rs
diff --git a/services/api/src/util.rs b/crates/api/src/util.rs
similarity index 100%
rename from services/api/src/util.rs
rename to crates/api/src/util.rs
diff --git a/services/avatars/Cargo.toml b/crates/avatars/Cargo.toml
similarity index 95%
rename from services/avatars/Cargo.toml
rename to crates/avatars/Cargo.toml
index c9f9ab96..cb42ff84 100644
--- a/services/avatars/Cargo.toml
+++ b/crates/avatars/Cargo.toml
@@ -8,7 +8,7 @@ name = "avatar_cleanup"
 path = "src/cleanup.rs"
 
 [dependencies]
-libpk = { path = "../../lib/libpk" }
+libpk = { path = "../libpk" }
 anyhow = { workspace = true }
 axum = { workspace = true }
 futures = { workspace = true }
diff --git a/services/avatars/src/cleanup.rs b/crates/avatars/src/cleanup.rs
similarity index 100%
rename from services/avatars/src/cleanup.rs
rename to crates/avatars/src/cleanup.rs
diff --git a/services/avatars/src/hash.rs b/crates/avatars/src/hash.rs
similarity index 100%
rename from services/avatars/src/hash.rs
rename to crates/avatars/src/hash.rs
diff --git a/services/avatars/src/init.sql b/crates/avatars/src/init.sql
similarity index 100%
rename from services/avatars/src/init.sql
rename to crates/avatars/src/init.sql
diff --git a/services/avatars/src/main.rs b/crates/avatars/src/main.rs
similarity index 100%
rename from services/avatars/src/main.rs
rename to crates/avatars/src/main.rs
diff --git a/services/avatars/src/migrate.rs b/crates/avatars/src/migrate.rs
similarity index 100%
rename from services/avatars/src/migrate.rs
rename to crates/avatars/src/migrate.rs
diff --git a/services/avatars/src/process.rs b/crates/avatars/src/process.rs
similarity index 100%
rename from services/avatars/src/process.rs
rename to crates/avatars/src/process.rs
diff --git a/services/avatars/src/pull.rs b/crates/avatars/src/pull.rs
similarity index 100%
rename from services/avatars/src/pull.rs
rename to crates/avatars/src/pull.rs
diff --git a/services/avatars/src/store.rs b/crates/avatars/src/store.rs
similarity index 100%
rename from services/avatars/src/store.rs
rename to crates/avatars/src/store.rs
diff --git a/services/dispatch/Cargo.toml b/crates/dispatch/Cargo.toml
similarity index 100%
rename from services/dispatch/Cargo.toml
rename to crates/dispatch/Cargo.toml
diff --git a/services/dispatch/src/logger.rs b/crates/dispatch/src/logger.rs
similarity index 100%
rename from services/dispatch/src/logger.rs
rename to crates/dispatch/src/logger.rs
diff --git a/services/dispatch/src/main.rs b/crates/dispatch/src/main.rs
similarity index 100%
rename from services/dispatch/src/main.rs
rename to crates/dispatch/src/main.rs
diff --git a/services/gateway/Cargo.toml b/crates/gateway/Cargo.toml
similarity index 94%
rename from services/gateway/Cargo.toml
rename to crates/gateway/Cargo.toml
index 98142a7f..bde62f22 100644
--- a/services/gateway/Cargo.toml
+++ b/crates/gateway/Cargo.toml
@@ -11,7 +11,7 @@ chrono = { workspace = true }
 fred = { workspace = true }
 futures = { workspace = true }
 lazy_static = { workspace = true }
-libpk = { path = "../../lib/libpk" }
+libpk = { path = "../libpk" }
 metrics = { workspace = true }
 serde_json = { workspace = true }
 signal-hook = { workspace = true }
diff --git a/services/gateway/src/cache_api.rs b/crates/gateway/src/cache_api.rs
similarity index 100%
rename from services/gateway/src/cache_api.rs
rename to crates/gateway/src/cache_api.rs
diff --git a/services/gateway/src/discord/cache.rs b/crates/gateway/src/discord/cache.rs
similarity index 100%
rename from services/gateway/src/discord/cache.rs
rename to crates/gateway/src/discord/cache.rs
diff --git a/services/gateway/src/discord/gateway.rs b/crates/gateway/src/discord/gateway.rs
similarity index 100%
rename from services/gateway/src/discord/gateway.rs
rename to crates/gateway/src/discord/gateway.rs
diff --git a/services/gateway/src/discord/identify_queue.rs b/crates/gateway/src/discord/identify_queue.rs
similarity index 100%
rename from services/gateway/src/discord/identify_queue.rs
rename to crates/gateway/src/discord/identify_queue.rs
diff --git a/services/gateway/src/discord/mod.rs b/crates/gateway/src/discord/mod.rs
similarity index 100%
rename from services/gateway/src/discord/mod.rs
rename to crates/gateway/src/discord/mod.rs
diff --git a/services/gateway/src/discord/shard_state.rs b/crates/gateway/src/discord/shard_state.rs
similarity index 100%
rename from services/gateway/src/discord/shard_state.rs
rename to crates/gateway/src/discord/shard_state.rs
diff --git a/services/gateway/src/logger.rs b/crates/gateway/src/logger.rs
similarity index 100%
rename from services/gateway/src/logger.rs
rename to crates/gateway/src/logger.rs
diff --git a/services/gateway/src/main.rs b/crates/gateway/src/main.rs
similarity index 100%
rename from services/gateway/src/main.rs
rename to crates/gateway/src/main.rs
diff --git a/lib/libpk/Cargo.toml b/crates/libpk/Cargo.toml
similarity index 100%
rename from lib/libpk/Cargo.toml
rename to crates/libpk/Cargo.toml
diff --git a/lib/libpk/src/_config.rs b/crates/libpk/src/_config.rs
similarity index 100%
rename from lib/libpk/src/_config.rs
rename to crates/libpk/src/_config.rs
diff --git a/lib/libpk/src/db/mod.rs b/crates/libpk/src/db/mod.rs
similarity index 100%
rename from lib/libpk/src/db/mod.rs
rename to crates/libpk/src/db/mod.rs
diff --git a/lib/libpk/src/db/repository/auth.rs b/crates/libpk/src/db/repository/auth.rs
similarity index 100%
rename from lib/libpk/src/db/repository/auth.rs
rename to crates/libpk/src/db/repository/auth.rs
diff --git a/lib/libpk/src/db/repository/avatars.rs b/crates/libpk/src/db/repository/avatars.rs
similarity index 100%
rename from lib/libpk/src/db/repository/avatars.rs
rename to crates/libpk/src/db/repository/avatars.rs
diff --git a/lib/libpk/src/db/repository/mod.rs b/crates/libpk/src/db/repository/mod.rs
similarity index 100%
rename from lib/libpk/src/db/repository/mod.rs
rename to crates/libpk/src/db/repository/mod.rs
diff --git a/lib/libpk/src/db/repository/stats.rs b/crates/libpk/src/db/repository/stats.rs
similarity index 100%
rename from lib/libpk/src/db/repository/stats.rs
rename to crates/libpk/src/db/repository/stats.rs
diff --git a/lib/libpk/src/db/types/avatars.rs b/crates/libpk/src/db/types/avatars.rs
similarity index 100%
rename from lib/libpk/src/db/types/avatars.rs
rename to crates/libpk/src/db/types/avatars.rs
diff --git a/lib/libpk/src/db/types/mod.rs b/crates/libpk/src/db/types/mod.rs
similarity index 100%
rename from lib/libpk/src/db/types/mod.rs
rename to crates/libpk/src/db/types/mod.rs
diff --git a/lib/libpk/src/lib.rs b/crates/libpk/src/lib.rs
similarity index 100%
rename from lib/libpk/src/lib.rs
rename to crates/libpk/src/lib.rs
diff --git a/lib/libpk/src/state.rs b/crates/libpk/src/state.rs
similarity index 100%
rename from lib/libpk/src/state.rs
rename to crates/libpk/src/state.rs
diff --git a/lib/libpk/src/util/mod.rs b/crates/libpk/src/util/mod.rs
similarity index 100%
rename from lib/libpk/src/util/mod.rs
rename to crates/libpk/src/util/mod.rs
diff --git a/lib/libpk/src/util/redis.rs b/crates/libpk/src/util/redis.rs
similarity index 100%
rename from lib/libpk/src/util/redis.rs
rename to crates/libpk/src/util/redis.rs
diff --git a/lib/model_macros/Cargo.toml b/crates/model_macros/Cargo.toml
similarity index 100%
rename from lib/model_macros/Cargo.toml
rename to crates/model_macros/Cargo.toml
diff --git a/lib/model_macros/src/lib.rs b/crates/model_macros/src/lib.rs
similarity index 100%
rename from lib/model_macros/src/lib.rs
rename to crates/model_macros/src/lib.rs
diff --git a/lib/models/Cargo.toml b/crates/models/Cargo.toml
similarity index 100%
rename from lib/models/Cargo.toml
rename to crates/models/Cargo.toml
diff --git a/lib/models/src/_util.rs b/crates/models/src/_util.rs
similarity index 100%
rename from lib/models/src/_util.rs
rename to crates/models/src/_util.rs
diff --git a/lib/models/src/lib.rs b/crates/models/src/lib.rs
similarity index 100%
rename from lib/models/src/lib.rs
rename to crates/models/src/lib.rs
diff --git a/lib/models/src/system.rs b/crates/models/src/system.rs
similarity index 100%
rename from lib/models/src/system.rs
rename to crates/models/src/system.rs
diff --git a/lib/models/src/system_config.rs b/crates/models/src/system_config.rs
similarity index 100%
rename from lib/models/src/system_config.rs
rename to crates/models/src/system_config.rs
diff --git a/services/scheduled_tasks/Cargo.toml b/crates/scheduled_tasks/Cargo.toml
similarity index 91%
rename from services/scheduled_tasks/Cargo.toml
rename to crates/scheduled_tasks/Cargo.toml
index 3df1a3e7..6eda3331 100644
--- a/services/scheduled_tasks/Cargo.toml
+++ b/crates/scheduled_tasks/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-libpk = { path = "../../lib/libpk" }
+libpk = { path = "../libpk" }
 
 anyhow = { workspace = true }
 chrono = { workspace = true }
diff --git a/services/scheduled_tasks/src/main.rs b/crates/scheduled_tasks/src/main.rs
similarity index 100%
rename from services/scheduled_tasks/src/main.rs
rename to crates/scheduled_tasks/src/main.rs
diff --git a/services/scheduled_tasks/src/tasks.rs b/crates/scheduled_tasks/src/tasks.rs
similarity index 100%
rename from services/scheduled_tasks/src/tasks.rs
rename to crates/scheduled_tasks/src/tasks.rs