diff --git a/Common/Common.vcxproj b/Common/Common.vcxproj
index c464ff11..517bdfb9 100644
--- a/Common/Common.vcxproj
+++ b/Common/Common.vcxproj
@@ -25,6 +25,21 @@
   <ItemGroup>
     <ClCompile Include="ControlTemplate.cpp" />
     <ClCompile Include="Dialog.cpp" />
+    <ClCompile Include="Gfx\Canvas.cpp" />
+    <ClCompile Include="Gfx\CanvasD2D.cpp" />
+    <ClCompile Include="Gfx\CanvasGDIP.cpp" />
+    <ClCompile Include="Gfx\FontCollection.cpp" />
+    <ClCompile Include="Gfx\FontCollectionD2D.cpp" />
+    <ClCompile Include="Gfx\FontCollectionGDIP.cpp" />
+    <ClCompile Include="Gfx\TextFormat.cpp" />
+    <ClCompile Include="Gfx\TextFormatD2D.cpp" />
+    <ClCompile Include="Gfx\TextFormatGDIP.cpp" />
+    <ClCompile Include="Gfx\Util\DWriteFontCollectionLoader.cpp" />
+    <ClCompile Include="Gfx\Util\DWriteFontFileEnumerator.cpp" />
+    <ClCompile Include="Gfx\Util\DWriteHelpers.cpp" />
+    <ClCompile Include="Gfx\Util\WICBitmapDIB.cpp" />
+    <ClCompile Include="Gfx\Util\WICBitmapLockDIB.cpp" />
+    <ClCompile Include="Gfx\Util\WICBitmapLockGDIP.cpp" />
     <ClCompile Include="MathParser.cpp" />
     <ClCompile Include="MenuTemplate.cpp" />
     <ClCompile Include="PathUtil.cpp" />
@@ -34,6 +49,21 @@
   <ItemGroup>
     <ClInclude Include="ControlTemplate.h" />
     <ClInclude Include="Dialog.h" />
+    <ClInclude Include="Gfx\Canvas.h" />
+    <ClInclude Include="Gfx\CanvasD2D.h" />
+    <ClInclude Include="Gfx\CanvasGDIP.h" />
+    <ClInclude Include="Gfx\FontCollection.h" />
+    <ClInclude Include="Gfx\FontCollectionD2D.h" />
+    <ClInclude Include="Gfx\FontCollectionGDIP.h" />
+    <ClInclude Include="Gfx\TextFormat.h" />
+    <ClInclude Include="Gfx\TextFormatD2D.h" />
+    <ClInclude Include="Gfx\TextFormatGDIP.h" />
+    <ClInclude Include="Gfx\Util\DWriteFontCollectionLoader.h" />
+    <ClInclude Include="Gfx\Util\DWriteFontFileEnumerator.h" />
+    <ClInclude Include="Gfx\Util\DWriteHelpers.h" />
+    <ClInclude Include="Gfx\Util\WICBitmapDIB.h" />
+    <ClInclude Include="Gfx\Util\WICBitmapLockDIB.h" />
+    <ClInclude Include="Gfx\Util\WICBitmapLockGDIP.h" />
     <ClInclude Include="MathParser.h" />
     <ClInclude Include="MenuTemplate.h" />
     <ClInclude Include="PathUtil.h" />
diff --git a/Common/Common.vcxproj.filters b/Common/Common.vcxproj.filters
index 6ed44123..1948370f 100644
--- a/Common/Common.vcxproj.filters
+++ b/Common/Common.vcxproj.filters
@@ -8,6 +8,51 @@
     <ClCompile Include="StringUtil.cpp" />
     <ClCompile Include="ControlTemplate.cpp" />
     <ClCompile Include="MathParser.cpp" />
