diff --git a/sourcepawn/batchtool/compile.cfg b/tools/batchtool/compile.cfg
similarity index 100%
rename from sourcepawn/batchtool/compile.cfg
rename to tools/batchtool/compile.cfg
diff --git a/sourcepawn/batchtool/compile.dpr b/tools/batchtool/compile.dpr
similarity index 100%
rename from sourcepawn/batchtool/compile.dpr
rename to tools/batchtool/compile.dpr
diff --git a/sourcepawn/batchtool/compile.exe b/tools/batchtool/compile.exe
similarity index 100%
rename from sourcepawn/batchtool/compile.exe
rename to tools/batchtool/compile.exe
diff --git a/sourcepawn/batchtool/icon.rc b/tools/batchtool/icon.rc
similarity index 100%
rename from sourcepawn/batchtool/icon.rc
rename to tools/batchtool/icon.rc
diff --git a/sourcepawn/batchtool/icon.res b/tools/batchtool/icon.res
similarity index 100%
rename from sourcepawn/batchtool/icon.res
rename to tools/batchtool/icon.res
diff --git a/sourcepawn/batchtool/pawn.ico b/tools/batchtool/pawn.ico
similarity index 100%
rename from sourcepawn/batchtool/pawn.ico
rename to tools/batchtool/pawn.ico
diff --git a/sourcepawn/batchtool/uFunc.pas b/tools/batchtool/uFunc.pas
similarity index 100%
rename from sourcepawn/batchtool/uFunc.pas
rename to tools/batchtool/uFunc.pas
diff --git a/sourcepawn/batchtool/version.rc b/tools/batchtool/version.rc
similarity index 100%
rename from sourcepawn/batchtool/version.rc
rename to tools/batchtool/version.rc
diff --git a/sourcepawn/batchtool/version.res b/tools/batchtool/version.res
similarity index 100%
rename from sourcepawn/batchtool/version.res
rename to tools/batchtool/version.res
diff --git a/tools/buildbot/PackageScript b/tools/buildbot/PackageScript
index 070bc9038..94219560c 100644
--- a/tools/buildbot/PackageScript
+++ b/tools/buildbot/PackageScript
@@ -465,6 +465,6 @@ CopyFiles('plugins/playercommands', 'addons/sourcemod/scripting/playercommands',
 )
 
 if builder.target_platform == 'windows':
-  CopyFiles('sourcepawn/batchtool', 'addons/sourcemod/scripting', ['compile.exe'])
+  CopyFiles('tools/batchtool', 'addons/sourcemod/scripting', ['compile.exe'])
 else:
   CopyFiles('plugins', 'addons/sourcemod/scripting', ['compile.sh'])