diff --git a/build/premake4.lua b/build/premake4.lua
index a49be672..7cddc8a2 100644
--- a/build/premake4.lua
+++ b/build/premake4.lua
@@ -35,7 +35,7 @@ solution "CppSharp"
   
   group "Libraries"
     include (srcdir .. "/CppSharp/CppSharp.lua")
-    include (srcdir .. "/Bridge/Bridge.lua")
+    include (srcdir .. "/AST/AST.lua")
     include (srcdir .. "/Generator/Generator.lua")
     include (srcdir .. "/Generator.Tests/Generator.Tests.lua")
     include (srcdir .. "/Parser/Parser.lua")
diff --git a/src/AST/AST.lua b/src/AST/AST.lua
new file mode 100644
index 00000000..51b6e3e7
--- /dev/null
+++ b/src/AST/AST.lua
@@ -0,0 +1,8 @@
+project "CppSharp.AST"
+
+  kind  "SharedLib"
+  language "C#"
+  location "."
+
+  files { "*.cs" }
+  links { "System" }
\ No newline at end of file
diff --git a/src/Bridge/ASTVisitor.cs b/src/AST/ASTVisitor.cs
similarity index 100%
rename from src/Bridge/ASTVisitor.cs
rename to src/AST/ASTVisitor.cs
diff --git a/src/Bridge/Class.cs b/src/AST/Class.cs
similarity index 100%
rename from src/Bridge/Class.cs
rename to src/AST/Class.cs
diff --git a/src/Bridge/Comment.cs b/src/AST/Comment.cs
similarity index 100%
rename from src/Bridge/Comment.cs
rename to src/AST/Comment.cs
diff --git a/src/Bridge/Conversions.cs b/src/AST/Conversions.cs
similarity index 100%
rename from src/Bridge/Conversions.cs
rename to src/AST/Conversions.cs
diff --git a/src/Bridge/Declaration.cs b/src/AST/Declaration.cs
similarity index 100%
rename from src/Bridge/Declaration.cs
rename to src/AST/Declaration.cs
diff --git a/src/Bridge/Delegate.cs b/src/AST/Delegate.cs
similarity index 100%
rename from src/Bridge/Delegate.cs
rename to src/AST/Delegate.cs
diff --git a/src/Bridge/Enumeration.cs b/src/AST/Enumeration.cs
similarity index 100%
rename from src/Bridge/Enumeration.cs
rename to src/AST/Enumeration.cs
diff --git a/src/Bridge/Event.cs b/src/AST/Event.cs
similarity index 100%
rename from src/Bridge/Event.cs
rename to src/AST/Event.cs
diff --git a/src/Bridge/Field.cs b/src/AST/Field.cs
similarity index 100%
rename from src/Bridge/Field.cs
rename to src/AST/Field.cs
diff --git a/src/Bridge/Function.cs b/src/AST/Function.cs
similarity index 100%
rename from src/Bridge/Function.cs
rename to src/AST/Function.cs
diff --git a/src/Bridge/Library.cs b/src/AST/Library.cs
similarity index 100%
rename from src/Bridge/Library.cs
rename to src/AST/Library.cs
diff --git a/src/Bridge/Method.cs b/src/AST/Method.cs
similarity index 100%
rename from src/Bridge/Method.cs
rename to src/AST/Method.cs
diff --git a/src/Bridge/Namespace.cs b/src/AST/Namespace.cs
similarity index 100%
rename from src/Bridge/Namespace.cs
rename to src/AST/Namespace.cs
diff --git a/src/Bridge/Preprocessor.cs b/src/AST/Preprocessor.cs
similarity index 100%
rename from src/Bridge/Preprocessor.cs
rename to src/AST/Preprocessor.cs
diff --git a/src/Bridge/Properties/AssemblyInfo.cs b/src/AST/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Bridge/Properties/AssemblyInfo.cs
rename to src/AST/Properties/AssemblyInfo.cs
diff --git a/src/Bridge/Property.cs b/src/AST/Property.cs
similarity index 100%
rename from src/Bridge/Property.cs
rename to src/AST/Property.cs
diff --git a/src/Bridge/Template.cs b/src/AST/Template.cs
similarity index 100%
rename from src/Bridge/Template.cs
rename to src/AST/Template.cs
diff --git a/src/Bridge/TranslationUnit.cs b/src/AST/TranslationUnit.cs
similarity index 100%
rename from src/Bridge/TranslationUnit.cs
rename to src/AST/TranslationUnit.cs
diff --git a/src/Bridge/Type.cs b/src/AST/Type.cs
similarity index 100%
rename from src/Bridge/Type.cs
rename to src/AST/Type.cs
diff --git a/src/Bridge/Variable.cs b/src/AST/Variable.cs
similarity index 100%
rename from src/Bridge/Variable.cs
rename to src/AST/Variable.cs
diff --git a/src/Bridge/Bridge.lua b/src/Bridge/Bridge.lua
deleted file mode 100644
index f474499b..00000000
--- a/src/Bridge/Bridge.lua
+++ /dev/null
@@ -1,13 +0,0 @@
-project "Bridge"
-
-  kind  "SharedLib"
-  language "C#"
-  location "."
-
-  files { "*.cs" }
-  links { "System" }
-  
-  if _ACTION == "clean" then
-    os.rmdir("lib")
-  end
-
diff --git a/src/CppSharp/CppSharp.lua b/src/CppSharp/CppSharp.lua
index f5074112..79245f1f 100644
--- a/src/CppSharp/CppSharp.lua
+++ b/src/CppSharp/CppSharp.lua
@@ -6,4 +6,4 @@ project "CppSharp"
 
   files   { "**.cs" }
   
