diff --git a/src/Makefile.am b/src/Makefile.am
index 190172c7..90368c68 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,8 +17,8 @@ liblol_a_SOURCES = \
     platform.cpp platform.h sprite.cpp sprite.h camera.cpp camera.h \
     \
     lol/unit.h lol/debug.h \
-    lol/core/types.h lol/core/array.h lol/core/string.h lol/core/hash.h \
-    lol/core/map.h \
+    lol/base/types.h lol/base/array.h lol/base/string.h lol/base/hash.h \
+    lol/base/map.h \
     lol/math/vector.h lol/math/half.h lol/math/real.h lol/math/remez.h \
     lol/math/math.h \
     \
@@ -40,7 +40,7 @@ liblol_a_SOURCES = \
     $(d3d9_sources) \
     $(android_sources) \
     \
-    core/hash.cpp core/string.cpp \
+    base/hash.cpp base/string.cpp \
     \
     thread/threadbase.h thread/thread.h \
     \
diff --git a/src/core/hash.cpp b/src/base/hash.cpp
similarity index 100%
rename from src/core/hash.cpp
rename to src/base/hash.cpp
diff --git a/src/core/string.cpp b/src/base/string.cpp
similarity index 100%
rename from src/core/string.cpp
rename to src/base/string.cpp
diff --git a/src/core.h b/src/core.h
index 45d45845..324add1e 100644
--- a/src/core.h
+++ b/src/core.h
@@ -76,11 +76,11 @@ static inline int isnan(float f)
 // Base types
 #include <lol/debug.h>
 
-#include <lol/core/types.h>
-#include <lol/core/array.h>
-#include <lol/core/string.h>
-#include <lol/core/hash.h>
-#include <lol/core/map.h>
+#include <lol/base/types.h>
+#include <lol/base/array.h>
+#include <lol/base/string.h>
+#include <lol/base/hash.h>
+#include <lol/base/map.h>
 
 #include <lol/math/math.h>
 #include <lol/math/half.h>
diff --git a/src/lol/core/array.h b/src/lol/base/array.h
similarity index 100%
rename from src/lol/core/array.h
rename to src/lol/base/array.h
diff --git a/src/lol/core/hash.h b/src/lol/base/hash.h
similarity index 100%
rename from src/lol/core/hash.h
rename to src/lol/base/hash.h
diff --git a/src/lol/core/map.h b/src/lol/base/map.h
similarity index 100%
rename from src/lol/core/map.h
rename to src/lol/base/map.h
diff --git a/src/lol/core/string.h b/src/lol/base/string.h
similarity index 98%
rename from src/lol/core/string.h
rename to src/lol/base/string.h
index 3bd87301..5dd8c765 100644
--- a/src/lol/core/string.h
+++ b/src/lol/base/string.h
@@ -17,7 +17,7 @@
 #if !defined __LOL_CORE_STRING_H__
 #define __LOL_CORE_STRING_H__
 
-#include <lol/core/array.h>
+#include <lol/base/array.h>
 
 namespace lol
 {
diff --git a/src/lol/core/types.h b/src/lol/base/types.h
similarity index 100%
rename from src/lol/core/types.h
rename to src/lol/base/types.h
diff --git a/src/lolcore.vcxproj b/src/lolcore.vcxproj
index 9b8a63eb..fc18c83d 100644
--- a/src/lolcore.vcxproj
+++ b/src/lolcore.vcxproj
@@ -234,8 +234,8 @@
     <ClCompile Include="bullet\LinearMath\btQuickprof.cpp" />
     <ClCompile Include="bullet\LinearMath\btSerializer.cpp" />
     <ClCompile Include="camera.cpp" />
-    <ClCompile Include="core\hash.cpp" />
-    <ClCompile Include="core\string.cpp" />
+    <ClCompile Include="base\hash.cpp" />
+    <ClCompile Include="base\string.cpp" />
     <ClCompile Include="debug\fps.cpp" />
     <ClCompile Include="debug\record.cpp" />
     <ClCompile Include="debug\stats.cpp" />
@@ -582,11 +582,11 @@
     <ClInclude Include="log.h" />
     <ClInclude Include="loldebug.h" />
     <ClInclude Include="lolgl.h" />
-    <ClInclude Include="lol\core\array.h" />
-    <ClInclude Include="lol\core\hash.h" />
-    <ClInclude Include="lol\core\map.h" />
-    <ClInclude Include="lol\core\string.h" />
-    <ClInclude Include="lol\core\types.h" />
+    <ClInclude Include="lol\base\array.h" />
+    <ClInclude Include="lol\base\hash.h" />
+    <ClInclude Include="lol\base\map.h" />
+    <ClInclude Include="lol\base\string.h" />
+    <ClInclude Include="lol\base\types.h" />
     <ClInclude Include="lol\debug.h" />
     <ClInclude Include="lol\math\half.h" />
     <ClInclude Include="lol\math\math.h" />