diff --git a/.cargo/config.toml b/.cargo/config.toml
index d972f516..e7630f18 100644
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -1,9 +1,12 @@
 [patch.crates-io]
 
-sov-ibc                     = { path = "modules/sov-ibc" }
-sov-ibc-transfer            = { path = "modules/sov-ibc-transfer" }
-sov-consensus-state-tracker = { path = "modules/sov-consensus-state-tracker" }
-sov-celestia-client         = { path = "clients/sov-celestia" }
+sov-ibc-proto               = { path = "crates/proto/sov-ibc-proto" }
+sov-client-types            = { path = "crates/clients/sov-client-types" }
+sov-celestia-client         = { path = "crates/clients/sov-celestia-client" }
+sov-celestia-client-types   = { path = "crates/clients/sov-celestia-client-types" }
+sov-ibc                     = { path = "crates/modules/sov-ibc" }
+sov-ibc-transfer            = { path = "crates/modules/sov-ibc-transfer" }
+sov-consensus-state-tracker = { path = "crates/modules/sov-consensus-state-tracker" }
 
 ibc                   = { git = "https://github.com/cosmos/ibc-rs.git", branch = "rano/downgrade-borsh" }
 ibc-core              = { git = "https://github.com/cosmos/ibc-rs.git", branch = "rano/downgrade-borsh" }
