diff --git a/.github/workflows/build-crate-and-npm.yml b/.github/workflows/build-crate-and-npm.yml
index ca008ccb4..04dae4e8d 100644
--- a/.github/workflows/build-crate-and-npm.yml
+++ b/.github/workflows/build-crate-and-npm.yml
@@ -61,7 +61,7 @@ jobs:
       env:
         CARGO_REGISTRY_TOKEN: ${{ secrets.cargo_registry_token }}
       run: |
-        cd chia_py_streamable_macro
+        cd crates/chia_py_streamable_macro
         cargo publish
 
     - name: publish to crates.io if tagged (chia_streamable_macro)
@@ -70,7 +70,7 @@ jobs:
       env:
         CARGO_REGISTRY_TOKEN: ${{ secrets.cargo_registry_token }}
       run: |
-        cd chia_streamable_macro
+        cd crates/chia_streamable_macro
         cargo publish
 
     - name: publish to crates.io if tagged (chia-traits)
@@ -79,7 +79,7 @@ jobs:
       env:
         CARGO_REGISTRY_TOKEN: ${{ secrets.cargo_registry_token }}
       run: |
-        cd chia-traits
+        cd crates/chia-traits
         cargo publish
 
     - name: publish to crates.io if tagged (chia-bls)
@@ -88,7 +88,7 @@ jobs:
       env:
         CARGO_REGISTRY_TOKEN: ${{ secrets.cargo_registry_token }}
       run: |
-        cd chia-bls
+        cd crates/chia-bls
         cargo publish
 
     - name: publish to crates.io if tagged (clvm-derive)
@@ -97,7 +97,7 @@ jobs:
       env:
         CARGO_REGISTRY_TOKEN: ${{ secrets.cargo_registry_token }}
       run: |
-        cd clvm-derive
+        cd crates/clvm-derive
         cargo publish
 
     - name: publish to crates.io if tagged (clvm-traits)
@@ -106,7 +106,7 @@ jobs:
       env:
         CARGO_REGISTRY_TOKEN: ${{ secrets.cargo_registry_token }}
       run: |
-        cd clvm-traits
+        cd crates/clvm-traits
         cargo publish
 
     - name: publish to crates.io if tagged (clvm-utils)
@@ -115,7 +115,7 @@ jobs:
       env:
         CARGO_REGISTRY_TOKEN: ${{ secrets.cargo_registry_token }}
       run: |
-        cd clvm-utils
+        cd crates/clvm-utils
         cargo publish
 
     - name: publish to crates.io if tagged (chia-protocol)
@@ -124,7 +124,7 @@ jobs:
       env:
         CARGO_REGISTRY_TOKEN: ${{ secrets.cargo_registry_token }}
       run: |
-        cd chia-protocol
+        cd crates/chia-protocol
         cargo publish
 
     - name: publish to crates.io if tagged (chia-wallet)
@@ -133,7 +133,7 @@ jobs:
       env:
         CARGO_REGISTRY_TOKEN: ${{ secrets.cargo_registry_token }}
       run: |
-        cd chia-wallet
+        cd crates/chia-wallet
         cargo publish
 
     - name: publish to crates.io if tagged (chia-client)
@@ -142,7 +142,7 @@ jobs:
       env:
         CARGO_REGISTRY_TOKEN: ${{ secrets.cargo_registry_token }}
       run: |
-        cd chia-client
+        cd crates/chia-client
         cargo publish
 
     - name: publish to crates.io if tagged (chia-ssl)
@@ -151,7 +151,7 @@ jobs:
       env:
         CARGO_REGISTRY_TOKEN: ${{ secrets.cargo_registry_token }}
       run: |
-        cd chia-ssl
+        cd crates/chia-ssl
         cargo publish
 
     - name: publish to crates.io if tagged (chia_rs)
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index b7e3cd972..f82d1b101 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -230,7 +230,7 @@ jobs:
 
     - name: cargo build
       run: |
-        cd chia-tools
+        cd crates/chia-tools
         cargo build
 
   build-sdist:
@@ -329,21 +329,21 @@ jobs:
           # not unloaded before exiting
           LSAN_OPTIONS: detect_leaks=0
         run: |
-          cd chia-bls
+          cd crates/chia-bls
           python -m pip install blspy
           cargo fuzz list | xargs -I "%" sh -c "cargo +nightly fuzz run % -- -max_total_time=10 || exit 255"
       - name: cargo fuzz (clvm-utils)
         run: |
-          cd clvm-utils
+          cd crates/clvm-utils
           cargo fuzz list | xargs -I "%" sh -c "cargo +nightly fuzz run % -- -max_total_time=20 || exit 255"
       - name: cargo fuzz (chia-protocol)
         run: |
-          cd chia-protocol
+          cd crates/chia-protocol
           cargo +nightly fuzz build
           cargo fuzz list | xargs -I "%" sh -c "cargo +nightly fuzz run % -- -max_total_time=20 || exit 255"
       - name: cargo fuzz (chia-wallet)
         run: |
-          cd chia-wallet
+          cd crates/chia-wallet
           cargo +nightly fuzz build
           cargo fuzz list | xargs -I "%" sh -c "cargo +nightly fuzz run % -- -max_total_time=20 || exit 255"
 