+    <ClCompile Include="Gfx\Canvas.cpp">
+      <Filter>Gfx</Filter>
+    </ClCompile>
+    <ClCompile Include="Gfx\CanvasD2D.cpp">
+      <Filter>Gfx</Filter>
+    </ClCompile>
+    <ClCompile Include="Gfx\CanvasGDIP.cpp">
+      <Filter>Gfx</Filter>
+    </ClCompile>
+    <ClCompile Include="Gfx\FontCollection.cpp">
+      <Filter>Gfx</Filter>
+    </ClCompile>
+    <ClCompile Include="Gfx\FontCollectionD2D.cpp">
+      <Filter>Gfx</Filter>
+    </ClCompile>
+    <ClCompile Include="Gfx\FontCollectionGDIP.cpp">
+      <Filter>Gfx</Filter>
+    </ClCompile>
+    <ClCompile Include="Gfx\TextFormat.cpp">
+      <Filter>Gfx</Filter>
+    </ClCompile>
+    <ClCompile Include="Gfx\TextFormatD2D.cpp">
+      <Filter>Gfx</Filter>
+    </ClCompile>
+    <ClCompile Include="Gfx\TextFormatGDIP.cpp">
+      <Filter>Gfx</Filter>
+    </ClCompile>
+    <ClCompile Include="Gfx\Util\DWriteHelpers.cpp">
+      <Filter>Gfx\Util</Filter>
+    </ClCompile>
+    <ClCompile Include="Gfx\Util\DWriteFontCollectionLoader.cpp">
+      <Filter>Gfx\Util</Filter>
+    </ClCompile>
+    <ClCompile Include="Gfx\Util\DWriteFontFileEnumerator.cpp">
+      <Filter>Gfx\Util</Filter>
+    </ClCompile>
+    <ClCompile Include="Gfx\Util\WICBitmapDIB.cpp">
+      <Filter>Gfx\Util</Filter>
+    </ClCompile>
+    <ClCompile Include="Gfx\Util\WICBitmapLockDIB.cpp">
+      <Filter>Gfx\Util</Filter>
+    </ClCompile>
+    <ClCompile Include="Gfx\Util\WICBitmapLockGDIP.cpp">
+      <Filter>Gfx\Util</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Dialog.h" />
@@ -20,5 +65,58 @@
     <ClInclude Include="MathParser.h" />
     <ClInclude Include="UnitTest.h" />
     <ClInclude Include="Timer.h" />
