diff --git a/bwta2-c/BWTA.h b/bwta2-includes/BWTA.h
similarity index 100%
rename from bwta2-c/BWTA.h
rename to bwta2-includes/BWTA.h
diff --git a/bwta2-c/BWTA/BaseLocation.h b/bwta2-includes/BWTA/BaseLocation.h
similarity index 100%
rename from bwta2-c/BWTA/BaseLocation.h
rename to bwta2-includes/BWTA/BaseLocation.h
diff --git a/bwta2-c/BWTA/Chokepoint.h b/bwta2-includes/BWTA/Chokepoint.h
similarity index 100%
rename from bwta2-c/BWTA/Chokepoint.h
rename to bwta2-includes/BWTA/Chokepoint.h
diff --git a/bwta2-c/BWTA/Polygon.h b/bwta2-includes/BWTA/Polygon.h
similarity index 100%
rename from bwta2-c/BWTA/Polygon.h
rename to bwta2-includes/BWTA/Polygon.h
diff --git a/bwta2-c/BWTA/RectangleArray.h b/bwta2-includes/BWTA/RectangleArray.h
similarity index 100%
rename from bwta2-c/BWTA/RectangleArray.h
rename to bwta2-includes/BWTA/RectangleArray.h
diff --git a/bwta2-c/BWTA/Region.h b/bwta2-includes/BWTA/Region.h
similarity index 100%
rename from bwta2-c/BWTA/Region.h
rename to bwta2-includes/BWTA/Region.h
diff --git a/generator/src/main/java/bwmirror/generator/CJavaPipeline.java b/generator/src/main/java/bwmirror/generator/CJavaPipeline.java
index 4226490..fc0f1ca 100644
--- a/generator/src/main/java/bwmirror/generator/CJavaPipeline.java
+++ b/generator/src/main/java/bwmirror/generator/CJavaPipeline.java
@@ -329,7 +329,7 @@ public class CJavaPipeline {
 
             PackageProcessOptions bwtaOptions = new PackageProcessOptions();
             bwtaOptions.packageName = "bwta";
-            bwtaOptions.cHeadersDir = new File(basePath.getPath() + "/bwta2-c");
+            bwtaOptions.cHeadersDir = new File(basePath.getPath() + "/bwta2-includes");
             bwtaOptions.additionalImportClasses = Arrays.asList("bwapi.Position", "bwapi.TilePosition", "bwapi.Player", "bwapi.Unit", "bwapi.Pair");
             bwtaOptions.globalClassName = "BWTA";