diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 63a9389db4..d0c6a00303 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -236,7 +236,7 @@ jobs:
             ~/.cargo/registry/index
             ~/.cargo/registry/cache
             ~/.cargo/git/db
-          key: 3-cargo-home-${{ matrix.os }}-${{ hashFiles('Cargo.lock') }}
+          key: 4-cargo-home-${{ matrix.os }}-${{ hashFiles('Cargo.lock') }}
 
       # In main branch, always creates fresh cache
       - name: Cache build output (main)
@@ -252,7 +252,7 @@ jobs:
             !./target/*/*.zip
             !./target/*/*.tar.gz
           key: |
-            3-cargo-target-${{ matrix.os }}-${{ matrix.profile }}-${{ github.sha }}
+            4-cargo-target-${{ matrix.os }}-${{ matrix.profile }}-${{ github.sha }}
 
       # Restore cache from the latest 'main' branch build.
       - name: Cache build output (PR)
@@ -268,7 +268,7 @@ jobs:
             !./target/*/*.tar.gz
           key: never_saved
           restore-keys: |
-            3-cargo-target-${{ matrix.os }}-${{ matrix.profile }}-
+            4-cargo-target-${{ matrix.os }}-${{ matrix.profile }}-
 
       # Don't save cache after building PRs or branches other than 'main'.
       - name: Skip save cache (PR)
diff --git a/bench_util/Cargo.toml b/bench_util/Cargo.toml
index f43436c06f..acc7cb22fc 100644
--- a/bench_util/Cargo.toml
+++ b/bench_util/Cargo.toml
@@ -10,7 +10,8 @@ readme = "README.md"
 repository = "https://github.com/denoland/deno"
 description = "Bench and profiling utilities for deno crates"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+[lib]
+path = "lib.rs"
 
 [dependencies]
 bencher = "0.1"
diff --git a/bench_util/src/js_runtime.rs b/bench_util/js_runtime.rs
similarity index 100%
rename from bench_util/src/js_runtime.rs
rename to bench_util/js_runtime.rs
diff --git a/bench_util/src/lib.rs b/bench_util/lib.rs
similarity index 100%
rename from bench_util/src/lib.rs
rename to bench_util/lib.rs
diff --git a/bench_util/src/profiling.rs b/bench_util/profiling.rs
similarity index 100%
rename from bench_util/src/profiling.rs
rename to bench_util/profiling.rs
diff --git a/serde_v8/Cargo.toml b/serde_v8/Cargo.toml
index 8a9ee33372..4462b6d8c2 100644
--- a/serde_v8/Cargo.toml
+++ b/serde_v8/Cargo.toml
@@ -9,6 +9,9 @@ readme = "README.md"
 repository = "https://github.com/denoland/deno"
 description = "Rust to V8 serialization and deserialization"
 
+[lib]
+path = "lib.rs"
+
 [dependencies]
 serde = { version = "1.0.130", features = ["derive"] }
 serde_bytes = "0.11"
diff --git a/serde_v8/src/de.rs b/serde_v8/de.rs
similarity index 100%
rename from serde_v8/src/de.rs
rename to serde_v8/de.rs
diff --git a/serde_v8/src/error.rs b/serde_v8/error.rs
similarity index 100%
rename from serde_v8/src/error.rs
rename to serde_v8/error.rs
diff --git a/serde_v8/src/keys.rs b/serde_v8/keys.rs
similarity index 100%
rename from serde_v8/src/keys.rs
rename to serde_v8/keys.rs
diff --git a/serde_v8/src/lib.rs b/serde_v8/lib.rs
similarity index 100%
rename from serde_v8/src/lib.rs
rename to serde_v8/lib.rs
diff --git a/serde_v8/src/magic/buffer.rs b/serde_v8/magic/buffer.rs
similarity index 100%
rename from serde_v8/src/magic/buffer.rs
rename to serde_v8/magic/buffer.rs
diff --git a/serde_v8/src/magic/bytestring.rs b/serde_v8/magic/bytestring.rs
similarity index 100%
rename from serde_v8/src/magic/bytestring.rs
rename to serde_v8/magic/bytestring.rs
diff --git a/serde_v8/src/magic/mod.rs b/serde_v8/magic/mod.rs
similarity index 100%
rename from serde_v8/src/magic/mod.rs
rename to serde_v8/magic/mod.rs
diff --git a/serde_v8/src/magic/string_or_buffer.rs b/serde_v8/magic/string_or_buffer.rs
similarity index 100%
rename from serde_v8/src/magic/string_or_buffer.rs
rename to serde_v8/magic/string_or_buffer.rs
diff --git a/serde_v8/src/magic/transl8.rs b/serde_v8/magic/transl8.rs
similarity index 100%
rename from serde_v8/src/magic/transl8.rs
rename to serde_v8/magic/transl8.rs
diff --git a/serde_v8/src/magic/u16string.rs b/serde_v8/magic/u16string.rs
similarity index 100%
rename from serde_v8/src/magic/u16string.rs
rename to serde_v8/magic/u16string.rs
diff --git a/serde_v8/src/magic/value.rs b/serde_v8/magic/value.rs
similarity index 100%
rename from serde_v8/src/magic/value.rs
rename to serde_v8/magic/value.rs
diff --git a/serde_v8/src/magic/zero_copy_buf.rs b/serde_v8/magic/zero_copy_buf.rs
similarity index 100%
rename from serde_v8/src/magic/zero_copy_buf.rs
rename to serde_v8/magic/zero_copy_buf.rs
diff --git a/serde_v8/src/payload.rs b/serde_v8/payload.rs
similarity index 100%
rename from serde_v8/src/payload.rs
rename to serde_v8/payload.rs
diff --git a/serde_v8/src/ser.rs b/serde_v8/ser.rs
similarity index 100%
rename from serde_v8/src/ser.rs
rename to serde_v8/ser.rs
diff --git a/serde_v8/src/serializable.rs b/serde_v8/serializable.rs
similarity index 100%
rename from serde_v8/src/serializable.rs
rename to serde_v8/serializable.rs
diff --git a/serde_v8/src/utils.rs b/serde_v8/utils.rs
similarity index 100%
rename from serde_v8/src/utils.rs
rename to serde_v8/utils.rs