diff --git a/substrate/primitives/api/Cargo.toml b/substrate/primitives/api/Cargo.toml
index 92bf9bea2b..97f9618fe5 100644
--- a/substrate/primitives/api/Cargo.toml
+++ b/substrate/primitives/api/Cargo.toml
@@ -19,7 +19,7 @@ sp-core = { version = "2.0.0", default-features = false, path = "../core" }
 sp-std = { version = "2.0.0", default-features = false, path = "../std" }
 sp-runtime = { version = "2.0.0", default-features = false, path = "../runtime" }
 sp-version = { version = "2.0.0", default-features = false, path = "../version" }
-sp-state-machine = { version = "0.8.0", optional = true, path = "../../primitives/state-machine" }
+sp-state-machine = { version = "0.8.0", optional = true, path = "../state-machine" }
 hash-db = { version = "0.15.2", optional = true }
 thiserror = { version = "1.0.21", optional = true }
 
diff --git a/substrate/primitives/api/test/Cargo.toml b/substrate/primitives/api/test/Cargo.toml
index 1110b02020..f3f698e0cc 100644
--- a/substrate/primitives/api/test/Cargo.toml
+++ b/substrate/primitives/api/test/Cargo.toml
@@ -17,10 +17,10 @@ substrate-test-runtime-client = { version = "2.0.0", path = "../../../test-utils
 sp-version = { version = "2.0.0", path = "../../version" }
 sp-runtime = { version = "2.0.0", path = "../../runtime" }
 sp-blockchain = { version = "2.0.0", path = "../../blockchain" }
-sp-consensus = { version = "0.8.0", path = "../../../primitives/consensus/common" }
+sp-consensus = { version = "0.8.0", path = "../../consensus/common" }
 sc-block-builder = { version = "0.8.0", path = "../../../client/block-builder" }
 codec = { package = "parity-scale-codec", version = "1.3.1" }
-sp-state-machine = { version = "0.8.0", path = "../../../primitives/state-machine" }
+sp-state-machine = { version = "0.8.0", path = "../../state-machine" }
 trybuild = { git = "https://github.com/bkchr/trybuild.git", branch = "bkchr-use-workspace-cargo-lock" }
 rustversion = "1.0.0"
 
diff --git a/substrate/primitives/application-crypto/Cargo.toml b/substrate/primitives/application-crypto/Cargo.toml
index 2ab6823759..47776d8091 100644
--- a/substrate/primitives/application-crypto/Cargo.toml
+++ b/substrate/primitives/application-crypto/Cargo.toml
@@ -19,7 +19,7 @@ sp-core = { version = "2.0.0", default-features = false, path = "../core" }
 codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false, features = ["derive"] }
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 sp-std = { version = "2.0.0", default-features = false, path = "../std" }
-sp-io = { version = "2.0.0", default-features = false, path = "../../primitives/io" }
+sp-io = { version = "2.0.0", default-features = false, path = "../io" }
 
 [features]
 default = [ "std" ]
diff --git a/substrate/primitives/consensus/common/Cargo.toml b/substrate/primitives/consensus/common/Cargo.toml
index dc1550ed29..642e047223 100644
--- a/substrate/primitives/consensus/common/Cargo.toml
+++ b/substrate/primitives/consensus/common/Cargo.toml
@@ -20,7 +20,7 @@ libp2p = { version = "0.32.2", default-features = false }
 log = "0.4.8"
 sp-core = { path= "../../core", version = "2.0.0"}
 sp-inherents = { version = "2.0.0", path = "../../inherents" }
-sp-state-machine = { version = "0.8.0", path = "../../../primitives/state-machine" }
+sp-state-machine = { version = "0.8.0", path = "../../state-machine" }
 futures = { version = "0.3.1", features = ["thread-pool"] }
 futures-timer = "3.0.1"
 sp-std = { version = "2.0.0", path = "../../std" }
