diff --git a/src/Makefile.am b/src/Makefile.am
index 72d463c4..c47f1a1e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -46,8 +46,6 @@ liblol_a_SOURCES = \
     \
     base/hash.cpp base/string.cpp \
     \
-    thread/threadbase.h thread/thread.h \
-    \
     math/vector.cpp math/real.cpp math/half.cpp math/trig.cpp \
     math/geometry.cpp \
     \
@@ -74,6 +72,7 @@ liblol_a_SOURCES = \
     mesh/mesh.cpp mesh/mesh.h \
     \
     sys/init.cpp \
+    sys/threadbase.h sys/thread.h \
     \
     image/image.cpp image/image.h image/image-private.h \
     image/codec/gdiplus-image.cpp \
diff --git a/src/core.h b/src/core.h
index 0bb7bf7b..9fa9788e 100644
--- a/src/core.h
+++ b/src/core.h
@@ -89,12 +89,12 @@ static inline int isnan(float f)
 #include <lol/math/geometry.h>
 
 #include <lol/sys/init.h>
+#include <lol/sys/thread.h>
 
 #include <lol/image/color.h>
 
 #include "numeric.h"
 #include "timer.h"
-#include "thread/thread.h"
 
 // Static classes
 #include "log.h"
diff --git a/src/thread/thread.h b/src/lol/sys/thread.h
similarity index 96%
rename from src/thread/thread.h
rename to src/lol/sys/thread.h
index be415a82..7e4d4a0a 100644
--- a/src/thread/thread.h
+++ b/src/lol/sys/thread.h
@@ -19,7 +19,7 @@
 #if defined __CELLOS_LV2__
 #   include "platform/ps3/threadbase.h"
 #else
-#   include "threadbase.h"
+#   include "sys/threadbase.h"
 #endif
 
 namespace lol
diff --git a/src/lolcore.vcxproj b/src/lolcore.vcxproj
index 9132720a..d3f9eeec 100644
--- a/src/lolcore.vcxproj
+++ b/src/lolcore.vcxproj
@@ -599,6 +599,8 @@
     <ClInclude Include="lol\math\real.h" />
     <ClInclude Include="lol\math\remez.h" />
     <ClInclude Include="lol\math\vector.h" />
+    <ClInclude Include="lol\sys\init.h" />
+    <ClInclude Include="lol\sys\thread.h" />
     <ClInclude Include="lol\unit.h" />
     <ClInclude Include="mesh\mesh.h" />
     <ClInclude Include="map.h" />
@@ -618,9 +620,9 @@
     <ClInclude Include="scene.h" />
     <ClInclude Include="simd.h" />
     <ClInclude Include="sprite.h" />
+    <ClInclude Include="sys\threadbase.h" />
+    <ClInclude Include="sys\init.cpp" />
     <ClInclude Include="text.h" />
-    <ClInclude Include="thread\thread.h" />
-    <ClInclude Include="thread\threadbase.h" />
     <ClInclude Include="ticker.h" />
     <ClInclude Include="tiler.h" />
     <ClInclude Include="tileset.h" />
@@ -647,4 +649,4 @@
   <ImportGroup Label="ExtensionTargets">
     <Import Project="$(SolutionDir)\Lol.Fx.targets" />
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/thread/threadbase.h b/src/sys/threadbase.h
similarity index 100%
rename from src/thread/threadbase.h
rename to src/sys/threadbase.h