diff --git a/src/ai.cpp b/src/ai/ai.cpp
similarity index 100%
rename from src/ai.cpp
rename to src/ai/ai.cpp
diff --git a/src/ai.hpp b/src/ai/ai.hpp
similarity index 100%
rename from src/ai.hpp
rename to src/ai/ai.hpp
diff --git a/src/ai_debug.cpp b/src/ai/ai_debug.cpp
similarity index 100%
rename from src/ai_debug.cpp
rename to src/ai/ai_debug.cpp
diff --git a/src/ai_debug.hpp b/src/ai/ai_debug.hpp
similarity index 100%
rename from src/ai_debug.hpp
rename to src/ai/ai_debug.hpp
diff --git a/src/goap.cpp b/src/ai/goap.cpp
similarity index 100%
rename from src/goap.cpp
rename to src/ai/goap.cpp
diff --git a/src/goap.hpp b/src/ai/goap.hpp
similarity index 100%
rename from src/goap.hpp
rename to src/ai/goap.hpp
diff --git a/src/autowalker.cpp b/src/autowalker.cpp
index b7cfbee..651f19d 100644
--- a/src/autowalker.cpp
+++ b/src/autowalker.cpp
@@ -1,5 +1,5 @@
 #include "autowalker.hpp"
-#include "ai_debug.hpp"
+#include "ai/ai_debug.hpp"
 #include "gui/ritual_ui.hpp"
 #include "game_level.hpp"
 #include "systems.hpp"
diff --git a/src/autowalker.hpp b/src/autowalker.hpp
index fc7c4be..ee163c9 100644
--- a/src/autowalker.hpp
+++ b/src/autowalker.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "ai.hpp"
+#include "ai/ai.hpp"
 #include "gui/fsm.hpp"
 #include <guecs/ui.hpp>
 
diff --git a/src/boss/system.cpp b/src/boss/system.cpp
index ed921c6..09021c3 100644
--- a/src/boss/system.cpp
+++ b/src/boss/system.cpp
@@ -2,7 +2,7 @@
 #include <fmt/core.h>
 #include "components.hpp"
 #include "game_level.hpp"
