diff --git a/.github/workflows/srtool.yml b/.github/workflows/srtool.yml
index 4087be5ee9..2a15d9682e 100644
--- a/.github/workflows/srtool.yml
+++ b/.github/workflows/srtool.yml
@@ -29,7 +29,7 @@ jobs:
         uses: chevdor/srtool-actions@v0.1.0
         with:
           chain: ${{ matrix.chain }}
-          runtime_dir: polkadot-parachains/${{ matrix.chain }}-runtime
+          runtime_dir: polkadot-parachains/${{ matrix.chain }}
       - name: Summary
         run: |
           echo '${{ steps.srtool_build.outputs.json }}' | jq > ${{ matrix.chain }}-srtool-digest.json
diff --git a/.gitignore b/.gitignore
index 2a3b965cec..9f68dce381 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,5 +3,5 @@
 .vscode
 .DS_Store
 /.cargo/config
-
+polkadot_argument_parsing
 **/node_modules
diff --git a/Cargo.lock b/Cargo.lock
index eeef7e2ec8..0f69263a34 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1833,91 +1833,6 @@ dependencies = [
  "xcm",
 ]
 
-[[package]]
-name = "cumulus-rococo-parachain-runtime"
-version = "0.1.0"
-dependencies = [
- "cumulus-pallet-aura-ext",
- "cumulus-pallet-dmp-queue",
- "cumulus-pallet-parachain-system",
- "cumulus-pallet-xcm",
- "cumulus-pallet-xcmp-queue",
- "cumulus-ping",
- "cumulus-primitives-core",
- "cumulus-primitives-timestamp",
- "cumulus-primitives-utility",
- "frame-executive",
- "frame-support",
- "frame-system",
- "hex",
- "hex-literal 0.3.1",
- "log",
- "pallet-assets",
- "pallet-aura",
- "pallet-balances",
- "pallet-randomness-collective-flip",
- "pallet-sudo",
- "pallet-timestamp",
- "pallet-transaction-payment",
- "pallet-xcm",
- "parachain-info",
- "parity-scale-codec",
- "polkadot-parachain",
- "serde",
- "sp-api",
- "sp-block-builder",
- "sp-consensus-aura",
- "sp-core",
- "sp-inherents",
- "sp-io",
- "sp-offchain",
- "sp-runtime",
- "sp-session",
- "sp-std",
- "sp-transaction-pool",
- "sp-version",
- "substrate-wasm-builder 4.0.0",
- "xcm",
- "xcm-builder",
- "xcm-executor",
-]
-
-[[package]]
-name = "cumulus-shell-runtime"
-version = "0.1.0"
-dependencies = [
- "cumulus-pallet-dmp-queue",
- "cumulus-pallet-parachain-system",
- "cumulus-pallet-xcm",
- "cumulus-primitives-core",
- "cumulus-primitives-utility",
- "frame-executive",
- "frame-support",
- "frame-system",
- "hex",
- "hex-literal 0.3.1",
- "log",
- "parachain-info",
- "parity-scale-codec",
- "polkadot-parachain",
- "serde",
- "sp-api",
- "sp-block-builder",
- "sp-core",
- "sp-inherents",
- "sp-io",
- "sp-offchain",
- "sp-runtime",
- "sp-session",
- "sp-std",
- "sp-transaction-pool",
- "sp-version",
- "substrate-wasm-builder 4.0.0",
- "xcm",
- "xcm-builder",
- "xcm-executor",
-]
-
 [[package]]
 name = "cumulus-test-client"
 version = "0.1.0"
