diff --git a/Cargo.toml b/Cargo.toml
index 1c5f34b..c1c71bc 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -15,37 +15,50 @@ strip = "debuginfo"
 codegen-units = 512
 
 [dependencies]
-actix-cors = "0.7.1"
-actix-web = "4.11"
-argon2 = { version = "0.5.3", features = ["std"] }
+thiserror = "2.0.12"
+
+# CLI
 clap = { version = "4.5", features = ["derive"] }
-futures = "0.3"
-getrandom = "0.3"
-hex = "0.4"
 log = "0.4"
-regex = "1.11"
+simple_logger = "5.0.0"
+
+# async
+futures = "0.3"
+tokio = { version = "1.46", features = ["full"] }
+futures-util = "0.3.31"
+
+# Data (de)serialization
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-simple_logger = "5.0.0"
-redis = { version = "0.32", features= ["tokio-comp"] }
-tokio-tungstenite = { version = "0.27", features = ["native-tls", "url"] }
 toml = "0.8"
-url = { version = "2.5", features = ["serde"] }
-uuid = { version = "1.17", features = ["serde", "v7"] }
-random-string = "1.1"
-actix-ws = "0.3.0"
-futures-util = "0.3.31"
-bunny-api-tokio = { version = "0.4", features = ["edge_storage"], default-features = false }
+
+# File Storage
 bindet = "0.3.2"
+bunny-api-tokio = { version = "0.4", features = ["edge_storage"], default-features = false }
+
+# Web Server
+actix-web = "4.11"
+actix-cors = "0.7.1"
+actix-ws = "0.3.0"
+actix-multipart = "0.7.2"
+url = { version = "2.5", features = ["serde"] }
+tokio-tungstenite = { version = "0.27", features = ["native-tls", "url"] }
+
+# Database
+uuid = { version = "1.17", features = ["serde", "v7"] }
+redis = { version = "0.32", features= ["tokio-comp"] }
 deadpool = "0.12"
 diesel = { version = "2.2", features = ["uuid", "chrono"], default-features = false }
-diesel-async = { version = "0.5", features = ["deadpool", "postgres", "async-connection-wrapper"] }
+diesel-async = { version = "0.6", features = ["deadpool", "postgres", "async-connection-wrapper"] }
 diesel_migrations = { version = "2.2.0", features = ["postgres"] }
-thiserror = "2.0.12"
-actix-multipart = "0.7.2"
+
+# Authentication
+argon2 = { version = "0.5.3", features = ["std"] }
+getrandom = "0.3"
+hex = "0.4"
+regex = "1.11"
+random-string = "1.1"
 lettre = { version = "0.11", features = ["tokio1", "tokio1-native-tls"] }
 chrono = { version = "0.4.41", features = ["serde"] }
 
-[dependencies.tokio]
-version = "1.45"
-features = ["full"]
+