diff --git a/.gitignore b/.gitignore
index aac91a2..4bffc71 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,5 @@
 /target/
 /output/
+
+#macOS
+.DS_Store
diff --git a/Cargo.toml b/Cargo.toml
index 0bd9bcf..d2a9965 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,3 +1,3 @@
 [workspace]
 resolver = "3"
-members = ["master", "types", "worker"]
+members = ["apps/*", "libs/*"]
diff --git a/master/Cargo.toml b/apps/master/Cargo.toml
similarity index 91%
rename from master/Cargo.toml
rename to apps/master/Cargo.toml
index 4ce2e52..c9eb24f 100644
--- a/master/Cargo.toml
+++ b/apps/master/Cargo.toml
@@ -14,5 +14,5 @@ serenity = { version = "0.12.5", default-features = false, features = [
     "collector",
 ] }
 tokio = { version = "1.49.0", features = ["macros", "rt-multi-thread"] }
-types = { path = "../types" }
+types = { path = "../../libs/types" }
 uuid = { version = "1.21.0" }
diff --git a/master/src/commands/mod.rs b/apps/master/src/commands/mod.rs
similarity index 100%
rename from master/src/commands/mod.rs
rename to apps/master/src/commands/mod.rs
diff --git a/master/src/commands/modal.rs b/apps/master/src/commands/modal.rs
similarity index 100%
rename from master/src/commands/modal.rs
rename to apps/master/src/commands/modal.rs
diff --git a/master/src/commands/ping.rs b/apps/master/src/commands/ping.rs
similarity index 100%
rename from master/src/commands/ping.rs
rename to apps/master/src/commands/ping.rs
diff --git a/master/src/commands/testnats.rs b/apps/master/src/commands/testnats.rs
similarity index 100%
rename from master/src/commands/testnats.rs
rename to apps/master/src/commands/testnats.rs
diff --git a/master/src/main.rs b/apps/master/src/main.rs
similarity index 100%
rename from master/src/main.rs
rename to apps/master/src/main.rs
diff --git a/worker/Cargo.toml b/apps/worker/Cargo.toml
similarity index 90%
rename from worker/Cargo.toml
rename to apps/worker/Cargo.toml
index 33b39cb..68e03aa 100644
--- a/worker/Cargo.toml
+++ b/apps/worker/Cargo.toml
@@ -9,6 +9,6 @@ futures = { version = "0.3.32" }
 futures-executor = { version = "0.3.32" }
 postcard = { version = "1.1.3", features = ["use-std"] }
 tokio = { version = "1.49.0", features = ["macros", "rt-multi-thread"] }
-types = { path = "../types" }
+types = { path = "../../libs/types" }
 which = { version = "8.0.0" }
 yt-dlp = { version = "2.1.0" }
diff --git a/worker/src/main.rs b/apps/worker/src/main.rs
similarity index 100%
rename from worker/src/main.rs
rename to apps/worker/src/main.rs
diff --git a/types/Cargo.toml b/libs/types/Cargo.toml
similarity index 100%
rename from types/Cargo.toml
rename to libs/types/Cargo.toml
diff --git a/types/src/jobs.rs b/libs/types/src/jobs.rs
similarity index 100%
rename from types/src/jobs.rs
rename to libs/types/src/jobs.rs
diff --git a/types/src/lib.rs b/libs/types/src/lib.rs
similarity index 100%
rename from types/src/lib.rs
rename to libs/types/src/lib.rs
diff --git a/types/src/misc.rs b/libs/types/src/misc.rs
similarity index 100%
rename from types/src/misc.rs
rename to libs/types/src/misc.rs