diff --git a/lib/build_runner.zig b/lib/compiler/build_runner.zig
similarity index 100%
rename from lib/build_runner.zig
rename to lib/compiler/build_runner.zig
diff --git a/lib/std/zig/fmt.zig b/lib/compiler/fmt.zig
similarity index 100%
rename from lib/std/zig/fmt.zig
rename to lib/compiler/fmt.zig
diff --git a/lib/std/zig/reduce.zig b/lib/compiler/reduce.zig
similarity index 100%
rename from lib/std/zig/reduce.zig
rename to lib/compiler/reduce.zig
diff --git a/lib/std/zig/reduce/Walk.zig b/lib/compiler/reduce/Walk.zig
similarity index 100%
rename from lib/std/zig/reduce/Walk.zig
rename to lib/compiler/reduce/Walk.zig
diff --git a/lib/test_runner.zig b/lib/compiler/test_runner.zig
similarity index 100%
rename from lib/test_runner.zig
rename to lib/compiler/test_runner.zig
diff --git a/src/main.zig b/src/main.zig
index b80070fd35..668bc61a77 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -2739,6 +2739,7 @@ fn buildOutputType(
             .paths = .{
                 .root = .{
                     .root_dir = zig_lib_directory,
+                    .sub_path = "compiler",
                 },
                 .root_src_path = "test_runner.zig",
             },
@@ -5385,7 +5386,10 @@ fn cmdBuild(gpa: Allocator, arena: Allocator, args: []const []const u8) !void {
                 },
                 .root_src_path = fs.path.basename(runner),
             } else .{
-                .root = .{ .root_dir = zig_lib_directory },
+                .root = .{
+                    .root_dir = zig_lib_directory,
+                    .sub_path = "compiler",
+                },
                 .root_src_path = "build_runner.zig",
             };
 
@@ -5767,7 +5771,7 @@ fn jitCmd(
         const main_mod_paths: Package.Module.CreateOptions.Paths = .{
             .root = .{
                 .root_dir = zig_lib_directory,
-                .sub_path = "std/zig",
+                .sub_path = "compiler",
             },
             .root_src_path = root_src_path,
         };