diff --git a/substrate/primitives/io/Cargo.toml b/substrate/primitives/io/Cargo.toml
index e470461d60..e65d75146d 100644
--- a/substrate/primitives/io/Cargo.toml
+++ b/substrate/primitives/io/Cargo.toml
@@ -21,10 +21,10 @@ sp-core = { version = "2.0.0", default-features = false, path = "../core" }
 sp-keystore = { version = "0.8.0", default-features = false, optional = true, path = "../keystore" }
 sp-std = { version = "2.0.0", default-features = false, path = "../std" }
 libsecp256k1 = { version = "0.3.4", optional = true }
-sp-state-machine = { version = "0.8.0", optional = true, path = "../../primitives/state-machine" }
-sp-wasm-interface = { version = "2.0.0", path = "../../primitives/wasm-interface", default-features = false }
+sp-state-machine = { version = "0.8.0", optional = true, path = "../state-machine" }
+sp-wasm-interface = { version = "2.0.0", path = "../wasm-interface", default-features = false }
 sp-runtime-interface = { version = "2.0.0", default-features = false, path = "../runtime-interface" }
-sp-trie = { version = "2.0.0", optional = true, path = "../../primitives/trie" }
+sp-trie = { version = "2.0.0", optional = true, path = "../trie" }
 sp-externalities = { version = "0.8.0", optional = true, path = "../externalities" }
 sp-tracing = { version = "2.0.0", default-features = false, path = "../tracing" }
 log = { version = "0.4.8", optional = true }
diff --git a/substrate/primitives/npos-elections/Cargo.toml b/substrate/primitives/npos-elections/Cargo.toml
index 4a66743028..44bcb2af87 100644
--- a/substrate/primitives/npos-elections/Cargo.toml
+++ b/substrate/primitives/npos-elections/Cargo.toml
@@ -22,7 +22,7 @@ sp-arithmetic = { version = "2.0.0", default-features = false, path = "../arithm
 [dev-dependencies]
 substrate-test-utils = { version = "2.0.0", path = "../../test-utils" }
 rand = "0.7.3"
-sp-runtime = { version = "2.0.0", path = "../../primitives/runtime" }
+sp-runtime = { version = "2.0.0", path = "../runtime" }
 
 [features]
 default = ["std"]
diff --git a/substrate/primitives/runtime-interface/test/Cargo.toml b/substrate/primitives/runtime-interface/test/Cargo.toml
index d6da3db4b6..fb000166ac 100644
--- a/substrate/primitives/runtime-interface/test/Cargo.toml
+++ b/substrate/primitives/runtime-interface/test/Cargo.toml
@@ -16,7 +16,7 @@ sp-runtime-interface = { version = "2.0.0", path = "../" }
 sc-executor = { version = "0.8.0", path = "../../../client/executor" }
 sp-runtime-interface-test-wasm = { version = "2.0.0", path = "../test-wasm" }
 sp-runtime-interface-test-wasm-deprecated = { version = "2.0.0", path = "../test-wasm-deprecated" }
-sp-state-machine = { version = "0.8.0", path = "../../../primitives/state-machine" }
+sp-state-machine = { version = "0.8.0", path = "../../state-machine" }
 sp-runtime = { version = "2.0.0", path = "../../runtime" }
 sp-core = { version = "2.0.0", path = "../../core" }
 sp-io = { version = "2.0.0", path = "../../io" }
diff --git a/substrate/primitives/runtime/Cargo.toml b/substrate/primitives/runtime/Cargo.toml
index 9c3286cd47..0ad0556158 100644
--- a/substrate/primitives/runtime/Cargo.toml
+++ b/substrate/primitives/runtime/Cargo.toml
@@ -33,7 +33,7 @@ either = { version = "1.5", default-features = false }
 [dev-dependencies]
 serde_json = "1.0.41"
 rand = "0.7.2"
-sp-state-machine = { version = "0.8.0", path = "../../primitives/state-machine" }
+sp-state-machine = { version = "0.8.0", path = "../state-machine" }
 
 [features]
 bench = []