diff --git a/bwapi_bridge/bwapi_bridge.vcxproj b/bwapi_bridge/bwapi_bridge.vcxproj
index 453514c..35f2c12 100644
--- a/bwapi_bridge/bwapi_bridge.vcxproj
+++ b/bwapi_bridge/bwapi_bridge.vcxproj
@@ -82,10 +82,10 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="..\output\concat_header.h" />
+    <ClInclude Include="..\output\bwapi_bridge_src\concat_header.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\output\c\impl.cpp" />
+    <ClCompile Include="..\output\bwapi_bridge_src\impl.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/bwapi_bridge/bwapi_bridge.vcxproj.filters b/bwapi_bridge/bwapi_bridge.vcxproj.filters
index 72bc34b..e81e87a 100644
--- a/bwapi_bridge/bwapi_bridge.vcxproj.filters
+++ b/bwapi_bridge/bwapi_bridge.vcxproj.filters
@@ -15,12 +15,12 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\output\concat_header.h">
+    <ClInclude Include="..\output\bwapi_bridge_src\concat_header.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\output\c\impl.cpp">
+    <ClCompile Include="..\output\bwapi_bridge_src\impl.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
diff --git a/generator/src/main/java/bwmirror/generator/CJavaPipeline.java b/generator/src/main/java/bwmirror/generator/CJavaPipeline.java
index d7e3ae2..445e2a0 100644
--- a/generator/src/main/java/bwmirror/generator/CJavaPipeline.java
+++ b/generator/src/main/java/bwmirror/generator/CJavaPipeline.java
@@ -328,8 +328,8 @@ public class CJavaPipeline {
             Properties props = new Properties();
             props.put(COMPILE_DIR_PROPERTY, basePath.getPath() + "/output/compiled");
             props.put(HEADERS_DIR_PROPERTY, basePath.getPath() + "/output/headers");
-            props.put(HEADER_FILE_PROPERTY, basePath.getPath() + "/output/concat_header.h");
-            props.put(C_IMPLEMENTATION_FILE_PROPERTY, basePath.getPath() + "/output/c/impl.cpp");
+            props.put(HEADER_FILE_PROPERTY, basePath.getPath() + "/output/bwapi_bridge_src/concat_header.h");
+            props.put(C_IMPLEMENTATION_FILE_PROPERTY, basePath.getPath() + "/output/bwapi_bridge_src/impl.cpp");
             props.put(GENERATE_TO_DIR, basePath.getPath() + "/output/generated");
 
             new CJavaPipeline().run(new PackageProcessOptions[]{bwapiOptions, bwtaOptions}, props);
diff --git a/generator/src/main/java/bwmirror/generator/ccalls/CallImplementer.java b/generator/src/main/java/bwmirror/generator/ccalls/CallImplementer.java
index 0a4014a..f985ac5 100644
--- a/generator/src/main/java/bwmirror/generator/ccalls/CallImplementer.java
+++ b/generator/src/main/java/bwmirror/generator/ccalls/CallImplementer.java
@@ -51,7 +51,7 @@ public class CallImplementer {
 
     public void setOut(PrintStream out) {
         this.out = out;
-        out.print("#include \"../concat_header.h\"\n" +
+        out.print("#include \"concat_header.h\"\n" +
                 "#include <BWAPI.h>\n" +
                 "#include <BWAPI/Client.h>\n" +
                 "#include <BWTA.h>\n" +