diff --git a/platform/msvc2010/liblove.vcxproj b/platform/msvc2010/liblove.vcxproj
index 43656c971..5d6d60780 100644
--- a/platform/msvc2010/liblove.vcxproj
+++ b/platform/msvc2010/liblove.vcxproj
@@ -424,8 +424,6 @@
     <ClCompile Include="..\..\src\modules\font\wrap_GlyphData.cpp" />
     <ClCompile Include="..\..\src\modules\font\wrap_Rasterizer.cpp" />
     <ClCompile Include="..\..\src\modules\graphics\Drawable.cpp" />
-    <ClCompile Include="..\..\src\modules\graphics\DrawGable.cpp" />
-    <ClCompile Include="..\..\src\modules\graphics\Geometry.cpp" />
     <ClCompile Include="..\..\src\modules\graphics\Graphics.cpp" />
     <ClCompile Include="..\..\src\modules\graphics\Image.cpp" />
     <ClCompile Include="..\..\src\modules\graphics\opengl\Canvas.cpp" />
@@ -433,6 +431,7 @@
     <ClCompile Include="..\..\src\modules\graphics\opengl\GLee.c" />
     <ClCompile Include="..\..\src\modules\graphics\opengl\Graphics.cpp" />
     <ClCompile Include="..\..\src\modules\graphics\opengl\Image.cpp" />
+    <ClCompile Include="..\..\src\modules\graphics\opengl\Mesh.cpp" />
     <ClCompile Include="..\..\src\modules\graphics\opengl\OpenGL.cpp" />
     <ClCompile Include="..\..\src\modules\graphics\opengl\ParticleSystem.cpp" />
     <ClCompile Include="..\..\src\modules\graphics\opengl\Polyline.cpp" />
@@ -441,12 +440,14 @@
     <ClCompile Include="..\..\src\modules\graphics\opengl\VertexBuffer.cpp" />
     <ClCompile Include="..\..\src\modules\graphics\opengl\wrap_Canvas.cpp" />
     <ClCompile Include="..\..\src\modules\graphics\opengl\wrap_Font.cpp" />
-    <ClCompile Include="..\..\src\modules\graphics\opengl\wrap_Geometry.cpp" />
     <ClCompile Include="..\..\src\modules\graphics\opengl\wrap_Graphics.cpp" />
     <ClCompile Include="..\..\src\modules\graphics\opengl\wrap_Image.cpp" />
+    <ClCompile Include="..\..\src\modules\graphics\opengl\wrap_Mesh.cpp" />
     <ClCompile Include="..\..\src\modules\graphics\opengl\wrap_ParticleSystem.cpp" />
+    <ClCompile Include="..\..\src\modules\graphics\opengl\wrap_Quad.cpp" />
     <ClCompile Include="..\..\src\modules\graphics\opengl\wrap_Shader.cpp" />
     <ClCompile Include="..\..\src\modules\graphics\opengl\wrap_SpriteBatch.cpp" />
+    <ClCompile Include="..\..\src\modules\graphics\Quad.cpp" />
     <ClCompile Include="..\..\src\modules\graphics\Volatile.cpp" />
     <ClCompile Include="..\..\src\modules\image\CompressedData.cpp" />
     <ClCompile Include="..\..\src\modules\image\ImageData.cpp" />
@@ -690,8 +691,7 @@
     <ClInclude Include="..\..\src\modules\font\wrap_Rasterizer.h" />
     <ClInclude Include="..\..\src\modules\graphics\Color.h" />
     <ClInclude Include="..\..\src\modules\graphics\Drawable.h" />
-    <ClInclude Include="..\..\src\modules\graphics\DrawGable.h" />
-    <ClInclude Include="..\..\src\modules\graphics\Geometry.h" />
+    <ClInclude Include="..\..\src\modules\graphics\DrawQable.h" />
     <ClInclude Include="..\..\src\modules\graphics\Graphics.h" />
     <ClInclude Include="..\..\src\modules\graphics\Image.h" />
     <ClInclude Include="..\..\src\modules\graphics\opengl\Canvas.h" />
@@ -699,6 +699,7 @@
     <ClInclude Include="..\..\src\modules\graphics\opengl\GLee.h" />
     <ClInclude Include="..\..\src\modules\graphics\opengl\Graphics.h" />
     <ClInclude Include="..\..\src\modules\graphics\opengl\Image.h" />
+    <ClInclude Include="..\..\src\modules\graphics\opengl\Mesh.h" />
     <ClInclude Include="..\..\src\modules\graphics\opengl\OpenGL.h" />
     <ClInclude Include="..\..\src\modules\graphics\opengl\ParticleSystem.h" />
     <ClInclude Include="..\..\src\modules\graphics\opengl\Polyline.h" />
@@ -707,12 +708,14 @@
     <ClInclude Include="..\..\src\modules\graphics\opengl\VertexBuffer.h" />
     <ClInclude Include="..\..\src\modules\graphics\opengl\wrap_Canvas.h" />
     <ClInclude Include="..\..\src\modules\graphics\opengl\wrap_Font.h" />
-    <ClInclude Include="..\..\src\modules\graphics\opengl\wrap_Geometry.h" />
     <ClInclude Include="..\..\src\modules\graphics\opengl\wrap_Graphics.h" />
     <ClInclude Include="..\..\src\modules\graphics\opengl\wrap_Image.h" />
