diff --git a/Cargo.toml b/Cargo.toml
index c2fe70f..bea6000 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,16 +1,6 @@
 [workspace]
 resolver = "2"
-members = [
-    "titan/titan",
-    "titan/titan-derive",
-    "logic/logic",
-    "logic/logic-derive",
-    "services/service-rpc",
-    "services/auth-service",
-    "services/game-service",
-    "services/gateway",
-    "services/scroll-server",
-]
+members = ["crates/*"]
 
 [workspace.package]
 version = "0.1.0"
@@ -19,14 +9,14 @@ rust-version = "1.75"
 license = "MIT"
 
 [workspace.dependencies]
-titan = { path = "titan/titan" }
-titan-derive = { path = "titan/titan-derive" }
-logic = { path = "logic/logic" }
-logic-derive = { path = "logic/logic-derive" }
-service-rpc = { path = "services/service-rpc" }
-auth-service = { path = "services/auth-service" }
-game-service = { path = "services/game-service" }
-gateway = { path = "services/gateway" }
+titan = { path = "crates/titan" }
+titan-derive = { path = "crates/titan-derive" }
+logic = { path = "crates/logic" }
+logic-derive = { path = "crates/logic-derive" }
+service-rpc = { path = "crates/service-rpc" }
+auth-service = { path = "crates/auth-service" }
+game-service = { path = "crates/game-service" }
+gateway = { path = "crates/gateway" }
 
 tokio = { version = "1.45", features = ["rt-multi-thread", "macros", "net", "io-util", "sync", "time", "signal", "fs"] }
 thiserror = "2"
