diff --git a/src/Makefile.am b/src/Makefile.am
index b57775bd..a6ceae3b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,15 +2,15 @@
 noinst_LIBRARIES = liblol.a
 
 liblol_a_SOURCES = \
-    core.h vector.cpp real.cpp tiler.cpp tiler.h dict.cpp dict.h \
+    core.h tiler.cpp tiler.h dict.cpp dict.h \
     audio.cpp audio.h scene.cpp scene.h font.cpp font.h layer.cpp layer.h \
     map.cpp map.h entity.cpp entity.h ticker.cpp ticker.h lolgl.h \
     tileset.cpp tileset.h forge.cpp forge.h video.cpp video.h log.cpp log.h \
     timer.cpp timer.h bitfield.h profiler.cpp profiler.h input.h input.cpp \
     world.cpp world.h sample.cpp sample.h sampler.cpp sampler.h \
     text.cpp text.h emitter.cpp emitter.h numeric.h hash.cpp hash.h \
-    worldentity.cpp worldentity.h gradient.cpp gradient.h half.cpp \
-    platform.cpp platform.h sprite.cpp sprite.h trig.cpp trig.h \
+    worldentity.cpp worldentity.h gradient.cpp gradient.h \
+    platform.cpp platform.h sprite.cpp sprite.h \
     \
     lol/unit.h \
     lol/math/vector.h lol/math/half.h lol/math/real.h lol/math/remez.h \
@@ -23,8 +23,11 @@ liblol_a_SOURCES = \
     $(nacl_sources) \
     $(sdl_sources) \
     \
-    shader/shader.cpp shader/shader.h \
     thread/threadbase.h thread/thread.h \
+    \
+    math/vector.cpp math/real.cpp math/half.cpp math/trig.cpp math/trig.h \
+    \
+    gpu/shader.cpp gpu/shader.h \
     gpu/vbo.cpp gpu/vbo.h \
     \
     image/image.cpp image/image.h image/image-private.h \
diff --git a/src/core.h b/src/core.h
index 5f566393..d0f6a26d 100644
--- a/src/core.h
+++ b/src/core.h
@@ -62,7 +62,7 @@ static inline int isnan(float f)
 #endif
 
 // Base types
-#include "trig.h"
+#include "math/trig.h"
 #include "lol/math/half.h"
 #include "lol/math/real.h"
 #include "lol/math/vector.h"
@@ -97,8 +97,8 @@ static inline int isnan(float f)
 #include "dict.h"
 #include "map.h"
 #include "layer.h"
+#include "gpu/shader.h"
 #include "gpu/vbo.h"
-#include "shader/shader.h"
 #include "image/image.h"
 #include "application/application.h"
 
diff --git a/src/shader/shader.cpp b/src/gpu/shader.cpp
similarity index 100%
rename from src/shader/shader.cpp
rename to src/gpu/shader.cpp
diff --git a/src/shader/shader.h b/src/gpu/shader.h
similarity index 100%
rename from src/shader/shader.h
rename to src/gpu/shader.h
diff --git a/src/half.cpp b/src/math/half.cpp
similarity index 100%
rename from src/half.cpp
rename to src/math/half.cpp
diff --git a/src/real.cpp b/src/math/real.cpp
similarity index 100%
rename from src/real.cpp
rename to src/math/real.cpp
diff --git a/src/trig.cpp b/src/math/trig.cpp
similarity index 100%
rename from src/trig.cpp
rename to src/math/trig.cpp
diff --git a/src/trig.h b/src/math/trig.h
similarity index 100%
rename from src/trig.h
rename to src/math/trig.h
diff --git a/src/vector.cpp b/src/math/vector.cpp
similarity index 100%
rename from src/vector.cpp
rename to src/math/vector.cpp
diff --git a/win32/lolcore.vcxproj b/win32/lolcore.vcxproj
index f2bb10c0..06033f77 100644
--- a/win32/lolcore.vcxproj
+++ b/win32/lolcore.vcxproj
@@ -151,9 +151,9 @@
     <ClCompile Include="..\src\entity.cpp" />
     <ClCompile Include="..\src\font.cpp" />
     <ClCompile Include="..\src\forge.cpp" />
+    <ClCompile Include="..\src\gpu\shader.cpp" />
     <ClCompile Include="..\src\gpu\vbo.cpp" />
     <ClCompile Include="..\src\gradient.cpp" />
-    <ClCompile Include="..\src\half.cpp" />
     <ClCompile Include="..\src\hash.cpp" />
     <ClCompile Include="..\src\image\codec\android-image.cpp" />
     <ClCompile Include="..\src\image\codec\dummy-image.cpp" />
