diff --git a/Source/OpenTK.Rewrite/Dependencies/IKVM.Reflection.dll b/Dependencies/managed/IKVM.Reflection.dll
similarity index 100%
rename from Source/OpenTK.Rewrite/Dependencies/IKVM.Reflection.dll
rename to Dependencies/managed/IKVM.Reflection.dll
diff --git a/Source/OpenTK.Rewrite/Dependencies/Mono.Cecil.Mdb.dll b/Dependencies/managed/Mono.Cecil.Mdb.dll
old mode 100755
new mode 100644
similarity index 100%
rename from Source/OpenTK.Rewrite/Dependencies/Mono.Cecil.Mdb.dll
rename to Dependencies/managed/Mono.Cecil.Mdb.dll
diff --git a/Source/OpenTK.Rewrite/Dependencies/Mono.Cecil.Pdb.dll b/Dependencies/managed/Mono.Cecil.Pdb.dll
old mode 100755
new mode 100644
similarity index 100%
rename from Source/OpenTK.Rewrite/Dependencies/Mono.Cecil.Pdb.dll
rename to Dependencies/managed/Mono.Cecil.Pdb.dll
diff --git a/Source/OpenTK.Rewrite/Dependencies/Mono.Cecil.Rocks.dll b/Dependencies/managed/Mono.Cecil.Rocks.dll
old mode 100755
new mode 100644
similarity index 100%
rename from Source/OpenTK.Rewrite/Dependencies/Mono.Cecil.Rocks.dll
rename to Dependencies/managed/Mono.Cecil.Rocks.dll
diff --git a/Source/OpenTK.Rewrite/Dependencies/Mono.Cecil.dll b/Dependencies/managed/Mono.Cecil.dll
old mode 100755
new mode 100644
similarity index 100%
rename from Source/OpenTK.Rewrite/Dependencies/Mono.Cecil.dll
rename to Dependencies/managed/Mono.Cecil.dll
diff --git a/OpenTK.sln b/OpenTK.sln
index ac6dd1a4..7ec22d50 100644
--- a/OpenTK.sln
+++ b/OpenTK.sln
@@ -51,7 +51,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Build.Installer.Zip", "Inst
 		{75DC22B1-113F-4A66-96B9-2FF8208C10E8} = {75DC22B1-113F-4A66-96B9-2FF8208C10E8}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenTK.Rewrite", "Source\OpenTK.Rewrite\OpenTK.Rewrite.csproj", "{C426C9D1-8857-4E52-BAC7-4C05EE6070AB}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Generator.Rewrite", "Source\Generator.Rewrite\Generator.Rewrite.csproj", "{C426C9D1-8857-4E52-BAC7-4C05EE6070AB}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -130,6 +130,7 @@ Global
 		{C426C9D1-8857-4E52-BAC7-4C05EE6070AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C426C9D1-8857-4E52-BAC7-4C05EE6070AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C426C9D1-8857-4E52-BAC7-4C05EE6070AB}.Documentation|Any CPU.ActiveCfg = Debug|Any CPU
+		{C426C9D1-8857-4E52-BAC7-4C05EE6070AB}.Documentation|Any CPU.Build.0 = Debug|Any CPU
 		{C426C9D1-8857-4E52-BAC7-4C05EE6070AB}.Nsis|Any CPU.ActiveCfg = Release|Any CPU
 		{C426C9D1-8857-4E52-BAC7-4C05EE6070AB}.Nsis|Any CPU.Build.0 = Release|Any CPU
 		{C426C9D1-8857-4E52-BAC7-4C05EE6070AB}.Release|Any CPU.ActiveCfg = Release|Any CPU
diff --git a/Source/Bind/Generator.Bind.csproj b/Source/Bind/Generator.Bind.csproj
index d98df20c..4eb98e16 100644
--- a/Source/Bind/Generator.Bind.csproj
+++ b/Source/Bind/Generator.Bind.csproj
@@ -49,7 +49,7 @@
     <DebugSymbols>True</DebugSymbols>
     <FileAlignment>4096</FileAlignment>
     <Optimize>False</Optimize>
