diff --git a/CMakeLists.txt b/CMakeLists.txt
index 66db1ccdbb..22419aa9fa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -549,34 +549,6 @@ set(ZIG_STAGE2_SOURCES
     src/Value.zig
     src/Zcu.zig
     src/Zcu/PerThread.zig
-    src/arch/riscv64/abi.zig
-    src/arch/riscv64/bits.zig
-    src/arch/riscv64/CodeGen.zig
-    src/arch/riscv64/Emit.zig
-    src/arch/riscv64/encoding.zig
-    src/arch/riscv64/Lower.zig
-    src/arch/riscv64/Mir.zig
-    src/arch/riscv64/mnem.zig
-    src/arch/sparc64/CodeGen.zig
-    src/arch/sparc64/Emit.zig
-    src/arch/sparc64/Mir.zig
-    src/arch/sparc64/abi.zig
-    src/arch/sparc64/bits.zig
-    src/arch/wasm/CodeGen.zig
-    src/arch/wasm/Emit.zig
-    src/arch/wasm/Mir.zig
-    src/arch/wasm/abi.zig
-    src/arch/x86/bits.zig
-    src/arch/x86_64/CodeGen.zig
-    src/arch/x86_64/Disassembler.zig
-    src/arch/x86_64/Emit.zig
-    src/arch/x86_64/Encoding.zig
-    src/arch/x86_64/Lower.zig
-    src/arch/x86_64/Mir.zig
-    src/arch/x86_64/abi.zig
-    src/arch/x86_64/bits.zig
-    src/arch/x86_64/encoder.zig
-    src/arch/x86_64/encodings.zon
     src/clang.zig
     src/clang_options.zig
     src/clang_options_data.zig
diff --git a/src/arch/wasm/CodeGen.zig b/src/arch/wasm/CodeGen.zig
index 9452066bc5..e396f69af3 100644
--- a/src/arch/wasm/CodeGen.zig
+++ b/src/arch/wasm/CodeGen.zig
@@ -17,7 +17,7 @@ const Compilation = @import("../../Compilation.zig");
 const link = @import("../../link.zig");
 const Air = @import("../../Air.zig");
 const Mir = @import("Mir.zig");
-const abi = @import("abi.zig");
+const abi = @import("../../codegen/wasm/abi.zig");
 const Alignment = InternPool.Alignment;
 const errUnionPayloadOffset = codegen.errUnionPayloadOffset;
 const errUnionErrorOffset = codegen.errUnionErrorOffset;
diff --git a/src/codegen/llvm.zig b/src/codegen/llvm.zig
index 1645a92657..27092a1de8 100644
--- a/src/codegen/llvm.zig
+++ b/src/codegen/llvm.zig
@@ -21,11 +21,11 @@ const Air = @import("../Air.zig");
 const Value = @import("../Value.zig");
 const Type = @import("../Type.zig");
 const x86_64_abi = @import("../arch/x86_64/abi.zig");
-const wasm_c_abi = @import("../arch/wasm/abi.zig");
+const wasm_c_abi = @import("wasm/abi.zig");
 const aarch64_c_abi = @import("aarch64/abi.zig");
 const arm_c_abi = @import("arm/abi.zig");
 const riscv_c_abi = @import("../arch/riscv64/abi.zig");
-const mips_c_abi = @import("../arch/mips/abi.zig");
+const mips_c_abi = @import("mips/abi.zig");
 const dev = @import("../dev.zig");
 
 const target_util = @import("../target.zig");
diff --git a/src/arch/mips/abi.zig b/src/codegen/mips/abi.zig
similarity index 100%
rename from src/arch/mips/abi.zig
rename to src/codegen/mips/abi.zig
diff --git a/src/arch/wasm/abi.zig b/src/codegen/wasm/abi.zig
similarity index 100%
rename from src/arch/wasm/abi.zig
rename to src/codegen/wasm/abi.zig
diff --git a/src/link/Wasm.zig b/src/link/Wasm.zig
index 5f98771dcf..6c67547a00 100644
--- a/src/link/Wasm.zig
+++ b/src/link/Wasm.zig
@@ -31,7 +31,7 @@ const mem = std.mem;
 
 const Mir = @import("../arch/wasm/Mir.zig");
 const CodeGen = @import("../arch/wasm/CodeGen.zig");
-const abi = @import("../arch/wasm/abi.zig");
+const abi = @import("../codegen/wasm/abi.zig");
 const Compilation = @import("../Compilation.zig");
 const Dwarf = @import("Dwarf.zig");
 const InternPool = @import("../InternPool.zig");