@@ -166,24 +166,24 @@
     <ClCompile Include="..\src\layer.cpp" />
     <ClCompile Include="..\src\log.cpp" />
     <ClCompile Include="..\src\map.cpp" />
+    <ClCompile Include="..\src\math\half.cpp" />
+    <ClCompile Include="..\src\math\real.cpp" />
+    <ClCompile Include="..\src\math\trig.cpp" />
+    <ClCompile Include="..\src\math\vector.cpp" />
     <ClCompile Include="..\src\platform.cpp" />
     <ClCompile Include="..\src\platform\sdl\sdlapp.cpp" />
     <ClCompile Include="..\src\platform\sdl\sdlinput.cpp" />
     <ClCompile Include="..\src\platform\xbox\xboxapp.cpp" />
     <ClCompile Include="..\src\profiler.cpp" />
-    <ClCompile Include="..\src\real.cpp" />
     <ClCompile Include="..\src\sample.cpp" />
     <ClCompile Include="..\src\sampler.cpp" />
     <ClCompile Include="..\src\scene.cpp" />
-    <ClCompile Include="..\src\shader\shader.cpp" />
     <ClCompile Include="..\src\sprite.cpp" />
     <ClCompile Include="..\src\text.cpp" />
     <ClCompile Include="..\src\ticker.cpp" />
     <ClCompile Include="..\src\tiler.cpp" />
     <ClCompile Include="..\src\tileset.cpp" />
     <ClCompile Include="..\src\timer.cpp" />
-    <ClCompile Include="..\src\trig.cpp" />
-    <ClCompile Include="..\src\vector.cpp" />
     <ClCompile Include="..\src\video.cpp" />
     <ClCompile Include="..\src\world.cpp" />
     <ClCompile Include="..\src\worldentity.cpp" />
@@ -204,9 +204,9 @@
     <ClInclude Include="..\src\entity.h" />
     <ClInclude Include="..\src\font.h" />
     <ClInclude Include="..\src\forge.h" />
+    <ClInclude Include="..\src\gpu\shader.h" />
     <ClInclude Include="..\src\gpu\vbo.h" />
     <ClInclude Include="..\src\gradient.h" />
-    <ClInclude Include="..\src\half.h" />
     <ClInclude Include="..\src\hash.h" />
     <ClInclude Include="..\src\image\image-private.h" />
     <ClInclude Include="..\src\image\image.h" />
@@ -215,11 +215,13 @@
     <ClInclude Include="..\src\log.h" />
     <ClInclude Include="..\src\loldebug.h" />
     <ClInclude Include="..\src\lolgl.h" />
+    <ClInclude Include="..\src\lol\math\half.h" />
     <ClInclude Include="..\src\lol\math\real.h" />
     <ClInclude Include="..\src\lol\math\remez.h" />
     <ClInclude Include="..\src\lol\math\vector.h" />
     <ClInclude Include="..\src\lol\unit.h" />
     <ClInclude Include="..\src\map.h" />
+    <ClInclude Include="..\src\math\trig.h" />
     <ClInclude Include="..\src\numeric.h" />
     <ClInclude Include="..\src\platform.h" />
     <ClInclude Include="..\src\platform\sdl\sdlapp.h" />
@@ -229,7 +231,6 @@
     <ClInclude Include="..\src\sample.h" />
     <ClInclude Include="..\src\sampler.h" />
     <ClInclude Include="..\src\scene.h" />
-    <ClInclude Include="..\src\shader\shader.h" />
     <ClInclude Include="..\src\simd.h" />
     <ClInclude Include="..\src\sprite.h" />
     <ClInclude Include="..\src\text.h" />
@@ -239,7 +240,6 @@
     <ClInclude Include="..\src\tiler.h" />
     <ClInclude Include="..\src\tileset.h" />
     <ClInclude Include="..\src\timer.h" />
-    <ClInclude Include="..\src\trig.h" />
     <ClInclude Include="..\src\video.h" />
     <ClInclude Include="..\src\world.h" />
     <ClInclude Include="..\src\worldentity.h" />
@@ -247,4 +247,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/win32/lolcore.vcxproj.filters b/win32/lolcore.vcxproj.filters
index 18ac30a1..0ff6e8ef 100644
--- a/win32/lolcore.vcxproj.filters
+++ b/win32/lolcore.vcxproj.filters
@@ -14,9 +14,6 @@
     <Filter Include="src\platform">
       <UniqueIdentifier>{a11c55f8-8e10-4270-be24-38e8d4fcf589}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\shader">
