diff --git a/polkadot/api/Cargo.toml b/polkadot/api/Cargo.toml
index 7b5015b991..b85492d9ba 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 = { path = "../../substrate/codec" }
-substrate-runtime-io = { path = "../../substrate/runtime-io" }
+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 = { path = "../../substrate/client" }
-substrate-primitives = { path = "../../substrate/primitives" }
-substrate-executor = { path = "../../substrate/executor" }
-substrate-state-machine = { path = "../../substrate/state-machine" }
+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" }
 
 [dev-dependencies]
-substrate-keyring = { path = "../../substrate/keyring" }
+substrate-keyring = { git = "https://github.com/paritytech/paritysubstrate" }
diff --git a/polkadot/availability-store/Cargo.toml b/polkadot/availability-store/Cargo.toml
index 9a926310b0..b99d9bcbba 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 = { path = "../../substrate/codec" }
-substrate-primitives = { path = "../../substrate/primitives" }
+substrate-codec = { git = "https://github.com/paritytech/paritysubstrate" }
+substrate-primitives = { git = "https://github.com/paritytech/paritysubstrate" }
 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 3ccf81b185..4714565a40 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 = { path = "../../substrate/cli" }
-substrate-client = { path = "../../substrate/client" }
-substrate-codec = { path = "../../substrate/codec" }
-substrate-extrinsic-pool = { path = "../../substrate/extrinsic-pool" }
-substrate-network = { path = "../../substrate/network" }
-substrate-primitives = { path = "../../substrate/primitives" }
-substrate-rpc = { path = "../../substrate/rpc" }
-substrate-rpc-servers = { path = "../../substrate/rpc-servers" }
-substrate-runtime-primitives = { path = "../../substrate/runtime/primitives" }
-substrate-service = { path = "../../substrate/service" }
-substrate-state-machine = { path = "../../substrate/state-machine" }
-substrate-telemetry = { path = "../../substrate/telemetry" }
+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" }
 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 122261e3f6..666afbd120 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 = { path = "../../substrate/client" }
-substrate-codec = { path = "../../substrate/codec", version = "0.1" }
-substrate-primitives = { path = "../../substrate/primitives", version = "0.1" }
+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" }
 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 = { path = "../../substrate/ed25519" }
+ed25519 = { git = "https://github.com/paritytech/paritysubstrate/ed25519" }
 tokio = "0.1.7"
diff --git a/polkadot/consensus/Cargo.toml b/polkadot/consensus/Cargo.toml
index 239e9c05af..6441af387a 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 = { path = "../../substrate/ed25519" }
+ed25519 = { git = "https://github.com/paritytech/paritysubstrate/ed25519" }
 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 = { path = "../../substrate/bft" }
-substrate-codec = { path = "../../substrate/codec" }
-substrate-primitives = { path = "../../substrate/primitives" }
-substrate-runtime-support = { path = "../../substrate/runtime-support" }
-substrate-client = { path = "../../substrate/client" }
-substrate-runtime-primitives = { path = "../../substrate/runtime/primitives" }
+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" }
 
 [dev-dependencies]
-substrate-keyring = { path = "../../substrate/keyring" }
+substrate-keyring = { git = "https://github.com/paritytech/paritysubstrate" }
diff --git a/polkadot/executor/Cargo.toml b/polkadot/executor/Cargo.toml
index e7cfc5b772..ae805e5f2c 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 = { path = "../../substrate/executor" }
+substrate-executor = { git = "https://github.com/paritytech/paritysubstrate" }
 polkadot-runtime = { path = "../runtime" }
diff --git a/polkadot/network/Cargo.toml b/polkadot/network/Cargo.toml
index 21fd95f71b..9344a42b59 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 = { path = "../../substrate/bft" }
-substrate-codec = { path = "../../substrate/codec" }
-substrate-codec-derive = { path = "../../substrate/codec/derive" }
-substrate-network = { path = "../../substrate/network" }
-substrate-primitives = { path = "../../substrate/primitives" }
-ed25519 = { path = "../../substrate/ed25519" }
+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" }
 futures = "0.1"
 tokio = "0.1.7"
 log = "0.4"
diff --git a/polkadot/parachain/Cargo.toml b/polkadot/parachain/Cargo.toml
index f9e2b3bf05..11da598857 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 = { path = "../../substrate/codec", default-features = false }
-substrate-codec-derive = { path = "../../substrate/codec/derive", default-features = false }
+substrate-codec = { git = "https://github.com/paritytech/paritysubstrate", default-features = false }
+substrate-codec-derive = { git = "https://github.com/paritytech/paritysubstrate", 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 b277f074c3..c4300beae8 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 = { path = "../../substrate/codec", default_features = false }
-substrate-codec-derive = { path = "../../substrate/codec/derive", default_features = false }
-substrate-primitives = { path = "../../substrate/primitives", default_features = false }
-substrate-runtime-std = { path = "../../substrate/runtime-std", default_features = false }
-substrate-runtime-primitives = { path = "../../substrate/runtime/primitives", default_features = false }
+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 }
 
 [dev-dependencies]
-substrate-serializer = { path = "../../substrate/serializer" }
+substrate-serializer = { git = "https://github.com/paritytech/paritysubstrate" }
 pretty_assertions = "0.4"
 
 [features]
