refactor: move crates into crates folder and remove redundant prefixes (

#1624)
ethereum · Jan 13, 2025 · dbdf060 · dbdf060
1 parent 4323283
commit dbdf060
Show file tree

Hide file tree

Showing 279 changed files with 68 additions and 81 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -5,23 +5,11 @@
 !Cargo.lock
 !Cargo.toml
 !/bin
-!/e2store
-!/ethportal-api
+!/crates
 !/ethportal-peertest
-!/light-client
-!/portalnet
 !/portal-bridge
-!/rpc
-!/src
-!/trin-beacon
-!/trin-evm
+!/testing
 !/trin-execution
-!/trin-history
-!/trin-metrics
-!/trin-state
-!/trin-storage
-!/trin-utils
-!/trin-validation
 !/utp-testing
 
 # include for vergen constants

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,22 +1,22 @@
 [workspace]
 members = [
     "bin/trin", 
-    "ethportal-api",
+    "crates/ethportal-api",
+    "crates/e2store",
+    "crates/evm",
+    "crates/light-client",
+    "crates/metrics",
+    "crates/rpc",
+    "crates/storage",
+    "crates/subnetworks/beacon",
+    "crates/subnetworks/history",
+    "crates/subnetworks/state",
+    "crates/utils",
+    "crates/validation",    
     "ethportal-peertest",
-    "e2store",
-    "light-client",
-    "trin-metrics",
     "portal-bridge",
-    "rpc",
     "testing/ef-tests",
-    "trin-beacon",
-    "trin-evm",
     "trin-execution",
-    "trin-history",
-    "trin-state",
-    "trin-storage",
-    "trin-utils",
-    "trin-validation",
     "utp-testing",
 ]
 
@@ -97,19 +97,19 @@ url = "2.3.1"
 utp-rs = { tag = "v0.1.0-alpha.14", git = "https://github.com/ethereum/utp" }
 
 # Trin workspace crates
-e2store = { path = "e2store" }
-ethportal-api = { path = "ethportal-api" }
-light-client = { path = "light-client" }
+e2store = { path = "crates/e2store" }
+ethportal-api = { path = "crates/ethportal-api" }
+light-client = { path = "crates/light-client" }
 portal-bridge = { path = "portal-bridge" }
-portalnet = { path = "portalnet" }
-rpc = { path = "rpc"}
+portalnet = { path = "crates/portalnet" }
+rpc = { path = "crates/rpc"}
 trin = { path = "bin/trin"}
-trin-beacon = { path = "trin-beacon" }
-trin-evm = { path = "trin-evm" }
+trin-beacon = { path = "crates/subnetworks/beacon" }
+trin-evm = { path = "crates/evm" }
 trin-execution = { path = "trin-execution" }
-trin-history = { path = "trin-history" }
-trin-metrics = { path = "trin-metrics" }
-trin-state = { path = "trin-state" }
-trin-storage = { path = "trin-storage" }
-trin-utils = { path = "trin-utils" }
-trin-validation = { path = "trin-validation" }
+trin-history = { path = "crates/subnetworks/history" }
+trin-metrics = { path = "crates/metrics" }
+trin-state = { path = "crates/subnetworks/state" }
+trin-storage = { path = "crates/storage" }
+trin-utils = { path = "crates/utils" }
+trin-validation = { path = "crates/validation" }
diff --git a/book/src/developers/core_concepts/cryptographic_accumulator.md b/book/src/developers/core_concepts/cryptographic_accumulator.md
@@ -90,7 +90,7 @@ that the data is canonical.
 ## Accumulator distribution
 
 The Accumulator is built once and then distributed in Trin (and other clients). It does not
-change over time and so can be incorporated into the `trin-validation` (`./trin-validation/src/assets`) and
+change over time and so can be incorporated into the `trin-validation` (`./crates/validation/src/assets`) and
 included in binary releases.
 
 The History network contains individual epoch hashes from the Master Accumulator and

diff --git a/e2store/Cargo.toml → crates/e2store/Cargo.toml b/e2store/Cargo.toml → crates/e2store/Cargo.toml
diff --git a/e2store/README.md → crates/e2store/README.md b/e2store/README.md → crates/e2store/README.md
diff --git a/e2store/src/bin/era2-stats.rs → crates/e2store/src/bin/era2-stats.rs b/e2store/src/bin/era2-stats.rs → crates/e2store/src/bin/era2-stats.rs
diff --git a/e2store/src/e2store/memory.rs → crates/e2store/src/e2store/memory.rs b/e2store/src/e2store/memory.rs → crates/e2store/src/e2store/memory.rs
diff --git a/e2store/src/e2store/mod.rs → crates/e2store/src/e2store/mod.rs b/e2store/src/e2store/mod.rs → crates/e2store/src/e2store/mod.rs
diff --git a/e2store/src/e2store/stream.rs → crates/e2store/src/e2store/stream.rs b/e2store/src/e2store/stream.rs → crates/e2store/src/e2store/stream.rs
diff --git a/e2store/src/e2store/types.rs → crates/e2store/src/e2store/types.rs b/e2store/src/e2store/types.rs → crates/e2store/src/e2store/types.rs
diff --git a/e2store/src/era.rs → crates/e2store/src/era.rs b/e2store/src/era.rs → crates/e2store/src/era.rs
diff --git a/e2store/src/era1.rs → crates/e2store/src/era1.rs b/e2store/src/era1.rs → crates/e2store/src/era1.rs
@@ -413,16 +413,16 @@ mod tests {
     use super::*;
 
     #[rstest::rstest]
-    #[case::era1("../test_assets/era1/mainnet-00000-5ec1ffb8.era1")]
-    #[case::era1("../test_assets/era1/mainnet-00001-a5364e9a.era1")]
+    #[case::era1("../../test_assets/era1/mainnet-00000-5ec1ffb8.era1")]
+    #[case::era1("../../test_assets/era1/mainnet-00001-a5364e9a.era1")]
     // epoch #10 contains txs
-    #[case::era1("../test_assets/era1/mainnet-00010-5f5d4516.era1")]
+    #[case::era1("../../test_assets/era1/mainnet-00010-5f5d4516.era1")]
     // this is a test era1 file that has been amended for size purposes,
     // since era1 files that contain typed txs are quite large.
     // it was created by copying the `mainnet-01600-c6a9ee35.era1` file
     // - the first 10 block tuples are included, unchanged
     // - the following 8182 block tuples contain empty bodies and receipts
-    #[case::era1("../test_assets/era1/test-mainnet-01600-xxxxxxxx.era1")]
+    #[case::era1("../../test_assets/era1/test-mainnet-01600-xxxxxxxx.era1")]
     fn test_era1(#[case] path: &str) {
         let era1 = Era1::read_from_file(path.to_string()).unwrap();
         let actual = era1.write().unwrap();
@@ -433,9 +433,9 @@ mod tests {
     }
 
     #[rstest::rstest]
-    #[case("../test_assets/era1/mainnet-00000-5ec1ffb8.era1", 0)]
-    #[case("../test_assets/era1/mainnet-00001-a5364e9a.era1", 8192)]
-    #[case("../test_assets/era1/mainnet-00010-5f5d4516.era1", 81920)]
+    #[case("../../test_assets/era1/mainnet-00000-5ec1ffb8.era1", 0)]
+    #[case("../../test_assets/era1/mainnet-00001-a5364e9a.era1", 8192)]
+    #[case("../../test_assets/era1/mainnet-00010-5f5d4516.era1", 81920)]
     fn test_era1_index(#[case] path: &str, #[case] index: u64) {
         let era1 = Era1::read_from_file(path.to_string()).unwrap();
         assert_eq!(era1.block_index.block_index.starting_number, index);

diff --git a/e2store/src/era2.rs → crates/e2store/src/era2.rs b/e2store/src/era2.rs → crates/e2store/src/era2.rs
diff --git a/e2store/src/lib.rs → crates/e2store/src/lib.rs b/e2store/src/lib.rs → crates/e2store/src/lib.rs
diff --git a/e2store/src/types.rs → crates/e2store/src/types.rs b/e2store/src/types.rs → crates/e2store/src/types.rs
diff --git a/e2store/src/utils.rs → crates/e2store/src/utils.rs b/e2store/src/utils.rs → crates/e2store/src/utils.rs
diff --git a/ethportal-api/Cargo.toml → crates/ethportal-api/Cargo.toml b/ethportal-api/Cargo.toml → crates/ethportal-api/Cargo.toml
diff --git a/ethportal-api/LICENSE → crates/ethportal-api/LICENSE b/ethportal-api/LICENSE → crates/ethportal-api/LICENSE
diff --git a/ethportal-api/README.md → crates/ethportal-api/README.md b/ethportal-api/README.md → crates/ethportal-api/README.md
diff --git a/ethportal-api/build.rs → crates/ethportal-api/build.rs b/ethportal-api/build.rs → crates/ethportal-api/build.rs
diff --git a/...i/src/assets/test/block_body_14764013.bin → ...i/src/assets/test/block_body_14764013.bin b/...i/src/assets/test/block_body_14764013.bin → ...i/src/assets/test/block_body_14764013.bin
diff --git a/...-api/src/assets/test/fluffy_epoch_acc.bin → ...-api/src/assets/test/fluffy_epoch_acc.bin b/...-api/src/assets/test/fluffy_epoch_acc.bin → ...-api/src/assets/test/fluffy_epoch_acc.bin
diff --git a/...ssets/test/fluffy_header_with_proofs.json → ...ssets/test/fluffy_header_with_proofs.json b/...ssets/test/fluffy_header_with_proofs.json → ...ssets/test/fluffy_header_with_proofs.json
diff --git a/...api/src/assets/test/receipts_14764013.bin → ...api/src/assets/test/receipts_14764013.bin b/...api/src/assets/test/receipts_14764013.bin → ...api/src/assets/test/receipts_14764013.bin
diff --git a/.../src/assets/test/ultralight_testEpoch.hex → .../src/assets/test/ultralight_testEpoch.hex b/.../src/assets/test/ultralight_testEpoch.hex → .../src/assets/test/ultralight_testEpoch.hex
diff --git a/ethportal-api/src/beacon.rs → crates/ethportal-api/src/beacon.rs b/ethportal-api/src/beacon.rs → crates/ethportal-api/src/beacon.rs
diff --git a/ethportal-api/src/discv5.rs → crates/ethportal-api/src/discv5.rs b/ethportal-api/src/discv5.rs → crates/ethportal-api/src/discv5.rs
diff --git a/ethportal-api/src/eth.rs → crates/ethportal-api/src/eth.rs b/ethportal-api/src/eth.rs → crates/ethportal-api/src/eth.rs
diff --git a/ethportal-api/src/history.rs → crates/ethportal-api/src/history.rs b/ethportal-api/src/history.rs → crates/ethportal-api/src/history.rs
diff --git a/ethportal-api/src/lib.rs → crates/ethportal-api/src/lib.rs b/ethportal-api/src/lib.rs → crates/ethportal-api/src/lib.rs
diff --git a/ethportal-api/src/state.rs → crates/ethportal-api/src/state.rs b/ethportal-api/src/state.rs → crates/ethportal-api/src/state.rs
diff --git a/crates/ethportal-api/src/test_utils/constants.rs b/crates/ethportal-api/src/test_utils/constants.rs
@@ -0,0 +1 @@
+pub const PORTAL_SPEC_TESTS_SUBMODULE_PATH: &str = "../../portal-spec-tests";
diff --git a/ethportal-api/src/test_utils/mod.rs → crates/ethportal-api/src/test_utils/mod.rs b/ethportal-api/src/test_utils/mod.rs → crates/ethportal-api/src/test_utils/mod.rs
diff --git a/ethportal-api/src/types/bytes.rs → crates/ethportal-api/src/types/bytes.rs b/ethportal-api/src/types/bytes.rs → crates/ethportal-api/src/types/bytes.rs
diff --git a/...l-api/src/types/consensus/beacon_block.rs → ...l-api/src/types/consensus/beacon_block.rs b/...l-api/src/types/consensus/beacon_block.rs → ...l-api/src/types/consensus/beacon_block.rs
diff --git a/...l-api/src/types/consensus/beacon_state.rs → ...l-api/src/types/consensus/beacon_state.rs b/...l-api/src/types/consensus/beacon_state.rs → ...l-api/src/types/consensus/beacon_state.rs
diff --git a/ethportal-api/src/types/consensus/body.rs → ...ethportal-api/src/types/consensus/body.rs b/ethportal-api/src/types/consensus/body.rs → ...ethportal-api/src/types/consensus/body.rs
diff --git a/.../src/types/consensus/execution_payload.rs → .../src/types/consensus/execution_payload.rs b/.../src/types/consensus/execution_payload.rs → .../src/types/consensus/execution_payload.rs
diff --git a/ethportal-api/src/types/consensus/fork.rs → ...ethportal-api/src/types/consensus/fork.rs b/ethportal-api/src/types/consensus/fork.rs → ...ethportal-api/src/types/consensus/fork.rs
diff --git a/ethportal-api/src/types/consensus/header.rs → ...hportal-api/src/types/consensus/header.rs b/ethportal-api/src/types/consensus/header.rs → ...hportal-api/src/types/consensus/header.rs
diff --git a/...c/types/consensus/historical_summaries.rs → ...c/types/consensus/historical_summaries.rs b/...c/types/consensus/historical_summaries.rs → ...c/types/consensus/historical_summaries.rs
diff --git a/...api/src/types/consensus/kzg_commitment.rs → ...api/src/types/consensus/kzg_commitment.rs b/...api/src/types/consensus/kzg_commitment.rs → ...api/src/types/consensus/kzg_commitment.rs
diff --git a/...types/consensus/light_client/bootstrap.rs → ...types/consensus/light_client/bootstrap.rs b/...types/consensus/light_client/bootstrap.rs → ...types/consensus/light_client/bootstrap.rs
diff --git a/...consensus/light_client/finality_update.rs → ...consensus/light_client/finality_update.rs b/...consensus/light_client/finality_update.rs → ...consensus/light_client/finality_update.rs
diff --git a/...rc/types/consensus/light_client/header.rs → ...rc/types/consensus/light_client/header.rs b/...rc/types/consensus/light_client/header.rs → ...rc/types/consensus/light_client/header.rs
diff --git a/...i/src/types/consensus/light_client/mod.rs → ...i/src/types/consensus/light_client/mod.rs b/...i/src/types/consensus/light_client/mod.rs → ...i/src/types/consensus/light_client/mod.rs
diff --git a/...nsensus/light_client/optimistic_update.rs → ...nsensus/light_client/optimistic_update.rs b/...nsensus/light_client/optimistic_update.rs → ...nsensus/light_client/optimistic_update.rs
diff --git a/...src/types/consensus/light_client/store.rs → ...src/types/consensus/light_client/store.rs b/...src/types/consensus/light_client/store.rs → ...src/types/consensus/light_client/store.rs
diff --git a/...rc/types/consensus/light_client/update.rs → ...rc/types/consensus/light_client/update.rs b/...rc/types/consensus/light_client/update.rs → ...rc/types/consensus/light_client/update.rs
diff --git a/ethportal-api/src/types/consensus/mod.rs → .../ethportal-api/src/types/consensus/mod.rs b/ethportal-api/src/types/consensus/mod.rs → .../ethportal-api/src/types/consensus/mod.rs
diff --git a/...rc/types/consensus/participation_flags.rs → ...rc/types/consensus/participation_flags.rs b/...rc/types/consensus/participation_flags.rs → ...rc/types/consensus/participation_flags.rs
diff --git a/ethportal-api/src/types/consensus/pubkey.rs → ...hportal-api/src/types/consensus/pubkey.rs b/ethportal-api/src/types/consensus/pubkey.rs → ...hportal-api/src/types/consensus/pubkey.rs
diff --git a/ethportal-api/src/types/consensus/serde.rs → ...thportal-api/src/types/consensus/serde.rs b/ethportal-api/src/types/consensus/serde.rs → ...thportal-api/src/types/consensus/serde.rs
diff --git a/...rtal-api/src/types/consensus/signature.rs → ...rtal-api/src/types/consensus/signature.rs b/...rtal-api/src/types/consensus/signature.rs → ...rtal-api/src/types/consensus/signature.rs
diff --git a/...api/src/types/consensus/sync_committee.rs → ...api/src/types/consensus/sync_committee.rs b/...api/src/types/consensus/sync_committee.rs → ...api/src/types/consensus/sync_committee.rs
diff --git a/...ortal-api/src/types/content_key/beacon.rs → ...ortal-api/src/types/content_key/beacon.rs b/...ortal-api/src/types/content_key/beacon.rs → ...ortal-api/src/types/content_key/beacon.rs
diff --git a/ethportal-api/src/types/content_key/error.rs → ...portal-api/src/types/content_key/error.rs b/ethportal-api/src/types/content_key/error.rs → ...portal-api/src/types/content_key/error.rs
diff --git a/...rtal-api/src/types/content_key/history.rs → ...rtal-api/src/types/content_key/history.rs b/...rtal-api/src/types/content_key/history.rs → ...rtal-api/src/types/content_key/history.rs
diff --git a/ethportal-api/src/types/content_key/mod.rs → ...thportal-api/src/types/content_key/mod.rs b/ethportal-api/src/types/content_key/mod.rs → ...thportal-api/src/types/content_key/mod.rs
diff --git a/...rtal-api/src/types/content_key/overlay.rs → ...rtal-api/src/types/content_key/overlay.rs b/...rtal-api/src/types/content_key/overlay.rs → ...rtal-api/src/types/content_key/overlay.rs
diff --git a/ethportal-api/src/types/content_key/state.rs → ...portal-api/src/types/content_key/state.rs b/ethportal-api/src/types/content_key/state.rs → ...portal-api/src/types/content_key/state.rs
diff --git a/...tal-api/src/types/content_value/beacon.rs → ...tal-api/src/types/content_value/beacon.rs b/...tal-api/src/types/content_value/beacon.rs → ...tal-api/src/types/content_value/beacon.rs
@@ -557,7 +557,7 @@ mod test {
     #[test]
     fn light_client_bootstrap_encode_decode() {
         let file = fs::read_to_string(
-            "../test_assets/portalnet/content/beacon/light_client_bootstrap.json",
+            "../../test_assets/portalnet/content/beacon/light_client_bootstrap.json",
         )
         .unwrap();
         let json: serde_json::Value = serde_json::from_str(&file).unwrap();
@@ -587,7 +587,7 @@ mod test {
     #[test]
     fn light_client_updates_by_range_encode_decode() {
         let file = fs::read_to_string(
-            "../test_assets/portalnet/content/beacon/light_client_updates_by_range.json",
+            "../../test_assets/portalnet/content/beacon/light_client_updates_by_range.json",
         )
         .unwrap();
         let json: serde_json::Value = serde_json::from_str(&file).unwrap();
@@ -623,7 +623,7 @@ mod test {
     #[test]
     fn light_client_optimistic_update_encode_decode() {
         let file = fs::read_to_string(
-            "../test_assets/portalnet/content/beacon/light_client_optimistic_update.json",
+            "../../test_assets/portalnet/content/beacon/light_client_optimistic_update.json",
         )
         .unwrap();
         let json: serde_json::Value = serde_json::from_str(&file).unwrap();
@@ -653,7 +653,7 @@ mod test {
     #[test]
     fn light_client_finality_update_encode_decode() {
         let file = fs::read_to_string(
-            "../test_assets/portalnet/content/beacon/light_client_finality_update.json",
+            "../../test_assets/portalnet/content/beacon/light_client_finality_update.json",
         )
         .unwrap();
         let json: serde_json::Value = serde_json::from_str(&file).unwrap();
@@ -682,7 +682,7 @@ mod test {
 
     #[test]
     fn historical_summaries_with_proof_encode_decode() {
-        let file = fs::read_to_string("./../portal-spec-tests/tests/mainnet/beacon_chain/historical_summaries_with_proof/deneb/historical_summaries_with_proof.yaml").unwrap();
+        let file = fs::read_to_string("./../../portal-spec-tests/tests/mainnet/beacon_chain/historical_summaries_with_proof/deneb/historical_summaries_with_proof.yaml").unwrap();
         let value: serde_yaml::Value = serde_yaml::from_str(&file).unwrap();
         let content_key = BeaconContentKey::deserialize(&value["content_key"]).unwrap();
         let content_bytes = RawContentValue::deserialize(&value["content_value"]).unwrap();

diff --git a/...-api/src/types/content_value/constants.rs → ...-api/src/types/content_value/constants.rs b/...-api/src/types/content_value/constants.rs → ...-api/src/types/content_value/constants.rs
diff --git a/...rtal-api/src/types/content_value/error.rs → ...rtal-api/src/types/content_value/error.rs b/...rtal-api/src/types/content_value/error.rs → ...rtal-api/src/types/content_value/error.rs
diff --git a/...al-api/src/types/content_value/history.rs → ...al-api/src/types/content_value/history.rs b/...al-api/src/types/content_value/history.rs → ...al-api/src/types/content_value/history.rs
@@ -67,8 +67,7 @@ mod test {
     #[test]
     fn header_with_proof_encode_decode_fluffy() {
         let file =
-            fs::read_to_string("../trin-validation/src/assets/fluffy/header_with_proofs.json")
-                .unwrap();
+            fs::read_to_string("../validation/src/assets/fluffy/header_with_proofs.json").unwrap();
         let json: Value = serde_json::from_str(&file).unwrap();
         let json = json.as_object().unwrap();
         for (block_num, obj) in json {

diff --git a/ethportal-api/src/types/content_value/mod.rs → ...portal-api/src/types/content_value/mod.rs b/ethportal-api/src/types/content_value/mod.rs → ...portal-api/src/types/content_value/mod.rs
diff --git a/...rtal-api/src/types/content_value/state.rs → ...rtal-api/src/types/content_value/state.rs b/...rtal-api/src/types/content_value/state.rs → ...rtal-api/src/types/content_value/state.rs
diff --git a/ethportal-api/src/types/discv5.rs → crates/ethportal-api/src/types/discv5.rs b/ethportal-api/src/types/discv5.rs → crates/ethportal-api/src/types/discv5.rs
diff --git a/ethportal-api/src/types/distance.rs → crates/ethportal-api/src/types/distance.rs b/ethportal-api/src/types/distance.rs → crates/ethportal-api/src/types/distance.rs
diff --git a/ethportal-api/src/types/enr.rs → crates/ethportal-api/src/types/enr.rs b/ethportal-api/src/types/enr.rs → crates/ethportal-api/src/types/enr.rs
diff --git a/...al-api/src/types/execution/accumulator.rs → ...al-api/src/types/execution/accumulator.rs b/...al-api/src/types/execution/accumulator.rs → ...al-api/src/types/execution/accumulator.rs
diff --git a/...tal-api/src/types/execution/block_body.rs → ...tal-api/src/types/execution/block_body.rs b/...tal-api/src/types/execution/block_body.rs → ...tal-api/src/types/execution/block_body.rs
@@ -568,7 +568,7 @@ mod tests {
         let encoded = block_body.as_ssz_bytes();
 
         let expected: Vec<u8> =
-            std::fs::read("../test_assets/mainnet/block_body_14764013.bin").unwrap();
+            std::fs::read("../../test_assets/mainnet/block_body_14764013.bin").unwrap();
         assert_eq!(hex_encode(&encoded), hex_encode(expected));
 
         let decoded = BlockBody::from_ssz_bytes(&encoded).unwrap();
@@ -601,7 +601,7 @@ mod tests {
     #[test_log::test]
     fn shanghai_block_body_round_trip() {
         // block 17139055
-        let raw = std::fs::read("../test_assets/mainnet/block_body_17139055.bin").unwrap();
+        let raw = std::fs::read("../../test_assets/mainnet/block_body_17139055.bin").unwrap();
         let body = BlockBodyShanghai::from_ssz_bytes(&raw).unwrap();
         assert_eq!(body.withdrawals.len(), 16);
         let withdrawals: Vec<Withdrawal> = serde_json::from_str(&shanghai_withdrawals()).unwrap();
@@ -613,7 +613,7 @@ mod tests {
     #[test_log::test]
     fn shanghai_block_body_transaction_hashes() {
         // block 17139055
-        let raw = std::fs::read("../test_assets/mainnet/block_body_17139055.bin").unwrap();
+        let raw = std::fs::read("../../test_assets/mainnet/block_body_17139055.bin").unwrap();
         let body = BlockBodyShanghai::from_ssz_bytes(&raw).unwrap();
         assert_eq!(body.txs.len(), 117);
         // Select a few transactions to compare against hashes from a block explorer:

diff --git a/ethportal-api/src/types/execution/header.rs → ...hportal-api/src/types/execution/header.rs b/ethportal-api/src/types/execution/header.rs → ...hportal-api/src/types/execution/header.rs
@@ -424,7 +424,7 @@ mod tests {
     #[test_log::test]
     fn post_shanghai_header() {
         let body =
-            std::fs::read_to_string("../test_assets/mainnet/block_17034871_value.json").unwrap();
+            std::fs::read_to_string("../../test_assets/mainnet/block_17034871_value.json").unwrap();
         let response: Value = serde_json::from_str(&body).unwrap();
         let header: Header = serde_json::from_value(response["result"].clone()).unwrap();
         let expected_hash = B256::from_slice(
@@ -502,7 +502,7 @@ mod tests {
     #[case("19433903")]
     fn post_dencun_header(#[case] case: &str) {
         let body =
-            std::fs::read_to_string(format!("../test_assets/mainnet/block_{case}_value.json"))
+            std::fs::read_to_string(format!("../../test_assets/mainnet/block_{case}_value.json"))
                 .unwrap();
         let response: Value = serde_json::from_str(&body).unwrap();
         let header: Header = serde_json::from_value(response["result"].clone()).unwrap();

diff --git a/.../src/types/execution/header_with_proof.rs → .../src/types/execution/header_with_proof.rs b/.../src/types/execution/header_with_proof.rs → .../src/types/execution/header_with_proof.rs
@@ -195,8 +195,7 @@ mod tests {
     #[test_log::test]
     fn decode_encode_header_with_proofs() {
         let file =
-            fs::read_to_string("../trin-validation/src/assets/fluffy/header_with_proofs.json")
-                .unwrap();
+            fs::read_to_string("../validation/src/assets/fluffy/header_with_proofs.json").unwrap();
         let json: Value = serde_json::from_str(&file).unwrap();
         let hwps = json.as_object().unwrap();
         for (block_number, obj) in hwps {

diff --git a/ethportal-api/src/types/execution/mod.rs → .../ethportal-api/src/types/execution/mod.rs b/ethportal-api/src/types/execution/mod.rs → .../ethportal-api/src/types/execution/mod.rs
diff --git a/...ortal-api/src/types/execution/receipts.rs → ...ortal-api/src/types/execution/receipts.rs b/...ortal-api/src/types/execution/receipts.rs → ...ortal-api/src/types/execution/receipts.rs
@@ -660,7 +660,7 @@ mod tests {
         let encoded = receipts.as_ssz_bytes();
 
         let expected: Vec<u8> =
-            std::fs::read("../test_assets/mainnet/receipts_14764013.bin").unwrap();
+            std::fs::read("../../test_assets/mainnet/receipts_14764013.bin").unwrap();
         assert_eq!(hex_encode(&encoded), hex_encode(expected));
 
         let decoded = Receipts::from_ssz_bytes(&encoded).unwrap();
@@ -832,7 +832,8 @@ mod tests {
         // this block (15573637) was chosen since it contains all tx types (legacy, access list,
         // eip1559) as well as contract creation txs
         let expected: String =
-            std::fs::read_to_string("../test_assets/infura_batch/receipts-15573637.json").unwrap();
+            std::fs::read_to_string("../../test_assets/infura_batch/receipts-15573637.json")
+                .unwrap();
         let receipts: Receipts = serde_json::from_str(&expected).unwrap();
         let expected_receipts_root: B256 = B256::from_slice(
             &hex_decode("0xc9e543effd8c9708acc53249157c54b0c6aecd69285044bcb9df91cedc6437ad")
@@ -846,7 +847,8 @@ mod tests {
         // batched group of pre-byzantium receipts, containing the "root" field instead of "status"
         // sourced from infura.
         let expected: String =
-            std::fs::read_to_string("../test_assets/infura_batch/receipts-1114271.json").unwrap();
+            std::fs::read_to_string("../../test_assets/infura_batch/receipts-1114271.json")
+                .unwrap();
         let receipts: Receipts = serde_json::from_str(&expected).unwrap();
         let expected_receipts_root: B256 = B256::from_slice(
             &hex_decode("0xd262fe545cec9ec04f4246334d05437fac8d8dfe201a1f6476fab545878cb251")
@@ -868,7 +870,7 @@ mod tests {
     )]
     fn dencun_receipts(#[case] block_number: &str, #[case] expected_root: &str) {
         let receipts = std::fs::read_to_string(format!(
-            "../test_assets/infura_batch/receipts-{block_number}.json"
+            "../../test_assets/infura_batch/receipts-{block_number}.json"
         ))
         .unwrap();
         let receipts: Receipts = serde_json::from_str(&receipts).unwrap();

diff --git a/...al-api/src/types/execution/transaction.rs → ...al-api/src/types/execution/transaction.rs b/...al-api/src/types/execution/transaction.rs → ...al-api/src/types/execution/transaction.rs
diff --git a/...tal-api/src/types/execution/withdrawal.rs → ...tal-api/src/types/execution/withdrawal.rs b/...tal-api/src/types/execution/withdrawal.rs → ...tal-api/src/types/execution/withdrawal.rs
diff --git a/ethportal-api/src/types/jsonrpc/endpoints.rs → ...portal-api/src/types/jsonrpc/endpoints.rs b/ethportal-api/src/types/jsonrpc/endpoints.rs → ...portal-api/src/types/jsonrpc/endpoints.rs
diff --git a/...al-api/src/types/jsonrpc/json_rpc_mock.rs → ...al-api/src/types/jsonrpc/json_rpc_mock.rs b/...al-api/src/types/jsonrpc/json_rpc_mock.rs → ...al-api/src/types/jsonrpc/json_rpc_mock.rs
diff --git a/ethportal-api/src/types/jsonrpc/mod.rs → ...es/ethportal-api/src/types/jsonrpc/mod.rs b/ethportal-api/src/types/jsonrpc/mod.rs → ...es/ethportal-api/src/types/jsonrpc/mod.rs
diff --git a/ethportal-api/src/types/jsonrpc/params.rs → ...ethportal-api/src/types/jsonrpc/params.rs b/ethportal-api/src/types/jsonrpc/params.rs → ...ethportal-api/src/types/jsonrpc/params.rs
diff --git a/ethportal-api/src/types/jsonrpc/request.rs → ...thportal-api/src/types/jsonrpc/request.rs b/ethportal-api/src/types/jsonrpc/request.rs → ...thportal-api/src/types/jsonrpc/request.rs
diff --git a/ethportal-api/src/types/mod.rs → crates/ethportal-api/src/types/mod.rs b/ethportal-api/src/types/mod.rs → crates/ethportal-api/src/types/mod.rs
diff --git a/ethportal-api/src/types/network.rs → crates/ethportal-api/src/types/network.rs b/ethportal-api/src/types/network.rs → crates/ethportal-api/src/types/network.rs
diff --git a/ethportal-api/src/types/node_id.rs → crates/ethportal-api/src/types/node_id.rs b/ethportal-api/src/types/node_id.rs → crates/ethportal-api/src/types/node_id.rs
diff --git a/ethportal-api/src/types/portal.rs → crates/ethportal-api/src/types/portal.rs b/ethportal-api/src/types/portal.rs → crates/ethportal-api/src/types/portal.rs
diff --git a/ethportal-api/src/types/portal_wire.rs → ...es/ethportal-api/src/types/portal_wire.rs b/ethportal-api/src/types/portal_wire.rs → ...es/ethportal-api/src/types/portal_wire.rs
diff --git a/ethportal-api/src/types/query_trace.rs → ...es/ethportal-api/src/types/query_trace.rs b/ethportal-api/src/types/query_trace.rs → ...es/ethportal-api/src/types/query_trace.rs
diff --git a/...api/src/types/state_trie/account_state.rs → ...api/src/types/state_trie/account_state.rs b/...api/src/types/state_trie/account_state.rs → ...api/src/types/state_trie/account_state.rs
diff --git a/ethportal-api/src/types/state_trie/mod.rs → ...ethportal-api/src/types/state_trie/mod.rs b/ethportal-api/src/types/state_trie/mod.rs → ...ethportal-api/src/types/state_trie/mod.rs
diff --git a/...ortal-api/src/types/state_trie/nibbles.rs → ...ortal-api/src/types/state_trie/nibbles.rs b/...ortal-api/src/types/state_trie/nibbles.rs → ...ortal-api/src/types/state_trie/nibbles.rs
diff --git a/...pi/src/types/state_trie/trie_traversal.rs → ...pi/src/types/state_trie/trie_traversal.rs b/...pi/src/types/state_trie/trie_traversal.rs → ...pi/src/types/state_trie/trie_traversal.rs
diff --git a/ethportal-api/src/types/state_trie/utils.rs → ...hportal-api/src/types/state_trie/utils.rs b/ethportal-api/src/types/state_trie/utils.rs → ...hportal-api/src/types/state_trie/utils.rs
diff --git a/ethportal-api/src/utils/bytes.rs → crates/ethportal-api/src/utils/bytes.rs b/ethportal-api/src/utils/bytes.rs → crates/ethportal-api/src/utils/bytes.rs
diff --git a/ethportal-api/src/utils/mod.rs → crates/ethportal-api/src/utils/mod.rs b/ethportal-api/src/utils/mod.rs → crates/ethportal-api/src/utils/mod.rs
diff --git a/ethportal-api/src/utils/roots.rs → crates/ethportal-api/src/utils/roots.rs b/ethportal-api/src/utils/roots.rs → crates/ethportal-api/src/utils/roots.rs
diff --git a/...rtal-api/src/utils/serde/hex_fixed_vec.rs → ...rtal-api/src/utils/serde/hex_fixed_vec.rs b/...rtal-api/src/utils/serde/hex_fixed_vec.rs → ...rtal-api/src/utils/serde/hex_fixed_vec.rs
diff --git a/...ortal-api/src/utils/serde/hex_var_list.rs → ...ortal-api/src/utils/serde/hex_var_list.rs b/...ortal-api/src/utils/serde/hex_var_list.rs → ...ortal-api/src/utils/serde/hex_var_list.rs
diff --git a/ethportal-api/src/utils/serde/mod.rs → crates/ethportal-api/src/utils/serde/mod.rs b/ethportal-api/src/utils/serde/mod.rs → crates/ethportal-api/src/utils/serde/mod.rs
diff --git a/ethportal-api/src/version.rs → crates/ethportal-api/src/version.rs b/ethportal-api/src/version.rs → crates/ethportal-api/src/version.rs
diff --git a/ethportal-api/src/web3.rs → crates/ethportal-api/src/web3.rs b/ethportal-api/src/web3.rs → crates/ethportal-api/src/web3.rs
diff --git a/trin-evm/Cargo.toml → crates/evm/Cargo.toml b/trin-evm/Cargo.toml → crates/evm/Cargo.toml
diff --git a/trin-evm/README.md → crates/evm/README.md b/trin-evm/README.md → crates/evm/README.md
diff --git a/trin-evm/src/async_db.rs → crates/evm/src/async_db.rs b/trin-evm/src/async_db.rs → crates/evm/src/async_db.rs
diff --git a/trin-evm/src/lib.rs → crates/evm/src/lib.rs b/trin-evm/src/lib.rs → crates/evm/src/lib.rs
diff --git a/trin-evm/src/spec_id.rs → crates/evm/src/spec_id.rs b/trin-evm/src/spec_id.rs → crates/evm/src/spec_id.rs
diff --git a/trin-evm/src/tx_env_modifier.rs → crates/evm/src/tx_env_modifier.rs b/trin-evm/src/tx_env_modifier.rs → crates/evm/src/tx_env_modifier.rs
diff --git a/light-client/Cargo.toml → crates/light-client/Cargo.toml b/light-client/Cargo.toml → crates/light-client/Cargo.toml
diff --git a/light-client/README.md → crates/light-client/README.md b/light-client/README.md → crates/light-client/README.md
diff --git a/light-client/src/client.rs → crates/light-client/src/client.rs b/light-client/src/client.rs → crates/light-client/src/client.rs
diff --git a/light-client/src/config/base.rs → crates/light-client/src/config/base.rs b/light-client/src/config/base.rs → crates/light-client/src/config/base.rs
diff --git a/light-client/src/config/checkpoints.rs → ...es/light-client/src/config/checkpoints.rs b/light-client/src/config/checkpoints.rs → ...es/light-client/src/config/checkpoints.rs
diff --git a/light-client/src/config/cli.rs → crates/light-client/src/config/cli.rs b/light-client/src/config/cli.rs → crates/light-client/src/config/cli.rs
diff --git a/light-client/src/config/client_config.rs → .../light-client/src/config/client_config.rs b/light-client/src/config/client_config.rs → .../light-client/src/config/client_config.rs
diff --git a/light-client/src/config/mod.rs → crates/light-client/src/config/mod.rs b/light-client/src/config/mod.rs → crates/light-client/src/config/mod.rs
diff --git a/light-client/src/config/networks.rs → crates/light-client/src/config/networks.rs b/light-client/src/config/networks.rs → crates/light-client/src/config/networks.rs
diff --git a/light-client/src/config/types.rs → crates/light-client/src/config/types.rs b/light-client/src/config/types.rs → crates/light-client/src/config/types.rs
diff --git a/light-client/src/config/utils.rs → crates/light-client/src/config/utils.rs b/light-client/src/config/utils.rs → crates/light-client/src/config/utils.rs
diff --git a/...-client/src/consensus/consensus_client.rs → ...-client/src/consensus/consensus_client.rs b/...-client/src/consensus/consensus_client.rs → ...-client/src/consensus/consensus_client.rs
diff --git a/light-client/src/consensus/constants.rs → ...s/light-client/src/consensus/constants.rs b/light-client/src/consensus/constants.rs → ...s/light-client/src/consensus/constants.rs
diff --git a/light-client/src/consensus/errors.rs → crates/light-client/src/consensus/errors.rs b/light-client/src/consensus/errors.rs → crates/light-client/src/consensus/errors.rs
diff --git a/light-client/src/consensus/mod.rs → crates/light-client/src/consensus/mod.rs b/light-client/src/consensus/mod.rs → crates/light-client/src/consensus/mod.rs
diff --git a/light-client/src/consensus/rpc/mock_rpc.rs → ...ight-client/src/consensus/rpc/mock_rpc.rs b/light-client/src/consensus/rpc/mock_rpc.rs → ...ight-client/src/consensus/rpc/mock_rpc.rs
diff --git a/light-client/src/consensus/rpc/mod.rs → crates/light-client/src/consensus/rpc/mod.rs b/light-client/src/consensus/rpc/mod.rs → crates/light-client/src/consensus/rpc/mod.rs
diff --git a/light-client/src/consensus/rpc/nimbus_rpc.rs → ...ht-client/src/consensus/rpc/nimbus_rpc.rs b/light-client/src/consensus/rpc/nimbus_rpc.rs → ...ht-client/src/consensus/rpc/nimbus_rpc.rs
diff --git a/light-client/src/consensus/rpc/portal_rpc.rs → ...ht-client/src/consensus/rpc/portal_rpc.rs b/light-client/src/consensus/rpc/portal_rpc.rs → ...ht-client/src/consensus/rpc/portal_rpc.rs
diff --git a/light-client/src/consensus/types.rs → crates/light-client/src/consensus/types.rs b/light-client/src/consensus/types.rs → crates/light-client/src/consensus/types.rs
diff --git a/light-client/src/consensus/utils.rs → crates/light-client/src/consensus/utils.rs b/light-client/src/consensus/utils.rs → crates/light-client/src/consensus/utils.rs
diff --git a/light-client/src/database.rs → crates/light-client/src/database.rs b/light-client/src/database.rs → crates/light-client/src/database.rs
diff --git a/light-client/src/errors.rs → crates/light-client/src/errors.rs b/light-client/src/errors.rs → crates/light-client/src/errors.rs
diff --git a/light-client/src/lib.rs → crates/light-client/src/lib.rs b/light-client/src/lib.rs → crates/light-client/src/lib.rs
diff --git a/light-client/src/main.rs → crates/light-client/src/main.rs b/light-client/src/main.rs → crates/light-client/src/main.rs
diff --git a/light-client/src/node.rs → crates/light-client/src/node.rs b/light-client/src/node.rs → crates/light-client/src/node.rs
diff --git a/light-client/src/rpc.rs → crates/light-client/src/rpc.rs b/light-client/src/rpc.rs → crates/light-client/src/rpc.rs
diff --git a/light-client/src/types.rs → crates/light-client/src/types.rs b/light-client/src/types.rs → crates/light-client/src/types.rs
diff --git a/light-client/src/utils.rs → crates/light-client/src/utils.rs b/light-client/src/utils.rs → crates/light-client/src/utils.rs
diff --git a/light-client/testdata/bootstrap.json → crates/light-client/testdata/bootstrap.json b/light-client/testdata/bootstrap.json → crates/light-client/testdata/bootstrap.json
diff --git a/light-client/testdata/finality.json → crates/light-client/testdata/finality.json b/light-client/testdata/finality.json → crates/light-client/testdata/finality.json
diff --git a/light-client/testdata/optimistic.json → crates/light-client/testdata/optimistic.json b/light-client/testdata/optimistic.json → crates/light-client/testdata/optimistic.json
diff --git a/light-client/testdata/updates.json → crates/light-client/testdata/updates.json b/light-client/testdata/updates.json → crates/light-client/testdata/updates.json
diff --git a/light-client/tests/sync.rs → crates/light-client/tests/sync.rs b/light-client/tests/sync.rs → crates/light-client/tests/sync.rs
diff --git a/trin-metrics/Cargo.toml → crates/metrics/Cargo.toml b/trin-metrics/Cargo.toml → crates/metrics/Cargo.toml
diff --git a/trin-metrics/src/bridge.rs → crates/metrics/src/bridge.rs b/trin-metrics/src/bridge.rs → crates/metrics/src/bridge.rs
diff --git a/trin-metrics/src/labels.rs → crates/metrics/src/labels.rs b/trin-metrics/src/labels.rs → crates/metrics/src/labels.rs
diff --git a/trin-metrics/src/lib.rs → crates/metrics/src/lib.rs b/trin-metrics/src/lib.rs → crates/metrics/src/lib.rs
diff --git a/trin-metrics/src/overlay.rs → crates/metrics/src/overlay.rs b/trin-metrics/src/overlay.rs → crates/metrics/src/overlay.rs
diff --git a/trin-metrics/src/portalnet.rs → crates/metrics/src/portalnet.rs b/trin-metrics/src/portalnet.rs → crates/metrics/src/portalnet.rs
diff --git a/trin-metrics/src/storage.rs → crates/metrics/src/storage.rs b/trin-metrics/src/storage.rs → crates/metrics/src/storage.rs
diff --git a/trin-metrics/src/timer.rs → crates/metrics/src/timer.rs b/trin-metrics/src/timer.rs → crates/metrics/src/timer.rs
diff --git a/portalnet/Cargo.toml → crates/portalnet/Cargo.toml b/portalnet/Cargo.toml → crates/portalnet/Cargo.toml
diff --git a/portalnet/README.md → crates/portalnet/README.md b/portalnet/README.md → crates/portalnet/README.md
diff --git a/portalnet/src/accept_queue.rs → crates/portalnet/src/accept_queue.rs b/portalnet/src/accept_queue.rs → crates/portalnet/src/accept_queue.rs
diff --git a/portalnet/src/bootnodes.rs → crates/portalnet/src/bootnodes.rs b/portalnet/src/bootnodes.rs → crates/portalnet/src/bootnodes.rs
diff --git a/portalnet/src/config.rs → crates/portalnet/src/config.rs b/portalnet/src/config.rs → crates/portalnet/src/config.rs
diff --git a/portalnet/src/constants.rs → crates/portalnet/src/constants.rs b/portalnet/src/constants.rs → crates/portalnet/src/constants.rs
diff --git a/portalnet/src/discovery.rs → crates/portalnet/src/discovery.rs b/portalnet/src/discovery.rs → crates/portalnet/src/discovery.rs
diff --git a/portalnet/src/events.rs → crates/portalnet/src/events.rs b/portalnet/src/events.rs → crates/portalnet/src/events.rs
diff --git a/portalnet/src/find/iterators/findcontent.rs → ...rtalnet/src/find/iterators/findcontent.rs b/portalnet/src/find/iterators/findcontent.rs → ...rtalnet/src/find/iterators/findcontent.rs
diff --git a/portalnet/src/find/iterators/findnodes.rs → ...portalnet/src/find/iterators/findnodes.rs b/portalnet/src/find/iterators/findnodes.rs → ...portalnet/src/find/iterators/findnodes.rs
diff --git a/portalnet/src/find/iterators/mod.rs → crates/portalnet/src/find/iterators/mod.rs b/portalnet/src/find/iterators/mod.rs → crates/portalnet/src/find/iterators/mod.rs
diff --git a/portalnet/src/find/iterators/query.rs → crates/portalnet/src/find/iterators/query.rs b/portalnet/src/find/iterators/query.rs → crates/portalnet/src/find/iterators/query.rs
diff --git a/portalnet/src/find/mod.rs → crates/portalnet/src/find/mod.rs b/portalnet/src/find/mod.rs → crates/portalnet/src/find/mod.rs
diff --git a/portalnet/src/find/query_info.rs → crates/portalnet/src/find/query_info.rs b/portalnet/src/find/query_info.rs → crates/portalnet/src/find/query_info.rs
diff --git a/portalnet/src/find/query_pool.rs → crates/portalnet/src/find/query_pool.rs b/portalnet/src/find/query_pool.rs → crates/portalnet/src/find/query_pool.rs
diff --git a/portalnet/src/lib.rs → crates/portalnet/src/lib.rs b/portalnet/src/lib.rs → crates/portalnet/src/lib.rs
diff --git a/portalnet/src/overlay/command.rs → crates/portalnet/src/overlay/command.rs b/portalnet/src/overlay/command.rs → crates/portalnet/src/overlay/command.rs
diff --git a/portalnet/src/overlay/config.rs → crates/portalnet/src/overlay/config.rs b/portalnet/src/overlay/config.rs → crates/portalnet/src/overlay/config.rs
diff --git a/portalnet/src/overlay/errors.rs → crates/portalnet/src/overlay/errors.rs b/portalnet/src/overlay/errors.rs → crates/portalnet/src/overlay/errors.rs
diff --git a/portalnet/src/overlay/mod.rs → crates/portalnet/src/overlay/mod.rs b/portalnet/src/overlay/mod.rs → crates/portalnet/src/overlay/mod.rs
diff --git a/portalnet/src/overlay/protocol.rs → crates/portalnet/src/overlay/protocol.rs b/portalnet/src/overlay/protocol.rs → crates/portalnet/src/overlay/protocol.rs
diff --git a/portalnet/src/overlay/request.rs → crates/portalnet/src/overlay/request.rs b/portalnet/src/overlay/request.rs → crates/portalnet/src/overlay/request.rs
diff --git a/portalnet/src/overlay/service.rs → crates/portalnet/src/overlay/service.rs b/portalnet/src/overlay/service.rs → crates/portalnet/src/overlay/service.rs
diff --git a/portalnet/src/put_content.rs → crates/portalnet/src/put_content.rs b/portalnet/src/put_content.rs → crates/portalnet/src/put_content.rs
diff --git a/portalnet/src/socket.rs → crates/portalnet/src/socket.rs b/portalnet/src/socket.rs → crates/portalnet/src/socket.rs
diff --git a/portalnet/src/types/kbucket.rs → crates/portalnet/src/types/kbucket.rs b/portalnet/src/types/kbucket.rs → crates/portalnet/src/types/kbucket.rs
diff --git a/portalnet/src/types/mod.rs → crates/portalnet/src/types/mod.rs b/portalnet/src/types/mod.rs → crates/portalnet/src/types/mod.rs
diff --git a/portalnet/src/types/node.rs → crates/portalnet/src/types/node.rs b/portalnet/src/types/node.rs → crates/portalnet/src/types/node.rs
diff --git a/portalnet/src/utils/db.rs → crates/portalnet/src/utils/db.rs b/portalnet/src/utils/db.rs → crates/portalnet/src/utils/db.rs
diff --git a/portalnet/src/utils/mod.rs → crates/portalnet/src/utils/mod.rs b/portalnet/src/utils/mod.rs → crates/portalnet/src/utils/mod.rs
diff --git a/portalnet/src/utils/portal_wire.rs → crates/portalnet/src/utils/portal_wire.rs b/portalnet/src/utils/portal_wire.rs → crates/portalnet/src/utils/portal_wire.rs
diff --git a/portalnet/src/utp_controller.rs → crates/portalnet/src/utp_controller.rs b/portalnet/src/utp_controller.rs → crates/portalnet/src/utp_controller.rs
diff --git a/portalnet/tests/overlay.rs → crates/portalnet/tests/overlay.rs b/portalnet/tests/overlay.rs → crates/portalnet/tests/overlay.rs
diff --git a/rpc/Cargo.toml → crates/rpc/Cargo.toml b/rpc/Cargo.toml → crates/rpc/Cargo.toml
diff --git a/rpc/README.md → crates/rpc/README.md b/rpc/README.md → crates/rpc/README.md
diff --git a/rpc/src/beacon_rpc.rs → crates/rpc/src/beacon_rpc.rs b/rpc/src/beacon_rpc.rs → crates/rpc/src/beacon_rpc.rs
diff --git a/rpc/src/builder.rs → crates/rpc/src/builder.rs b/rpc/src/builder.rs → crates/rpc/src/builder.rs
diff --git a/rpc/src/config.rs → crates/rpc/src/config.rs b/rpc/src/config.rs → crates/rpc/src/config.rs
diff --git a/rpc/src/cors.rs → crates/rpc/src/cors.rs b/rpc/src/cors.rs → crates/rpc/src/cors.rs
diff --git a/rpc/src/discv5_rpc.rs → crates/rpc/src/discv5_rpc.rs b/rpc/src/discv5_rpc.rs → crates/rpc/src/discv5_rpc.rs
diff --git a/rpc/src/errors.rs → crates/rpc/src/errors.rs b/rpc/src/errors.rs → crates/rpc/src/errors.rs
diff --git a/rpc/src/eth_rpc.rs → crates/rpc/src/eth_rpc.rs b/rpc/src/eth_rpc.rs → crates/rpc/src/eth_rpc.rs
diff --git a/rpc/src/evm_state.rs → crates/rpc/src/evm_state.rs b/rpc/src/evm_state.rs → crates/rpc/src/evm_state.rs
diff --git a/rpc/src/fetch.rs → crates/rpc/src/fetch.rs b/rpc/src/fetch.rs → crates/rpc/src/fetch.rs
diff --git a/rpc/src/history_rpc.rs → crates/rpc/src/history_rpc.rs b/rpc/src/history_rpc.rs → crates/rpc/src/history_rpc.rs
diff --git a/rpc/src/lib.rs → crates/rpc/src/lib.rs b/rpc/src/lib.rs → crates/rpc/src/lib.rs
diff --git a/rpc/src/rpc_server.rs → crates/rpc/src/rpc_server.rs b/rpc/src/rpc_server.rs → crates/rpc/src/rpc_server.rs
diff --git a/rpc/src/serde.rs → crates/rpc/src/serde.rs b/rpc/src/serde.rs → crates/rpc/src/serde.rs
diff --git a/rpc/src/state_rpc.rs → crates/rpc/src/state_rpc.rs b/rpc/src/state_rpc.rs → crates/rpc/src/state_rpc.rs
diff --git a/rpc/src/web3_rpc.rs → crates/rpc/src/web3_rpc.rs b/rpc/src/web3_rpc.rs → crates/rpc/src/web3_rpc.rs
diff --git a/trin-storage/Cargo.toml → crates/storage/Cargo.toml b/trin-storage/Cargo.toml → crates/storage/Cargo.toml
diff --git a/trin-storage/src/config.rs → crates/storage/src/config.rs b/trin-storage/src/config.rs → crates/storage/src/config.rs
diff --git a/trin-storage/src/error.rs → crates/storage/src/error.rs b/trin-storage/src/error.rs → crates/storage/src/error.rs
diff --git a/trin-storage/src/lib.rs → crates/storage/src/lib.rs b/trin-storage/src/lib.rs → crates/storage/src/lib.rs
diff --git a/trin-storage/src/sql.rs → crates/storage/src/sql.rs b/trin-storage/src/sql.rs → crates/storage/src/sql.rs
diff --git a/trin-storage/src/test_utils.rs → crates/storage/src/test_utils.rs b/trin-storage/src/test_utils.rs → crates/storage/src/test_utils.rs
diff --git a/trin-storage/src/utils.rs → crates/storage/src/utils.rs b/trin-storage/src/utils.rs → crates/storage/src/utils.rs
diff --git a/...age/src/versioned/id_indexed_v1/config.rs → ...age/src/versioned/id_indexed_v1/config.rs b/...age/src/versioned/id_indexed_v1/config.rs → ...age/src/versioned/id_indexed_v1/config.rs
diff --git a/.../src/versioned/id_indexed_v1/migration.rs → .../src/versioned/id_indexed_v1/migration.rs b/.../src/versioned/id_indexed_v1/migration.rs → .../src/versioned/id_indexed_v1/migration.rs
diff --git a/...torage/src/versioned/id_indexed_v1/mod.rs → ...torage/src/versioned/id_indexed_v1/mod.rs b/...torage/src/versioned/id_indexed_v1/mod.rs → ...torage/src/versioned/id_indexed_v1/mod.rs
diff --git a/...rsioned/id_indexed_v1/pruning_strategy.rs → ...rsioned/id_indexed_v1/pruning_strategy.rs b/...rsioned/id_indexed_v1/pruning_strategy.rs → ...rsioned/id_indexed_v1/pruning_strategy.rs
diff --git a/...torage/src/versioned/id_indexed_v1/sql.rs → ...torage/src/versioned/id_indexed_v1/sql.rs b/...torage/src/versioned/id_indexed_v1/sql.rs → ...torage/src/versioned/id_indexed_v1/sql.rs
diff --git a/...rage/src/versioned/id_indexed_v1/store.rs → ...rage/src/versioned/id_indexed_v1/store.rs b/...rage/src/versioned/id_indexed_v1/store.rs → ...rage/src/versioned/id_indexed_v1/store.rs
diff --git a/trin-storage/src/versioned/mod.rs → crates/storage/src/versioned/mod.rs b/trin-storage/src/versioned/mod.rs → crates/storage/src/versioned/mod.rs
diff --git a/trin-storage/src/versioned/sql.rs → crates/storage/src/versioned/sql.rs b/trin-storage/src/versioned/sql.rs → crates/storage/src/versioned/sql.rs
diff --git a/trin-storage/src/versioned/store.rs → crates/storage/src/versioned/store.rs b/trin-storage/src/versioned/store.rs → crates/storage/src/versioned/store.rs
diff --git a/trin-storage/src/versioned/usage_stats.rs → crates/storage/src/versioned/usage_stats.rs b/trin-storage/src/versioned/usage_stats.rs → crates/storage/src/versioned/usage_stats.rs
diff --git a/trin-storage/src/versioned/utils.rs → crates/storage/src/versioned/utils.rs b/trin-storage/src/versioned/utils.rs → crates/storage/src/versioned/utils.rs
diff --git a/trin-beacon/Cargo.toml → crates/subnetworks/beacon/Cargo.toml b/trin-beacon/Cargo.toml → crates/subnetworks/beacon/Cargo.toml
diff --git a/trin-beacon/README.md → crates/subnetworks/beacon/README.md b/trin-beacon/README.md → crates/subnetworks/beacon/README.md
diff --git a/trin-beacon/src/events.rs → crates/subnetworks/beacon/src/events.rs b/trin-beacon/src/events.rs → crates/subnetworks/beacon/src/events.rs
diff --git a/trin-beacon/src/jsonrpc.rs → crates/subnetworks/beacon/src/jsonrpc.rs b/trin-beacon/src/jsonrpc.rs → crates/subnetworks/beacon/src/jsonrpc.rs
diff --git a/trin-beacon/src/lib.rs → crates/subnetworks/beacon/src/lib.rs b/trin-beacon/src/lib.rs → crates/subnetworks/beacon/src/lib.rs
diff --git a/trin-beacon/src/network.rs → crates/subnetworks/beacon/src/network.rs b/trin-beacon/src/network.rs → crates/subnetworks/beacon/src/network.rs
diff --git a/trin-beacon/src/storage.rs → crates/subnetworks/beacon/src/storage.rs b/trin-beacon/src/storage.rs → crates/subnetworks/beacon/src/storage.rs
diff --git a/trin-beacon/src/sync.rs → crates/subnetworks/beacon/src/sync.rs b/trin-beacon/src/sync.rs → crates/subnetworks/beacon/src/sync.rs
diff --git a/trin-beacon/src/test_utils.rs → crates/subnetworks/beacon/src/test_utils.rs b/trin-beacon/src/test_utils.rs → crates/subnetworks/beacon/src/test_utils.rs
@@ -21,7 +21,7 @@ use tree_hash::TreeHash;
 // Valid number range for the test cases is 0..=1
 pub fn get_light_client_bootstrap(number: u8) -> ForkVersionedLightClientBootstrap {
     let lc_bootstrap = std::fs::read(format!(
-        "../test_assets/beacon/deneb/LightClientBootstrap/ssz_random/case_{number}/serialized.ssz_snappy"
+        "../../../test_assets/beacon/deneb/LightClientBootstrap/ssz_random/case_{number}/serialized.ssz_snappy"
     ))
         .expect("cannot find test asset");
     let mut decoder = snap::raw::Decoder::new();
@@ -38,7 +38,7 @@ pub fn get_light_client_bootstrap(number: u8) -> ForkVersionedLightClientBootstr
 // Valid number range for the test cases is 0..=1
 pub fn get_light_client_update(number: u8) -> ForkVersionedLightClientUpdate {
     let lc_update = std::fs::read(format!(
-        "../test_assets/beacon/deneb/LightClientUpdate/ssz_random/case_{number}/serialized.ssz_snappy"
+        "../../../test_assets/beacon/deneb/LightClientUpdate/ssz_random/case_{number}/serialized.ssz_snappy"
     ))
         .expect("cannot find test asset");
     let mut decoder = snap::raw::Decoder::new();
@@ -54,7 +54,7 @@ pub fn get_light_client_update(number: u8) -> ForkVersionedLightClientUpdate {
 // Valid number range for the test cases is 0..=1
 pub fn get_light_client_finality_update(number: u8) -> ForkVersionedLightClientFinalityUpdate {
     let lc_finality_update = std::fs::read(format!(
-        "../test_assets/beacon/deneb/LightClientFinalityUpdate/ssz_random/case_{number}/serialized.ssz_snappy"
+        "../../../test_assets/beacon/deneb/LightClientFinalityUpdate/ssz_random/case_{number}/serialized.ssz_snappy"
     ))
         .expect("cannot find test asset");
     let mut decoder = snap::raw::Decoder::new();
@@ -71,7 +71,7 @@ pub fn get_light_client_finality_update(number: u8) -> ForkVersionedLightClientF
 // Valid number range for the test cases is 0..=1
 pub fn get_light_client_optimistic_update(number: u8) -> ForkVersionedLightClientOptimisticUpdate {
     let lc_optimistic_update = std::fs::read(format!(
-        "../test_assets/beacon/deneb/LightClientOptimisticUpdate/ssz_random/case_{number}/serialized.ssz_snappy"
+        "../../../test_assets/beacon/deneb/LightClientOptimisticUpdate/ssz_random/case_{number}/serialized.ssz_snappy"
     ))
         .expect("cannot find test asset");
     let mut decoder = snap::raw::Decoder::new();
@@ -88,7 +88,7 @@ pub fn get_light_client_optimistic_update(number: u8) -> ForkVersionedLightClien
 
 pub fn get_history_summaries_with_proof() -> (ForkVersionedHistoricalSummariesWithProof, B256) {
     let value = std::fs::read(
-        "../test_assets/beacon/deneb/BeaconState/ssz_random/case_0/serialized.ssz_snappy",
+        "../../../test_assets/beacon/deneb/BeaconState/ssz_random/case_0/serialized.ssz_snappy",
     )
     .expect("cannot find test asset");
     let mut decoder = snap::raw::Decoder::new();

diff --git a/trin-beacon/src/validation.rs → crates/subnetworks/beacon/src/validation.rs b/trin-beacon/src/validation.rs → crates/subnetworks/beacon/src/validation.rs
diff --git a/trin-history/Cargo.toml → crates/subnetworks/history/Cargo.toml b/trin-history/Cargo.toml → crates/subnetworks/history/Cargo.toml
diff --git a/trin-history/README.md → crates/subnetworks/history/README.md b/trin-history/README.md → crates/subnetworks/history/README.md
diff --git a/trin-history/src/events.rs → crates/subnetworks/history/src/events.rs b/trin-history/src/events.rs → crates/subnetworks/history/src/events.rs
diff --git a/trin-history/src/jsonrpc.rs → crates/subnetworks/history/src/jsonrpc.rs b/trin-history/src/jsonrpc.rs → crates/subnetworks/history/src/jsonrpc.rs
diff --git a/trin-history/src/lib.rs → crates/subnetworks/history/src/lib.rs b/trin-history/src/lib.rs → crates/subnetworks/history/src/lib.rs
diff --git a/trin-history/src/network.rs → crates/subnetworks/history/src/network.rs b/trin-history/src/network.rs → crates/subnetworks/history/src/network.rs
diff --git a/trin-history/src/storage.rs → crates/subnetworks/history/src/storage.rs b/trin-history/src/storage.rs → crates/subnetworks/history/src/storage.rs
diff --git a/trin-history/src/validation.rs → crates/subnetworks/history/src/validation.rs b/trin-history/src/validation.rs → crates/subnetworks/history/src/validation.rs
@@ -132,9 +132,8 @@ mod tests {
     use super::*;
 
     fn get_header_with_proof_ssz() -> Vec<u8> {
-        let file =
-            fs::read_to_string("../trin-validation/src/assets/fluffy/header_with_proofs.json")
-                .unwrap();
+        let file = fs::read_to_string("../../validation/src/assets/fluffy/header_with_proofs.json")
+            .unwrap();
         let json: Value = serde_json::from_str(&file).unwrap();
         let json = json.as_object().unwrap();
         let raw_header = json.get("1000001").unwrap().as_object().unwrap();

diff --git a/trin-state/Cargo.toml → crates/subnetworks/state/Cargo.toml b/trin-state/Cargo.toml → crates/subnetworks/state/Cargo.toml
diff --git a/trin-state/README.md → crates/subnetworks/state/README.md b/trin-state/README.md → crates/subnetworks/state/README.md
diff --git a/trin-state/src/events.rs → crates/subnetworks/state/src/events.rs b/trin-state/src/events.rs → crates/subnetworks/state/src/events.rs
diff --git a/trin-state/src/jsonrpc.rs → crates/subnetworks/state/src/jsonrpc.rs b/trin-state/src/jsonrpc.rs → crates/subnetworks/state/src/jsonrpc.rs
diff --git a/trin-state/src/lib.rs → crates/subnetworks/state/src/lib.rs b/trin-state/src/lib.rs → crates/subnetworks/state/src/lib.rs
diff --git a/trin-state/src/network.rs → crates/subnetworks/state/src/network.rs b/trin-state/src/network.rs → crates/subnetworks/state/src/network.rs
diff --git a/trin-state/src/storage.rs → crates/subnetworks/state/src/storage.rs b/trin-state/src/storage.rs → crates/subnetworks/state/src/storage.rs
diff --git a/trin-state/src/validation/error.rs → ...subnetworks/state/src/validation/error.rs b/trin-state/src/validation/error.rs → ...subnetworks/state/src/validation/error.rs
diff --git a/trin-state/src/validation/mod.rs → ...s/subnetworks/state/src/validation/mod.rs b/trin-state/src/validation/mod.rs → ...s/subnetworks/state/src/validation/mod.rs
diff --git a/trin-state/src/validation/trie.rs → .../subnetworks/state/src/validation/trie.rs b/trin-state/src/validation/trie.rs → .../subnetworks/state/src/validation/trie.rs
diff --git a/trin-state/src/validation/validator.rs → ...etworks/state/src/validation/validator.rs b/trin-state/src/validation/validator.rs → ...etworks/state/src/validation/validator.rs
diff --git a/trin-utils/Cargo.toml → crates/utils/Cargo.toml b/trin-utils/Cargo.toml → crates/utils/Cargo.toml
diff --git a/trin-utils/README.md → crates/utils/README.md b/trin-utils/README.md → crates/utils/README.md
diff --git a/trin-utils/src/cli.rs → crates/utils/src/cli.rs b/trin-utils/src/cli.rs → crates/utils/src/cli.rs
diff --git a/trin-utils/src/dir.rs → crates/utils/src/dir.rs b/trin-utils/src/dir.rs → crates/utils/src/dir.rs
diff --git a/trin-utils/src/lib.rs → crates/utils/src/lib.rs b/trin-utils/src/lib.rs → crates/utils/src/lib.rs
diff --git a/trin-utils/src/log.rs → crates/utils/src/log.rs b/trin-utils/src/log.rs → crates/utils/src/log.rs
diff --git a/trin-utils/src/submodules.rs → crates/utils/src/submodules.rs b/trin-utils/src/submodules.rs → crates/utils/src/submodules.rs
@@ -4,7 +4,7 @@ use std::{
     path::{Path, PathBuf},
 };
 
-pub const PORTAL_SPEC_TESTS_SUBMODULE_PATH: &str = "../portal-spec-tests";
+pub const PORTAL_SPEC_TESTS_SUBMODULE_PATH: &str = "../../../portal-spec-tests";
 
 /// Reads a file from a "portal-spec-tests" submodule.
 pub fn read_portal_spec_tests_file<P: AsRef<Path>>(path: P) -> io::Result<String> {

diff --git a/trin-validation/Cargo.toml → crates/validation/Cargo.toml b/trin-validation/Cargo.toml → crates/validation/Cargo.toml
diff --git a/trin-validation/README.md → crates/validation/README.md b/trin-validation/README.md → crates/validation/README.md
diff --git a/trin-validation/src/accumulator.rs → crates/validation/src/accumulator.rs b/trin-validation/src/accumulator.rs → crates/validation/src/accumulator.rs
diff --git a/...73dc16ec5a107c0345858c343fc94780b4218.bin → ...73dc16ec5a107c0345858c343fc94780b4218.bin b/...73dc16ec5a107c0345858c343fc94780b4218.bin → ...73dc16ec5a107c0345858c343fc94780b4218.bin
diff --git a/...3dbfc73f2bb396df17a31e5457329b9a0f38d.bin → ...3dbfc73f2bb396df17a31e5457329b9a0f38d.bin b/...3dbfc73f2bb396df17a31e5457329b9a0f38d.bin → ...3dbfc73f2bb396df17a31e5457329b9a0f38d.bin
diff --git a/...a27a816ec05d3d6bd1625acad72227071e721.bin → ...a27a816ec05d3d6bd1625acad72227071e721.bin b/...a27a816ec05d3d6bd1625acad72227071e721.bin → ...a27a816ec05d3d6bd1625acad72227071e721.bin
diff --git a/...f327a4a79f261640ff967f7e3283e3a184c70.bin → ...f327a4a79f261640ff967f7e3283e3a184c70.bin b/...f327a4a79f261640ff967f7e3283e3a184c70.bin → ...f327a4a79f261640ff967f7e3283e3a184c70.bin
diff --git a/...alidation/src/assets/fluffy/epoch_acc.bin → ...alidation/src/assets/fluffy/epoch_acc.bin b/...alidation/src/assets/fluffy/epoch_acc.bin → ...alidation/src/assets/fluffy/epoch_acc.bin
diff --git a/...src/assets/fluffy/header_with_proofs.json → ...src/assets/fluffy/header_with_proofs.json b/...src/assets/fluffy/header_with_proofs.json → ...src/assets/fluffy/header_with_proofs.json
diff --git a/trin-validation/src/assets/header_rlps.json → ...es/validation/src/assets/header_rlps.json b/trin-validation/src/assets/header_rlps.json → ...es/validation/src/assets/header_rlps.json
diff --git a/...alidation/src/assets/historical_roots.ssz → ...alidation/src/assets/historical_roots.ssz b/...alidation/src/assets/historical_roots.ssz → ...alidation/src/assets/historical_roots.ssz
diff --git a/trin-validation/src/assets/hive/blocks.yaml → ...es/validation/src/assets/hive/blocks.yaml b/trin-validation/src/assets/hive/blocks.yaml → ...es/validation/src/assets/hive/blocks.yaml
diff --git a/trin-validation/src/assets/merge_macc.bin → crates/validation/src/assets/merge_macc.bin b/trin-validation/src/assets/merge_macc.bin → crates/validation/src/assets/merge_macc.bin
diff --git a/trin-validation/src/constants.rs → crates/validation/src/constants.rs b/trin-validation/src/constants.rs → crates/validation/src/constants.rs
diff --git a/trin-validation/src/header_validator.rs → crates/validation/src/header_validator.rs b/trin-validation/src/header_validator.rs → crates/validation/src/header_validator.rs
@@ -385,7 +385,7 @@ mod test {
         let header_validator = get_mainnet_header_validator();
 
         // Read the historical roots block proof from a test file
-        let file = fs::read_to_string("./../portal-spec-tests/tests/mainnet/history/headers_with_proof/block_proofs_bellatrix/beacon_block_proof-15539558-cdf9ed89b0c43cda17398dc4da9cfc505e5ccd19f7c39e3b43474180f1051e01.yaml").unwrap();
+        let file = fs::read_to_string("./../../portal-spec-tests/tests/mainnet/history/headers_with_proof/block_proofs_bellatrix/beacon_block_proof-15539558-cdf9ed89b0c43cda17398dc4da9cfc505e5ccd19f7c39e3b43474180f1051e01.yaml").unwrap();
         let value: serde_yaml::Value = serde_yaml::from_str(&file).unwrap();
         let block_number: u64 = 15539558;
         let header_hash = value
@@ -430,7 +430,7 @@ mod test {
         let header_validator = get_mainnet_header_validator();
 
         // Read the historical roots block proof from a test file
-        let file = fs::read_to_string(format!("./../portal-spec-tests/tests/mainnet/history/headers_with_proof/block_proofs_capella/beacon_block_proof-{block_number}.yaml")).unwrap();
+        let file = fs::read_to_string(format!("./../../portal-spec-tests/tests/mainnet/history/headers_with_proof/block_proofs_capella/beacon_block_proof-{block_number}.yaml")).unwrap();
         let value: serde_yaml::Value = serde_yaml::from_str(&file).unwrap();
         let header_hash = value
             .get("execution_block_header")
@@ -442,7 +442,7 @@ mod test {
             serde_yaml::from_value(value).unwrap();
 
         // Load historical summaries from ssz file
-        let historical_summaries_bytes = std::fs::read("./../portal-spec-tests/tests/mainnet/history/headers_with_proof/block_proofs_capella/historical_summaries_at_slot_8953856.ssz"
+        let historical_summaries_bytes = std::fs::read("./../../portal-spec-tests/tests/mainnet/history/headers_with_proof/block_proofs_capella/historical_summaries_at_slot_8953856.ssz"
         ).expect("cannot load HistoricalSummaries bytes from test file");
         let historical_summaries = HistoricalSummaries::from_ssz_bytes(&historical_summaries_bytes)
             .expect("cannot decode HistoricalSummaries bytes");
@@ -513,7 +513,7 @@ mod test {
 
     fn read_epoch_accumulator_122() -> EpochAccumulator {
         let epoch_acc_bytes = fs::read(
-            "../portal-spec-tests/tests/mainnet/history/accumulator/epoch-record-00122.ssz",
+            "../../portal-spec-tests/tests/mainnet/history/accumulator/epoch-record-00122.ssz",
         )
         .unwrap();
         EpochAccumulator::from_ssz_bytes(&epoch_acc_bytes).unwrap()

diff --git a/trin-validation/src/historical_roots_acc.rs → ...es/validation/src/historical_roots_acc.rs b/trin-validation/src/historical_roots_acc.rs → ...es/validation/src/historical_roots_acc.rs
diff --git a/trin-validation/src/lib.rs → crates/validation/src/lib.rs b/trin-validation/src/lib.rs → crates/validation/src/lib.rs
diff --git a/trin-validation/src/merkle/mod.rs → crates/validation/src/merkle/mod.rs b/trin-validation/src/merkle/mod.rs → crates/validation/src/merkle/mod.rs
diff --git a/trin-validation/src/merkle/proof.rs → crates/validation/src/merkle/proof.rs b/trin-validation/src/merkle/proof.rs → crates/validation/src/merkle/proof.rs
diff --git a/trin-validation/src/merkle/safe_arith.rs → crates/validation/src/merkle/safe_arith.rs b/trin-validation/src/merkle/safe_arith.rs → crates/validation/src/merkle/safe_arith.rs
diff --git a/trin-validation/src/oracle.rs → crates/validation/src/oracle.rs b/trin-validation/src/oracle.rs → crates/validation/src/oracle.rs
diff --git a/trin-validation/src/validator.rs → crates/validation/src/validator.rs b/trin-validation/src/validator.rs → crates/validation/src/validator.rs
diff --git a/ethportal-api/src/test_utils/constants.rs b/ethportal-api/src/test_utils/constants.rs
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		pub const PORTAL_SPEC_TESTS_SUBMODULE_PATH: &str = "../../portal-spec-tests";