diff --git a/Cargo.lock b/Cargo.lock
index b3e3dacd34..d3137822e4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -54,17 +54,6 @@ dependencies = [
  "cpufeatures",
 ]
 
-[[package]]
-name = "again"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05802a5ad4d172eaf796f7047b42d0af9db513585d16d4169660a21613d34b93"
-dependencies = [
- "log",
- "rand 0.7.3",
- "wasm-timer",
-]
-
 [[package]]
 name = "ahash"
 version = "0.8.11"
@@ -856,15 +845,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "async-stdin"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1ff8b5d9b5ec29e0f49583ba71847b8c8888b67a8510133048a380903aa6822"
-dependencies = [
- "tokio",
-]
-
 [[package]]
 name = "async-stream"
 version = "0.3.6"
@@ -887,17 +867,6 @@ dependencies = [
  "syn 2.0.98",
 ]
 
-[[package]]
-name = "async-throttle"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c99532de164435a0b91279e715bff4fa0d164643b409a67761907ffc210ee8f"
-dependencies = [
- "backoff",
- "dashmap 5.5.3",
- "tokio",
-]
-
 [[package]]
 name = "async-trait"
 version = "0.1.86"
@@ -2038,19 +2007,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "dashmap"
-version = "5.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
-dependencies = [
- "cfg-if",
- "hashbrown 0.14.5",
- "lock_api",
- "once_cell",
- "parking_lot_core 0.9.10",
-]
-
 [[package]]
 name = "dashu"
 version = "0.4.2"
@@ -2843,35 +2799,6 @@ dependencies = [
  "zkvm_interface",
 ]
 
-[[package]]
-name = "ethrex-prover-bench"
-version = "0.1.0"
-dependencies = [
- "again",
- "bincode",
- "bytes",
- "clap 4.5.30",
- "ethrex-common",
- "ethrex-l2",
- "ethrex-prover",
- "ethrex-rlp",
- "ethrex-storage",
- "ethrex-trie",
- "ethrex-vm",
- "futures-util",
- "hex",
- "lazy_static",
- "reqwest",
- "revm 19.5.0",
- "revm-inspectors",
- "revm-primitives 15.2.0",
- "serde",
- "serde_json",
- "tokio",
- "tokio-utils",
- "zkvm_interface",
-]
-
 [[package]]
 name = "ethrex-rlp"
 version = "0.1.0"
@@ -3391,17 +3318,6 @@ dependencies = [
  "typenum",
 ]
 
-[[package]]
-name = "getrandom"
-version = "0.1.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
-dependencies = [
- "cfg-if",
- "libc",
- "wasi 0.9.0+wasi-snapshot-preview1",
-]
-
 [[package]]
 name = "getrandom"
 version = "0.2.15"