-    <OutputPath>..\..\Binaries\OpenTK\Debug\</OutputPath>
+    <OutputPath>..\..\Binaries\Tools\Debug\</OutputPath>
     <RegisterForComInterop>False</RegisterForComInterop>
     <RemoveIntegerChecks>False</RemoveIntegerChecks>
     <WarningLevel>4</WarningLevel>
@@ -63,7 +63,7 @@
     <DefineConstants>TRACE;</DefineConstants>
     <FileAlignment>4096</FileAlignment>
     <Optimize>True</Optimize>
-    <OutputPath>..\..\Binaries\OpenTK\Release\</OutputPath>
+    <OutputPath>..\..\Binaries\Tools\Release\</OutputPath>
     <RegisterForComInterop>False</RegisterForComInterop>
     <RemoveIntegerChecks>False</RemoveIntegerChecks>
     <WarningLevel>4</WarningLevel>
@@ -77,7 +77,7 @@
     <DefineConstants>TRACE;</DefineConstants>
     <FileAlignment>4096</FileAlignment>
     <Optimize>True</Optimize>
-    <OutputPath>..\..\Binaries\OpenTK\Release\</OutputPath>
+    <OutputPath>..\..\Binaries\Tools\Release\</OutputPath>
     <RegisterForComInterop>False</RegisterForComInterop>
     <RemoveIntegerChecks>False</RemoveIntegerChecks>
     <WarningLevel>4</WarningLevel>
@@ -85,7 +85,7 @@
     <DebugType>none</DebugType>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Documentation|AnyCPU'">
-    <OutputPath>..\..\Binaries\OpenTK\Release\</OutputPath>
+    <OutputPath>..\..\Binaries\Tools\Release\</OutputPath>
     <DebugType>none</DebugType>
     <WarningLevel>4</WarningLevel>
     <Optimize>True</Optimize>
diff --git a/Source/Build.UpdateVersion/Build.UpdateVersion.csproj b/Source/Build.UpdateVersion/Build.UpdateVersion.csproj
index c4ff8774..de945d56 100644
--- a/Source/Build.UpdateVersion/Build.UpdateVersion.csproj
+++ b/Source/Build.UpdateVersion/Build.UpdateVersion.csproj
@@ -1,25 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(Configuration)' == 'Documentation'">
-    <OutputPath>..\..\Binaries\OpenTK\Release</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
-    <OutputPath>..\..\Binaries\OpenTK\Debug</OutputPath>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <Optimize>false</Optimize>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)' == 'Release'">
-    <OutputPath>..\..\Binaries\OpenTK\Release</OutputPath>
-    <Optimize>true</Optimize>
-    <DefineConstants>TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)' == 'Nsis'">
-    <OutputPath>..\..\Binaries\OpenTK\Release</OutputPath>
-    <Optimize>true</Optimize>
-    <DefineConstants>TRACE</DefineConstants>
-  </PropertyGroup>
   <PropertyGroup>
     <ProjectGuid>{75DC22B1-113F-4A66-96B9-2FF8208C10E8}</ProjectGuid>
     <AssemblyName>Build.UpdateVersion</AssemblyName>
@@ -31,6 +11,32 @@
     <ProductVersion>10.0.0</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Documentation' ">
+    <DefineConstants>TRACE</DefineConstants>
+    <WarningLevel>4</WarningLevel>
+    <OutputPath>..\..\Binaries\Tools\Release\</OutputPath>
+    <Optimize>true</Optimize>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DebugSymbols>True</DebugSymbols>
+    <DebugType>full</DebugType>
+    <WarningLevel>4</WarningLevel>
+    <OutputPath>..\..\Binaries\Tools\Debug\</OutputPath>
+    <Optimize>false</Optimize>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <DefineConstants>TRACE</DefineConstants>
+    <WarningLevel>4</WarningLevel>
+    <OutputPath>..\..\Binaries\Tools\Release\</OutputPath>
+    <Optimize>true</Optimize>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Nsis' ">
+    <DefineConstants>TRACE</DefineConstants>
+    <WarningLevel>4</WarningLevel>
+    <OutputPath>..\..\Binaries\Tools\Release\</OutputPath>
+    <Optimize>true</Optimize>
+  </PropertyGroup>
   <ItemGroup>
     <Compile Include="Program.cs" />
   </ItemGroup>
