16 files changed, 37 insertions, 36 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cda7b1b..6e05db1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,10 +49,10 @@ add_library(gfx SHARED
   src/core/shader_program.c
   src/core/shader.c
   src/core/texture.c
-  src/llr/llr.c
   src/memory.c
-  src/renderer/imm_renderer.c
-  src/renderer/renderer.c
+  src/render/imm.c
+  src/render/llr.c
+  src/render/renderer.c
   src/scene/animation.c
   src/scene/camera.c
   src/scene/model.c
diff --git a/include/gfx/renderer/imm_renderer.h b/include/gfx/render/imm.h
index 62c071e..62c071e 100644
--- a/include/gfx/renderer/imm_renderer.h
+++ b/include/gfx/render/imm.h
diff --git a/include/gfx/llr/llr.h b/include/gfx/render/llr.h
index 6d78a50..785f9cd 100644
--- a/include/gfx/llr/llr.h
+++ b/include/gfx/render/llr.h
@@ -60,6 +60,7 @@ Light* gfx_make_light(const LightDesc*);
 
 /// Destroy the light.
 ///
+/// TODO: Remove this comment. Inline node payload as described in node_impl.h
 /// The light is conveniently removed from the scene graph and its parent scene
 /// node is destroyed.
 void gfx_destroy_light(Light**);
diff --git a/include/gfx/renderer.h b/include/gfx/render/renderer.h
index 1da74eb..1da74eb 100644
--- a/include/gfx/renderer.h
+++ b/include/gfx/render/renderer.h
diff --git a/src/asset/model.c b/src/asset/model.c
index 96d200f..1e05a85 100644
--- a/src/asset/model.c
+++ b/src/asset/model.c
@@ -82,28 +82,28 @@
 #include "asset/model.h"
 
 #include "asset/texture.h"
-#include "gfx/core.h"
-#include "gfx/gfx.h"
-#include "gfx/llr/llr.h"
-#include "gfx/scene/animation.h"
-#include "gfx/scene/camera.h"
-#include "gfx/scene/node.h"
-#include "gfx/scene/object.h"
-#include "gfx/sizes.h"
-#include "gfx/util/shader.h"
-
 #include "gfx_assert.h"
 #include "scene/model_impl.h"
 
-#include "cstring.h"
-#include "error.h"
-#include "log/log.h"
-#include "math/camera.h"
-#include "math/defs.h"
-#include "math/mat4.h"
-#include "math/quat.h"
-#include "math/vec2.h"
-#include "math/vec3.h"
+#include <gfx/core.h>
+#include <gfx/gfx.h>
+#include <gfx/render/llr.h>
+#include <gfx/scene/animation.h>
+#include <gfx/scene/camera.h>
+#include <gfx/scene/node.h>
+#include <gfx/scene/object.h>
+#include <gfx/sizes.h>
+#include <gfx/util/shader.h>
+
+#include <cstring.h>
+#include <error.h>
+#include <log/log.h>
+#include <math/camera.h>
+#include <math/defs.h>
+#include <math/mat4.h>
+#include <math/quat.h>
+#include <math/vec2.h>
+#include <math/vec3.h>
 
 #include "cgltf_tangents.h"
 #define CGLTF_IMPLEMENTATION
diff --git a/src/gfx.c b/src/gfx.c
index 18098d2..bf713ca 100644
--- a/src/gfx.c
+++ b/src/gfx.c
@@ -2,10 +2,10 @@
 
 #include "asset/asset_cache.h"
 #include "core/core_impl.h"
-#include "llr/llr_impl.h"
 #include "memory.h"
-#include "renderer/imm_renderer_impl.h"
-#include "renderer/renderer_impl.h"
+#include "render/imm_impl.h"
+#include "render/llr_impl.h"
+#include "render/renderer_impl.h"
 
 #include <assert.h>
 #include <stdlib.h>
diff --git a/src/memory.c b/src/memory.c
index 39ae6ea..a68bc2b 100644
--- a/src/memory.c
+++ b/src/memory.c
@@ -2,7 +2,7 @@
 
 #include <gfx/sizes.h>
 
-#include "llr/llr_impl.h"
+#include "render/llr_impl.h"
 #include "scene/animation_impl.h"
 #include "scene/camera_impl.h"
 #include "scene/model_impl.h"
diff --git a/src/renderer/imm_renderer.c b/src/render/imm.c
index b3af7e8..8a93488 100644
--- a/src/renderer/imm_renderer.c
+++ b/src/render/imm.c
@@ -1,8 +1,8 @@
-#include "imm_renderer_impl.h"
+#include "imm_impl.h"
 
 #include <gfx/core.h>
-#include <gfx/llr/llr.h>
-#include <gfx/renderer/imm_renderer.h>
+#include <gfx/render/imm.h>
+#include <gfx/render/llr.h>
 #include <gfx/util/shader.h>
 
 #include <math/aabb3.h>
diff --git a/src/renderer/imm_renderer_impl.h b/src/render/imm_impl.h
index d87b910..d87b910 100644
--- a/src/renderer/imm_renderer_impl.h
+++ b/src/render/imm_impl.h
diff --git a/src/llr/llr.c b/src/render/llr.c
index a1b37be..a1b37be 100644
--- a/src/llr/llr.c
+++ b/src/render/llr.c
diff --git a/src/llr/llr_impl.h b/src/render/llr_impl.h
index 6318ee0..319441c 100644
--- a/src/llr/llr_impl.h
+++ b/src/render/llr_impl.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <gfx/llr/llr.h>
+#include <gfx/render/llr.h>
 #include <gfx/sizes.h>
 
 #include "scene/types.h"
diff --git a/src/renderer/renderer.c b/src/render/renderer.c
index 7797c83..eca7551 100644
--- a/src/renderer/renderer.c
+++ b/src/render/renderer.c
@@ -1,6 +1,6 @@
 #include "renderer_impl.h"
 
-#include "llr/llr_impl.h"
+#include "llr_impl.h"
 #include "memory.h"
 #include "scene/animation_impl.h"
 #include "scene/camera_impl.h"
@@ -10,7 +10,7 @@
 #include "scene/scene_impl.h"
 
 #include <gfx/core.h>
-#include <gfx/llr/llr.h>
+#include <gfx/render/llr.h>
 #include <gfx/util/shader.h>
 
 #include <math/mat4.h>
diff --git a/src/renderer/renderer_impl.h b/src/render/renderer_impl.h
index 7395915..160ff52 100644
--- a/src/renderer/renderer_impl.h
+++ b/src/render/renderer_impl.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <gfx/renderer.h>
+#include <gfx/render/renderer.h>
 
 #include <stdbool.h>
 
diff --git a/src/scene/node.c b/src/scene/node.c
index b7cf467..c5c8d94 100644
--- a/src/scene/node.c
+++ b/src/scene/node.c
@@ -2,10 +2,10 @@
 
 #include "animation_impl.h"
 #include "camera_impl.h"
-#include "llr/llr_impl.h"
 #include "memory.h"
 #include "model_impl.h"
 #include "object_impl.h"
+#include "render/llr_impl.h"
 #include "scene_graph.h"
 
 #include "gfx_assert.h"
diff --git a/src/scene/object.c b/src/scene/object.c
index 3b2d498..d1f355c 100644
--- a/src/scene/object.c
+++ b/src/scene/object.c
@@ -2,9 +2,9 @@
 
 #include <gfx/core.h>
 
-#include "llr/llr_impl.h"
 #include "memory.h"
 #include "node_impl.h"
+#include "render/llr_impl.h"
 
 #include <assert.h>
 
diff --git a/src/util/skyquad.c b/src/util/skyquad.c
index 847bc91..1a9b4af 100644
--- a/src/util/skyquad.c
+++ b/src/util/skyquad.c
@@ -1,7 +1,7 @@
 #include <gfx/util/skyquad.h>
 
+#include <../../include/gfx/render/llr.h>
 #include <gfx/core.h>
-#include <gfx/llr/llr.h>
 #include <gfx/scene/node.h>
 #include <gfx/scene/object.h>
 #include <gfx/util/geometry.h>