diff --git a/Cargo.toml b/Cargo.toml
index 098f74375..0721e12d2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -77,31 +77,45 @@ alloy-provider = { git = "https://github.com/brechtpd/alloy", branch = "175_4e22
 alloy-transport-http = { git = "https://github.com/brechtpd/alloy", branch = "175_4e22b9e" }
 alloy-signer = { git = "https://github.com/brechtpd/alloy", branch = "175_4e22b9e" }
 alloy-signer-wallet = { git = "https://github.com/brechtpd/alloy", branch = "175_4e22b9e" }
+reqwest_alloy = { package = "reqwest", version = "0.12.4", features = ["json"] }
+
 
 # ethers (TODO: remove)
 ethers-contract = { git = "https://github.com/smtmfft/ethers-rs", branch = "ethers-core-2.0.10" }
 ethers-core = { git = "https://github.com/smtmfft/ethers-rs", branch = "ethers-core-2.0.10" }
 ethers-providers = { git = "https://github.com/smtmfft/ethers-rs", branch = "ethers-core-2.0.10" }
 
-# serde
+# Conversion, serialization, codecs, compression
 serde = { version = "1.0", default-features = false, features = [
     "derive",
     "alloc",
 ] }
 serde_json = { version = "1.0", default-features = false, features = ["alloc"] }
 serde_with = { version = "3.0" }
+bincode = "1.3.3"
+bytemuck = "1.13"
+flate2 = "1.0.28"
+rlp = "0.5.2"
+hex = { version = "0.4.3" }
+hex-literal = "0.4"
+base64-serde = "0.7.0"
+base64 = "0.21.7"
+libflate = { version = "2.0.0" }
+typetag = { version = "0.2.15" }
 
-# tracing
+# tracing, logging
 tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = ["env-filter", "json"] }
 tracing-appender = "0.2"
+log = { version = "0.4.13" }
+env_logger = { version = "0.11.3" }
 
 # memory
 cap = { git = "https://github.com/brechtpd/cap", branch = "more-stats", features = [
     "stats",
 ] }
 
-# server
+# async, server, http queries
 axum = { version = "0.7.4", features = ["macros"] }
 tower-http = { version = "0.5.2", features = ["full"] }
 tower = { version = "0.4.13", features = ["full"] }
@@ -110,6 +124,10 @@ utoipa-scalar = { version = "0.1.0", features = ["axum"] }
 utoipa = { version = "4.2.0", features = ["axum_extras"] }
 structopt = "0.3.24"
 prometheus = { version = "0.13.3", features = ["process"] }
+tokio = { version = "^1.23", features = ["full"] }
+hyper = { version = "0.14.27", features = ["server"] }
+reqwest = { version = "0.11.22", features = ["json"] }
+url = "2.5.0"
 
 # crypto
 c-kzg = "1.0.0"
@@ -125,41 +143,26 @@ secp256k1 = { version = "0.27.0", features = [
     "recovery",
 ] }
 
+# Error model
+anyhow = "1.0"
+thiserror = "1.0"
+thiserror-no-std = "2.0.2"
+
 # misc
 hashbrown = { version = "0.14", features = ["inline-more"] }
 tempfile = "3.8"
-anyhow = "1.0"
-bincode = "1.3.3"
-bytemuck = "1.13"
 cargo_metadata = "0.12.1"
 clap = { version = "4.4.6", features = ["derive", "string", "env"] }
-flate2 = "1.0.28"
-tokio = { version = "^1.23", features = ["full"] }
-hyper = { version = "0.14.27", features = ["server"] }
 lru_time_cache = "0.11.11"
 lazy_static = "1.4.0"
 once_cell = "1.8.0"
-thiserror = "1.0"
-reqwest = { version = "0.11.22", features = ["json"] }
-reqwest_alloy = { package = "reqwest", version = "0.12.4", features = ["json"] }
 proptest = "1.4.0"
-rlp = "0.5.2"
-url = "2.5.0"
 cfg-if = "1.0.0"
-libflate = { version = "2.0.0" }
-log = { version = "0.4.13" }
-env_logger = { version = "0.11.3" }
-typetag = { version = "0.2.15" }
-hex = { version = "0.4.3" }
-thiserror-no-std = "2.0.2"
 chrono = { version = "0.4", default-features = false }
-hex-literal = "0.4"
 assert_cmd = "2.0"
 regex = "1.5.4"
 rstest = "0.18"
 rand = "0.8.5"
 rand_core = "0.6.4"
-base64-serde = "0.7.0"
-base64 = "0.21.7"
 dirs = "5.0.1"
 pathdiff = "0.2.1"