diff --git a/polkadot/api/Cargo.toml b/polkadot/api/Cargo.toml
index b85492d9ba..86a1083c38 100644
--- a/polkadot/api/Cargo.toml
+++ b/polkadot/api/Cargo.toml
@@ -8,14 +8,14 @@ error-chain = "0.12"
 polkadot-executor = { path = "../executor" }
 polkadot-runtime = { path = "../runtime" }
 polkadot-primitives = { path = "../primitives" }
-substrate-codec = { git = "https://github.com/paritytech/paritysubstrate" }
-substrate-runtime-io = { git = "https://github.com/paritytech/paritysubstrate" }
-substrate-runtime-executive = { path  = "../../substrate/runtime/executive" }
-substrate-runtime-primitives = { path  = "../../substrate/runtime/primitives" }
-substrate-client = { git = "https://github.com/paritytech/paritysubstrate" }
-substrate-primitives = { git = "https://github.com/paritytech/paritysubstrate" }
-substrate-executor = { git = "https://github.com/paritytech/paritysubstrate" }
-substrate-state-machine = { git = "https://github.com/paritytech/paritysubstrate" }
+substrate-codec = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
+substrate-runtime-io = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
+substrate-runtime-executive = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
+substrate-runtime-primitives = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
+substrate-client = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
+substrate-primitives = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
+substrate-executor = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
+substrate-state-machine = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
 
 [dev-dependencies]
-substrate-keyring = { git = "https://github.com/paritytech/paritysubstrate" }
+substrate-keyring = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
diff --git a/polkadot/availability-store/Cargo.toml b/polkadot/availability-store/Cargo.toml
index b99d9bcbba..61e29234e6 100644
--- a/polkadot/availability-store/Cargo.toml
+++ b/polkadot/availability-store/Cargo.toml
@@ -8,8 +8,8 @@ authors = ["Parity Technologies <admin@parity.io>"]
 polkadot-primitives = { path = "../primitives" }
 parking_lot = "0.4"
 log = "0.3"
-substrate-codec = { git = "https://github.com/paritytech/paritysubstrate" }
-substrate-primitives = { git = "https://github.com/paritytech/paritysubstrate" }
+substrate-codec = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
+substrate-primitives = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
 kvdb = { git = "https://github.com/paritytech/parity.git" }
 kvdb-rocksdb = { git = "https://github.com/paritytech/parity.git" }
 kvdb-memorydb = { git = "https://github.com/paritytech/parity.git" }
diff --git a/polkadot/cli/Cargo.toml b/polkadot/cli/Cargo.toml
index 4714565a40..2c3775204d 100644
--- a/polkadot/cli/Cargo.toml
+++ b/polkadot/cli/Cargo.toml
@@ -14,18 +14,18 @@ tokio = "0.1.7"
 futures = "0.1.17"
 parking_lot = "0.4"
 exit-future = "0.1"
-substrate-cli = { git = "https://github.com/paritytech/paritysubstrate" }
-substrate-client = { git = "https://github.com/paritytech/paritysubstrate" }
-substrate-codec = { git = "https://github.com/paritytech/paritysubstrate" }
-substrate-extrinsic-pool = { git = "https://github.com/paritytech/paritysubstrate" }
-substrate-network = { git = "https://github.com/paritytech/paritysubstrate" }
-substrate-primitives = { git = "https://github.com/paritytech/paritysubstrate" }
-substrate-rpc = { git = "https://github.com/paritytech/paritysubstrate" }
-substrate-rpc-servers = { git = "https://github.com/paritytech/paritysubstrate" }
-substrate-runtime-primitives = { git = "https://github.com/paritytech/paritysubstrate" }
-substrate-service = { git = "https://github.com/paritytech/paritysubstrate" }
-substrate-state-machine = { git = "https://github.com/paritytech/paritysubstrate" }
-substrate-telemetry = { git = "https://github.com/paritytech/paritysubstrate" }
+substrate-cli = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
+substrate-client = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
+substrate-codec = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
+substrate-extrinsic-pool = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
+substrate-network = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
+substrate-primitives = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
+substrate-rpc = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
+substrate-rpc-servers = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
+substrate-runtime-primitives = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
+substrate-service = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
+substrate-state-machine = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
+substrate-telemetry = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
 polkadot-primitives = { path = "../primitives" }
 polkadot-runtime = { path = "../runtime" }
 polkadot-service = { path = "../service" }
