diff --git a/meson.build b/meson.build
index e8376b9..d210774 100644
--- a/meson.build
+++ b/meson.build
@@ -1,4 +1,3 @@
-# clang might need _LIBCPP_ENABLE_CXX26_REMOVED_CODECVT
 
 project('raycaster', 'cpp',
   version: '0.1.0',
diff --git a/src/graphics/animation.hpp b/src/graphics/animation.hpp
index f01de8f..2b97f43 100644
--- a/src/graphics/animation.hpp
+++ b/src/graphics/animation.hpp
@@ -8,7 +8,7 @@
 #include <SFML/System/Clock.hpp>
 #include <SFML/System/Time.hpp>
 #include <functional>
-#include "easing.hpp"
+#include "graphics/easing.hpp"
 #include <fmt/core.h>
 #include "json_mods.hpp"
 #include <source_location>
diff --git a/src/camera.cpp b/src/graphics/camera.cpp
similarity index 99%
rename from src/camera.cpp
rename to src/graphics/camera.cpp
index 9dda552..f49e3ac 100644
--- a/src/camera.cpp
+++ b/src/graphics/camera.cpp
@@ -1,4 +1,4 @@
-#include "camera.hpp"
+#include "graphics/camera.hpp"
 #include <unordered_map>
 #include "components.hpp"
 #include "config.hpp"
diff --git a/src/camera.hpp b/src/graphics/camera.hpp
similarity index 100%
rename from src/camera.hpp
rename to src/graphics/camera.hpp
diff --git a/src/easing.cpp b/src/graphics/easing.cpp
similarity index 100%
rename from src/easing.cpp
rename to src/graphics/easing.cpp
diff --git a/src/easing.hpp b/src/graphics/easing.hpp
similarity index 100%
rename from src/easing.hpp
rename to src/graphics/easing.hpp
diff --git a/src/raycaster.cpp b/src/graphics/raycaster.cpp
similarity index 99%
rename from src/raycaster.cpp
rename to src/graphics/raycaster.cpp
index fa632b1..28c61d7 100644
--- a/src/raycaster.cpp
+++ b/src/graphics/raycaster.cpp
@@ -1,4 +1,4 @@
-#include "raycaster.hpp"
+#include "graphics/raycaster.hpp"
 #include "dbc.hpp"
 #include "algos/matrix.hpp"
 #include <algorithm>
diff --git a/src/raycaster.hpp b/src/graphics/raycaster.hpp
similarity index 100%
rename from src/raycaster.hpp
rename to src/graphics/raycaster.hpp
diff --git a/src/graphics/scene.hpp b/src/graphics/scene.hpp
index c4d582c..81201d2 100644
--- a/src/graphics/scene.hpp
+++ b/src/graphics/scene.hpp
@@ -5,7 +5,7 @@
 #include "graphics/textures.hpp"
 #include <SFML/Graphics/RenderWindow.hpp>
 #include <guecs/ui.hpp>
-#include "camera.hpp"
+#include "graphics/camera.hpp"
 #include <functional>
 #include "graphics/animation.hpp"
 #include "components.hpp"
diff --git a/src/gui/main_ui.hpp b/src/gui/main_ui.hpp
index 7093e74..7cb35af 100644
--- a/src/gui/main_ui.hpp
+++ b/src/gui/main_ui.hpp
@@ -5,7 +5,7 @@
 #include <guecs/ui.hpp>
 #include "gui/overlay_ui.hpp"
 #include "gui/debug_ui.hpp"
-#include "raycaster.hpp"
+#include "graphics/raycaster.hpp"
 #include <optional>
 
 namespace animation {
diff --git a/src/main.cpp b/src/main.cpp
index 1c0b010..e944f07 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -7,7 +7,7 @@
 #include "graphics/shaders.hpp"
 #include "gui/backend.hpp"
 #include "game_level.hpp"
-#include "camera.hpp"
+#include "graphics/camera.hpp"
 
 int main(int argc, char* argv[]) {
   try {
diff --git a/src/meson.build b/src/meson.build
index 0ecf366..c94ff37 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -39,9 +39,9 @@ sources = files(
   'graphics/scene.cpp',
   'graphics/animation.cpp',
   'graphics/lights.cpp',
-  'raycaster.cpp',
-  'easing.cpp',
-  'camera.cpp',
+  'graphics/raycaster.cpp',
+  'graphics/easing.cpp',
+  'graphics/camera.cpp',
 
   # algos
   'algos/matrix.cpp',
diff --git a/src/storyboard/ui.hpp b/src/storyboard/ui.hpp
index e801ef8..f434613 100644
--- a/src/storyboard/ui.hpp
+++ b/src/storyboard/ui.hpp
@@ -1,7 +1,7 @@
 #pragma once
 #include "constants.hpp"
 #include <guecs/ui.hpp>
-#include "camera.hpp"
+#include "graphics/camera.hpp"
 #include <SFML/Audio/Sound.hpp>
 #include "components.hpp"
 
diff --git a/tools/arena.cpp b/tools/arena.cpp
index 4c3732e..294ef52 100644
--- a/tools/arena.cpp
+++ b/tools/arena.cpp
@@ -10,7 +10,7 @@
 #include "events.hpp"
 #include "constants.hpp"
 #include "gui/event_router.hpp"
-#include "camera.hpp"
+#include "graphics/camera.hpp"
 
 void craft_weapon() {
   auto world = GameDB::current_world();
diff --git a/tools/storyboard.cpp b/tools/storyboard.cpp
index 7f94ba4..0b609bb 100644
--- a/tools/storyboard.cpp
+++ b/tools/storyboard.cpp
@@ -6,7 +6,7 @@
 #include "constants.hpp"
 #include "gui/backend.hpp"
 #include "gui/event_router.hpp"
-#include "camera.hpp"
+#include "graphics/camera.hpp"
 #include "storyboard/ui.hpp"
 
 int main(int, char*[]) {