+    <ClInclude Include="..\..\src\modules\graphics\opengl\wrap_Mesh.h" />
     <ClInclude Include="..\..\src\modules\graphics\opengl\wrap_ParticleSystem.h" />
+    <ClInclude Include="..\..\src\modules\graphics\opengl\wrap_Quad.h" />
     <ClInclude Include="..\..\src\modules\graphics\opengl\wrap_Shader.h" />
     <ClInclude Include="..\..\src\modules\graphics\opengl\wrap_SpriteBatch.h" />
+    <ClInclude Include="..\..\src\modules\graphics\Quad.h" />
     <ClInclude Include="..\..\src\modules\graphics\Volatile.h" />
     <ClInclude Include="..\..\src\modules\image\CompressedData.h" />
     <ClInclude Include="..\..\src\modules\image\Image.h" />
diff --git a/platform/msvc2010/liblove.vcxproj.filters b/platform/msvc2010/liblove.vcxproj.filters
index 86e3447e4..e98ed133d 100644
--- a/platform/msvc2010/liblove.vcxproj.filters
+++ b/platform/msvc2010/liblove.vcxproj.filters
@@ -163,6 +163,12 @@
     <Filter Include="modules\system\sdl">
       <UniqueIdentifier>{2241f4ca-a51c-4d8d-be82-2b7dfd267b7b}</UniqueIdentifier>
     </Filter>
+    <Filter Include="modules\system">
+      <UniqueIdentifier>{731671fa-d695-42c3-9d1c-9e227d9ebab4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="modules\system\sdl">
+      <UniqueIdentifier>{2241f4ca-a51c-4d8d-be82-2b7dfd267b7b}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\src\common\Matrix.cpp">
@@ -807,15 +813,6 @@
     <ClCompile Include="..\..\src\modules\math\wrap_RandomGenerator.cpp">
       <Filter>modules\math</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\modules\graphics\DrawGable.cpp">
-      <Filter>modules\graphics</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\modules\graphics\Geometry.cpp">
-      <Filter>modules\graphics</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\modules\graphics\opengl\wrap_Geometry.cpp">
-      <Filter>modules\graphics\opengl</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\libraries\noise1234\simplexnoise1234.cpp">
       <Filter>libraries\noise1234</Filter>
     </ClCompile>
@@ -882,6 +879,42 @@
     <ClCompile Include="..\..\src\modules\system\sdl\System.cpp">
       <Filter>modules\system\sdl</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\modules\joystick\sdl\JoystickModule.cpp">
+      <Filter>modules\joystick\sdl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\modules\joystick\sdl\wrap_JoystickModule.cpp">
+      <Filter>modules\joystick\sdl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\modules\mouse\Cursor.cpp">
+      <Filter>modules\mouse</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\modules\mouse\wrap_Cursor.cpp">
+      <Filter>modules\mouse</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\modules\mouse\sdl\Cursor.cpp">
+      <Filter>modules\mouse\sdl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\modules\system\System.cpp">
+      <Filter>modules\system</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\modules\system\wrap_System.cpp">
+      <Filter>modules\system</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\modules\system\sdl\System.cpp">
+      <Filter>modules\system\sdl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\modules\graphics\Quad.cpp">
+      <Filter>modules\graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\modules\graphics\opengl\wrap_Quad.cpp">
+      <Filter>modules\graphics\opengl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\modules\graphics\opengl\wrap_Mesh.cpp">
+      <Filter>modules\graphics\opengl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\modules\graphics\opengl\Mesh.cpp">
+      <Filter>modules\graphics\opengl</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\scripts\boot.lua">
@@ -1609,15 +1642,6 @@
     <ClInclude Include="..\..\src\modules\math\wrap_RandomGenerator.h">
       <Filter>modules\math</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\modules\graphics\DrawGable.h">
-      <Filter>modules\graphics</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\modules\graphics\Geometry.h">
-      <Filter>modules\graphics</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\modules\graphics\opengl\wrap_Geometry.h">
-      <Filter>modules\graphics\opengl</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\libraries\noise1234\simplexnoise1234.h">
       <Filter>libraries\noise1234</Filter>
     </ClInclude>
@@ -1690,6 +1714,48 @@
     <ClInclude Include="..\..\src\modules\system\sdl\System.h">
       <Filter>modules\system\sdl</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\modules\joystick\JoystickModule.h">
+      <Filter>modules\joystick</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\joystick\sdl\JoystickModule.h">
+      <Filter>modules\joystick\sdl</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\joystick\sdl\wrap_JoystickModule.h">
+      <Filter>modules\joystick\sdl</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\mouse\Cursor.h">
+      <Filter>modules\mouse</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\mouse\wrap_Cursor.h">
+      <Filter>modules\mouse</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\mouse\sdl\Cursor.h">
+      <Filter>modules\mouse\sdl</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\system\System.h">
+      <Filter>modules\system</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\system\wrap_System.h">
+      <Filter>modules\system</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\system\sdl\System.h">
+      <Filter>modules\system\sdl</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\graphics\DrawQable.h">
+      <Filter>modules\graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\graphics\Quad.h">
+      <Filter>modules\graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\graphics\opengl\wrap_Quad.h">
+      <Filter>modules\graphics\opengl</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\graphics\opengl\wrap_Mesh.h">
+      <Filter>modules\graphics\opengl</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\graphics\opengl\Mesh.h">
+      <Filter>modules\graphics\opengl</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="love.rc" />