diff --git a/polkadot/collator/Cargo.toml b/polkadot/collator/Cargo.toml
index 666afbd120..48c85d97be 100644
--- a/polkadot/collator/Cargo.toml
+++ b/polkadot/collator/Cargo.toml
@@ -6,13 +6,13 @@ description = "Collator node implementation"
 
 [dependencies]
 futures = "0.1.17"
-substrate-client = { git = "https://github.com/paritytech/paritysubstrate" }
-substrate-codec = { git = "https://github.com/paritytech/paritysubstrate", version = "0.1" }
-substrate-primitives = { git = "https://github.com/paritytech/paritysubstrate", version = "0.1" }
+substrate-client = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
+substrate-codec = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate", version = "0.1" }
+substrate-primitives = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate", version = "0.1" }
 polkadot-api = { path = "../api" }
 polkadot-runtime = { path = "../runtime", version = "0.1" }
 polkadot-primitives = { path = "../primitives", version = "0.1" }
 polkadot-cli = { path = "../cli" }
 log = "0.4"
-ed25519 = { git = "https://github.com/paritytech/paritysubstrate/ed25519" }
+ed25519 = { git = "https://github.com/paritytech/polkadot" }
 tokio = "0.1.7"
diff --git a/polkadot/consensus/Cargo.toml b/polkadot/consensus/Cargo.toml
index 6441af387a..f68a6a8f1c 100644
--- a/polkadot/consensus/Cargo.toml
+++ b/polkadot/consensus/Cargo.toml
@@ -7,7 +7,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
 futures = "0.1.17"
 parking_lot = "0.4"
 tokio = "0.1.7"
-ed25519 = { git = "https://github.com/paritytech/paritysubstrate/ed25519" }
+ed25519 = { git = "https://github.com/paritytech/polkadot" }
 error-chain = "0.12"
 log = "0.3"
 exit-future = "0.1"
@@ -19,12 +19,12 @@ polkadot-primitives = { path = "../primitives" }
 polkadot-runtime = { path = "../runtime" }
 polkadot-statement-table = { path = "../statement-table" }
 polkadot-transaction-pool = { path = "../transaction-pool" }
-substrate-bft = { git = "https://github.com/paritytech/paritysubstrate" }
-substrate-codec = { git = "https://github.com/paritytech/paritysubstrate" }
-substrate-primitives = { git = "https://github.com/paritytech/paritysubstrate" }
-substrate-runtime-support = { git = "https://github.com/paritytech/paritysubstrate" }
-substrate-client = { git = "https://github.com/paritytech/paritysubstrate" }
-substrate-runtime-primitives = { git = "https://github.com/paritytech/paritysubstrate" }
+substrate-bft = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
+substrate-codec = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
+substrate-primitives = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
+substrate-runtime-support = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
+substrate-client = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
+substrate-runtime-primitives = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
 
 [dev-dependencies]
-substrate-keyring = { git = "https://github.com/paritytech/paritysubstrate" }
+substrate-keyring = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
diff --git a/polkadot/executor/Cargo.toml b/polkadot/executor/Cargo.toml
index ae805e5f2c..d5cf1bdbe3 100644
--- a/polkadot/executor/Cargo.toml
+++ b/polkadot/executor/Cargo.toml
@@ -5,5 +5,5 @@ authors = ["Parity Technologies <admin@parity.io>"]
 description = "Polkadot node implementation in Rust."
 
 [dependencies]
-substrate-executor = { git = "https://github.com/paritytech/paritysubstrate" }
+substrate-executor = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
 polkadot-runtime = { path = "../runtime" }
diff --git a/polkadot/network/Cargo.toml b/polkadot/network/Cargo.toml
index 9344a42b59..ca53ab3bf5 100644
--- a/polkadot/network/Cargo.toml
+++ b/polkadot/network/Cargo.toml
@@ -10,12 +10,12 @@ polkadot-api = { path = "../api" }
 polkadot-availability-store = { path = "../availability-store" }
 polkadot-consensus = { path = "../consensus" }
 polkadot-primitives = { path = "../primitives" }
-substrate-bft = { git = "https://github.com/paritytech/paritysubstrate" }
-substrate-codec = { git = "https://github.com/paritytech/paritysubstrate" }
-substrate-codec-derive = { git = "https://github.com/paritytech/paritysubstrate" }
-substrate-network = { git = "https://github.com/paritytech/paritysubstrate" }
-substrate-primitives = { git = "https://github.com/paritytech/paritysubstrate" }
-ed25519 = { git = "https://github.com/paritytech/paritysubstrate/ed25519" }
+substrate-bft = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
+substrate-codec = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
+substrate-codec-derive = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
+substrate-network = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
+substrate-primitives = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
+ed25519 = { git = "https://github.com/paritytech/polkadot" }
 futures = "0.1"
 tokio = "0.1.7"
 log = "0.4"