@@ -6579,8 +6494,6 @@ dependencies = [
  "cumulus-client-service",
  "cumulus-primitives-core",
  "cumulus-primitives-parachain-inherent",
- "cumulus-rococo-parachain-runtime",
- "cumulus-shell-runtime",
  "derive_more 0.15.0",
  "exit-future 0.1.4",
  "frame-benchmarking",
@@ -6597,6 +6510,7 @@ dependencies = [
  "polkadot-primitives",
  "polkadot-service",
  "rand 0.7.3",
+ "rococo-runtime 0.1.0",
  "sc-basic-authorship",
  "sc-chain-spec",
  "sc-cli",
@@ -6611,6 +6525,7 @@ dependencies = [
  "sc-tracing",
  "sc-transaction-pool",
  "serde",
+ "shell-runtime",
  "sp-api",
  "sp-block-builder",
  "sp-blockchain",
@@ -7395,7 +7310,7 @@ dependencies = [
  "polkadot-runtime",
  "polkadot-runtime-parachains",
  "polkadot-statement-distribution",
- "rococo-runtime",
+ "rococo-runtime 0.9.5",
  "sc-authority-discovery",
  "sc-basic-authorship",
  "sc-block-builder",
@@ -8357,6 +8272,55 @@ dependencies = [
  "librocksdb-sys",
 ]
 
+[[package]]
+name = "rococo-runtime"
+version = "0.1.0"
+dependencies = [
+ "cumulus-pallet-aura-ext",
+ "cumulus-pallet-dmp-queue",
+ "cumulus-pallet-parachain-system",
+ "cumulus-pallet-xcm",
+ "cumulus-pallet-xcmp-queue",
+ "cumulus-ping",
+ "cumulus-primitives-core",
+ "cumulus-primitives-timestamp",
+ "cumulus-primitives-utility",
+ "frame-executive",
+ "frame-support",
+ "frame-system",
+ "hex",
+ "hex-literal 0.3.1",
+ "log",
+ "pallet-assets",
+ "pallet-aura",
+ "pallet-balances",
+ "pallet-randomness-collective-flip",
+ "pallet-sudo",
+ "pallet-timestamp",
+ "pallet-transaction-payment",
+ "pallet-xcm",
+ "parachain-info",
+ "parity-scale-codec",
+ "polkadot-parachain",
+ "serde",
+ "sp-api",
+ "sp-block-builder",
+ "sp-consensus-aura",
+ "sp-core",
+ "sp-inherents",
+ "sp-io",
+ "sp-offchain",
+ "sp-runtime",
+ "sp-session",
+ "sp-std",
+ "sp-transaction-pool",
+ "sp-version",
+ "substrate-wasm-builder 4.0.0",
+ "xcm",
+ "xcm-builder",
+ "xcm-executor",
+]
+
 [[package]]
 name = "rococo-runtime"
 version = "0.9.5"
@@ -9857,6 +9821,42 @@ dependencies = [
  "loom",
 ]
 
+[[package]]
+name = "shell-runtime"
+version = "0.1.0"
+dependencies = [
+ "cumulus-pallet-dmp-queue",
+ "cumulus-pallet-parachain-system",
+ "cumulus-pallet-xcm",
+ "cumulus-primitives-core",
+ "cumulus-primitives-utility",
+ "frame-executive",
+ "frame-support",
+ "frame-system",
+ "hex",
+ "hex-literal 0.3.1",
+ "log",
+ "parachain-info",
+ "parity-scale-codec",
+ "polkadot-parachain",
+ "serde",
+ "sp-api",
+ "sp-block-builder",
+ "sp-core",
+ "sp-inherents",
+ "sp-io",
+ "sp-offchain",
+ "sp-runtime",
+ "sp-session",
+ "sp-std",
+ "sp-transaction-pool",
+ "sp-version",
+ "substrate-wasm-builder 4.0.0",
+ "xcm",
+ "xcm-builder",
+ "xcm-executor",
+]
+
 [[package]]
 name = "shlex"
 version = "0.1.1"
diff --git a/Cargo.toml b/Cargo.toml
index 1f445bb973..ae84d34ea5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -22,12 +22,12 @@ members = [
 	"polkadot-parachains/",
 	"polkadot-parachains/pallets/parachain-info",
 	"polkadot-parachains/pallets/ping",
-	"polkadot-parachains/rococo-runtime",
-	"polkadot-parachains/shell-runtime",
+	"polkadot-parachains/rococo",
+	"polkadot-parachains/shell",
 	"polkadot-parachains/statemint-common",
-	"polkadot-parachains/statemint-runtime",
-	"polkadot-parachains/statemine-runtime",
-	"polkadot-parachains/westmint-runtime",
+	"polkadot-parachains/statemint",
+	"polkadot-parachains/statemine",
+	"polkadot-parachains/westmint",
 	"test/runtime",
 	"test/runtime-upgrade",
 	"test/client",
diff --git a/polkadot-parachains/Cargo.toml b/polkadot-parachains/Cargo.toml
index b1b66cc16f..fc142b46a8 100644
--- a/polkadot-parachains/Cargo.toml
+++ b/polkadot-parachains/Cargo.toml
@@ -23,11 +23,11 @@ hex-literal = "0.2.1"
 async-trait = "0.1.42"
 
 # Parachain runtimes
-rococo-parachain-runtime = { package = "cumulus-rococo-parachain-runtime", path = "rococo-runtime" }
-shell-runtime = { package = "cumulus-shell-runtime", path = "shell-runtime" }
-statemint-runtime = { path = "statemint-runtime" }
-statemine-runtime = { path = "statemine-runtime" }
-westmint-runtime = { path = "westmint-runtime" }
+rococo-parachain-runtime = { package = "rococo-runtime", path = "rococo" }
+shell-runtime = { path = "shell" }
+statemint-runtime = { path = "statemint" }
+statemine-runtime = { path = "statemine" }
+westmint-runtime = { path = "westmint" }
 statemint-common = { path = "statemint-common" }
 
 # Substrate dependencies
diff --git a/polkadot-parachains/rococo-runtime/Cargo.toml b/polkadot-parachains/rococo/Cargo.toml
similarity index 99%
rename from polkadot-parachains/rococo-runtime/Cargo.toml
rename to polkadot-parachains/rococo/Cargo.toml
index fb784c8b63..b118ac416f 100644
--- a/polkadot-parachains/rococo-runtime/Cargo.toml
+++ b/polkadot-parachains/rococo/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = 'cumulus-rococo-parachain-runtime'
+name = 'rococo-runtime'
 version = '0.1.0'
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = '2018'
diff --git a/polkadot-parachains/rococo-runtime/build.rs b/polkadot-parachains/rococo/build.rs
similarity index 100%
rename from polkadot-parachains/rococo-runtime/build.rs
rename to polkadot-parachains/rococo/build.rs
diff --git a/polkadot-parachains/rococo-runtime/src/lib.rs b/polkadot-parachains/rococo/src/lib.rs
similarity index 100%
rename from polkadot-parachains/rococo-runtime/src/lib.rs
rename to polkadot-parachains/rococo/src/lib.rs
diff --git a/polkadot-parachains/shell-runtime/Cargo.toml b/polkadot-parachains/shell/Cargo.toml
similarity index 99%
rename from polkadot-parachains/shell-runtime/Cargo.toml
rename to polkadot-parachains/shell/Cargo.toml
index 5cd47e8500..d0f18618d1 100644
--- a/polkadot-parachains/shell-runtime/Cargo.toml
+++ b/polkadot-parachains/shell/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = 'cumulus-shell-runtime'
+name = 'shell-runtime'
 version = '0.1.0'
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = '2018'
diff --git a/polkadot-parachains/shell-runtime/build.rs b/polkadot-parachains/shell/build.rs
similarity index 100%
rename from polkadot-parachains/shell-runtime/build.rs
rename to polkadot-parachains/shell/build.rs
diff --git a/polkadot-parachains/shell-runtime/src/lib.rs b/polkadot-parachains/shell/src/lib.rs
similarity index 100%
rename from polkadot-parachains/shell-runtime/src/lib.rs
rename to polkadot-parachains/shell/src/lib.rs
diff --git a/polkadot-parachains/statemine-runtime/Cargo.toml b/polkadot-parachains/statemine/Cargo.toml
similarity index 100%
rename from polkadot-parachains/statemine-runtime/Cargo.toml
rename to polkadot-parachains/statemine/Cargo.toml
diff --git a/polkadot-parachains/statemine-runtime/build.rs b/polkadot-parachains/statemine/build.rs
similarity index 100%
rename from polkadot-parachains/statemine-runtime/build.rs
rename to polkadot-parachains/statemine/build.rs
diff --git a/polkadot-parachains/statemine-runtime/src/constants.rs b/polkadot-parachains/statemine/src/constants.rs
similarity index 100%
rename from polkadot-parachains/statemine-runtime/src/constants.rs
rename to polkadot-parachains/statemine/src/constants.rs
diff --git a/polkadot-parachains/statemine-runtime/src/lib.rs b/polkadot-parachains/statemine/src/lib.rs
similarity index 100%
rename from polkadot-parachains/statemine-runtime/src/lib.rs
rename to polkadot-parachains/statemine/src/lib.rs
diff --git a/polkadot-parachains/statemine-runtime/src/weights/mod.rs b/polkadot-parachains/statemine/src/weights/mod.rs
similarity index 100%
rename from polkadot-parachains/statemine-runtime/src/weights/mod.rs
rename to polkadot-parachains/statemine/src/weights/mod.rs
diff --git a/polkadot-parachains/statemine-runtime/src/weights/pallet_assets.rs b/polkadot-parachains/statemine/src/weights/pallet_assets.rs
similarity index 100%
rename from polkadot-parachains/statemine-runtime/src/weights/pallet_assets.rs
rename to polkadot-parachains/statemine/src/weights/pallet_assets.rs
diff --git a/polkadot-parachains/statemine-runtime/src/weights/pallet_balances.rs b/polkadot-parachains/statemine/src/weights/pallet_balances.rs
similarity index 100%
rename from polkadot-parachains/statemine-runtime/src/weights/pallet_balances.rs
rename to polkadot-parachains/statemine/src/weights/pallet_balances.rs
diff --git a/polkadot-parachains/statemine-runtime/src/weights/pallet_collator_selection.rs b/polkadot-parachains/statemine/src/weights/pallet_collator_selection.rs
similarity index 100%
rename from polkadot-parachains/statemine-runtime/src/weights/pallet_collator_selection.rs
rename to polkadot-parachains/statemine/src/weights/pallet_collator_selection.rs
diff --git a/polkadot-parachains/statemine-runtime/src/weights/pallet_multisig.rs b/polkadot-parachains/statemine/src/weights/pallet_multisig.rs
similarity index 100%
rename from polkadot-parachains/statemine-runtime/src/weights/pallet_multisig.rs
rename to polkadot-parachains/statemine/src/weights/pallet_multisig.rs
diff --git a/polkadot-parachains/statemine-runtime/src/weights/pallet_proxy.rs b/polkadot-parachains/statemine/src/weights/pallet_proxy.rs
similarity index 100%
rename from polkadot-parachains/statemine-runtime/src/weights/pallet_proxy.rs
rename to polkadot-parachains/statemine/src/weights/pallet_proxy.rs
diff --git a/polkadot-parachains/statemine-runtime/src/weights/pallet_session.rs b/polkadot-parachains/statemine/src/weights/pallet_session.rs
similarity index 100%
rename from polkadot-parachains/statemine-runtime/src/weights/pallet_session.rs
rename to polkadot-parachains/statemine/src/weights/pallet_session.rs
diff --git a/polkadot-parachains/statemine-runtime/src/weights/pallet_timestamp.rs b/polkadot-parachains/statemine/src/weights/pallet_timestamp.rs
similarity index 100%
rename from polkadot-parachains/statemine-runtime/src/weights/pallet_timestamp.rs
rename to polkadot-parachains/statemine/src/weights/pallet_timestamp.rs
diff --git a/polkadot-parachains/statemine-runtime/src/weights/pallet_uniques.rs b/polkadot-parachains/statemine/src/weights/pallet_uniques.rs
similarity index 100%
rename from polkadot-parachains/statemine-runtime/src/weights/pallet_uniques.rs
rename to polkadot-parachains/statemine/src/weights/pallet_uniques.rs
diff --git a/polkadot-parachains/statemine-runtime/src/weights/pallet_utility.rs b/polkadot-parachains/statemine/src/weights/pallet_utility.rs
similarity index 100%
rename from polkadot-parachains/statemine-runtime/src/weights/pallet_utility.rs
rename to polkadot-parachains/statemine/src/weights/pallet_utility.rs
diff --git a/polkadot-parachains/statemint-runtime/Cargo.toml b/polkadot-parachains/statemint/Cargo.toml
similarity index 100%
rename from polkadot-parachains/statemint-runtime/Cargo.toml
rename to polkadot-parachains/statemint/Cargo.toml
diff --git a/polkadot-parachains/statemint-runtime/build.rs b/polkadot-parachains/statemint/build.rs
similarity index 100%
rename from polkadot-parachains/statemint-runtime/build.rs
rename to polkadot-parachains/statemint/build.rs
diff --git a/polkadot-parachains/statemint-runtime/src/constants.rs b/polkadot-parachains/statemint/src/constants.rs
similarity index 100%
rename from polkadot-parachains/statemint-runtime/src/constants.rs
rename to polkadot-parachains/statemint/src/constants.rs
diff --git a/polkadot-parachains/statemint-runtime/src/lib.rs b/polkadot-parachains/statemint/src/lib.rs
similarity index 100%
rename from polkadot-parachains/statemint-runtime/src/lib.rs
rename to polkadot-parachains/statemint/src/lib.rs
diff --git a/polkadot-parachains/statemint-runtime/src/weights/mod.rs b/polkadot-parachains/statemint/src/weights/mod.rs
similarity index 100%
rename from polkadot-parachains/statemint-runtime/src/weights/mod.rs
rename to polkadot-parachains/statemint/src/weights/mod.rs
diff --git a/polkadot-parachains/statemint-runtime/src/weights/pallet_assets.rs b/polkadot-parachains/statemint/src/weights/pallet_assets.rs
similarity index 100%
rename from polkadot-parachains/statemint-runtime/src/weights/pallet_assets.rs
rename to polkadot-parachains/statemint/src/weights/pallet_assets.rs
diff --git a/polkadot-parachains/statemint-runtime/src/weights/pallet_balances.rs b/polkadot-parachains/statemint/src/weights/pallet_balances.rs
similarity index 100%
rename from polkadot-parachains/statemint-runtime/src/weights/pallet_balances.rs
rename to polkadot-parachains/statemint/src/weights/pallet_balances.rs
diff --git a/polkadot-parachains/statemint-runtime/src/weights/pallet_collator_selection.rs b/polkadot-parachains/statemint/src/weights/pallet_collator_selection.rs
similarity index 100%
rename from polkadot-parachains/statemint-runtime/src/weights/pallet_collator_selection.rs
rename to polkadot-parachains/statemint/src/weights/pallet_collator_selection.rs
diff --git a/polkadot-parachains/statemint-runtime/src/weights/pallet_multisig.rs b/polkadot-parachains/statemint/src/weights/pallet_multisig.rs
similarity index 100%
rename from polkadot-parachains/statemint-runtime/src/weights/pallet_multisig.rs
rename to polkadot-parachains/statemint/src/weights/pallet_multisig.rs
diff --git a/polkadot-parachains/statemint-runtime/src/weights/pallet_proxy.rs b/polkadot-parachains/statemint/src/weights/pallet_proxy.rs
similarity index 100%
rename from polkadot-parachains/statemint-runtime/src/weights/pallet_proxy.rs
rename to polkadot-parachains/statemint/src/weights/pallet_proxy.rs
diff --git a/polkadot-parachains/statemint-runtime/src/weights/pallet_session.rs b/polkadot-parachains/statemint/src/weights/pallet_session.rs
similarity index 100%
rename from polkadot-parachains/statemint-runtime/src/weights/pallet_session.rs
rename to polkadot-parachains/statemint/src/weights/pallet_session.rs
diff --git a/polkadot-parachains/statemint-runtime/src/weights/pallet_timestamp.rs b/polkadot-parachains/statemint/src/weights/pallet_timestamp.rs
similarity index 100%
rename from polkadot-parachains/statemint-runtime/src/weights/pallet_timestamp.rs
rename to polkadot-parachains/statemint/src/weights/pallet_timestamp.rs
diff --git a/polkadot-parachains/statemint-runtime/src/weights/pallet_utility.rs b/polkadot-parachains/statemint/src/weights/pallet_utility.rs
similarity index 100%
rename from polkadot-parachains/statemint-runtime/src/weights/pallet_utility.rs
rename to polkadot-parachains/statemint/src/weights/pallet_utility.rs
diff --git a/polkadot-parachains/westmint-runtime/Cargo.toml b/polkadot-parachains/westmint/Cargo.toml
similarity index 100%
rename from polkadot-parachains/westmint-runtime/Cargo.toml
rename to polkadot-parachains/westmint/Cargo.toml
diff --git a/polkadot-parachains/westmint-runtime/build.rs b/polkadot-parachains/westmint/build.rs
similarity index 100%
rename from polkadot-parachains/westmint-runtime/build.rs
rename to polkadot-parachains/westmint/build.rs
diff --git a/polkadot-parachains/westmint-runtime/src/constants.rs b/polkadot-parachains/westmint/src/constants.rs
similarity index 100%
rename from polkadot-parachains/westmint-runtime/src/constants.rs
rename to polkadot-parachains/westmint/src/constants.rs
diff --git a/polkadot-parachains/westmint-runtime/src/lib.rs b/polkadot-parachains/westmint/src/lib.rs
similarity index 100%
rename from polkadot-parachains/westmint-runtime/src/lib.rs
rename to polkadot-parachains/westmint/src/lib.rs
diff --git a/polkadot-parachains/westmint-runtime/src/weights/mod.rs b/polkadot-parachains/westmint/src/weights/mod.rs
similarity index 100%
rename from polkadot-parachains/westmint-runtime/src/weights/mod.rs
rename to polkadot-parachains/westmint/src/weights/mod.rs
diff --git a/polkadot-parachains/westmint-runtime/src/weights/pallet_assets.rs b/polkadot-parachains/westmint/src/weights/pallet_assets.rs
similarity index 100%
rename from polkadot-parachains/westmint-runtime/src/weights/pallet_assets.rs
rename to polkadot-parachains/westmint/src/weights/pallet_assets.rs
diff --git a/polkadot-parachains/westmint-runtime/src/weights/pallet_balances.rs b/polkadot-parachains/westmint/src/weights/pallet_balances.rs
similarity index 100%
rename from polkadot-parachains/westmint-runtime/src/weights/pallet_balances.rs
rename to polkadot-parachains/westmint/src/weights/pallet_balances.rs
diff --git a/polkadot-parachains/westmint-runtime/src/weights/pallet_collator_selection.rs b/polkadot-parachains/westmint/src/weights/pallet_collator_selection.rs
similarity index 100%
rename from polkadot-parachains/westmint-runtime/src/weights/pallet_collator_selection.rs
rename to polkadot-parachains/westmint/src/weights/pallet_collator_selection.rs
diff --git a/polkadot-parachains/westmint-runtime/src/weights/pallet_multisig.rs b/polkadot-parachains/westmint/src/weights/pallet_multisig.rs
similarity index 100%
rename from polkadot-parachains/westmint-runtime/src/weights/pallet_multisig.rs
rename to polkadot-parachains/westmint/src/weights/pallet_multisig.rs
diff --git a/polkadot-parachains/westmint-runtime/src/weights/pallet_proxy.rs b/polkadot-parachains/westmint/src/weights/pallet_proxy.rs
similarity index 100%
rename from polkadot-parachains/westmint-runtime/src/weights/pallet_proxy.rs
rename to polkadot-parachains/westmint/src/weights/pallet_proxy.rs
diff --git a/polkadot-parachains/westmint-runtime/src/weights/pallet_session.rs b/polkadot-parachains/westmint/src/weights/pallet_session.rs
similarity index 100%
rename from polkadot-parachains/westmint-runtime/src/weights/pallet_session.rs
rename to polkadot-parachains/westmint/src/weights/pallet_session.rs
diff --git a/polkadot-parachains/westmint-runtime/src/weights/pallet_timestamp.rs b/polkadot-parachains/westmint/src/weights/pallet_timestamp.rs
similarity index 100%
rename from polkadot-parachains/westmint-runtime/src/weights/pallet_timestamp.rs
rename to polkadot-parachains/westmint/src/weights/pallet_timestamp.rs
diff --git a/polkadot-parachains/westmint-runtime/src/weights/pallet_utility.rs b/polkadot-parachains/westmint/src/weights/pallet_utility.rs
similarity index 100%
rename from polkadot-parachains/westmint-runtime/src/weights/pallet_utility.rs
rename to polkadot-parachains/westmint/src/weights/pallet_utility.rs