diff --git a/cube_tables.h b/cube_tables.h
index a7abc5c..904ee99 100644
--- a/cube_tables.h
+++ b/cube_tables.h
@@ -1,7 +1,7 @@
 #ifndef CUBE_TABLES_H
 #define CUBE_TABLES_H
 
-#include <vector3.h>
+#include <core/math/vector3.h>
 #include "vector3i.h"
 #include "voxel.h"
 
diff --git a/voxel.h b/voxel.h
index 99151ac..5d807f0 100644
--- a/voxel.h
+++ b/voxel.h
@@ -1,7 +1,7 @@
 #ifndef VOXEL_TYPE_H
 #define VOXEL_TYPE_H
 
-#include <resource.h>
+#include <core/resource.h>
 
 class VoxelLibrary;
 
diff --git a/voxel_buffer.cpp b/voxel_buffer.cpp
index 6637151..0dcf154 100644
--- a/voxel_buffer.cpp
+++ b/voxel_buffer.cpp
@@ -1,5 +1,5 @@
 #include "voxel_buffer.h"
-#include <math_funcs.h>
+#include <core/math/math_funcs.h>
 #include <string.h>
 
 VoxelBuffer::VoxelBuffer() {
diff --git a/voxel_buffer.h b/voxel_buffer.h
index e0b76c4..8790f0d 100644
--- a/voxel_buffer.h
+++ b/voxel_buffer.h
@@ -2,8 +2,8 @@
 #define VOXEL_BUFFER_H
 
 #include "vector3i.h"
-#include <reference.h>
-#include <vector.h>
+#include <core/reference.h>
+#include <core/vector.h>
 
 // Dense voxels data storage.
 // Organized in 8-bit channels like images, all optional.
diff --git a/voxel_library.h b/voxel_library.h
index a579c09..4bd62cf 100644
--- a/voxel_library.h
+++ b/voxel_library.h
@@ -2,7 +2,7 @@
 #define VOXEL_LIBRARY_H
 
 #include "voxel.h"
-#include <resource.h>
+#include <core/resource.h>
 
 class VoxelLibrary : public Resource {
 	GDCLASS(VoxelLibrary, Resource)
diff --git a/voxel_mesher.h b/voxel_mesher.h
index 0e6b832..1fcffd0 100644
--- a/voxel_mesher.h
+++ b/voxel_mesher.h
@@ -5,7 +5,7 @@
 #include "voxel_buffer.h"
 #include "voxel_library.h"
 #include "zprofiling.h"
-#include <reference.h>
+#include <core/reference.h>
 #include <scene/resources/mesh.h>
 
 // TODO Should be renamed VoxelMesherCubic or something like that
diff --git a/voxel_mesher_smooth.cpp b/voxel_mesher_smooth.cpp
index 51d20bc..f75be0f 100644
--- a/voxel_mesher_smooth.cpp
+++ b/voxel_mesher_smooth.cpp
@@ -1,7 +1,7 @@
 
 #include "voxel_mesher_smooth.h"
 #include "transvoxel_tables.cpp"
-#include <os/os.h>
+#include <core/os/os.h>
 
 inline float tof(int8_t v) {
 	return static_cast<float>(v) / 256.f;
diff --git a/voxel_provider.h b/voxel_provider.h
index 58a7aae..cf2db1f 100644
--- a/voxel_provider.h
+++ b/voxel_provider.h
@@ -1,7 +1,7 @@
 #ifndef VOXEL_PROVIDER_H
 #define VOXEL_PROVIDER_H
 
-#include <resource.h>
+#include <core/resource.h>
 #include "voxel_buffer.h"
 
 class VoxelProvider : public Resource {
diff --git a/voxel_raycast.cpp b/voxel_raycast.cpp
index b4bdb00..eca06b8 100644
--- a/voxel_raycast.cpp
+++ b/voxel_raycast.cpp
@@ -1,5 +1,5 @@
 #include "voxel_raycast.h"
-#include <math_funcs.h>
+#include <core/math/math_funcs.h>
 
 bool voxel_raycast(
 		Vector3 ray_origin,
diff --git a/voxel_raycast.h b/voxel_raycast.h
index 1370cae..a827aab 100644
--- a/voxel_raycast.h
+++ b/voxel_raycast.h
@@ -1,5 +1,5 @@
 #include "vector3i.h"
-#include <vector3.h>
+#include <core/math/vector3.h>
 
 // TODO that could be a template function
 // pos: voxel position
diff --git a/voxel_terrain.cpp b/voxel_terrain.cpp
index b70e0f1..110051d 100644
--- a/voxel_terrain.cpp
+++ b/voxel_terrain.cpp
@@ -1,9 +1,9 @@
 #include "voxel_terrain.h"
 #include "voxel_raycast.h"
 #include "rect3i.h"
-#include <os/os.h>
+#include <core/os/os.h>
 #include <scene/3d/mesh_instance.h>
-#include <engine.h>
+#include <core/engine.h>
 
 
 VoxelTerrain::VoxelTerrain()
diff --git a/zprofiling.cpp b/zprofiling.cpp
index 4a81cc1..175a0cc 100644
--- a/zprofiling.cpp
+++ b/zprofiling.cpp
@@ -1,7 +1,7 @@
 #include "zprofiling.h"
 
 #ifdef VOXEL_PROFILING
-#include <os/os.h>
+#include <core/os/os.h>
 
 //-----------------------------------------------------------------------------
 class ZProfileVar {
diff --git a/zprofiling.h b/zprofiling.h
index b8fadce..4f8267b 100644
--- a/zprofiling.h
+++ b/zprofiling.h
@@ -5,9 +5,9 @@
 
 #ifdef VOXEL_PROFILING
 
-#include <dictionary.h>
-#include <hash_map.h>
-#include <ustring.h>
+#include <core/dictionary.h>
+#include <core/hash_map.h>
+#include <core/ustring.h>
 
 #define VOXEL_PROFILE_BEGIN(_key) _zprofiler.begin(_key);
 #define VOXEL_PROFILE_END(_key) _zprofiler.end(_key);