+    <ClInclude Include="Gfx\Canvas.h">
+      <Filter>Gfx</Filter>
+    </ClInclude>
+    <ClInclude Include="Gfx\CanvasD2D.h">
+      <Filter>Gfx</Filter>
+    </ClInclude>
+    <ClInclude Include="Gfx\CanvasGDIP.h">
+      <Filter>Gfx</Filter>
+    </ClInclude>
+    <ClInclude Include="Gfx\FontCollection.h">
+      <Filter>Gfx</Filter>
+    </ClInclude>
+    <ClInclude Include="Gfx\FontCollectionD2D.h">
+      <Filter>Gfx</Filter>
+    </ClInclude>
+    <ClInclude Include="Gfx\FontCollectionGDIP.h">
+      <Filter>Gfx</Filter>
+    </ClInclude>
+    <ClInclude Include="Gfx\TextFormat.h">
+      <Filter>Gfx</Filter>
+    </ClInclude>
+    <ClInclude Include="Gfx\TextFormatD2D.h">
+      <Filter>Gfx</Filter>
+    </ClInclude>
+    <ClInclude Include="Gfx\TextFormatGDIP.h">
+      <Filter>Gfx</Filter>
+    </ClInclude>
+    <ClInclude Include="Gfx\Util\DWriteHelpers.h">
+      <Filter>Gfx\Util</Filter>
+    </ClInclude>
+    <ClInclude Include="Gfx\Util\DWriteFontCollectionLoader.h">
+      <Filter>Gfx\Util</Filter>
+    </ClInclude>
+    <ClInclude Include="Gfx\Util\DWriteFontFileEnumerator.h">
+      <Filter>Gfx\Util</Filter>
+    </ClInclude>
+    <ClInclude Include="Gfx\Util\WICBitmapDIB.h">
+      <Filter>Gfx\Util</Filter>
+    </ClInclude>
+    <ClInclude Include="Gfx\Util\WICBitmapLockDIB.h">
+      <Filter>Gfx\Util</Filter>
+    </ClInclude>
+    <ClInclude Include="Gfx\Util\WICBitmapLockGDIP.h">
+      <Filter>Gfx\Util</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="Gfx">
+      <UniqueIdentifier>{263d9d8c-b463-4f2a-87ab-5f6575a4cc38}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Gfx\Util">
+      <UniqueIdentifier>{c3efb431-e0f5-4085-9b07-33a7e34c4baa}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Library/Library.vcxproj b/Library/Library.vcxproj
index cfdf9bab..f670a60b 100644
--- a/Library/Library.vcxproj
+++ b/Library/Library.vcxproj
@@ -27,24 +27,6 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\Common\Gfx\Canvas.cpp" />
-    <ClCompile Include="..\Common\Gfx\CanvasD2D.cpp" />
-    <ClCompile Include="..\Common\Gfx\CanvasGDIP.cpp" />
-    <ClCompile Include="..\Common\Gfx\FontCollection.cpp" />
-    <ClCompile Include="..\Common\Gfx\FontCollectionD2D.cpp" />
-    <ClCompile Include="..\Common\Gfx\FontCollectionGDIP.cpp" />
-    <ClCompile Include="..\Common\Gfx\TextFormat.cpp" />
-    <ClCompile Include="..\Common\Gfx\TextFormatD2D.cpp" />
-    <ClCompile Include="..\Common\Gfx\TextFormatD2D_Test.cpp">
-      <ExcludedFromBuild>$(ExcludeTests)</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\Common\Gfx\TextFormatGDIP.cpp" />
-    <ClCompile Include="..\Common\Gfx\Util\DWriteHelpers.cpp" />
-    <ClCompile Include="..\Common\Gfx\Util\DWriteFontCollectionLoader.cpp" />
-    <ClCompile Include="..\Common\Gfx\Util\DWriteFontFileEnumerator.cpp" />
-    <ClCompile Include="..\Common\Gfx\Util\WICBitmapDIB.cpp" />
-    <ClCompile Include="..\Common\Gfx\Util\WICBitmapLockDIB.cpp" />
-    <ClCompile Include="..\Common\Gfx\Util\WICBitmapLockGDIP.cpp" />
     <ClCompile Include="CommandHandler.cpp">
       <PrecompiledHeader>Use</PrecompiledHeader>
     </ClCompile>
@@ -219,21 +201,6 @@
     <ResourceCompile Include="Library.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\Common\Gfx\Canvas.h" />
-    <ClInclude Include="..\Common\Gfx\CanvasD2D.h" />
-    <ClInclude Include="..\Common\Gfx\CanvasGDIP.h" />
-    <ClInclude Include="..\Common\Gfx\FontCollection.h" />
-    <ClInclude Include="..\Common\Gfx\FontCollectionD2D.h" />
-    <ClInclude Include="..\Common\Gfx\FontCollectionGDIP.h" />
-    <ClInclude Include="..\Common\Gfx\TextFormat.h" />
-    <ClInclude Include="..\Common\Gfx\TextFormatD2D.h" />
-    <ClInclude Include="..\Common\Gfx\TextFormatGDIP.h" />
-    <ClInclude Include="..\Common\Gfx\Util\DWriteHelpers.h" />
-    <ClInclude Include="..\Common\Gfx\Util\DWriteFontCollectionLoader.h" />
-    <ClInclude Include="..\Common\Gfx\Util\DWriteFontFileEnumerator.h" />
-    <ClInclude Include="..\Common\Gfx\Util\WICBitmapDIB.h" />
-    <ClInclude Include="..\Common\Gfx\Util\WICBitmapLockDIB.h" />
-    <ClInclude Include="..\Common\Gfx\Util\WICBitmapLockGDIP.h" />
     <ClInclude Include="CommandHandler.h" />
     <ClInclude Include="ConfigParser.h" />
     <ClInclude Include="ContextMenu.h" />
