diff --git a/Cargo.toml b/Cargo.toml
index a08c64a403136ee9bdc7be3fe0ebcba890717743..62f8c9c8953a2acff6694e4b27c574337694bfa3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -36,21 +36,21 @@ members = [
"bridges/primitives/test-utils",
"bridges/primitives/xcm-bridge-hub",
"bridges/primitives/xcm-bridge-hub-router",
- "bridges/snowbridge/parachain/pallets/ethereum-client",
- "bridges/snowbridge/parachain/pallets/ethereum-client/fixtures",
- "bridges/snowbridge/parachain/pallets/inbound-queue",
- "bridges/snowbridge/parachain/pallets/inbound-queue/fixtures",
- "bridges/snowbridge/parachain/pallets/outbound-queue",
- "bridges/snowbridge/parachain/pallets/outbound-queue/merkle-tree",
- "bridges/snowbridge/parachain/pallets/outbound-queue/runtime-api",
- "bridges/snowbridge/parachain/pallets/system",
- "bridges/snowbridge/parachain/pallets/system/runtime-api",
- "bridges/snowbridge/parachain/primitives/beacon",
- "bridges/snowbridge/parachain/primitives/core",
- "bridges/snowbridge/parachain/primitives/ethereum",
- "bridges/snowbridge/parachain/primitives/router",
- "bridges/snowbridge/parachain/runtime/runtime-common",
- "bridges/snowbridge/parachain/runtime/test-common",
+ "bridges/snowbridge/pallets/ethereum-client",
+ "bridges/snowbridge/pallets/ethereum-client/fixtures",
+ "bridges/snowbridge/pallets/inbound-queue",
+ "bridges/snowbridge/pallets/inbound-queue/fixtures",
+ "bridges/snowbridge/pallets/outbound-queue",
+ "bridges/snowbridge/pallets/outbound-queue/merkle-tree",
+ "bridges/snowbridge/pallets/outbound-queue/runtime-api",
+ "bridges/snowbridge/pallets/system",
+ "bridges/snowbridge/pallets/system/runtime-api",
+ "bridges/snowbridge/primitives/beacon",
+ "bridges/snowbridge/primitives/core",
+ "bridges/snowbridge/primitives/ethereum",
+ "bridges/snowbridge/primitives/router",
+ "bridges/snowbridge/runtime/runtime-common",
+ "bridges/snowbridge/runtime/test-common",
"cumulus/client/cli",
"cumulus/client/collator",
"cumulus/client/consensus/aura",
diff --git a/bridges/snowbridge/parachain/pallets/ethereum-client/Cargo.toml b/bridges/snowbridge/pallets/ethereum-client/Cargo.toml
similarity index 71%
rename from bridges/snowbridge/parachain/pallets/ethereum-client/Cargo.toml
rename to bridges/snowbridge/pallets/ethereum-client/Cargo.toml
index c490f3af73c2e8839cc37e22c6a92339c8558822..2f76d5b8357985c65cdc09c86257bc6ddd766250 100644
--- a/bridges/snowbridge/parachain/pallets/ethereum-client/Cargo.toml
+++ b/bridges/snowbridge/pallets/ethereum-client/Cargo.toml
@@ -26,30 +26,30 @@ rlp = { version = "0.5.2", default-features = false }
hex-literal = { version = "0.4.1", optional = true }
log = { version = "0.4.20", default-features = false }
-frame-benchmarking = { path = "../../../../../substrate/frame/benchmarking", default-features = false, optional = true }
-frame-support = { path = "../../../../../substrate/frame/support", default-features = false }
-frame-system = { path = "../../../../../substrate/frame/system", default-features = false }
-sp-core = { path = "../../../../../substrate/primitives/core", default-features = false }
-sp-std = { path = "../../../../../substrate/primitives/std", default-features = false }
-sp-runtime = { path = "../../../../../substrate/primitives/runtime", default-features = false }
-sp-io = { path = "../../../../../substrate/primitives/io", default-features = false, optional = true }
+frame-benchmarking = { path = "../../../../substrate/frame/benchmarking", default-features = false, optional = true }
+frame-support = { path = "../../../../substrate/frame/support", default-features = false }
+frame-system = { path = "../../../../substrate/frame/system", default-features = false }
+sp-core = { path = "../../../../substrate/primitives/core", default-features = false }
+sp-std = { path = "../../../../substrate/primitives/std", default-features = false }
+sp-runtime = { path = "../../../../substrate/primitives/runtime", default-features = false }
+sp-io = { path = "../../../../substrate/primitives/io", default-features = false, optional = true }
snowbridge-core = { path = "../../primitives/core", default-features = false }
snowbridge-ethereum = { path = "../../primitives/ethereum", default-features = false }
snowbridge-pallet-ethereum-client-fixtures = { path = "./fixtures", default-features = false, optional = true }
primitives = { package = "snowbridge-beacon-primitives", path = "../../primitives/beacon", default-features = false }
static_assertions = { version = "1.1.0", default-features = false }
-bp-runtime = { path = "../../../../primitives/runtime", default-features = false }
-pallet-timestamp = { path = "../../../../../substrate/frame/timestamp", default-features = false, optional = true }
+bp-runtime = { path = "../../../primitives/runtime", default-features = false }
+pallet-timestamp = { path = "../../../../substrate/frame/timestamp", default-features = false, optional = true }
[dev-dependencies]
rand = "0.8.5"
-sp-keyring = { path = "../../../../../substrate/primitives/keyring" }
+sp-keyring = { path = "../../../../substrate/primitives/keyring" }
serde_json = "1.0.111"
hex-literal = "0.4.1"
-pallet-timestamp = { path = "../../../../../substrate/frame/timestamp" }
+pallet-timestamp = { path = "../../../../substrate/frame/timestamp" }
snowbridge-pallet-ethereum-client-fixtures = { path = "./fixtures" }
-sp-io = { path = "../../../../../substrate/primitives/io" }
+sp-io = { path = "../../../../substrate/primitives/io" }
serde = "1.0.195"
[features]
diff --git a/bridges/snowbridge/parachain/pallets/ethereum-client/README.md b/bridges/snowbridge/pallets/ethereum-client/README.md
similarity index 100%
rename from bridges/snowbridge/parachain/pallets/ethereum-client/README.md
rename to bridges/snowbridge/pallets/ethereum-client/README.md
diff --git a/bridges/snowbridge/parachain/pallets/ethereum-client/benchmark.md b/bridges/snowbridge/pallets/ethereum-client/benchmark.md
similarity index 100%
rename from bridges/snowbridge/parachain/pallets/ethereum-client/benchmark.md
rename to bridges/snowbridge/pallets/ethereum-client/benchmark.md
diff --git a/bridges/snowbridge/parachain/pallets/ethereum-client/fixtures/Cargo.toml b/bridges/snowbridge/pallets/ethereum-client/fixtures/Cargo.toml
similarity index 67%
rename from bridges/snowbridge/parachain/pallets/ethereum-client/fixtures/Cargo.toml
rename to bridges/snowbridge/pallets/ethereum-client/fixtures/Cargo.toml
index f3c26bbbe31b4151e7d1d6d64d48df63577b4abd..fd1914a7d30e81c3615c981d7ae8ba378a8a5724 100644
--- a/bridges/snowbridge/parachain/pallets/ethereum-client/fixtures/Cargo.toml
+++ b/bridges/snowbridge/pallets/ethereum-client/fixtures/Cargo.toml
@@ -16,11 +16,11 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
hex-literal = { version = "0.4.1" }
-sp-core = { path = "../../../../../../substrate/primitives/core", default-features = false }
-sp-std = { path = "../../../../../../substrate/primitives/std", default-features = false }
-frame-benchmarking = { path = "../../../../../../substrate/frame/benchmarking", default-features = false, optional = true }
-frame-support = { path = "../../../../../../substrate/frame/support", default-features = false }
-frame-system = { path = "../../../../../../substrate/frame/system", default-features = false }
+sp-core = { path = "../../../../../substrate/primitives/core", default-features = false }
+sp-std = { path = "../../../../../substrate/primitives/std", default-features = false }
+frame-benchmarking = { path = "../../../../../substrate/frame/benchmarking", default-features = false, optional = true }
+frame-support = { path = "../../../../../substrate/frame/support", default-features = false }
+frame-system = { path = "../../../../../substrate/frame/system", default-features = false }
snowbridge-core = { path = "../../../primitives/core", default-features = false }
snowbridge-beacon-primitives = { path = "../../../primitives/beacon", default-features = false }
diff --git a/bridges/snowbridge/parachain/pallets/ethereum-client/fixtures/src/lib.rs b/bridges/snowbridge/pallets/ethereum-client/fixtures/src/lib.rs
similarity index 100%
rename from bridges/snowbridge/parachain/pallets/ethereum-client/fixtures/src/lib.rs
rename to bridges/snowbridge/pallets/ethereum-client/fixtures/src/lib.rs
diff --git a/bridges/snowbridge/parachain/pallets/ethereum-client/src/benchmarking/mod.rs b/bridges/snowbridge/pallets/ethereum-client/src/benchmarking/mod.rs
similarity index 100%
rename from bridges/snowbridge/parachain/pallets/ethereum-client/src/benchmarking/mod.rs
rename to bridges/snowbridge/pallets/ethereum-client/src/benchmarking/mod.rs
diff --git a/bridges/snowbridge/parachain/pallets/ethereum-client/src/benchmarking/util.rs b/bridges/snowbridge/pallets/ethereum-client/src/benchmarking/util.rs
similarity index 100%
rename from bridges/snowbridge/parachain/pallets/ethereum-client/src/benchmarking/util.rs
rename to bridges/snowbridge/pallets/ethereum-client/src/benchmarking/util.rs
diff --git a/bridges/snowbridge/parachain/pallets/ethereum-client/src/config/mod.rs b/bridges/snowbridge/pallets/ethereum-client/src/config/mod.rs
similarity index 100%
rename from bridges/snowbridge/parachain/pallets/ethereum-client/src/config/mod.rs
rename to bridges/snowbridge/pallets/ethereum-client/src/config/mod.rs
diff --git a/bridges/snowbridge/parachain/pallets/ethereum-client/src/functions.rs b/bridges/snowbridge/pallets/ethereum-client/src/functions.rs
similarity index 100%
rename from bridges/snowbridge/parachain/pallets/ethereum-client/src/functions.rs
rename to bridges/snowbridge/pallets/ethereum-client/src/functions.rs
diff --git a/bridges/snowbridge/parachain/pallets/ethereum-client/src/impls.rs b/bridges/snowbridge/pallets/ethereum-client/src/impls.rs
similarity index 100%
rename from bridges/snowbridge/parachain/pallets/ethereum-client/src/impls.rs
rename to bridges/snowbridge/pallets/ethereum-client/src/impls.rs
diff --git a/bridges/snowbridge/parachain/pallets/ethereum-client/src/lib.rs b/bridges/snowbridge/pallets/ethereum-client/src/lib.rs
similarity index 100%
rename from bridges/snowbridge/parachain/pallets/ethereum-client/src/lib.rs
rename to bridges/snowbridge/pallets/ethereum-client/src/lib.rs
diff --git a/bridges/snowbridge/parachain/pallets/ethereum-client/src/mock.rs b/bridges/snowbridge/pallets/ethereum-client/src/mock.rs
similarity index 100%
rename from bridges/snowbridge/parachain/pallets/ethereum-client/src/mock.rs
rename to bridges/snowbridge/pallets/ethereum-client/src/mock.rs
diff --git a/bridges/snowbridge/parachain/pallets/ethereum-client/src/tests.rs b/bridges/snowbridge/pallets/ethereum-client/src/tests.rs
similarity index 100%
rename from bridges/snowbridge/parachain/pallets/ethereum-client/src/tests.rs
rename to bridges/snowbridge/pallets/ethereum-client/src/tests.rs
diff --git a/bridges/snowbridge/parachain/pallets/ethereum-client/src/types.rs b/bridges/snowbridge/pallets/ethereum-client/src/types.rs
similarity index 100%
rename from bridges/snowbridge/parachain/pallets/ethereum-client/src/types.rs
rename to bridges/snowbridge/pallets/ethereum-client/src/types.rs
diff --git a/bridges/snowbridge/parachain/pallets/ethereum-client/src/weights.rs b/bridges/snowbridge/pallets/ethereum-client/src/weights.rs
similarity index 100%
rename from bridges/snowbridge/parachain/pallets/ethereum-client/src/weights.rs
rename to bridges/snowbridge/pallets/ethereum-client/src/weights.rs
diff --git a/bridges/snowbridge/parachain/pallets/ethereum-client/tests/fixtures/execution-header-update.json b/bridges/snowbridge/pallets/ethereum-client/tests/fixtures/execution-header-update.json
similarity index 100%
rename from bridges/snowbridge/parachain/pallets/ethereum-client/tests/fixtures/execution-header-update.json
rename to bridges/snowbridge/pallets/ethereum-client/tests/fixtures/execution-header-update.json
diff --git a/bridges/snowbridge/parachain/pallets/ethereum-client/tests/fixtures/finalized-header-update.json b/bridges/snowbridge/pallets/ethereum-client/tests/fixtures/finalized-header-update.json
similarity index 100%
rename from bridges/snowbridge/parachain/pallets/ethereum-client/tests/fixtures/finalized-header-update.json
rename to bridges/snowbridge/pallets/ethereum-client/tests/fixtures/finalized-header-update.json
diff --git a/bridges/snowbridge/parachain/pallets/ethereum-client/tests/fixtures/inbound-message.json b/bridges/snowbridge/pallets/ethereum-client/tests/fixtures/inbound-message.json
similarity index 100%
rename from bridges/snowbridge/parachain/pallets/ethereum-client/tests/fixtures/inbound-message.json
rename to bridges/snowbridge/pallets/ethereum-client/tests/fixtures/inbound-message.json
diff --git a/bridges/snowbridge/parachain/pallets/ethereum-client/tests/fixtures/initial-checkpoint.json b/bridges/snowbridge/pallets/ethereum-client/tests/fixtures/initial-checkpoint.json
similarity index 100%
rename from bridges/snowbridge/parachain/pallets/ethereum-client/tests/fixtures/initial-checkpoint.json
rename to bridges/snowbridge/pallets/ethereum-client/tests/fixtures/initial-checkpoint.json
diff --git a/bridges/snowbridge/parachain/pallets/ethereum-client/tests/fixtures/next-finalized-header-update.json b/bridges/snowbridge/pallets/ethereum-client/tests/fixtures/next-finalized-header-update.json
similarity index 100%
rename from bridges/snowbridge/parachain/pallets/ethereum-client/tests/fixtures/next-finalized-header-update.json
rename to bridges/snowbridge/pallets/ethereum-client/tests/fixtures/next-finalized-header-update.json
diff --git a/bridges/snowbridge/parachain/pallets/ethereum-client/tests/fixtures/next-sync-committee-update.json b/bridges/snowbridge/pallets/ethereum-client/tests/fixtures/next-sync-committee-update.json
similarity index 100%
rename from bridges/snowbridge/parachain/pallets/ethereum-client/tests/fixtures/next-sync-committee-update.json
rename to bridges/snowbridge/pallets/ethereum-client/tests/fixtures/next-sync-committee-update.json
diff --git a/bridges/snowbridge/parachain/pallets/ethereum-client/tests/fixtures/sync-committee-update.json b/bridges/snowbridge/pallets/ethereum-client/tests/fixtures/sync-committee-update.json
similarity index 100%
rename from bridges/snowbridge/parachain/pallets/ethereum-client/tests/fixtures/sync-committee-update.json
rename to bridges/snowbridge/pallets/ethereum-client/tests/fixtures/sync-committee-update.json
diff --git a/bridges/snowbridge/parachain/pallets/inbound-queue/Cargo.toml b/bridges/snowbridge/pallets/inbound-queue/Cargo.toml
similarity index 73%
rename from bridges/snowbridge/parachain/pallets/inbound-queue/Cargo.toml
rename to bridges/snowbridge/pallets/inbound-queue/Cargo.toml
index 367e00ad46a110be1afe58445d7792af5bab345a..1081b162ddaec58037863a65028db4dffd03b438 100644
--- a/bridges/snowbridge/parachain/pallets/inbound-queue/Cargo.toml
+++ b/bridges/snowbridge/pallets/inbound-queue/Cargo.toml
@@ -25,18 +25,18 @@ alloy-sol-types = { version = "0.4.2", default-features = false }
alloy-rlp = { version = "0.3.3", default-features = false, features = ["derive"] }
num-traits = { version = "0.2.16", default-features = false }
-frame-benchmarking = { path = "../../../../../substrate/frame/benchmarking", default-features = false, optional = true }
-frame-support = { path = "../../../../../substrate/frame/support", default-features = false }
-frame-system = { path = "../../../../../substrate/frame/system", default-features = false }
-pallet-balances = { path = "../../../../../substrate/frame/balances", default-features = false }
-sp-core = { path = "../../../../../substrate/primitives/core", default-features = false }
-sp-std = { path = "../../../../../substrate/primitives/std", default-features = false }
-sp-io = { path = "../../../../../substrate/primitives/io", default-features = false }
-sp-runtime = { path = "../../../../../substrate/primitives/runtime", default-features = false }
+frame-benchmarking = { path = "../../../../substrate/frame/benchmarking", default-features = false, optional = true }
+frame-support = { path = "../../../../substrate/frame/support", default-features = false }
+frame-system = { path = "../../../../substrate/frame/system", default-features = false }
+pallet-balances = { path = "../../../../substrate/frame/balances", default-features = false }
+sp-core = { path = "../../../../substrate/primitives/core", default-features = false }
+sp-std = { path = "../../../../substrate/primitives/std", default-features = false }
+sp-io = { path = "../../../../substrate/primitives/io", default-features = false }
+sp-runtime = { path = "../../../../substrate/primitives/runtime", default-features = false }
-xcm = { package = "staging-xcm", path = "../../../../../polkadot/xcm", default-features = false }
-xcm-builder = { package = "staging-xcm-builder", path = "../../../../../polkadot/xcm/xcm-builder", default-features = false }
-xcm-executor = { package = "staging-xcm-executor", path = "../../../../../polkadot/xcm/xcm-executor", default-features = false }
+xcm = { package = "staging-xcm", path = "../../../../polkadot/xcm", default-features = false }
+xcm-builder = { package = "staging-xcm-builder", path = "../../../../polkadot/xcm/xcm-builder", default-features = false }
+xcm-executor = { package = "staging-xcm-executor", path = "../../../../polkadot/xcm/xcm-executor", default-features = false }
snowbridge-core = { path = "../../primitives/core", default-features = false }
snowbridge-ethereum = { path = "../../primitives/ethereum", default-features = false }
@@ -45,8 +45,8 @@ snowbridge-beacon-primitives = { path = "../../primitives/beacon", default-featu
snowbridge-pallet-inbound-queue-fixtures = { path = "./fixtures", default-features = false, optional = true }
[dev-dependencies]
-frame-benchmarking = { path = "../../../../../substrate/frame/benchmarking" }
-sp-keyring = { path = "../../../../../substrate/primitives/keyring" }
+frame-benchmarking = { path = "../../../../substrate/frame/benchmarking" }
+sp-keyring = { path = "../../../../substrate/primitives/keyring" }
snowbridge-pallet-ethereum-client = { path = "../ethereum-client" }
hex-literal = { version = "0.4.1" }
diff --git a/bridges/snowbridge/parachain/pallets/inbound-queue/README.md b/bridges/snowbridge/pallets/inbound-queue/README.md
similarity index 100%
rename from bridges/snowbridge/parachain/pallets/inbound-queue/README.md
rename to bridges/snowbridge/pallets/inbound-queue/README.md
diff --git a/bridges/snowbridge/parachain/pallets/inbound-queue/fixtures/Cargo.toml b/bridges/snowbridge/pallets/inbound-queue/fixtures/Cargo.toml
similarity index 67%
rename from bridges/snowbridge/parachain/pallets/inbound-queue/fixtures/Cargo.toml
rename to bridges/snowbridge/pallets/inbound-queue/fixtures/Cargo.toml
index 7ed2b73151976b162afdb8ee49fea7597c2a078e..61f1421e056773c4f078390f9c48f7b8fa0420d3 100644
--- a/bridges/snowbridge/parachain/pallets/inbound-queue/fixtures/Cargo.toml
+++ b/bridges/snowbridge/pallets/inbound-queue/fixtures/Cargo.toml
@@ -16,11 +16,11 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
hex-literal = { version = "0.4.1" }
-sp-core = { path = "../../../../../../substrate/primitives/core", default-features = false }
-sp-std = { path = "../../../../../../substrate/primitives/std", default-features = false }
-frame-benchmarking = { path = "../../../../../../substrate/frame/benchmarking", default-features = false, optional = true }
-frame-support = { path = "../../../../../../substrate/frame/support", default-features = false }
-frame-system = { path = "../../../../../../substrate/frame/system", default-features = false }
+sp-core = { path = "../../../../../substrate/primitives/core", default-features = false }
+sp-std = { path = "../../../../../substrate/primitives/std", default-features = false }
+frame-benchmarking = { path = "../../../../../substrate/frame/benchmarking", default-features = false, optional = true }
+frame-support = { path = "../../../../../substrate/frame/support", default-features = false }
+frame-system = { path = "../../../../../substrate/frame/system", default-features = false }
snowbridge-core = { path = "../../../primitives/core", default-features = false }
snowbridge-beacon-primitives = { path = "../../../primitives/beacon", default-features = false }
diff --git a/bridges/snowbridge/parachain/pallets/inbound-queue/fixtures/src/lib.rs b/bridges/snowbridge/pallets/inbound-queue/fixtures/src/lib.rs
similarity index 100%
rename from bridges/snowbridge/parachain/pallets/inbound-queue/fixtures/src/lib.rs
rename to bridges/snowbridge/pallets/inbound-queue/fixtures/src/lib.rs
diff --git a/bridges/snowbridge/parachain/pallets/inbound-queue/fixtures/src/register_token.rs b/bridges/snowbridge/pallets/inbound-queue/fixtures/src/register_token.rs
similarity index 100%
rename from bridges/snowbridge/parachain/pallets/inbound-queue/fixtures/src/register_token.rs
rename to bridges/snowbridge/pallets/inbound-queue/fixtures/src/register_token.rs
diff --git a/bridges/snowbridge/parachain/pallets/inbound-queue/fixtures/src/register_token_with_insufficient_fee.rs b/bridges/snowbridge/pallets/inbound-queue/fixtures/src/register_token_with_insufficient_fee.rs
similarity index 100%
rename from bridges/snowbridge/parachain/pallets/inbound-queue/fixtures/src/register_token_with_insufficient_fee.rs
rename to bridges/snowbridge/pallets/inbound-queue/fixtures/src/register_token_with_insufficient_fee.rs
diff --git a/bridges/snowbridge/parachain/pallets/inbound-queue/fixtures/src/send_token.rs b/bridges/snowbridge/pallets/inbound-queue/fixtures/src/send_token.rs
similarity index 100%
rename from bridges/snowbridge/parachain/pallets/inbound-queue/fixtures/src/send_token.rs
rename to bridges/snowbridge/pallets/inbound-queue/fixtures/src/send_token.rs
diff --git a/bridges/snowbridge/parachain/pallets/inbound-queue/fixtures/src/send_token_to_penpal.rs b/bridges/snowbridge/pallets/inbound-queue/fixtures/src/send_token_to_penpal.rs
similarity index 100%
rename from bridges/snowbridge/parachain/pallets/inbound-queue/fixtures/src/send_token_to_penpal.rs
rename to bridges/snowbridge/pallets/inbound-queue/fixtures/src/send_token_to_penpal.rs
diff --git a/bridges/snowbridge/parachain/pallets/inbound-queue/src/benchmarking/mod.rs b/bridges/snowbridge/pallets/inbound-queue/src/benchmarking/mod.rs
similarity index 100%
rename from bridges/snowbridge/parachain/pallets/inbound-queue/src/benchmarking/mod.rs
rename to bridges/snowbridge/pallets/inbound-queue/src/benchmarking/mod.rs
diff --git a/bridges/snowbridge/parachain/pallets/inbound-queue/src/envelope.rs b/bridges/snowbridge/pallets/inbound-queue/src/envelope.rs
similarity index 100%
rename from bridges/snowbridge/parachain/pallets/inbound-queue/src/envelope.rs
rename to bridges/snowbridge/pallets/inbound-queue/src/envelope.rs
diff --git a/bridges/snowbridge/parachain/pallets/inbound-queue/src/lib.rs b/bridges/snowbridge/pallets/inbound-queue/src/lib.rs
similarity index 100%
rename from bridges/snowbridge/parachain/pallets/inbound-queue/src/lib.rs
rename to bridges/snowbridge/pallets/inbound-queue/src/lib.rs
diff --git a/bridges/snowbridge/parachain/pallets/inbound-queue/src/mock.rs b/bridges/snowbridge/pallets/inbound-queue/src/mock.rs
similarity index 100%
rename from bridges/snowbridge/parachain/pallets/inbound-queue/src/mock.rs
rename to bridges/snowbridge/pallets/inbound-queue/src/mock.rs
diff --git a/bridges/snowbridge/parachain/pallets/inbound-queue/src/test.rs b/bridges/snowbridge/pallets/inbound-queue/src/test.rs
similarity index 100%
rename from bridges/snowbridge/parachain/pallets/inbound-queue/src/test.rs
rename to bridges/snowbridge/pallets/inbound-queue/src/test.rs
diff --git a/bridges/snowbridge/parachain/pallets/inbound-queue/src/weights.rs b/bridges/snowbridge/pallets/inbound-queue/src/weights.rs
similarity index 100%
rename from bridges/snowbridge/parachain/pallets/inbound-queue/src/weights.rs
rename to bridges/snowbridge/pallets/inbound-queue/src/weights.rs
diff --git a/bridges/snowbridge/parachain/pallets/outbound-queue/Cargo.toml b/bridges/snowbridge/pallets/outbound-queue/Cargo.toml
similarity index 62%
rename from bridges/snowbridge/parachain/pallets/outbound-queue/Cargo.toml
rename to bridges/snowbridge/pallets/outbound-queue/Cargo.toml
index d6add7e348cdaff48ded64b6e2ab94ae9ebe02f1..ae52fb3e5c49d5d35558d78a38b7f00b0d01ac8f 100644
--- a/bridges/snowbridge/parachain/pallets/outbound-queue/Cargo.toml
+++ b/bridges/snowbridge/pallets/outbound-queue/Cargo.toml
@@ -20,26 +20,26 @@ codec = { version = "3.6.1", package = "parity-scale-codec", default-features =
scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
hex-literal = { version = "0.4.1", optional = true }
-frame-benchmarking = { path = "../../../../../substrate/frame/benchmarking", default-features = false, optional = true }
-frame-support = { path = "../../../../../substrate/frame/support", default-features = false }
-frame-system = { path = "../../../../../substrate/frame/system", default-features = false }
-sp-core = { path = "../../../../../substrate/primitives/core", default-features = false }
-sp-std = { path = "../../../../../substrate/primitives/std", default-features = false }
-sp-runtime = { path = "../../../../../substrate/primitives/runtime", default-features = false }
-sp-io = { path = "../../../../../substrate/primitives/io", default-features = false }
-sp-arithmetic = { path = "../../../../../substrate/primitives/arithmetic", default-features = false }
+frame-benchmarking = { path = "../../../../substrate/frame/benchmarking", default-features = false, optional = true }
+frame-support = { path = "../../../../substrate/frame/support", default-features = false }
+frame-system = { path = "../../../../substrate/frame/system", default-features = false }
+sp-core = { path = "../../../../substrate/primitives/core", default-features = false }
+sp-std = { path = "../../../../substrate/primitives/std", default-features = false }
+sp-runtime = { path = "../../../../substrate/primitives/runtime", default-features = false }
+sp-io = { path = "../../../../substrate/primitives/io", default-features = false }
+sp-arithmetic = { path = "../../../../substrate/primitives/arithmetic", default-features = false }
-bridge-hub-common = { path = "../../../../../cumulus/parachains/runtimes/bridge-hubs/common", default-features = false }
+bridge-hub-common = { path = "../../../../cumulus/parachains/runtimes/bridge-hubs/common", default-features = false }
snowbridge-core = { path = "../../primitives/core", default-features = false, features = ["serde"] }
snowbridge-outbound-queue-merkle-tree = { path = "merkle-tree", default-features = false }
ethabi = { package = "ethabi-decode", version = "1.0.0", default-features = false }
-xcm = { package = "staging-xcm", path = "../../../../../polkadot/xcm", default-features = false }
+xcm = { package = "staging-xcm", path = "../../../../polkadot/xcm", default-features = false }
[dev-dependencies]
-pallet-message-queue = { path = "../../../../../substrate/frame/message-queue", default-features = false }
-sp-keyring = { path = "../../../../../substrate/primitives/keyring" }
+pallet-message-queue = { path = "../../../../substrate/frame/message-queue", default-features = false }
+sp-keyring = { path = "../../../../substrate/primitives/keyring" }
hex-literal = { version = "0.4.1" }
[features]
diff --git a/bridges/snowbridge/parachain/pallets/outbound-queue/README.md b/bridges/snowbridge/pallets/outbound-queue/README.md
similarity index 100%
rename from bridges/snowbridge/parachain/pallets/outbound-queue/README.md
rename to bridges/snowbridge/pallets/outbound-queue/README.md
diff --git a/bridges/snowbridge/parachain/pallets/outbound-queue/merkle-tree/Cargo.toml b/bridges/snowbridge/pallets/outbound-queue/merkle-tree/Cargo.toml
similarity index 74%
rename from bridges/snowbridge/parachain/pallets/outbound-queue/merkle-tree/Cargo.toml
rename to bridges/snowbridge/pallets/outbound-queue/merkle-tree/Cargo.toml
index 074b8031878e937d7dd7e70e6caa401ca9b6fbcd..c185d5af7062045f40946fcbd3c45cb62b932216 100644
--- a/bridges/snowbridge/parachain/pallets/outbound-queue/merkle-tree/Cargo.toml
+++ b/bridges/snowbridge/pallets/outbound-queue/merkle-tree/Cargo.toml
@@ -18,15 +18,15 @@ targets = ["x86_64-unknown-linux-gnu"]
codec = { version = "3.1.5", package = "parity-scale-codec", default-features = false, features = ["derive"] }
scale-info = { version = "2.7.0", default-features = false, features = ["derive"] }
-sp-core = { path = "../../../../../../substrate/primitives/core", default-features = false }
-sp-runtime = { path = "../../../../../../substrate/primitives/runtime", default-features = false }
+sp-core = { path = "../../../../../substrate/primitives/core", default-features = false }
+sp-runtime = { path = "../../../../../substrate/primitives/runtime", default-features = false }
[dev-dependencies]
hex-literal = { version = "0.4.1" }
env_logger = "0.9"
hex = "0.4"
array-bytes = "4.1"
-sp-crypto-hashing = { path = "../../../../../../substrate/primitives/crypto/hashing" }
+sp-crypto-hashing = { path = "../../../../../substrate/primitives/crypto/hashing" }
[features]
default = ["std"]
diff --git a/bridges/snowbridge/parachain/pallets/outbound-queue/merkle-tree/README.md b/bridges/snowbridge/pallets/outbound-queue/merkle-tree/README.md
similarity index 100%
rename from bridges/snowbridge/parachain/pallets/outbound-queue/merkle-tree/README.md
rename to bridges/snowbridge/pallets/outbound-queue/merkle-tree/README.md
diff --git a/bridges/snowbridge/parachain/pallets/outbound-queue/merkle-tree/src/lib.rs b/bridges/snowbridge/pallets/outbound-queue/merkle-tree/src/lib.rs
similarity index 100%
rename from bridges/snowbridge/parachain/pallets/outbound-queue/merkle-tree/src/lib.rs
rename to bridges/snowbridge/pallets/outbound-queue/merkle-tree/src/lib.rs
diff --git a/bridges/snowbridge/parachain/pallets/outbound-queue/runtime-api/Cargo.toml b/bridges/snowbridge/pallets/outbound-queue/runtime-api/Cargo.toml
similarity index 65%
rename from bridges/snowbridge/parachain/pallets/outbound-queue/runtime-api/Cargo.toml
rename to bridges/snowbridge/pallets/outbound-queue/runtime-api/Cargo.toml
index a1c465957e1df9843c8ff96d46ace84cf44dc85e..347b3bae493b7491790854be7a28f82386d2ee4b 100644
--- a/bridges/snowbridge/parachain/pallets/outbound-queue/runtime-api/Cargo.toml
+++ b/bridges/snowbridge/pallets/outbound-queue/runtime-api/Cargo.toml
@@ -16,11 +16,11 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
codec = { version = "3.1.5", package = "parity-scale-codec", features = ["derive"], default-features = false }
-sp-core = { path = "../../../../../../substrate/primitives/core", default-features = false }
-sp-std = { path = "../../../../../../substrate/primitives/std", default-features = false }
-sp-api = { path = "../../../../../../substrate/primitives/api", default-features = false }
-frame-support = { path = "../../../../../../substrate/frame/support", default-features = false }
-xcm = { package = "staging-xcm", path = "../../../../../../polkadot/xcm", default-features = false }
+sp-core = { path = "../../../../../substrate/primitives/core", default-features = false }
+sp-std = { path = "../../../../../substrate/primitives/std", default-features = false }
+sp-api = { path = "../../../../../substrate/primitives/api", default-features = false }
+frame-support = { path = "../../../../../substrate/frame/support", default-features = false }
+xcm = { package = "staging-xcm", path = "../../../../../polkadot/xcm", default-features = false }
snowbridge-outbound-queue-merkle-tree = { path = "../merkle-tree", default-features = false }
snowbridge-core = { path = "../../../primitives/core", default-features = false }
diff --git a/bridges/snowbridge/parachain/pallets/outbound-queue/runtime-api/README.md b/bridges/snowbridge/pallets/outbound-queue/runtime-api/README.md
similarity index 100%
rename from bridges/snowbridge/parachain/pallets/outbound-queue/runtime-api/README.md
rename to bridges/snowbridge/pallets/outbound-queue/runtime-api/README.md
diff --git a/bridges/snowbridge/parachain/pallets/outbound-queue/runtime-api/src/lib.rs b/bridges/snowbridge/pallets/outbound-queue/runtime-api/src/lib.rs
similarity index 100%
rename from bridges/snowbridge/parachain/pallets/outbound-queue/runtime-api/src/lib.rs
rename to bridges/snowbridge/pallets/outbound-queue/runtime-api/src/lib.rs
diff --git a/bridges/snowbridge/parachain/pallets/outbound-queue/src/api.rs b/bridges/snowbridge/pallets/outbound-queue/src/api.rs
similarity index 100%
rename from bridges/snowbridge/parachain/pallets/outbound-queue/src/api.rs
rename to bridges/snowbridge/pallets/outbound-queue/src/api.rs
diff --git a/bridges/snowbridge/parachain/pallets/outbound-queue/src/benchmarking.rs b/bridges/snowbridge/pallets/outbound-queue/src/benchmarking.rs
similarity index 100%
rename from bridges/snowbridge/parachain/pallets/outbound-queue/src/benchmarking.rs
rename to bridges/snowbridge/pallets/outbound-queue/src/benchmarking.rs
diff --git a/bridges/snowbridge/parachain/pallets/outbound-queue/src/lib.rs b/bridges/snowbridge/pallets/outbound-queue/src/lib.rs
similarity index 100%
rename from bridges/snowbridge/parachain/pallets/outbound-queue/src/lib.rs
rename to bridges/snowbridge/pallets/outbound-queue/src/lib.rs
diff --git a/bridges/snowbridge/parachain/pallets/outbound-queue/src/mock.rs b/bridges/snowbridge/pallets/outbound-queue/src/mock.rs
similarity index 100%
rename from bridges/snowbridge/parachain/pallets/outbound-queue/src/mock.rs
rename to bridges/snowbridge/pallets/outbound-queue/src/mock.rs
diff --git a/bridges/snowbridge/parachain/pallets/outbound-queue/src/process_message_impl.rs b/bridges/snowbridge/pallets/outbound-queue/src/process_message_impl.rs
similarity index 100%
rename from bridges/snowbridge/parachain/pallets/outbound-queue/src/process_message_impl.rs
rename to bridges/snowbridge/pallets/outbound-queue/src/process_message_impl.rs
diff --git a/bridges/snowbridge/parachain/pallets/outbound-queue/src/send_message_impl.rs b/bridges/snowbridge/pallets/outbound-queue/src/send_message_impl.rs
similarity index 100%
rename from bridges/snowbridge/parachain/pallets/outbound-queue/src/send_message_impl.rs
rename to bridges/snowbridge/pallets/outbound-queue/src/send_message_impl.rs
diff --git a/bridges/snowbridge/parachain/pallets/outbound-queue/src/test.rs b/bridges/snowbridge/pallets/outbound-queue/src/test.rs
similarity index 100%
rename from bridges/snowbridge/parachain/pallets/outbound-queue/src/test.rs
rename to bridges/snowbridge/pallets/outbound-queue/src/test.rs
diff --git a/bridges/snowbridge/parachain/pallets/outbound-queue/src/types.rs b/bridges/snowbridge/pallets/outbound-queue/src/types.rs
similarity index 100%
rename from bridges/snowbridge/parachain/pallets/outbound-queue/src/types.rs
rename to bridges/snowbridge/pallets/outbound-queue/src/types.rs
diff --git a/bridges/snowbridge/parachain/pallets/outbound-queue/src/weights.rs b/bridges/snowbridge/pallets/outbound-queue/src/weights.rs
similarity index 100%
rename from bridges/snowbridge/parachain/pallets/outbound-queue/src/weights.rs
rename to bridges/snowbridge/pallets/outbound-queue/src/weights.rs
diff --git a/bridges/snowbridge/parachain/pallets/system/Cargo.toml b/bridges/snowbridge/pallets/system/Cargo.toml
similarity index 63%
rename from bridges/snowbridge/parachain/pallets/system/Cargo.toml
rename to bridges/snowbridge/pallets/system/Cargo.toml
index da240344ba9a1f61d82b57f5e281125fdec1d49c..aa600511633bb7d5fef36f8d4ae6cec847c4e6c4 100644
--- a/bridges/snowbridge/parachain/pallets/system/Cargo.toml
+++ b/bridges/snowbridge/pallets/system/Cargo.toml
@@ -19,19 +19,19 @@ codec = { package = "parity-scale-codec", version = "3.6.1", default-features =
"derive",
] }
scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
-frame-benchmarking = { path = "../../../../../substrate/frame/benchmarking", default-features = false, optional = true }
-frame-support = { path = "../../../../../substrate/frame/support", default-features = false }
-frame-system = { path = "../../../../../substrate/frame/system", default-features = false }
+frame-benchmarking = { path = "../../../../substrate/frame/benchmarking", default-features = false, optional = true }
+frame-support = { path = "../../../../substrate/frame/support", default-features = false }
+frame-system = { path = "../../../../substrate/frame/system", default-features = false }
log = { version = "0.4.20", default-features = false }
-sp-core = { path = "../../../../../substrate/primitives/core", default-features = false }
-sp-std = { path = "../../../../../substrate/primitives/std", default-features = false }
-sp-io = { path = "../../../../../substrate/primitives/io", default-features = false }
-sp-runtime = { path = "../../../../../substrate/primitives/runtime", default-features = false }
+sp-core = { path = "../../../../substrate/primitives/core", default-features = false }
+sp-std = { path = "../../../../substrate/primitives/std", default-features = false }
+sp-io = { path = "../../../../substrate/primitives/io", default-features = false }
+sp-runtime = { path = "../../../../substrate/primitives/runtime", default-features = false }
-xcm = { package = "staging-xcm", path = "../../../../../polkadot/xcm", default-features = false }
-xcm-builder = { package = "staging-xcm-builder", path = "../../../../../polkadot/xcm/xcm-builder", default-features = false }
-xcm-executor = { package = "staging-xcm-executor", path = "../../../../../polkadot/xcm/xcm-executor", default-features = false }
+xcm = { package = "staging-xcm", path = "../../../../polkadot/xcm", default-features = false }
+xcm-builder = { package = "staging-xcm-builder", path = "../../../../polkadot/xcm/xcm-builder", default-features = false }
+xcm-executor = { package = "staging-xcm-executor", path = "../../../../polkadot/xcm/xcm-executor", default-features = false }
ethabi = { package = "ethabi-decode", version = "1.0.0", default-features = false }
snowbridge-core = { path = "../../primitives/core", default-features = false }
@@ -39,10 +39,10 @@ snowbridge-core = { path = "../../primitives/core", default-features = false }
[dev-dependencies]
hex = "0.4.1"
hex-literal = { version = "0.4.1" }
-pallet-balances = { path = "../../../../../substrate/frame/balances" }
-sp-keyring = { path = "../../../../../substrate/primitives/keyring" }
-polkadot-primitives = { path = "../../../../../polkadot/primitives" }
-pallet-message-queue = { path = "../../../../../substrate/frame/message-queue" }
+pallet-balances = { path = "../../../../substrate/frame/balances" }
+sp-keyring = { path = "../../../../substrate/primitives/keyring" }
+polkadot-primitives = { path = "../../../../polkadot/primitives" }
+pallet-message-queue = { path = "../../../../substrate/frame/message-queue" }
snowbridge-pallet-outbound-queue = { path = "../outbound-queue" }
[features]
diff --git a/bridges/snowbridge/parachain/pallets/system/README.md b/bridges/snowbridge/pallets/system/README.md
similarity index 100%
rename from bridges/snowbridge/parachain/pallets/system/README.md
rename to bridges/snowbridge/pallets/system/README.md
diff --git a/bridges/snowbridge/parachain/pallets/system/runtime-api/Cargo.toml b/bridges/snowbridge/pallets/system/runtime-api/Cargo.toml
similarity index 65%
rename from bridges/snowbridge/parachain/pallets/system/runtime-api/Cargo.toml
rename to bridges/snowbridge/pallets/system/runtime-api/Cargo.toml
index 8f128e3a35de6d985bcb95f576d9e719660966bf..355d2d29147f3cd84ae013363db874c9b9739b8e 100644
--- a/bridges/snowbridge/parachain/pallets/system/runtime-api/Cargo.toml
+++ b/bridges/snowbridge/pallets/system/runtime-api/Cargo.toml
@@ -18,10 +18,10 @@ targets = ["x86_64-unknown-linux-gnu"]
codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = [
"derive",
] }
-sp-core = { path = "../../../../../../substrate/primitives/core", default-features = false }
-sp-std = { path = "../../../../../../substrate/primitives/std", default-features = false }
-sp-api = { path = "../../../../../../substrate/primitives/api", default-features = false }
-xcm = { package = "staging-xcm", path = "../../../../../../polkadot/xcm", default-features = false }
+sp-core = { path = "../../../../../substrate/primitives/core", default-features = false }
+sp-std = { path = "../../../../../substrate/primitives/std", default-features = false }
+sp-api = { path = "../../../../../substrate/primitives/api", default-features = false }
+xcm = { package = "staging-xcm", path = "../../../../../polkadot/xcm", default-features = false }
snowbridge-core = { path = "../../../primitives/core", default-features = false }
[features]
diff --git a/bridges/snowbridge/parachain/pallets/system/runtime-api/README.md b/bridges/snowbridge/pallets/system/runtime-api/README.md
similarity index 100%
rename from bridges/snowbridge/parachain/pallets/system/runtime-api/README.md
rename to bridges/snowbridge/pallets/system/runtime-api/README.md
diff --git a/bridges/snowbridge/parachain/pallets/system/runtime-api/src/lib.rs b/bridges/snowbridge/pallets/system/runtime-api/src/lib.rs
similarity index 100%
rename from bridges/snowbridge/parachain/pallets/system/runtime-api/src/lib.rs
rename to bridges/snowbridge/pallets/system/runtime-api/src/lib.rs
diff --git a/bridges/snowbridge/parachain/pallets/system/src/api.rs b/bridges/snowbridge/pallets/system/src/api.rs
similarity index 100%
rename from bridges/snowbridge/parachain/pallets/system/src/api.rs
rename to bridges/snowbridge/pallets/system/src/api.rs
diff --git a/bridges/snowbridge/parachain/pallets/system/src/benchmarking.rs b/bridges/snowbridge/pallets/system/src/benchmarking.rs
similarity index 100%
rename from bridges/snowbridge/parachain/pallets/system/src/benchmarking.rs
rename to bridges/snowbridge/pallets/system/src/benchmarking.rs
diff --git a/bridges/snowbridge/parachain/pallets/system/src/lib.rs b/bridges/snowbridge/pallets/system/src/lib.rs
similarity index 100%
rename from bridges/snowbridge/parachain/pallets/system/src/lib.rs
rename to bridges/snowbridge/pallets/system/src/lib.rs
diff --git a/bridges/snowbridge/parachain/pallets/system/src/migration.rs b/bridges/snowbridge/pallets/system/src/migration.rs
similarity index 100%
rename from bridges/snowbridge/parachain/pallets/system/src/migration.rs
rename to bridges/snowbridge/pallets/system/src/migration.rs
diff --git a/bridges/snowbridge/parachain/pallets/system/src/mock.rs b/bridges/snowbridge/pallets/system/src/mock.rs
similarity index 100%
rename from bridges/snowbridge/parachain/pallets/system/src/mock.rs
rename to bridges/snowbridge/pallets/system/src/mock.rs
diff --git a/bridges/snowbridge/parachain/pallets/system/src/tests.rs b/bridges/snowbridge/pallets/system/src/tests.rs
similarity index 100%
rename from bridges/snowbridge/parachain/pallets/system/src/tests.rs
rename to bridges/snowbridge/pallets/system/src/tests.rs
diff --git a/bridges/snowbridge/parachain/pallets/system/src/weights.rs b/bridges/snowbridge/pallets/system/src/weights.rs
similarity index 100%
rename from bridges/snowbridge/parachain/pallets/system/src/weights.rs
rename to bridges/snowbridge/pallets/system/src/weights.rs
diff --git a/bridges/snowbridge/parachain/LICENSE b/bridges/snowbridge/parachain/LICENSE
deleted file mode 100644
index 261eeb9e9f8b2b4b0d119366dda99c6fd7d35c64..0000000000000000000000000000000000000000
--- a/bridges/snowbridge/parachain/LICENSE
+++ /dev/null
@@ -1,201 +0,0 @@
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
diff --git a/bridges/snowbridge/parachain/README.md b/bridges/snowbridge/parachain/README.md
deleted file mode 100644
index a38910da3164e853f54b284f8d38795d4220aafe..0000000000000000000000000000000000000000
--- a/bridges/snowbridge/parachain/README.md
+++ /dev/null
@@ -1,127 +0,0 @@
-# Snowbridge ·
-[]
-(https://codecov.io/gh/Snowfork/snowbridge)
-
-
-Snowbridge is a trustless bridge between Polkadot and Ethereum. For documentation, visit https://docs.snowbridge.network.
-
-## Components
-
-### Parachain
-
-Polkadot parachain and our pallets. See [parachain/README.md](https://github.com/Snowfork/snowbridge/blob/main/parachain/README.md).
-
-### Contracts
-
-Ethereum contracts and unit tests. See [contracts/README.md](https://github.com/Snowfork/snowbridge/blob/main/contracts/README.md)
-
-### Relayer
-
-Off-chain relayer services for relaying messages between Polkadot and Ethereum. See
-[relayer/README.md](https://github.com/Snowfork/snowbridge/blob/main/relayer/README.md)
-
-### Local Testnet
-
-Scripts to provision a local testnet, running the above services to bridge between local deployments of Polkadot and
-Ethereum. See [web/packages/test/README.md](https://github.com/Snowfork/snowbridge/blob/main/web/packages/test/README.md).
-
-### Smoke Tests
-
-Integration tests for our local testnet. See [smoketest/README.md](https://github.com/Snowfork/snowbridge/blob/main/smoketest/README.md).
-
-## Development
-
-We use the Nix package manager to provide a reproducible and maintainable developer environment.
-
-After [installing nix](https://nixos.org/download.html) Nix, enable [flakes](https://nixos.wiki/wiki/Flakes):
-
-```sh
-mkdir -p ~/.config/nix
-echo 'experimental-features = nix-command flakes' >> ~/.config/nix/nix.conf
-```
-
-Then activate a developer shell in the root of our repo, where
-[`flake.nix`](https://github.com/Snowfork/snowbridge/blob/main/flake.nix) is located:
-
-```sh
-nix develop
-```
-
-Also make sure to run this initialization script once:
-```sh
-scripts/init.sh
-```
-
-### Support for code editors
-
-To ensure your code editor (such as VS Code) can execute tools in the nix shell, startup your editor within the
-interactive shell.
-
-Example for VS Code:
-
-```sh
-nix develop
-code .
-```
-
-### Custom shells
-
-The developer shell is bash by default. To preserve your existing shell:
-
-```sh
-nix develop --command $SHELL
-```
-
-### Automatic developer shells
-
-To automatically enter the developer shell whenever you open the project, install
-[`direnv`](https://direnv.net/docs/installation.html) and use the template `.envrc`:
-
-```sh
-cp .envrc.example .envrc
-direnv allow
-```
-
-### Upgrading the Rust toolchain
-
-Sometimes we would like to upgrade rust toolchain. First update `parachain/rust-toolchain.toml` as required and then
-update `flake.lock` running
-```sh
-nix flake lock --update-input rust-overlay
-```
-
-## Troubleshooting
-
-Check the contents of all `.envrc` files.
-
-Remove untracked files:
-```sh
-git clean -idx
-```
-
-Ensure that the current Rust toolchain is the one selected in `scripts/init.sh`.
-
-Ensure submodules are up-to-date:
-```sh
-git submodule update
-```
-
-Check untracked files & directories:
-```sh
-git clean -ndx | awk '{print $3}'
-```
-After removing `node_modules` directories (eg. with `git clean above`), clear the pnpm cache:
-```sh
-pnpm store prune
-```
-
-Check Nix config in `~/.config/nix/nix.conf`.
-
-Run a pure developer shell (note that this removes access to your local tools):
-```sh
-nix develop -i --pure-eval
-```
-
-## Security
-
-The security policy and procedures can be found in SECURITY.md.
diff --git a/bridges/snowbridge/parachain/primitives/ethereum/.cargo/config.toml b/bridges/snowbridge/parachain/primitives/ethereum/.cargo/config.toml
deleted file mode 100644
index 4ec2f3b8620332641758c95f2c1c685e261cba42..0000000000000000000000000000000000000000
--- a/bridges/snowbridge/parachain/primitives/ethereum/.cargo/config.toml
+++ /dev/null
@@ -1,2 +0,0 @@
-[target.wasm32-unknown-unknown]
-runner = 'wasm-bindgen-test-runner'
diff --git a/bridges/snowbridge/parachain/primitives/beacon/Cargo.toml b/bridges/snowbridge/primitives/beacon/Cargo.toml
similarity index 72%
rename from bridges/snowbridge/parachain/primitives/beacon/Cargo.toml
rename to bridges/snowbridge/primitives/beacon/Cargo.toml
index 3c2b3fcd065e3bce4e269b805426d55067537925..b59e5191b418753fc3eb1a2342194af4efc311c3 100644
--- a/bridges/snowbridge/parachain/primitives/beacon/Cargo.toml
+++ b/bridges/snowbridge/primitives/beacon/Cargo.toml
@@ -18,12 +18,12 @@ codec = { package = "parity-scale-codec", version = "3.6.1", default-features =
scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
rlp = { version = "0.5", default-features = false }
-frame-support = { path = "../../../../../substrate/frame/support", default-features = false }
-frame-system = { path = "../../../../../substrate/frame/system", default-features = false }
-sp-runtime = { path = "../../../../../substrate/primitives/runtime", default-features = false }
-sp-core = { path = "../../../../../substrate/primitives/core", default-features = false }
-sp-std = { path = "../../../../../substrate/primitives/std", default-features = false }
-sp-io = { path = "../../../../../substrate/primitives/io", default-features = false }
+frame-support = { path = "../../../../substrate/frame/support", default-features = false }
+frame-system = { path = "../../../../substrate/frame/system", default-features = false }
+sp-runtime = { path = "../../../../substrate/primitives/runtime", default-features = false }
+sp-core = { path = "../../../../substrate/primitives/core", default-features = false }
+sp-std = { path = "../../../../substrate/primitives/std", default-features = false }
+sp-io = { path = "../../../../substrate/primitives/io", default-features = false }
ssz_rs = { version = "0.9.0", default-features = false }
ssz_rs_derive = { version = "0.9.0", default-features = false }
diff --git a/bridges/snowbridge/parachain/primitives/beacon/README.md b/bridges/snowbridge/primitives/beacon/README.md
similarity index 100%
rename from bridges/snowbridge/parachain/primitives/beacon/README.md
rename to bridges/snowbridge/primitives/beacon/README.md
diff --git a/bridges/snowbridge/parachain/primitives/beacon/src/bits.rs b/bridges/snowbridge/primitives/beacon/src/bits.rs
similarity index 100%
rename from bridges/snowbridge/parachain/primitives/beacon/src/bits.rs
rename to bridges/snowbridge/primitives/beacon/src/bits.rs
diff --git a/bridges/snowbridge/parachain/primitives/beacon/src/bls.rs b/bridges/snowbridge/primitives/beacon/src/bls.rs
similarity index 100%
rename from bridges/snowbridge/parachain/primitives/beacon/src/bls.rs
rename to bridges/snowbridge/primitives/beacon/src/bls.rs
diff --git a/bridges/snowbridge/parachain/primitives/beacon/src/config.rs b/bridges/snowbridge/primitives/beacon/src/config.rs
similarity index 100%
rename from bridges/snowbridge/parachain/primitives/beacon/src/config.rs
rename to bridges/snowbridge/primitives/beacon/src/config.rs
diff --git a/bridges/snowbridge/parachain/primitives/beacon/src/lib.rs b/bridges/snowbridge/primitives/beacon/src/lib.rs
similarity index 100%
rename from bridges/snowbridge/parachain/primitives/beacon/src/lib.rs
rename to bridges/snowbridge/primitives/beacon/src/lib.rs
diff --git a/bridges/snowbridge/parachain/primitives/beacon/src/merkle_proof.rs b/bridges/snowbridge/primitives/beacon/src/merkle_proof.rs
similarity index 100%
rename from bridges/snowbridge/parachain/primitives/beacon/src/merkle_proof.rs
rename to bridges/snowbridge/primitives/beacon/src/merkle_proof.rs
diff --git a/bridges/snowbridge/parachain/primitives/beacon/src/receipt.rs b/bridges/snowbridge/primitives/beacon/src/receipt.rs
similarity index 100%
rename from bridges/snowbridge/parachain/primitives/beacon/src/receipt.rs
rename to bridges/snowbridge/primitives/beacon/src/receipt.rs
diff --git a/bridges/snowbridge/parachain/primitives/beacon/src/serde_utils.rs b/bridges/snowbridge/primitives/beacon/src/serde_utils.rs
similarity index 100%
rename from bridges/snowbridge/parachain/primitives/beacon/src/serde_utils.rs
rename to bridges/snowbridge/primitives/beacon/src/serde_utils.rs
diff --git a/bridges/snowbridge/parachain/primitives/beacon/src/ssz.rs b/bridges/snowbridge/primitives/beacon/src/ssz.rs
similarity index 100%
rename from bridges/snowbridge/parachain/primitives/beacon/src/ssz.rs
rename to bridges/snowbridge/primitives/beacon/src/ssz.rs
diff --git a/bridges/snowbridge/parachain/primitives/beacon/src/types.rs b/bridges/snowbridge/primitives/beacon/src/types.rs
similarity index 100%
rename from bridges/snowbridge/parachain/primitives/beacon/src/types.rs
rename to bridges/snowbridge/primitives/beacon/src/types.rs
diff --git a/bridges/snowbridge/parachain/primitives/beacon/src/updates.rs b/bridges/snowbridge/primitives/beacon/src/updates.rs
similarity index 100%
rename from bridges/snowbridge/parachain/primitives/beacon/src/updates.rs
rename to bridges/snowbridge/primitives/beacon/src/updates.rs
diff --git a/bridges/snowbridge/parachain/primitives/core/Cargo.toml b/bridges/snowbridge/primitives/core/Cargo.toml
similarity index 62%
rename from bridges/snowbridge/parachain/primitives/core/Cargo.toml
rename to bridges/snowbridge/primitives/core/Cargo.toml
index 4e56495c1e6b6d5d5453aaf00f466f90fab1a49d..f735d01a848fb15ced0f086b8b7117e6e771c688 100644
--- a/bridges/snowbridge/parachain/primitives/core/Cargo.toml
+++ b/bridges/snowbridge/primitives/core/Cargo.toml
@@ -17,17 +17,17 @@ codec = { package = "parity-scale-codec", version = "3.6.1", default-features =
scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
hex-literal = { version = "0.4.1" }
-polkadot-parachain-primitives = { path = "../../../../../polkadot/parachain", default-features = false }
-xcm = { package = "staging-xcm", path = "../../../../../polkadot/xcm", default-features = false }
-xcm-builder = { package = "staging-xcm-builder", path = "../../../../../polkadot/xcm/xcm-builder", default-features = false }
+polkadot-parachain-primitives = { path = "../../../../polkadot/parachain", default-features = false }
+xcm = { package = "staging-xcm", path = "../../../../polkadot/xcm", default-features = false }
+xcm-builder = { package = "staging-xcm-builder", path = "../../../../polkadot/xcm/xcm-builder", default-features = false }
-frame-support = { path = "../../../../../substrate/frame/support", default-features = false }
-frame-system = { path = "../../../../../substrate/frame/system", default-features = false }
-sp-runtime = { path = "../../../../../substrate/primitives/runtime", default-features = false }
-sp-std = { path = "../../../../../substrate/primitives/std", default-features = false }
-sp-io = { path = "../../../../../substrate/primitives/io", default-features = false }
-sp-core = { path = "../../../../../substrate/primitives/core", default-features = false }
-sp-arithmetic = { path = "../../../../../substrate/primitives/arithmetic", default-features = false }
+frame-support = { path = "../../../../substrate/frame/support", default-features = false }
+frame-system = { path = "../../../../substrate/frame/system", default-features = false }
+sp-runtime = { path = "../../../../substrate/primitives/runtime", default-features = false }
+sp-std = { path = "../../../../substrate/primitives/std", default-features = false }
+sp-io = { path = "../../../../substrate/primitives/io", default-features = false }
+sp-core = { path = "../../../../substrate/primitives/core", default-features = false }
+sp-arithmetic = { path = "../../../../substrate/primitives/arithmetic", default-features = false }
snowbridge-beacon-primitives = { path = "../beacon", default-features = false }
diff --git a/bridges/snowbridge/parachain/primitives/core/README.md b/bridges/snowbridge/primitives/core/README.md
similarity index 100%
rename from bridges/snowbridge/parachain/primitives/core/README.md
rename to bridges/snowbridge/primitives/core/README.md
diff --git a/bridges/snowbridge/parachain/primitives/core/src/inbound.rs b/bridges/snowbridge/primitives/core/src/inbound.rs
similarity index 100%
rename from bridges/snowbridge/parachain/primitives/core/src/inbound.rs
rename to bridges/snowbridge/primitives/core/src/inbound.rs
diff --git a/bridges/snowbridge/parachain/primitives/core/src/lib.rs b/bridges/snowbridge/primitives/core/src/lib.rs
similarity index 100%
rename from bridges/snowbridge/parachain/primitives/core/src/lib.rs
rename to bridges/snowbridge/primitives/core/src/lib.rs
diff --git a/bridges/snowbridge/parachain/primitives/core/src/operating_mode.rs b/bridges/snowbridge/primitives/core/src/operating_mode.rs
similarity index 100%
rename from bridges/snowbridge/parachain/primitives/core/src/operating_mode.rs
rename to bridges/snowbridge/primitives/core/src/operating_mode.rs
diff --git a/bridges/snowbridge/parachain/primitives/core/src/outbound.rs b/bridges/snowbridge/primitives/core/src/outbound.rs
similarity index 100%
rename from bridges/snowbridge/parachain/primitives/core/src/outbound.rs
rename to bridges/snowbridge/primitives/core/src/outbound.rs
diff --git a/bridges/snowbridge/parachain/primitives/core/src/pricing.rs b/bridges/snowbridge/primitives/core/src/pricing.rs
similarity index 100%
rename from bridges/snowbridge/parachain/primitives/core/src/pricing.rs
rename to bridges/snowbridge/primitives/core/src/pricing.rs
diff --git a/bridges/snowbridge/parachain/primitives/core/src/ringbuffer.rs b/bridges/snowbridge/primitives/core/src/ringbuffer.rs
similarity index 100%
rename from bridges/snowbridge/parachain/primitives/core/src/ringbuffer.rs
rename to bridges/snowbridge/primitives/core/src/ringbuffer.rs
diff --git a/bridges/snowbridge/parachain/primitives/core/src/tests.rs b/bridges/snowbridge/primitives/core/src/tests.rs
similarity index 100%
rename from bridges/snowbridge/parachain/primitives/core/src/tests.rs
rename to bridges/snowbridge/primitives/core/src/tests.rs
diff --git a/bridges/snowbridge/parachain/primitives/core/tests/fixtures/packet.scale b/bridges/snowbridge/primitives/core/tests/fixtures/packet.scale
similarity index 100%
rename from bridges/snowbridge/parachain/primitives/core/tests/fixtures/packet.scale
rename to bridges/snowbridge/primitives/core/tests/fixtures/packet.scale
diff --git a/bridges/snowbridge/parachain/primitives/core/tests/mod.rs b/bridges/snowbridge/primitives/core/tests/mod.rs
similarity index 100%
rename from bridges/snowbridge/parachain/primitives/core/tests/mod.rs
rename to bridges/snowbridge/primitives/core/tests/mod.rs
diff --git a/bridges/snowbridge/parachain/primitives/ethereum/Cargo.toml b/bridges/snowbridge/primitives/ethereum/Cargo.toml
similarity index 81%
rename from bridges/snowbridge/parachain/primitives/ethereum/Cargo.toml
rename to bridges/snowbridge/primitives/ethereum/Cargo.toml
index c419f3f47f7398fc0fc3555ca7105ca31ee83d75..047ebdd56695b1b42768da7108c75ce4c15b4fb4 100644
--- a/bridges/snowbridge/parachain/primitives/ethereum/Cargo.toml
+++ b/bridges/snowbridge/primitives/ethereum/Cargo.toml
@@ -23,10 +23,10 @@ hex-literal = { version = "0.4.1", default-features = false }
parity-bytes = { version = "0.1.2", default-features = false }
rlp = { version = "0.5.2", default-features = false }
-sp-io = { path = "../../../../../substrate/primitives/io", default-features = false }
-sp-std = { path = "../../../../../substrate/primitives/std", default-features = false }
-sp-core = { path = "../../../../../substrate/primitives/core", default-features = false }
-sp-runtime = { path = "../../../../../substrate/primitives/runtime", default-features = false }
+sp-io = { path = "../../../../substrate/primitives/io", default-features = false }
+sp-std = { path = "../../../../substrate/primitives/std", default-features = false }
+sp-core = { path = "../../../../substrate/primitives/core", default-features = false }
+sp-runtime = { path = "../../../../substrate/primitives/runtime", default-features = false }
ethabi = { package = "ethabi-decode", version = "1.0.0", default-features = false }
diff --git a/bridges/snowbridge/parachain/primitives/ethereum/README.md b/bridges/snowbridge/primitives/ethereum/README.md
similarity index 100%
rename from bridges/snowbridge/parachain/primitives/ethereum/README.md
rename to bridges/snowbridge/primitives/ethereum/README.md
diff --git a/bridges/snowbridge/parachain/primitives/ethereum/src/header.rs b/bridges/snowbridge/primitives/ethereum/src/header.rs
similarity index 100%
rename from bridges/snowbridge/parachain/primitives/ethereum/src/header.rs
rename to bridges/snowbridge/primitives/ethereum/src/header.rs
diff --git a/bridges/snowbridge/parachain/primitives/ethereum/src/lib.rs b/bridges/snowbridge/primitives/ethereum/src/lib.rs
similarity index 100%
rename from bridges/snowbridge/parachain/primitives/ethereum/src/lib.rs
rename to bridges/snowbridge/primitives/ethereum/src/lib.rs
diff --git a/bridges/snowbridge/parachain/primitives/ethereum/src/log.rs b/bridges/snowbridge/primitives/ethereum/src/log.rs
similarity index 100%
rename from bridges/snowbridge/parachain/primitives/ethereum/src/log.rs
rename to bridges/snowbridge/primitives/ethereum/src/log.rs
diff --git a/bridges/snowbridge/parachain/primitives/ethereum/src/mpt.rs b/bridges/snowbridge/primitives/ethereum/src/mpt.rs
similarity index 100%
rename from bridges/snowbridge/parachain/primitives/ethereum/src/mpt.rs
rename to bridges/snowbridge/primitives/ethereum/src/mpt.rs
diff --git a/bridges/snowbridge/parachain/primitives/ethereum/src/receipt.rs b/bridges/snowbridge/primitives/ethereum/src/receipt.rs
similarity index 100%
rename from bridges/snowbridge/parachain/primitives/ethereum/src/receipt.rs
rename to bridges/snowbridge/primitives/ethereum/src/receipt.rs
diff --git a/bridges/snowbridge/parachain/primitives/router/Cargo.toml b/bridges/snowbridge/primitives/router/Cargo.toml
similarity index 66%
rename from bridges/snowbridge/parachain/primitives/router/Cargo.toml
rename to bridges/snowbridge/primitives/router/Cargo.toml
index dcb09499c55b4793cef27e9ecf610435ad2c8573..712c60c2148f60f12e2be246e32242b67188bdaf 100644
--- a/bridges/snowbridge/parachain/primitives/router/Cargo.toml
+++ b/bridges/snowbridge/primitives/router/Cargo.toml
@@ -17,16 +17,16 @@ codec = { package = "parity-scale-codec", version = "3.6.1", default-features =
scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
log = { version = "0.4.20", default-features = false }
-frame-support = { path = "../../../../../substrate/frame/support", default-features = false }
-frame-system = { path = "../../../../../substrate/frame/system", default-features = false }
-sp-core = { path = "../../../../../substrate/primitives/core", default-features = false }
-sp-io = { path = "../../../../../substrate/primitives/io", default-features = false }
-sp-runtime = { path = "../../../../../substrate/primitives/runtime", default-features = false }
-sp-std = { path = "../../../../../substrate/primitives/std", default-features = false }
+frame-support = { path = "../../../../substrate/frame/support", default-features = false }
+frame-system = { path = "../../../../substrate/frame/system", default-features = false }
+sp-core = { path = "../../../../substrate/primitives/core", default-features = false }
+sp-io = { path = "../../../../substrate/primitives/io", default-features = false }
+sp-runtime = { path = "../../../../substrate/primitives/runtime", default-features = false }
+sp-std = { path = "../../../../substrate/primitives/std", default-features = false }
-xcm = { package = "staging-xcm", path = "../../../../../polkadot/xcm", default-features = false }
-xcm-builder = { package = "staging-xcm-builder", path = "../../../../../polkadot/xcm/xcm-builder", default-features = false }
-xcm-executor = { package = "staging-xcm-executor", path = "../../../../../polkadot/xcm/xcm-executor", default-features = false }
+xcm = { package = "staging-xcm", path = "../../../../polkadot/xcm", default-features = false }
+xcm-builder = { package = "staging-xcm-builder", path = "../../../../polkadot/xcm/xcm-builder", default-features = false }
+xcm-executor = { package = "staging-xcm-executor", path = "../../../../polkadot/xcm/xcm-executor", default-features = false }
snowbridge-core = { path = "../core", default-features = false }
diff --git a/bridges/snowbridge/parachain/primitives/router/README.md b/bridges/snowbridge/primitives/router/README.md
similarity index 100%
rename from bridges/snowbridge/parachain/primitives/router/README.md
rename to bridges/snowbridge/primitives/router/README.md
diff --git a/bridges/snowbridge/parachain/primitives/router/src/inbound/mod.rs b/bridges/snowbridge/primitives/router/src/inbound/mod.rs
similarity index 100%
rename from bridges/snowbridge/parachain/primitives/router/src/inbound/mod.rs
rename to bridges/snowbridge/primitives/router/src/inbound/mod.rs
diff --git a/bridges/snowbridge/parachain/primitives/router/src/inbound/tests.rs b/bridges/snowbridge/primitives/router/src/inbound/tests.rs
similarity index 100%
rename from bridges/snowbridge/parachain/primitives/router/src/inbound/tests.rs
rename to bridges/snowbridge/primitives/router/src/inbound/tests.rs
diff --git a/bridges/snowbridge/parachain/primitives/router/src/lib.rs b/bridges/snowbridge/primitives/router/src/lib.rs
similarity index 100%
rename from bridges/snowbridge/parachain/primitives/router/src/lib.rs
rename to bridges/snowbridge/primitives/router/src/lib.rs
diff --git a/bridges/snowbridge/parachain/primitives/router/src/outbound/mod.rs b/bridges/snowbridge/primitives/router/src/outbound/mod.rs
similarity index 100%
rename from bridges/snowbridge/parachain/primitives/router/src/outbound/mod.rs
rename to bridges/snowbridge/primitives/router/src/outbound/mod.rs
diff --git a/bridges/snowbridge/parachain/primitives/router/src/outbound/tests.rs b/bridges/snowbridge/primitives/router/src/outbound/tests.rs
similarity index 100%
rename from bridges/snowbridge/parachain/primitives/router/src/outbound/tests.rs
rename to bridges/snowbridge/primitives/router/src/outbound/tests.rs
diff --git a/bridges/snowbridge/parachain/runtime/runtime-common/Cargo.toml b/bridges/snowbridge/runtime/runtime-common/Cargo.toml
similarity index 65%
rename from bridges/snowbridge/parachain/runtime/runtime-common/Cargo.toml
rename to bridges/snowbridge/runtime/runtime-common/Cargo.toml
index 1fdb10beeb95af68de298a181f074cf248b266cc..f5b44b25585aaccdc434d93cb039e24b4712aebc 100644
--- a/bridges/snowbridge/parachain/runtime/runtime-common/Cargo.toml
+++ b/bridges/snowbridge/runtime/runtime-common/Cargo.toml
@@ -14,13 +14,13 @@ workspace = true
[dependencies]
log = { version = "0.4.20", default-features = false }
codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false }
-frame-support = { path = "../../../../../substrate/frame/support", default-features = false }
-frame-system = { path = "../../../../../substrate/frame/system", default-features = false }
-sp-std = { path = "../../../../../substrate/primitives/std", default-features = false }
-sp-arithmetic = { path = "../../../../../substrate/primitives/arithmetic", default-features = false }
-xcm = { package = "staging-xcm", path = "../../../../../polkadot/xcm", default-features = false }
-xcm-builder = { package = "staging-xcm-builder", path = "../../../../../polkadot/xcm/xcm-builder", default-features = false }
-xcm-executor = { package = "staging-xcm-executor", path = "../../../../../polkadot/xcm/xcm-executor", default-features = false }
+frame-support = { path = "../../../../substrate/frame/support", default-features = false }
+frame-system = { path = "../../../../substrate/frame/system", default-features = false }
+sp-std = { path = "../../../../substrate/primitives/std", default-features = false }
+sp-arithmetic = { path = "../../../../substrate/primitives/arithmetic", default-features = false }
+xcm = { package = "staging-xcm", path = "../../../../polkadot/xcm", default-features = false }
+xcm-builder = { package = "staging-xcm-builder", path = "../../../../polkadot/xcm/xcm-builder", default-features = false }
+xcm-executor = { package = "staging-xcm-executor", path = "../../../../polkadot/xcm/xcm-executor", default-features = false }
snowbridge-core = { path = "../../primitives/core", default-features = false }
diff --git a/bridges/snowbridge/parachain/runtime/runtime-common/README.md b/bridges/snowbridge/runtime/runtime-common/README.md
similarity index 100%
rename from bridges/snowbridge/parachain/runtime/runtime-common/README.md
rename to bridges/snowbridge/runtime/runtime-common/README.md
diff --git a/bridges/snowbridge/parachain/runtime/runtime-common/src/lib.rs b/bridges/snowbridge/runtime/runtime-common/src/lib.rs
similarity index 100%
rename from bridges/snowbridge/parachain/runtime/runtime-common/src/lib.rs
rename to bridges/snowbridge/runtime/runtime-common/src/lib.rs
diff --git a/bridges/snowbridge/parachain/runtime/runtime-common/src/tests.rs b/bridges/snowbridge/runtime/runtime-common/src/tests.rs
similarity index 100%
rename from bridges/snowbridge/parachain/runtime/runtime-common/src/tests.rs
rename to bridges/snowbridge/runtime/runtime-common/src/tests.rs
diff --git a/bridges/snowbridge/parachain/runtime/test-common/Cargo.toml b/bridges/snowbridge/runtime/test-common/Cargo.toml
similarity index 51%
rename from bridges/snowbridge/parachain/runtime/test-common/Cargo.toml
rename to bridges/snowbridge/runtime/test-common/Cargo.toml
index 8c5bb153c3bcf7c18992f10d78fefffcd465cfd2..a2994e618913416214cb7eb21d1a56c23c2d1094 100644
--- a/bridges/snowbridge/parachain/runtime/test-common/Cargo.toml
+++ b/bridges/snowbridge/runtime/test-common/Cargo.toml
@@ -19,62 +19,62 @@ serde = { version = "1.0.195", optional = true, features = ["derive"] }
smallvec = "1.11.0"
# Substrate
-frame-benchmarking = { path = "../../../../../substrate/frame/benchmarking", default-features = false, optional = true }
-frame-executive = { path = "../../../../../substrate/frame/executive", default-features = false }
-frame-support = { path = "../../../../../substrate/frame/support", default-features = false }
-frame-system = { path = "../../../../../substrate/frame/system", default-features = false }
-frame-system-benchmarking = { path = "../../../../../substrate/frame/system/benchmarking", default-features = false, optional = true }
-frame-system-rpc-runtime-api = { path = "../../../../../substrate/frame/system/rpc/runtime-api", default-features = false }
-frame-try-runtime = { path = "../../../../../substrate/frame/try-runtime", default-features = false, optional = true }
-pallet-aura = { path = "../../../../../substrate/frame/aura", default-features = false }
-pallet-authorship = { path = "../../../../../substrate/frame/authorship", default-features = false }
-pallet-balances = { path = "../../../../../substrate/frame/balances", default-features = false }
-pallet-session = { path = "../../../../../substrate/frame/session", default-features = false }
-pallet-multisig = { path = "../../../../../substrate/frame/multisig", default-features = false }
-pallet-message-queue = { path = "../../../../../substrate/frame/message-queue", default-features = false }
-pallet-timestamp = { path = "../../../../../substrate/frame/timestamp", default-features = false }
-pallet-transaction-payment = { path = "../../../../../substrate/frame/transaction-payment", default-features = false }
-pallet-transaction-payment-rpc-runtime-api = { path = "../../../../../substrate/frame/transaction-payment/rpc/runtime-api", default-features = false }
-pallet-utility = { path = "../../../../../substrate/frame/utility", default-features = false }
-sp-api = { path = "../../../../../substrate/primitives/api", default-features = false }
-sp-block-builder = { path = "../../../../../substrate/primitives/block-builder", default-features = false }
-sp-consensus-aura = { path = "../../../../../substrate/primitives/consensus/aura", default-features = false }
-sp-core = { path = "../../../../../substrate/primitives/core", default-features = false }
-sp-genesis-builder = { path = "../../../../../substrate/primitives/genesis-builder", default-features = false }
-sp-inherents = { path = "../../../../../substrate/primitives/inherents", default-features = false }
-sp-io = { path = "../../../../../substrate/primitives/io", default-features = false }
-sp-keyring = { path = "../../../../../substrate/primitives/keyring" }
-sp-offchain = { path = "../../../../../substrate/primitives/offchain", default-features = false }
-sp-runtime = { path = "../../../../../substrate/primitives/runtime", default-features = false }
-sp-session = { path = "../../../../../substrate/primitives/session", default-features = false }
-sp-std = { path = "../../../../../substrate/primitives/std", default-features = false }
-sp-storage = { path = "../../../../../substrate/primitives/storage", default-features = false }
-sp-transaction-pool = { path = "../../../../../substrate/primitives/transaction-pool", default-features = false }
-sp-version = { path = "../../../../../substrate/primitives/version", default-features = false }
+frame-benchmarking = { path = "../../../../substrate/frame/benchmarking", default-features = false, optional = true }
+frame-executive = { path = "../../../../substrate/frame/executive", default-features = false }
+frame-support = { path = "../../../../substrate/frame/support", default-features = false }
+frame-system = { path = "../../../../substrate/frame/system", default-features = false }
+frame-system-benchmarking = { path = "../../../../substrate/frame/system/benchmarking", default-features = false, optional = true }
+frame-system-rpc-runtime-api = { path = "../../../../substrate/frame/system/rpc/runtime-api", default-features = false }
+frame-try-runtime = { path = "../../../../substrate/frame/try-runtime", default-features = false, optional = true }
+pallet-aura = { path = "../../../../substrate/frame/aura", default-features = false }
+pallet-authorship = { path = "../../../../substrate/frame/authorship", default-features = false }
+pallet-balances = { path = "../../../../substrate/frame/balances", default-features = false }
+pallet-session = { path = "../../../../substrate/frame/session", default-features = false }
+pallet-multisig = { path = "../../../../substrate/frame/multisig", default-features = false }
+pallet-message-queue = { path = "../../../../substrate/frame/message-queue", default-features = false }
+pallet-timestamp = { path = "../../../../substrate/frame/timestamp", default-features = false }
+pallet-transaction-payment = { path = "../../../../substrate/frame/transaction-payment", default-features = false }
+pallet-transaction-payment-rpc-runtime-api = { path = "../../../../substrate/frame/transaction-payment/rpc/runtime-api", default-features = false }
+pallet-utility = { path = "../../../../substrate/frame/utility", default-features = false }
+sp-api = { path = "../../../../substrate/primitives/api", default-features = false }
+sp-block-builder = { path = "../../../../substrate/primitives/block-builder", default-features = false }
+sp-consensus-aura = { path = "../../../../substrate/primitives/consensus/aura", default-features = false }
+sp-core = { path = "../../../../substrate/primitives/core", default-features = false }
+sp-genesis-builder = { path = "../../../../substrate/primitives/genesis-builder", default-features = false }
+sp-inherents = { path = "../../../../substrate/primitives/inherents", default-features = false }
+sp-io = { path = "../../../../substrate/primitives/io", default-features = false }
+sp-keyring = { path = "../../../../substrate/primitives/keyring" }
+sp-offchain = { path = "../../../../substrate/primitives/offchain", default-features = false }
+sp-runtime = { path = "../../../../substrate/primitives/runtime", default-features = false }
+sp-session = { path = "../../../../substrate/primitives/session", default-features = false }
+sp-std = { path = "../../../../substrate/primitives/std", default-features = false }
+sp-storage = { path = "../../../../substrate/primitives/storage", default-features = false }
+sp-transaction-pool = { path = "../../../../substrate/primitives/transaction-pool", default-features = false }
+sp-version = { path = "../../../../substrate/primitives/version", default-features = false }
# Polkadot
-pallet-xcm = { path = "../../../../../polkadot/xcm/pallet-xcm", default-features = false }
-pallet-xcm-benchmarks = { path = "../../../../../polkadot/xcm/pallet-xcm-benchmarks", default-features = false, optional = true }
-polkadot-core-primitives = { path = "../../../../../polkadot/core-primitives", default-features = false }
-polkadot-parachain-primitives = { path = "../../../../../polkadot/parachain", default-features = false }
-polkadot-runtime-common = { path = "../../../../../polkadot/runtime/common", default-features = false }
-xcm = { package = "staging-xcm", path = "../../../../../polkadot/xcm", default-features = false }
-xcm-builder = { package = "staging-xcm-builder", path = "../../../../../polkadot/xcm/xcm-builder", default-features = false }
-xcm-executor = { package = "staging-xcm-executor", path = "../../../../../polkadot/xcm/xcm-executor", default-features = false }
+pallet-xcm = { path = "../../../../polkadot/xcm/pallet-xcm", default-features = false }
+pallet-xcm-benchmarks = { path = "../../../../polkadot/xcm/pallet-xcm-benchmarks", default-features = false, optional = true }
+polkadot-core-primitives = { path = "../../../../polkadot/core-primitives", default-features = false }
+polkadot-parachain-primitives = { path = "../../../../polkadot/parachain", default-features = false }
+polkadot-runtime-common = { path = "../../../../polkadot/runtime/common", default-features = false }
+xcm = { package = "staging-xcm", path = "../../../../polkadot/xcm", default-features = false }
+xcm-builder = { package = "staging-xcm-builder", path = "../../../../polkadot/xcm/xcm-builder", default-features = false }
+xcm-executor = { package = "staging-xcm-executor", path = "../../../../polkadot/xcm/xcm-executor", default-features = false }
# Cumulus
-cumulus-pallet-aura-ext = { path = "../../../../../cumulus/pallets/aura-ext", default-features = false }
-cumulus-pallet-parachain-system = { path = "../../../../../cumulus/pallets/parachain-system", default-features = false, features = ["parameterized-consensus-hook"] }
-cumulus-pallet-session-benchmarking = { path = "../../../../../cumulus/pallets/session-benchmarking", default-features = false }
-cumulus-pallet-xcm = { path = "../../../../../cumulus/pallets/xcm", default-features = false }
-cumulus-pallet-xcmp-queue = { path = "../../../../../cumulus/pallets/xcmp-queue", default-features = false, features = ["bridging"] }
-cumulus-primitives-core = { path = "../../../../../cumulus/primitives/core", default-features = false }
-cumulus-primitives-utility = { path = "../../../../../cumulus/primitives/utility", default-features = false }
-pallet-collator-selection = { path = "../../../../../cumulus/pallets/collator-selection", default-features = false }
-parachain-info = { package = "staging-parachain-info", path = "../../../../../cumulus/parachains/pallets/parachain-info", default-features = false }
-parachains-common = { path = "../../../../../cumulus/parachains/common", default-features = false }
-parachains-runtimes-test-utils = { path = "../../../../../cumulus/parachains/runtimes/test-utils", default-features = false }
-assets-common = { path = "../../../../../cumulus/parachains/runtimes/assets/common", default-features = false }
+cumulus-pallet-aura-ext = { path = "../../../../cumulus/pallets/aura-ext", default-features = false }
+cumulus-pallet-parachain-system = { path = "../../../../cumulus/pallets/parachain-system", default-features = false, features = ["parameterized-consensus-hook"] }
+cumulus-pallet-session-benchmarking = { path = "../../../../cumulus/pallets/session-benchmarking", default-features = false }
+cumulus-pallet-xcm = { path = "../../../../cumulus/pallets/xcm", default-features = false }
+cumulus-pallet-xcmp-queue = { path = "../../../../cumulus/pallets/xcmp-queue", default-features = false, features = ["bridging"] }
+cumulus-primitives-core = { path = "../../../../cumulus/primitives/core", default-features = false }
+cumulus-primitives-utility = { path = "../../../../cumulus/primitives/utility", default-features = false }
+pallet-collator-selection = { path = "../../../../cumulus/pallets/collator-selection", default-features = false }
+parachain-info = { package = "staging-parachain-info", path = "../../../../cumulus/parachains/pallets/parachain-info", default-features = false }
+parachains-common = { path = "../../../../cumulus/parachains/common", default-features = false }
+parachains-runtimes-test-utils = { path = "../../../../cumulus/parachains/runtimes/test-utils", default-features = false }
+assets-common = { path = "../../../../cumulus/parachains/runtimes/assets/common", default-features = false }
# Ethereum Bridge (Snowbridge)
snowbridge-core = { path = "../../primitives/core", default-features = false }
@@ -90,9 +90,9 @@ snowbridge-system-runtime-api = { path = "../../pallets/system/runtime-api", def
[dev-dependencies]
static_assertions = "1.1"
-bridge-hub-test-utils = { path = "../../../../../cumulus/parachains/runtimes/bridge-hubs/test-utils" }
-bridge-runtime-common = { path = "../../../../bin/runtime-common", features = ["integrity-test"] }
-sp-keyring = { path = "../../../../../substrate/primitives/keyring" }
+bridge-hub-test-utils = { path = "../../../../cumulus/parachains/runtimes/bridge-hubs/test-utils" }
+bridge-runtime-common = { path = "../../../bin/runtime-common", features = ["integrity-test"] }
+sp-keyring = { path = "../../../../substrate/primitives/keyring" }
[features]
default = ["std"]
diff --git a/bridges/snowbridge/parachain/runtime/test-common/README.md b/bridges/snowbridge/runtime/test-common/README.md
similarity index 100%
rename from bridges/snowbridge/parachain/runtime/test-common/README.md
rename to bridges/snowbridge/runtime/test-common/README.md
diff --git a/bridges/snowbridge/parachain/runtime/test-common/src/lib.rs b/bridges/snowbridge/runtime/test-common/src/lib.rs
similarity index 99%
rename from bridges/snowbridge/parachain/runtime/test-common/src/lib.rs
rename to bridges/snowbridge/runtime/test-common/src/lib.rs
index 50e727f886dfe46182548bf1a7278d3f588fa236..c9bbce98e575d5e55015aa7814d8cd57a5c3a966 100644
--- a/bridges/snowbridge/parachain/runtime/test-common/src/lib.rs
+++ b/bridges/snowbridge/runtime/test-common/src/lib.rs
@@ -184,7 +184,7 @@ pub fn send_transfer_token_message_success<Runtime, XcmConfig>(
<snowbridge_pallet_outbound_queue::Pallet<Runtime>>::on_finalize(next_block_number);
let included_head = <frame_system::Pallet<Runtime>>::finalize();
- let origin: ParaId = (assethub_parachain_id as u32).into();
+ let origin: ParaId = assethub_parachain_id.into();
let channel_id: ChannelId = origin.into();
let nonce = snowbridge_pallet_outbound_queue::Nonce::<Runtime>::try_get(channel_id);
diff --git a/bridges/snowbridge/parachain/scripts/benchmark.sh b/bridges/snowbridge/scripts/benchmark.sh
similarity index 100%
rename from bridges/snowbridge/parachain/scripts/benchmark.sh
rename to bridges/snowbridge/scripts/benchmark.sh
diff --git a/bridges/snowbridge/parachain/scripts/hexliteral.sh b/bridges/snowbridge/scripts/hexliteral.sh
similarity index 100%
rename from bridges/snowbridge/parachain/scripts/hexliteral.sh
rename to bridges/snowbridge/scripts/hexliteral.sh
diff --git a/bridges/snowbridge/parachain/scripts/init.sh b/bridges/snowbridge/scripts/init.sh
similarity index 100%
rename from bridges/snowbridge/parachain/scripts/init.sh
rename to bridges/snowbridge/scripts/init.sh
diff --git a/bridges/snowbridge/parachain/scripts/make-build-config.sh b/bridges/snowbridge/scripts/make-build-config.sh
similarity index 100%
rename from bridges/snowbridge/parachain/scripts/make-build-config.sh
rename to bridges/snowbridge/scripts/make-build-config.sh
diff --git a/bridges/snowbridge/parachain/scripts/verify-pallets-build.sh b/bridges/snowbridge/scripts/verify-pallets-build.sh
similarity index 100%
rename from bridges/snowbridge/parachain/scripts/verify-pallets-build.sh
rename to bridges/snowbridge/scripts/verify-pallets-build.sh
diff --git a/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/Cargo.toml b/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/Cargo.toml
index ddffe7686a2f188870187aad2af7bae25364efb2..89f0d2a9ca6dacae72e73d5b6e8c310347389070 100644
--- a/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/Cargo.toml
+++ b/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/Cargo.toml
@@ -44,9 +44,9 @@ rococo-system-emulated-network = { path = "../../../networks/rococo-system" }
asset-hub-rococo-runtime = { path = "../../../../../runtimes/assets/asset-hub-rococo", default-features = false }
# Snowbridge
-snowbridge-core = { path = "../../../../../../../bridges/snowbridge/parachain/primitives/core", default-features = false }
-snowbridge-router-primitives = { path = "../../../../../../../bridges/snowbridge/parachain/primitives/router", default-features = false }
-snowbridge-pallet-system = { path = "../../../../../../../bridges/snowbridge/parachain/pallets/system", default-features = false }
-snowbridge-pallet-outbound-queue = { path = "../../../../../../../bridges/snowbridge/parachain/pallets/outbound-queue", default-features = false }
-snowbridge-pallet-inbound-queue = { path = "../../../../../../../bridges/snowbridge/parachain/pallets/inbound-queue", default-features = false }
-snowbridge-pallet-inbound-queue-fixtures = { path = "../../../../../../../bridges/snowbridge/parachain/pallets/inbound-queue/fixtures" }
+snowbridge-core = { path = "../../../../../../../bridges/snowbridge/primitives/core", default-features = false }
+snowbridge-router-primitives = { path = "../../../../../../../bridges/snowbridge/primitives/router", default-features = false }
+snowbridge-pallet-system = { path = "../../../../../../../bridges/snowbridge/pallets/system", default-features = false }
+snowbridge-pallet-outbound-queue = { path = "../../../../../../../bridges/snowbridge/pallets/outbound-queue", default-features = false }
+snowbridge-pallet-inbound-queue = { path = "../../../../../../../bridges/snowbridge/pallets/inbound-queue", default-features = false }
+snowbridge-pallet-inbound-queue-fixtures = { path = "../../../../../../../bridges/snowbridge/pallets/inbound-queue/fixtures" }
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-rococo/Cargo.toml b/cumulus/parachains/runtimes/assets/asset-hub-rococo/Cargo.toml
index cb6445a6316ab5654a77ded15e7a9f3c49b005ce..d1b302dc6d4f3bf3f51fa6d444c288f78bfefe7e 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-rococo/Cargo.toml
+++ b/cumulus/parachains/runtimes/assets/asset-hub-rococo/Cargo.toml
@@ -90,7 +90,7 @@ bp-asset-hub-rococo = { path = "../../../../../bridges/primitives/chain-asset-hu
bp-asset-hub-westend = { path = "../../../../../bridges/primitives/chain-asset-hub-westend", default-features = false }
bp-bridge-hub-rococo = { path = "../../../../../bridges/primitives/chain-bridge-hub-rococo", default-features = false }
bp-bridge-hub-westend = { path = "../../../../../bridges/primitives/chain-bridge-hub-westend", default-features = false }
-snowbridge-router-primitives = { path = "../../../../../bridges/snowbridge/parachain/primitives/router", default-features = false }
+snowbridge-router-primitives = { path = "../../../../../bridges/snowbridge/primitives/router", default-features = false }
[dev-dependencies]
asset-test-utils = { path = "../test-utils" }
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/Cargo.toml b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/Cargo.toml
index 0b750d30a5fe9338b54f271ad58bd656a7189691..920e7b1571c6f83ee241700ad30c57a10c76429e 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/Cargo.toml
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/Cargo.toml
@@ -107,16 +107,16 @@ pallet-xcm-bridge-hub = { path = "../../../../../bridges/modules/xcm-bridge-hub"
bridge-runtime-common = { path = "../../../../../bridges/bin/runtime-common", default-features = false }
# Ethereum Bridge (Snowbridge)
-snowbridge-beacon-primitives = { path = "../../../../../bridges/snowbridge/parachain/primitives/beacon", default-features = false }
-snowbridge-pallet-system = { path = "../../../../../bridges/snowbridge/parachain/pallets/system", default-features = false }
-snowbridge-system-runtime-api = { path = "../../../../../bridges/snowbridge/parachain/pallets/system/runtime-api", default-features = false }
-snowbridge-core = { path = "../../../../../bridges/snowbridge/parachain/primitives/core", default-features = false }
-snowbridge-pallet-ethereum-client = { path = "../../../../../bridges/snowbridge/parachain/pallets/ethereum-client", default-features = false }
-snowbridge-pallet-inbound-queue = { path = "../../../../../bridges/snowbridge/parachain/pallets/inbound-queue", default-features = false }
-snowbridge-pallet-outbound-queue = { path = "../../../../../bridges/snowbridge/parachain/pallets/outbound-queue", default-features = false }
-snowbridge-outbound-queue-runtime-api = { path = "../../../../../bridges/snowbridge/parachain/pallets/outbound-queue/runtime-api", default-features = false }
-snowbridge-router-primitives = { path = "../../../../../bridges/snowbridge/parachain/primitives/router", default-features = false }
-snowbridge-runtime-common = { path = "../../../../../bridges/snowbridge/parachain/runtime/runtime-common", default-features = false }
+snowbridge-beacon-primitives = { path = "../../../../../bridges/snowbridge/primitives/beacon", default-features = false }
+snowbridge-pallet-system = { path = "../../../../../bridges/snowbridge/pallets/system", default-features = false }
+snowbridge-system-runtime-api = { path = "../../../../../bridges/snowbridge/pallets/system/runtime-api", default-features = false }
+snowbridge-core = { path = "../../../../../bridges/snowbridge/primitives/core", default-features = false }
+snowbridge-pallet-ethereum-client = { path = "../../../../../bridges/snowbridge/pallets/ethereum-client", default-features = false }
+snowbridge-pallet-inbound-queue = { path = "../../../../../bridges/snowbridge/pallets/inbound-queue", default-features = false }
+snowbridge-pallet-outbound-queue = { path = "../../../../../bridges/snowbridge/pallets/outbound-queue", default-features = false }
+snowbridge-outbound-queue-runtime-api = { path = "../../../../../bridges/snowbridge/pallets/outbound-queue/runtime-api", default-features = false }
+snowbridge-router-primitives = { path = "../../../../../bridges/snowbridge/primitives/router", default-features = false }
+snowbridge-runtime-common = { path = "../../../../../bridges/snowbridge/runtime/runtime-common", default-features = false }
bridge-hub-common = { path = "../common", default-features = false }
@@ -127,7 +127,7 @@ bridge-runtime-common = { path = "../../../../../bridges/bin/runtime-common", fe
"integrity-test",
] }
sp-keyring = { path = "../../../../../substrate/primitives/keyring" }
-snowbridge-runtime-test-common = { path = "../../../../../bridges/snowbridge/parachain/runtime/test-common" }
+snowbridge-runtime-test-common = { path = "../../../../../bridges/snowbridge/runtime/test-common" }
[features]
default = ["std"]
diff --git a/cumulus/parachains/runtimes/bridge-hubs/common/Cargo.toml b/cumulus/parachains/runtimes/bridge-hubs/common/Cargo.toml
index cb873ad4bc36c3002beef2d5e6cf0658d46e3ffa..a4dcd19dc9e8675599eaad9c2d340eca5874e63b 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/common/Cargo.toml
+++ b/cumulus/parachains/runtimes/bridge-hubs/common/Cargo.toml
@@ -16,7 +16,7 @@ sp-runtime = { path = "../../../../../substrate/primitives/runtime", default-fea
cumulus-primitives-core = { path = "../../../../primitives/core", default-features = false }
xcm = { package = "staging-xcm", path = "../../../../../polkadot/xcm", default-features = false }
pallet-message-queue = { path = "../../../../../substrate/frame/message-queue", default-features = false }
-snowbridge-core = { path = "../../../../../bridges/snowbridge/parachain/primitives/core", default-features = false }
+snowbridge-core = { path = "../../../../../bridges/snowbridge/primitives/core", default-features = false }
[features]
default = ["std"]