@@ -5875,7 +5791,7 @@ dependencies = [
  "lazy_static",
  "num-traits",
  "rand 0.8.5",
- "rand_chacha 0.3.1",
+ "rand_chacha",
  "rand_xorshift",
  "regex-syntax 0.8.5",
  "rusty-fork",
@@ -6012,19 +5928,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "rand"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
-dependencies = [
- "getrandom 0.1.16",
- "libc",
- "rand_chacha 0.2.2",
- "rand_core 0.5.1",
- "rand_hc",
-]
-
 [[package]]
 name = "rand"
 version = "0.8.5"
@@ -6032,21 +5935,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
 dependencies = [
  "libc",
- "rand_chacha 0.3.1",
+ "rand_chacha",
  "rand_core 0.6.4",
  "serde",
 ]
 
-[[package]]
-name = "rand_chacha"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
-dependencies = [
- "ppv-lite86",
- "rand_core 0.5.1",
-]
-
 [[package]]
 name = "rand_chacha"
 version = "0.3.1"
@@ -6072,15 +5965,6 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
 
-[[package]]
-name = "rand_core"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
-dependencies = [
- "getrandom 0.1.16",
-]
-
 [[package]]
 name = "rand_core"
 version = "0.6.4"
@@ -6090,15 +5974,6 @@ dependencies = [
  "getrandom 0.2.15",
 ]
 
-[[package]]
-name = "rand_hc"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
-dependencies = [
- "rand_core 0.5.1",
-]
-
 [[package]]
 name = "rand_xorshift"
 version = "0.3.0"
@@ -7414,15 +7289,6 @@ version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
-[[package]]
-name = "shutdown-async"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2799e69bde7e68bedd86c6d94bffa783219114f1f31435ddda61f4aeba348ff"
-dependencies = [
- "tokio",
-]
-
 [[package]]
 name = "signal-hook-registry"
 version = "1.4.2"
@@ -8427,7 +8293,7 @@ dependencies = [
  "aho-corasick 0.7.20",
  "clap 2.34.0",
  "crossbeam-channel",
- "dashmap 4.0.2",
+ "dashmap",
  "dirs 3.0.2",
  "encoding_rs_io",
  "env_logger",
@@ -8521,18 +8387,6 @@ dependencies = [
  "tokio",
 ]
 
-[[package]]
-name = "tokio-utils"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de75f75f464153a50fe48b9675360e3cf2ae1d7d81f9751363bd2ee4888f5ce8"
-dependencies = [
- "async-stdin",
- "async-throttle",
- "shutdown-async",
- "tub",
-]
-
 [[package]]
 name = "toml"
 version = "0.5.11"
@@ -8770,16 +8624,6 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
-[[package]]
-name = "tub"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bca43faba247bc76eb1d6c1b8b561e4a1c5bdd427cc3d7a007faabea75c683a"
-dependencies = [
- "crossbeam-queue",
- "tokio",
-]
-
 [[package]]
 name = "twirp-rs"
 version = "0.13.0-succinct"
@@ -9060,12 +8904,6 @@ dependencies = [
  "try-lock",
 ]
 
-[[package]]
-name = "wasi"
-version = "0.9.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
-
 [[package]]
 name = "wasi"
 version = "0.11.0+wasi-snapshot-preview1"
@@ -9165,21 +9003,6 @@ dependencies = [
  "web-sys",
 ]
 
-[[package]]
-name = "wasm-timer"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f"
-dependencies = [
- "futures",
- "js-sys",
- "parking_lot 0.11.2",
- "pin-utils",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
-]
-
 [[package]]
 name = "web-sys"
 version = "0.3.77"
diff --git a/Cargo.toml b/Cargo.toml
index e59816d0a8..0eabb6d348 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,27 +1,26 @@
 [workspace]
 members = [
-  "cmd/ef_tests/blockchain",
-  "cmd/ef_tests/state",
-  "cmd/ethrex",
-  "cmd/ethrex_l2",
-  "cmd/hive_report",
-  "cmd/loc",
-  "crates/blockchain",
-  "crates/blockchain/dev",
-  "crates/common",
-  "crates/common/rlp",
-  "crates/l2/",
-  "crates/l2/contracts",
-  "crates/l2/prover",
-  "crates/l2/prover/bench",
-  "crates/l2/sdk",
-  "crates/networking/p2p",
-  "crates/networking/rpc",
-  "crates/storage/store",
-  "crates/storage/trie",
-  "crates/vm",
-  "crates/vm/levm",
-  "crates/vm/levm/bench/revm_comparison",
+    "cmd/ef_tests/blockchain",
+    "cmd/ef_tests/state",
+    "cmd/ethrex",
+    "cmd/ethrex_l2",
+    "cmd/hive_report",
+    "cmd/loc",
+    "crates/blockchain",
+    "crates/blockchain/dev",
+    "crates/common",
+    "crates/common/rlp",
+    "crates/common/trie",
+    "crates/l2/",
+    "crates/l2/contracts",
+    "crates/l2/prover",
+    "crates/l2/sdk",
+    "crates/networking/p2p",
+    "crates/networking/rpc",
+    "crates/storage",
+    "crates/vm",
+    "crates/vm/levm",
+    "crates/vm/levm/bench/revm_comparison",
 ]
 resolver = "2"
 
@@ -36,10 +35,10 @@ ethrex-blockchain = { path = "./crates/blockchain" }
 ethrex-common = { path = "./crates/common" }
 ethrex-p2p = { path = "./crates/networking/p2p" }
 ethrex-rpc = { path = "./crates/networking/rpc" }
-ethrex-storage = { path = "./crates/storage/store" }
+ethrex-storage = { path = "./crates/storage" }
 ethrex-vm = { path = "./crates/vm" }
 ethrex-levm = { path = "./crates/vm/levm" }
-ethrex-trie = { path = "./crates/storage/trie" }
+ethrex-trie = { path = "./crates/common/trie" }
 ethrex-rlp = { path = "./crates/common/rlp" }
 ethrex-l2 = { path = "./crates/l2" }
 ethrex-sdk = { path = "./crates/l2/sdk" }
@@ -69,9 +68,9 @@ redb = "2.2.0"
 snap = "1.1.1"
 k256 = { version = "0.13.3", features = ["ecdh"] }
 secp256k1 = { version = "0.29.1", default-features = false, features = [
-  "global-context",
-  "recovery",
-  "rand",
+    "global-context",
+    "recovery",
+    "rand",
 ] }
 keccak-hash = "0.11.0"
 axum = "0.8.1"
diff --git a/crates/storage/trie/Cargo.toml b/crates/common/trie/Cargo.toml
similarity index 100%
rename from crates/storage/trie/Cargo.toml
rename to crates/common/trie/Cargo.toml
diff --git a/crates/storage/trie/db.rs b/crates/common/trie/db.rs
similarity index 100%
rename from crates/storage/trie/db.rs
rename to crates/common/trie/db.rs
diff --git a/crates/storage/trie/error.rs b/crates/common/trie/error.rs
similarity index 100%
rename from crates/storage/trie/error.rs
rename to crates/common/trie/error.rs
diff --git a/crates/storage/trie/nibbles.rs b/crates/common/trie/nibbles.rs
similarity index 100%
rename from crates/storage/trie/nibbles.rs
rename to crates/common/trie/nibbles.rs
diff --git a/crates/storage/trie/node.rs b/crates/common/trie/node.rs
similarity index 100%
rename from crates/storage/trie/node.rs
rename to crates/common/trie/node.rs
diff --git a/crates/storage/trie/node/branch.rs b/crates/common/trie/node/branch.rs
similarity index 100%
rename from crates/storage/trie/node/branch.rs
rename to crates/common/trie/node/branch.rs
diff --git a/crates/storage/trie/node/extension.rs b/crates/common/trie/node/extension.rs
similarity index 100%
rename from crates/storage/trie/node/extension.rs
rename to crates/common/trie/node/extension.rs
diff --git a/crates/storage/trie/node/leaf.rs b/crates/common/trie/node/leaf.rs
similarity index 100%
rename from crates/storage/trie/node/leaf.rs
rename to crates/common/trie/node/leaf.rs
diff --git a/crates/storage/trie/node_hash.rs b/crates/common/trie/node_hash.rs
similarity index 100%
rename from crates/storage/trie/node_hash.rs
rename to crates/common/trie/node_hash.rs
diff --git a/crates/storage/trie/rlp.rs b/crates/common/trie/rlp.rs
similarity index 100%
rename from crates/storage/trie/rlp.rs
rename to crates/common/trie/rlp.rs
diff --git a/crates/storage/trie/src/main.rs b/crates/common/trie/src/main.rs
similarity index 100%
rename from crates/storage/trie/src/main.rs
rename to crates/common/trie/src/main.rs
diff --git a/crates/storage/trie/state.rs b/crates/common/trie/state.rs
similarity index 100%
rename from crates/storage/trie/state.rs
rename to crates/common/trie/state.rs
diff --git a/crates/storage/trie/test_utils.rs b/crates/common/trie/test_utils.rs
similarity index 100%
rename from crates/storage/trie/test_utils.rs
rename to crates/common/trie/test_utils.rs
diff --git a/crates/storage/trie/trie.rs b/crates/common/trie/trie.rs
similarity index 100%
rename from crates/storage/trie/trie.rs
rename to crates/common/trie/trie.rs
diff --git a/crates/storage/trie/trie_iter.rs b/crates/common/trie/trie_iter.rs
similarity index 100%
rename from crates/storage/trie/trie_iter.rs
rename to crates/common/trie/trie_iter.rs
diff --git a/crates/storage/trie/verify_range.rs b/crates/common/trie/verify_range.rs
similarity index 100%
rename from crates/storage/trie/verify_range.rs
rename to crates/common/trie/verify_range.rs
diff --git a/crates/l2/prover/zkvm/interface/Cargo.toml b/crates/l2/prover/zkvm/interface/Cargo.toml
index 5a2940961f..c249792dd3 100644
--- a/crates/l2/prover/zkvm/interface/Cargo.toml
+++ b/crates/l2/prover/zkvm/interface/Cargo.toml
@@ -12,8 +12,8 @@ thiserror = "2.0.9"
 ethrex-common = { path = "../../../../common/", default-features = false }
 ethrex-vm = { path = "../../../../vm", default-features = false }
 ethrex-rlp = { path = "../../../../common/rlp", default-features = false }
-ethrex-storage = { path = "../../../../storage/store", default-features = false }
-ethrex-trie = { path = "../../../../storage/trie", default-features = false }
+ethrex-storage = { path = "../../../../storage", default-features = false }
+ethrex-trie = { path = "../../../../common/trie", default-features = false }
 
 [build-dependencies]
 risc0-build = { version = "1.2.2" }
diff --git a/crates/storage/store/Cargo.toml b/crates/storage/Cargo.toml
similarity index 100%
rename from crates/storage/store/Cargo.toml
rename to crates/storage/Cargo.toml
diff --git a/crates/storage/store/api.rs b/crates/storage/api.rs
similarity index 100%
rename from crates/storage/store/api.rs
rename to crates/storage/api.rs
diff --git a/crates/storage/store/error.rs b/crates/storage/error.rs
similarity index 100%
rename from crates/storage/store/error.rs
rename to crates/storage/error.rs
diff --git a/crates/storage/store/lib.rs b/crates/storage/lib.rs
similarity index 100%
rename from crates/storage/store/lib.rs
rename to crates/storage/lib.rs
diff --git a/crates/storage/store/rlp.rs b/crates/storage/rlp.rs
similarity index 100%
rename from crates/storage/store/rlp.rs
rename to crates/storage/rlp.rs
diff --git a/crates/storage/store/store.rs b/crates/storage/store.rs
similarity index 99%
rename from crates/storage/store/store.rs
rename to crates/storage/store.rs
index 6549da24cc..cc219d2029 100644
--- a/crates/storage/store/store.rs
+++ b/crates/storage/store.rs
@@ -1239,8 +1239,8 @@ mod tests {
     }
 
     fn test_genesis_block(store: Store) {
-        const GENESIS_KURTOSIS: &str = include_str!("../../../test_data/genesis-kurtosis.json");
-        const GENESIS_HIVE: &str = include_str!("../../../test_data/genesis-hive.json");
+        const GENESIS_KURTOSIS: &str = include_str!("../../test_data/genesis-kurtosis.json");
+        const GENESIS_HIVE: &str = include_str!("../../test_data/genesis-hive.json");
         assert_ne!(GENESIS_KURTOSIS, GENESIS_HIVE);
         let genesis_kurtosis: Genesis =
             serde_json::from_str(GENESIS_KURTOSIS).expect("deserialize genesis-kurtosis.json");
diff --git a/crates/storage/store/store_db/in_memory.rs b/crates/storage/store_db/in_memory.rs
similarity index 100%
rename from crates/storage/store/store_db/in_memory.rs
rename to crates/storage/store_db/in_memory.rs
diff --git a/crates/storage/store/store_db/libmdbx.rs b/crates/storage/store_db/libmdbx.rs
similarity index 100%
rename from crates/storage/store/store_db/libmdbx.rs
rename to crates/storage/store_db/libmdbx.rs
diff --git a/crates/storage/store/store_db/mod.rs b/crates/storage/store_db/mod.rs
similarity index 100%
rename from crates/storage/store/store_db/mod.rs
rename to crates/storage/store_db/mod.rs
diff --git a/crates/storage/store/store_db/redb.rs b/crates/storage/store_db/redb.rs
similarity index 100%
rename from crates/storage/store/store_db/redb.rs
rename to crates/storage/store_db/redb.rs
diff --git a/crates/storage/store/trie_db/libmdbx.rs b/crates/storage/trie_db/libmdbx.rs
similarity index 100%
rename from crates/storage/store/trie_db/libmdbx.rs
rename to crates/storage/trie_db/libmdbx.rs
diff --git a/crates/storage/store/trie_db/libmdbx_dupsort.rs b/crates/storage/trie_db/libmdbx_dupsort.rs
similarity index 100%
rename from crates/storage/store/trie_db/libmdbx_dupsort.rs
rename to crates/storage/trie_db/libmdbx_dupsort.rs
diff --git a/crates/storage/store/trie_db/mod.rs b/crates/storage/trie_db/mod.rs
similarity index 100%
rename from crates/storage/store/trie_db/mod.rs
rename to crates/storage/trie_db/mod.rs
diff --git a/crates/storage/store/trie_db/redb.rs b/crates/storage/trie_db/redb.rs
similarity index 100%
rename from crates/storage/store/trie_db/redb.rs
rename to crates/storage/trie_db/redb.rs
diff --git a/crates/storage/store/trie_db/redb_multitable.rs b/crates/storage/trie_db/redb_multitable.rs
similarity index 100%
rename from crates/storage/store/trie_db/redb_multitable.rs
rename to crates/storage/trie_db/redb_multitable.rs
diff --git a/crates/storage/store/trie_db/test_utils.rs b/crates/storage/trie_db/test_utils.rs
similarity index 100%
rename from crates/storage/store/trie_db/test_utils.rs
rename to crates/storage/trie_db/test_utils.rs
diff --git a/crates/storage/store/trie_db/utils.rs b/crates/storage/trie_db/utils.rs
similarity index 100%
rename from crates/storage/store/trie_db/utils.rs
rename to crates/storage/trie_db/utils.rs
diff --git a/crates/storage/store/utils.rs b/crates/storage/utils.rs
similarity index 100%
rename from crates/storage/store/utils.rs
rename to crates/storage/utils.rs