diff --git a/src/CppParser/Bindings/CSharp/AST.cs b/src/CppParser/Bindings/CSharp/i686-pc-win32/AST.cs
similarity index 100%
rename from src/CppParser/Bindings/CSharp/AST.cs
rename to src/CppParser/Bindings/CSharp/i686-pc-win32/AST.cs
diff --git a/src/CppParser/Bindings/CSharp/CppParser.cs b/src/CppParser/Bindings/CSharp/i686-pc-win32/CppParser.cs
similarity index 100%
rename from src/CppParser/Bindings/CSharp/CppParser.cs
rename to src/CppParser/Bindings/CSharp/i686-pc-win32/CppParser.cs
diff --git a/src/CppParser/Bindings/CSharp/Target.cs b/src/CppParser/Bindings/CSharp/i686-pc-win32/Target.cs
similarity index 100%
rename from src/CppParser/Bindings/CSharp/Target.cs
rename to src/CppParser/Bindings/CSharp/i686-pc-win32/Target.cs
diff --git a/src/CppParser/Bindings/premake4.lua b/src/CppParser/Bindings/premake4.lua
index 711660df..4ece2bfb 100644
--- a/src/CppParser/Bindings/premake4.lua
+++ b/src/CppParser/Bindings/premake4.lua
@@ -26,10 +26,12 @@ project "CppSharp.Parser.CSharp"
 
   links { "CppSharp.Runtime" }
 
-  if os.is_osx() then
+  if os.is_windows() then
+      files { "CSharp/i686-pc-win32/**.cs" }
+  elseif os.is_osx() then
       files { "CSharp/i686-apple-darwin12.4.0/**.cs" }
   else
-      files { "CSharp/*.cs" }
+      print "Unknown architecture"
   end
 
   configuration ""
@@ -65,4 +67,4 @@ if string.starts(action, "vs") and os.is_windows() then
     configuration "*"
     links { "CppSharp.CppParser" }
 
-end
\ No newline at end of file
+end