[language] move diem-vm to diem/diem-move

Closes: aptos-labs#9612
nhung1205 · Nov 3, 2021 · 25b6242 · 25b6242
1 parent 7d281ce
commit 25b6242
Show file tree

Hide file tree

Showing 68 changed files with 42 additions and 43 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -52,9 +52,12 @@ members = [
     "diem-move/diem-keygen",
     "diem-move/diem-resource-viewer",
     "diem-move/diem-validator-interface",
+    "diem-move/diem-vm",
     "diem-move/e2e-tests-replay",
     "diem-move/genesis-viewer",
+    "diem-move/mvhashmap",
     "diem-move/oncall-trainer",
+    "diem-move/parallel-executor",
     "diem-move/transaction-replay",
     "diem-move/vm-genesis",
     "diem-move/writeset-transaction-generator",
@@ -83,9 +86,6 @@ members = [
     "language/diem-framework/DPN/releases",
     "language/diem-framework/releases",
     "language/diem-transaction-benchmarks",
-    "language/diem-vm",
-    "language/diem-vm/mvhashmap",
-    "language/diem-vm/parallel-executor",
     "language/e2e-testsuite",
     "language/ir-testsuite",
     "language/move-analyzer",

diff --git a/api/Cargo.toml b/api/Cargo.toml
@@ -48,6 +48,6 @@ diem-genesis-tool = {path = "../config/management/genesis", features = ["testing
 diem-framework-releases = { path = "../language/diem-framework/DPN/releases" }
 diem-sdk = { path = "../sdk" }
 vm-validator = { path = "../vm-validator" }
-diem-vm = { path = "../language/diem-vm" }
+diem-vm = { path = "../diem-move/diem-vm" }
 executor = { path = "../execution/executor" }
 executor-types = { path = "../execution/executor-types" }
diff --git a/config/management/genesis/Cargo.toml b/config/management/genesis/Cargo.toml
@@ -31,7 +31,7 @@ diem-secure-storage = { path = "../../../secure/storage" }
 diem-types = { path = "../../../types" }
 diem-workspace-hack = { path = "../../../common/workspace-hack" }
 diem-temppath = { path = "../../../common/temppath" }
-diem-vm = { path = "../../../language/diem-vm" }
+diem-vm = { path = "../../../diem-move/diem-vm" }
 diemdb = { path = "../../../storage/diemdb" }
 storage-interface = { path = "../../../storage/storage-interface" }
 vm-genesis = { path = "../../../diem-move/vm-genesis" }

diff --git a/consensus/Cargo.toml b/consensus/Cargo.toml
@@ -47,7 +47,7 @@ diem-infallible = { path = "../common/infallible" }
 diem-secure-storage = { path = "../secure/storage" }
 diem-temppath = { path = "../common/temppath" }
 diem-types = { path = "../types" }
-diem-vm = { path = "../language/diem-vm" }
+diem-vm = { path = "../diem-move/diem-vm" }
 diem-workspace-hack = { path = "../common/workspace-hack" }
 network = { path = "../network" }
 safety-rules = { path = "safety-rules" }

diff --git a/diem-move/df-cli/Cargo.toml b/diem-move/df-cli/Cargo.toml
@@ -17,7 +17,7 @@ structopt = "0.3.21"
 diem-workspace-hack = { path = "../../common/workspace-hack" }
 move-core-types = { path = "../../language/move-core/types" }
 move-cli = { path = "../../language/tools/move-cli" }
-diem-vm = { path = "../../language/diem-vm" }
+diem-vm = { path = "../diem-vm" }
 diem-framework-releases = { path = "../../language/diem-framework/DPN/releases" }
 
 [dev-dependencies]

diff --git a/language/diem-vm/Cargo.toml → diem-move/diem-vm/Cargo.toml b/language/diem-vm/Cargo.toml → diem-move/diem-vm/Cargo.toml
@@ -24,24 +24,24 @@ diem-metrics = { path = "../../common/metrics" }
 diem-state-view = { path = "../../storage/state-view" }
 diem-types = { path = "../../types" }
 diem-workspace-hack = { path = "../../common/workspace-hack" }
-move-core-types = { path = "../move-core/types" }
-move-vm-runtime = { path = "../move-vm/runtime" }
-move-vm-types = { path = "../move-vm/types" }
-move-binary-format = { path = "../move-binary-format" }
-move-stdlib = { path = "../move-stdlib" }
-diem-framework = { path = "../diem-framework" }
+move-core-types = { path = "../../language/move-core/types" }
+move-vm-runtime = { path = "../../language/move-vm/runtime" }
+move-vm-types = { path = "../../language/move-vm/types" }
+move-binary-format = { path = "../../language/move-binary-format" }
+move-stdlib = { path = "../../language/move-stdlib" }
+diem-framework = { path = "../../language/diem-framework" }
 serde_json = "1.0.64"
 serde = { version = "1.0.124", default-features = false }
-read-write-set-dynamic = { path = "../tools/read-write-set/dynamic"}
+read-write-set-dynamic = { path = "../../language/tools/read-write-set/dynamic"}
 
-mvhashmap = { path = "mvhashmap" }
-diem-parallel-executor = {path = "parallel-executor" }
+mvhashmap = { path = "../mvhashmap" }
+diem-parallel-executor = {path = "../parallel-executor" }
 
 [dev-dependencies]
 proptest = "1.0.0"
 
 diem-types = { path = "../../types", features = ["fuzzing"] }
-diem-framework-releases = { path = "../diem-framework/DPN/releases" }
+diem-framework-releases = { path = "../../language/diem-framework/DPN/releases" }
 
 [features]
 default = []

diff --git a/language/diem-vm/README.md → diem-move/diem-vm/README.md b/language/diem-vm/README.md → diem-move/diem-vm/README.md
diff --git a/language/diem-vm/src/access_path_cache.rs → diem-move/diem-vm/src/access_path_cache.rs b/language/diem-vm/src/access_path_cache.rs → diem-move/diem-vm/src/access_path_cache.rs
diff --git a/language/diem-vm/src/adapter_common.rs → diem-move/diem-vm/src/adapter_common.rs b/language/diem-vm/src/adapter_common.rs → diem-move/diem-vm/src/adapter_common.rs
diff --git a/language/diem-vm/src/counters.rs → diem-move/diem-vm/src/counters.rs b/language/diem-vm/src/counters.rs → diem-move/diem-vm/src/counters.rs
diff --git a/language/diem-vm/src/data_cache.rs → diem-move/diem-vm/src/data_cache.rs b/language/diem-vm/src/data_cache.rs → diem-move/diem-vm/src/data_cache.rs
diff --git a/language/diem-vm/src/diem_vm.rs → diem-move/diem-vm/src/diem_vm.rs b/language/diem-vm/src/diem_vm.rs → diem-move/diem-vm/src/diem_vm.rs
diff --git a/language/diem-vm/src/diem_vm_impl.rs → diem-move/diem-vm/src/diem_vm_impl.rs b/language/diem-vm/src/diem_vm_impl.rs → diem-move/diem-vm/src/diem_vm_impl.rs
diff --git a/language/diem-vm/src/errors.rs → diem-move/diem-vm/src/errors.rs b/language/diem-vm/src/errors.rs → diem-move/diem-vm/src/errors.rs
diff --git a/language/diem-vm/src/foreign_contracts.rs → diem-move/diem-vm/src/foreign_contracts.rs b/language/diem-vm/src/foreign_contracts.rs → diem-move/diem-vm/src/foreign_contracts.rs
diff --git a/language/diem-vm/src/lib.rs → diem-move/diem-vm/src/lib.rs b/language/diem-vm/src/lib.rs → diem-move/diem-vm/src/lib.rs
diff --git a/language/diem-vm/src/logging.rs → diem-move/diem-vm/src/logging.rs b/language/diem-vm/src/logging.rs → diem-move/diem-vm/src/logging.rs
diff --git a/language/diem-vm/src/natives.rs → diem-move/diem-vm/src/natives.rs b/language/diem-vm/src/natives.rs → diem-move/diem-vm/src/natives.rs
diff --git a/...uage/diem-vm/src/parallel_executor/mod.rs → ...move/diem-vm/src/parallel_executor/mod.rs b/...uage/diem-vm/src/parallel_executor/mod.rs → ...move/diem-vm/src/parallel_executor/mod.rs
diff --git a/...allel_executor/read_write_set_analyzer.rs → ...allel_executor/read_write_set_analyzer.rs b/...allel_executor/read_write_set_analyzer.rs → ...allel_executor/read_write_set_analyzer.rs
diff --git a/.../src/parallel_executor/storage_wrapper.rs → .../src/parallel_executor/storage_wrapper.rs b/.../src/parallel_executor/storage_wrapper.rs → .../src/parallel_executor/storage_wrapper.rs
diff --git a/...em-vm/src/parallel_executor/vm_wrapper.rs → ...em-vm/src/parallel_executor/vm_wrapper.rs b/...em-vm/src/parallel_executor/vm_wrapper.rs → ...em-vm/src/parallel_executor/vm_wrapper.rs
diff --git a/...ge/diem-vm/src/read_write_set_analysis.rs → ...ve/diem-vm/src/read_write_set_analysis.rs b/...ge/diem-vm/src/read_write_set_analysis.rs → ...ve/diem-vm/src/read_write_set_analysis.rs
diff --git a/.../diem-vm/src/script_to_script_function.rs → .../diem-vm/src/script_to_script_function.rs b/.../diem-vm/src/script_to_script_function.rs → .../diem-vm/src/script_to_script_function.rs
diff --git a/language/diem-vm/src/system_module_names.rs → diem-move/diem-vm/src/system_module_names.rs b/language/diem-vm/src/system_module_names.rs → diem-move/diem-vm/src/system_module_names.rs
diff --git a/language/diem-vm/src/transaction_metadata.rs → ...-move/diem-vm/src/transaction_metadata.rs b/language/diem-vm/src/transaction_metadata.rs → ...-move/diem-vm/src/transaction_metadata.rs
diff --git a/language/diem-vm/src/unit_tests/mod.rs → diem-move/diem-vm/src/unit_tests/mod.rs b/language/diem-vm/src/unit_tests/mod.rs → diem-move/diem-vm/src/unit_tests/mod.rs
diff --git a/..._tests/script_to_script_function_tests.rs → ..._tests/script_to_script_function_tests.rs b/..._tests/script_to_script_function_tests.rs → ..._tests/script_to_script_function_tests.rs
diff --git a/diem-move/e2e-tests-replay/Cargo.toml b/diem-move/e2e-tests-replay/Cargo.toml
@@ -17,7 +17,7 @@ diem-workspace-hack = { path = "../../common/workspace-hack" }
 bytecode-interpreter = { path = "../../language/move-prover/interpreter" }
 diem-types = { path = "../../types", features = ["fuzzing"] }
 diem-framework = { path = "../../language/diem-framework" }
-diem-vm = { path = "../../language/diem-vm" }
+diem-vm = { path = "../../diem-move/diem-vm" }
 language-e2e-tests = { path = "../../language/testing-infra/e2e-tests" }
 move-binary-format = { path = "../../language/move-binary-format" }
 move-core-types = { path = "../../language/move-core/types" }

diff --git a/language/diem-vm/mvhashmap/Cargo.toml → diem-move/mvhashmap/Cargo.toml b/language/diem-vm/mvhashmap/Cargo.toml → diem-move/mvhashmap/Cargo.toml
@@ -15,7 +15,7 @@ edition = "2018"
 once_cell = "1.7.2"
 rayon = "1.5.0"
 num_cpus = "1.13.0"
-diem-workspace-hack = { path = "../../../common/workspace-hack" }
+diem-workspace-hack = { path = "../../common/workspace-hack" }
 
 [dev-dependencies]
 proptest = "1.0.0"

diff --git a/language/diem-vm/mvhashmap/src/lib.rs → diem-move/mvhashmap/src/lib.rs b/language/diem-vm/mvhashmap/src/lib.rs → diem-move/mvhashmap/src/lib.rs
diff --git a/...e/diem-vm/mvhashmap/src/unit_tests/mod.rs → diem-move/mvhashmap/src/unit_tests/mod.rs b/...e/diem-vm/mvhashmap/src/unit_tests/mod.rs → diem-move/mvhashmap/src/unit_tests/mod.rs
diff --git a/...vhashmap/src/unit_tests/proptest_types.rs → ...vhashmap/src/unit_tests/proptest_types.rs b/...vhashmap/src/unit_tests/proptest_types.rs → ...vhashmap/src/unit_tests/proptest_types.rs
diff --git a/...uage/diem-vm/parallel-executor/Cargo.toml → diem-move/parallel-executor/Cargo.toml b/...uage/diem-vm/parallel-executor/Cargo.toml → diem-move/parallel-executor/Cargo.toml
@@ -13,7 +13,7 @@ edition = "2018"
 
 [dependencies]
 mvhashmap = { path = "../mvhashmap" }
-diem-workspace-hack = { path = "../../../common/workspace-hack" }
+diem-workspace-hack = { path = "../../common/workspace-hack" }
 
 anyhow = "1.0.38"
 crossbeam-queue = "0.3.1"

diff --git a/...lel-executor/benches/scheduler_benches.rs → ...lel-executor/benches/scheduler_benches.rs b/...lel-executor/benches/scheduler_benches.rs → ...lel-executor/benches/scheduler_benches.rs
diff --git a/...e/diem-vm/parallel-executor/src/errors.rs → diem-move/parallel-executor/src/errors.rs b/...e/diem-vm/parallel-executor/src/errors.rs → diem-move/parallel-executor/src/errors.rs
diff --git a/...diem-vm/parallel-executor/src/executor.rs → diem-move/parallel-executor/src/executor.rs b/...diem-vm/parallel-executor/src/executor.rs → diem-move/parallel-executor/src/executor.rs
diff --git a/...uage/diem-vm/parallel-executor/src/lib.rs → diem-move/parallel-executor/src/lib.rs b/...uage/diem-vm/parallel-executor/src/lib.rs → diem-move/parallel-executor/src/lib.rs
diff --git a/...vm/parallel-executor/src/outcome_array.rs → ...ve/parallel-executor/src/outcome_array.rs b/...vm/parallel-executor/src/outcome_array.rs → ...ve/parallel-executor/src/outcome_array.rs
diff --git a/...el-executor/src/proptest_types/bencher.rs → ...el-executor/src/proptest_types/bencher.rs b/...el-executor/src/proptest_types/bencher.rs → ...el-executor/src/proptest_types/bencher.rs
diff --git a/...rallel-executor/src/proptest_types/mod.rs → ...rallel-executor/src/proptest_types/mod.rs b/...rallel-executor/src/proptest_types/mod.rs → ...rallel-executor/src/proptest_types/mod.rs
diff --git a/...llel-executor/src/proptest_types/tests.rs → ...llel-executor/src/proptest_types/tests.rs b/...llel-executor/src/proptest_types/tests.rs → ...llel-executor/src/proptest_types/tests.rs
diff --git a/...llel-executor/src/proptest_types/types.rs → ...llel-executor/src/proptest_types/types.rs b/...llel-executor/src/proptest_types/types.rs → ...llel-executor/src/proptest_types/types.rs
diff --git a/...iem-vm/parallel-executor/src/scheduler.rs → diem-move/parallel-executor/src/scheduler.rs b/...iem-vm/parallel-executor/src/scheduler.rs → diem-move/parallel-executor/src/scheduler.rs
diff --git a/...age/diem-vm/parallel-executor/src/task.rs → diem-move/parallel-executor/src/task.rs b/...age/diem-vm/parallel-executor/src/task.rs → diem-move/parallel-executor/src/task.rs
diff --git a/...m/parallel-executor/src/unit_tests/mod.rs → ...e/parallel-executor/src/unit_tests/mod.rs b/...m/parallel-executor/src/unit_tests/mod.rs → ...e/parallel-executor/src/unit_tests/mod.rs
diff --git a/diem-move/transaction-replay/Cargo.toml b/diem-move/transaction-replay/Cargo.toml
@@ -18,7 +18,7 @@ diem-types = { path = "../../types" }
 diem-state-view = { path = "../../storage/state-view" }
 diem-validator-interface = { path = "../diem-validator-interface" }
 diemdb = { path = "../../storage/diemdb" }
-diem-vm = { path = "../../language/diem-vm" }
+diem-vm = { path = "../diem-vm" }
 move-binary-format = { path = "../../language/move-binary-format"}
 move-cli = { path = "../../language/tools/move-cli" }
 move-vm-types = { path = "../../language/move-vm/types" }

diff --git a/diem-move/vm-genesis/Cargo.toml b/diem-move/vm-genesis/Cargo.toml
@@ -29,7 +29,7 @@ diem-framework = { path = "../../language/diem-framework" }
 diem-framework-releases = { path = "../../language/diem-framework/DPN/releases" }
 diem-transaction-builder = { path = "../../sdk/transaction-builder"}
 move-binary-format = { path = "../../language/move-binary-format" }
-diem-vm = { path = "../../language/diem-vm" }
+diem-vm = { path = "../diem-vm" }
 
 [dev-dependencies]
 proptest = "1.0.0"

diff --git a/diem-move/writeset-transaction-generator/Cargo.toml b/diem-move/writeset-transaction-generator/Cargo.toml
@@ -34,7 +34,7 @@ diem-state-view = { path = "../../storage/state-view" }
 diem-validator-interface = { path = "../diem-validator-interface" }
 diem-transaction-replay = { path = "../transaction-replay" }
 diemdb = { path = "../../storage/diemdb" }
-diem-vm = { path = "../../language/diem-vm" }
+diem-vm = { path = "../diem-vm" }
 move-binary-format = { path = "../../language/move-binary-format"}
 move-vm-types = { path = "../../language/move-vm/types" }
 move-core-types = { path = "../../language/move-core/types" }

diff --git a/diem-node/Cargo.toml b/diem-node/Cargo.toml
@@ -42,7 +42,7 @@ diem-secure-storage = { path = "../secure/storage" }
 diem-temppath = { path = "../common/temppath" }
 diem-time-service = { path = "../common/time-service" }
 diem-types = { path = "../types" }
-diem-vm = { path = "../language/diem-vm" }
+diem-vm = { path = "../diem-move/diem-vm" }
 diem-workspace-hack = { path = "../common/workspace-hack" }
 diemdb = { path = "../storage/diemdb" }
 mempool-notifications = { path = "../state-sync/inter-component/mempool-notifications" }

diff --git a/execution/db-bootstrapper/Cargo.toml b/execution/db-bootstrapper/Cargo.toml
@@ -20,6 +20,6 @@ diem-config = { path = "../../config" }
 diem-crypto = { path = "../../crypto/crypto" }
 diem-temppath = { path = "../../common/temppath" }
 diem-types = { path = "../../types" }
-diem-vm = { path = "../../language/diem-vm" }
+diem-vm = { path = "../../diem-move/diem-vm" }
 diem-workspace-hack = { path = "../../common/workspace-hack" }
 storage-interface = { path = "../../storage/storage-interface" }
diff --git a/execution/execution-correctness/Cargo.toml b/execution/execution-correctness/Cargo.toml
@@ -23,7 +23,7 @@ diem-secure-net = { path = "../../secure/net" }
 diem-secure-storage = { path = "../../secure/storage" }
 diem-temppath = { path = "../../common/temppath" }
 diem-types = { path = "../../types" }
-diem-vm = { path = "../../language/diem-vm" }
+diem-vm = { path = "../../diem-move/diem-vm" }
 diem-workspace-hack = { path = "../../common/workspace-hack" }
 serde = { version = "1.0.124", default-features = false }
 storage-client = { path = "../../storage/storage-client" }

diff --git a/execution/executor-benchmark/Cargo.toml b/execution/executor-benchmark/Cargo.toml
@@ -29,7 +29,7 @@ diem-infallible = { path = "../../common/infallible" }
 diem-jellyfish-merkle = { path = "../../storage/jellyfish-merkle" }
 diem-logger = { path = "../../common/logger" }
 diem-types = { path = "../../types" }
-diem-vm= { path = "../../language/diem-vm" }
+diem-vm= { path = "../../diem-move/diem-vm" }
 diem-workspace-hack = { path = "../../common/workspace-hack" }
 schemadb = { path = "../../storage/schemadb" }
 storage-client = { path = "../../storage/storage-client" }

diff --git a/execution/executor-test-helpers/Cargo.toml b/execution/executor-test-helpers/Cargo.toml
@@ -22,7 +22,7 @@ diem-crypto = { path = "../../crypto/crypto" }
 diem-genesis-tool = {path = "../../config/management/genesis", features = ["testing"] }
 diem-temppath = { path = "../../common/temppath" }
 diem-types = { path = "../../types", features = ["fuzzing"] }
-diem-vm = { path = "../../language/diem-vm" }
+diem-vm = { path = "../../diem-move/diem-vm" }
 diem-workspace-hack = { path = "../../common/workspace-hack" }
 storage-interface = { path = "../../storage/storage-interface" }
 storage-service = { path = "../../storage/storage-service" }

diff --git a/execution/executor/Cargo.toml b/execution/executor/Cargo.toml
@@ -28,7 +28,7 @@ diem-secure-net = { path = "../../secure/net" }
 diem-state-view = { path = "../../storage/state-view" }
 diem-types = { path = "../../types" }
 move-core-types = { path = "../../language/move-core/types" }
-diem-vm = { path = "../../language/diem-vm" }
+diem-vm = { path = "../../diem-move/diem-vm" }
 diem-workspace-hack = { path = "../../common/workspace-hack" }
 scratchpad = { path = "../../storage/scratchpad" }
 storage-interface = { path = "../../storage/storage-interface" }

diff --git a/language/diem-framework/Cargo.toml b/language/diem-framework/Cargo.toml
@@ -44,7 +44,7 @@ include_dir = "0.6.0"
 [dev-dependencies]
 datatest-stable = "0.1.1"
 move-unit-test = { path = "../tools/move-unit-test" }
-diem-vm = { path = "../diem-vm" }
+diem-vm = { path = "../../diem-move/diem-vm" }
 
 tempfile = "3.2.0"
 dir-diff = "0.3.2"

diff --git a/language/diem-transaction-benchmarks/Cargo.toml b/language/diem-transaction-benchmarks/Cargo.toml
@@ -20,7 +20,7 @@ diem-workspace-hack = { path = "../../common/workspace-hack" }
 
 read-write-set = { path = "../tools/read-write-set" }
 read-write-set-dynamic = { path = "../tools/read-write-set/dynamic" }
-diem-vm = { path = "../diem-vm" }
+diem-vm = { path = "../../diem-move/diem-vm" }
 diem-framework-releases = { path = "../diem-framework/DPN/releases" }
 
 [[bench]]

diff --git a/language/e2e-testsuite/Cargo.toml b/language/e2e-testsuite/Cargo.toml
@@ -24,7 +24,7 @@ move-vm-runtime = { path = "../move-vm/runtime" }
 move-vm-types = { path = "../move-vm/types" }
 diem-transaction-builder = { path = "../../sdk/transaction-builder"}
 move-binary-format = { path = "../move-binary-format" }
-diem-vm = { path = "../diem-vm" }
+diem-vm = { path = "../../diem-move/diem-vm" }
 proptest = "1.0.0"
 diem-logger = { path = "../../common/logger" }
 diem-framework-releases = { path = "../diem-framework/DPN/releases" }

diff --git a/language/testing-infra/diem-transactional-test-harness/Cargo.toml b/language/testing-infra/diem-transactional-test-harness/Cargo.toml
@@ -23,7 +23,7 @@ language-e2e-tests = { path = "../e2e-tests" }
 move-lang = { path = "../../move-lang" }
 move-binary-format = { path = "../../move-binary-format" }
 move-core-types = { path = "../../move-core/types" }
-diem-vm =  { path = "../../diem-vm" }
+diem-vm =  { path = "../../../diem-move/diem-vm" }
 diem-types = { path = "../../../types", features = ["fuzzing"] }
 diem-transaction-builder = { path = "../../../sdk/transaction-builder" }
 diem-crypto = { path = "../../../crypto/crypto" }

diff --git a/language/testing-infra/e2e-tests/Cargo.toml b/language/testing-infra/e2e-tests/Cargo.toml
@@ -26,7 +26,7 @@ move-vm-runtime = { path = "../../move-vm/runtime" }
 move-vm-types = { path = "../../move-vm/types" }
 move-binary-format = { path = "../../move-binary-format" }
 vm-genesis = { path = "../../../diem-move/vm-genesis" }
-diem-vm = { path = "../../diem-vm" }
+diem-vm = { path = "../../../diem-move/diem-vm" }
 proptest = "1.0.0"
 proptest-derive = "0.3.0"
 diem-keygen = { path = "../../../diem-move/diem-keygen" }

diff --git a/language/testing-infra/functional-tests/Cargo.toml b/language/testing-infra/functional-tests/Cargo.toml
@@ -15,7 +15,7 @@ move-command-line-common = { path = "../../move-command-line-common" }
 hex = "0.4.3"
 diem-state-view = { path = "../../../storage/state-view" }
 diem-types = { path = "../../../types" }
-diem-vm = { path = "../../diem-vm" }
+diem-vm = { path = "../../../diem-move/diem-vm" }
 move-binary-format = { path = "../../move-binary-format" }
 bytecode-verifier = { path = "../../bytecode-verifier" }
 language-e2e-tests = { path = "../e2e-tests" }

diff --git a/secure/key-manager/Cargo.toml b/secure/key-manager/Cargo.toml
@@ -42,7 +42,7 @@ diem-json-rpc = { path = "../../json-rpc", features = ["fuzzing"] }
 diem-mempool = { path = "../../mempool"}
 diem-secure-storage = { path = "../storage", features = ["testing"] }
 diem-time-service = { path = "../../common/time-service", features = ["testing"] }
-diem-vm = { path = "../../language/diem-vm" }
+diem-vm = { path = "../../diem-move/diem-vm" }
 diemdb = { path = "../../storage/diemdb" }
 storage-interface= { path = "../../storage/storage-interface" }
 vm-validator = { path = "../../vm-validator" }

diff --git a/shuffle/move/Cargo.toml b/shuffle/move/Cargo.toml
@@ -11,6 +11,6 @@ edition = "2018"
 [dependencies]
 diem-framework = { path = "../../language/diem-framework" }
 diem-workspace-hack = { path = "../../common/workspace-hack" }
-diem-vm = { path = "../../language/diem-vm" }
+diem-vm = { path = "../../diem-move/diem-vm" }
 move-stdlib = { path = "../../language/move-stdlib" }
 move-unit-test = { path = "../../language/tools/move-unit-test" }
diff --git a/state-sync/inter-component/event-notifications/Cargo.toml b/state-sync/inter-component/event-notifications/Cargo.toml
@@ -31,7 +31,7 @@ claim = "0.5.0"
 
 diem-crypto = { path = "../../../crypto/crypto" }
 diem-temppath = { path = "../../../common/temppath" }
-diem-vm = { path = "../../../language/diem-vm" }
+diem-vm = { path = "../../../diem-move/diem-vm" }
 diemdb = { path = "../../../storage/diemdb" }
 executor-test-helpers = { path = "../../../execution/executor-test-helpers" }
 move-core-types = { path = "../../../language/move-core/types" }

diff --git a/state-sync/state-sync-v1/Cargo.toml b/state-sync/state-sync-v1/Cargo.toml
@@ -34,7 +34,7 @@ diem-metrics = { path = "../../common/metrics" }
 diem-proptest-helpers = { path = "../../common/proptest-helpers", optional = true }
 diem-temppath = { path = "../../common/temppath" }
 diem-types = { path = "../../types" }
-diem-vm = { path = "../../language/diem-vm" }
+diem-vm = { path = "../../diem-move/diem-vm" }
 diem-workspace-hack = { path = "../../common/workspace-hack" }
 diemdb = { path = "../../storage/diemdb", optional = true }
 event-notifications = { path = "../../state-sync/inter-component/event-notifications" }

diff --git a/storage/backup/backup-cli/Cargo.toml b/storage/backup/backup-cli/Cargo.toml
@@ -42,7 +42,7 @@ diem-logger = { path = "../../../common/logger" }
 diem-secure-push-metrics = { path = "../../../secure/push-metrics" }
 diem-temppath = { path = "../../../common/temppath" }
 diem-types = { path = "../../../types" }
-diem-vm = { path = "../../../language/diem-vm" }
+diem-vm = { path = "../../../diem-move/diem-vm" }
 diem-workspace-hack = { path = "../../../common/workspace-hack" }
 diemdb = { path = "../../diemdb" }
 storage-interface = { path = "../../storage-interface" }

diff --git a/vm-validator/Cargo.toml b/vm-validator/Cargo.toml
@@ -16,7 +16,7 @@ scratchpad = { path = "../storage/scratchpad" }
 diem-state-view = { path = "../storage/state-view" }
 storage-interface = { path = "../storage/storage-interface" }
 diem-types = { path = "../types" }
-diem-vm = { path = "../language/diem-vm" }
+diem-vm = { path = "../diem-move/diem-vm" }
 diem-workspace-hack = { path = "../common/workspace-hack" }
 
 [dev-dependencies]
@@ -27,7 +27,7 @@ executor-test-helpers = { path = "../execution/executor-test-helpers" }
 diem-crypto = { path = "../crypto/crypto", features = ["fuzzing"] }
 diem-temppath = { path = "../common/temppath" }
 diem-types = { path = "../types", features = ["fuzzing"] }
-diem-vm = { path = "../language/diem-vm" }
+diem-vm = { path = "../diem-move/diem-vm" }
 diemdb = { path = "../storage/diemdb", features = ["fuzzing"] }
 storage-service = { path = "../storage/storage-service" }
 diem-transaction-builder = { path = "../sdk/transaction-builder" }

diff --git a/x.toml b/x.toml
@@ -261,7 +261,6 @@ diem_crates_in_language = [
     "framework-releases",
     "diem-transactional-test-harness",
     "diem-transaction-benchmarks",
-    "diem-vm",
     "language-e2e-testsuite",
     "ir-testsuite",
     "language-e2e-tests",