@@ -44,23 +50,6 @@
     <PostBuildEvent>
     </PostBuildEvent>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Documentation|AnyCPU' ">
-    <DefineConstants>TRACE;</DefineConstants>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>True</DebugSymbols>
-    <DebugType>full</DebugType>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DefineConstants>TRACE;</DefineConstants>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Nsis|AnyCPU' ">
-    <DefineConstants>TRACE;</DefineConstants>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
   <Target Name="BeforeBuild">
     <Delete Files="..\..\Version.txt" />
   </Target>
@@ -68,4 +57,4 @@
     <Exec Command="$(OutputPath)\Build.UpdateVersion.exe" Condition="$(OS) == 'Windows_NT'" />
     <Exec Command="mono $(OutputPath)\Build.UpdateVersion.exe" Condition="$(OS) != 'Windows_NT'" />
   </Target>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Source/Converter/Generator.Convert.csproj b/Source/Converter/Generator.Convert.csproj
index 64e85956..0dede34d 100644
--- a/Source/Converter/Generator.Convert.csproj
+++ b/Source/Converter/Generator.Convert.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
   <PropertyGroup>
     <ProjectType>Local</ProjectType>
@@ -48,7 +48,7 @@
     <DebugSymbols>True</DebugSymbols>
     <FileAlignment>4096</FileAlignment>
     <Optimize>False</Optimize>
-    <OutputPath>..\..\Binaries\OpenTK\Debug\</OutputPath>
+    <OutputPath>..\..\Binaries\Tools\Debug\</OutputPath>
     <RegisterForComInterop>False</RegisterForComInterop>
     <RemoveIntegerChecks>False</RemoveIntegerChecks>
     <WarningLevel>4</WarningLevel>
@@ -63,7 +63,7 @@
     <DefineConstants>TRACE;</DefineConstants>
     <FileAlignment>4096</FileAlignment>
     <Optimize>True</Optimize>
-    <OutputPath>..\..\Binaries\OpenTK\Release\</OutputPath>
+    <OutputPath>..\..\Binaries\Tools\Release\</OutputPath>
     <RegisterForComInterop>False</RegisterForComInterop>
     <RemoveIntegerChecks>False</RemoveIntegerChecks>
     <WarningLevel>4</WarningLevel>
@@ -71,7 +71,7 @@
     <DebugType>none</DebugType>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Documentation|AnyCPU'">
-    <OutputPath>..\..\Binaries\OpenTK\Release\</OutputPath>
+    <OutputPath>..\..\Binaries\Tools\Release\</OutputPath>
     <DebugType>none</DebugType>
     <WarningLevel>4</WarningLevel>
     <Optimize>True</Optimize>
@@ -84,7 +84,7 @@
     <DefineConstants>TRACE;</DefineConstants>
     <FileAlignment>4096</FileAlignment>
     <Optimize>True</Optimize>
-    <OutputPath>..\..\Binaries\OpenTK\Release\</OutputPath>
+    <OutputPath>..\..\Binaries\Tools\Release\</OutputPath>
     <RegisterForComInterop>False</RegisterForComInterop>
     <RemoveIntegerChecks>False</RemoveIntegerChecks>
     <WarningLevel>4</WarningLevel>
diff --git a/Source/OpenTK.Rewrite/OpenTK.Rewrite.csproj b/Source/Generator.Rewrite/Generator.Rewrite.csproj
similarity index 89%
rename from Source/OpenTK.Rewrite/OpenTK.Rewrite.csproj
rename to Source/Generator.Rewrite/Generator.Rewrite.csproj
index d5aa2ba5..6301e72c 100644
--- a/Source/OpenTK.Rewrite/OpenTK.Rewrite.csproj
+++ b/Source/Generator.Rewrite/Generator.Rewrite.csproj
@@ -8,7 +8,7 @@
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>OpenTK.Rewrite</RootNamespace>
-    <AssemblyName>OpenTK.Rewrite</AssemblyName>
+    <AssemblyName>Rewrite</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProductVersion>12.0.0</ProductVersion>
@@ -19,7 +19,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\..\Binaries\OpenTK\Debug\</OutputPath>
+    <OutputPath>..\..\Binaries\Tools\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -29,7 +29,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\..\Binaries\OpenTK\Release\</OutputPath>
+    <OutputPath>..\..\Binaries\Tools\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -42,36 +42,29 @@
     <AssemblyOriginatorKeyFile>..\..\OpenTK.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
     <Reference Include="Mono.Cecil">