diff --git a/polkadot/parachain/Cargo.toml b/polkadot/parachain/Cargo.toml
index 11da598857..e9242ca20a 100644
--- a/polkadot/parachain/Cargo.toml
+++ b/polkadot/parachain/Cargo.toml
@@ -5,8 +5,8 @@ authors = ["Parity Technologies <admin@parity.io>"]
 description = "Types and utilities for creating and working with parachains"
 
 [dependencies]
-substrate-codec = { git = "https://github.com/paritytech/paritysubstrate", default-features = false }
-substrate-codec-derive = { git = "https://github.com/paritytech/paritysubstrate", default-features = false }
+substrate-codec = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate", default-features = false }
+substrate-codec-derive = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate", default-features = false }
 wasmi = { version = "0.4", optional = true }
 error-chain = { version = "0.12", optional = true }
 
diff --git a/polkadot/primitives/Cargo.toml b/polkadot/primitives/Cargo.toml
index c4300beae8..874b17d415 100644
--- a/polkadot/primitives/Cargo.toml
+++ b/polkadot/primitives/Cargo.toml
@@ -6,14 +6,14 @@ authors = ["Parity Technologies <admin@parity.io>"]
 [dependencies]
 serde = { version = "1.0", default_features = false }
 serde_derive = { version = "1.0", optional = true }
-substrate-codec = { git = "https://github.com/paritytech/paritysubstrate", default_features = false }
-substrate-codec-derive = { git = "https://github.com/paritytech/paritysubstrate", default_features = false }
-substrate-primitives = { git = "https://github.com/paritytech/paritysubstrate", default_features = false }
-substrate-runtime-std = { git = "https://github.com/paritytech/paritysubstrate", default_features = false }
-substrate-runtime-primitives = { git = "https://github.com/paritytech/paritysubstrate", default_features = false }
+substrate-codec = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate", default_features = false }
+substrate-codec-derive = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate", default_features = false }
+substrate-primitives = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate", default_features = false }
+substrate-runtime-std = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate", default_features = false }
+substrate-runtime-primitives = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate", default_features = false }
 
 [dev-dependencies]
-substrate-serializer = { git = "https://github.com/paritytech/paritysubstrate" }
+substrate-serializer = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
 pretty_assertions = "0.4"
 
 [features]
diff --git a/polkadot/runtime/Cargo.toml b/polkadot/runtime/Cargo.toml
index 494c28c28b..0a9d6852c2 100644
--- a/polkadot/runtime/Cargo.toml
+++ b/polkadot/runtime/Cargo.toml
@@ -10,23 +10,23 @@ serde = { version = "1.0", default_features = false }
 serde_derive = { version = "1.0", optional = true }
 safe-mix = { version = "1.0", default_features = false}
 polkadot-primitives = { path = "../primitives", default_features = false }
-substrate-codec = { git = "https://github.com/paritytech/paritysubstrate" }
-substrate-serializer = { git = "https://github.com/paritytech/paritysubstrate" }
-substrate-runtime-std = { git = "https://github.com/paritytech/paritysubstrate" }
-substrate-runtime-io = { git = "https://github.com/paritytech/paritysubstrate" }
-substrate-runtime-support = { git = "https://github.com/paritytech/paritysubstrate" }
-substrate-primitives = { git = "https://github.com/paritytech/paritysubstrate" }
-substrate-keyring = { git = "https://github.com/paritytech/paritysubstrate" }
-substrate-runtime-consensus = { git = "https://github.com/paritytech/paritysubstrate" }
-substrate-runtime-council = { git = "https://github.com/paritytech/paritysubstrate" }
-substrate-runtime-democracy = { git = "https://github.com/paritytech/paritysubstrate" }
-substrate-runtime-executive = { git = "https://github.com/paritytech/paritysubstrate" }
-substrate-runtime-primitives = { git = "https://github.com/paritytech/paritysubstrate" }
-substrate-runtime-session = { git = "https://github.com/paritytech/paritysubstrate" }
-substrate-runtime-staking = { git = "https://github.com/paritytech/paritysubstrate" }
-substrate-runtime-system = { git = "https://github.com/paritytech/paritysubstrate" }
-substrate-runtime-timestamp = { git = "https://github.com/paritytech/paritysubstrate" }
-substrate-runtime-version = { git = "https://github.com/paritytech/paritysubstrate" }
+substrate-codec = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
+substrate-serializer = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
+substrate-runtime-std = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
+substrate-runtime-io = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
+substrate-runtime-support = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
+substrate-primitives = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
+substrate-keyring = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
+substrate-runtime-consensus = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
+substrate-runtime-council = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
+substrate-runtime-democracy = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
+substrate-runtime-executive = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
+substrate-runtime-primitives = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
+substrate-runtime-session = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
+substrate-runtime-staking = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
+substrate-runtime-system = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
+substrate-runtime-timestamp = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
+substrate-runtime-version = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
 
 [dev-dependencies]
 hex-literal = "0.1.0"