-      <UniqueIdentifier>{ae7aa503-aea5-4aa6-9f61-2f92cfade09c}</UniqueIdentifier>
-    </Filter>
     <Filter Include="src\platform\sdl">
       <UniqueIdentifier>{4089421f-2cc2-4036-a6b2-9df8a2f4efc8}</UniqueIdentifier>
     </Filter>
@@ -26,6 +23,9 @@
     <Filter Include="src\lol\math">
       <UniqueIdentifier>{1e0b7a4c-425f-4d4f-945e-ba2ac9386ce0}</UniqueIdentifier>
     </Filter>
+    <Filter Include="src\math">
+      <UniqueIdentifier>{2caadbda-b9f1-446d-bbd2-55c959db342c}</UniqueIdentifier>
+    </Filter>
     <Filter Include="src\gpu">
       <UniqueIdentifier>{ec9b94fc-c716-4ef2-9c3b-c7f3447574b0}</UniqueIdentifier>
     </Filter>
@@ -61,9 +61,6 @@
     <ClCompile Include="..\src\debug\stats.cpp">
       <Filter>src\debug</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\shader\shader.cpp">
-      <Filter>src\shader</Filter>
-    </ClCompile>
     <ClCompile Include="..\src\platform\sdl\sdlapp.cpp">
       <Filter>src\platform\sdl</Filter>
     </ClCompile>
@@ -94,8 +91,8 @@
     <ClCompile Include="..\src\gradient.cpp">
       <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\half.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="..\src\math\half.cpp">
+      <Filter>src\math</Filter>
     </ClCompile>
     <ClCompile Include="..\src\hash.cpp">
       <Filter>src</Filter>
@@ -118,8 +115,8 @@
     <ClCompile Include="..\src\profiler.cpp">
       <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\real.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="..\src\math\real.cpp">
+      <Filter>src\math</Filter>
     </ClCompile>
     <ClCompile Include="..\src\sample.cpp">
       <Filter>src</Filter>
@@ -148,11 +145,11 @@
     <ClCompile Include="..\src\timer.cpp">
       <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\trig.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="..\src\math\trig.cpp">
+      <Filter>src\math</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vector.cpp">
-      <Filter>src</Filter>
+    <ClCompile Include="..\src\math\vector.cpp">
+      <Filter>src\math</Filter>
     </ClCompile>
     <ClCompile Include="..\src\video.cpp">
       <Filter>src</Filter>
@@ -163,6 +160,9 @@
     <ClCompile Include="..\src\worldentity.cpp">
       <Filter>src</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\gpu\shader.cpp">
+      <Filter>src\gpu</Filter>
+    </ClCompile>
     <ClCompile Include="..\src\gpu\vbo.cpp">
       <Filter>src\gpu</Filter>
     </ClCompile>
@@ -210,9 +210,6 @@
     <ClInclude Include="..\src\debug\stats.h">
       <Filter>src\debug</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\shader\shader.h">
-      <Filter>src\shader</Filter>
-    </ClInclude>
     <ClInclude Include="..\src\platform\sdl\sdlinput.h">
       <Filter>src\platform\sdl</Filter>
     </ClInclude>
@@ -249,9 +246,6 @@
     <ClInclude Include="..\src\gradient.h">
       <Filter>src</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\half.h">
-      <Filter>src</Filter>
-    </ClInclude>
     <ClInclude Include="..\src\hash.h">
       <Filter>src</Filter>
     </ClInclude>
@@ -312,8 +306,8 @@
     <ClInclude Include="..\src\timer.h">
       <Filter>src</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\trig.h">
-      <Filter>src</Filter>
+    <ClInclude Include="..\src\math\trig.h">
+      <Filter>src\math</Filter>
     </ClInclude>
     <ClInclude Include="..\src\video.h">
       <Filter>src</Filter>
@@ -324,6 +318,9 @@
     <ClInclude Include="..\src\worldentity.h">
       <Filter>src</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\lol\math\half.h">
+      <Filter>src\lol\math</Filter>
+    </ClInclude>
     <ClInclude Include="..\src\lol\math\real.h">
       <Filter>src\lol\math</Filter>
     </ClInclude>
@@ -336,6 +333,9 @@
     <ClInclude Include="..\src\lol\unit.h">
       <Filter>src\lol</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\gpu\shader.h">
+      <Filter>src\gpu</Filter>
+    </ClInclude>
     <ClInclude Include="..\src\gpu\vbo.h">
       <Filter>src\gpu</Filter>
     </ClInclude>
@@ -355,4 +355,4 @@
       <Filter>src\platform\xbox</Filter>
     </ClInclude>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>