diff --git a/flake.nix b/flake.nix
index 7ad55c1..30024a4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -77,7 +77,7 @@
 
           inherit (pkgs) lib;
 
-          rust-nightly = pkgs.rust-bin.fromRustupToolchainFile ./rust/lanzaboote/rust-toolchain.toml;
+          rust-nightly = pkgs.rust-bin.fromRustupToolchainFile ./rust/stub/rust-toolchain.toml;
           craneLib = crane.lib.x86_64-linux.overrideToolchain rust-nightly;
 
           # Build attributes for a Rust application.
@@ -108,7 +108,7 @@
             };
 
           lanzabooteCrane = buildRustApp {
-            src = craneLib.cleanCargoSource ./rust/lanzaboote;
+            src = craneLib.cleanCargoSource ./rust/stub;
             target = "x86_64-unknown-uefi";
             doCheck = false;
           };
@@ -116,7 +116,7 @@
           lanzaboote = lanzabooteCrane.package;
 
           lanzatoolCrane = buildRustApp {
-            src = ./rust/lanzatool;
+            src = ./rust/tool;
             extraArgs = {
               TEST_SYSTEMD = pkgs.systemd;
               checkInputs = with pkgs; [
diff --git a/rust/lanzaboote/.cargo/config b/rust/stub/.cargo/config
similarity index 100%
rename from rust/lanzaboote/.cargo/config
rename to rust/stub/.cargo/config
diff --git a/rust/lanzaboote/Cargo.lock b/rust/stub/Cargo.lock
similarity index 100%
rename from rust/lanzaboote/Cargo.lock
rename to rust/stub/Cargo.lock
diff --git a/rust/lanzaboote/Cargo.toml b/rust/stub/Cargo.toml
similarity index 100%
rename from rust/lanzaboote/Cargo.toml
rename to rust/stub/Cargo.toml
diff --git a/rust/lanzaboote/rust-toolchain.toml b/rust/stub/rust-toolchain.toml
similarity index 100%
rename from rust/lanzaboote/rust-toolchain.toml
rename to rust/stub/rust-toolchain.toml
diff --git a/rust/lanzaboote/src/linux_loader.rs b/rust/stub/src/linux_loader.rs
similarity index 100%
rename from rust/lanzaboote/src/linux_loader.rs
rename to rust/stub/src/linux_loader.rs
diff --git a/rust/lanzaboote/src/main.rs b/rust/stub/src/main.rs
similarity index 100%
rename from rust/lanzaboote/src/main.rs
rename to rust/stub/src/main.rs
diff --git a/rust/lanzaboote/src/pe_section.rs b/rust/stub/src/pe_section.rs
similarity index 100%
rename from rust/lanzaboote/src/pe_section.rs
rename to rust/stub/src/pe_section.rs
diff --git a/rust/lanzaboote/src/uefi_helpers.rs b/rust/stub/src/uefi_helpers.rs
similarity index 100%
rename from rust/lanzaboote/src/uefi_helpers.rs
rename to rust/stub/src/uefi_helpers.rs
diff --git a/rust/lanzatool/Cargo.lock b/rust/tool/Cargo.lock
similarity index 100%
rename from rust/lanzatool/Cargo.lock
rename to rust/tool/Cargo.lock
diff --git a/rust/lanzatool/Cargo.toml b/rust/tool/Cargo.toml
similarity index 100%
rename from rust/lanzatool/Cargo.toml
rename to rust/tool/Cargo.toml
diff --git a/rust/lanzatool/bootspec.json b/rust/tool/bootspec.json
similarity index 100%
rename from rust/lanzatool/bootspec.json
rename to rust/tool/bootspec.json
diff --git a/rust/lanzatool/src/cli.rs b/rust/tool/src/cli.rs
similarity index 100%
rename from rust/lanzatool/src/cli.rs
rename to rust/tool/src/cli.rs
diff --git a/rust/lanzatool/src/esp.rs b/rust/tool/src/esp.rs
similarity index 100%
rename from rust/lanzatool/src/esp.rs
rename to rust/tool/src/esp.rs
diff --git a/rust/lanzatool/src/gc.rs b/rust/tool/src/gc.rs
similarity index 100%
rename from rust/lanzatool/src/gc.rs
rename to rust/tool/src/gc.rs
diff --git a/rust/lanzatool/src/generation.rs b/rust/tool/src/generation.rs
similarity index 100%
rename from rust/lanzatool/src/generation.rs
rename to rust/tool/src/generation.rs
diff --git a/rust/lanzatool/src/install.rs b/rust/tool/src/install.rs
similarity index 100%
rename from rust/lanzatool/src/install.rs
rename to rust/tool/src/install.rs
diff --git a/rust/lanzatool/src/main.rs b/rust/tool/src/main.rs
similarity index 100%
rename from rust/lanzatool/src/main.rs
rename to rust/tool/src/main.rs
diff --git a/rust/lanzatool/src/os_release.rs b/rust/tool/src/os_release.rs
similarity index 100%
rename from rust/lanzatool/src/os_release.rs
rename to rust/tool/src/os_release.rs
diff --git a/rust/lanzatool/src/pe.rs b/rust/tool/src/pe.rs
similarity index 100%
rename from rust/lanzatool/src/pe.rs
rename to rust/tool/src/pe.rs
diff --git a/rust/lanzatool/src/signature.rs b/rust/tool/src/signature.rs
similarity index 100%
rename from rust/lanzatool/src/signature.rs
rename to rust/tool/src/signature.rs
diff --git a/rust/lanzatool/tests/common/mod.rs b/rust/tool/tests/common/mod.rs
similarity index 100%
rename from rust/lanzatool/tests/common/mod.rs
rename to rust/tool/tests/common/mod.rs
diff --git a/rust/lanzatool/tests/fixtures/uefi-keys/db.key b/rust/tool/tests/fixtures/uefi-keys/db.key
similarity index 100%
rename from rust/lanzatool/tests/fixtures/uefi-keys/db.key
rename to rust/tool/tests/fixtures/uefi-keys/db.key
diff --git a/rust/lanzatool/tests/fixtures/uefi-keys/db.pem b/rust/tool/tests/fixtures/uefi-keys/db.pem
similarity index 100%
rename from rust/lanzatool/tests/fixtures/uefi-keys/db.pem
rename to rust/tool/tests/fixtures/uefi-keys/db.pem
diff --git a/rust/lanzatool/tests/gc.rs b/rust/tool/tests/gc.rs
similarity index 100%
rename from rust/lanzatool/tests/gc.rs
rename to rust/tool/tests/gc.rs
diff --git a/rust/lanzatool/tests/os_release.rs b/rust/tool/tests/os_release.rs
similarity index 100%
rename from rust/lanzatool/tests/os_release.rs
rename to rust/tool/tests/os_release.rs