diff --git a/polkadot/runtime/wasm/Cargo.toml b/polkadot/runtime/wasm/Cargo.toml
index 9bc4b2accb..55d47b273b 100644
--- a/polkadot/runtime/wasm/Cargo.toml
+++ b/polkadot/runtime/wasm/Cargo.toml
@@ -10,21 +10,21 @@ crate-type = ["cdylib"]
 integer-sqrt = { git = "https://github.com/paritytech/integer-sqrt-rs.git", branch = "master" }
 polkadot-primitives = { path = "../../primitives", default-features = false }
 safe-mix = { version = "1.0", default-features = false }
-substrate-codec = { git = "https://github.com/paritytech/paritysubstrate", default-features = false }
-substrate-primitives = { git = "https://github.com/paritytech/paritysubstrate", default-features = false }
-substrate-runtime-std = { git = "https://github.com/paritytech/paritysubstrate", default-features = false }
-substrate-runtime-io = { git = "https://github.com/paritytech/paritysubstrate", default-features = false }
-substrate-runtime-support = { git = "https://github.com/paritytech/paritysubstrate", default-features = false }
-substrate-runtime-consensus = { git = "https://github.com/paritytech/paritysubstrate", default-features = false }
-substrate-runtime-council = { git = "https://github.com/paritytech/paritysubstrate", default-features = false }
-substrate-runtime-democracy = { git = "https://github.com/paritytech/paritysubstrate", default-features = false }
-substrate-runtime-executive = { git = "https://github.com/paritytech/paritysubstrate", default-features = false }
-substrate-runtime-primitives = { git = "https://github.com/paritytech/paritysubstrate", default-features = false }
-substrate-runtime-session = { git = "https://github.com/paritytech/paritysubstrate", default-features = false }
-substrate-runtime-staking = { git = "https://github.com/paritytech/paritysubstrate", default-features = false }
-substrate-runtime-system = { git = "https://github.com/paritytech/paritysubstrate", default-features = false }
-substrate-runtime-timestamp = { git = "https://github.com/paritytech/paritysubstrate", default-features = false }
-substrate-runtime-version = { git = "https://github.com/paritytech/paritysubstrate", default-features = false }
+substrate-codec = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate", default-features = false }
+substrate-primitives = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate", default-features = false }
+substrate-runtime-std = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate", default-features = false }
+substrate-runtime-io = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate", default-features = false }
+substrate-runtime-support = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate", default-features = false }
+substrate-runtime-consensus = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate", default-features = false }
+substrate-runtime-council = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate", default-features = false }
+substrate-runtime-democracy = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate", default-features = false }
+substrate-runtime-executive = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate", default-features = false }
+substrate-runtime-primitives = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate", default-features = false }
+substrate-runtime-session = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate", default-features = false }
+substrate-runtime-staking = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate", default-features = false }
+substrate-runtime-system = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate", default-features = false }
+substrate-runtime-timestamp = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate", default-features = false }
+substrate-runtime-version = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate", default-features = false }
 
 [features]
 default = []
diff --git a/polkadot/service/Cargo.toml b/polkadot/service/Cargo.toml
index 5120b62aa9..2fde42b75e 100644
--- a/polkadot/service/Cargo.toml
+++ b/polkadot/service/Cargo.toml
@@ -11,7 +11,7 @@ log = "0.3"
 slog = "^2"
 tokio = "0.1.7"
 hex-literal = "0.1"
-ed25519 = { git = "https://github.com/paritytech/paritysubstrate/ed25519" }
+ed25519 = { git = "https://github.com/paritytech/polkadot" }
 polkadot-availability-store = { path = "../availability-store" }
 polkadot-primitives = { path = "../primitives" }
 polkadot-runtime = { path = "../runtime" }