@@ -17,7 +20,7 @@ ibc-primitives        = { git = "https://github.com/cosmos/ibc-rs.git", branch =
 ibc-query             = { git = "https://github.com/cosmos/ibc-rs.git", branch = "rano/downgrade-borsh" }
 ibc-testkit           = { git = "https://github.com/cosmos/ibc-rs.git", branch = "rano/downgrade-borsh" }
 
-cosmrs         = { git = "https://github.com/cosmos/cosmos-rust.git", rev = "ced74a7" }
+cosmrs         = { git = "https://github.com/cosmos/cosmos-rust.git", rev = "4b1332e" }
 basecoin       = { git = "https://github.com/informalsystems/basecoin-rs.git", branch = "rano/sov-support" }
 basecoin-store = { git = "https://github.com/informalsystems/basecoin-rs.git", branch = "rano/sov-support" }
 jmt            = { git = "https://github.com/penumbra-zone/jmt.git", rev = "1d007e11cb68aa5ca13e9a5af4a12e6439d5f7b6" }
diff --git a/Cargo.lock b/Cargo.lock
index fc5c3bf7..5fc122f9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1367,7 +1367,7 @@ dependencies = [
 [[package]]
 name = "cosmos-sdk-proto"
 version = "0.22.0-pre"
-source = "git+https://github.com/cosmos/cosmos-rust.git?rev=ced74a7#ced74a754669ebf698decdae33ceeb2cc9a0839b"
+source = "git+https://github.com/cosmos/cosmos-rust.git?rev=4b1332e#4b1332e6d8258ac845cef71589c8d362a669675a"
 dependencies = [
  "prost",
  "prost-types",
@@ -1377,7 +1377,7 @@ dependencies = [
 [[package]]
 name = "cosmrs"
 version = "0.17.0-pre"
-source = "git+https://github.com/cosmos/cosmos-rust.git?rev=ced74a7#ced74a754669ebf698decdae33ceeb2cc9a0839b"
+source = "git+https://github.com/cosmos/cosmos-rust.git?rev=4b1332e#4b1332e6d8258ac845cef71589c8d362a669675a"
 dependencies = [
  "bip32",
  "cosmos-sdk-proto",
diff --git a/Cargo.toml b/Cargo.toml
index a4ca254f..564110d6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,16 +1,16 @@
 [workspace]
 resolver = "2"
 members = [
-  "proto",
-  "proto/compiler",
-  "clients/sov-types",
-  "clients/sov-celestia/types",
-  "clients/sov-celestia",
-  "clients/sov-celestia/cw-contract",
-  "modules/sov-ibc-transfer",
-  "modules/sov-ibc",
-  "modules/sov-consensus-state-tracker",
-  "mocks",
+  "crates/proto/sov-ibc-proto",
+  "crates/proto/sov-ibc-proto-compiler",
+  "crates/clients/sov-client-types",
+  "crates/clients/sov-celestia-client",
+  "crates/clients/sov-celestia-client-types",
+  "crates/clients/sov-celestia-client-cw",
+  "crates/modules/sov-ibc",
+  "crates/modules/sov-ibc-transfer",
+  "crates/modules/sov-consensus-state-tracker",
+  "crates/test/sov-ibc-mocks",
 ]
 
 exclude = [
@@ -46,6 +46,15 @@ semicolon_if_nothing_returned = "deny"
 uninlined_format_args         = "deny"
 
 [workspace.dependencies]
+
+sov-ibc-proto               = { version = "0.1.0" }
+sov-client-types            = { version = "0.1.0" }
+sov-celestia-client         = { version = "0.1.0", default-features = false }
+sov-celestia-client-types   = { version = "0.1.0", default-features = false }
+sov-ibc                     = { version = "0.1.0" }
+sov-ibc-transfer            = { version = "0.1.0" }
+sov-consensus-state-tracker = { version = "0.1.0" }
+
 # external dependencies
 anyhow      = "1.0.68"
 base64      = { version = "0.21", default-features = false }
@@ -105,3 +114,5 @@ sov-kernels                = { version = "0.3.0" }
 sov-mock-zkvm              = { version = "0.3.0" }
 sov-prover-storage-manager = { version = "0.3.0" }
 const-rollup-config        = { version = "0.3.0" }
+
+# Note: the `[patch.crates-io]` section is placed at `./cargo/config.toml`
diff --git a/ci/risc0-check/methods/guest/Cargo.toml b/ci/risc0-check/methods/guest/Cargo.toml
index 3f4bc84a..94358613 100644
--- a/ci/risc0-check/methods/guest/Cargo.toml
+++ b/ci/risc0-check/methods/guest/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2021"
 [workspace]
 
 [dependencies]
-sov-ibc             = { path = "../../../../modules/sov-ibc" }
-sov-ibc-transfer    = { path = "../../../../modules/sov-ibc-transfer" }
-sov-celestia-client = { path = "../../../../clients/sov-celestia" }
+sov-ibc             = { path = "../../../../crates/modules/sov-ibc" }
+sov-ibc-transfer    = { path = "../../../../crates/modules/sov-ibc-transfer" }
+sov-celestia-client = { path = "../../../../crates/clients/sov-celestia-client" }
 risc0-zkvm          = { version = "0.20.1", default-features = false, features = [ "std" ] }
diff --git a/clients/README.md b/crates/clients/README.md
similarity index 100%
rename from clients/README.md
rename to crates/clients/README.md
diff --git a/clients/sov-celestia/cw-contract/Cargo.toml b/crates/clients/sov-celestia-client-cw/Cargo.toml
similarity index 86%
rename from clients/sov-celestia/cw-contract/Cargo.toml
rename to crates/clients/sov-celestia-client-cw/Cargo.toml
index 6a784633..928bcc1c 100644
--- a/clients/sov-celestia/cw-contract/Cargo.toml
+++ b/crates/clients/sov-celestia-client-cw/Cargo.toml
@@ -20,7 +20,7 @@ crate-type = [ "cdylib", "rlib" ]
 # ibc dependencies
 ibc-core            = { workspace = true }
 ibc-client-cw       = { workspace = true }
-sov-celestia-client = { path = "./../", default-features = false, features = [ "serde" ] }
+sov-celestia-client = { workspace = true, default-features = false, features = [ "serde" ] }
 
 # cosmwasm dependencies
 ### Note: Kept at the following version to match the CosmWasm module version
@@ -32,7 +32,7 @@ cosmwasm-std    = "2.0.4"
 [dev-dependencies]
 cosmwasm-vm           = "2.0.4"
 ibc-client-tendermint = { workspace = true }
-sov-celestia-client   = { path = "./../", default-features = false, features = [ "test-util" ] }
+sov-celestia-client   = { workspace = true, default-features = false, features = [ "test-util" ] }
 tendermint-testgen    = { workspace = true }
 
 [features]
diff --git a/clients/sov-celestia/cw-contract/src/client_type.rs b/crates/clients/sov-celestia-client-cw/src/client_type.rs
similarity index 100%
rename from clients/sov-celestia/cw-contract/src/client_type.rs
rename to crates/clients/sov-celestia-client-cw/src/client_type.rs
diff --git a/clients/sov-celestia/cw-contract/src/entrypoint.rs b/crates/clients/sov-celestia-client-cw/src/entrypoint.rs
similarity index 100%
rename from clients/sov-celestia/cw-contract/src/entrypoint.rs
rename to crates/clients/sov-celestia-client-cw/src/entrypoint.rs
diff --git a/clients/sov-celestia/cw-contract/src/lib.rs b/crates/clients/sov-celestia-client-cw/src/lib.rs
similarity index 100%
rename from clients/sov-celestia/cw-contract/src/lib.rs
rename to crates/clients/sov-celestia-client-cw/src/lib.rs
diff --git a/clients/sov-celestia/cw-contract/src/tests/fixture.rs b/crates/clients/sov-celestia-client-cw/src/tests/fixture.rs
similarity index 100%
rename from clients/sov-celestia/cw-contract/src/tests/fixture.rs
rename to crates/clients/sov-celestia-client-cw/src/tests/fixture.rs
diff --git a/clients/sov-celestia/cw-contract/src/tests/mod.rs b/crates/clients/sov-celestia-client-cw/src/tests/mod.rs
similarity index 100%
rename from clients/sov-celestia/cw-contract/src/tests/mod.rs
rename to crates/clients/sov-celestia-client-cw/src/tests/mod.rs
diff --git a/clients/sov-celestia/types/Cargo.toml b/crates/clients/sov-celestia-client-types/Cargo.toml
similarity index 94%
rename from clients/sov-celestia/types/Cargo.toml
rename to crates/clients/sov-celestia-client-types/Cargo.toml
index b6a1d2b6..57884704 100644
--- a/clients/sov-celestia/types/Cargo.toml
+++ b/crates/clients/sov-celestia-client-types/Cargo.toml
@@ -31,8 +31,8 @@ typed-builder = { version = "0.18.0", optional = true }
 ibc-core              = { workspace = true }
 ibc-client-tendermint = { workspace = true }
 ibc-client-wasm-types = { workspace = true, features = [ "cosmwasm" ], optional = true }
-sov-client-types      = { path = "./../../sov-types" }
-sov-ibc-proto         = { path = "./../../../proto" }
+sov-client-types      = { workspace = true }
+sov-ibc-proto         = { workspace = true }
 
 # DA layer dependencies
 tendermint                       = { workspace = true }
diff --git a/clients/sov-celestia/types/src/client_message/header.rs b/crates/clients/sov-celestia-client-types/src/client_message/header.rs
similarity index 100%
rename from clients/sov-celestia/types/src/client_message/header.rs
rename to crates/clients/sov-celestia-client-types/src/client_message/header.rs
diff --git a/clients/sov-celestia/types/src/client_message/misbehaviour.rs b/crates/clients/sov-celestia-client-types/src/client_message/misbehaviour.rs
similarity index 100%
rename from clients/sov-celestia/types/src/client_message/misbehaviour.rs
rename to crates/clients/sov-celestia-client-types/src/client_message/misbehaviour.rs
diff --git a/clients/sov-celestia/types/src/client_message/mod.rs b/crates/clients/sov-celestia-client-types/src/client_message/mod.rs
similarity index 100%
rename from clients/sov-celestia/types/src/client_message/mod.rs
rename to crates/clients/sov-celestia-client-types/src/client_message/mod.rs
diff --git a/clients/sov-celestia/types/src/client_state/da_params.rs b/crates/clients/sov-celestia-client-types/src/client_state/da_params.rs
similarity index 100%
rename from clients/sov-celestia/types/src/client_state/da_params.rs
rename to crates/clients/sov-celestia-client-types/src/client_state/da_params.rs
diff --git a/clients/sov-celestia/types/src/client_state/definition.rs b/crates/clients/sov-celestia-client-types/src/client_state/definition.rs
similarity index 100%
rename from clients/sov-celestia/types/src/client_state/definition.rs
rename to crates/clients/sov-celestia-client-types/src/client_state/definition.rs
diff --git a/clients/sov-celestia/types/src/client_state/mod.rs b/crates/clients/sov-celestia-client-types/src/client_state/mod.rs
similarity index 100%
rename from clients/sov-celestia/types/src/client_state/mod.rs
rename to crates/clients/sov-celestia-client-types/src/client_state/mod.rs
diff --git a/clients/sov-celestia/types/src/consensus_state/da_params.rs b/crates/clients/sov-celestia-client-types/src/consensus_state/da_params.rs
similarity index 100%
rename from clients/sov-celestia/types/src/consensus_state/da_params.rs
rename to crates/clients/sov-celestia-client-types/src/consensus_state/da_params.rs
diff --git a/clients/sov-celestia/types/src/consensus_state/definition.rs b/crates/clients/sov-celestia-client-types/src/consensus_state/definition.rs
similarity index 100%
rename from clients/sov-celestia/types/src/consensus_state/definition.rs
rename to crates/clients/sov-celestia-client-types/src/consensus_state/definition.rs
diff --git a/clients/sov-celestia/types/src/consensus_state/mod.rs b/crates/clients/sov-celestia-client-types/src/consensus_state/mod.rs
similarity index 100%
rename from clients/sov-celestia/types/src/consensus_state/mod.rs
rename to crates/clients/sov-celestia-client-types/src/consensus_state/mod.rs
diff --git a/clients/sov-celestia/types/src/lib.rs b/crates/clients/sov-celestia-client-types/src/lib.rs
similarity index 100%
rename from clients/sov-celestia/types/src/lib.rs
rename to crates/clients/sov-celestia-client-types/src/lib.rs
diff --git a/clients/sov-celestia/Cargo.toml b/crates/clients/sov-celestia-client/Cargo.toml
similarity index 94%
rename from clients/sov-celestia/Cargo.toml
rename to crates/clients/sov-celestia-client/Cargo.toml
index 4dec1685..5b9e9523 100644
--- a/clients/sov-celestia/Cargo.toml
+++ b/crates/clients/sov-celestia-client/Cargo.toml
@@ -7,7 +7,7 @@ repository   = { workspace = true }
 rust-version = { workspace = true }
 version      = { workspace = true }
 keywords     = [ "rollup", "sovereign", "ibc", "light-client" ]
-readme       = "./../README.md"
+readme       = "../../README.md"
 
 description = """
     Contains the implementation of `sov-celestia` light client, and re-exports
@@ -31,7 +31,7 @@ typed-builder = { version = "0.18.0", optional = true }
 # ibc dependencies
 ibc-core                  = { workspace = true }
 ibc-client-tendermint     = { workspace = true }
-sov-celestia-client-types = { path = "./types", default-features = false }
+sov-celestia-client-types = { workspace = true, default-features = false }
 
 # DA layer dependencies
 tendermint                       = { workspace = true }
diff --git a/clients/sov-celestia/src/client_state/common.rs b/crates/clients/sov-celestia-client/src/client_state/common.rs
similarity index 100%
rename from clients/sov-celestia/src/client_state/common.rs
rename to crates/clients/sov-celestia-client/src/client_state/common.rs
diff --git a/clients/sov-celestia/src/client_state/execution.rs b/crates/clients/sov-celestia-client/src/client_state/execution.rs
similarity index 100%
rename from clients/sov-celestia/src/client_state/execution.rs
rename to crates/clients/sov-celestia-client/src/client_state/execution.rs
diff --git a/clients/sov-celestia/src/client_state/misbehaviour.rs b/crates/clients/sov-celestia-client/src/client_state/misbehaviour.rs
similarity index 100%
rename from clients/sov-celestia/src/client_state/misbehaviour.rs
rename to crates/clients/sov-celestia-client/src/client_state/misbehaviour.rs
diff --git a/clients/sov-celestia/src/client_state/mod.rs b/crates/clients/sov-celestia-client/src/client_state/mod.rs
similarity index 100%
rename from clients/sov-celestia/src/client_state/mod.rs
rename to crates/clients/sov-celestia-client/src/client_state/mod.rs
diff --git a/clients/sov-celestia/src/client_state/update_client.rs b/crates/clients/sov-celestia-client/src/client_state/update_client.rs
similarity index 100%
rename from clients/sov-celestia/src/client_state/update_client.rs
rename to crates/clients/sov-celestia-client/src/client_state/update_client.rs
diff --git a/clients/sov-celestia/src/client_state/validation.rs b/crates/clients/sov-celestia-client/src/client_state/validation.rs
similarity index 100%
rename from clients/sov-celestia/src/client_state/validation.rs
rename to crates/clients/sov-celestia-client/src/client_state/validation.rs
diff --git a/clients/sov-celestia/src/consensus_state.rs b/crates/clients/sov-celestia-client/src/consensus_state.rs
similarity index 100%
rename from clients/sov-celestia/src/consensus_state.rs
rename to crates/clients/sov-celestia-client/src/consensus_state.rs
diff --git a/clients/sov-celestia/src/lib.rs b/crates/clients/sov-celestia-client/src/lib.rs
similarity index 100%
rename from clients/sov-celestia/src/lib.rs
rename to crates/clients/sov-celestia-client/src/lib.rs
diff --git a/clients/sov-types/Cargo.toml b/crates/clients/sov-client-types/Cargo.toml
similarity index 97%
rename from clients/sov-types/Cargo.toml
rename to crates/clients/sov-client-types/Cargo.toml
index 89654223..b1a1cb87 100644
--- a/clients/sov-types/Cargo.toml
+++ b/crates/clients/sov-client-types/Cargo.toml
@@ -30,7 +30,7 @@ typed-builder = { version = "0.18.0", optional = true }
 
 # ibc dependencies
 ibc-core      = { workspace = true }
-sov-ibc-proto = { path = "./../../proto" }
+sov-ibc-proto = { workspace = true }
 
 [features]
 default = [ "std" ]
diff --git a/clients/sov-types/src/aggregated_proof.rs b/crates/clients/sov-client-types/src/aggregated_proof.rs
similarity index 100%
rename from clients/sov-types/src/aggregated_proof.rs
rename to crates/clients/sov-client-types/src/aggregated_proof.rs
diff --git a/clients/sov-types/src/client_params.rs b/crates/clients/sov-client-types/src/client_params.rs
similarity index 100%
rename from clients/sov-types/src/client_params.rs
rename to crates/clients/sov-client-types/src/client_params.rs
diff --git a/clients/sov-types/src/consensus_params.rs b/crates/clients/sov-client-types/src/consensus_params.rs
similarity index 100%
rename from clients/sov-types/src/consensus_params.rs
rename to crates/clients/sov-client-types/src/consensus_params.rs
diff --git a/clients/sov-types/src/error.rs b/crates/clients/sov-client-types/src/error.rs
similarity index 100%
rename from clients/sov-types/src/error.rs
rename to crates/clients/sov-client-types/src/error.rs
diff --git a/clients/sov-types/src/lib.rs b/crates/clients/sov-client-types/src/lib.rs
similarity index 100%
rename from clients/sov-types/src/lib.rs
rename to crates/clients/sov-client-types/src/lib.rs
diff --git a/modules/README.md b/crates/modules/README.md
similarity index 100%
rename from modules/README.md
rename to crates/modules/README.md
diff --git a/modules/sov-consensus-state-tracker/Cargo.toml b/crates/modules/sov-consensus-state-tracker/Cargo.toml
similarity index 93%
rename from modules/sov-consensus-state-tracker/Cargo.toml
rename to crates/modules/sov-consensus-state-tracker/Cargo.toml
index 8d49da39..f3aa516e 100644
--- a/modules/sov-consensus-state-tracker/Cargo.toml
+++ b/crates/modules/sov-consensus-state-tracker/Cargo.toml
@@ -36,8 +36,8 @@ sov-celestia-adapter = { workspace = true, features = [ "native" ], optional = t
 sov-modules-api      = { workspace = true }
 sov-state            = { workspace = true }
 sov-rollup-interface = { workspace = true }
-sov-ibc              = { path = "../sov-ibc" }
-sov-celestia-client  = { path = "../../clients/sov-celestia" }
+sov-ibc              = { workspace = true }
+sov-celestia-client  = { workspace = true }
 
 [features]
 default = [ "mock-da" ]
diff --git a/modules/sov-consensus-state-tracker/src/celestia_da.rs b/crates/modules/sov-consensus-state-tracker/src/celestia_da.rs
similarity index 100%
rename from modules/sov-consensus-state-tracker/src/celestia_da.rs
rename to crates/modules/sov-consensus-state-tracker/src/celestia_da.rs
diff --git a/modules/sov-consensus-state-tracker/src/lib.rs b/crates/modules/sov-consensus-state-tracker/src/lib.rs
similarity index 100%
rename from modules/sov-consensus-state-tracker/src/lib.rs
rename to crates/modules/sov-consensus-state-tracker/src/lib.rs
diff --git a/modules/sov-consensus-state-tracker/src/mock_da.rs b/crates/modules/sov-consensus-state-tracker/src/mock_da.rs
similarity index 100%
rename from modules/sov-consensus-state-tracker/src/mock_da.rs
rename to crates/modules/sov-consensus-state-tracker/src/mock_da.rs
diff --git a/modules/sov-ibc-transfer/Cargo.toml b/crates/modules/sov-ibc-transfer/Cargo.toml
similarity index 100%
rename from modules/sov-ibc-transfer/Cargo.toml
rename to crates/modules/sov-ibc-transfer/Cargo.toml
diff --git a/modules/sov-ibc-transfer/src/context.rs b/crates/modules/sov-ibc-transfer/src/context.rs
similarity index 100%
rename from modules/sov-ibc-transfer/src/context.rs
rename to crates/modules/sov-ibc-transfer/src/context.rs
diff --git a/modules/sov-ibc-transfer/src/genesis.rs b/crates/modules/sov-ibc-transfer/src/genesis.rs
similarity index 100%
rename from modules/sov-ibc-transfer/src/genesis.rs
rename to crates/modules/sov-ibc-transfer/src/genesis.rs
diff --git a/modules/sov-ibc-transfer/src/lib.rs b/crates/modules/sov-ibc-transfer/src/lib.rs
similarity index 100%
rename from modules/sov-ibc-transfer/src/lib.rs
rename to crates/modules/sov-ibc-transfer/src/lib.rs
diff --git a/modules/sov-ibc-transfer/src/rpc.rs b/crates/modules/sov-ibc-transfer/src/rpc.rs
similarity index 100%
rename from modules/sov-ibc-transfer/src/rpc.rs
rename to crates/modules/sov-ibc-transfer/src/rpc.rs
diff --git a/modules/sov-ibc-transfer/src/utils.rs b/crates/modules/sov-ibc-transfer/src/utils.rs
similarity index 100%
rename from modules/sov-ibc-transfer/src/utils.rs
rename to crates/modules/sov-ibc-transfer/src/utils.rs
diff --git a/modules/sov-ibc/Cargo.toml b/crates/modules/sov-ibc/Cargo.toml
similarity index 93%
rename from modules/sov-ibc/Cargo.toml
rename to crates/modules/sov-ibc/Cargo.toml
index 098d2f01..42d2770c 100644
--- a/modules/sov-ibc/Cargo.toml
+++ b/crates/modules/sov-ibc/Cargo.toml
@@ -28,14 +28,14 @@ thiserror   = { workspace = true }
 tracing     = { workspace = true }
 
 # internal dependencies
-sov-ibc-transfer = { path = "../sov-ibc-transfer" }
+sov-ibc-transfer = { workspace = true }
 
 # ibc dependencies
 ibc-core              = { workspace = true }
 ibc-app-transfer      = { workspace = true }
 ibc-client-tendermint = { workspace = true }
 ibc-query             = { workspace = true, optional = true }
-sov-celestia-client   = { path = "../../clients/sov-celestia" }
+sov-celestia-client   = { workspace = true }
 
 # enforce version so that Risc0 compiles
 ahash = "=0.8.6"
diff --git a/modules/sov-ibc/src/call.rs b/crates/modules/sov-ibc/src/call.rs
similarity index 100%
rename from modules/sov-ibc/src/call.rs
rename to crates/modules/sov-ibc/src/call.rs
diff --git a/modules/sov-ibc/src/clients/context.rs b/crates/modules/sov-ibc/src/clients/context.rs
similarity index 100%
rename from modules/sov-ibc/src/clients/context.rs
rename to crates/modules/sov-ibc/src/clients/context.rs
diff --git a/modules/sov-ibc/src/clients/mod.rs b/crates/modules/sov-ibc/src/clients/mod.rs
similarity index 100%
rename from modules/sov-ibc/src/clients/mod.rs
rename to crates/modules/sov-ibc/src/clients/mod.rs
diff --git a/modules/sov-ibc/src/codec.rs b/crates/modules/sov-ibc/src/codec.rs
similarity index 100%
rename from modules/sov-ibc/src/codec.rs
rename to crates/modules/sov-ibc/src/codec.rs
diff --git a/modules/sov-ibc/src/context.rs b/crates/modules/sov-ibc/src/context.rs
similarity index 100%
rename from modules/sov-ibc/src/context.rs
rename to crates/modules/sov-ibc/src/context.rs
diff --git a/modules/sov-ibc/src/event.rs b/crates/modules/sov-ibc/src/event.rs
similarity index 100%
rename from modules/sov-ibc/src/event.rs
rename to crates/modules/sov-ibc/src/event.rs
diff --git a/modules/sov-ibc/src/genesis.rs b/crates/modules/sov-ibc/src/genesis.rs
similarity index 100%
rename from modules/sov-ibc/src/genesis.rs
rename to crates/modules/sov-ibc/src/genesis.rs
diff --git a/modules/sov-ibc/src/lib.rs b/crates/modules/sov-ibc/src/lib.rs
similarity index 100%
rename from modules/sov-ibc/src/lib.rs
rename to crates/modules/sov-ibc/src/lib.rs
diff --git a/modules/sov-ibc/src/router.rs b/crates/modules/sov-ibc/src/router.rs
similarity index 100%
rename from modules/sov-ibc/src/router.rs
rename to crates/modules/sov-ibc/src/router.rs
diff --git a/modules/sov-ibc/src/rpc/context.rs b/crates/modules/sov-ibc/src/rpc/context.rs
similarity index 100%
rename from modules/sov-ibc/src/rpc/context.rs
rename to crates/modules/sov-ibc/src/rpc/context.rs
diff --git a/modules/sov-ibc/src/rpc/helpers.rs b/crates/modules/sov-ibc/src/rpc/helpers.rs
similarity index 100%
rename from modules/sov-ibc/src/rpc/helpers.rs
rename to crates/modules/sov-ibc/src/rpc/helpers.rs
diff --git a/modules/sov-ibc/src/rpc/methods.rs b/crates/modules/sov-ibc/src/rpc/methods.rs
similarity index 100%
rename from modules/sov-ibc/src/rpc/methods.rs
rename to crates/modules/sov-ibc/src/rpc/methods.rs
diff --git a/modules/sov-ibc/src/rpc/mod.rs b/crates/modules/sov-ibc/src/rpc/mod.rs
similarity index 100%
rename from modules/sov-ibc/src/rpc/mod.rs
rename to crates/modules/sov-ibc/src/rpc/mod.rs
diff --git a/proto/compiler/Cargo.toml b/crates/proto/sov-ibc-proto-compiler/Cargo.toml
similarity index 100%
rename from proto/compiler/Cargo.toml
rename to crates/proto/sov-ibc-proto-compiler/Cargo.toml
diff --git a/proto/compiler/IBC_GO_COMMIT b/crates/proto/sov-ibc-proto-compiler/IBC_GO_COMMIT
similarity index 100%
rename from proto/compiler/IBC_GO_COMMIT
rename to crates/proto/sov-ibc-proto-compiler/IBC_GO_COMMIT
diff --git a/proto/compiler/src/cmd.rs b/crates/proto/sov-ibc-proto-compiler/src/cmd.rs
similarity index 100%
rename from proto/compiler/src/cmd.rs
rename to crates/proto/sov-ibc-proto-compiler/src/cmd.rs
diff --git a/proto/compiler/src/main.rs b/crates/proto/sov-ibc-proto-compiler/src/main.rs
similarity index 100%
rename from proto/compiler/src/main.rs
rename to crates/proto/sov-ibc-proto-compiler/src/main.rs
diff --git a/proto/compiler/sync-protobuf.sh b/crates/proto/sov-ibc-proto-compiler/sync-protobuf.sh
similarity index 100%
rename from proto/compiler/sync-protobuf.sh
rename to crates/proto/sov-ibc-proto-compiler/sync-protobuf.sh
diff --git a/proto/Cargo.toml b/crates/proto/sov-ibc-proto/Cargo.toml
similarity index 100%
rename from proto/Cargo.toml
rename to crates/proto/sov-ibc-proto/Cargo.toml
diff --git a/proto/README.md b/crates/proto/sov-ibc-proto/README.md
similarity index 100%
rename from proto/README.md
rename to crates/proto/sov-ibc-proto/README.md
diff --git a/proto/definitions/buf.lock b/crates/proto/sov-ibc-proto/definitions/buf.lock
similarity index 100%
rename from proto/definitions/buf.lock
rename to crates/proto/sov-ibc-proto/definitions/buf.lock
diff --git a/proto/definitions/buf.yaml b/crates/proto/sov-ibc-proto/definitions/buf.yaml
similarity index 100%
rename from proto/definitions/buf.yaml
rename to crates/proto/sov-ibc-proto/definitions/buf.yaml
diff --git a/proto/definitions/ibc/lightclients/sovereign/tendermint/v1/tendermint.proto b/crates/proto/sov-ibc-proto/definitions/ibc/lightclients/sovereign/tendermint/v1/tendermint.proto
similarity index 100%
rename from proto/definitions/ibc/lightclients/sovereign/tendermint/v1/tendermint.proto
rename to crates/proto/sov-ibc-proto/definitions/ibc/lightclients/sovereign/tendermint/v1/tendermint.proto
diff --git a/proto/definitions/ibc/lightclients/sovereign/v1/sovereign.proto b/crates/proto/sov-ibc-proto/definitions/ibc/lightclients/sovereign/v1/sovereign.proto
similarity index 100%
rename from proto/definitions/ibc/lightclients/sovereign/v1/sovereign.proto
rename to crates/proto/sov-ibc-proto/definitions/ibc/lightclients/sovereign/v1/sovereign.proto
diff --git a/proto/definitions/sovereign/types/v1/types.proto b/crates/proto/sov-ibc-proto/definitions/sovereign/types/v1/types.proto
similarity index 100%
rename from proto/definitions/sovereign/types/v1/types.proto
rename to crates/proto/sov-ibc-proto/definitions/sovereign/types/v1/types.proto
diff --git a/proto/src/lib.rs b/crates/proto/sov-ibc-proto/src/lib.rs
similarity index 100%
rename from proto/src/lib.rs
rename to crates/proto/sov-ibc-proto/src/lib.rs
diff --git a/proto/src/prost/ibc.lightclients.sovereign.tendermint.v1.rs b/crates/proto/sov-ibc-proto/src/prost/ibc.lightclients.sovereign.tendermint.v1.rs
similarity index 100%
rename from proto/src/prost/ibc.lightclients.sovereign.tendermint.v1.rs
rename to crates/proto/sov-ibc-proto/src/prost/ibc.lightclients.sovereign.tendermint.v1.rs
diff --git a/proto/src/prost/ibc.lightclients.sovereign.tendermint.v1.serde.rs b/crates/proto/sov-ibc-proto/src/prost/ibc.lightclients.sovereign.tendermint.v1.serde.rs
similarity index 100%
rename from proto/src/prost/ibc.lightclients.sovereign.tendermint.v1.serde.rs
rename to crates/proto/sov-ibc-proto/src/prost/ibc.lightclients.sovereign.tendermint.v1.serde.rs
diff --git a/proto/src/prost/ibc.lightclients.sovereign.v1.rs b/crates/proto/sov-ibc-proto/src/prost/ibc.lightclients.sovereign.v1.rs
similarity index 100%
rename from proto/src/prost/ibc.lightclients.sovereign.v1.rs
rename to crates/proto/sov-ibc-proto/src/prost/ibc.lightclients.sovereign.v1.rs
diff --git a/proto/src/prost/ibc.lightclients.sovereign.v1.serde.rs b/crates/proto/sov-ibc-proto/src/prost/ibc.lightclients.sovereign.v1.serde.rs
similarity index 100%
rename from proto/src/prost/ibc.lightclients.sovereign.v1.serde.rs
rename to crates/proto/sov-ibc-proto/src/prost/ibc.lightclients.sovereign.v1.serde.rs
diff --git a/proto/src/prost/proto_descriptor.bin b/crates/proto/sov-ibc-proto/src/prost/proto_descriptor.bin
similarity index 100%
rename from proto/src/prost/proto_descriptor.bin
rename to crates/proto/sov-ibc-proto/src/prost/proto_descriptor.bin
diff --git a/proto/src/prost/sovereign.types.v1.rs b/crates/proto/sov-ibc-proto/src/prost/sovereign.types.v1.rs
similarity index 100%
rename from proto/src/prost/sovereign.types.v1.rs
rename to crates/proto/sov-ibc-proto/src/prost/sovereign.types.v1.rs
diff --git a/proto/src/prost/sovereign.types.v1.serde.rs b/crates/proto/sov-ibc-proto/src/prost/sovereign.types.v1.serde.rs
similarity index 100%
rename from proto/src/prost/sovereign.types.v1.serde.rs
rename to crates/proto/sov-ibc-proto/src/prost/sovereign.types.v1.serde.rs
diff --git a/mocks/Cargo.toml b/crates/test/sov-ibc-mocks/Cargo.toml
similarity index 100%
rename from mocks/Cargo.toml
rename to crates/test/sov-ibc-mocks/Cargo.toml
diff --git a/mocks/README.md b/crates/test/sov-ibc-mocks/README.md
similarity index 100%
rename from mocks/README.md
rename to crates/test/sov-ibc-mocks/README.md
diff --git a/mocks/celestia_rollup_config.toml b/crates/test/sov-ibc-mocks/celestia_rollup_config.toml
similarity index 100%
rename from mocks/celestia_rollup_config.toml
rename to crates/test/sov-ibc-mocks/celestia_rollup_config.toml
diff --git a/mocks/src/configs.rs b/crates/test/sov-ibc-mocks/src/configs.rs
similarity index 100%
rename from mocks/src/configs.rs
rename to crates/test/sov-ibc-mocks/src/configs.rs
diff --git a/mocks/src/cosmos/app.rs b/crates/test/sov-ibc-mocks/src/cosmos/app.rs
similarity index 100%
rename from mocks/src/cosmos/app.rs
rename to crates/test/sov-ibc-mocks/src/cosmos/app.rs
diff --git a/mocks/src/cosmos/builder.rs b/crates/test/sov-ibc-mocks/src/cosmos/builder.rs
similarity index 100%
rename from mocks/src/cosmos/builder.rs
rename to crates/test/sov-ibc-mocks/src/cosmos/builder.rs
diff --git a/mocks/src/cosmos/configs.rs b/crates/test/sov-ibc-mocks/src/cosmos/configs.rs
similarity index 100%
rename from mocks/src/cosmos/configs.rs
rename to crates/test/sov-ibc-mocks/src/cosmos/configs.rs
diff --git a/mocks/src/cosmos/core.rs b/crates/test/sov-ibc-mocks/src/cosmos/core.rs
similarity index 100%
rename from mocks/src/cosmos/core.rs
rename to crates/test/sov-ibc-mocks/src/cosmos/core.rs
diff --git a/mocks/src/cosmos/manual.rs b/crates/test/sov-ibc-mocks/src/cosmos/manual.rs
similarity index 100%
rename from mocks/src/cosmos/manual.rs
rename to crates/test/sov-ibc-mocks/src/cosmos/manual.rs
diff --git a/mocks/src/cosmos/mod.rs b/crates/test/sov-ibc-mocks/src/cosmos/mod.rs
similarity index 100%
rename from mocks/src/cosmos/mod.rs
rename to crates/test/sov-ibc-mocks/src/cosmos/mod.rs
diff --git a/mocks/src/cosmos/runner.rs b/crates/test/sov-ibc-mocks/src/cosmos/runner.rs
similarity index 100%
rename from mocks/src/cosmos/runner.rs
rename to crates/test/sov-ibc-mocks/src/cosmos/runner.rs
diff --git a/mocks/src/cosmos/utils.rs b/crates/test/sov-ibc-mocks/src/cosmos/utils.rs
similarity index 100%
rename from mocks/src/cosmos/utils.rs
rename to crates/test/sov-ibc-mocks/src/cosmos/utils.rs
diff --git a/mocks/src/lib.rs b/crates/test/sov-ibc-mocks/src/lib.rs
similarity index 100%
rename from mocks/src/lib.rs
rename to crates/test/sov-ibc-mocks/src/lib.rs
diff --git a/mocks/src/relayer/builder.rs b/crates/test/sov-ibc-mocks/src/relayer/builder.rs
similarity index 100%
rename from mocks/src/relayer/builder.rs
rename to crates/test/sov-ibc-mocks/src/relayer/builder.rs
diff --git a/mocks/src/relayer/context.rs b/crates/test/sov-ibc-mocks/src/relayer/context.rs
similarity index 100%
rename from mocks/src/relayer/context.rs
rename to crates/test/sov-ibc-mocks/src/relayer/context.rs
diff --git a/mocks/src/relayer/handle/cosmos.rs b/crates/test/sov-ibc-mocks/src/relayer/handle/cosmos.rs
similarity index 100%
rename from mocks/src/relayer/handle/cosmos.rs
rename to crates/test/sov-ibc-mocks/src/relayer/handle/cosmos.rs
diff --git a/mocks/src/relayer/handle/mod.rs b/crates/test/sov-ibc-mocks/src/relayer/handle/mod.rs
similarity index 100%
rename from mocks/src/relayer/handle/mod.rs
rename to crates/test/sov-ibc-mocks/src/relayer/handle/mod.rs
diff --git a/mocks/src/relayer/handle/rollup.rs b/crates/test/sov-ibc-mocks/src/relayer/handle/rollup.rs
similarity index 100%
rename from mocks/src/relayer/handle/rollup.rs
rename to crates/test/sov-ibc-mocks/src/relayer/handle/rollup.rs
diff --git a/mocks/src/relayer/mod.rs b/crates/test/sov-ibc-mocks/src/relayer/mod.rs
similarity index 100%
rename from mocks/src/relayer/mod.rs
rename to crates/test/sov-ibc-mocks/src/relayer/mod.rs
diff --git a/mocks/src/relayer/msgs/cosmos.rs b/crates/test/sov-ibc-mocks/src/relayer/msgs/cosmos.rs
similarity index 100%
rename from mocks/src/relayer/msgs/cosmos.rs
rename to crates/test/sov-ibc-mocks/src/relayer/msgs/cosmos.rs
diff --git a/mocks/src/relayer/msgs/mod.rs b/crates/test/sov-ibc-mocks/src/relayer/msgs/mod.rs
similarity index 100%
rename from mocks/src/relayer/msgs/mod.rs
rename to crates/test/sov-ibc-mocks/src/relayer/msgs/mod.rs
diff --git a/mocks/src/relayer/msgs/rollup.rs b/crates/test/sov-ibc-mocks/src/relayer/msgs/rollup.rs
similarity index 100%
rename from mocks/src/relayer/msgs/rollup.rs
rename to crates/test/sov-ibc-mocks/src/relayer/msgs/rollup.rs
diff --git a/mocks/src/relayer/relay.rs b/crates/test/sov-ibc-mocks/src/relayer/relay.rs
similarity index 100%
rename from mocks/src/relayer/relay.rs
rename to crates/test/sov-ibc-mocks/src/relayer/relay.rs
diff --git a/mocks/src/sovereign/da_service.rs b/crates/test/sov-ibc-mocks/src/sovereign/da_service.rs
similarity index 100%
rename from mocks/src/sovereign/da_service.rs
rename to crates/test/sov-ibc-mocks/src/sovereign/da_service.rs
diff --git a/mocks/src/sovereign/manual.rs b/crates/test/sov-ibc-mocks/src/sovereign/manual.rs
similarity index 100%
rename from mocks/src/sovereign/manual.rs
rename to crates/test/sov-ibc-mocks/src/sovereign/manual.rs
diff --git a/mocks/src/sovereign/mod.rs b/crates/test/sov-ibc-mocks/src/sovereign/mod.rs
similarity index 100%
rename from mocks/src/sovereign/mod.rs
rename to crates/test/sov-ibc-mocks/src/sovereign/mod.rs
diff --git a/mocks/src/sovereign/rollup.rs b/crates/test/sov-ibc-mocks/src/sovereign/rollup.rs
similarity index 100%
rename from mocks/src/sovereign/rollup.rs
rename to crates/test/sov-ibc-mocks/src/sovereign/rollup.rs
diff --git a/mocks/src/sovereign/runner.rs b/crates/test/sov-ibc-mocks/src/sovereign/runner.rs
similarity index 100%
rename from mocks/src/sovereign/runner.rs
rename to crates/test/sov-ibc-mocks/src/sovereign/runner.rs
diff --git a/mocks/src/sovereign/runtime/config.rs b/crates/test/sov-ibc-mocks/src/sovereign/runtime/config.rs
similarity index 100%
rename from mocks/src/sovereign/runtime/config.rs
rename to crates/test/sov-ibc-mocks/src/sovereign/runtime/config.rs
diff --git a/mocks/src/sovereign/runtime/mod.rs b/crates/test/sov-ibc-mocks/src/sovereign/runtime/mod.rs
similarity index 100%
rename from mocks/src/sovereign/runtime/mod.rs
rename to crates/test/sov-ibc-mocks/src/sovereign/runtime/mod.rs
diff --git a/mocks/src/tests/client.rs b/crates/test/sov-ibc-mocks/src/tests/client.rs
similarity index 100%
rename from mocks/src/tests/client.rs
rename to crates/test/sov-ibc-mocks/src/tests/client.rs
diff --git a/mocks/src/tests/mod.rs b/crates/test/sov-ibc-mocks/src/tests/mod.rs
similarity index 100%
rename from mocks/src/tests/mod.rs
rename to crates/test/sov-ibc-mocks/src/tests/mod.rs
diff --git a/mocks/src/tests/transfer.rs b/crates/test/sov-ibc-mocks/src/tests/transfer.rs
similarity index 100%
rename from mocks/src/tests/transfer.rs
rename to crates/test/sov-ibc-mocks/src/tests/transfer.rs
diff --git a/mocks/src/utils/mod.rs b/crates/test/sov-ibc-mocks/src/utils/mod.rs
similarity index 100%
rename from mocks/src/utils/mod.rs
rename to crates/test/sov-ibc-mocks/src/utils/mod.rs
diff --git a/mocks/src/utils/mutex.rs b/crates/test/sov-ibc-mocks/src/utils/mutex.rs
similarity index 100%
rename from mocks/src/utils/mutex.rs
rename to crates/test/sov-ibc-mocks/src/utils/mutex.rs
diff --git a/nix/sov-celestia-cw.nix b/nix/sov-celestia-cw.nix
index 26ac901f..d9ae72ff 100644
--- a/nix/sov-celestia-cw.nix
+++ b/nix/sov-celestia-cw.nix
@@ -48,10 +48,7 @@ let
         installPhase = ''
             mkdir -p $out $out/vendor
 
-            cp -r ${../clients} $out/clients
-            cp -r ${../modules} $out/modules
-            cp -r ${../mocks} $out/mocks
-            cp -r ${../proto} $out/proto
+            cp -r ${../crates} $out/crates
 
             cp -r ${sovereign-sdk-src} $out/vendor/sovereign-sdk
 
@@ -75,7 +72,7 @@ let
                 "risc0-cycle-utils-0.3.0" = "sha256-5dA62v1eqfyZBny4s3YlC2Tty7Yfd/OAVGfTlLBgypk=";
                 "rockbound-1.0.0" = "sha256-aDrNegRfsSwiNw4XLsE4rpUYDZn2N59UJbGZ6mpY180=";
                 "tendermint-0.32.0" = "sha256-FtY7a+hBvQryATrs3mykCWFRe8ABTT6cuf5oh9IBElQ=";
-                "cosmos-sdk-proto-0.22.0-pre" = "sha256-r7zoHmk12iTdsyJ/4rRgD5HDeDSiNcs/HlS7eGi+NbE=";
+                "cosmos-sdk-proto-0.22.0-pre" = "sha256-nRfcAbjFcvAqool+6heYK8joiU5YaSWITnO6S5MRM1E=";
             };
         };