-      <HintPath>Dependencies\Mono.Cecil.dll</HintPath>
+      <HintPath>..\..\Dependencies\managed\Mono.Cecil.dll</HintPath>
     </Reference>
     <Reference Include="Mono.Cecil.Mdb">
-      <HintPath>Dependencies\Mono.Cecil.Mdb.dll</HintPath>
+      <HintPath>..\..\Dependencies\managed\Mono.Cecil.Mdb.dll</HintPath>
     </Reference>
     <Reference Include="Mono.Cecil.Pdb">
-      <HintPath>Dependencies\Mono.Cecil.Pdb.dll</HintPath>
+      <HintPath>..\..\Dependencies\managed\Mono.Cecil.Pdb.dll</HintPath>
     </Reference>
     <Reference Include="Mono.Cecil.Rocks">
-      <HintPath>Dependencies\Mono.Cecil.Rocks.dll</HintPath>
+      <HintPath>..\..\Dependencies\managed\Mono.Cecil.Rocks.dll</HintPath>
     </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="Dependencies\Mono.Cecil.dll" />
-    <Content Include="Dependencies\Mono.Cecil.Mdb.dll" />
-    <Content Include="Dependencies\Mono.Cecil.Pdb.dll" />
-    <Content Include="Dependencies\IKVM.Reflection.dll" />
-  </ItemGroup>
   <ItemGroup>
     <None Include="..\..\OpenTK.snk">
       <Link>OpenTK.snk</Link>
     </None>
-    <None Include="Dependencies\Mono.Cecil.Rocks.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/Source/OpenTK.Rewrite/Program.cs b/Source/Generator.Rewrite/Program.cs
similarity index 100%
rename from Source/OpenTK.Rewrite/Program.cs
rename to Source/Generator.Rewrite/Program.cs
diff --git a/Source/OpenTK.Rewrite/Properties/AssemblyInfo.cs b/Source/Generator.Rewrite/Properties/AssemblyInfo.cs
similarity index 100%
rename from Source/OpenTK.Rewrite/Properties/AssemblyInfo.cs
rename to Source/Generator.Rewrite/Properties/AssemblyInfo.cs
diff --git a/Source/OpenTK/OpenTK.csproj b/Source/OpenTK/OpenTK.csproj
index 8a6274a5..118b891e 100644
--- a/Source/OpenTK/OpenTK.csproj
+++ b/Source/OpenTK/OpenTK.csproj
@@ -783,8 +783,8 @@
   </PropertyGroup>
   <ItemGroup />
   <Target Name="AfterBuild">
-    <Exec Command="$(OutputPath)OpenTK.Rewrite.exe $(OutputPath)OpenTK.dll ../../../OpenTK.snk" Condition="$(OS) == 'Windows_NT'" />
-    <Exec Command="mono $(OutputPath)OpenTK.Rewrite.exe $(OutputPath)OpenTK.dll ../../../OpenTK.snk" Condition="$(OS) != 'Windows_NT'" />
+    <Exec Command="$(OutputPath)..\..\Tools\$(Configuration)\Rewrite.exe $(OutputPath)OpenTK.dll ..\..\OpenTK.snk" Condition="$(OS) == 'Windows_NT'" />
+    <Exec Command="mono $(OutputPath)..\..\Tools\$(Configuration)\Rewrite.exe $(OutputPath)OpenTK.dll ..\..\OpenTK.snk" Condition="$(OS) != 'Windows_NT'" />
   </Target>
   <ProjectExtensions>
     <MonoDevelop>