diff --git a/lib/std/Build/Watch.zig b/lib/std/Build/Watch.zig
index cc8bd60c9a..06c07d929b 100644
--- a/lib/std/Build/Watch.zig
+++ b/lib/std/Build/Watch.zig
@@ -171,7 +171,13 @@ const Os = switch (builtin.os.tag) {
                         const gop = try w.dir_table.getOrPut(gpa, path);
                         if (!gop.found_existing) {
                             var mount_id: MountId = undefined;
-                            const dir_handle = try Os.getDirHandle(gpa, path, &mount_id);
+                            const dir_handle = Os.getDirHandle(gpa, path, &mount_id) catch |err| switch (err) {
+                                error.FileNotFound => {
+                                    std.debug.assert(w.dir_table.swapRemove(path));
+                                    continue;
+                                },
+                                else => return err,
+                            };
                             const fan_fd = blk: {
                                 const fd_gop = try w.os.poll_fds.getOrPut(gpa, mount_id);
                                 if (!fd_gop.found_existing) {
diff --git a/src/Zcu.zig b/src/Zcu.zig
index 76c3a96d13..228144bc9c 100644
--- a/src/Zcu.zig
+++ b/src/Zcu.zig
@@ -3646,6 +3646,7 @@ pub fn errorSetBits(zcu: *const Zcu) u16 {
 
     if (zcu.error_limit == 0) return 0;
     if (target.cpu.arch.isSpirV()) {
+        // As expected by https://github.com/Snektron/zig-spirv-test-executor
         if (zcu.comp.config.is_test) return 32;
     }
 
diff --git a/src/codegen.zig b/src/codegen.zig
index 557bb155dd..2e06bfb676 100644
--- a/src/codegen.zig
+++ b/src/codegen.zig
@@ -57,7 +57,7 @@ fn importBackend(comptime backend: std.builtin.CompilerBackend) type {
         .stage2_powerpc => unreachable,
         .stage2_riscv64 => @import("arch/riscv64/CodeGen.zig"),
         .stage2_sparc64 => @import("arch/sparc64/CodeGen.zig"),
-        .stage2_spirv => @import("arch/spirv/CodeGen.zig"),
+        .stage2_spirv => @import("codegen/spirv/CodeGen.zig"),
         .stage2_wasm => @import("arch/wasm/CodeGen.zig"),
         .stage2_x86, .stage2_x86_64 => @import("arch/x86_64/CodeGen.zig"),
         _ => unreachable,
diff --git a/src/arch/spirv/Assembler.zig b/src/codegen/spirv/Assembler.zig
similarity index 100%
rename from src/arch/spirv/Assembler.zig
rename to src/codegen/spirv/Assembler.zig
diff --git a/src/arch/spirv/CodeGen.zig b/src/codegen/spirv/CodeGen.zig
similarity index 100%
rename from src/arch/spirv/CodeGen.zig
rename to src/codegen/spirv/CodeGen.zig
diff --git a/src/arch/spirv/Module.zig b/src/codegen/spirv/Module.zig
similarity index 100%
rename from src/arch/spirv/Module.zig
rename to src/codegen/spirv/Module.zig
diff --git a/src/arch/spirv/Section.zig b/src/codegen/spirv/Section.zig
similarity index 100%
rename from src/arch/spirv/Section.zig
rename to src/codegen/spirv/Section.zig
diff --git a/src/arch/spirv/extinst.zig.grammar.json b/src/codegen/spirv/extinst.zig.grammar.json
similarity index 100%
rename from src/arch/spirv/extinst.zig.grammar.json
rename to src/codegen/spirv/extinst.zig.grammar.json
diff --git a/src/arch/spirv/spec.zig b/src/codegen/spirv/spec.zig
similarity index 100%
rename from src/arch/spirv/spec.zig
rename to src/codegen/spirv/spec.zig
diff --git a/src/link/SpirV.zig b/src/link/SpirV.zig
index 675b31baee..3f13883649 100644
--- a/src/link/SpirV.zig
+++ b/src/link/SpirV.zig
@@ -11,19 +11,18 @@ const link = @import("../link.zig");
 const Air = @import("../Air.zig");
 const Type = @import("../Type.zig");
 const BinaryModule = @import("SpirV/BinaryModule.zig");
-const CodeGen = @import("../arch/spirv/CodeGen.zig");
-const SpvModule = @import("../arch/spirv/Module.zig");
-const Section = @import("../arch/spirv/Section.zig");
+const CodeGen = @import("../codegen/spirv/CodeGen.zig");
+const Module = @import("../codegen/spirv/Module.zig");
 const trace = @import("../tracy.zig").trace;
 
-const spec = @import("../arch/spirv/spec.zig");
+const spec = @import("../codegen/spirv/spec.zig");
 const Id = spec.Id;
 const Word = spec.Word;
 
 const Linker = @This();
 
 base: link.File,
-module: SpvModule,
+module: Module,
 
 pub fn createEmpty(
     arena: Allocator,
diff --git a/src/link/SpirV/BinaryModule.zig b/src/link/SpirV/BinaryModule.zig
index 4ec98c02b7..7ba9e80bdc 100644
--- a/src/link/SpirV/BinaryModule.zig
+++ b/src/link/SpirV/BinaryModule.zig
@@ -3,7 +3,7 @@ const assert = std.debug.assert;
 const Allocator = std.mem.Allocator;
 const log = std.log.scoped(.spirv_parse);
 
-const spec = @import("../../arch/spirv/spec.zig");
+const spec = @import("../../codegen/spirv/spec.zig");
 const Opcode = spec.Opcode;
 const Word = spec.Word;
 const InstructionSet = spec.InstructionSet;
diff --git a/src/link/SpirV/lower_invocation_globals.zig b/src/link/SpirV/lower_invocation_globals.zig
index 7bcc272a7f..8136baf305 100644
--- a/src/link/SpirV/lower_invocation_globals.zig
+++ b/src/link/SpirV/lower_invocation_globals.zig
@@ -4,8 +4,8 @@ const assert = std.debug.assert;
 const log = std.log.scoped(.spirv_link);
 
 const BinaryModule = @import("BinaryModule.zig");
-const Section = @import("../../arch/spirv/Section.zig");
-const spec = @import("../../arch/spirv/spec.zig");
+const Section = @import("../../codegen/spirv/Section.zig");
+const spec = @import("../../codegen/spirv/spec.zig");
 const ResultId = spec.Id;
 const Word = spec.Word;
 
diff --git a/src/link/SpirV/prune_unused.zig b/src/link/SpirV/prune_unused.zig
index fe04cfe600..87fb047f53 100644
--- a/src/link/SpirV/prune_unused.zig
+++ b/src/link/SpirV/prune_unused.zig
@@ -12,8 +12,8 @@ const assert = std.debug.assert;
 const log = std.log.scoped(.spirv_link);
 
 const BinaryModule = @import("BinaryModule.zig");
-const Section = @import("../../arch/spirv/Section.zig");
-const spec = @import("../../arch/spirv/spec.zig");
+const Section = @import("../../codegen/spirv/Section.zig");
+const spec = @import("../../codegen/spirv/spec.zig");
 const Opcode = spec.Opcode;
 const ResultId = spec.Id;
 const Word = spec.Word;