diff --git a/extensions/structs/structs.txt b/gamedata/structs.gamedata.txt
similarity index 100%
rename from extensions/structs/structs.txt
rename to gamedata/structs.gamedata.txt
diff --git a/extensions/structs/structs.inc b/plugins/include/structs.inc
similarity index 95%
rename from extensions/structs/structs.inc
rename to plugins/include/structs.inc
index 19819d40..f324ca10 100644
--- a/extensions/structs/structs.inc
+++ b/plugins/include/structs.inc
@@ -156,6 +156,7 @@ native SetStructEnt(Handle:strct, const String:member[], entity);
 
 /**
  * Retrieves a struct handle to a FileWeaponInfo_t for the given weapon name.
+ * This handle needs to be closed when you have finished using it.
  *
  * @param weapon	Weapon name to retrieve.
  * @return			Struct handle or INVALID_HANDLE on failure.
diff --git a/extensions/structs/structtest.sp b/plugins/testsuite/structtest.sp
similarity index 100%
rename from extensions/structs/structtest.sp
rename to plugins/testsuite/structtest.sp
diff --git a/tools/builder/PkgCore.cs b/tools/builder/PkgCore.cs
index 58531e8e..3c129672 100644
--- a/tools/builder/PkgCore.cs
+++ b/tools/builder/PkgCore.cs
@@ -282,6 +282,14 @@ namespace builder
 			lib.vcproj_name = "clientprefs";
 			libraries.Add(lib);
 
+			lib = new Library();
+			lib.package_path = "addons/sourcemod/extensions/auto.2.ep2";
+			lib.source_path = "extensions/structs";
+			lib.binary_name = "structs.ext";
+			lib.vcproj_name = "sdk";
+			lib.build_mode = BuildMode.BuildMode_Episode2;
+			libraries.Add(lib);
+
 			return (Library [])libraries.ToArray(typeof(Library));
 		}