From 9f8ab9ef2c5cbc36280febfadebfe47fe6b88400 Mon Sep 17 00:00:00 2001
From: George Mitenkov <georgemitenk0v@gmail.com>
Date: Thu, 5 Dec 2024 19:08:44 +0000
Subject: [PATCH] [move] Use workspace dependencies for third-party/move
 (#15461)

---
 Cargo.lock                                    | 22 +++++-----
 Cargo.toml                                    | 22 +++++-----
 aptos-move/framework/move-stdlib/Cargo.toml   | 22 +++++-----
 testsuite/fuzzer/Cargo.toml                   |  6 +--
 third_party/move/evm/exec-utils/Cargo.toml    |  5 +--
 third_party/move/evm/move-to-yul/Cargo.toml   | 17 ++++----
 .../move-table-extension/Cargo.toml           | 14 +++----
 .../move/move-binary-format/Cargo.toml        |  4 +-
 .../serializer-tests/Cargo.toml               |  4 +-
 .../move/move-bytecode-verifier/Cargo.toml    | 12 ++----
 .../bytecode-verifier-tests/Cargo.toml        |  8 ++--
 .../src/unit_tests/bounds_tests.rs            |  8 ++--
 .../src/unit_tests/signature_tests.rs         |  2 +-
 .../move-bytecode-verifier/fuzz/Cargo.toml    |  9 ++--
 .../invalid-mutations/Cargo.toml              |  9 ++--
 .../transactional-tests/Cargo.toml            |  2 +-
 .../move/move-command-line-common/Cargo.toml  |  3 +-
 third_party/move/move-compiler-v2/Cargo.toml  | 34 ++++++++-------
 .../transactional-tests/Cargo.toml            |  8 ++--
 third_party/move/move-compiler/Cargo.toml     | 18 ++++----
 third_party/move/move-compiler/TODO           | 41 -------------------
 .../transactional-tests/Cargo.toml            |  2 +-
 third_party/move/move-examples/Cargo.toml     |  2 +-
 .../diem-framework/crates/cli/Cargo.toml      | 11 ++---
 .../diem-framework/crates/natives/Cargo.toml  | 10 ++---
 third_party/move/move-ir-compiler/Cargo.toml  | 16 +++-----
 .../move-bytecode-source-map/Cargo.toml       | 15 +++----
 .../move-ir-to-bytecode/Cargo.toml            | 14 +++----
 .../move-ir-to-bytecode/syntax/Cargo.toml     |  8 ++--
 .../transactional-tests/Cargo.toml            |  2 +-
 third_party/move/move-ir/types/Cargo.toml     |  7 ++--
 third_party/move/move-model/Cargo.toml        | 21 ++++------
 .../move-model/bytecode-test-utils/Cargo.toml | 12 +++---
 .../move/move-model/bytecode/Cargo.toml       | 11 +++--
 .../abstract_domain_derive/Cargo.toml         |  2 +-
 third_party/move/move-prover/Cargo.toml       | 25 +++++------
 .../move-prover/boogie-backend/Cargo.toml     | 14 +++----
 .../move-prover/bytecode-pipeline/Cargo.toml  | 14 +++----
 third_party/move/move-prover/lab/Cargo.toml   | 26 ++++--------
 .../move/move-prover/move-abigen/Cargo.toml   | 18 ++++----
 .../move/move-prover/move-docgen/Cargo.toml   | 13 +++---
 .../move-prover/move-errmapgen/Cargo.toml     | 11 ++---
 .../move/move-prover/test-utils/Cargo.toml    |  2 +-
 third_party/move/move-stdlib/Cargo.toml       | 24 +++++------
 .../move/move-vm/integration-tests/Cargo.toml | 21 ++++------
 .../move/move-vm/paranoid-tests/Cargo.toml    |  2 +-
 third_party/move/move-vm/runtime/Cargo.toml   | 19 ++++-----
 .../move/move-vm/test-utils/Cargo.toml        | 11 +++--
 .../move-vm/transactional-tests/Cargo.toml    |  2 +-
 third_party/move/move-vm/types/Cargo.toml     |  7 ++--
 .../module-generation/Cargo.toml              | 13 +++---
 .../transactional-test-runner/Cargo.toml      | 35 ++++++++--------
 .../move/tools/move-bytecode-utils/Cargo.toml |  4 +-
 .../tools/move-bytecode-viewer/Cargo.toml     |  7 ++--
 third_party/move/tools/move-cli/Cargo.toml    | 35 ++++++++--------
 .../move/tools/move-coverage/Cargo.toml       | 14 +++----
 .../move/tools/move-decompiler/Cargo.toml     |  3 +-
 .../move/tools/move-disassembler/Cargo.toml   | 18 ++++----
 .../move/tools/move-explain/Cargo.toml        |  7 ++--
 third_party/move/tools/move-linter/Cargo.toml | 17 ++++----
 .../move/tools/move-package/Cargo.toml        | 34 +++++++--------
 .../tools/move-resource-viewer/Cargo.toml     |  6 +--
 .../move/tools/move-unit-test/Cargo.toml      | 40 ++++++++----------
 63 files changed, 360 insertions(+), 485 deletions(-)
 delete mode 100644 third_party/move/move-compiler/TODO

diff --git a/Cargo.lock b/Cargo.lock
index 4b2486bf5ad728..ca3e47878f1d84 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5914,9 +5914,9 @@ version = "0.1.0"
 dependencies = [
  "fail",
  "hex",
- "invalid-mutations",
  "move-binary-format",
  "move-bytecode-verifier",
+ "move-bytecode-verifier-invalid-mutations",
  "move-core-types",
  "petgraph 0.6.5",
  "proptest",
@@ -9926,15 +9926,6 @@ dependencies = [
  "parking_lot 0.12.1",
 ]
 
-[[package]]
-name = "invalid-mutations"
-version = "0.1.0"
-dependencies = [
- "move-binary-format",
- "move-core-types",
- "proptest",
-]
-
 [[package]]
 name = "io-lifetimes"
 version = "1.0.11"
@@ -11058,15 +11049,24 @@ version = "0.1.0"
 dependencies = [
  "fail",
  "hex-literal",
- "invalid-mutations",
  "move-binary-format",
  "move-borrow-graph",
+ "move-bytecode-verifier-invalid-mutations",
  "move-core-types",
  "petgraph 0.6.5",
  "serde",
  "typed-arena",
 ]
 
+[[package]]
+name = "move-bytecode-verifier-invalid-mutations"
+version = "0.1.0"
+dependencies = [
+ "move-binary-format",
+ "move-core-types",
+ "proptest",
+]
+
 [[package]]
 name = "move-bytecode-viewer"
 version = "0.1.0"
diff --git a/Cargo.toml b/Cargo.toml
index 47644e807048ac..cc429d5c1435df 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -623,6 +623,7 @@ http = "0.2.9"
 httpmock = "0.6.8"
 hyper = { version = "0.14.18", features = ["full"] }
 hyper-tls = "0.5.0"
+im = "15.0.0"
 image = "0.24.5"
 indexmap = "1.9.3"
 include_dir = { version = "0.7.2", features = ["glob"] }
@@ -840,8 +841,12 @@ z3tracer = "0.8.0"
 # MOVE DEPENDENCIES
 move-abigen = { path = "third_party/move/move-prover/move-abigen" }
 move-binary-format = { path = "third_party/move/move-binary-format" }
+move-borrow-graph = { path = "third_party/move/move-borrow-graph" }
+move-bytecode-source-map = { path = "third_party/move/move-ir-compiler/move-bytecode-source-map" }
 move-bytecode-spec = { path = "third_party/move/move-bytecode-spec" }
 move-bytecode-verifier = { path = "third_party/move/move-bytecode-verifier" }
+move-bytecode-verifier-invalid-mutations = { path = "third_party/move/move-bytecode-verifier/invalid-mutations" }
+move-bytecode-viewer = { path = "third_party/move/tools/move-bytecode-viewer" }
 move-bytecode-utils = { path = "third_party/move/tools/move-bytecode-utils" }
 move-cli = { path = "third_party/move/tools/move-cli" }
 move-command-line-common = { path = "third_party/move/move-command-line-common" }
@@ -852,32 +857,29 @@ move-core-types = { path = "third_party/move/move-core/types" }
 move-decompiler = { path = "third_party/move/tools/move-decompiler" }
 move-docgen = { path = "third_party/move/move-prover/move-docgen" }
 move-disassembler = { path = "third_party/move/tools/move-disassembler" }
+move-errmapgen = { path = "third_party/move/move-prover/move-errmapgen" }
 move-ir-types = { path = "third_party/move/move-ir/types" }
 move-ir-compiler = { path = "third_party/move/move-ir-compiler" }
+move-ir-to-bytecode = { path = "third_party/move/move-ir-compiler/move-ir-to-bytecode" }
 move-linter = { path = "third_party/move/tools/move-linter" }
-move-bytecode-source-map = { path = "third_party/move/move-ir-compiler/move-bytecode-source-map" }
 move-model = { path = "third_party/move/move-model" }
 move-package = { path = "third_party/move/tools/move-package" }
 move-prover = { path = "third_party/move/move-prover" }
 move-prover-boogie-backend = { path = "third_party/move/move-prover/boogie-backend" }
 move-prover-bytecode-pipeline = { path = "third_party/move/move-prover/bytecode-pipeline" }
-move-stackless-bytecode = { path = "third_party/move/move-model/bytecode" }
-move-stackless-bytecode-test-utils = { path = "third_party/move/move-model/bytecode-test-utils" }
+move-prover-test-utils = { path = "third_party/move/move-prover/test-utils" }
 aptos-move-stdlib = { path = "aptos-move/framework/move-stdlib" }
 aptos-table-natives = { path = "aptos-move/framework/table-natives" }
-move-prover-test-utils = { path = "third_party/move/move-prover/test-utils" }
 move-resource-viewer = { path = "third_party/move/tools/move-resource-viewer" }
+move-stackless-bytecode = { path = "third_party/move/move-model/bytecode" }
+move-stackless-bytecode-test-utils = { path = "third_party/move/move-model/bytecode-test-utils" }
 move-symbol-pool = { path = "third_party/move/move-symbol-pool" }
 move-table-extension = { path = "third_party/move/extensions/move-table-extension" }
 move-transactional-test-runner = { path = "third_party/move/testing-infra/transactional-test-runner" }
-move-unit-test = { path = "third_party/move/tools/move-unit-test", features = [
-    "table-extension",
-] }
+move-unit-test = { path = "third_party/move/tools/move-unit-test", features = ["table-extension"] }
 move-vm-metrics = { path = "third_party/move/move-vm/metrics" }
 move-vm-runtime = { path = "third_party/move/move-vm/runtime" }
-move-vm-test-utils = { path = "third_party/move/move-vm/test-utils", features = [
-    "table-extension",
-] }
+move-vm-test-utils = { path = "third_party/move/move-vm/test-utils", features = ["table-extension"] }
 move-vm-types = { path = "third_party/move/move-vm/types" }
 
 [profile.release]
diff --git a/aptos-move/framework/move-stdlib/Cargo.toml b/aptos-move/framework/move-stdlib/Cargo.toml
index c14625d18dbd6b..4aa6fd1223f0bc 100644
--- a/aptos-move/framework/move-stdlib/Cargo.toml
+++ b/aptos-move/framework/move-stdlib/Cargo.toml
@@ -15,20 +15,20 @@ aptos-gas-schedule = { workspace = true }
 aptos-native-interface = { workspace = true }
 aptos-types = { workspace = true }
 bcs = { workspace = true }
-move-core-types = { path = "../../../third_party/move/move-core/types" }
-move-vm-runtime = { path = "../../../third_party/move/move-vm/runtime" }
-move-vm-types = { path = "../../../third_party/move/move-vm/types" }
-sha2 = "0.9.3"
-sha3 = "0.9.1"
-smallvec = "1.6.1"
+move-core-types = { workspace = true }
+move-vm-runtime = { workspace = true }
+move-vm-types = { workspace = true }
+sha2 = { workspace = true }
+sha3 = { workspace = true }
+smallvec = { workspace = true }
 
 [dev-dependencies]
 dir-diff = "0.3.2"
 file_diff = "1.0.0"
-move-cli = { path = "../../../third_party/move/tools/move-cli" }
-move-package = { path = "../../../third_party/move/tools/move-package" }
-move-unit-test = { path = "../../../third_party/move/tools/move-unit-test" }
-tempfile = "3.2.0"
+move-cli = { workspace = true }
+move-package = { workspace = true }
+move-unit-test = { workspace = true }
+tempfile = { workspace = true }
 
 [features]
-testing = []
\ No newline at end of file
+testing = []
diff --git a/testsuite/fuzzer/Cargo.toml b/testsuite/fuzzer/Cargo.toml
index 4d8b3d26f2e786..8bad4860718126 100644
--- a/testsuite/fuzzer/Cargo.toml
+++ b/testsuite/fuzzer/Cargo.toml
@@ -10,10 +10,10 @@ aptos-types = { workspace = true }
 arbitrary = { workspace = true }
 base64 = "0.21.7"
 bcs = { workspace = true }
-clap = "4.5.20"
-csv = "1.3.0"
+clap = { workspace = true }
+csv = { workspace = true }
 dearbitrary = { workspace = true }
-hex = "0.4.3"
+hex = { workspace = true }
 move-binary-format = { workspace = true, features = ["fuzzing"] }
 move-core-types = { workspace = true, features = ["fuzzing"] }
 sha2 = { workspace = true }
diff --git a/third_party/move/evm/exec-utils/Cargo.toml b/third_party/move/evm/exec-utils/Cargo.toml
index 80736821c59121..faf398bc4de1d5 100644
--- a/third_party/move/evm/exec-utils/Cargo.toml
+++ b/third_party/move/evm/exec-utils/Cargo.toml
@@ -12,10 +12,7 @@ anyhow = { workspace = true }
 evm = { workspace = true }
 evm-runtime = { workspace = true }
 hex = { workspace = true }
+move-command-line-common = { workspace = true }
 primitive-types = { workspace = true }
-# external dependencies
 sha3 = { workspace = true }
 tempfile = { workspace = true }
-
-# move dependencies
-move-command-line-common = { path = "../../move-command-line-common" }
diff --git a/third_party/move/evm/move-to-yul/Cargo.toml b/third_party/move/evm/move-to-yul/Cargo.toml
index b979d3af1ff3d1..7f8c0704e2c01f 100644
--- a/third_party/move/evm/move-to-yul/Cargo.toml
+++ b/third_party/move/evm/move-to-yul/Cargo.toml
@@ -8,15 +8,6 @@ edition = "2021"
 license = "Apache-2.0"
 
 [dependencies]
-move-command-line-common = { path = "../../move-command-line-common" }
-move-compiler = { path = "../../move-compiler" }
-move-core-types = { path = "../../move-core/types" }
-move-ethereum-abi = { path = "../move-ethereum-abi" }
-move-model = { path = "../../move-model" }
-# move dependencies
-move-stackless-bytecode = { path = "../../move-model/bytecode" }
-
-# external dependencies
 anyhow = { workspace = true }
 atty = { workspace = true }
 clap = { workspace = true }
@@ -26,6 +17,12 @@ ethnum = { workspace = true }
 evm = { workspace = true }
 itertools = { workspace = true }
 maplit = { workspace = true }
+move-command-line-common = { workspace = true }
+move-compiler = { workspace = true }
+move-core-types = { workspace = true }
+move-ethereum-abi = { path = "../move-ethereum-abi" }
+move-model = { workspace = true }
+move-stackless-bytecode = { workspace = true }
 once_cell = { workspace = true }
 primitive-types = { workspace = true }
 regex = { workspace = true }
@@ -36,7 +33,7 @@ sha3 = { workspace = true }
 datatest-stable = { workspace = true }
 evm = { workspace = true }
 evm-exec-utils = { path = "../exec-utils" }
-move-prover-test-utils = { path = "../../move-prover/test-utils" }
+move-prover-test-utils = { workspace = true }
 move-stdlib = { path = "../../move-stdlib" }
 tempfile = { workspace = true }
 walkdir = { workspace = true }
diff --git a/third_party/move/extensions/move-table-extension/Cargo.toml b/third_party/move/extensions/move-table-extension/Cargo.toml
index 1dee926a611e0e..07a9759b45b563 100644
--- a/third_party/move/extensions/move-table-extension/Cargo.toml
+++ b/third_party/move/extensions/move-table-extension/Cargo.toml
@@ -11,16 +11,16 @@ publish = false
 [dependencies]
 better_any = { workspace = true }
 bytes = { workspace = true }
-move-binary-format = { path = "../../move-binary-format" }
-move-core-types = { path = "../../move-core/types" }
-move-vm-runtime = { path = "../../move-vm/runtime" }
-move-vm-types = { path = "../../move-vm/types" }
+move-binary-format = { workspace = true }
+move-core-types = { workspace = true }
+move-vm-runtime = { workspace = true }
+move-vm-types = { workspace = true }
 sha3 = { workspace = true }
 smallvec = { workspace = true }
 
 [dev-dependencies]
-move-cli = { path = "../../tools/move-cli" }
-move-package = { path = "../../tools/move-package" }
+move-cli = { workspace = true }
+move-package = { workspace = true }
 move-stdlib = { path = "../../move-stdlib", features = ["testing"] }
-move-unit-test = { path = "../../tools/move-unit-test", features = ["table-extension"] }
+move-unit-test = { workspace = true, features = ["table-extension"] }
 tempfile = { workspace = true }
diff --git a/third_party/move/move-binary-format/Cargo.toml b/third_party/move/move-binary-format/Cargo.toml
index 18024c2d916695..a701e9992c192b 100644
--- a/third_party/move/move-binary-format/Cargo.toml
+++ b/third_party/move/move-binary-format/Cargo.toml
@@ -16,7 +16,7 @@ backtrace = { workspace = true }
 dearbitrary = { workspace = true, optional = true, features = ["derive"] }
 indexmap = { workspace = true }
 move-bytecode-spec = { workspace = true }
-move-core-types = { path = "../move-core/types" }
+move-core-types = { workspace = true }
 proptest = { workspace = true, optional = true }
 proptest-derive = { workspace = true, optional = true }
 ref-cast = { workspace = true }
@@ -24,7 +24,7 @@ serde = { workspace = true }
 variant_count = { workspace = true }
 
 [dev-dependencies]
-move-core-types = { path = "../move-core/types", features = ["fuzzing"] }
+move-core-types = { workspace = true, features = ["fuzzing"] }
 proptest = { workspace = true }
 proptest-derive = { workspace = true }
 serde_json = { workspace = true }
diff --git a/third_party/move/move-binary-format/serializer-tests/Cargo.toml b/third_party/move/move-binary-format/serializer-tests/Cargo.toml
index b83bf8a437565e..8dd29651dec5c0 100644
--- a/third_party/move/move-binary-format/serializer-tests/Cargo.toml
+++ b/third_party/move/move-binary-format/serializer-tests/Cargo.toml
@@ -10,8 +10,8 @@ publish = false
 edition = "2021"
 
 [dev-dependencies]
-move-binary-format = { path = "../", features = ["fuzzing"] }
-move-core-types = { path = "../../move-core/types" }
+move-binary-format = { workspace = true, features = ["fuzzing"] }
+move-core-types = { workspace = true }
 proptest = { workspace = true }
 proptest-derive = { workspace = true }
 
diff --git a/third_party/move/move-bytecode-verifier/Cargo.toml b/third_party/move/move-bytecode-verifier/Cargo.toml
index 9085bb18163730..2f506216981e2b 100644
--- a/third_party/move/move-bytecode-verifier/Cargo.toml
+++ b/third_party/move/move-bytecode-verifier/Cargo.toml
@@ -11,17 +11,13 @@ edition = "2021"
 
 [dependencies]
 fail = { workspace = true }
-move-binary-format = { path = "../move-binary-format" }
+move-binary-format = { workspace = true }
+move-borrow-graph = { workspace = true }
+move-core-types = { workspace = true }
 petgraph = { workspace = true }
 serde = { workspace = true }
 typed-arena = { workspace = true }
 
-move-borrow-graph = { path = "../move-borrow-graph" }
-move-core-types = { path = "../move-core/types" }
-
 [dev-dependencies]
 hex-literal = { workspace = true }
-invalid-mutations = { path = "invalid-mutations" }
-
-[features]
-default = []
+move-bytecode-verifier-invalid-mutations = { workspace = true }
diff --git a/third_party/move/move-bytecode-verifier/bytecode-verifier-tests/Cargo.toml b/third_party/move/move-bytecode-verifier/bytecode-verifier-tests/Cargo.toml
index 4e5c437cddfdb9..30c43d5d75f320 100644
--- a/third_party/move/move-bytecode-verifier/bytecode-verifier-tests/Cargo.toml
+++ b/third_party/move/move-bytecode-verifier/bytecode-verifier-tests/Cargo.toml
@@ -12,10 +12,10 @@ edition = "2021"
 [dev-dependencies]
 fail = { workspace = true, features = ['failpoints'] }
 hex = { workspace = true }
-invalid-mutations = { path = "../invalid-mutations" }
-move-binary-format = { path = "../../move-binary-format", features = ["fuzzing"] }
-move-bytecode-verifier = { path = "../" }
-move-core-types = { path = "../../move-core/types" }
+move-binary-format = { workspace = true, features = ["fuzzing"] }
+move-bytecode-verifier = { workspace = true }
+move-bytecode-verifier-invalid-mutations = { workspace = true }
+move-core-types = { workspace = true }
 petgraph = { workspace = true }
 proptest = { workspace = true }
 
diff --git a/third_party/move/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/bounds_tests.rs b/third_party/move/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/bounds_tests.rs
index 506a027f75778d..081ed67a5f4ff7 100644
--- a/third_party/move/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/bounds_tests.rs
+++ b/third_party/move/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/bounds_tests.rs
@@ -2,14 +2,14 @@
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
-use invalid_mutations::bounds::{
-    ApplyCodeUnitBoundsContext, ApplyOutOfBoundsContext, CodeUnitBoundsMutation,
-    OutOfBoundsMutation,
-};
 use move_binary_format::{
     check_bounds::BoundsChecker, file_format::*, file_format_common,
     proptest_types::CompiledModuleStrategyGen,
 };
+use move_bytecode_verifier_invalid_mutations::bounds::{
+    ApplyCodeUnitBoundsContext, ApplyOutOfBoundsContext, CodeUnitBoundsMutation,
+    OutOfBoundsMutation,
+};
 use move_core_types::{
     account_address::AccountAddress, identifier::Identifier, vm_status::StatusCode,
 };
diff --git a/third_party/move/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/signature_tests.rs b/third_party/move/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/signature_tests.rs
index e7b9f123d8b86d..4010c58543315b 100644
--- a/third_party/move/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/signature_tests.rs
+++ b/third_party/move/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/signature_tests.rs
@@ -2,13 +2,13 @@
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
-use invalid_mutations::signature::{FieldRefMutation, SignatureRefMutation};
 use move_binary_format::file_format::{
     Bytecode::*, CompiledModule, SignatureToken::*, Visibility::Public, *,
 };
 use move_bytecode_verifier::{
     verify_module, verify_module_with_config_for_test, SignatureChecker, VerifierConfig,
 };
+use move_bytecode_verifier_invalid_mutations::signature::{FieldRefMutation, SignatureRefMutation};
 use move_core_types::{
     account_address::AccountAddress, identifier::Identifier, vm_status::StatusCode,
 };
diff --git a/third_party/move/move-bytecode-verifier/fuzz/Cargo.toml b/third_party/move/move-bytecode-verifier/fuzz/Cargo.toml
index c89658cc77f8cc..7de0a965aba799 100644
--- a/third_party/move/move-bytecode-verifier/fuzz/Cargo.toml
+++ b/third_party/move/move-bytecode-verifier/fuzz/Cargo.toml
@@ -12,12 +12,9 @@ cargo-fuzz = true
 [dependencies]
 arbitrary = { workspace = true }
 libfuzzer-sys = { workspace = true }
-move-binary-format = { path = "../../move-binary-format", features = ["fuzzing"] }
-move-bytecode-verifier = { path = "../" }
-move-core-types = { path = "../../move-core/types", features = ["fuzzing"] }
-# Prevent this from interfering with workspaces
-#[workspace]
-#members = ["."]
+move-binary-format = { workspace = true, features = ["fuzzing"] }
+move-bytecode-verifier = { workspace = true }
+move-core-types = { workspace = true, features = ["fuzzing"] }
 
 [[bin]]
 name = "code_unit"
diff --git a/third_party/move/move-bytecode-verifier/invalid-mutations/Cargo.toml b/third_party/move/move-bytecode-verifier/invalid-mutations/Cargo.toml
index 77a835ecfbb2d0..db099869774ecc 100644
--- a/third_party/move/move-bytecode-verifier/invalid-mutations/Cargo.toml
+++ b/third_party/move/move-bytecode-verifier/invalid-mutations/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "invalid-mutations"
+name = "move-bytecode-verifier-invalid-mutations"
 version = "0.1.0"
 edition = "2021"
 authors = ["Diem Association <opensource@diem.com>"]
@@ -10,9 +10,6 @@ license = "Apache-2.0"
 publish = false
 
 [dependencies]
-move-binary-format = { path = "../../move-binary-format" }
-move-core-types = { path = "../../move-core/types" }
+move-binary-format = { workspace = true }
+move-core-types = { workspace = true }
 proptest = { workspace = true }
-
-[features]
-default = []
diff --git a/third_party/move/move-bytecode-verifier/transactional-tests/Cargo.toml b/third_party/move/move-bytecode-verifier/transactional-tests/Cargo.toml
index 2e346e12b13d96..c65d4f675b63f8 100644
--- a/third_party/move/move-bytecode-verifier/transactional-tests/Cargo.toml
+++ b/third_party/move/move-bytecode-verifier/transactional-tests/Cargo.toml
@@ -8,7 +8,7 @@ license = "Apache-2.0"
 
 [dev-dependencies]
 datatest-stable = { workspace = true }
-move-transactional-test-runner = { path = "../../testing-infra/transactional-test-runner" }
+move-transactional-test-runner = { workspace = true }
 
 [[test]]
 name = "tests"
diff --git a/third_party/move/move-command-line-common/Cargo.toml b/third_party/move/move-command-line-common/Cargo.toml
index 4030dbe59abe92..7fc21855f506bb 100644
--- a/third_party/move/move-command-line-common/Cargo.toml
+++ b/third_party/move/move-command-line-common/Cargo.toml
@@ -14,10 +14,9 @@ anyhow = { workspace = true }
 difference = { workspace = true }
 dirs-next = { workspace = true }
 hex = { workspace = true }
+move-core-types = { workspace = true }
 num-bigint = { workspace = true }
 once_cell = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 sha2 = { workspace = true }
 walkdir = { workspace = true }
-
-move-core-types = { path = "../move-core/types" }
diff --git a/third_party/move/move-compiler-v2/Cargo.toml b/third_party/move/move-compiler-v2/Cargo.toml
index 90255ab170a9ca..f24853b9f9b2ba 100644
--- a/third_party/move/move-compiler-v2/Cargo.toml
+++ b/third_party/move/move-compiler-v2/Cargo.toml
@@ -13,37 +13,35 @@ edition = "2021"
 abstract-domain-derive = { path = "../move-model/bytecode/abstract_domain_derive" }
 anyhow = { workspace = true }
 bcs = { workspace = true }
-move-binary-format = { path = "../move-binary-format" }
-move-borrow-graph = { path = "../move-borrow-graph" }
-move-bytecode-source-map = { path = "../move-ir-compiler/move-bytecode-source-map" }
-move-bytecode-verifier = { path = "../move-bytecode-verifier" }
-move-command-line-common = { path = "../move-command-line-common" }
-move-compiler = { path = "../move-compiler" }
-move-core-types = { path = "../move-core/types" }
-move-disassembler = { path = "../tools/move-disassembler" }
-move-ir-types = { path = "../move-ir/types" }
-move-model = { path = "../move-model" }
-move-stackless-bytecode = { path = "../move-model/bytecode" }
-move-symbol-pool = { path = "../move-symbol-pool" }
-
 clap = { workspace = true, features = ["derive", "env"] }
 codespan-reporting = { workspace = true, features = ["serde", "serialization"] }
 ethnum = { workspace = true }
 flexi_logger = { workspace = true }
-im = "15.0.0"
+im = { workspace = true }
 itertools = { workspace = true }
 log = { workspace = true, features = ["serde"] }
+move-binary-format = { workspace = true }
+move-borrow-graph = { workspace = true }
+move-bytecode-source-map = { workspace = true }
+move-bytecode-verifier = { workspace = true }
+move-command-line-common = { workspace = true }
+move-compiler = { workspace = true }
+move-core-types = { workspace = true }
+move-disassembler = { workspace = true }
+move-ir-types = { workspace = true }
+move-model = { workspace = true }
+move-stackless-bytecode = { workspace = true }
+move-symbol-pool = { workspace = true }
 num = { workspace = true }
 once_cell = { workspace = true }
-#paste = "1.0.5"
 petgraph = { workspace = true }
 
 [dev-dependencies]
 anyhow = { workspace = true }
 datatest-stable = { workspace = true }
-move-command-line-common = { path = "../move-command-line-common" }
-move-ir-types = { path = "../move-ir/types" }
-move-prover-test-utils = { path = "../move-prover/test-utils" }
+move-command-line-common = { workspace = true }
+move-ir-types = { workspace = true }
+move-prover-test-utils = { workspace = true }
 move-stdlib = { path = "../move-stdlib" }
 walkdir = { workspace = true }
 
diff --git a/third_party/move/move-compiler-v2/transactional-tests/Cargo.toml b/third_party/move/move-compiler-v2/transactional-tests/Cargo.toml
index d8110ee7ae77ff..8a8cccc3dd3637 100644
--- a/third_party/move/move-compiler-v2/transactional-tests/Cargo.toml
+++ b/third_party/move/move-compiler-v2/transactional-tests/Cargo.toml
@@ -7,15 +7,15 @@ edition = "2021"
 license = "Apache-2.0"
 
 [dependencies]
-move-command-line-common = { path = "../../move-command-line-common" }
+move-command-line-common = { workspace = true }
 once_cell = { workspace = true }
 
 [dev-dependencies]
 datatest-stable = { workspace = true }
 itertools = { workspace = true }
-move-compiler-v2 = { path = ".." }
-move-model = { path = "../../move-model" }
-move-transactional-test-runner = { path = "../../testing-infra/transactional-test-runner" }
+move-compiler-v2 = { workspace = true }
+move-model = { workspace = true }
+move-transactional-test-runner = { workspace = true }
 walkdir = { workspace = true }
 
 [[test]]
diff --git a/third_party/move/move-compiler/Cargo.toml b/third_party/move/move-compiler/Cargo.toml
index 038362bf81b09d..522ec440dcc87f 100644
--- a/third_party/move/move-compiler/Cargo.toml
+++ b/third_party/move/move-compiler/Cargo.toml
@@ -19,15 +19,15 @@ tempfile = { workspace = true }
 
 bcs = { workspace = true }
 
-move-binary-format = { path = "../move-binary-format" }
-move-borrow-graph = { path = "../move-borrow-graph" }
-move-bytecode-source-map = { path = "../move-ir-compiler/move-bytecode-source-map" }
-move-bytecode-verifier = { path = "../move-bytecode-verifier" }
-move-command-line-common = { path = "../move-command-line-common" }
-move-core-types = { path = "../move-core/types" }
-move-ir-to-bytecode = { path = "../move-ir-compiler/move-ir-to-bytecode" }
-move-ir-types = { path = "../move-ir/types" }
-move-symbol-pool = { path = "../move-symbol-pool" }
+move-binary-format = { workspace = true }
+move-borrow-graph = { workspace = true }
+move-bytecode-source-map = { workspace = true }
+move-bytecode-verifier = { workspace = true }
+move-command-line-common = { workspace = true }
+move-core-types = { workspace = true }
+move-ir-to-bytecode = { workspace = true }
+move-ir-types = { workspace = true }
+move-symbol-pool = { workspace = true }
 
 [dev-dependencies]
 datatest-stable = { workspace = true }
diff --git a/third_party/move/move-compiler/TODO b/third_party/move/move-compiler/TODO
deleted file mode 100644
index fc8a05e8052c62..00000000000000
--- a/third_party/move/move-compiler/TODO
+++ /dev/null
@@ -1,41 +0,0 @@
-# P0
-
-## Soundness
-
-* SCC generic check
-
-## Cohesion
-
-* Type inference nonsense (overtightened in types from parsing to typing)
-
-# P1
-
-* Function args with `_`
-
-# P2
-
-* suggest copy or *& on inferred duplicate move of affine types
-* Traits on AST/Context
-* Context in separate files
-* location stack tracking
-  if (true) R{} else R{} points to unused resource really weirdly
-* Better messages for unexpected exps in Expansion passes
-* Stop using box::leak and atomicusize, pass around compilation context
-* Address aliases
-* Using all sorts of aliases in error messages
-  * i.e. 0x00000000000000384028920984.M.S becomes Sender.M.S
-
-# P3
-
-* Dead resource/struct decls
-* Dead field decls
-* Unused type params
-* Plurals in errors
-* .. patterns in lvalues for structs
-* move out of owned struct fields
-  * supporting x.f where x: S (i.e. move x.f)
-
-# P4
-
-* improve language character set
-* improve comments
diff --git a/third_party/move/move-compiler/transactional-tests/Cargo.toml b/third_party/move/move-compiler/transactional-tests/Cargo.toml
index 4a61fbf336685d..cad9ae2a4bcef0 100644
--- a/third_party/move/move-compiler/transactional-tests/Cargo.toml
+++ b/third_party/move/move-compiler/transactional-tests/Cargo.toml
@@ -8,7 +8,7 @@ license = "Apache-2.0"
 
 [dev-dependencies]
 datatest-stable = { workspace = true }
-move-transactional-test-runner = { path = "../../testing-infra/transactional-test-runner" }
+move-transactional-test-runner = { workspace = true }
 
 [[test]]
 name = "tests"
diff --git a/third_party/move/move-examples/Cargo.toml b/third_party/move/move-examples/Cargo.toml
index 89f791811f4828..0df69fbb215cf8 100644
--- a/third_party/move/move-examples/Cargo.toml
+++ b/third_party/move/move-examples/Cargo.toml
@@ -10,7 +10,7 @@ publish = false
 [dependencies]
 
 [dev-dependencies]
-move-cli = { path = "../tools/move-cli" }
+move-cli = { workspace = true }
 move-stdlib = { path = "../move-stdlib" }
 
 [features]
diff --git a/third_party/move/move-examples/diem-framework/crates/cli/Cargo.toml b/third_party/move/move-examples/diem-framework/crates/cli/Cargo.toml
index 54191f06121d68..a8dfc0cced2065 100644
--- a/third_party/move/move-examples/diem-framework/crates/cli/Cargo.toml
+++ b/third_party/move/move-examples/diem-framework/crates/cli/Cargo.toml
@@ -10,14 +10,11 @@ edition = "2021"
 [dependencies]
 anyhow = { workspace = true }
 clap = { workspace = true, features = ["derive"] }
-
-move-cli = { path = "../../../../../tools/move-cli" }
-move-core-types = { path = "../../../../../move-core/types" }
-
-move-stdlib = { path = "../../../../../move-stdlib" }
-move-vm-test-utils = { path = "../../../../../move-vm/test-utils" }
-
 diem-framework-natives = { path = "../natives" }
+move-cli = { workspace = true }
+move-core-types = { workspace = true }
+move-stdlib = { path = "../../../../move-stdlib" }
+move-vm-test-utils = { workspace = true }
 
 [dev-dependencies]
 datatest-stable = { workspace = true }
diff --git a/third_party/move/move-examples/diem-framework/crates/natives/Cargo.toml b/third_party/move/move-examples/diem-framework/crates/natives/Cargo.toml
index bb093436b9f69a..86171b086b8ecc 100644
--- a/third_party/move/move-examples/diem-framework/crates/natives/Cargo.toml
+++ b/third_party/move/move-examples/diem-framework/crates/natives/Cargo.toml
@@ -7,11 +7,9 @@ edition = "2021"
 license = "Apache-2.0"
 
 [dependencies]
-move-binary-format = { path = "../../../../../move-binary-format" }
-move-core-types = { path = "../../../../../move-core/types" }
-move-vm-runtime = { path = "../../../../../move-vm/runtime" }
-move-vm-types = { path = "../../../../../move-vm/types" }
-
 diem-crypto = { path = "../crypto" }
-
+move-binary-format = { workspace = true }
+move-core-types = { workspace = true }
+move-vm-runtime = { workspace = true }
+move-vm-types = { workspace = true }
 smallvec = { workspace = true }
diff --git a/third_party/move/move-ir-compiler/Cargo.toml b/third_party/move/move-ir-compiler/Cargo.toml
index 4a558246d37ec6..0b3752139faf1e 100644
--- a/third_party/move/move-ir-compiler/Cargo.toml
+++ b/third_party/move/move-ir-compiler/Cargo.toml
@@ -11,15 +11,11 @@ edition = "2021"
 
 [dependencies]
 anyhow = { workspace = true }
+bcs = { workspace = true }
 clap = { workspace = true, features = ["derive"] }
-move-binary-format = { path = "../move-binary-format" }
-move-bytecode-source-map = { path = "move-bytecode-source-map" }
-move-bytecode-verifier = { path = "../move-bytecode-verifier" }
-move-command-line-common = { path = "../move-command-line-common" }
-move-ir-to-bytecode = { path = "move-ir-to-bytecode" }
+move-binary-format = { workspace = true }
+move-bytecode-source-map = { workspace = true }
+move-bytecode-verifier = { workspace = true }
+move-command-line-common = { workspace = true }
+move-ir-to-bytecode = { workspace = true }
 serde_json = { workspace = true }
-
-bcs = { workspace = true }
-
-[features]
-default = []
diff --git a/third_party/move/move-ir-compiler/move-bytecode-source-map/Cargo.toml b/third_party/move/move-ir-compiler/move-bytecode-source-map/Cargo.toml
index 434bccf85ac8d7..b7428bba989851 100644
--- a/third_party/move/move-ir-compiler/move-bytecode-source-map/Cargo.toml
+++ b/third_party/move/move-ir-compiler/move-bytecode-source-map/Cargo.toml
@@ -8,15 +8,10 @@ edition = "2021"
 
 [dependencies]
 anyhow = { workspace = true }
-move-binary-format = { path = "../../move-binary-format" }
-move-command-line-common = { path = "../../move-command-line-common" }
-move-core-types = { path = "../../move-core/types" }
-move-ir-types = { path = "../../move-ir/types" }
-move-symbol-pool = { path = "../../move-symbol-pool" }
-
 bcs = { workspace = true }
-
+move-binary-format = { workspace = true }
+move-command-line-common = { workspace = true }
+move-core-types = { workspace = true }
+move-ir-types = { workspace = true }
+move-symbol-pool = { workspace = true }
 serde = { workspace = true }
-
-[features]
-default = []
diff --git a/third_party/move/move-ir-compiler/move-ir-to-bytecode/Cargo.toml b/third_party/move/move-ir-compiler/move-ir-to-bytecode/Cargo.toml
index cf897818ea2ad4..27d17fbbefb69e 100644
--- a/third_party/move/move-ir-compiler/move-ir-to-bytecode/Cargo.toml
+++ b/third_party/move/move-ir-compiler/move-ir-to-bytecode/Cargo.toml
@@ -13,14 +13,12 @@ edition = "2021"
 anyhow = { workspace = true }
 codespan-reporting = { workspace = true }
 log = { workspace = true }
-move-binary-format = { path = "../../move-binary-format" }
-move-bytecode-source-map = { path = "../move-bytecode-source-map" }
-move-command-line-common = { path = "../../move-command-line-common" }
-move-core-types = { path = "../../move-core/types" }
+move-binary-format = { workspace = true }
+move-bytecode-source-map = { workspace = true }
+move-command-line-common = { workspace = true }
+move-core-types = { workspace = true }
 move-ir-to-bytecode-syntax = { path = "syntax" }
-move-ir-types = { path = "../../move-ir/types" }
-move-symbol-pool = { path = "../../move-symbol-pool" }
+move-ir-types = { workspace = true }
+move-symbol-pool = { workspace = true }
 ouroboros = { workspace = true }
 
-[features]
-default = []
diff --git a/third_party/move/move-ir-compiler/move-ir-to-bytecode/syntax/Cargo.toml b/third_party/move/move-ir-compiler/move-ir-to-bytecode/syntax/Cargo.toml
index 35e53bfe51bae5..438ecddaef18be 100644
--- a/third_party/move/move-ir-compiler/move-ir-to-bytecode/syntax/Cargo.toml
+++ b/third_party/move/move-ir-compiler/move-ir-to-bytecode/syntax/Cargo.toml
@@ -12,10 +12,10 @@ edition = "2021"
 [dependencies]
 anyhow = { workspace = true }
 hex = { workspace = true }
-move-command-line-common = { path = "../../../move-command-line-common" }
-move-core-types = { path = "../../../move-core/types" }
-move-ir-types = { path = "../../../move-ir/types" }
-move-symbol-pool = { path = "../../../move-symbol-pool" }
+move-command-line-common = { workspace = true }
+move-core-types = { workspace = true }
+move-ir-types = { workspace = true }
+move-symbol-pool = { workspace = true }
 
 [features]
 default = []
diff --git a/third_party/move/move-ir-compiler/transactional-tests/Cargo.toml b/third_party/move/move-ir-compiler/transactional-tests/Cargo.toml
index 84bd5b1309565b..cdbe4757857f5e 100644
--- a/third_party/move/move-ir-compiler/transactional-tests/Cargo.toml
+++ b/third_party/move/move-ir-compiler/transactional-tests/Cargo.toml
@@ -8,7 +8,7 @@ license = "Apache-2.0"
 
 [dev-dependencies]
 datatest-stable = { workspace = true }
-move-transactional-test-runner = { path = "../../testing-infra/transactional-test-runner" }
+move-transactional-test-runner = { workspace = true }
 
 [[test]]
 name = "tests"
diff --git a/third_party/move/move-ir/types/Cargo.toml b/third_party/move/move-ir/types/Cargo.toml
index adf98dc221acef..9b040edc45b1fa 100644
--- a/third_party/move/move-ir/types/Cargo.toml
+++ b/third_party/move/move-ir/types/Cargo.toml
@@ -12,9 +12,8 @@ edition = "2021"
 
 [dependencies]
 hex = { workspace = true }
-move-command-line-common = { path = "../../move-command-line-common" }
+move-command-line-common = { workspace = true }
+move-core-types = { workspace = true }
+move-symbol-pool = { workspace = true }
 once_cell = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
-
-move-core-types = { path = "../../move-core/types" }
-move-symbol-pool = { path = "../../move-symbol-pool" }
diff --git a/third_party/move/move-model/Cargo.toml b/third_party/move/move-model/Cargo.toml
index 820a2b5b5af9b2..a63e2cc297897d 100644
--- a/third_party/move/move-model/Cargo.toml
+++ b/third_party/move/move-model/Cargo.toml
@@ -8,23 +8,20 @@ license = "Apache-2.0"
 
 [dependencies]
 anyhow = { workspace = true }
-move-binary-format = { path = "../move-binary-format" }
-move-bytecode-source-map = { path = "../move-ir-compiler/move-bytecode-source-map" }
-move-command-line-common = { path = "../move-command-line-common" }
-# diem dependencies
-move-compiler = { path = "../move-compiler" }
-move-core-types = { path = "../move-core/types" }
-move-disassembler = { path = "../tools/move-disassembler" }
-move-ir-types = { path = "../move-ir/types" }
-move-symbol-pool = { path = "../move-symbol-pool" }
-
-# external dependencies
 codespan = { workspace = true }
 codespan-reporting = { workspace = true }
 either = { workspace = true }
 internment = { workspace = true, features = ["arc"] }
 itertools = { workspace = true }
 log = { workspace = true }
+move-binary-format = { workspace = true }
+move-bytecode-source-map = { workspace = true }
+move-command-line-common = { workspace = true }
+move-compiler = { workspace = true }
+move-core-types = { workspace = true }
+move-disassembler = { workspace = true }
+move-ir-types = { workspace = true }
+move-symbol-pool = { workspace = true }
 num = { workspace = true }
 num-traits = { workspace = true }
 once_cell = { workspace = true }
@@ -33,7 +30,7 @@ serde = { workspace = true, features = ["derive"] }
 
 [dev-dependencies]
 datatest-stable = { workspace = true }
-move-prover-test-utils = { path = "../move-prover/test-utils" }
+move-prover-test-utils = { workspace = true }
 
 [[test]]
 name = "testsuite"
diff --git a/third_party/move/move-model/bytecode-test-utils/Cargo.toml b/third_party/move/move-model/bytecode-test-utils/Cargo.toml
index eb622da8f865bd..2b31cc3b0a5090 100644
--- a/third_party/move/move-model/bytecode-test-utils/Cargo.toml
+++ b/third_party/move/move-model/bytecode-test-utils/Cargo.toml
@@ -12,10 +12,10 @@ edition = "2021"
 [dependencies]
 anyhow = { workspace = true }
 codespan-reporting = { workspace = true, features = ["serde", "serialization"] }
-move-command-line-common = { path = "../../move-command-line-common" }
-move-compiler = { path = "../../move-compiler" }
-move-compiler-v2 = { path = "../../move-compiler-v2" }
-move-model = { path = ".." }
-move-prover-test-utils = { path = "../../move-prover/test-utils" }
-move-stackless-bytecode = { path = "../bytecode" }
+move-command-line-common = { workspace = true }
+move-compiler = { workspace = true }
+move-compiler-v2 = { workspace = true }
+move-model = { workspace = true }
+move-prover-test-utils = { workspace = true }
+move-stackless-bytecode = { workspace = true }
 move-stdlib = { path = "../../move-stdlib" }
diff --git a/third_party/move/move-model/bytecode/Cargo.toml b/third_party/move/move-model/bytecode/Cargo.toml
index 55fca5723dfb2c..8770e6f4b981c0 100644
--- a/third_party/move/move-model/bytecode/Cargo.toml
+++ b/third_party/move/move-model/bytecode/Cargo.toml
@@ -11,16 +11,15 @@ edition = "2021"
 
 [dependencies]
 abstract-domain-derive = { path = "./abstract_domain_derive" }
-move-binary-format = { path = "../../move-binary-format" }
-move-core-types = { path = "../../move-core/types" }
-move-model = { path = ".." }
-
 anyhow = { workspace = true }
 codespan-reporting = { workspace = true, features = ["serde", "serialization"] }
 ethnum = { workspace = true }
-im = "15.0.0"
+im = { workspace = true }
 itertools = { workspace = true }
 log = { workspace = true }
+move-binary-format = { workspace = true }
+move-core-types = { workspace = true }
+move-model = { workspace = true }
 num = { workspace = true }
 paste = { workspace = true }
 petgraph = { workspace = true }
@@ -30,7 +29,7 @@ try_match = { workspace = true }
 [dev-dependencies]
 anyhow = { workspace = true }
 datatest-stable = { workspace = true }
-move-stackless-bytecode-test-utils = { path = "../bytecode-test-utils" }
+move-stackless-bytecode-test-utils = { workspace = true }
 
 [features]
 default = []
diff --git a/third_party/move/move-model/bytecode/abstract_domain_derive/Cargo.toml b/third_party/move/move-model/bytecode/abstract_domain_derive/Cargo.toml
index 27a8a2c0fb76f8..2c183c63884089 100644
--- a/third_party/move/move-model/bytecode/abstract_domain_derive/Cargo.toml
+++ b/third_party/move/move-model/bytecode/abstract_domain_derive/Cargo.toml
@@ -15,4 +15,4 @@ quote = { workspace = true }
 proc-macro2 = { workspace = true }
 
 [dev-dependencies]
-move-stackless-bytecode = { path = ".." }
+move-stackless-bytecode = { workspace = true }
diff --git a/third_party/move/move-prover/Cargo.toml b/third_party/move/move-prover/Cargo.toml
index 2609f4abd3c10b..12b76dec756978 100644
--- a/third_party/move/move-prover/Cargo.toml
+++ b/third_party/move/move-prover/Cargo.toml
@@ -8,24 +8,21 @@ license = "Apache-2.0"
 
 [dependencies]
 anyhow = { workspace = true }
-move-abigen = { path = "move-abigen" }
-move-command-line-common = { path = "../move-command-line-common" }
-move-compiler = { path = "../move-compiler" }
-move-compiler-v2 = { path = "../move-compiler-v2" }
-move-docgen = { path = "move-docgen" }
-move-errmapgen = { path = "move-errmapgen" }
-move-model = { path = "../move-model" }
-# move dependencies
-move-prover-boogie-backend = { path = "boogie-backend" }
-move-prover-bytecode-pipeline = { path = "bytecode-pipeline" }
-move-stackless-bytecode = { path = "../move-model/bytecode" }
-
-# external dependencies
 atty = { workspace = true }
 clap = { workspace = true, features = ["derive"] }
 codespan-reporting = { workspace = true }
 itertools = { workspace = true }
 log = { workspace = true, features = ["serde"] }
+move-abigen = { workspace = true }
+move-command-line-common = { workspace = true }
+move-compiler = { workspace = true }
+move-compiler-v2 = { workspace = true }
+move-docgen = { workspace = true }
+move-errmapgen = { workspace = true }
+move-model = { workspace = true }
+move-prover-boogie-backend = { workspace = true }
+move-prover-bytecode-pipeline = { workspace = true }
+move-stackless-bytecode  = { workspace = true }
 once_cell = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 simplelog = { workspace = true }
@@ -33,7 +30,7 @@ toml = { workspace = true }
 
 [dev-dependencies]
 datatest-stable = { workspace = true }
-move-prover-test-utils = { path = "test-utils" }
+move-prover-test-utils = { workspace = true }
 shell-words = { workspace = true }
 tempfile = { workspace = true }
 walkdir = { workspace = true }
diff --git a/third_party/move/move-prover/boogie-backend/Cargo.toml b/third_party/move/move-prover/boogie-backend/Cargo.toml
index 690d0700406395..7ba19d237e5707 100644
--- a/third_party/move/move-prover/boogie-backend/Cargo.toml
+++ b/third_party/move/move-prover/boogie-backend/Cargo.toml
@@ -15,13 +15,13 @@ codespan-reporting = { workspace = true }
 futures = { workspace = true }
 itertools = { workspace = true }
 log = { workspace = true }
-move-binary-format = { path = "../../move-binary-format" }
-move-command-line-common = { path = "../../move-command-line-common" }
-move-compiler = { path = "../../move-compiler" }
-move-core-types = { path = "../../move-core/types" }
-move-model = { path = "../../move-model" }
-move-prover-bytecode-pipeline = { path = "../bytecode-pipeline" }
-move-stackless-bytecode = { path = "../../move-model/bytecode" }
+move-binary-format = { workspace = true }
+move-command-line-common = { workspace = true }
+move-compiler = { workspace = true }
+move-core-types = { workspace = true }
+move-model = { workspace = true }
+move-prover-bytecode-pipeline = { workspace = true }
+move-stackless-bytecode = { workspace = true }
 num = { workspace = true }
 once_cell = { workspace = true }
 pretty = { workspace = true }
diff --git a/third_party/move/move-prover/bytecode-pipeline/Cargo.toml b/third_party/move/move-prover/bytecode-pipeline/Cargo.toml
index 4a0fc40b375883..366973ed14db22 100644
--- a/third_party/move/move-prover/bytecode-pipeline/Cargo.toml
+++ b/third_party/move/move-prover/bytecode-pipeline/Cargo.toml
@@ -9,22 +9,18 @@ license = "Apache-2.0"
 [dependencies]
 abstract-domain-derive = { path = "../../move-model/bytecode/abstract_domain_derive" }
 anyhow = { workspace = true }
-move-binary-format = { path = "../../move-binary-format" }
-move-core-types = { path = "../../move-core/types" }
-move-model = { path = "../../move-model" }
-
-# move dependencies
-move-stackless-bytecode = { path = "../../move-model/bytecode" }
-
-# external dependencies
 codespan-reporting = { workspace = true }
 itertools = { workspace = true }
 log = { workspace = true, features = ["serde"] }
+move-binary-format = { workspace = true }
+move-core-types = { workspace = true }
+move-model = { workspace = true }
+move-stackless-bytecode = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 
 [dev-dependencies]
 datatest-stable = { workspace = true }
-move-stackless-bytecode-test-utils = { path = "../../move-model/bytecode-test-utils" }
+move-stackless-bytecode-test-utils = { workspace = true }
 shell-words = { workspace = true }
 tempfile = { workspace = true }
 walkdir = { workspace = true }
diff --git a/third_party/move/move-prover/lab/Cargo.toml b/third_party/move/move-prover/lab/Cargo.toml
index b8a23eca6e5ecb..5ebf0e18075a0d 100644
--- a/third_party/move/move-prover/lab/Cargo.toml
+++ b/third_party/move/move-prover/lab/Cargo.toml
@@ -7,26 +7,18 @@ edition = "2021"
 license = "Apache-2.0"
 
 [dependencies]
-# Move dependencies
-move-compiler = { path = "../../move-compiler" }
-move-compiler-v2 = { path = "../../move-compiler-v2" }
-move-model = { path = "../../move-model" }
-move-prover = { path = ".." }
-move-prover-boogie-backend = { path = "../boogie-backend" }
-move-prover-bytecode-pipeline = { path = "../bytecode-pipeline" }
-
-# FB external dependencies
-z3tracer = { workspace = true }
-
-# external dependencies
 anyhow = { workspace = true }
 chrono = { workspace = true }
 clap = { workspace = true, features = ["derive"] }
 codespan-reporting = { workspace = true }
 itertools = { workspace = true }
 log = { workspace = true, features = ["serde"] }
-plotters = { workspace = true, features = [
-    "evcxr",
-    "line_series",
-    "histogram",
-] }
+move-compiler = { workspace = true }
+move-compiler-v2 = { workspace = true }
+move-model = { workspace = true }
+move-prover = { workspace = true }
+move-prover-boogie-backend = { workspace = true }
+move-prover-bytecode-pipeline = { workspace = true }
+plotters = { workspace = true, features = ["evcxr", "line_series", "histogram"] }
+z3tracer = { workspace = true }
+
diff --git a/third_party/move/move-prover/move-abigen/Cargo.toml b/third_party/move/move-prover/move-abigen/Cargo.toml
index 13880ec1606f96..d9da5ad60f5d16 100644
--- a/third_party/move/move-prover/move-abigen/Cargo.toml
+++ b/third_party/move/move-prover/move-abigen/Cargo.toml
@@ -8,25 +8,21 @@ license = "Apache-2.0"
 
 [dependencies]
 anyhow = { workspace = true }
-move-binary-format = { path = "../../move-binary-format" }
-move-bytecode-verifier = { path = "../../move-bytecode-verifier" }
-move-command-line-common = { path = "../../move-command-line-common" }
-move-core-types = { path = "../../move-core/types" }
-# Move dependencies
-move-model = { path = "../../move-model" }
-
 bcs = { workspace = true }
 heck = { workspace = true }
-
-# external dependencies
 log = { workspace = true }
+move-binary-format = { workspace = true }
+move-bytecode-verifier = { workspace = true }
+move-command-line-common = { workspace = true }
+move-core-types = { workspace = true }
+move-model = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 
 [dev-dependencies]
 codespan-reporting = { workspace = true }
 datatest-stable = { workspace = true }
-move-prover = { path = ".." }
-move-prover-test-utils = { path = "../test-utils" }
+move-prover = { workspace = true }
+move-prover-test-utils = { workspace = true }
 tempfile = { workspace = true }
 
 # force more deterministic tests
diff --git a/third_party/move/move-prover/move-docgen/Cargo.toml b/third_party/move/move-prover/move-docgen/Cargo.toml
index c1193b4947ba5e..dd4e617cdf217d 100644
--- a/third_party/move/move-prover/move-docgen/Cargo.toml
+++ b/third_party/move/move-prover/move-docgen/Cargo.toml
@@ -8,25 +8,22 @@ license = "Apache-2.0"
 
 [dependencies]
 anyhow = { workspace = true }
-# diem dependencies
-move-compiler = { path = "../../move-compiler" }
-move-core-types = { path = "../../move-core/types" }
-move-model = { path = "../../move-model" }
-
-# external dependencies
 clap = { workspace = true }
 codespan = { workspace = true }
 codespan-reporting = { workspace = true }
 itertools = { workspace = true }
 log = { workspace = true }
+move-compiler = { workspace = true }
+move-core-types = { workspace = true }
+move-model = { workspace = true }
 once_cell = { workspace = true }
 regex = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 
 [dev-dependencies]
 datatest-stable = { workspace = true }
-move-prover = { path = ".." }
-move-prover-test-utils = { path = "../test-utils" }
+move-prover = { workspace = true }
+move-prover-test-utils = { workspace = true }
 tempfile = { workspace = true }
 
 [[test]]
diff --git a/third_party/move/move-prover/move-errmapgen/Cargo.toml b/third_party/move/move-prover/move-errmapgen/Cargo.toml
index 6b726107fbf973..9e448d8bd17d92 100644
--- a/third_party/move/move-prover/move-errmapgen/Cargo.toml
+++ b/third_party/move/move-prover/move-errmapgen/Cargo.toml
@@ -8,15 +8,12 @@ license = "Apache-2.0"
 
 [dependencies]
 anyhow = { workspace = true }
-# Move dependencies
-move-command-line-common = { path = "../../move-command-line-common" }
-move-core-types = { path = "../../move-core/types" }
-move-model = { path = "../../move-model" }
-
-# external dependencies
+move-command-line-common = { workspace = true }
+move-core-types ={ workspace = true }
+move-model = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 
 [dev-dependencies]
 codespan-reporting = { workspace = true }
 datatest-stable = { workspace = true }
-move-prover = { path = ".." }
+move-prover = { workspace = true }
diff --git a/third_party/move/move-prover/test-utils/Cargo.toml b/third_party/move/move-prover/test-utils/Cargo.toml
index 576de1ab67db2f..d18e3baec45f18 100644
--- a/third_party/move/move-prover/test-utils/Cargo.toml
+++ b/third_party/move/move-prover/test-utils/Cargo.toml
@@ -8,6 +8,6 @@ license = "Apache-2.0"
 
 [dependencies]
 anyhow = { workspace = true }
-move-command-line-common = { path = "../../move-command-line-common" }
+move-command-line-common = { workspace = true }
 prettydiff = { workspace = true }
 regex = { workspace = true }
diff --git a/third_party/move/move-stdlib/Cargo.toml b/third_party/move/move-stdlib/Cargo.toml
index 6d643779e4db57..164491155f2c4f 100644
--- a/third_party/move/move-stdlib/Cargo.toml
+++ b/third_party/move/move-stdlib/Cargo.toml
@@ -14,15 +14,15 @@ publish = false
 anyhow = { workspace = true }
 hex = { workspace = true }
 log = { workspace = true }
-move-binary-format = { path = "../move-binary-format" }
-move-command-line-common = { path = "../move-command-line-common" }
-move-compiler = { path = "../move-compiler" }
-move-core-types = { path = "../move-core/types" }
-move-docgen = { path = "../move-prover/move-docgen" }
-move-errmapgen = { path = "../move-prover/move-errmapgen" }
-move-prover = { path = "../move-prover" }
-move-vm-runtime = { path = "../move-vm/runtime" }
-move-vm-types = { path = "../move-vm/types" }
+move-binary-format = { workspace = true }
+move-command-line-common = { workspace = true }
+move-compiler ={ workspace = true }
+move-core-types = { workspace = true }
+move-docgen = { workspace = true }
+move-errmapgen = { workspace = true }
+move-prover = { workspace = true }
+move-vm-runtime = { workspace = true }
+move-vm-types = { workspace = true }
 sha2 = { workspace = true }
 sha3 = { workspace = true }
 smallvec = { workspace = true }
@@ -31,9 +31,9 @@ walkdir = { workspace = true }
 [dev-dependencies]
 dir-diff = { workspace = true }
 file_diff = { workspace = true }
-move-cli = { path = "../tools/move-cli" }
-move-package = { path = "../tools/move-package" }
-move-unit-test = { path = "../tools/move-unit-test" }
+move-cli = { workspace = true }
+move-package = { workspace = true }
+move-unit-test = { workspace = true }
 tempfile = { workspace = true }
 
 [features]
diff --git a/third_party/move/move-vm/integration-tests/Cargo.toml b/third_party/move/move-vm/integration-tests/Cargo.toml
index 99a7339b94520d..9a592c082f8e3d 100644
--- a/third_party/move/move-vm/integration-tests/Cargo.toml
+++ b/third_party/move/move-vm/integration-tests/Cargo.toml
@@ -14,20 +14,17 @@ edition = "2021"
 anyhow = { workspace = true }
 bytes = { workspace = true }
 memory-stats = { workspace = true }
-move-binary-format = { path = "../../move-binary-format", features = ["testing"] }
-move-bytecode-verifier = { path = "../../move-bytecode-verifier" }
-move-compiler = { path = "../../move-compiler" }
+move-binary-format = { workspace = true, features = ["testing"] }
+move-bytecode-verifier = { workspace = true }
+move-compiler = { workspace = true }
+move-core-types = { workspace = true }
+move-stdlib = { path = "../../move-stdlib" }
+move-vm-runtime = { workspace = true, features = ["testing"] }
+move-vm-test-utils = { workspace = true }
+move-vm-types = { workspace = true }
 smallvec = { workspace = true }
 tempfile = { workspace = true }
 
-move-core-types = { path = "../../move-core/types" }
-move-stdlib = { path = "../../move-stdlib" }
-move-vm-runtime = { path = "../runtime", features = ["testing"] }
-move-vm-test-utils = { path = "../test-utils" }
-move-vm-types = { path = "../types" }
-
 [features]
 default = []
-table-extension = [
-    "move-vm-test-utils/table-extension"
-]
+table-extension = ["move-vm-test-utils/table-extension"]
diff --git a/third_party/move/move-vm/paranoid-tests/Cargo.toml b/third_party/move/move-vm/paranoid-tests/Cargo.toml
index bf4e6bb08686fb..8cfbe663bb3645 100644
--- a/third_party/move/move-vm/paranoid-tests/Cargo.toml
+++ b/third_party/move/move-vm/paranoid-tests/Cargo.toml
@@ -9,7 +9,7 @@ license = "Apache-2.0"
 [dev-dependencies]
 datatest-stable = { workspace = true }
 fail = { workspace = true, features = ['failpoints'] }
-move-transactional-test-runner = { path = "../../testing-infra/transactional-test-runner", features = ['failpoints'] }
+move-transactional-test-runner = { workspace = true, features = ['failpoints'] }
 
 [[test]]
 name = "tests"
diff --git a/third_party/move/move-vm/runtime/Cargo.toml b/third_party/move/move-vm/runtime/Cargo.toml
index d571a946073326..4b20b934b638ca 100644
--- a/third_party/move/move-vm/runtime/Cargo.toml
+++ b/third_party/move/move-vm/runtime/Cargo.toml
@@ -19,7 +19,11 @@ fail = { workspace = true }
 hashbrown = { workspace = true }
 lazy_static = { workspace = true }
 lru = { workspace = true }
-move-binary-format = { path = "../../move-binary-format" }
+move-binary-format = { workspace = true }
+move-bytecode-verifier = { workspace = true }
+move-core-types = { workspace = true }
+move-vm-metrics = { workspace = true }
+move-vm-types = { workspace = true }
 once_cell = { workspace = true }
 parking_lot = { workspace = true }
 serde = { workspace = true }
@@ -27,18 +31,13 @@ sha3 = { workspace = true }
 triomphe = { workspace = true }
 typed-arena = { workspace = true }
 
-move-bytecode-verifier = { path = "../../move-bytecode-verifier" }
-move-core-types = { path = "../../move-core/types" }
-move-vm-metrics = { workspace = true }
-move-vm-types = { path = "../types" }
-
 [dev-dependencies]
 anyhow = { workspace = true }
 hex = { workspace = true }
-move-binary-format = { path = "../../move-binary-format", features = ["fuzzing"] }
-move-compiler = { path = "../../move-compiler" }
-move-ir-compiler = { path = "../../move-ir-compiler" }
-move-vm-test-utils = { path = "../test-utils" }
+move-binary-format = { workspace = true, features = ["fuzzing"] }
+move-compiler = { workspace = true }
+move-ir-compiler = { workspace = true }
+move-vm-test-utils ={ workspace = true }
 proptest = { workspace = true }
 
 [features]
diff --git a/third_party/move/move-vm/test-utils/Cargo.toml b/third_party/move/move-vm/test-utils/Cargo.toml
index 1d075c08cca171..5073ddbdf150d5 100644
--- a/third_party/move/move-vm/test-utils/Cargo.toml
+++ b/third_party/move/move-vm/test-utils/Cargo.toml
@@ -13,15 +13,14 @@ edition = "2021"
 [dependencies]
 anyhow = { workspace = true }
 bytes = { workspace = true }
+move-binary-format = { workspace = true }
+move-bytecode-utils = { workspace = true }
+move-core-types = { workspace = true }
+move-table-extension = { workspace = true, optional = true }
+move-vm-types = { workspace = true }
 once_cell = { workspace = true }
 serde = { workspace = true, features = ["derive", "rc"] }
 
-move-binary-format = { path = "../../move-binary-format" }
-move-bytecode-utils = { path = "../../tools/move-bytecode-utils" }
-move-core-types = { path = "../../move-core/types" }
-move-table-extension = { path = "../../extensions/move-table-extension", optional = true }
-move-vm-types = { path = "../types" }
-
 [features]
 default = []
 table-extension = ["move-table-extension"]
diff --git a/third_party/move/move-vm/transactional-tests/Cargo.toml b/third_party/move/move-vm/transactional-tests/Cargo.toml
index 6d30685ac1ed5b..f8c26618772ab3 100644
--- a/third_party/move/move-vm/transactional-tests/Cargo.toml
+++ b/third_party/move/move-vm/transactional-tests/Cargo.toml
@@ -8,7 +8,7 @@ license = "Apache-2.0"
 
 [dev-dependencies]
 datatest-stable = { workspace = true }
-move-transactional-test-runner = { path = "../../testing-infra/transactional-test-runner" }
+move-transactional-test-runner = { workspace = true }
 
 [[test]]
 name = "tests"
diff --git a/third_party/move/move-vm/types/Cargo.toml b/third_party/move/move-vm/types/Cargo.toml
index e98295f82d738a..858a924fc16412 100644
--- a/third_party/move/move-vm/types/Cargo.toml
+++ b/third_party/move/move-vm/types/Cargo.toml
@@ -18,6 +18,8 @@ dashmap = { workspace = true }
 derivative = { workspace = true }
 hashbrown = { workspace = true }
 itertools = { workspace = true }
+move-binary-format = { workspace = true }
+move-core-types = { workspace = true }
 proptest = { workspace = true, optional = true }
 serde = { workspace = true, features = ["derive", "rc"] }
 sha3 = { workspace = true }
@@ -25,12 +27,9 @@ smallbitvec = { workspace = true }
 smallvec = { workspace = true }
 triomphe = { workspace = true }
 
-move-binary-format = { path = "../../move-binary-format" }
-move-core-types = { path = "../../move-core/types" }
-
 [dev-dependencies]
 claims = { workspace = true }
-move-binary-format = { path = "../../move-binary-format", features = ["fuzzing"] }
+move-binary-format = { workspace = true, features = ["fuzzing"] }
 proptest = { workspace = true }
 rand = { workspace = true }
 
diff --git a/third_party/move/testing-infra/module-generation/Cargo.toml b/third_party/move/testing-infra/module-generation/Cargo.toml
index ca6088cdec1ca8..3179dab7209c38 100644
--- a/third_party/move/testing-infra/module-generation/Cargo.toml
+++ b/third_party/move/testing-infra/module-generation/Cargo.toml
@@ -10,16 +10,15 @@ publish = false
 edition = "2021"
 
 [dependencies]
-move-binary-format = { path = "../../move-binary-format" }
+move-binary-format = { workspace = true }
+move-bytecode-verifier = { workspace = true }
+move-core-types = { workspace = true }
+move-ir-to-bytecode = { workspace = true }
+move-ir-types = { workspace = true }
+move-symbol-pool = { workspace = true }
 # Cannot use workspace version as aptos-core currently cannot be upgraded
 # to newer rand. See https://github.com/aptos-labs/aptos-core/issues/13031
 rand = { version = "0.8.5" }
 
-move-bytecode-verifier = { path = "../../move-bytecode-verifier" }
-move-core-types = { path = "../../move-core/types" }
-move-ir-to-bytecode = { path = "../../move-ir-compiler/move-ir-to-bytecode" }
-move-ir-types = { path = "../../move-ir/types" }
-move-symbol-pool = { path = "../../move-symbol-pool" }
-
 [features]
 default = []
diff --git a/third_party/move/testing-infra/transactional-test-runner/Cargo.toml b/third_party/move/testing-infra/transactional-test-runner/Cargo.toml
index 3249bb20ec279e..f7b71119528b04 100644
--- a/third_party/move/testing-infra/transactional-test-runner/Cargo.toml
+++ b/third_party/move/testing-infra/transactional-test-runner/Cargo.toml
@@ -12,29 +12,28 @@ edition = "2021"
 [dependencies]
 anyhow = { workspace = true }
 clap = { workspace = true, features = ["derive"] }
-move-binary-format = { path = "../../move-binary-format", features = ["testing"] }
-move-bytecode-source-map = { path = "../../move-ir-compiler/move-bytecode-source-map" }
-move-bytecode-verifier = { path = "../../move-bytecode-verifier" }
-move-command-line-common = { path = "../../move-command-line-common" }
-move-compiler = { path = "../../move-compiler" }
-move-compiler-v2 = { path = "../../move-compiler-v2" }
-move-core-types = { path = "../../move-core/types" }
-move-disassembler = { path = "../../tools/move-disassembler" }
-move-ir-compiler = { path = "../../move-ir-compiler" }
-move-ir-types = { path = "../../move-ir/types" }
-move-model = { path = "../../move-model" }
-move-resource-viewer = { path = "../../tools/move-resource-viewer" }
+move-binary-format = { workspace = true, features = ["testing"] }
+move-bytecode-source-map = { workspace = true }
+move-bytecode-verifier = { workspace = true }
+move-command-line-common = { workspace = true }
+move-compiler = { workspace = true }
+move-compiler-v2 = { workspace = true }
+move-core-types = { workspace = true }
+move-disassembler = { workspace = true }
+move-ir-compiler = { workspace = true }
+move-ir-types = { workspace = true }
+move-model = { workspace = true }
+move-resource-viewer = { workspace = true }
+move-stdlib = { path = "../../move-stdlib", features = ["testing"] }
+move-symbol-pool = { workspace = true }
+move-vm-runtime = { workspace = true, features = ["testing"] }
+move-vm-test-utils = { workspace = true }
+move-vm-types = { workspace = true }
 once_cell = { workspace = true }
 regex = { workspace = true }
 tempfile = { workspace = true }
 termcolor = { workspace = true }
 
-move-stdlib = { path = "../../move-stdlib", features = ["testing"] }
-move-symbol-pool = { path = "../../move-symbol-pool" }
-move-vm-runtime = { path = "../../move-vm/runtime", features = ["testing"] }
-move-vm-test-utils = { path = "../../move-vm/test-utils" }
-move-vm-types = { path = "../../move-vm/types" }
-
 [dev-dependencies]
 datatest-stable = { workspace = true }
 difference = { workspace = true }
diff --git a/third_party/move/tools/move-bytecode-utils/Cargo.toml b/third_party/move/tools/move-bytecode-utils/Cargo.toml
index aa14f2a0998416..a85724ca759408 100644
--- a/third_party/move/tools/move-bytecode-utils/Cargo.toml
+++ b/third_party/move/tools/move-bytecode-utils/Cargo.toml
@@ -11,7 +11,7 @@ edition = "2021"
 
 [dependencies]
 anyhow = { workspace = true }
-move-binary-format = { path = "../../move-binary-format" }
-move-core-types = { path = "../../move-core/types" }
+move-binary-format = { workspace = true }
+move-core-types = { workspace = true }
 petgraph = { workspace = true }
 serde-reflection = { workspace = true }
diff --git a/third_party/move/tools/move-bytecode-viewer/Cargo.toml b/third_party/move/tools/move-bytecode-viewer/Cargo.toml
index e3a51224a71a76..ac4a3de10bf651 100644
--- a/third_party/move/tools/move-bytecode-viewer/Cargo.toml
+++ b/third_party/move/tools/move-bytecode-viewer/Cargo.toml
@@ -11,12 +11,11 @@ edition = "2021"
 anyhow = { workspace = true }
 clap = { workspace = true, features = ["derive"] }
 crossterm = { workspace = true }
-move-binary-format = { path = "../../move-binary-format" }
-move-bytecode-source-map = { path = "../../move-ir-compiler/move-bytecode-source-map" }
+move-binary-format = { workspace = true }
+move-bytecode-source-map = { workspace = true }
+move-disassembler = { workspace = true }
 regex = { workspace = true }
 tui = { workspace = true }
 
-move-disassembler = { path = "../move-disassembler" }
-
 [features]
 default = []
diff --git a/third_party/move/tools/move-cli/Cargo.toml b/third_party/move/tools/move-cli/Cargo.toml
index f7ee5cf507ff37..a3e8a3a6232934 100644
--- a/third_party/move/tools/move-cli/Cargo.toml
+++ b/third_party/move/tools/move-cli/Cargo.toml
@@ -14,27 +14,26 @@ anyhow = { workspace = true }
 clap = { workspace = true, features = ["derive"] }
 codespan-reporting = { workspace = true }
 colored = { workspace = true }
+move-binary-format = { workspace = true }
+move-bytecode-viewer = { workspace = true }
+move-command-line-common = { workspace = true }
+move-compiler = { workspace = true }
+move-compiler-v2 = { workspace = true }
+move-core-types = { workspace = true }
+move-coverage = { workspace = true }
+move-disassembler = { workspace = true }
+move-docgen = { workspace = true }
+move-errmapgen = { workspace = true }
+move-model = { workspace = true }
+move-package = { workspace = true }
+move-prover = { workspace = true }
+move-stdlib = { path = "../../move-stdlib" }
+move-unit-test = { workspace = true }
+move-vm-runtime = { workspace = true, features = ["debugging"] }
+move-vm-test-utils = { workspace = true }
 once_cell = { workspace = true }
 tempfile = { workspace = true }
 
-move-binary-format = { path = "../../move-binary-format" }
-move-bytecode-viewer = { path = "../move-bytecode-viewer" }
-move-command-line-common = { path = "../../move-command-line-common" }
-move-compiler = { path = "../../move-compiler" }
-move-compiler-v2 = { path = "../../move-compiler-v2" }
-move-core-types = { path = "../../move-core/types" }
-move-coverage = { path = "../move-coverage" }
-move-disassembler = { path = "../move-disassembler" }
-move-docgen = { path = "../../move-prover/move-docgen" }
-move-errmapgen = { path = "../../move-prover/move-errmapgen" }
-move-model = { path = "../../move-model" }
-move-package = { path = "../move-package" }
-move-prover = { path = "../../move-prover" }
-move-stdlib = { path = "../../move-stdlib" }
-move-unit-test = { path = "../move-unit-test" }
-move-vm-runtime = { path = "../../move-vm/runtime", features = ["debugging"] }
-move-vm-test-utils = { path = "../../move-vm/test-utils" }
-
 [dev-dependencies]
 datatest-stable = { workspace = true }
 httpmock = { workspace = true }
diff --git a/third_party/move/tools/move-coverage/Cargo.toml b/third_party/move/tools/move-coverage/Cargo.toml
index 276754c9b3ca3e..a3342f30ef7678 100644
--- a/third_party/move/tools/move-coverage/Cargo.toml
+++ b/third_party/move/tools/move-coverage/Cargo.toml
@@ -11,19 +11,17 @@ edition = "2021"
 
 [dependencies]
 anyhow = { workspace = true }
+bcs = { workspace = true }
 clap = { workspace = true, features = ["derive"] }
 codespan = { workspace = true, features = ["serialization"] }
 colored = { workspace = true }
+move-binary-format = { workspace = true }
+move-bytecode-source-map = { workspace = true }
+move-command-line-common = { workspace = true }
+move-core-types = { workspace = true }
+move-ir-types = { workspace = true }
 petgraph = { workspace = true }
 serde = { workspace = true }
 
-bcs = { workspace = true }
-move-binary-format = { path = "../../move-binary-format" }
-move-bytecode-source-map = { path = "../../move-ir-compiler/move-bytecode-source-map" }
-
-move-command-line-common = { path = "../../move-command-line-common" }
-move-core-types = { path = "../../move-core/types" }
-move-ir-types = { path = "../../move-ir/types" }
-
 [features]
 default = []
diff --git a/third_party/move/tools/move-decompiler/Cargo.toml b/third_party/move/tools/move-decompiler/Cargo.toml
index 2c331cdca315a1..723f296dbfdb0a 100644
--- a/third_party/move/tools/move-decompiler/Cargo.toml
+++ b/third_party/move/tools/move-decompiler/Cargo.toml
@@ -11,11 +11,10 @@ edition = "2021"
 
 [dependencies]
 anyhow = { workspace = true }
+bcs = { workspace = true }
 clap = { workspace = true, features = ["derive"] }
 codespan = { workspace = true }
 codespan-reporting = { workspace = true, features = ["serde", "serialization"] }
-
-bcs = { workspace = true }
 move-binary-format = { workspace = true }
 move-bytecode-source-map = { workspace = true }
 move-bytecode-verifier = { workspace = true }
diff --git a/third_party/move/tools/move-disassembler/Cargo.toml b/third_party/move/tools/move-disassembler/Cargo.toml
index 33babe7a7f6740..b2ae37947a63cc 100644
--- a/third_party/move/tools/move-disassembler/Cargo.toml
+++ b/third_party/move/tools/move-disassembler/Cargo.toml
@@ -9,17 +9,15 @@ edition = "2021"
 
 [dependencies]
 anyhow = { workspace = true }
-colored = { workspace = true }
-move-binary-format = { path = "../../move-binary-format" }
-move-bytecode-source-map = { path = "../../move-ir-compiler/move-bytecode-source-map" }
-
-move-command-line-common = { path = "../../move-command-line-common" }
-move-compiler = { path = "../../move-compiler" }
-move-core-types = { path = "../../move-core/types" }
-move-coverage = { path = "../move-coverage" }
-move-ir-types = { path = "../../move-ir/types" }
-
 clap = { workspace = true, features = ["derive"] }
+colored = { workspace = true }
+move-binary-format = { workspace = true }
+move-bytecode-source-map = { workspace = true }
+move-command-line-common = { workspace = true }
+move-compiler = { workspace = true }
+move-core-types = { workspace = true }
+move-coverage = { workspace = true }
+move-ir-types = { workspace = true }
 
 [features]
 default = []
diff --git a/third_party/move/tools/move-explain/Cargo.toml b/third_party/move/tools/move-explain/Cargo.toml
index a6d982f3caa0ee..7002b14395079b 100644
--- a/third_party/move/tools/move-explain/Cargo.toml
+++ b/third_party/move/tools/move-explain/Cargo.toml
@@ -10,11 +10,10 @@ publish = false
 edition = "2021"
 
 [dependencies]
-clap = { workspace = true, features = ["derive"] }
-move-command-line-common = { path = "../../move-command-line-common" }
-move-core-types = { path = "../../move-core/types" }
-
 bcs = { workspace = true }
+clap = { workspace = true, features = ["derive"] }
+move-command-line-common = { workspace = true }
+move-core-types = { workspace = true }
 
 [features]
 default = []
diff --git a/third_party/move/tools/move-linter/Cargo.toml b/third_party/move/tools/move-linter/Cargo.toml
index e4db9861a99714..947f77132d42bd 100644
--- a/third_party/move/tools/move-linter/Cargo.toml
+++ b/third_party/move/tools/move-linter/Cargo.toml
@@ -1,13 +1,16 @@
 [package]
 name = "move-linter"
-version = "0.1.0"
-authors = ["Aptos Labs"]
 description = "The Move Linter"
-repository = "https://github.com/aptos-labs/aptos-core"
-homepage = "https://aptosfoundation.org/"
-license = "Apache-2.0"
-publish = false
-edition = "2021"
+version = "0.1.0"
+
+# Workspace inherited keys
+authors = { workspace = true }
+edition = { workspace = true }
+homepage = { workspace = true }
+license = { workspace = true }
+publish = { workspace = true }
+repository = { workspace = true }
+rust-version = { workspace = true }
 
 [dependencies]
 codespan-reporting = { workspace = true }
diff --git a/third_party/move/tools/move-package/Cargo.toml b/third_party/move/tools/move-package/Cargo.toml
index 7c57f7cffc06b3..9d9193497db559 100644
--- a/third_party/move/tools/move-package/Cargo.toml
+++ b/third_party/move/tools/move-package/Cargo.toml
@@ -11,7 +11,21 @@ edition = "2021"
 anyhow = { workspace = true }
 clap = { workspace = true, features = ["derive"] }
 colored = { workspace = true }
+evm-exec-utils = { path = "../../evm/exec-utils", optional = true }
+hex = { workspace = true, optional = true }
 itertools = { workspace = true }
+move-abigen = { workspace = true }
+move-binary-format = { workspace = true }
+move-bytecode-source-map = { workspace = true }
+move-bytecode-utils = { workspace = true }
+move-command-line-common = { workspace = true }
+move-compiler = { workspace = true }
+move-compiler-v2 = { workspace = true }
+move-core-types = { workspace = true }
+move-docgen = { workspace = true }
+move-model = { workspace = true }
+move-symbol-pool = { workspace = true }
+move-to-yul = { path = "../../evm/move-to-yul", optional = true }
 named-lock = { workspace = true }
 once_cell = { workspace = true }
 petgraph = { workspace = true }
@@ -20,27 +34,9 @@ serde = { workspace = true, features = ["derive"] }
 serde_yaml = { workspace = true }
 sha2 = { workspace = true }
 tempfile = { workspace = true }
+termcolor = { workspace = true }
 toml = { workspace = true }
 walkdir = { workspace = true }
-
-evm-exec-utils = { path = "../../evm/exec-utils", optional = true }
-hex = { workspace = true, optional = true }
-move-abigen = { path = "../../move-prover/move-abigen" }
-
-move-binary-format = { path = "../../move-binary-format" }
-move-bytecode-source-map = { path = "../../move-ir-compiler/move-bytecode-source-map" }
-move-bytecode-utils = { path = "../move-bytecode-utils" }
-move-command-line-common = { path = "../../move-command-line-common" }
-move-compiler = { path = "../../move-compiler" }
-move-compiler-v2 = { path = "../../move-compiler-v2" }
-move-core-types = { path = "../../move-core/types" }
-move-docgen = { path = "../../move-prover/move-docgen" }
-move-model = { path = "../../move-model" }
-move-symbol-pool = { path = "../../move-symbol-pool" }
-
-move-to-yul = { path = "../../evm/move-to-yul", optional = true }
-termcolor = { workspace = true }
-
 whoami = { workspace = true }
 
 [dev-dependencies]
diff --git a/third_party/move/tools/move-resource-viewer/Cargo.toml b/third_party/move/tools/move-resource-viewer/Cargo.toml
index 962de569ff3908..e57a8a80444d61 100644
--- a/third_party/move/tools/move-resource-viewer/Cargo.toml
+++ b/third_party/move/tools/move-resource-viewer/Cargo.toml
@@ -10,9 +10,9 @@ publish = false
 edition = "2021"
 
 [dependencies]
-move-binary-format = { path = "../../move-binary-format" }
-move-bytecode-utils = { path = "../move-bytecode-utils" }
-move-core-types = { path = "../../move-core/types" }
+move-binary-format = { workspace = true }
+move-bytecode-utils = { workspace = true }
+move-core-types = { workspace = true }
 serde = { workspace = true, features = ["derive", "rc"] }
 
 anyhow = { workspace = true }
diff --git a/third_party/move/tools/move-unit-test/Cargo.toml b/third_party/move/tools/move-unit-test/Cargo.toml
index c0e29367cb1a01..da90b2bc4684d3 100644
--- a/third_party/move/tools/move-unit-test/Cargo.toml
+++ b/third_party/move/tools/move-unit-test/Cargo.toml
@@ -15,34 +15,30 @@ better_any = { workspace = true }
 clap = { workspace = true, features = ["derive"] }
 codespan-reporting = { workspace = true }
 colored = { workspace = true }
+evm = { workspace = true, optional = true }
 evm-exec-utils = { path = "../../evm/exec-utils", optional = true }
 itertools = { workspace = true }
-move-binary-format = { path = "../../move-binary-format" }
-move-bytecode-utils = { path = "../move-bytecode-utils" }
-once_cell = { workspace = true }
-rayon = { workspace = true }
-regex = { workspace = true }
-
-move-command-line-common = { path = "../../move-command-line-common" }
-move-compiler = { path = "../../move-compiler" }
-move-compiler-v2 = { path = "../../move-compiler-v2" }
-move-core-types = { path = "../../move-core/types" }
-move-ir-types = { path = "../../move-ir/types" }
-move-model = { path = "../../move-model" }
-move-package = { path = "../move-package" }
-move-resource-viewer = { path = "../move-resource-viewer" }
+move-binary-format = { workspace = true }
+move-bytecode-utils = { workspace = true }
+move-command-line-common = { workspace = true }
+move-compiler = { workspace = true }
+move-compiler-v2 = { workspace = true }
+move-core-types = { workspace = true }
+move-ir-types = { workspace = true }
+move-model = { workspace = true }
+move-package = { workspace = true }
+move-resource-viewer = { workspace = true }
 move-stdlib = { path = "../../move-stdlib", features = ["testing"] }
-move-symbol-pool = { path = "../../move-symbol-pool" }
+move-symbol-pool = { workspace = true }
 move-table-extension = { path = "../../extensions/move-table-extension" }
-move-vm-runtime = { path = "../../move-vm/runtime", features = ["testing"] }
-move-vm-test-utils = { path = "../../move-vm/test-utils" }
-move-vm-types = { path = "../../move-vm/types" }
-
-# EVM-specific dependencies
 move-to-yul = { path = "../../evm/move-to-yul", optional = true }
-
-evm = { workspace = true, optional = true }
+move-vm-runtime = { workspace = true, features = ["testing"] }
+move-vm-test-utils = { workspace = true }
+move-vm-types = { workspace = true }
+once_cell = { workspace = true }
 primitive-types = { workspace = true, optional = true }
+rayon = { workspace = true }
+regex = { workspace = true }
 
 [dev-dependencies]
 datatest-stable = { workspace = true }