diff --git a/AMBuildScript b/AMBuildScript
index 7306cd1..839b733 100644
--- a/AMBuildScript
+++ b/AMBuildScript
@@ -314,3 +314,4 @@ SteamWorks.configure()
 BuildScripts = ['Extension/AMBuilder']
 
 builder.RunBuildScripts(BuildScripts, { 'SteamWorks': SteamWorks })
+builder.RunScript('buildbot/PackageScript', { 'SteamWorks': SteamWorks })
diff --git a/buildbot/PackageScript b/buildbot/PackageScript
new file mode 100644
index 0000000..66e3c16
--- /dev/null
+++ b/buildbot/PackageScript
@@ -0,0 +1,31 @@
+# vim: set ts=8 sts=2 sw=2 tw=99 et ft=python: 
+import os
+
+builder.SetBuildFolder('package')
+
+folder_list = [
+  'addons/sourcemod/extensions',
+  'addons/sourcemod/scripting',
+  'addons/sourcemod/scripting/include',
+]
+
+# Create the distribution folder hierarchy.
+folder_map = {}
+for folder in folder_list:
+  norm_folder = os.path.normpath(folder)
+  folder_map[folder] = builder.AddFolder(norm_folder)
+
+for extension in SteamWorks.extensions:
+  builder.AddCopy(extension.binary, folder_map['addons/sourcemod/extensions'])
+
+# Do all straight-up file copies from the source tree.
+def CopyFiles(src, dest, files):
+  if not dest:
+    dest = src
+  dest_entry = folder_map[dest]
+  for source_file in files:
+    source_path = os.path.join(builder.sourcePath, src, source_file)
+    builder.AddCopy(source_path, dest_entry)
+
+CopyFiles('Pawn', 'addons/sourcemod/scripting', ['swag.sp'])
+CopyFiles('Pawn/includes', 'addons/sourcemod/scripting/include', ['SteamWorks.inc'])
\ No newline at end of file
diff --git a/helpers.pm b/buildbot/helpers.pm
similarity index 100%
rename from helpers.pm
rename to buildbot/helpers.pm
diff --git a/package_script.pl b/buildbot/package_script.pl
similarity index 88%
rename from package_script.pl
rename to buildbot/package_script.pl
index 4882a06..f051772 100644
--- a/package_script.pl
+++ b/buildbot/package_script.pl
@@ -55,15 +55,12 @@ else
 }
 
 #Switch to the output folder.
-# chdir(Build::PathFormat('../../OUTPUT/package'));
+chdir(Build::PathFormat('../../../OUTPUT/package'));
 
 my ($dirlist, $filename, $cmd);
-$dirlist = "addons";
+$dirlist = "../addons";
 $filename = 'SteamWorks' . $version;
 
-mkpath("addons/sourcemod/extensions");
-copy("build/Extension/SteamWorks.ext/SteamWorks.ext" . $ext, "addons/sourcemod/extensions/SteamWorks.ext" . $ext)  or die $!;
-
 if ($^O eq "linux")
 {
     $filename .= '.tar.gz';