diff --git a/Library/Library.vcxproj.filters b/Library/Library.vcxproj.filters
index 8fc2d1ba..7810ec0b 100644
--- a/Library/Library.vcxproj.filters
+++ b/Library/Library.vcxproj.filters
@@ -19,15 +19,6 @@
     <Filter Include="Lua\glue">
       <UniqueIdentifier>{941dce28-a314-4492-befb-5770432c98bf}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Common">
-      <UniqueIdentifier>{3fcdd272-ad7a-4e06-a1bc-ff114498ccee}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Common\Gfx">
-      <UniqueIdentifier>{26d9c191-5857-45c2-9e73-b0b88964728f}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Common\Gfx\Util">
-      <UniqueIdentifier>{acfbb3c5-84fd-471f-845c-f7d178d35c55}</UniqueIdentifier>
-    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="ConfigParser.cpp">
@@ -174,54 +165,6 @@
     <ClCompile Include="Section.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\Common\Gfx\Canvas.cpp">
-      <Filter>Common\Gfx</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\Gfx\CanvasD2D.cpp">
-      <Filter>Common\Gfx</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\Gfx\CanvasGDIP.cpp">
-      <Filter>Common\Gfx</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\Gfx\FontCollection.cpp">
-      <Filter>Common\Gfx</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\Gfx\FontCollectionD2D.cpp">
-      <Filter>Common\Gfx</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\Gfx\FontCollectionGDIP.cpp">
-      <Filter>Common\Gfx</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\Gfx\TextFormat.cpp">
-      <Filter>Common\Gfx</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\Gfx\TextFormatD2D.cpp">
-      <Filter>Common\Gfx</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\Gfx\TextFormatD2D_Test.cpp">
-      <Filter>Common\Gfx</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\Gfx\TextFormatGDIP.cpp">
-      <Filter>Common\Gfx</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\Gfx\Util\DWriteHelpers.cpp">
-      <Filter>Common\Gfx\Util</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\Gfx\Util\DWriteFontFileEnumerator.cpp">
-      <Filter>Common\Gfx\Util</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\Gfx\Util\DWriteFontCollectionLoader.cpp">
-      <Filter>Common\Gfx\Util</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\Gfx\Util\WICBitmapLockGDIP.cpp">
-      <Filter>Common\Gfx\Util</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\Gfx\Util\WICBitmapDIB.cpp">
-      <Filter>Common\Gfx\Util</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\Gfx\Util\WICBitmapLockDIB.cpp">
-      <Filter>Common\Gfx\Util</Filter>
-    </ClCompile>
     <ClCompile Include="Logger.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -383,51 +326,6 @@
     <ClInclude Include="Section.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\Common\Gfx\Canvas.h">
-      <Filter>Common\Gfx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\Gfx\CanvasD2D.h">
-      <Filter>Common\Gfx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\Gfx\CanvasGDIP.h">
-      <Filter>Common\Gfx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\Gfx\FontCollectionGDIP.h">
-      <Filter>Common\Gfx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\Gfx\FontCollection.h">
-      <Filter>Common\Gfx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\Gfx\FontCollectionD2D.h">
-      <Filter>Common\Gfx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\Gfx\TextFormat.h">
-      <Filter>Common\Gfx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\Gfx\TextFormatD2D.h">
-      <Filter>Common\Gfx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\Gfx\TextFormatGDIP.h">
-      <Filter>Common\Gfx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\Gfx\Util\DWriteHelpers.h">
-      <Filter>Common\Gfx\Util</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\Gfx\Util\DWriteFontFileEnumerator.h">
-      <Filter>Common\Gfx\Util</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\Gfx\Util\DWriteFontCollectionLoader.h">
-      <Filter>Common\Gfx\Util</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\Gfx\Util\WICBitmapLockDIB.h">
-      <Filter>Common\Gfx\Util</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\Gfx\Util\WICBitmapLockGDIP.h">
-      <Filter>Common\Gfx\Util</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\Gfx\Util\WICBitmapDIB.h">
-      <Filter>Common\Gfx\Util</Filter>
-    </ClInclude>
     <ClInclude Include="Logger.h">
       <Filter>Header Files</Filter>
     </ClInclude>