diff --git a/packages.nix b/packages.nix
index 06567e4..f49a48b 100644
--- a/packages.nix
+++ b/packages.nix
@@ -86,7 +86,7 @@ lib.makeScope newScope (
 
         postPatch = ''
           patchShebangs --build .
-          cp -r ${escapeStorePath ./overlay}/. .
+          cp -r ${escapeStorePath ./src_overlay}/. .
           rm config-overrides/*/difficultylock.json5
         '';
         dontConfigure = true;
@@ -111,12 +111,12 @@ lib.makeScope newScope (
             rm -r config-overrides manifest.json modlist.html
 
             # `packwiz init` tries to go online so we have to do this
-            substitute ${escapeStorePath ./pack.toml.in} pack.toml \
+            substitute ${escapeStorePath ./packwiz/pack.toml.in} pack.toml \
               --subst-var-by mc_version "$(jq -r '.minecraft.version' "$src/manifest.json")" \
               --subst-var-by forge_version "$(jq -r '.minecraft.modLoaders[0].id | sub("^forge-"; "")' "$src/manifest.json")"
             : > index.toml
-            python3 ${escapeStorePath ./gen_pw_mods.py} ${escapeStorePath ./mods.json}
-            substitute ${escapeStorePath ./forge-installer.pw.toml.in} forge-installer.pw.toml \
+            python3 ${escapeStorePath ./packwiz/gen_pw_mods.py} ${escapeStorePath ./mods.json}
+            substitute ${escapeStorePath ./packwiz/forge-installer.pw.toml.in} forge-installer.pw.toml \
               --subst-var-by url ${escapeShellArg forgeServer.src.url} \
               --subst-var-by hash ${escapeShellArg forgeServer.src.outputHash}
             packwiz refresh
diff --git a/forge-installer.pw.toml.in b/packwiz/forge-installer.pw.toml.in
similarity index 100%
rename from forge-installer.pw.toml.in
rename to packwiz/forge-installer.pw.toml.in
diff --git a/gen_pw_mods.py b/packwiz/gen_pw_mods.py
similarity index 100%
rename from gen_pw_mods.py
rename to packwiz/gen_pw_mods.py
diff --git a/pack.toml.in b/packwiz/pack.toml.in
similarity index 100%
rename from pack.toml.in
rename to packwiz/pack.toml.in
diff --git a/overlay/config/giacomos_speedometer-client.toml b/src_overlay/config/giacomos_speedometer-client.toml
similarity index 100%
rename from overlay/config/giacomos_speedometer-client.toml
rename to src_overlay/config/giacomos_speedometer-client.toml
diff --git a/overlay/config/invtweaks-client.toml b/src_overlay/config/invtweaks-client.toml
similarity index 100%
rename from overlay/config/invtweaks-client.toml
rename to src_overlay/config/invtweaks-client.toml
diff --git a/overlay/manifest.json b/src_overlay/manifest.json
similarity index 100%
rename from overlay/manifest.json
rename to src_overlay/manifest.json