diff --git a/Cargo.lock b/Cargo.lock
index e301f48c070a5..cc63cf57f03e5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1207,7 +1207,7 @@ dependencies = [
 
 [[package]]
 name = "finality-grandpa"
-version = "0.10.1"
+version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2368,7 +2368,7 @@ dependencies = [
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "libsecp256k1 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "multistream-select 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "multistream-select 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-multiaddr 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-multihash 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2777,7 +2777,7 @@ dependencies = [
 
 [[package]]
 name = "lru"
-version = "0.4.2"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "hashbrown 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2932,7 +2932,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "multistream-select"
-version = "0.6.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -5298,7 +5298,7 @@ name = "sc-finality-grandpa"
 version = "2.0.0"
 dependencies = [
  "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "finality-grandpa 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "finality-grandpa 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "fork-tree 2.0.0",
  "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -5365,7 +5365,7 @@ dependencies = [
  "linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "linked_hash_set 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "lru 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lru 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "quickcheck 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -6106,7 +6106,7 @@ version = "2.0.0"
 dependencies = [
  "derive_more 0.99.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "lru 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lru 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "sp-block-builder 2.0.0",
@@ -8188,7 +8188,7 @@ dependencies = [
 "checksum fallible-iterator 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7"
 "checksum fdlimit 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b1ee15a7050e5580b3712877157068ea713b245b080ff302ae2ca973cfcd9baa"
 "checksum file-per-thread-logger 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8505b75b31ef7285168dd237c4a7db3c1f3e0927e7d314e670bc98e854272fe9"
-"checksum finality-grandpa 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bd555755b04f83d6ed3041f5da26c0123a417ae2b96a826c1171b3f6fb804803"
+"checksum finality-grandpa 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4106eb29c7e092f4a6ce6e7632abbbfdf85d94e63035d3790d2d16eeae83d3f4"
 "checksum fixed-hash 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "72fe7539e2c5692c6989f2f9c0457e42f1e5768f96b85c87d273574670ae459f"
 "checksum fixedbitset 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "86d4de0081402f5e88cdac65c8dcdcc73118c1a7a465e2a05f0da05843a8ea33"
 "checksum flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6bd6d6f4752952feb71363cffc9ebac9411b75b87c6ab6058c40c8900cf43c0f"
@@ -8317,7 +8317,7 @@ dependencies = [
 "checksum lock_api 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e57b3997725d2b60dbec1297f6c2e2957cc383db1cebd6be812163f969c7d586"
 "checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
 "checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
-"checksum lru 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "79aea63cd4aa0930b66807632cc61c74db9ea687358fc1f165bab053bcce4a7a"
+"checksum lru 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0609345ddee5badacf857d4f547e0e5a2e987db77085c24cd887f73573a04237"
 "checksum mach 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "86dd2487cdfea56def77b88438a2c915fb45113c5319bfe7e14306ca4cd0b0e1"
 "checksum malloc_size_of_derive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e37c5d4cd9473c5f4c9c111f033f15d4df9bd378fdf615944e360a4f55a05f0b"
 "checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
@@ -8335,7 +8335,7 @@ dependencies = [
 "checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919"
 "checksum more-asserts 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0debeb9fcf88823ea64d64e4a815ab1643f33127d995978e099942ce38f25238"
 "checksum multimap 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2eb04b9f127583ed176e163fb9ec6f3e793b87e21deedd5734a69386a18a0151"
-"checksum multistream-select 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1242e4ecf2060b35fb58002988e4720fbb3a2cbd4c136d369c420fa028f69efe"
+"checksum multistream-select 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "fc3ef54aab1b2e37e911bcb99e376dbe4c1e0710afcdb8428608e4f993b39c47"
 "checksum names 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ef320dab323286b50fb5cdda23f61c796a72a89998ab565ca32525c5c556f2da"
 "checksum native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4b2df1a4c22fd44a62147fd8f13dd0f95c9d8ca7b2610299b2a2f9cf8964274e"
 "checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88"
diff --git a/Cargo.toml b/Cargo.toml
index b423ecbd38113..84f412851556d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -37,16 +37,16 @@ members = [
 	"client/peerset",
 	"client/rpc-servers",
 	"client/rpc",
-	"client/rpc/api",
+	"client/rpc-api",
 	"client/service",
 	"client/service/test",
 	"client/state-db",
 	"client/telemetry",
 	"client/transaction-pool",
 	"client/transaction-pool/graph",
-	"client/utils/wasm-builder-runner",
-	"client/grafana-data-source",
-	"client/grafana-data-source/test",
+	"utils/wasm-builder-runner",
+	"utils/grafana-data-source",
+	"utils/grafana-data-source/test",
 	"frame/assets",
 	"frame/aura",
 	"frame/authority-discovery",
@@ -136,9 +136,9 @@ members = [
 	"primitives/transaction-pool",
 	"primitives/trie",
 	"primitives/wasm-interface",
-	"test/utils/client",
-	"test/utils/runtime",
-	"test/utils/runtime/client",
+	"test-utils/client",
+	"test-utils/runtime",
+	"test-utils/runtime/client",
 	"utils/build-script-utils",
 	"utils/fork-tree",
 	"utils/frame/rpc/support",
diff --git a/bin/node-template/runtime/Cargo.toml b/bin/node-template/runtime/Cargo.toml
index bc4833e6e740e..c1c30d3adc458 100644
--- a/bin/node-template/runtime/Cargo.toml
+++ b/bin/node-template/runtime/Cargo.toml
@@ -33,7 +33,7 @@ sp-transaction-pool = { package = "sp-transaction-pool", path = "../../../primit
 version = { package = "sp-version", path = "../../../primitives/version", default-features = false }
 
 [build-dependencies]
-wasm-builder-runner = { package = "substrate-wasm-builder-runner", path = "../../../client/utils/wasm-builder-runner", version = "1.0.4" }
+wasm-builder-runner = { package = "substrate-wasm-builder-runner", path = "../../../utils/wasm-builder-runner", version = "1.0.4" }
 
 [features]
 default = ["std"]
diff --git a/bin/node/executor/Cargo.toml b/bin/node/executor/Cargo.toml
index a86ca7a3916f2..7633c256e771c 100644
--- a/bin/node/executor/Cargo.toml
+++ b/bin/node/executor/Cargo.toml
@@ -18,7 +18,7 @@ node-runtime = { path = "../runtime" }
 
 [dev-dependencies]
 node-testing = { path = "../testing" }
-test-client = { package = "substrate-test-client", path = "../../../test/utils/client" }
+test-client = { package = "substrate-test-client", path = "../../../test-utils/client" }
 sp-runtime = { path = "../../../primitives/runtime" }
 runtime_support = { package = "frame-support", path = "../../../frame/support" }
 balances = { package = "pallet-balances", path = "../../../frame/balances" }
diff --git a/bin/node/runtime/Cargo.toml b/bin/node/runtime/Cargo.toml
index 3c0a0f236c94e..1cc4fc831b458 100644
--- a/bin/node/runtime/Cargo.toml
+++ b/bin/node/runtime/Cargo.toml
@@ -63,7 +63,7 @@ transaction-payment = { package = "pallet-transaction-payment", path = "../../..
 transaction-payment-rpc-runtime-api = { package = "pallet-transaction-payment-rpc-runtime-api", path = "../../../frame/transaction-payment/rpc/runtime-api/", default-features = false }
 
 [build-dependencies]
-wasm-builder-runner = { package = "substrate-wasm-builder-runner", path = "../../../client/utils/wasm-builder-runner", version = "1.0.4" }
+wasm-builder-runner = { package = "substrate-wasm-builder-runner", path = "../../../utils/wasm-builder-runner", version = "1.0.4" }
 
 [dev-dependencies]
 sp-io = { path = "../../../primitives/io" }
diff --git a/bin/node/testing/Cargo.toml b/bin/node/testing/Cargo.toml
index 799ba8628970c..ce5aa78a5dfa7 100644
--- a/bin/node/testing/Cargo.toml
+++ b/bin/node/testing/Cargo.toml
@@ -24,7 +24,7 @@ sp-runtime = { path = "../../../primitives/runtime" }
 staking = { package = "pallet-staking", path = "../../../frame/staking" }
 sc-executor = { path = "../../../client/executor" }
 system = { package = "frame-system", path = "../../../frame/system" }
-test-client = { package = "substrate-test-client", path = "../../../test/utils/client" }
+test-client = { package = "substrate-test-client", path = "../../../test-utils/client" }
 timestamp = { package = "pallet-timestamp", path = "../../../frame/timestamp" }
 transaction-payment = { package = "pallet-transaction-payment", path = "../../../frame/transaction-payment" }
 treasury = { package = "pallet-treasury", path = "../../../frame/treasury" }
diff --git a/client/Cargo.toml b/client/Cargo.toml
index 328a61d43ae23..c259c8db301fd 100644
--- a/client/Cargo.toml
+++ b/client/Cargo.toml
@@ -35,6 +35,6 @@ tracing = "0.1.10"
 [dev-dependencies]
 env_logger = "0.7.0"
 tempfile = "3.1.0"
-test-client = { package = "substrate-test-runtime-client", path = "../test/utils/runtime/client" }
+test-client = { package = "substrate-test-runtime-client", path = "../test-utils/runtime/client" }
 kvdb-memorydb = "0.1.2"
 panic-handler = { package = "sp-panic-handler", path = "../primitives/panic-handler" }
diff --git a/client/basic-authorship/Cargo.toml b/client/basic-authorship/Cargo.toml
index 82eb5c3db9b0a..f361ebe477036 100644
--- a/client/basic-authorship/Cargo.toml
+++ b/client/basic-authorship/Cargo.toml
@@ -22,5 +22,5 @@ tokio-executor = { version = "0.2.0-alpha.6", features = ["blocking"] }
 
 [dev-dependencies]
 txpool = { package = "sc-transaction-pool", path = "../../client/transaction-pool" }
-test-client = { package = "substrate-test-runtime-client", path = "../../test/utils/runtime/client" }
+test-client = { package = "substrate-test-runtime-client", path = "../../test-utils/runtime/client" }
 parking_lot = "0.9"
diff --git a/client/consensus/aura/Cargo.toml b/client/consensus/aura/Cargo.toml
index ad0e5621e2dad..c35d72bd677b4 100644
--- a/client/consensus/aura/Cargo.toml
+++ b/client/consensus/aura/Cargo.toml
@@ -37,7 +37,7 @@ sc-executor = { path = "../../executor" }
 sc-network = { path = "../../network" }
 sc-network-test = { path = "../../network/test" }
 service = { package = "sc-service", path = "../../service" }
-test-client = { package = "substrate-test-runtime-client", path = "../../../test/utils/runtime/client" }
+test-client = { package = "substrate-test-runtime-client", path = "../../../test-utils/runtime/client" }
 tokio = "0.1.22"
 env_logger = "0.7.0"
 tempfile = "3.1.0"
diff --git a/client/consensus/babe/Cargo.toml b/client/consensus/babe/Cargo.toml
index 5003a4bb0e1aa..d03157415a5ff 100644
--- a/client/consensus/babe/Cargo.toml
+++ b/client/consensus/babe/Cargo.toml
@@ -46,7 +46,7 @@ sc-executor = { path = "../../executor" }
 sc-network = { path = "../../network" }
 sc-network-test = { path = "../../network/test" }
 service = { package = "sc-service", path = "../../service" }
-test-client = { package = "substrate-test-runtime-client", path = "../../../test/utils/runtime/client" }
+test-client = { package = "substrate-test-runtime-client", path = "../../../test-utils/runtime/client" }
 block-builder = { package = "sc-block-builder", path = "../../block-builder" }
 tokio = "0.1.22"
 env_logger = "0.7.0"
diff --git a/client/consensus/slots/Cargo.toml b/client/consensus/slots/Cargo.toml
index 81629d2e32e1f..18d9f97b19a48 100644
--- a/client/consensus/slots/Cargo.toml
+++ b/client/consensus/slots/Cargo.toml
@@ -21,4 +21,4 @@ parking_lot = "0.9.0"
 log = "0.4.8"
 
 [dev-dependencies]
-test-client = { package = "substrate-test-runtime-client", path = "../../../test/utils/runtime/client" }
+test-client = { package = "substrate-test-runtime-client", path = "../../../test-utils/runtime/client" }
diff --git a/client/db/Cargo.toml b/client/db/Cargo.toml
index 631d89ce48562..c6c256b7eb053 100644
--- a/client/db/Cargo.toml
+++ b/client/db/Cargo.toml
@@ -26,7 +26,7 @@ sp-blockchain = { path = "../../primitives/blockchain" }
 
 [dev-dependencies]
 sp-keyring = { path = "../../primitives/keyring" }
-test-client = { package = "substrate-test-runtime-client", path = "../../test/utils/runtime/client" }
+test-client = { package = "substrate-test-runtime-client", path = "../../test-utils/runtime/client" }
 env_logger = "0.7.0"
 quickcheck = "0.9"
 
diff --git a/client/executor/Cargo.toml b/client/executor/Cargo.toml
index 84ba2a9da02fc..6dc4b46017e5d 100644
--- a/client/executor/Cargo.toml
+++ b/client/executor/Cargo.toml
@@ -37,7 +37,7 @@ assert_matches = "1.3.0"
 wabt = "0.9.2"
 hex-literal = "0.2.1"
 runtime-test = { package = "sc-runtime-test", path = "runtime-test" }
-test-runtime = { package = "substrate-test-runtime", path = "../../test/utils/runtime" }
+test-runtime = { package = "substrate-test-runtime", path = "../../test-utils/runtime" }
 runtime-interface = { package = "sp-runtime-interface", path = "../../primitives/runtime-interface" }
 state_machine = { package = "sp-state-machine", path = "../../primitives/state-machine"  }
 test-case = "0.3.3"
diff --git a/client/executor/runtime-test/Cargo.toml b/client/executor/runtime-test/Cargo.toml
index 07b0dac21d996..5d781a72499bb 100644
--- a/client/executor/runtime-test/Cargo.toml
+++ b/client/executor/runtime-test/Cargo.toml
@@ -13,7 +13,7 @@ primitives = { package = "sp-core",  path = "../../../primitives/core", default-
 sp-runtime = { package = "sp-runtime",  path = "../../../primitives/runtime", default-features = false }
 
 [build-dependencies]
-wasm-builder-runner = { package = "substrate-wasm-builder-runner", path = "../../../client/utils/wasm-builder-runner", version = "1.0.4" }
+wasm-builder-runner = { package = "substrate-wasm-builder-runner", path = "../../../utils/wasm-builder-runner", version = "1.0.4" }
 
 [features]
 default = [ "std" ]
diff --git a/client/finality-grandpa/Cargo.toml b/client/finality-grandpa/Cargo.toml
index 1ba0cfa766c7f..fb6cb0827a820 100644
--- a/client/finality-grandpa/Cargo.toml
+++ b/client/finality-grandpa/Cargo.toml
@@ -34,7 +34,7 @@ grandpa = { package = "finality-grandpa", version = "0.10.1", features = ["deriv
 network = { package = "sc-network", path = "../network" }
 sc-network-test = { path = "../network/test" }
 keyring = { package = "sp-keyring", path = "../../primitives/keyring" }
-test-client = { package = "substrate-test-runtime-client", path = "../../test/utils/runtime/client"}
+test-client = { package = "substrate-test-runtime-client", path = "../../test-utils/runtime/client"}
 babe_primitives = { package = "sp-consensus-babe", path = "../../primitives/consensus/babe" }
 state_machine = { package = "sp-state-machine", path = "../../primitives/state-machine" }
 env_logger = "0.7.0"
diff --git a/client/network/Cargo.toml b/client/network/Cargo.toml
index e2a8e688ad7dd..d7ac7c3b6dc71 100644
--- a/client/network/Cargo.toml
+++ b/client/network/Cargo.toml
@@ -43,8 +43,8 @@ tokio-io = "0.1.12"
 tokio = { version = "0.1.22", optional = true }
 unsigned-varint = { version = "0.2.2", features = ["codec"] }
 keyring = { package = "sp-keyring", path = "../../primitives/keyring", optional = true }
-test_client = { package = "substrate-test-client", path = "../../test/utils/client", optional = true }
-test-client = { package = "substrate-test-runtime-client", path = "../../test/utils/runtime/client", optional = true }
+test_client = { package = "substrate-test-client", path = "../../test-utils/client", optional = true }
+test-client = { package = "substrate-test-runtime-client", path = "../../test-utils/runtime/client", optional = true }
 erased-serde = "0.3.9"
 void = "1.0.2"
 zeroize = "1.0.0"
diff --git a/client/network/test/Cargo.toml b/client/network/test/Cargo.toml
index 3ebb7ac6b4dd6..e92ae0f7fc59a 100644
--- a/client/network/test/Cargo.toml
+++ b/client/network/test/Cargo.toml
@@ -24,7 +24,7 @@ primitives = { package = "sp-core", path = "../../../primitives/core" }
 block-builder = { package = "sc-block-builder", path = "../../block-builder" }
 babe-primitives = { package = "sp-consensus-babe", path = "../../../primitives/consensus/babe" }
 env_logger = "0.7.0"
-test-client = { package = "substrate-test-runtime-client", path = "../../../test/utils/runtime/client" }
-test_runtime = { package = "substrate-test-runtime", path = "../../../test/utils/runtime" }
+test-client = { package = "substrate-test-runtime-client", path = "../../../test-utils/runtime/client" }
+test_runtime = { package = "substrate-test-runtime", path = "../../../test-utils/runtime" }
 tempfile = "3.1.0"
 tokio = "0.1.22"
diff --git a/client/offchain/Cargo.toml b/client/offchain/Cargo.toml
index 5bfffc80f5fd4..755453fa21451 100644
--- a/client/offchain/Cargo.toml
+++ b/client/offchain/Cargo.toml
@@ -33,7 +33,7 @@ hyper-rustls = "0.17.1"
 [dev-dependencies]
 client-db = { package = "sc-client-db", path = "../db/", default-features = true }
 env_logger = "0.7.0"
-test-client = { package = "substrate-test-runtime-client", path = "../../test/utils/runtime/client" }
+test-client = { package = "substrate-test-runtime-client", path = "../../test-utils/runtime/client" }
 tokio = "0.1.22"
 txpool = { package = "sc-transaction-pool", path = "../../client/transaction-pool" }
 txpool-api = { package = "sp-transaction-pool", path = "../../primitives/transaction-pool" }
diff --git a/client/rpc/api/Cargo.toml b/client/rpc-api/Cargo.toml
similarity index 60%
rename from client/rpc/api/Cargo.toml
rename to client/rpc-api/Cargo.toml
index e5e6903215e52..58fb3ca90423f 100644
--- a/client/rpc/api/Cargo.toml
+++ b/client/rpc-api/Cargo.toml
@@ -14,9 +14,9 @@ jsonrpc-derive = "14.0.3"
 jsonrpc-pubsub = "14.0.3"
 log = "0.4.8"
 parking_lot = "0.9.0"
-primitives = { package = "sp-core", path = "../../../primitives/core" }
-runtime_version = { package = "sp-version", path = "../../../primitives/version" }
+primitives = { package = "sp-core", path = "../../primitives/core" }
+runtime_version = { package = "sp-version", path = "../../primitives/version" }
 serde = { version = "1.0.101", features = ["derive"] }
 serde_json = "1.0.41"
-txpool-api = { package = "sp-transaction-pool", path = "../../../primitives/transaction-pool" }
-rpc-primitives = { package = "sp-rpc", path = "../../../primitives/rpc" }
+txpool-api = { package = "sp-transaction-pool", path = "../../primitives/transaction-pool" }
+rpc-primitives = { package = "sp-rpc", path = "../../primitives/rpc" }
diff --git a/client/rpc/api/src/author/error.rs b/client/rpc-api/src/author/error.rs
similarity index 100%
rename from client/rpc/api/src/author/error.rs
rename to client/rpc-api/src/author/error.rs
diff --git a/client/rpc/api/src/author/hash.rs b/client/rpc-api/src/author/hash.rs
similarity index 100%
rename from client/rpc/api/src/author/hash.rs
rename to client/rpc-api/src/author/hash.rs
diff --git a/client/rpc/api/src/author/mod.rs b/client/rpc-api/src/author/mod.rs
similarity index 100%
rename from client/rpc/api/src/author/mod.rs
rename to client/rpc-api/src/author/mod.rs
diff --git a/client/rpc/api/src/chain/error.rs b/client/rpc-api/src/chain/error.rs
similarity index 100%
rename from client/rpc/api/src/chain/error.rs
rename to client/rpc-api/src/chain/error.rs
diff --git a/client/rpc/api/src/chain/mod.rs b/client/rpc-api/src/chain/mod.rs
similarity index 100%
rename from client/rpc/api/src/chain/mod.rs
rename to client/rpc-api/src/chain/mod.rs
diff --git a/client/rpc/api/src/errors.rs b/client/rpc-api/src/errors.rs
similarity index 100%
rename from client/rpc/api/src/errors.rs
rename to client/rpc-api/src/errors.rs
diff --git a/client/rpc/api/src/helpers.rs b/client/rpc-api/src/helpers.rs
similarity index 100%
rename from client/rpc/api/src/helpers.rs
rename to client/rpc-api/src/helpers.rs
diff --git a/client/rpc/api/src/lib.rs b/client/rpc-api/src/lib.rs
similarity index 100%
rename from client/rpc/api/src/lib.rs
rename to client/rpc-api/src/lib.rs
diff --git a/client/rpc/api/src/state/error.rs b/client/rpc-api/src/state/error.rs
similarity index 100%
rename from client/rpc/api/src/state/error.rs
rename to client/rpc-api/src/state/error.rs
diff --git a/client/rpc/api/src/state/mod.rs b/client/rpc-api/src/state/mod.rs
similarity index 100%
rename from client/rpc/api/src/state/mod.rs
rename to client/rpc-api/src/state/mod.rs
diff --git a/client/rpc/api/src/subscriptions.rs b/client/rpc-api/src/subscriptions.rs
similarity index 100%
rename from client/rpc/api/src/subscriptions.rs
rename to client/rpc-api/src/subscriptions.rs
diff --git a/client/rpc/api/src/system/error.rs b/client/rpc-api/src/system/error.rs
similarity index 100%
rename from client/rpc/api/src/system/error.rs
rename to client/rpc-api/src/system/error.rs
diff --git a/client/rpc/api/src/system/helpers.rs b/client/rpc-api/src/system/helpers.rs
similarity index 100%
rename from client/rpc/api/src/system/helpers.rs
rename to client/rpc-api/src/system/helpers.rs
diff --git a/client/rpc/api/src/system/mod.rs b/client/rpc-api/src/system/mod.rs
similarity index 100%
rename from client/rpc/api/src/system/mod.rs
rename to client/rpc-api/src/system/mod.rs
diff --git a/client/rpc/Cargo.toml b/client/rpc/Cargo.toml
index ab93d48d2cfac..61ad753c84c71 100644
--- a/client/rpc/Cargo.toml
+++ b/client/rpc/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 
 [dependencies]
-api = { package = "sc-rpc-api", path = "./api" }
+api = { package = "sc-rpc-api", path = "../rpc-api" }
 client-api = { package = "sc-client-api", path = "../api" }
 client = { package = "sc-client", path = "../" }
 sp-api = { path = "../../primitives/api" }
@@ -34,6 +34,6 @@ futures01 = { package = "futures", version = "0.1.29" }
 network = { package = "sc-network", path = "../network" }
 rustc-hex = "2.0.1"
 sp-io = { path = "../../primitives/io" }
-test-client = { package = "substrate-test-runtime-client", path = "../../test/utils/runtime/client" }
+test-client = { package = "substrate-test-runtime-client", path = "../../test-utils/runtime/client" }
 tokio = "0.1.22"
 txpool = { package = "sc-transaction-pool", path = "../transaction-pool" }
diff --git a/client/service/Cargo.toml b/client/service/Cargo.toml
index 0424aa28e7004..fe01818d20fb7 100644
--- a/client/service/Cargo.toml
+++ b/client/service/Cargo.toml
@@ -51,12 +51,12 @@ rpc = { package = "sc-rpc", path = "../rpc" }
 tel = { package = "sc-telemetry", path = "../telemetry" }
 offchain = { package = "sc-offchain", path = "../offchain" }
 parity-multiaddr = { package = "parity-multiaddr", version = "0.5.0" }
-grafana-data-source = { path = "../grafana-data-source" }
+grafana-data-source = { path = "../../utils/grafana-data-source" }
 sc-tracing = { package = "sc-tracing", path = "../tracing" }
 tracing = "0.1.10"
 
 [dev-dependencies]
-substrate-test-runtime-client = { path = "../../test/utils/runtime/client" }
+substrate-test-runtime-client = { path = "../../test-utils/runtime/client" }
 babe-primitives = { package = "sp-consensus-babe", path = "../../primitives/consensus/babe" }
 grandpa = { package = "sc-finality-grandpa", path = "../finality-grandpa" }
 grandpa-primitives = { package = "sp-finality-grandpa", path = "../../primitives/finality-grandpa" }
diff --git a/client/tracing/Cargo.toml b/client/tracing/Cargo.toml
index b94059edcdc6a..6c9c04ead5c5a 100644
--- a/client/tracing/Cargo.toml
+++ b/client/tracing/Cargo.toml
@@ -15,7 +15,7 @@ slog = { version = "2.5.2", features = ["nested-values"] }
 tracing-core = "0.1.7"
 
 sc-telemetry = { path = "../telemetry" }
-grafana-data-source = { path = "../grafana-data-source" }
+grafana-data-source = { path = "../../utils/grafana-data-source" }
 
 [dev-dependencies]
 tracing = "0.1.10"
diff --git a/client/transaction-pool/Cargo.toml b/client/transaction-pool/Cargo.toml
index 67cfe7837387d..f1ab17927d629 100644
--- a/client/transaction-pool/Cargo.toml
+++ b/client/transaction-pool/Cargo.toml
@@ -20,4 +20,4 @@ sp-blockchain = { path = "../../primitives/blockchain" }
 
 [dev-dependencies]
 keyring = { package = "sp-keyring", path = "../../primitives/keyring" }
-test-client = { package = "substrate-test-runtime-client", path = "../../test/utils/runtime/client" }
+test-client = { package = "substrate-test-runtime-client", path = "../../test-utils/runtime/client" }
diff --git a/client/transaction-pool/graph/Cargo.toml b/client/transaction-pool/graph/Cargo.toml
index a9f5e2e6b1ea3..cda2fb93e85d3 100644
--- a/client/transaction-pool/graph/Cargo.toml
+++ b/client/transaction-pool/graph/Cargo.toml
@@ -17,7 +17,7 @@ txpool-api = { package = "sp-transaction-pool", path = "../../../primitives/tran
 [dev-dependencies]
 assert_matches = "1.3.0"
 codec = { package = "parity-scale-codec", version = "1.0.0" }
-test_runtime = { package = "substrate-test-runtime", path = "../../../test/utils/runtime" }
+test_runtime = { package = "substrate-test-runtime", path = "../../../test-utils/runtime" }
 criterion = "0.3"
 
 [[bench]]
diff --git a/frame/babe/Cargo.toml b/frame/babe/Cargo.toml
index 4cc325c0e1984..ebfc436f7a30d 100644
--- a/frame/babe/Cargo.toml
+++ b/frame/babe/Cargo.toml
@@ -25,7 +25,7 @@ lazy_static = "1.4.0"
 parking_lot = "0.9.0"
 sp-version = { path = "../../primitives/version", default-features = false }
 primitives = { package = "sp-core",  path = "../../primitives/core" }
-test-runtime = { package = "substrate-test-runtime", path = "../../test/utils/runtime" }
+test-runtime = { package = "substrate-test-runtime", path = "../../test-utils/runtime" }
 
 [features]
 default = ["std"]
diff --git a/frame/elections-phragmen/Cargo.toml b/frame/elections-phragmen/Cargo.toml
index 7415107cd23e6..0778ef25fd987 100644
--- a/frame/elections-phragmen/Cargo.toml
+++ b/frame/elections-phragmen/Cargo.toml
@@ -17,7 +17,7 @@ sp-io = { path = "../../primitives/io" }
 hex-literal = "0.2.1"
 balances = { package = "pallet-balances", path = "../balances" }
 primitives = { package = "sp-core",  path = "../../primitives/core" }
-substrate-test-utils = { path = "../../test/utils" }
+substrate-test-utils = { path = "../../test-utils" }
 serde = { version = "1.0.101" }
 
 [features]
diff --git a/frame/staking/Cargo.toml b/frame/staking/Cargo.toml
index b125327f18f20..c82a0c13e2988 100644
--- a/frame/staking/Cargo.toml
+++ b/frame/staking/Cargo.toml
@@ -24,7 +24,7 @@ primitives = { package = "sp-core",  path = "../../primitives/core" }
 balances = { package = "pallet-balances", path = "../balances" }
 timestamp = { package = "pallet-timestamp", path = "../timestamp" }
 pallet-staking-reward-curve = { path = "../staking/reward-curve"}
-substrate-test-utils = { path = "../../test/utils" }
+substrate-test-utils = { path = "../../test-utils" }
 
 [features]
 equalize = []
diff --git a/primitives/api/test/Cargo.toml b/primitives/api/test/Cargo.toml
index 9e0718a0d5932..497790f2d6bef 100644
--- a/primitives/api/test/Cargo.toml
+++ b/primitives/api/test/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2018"
 
 [dependencies]
 sp-api = { path = "../" }
-test-client = { package = "substrate-test-runtime-client", path = "../../../test/utils/runtime/client" }
+test-client = { package = "substrate-test-runtime-client", path = "../../../test-utils/runtime/client" }
 sp-version = { path = "../../version" }
 sp-runtime = { path = "../../runtime" }
 sp-blockchain = { path = "../../blockchain" }
@@ -18,7 +18,7 @@ rustversion = "1.0.0"
 
 [dev-dependencies]
 criterion = "0.3.0"
-test-client = { package = "substrate-test-runtime-client", path = "../../../test/utils/runtime/client" }
+test-client = { package = "substrate-test-runtime-client", path = "../../../test-utils/runtime/client" }
 
 [[bench]]
 name = "bench"
diff --git a/primitives/application-crypto/test/Cargo.toml b/primitives/application-crypto/test/Cargo.toml
index e5eed8f5b329c..2a599e963869d 100644
--- a/primitives/application-crypto/test/Cargo.toml
+++ b/primitives/application-crypto/test/Cargo.toml
@@ -8,5 +8,5 @@ publish = false
 
 [dependencies]
 primitives = { package = "sp-core", path = "../../core", default-features = false }
-test-client = { package = "substrate-test-runtime-client", path = "../../../test/utils/runtime/client" }
+test-client = { package = "substrate-test-runtime-client", path = "../../../test-utils/runtime/client" }
 sp-runtime = { path = "../../runtime" }
\ No newline at end of file
diff --git a/primitives/phragmen/Cargo.toml b/primitives/phragmen/Cargo.toml
index 8c546b73496ae..7637c25f2d6bb 100644
--- a/primitives/phragmen/Cargo.toml
+++ b/primitives/phragmen/Cargo.toml
@@ -10,7 +10,7 @@ sp-std = { path = "../std", default-features = false }
 sp-runtime = { path = "../../primitives/runtime", default-features = false }
 
 [dev-dependencies]
-substrate-test-utils = { path = "../../test/utils" }
+substrate-test-utils = { path = "../../test-utils" }
 sp-io ={ path = "../../primitives/io" }
 rand = "0.7.2"
 
diff --git a/primitives/runtime-interface/test-wasm/Cargo.toml b/primitives/runtime-interface/test-wasm/Cargo.toml
index 553693f248489..9c3ac0a7f0625 100644
--- a/primitives/runtime-interface/test-wasm/Cargo.toml
+++ b/primitives/runtime-interface/test-wasm/Cargo.toml
@@ -12,7 +12,7 @@ sp-io = { path = "../../io", default-features = false }
 primitives = { package = "sp-core", path = "../../core", default-features = false }
 
 [build-dependencies]
-wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.3", path = "../../../client/utils/wasm-builder-runner" }
+wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.3", path = "../../../utils/wasm-builder-runner" }
 
 [features]
 default = [ "std" ]
diff --git a/test/utils/Cargo.toml b/test-utils/Cargo.toml
similarity index 100%
rename from test/utils/Cargo.toml
rename to test-utils/Cargo.toml
diff --git a/test-utils/client/Cargo.toml b/test-utils/client/Cargo.toml
new file mode 100644
index 0000000000000..d89a75d137fd8
--- /dev/null
+++ b/test-utils/client/Cargo.toml
@@ -0,0 +1,20 @@
+[package]
+name = "substrate-test-client"
+version = "2.0.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+edition = "2018"
+
+[dependencies]
+client-api = { package = "sc-client-api", path = "../../client/api" }
+client = { package = "sc-client", path = "../../client/" }
+client-db = { package = "sc-client-db", path = "../../client//db", features = ["test-helpers"] }
+consensus = { package = "sp-consensus", path = "../../primitives/consensus/common" }
+executor = { package = "sc-executor", path = "../../client/executor" }
+futures = "0.3.1"
+hash-db = "0.15.2"
+keyring = { package = "sp-keyring", path = "../../primitives/keyring" }
+codec = { package = "parity-scale-codec", version = "1.0.0" }
+primitives = { package = "sp-core", path = "../../primitives/core" }
+sp-runtime = {  path = "../../primitives/runtime" }
+sp-blockchain = {  path = "../../primitives/blockchain" }
+state_machine = { package = "sp-state-machine", path = "../../primitives/state-machine" }
diff --git a/test/utils/client/src/client_ext.rs b/test-utils/client/src/client_ext.rs
similarity index 100%
rename from test/utils/client/src/client_ext.rs
rename to test-utils/client/src/client_ext.rs
diff --git a/test/utils/client/src/lib.rs b/test-utils/client/src/lib.rs
similarity index 100%
rename from test/utils/client/src/lib.rs
rename to test-utils/client/src/lib.rs
diff --git a/test-utils/runtime/Cargo.toml b/test-utils/runtime/Cargo.toml
new file mode 100644
index 0000000000000..c669cd4141318
--- /dev/null
+++ b/test-utils/runtime/Cargo.toml
@@ -0,0 +1,83 @@
+[package]
+name = "substrate-test-runtime"
+version = "2.0.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+edition = "2018"
+build = "build.rs"
+
+[dependencies]
+app-crypto = { package = "sp-application-crypto", path = "../../primitives/application-crypto", default-features = false }
+aura-primitives = { package = "sp-consensus-aura", path = "../../primitives/consensus/aura", default-features = false }
+babe-primitives = { package = "sp-consensus-babe", path = "../../primitives/consensus/babe", default-features = false }
+block-builder-api = { package = "sp-block-builder", path = "../../primitives/block-builder", default-features = false }
+cfg-if = "0.1.10"
+codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
+executive = { package = "frame-executive", path = "../../frame/executive", default-features = false }
+inherents = { package = "sp-inherents", path = "../../primitives/inherents", default-features = false }
+keyring = { package = "sp-keyring", path = "../../primitives/keyring", optional = true }
+log = { version = "0.4.8", optional = true }
+memory-db = { version = "0.15.2", default-features = false }
+offchain-primitives = { package = "sp-offchain", path = "../../primitives/offchain", default-features = false}
+primitives = { package = "sp-core", path = "../../primitives/core", default-features = false }
+sp-std = { path = "../../primitives/std", default-features = false }
+runtime-interface = { package = "sp-runtime-interface", path = "../../primitives/runtime-interface", default-features = false}
+sp-io = { path = "../../primitives/io", default-features = false }
+runtime_support = { package = "frame-support", path = "../../frame/support", default-features = false }
+runtime_version = { package = "sp-version", path = "../../primitives/version", default-features = false }
+serde = { version = "1.0.101", optional = true, features = ["derive"] }
+session = { package = "sp-session", path = "../../primitives/session", default-features = false }
+sp-api = { path = "../../primitives/api", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
+pallet-babe = { path = "../../frame/babe", default-features = false }
+frame-system = { path = "../../frame/system", default-features = false }
+frame-system-rpc-runtime-api = { path = "../../frame/system/rpc/runtime-api", default-features = false }
+pallet-timestamp = { path = "../../frame/timestamp", default-features = false }
+sc-client = { path = "../../client", optional = true }
+sp-trie = { path = "../../primitives/trie", default-features = false }
+sp-transaction-pool = { package = "sp-transaction-pool", path = "../../primitives/transaction-pool", default-features = false }
+trie-db = { version = "0.16.0", default-features = false }
+
+[dev-dependencies]
+sc-executor = { path = "../../client/executor" }
+substrate-test-runtime-client = { path = "./client" }
+state_machine = { package = "sp-state-machine", path = "../../primitives/state-machine" }
+
+[build-dependencies]
+wasm-builder-runner = { package = "substrate-wasm-builder-runner", path = "../../utils/wasm-builder-runner", version = "1.0.4" }
+
+[features]
+default = [
+	"std",
+]
+std = [
+	"app-crypto/std",
+	"aura-primitives/std",
+	"babe-primitives/std",
+	"block-builder-api/std",
+	"codec/std",
+	"executive/std",
+	"inherents/std",
+	"keyring",
+	"log",
+	"memory-db/std",
+	"offchain-primitives/std",
+	"primitives/std",
+	"primitives/std",
+	"sp-std/std",
+	"runtime-interface/std",
+	"sp-io/std",
+	"runtime_support/std",
+	"runtime_version/std",
+	"serde",
+	"session/std",
+	"sp-api/std",
+	"sp-runtime/std",
+	"pallet-babe/std",
+	"frame-system-rpc-runtime-api/std",
+	"frame-system/std",
+	"pallet-timestamp/std",
+	"sc-client",
+	"sp-trie/std",
+	"sp-transaction-pool/std",
+	"trie-db/std",
+]
diff --git a/test/utils/runtime/build.rs b/test-utils/runtime/build.rs
similarity index 97%
rename from test/utils/runtime/build.rs
rename to test-utils/runtime/build.rs
index cd2c502e78c45..3197a406f2a09 100644
--- a/test/utils/runtime/build.rs
+++ b/test-utils/runtime/build.rs
@@ -20,7 +20,7 @@ fn main() {
 	build_current_project_with_rustflags(
 		"wasm_binary.rs",
 		WasmBuilderSource::CratesOrPath {
-			path: "../../../utils/wasm-builder",
+			path: "../../utils/wasm-builder",
 			version: "1.0.8",
 		},
 		// Note that we set the stack-size to 1MB explicitly even though it is set
diff --git a/test/utils/runtime/client/Cargo.toml b/test-utils/runtime/client/Cargo.toml
similarity index 55%
rename from test/utils/runtime/client/Cargo.toml
rename to test-utils/runtime/client/Cargo.toml
index 34b9a73fdcfa3..85b9928234fff 100644
--- a/test/utils/runtime/client/Cargo.toml
+++ b/test-utils/runtime/client/Cargo.toml
@@ -5,13 +5,13 @@ authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 
 [dependencies]
-block-builder = { package = "sc-block-builder", path = "../../../../client/block-builder" }
+block-builder = { package = "sc-block-builder", path = "../../../client/block-builder" }
 generic-test-client = { package = "substrate-test-client", path = "../../client" }
-primitives = { package = "sp-core", path = "../../../../primitives/core" }
+primitives = { package = "sp-core", path = "../../../primitives/core" }
 runtime = { package = "substrate-test-runtime", path = "../../runtime" }
-sp-runtime = { path = "../../../../primitives/runtime" }
-sp-blockchain = { path = "../../../../primitives/blockchain" }
+sp-runtime = { path = "../../../primitives/runtime" }
+sp-blockchain = { path = "../../../primitives/blockchain" }
 codec = { package = "parity-scale-codec", version = "1.0.0" }
-client-api = { package = "sc-client-api", path = "../../../../client/api" }
-client = { package = "sc-client", path = "../../../../client/" }
+client-api = { package = "sc-client-api", path = "../../../client/api" }
+client = { package = "sc-client", path = "../../../client/" }
 futures = "0.3.1"
diff --git a/test/utils/runtime/client/src/block_builder_ext.rs b/test-utils/runtime/client/src/block_builder_ext.rs
similarity index 100%
rename from test/utils/runtime/client/src/block_builder_ext.rs
rename to test-utils/runtime/client/src/block_builder_ext.rs
diff --git a/test/utils/runtime/client/src/lib.rs b/test-utils/runtime/client/src/lib.rs
similarity index 100%
rename from test/utils/runtime/client/src/lib.rs
rename to test-utils/runtime/client/src/lib.rs
diff --git a/test/utils/runtime/client/src/trait_tests.rs b/test-utils/runtime/client/src/trait_tests.rs
similarity index 100%
rename from test/utils/runtime/client/src/trait_tests.rs
rename to test-utils/runtime/client/src/trait_tests.rs
diff --git a/test/utils/runtime/src/genesismap.rs b/test-utils/runtime/src/genesismap.rs
similarity index 100%
rename from test/utils/runtime/src/genesismap.rs
rename to test-utils/runtime/src/genesismap.rs
diff --git a/test/utils/runtime/src/lib.rs b/test-utils/runtime/src/lib.rs
similarity index 100%
rename from test/utils/runtime/src/lib.rs
rename to test-utils/runtime/src/lib.rs
diff --git a/test/utils/runtime/src/system.rs b/test-utils/runtime/src/system.rs
similarity index 100%
rename from test/utils/runtime/src/system.rs
rename to test-utils/runtime/src/system.rs
diff --git a/test/utils/src/lib.rs b/test-utils/src/lib.rs
similarity index 100%
rename from test/utils/src/lib.rs
rename to test-utils/src/lib.rs
diff --git a/test/utils/client/Cargo.toml b/test/utils/client/Cargo.toml
deleted file mode 100644
index e3375099e3459..0000000000000
--- a/test/utils/client/Cargo.toml
+++ /dev/null
@@ -1,20 +0,0 @@
-[package]
-name = "substrate-test-client"
-version = "2.0.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
-
-[dependencies]
-client-api = { package = "sc-client-api", path = "../../../client/api" }
-client = { package = "sc-client", path = "../../../client/" }
-client-db = { package = "sc-client-db", path = "../../../client//db", features = ["test-helpers"] }
-consensus = { package = "sp-consensus", path = "../../../primitives/consensus/common" }
-executor = { package = "sc-executor", path = "../../../client/executor" }
-futures = "0.3.1"
-hash-db = "0.15.2"
-keyring = { package = "sp-keyring", path = "../../../primitives/keyring" }
-codec = { package = "parity-scale-codec", version = "1.0.0" }
-primitives = { package = "sp-core", path = "../../../primitives/core" }
-sp-runtime = {  path = "../../../primitives/runtime" }
-sp-blockchain = {  path = "../../../primitives/blockchain" }
-state_machine = { package = "sp-state-machine", path = "../../../primitives/state-machine" }
diff --git a/test/utils/runtime/Cargo.toml b/test/utils/runtime/Cargo.toml
deleted file mode 100644
index afde5a3d14b13..0000000000000
--- a/test/utils/runtime/Cargo.toml
+++ /dev/null
@@ -1,83 +0,0 @@
-[package]
-name = "substrate-test-runtime"
-version = "2.0.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
-build = "build.rs"
-
-[dependencies]
-app-crypto = { package = "sp-application-crypto", path = "../../../primitives/application-crypto", default-features = false }
-aura-primitives = { package = "sp-consensus-aura", path = "../../../primitives/consensus/aura", default-features = false }
-babe-primitives = { package = "sp-consensus-babe", path = "../../../primitives/consensus/babe", default-features = false }
-block-builder-api = { package = "sp-block-builder", path = "../../../primitives/block-builder", default-features = false }
-cfg-if = "0.1.10"
-codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
-executive = { package = "frame-executive", path = "../../../frame/executive", default-features = false }
-inherents = { package = "sp-inherents", path = "../../../primitives/inherents", default-features = false }
-keyring = { package = "sp-keyring", path = "../../../primitives/keyring", optional = true }
-log = { version = "0.4.8", optional = true }
-memory-db = { version = "0.15.2", default-features = false }
-offchain-primitives = { package = "sp-offchain", path = "../../../primitives/offchain", default-features = false}
-primitives = { package = "sp-core", path = "../../../primitives/core", default-features = false }
-sp-std = { path = "../../../primitives/std", default-features = false }
-runtime-interface = { package = "sp-runtime-interface", path = "../../../primitives/runtime-interface", default-features = false}
-sp-io = { path = "../../../primitives/io", default-features = false }
-runtime_support = { package = "frame-support", path = "../../../frame/support", default-features = false }
-runtime_version = { package = "sp-version", path = "../../../primitives/version", default-features = false }
-serde = { version = "1.0.101", optional = true, features = ["derive"] }
-session = { package = "sp-session", path = "../../../primitives/session", default-features = false }
-sp-api = { path = "../../../primitives/api", default-features = false }
-sp-runtime = { path = "../../../primitives/runtime", default-features = false }
-pallet-babe = { path = "../../../frame/babe", default-features = false }
-frame-system = { path = "../../../frame/system", default-features = false }
-frame-system-rpc-runtime-api = { path = "../../../frame/system/rpc/runtime-api", default-features = false }
-pallet-timestamp = { path = "../../../frame/timestamp", default-features = false }
-sc-client = { path = "../../../client", optional = true }
-sp-trie = { path = "../../../primitives/trie", default-features = false }
-sp-transaction-pool = { package = "sp-transaction-pool", path = "../../../primitives/transaction-pool", default-features = false }
-trie-db = { version = "0.16.0", default-features = false }
-
-[dev-dependencies]
-sc-executor = { path = "../../../client/executor" }
-substrate-test-runtime-client = { path = "./client" }
-state_machine = { package = "sp-state-machine", path = "../../../primitives/state-machine" }
-
-[build-dependencies]
-wasm-builder-runner = { package = "substrate-wasm-builder-runner", path = "../../../client/utils/wasm-builder-runner", version = "1.0.4" }
-
-[features]
-default = [
-	"std",
-]
-std = [
-	"app-crypto/std",
-	"aura-primitives/std",
-	"babe-primitives/std",
-	"block-builder-api/std",
-	"codec/std",
-	"executive/std",
-	"inherents/std",
-	"keyring",
-	"log",
-	"memory-db/std",
-	"offchain-primitives/std",
-	"primitives/std",
-	"primitives/std",
-	"sp-std/std",
-	"runtime-interface/std",
-	"sp-io/std",
-	"runtime_support/std",
-	"runtime_version/std",
-	"serde",
-	"session/std",
-	"sp-api/std",
-	"sp-runtime/std",
-	"pallet-babe/std",
-	"frame-system-rpc-runtime-api/std",
-	"frame-system/std",
-	"pallet-timestamp/std",
-	"sc-client",
-	"sp-trie/std",
-	"sp-transaction-pool/std",
-	"trie-db/std",
-]
diff --git a/test/utils/transaction-factory/Cargo.toml b/test/utils/transaction-factory/Cargo.toml
deleted file mode 100644
index 76293b6e071ff..0000000000000
--- a/test/utils/transaction-factory/Cargo.toml
+++ /dev/null
@@ -1,19 +0,0 @@
-[package]
-name = "sc-transaction-factory"
-version = "0.0.1"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
-
-[dependencies]
-block-builder-api = { package = "sp-block-builder", path = "../../primitives/block-builder" }
-cli = { package = "sc-cli", path = "../cli" }
-client-api = { package = "sc-client-api", path = "../api" }
-client = { package = "sc-client", path = "../" }
-codec = { package = "parity-scale-codec", version = "1.0.0", features = ["derive"] }
-consensus_common = { package = "sp-consensus", path = "../../primitives/consensus/common" }
-log = "0.4.8"
-primitives = { package = "sp-core", path = "../../primitives/core" }
-sp-api = { path = "../../primitives/api" }
-sp-runtime = { path = "../../primitives/runtime" }
-sc-service = { path = "../service" }
-sp-blockchain = { path = "../../primitives/blockchain" }
diff --git a/utils/frame/rpc/support/Cargo.toml b/utils/frame/rpc/support/Cargo.toml
index 1833322cd679b..cc5a860470b71 100644
--- a/utils/frame/rpc/support/Cargo.toml
+++ b/utils/frame/rpc/support/Cargo.toml
@@ -12,7 +12,7 @@ parity-scale-codec = "1"
 serde = "1"
 frame-support = { path = "../../../../frame/support" }
 sp-storage = { path = "../../../../primitives/storage" }
-sc-rpc-api = { path = "../../../../client/rpc/api" }
+sc-rpc-api = { path = "../../../../client/rpc-api" }
 
 [dev-dependencies]
 frame-system = { path = "../../../../frame/system" }
diff --git a/utils/frame/rpc/system/Cargo.toml b/utils/frame/rpc/system/Cargo.toml
index 0697d15e63114..a5018917495cb 100644
--- a/utils/frame/rpc/system/Cargo.toml
+++ b/utils/frame/rpc/system/Cargo.toml
@@ -20,6 +20,6 @@ sp-blockchain = { path = "../../../../primitives/blockchain" }
 txpool-api = { package = "sp-transaction-pool", path = "../../../../primitives/transaction-pool" }
 
 [dev-dependencies]
-test-client = { package = "substrate-test-runtime-client", path = "../../../../test/utils/runtime/client" }
+test-client = { package = "substrate-test-runtime-client", path = "../../../../test-utils/runtime/client" }
 env_logger = "0.7.0"
 txpool = { package = "sc-transaction-pool", path = "../../../../client/transaction-pool" }
diff --git a/client/grafana-data-source/Cargo.toml b/utils/grafana-data-source/Cargo.toml
similarity index 100%
rename from client/grafana-data-source/Cargo.toml
rename to utils/grafana-data-source/Cargo.toml
diff --git a/client/grafana-data-source/src/database.rs b/utils/grafana-data-source/src/database.rs
similarity index 100%
rename from client/grafana-data-source/src/database.rs
rename to utils/grafana-data-source/src/database.rs
diff --git a/client/grafana-data-source/src/lib.rs b/utils/grafana-data-source/src/lib.rs
similarity index 100%
rename from client/grafana-data-source/src/lib.rs
rename to utils/grafana-data-source/src/lib.rs
diff --git a/client/grafana-data-source/src/networking.rs b/utils/grafana-data-source/src/networking.rs
similarity index 100%
rename from client/grafana-data-source/src/networking.rs
rename to utils/grafana-data-source/src/networking.rs
diff --git a/client/grafana-data-source/src/server.rs b/utils/grafana-data-source/src/server.rs
similarity index 100%
rename from client/grafana-data-source/src/server.rs
rename to utils/grafana-data-source/src/server.rs
diff --git a/client/grafana-data-source/src/types.rs b/utils/grafana-data-source/src/types.rs
similarity index 100%
rename from client/grafana-data-source/src/types.rs
rename to utils/grafana-data-source/src/types.rs
diff --git a/client/grafana-data-source/test/Cargo.toml b/utils/grafana-data-source/test/Cargo.toml
similarity index 100%
rename from client/grafana-data-source/test/Cargo.toml
rename to utils/grafana-data-source/test/Cargo.toml
diff --git a/client/grafana-data-source/test/src/main.rs b/utils/grafana-data-source/test/src/main.rs
similarity index 100%
rename from client/grafana-data-source/test/src/main.rs
rename to utils/grafana-data-source/test/src/main.rs
diff --git a/client/utils/wasm-builder-runner/Cargo.toml b/utils/wasm-builder-runner/Cargo.toml
similarity index 100%
rename from client/utils/wasm-builder-runner/Cargo.toml
rename to utils/wasm-builder-runner/Cargo.toml
diff --git a/client/utils/wasm-builder-runner/README.md b/utils/wasm-builder-runner/README.md
similarity index 100%
rename from client/utils/wasm-builder-runner/README.md
rename to utils/wasm-builder-runner/README.md
diff --git a/client/utils/wasm-builder-runner/src/lib.rs b/utils/wasm-builder-runner/src/lib.rs
similarity index 100%
rename from client/utils/wasm-builder-runner/src/lib.rs
rename to utils/wasm-builder-runner/src/lib.rs