diff --git a/polkadot/runtime/Cargo.toml b/polkadot/runtime/Cargo.toml
index 3a595fef7c..494c28c28b 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 = { path = "../../substrate/codec" }
-substrate-serializer = { path = "../../substrate/serializer" }
-substrate-runtime-std = { path = "../../substrate/runtime-std" }
-substrate-runtime-io = { path = "../../substrate/runtime-io" }
-substrate-runtime-support = { path = "../../substrate/runtime-support" }
-substrate-primitives = { path = "../../substrate/primitives" }
-substrate-keyring = { path = "../../substrate/keyring" }
-substrate-runtime-consensus = { path = "../../substrate/runtime/consensus" }
-substrate-runtime-council = { path = "../../substrate/runtime/council" }
-substrate-runtime-democracy = { path = "../../substrate/runtime/democracy" }
-substrate-runtime-executive = { path = "../../substrate/runtime/executive" }
-substrate-runtime-primitives = { path = "../../substrate/runtime/primitives" }
-substrate-runtime-session = { path = "../../substrate/runtime/session" }
-substrate-runtime-staking = { path = "../../substrate/runtime/staking" }
-substrate-runtime-system = { path = "../../substrate/runtime/system" }
-substrate-runtime-timestamp = { path = "../../substrate/runtime/timestamp" }
-substrate-runtime-version = { path = "../../substrate/runtime/version" }
+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" }
 
 [dev-dependencies]
 hex-literal = "0.1.0"
diff --git a/polkadot/runtime/wasm/Cargo.toml b/polkadot/runtime/wasm/Cargo.toml
index ba21f37d11..9bc4b2accb 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 = { path = "../../../substrate/codec", default-features = false }
-substrate-primitives = { path = "../../../substrate/primitives", default-features = false }
-substrate-runtime-std = { path = "../../../substrate/runtime-std", default-features = false }
-substrate-runtime-io = { path = "../../../substrate/runtime-io", default-features = false }
-substrate-runtime-support = { path = "../../../substrate/runtime-support", default-features = false }
-substrate-runtime-consensus = { path = "../../../substrate/runtime/consensus", default-features = false }
-substrate-runtime-council = { path = "../../../substrate/runtime/council", default-features = false }
-substrate-runtime-democracy = { path = "../../../substrate/runtime/democracy", default-features = false }
-substrate-runtime-executive = { path = "../../../substrate/runtime/executive", default-features = false }
-substrate-runtime-primitives = { path = "../../../substrate/runtime/primitives", default-features = false }
-substrate-runtime-session = { path = "../../../substrate/runtime/session", default-features = false }
-substrate-runtime-staking = { path = "../../../substrate/runtime/staking", default-features = false }
-substrate-runtime-system = { path = "../../../substrate/runtime/system", default-features = false }
-substrate-runtime-timestamp = { path = "../../../substrate/runtime/timestamp", default-features = false }
-substrate-runtime-version = { path = "../../../substrate/runtime/version", 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 }
 
 [features]
 default = []
diff --git a/polkadot/service/Cargo.toml b/polkadot/service/Cargo.toml
index b0561122e1..5120b62aa9 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 = { path = "../../substrate/ed25519" }
+ed25519 = { git = "https://github.com/paritytech/paritysubstrate/ed25519" }
 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 = { path = "../../substrate/runtime-io" }
-substrate-primitives = { path = "../../substrate/primitives" }
-substrate-network = { path = "../../substrate/network" }
-substrate-client = { path = "../../substrate/client" }
-substrate-codec = { path = "../../substrate/codec" }
-substrate-service = { path = "../../substrate/service" }
-substrate-telemetry = { path = "../../substrate/telemetry" }
+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" }
diff --git a/polkadot/statement-table/Cargo.toml b/polkadot/statement-table/Cargo.toml
index 97e35d1f5f..155de4603b 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 = { path = "../../substrate/codec" }
-substrate-codec-derive = { path = "../../substrate/codec/derive" }
-substrate-primitives = { path = "../../substrate/primitives" }
+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" }
 polkadot-primitives = { path = "../primitives" }
diff --git a/polkadot/test-parachains/adder/Cargo.toml b/polkadot/test-parachains/adder/Cargo.toml
index 2b41ba9bfa..cb1c703703 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 = { path = "../../../substrate/codec/derive", default-features = false }
+substrate-codec-derive = { git = "https://github.com/paritytech/paritysubstrate", default-features = false }
 tiny-keccak = "1.4"
diff --git a/polkadot/transaction-pool/Cargo.toml b/polkadot/transaction-pool/Cargo.toml
index 588db7ef0b..b596d138d3 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 = { path = "../../substrate/client" }
-substrate-codec = { path = "../../substrate/codec" }
-substrate-keyring = { path = "../../substrate/keyring" }
-substrate-extrinsic-pool = { path = "../../substrate/extrinsic-pool" }
-substrate-primitives = { path = "../../substrate/primitives" }
-substrate-runtime-primitives = { path = "../../substrate/runtime/primitives" }
-ed25519 = { path = "../../substrate/ed25519" }
+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" }