diff --git a/services/auth-service/Cargo.toml b/crates/auth-service/Cargo.toml
similarity index 100%
rename from services/auth-service/Cargo.toml
rename to crates/auth-service/Cargo.toml
diff --git a/services/auth-service/src/config.rs b/crates/auth-service/src/config.rs
similarity index 100%
rename from services/auth-service/src/config.rs
rename to crates/auth-service/src/config.rs
diff --git a/services/auth-service/src/lib.rs b/crates/auth-service/src/lib.rs
similarity index 100%
rename from services/auth-service/src/lib.rs
rename to crates/auth-service/src/lib.rs
diff --git a/services/auth-service/src/main.rs b/crates/auth-service/src/main.rs
similarity index 100%
rename from services/auth-service/src/main.rs
rename to crates/auth-service/src/main.rs
diff --git a/services/auth-service/src/service.rs b/crates/auth-service/src/service.rs
similarity index 100%
rename from services/auth-service/src/service.rs
rename to crates/auth-service/src/service.rs
diff --git a/services/auth-service/src/store.rs b/crates/auth-service/src/store.rs
similarity index 100%
rename from services/auth-service/src/store.rs
rename to crates/auth-service/src/store.rs
diff --git a/services/auth-service/src/time.rs b/crates/auth-service/src/time.rs
similarity index 100%
rename from services/auth-service/src/time.rs
rename to crates/auth-service/src/time.rs
diff --git a/services/game-service/Cargo.toml b/crates/game-service/Cargo.toml
similarity index 100%
rename from services/game-service/Cargo.toml
rename to crates/game-service/Cargo.toml
diff --git a/services/game-service/src/catalog.rs b/crates/game-service/src/catalog.rs
similarity index 100%
rename from services/game-service/src/catalog.rs
rename to crates/game-service/src/catalog.rs
diff --git a/services/game-service/src/config.rs b/crates/game-service/src/config.rs
similarity index 100%
rename from services/game-service/src/config.rs
rename to crates/game-service/src/config.rs
diff --git a/services/game-service/src/home.rs b/crates/game-service/src/home.rs
similarity index 100%
rename from services/game-service/src/home.rs
rename to crates/game-service/src/home.rs
diff --git a/services/game-service/src/home_mode.rs b/crates/game-service/src/home_mode.rs
similarity index 100%
rename from services/game-service/src/home_mode.rs
rename to crates/game-service/src/home_mode.rs
diff --git a/services/game-service/src/lib.rs b/crates/game-service/src/lib.rs
similarity index 100%
rename from services/game-service/src/lib.rs
rename to crates/game-service/src/lib.rs
diff --git a/services/game-service/src/main.rs b/crates/game-service/src/main.rs
similarity index 100%
rename from services/game-service/src/main.rs
rename to crates/game-service/src/main.rs
diff --git a/services/game-service/src/profile.rs b/crates/game-service/src/profile.rs
similarity index 100%
rename from services/game-service/src/profile.rs
rename to crates/game-service/src/profile.rs
diff --git a/services/game-service/src/rewards.rs b/crates/game-service/src/rewards.rs
similarity index 100%
rename from services/game-service/src/rewards.rs
rename to crates/game-service/src/rewards.rs
diff --git a/services/game-service/src/service.rs b/crates/game-service/src/service.rs
similarity index 100%
rename from services/game-service/src/service.rs
rename to crates/game-service/src/service.rs
diff --git a/services/game-service/src/time.rs b/crates/game-service/src/time.rs
similarity index 100%
rename from services/game-service/src/time.rs
rename to crates/game-service/src/time.rs
diff --git a/services/gateway/Cargo.toml b/crates/gateway/Cargo.toml
similarity index 100%
rename from services/gateway/Cargo.toml
rename to crates/gateway/Cargo.toml
diff --git a/services/gateway/src/backend.rs b/crates/gateway/src/backend.rs
similarity index 100%
rename from services/gateway/src/backend.rs
rename to crates/gateway/src/backend.rs
diff --git a/services/gateway/src/bin/scroll-probe.rs b/crates/gateway/src/bin/scroll-probe.rs
similarity index 100%
rename from services/gateway/src/bin/scroll-probe.rs
rename to crates/gateway/src/bin/scroll-probe.rs
diff --git a/services/gateway/src/config.rs b/crates/gateway/src/config.rs
similarity index 100%
rename from services/gateway/src/config.rs
rename to crates/gateway/src/config.rs
diff --git a/services/gateway/src/lib.rs b/crates/gateway/src/lib.rs
similarity index 100%
rename from services/gateway/src/lib.rs
rename to crates/gateway/src/lib.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/services/gateway/src/message_manager.rs b/crates/gateway/src/message_manager.rs
similarity index 100%
rename from services/gateway/src/message_manager.rs
rename to crates/gateway/src/message_manager.rs
diff --git a/services/gateway/src/session.rs b/crates/gateway/src/session.rs
similarity index 100%
rename from services/gateway/src/session.rs
rename to crates/gateway/src/session.rs
diff --git a/logic/logic-derive/Cargo.toml b/crates/logic-derive/Cargo.toml
similarity index 100%
rename from logic/logic-derive/Cargo.toml
rename to crates/logic-derive/Cargo.toml
diff --git a/logic/logic-derive/src/lib.rs b/crates/logic-derive/src/lib.rs
similarity index 100%
rename from logic/logic-derive/src/lib.rs
rename to crates/logic-derive/src/lib.rs
diff --git a/logic/logic/Cargo.toml b/crates/logic/Cargo.toml
similarity index 100%
rename from logic/logic/Cargo.toml
rename to crates/logic/Cargo.toml
diff --git a/logic/logic/src/commands/chest.rs b/crates/logic/src/commands/chest.rs
similarity index 100%
rename from logic/logic/src/commands/chest.rs
rename to crates/logic/src/commands/chest.rs
diff --git a/logic/logic/src/commands/command.rs b/crates/logic/src/commands/command.rs
similarity index 100%
rename from logic/logic/src/commands/command.rs
rename to crates/logic/src/commands/command.rs
diff --git a/logic/logic/src/commands/header.rs b/crates/logic/src/commands/header.rs
similarity index 100%
rename from logic/logic/src/commands/header.rs
rename to crates/logic/src/commands/header.rs
diff --git a/logic/logic/src/commands/manager.rs b/crates/logic/src/commands/manager.rs
similarity index 100%
rename from logic/logic/src/commands/manager.rs
rename to crates/logic/src/commands/manager.rs
diff --git a/logic/logic/src/commands/mod.rs b/crates/logic/src/commands/mod.rs
similarity index 100%
rename from logic/logic/src/commands/mod.rs
rename to crates/logic/src/commands/mod.rs
diff --git a/logic/logic/src/commands/reward.rs b/crates/logic/src/commands/reward.rs
similarity index 100%
rename from logic/logic/src/commands/reward.rs
rename to crates/logic/src/commands/reward.rs
diff --git a/logic/logic/src/commands/spells.rs b/crates/logic/src/commands/spells.rs
similarity index 100%
rename from logic/logic/src/commands/spells.rs
rename to crates/logic/src/commands/spells.rs
diff --git a/logic/logic/src/commands/ui.rs b/crates/logic/src/commands/ui.rs
similarity index 100%
rename from logic/logic/src/commands/ui.rs
rename to crates/logic/src/commands/ui.rs
diff --git a/logic/logic/src/data/data_ref.rs b/crates/logic/src/data/data_ref.rs
similarity index 100%
rename from logic/logic/src/data/data_ref.rs
rename to crates/logic/src/data/data_ref.rs
diff --git a/logic/logic/src/data/logic_data.rs b/crates/logic/src/data/logic_data.rs
similarity index 100%
rename from logic/logic/src/data/logic_data.rs
rename to crates/logic/src/data/logic_data.rs
diff --git a/logic/logic/src/data/logic_data_table.rs b/crates/logic/src/data/logic_data_table.rs
similarity index 100%
rename from logic/logic/src/data/logic_data_table.rs
rename to crates/logic/src/data/logic_data_table.rs
diff --git a/logic/logic/src/data/logic_data_tables.rs b/crates/logic/src/data/logic_data_tables.rs
similarity index 100%
rename from logic/logic/src/data/logic_data_tables.rs
rename to crates/logic/src/data/logic_data_tables.rs
diff --git a/logic/logic/src/data/mod.rs b/crates/logic/src/data/mod.rs
similarity index 100%
rename from logic/logic/src/data/mod.rs
rename to crates/logic/src/data/mod.rs
diff --git a/logic/logic/src/data/tables.rs b/crates/logic/src/data/tables.rs
similarity index 100%
rename from logic/logic/src/data/tables.rs
rename to crates/logic/src/data/tables.rs
diff --git a/logic/logic/src/data/typed.rs b/crates/logic/src/data/typed.rs
similarity index 100%
rename from logic/logic/src/data/typed.rs
rename to crates/logic/src/data/typed.rs
diff --git a/logic/logic/src/factory.rs b/crates/logic/src/factory.rs
similarity index 100%
rename from logic/logic/src/factory.rs
rename to crates/logic/src/factory.rs
diff --git a/logic/logic/src/home/logic_home_mode.rs b/crates/logic/src/home/logic_home_mode.rs
similarity index 100%
rename from logic/logic/src/home/logic_home_mode.rs
rename to crates/logic/src/home/logic_home_mode.rs
diff --git a/logic/logic/src/home/mod.rs b/crates/logic/src/home/mod.rs
similarity index 100%
rename from logic/logic/src/home/mod.rs
rename to crates/logic/src/home/mod.rs
diff --git a/logic/logic/src/lib.rs b/crates/logic/src/lib.rs
similarity index 100%
rename from logic/logic/src/lib.rs
rename to crates/logic/src/lib.rs
diff --git a/logic/logic/src/messages/available_server_command.rs b/crates/logic/src/messages/available_server_command.rs
similarity index 100%
rename from logic/logic/src/messages/available_server_command.rs
rename to crates/logic/src/messages/available_server_command.rs
diff --git a/logic/logic/src/messages/client_capabilities.rs b/crates/logic/src/messages/client_capabilities.rs
similarity index 100%
rename from logic/logic/src/messages/client_capabilities.rs
rename to crates/logic/src/messages/client_capabilities.rs
diff --git a/logic/logic/src/messages/client_requests.rs b/crates/logic/src/messages/client_requests.rs
similarity index 100%
rename from logic/logic/src/messages/client_requests.rs
rename to crates/logic/src/messages/client_requests.rs
diff --git a/logic/logic/src/messages/end_client_turn.rs b/crates/logic/src/messages/end_client_turn.rs
similarity index 100%
rename from logic/logic/src/messages/end_client_turn.rs
rename to crates/logic/src/messages/end_client_turn.rs
diff --git a/logic/logic/src/messages/go_home.rs b/crates/logic/src/messages/go_home.rs
similarity index 100%
rename from logic/logic/src/messages/go_home.rs
rename to crates/logic/src/messages/go_home.rs
diff --git a/logic/logic/src/messages/keep_alive.rs b/crates/logic/src/messages/keep_alive.rs
similarity index 100%
rename from logic/logic/src/messages/keep_alive.rs
rename to crates/logic/src/messages/keep_alive.rs
diff --git a/logic/logic/src/messages/login.rs b/crates/logic/src/messages/login.rs
similarity index 100%
rename from logic/logic/src/messages/login.rs
rename to crates/logic/src/messages/login.rs
diff --git a/logic/logic/src/messages/login_failed.rs b/crates/logic/src/messages/login_failed.rs
similarity index 100%
rename from logic/logic/src/messages/login_failed.rs
rename to crates/logic/src/messages/login_failed.rs
diff --git a/logic/logic/src/messages/login_ok.rs b/crates/logic/src/messages/login_ok.rs
similarity index 100%
rename from logic/logic/src/messages/login_ok.rs
rename to crates/logic/src/messages/login_ok.rs
diff --git a/logic/logic/src/messages/mod.rs b/crates/logic/src/messages/mod.rs
similarity index 100%
rename from logic/logic/src/messages/mod.rs
rename to crates/logic/src/messages/mod.rs
diff --git a/logic/logic/src/messages/out_of_sync.rs b/crates/logic/src/messages/out_of_sync.rs
similarity index 100%
rename from logic/logic/src/messages/out_of_sync.rs
rename to crates/logic/src/messages/out_of_sync.rs
diff --git a/logic/logic/src/messages/own_home_data.rs b/crates/logic/src/messages/own_home_data.rs
similarity index 100%
rename from logic/logic/src/messages/own_home_data.rs
rename to crates/logic/src/messages/own_home_data.rs
diff --git a/logic/logic/src/messages/server_error.rs b/crates/logic/src/messages/server_error.rs
similarity index 100%
rename from logic/logic/src/messages/server_error.rs
rename to crates/logic/src/messages/server_error.rs
diff --git a/logic/logic/src/messages/start_mission.rs b/crates/logic/src/messages/start_mission.rs
similarity index 100%
rename from logic/logic/src/messages/start_mission.rs
rename to crates/logic/src/messages/start_mission.rs
diff --git a/logic/logic/src/model/chest.rs b/crates/logic/src/model/chest.rs
similarity index 100%
rename from logic/logic/src/model/chest.rs
rename to crates/logic/src/model/chest.rs
diff --git a/logic/logic/src/model/client_avatar.rs b/crates/logic/src/model/client_avatar.rs
similarity index 100%
rename from logic/logic/src/model/client_avatar.rs
rename to crates/logic/src/model/client_avatar.rs
diff --git a/logic/logic/src/model/client_home.rs b/crates/logic/src/model/client_home.rs
similarity index 100%
rename from logic/logic/src/model/client_home.rs
rename to crates/logic/src/model/client_home.rs
diff --git a/logic/logic/src/model/data_slot.rs b/crates/logic/src/model/data_slot.rs
similarity index 100%
rename from logic/logic/src/model/data_slot.rs
rename to crates/logic/src/model/data_slot.rs
diff --git a/logic/logic/src/model/mod.rs b/crates/logic/src/model/mod.rs
similarity index 100%
rename from logic/logic/src/model/mod.rs
rename to crates/logic/src/model/mod.rs
diff --git a/logic/logic/src/model/spell.rs b/crates/logic/src/model/spell.rs
similarity index 100%
rename from logic/logic/src/model/spell.rs
rename to crates/logic/src/model/spell.rs
diff --git a/logic/logic/src/model/timer.rs b/crates/logic/src/model/timer.rs
similarity index 100%
rename from logic/logic/src/model/timer.rs
rename to crates/logic/src/model/timer.rs
diff --git a/services/scroll-server/Cargo.toml b/crates/scroll-server/Cargo.toml
similarity index 100%
rename from services/scroll-server/Cargo.toml
rename to crates/scroll-server/Cargo.toml
diff --git a/services/scroll-server/src/main.rs b/crates/scroll-server/src/main.rs
similarity index 100%
rename from services/scroll-server/src/main.rs
rename to crates/scroll-server/src/main.rs
diff --git a/services/service-rpc/Cargo.toml b/crates/service-rpc/Cargo.toml
similarity index 100%
rename from services/service-rpc/Cargo.toml
rename to crates/service-rpc/Cargo.toml
diff --git a/services/service-rpc/src/auth.rs b/crates/service-rpc/src/auth.rs
similarity index 100%
rename from services/service-rpc/src/auth.rs
rename to crates/service-rpc/src/auth.rs
diff --git a/services/service-rpc/src/base64.rs b/crates/service-rpc/src/base64.rs
similarity index 100%
rename from services/service-rpc/src/base64.rs
rename to crates/service-rpc/src/base64.rs
diff --git a/services/service-rpc/src/client.rs b/crates/service-rpc/src/client.rs
similarity index 100%
rename from services/service-rpc/src/client.rs
rename to crates/service-rpc/src/client.rs
diff --git a/services/service-rpc/src/error.rs b/crates/service-rpc/src/error.rs
similarity index 100%
rename from services/service-rpc/src/error.rs
rename to crates/service-rpc/src/error.rs
diff --git a/services/service-rpc/src/game.rs b/crates/service-rpc/src/game.rs
similarity index 100%
rename from services/service-rpc/src/game.rs
rename to crates/service-rpc/src/game.rs
diff --git a/services/service-rpc/src/lib.rs b/crates/service-rpc/src/lib.rs
similarity index 100%
rename from services/service-rpc/src/lib.rs
rename to crates/service-rpc/src/lib.rs
diff --git a/services/service-rpc/src/server.rs b/crates/service-rpc/src/server.rs
similarity index 100%
rename from services/service-rpc/src/server.rs
rename to crates/service-rpc/src/server.rs
diff --git a/services/service-rpc/src/wire.rs b/crates/service-rpc/src/wire.rs
similarity index 100%
rename from services/service-rpc/src/wire.rs
rename to crates/service-rpc/src/wire.rs
diff --git a/titan/titan-derive/Cargo.toml b/crates/titan-derive/Cargo.toml
similarity index 100%
rename from titan/titan-derive/Cargo.toml
rename to crates/titan-derive/Cargo.toml
diff --git a/titan/titan-derive/src/codec.rs b/crates/titan-derive/src/codec.rs
similarity index 100%
rename from titan/titan-derive/src/codec.rs
rename to crates/titan-derive/src/codec.rs
diff --git a/titan/titan-derive/src/lib.rs b/crates/titan-derive/src/lib.rs
similarity index 100%
rename from titan/titan-derive/src/lib.rs
rename to crates/titan-derive/src/lib.rs
diff --git a/titan/titan-derive/src/meta.rs b/crates/titan-derive/src/meta.rs
similarity index 100%
rename from titan/titan-derive/src/meta.rs
rename to crates/titan-derive/src/meta.rs
diff --git a/titan/titan/Cargo.toml b/crates/titan/Cargo.toml
similarity index 100%
rename from titan/titan/Cargo.toml
rename to crates/titan/Cargo.toml
diff --git a/titan/titan/src/checksum.rs b/crates/titan/src/checksum.rs
similarity index 100%
rename from titan/titan/src/checksum.rs
rename to crates/titan/src/checksum.rs
diff --git a/titan/titan/src/codec.rs b/crates/titan/src/codec.rs
similarity index 100%
rename from titan/titan/src/codec.rs
rename to crates/titan/src/codec.rs
diff --git a/titan/titan/src/crypto/mod.rs b/crates/titan/src/crypto/mod.rs
similarity index 100%
rename from titan/titan/src/crypto/mod.rs
rename to crates/titan/src/crypto/mod.rs
diff --git a/titan/titan/src/crypto/plain.rs b/crates/titan/src/crypto/plain.rs
similarity index 100%
rename from titan/titan/src/crypto/plain.rs
rename to crates/titan/src/crypto/plain.rs
diff --git a/titan/titan/src/crypto/rc4.rs b/crates/titan/src/crypto/rc4.rs
similarity index 100%
rename from titan/titan/src/crypto/rc4.rs
rename to crates/titan/src/crypto/rc4.rs
diff --git a/titan/titan/src/csv/mod.rs b/crates/titan/src/csv/mod.rs
similarity index 100%
rename from titan/titan/src/csv/mod.rs
rename to crates/titan/src/csv/mod.rs
diff --git a/titan/titan/src/csv/node.rs b/crates/titan/src/csv/node.rs
similarity index 100%
rename from titan/titan/src/csv/node.rs
rename to crates/titan/src/csv/node.rs
diff --git a/titan/titan/src/csv/reader.rs b/crates/titan/src/csv/reader.rs
similarity index 100%
rename from titan/titan/src/csv/reader.rs
rename to crates/titan/src/csv/reader.rs
diff --git a/titan/titan/src/csv/row.rs b/crates/titan/src/csv/row.rs
similarity index 100%
rename from titan/titan/src/csv/row.rs
rename to crates/titan/src/csv/row.rs
diff --git a/titan/titan/src/csv/table.rs b/crates/titan/src/csv/table.rs
similarity index 100%
rename from titan/titan/src/csv/table.rs
rename to crates/titan/src/csv/table.rs
diff --git a/titan/titan/src/csv/value.rs b/crates/titan/src/csv/value.rs
similarity index 100%
rename from titan/titan/src/csv/value.rs
rename to crates/titan/src/csv/value.rs
diff --git a/titan/titan/src/data_ref.rs b/crates/titan/src/data_ref.rs
similarity index 100%
rename from titan/titan/src/data_ref.rs
rename to crates/titan/src/data_ref.rs
diff --git a/titan/titan/src/error.rs b/crates/titan/src/error.rs
similarity index 100%
rename from titan/titan/src/error.rs
rename to crates/titan/src/error.rs
diff --git a/titan/titan/src/factory.rs b/crates/titan/src/factory.rs
similarity index 100%
rename from titan/titan/src/factory.rs
rename to crates/titan/src/factory.rs
diff --git a/titan/titan/src/frame.rs b/crates/titan/src/frame.rs
similarity index 100%
rename from titan/titan/src/frame.rs
rename to crates/titan/src/frame.rs
diff --git a/titan/titan/src/io/mod.rs b/crates/titan/src/io/mod.rs
similarity index 100%
rename from titan/titan/src/io/mod.rs
rename to crates/titan/src/io/mod.rs
diff --git a/titan/titan/src/io/reader.rs b/crates/titan/src/io/reader.rs
similarity index 100%
rename from titan/titan/src/io/reader.rs
rename to crates/titan/src/io/reader.rs
diff --git a/titan/titan/src/io/writer.rs b/crates/titan/src/io/writer.rs
similarity index 100%
rename from titan/titan/src/io/writer.rs
rename to crates/titan/src/io/writer.rs
diff --git a/titan/titan/src/json.rs b/crates/titan/src/json.rs
similarity index 100%
rename from titan/titan/src/json.rs
rename to crates/titan/src/json.rs
diff --git a/titan/titan/src/lib.rs b/crates/titan/src/lib.rs
similarity index 100%
rename from titan/titan/src/lib.rs
rename to crates/titan/src/lib.rs
diff --git a/titan/titan/src/logic_long.rs b/crates/titan/src/logic_long.rs
similarity index 100%
rename from titan/titan/src/logic_long.rs
rename to crates/titan/src/logic_long.rs
diff --git a/titan/titan/src/message.rs b/crates/titan/src/message.rs
similarity index 100%
rename from titan/titan/src/message.rs
rename to crates/titan/src/message.rs
diff --git a/titan/titan/src/net/messaging.rs b/crates/titan/src/net/messaging.rs
similarity index 100%
rename from titan/titan/src/net/messaging.rs
rename to crates/titan/src/net/messaging.rs
diff --git a/titan/titan/src/net/mod.rs b/crates/titan/src/net/mod.rs
similarity index 100%
rename from titan/titan/src/net/mod.rs
rename to crates/titan/src/net/mod.rs