-#include "ai.hpp"
+#include "ai/ai.hpp"
 #include "battle.hpp"
 
 namespace boss {
diff --git a/src/components.hpp b/src/components.hpp
index b2fee3d..1d04831 100644
--- a/src/components.hpp
+++ b/src/components.hpp
@@ -11,7 +11,7 @@
 #include <functional>
 #include <optional>
 #include "json_mods.hpp"
-#include "goap.hpp"
+#include "ai/goap.hpp"
 #include <array>
 
 namespace combat {
diff --git a/src/backend.cpp b/src/gui/backend.cpp
similarity index 100%
rename from src/backend.cpp
rename to src/gui/backend.cpp
diff --git a/src/backend.hpp b/src/gui/backend.hpp
similarity index 100%
rename from src/backend.hpp
rename to src/gui/backend.hpp
diff --git a/src/gui/main_ui.cpp b/src/gui/main_ui.cpp
index 4c419d6..25529df 100644
--- a/src/gui/main_ui.cpp
+++ b/src/gui/main_ui.cpp
@@ -4,7 +4,7 @@
 #include "animation.hpp"
 #include "constants.hpp"
 #include "game_level.hpp"
-#include "ai.hpp"
+#include "ai/ai.hpp"
 
 namespace gui {
   using namespace components;
diff --git a/src/main.cpp b/src/main.cpp
index 0c77d7f..6fb49ad 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2,10 +2,10 @@
 #include "textures.hpp"
 #include "sound.hpp"
 #include "autowalker.hpp"
-#include "ai.hpp"
+#include "ai/ai.hpp"
 #include <iostream>
 #include "shaders.hpp"
-#include "backend.hpp"
+#include "gui/backend.hpp"
 #include "game_level.hpp"
 #include "camera.hpp"
 
diff --git a/src/meson.build b/src/meson.build
index 713c995..d64d74e 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,20 +1,20 @@
 sources = files(
-  'ai.cpp',
-  'ai_debug.cpp',
-  'animation.cpp',
-  'autowalker.cpp',
-  'backend.cpp',
+  # ai
+  'ai/ai.cpp',
+  'ai/ai_debug.cpp',
+  'ai/goap.cpp',
+
+  # combat
   'battle.cpp',
+  'combat.cpp',
+
+  # boss fight mini game
   'boss/fight.cpp',
   'boss/system.cpp',
   'boss/ui.cpp',
-  'camera.cpp',
-  'combat.cpp',
-  'components.cpp',
-  'config.cpp',
-  'dbc.cpp',
-  'game_level.cpp',
-  'goap.cpp',
+
+  # gui
+  'gui/backend.cpp',
   'gui/combat_ui.cpp',
   'gui/debug_ui.cpp',
   'gui/dnd_loot.cpp',
@@ -28,24 +28,43 @@ sources = files(
   'gui/overlay_ui.cpp',
   'gui/ritual_ui.cpp',
   'gui/status_ui.cpp',
-  'inventory.cpp',
+
+  # cutscenes
+  'storyboard/ui.cpp',
+
+  # sound
+  'sound.cpp',
+
+  # graphics
+  'textures.cpp',
+  'palette.cpp',
+  'shaders.cpp',
+  'scene.cpp',
+  'animation.cpp',
   'lights.cpp',
-  'map.cpp',
+  'raycaster.cpp',
+  'easing.cpp',
+  'camera.cpp',
+
+  # algos
   'matrix.cpp',
   'maze.cpp',
-  'palette.cpp',
   'pathing.cpp',
   'rand.cpp',
-  'raycaster.cpp',
-  'rituals.cpp',
-  'scene.cpp',
-  'shaders.cpp',
-  'sound.cpp',
   'spatialmap.cpp',
   'stats.cpp',
-  'storyboard/ui.cpp',
+
+  # game
   'systems.cpp',
-  'textures.cpp',
   'worldbuilder.cpp',
-  'easing.cpp',
+  'rituals.cpp',
+  'inventory.cpp',
+  'autowalker.cpp',
+  'components.cpp',
+  'game_level.cpp',
+  'config.cpp',
+  'map.cpp',
+
+  # root
+  'dbc.cpp',
 )
diff --git a/src/rituals.cpp b/src/rituals.cpp
index 267e7cf..087a0c1 100644
--- a/src/rituals.cpp
+++ b/src/rituals.cpp
@@ -1,6 +1,6 @@
 #include "rituals.hpp"
-#include "ai_debug.hpp"
-#include "ai.hpp"
+#include "ai/ai_debug.hpp"
+#include "ai/ai.hpp"
 
 namespace ritual {
   Engine::Engine(std::string config_path) :
diff --git a/src/rituals.hpp b/src/rituals.hpp
index 1ad0f5e..ef80e20 100644
--- a/src/rituals.hpp
+++ b/src/rituals.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#include "goap.hpp"
-#include "ai.hpp"
+#include "ai/goap.hpp"
+#include "ai/ai.hpp"
 #include "config.hpp"
 #include "components.hpp"
 
diff --git a/src/systems.cpp b/src/systems.cpp
index f4b665f..9e0accf 100644
--- a/src/systems.cpp
+++ b/src/systems.cpp
@@ -8,8 +8,8 @@
 #include "lights.hpp"
 #include "events.hpp"
 #include "sound.hpp"
-#include "ai.hpp"
-#include "ai_debug.hpp"
+#include "ai/ai.hpp"
+#include "ai/ai_debug.hpp"
 #include "shiterator.hpp"
 #include "rituals.hpp"
 #include "battle.hpp"
diff --git a/tests/ai.cpp b/tests/ai.cpp
index 0f55350..1674517 100644
--- a/tests/ai.cpp
+++ b/tests/ai.cpp
@@ -1,8 +1,8 @@
 #include <catch2/catch_test_macros.hpp>
 #include "dbc.hpp"
-#include "ai.hpp"
+#include "ai/ai.hpp"
+#include "ai/ai_debug.hpp"
 #include <iostream>
-#include "ai_debug.hpp"
 #include "rituals.hpp"
 
 using namespace dbc;
diff --git a/tests/battle.cpp b/tests/battle.cpp
index 9018025..82ed91e 100644
--- a/tests/battle.cpp
+++ b/tests/battle.cpp
@@ -6,10 +6,10 @@
 #include "simplefsm.hpp"
 #include "dinkyecs.hpp"
 #include "boss/system.hpp"
-#include "backend.hpp"
+#include "gui/backend.hpp"
 #include "game_level.hpp"
 #include "components.hpp"
-#include "ai.hpp"
+#include "ai/ai.hpp"
 #include "palette.hpp"
 
 using namespace combat;
diff --git a/tests/pathing.cpp b/tests/pathing.cpp
index 4bd32a2..40d12c7 100644
--- a/tests/pathing.cpp
+++ b/tests/pathing.cpp
@@ -4,7 +4,7 @@
 #include <fstream>
 #include "pathing.hpp"
 #include "matrix.hpp"
-#include "ai.hpp"
+#include "ai/ai.hpp"
 #include "game_level.hpp"
 #include <chrono>
 #include <thread>
diff --git a/tests/rituals.cpp b/tests/rituals.cpp
index 57a5361..eb8ccf2 100644
--- a/tests/rituals.cpp
+++ b/tests/rituals.cpp
@@ -2,7 +2,6 @@
 #include <iostream>
 #include "rituals.hpp"
 #include "simplefsm.hpp"
-#include "ai_debug.hpp"
 
 TEST_CASE("ritual::Engine basic tests", "[rituals]") {
   ritual::Engine re("assets/rituals.json");
diff --git a/tools/animator.cpp b/tools/animator.cpp
index 83ec4b0..bb3a6cd 100644
--- a/tools/animator.cpp
+++ b/tools/animator.cpp
@@ -1,9 +1,9 @@
 #define FSM_DEBUG 1
 #include "sound.hpp"
-#include "ai.hpp"
+#include "ai/ai.hpp"
 #include <iostream>
 #include "shaders.hpp"
-#include "backend.hpp"
+#include "gui/backend.hpp"
 #include "constants.hpp"
 #include "animation.hpp"
 #include "tools/animator.hpp"
diff --git a/tools/arena.cpp b/tools/arena.cpp
index 04ef716..b1af8de 100644
--- a/tools/arena.cpp
+++ b/tools/arena.cpp
@@ -1,10 +1,10 @@
 #include "textures.hpp"
 #include "sound.hpp"
 #include "autowalker.hpp"
-#include "ai.hpp"
+#include "ai/ai.hpp"
 #include <iostream>
 #include "shaders.hpp"
-#include "backend.hpp"
+#include "gui/backend.hpp"
 #include "game_level.hpp"
 #include "boss/system.hpp"
 #include "events.hpp"
diff --git a/tools/storyboard.cpp b/tools/storyboard.cpp
index aec7109..1aa5711 100644
--- a/tools/storyboard.cpp
+++ b/tools/storyboard.cpp
@@ -1,11 +1,10 @@
 #include "gui/fsm.hpp"
 #include "textures.hpp"
 #include "sound.hpp"
-#include "ai.hpp"
 #include <iostream>
 #include "shaders.hpp"
-#include "backend.hpp"
 #include "constants.hpp"
+#include "gui/backend.hpp"
 #include "gui/event_router.hpp"
 #include "camera.hpp"
 #include "storyboard/ui.hpp"