@@ -20,10 +20,10 @@ polkadot-executor = { path = "../executor" }
 polkadot-api = { path = "../api" }
 polkadot-transaction-pool = { path = "../transaction-pool" }
 polkadot-network = { path = "../network" }
-substrate-runtime-io = { git = "https://github.com/paritytech/paritysubstrate" }
-substrate-primitives = { git = "https://github.com/paritytech/paritysubstrate" }
-substrate-network = { git = "https://github.com/paritytech/paritysubstrate" }
-substrate-client = { git = "https://github.com/paritytech/paritysubstrate" }
-substrate-codec = { git = "https://github.com/paritytech/paritysubstrate" }
-substrate-service = { git = "https://github.com/paritytech/paritysubstrate" }
-substrate-telemetry = { git = "https://github.com/paritytech/paritysubstrate" }
+substrate-runtime-io = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
+substrate-primitives = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
+substrate-network = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
+substrate-client = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
+substrate-codec = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
+substrate-service = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
+substrate-telemetry = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
diff --git a/polkadot/statement-table/Cargo.toml b/polkadot/statement-table/Cargo.toml
index 155de4603b..13bd7d1a20 100644
--- a/polkadot/statement-table/Cargo.toml
+++ b/polkadot/statement-table/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
-substrate-codec = { git = "https://github.com/paritytech/paritysubstrate" }
-substrate-codec-derive = { git = "https://github.com/paritytech/paritysubstrate" }
-substrate-primitives = { git = "https://github.com/paritytech/paritysubstrate" }
+substrate-codec = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
+substrate-codec-derive = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
+substrate-primitives = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
 polkadot-primitives = { path = "../primitives" }
diff --git a/polkadot/test-parachains/adder/Cargo.toml b/polkadot/test-parachains/adder/Cargo.toml
index cb1c703703..7acf7b8892 100644
--- a/polkadot/test-parachains/adder/Cargo.toml
+++ b/polkadot/test-parachains/adder/Cargo.toml
@@ -6,5 +6,5 @@ description = "Test parachain which adds to a number as its state transition"
 
 [dependencies]
 polkadot-parachain = { path = "../../parachain/", default-features = false }
-substrate-codec-derive = { git = "https://github.com/paritytech/paritysubstrate", default-features = false }
+substrate-codec-derive = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate", default-features = false }
 tiny-keccak = "1.4"
diff --git a/polkadot/test-parachains/adder/collator/Cargo.toml b/polkadot/test-parachains/adder/collator/Cargo.toml
index 97ae48cd25..0d71ae8e79 100644
--- a/polkadot/test-parachains/adder/collator/Cargo.toml
+++ b/polkadot/test-parachains/adder/collator/Cargo.toml
@@ -8,7 +8,7 @@ adder = { path = ".." }
 polkadot-parachain = { path = "../../../parachain" }
 polkadot-collator = { path = "../../../collator" }
 polkadot-primitives = { path = "../../../primitives" }
-ed25519 = { path = "../../../../substrate/ed25519" }
+ed25519 = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
 parking_lot = "0.4"
 ctrlc = { git = "https://github.com/paritytech/rust-ctrlc.git" }
 futures = "0.1"
diff --git a/polkadot/transaction-pool/Cargo.toml b/polkadot/transaction-pool/Cargo.toml
index b596d138d3..71ce92016b 100644
--- a/polkadot/transaction-pool/Cargo.toml
+++ b/polkadot/transaction-pool/Cargo.toml
@@ -10,10 +10,10 @@ parking_lot = "0.4"
 polkadot-api = { path = "../api" }
 polkadot-primitives = { path = "../primitives" }
 polkadot-runtime = { path = "../runtime" }
-substrate-client = { git = "https://github.com/paritytech/paritysubstrate" }
-substrate-codec = { git = "https://github.com/paritytech/paritysubstrate" }
-substrate-keyring = { git = "https://github.com/paritytech/paritysubstrate" }
-substrate-extrinsic-pool = { git = "https://github.com/paritytech/paritysubstrate" }
-substrate-primitives = { git = "https://github.com/paritytech/paritysubstrate" }
-substrate-runtime-primitives = { git = "https://github.com/paritytech/paritysubstrate" }
-ed25519 = { git = "https://github.com/paritytech/paritysubstrate/ed25519" }
+substrate-client = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
+substrate-codec = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
+substrate-keyring = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
+substrate-extrinsic-pool = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
+substrate-primitives = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
+substrate-runtime-primitives = { git = "https://github.com/paritytech/polkadot", branch = "split-substrate" }
+ed25519 = { git = "https://github.com/paritytech/polkadot" }