diff --git a/Cargo.toml b/Cargo.toml
index a4644b2996..1fa4890b6e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -25,41 +25,42 @@ tokio1 = ["jsonrpsee-http-client/tokio1"]
 
 [dependencies]
 async-trait = "0.1.49"
-log = "0.4.14"
-thiserror = "1.0.24"
+codec = { package = "parity-scale-codec", version = "2.1", default-features = false, features = ["derive", "full"] }
+dyn-clone = "1.0.4"
 futures = "0.3.13"
+hex = "0.4.3"
 jsonrpsee-proc-macros = "=0.2.0-alpha.6"
 jsonrpsee-ws-client = "=0.2.0-alpha.6"
 jsonrpsee-http-client = { version = "=0.2.0-alpha.6", default-features = false }
+log = "0.4.14"
 num-traits = { version = "0.2.14", default-features = false }
 serde = { version = "1.0.124", features = ["derive"] }
 serde_json = "1.0.64"
+thiserror = "1.0.24"
 url = "2.2.1"
-codec = { package = "parity-scale-codec", version = "2.1", default-features = false, features = ["derive", "full"] }
-dyn-clone = "1.0.4"
 
-frame-metadata = "13.0.0"
-frame-support = "3.0.0"
-sp-runtime = "3.0.0"
-sp-version = "3.0.0"
-pallet-indices = "3.0.0"
-hex = "0.4.3"
-sp-std = "3.0.0"
-application-crypto = { version = "3.0.0", package = "sp-application-crypto" }
-pallet-staking = "3.0.0"
-
-sp-rpc = { version = "3.0.0", package = "sp-rpc" }
-sp-core = { version = "3.0.0", package = "sp-core" }
 substrate-subxt-client = { version = "0.7.0", path = "client", optional = true }
 substrate-subxt-proc-macro = { version = "0.15.0", path = "proc-macro" }
 
+sp-application-crypto = "3.0.0"
+sp-core = "3.0.0"
+sp-rpc = "3.0.0"
+sp-runtime = "3.0.0"
+sp-std = "3.0.0"
+sp-version = "3.0.0"
+
+frame-metadata = "13.0.0"
+frame-support = "3.0.0"
+pallet-indices = "3.0.0"
+pallet-staking = "3.0.0"
+
 [dev-dependencies]
+assert_matches = "1.5.0"
 async-std = { version = "1.9.0", features = ["attributes"] }
 env_logger = "0.8.3"
-frame-system = "3.0.0"
-pallet-balances = "3.0.0"
-sp-keyring = "3.0.0"
 tempdir = "0.3.7"
 wabt = "0.10.0"
 which = "4.0.2"
-assert_matches = "1.5.0"
+sp-keyring = "3.0.0"
+frame-system = "3.0.0"
+pallet-balances = "3.0.0"
diff --git a/client/Cargo.toml b/client/Cargo.toml
index 776fc9bb42..f02963152c 100644
--- a/client/Cargo.toml
+++ b/client/Cargo.toml
@@ -17,13 +17,14 @@ futures = { version = "0.3.9", features = ["compat"], package = "futures" }
 futures01 = { package = "futures", version = "0.1.29" }
 jsonrpsee-types = "=0.2.0-alpha.6"
 log = "0.4.13"
-sc-network = { version = "0.9.0", default-features = false }
-sc-client-db = "0.9.0"
-sc-service = { version = "0.9.0", default-features = false }
 serde_json = "1.0.61"
-sp-keyring = "3.0.0"
 thiserror = "1.0.23"
 
+sc-client-db = "0.9.0"
+sp-keyring = "3.0.0"
+sc-network = { version = "0.9.0", default-features = false }
+sc-service = { version = "0.9.0", default-features = false }
+
 [target.'cfg(target_arch="x86_64")'.dependencies]
 sc-service = { version = "0.9.0", default-features = false, features = ["wasmtime"] }
 
diff --git a/proc-macro/Cargo.toml b/proc-macro/Cargo.toml
index 42e64affc4..721291be29 100644
--- a/proc-macro/Cargo.toml
+++ b/proc-macro/Cargo.toml
@@ -29,10 +29,11 @@ async-std = { version = "1.8.0", features = ["attributes"] }
 codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] }
 env_logger = "0.8.2"
 pretty_assertions = "0.6.1"
-sp-keyring = "3.0.0"
 substrate-subxt = { path = ".." }
 trybuild = "1.0.38"
 
+sp-keyring = "3.0.0"
+
 [[test]]
 name = "balances"
 path = "tests/balances.rs"
diff --git a/src/runtimes.rs b/src/runtimes.rs
index 985b14d364..515c6d4248 100644
--- a/src/runtimes.rs
+++ b/src/runtimes.rs
@@ -39,7 +39,7 @@ pub struct Babe;
 /// These are redefined here to avoid dependencies on the substrate creates where they are defined.
 /// They must be identical to the definitions in the target substrate version.
 pub mod app {
-    use application_crypto::{
+    use sp_application_crypto::{
         app_crypto,
         ed25519,
         key_types,