20 files changed, 9 insertions, 12 deletions

diff --git a/gfx/CMakeLists.txt b/gfx/CMakeLists.txt
index c835bd9..7aa118b 100644
--- a/gfx/CMakeLists.txt
+++ b/gfx/CMakeLists.txt
@@ -36,14 +36,14 @@ add_library(gfx SHARED
   src/asset/asset_cache.c
   src/asset/model.c
   src/asset/texture.c
-  src/render/buffer.c
-  src/render/core.c
-  src/render/framebuffer.c
-  src/render/geometry.c
-  src/render/renderbuffer.c
-  src/render/shader_program.c
-  src/render/shader.c
-  src/render/texture.c
+  src/core/buffer.c
+  src/core/core.c
+  src/core/framebuffer.c
+  src/core/geometry.c
+  src/core/renderbuffer.c
+  src/core/shader_program.c
+  src/core/shader.c
+  src/core/texture.c
   src/renderer/imm_renderer.c
   src/renderer/renderer.c
   src/scene/animation.c
diff --git a/gfx/src/render/buffer.c b/gfx/src/core/buffer.c
index 3b7e4bc..3b7e4bc 100644
--- a/gfx/src/render/buffer.c
+++ b/gfx/src/core/buffer.c
diff --git a/gfx/src/render/buffer.h b/gfx/src/core/buffer.h
index b9080f0..b9080f0 100644
--- a/gfx/src/render/buffer.h
+++ b/gfx/src/core/buffer.h
diff --git a/gfx/src/render/constants.h b/gfx/src/core/constants.h
index a6a3b94..a6a3b94 100644
--- a/gfx/src/render/constants.h
+++ b/gfx/src/core/constants.h
diff --git a/gfx/src/render/core.c b/gfx/src/core/core.c
index 7a6d9cc..7a6d9cc 100644
--- a/gfx/src/render/core.c
+++ b/gfx/src/core/core.c
diff --git a/gfx/src/render/core_impl.h b/gfx/src/core/core_impl.h
index e27c0f2..e27c0f2 100644
--- a/gfx/src/render/core_impl.h
+++ b/gfx/src/core/core_impl.h
diff --git a/gfx/src/render/framebuffer.c b/gfx/src/core/framebuffer.c
index 76d9002..76d9002 100644
--- a/gfx/src/render/framebuffer.c
+++ b/gfx/src/core/framebuffer.c
diff --git a/gfx/src/render/framebuffer.h b/gfx/src/core/framebuffer.h
index 1a3439c..1a3439c 100644
--- a/gfx/src/render/framebuffer.h
+++ b/gfx/src/core/framebuffer.h
diff --git a/gfx/src/render/geometry.c b/gfx/src/core/geometry.c
index cfc749f..cfc749f 100644
--- a/gfx/src/render/geometry.c
+++ b/gfx/src/core/geometry.c
diff --git a/gfx/src/render/geometry.h b/gfx/src/core/geometry.h
index c37a76f..c37a76f 100644
--- a/gfx/src/render/geometry.h
+++ b/gfx/src/core/geometry.h
diff --git a/gfx/src/render/gl_util.h b/gfx/src/core/gl_util.h
index a3cc629..a3cc629 100644
--- a/gfx/src/render/gl_util.h
+++ b/gfx/src/core/gl_util.h
diff --git a/gfx/src/render/renderbuffer.c b/gfx/src/core/renderbuffer.c
index 2753f3b..2753f3b 100644
--- a/gfx/src/render/renderbuffer.c
+++ b/gfx/src/core/renderbuffer.c
diff --git a/gfx/src/render/renderbuffer.h b/gfx/src/core/renderbuffer.h
index ea11610..ea11610 100644
--- a/gfx/src/render/renderbuffer.h
+++ b/gfx/src/core/renderbuffer.h
diff --git a/gfx/src/render/shader.c b/gfx/src/core/shader.c
index af2f89f..af2f89f 100644
--- a/gfx/src/render/shader.c
+++ b/gfx/src/core/shader.c
diff --git a/gfx/src/render/shader.h b/gfx/src/core/shader.h
index b9f5679..b9f5679 100644
--- a/gfx/src/render/shader.h
+++ b/gfx/src/core/shader.h
diff --git a/gfx/src/render/shader_program.c b/gfx/src/core/shader_program.c
index 3cbe48d..3cbe48d 100644
--- a/gfx/src/render/shader_program.c
+++ b/gfx/src/core/shader_program.c
diff --git a/gfx/src/render/shader_program.h b/gfx/src/core/shader_program.h
index 1443663..1443663 100644
--- a/gfx/src/render/shader_program.h
+++ b/gfx/src/core/shader_program.h
diff --git a/gfx/src/render/texture.c b/gfx/src/core/texture.c
index 89f7ec0..89f7ec0 100644
--- a/gfx/src/render/texture.c
+++ b/gfx/src/core/texture.c
diff --git a/gfx/src/render/texture.h b/gfx/src/core/texture.h
index 4af41e9..4af41e9 100644
--- a/gfx/src/render/texture.h
+++ b/gfx/src/core/texture.h
diff --git a/gfx/src/gfx.c b/gfx/src/gfx.c
index 8c513a1..36020df 100644
--- a/gfx/src/gfx.c
+++ b/gfx/src/gfx.c
@@ -1,14 +1,11 @@
 #include <gfx/gfx.h>
 
 #include "asset/asset_cache.h"
-#include "render/core_impl.h"
+#include "core/core_impl.h"
 #include "renderer/imm_renderer_impl.h"
 #include "renderer/renderer_impl.h"
-#include "scene/scene_graph.h"
-#include "scene/scene_impl.h"
 #include "scene/scene_memory.h"
 
-#include <cstring.h>
 #include <log/log.h>
 
 #include <assert.h>