diff --git a/Cargo.toml b/Cargo.toml
index 2fbbc4a..f930652 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,11 +1,11 @@
 [workspace]
 resolver = "2"
 members = [
-  "./channels/*",
-  "./gateway",
-  "./ws-proto",
-  "./udp-proto",
-  "./voice/*",
+  "./server/channels/*",
+  "./server/gateway",
+  "./server/ws-proto",
+  "./server/udp-proto",
+  "./server/voice/*",
 ]
 
 exclude = [
diff --git a/client/Cargo.toml b/client/Cargo.toml
index c7ddf0c..fabe04c 100644
--- a/client/Cargo.toml
+++ b/client/Cargo.toml
@@ -31,11 +31,11 @@ tokio-tungstenite = { version = "0.20.1", features = [
 tracing = { version = "0.1.39", features = ["log"] }
 tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
 tungstenite = { version = "0.20.1", features = ["rustls"] }
-udp-proto = { version = "0.1.0", path = "../udp-proto" }
+udp-proto = { version = "0.1.0", path = "../server/udp-proto" }
 uuid = { version = "1.4.1", features = ["v4", "serde"] }
-voices-voice-crypto = { path = "../voice/crypto" }
-voice-proto = { path = "../voice/proto", features = ["client"] }
-voices-ws-proto = { path = "../ws-proto", features = ["client"] }
+voices-voice-crypto = { path = "../server/voice/crypto" }
+voice-proto = { path = "../server/voice/proto", features = ["client"] }
+voices-ws-proto = { path = "../server/ws-proto", features = ["client"] }
 rubato = { version = "0.14.1", features = ["log"] }
 tracing-log = "0.1.3"
 nnnoiseless = "0.5.1"
diff --git a/channels/core/.env b/server/channels/core/.env
similarity index 100%
rename from channels/core/.env
rename to server/channels/core/.env
diff --git a/channels/core/Cargo.toml b/server/channels/core/Cargo.toml
similarity index 100%
rename from channels/core/Cargo.toml
rename to server/channels/core/Cargo.toml
diff --git a/channels/core/diesel.toml b/server/channels/core/diesel.toml
similarity index 100%
rename from channels/core/diesel.toml
rename to server/channels/core/diesel.toml
diff --git a/channels/core/init.sql b/server/channels/core/init.sql
similarity index 100%
rename from channels/core/init.sql
rename to server/channels/core/init.sql
diff --git a/channels/core/init_db.sh b/server/channels/core/init_db.sh
similarity index 100%
rename from channels/core/init_db.sh
rename to server/channels/core/init_db.sh
diff --git a/channels/core/migrations/00000000000000_diesel_initial_setup/down.sql b/server/channels/core/migrations/00000000000000_diesel_initial_setup/down.sql
similarity index 100%
rename from channels/core/migrations/00000000000000_diesel_initial_setup/down.sql
rename to server/channels/core/migrations/00000000000000_diesel_initial_setup/down.sql
diff --git a/channels/core/migrations/00000000000000_diesel_initial_setup/up.sql b/server/channels/core/migrations/00000000000000_diesel_initial_setup/up.sql
similarity index 100%
rename from channels/core/migrations/00000000000000_diesel_initial_setup/up.sql
rename to server/channels/core/migrations/00000000000000_diesel_initial_setup/up.sql
diff --git a/channels/core/migrations/2022-08-30-214404_init/down.sql b/server/channels/core/migrations/2022-08-30-214404_init/down.sql
similarity index 100%
rename from channels/core/migrations/2022-08-30-214404_init/down.sql
rename to server/channels/core/migrations/2022-08-30-214404_init/down.sql
diff --git a/channels/core/migrations/2022-08-30-214404_init/up.sql b/server/channels/core/migrations/2022-08-30-214404_init/up.sql
similarity index 100%
rename from channels/core/migrations/2022-08-30-214404_init/up.sql
rename to server/channels/core/migrations/2022-08-30-214404_init/up.sql
diff --git a/channels/core/src/db.rs b/server/channels/core/src/db.rs
similarity index 100%
rename from channels/core/src/db.rs
rename to server/channels/core/src/db.rs
diff --git a/channels/core/src/db_models/channel.rs b/server/channels/core/src/db_models/channel.rs
similarity index 100%
rename from channels/core/src/db_models/channel.rs
rename to server/channels/core/src/db_models/channel.rs
diff --git a/channels/core/src/db_models/mod.rs b/server/channels/core/src/db_models/mod.rs
similarity index 100%
rename from channels/core/src/db_models/mod.rs
rename to server/channels/core/src/db_models/mod.rs
diff --git a/channels/core/src/db_models/server.rs b/server/channels/core/src/db_models/server.rs
similarity index 100%
rename from channels/core/src/db_models/server.rs
rename to server/channels/core/src/db_models/server.rs
diff --git a/channels/core/src/db_models/voice_server.rs b/server/channels/core/src/db_models/voice_server.rs
similarity index 100%
rename from channels/core/src/db_models/voice_server.rs
rename to server/channels/core/src/db_models/voice_server.rs
diff --git a/channels/core/src/error.rs b/server/channels/core/src/error.rs
similarity index 100%
rename from channels/core/src/error.rs
rename to server/channels/core/src/error.rs
diff --git a/channels/core/src/lib.rs b/server/channels/core/src/lib.rs
similarity index 100%
rename from channels/core/src/lib.rs
rename to server/channels/core/src/lib.rs
diff --git a/channels/core/src/models.rs b/server/channels/core/src/models.rs
similarity index 100%
rename from channels/core/src/models.rs
rename to server/channels/core/src/models.rs
diff --git a/channels/core/src/schema.rs b/server/channels/core/src/schema.rs
similarity index 100%
rename from channels/core/src/schema.rs
rename to server/channels/core/src/schema.rs
diff --git a/channels/core/src/test.rs b/server/channels/core/src/test.rs
similarity index 100%
rename from channels/core/src/test.rs
rename to server/channels/core/src/test.rs
diff --git a/channels/core/src/test_helper.rs b/server/channels/core/src/test_helper.rs
similarity index 100%
rename from channels/core/src/test_helper.rs
rename to server/channels/core/src/test_helper.rs
diff --git a/channels/grpc/Cargo.toml b/server/channels/grpc/Cargo.toml
similarity index 100%
rename from channels/grpc/Cargo.toml
rename to server/channels/grpc/Cargo.toml
diff --git a/channels/grpc/Dockerfile b/server/channels/grpc/Dockerfile
similarity index 100%
rename from channels/grpc/Dockerfile
rename to server/channels/grpc/Dockerfile
diff --git a/channels/grpc/build.rs b/server/channels/grpc/build.rs
similarity index 100%
rename from channels/grpc/build.rs
rename to server/channels/grpc/build.rs
diff --git a/channels/grpc/channels.v1.proto b/server/channels/grpc/channels.v1.proto
similarity index 100%
rename from channels/grpc/channels.v1.proto
rename to server/channels/grpc/channels.v1.proto
diff --git a/channels/grpc/src/lib.rs b/server/channels/grpc/src/lib.rs
similarity index 100%
rename from channels/grpc/src/lib.rs
rename to server/channels/grpc/src/lib.rs
diff --git a/channels/grpc/src/main.rs b/server/channels/grpc/src/main.rs
similarity index 100%
rename from channels/grpc/src/main.rs
rename to server/channels/grpc/src/main.rs
diff --git a/channels/grpc/src/server.rs b/server/channels/grpc/src/server.rs
similarity index 100%
rename from channels/grpc/src/server.rs
rename to server/channels/grpc/src/server.rs
diff --git a/channels/grpc/src/service.rs b/server/channels/grpc/src/service.rs
similarity index 100%
rename from channels/grpc/src/service.rs
rename to server/channels/grpc/src/service.rs
diff --git a/channels/grpc/src/voice_channels.v1.rs b/server/channels/grpc/src/voice_channels.v1.rs
similarity index 100%
rename from channels/grpc/src/voice_channels.v1.rs
rename to server/channels/grpc/src/voice_channels.v1.rs
diff --git a/channels/models/Cargo.toml b/server/channels/models/Cargo.toml
similarity index 100%
rename from channels/models/Cargo.toml
rename to server/channels/models/Cargo.toml
diff --git a/channels/models/src/lib.rs b/server/channels/models/src/lib.rs
similarity index 100%
rename from channels/models/src/lib.rs
rename to server/channels/models/src/lib.rs
diff --git a/gateway/Cargo.toml b/server/gateway/Cargo.toml
similarity index 100%
rename from gateway/Cargo.toml
rename to server/gateway/Cargo.toml
diff --git a/gateway/Dockerfile b/server/gateway/Dockerfile
similarity index 100%
rename from gateway/Dockerfile
rename to server/gateway/Dockerfile
diff --git a/gateway/build.rs b/server/gateway/build.rs
similarity index 100%
rename from gateway/build.rs
rename to server/gateway/build.rs
diff --git a/gateway/cli.py b/server/gateway/cli.py
similarity index 100%
rename from gateway/cli.py
rename to server/gateway/cli.py
diff --git a/gateway/src/channel_registry/distributed.rs b/server/gateway/src/channel_registry/distributed.rs
similarity index 100%
rename from gateway/src/channel_registry/distributed.rs
rename to server/gateway/src/channel_registry/distributed.rs
diff --git a/gateway/src/channel_registry/integrated.rs b/server/gateway/src/channel_registry/integrated.rs
similarity index 100%
rename from gateway/src/channel_registry/integrated.rs
rename to server/gateway/src/channel_registry/integrated.rs
diff --git a/gateway/src/channel_registry/mod.rs b/server/gateway/src/channel_registry/mod.rs
similarity index 100%
rename from gateway/src/channel_registry/mod.rs
rename to server/gateway/src/channel_registry/mod.rs
diff --git a/gateway/src/channel_registry/voice_channels.v1.rs b/server/gateway/src/channel_registry/voice_channels.v1.rs
similarity index 100%
rename from gateway/src/channel_registry/voice_channels.v1.rs
rename to server/gateway/src/channel_registry/voice_channels.v1.rs
diff --git a/gateway/src/lib.rs b/server/gateway/src/lib.rs
similarity index 100%
rename from gateway/src/lib.rs
rename to server/gateway/src/lib.rs
diff --git a/gateway/src/main.rs b/server/gateway/src/main.rs
similarity index 100%
rename from gateway/src/main.rs
rename to server/gateway/src/main.rs
diff --git a/gateway/src/rest_api.rs b/server/gateway/src/rest_api.rs
similarity index 100%
rename from gateway/src/rest_api.rs
rename to server/gateway/src/rest_api.rs
diff --git a/gateway/src/server/channels/mod.rs b/server/gateway/src/server/channels/mod.rs
similarity index 100%
rename from gateway/src/server/channels/mod.rs
rename to server/gateway/src/server/channels/mod.rs
diff --git a/gateway/src/server/channels/state/distributed.rs b/server/gateway/src/server/channels/state/distributed.rs
similarity index 100%
rename from gateway/src/server/channels/state/distributed.rs
rename to server/gateway/src/server/channels/state/distributed.rs
diff --git a/gateway/src/server/channels/state/local.rs b/server/gateway/src/server/channels/state/local.rs
similarity index 100%
rename from gateway/src/server/channels/state/local.rs
rename to server/gateway/src/server/channels/state/local.rs
diff --git a/gateway/src/server/channels/state/mod.rs b/server/gateway/src/server/channels/state/mod.rs
similarity index 100%
rename from gateway/src/server/channels/state/mod.rs
rename to server/gateway/src/server/channels/state/mod.rs
diff --git a/gateway/src/server/mod.rs b/server/gateway/src/server/mod.rs
similarity index 100%
rename from gateway/src/server/mod.rs
rename to server/gateway/src/server/mod.rs
diff --git a/gateway/src/server/session.rs b/server/gateway/src/server/session.rs
similarity index 100%
rename from gateway/src/server/session.rs
rename to server/gateway/src/server/session.rs
diff --git a/gateway/src/server/ws.rs b/server/gateway/src/server/ws.rs
similarity index 100%
rename from gateway/src/server/ws.rs
rename to server/gateway/src/server/ws.rs
diff --git a/gateway/src/util.rs b/server/gateway/src/util.rs
similarity index 100%
rename from gateway/src/util.rs
rename to server/gateway/src/util.rs
diff --git a/gateway/src/voice_instance/integrated.rs b/server/gateway/src/voice_instance/integrated.rs
similarity index 100%
rename from gateway/src/voice_instance/integrated.rs
rename to server/gateway/src/voice_instance/integrated.rs
diff --git a/gateway/src/voice_instance/mod.rs b/server/gateway/src/voice_instance/mod.rs
similarity index 100%
rename from gateway/src/voice_instance/mod.rs
rename to server/gateway/src/voice_instance/mod.rs
diff --git a/gateway/src/voice_instance/remote.rs b/server/gateway/src/voice_instance/remote.rs
similarity index 100%
rename from gateway/src/voice_instance/remote.rs
rename to server/gateway/src/voice_instance/remote.rs
diff --git a/gateway/src/voice_instance/voice_server.v1.rs b/server/gateway/src/voice_instance/voice_server.v1.rs
similarity index 100%
rename from gateway/src/voice_instance/voice_server.v1.rs
rename to server/gateway/src/voice_instance/voice_server.v1.rs
diff --git a/server/gateway/tests/it/main.rs b/server/gateway/tests/it/main.rs
new file mode 100644
index 0000000..4653555
--- /dev/null
+++ b/server/gateway/tests/it/main.rs
@@ -0,0 +1,2 @@
+#[tokio::test]
+async fn test() {}
diff --git a/udp-proto/Cargo.toml b/server/udp-proto/Cargo.toml
similarity index 100%
rename from udp-proto/Cargo.toml
rename to server/udp-proto/Cargo.toml
diff --git a/udp-proto/src/lib.rs b/server/udp-proto/src/lib.rs
similarity index 100%
rename from udp-proto/src/lib.rs
rename to server/udp-proto/src/lib.rs
diff --git a/voice/core/Cargo.toml b/server/voice/core/Cargo.toml
similarity index 100%
rename from voice/core/Cargo.toml
rename to server/voice/core/Cargo.toml
diff --git a/voice/core/src/channel/connection.rs b/server/voice/core/src/channel/connection.rs
similarity index 100%
rename from voice/core/src/channel/connection.rs
rename to server/voice/core/src/channel/connection.rs
diff --git a/voice/core/src/channel/mod.rs b/server/voice/core/src/channel/mod.rs
similarity index 100%
rename from voice/core/src/channel/mod.rs
rename to server/voice/core/src/channel/mod.rs
diff --git a/voice/core/src/config.rs b/server/voice/core/src/config.rs
similarity index 100%
rename from voice/core/src/config.rs
rename to server/voice/core/src/config.rs
diff --git a/voice/core/src/lib.rs b/server/voice/core/src/lib.rs
similarity index 100%
rename from voice/core/src/lib.rs
rename to server/voice/core/src/lib.rs
diff --git a/voice/core/src/ports.rs b/server/voice/core/src/ports.rs
similarity index 100%
rename from voice/core/src/ports.rs
rename to server/voice/core/src/ports.rs
diff --git a/voice/core/src/test.rs b/server/voice/core/src/test.rs
similarity index 100%
rename from voice/core/src/test.rs
rename to server/voice/core/src/test.rs
diff --git a/voice/crypto/Cargo.toml b/server/voice/crypto/Cargo.toml
similarity index 100%
rename from voice/crypto/Cargo.toml
rename to server/voice/crypto/Cargo.toml
diff --git a/voice/crypto/src/lib.rs b/server/voice/crypto/src/lib.rs
similarity index 100%
rename from voice/crypto/src/lib.rs
rename to server/voice/crypto/src/lib.rs
diff --git a/voice/grpc/Cargo.toml b/server/voice/grpc/Cargo.toml
similarity index 100%
rename from voice/grpc/Cargo.toml
rename to server/voice/grpc/Cargo.toml
diff --git a/voice/grpc/Dockerfile b/server/voice/grpc/Dockerfile
similarity index 100%
rename from voice/grpc/Dockerfile
rename to server/voice/grpc/Dockerfile
diff --git a/voice/grpc/build.rs b/server/voice/grpc/build.rs
similarity index 100%
rename from voice/grpc/build.rs
rename to server/voice/grpc/build.rs
diff --git a/voice/grpc/service.proto b/server/voice/grpc/service.proto
similarity index 100%
rename from voice/grpc/service.proto
rename to server/voice/grpc/service.proto
diff --git a/voice/grpc/src/main.rs b/server/voice/grpc/src/main.rs
similarity index 100%
rename from voice/grpc/src/main.rs
rename to server/voice/grpc/src/main.rs
diff --git a/voice/grpc/src/registry/mod.rs b/server/voice/grpc/src/registry/mod.rs
similarity index 100%
rename from voice/grpc/src/registry/mod.rs
rename to server/voice/grpc/src/registry/mod.rs
diff --git a/voice/grpc/src/registry/voice_channels.v1.rs b/server/voice/grpc/src/registry/voice_channels.v1.rs
similarity index 100%
rename from voice/grpc/src/registry/voice_channels.v1.rs
rename to server/voice/grpc/src/registry/voice_channels.v1.rs
diff --git a/voice/grpc/src/server.rs b/server/voice/grpc/src/server.rs
similarity index 100%
rename from voice/grpc/src/server.rs
rename to server/voice/grpc/src/server.rs
diff --git a/voice/grpc/src/service.rs b/server/voice/grpc/src/service.rs
similarity index 100%
rename from voice/grpc/src/service.rs
rename to server/voice/grpc/src/service.rs
diff --git a/voice/grpc/src/voice_server.v1.rs b/server/voice/grpc/src/voice_server.v1.rs
similarity index 100%
rename from voice/grpc/src/voice_server.v1.rs
rename to server/voice/grpc/src/voice_server.v1.rs
diff --git a/voice/models/Cargo.toml b/server/voice/models/Cargo.toml
similarity index 100%
rename from voice/models/Cargo.toml
rename to server/voice/models/Cargo.toml
diff --git a/voice/models/src/lib.rs b/server/voice/models/src/lib.rs
similarity index 100%
rename from voice/models/src/lib.rs
rename to server/voice/models/src/lib.rs
diff --git a/voice/proto/Cargo.toml b/server/voice/proto/Cargo.toml
similarity index 100%
rename from voice/proto/Cargo.toml
rename to server/voice/proto/Cargo.toml
diff --git a/voice/proto/build.rs b/server/voice/proto/build.rs
similarity index 100%
rename from voice/proto/build.rs
rename to server/voice/proto/build.rs
diff --git a/voice/proto/src/lib.rs b/server/voice/proto/src/lib.rs
similarity index 100%
rename from voice/proto/src/lib.rs
rename to server/voice/proto/src/lib.rs
diff --git a/voice/proto/voice.proto b/server/voice/proto/voice.proto
similarity index 100%
rename from voice/proto/voice.proto
rename to server/voice/proto/voice.proto
diff --git a/ws-proto/Cargo.toml b/server/ws-proto/Cargo.toml
similarity index 100%
rename from ws-proto/Cargo.toml
rename to server/ws-proto/Cargo.toml
diff --git a/ws-proto/src/client.rs b/server/ws-proto/src/client.rs
similarity index 100%
rename from ws-proto/src/client.rs
rename to server/ws-proto/src/client.rs
diff --git a/ws-proto/src/lib.rs b/server/ws-proto/src/lib.rs
similarity index 100%
rename from ws-proto/src/lib.rs
rename to server/ws-proto/src/lib.rs