-  links { "System", "System.Core", "Bridge", "Generator" }
+  links { "System", "System.Core", "CppSharp.AST", "CppSharp.Generator" }
diff --git a/src/Generator.Tests/Generator.Tests.lua b/src/Generator.Tests/Generator.Tests.lua
index 7c86d552..80706348 100644
--- a/src/Generator.Tests/Generator.Tests.lua
+++ b/src/Generator.Tests/Generator.Tests.lua
@@ -1,4 +1,4 @@
-project "Generator.Tests"
+project "CppSharp.Generator.Tests"
 
   kind "SharedLib"
   language "C#"
@@ -16,9 +16,9 @@ project "Generator.Tests"
   {
     "System",
     "System.Core",
-    "Bridge",
-    "Generator",
-    "Parser",
+    "CppSharp.AST",
+    "CppSharp.Generator",
+    "CppSharp.Parser",
     "NUnit.Framework",
     "NSubstitute"
   }
diff --git a/src/Generator/Generator.lua b/src/Generator/Generator.lua
index 934ad031..bfe88b43 100644
--- a/src/Generator/Generator.lua
+++ b/src/Generator/Generator.lua
@@ -1,4 +1,4 @@
-project "Generator"
+project "CppSharp.Generator"
 
   kind "SharedLib"
   language "C#"
@@ -7,4 +7,4 @@ project "Generator"
   files   { "**.cs", "**.bmp", "**.resx", "**.config" }
   excludes { "Filter.cs" }
   
-  links { "System", "System.Core", "Bridge", "Parser" }
+  links { "System", "System.Core", "CppSharp.AST", "CppSharp.Parser" }
diff --git a/src/Parser/Parser.h b/src/Parser/Parser.h
index 8510a3c6..5aed4837 100644
--- a/src/Parser/Parser.h
+++ b/src/Parser/Parser.h
@@ -25,7 +25,7 @@
 #include <string>
 #include <cstdarg>
 
-#using <Bridge.dll>
+#using <CppSharp.AST.dll>
 #include <vcclr.h>
 
 #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof(arr[0]))
diff --git a/src/Parser/Parser.lua b/src/Parser/Parser.lua
index f34ed67e..2448b24f 100644
--- a/src/Parser/Parser.lua
+++ b/src/Parser/Parser.lua
@@ -4,13 +4,13 @@ clang_msvc_flags =
   "/wd4355", "/wd4996", "/wd4624", "/wd4291"
 }
 
-project "Parser"
+project "CppSharp.Parser"
   
   kind "SharedLib"
   language "C++"
   SetupNativeProject()
   
-  dependson { "Bridge" }
+  dependson { "CppSharp.AST" }
   flags { common_flags, "Managed" }
 
   -- usingdirs is only supported in per-file configs in our
diff --git a/src/Runtime/Runtime.lua b/src/Runtime/Runtime.lua
index 141562d6..73757501 100644
--- a/src/Runtime/Runtime.lua
+++ b/src/Runtime/Runtime.lua
@@ -1,4 +1,4 @@
-project "Runtime"
+project "CppSharp.Runtime"
 
   kind "SharedLib"
   language "C#"