diff --git a/Cargo.toml b/Cargo.toml
index c2c6cea90..f67d9b0b6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,21 +1,21 @@
 [workspace]
 members = [
-    "chia-bls",
-    "chia-bls/fuzz",
-    "chia-client",
-    "chia-protocol",
-    "chia-protocol/fuzz",
-    "chia_py_streamable_macro",
-    "chia_streamable_macro",
-    "chia-ssl",
-    "chia-tools",
-    "chia-traits",
-    "chia-wallet",
-    "chia-wallet/fuzz",
-    "clvm-derive",
-    "clvm-traits",
-    "clvm-utils",
-    "clvm-utils/fuzz",
+    "crates/chia-bls",
+    "crates/chia-bls/fuzz",
+    "crates/chia-client",
+    "crates/chia-protocol",
+    "crates/chia-protocol/fuzz",
+    "crates/chia_py_streamable_macro",
+    "crates/chia_streamable_macro",
+    "crates/chia-ssl",
+    "crates/chia-tools",
+    "crates/chia-traits",
+    "crates/chia-wallet",
+    "crates/chia-wallet/fuzz",
+    "crates/clvm-derive",
+    "crates/clvm-traits",
+    "crates/clvm-utils",
+    "crates/clvm-utils/fuzz",
     "fuzz",
     "wasm",
     "wheel",
@@ -28,8 +28,8 @@ edition = "2021"
 license = "Apache-2.0"
 description = "Utility functions and types used by the Chia blockchain full node"
 authors = ["Richard Kiss <him@richardkiss.com>", "Arvid Norberg <arvid@chia.net>"]
-homepage = "https://github.com/Chia-Network/chia_rs/"
-repository = "https://github.com/Chia-Network/chia_rs/"
+homepage = "https://github.com/Chia-Network/chia_rs"
+repository = "https://github.com/Chia-Network/chia_rs"
 
 [features]
 py-bindings = ["dep:pyo3"]
@@ -38,12 +38,12 @@ py-bindings = ["dep:pyo3"]
 clvmr = "0.6.0"
 hex = "0.4.3"
 pyo3 = { version = ">=0.19.0", optional = true }
-clvm-utils = { version = "0.5.1", path = "clvm-utils" }
-chia-traits = { version = "0.5.2", path = "chia-traits" }
-clvm-traits = { version = "0.5.2", path = "clvm-traits" }
-clvm-derive = { version = "0.5.2", path = "clvm-derive" }
-chia-protocol = { version = "0.5.1", path = "chia-protocol" }
-chia-wallet = { version = "0.5.1", path = "chia-wallet" }
+clvm-utils = { version = "0.5.1", path = "crates/clvm-utils" }
+chia-traits = { version = "0.5.2", path = "crates/chia-traits" }
+clvm-traits = { version = "0.5.2", path = "crates/clvm-traits" }
+clvm-derive = { version = "0.5.2", path = "crates/clvm-derive" }
+chia-protocol = { version = "0.5.1", path = "crates/chia-protocol" }
+chia-wallet = { version = "0.5.1", path = "crates/chia-wallet" }
 hex-literal = "0.4.1"
 thiserror = "1.0.44"
 
diff --git a/README.md b/README.md
index 70e2ece6f..ae2c908e4 100644
--- a/README.md
+++ b/README.md
@@ -78,7 +78,7 @@ crates. There is a tool to generate a fuzzing corpus from a blockchain database.
 It's run like this:
 
 ```
-cd chia-tools
+cd crates/chia-tools
 cargo run --release --bin gen-corpus -- --help
 ```
 
diff --git a/bump-version.py b/bump-version.py
index d9012e926..da6966432 100644
--- a/bump-version.py
+++ b/bump-version.py
@@ -12,21 +12,21 @@
 tag = sys.argv[2]
 
 our_crates = [
-    "chia-bls",
-    "clvm-traits",
-    "chia-traits",
-    "chia_py_streamable_macro",
-    "chia_streamable_macro",
-    "chia-protocol",
-    "chia-tools",
-    "clvm-utils",
-    "clvm-derive",
-    "chia-wallet",
-    "chia-client",
-    "chia-ssl",
-    "fuzz",
-    "chia-wallet/fuzz",
-    "clvm-utils/fuzz",
+    "crates/chia-bls",
+    "crates/clvm-traits",
+    "crates/chia-traits",
+    "crates/chia_py_streamable_macro",
+    "crates/chia_streamable_macro",
+    "crates/chia-protocol",
+    "crates/chia-tools",
+    "crates/clvm-utils",
+    "crates/clvm-derive",
+    "crates/chia-wallet",
+    "crates/chia-client",
+    "crates/chia-ssl",
+    "crates/fuzz",
+    "crates/chia-wallet/fuzz",
+    "crates/clvm-utils/fuzz",
 ]
 
 def crates_with_changes() -> Set[str]:
diff --git a/chia-bls/Cargo.toml b/crates/chia-bls/Cargo.toml
similarity index 90%
rename from chia-bls/Cargo.toml
rename to crates/chia-bls/Cargo.toml
index ab911e916..32dde2f20 100644
--- a/chia-bls/Cargo.toml
+++ b/crates/chia-bls/Cargo.toml
@@ -5,8 +5,8 @@ edition = "2021"
 license = "Apache-2.0"
 description = "BLS signature, verification and aggregation funcions for the Chia blockchain"
 authors = ["Arvid Norberg <arvid@chia.net>"]
-homepage = "https://github.com/Chia-Network/chia_rs/chia-bls/"
-repository = "https://github.com/Chia-Network/chia_rs/chia-bls/"
+homepage = "https://github.com/Chia-Network/chia_rs"
+repository = "https://github.com/Chia-Network/chia_rs"
 
 [features]
 py-bindings = ["dep:pyo3", "chia_py_streamable_macro", "chia-traits/py-bindings"]
diff --git a/chia-bls/README.md b/crates/chia-bls/README.md
similarity index 100%
rename from chia-bls/README.md
rename to crates/chia-bls/README.md
diff --git a/chia-bls/benches/derive_key.rs b/crates/chia-bls/benches/derive_key.rs
similarity index 100%
rename from chia-bls/benches/derive_key.rs
rename to crates/chia-bls/benches/derive_key.rs
diff --git a/chia-bls/benches/parse.rs b/crates/chia-bls/benches/parse.rs
similarity index 100%
rename from chia-bls/benches/parse.rs
rename to crates/chia-bls/benches/parse.rs
diff --git a/chia-bls/benches/sign.rs b/crates/chia-bls/benches/sign.rs
similarity index 100%
rename from chia-bls/benches/sign.rs
rename to crates/chia-bls/benches/sign.rs
diff --git a/chia-bls/benches/verify.rs b/crates/chia-bls/benches/verify.rs
similarity index 100%
rename from chia-bls/benches/verify.rs
rename to crates/chia-bls/benches/verify.rs
diff --git a/chia-bls/fuzz/.gitignore b/crates/chia-bls/fuzz/.gitignore
similarity index 100%
rename from chia-bls/fuzz/.gitignore
rename to crates/chia-bls/fuzz/.gitignore
diff --git a/chia-bls/fuzz/Cargo.toml b/crates/chia-bls/fuzz/Cargo.toml
similarity index 100%
rename from chia-bls/fuzz/Cargo.toml
rename to crates/chia-bls/fuzz/Cargo.toml
diff --git a/chia-bls/fuzz/fuzz_targets/blspy-fidelity.rs b/crates/chia-bls/fuzz/fuzz_targets/blspy-fidelity.rs
similarity index 100%
rename from chia-bls/fuzz/fuzz_targets/blspy-fidelity.rs
rename to crates/chia-bls/fuzz/fuzz_targets/blspy-fidelity.rs
diff --git a/chia-bls/fuzz/fuzz_targets/derive.rs b/crates/chia-bls/fuzz/fuzz_targets/derive.rs
similarity index 100%
rename from chia-bls/fuzz/fuzz_targets/derive.rs
rename to crates/chia-bls/fuzz/fuzz_targets/derive.rs
diff --git a/chia-bls/src/derivable_key.rs b/crates/chia-bls/src/derivable_key.rs
similarity index 100%
rename from chia-bls/src/derivable_key.rs
rename to crates/chia-bls/src/derivable_key.rs
diff --git a/chia-bls/src/derive_keys.rs b/crates/chia-bls/src/derive_keys.rs
similarity index 100%
rename from chia-bls/src/derive_keys.rs
rename to crates/chia-bls/src/derive_keys.rs
diff --git a/chia-bls/src/error.rs b/crates/chia-bls/src/error.rs
similarity index 100%
rename from chia-bls/src/error.rs
rename to crates/chia-bls/src/error.rs
diff --git a/chia-bls/src/gtelement.rs b/crates/chia-bls/src/gtelement.rs
similarity index 100%
rename from chia-bls/src/gtelement.rs
rename to crates/chia-bls/src/gtelement.rs
diff --git a/chia-bls/src/lib.rs b/crates/chia-bls/src/lib.rs
similarity index 100%
rename from chia-bls/src/lib.rs
rename to crates/chia-bls/src/lib.rs
diff --git a/chia-bls/src/mnemonic.rs b/crates/chia-bls/src/mnemonic.rs
similarity index 100%
rename from chia-bls/src/mnemonic.rs
rename to crates/chia-bls/src/mnemonic.rs
diff --git a/chia-bls/src/public_key.rs b/crates/chia-bls/src/public_key.rs
similarity index 100%
rename from chia-bls/src/public_key.rs
rename to crates/chia-bls/src/public_key.rs
diff --git a/chia-bls/src/secret_key.rs b/crates/chia-bls/src/secret_key.rs
similarity index 100%
rename from chia-bls/src/secret_key.rs
rename to crates/chia-bls/src/secret_key.rs
diff --git a/chia-bls/src/signature.rs b/crates/chia-bls/src/signature.rs
similarity index 100%
rename from chia-bls/src/signature.rs
rename to crates/chia-bls/src/signature.rs
diff --git a/chia-client/Cargo.toml b/crates/chia-client/Cargo.toml
similarity index 78%
rename from chia-client/Cargo.toml
rename to crates/chia-client/Cargo.toml
index f31ac8e54..21369970d 100644
--- a/chia-client/Cargo.toml
+++ b/crates/chia-client/Cargo.toml
@@ -5,8 +5,8 @@ edition = "2021"
 license = "Apache-2.0"
 description = "Chia light client and async peer connections."
 authors = ["Brandon Haggstrom <b.haggstrom@chia.net>"]
-homepage = "https://github.com/Chia-Network/chia_rs/chia-client/"
-repository = "https://github.com/Chia-Network/chia_rs/chia-client/"
+homepage = "https://github.com/Chia-Network/chia_rs"
+repository = "https://github.com/Chia-Network/chia_rs"
 
 [dependencies]
 chia-protocol = { version = "0.5.1", path = "../chia-protocol" }
diff --git a/chia-client/src/error.rs b/crates/chia-client/src/error.rs
similarity index 100%
rename from chia-client/src/error.rs
rename to crates/chia-client/src/error.rs
diff --git a/chia-client/src/lib.rs b/crates/chia-client/src/lib.rs
similarity index 100%
rename from chia-client/src/lib.rs
rename to crates/chia-client/src/lib.rs
diff --git a/chia-client/src/peer.rs b/crates/chia-client/src/peer.rs
similarity index 100%
rename from chia-client/src/peer.rs
rename to crates/chia-client/src/peer.rs
diff --git a/chia-client/src/utils.rs b/crates/chia-client/src/utils.rs
similarity index 100%
rename from chia-client/src/utils.rs
rename to crates/chia-client/src/utils.rs
diff --git a/chia-protocol/Cargo.toml b/crates/chia-protocol/Cargo.toml
similarity index 88%
rename from chia-protocol/Cargo.toml
rename to crates/chia-protocol/Cargo.toml
index 8a6862609..1c800a845 100644
--- a/chia-protocol/Cargo.toml
+++ b/crates/chia-protocol/Cargo.toml
@@ -5,8 +5,8 @@ edition = "2021"
 license = "Apache-2.0"
 description = "Chia network protocol message types"
 authors = ["Arvid Norberg <arvid@chia.net>"]
-homepage = "https://github.com/Chia-Network/chia_rs/chia-protocol/"
-repository = "https://github.com/Chia-Network/chia_rs/chia-protocol/"
+homepage = "https://github.com/Chia-Network/chia_rs"
+repository = "https://github.com/Chia-Network/chia_rs"
 
 [features]
 py-bindings = ["dep:pyo3", "dep:chia_py_streamable_macro", "chia-traits/py-bindings"]
diff --git a/chia-protocol/fuzz/Cargo.toml b/crates/chia-protocol/fuzz/Cargo.toml
similarity index 100%
rename from chia-protocol/fuzz/Cargo.toml
rename to crates/chia-protocol/fuzz/Cargo.toml
diff --git a/chia-protocol/fuzz/fuzz_targets/parse-foliage.rs b/crates/chia-protocol/fuzz/fuzz_targets/parse-foliage.rs
similarity index 100%
rename from chia-protocol/fuzz/fuzz_targets/parse-foliage.rs
rename to crates/chia-protocol/fuzz/fuzz_targets/parse-foliage.rs
diff --git a/chia-protocol/fuzz/fuzz_targets/parse-full-block.rs b/crates/chia-protocol/fuzz/fuzz_targets/parse-full-block.rs
similarity index 100%
rename from chia-protocol/fuzz/fuzz_targets/parse-full-block.rs
rename to crates/chia-protocol/fuzz/fuzz_targets/parse-full-block.rs
diff --git a/chia-protocol/fuzz/fuzz_targets/parse-header-block.rs b/crates/chia-protocol/fuzz/fuzz_targets/parse-header-block.rs
similarity index 100%
rename from chia-protocol/fuzz/fuzz_targets/parse-header-block.rs
rename to crates/chia-protocol/fuzz/fuzz_targets/parse-header-block.rs
diff --git a/chia-protocol/fuzz/fuzz_targets/parse-program.rs b/crates/chia-protocol/fuzz/fuzz_targets/parse-program.rs
similarity index 100%
rename from chia-protocol/fuzz/fuzz_targets/parse-program.rs
rename to crates/chia-protocol/fuzz/fuzz_targets/parse-program.rs
diff --git a/chia-protocol/fuzz/fuzz_targets/parse-tx-info.rs b/crates/chia-protocol/fuzz/fuzz_targets/parse-tx-info.rs
similarity index 100%
rename from chia-protocol/fuzz/fuzz_targets/parse-tx-info.rs
rename to crates/chia-protocol/fuzz/fuzz_targets/parse-tx-info.rs
diff --git a/chia-protocol/fuzz/fuzz_targets/spend-bundle.rs b/crates/chia-protocol/fuzz/fuzz_targets/spend-bundle.rs
similarity index 100%
rename from chia-protocol/fuzz/fuzz_targets/spend-bundle.rs
rename to crates/chia-protocol/fuzz/fuzz_targets/spend-bundle.rs
diff --git a/chia-protocol/fuzz/fuzz_targets/streamable.rs b/crates/chia-protocol/fuzz/fuzz_targets/streamable.rs
similarity index 100%
rename from chia-protocol/fuzz/fuzz_targets/streamable.rs
rename to crates/chia-protocol/fuzz/fuzz_targets/streamable.rs
diff --git a/chia-protocol/src/block_record.rs b/crates/chia-protocol/src/block_record.rs
similarity index 100%
rename from chia-protocol/src/block_record.rs
rename to crates/chia-protocol/src/block_record.rs
diff --git a/chia-protocol/src/bytes.rs b/crates/chia-protocol/src/bytes.rs
similarity index 100%
rename from chia-protocol/src/bytes.rs
rename to crates/chia-protocol/src/bytes.rs
diff --git a/chia-protocol/src/chia_protocol.rs b/crates/chia-protocol/src/chia_protocol.rs
similarity index 100%
rename from chia-protocol/src/chia_protocol.rs
rename to crates/chia-protocol/src/chia_protocol.rs
diff --git a/chia-protocol/src/classgroup.rs b/crates/chia-protocol/src/classgroup.rs
similarity index 100%
rename from chia-protocol/src/classgroup.rs
rename to crates/chia-protocol/src/classgroup.rs
diff --git a/chia-protocol/src/coin.rs b/crates/chia-protocol/src/coin.rs
similarity index 100%
rename from chia-protocol/src/coin.rs
rename to crates/chia-protocol/src/coin.rs
diff --git a/chia-protocol/src/coin_spend.rs b/crates/chia-protocol/src/coin_spend.rs
similarity index 100%
rename from chia-protocol/src/coin_spend.rs
rename to crates/chia-protocol/src/coin_spend.rs
diff --git a/chia-protocol/src/coin_state.rs b/crates/chia-protocol/src/coin_state.rs
similarity index 100%
rename from chia-protocol/src/coin_state.rs
rename to crates/chia-protocol/src/coin_state.rs
diff --git a/chia-protocol/src/end_of_sub_slot_bundle.rs b/crates/chia-protocol/src/end_of_sub_slot_bundle.rs
similarity index 100%
rename from chia-protocol/src/end_of_sub_slot_bundle.rs
rename to crates/chia-protocol/src/end_of_sub_slot_bundle.rs
diff --git a/chia-protocol/src/fee_estimate.rs b/crates/chia-protocol/src/fee_estimate.rs
similarity index 100%
rename from chia-protocol/src/fee_estimate.rs
rename to crates/chia-protocol/src/fee_estimate.rs
diff --git a/chia-protocol/src/foliage.rs b/crates/chia-protocol/src/foliage.rs
similarity index 100%
rename from chia-protocol/src/foliage.rs
rename to crates/chia-protocol/src/foliage.rs
diff --git a/chia-protocol/src/full_node_protocol.rs b/crates/chia-protocol/src/full_node_protocol.rs
similarity index 100%
rename from chia-protocol/src/full_node_protocol.rs
rename to crates/chia-protocol/src/full_node_protocol.rs
diff --git a/chia-protocol/src/fullblock.rs b/crates/chia-protocol/src/fullblock.rs
similarity index 100%
rename from chia-protocol/src/fullblock.rs
rename to crates/chia-protocol/src/fullblock.rs
diff --git a/chia-protocol/src/header_block.rs b/crates/chia-protocol/src/header_block.rs
similarity index 100%
rename from chia-protocol/src/header_block.rs
rename to crates/chia-protocol/src/header_block.rs
diff --git a/chia-protocol/src/lazy_node.rs b/crates/chia-protocol/src/lazy_node.rs
similarity index 100%
rename from chia-protocol/src/lazy_node.rs
rename to crates/chia-protocol/src/lazy_node.rs
diff --git a/chia-protocol/src/lib.rs b/crates/chia-protocol/src/lib.rs
similarity index 100%
rename from chia-protocol/src/lib.rs
rename to crates/chia-protocol/src/lib.rs
diff --git a/chia-protocol/src/message_struct.rs b/crates/chia-protocol/src/message_struct.rs
similarity index 100%
rename from chia-protocol/src/message_struct.rs
rename to crates/chia-protocol/src/message_struct.rs
diff --git a/chia-protocol/src/peer_info.rs b/crates/chia-protocol/src/peer_info.rs
similarity index 100%
rename from chia-protocol/src/peer_info.rs
rename to crates/chia-protocol/src/peer_info.rs
diff --git a/chia-protocol/src/pool_target.rs b/crates/chia-protocol/src/pool_target.rs
similarity index 100%
rename from chia-protocol/src/pool_target.rs
rename to crates/chia-protocol/src/pool_target.rs
diff --git a/chia-protocol/src/program.rs b/crates/chia-protocol/src/program.rs
similarity index 100%
rename from chia-protocol/src/program.rs
rename to crates/chia-protocol/src/program.rs
diff --git a/chia-protocol/src/proof_of_space.rs b/crates/chia-protocol/src/proof_of_space.rs
similarity index 100%
rename from chia-protocol/src/proof_of_space.rs
rename to crates/chia-protocol/src/proof_of_space.rs
diff --git a/chia-protocol/src/reward_chain_block.rs b/crates/chia-protocol/src/reward_chain_block.rs
similarity index 100%
rename from chia-protocol/src/reward_chain_block.rs
rename to crates/chia-protocol/src/reward_chain_block.rs
diff --git a/chia-protocol/src/slots.rs b/crates/chia-protocol/src/slots.rs
similarity index 100%
rename from chia-protocol/src/slots.rs
rename to crates/chia-protocol/src/slots.rs
diff --git a/chia-protocol/src/spend_bundle.rs b/crates/chia-protocol/src/spend_bundle.rs
similarity index 98%
rename from chia-protocol/src/spend_bundle.rs
rename to crates/chia-protocol/src/spend_bundle.rs
index 241feb832..4775a8276 100644
--- a/chia-protocol/src/spend_bundle.rs
+++ b/crates/chia-protocol/src/spend_bundle.rs
@@ -156,7 +156,8 @@ mod tests {
         #[case] expect_parent: &str,
         #[case] expect_ph: &str,
     ) {
-        let spend_bytes = fs::read(format!("../ff-tests/{spend_file}.spend")).expect("read file");
+        let spend_bytes =
+            fs::read(format!("../../ff-tests/{spend_file}.spend")).expect("read file");
         let spend = CoinSpend::from_bytes(&spend_bytes).expect("parse CoinSpend");
         let bundle = SpendBundle::new(vec![spend], G2Element::default());
 
diff --git a/chia-protocol/src/sub_epoch_summary.rs b/crates/chia-protocol/src/sub_epoch_summary.rs
similarity index 100%
rename from chia-protocol/src/sub_epoch_summary.rs
rename to crates/chia-protocol/src/sub_epoch_summary.rs
diff --git a/chia-protocol/src/unfinished_block.rs b/crates/chia-protocol/src/unfinished_block.rs
similarity index 100%
rename from chia-protocol/src/unfinished_block.rs
rename to crates/chia-protocol/src/unfinished_block.rs
diff --git a/chia-protocol/src/vdf.rs b/crates/chia-protocol/src/vdf.rs
similarity index 100%
rename from chia-protocol/src/vdf.rs
rename to crates/chia-protocol/src/vdf.rs
diff --git a/chia-protocol/src/wallet_protocol.rs b/crates/chia-protocol/src/wallet_protocol.rs
similarity index 100%
rename from chia-protocol/src/wallet_protocol.rs
rename to crates/chia-protocol/src/wallet_protocol.rs
diff --git a/chia-protocol/src/weight_proof.rs b/crates/chia-protocol/src/weight_proof.rs
similarity index 100%
rename from chia-protocol/src/weight_proof.rs
rename to crates/chia-protocol/src/weight_proof.rs
diff --git a/chia-ssl/Cargo.toml b/crates/chia-ssl/Cargo.toml
similarity index 74%
rename from chia-ssl/Cargo.toml
rename to crates/chia-ssl/Cargo.toml
index b8680fe53..6199d2ab3 100644
--- a/chia-ssl/Cargo.toml
+++ b/crates/chia-ssl/Cargo.toml
@@ -5,8 +5,8 @@ edition = "2021"
 license = "Apache-2.0"
 description = "Chia SSL X.509 certificate generator"
 authors = ["Brandon Haggstrom <b.haggstrom@chia.net>"]
-homepage = "https://github.com/Chia-Network/chia_rs/chia-ssl/"
-repository = "https://github.com/Chia-Network/chia_rs/chia-ssl/"
+homepage = "https://github.com/Chia-Network/chia_rs"
+repository = "https://github.com/Chia-Network/chia_rs"
 
 [dependencies]
 lazy_static = "1.4.0"
diff --git a/chia-ssl/chia_ca.crt b/crates/chia-ssl/chia_ca.crt
similarity index 100%
rename from chia-ssl/chia_ca.crt
rename to crates/chia-ssl/chia_ca.crt
diff --git a/chia-ssl/chia_ca.key b/crates/chia-ssl/chia_ca.key
similarity index 100%
rename from chia-ssl/chia_ca.key
rename to crates/chia-ssl/chia_ca.key
diff --git a/chia-ssl/src/ca.rs b/crates/chia-ssl/src/ca.rs
similarity index 100%
rename from chia-ssl/src/ca.rs
rename to crates/chia-ssl/src/ca.rs
diff --git a/chia-ssl/src/error.rs b/crates/chia-ssl/src/error.rs
similarity index 100%
rename from chia-ssl/src/error.rs
rename to crates/chia-ssl/src/error.rs
diff --git a/chia-ssl/src/lib.rs b/crates/chia-ssl/src/lib.rs
similarity index 100%
rename from chia-ssl/src/lib.rs
rename to crates/chia-ssl/src/lib.rs
diff --git a/chia-tools/Cargo.toml b/crates/chia-tools/Cargo.toml
similarity index 88%
rename from chia-tools/Cargo.toml
rename to crates/chia-tools/Cargo.toml
index 51fa37034..3ac76ab0f 100644
--- a/chia-tools/Cargo.toml
+++ b/crates/chia-tools/Cargo.toml
@@ -5,8 +5,8 @@ edition = "2021"
 license = "Apache-2.0"
 description = "Utility functions and types used by the Chia blockchain full node"
 authors = ["Arvid Norberg <arvid@chia.net>"]
-homepage = "https://github.com/Chia-Network/chia_rs/chia-tools"
-repository = "https://github.com/Chia-Network/chia_rs/chia-tools"
+homepage = "https://github.com/Chia-Network/chia_rs"
+repository = "https://github.com/Chia-Network/chia_rs"
 
 [dependencies]
 chia-protocol = { version = "0.5.1", path = "../chia-protocol" }
@@ -16,7 +16,7 @@ clvm-traits = { version = "0.5.2", path = "../clvm-traits" }
 chia-wallet = { version = "0.5.1", path = "../chia-wallet" }
 chia-bls = { version = "0.5.1", path = "../chia-bls" }
 clvmr = { version = "0.6.0", features = ["counters"] }
-chia = { version = "0.5.2", path = ".." }
+chia = { version = "0.5.2", path = "../.." }
 rusqlite = { version = "0.30.0", features = ["bundled"] }
 clap = { version = "4.3.9", features = ["derive"] }
 zstd = "0.12.3"
diff --git a/chia-tools/graph.gnuplot b/crates/chia-tools/graph.gnuplot
similarity index 100%
rename from chia-tools/graph.gnuplot
rename to crates/chia-tools/graph.gnuplot
diff --git a/chia-tools/parse-analyze-chain.py b/crates/chia-tools/parse-analyze-chain.py
similarity index 100%
rename from chia-tools/parse-analyze-chain.py
rename to crates/chia-tools/parse-analyze-chain.py
diff --git a/chia-tools/src/bin/analyze-chain.rs b/crates/chia-tools/src/bin/analyze-chain.rs
similarity index 100%
rename from chia-tools/src/bin/analyze-chain.rs
rename to crates/chia-tools/src/bin/analyze-chain.rs
diff --git a/chia-tools/src/bin/compress-clvm.rs b/crates/chia-tools/src/bin/compress-clvm.rs
similarity index 100%
rename from chia-tools/src/bin/compress-clvm.rs
rename to crates/chia-tools/src/bin/compress-clvm.rs
diff --git a/chia-tools/src/bin/fast-forward-spend.rs b/crates/chia-tools/src/bin/fast-forward-spend.rs
similarity index 100%
rename from chia-tools/src/bin/fast-forward-spend.rs
rename to crates/chia-tools/src/bin/fast-forward-spend.rs
diff --git a/chia-tools/src/bin/gen-corpus.rs b/crates/chia-tools/src/bin/gen-corpus.rs
similarity index 100%
rename from chia-tools/src/bin/gen-corpus.rs
rename to crates/chia-tools/src/bin/gen-corpus.rs
diff --git a/chia-tools/src/bin/get-generator.rs b/crates/chia-tools/src/bin/get-generator.rs
similarity index 100%
rename from chia-tools/src/bin/get-generator.rs
rename to crates/chia-tools/src/bin/get-generator.rs
diff --git a/chia-tools/src/bin/optimize-db.rs b/crates/chia-tools/src/bin/optimize-db.rs
similarity index 100%
rename from chia-tools/src/bin/optimize-db.rs
rename to crates/chia-tools/src/bin/optimize-db.rs
diff --git a/chia-tools/src/bin/run-spend.rs b/crates/chia-tools/src/bin/run-spend.rs
similarity index 100%
rename from chia-tools/src/bin/run-spend.rs
rename to crates/chia-tools/src/bin/run-spend.rs
diff --git a/chia-tools/src/bin/test-block-generators.rs b/crates/chia-tools/src/bin/test-block-generators.rs
similarity index 100%
rename from chia-tools/src/bin/test-block-generators.rs
rename to crates/chia-tools/src/bin/test-block-generators.rs
diff --git a/chia-tools/src/lib.rs b/crates/chia-tools/src/lib.rs
similarity index 100%
rename from chia-tools/src/lib.rs
rename to crates/chia-tools/src/lib.rs
diff --git a/chia-tools/src/visit_spends.rs b/crates/chia-tools/src/visit_spends.rs
similarity index 100%
rename from chia-tools/src/visit_spends.rs
rename to crates/chia-tools/src/visit_spends.rs
diff --git a/chia-traits/Cargo.toml b/crates/chia-traits/Cargo.toml
similarity index 100%
rename from chia-traits/Cargo.toml
rename to crates/chia-traits/Cargo.toml
diff --git a/chia-traits/src/chia_error.rs b/crates/chia-traits/src/chia_error.rs
similarity index 100%
rename from chia-traits/src/chia_error.rs
rename to crates/chia-traits/src/chia_error.rs
diff --git a/chia-traits/src/from_json_dict.rs b/crates/chia-traits/src/from_json_dict.rs
similarity index 100%
rename from chia-traits/src/from_json_dict.rs
rename to crates/chia-traits/src/from_json_dict.rs
diff --git a/chia-traits/src/int.rs b/crates/chia-traits/src/int.rs
similarity index 100%
rename from chia-traits/src/int.rs
rename to crates/chia-traits/src/int.rs
diff --git a/chia-traits/src/lib.rs b/crates/chia-traits/src/lib.rs
similarity index 100%
rename from chia-traits/src/lib.rs
rename to crates/chia-traits/src/lib.rs
diff --git a/chia-traits/src/streamable.rs b/crates/chia-traits/src/streamable.rs
similarity index 100%
rename from chia-traits/src/streamable.rs
rename to crates/chia-traits/src/streamable.rs
diff --git a/chia-traits/src/to_json_dict.rs b/crates/chia-traits/src/to_json_dict.rs
similarity index 100%
rename from chia-traits/src/to_json_dict.rs
rename to crates/chia-traits/src/to_json_dict.rs
diff --git a/chia-wallet/Cargo.toml b/crates/chia-wallet/Cargo.toml
similarity index 82%
rename from chia-wallet/Cargo.toml
rename to crates/chia-wallet/Cargo.toml
index 3dc093382..0d52ba651 100644
--- a/chia-wallet/Cargo.toml
+++ b/crates/chia-wallet/Cargo.toml
@@ -5,8 +5,8 @@ edition = "2021"
 license = "Apache-2.0"
 description = "Chia primitives needed for building wallets."
 authors = ["Brandon Haggstrom <b.haggstrom@chia.net>"]
-homepage = "https://github.com/Chia-Network/chia_rs/chia-wallet/"
-repository = "https://github.com/Chia-Network/chia_rs/chia-wallet/"
+homepage = "https://github.com/Chia-Network/chia_rs"
+repository = "https://github.com/Chia-Network/chia_rs"
 
 [dependencies]
 clvmr = "0.6.0"
diff --git a/chia-wallet/fuzz/.gitignore b/crates/chia-wallet/fuzz/.gitignore
similarity index 100%
rename from chia-wallet/fuzz/.gitignore
rename to crates/chia-wallet/fuzz/.gitignore
diff --git a/chia-wallet/fuzz/Cargo.toml b/crates/chia-wallet/fuzz/Cargo.toml
similarity index 100%
rename from chia-wallet/fuzz/Cargo.toml
rename to crates/chia-wallet/fuzz/Cargo.toml
diff --git a/chia-wallet/fuzz/fuzz_targets/roundtrip.rs b/crates/chia-wallet/fuzz/fuzz_targets/roundtrip.rs
similarity index 100%
rename from chia-wallet/fuzz/fuzz_targets/roundtrip.rs
rename to crates/chia-wallet/fuzz/fuzz_targets/roundtrip.rs
diff --git a/chia-wallet/src/derive_synthetic.rs b/crates/chia-wallet/src/derive_synthetic.rs
similarity index 100%
rename from chia-wallet/src/derive_synthetic.rs
rename to crates/chia-wallet/src/derive_synthetic.rs
diff --git a/chia-wallet/src/lib.rs b/crates/chia-wallet/src/lib.rs
similarity index 100%
rename from chia-wallet/src/lib.rs
rename to crates/chia-wallet/src/lib.rs
diff --git a/chia-wallet/src/proof.rs b/crates/chia-wallet/src/proof.rs
similarity index 100%
rename from chia-wallet/src/proof.rs
rename to crates/chia-wallet/src/proof.rs
diff --git a/chia-wallet/src/puzzles.rs b/crates/chia-wallet/src/puzzles.rs
similarity index 100%
rename from chia-wallet/src/puzzles.rs
rename to crates/chia-wallet/src/puzzles.rs
diff --git a/chia-wallet/src/puzzles/cat.rs b/crates/chia-wallet/src/puzzles/cat.rs
similarity index 100%
rename from chia-wallet/src/puzzles/cat.rs
rename to crates/chia-wallet/src/puzzles/cat.rs
diff --git a/chia-wallet/src/puzzles/did.rs b/crates/chia-wallet/src/puzzles/did.rs
similarity index 100%
rename from chia-wallet/src/puzzles/did.rs
rename to crates/chia-wallet/src/puzzles/did.rs
diff --git a/chia-wallet/src/puzzles/nft.rs b/crates/chia-wallet/src/puzzles/nft.rs
similarity index 100%
rename from chia-wallet/src/puzzles/nft.rs
rename to crates/chia-wallet/src/puzzles/nft.rs
diff --git a/chia-wallet/src/puzzles/offer.rs b/crates/chia-wallet/src/puzzles/offer.rs
similarity index 100%
rename from chia-wallet/src/puzzles/offer.rs
rename to crates/chia-wallet/src/puzzles/offer.rs
diff --git a/chia-wallet/src/puzzles/singleton.rs b/crates/chia-wallet/src/puzzles/singleton.rs
similarity index 100%
rename from chia-wallet/src/puzzles/singleton.rs
rename to crates/chia-wallet/src/puzzles/singleton.rs
diff --git a/chia-wallet/src/puzzles/standard.rs b/crates/chia-wallet/src/puzzles/standard.rs
similarity index 100%
rename from chia-wallet/src/puzzles/standard.rs
rename to crates/chia-wallet/src/puzzles/standard.rs
diff --git a/chia_py_streamable_macro/Cargo.toml b/crates/chia_py_streamable_macro/Cargo.toml
similarity index 68%
rename from chia_py_streamable_macro/Cargo.toml
rename to crates/chia_py_streamable_macro/Cargo.toml
index 9d530d925..0bedec996 100644
--- a/chia_py_streamable_macro/Cargo.toml
+++ b/crates/chia_py_streamable_macro/Cargo.toml
@@ -5,8 +5,8 @@ edition = "2021"
 license = "Apache-2.0"
 description = "Derive macro to create python bindings for Chia types"
 authors = ["Arvid Norberg <arvid@libtorrent.org>"]
-homepage = "https://github.com/Chia-Network/chia_rs/chia_py_streamable_macro/"
-repository = "https://github.com/Chia-Network/chia_rs/chia_py_streamable_macro/"
+homepage = "https://github.com/Chia-Network/chia_rs"
+repository = "https://github.com/Chia-Network/chia_rs"
 
 [lib]
 proc-macro = true
diff --git a/chia_py_streamable_macro/src/lib.rs b/crates/chia_py_streamable_macro/src/lib.rs
similarity index 100%
rename from chia_py_streamable_macro/src/lib.rs
rename to crates/chia_py_streamable_macro/src/lib.rs
diff --git a/chia_streamable_macro/Cargo.toml b/crates/chia_streamable_macro/Cargo.toml
similarity index 78%
rename from chia_streamable_macro/Cargo.toml
rename to crates/chia_streamable_macro/Cargo.toml
index 43923960b..689c0298f 100644
--- a/chia_streamable_macro/Cargo.toml
+++ b/crates/chia_streamable_macro/Cargo.toml
@@ -5,8 +5,8 @@ edition = "2021"
 license = "Apache-2.0"
 description = "Streamable derive macro for serializing/deserializing types in Chia protocol format"
 authors = ["Arvid Norberg <arvid@libtorrent.org>"]
-homepage = "https://github.com/Chia-Network/chia_rs/"
-repository = "https://github.com/Chia-Network/chia_rs/"
+homepage = "https://github.com/Chia-Network/chia_rs"
+repository = "https://github.com/Chia-Network/chia_rs"
 
 [lib]
 proc-macro = true
diff --git a/chia_streamable_macro/src/lib.rs b/crates/chia_streamable_macro/src/lib.rs
similarity index 100%
rename from chia_streamable_macro/src/lib.rs
rename to crates/chia_streamable_macro/src/lib.rs
diff --git a/clvm-derive/Cargo.toml b/crates/clvm-derive/Cargo.toml
similarity index 69%
rename from clvm-derive/Cargo.toml
rename to crates/clvm-derive/Cargo.toml
index ce5f49f33..ac1c32a89 100644
--- a/clvm-derive/Cargo.toml
+++ b/crates/clvm-derive/Cargo.toml
@@ -5,8 +5,8 @@ edition = "2021"
 license = "Apache-2.0"
 description = "Derive macros for implementing CLVM traits."
 authors = ["Brandon Haggstrom <b.haggstrom@chia.net>"]
-homepage = "https://github.com/Chia-Network/chia_rs/clvm-derive/"
-repository = "https://github.com/Chia-Network/chia_rs/clvm-derive/"
+homepage = "https://github.com/Chia-Network/chia_rs"
+repository = "https://github.com/Chia-Network/chia_rs"
 
 [lib]
 proc-macro = true
diff --git a/clvm-derive/src/from_clvm.rs b/crates/clvm-derive/src/from_clvm.rs
similarity index 100%
rename from clvm-derive/src/from_clvm.rs
rename to crates/clvm-derive/src/from_clvm.rs
diff --git a/clvm-derive/src/helpers.rs b/crates/clvm-derive/src/helpers.rs
similarity index 100%
rename from clvm-derive/src/helpers.rs
rename to crates/clvm-derive/src/helpers.rs
diff --git a/clvm-derive/src/lib.rs b/crates/clvm-derive/src/lib.rs
similarity index 100%
rename from clvm-derive/src/lib.rs
rename to crates/clvm-derive/src/lib.rs
diff --git a/clvm-derive/src/macros.rs b/crates/clvm-derive/src/macros.rs
similarity index 100%
rename from clvm-derive/src/macros.rs
rename to crates/clvm-derive/src/macros.rs
diff --git a/clvm-derive/src/to_clvm.rs b/crates/clvm-derive/src/to_clvm.rs
similarity index 100%
rename from clvm-derive/src/to_clvm.rs
rename to crates/clvm-derive/src/to_clvm.rs
diff --git a/clvm-traits/Cargo.toml b/crates/clvm-traits/Cargo.toml
similarity index 83%
rename from clvm-traits/Cargo.toml
rename to crates/clvm-traits/Cargo.toml
index 992802f42..f9b414902 100644
--- a/clvm-traits/Cargo.toml
+++ b/crates/clvm-traits/Cargo.toml
@@ -5,8 +5,8 @@ edition = "2021"
 license = "Apache-2.0"
 description = "Traits for encoding and decoding CLVM objects."
 authors = ["Brandon Haggstrom <b.haggstrom@chia.net>"]
-homepage = "https://github.com/Chia-Network/chia_rs/clvm-traits/"
-repository = "https://github.com/Chia-Network/chia_rs/clvm-traits/"
+homepage = "https://github.com/Chia-Network/chia_rs"
+repository = "https://github.com/Chia-Network/chia_rs"
 
 [package.metadata.docs.rs]
 features = ["derive", "chia-bls"]
diff --git a/clvm-traits/docs/derive_macros.md b/crates/clvm-traits/docs/derive_macros.md
similarity index 100%
rename from clvm-traits/docs/derive_macros.md
rename to crates/clvm-traits/docs/derive_macros.md
diff --git a/clvm-traits/src/clvm_decoder.rs b/crates/clvm-traits/src/clvm_decoder.rs
similarity index 100%
rename from clvm-traits/src/clvm_decoder.rs
rename to crates/clvm-traits/src/clvm_decoder.rs
diff --git a/clvm-traits/src/clvm_encoder.rs b/crates/clvm-traits/src/clvm_encoder.rs
similarity index 100%
rename from clvm-traits/src/clvm_encoder.rs
rename to crates/clvm-traits/src/clvm_encoder.rs
diff --git a/clvm-traits/src/error.rs b/crates/clvm-traits/src/error.rs
similarity index 100%
rename from clvm-traits/src/error.rs
rename to crates/clvm-traits/src/error.rs
diff --git a/clvm-traits/src/from_clvm.rs b/crates/clvm-traits/src/from_clvm.rs
similarity index 100%
rename from clvm-traits/src/from_clvm.rs
rename to crates/clvm-traits/src/from_clvm.rs
diff --git a/clvm-traits/src/lib.rs b/crates/clvm-traits/src/lib.rs
similarity index 100%
rename from clvm-traits/src/lib.rs
rename to crates/clvm-traits/src/lib.rs
diff --git a/clvm-traits/src/macros.rs b/crates/clvm-traits/src/macros.rs
similarity index 100%
rename from clvm-traits/src/macros.rs
rename to crates/clvm-traits/src/macros.rs
diff --git a/clvm-traits/src/match_byte.rs b/crates/clvm-traits/src/match_byte.rs
similarity index 100%
rename from clvm-traits/src/match_byte.rs
rename to crates/clvm-traits/src/match_byte.rs
diff --git a/clvm-traits/src/to_clvm.rs b/crates/clvm-traits/src/to_clvm.rs
similarity index 100%
rename from clvm-traits/src/to_clvm.rs
rename to crates/clvm-traits/src/to_clvm.rs
diff --git a/clvm-traits/src/wrappers.rs b/crates/clvm-traits/src/wrappers.rs
similarity index 100%
rename from clvm-traits/src/wrappers.rs
rename to crates/clvm-traits/src/wrappers.rs
diff --git a/clvm-utils/Cargo.toml b/crates/clvm-utils/Cargo.toml
similarity index 74%
rename from clvm-utils/Cargo.toml
rename to crates/clvm-utils/Cargo.toml
index b799ef411..e3b2e9c70 100644
--- a/clvm-utils/Cargo.toml
+++ b/crates/clvm-utils/Cargo.toml
@@ -5,8 +5,8 @@ edition = "2021"
 license = "Apache-2.0"
 description = "Utility functions for processing clvm programs and structures"
 authors = ["Arvid Norberg <arvid@chia.net>"]
-homepage = "https://github.com/Chia-Network/chia_rs/"
-repository = "https://github.com/Chia-Network/chia_rs/clvm-utils"
+homepage = "https://github.com/Chia-Network/chia_rs"
+repository = "https://github.com/Chia-Network/chia_rs"
 
 [dependencies]
 clvmr = "0.6.0"
diff --git a/clvm-utils/fuzz/Cargo.toml b/crates/clvm-utils/fuzz/Cargo.toml
similarity index 78%
rename from clvm-utils/fuzz/Cargo.toml
rename to crates/clvm-utils/fuzz/Cargo.toml
index 59a379d9f..b4832488d 100644
--- a/clvm-utils/fuzz/Cargo.toml
+++ b/crates/clvm-utils/fuzz/Cargo.toml
@@ -11,10 +11,10 @@ cargo-fuzz = true
 [dependencies]
 libfuzzer-sys = "0.4"
 clvmr = "=0.6.0"
-chia-fuzz = { path = "../../fuzz" }
+chia-fuzz = { path = "../../../fuzz" }
 clvm-utils = { path = ".." }
-clvm-traits = { path = "../../clvm-traits" }
-chia = { path = "../.." }
+clvm-traits = { path = "../../../crates/clvm-traits" }
+chia = { path = "../../.." }
 
 [[bin]]
 name = "tree-hash"
diff --git a/clvm-utils/fuzz/fuzz_targets/curry.rs b/crates/clvm-utils/fuzz/fuzz_targets/curry.rs
similarity index 100%
rename from clvm-utils/fuzz/fuzz_targets/curry.rs
rename to crates/clvm-utils/fuzz/fuzz_targets/curry.rs
diff --git a/clvm-utils/fuzz/fuzz_targets/tree-hash.rs b/crates/clvm-utils/fuzz/fuzz_targets/tree-hash.rs
similarity index 100%
rename from clvm-utils/fuzz/fuzz_targets/tree-hash.rs
rename to crates/clvm-utils/fuzz/fuzz_targets/tree-hash.rs
diff --git a/clvm-utils/src/curried_program.rs b/crates/clvm-utils/src/curried_program.rs
similarity index 100%
rename from clvm-utils/src/curried_program.rs
rename to crates/clvm-utils/src/curried_program.rs
diff --git a/clvm-utils/src/curry_tree_hash.rs b/crates/clvm-utils/src/curry_tree_hash.rs
similarity index 100%
rename from clvm-utils/src/curry_tree_hash.rs
rename to crates/clvm-utils/src/curry_tree_hash.rs
diff --git a/clvm-utils/src/lib.rs b/crates/clvm-utils/src/lib.rs
similarity index 100%
rename from clvm-utils/src/lib.rs
rename to crates/clvm-utils/src/lib.rs
diff --git a/clvm-utils/src/tree_hash.rs b/crates/clvm-utils/src/tree_hash.rs
similarity index 99%
rename from clvm-utils/src/tree_hash.rs
rename to crates/clvm-utils/src/tree_hash.rs
index 754603bc8..1b2c4084d 100644
--- a/clvm-utils/src/tree_hash.rs
+++ b/crates/clvm-utils/src/tree_hash.rs
@@ -274,7 +274,7 @@ fn test_tree_hash_cached(
     };
     use std::fs::read_to_string;
 
-    let filename = format!("../generator-tests/{name}.txt");
+    let filename = format!("../../generator-tests/{name}.txt");
     println!("file: {filename}",);
     let test_file = read_to_string(filename).expect("test file not found");
     let (generator, _) = test_file.split_once('\n').expect("invalid test file");
diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml
index aff2a356a..77c0c9aed 100644
--- a/fuzz/Cargo.toml
+++ b/fuzz/Cargo.toml
@@ -11,10 +11,10 @@ cargo-fuzz = true
 [dependencies]
 libfuzzer-sys = "0.4"
 clvmr = "0.6.0"
-clvm-utils = { path = "../clvm-utils" }
-clvm-traits = { path = "../clvm-traits" }
-chia-protocol = { path = "../chia-protocol" }
-chia-traits = { path = "../chia-traits" }
+clvm-utils = { path = "../crates/clvm-utils" }
+clvm-traits = { path = "../crates/clvm-traits" }
+chia-protocol = { path = "../crates/chia-protocol" }
+chia-traits = { path = "../crates/chia-traits" }
 chia = { path = ".." }
 hex-literal = "=0.4.1"
 
diff --git a/wasm/Cargo.toml b/wasm/Cargo.toml
index c6a39cb25..e30f1d4a6 100644
--- a/wasm/Cargo.toml
+++ b/wasm/Cargo.toml
@@ -5,8 +5,8 @@ authors = ["Richard Kiss <him@richardkiss.com>"]
 edition = "2021"
 license = "Apache-2.0"
 description = "Code useful for implementing chia consensus."
-homepage = "https://github.com/Chia-Network/chia_rs/"
-repository = "https://github.com/Chia-Network/chia_rs/"
+homepage = "https://github.com/Chia-Network/chia_rs"
+repository = "https://github.com/Chia-Network/chia_rs"
 readme = "README.md"
 
 [lib]
diff --git a/wheel/Cargo.toml b/wheel/Cargo.toml
index b3040db10..12da87d2e 100644
--- a/wheel/Cargo.toml
+++ b/wheel/Cargo.toml
@@ -5,8 +5,8 @@ authors = ["Richard Kiss <him@richardkiss.com>"]
 edition = "2021"
 license = "Apache-2.0"
 description = "Code useful for implementing chia consensus."
-homepage = "https://github.com/Chia-Network/chia_rs/"
-repository = "https://github.com/Chia-Network/chia_rs/"
+homepage = "https://github.com/Chia-Network/chia_rs"
+repository = "https://github.com/Chia-Network/chia_rs"
 readme = "README.md"
 
 [lib]
@@ -20,10 +20,10 @@ hex = "0.4.3"
 sha2 = "0.10.8"
 pyo3 = { version = "=0.19.0", features = ["multiple-pymethods"] }
 chia = { version = "=0.5.2", path = "..", features = ["py-bindings"] }
-chia-bls = { version = "=0.5.1", path = "../chia-bls", features = ["py-bindings"]  }
-chia-protocol = { version = "=0.5.1", path = "../chia-protocol", features = ["py-bindings"]  }
-chia-traits = { version = "=0.5.2", path = "../chia-traits", features = ["py-bindings"]  }
-clvm-traits = { version = "=0.5.2", path = "../clvm-traits", features = ["derive", "py-bindings"] }
-clvm-utils = { version = "=0.5.1", path = "../clvm-utils" }
-chia_py_streamable_macro = { version = "=0.5.1", path = "../chia_py_streamable_macro" }
-chia_streamable_macro = { version = "=0.3.0", path = "../chia_streamable_macro" }
+chia-bls = { version = "=0.5.1", path = "../crates/chia-bls", features = ["py-bindings"]  }
+chia-protocol = { version = "=0.5.1", path = "../crates/chia-protocol", features = ["py-bindings"]  }
+chia-traits = { version = "=0.5.2", path = "../crates/chia-traits", features = ["py-bindings"]  }
+clvm-traits = { version = "=0.5.2", path = "../crates/clvm-traits", features = ["derive", "py-bindings"] }
+clvm-utils = { version = "=0.5.1", path = "../crates/clvm-utils" }
+chia_py_streamable_macro = { version = "=0.5.1", path = "../crates/chia_py_streamable_macro" }
+chia_streamable_macro = { version = "=0.3.0", path = "../crates/chia_streamable_macro" }
diff --git a/wheel/generate_type_stubs.py b/wheel/generate_type_stubs.py
index f7057430d..036083d87 100644
--- a/wheel/generate_type_stubs.py
+++ b/wheel/generate_type_stubs.py
@@ -3,7 +3,7 @@
 from glob import glob
 
 output_file = Path(__file__).parent.resolve() / "chia_rs.pyi"
-input_dir = Path(__file__).parent.parent.resolve() / "chia-protocol" / "src"
+input_dir = Path(__file__).parent.parent.resolve() / "crates" / "chia-protocol" / "src"
 
 # enums are exposed to python as int
 enums = set(["NodeType", "ProtocolMessageTypes"])