diff --git a/src/Package.zig b/src/Package.zig
index 32533b2d04..c36830d599 100644
--- a/src/Package.zig
+++ b/src/Package.zig
@@ -1,7 +1,7 @@
 pub const Module = @import("Package/Module.zig");
 pub const Fetch = @import("Package/Fetch.zig");
 pub const build_zig_basename = "build.zig";
-pub const Manifest = @import("Manifest.zig");
+pub const Manifest = @import("Package/Manifest.zig");
 
 pub const Path = struct {
     root_dir: Cache.Directory,
diff --git a/src/Package/Fetch.zig b/src/Package/Fetch.zig
index b57117ce97..373ab5be78 100644
--- a/src/Package/Fetch.zig
+++ b/src/Package/Fetch.zig
@@ -1449,9 +1449,9 @@ const Allocator = std.mem.Allocator;
 const Cache = std.Build.Cache;
 const ThreadPool = std.Thread.Pool;
 const WaitGroup = std.Thread.WaitGroup;
-const Manifest = @import("../Manifest.zig");
 const Fetch = @This();
 const main = @import("../main.zig");
-const git = @import("../git.zig");
+const git = @import("Fetch/git.zig");
 const Package = @import("../Package.zig");
+const Manifest = Package.Manifest;
 const ErrorBundle = std.zig.ErrorBundle;
diff --git a/src/git.zig b/src/Package/Fetch/git.zig
similarity index 99%
rename from src/git.zig
rename to src/Package/Fetch/git.zig
index fd35c5c33e..af4317702d 100644
--- a/src/git.zig
+++ b/src/Package/Fetch/git.zig
@@ -11,8 +11,6 @@ const Allocator = mem.Allocator;
 const Sha1 = std.crypto.hash.Sha1;
 const assert = std.debug.assert;
 
-const ProgressReader = @import("Package.zig").ProgressReader;
-
 pub const oid_length = Sha1.digest_length;
 pub const fmt_oid_length = 2 * oid_length;
 /// The ID of a Git object (an SHA-1 hash).
diff --git a/src/git/testdata/testrepo.idx b/src/Package/Fetch/git/testdata/testrepo.idx
similarity index 100%
rename from src/git/testdata/testrepo.idx
rename to src/Package/Fetch/git/testdata/testrepo.idx
diff --git a/src/git/testdata/testrepo.pack b/src/Package/Fetch/git/testdata/testrepo.pack
similarity index 100%
rename from src/git/testdata/testrepo.pack
rename to src/Package/Fetch/git/testdata/testrepo.pack
diff --git a/src/Manifest.zig b/src/Package/Manifest.zig
similarity index 100%
rename from src/Manifest.zig
rename to src/Package/Manifest.zig