diff --git a/src/ai/ai.hpp b/src/ai/ai.hpp
index 0c34aea..3e0fd81 100644
--- a/src/ai/ai.hpp
+++ b/src/ai/ai.hpp
@@ -5,7 +5,7 @@
 #include <limits>
 #include <optional>
 #include <nlohmann/json.hpp>
-#include "config.hpp"
+#include "game/config.hpp"
 #include "goap.hpp"
 
 namespace ai {
diff --git a/src/ai/goap.hpp b/src/ai/goap.hpp
index 1abb9b6..ef06b2a 100644
--- a/src/ai/goap.hpp
+++ b/src/ai/goap.hpp
@@ -5,7 +5,7 @@
 #include <limits>
 #include <optional>
 #include <nlohmann/json.hpp>
-#include "config.hpp"
+#include "game/config.hpp"
 
 namespace ai {
   // ZED: I don't know if this is the best place for this
diff --git a/src/dinkyecs.hpp b/src/algos/dinkyecs.hpp
similarity index 100%
rename from src/dinkyecs.hpp
rename to src/algos/dinkyecs.hpp
diff --git a/src/algos/matrix.hpp b/src/algos/matrix.hpp
index 9b6274d..e08b304 100644
--- a/src/algos/matrix.hpp
+++ b/src/algos/matrix.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "shiterator.hpp"
+#include "algos/shiterator.hpp"
 
 namespace matrix {
   using Row = shiterator::BaseRow<int>;
diff --git a/src/algos/maze.hpp b/src/algos/maze.hpp
index 38b0859..c10dd06 100644
--- a/src/algos/maze.hpp
+++ b/src/algos/maze.hpp
@@ -1,6 +1,6 @@
 #pragma once
 #include "algos/matrix.hpp"
-#include "map.hpp"
+#include "game/map.hpp"
 
 namespace maze {
 
diff --git a/src/algos/pathing.hpp b/src/algos/pathing.hpp
index 6309b67..2e07285 100644
--- a/src/algos/pathing.hpp
+++ b/src/algos/pathing.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "point.hpp"
+#include "algos/point.hpp"
 #include "algos/matrix.hpp"
 #include <functional>
 
diff --git a/src/point.hpp b/src/algos/point.hpp
similarity index 100%
rename from src/point.hpp
rename to src/algos/point.hpp
diff --git a/src/shiterator.hpp b/src/algos/shiterator.hpp
similarity index 99%
rename from src/shiterator.hpp
rename to src/algos/shiterator.hpp
index 023145f..d925609 100644
--- a/src/shiterator.hpp
+++ b/src/algos/shiterator.hpp
@@ -6,7 +6,7 @@
 #include <numeric>
 #include <algorithm>
 #include <fmt/core.h>
-#include "point.hpp"
+#include "algos/point.hpp"
 #include "algos/rand.hpp"
 #include "dbc.hpp"
 
diff --git a/src/simplefsm.hpp b/src/algos/simplefsm.hpp
similarity index 100%
rename from src/simplefsm.hpp
rename to src/algos/simplefsm.hpp
diff --git a/src/algos/spatialmap.hpp b/src/algos/spatialmap.hpp
index efa33c7..1077c37 100644
--- a/src/algos/spatialmap.hpp
+++ b/src/algos/spatialmap.hpp
@@ -1,9 +1,9 @@
 #pragma once
 #include <vector>
 #include <unordered_map>
-#include "map.hpp"
-#include "dinkyecs.hpp"
-#include "point.hpp"
+#include "game/map.hpp"
+#include "algos/dinkyecs.hpp"
+#include "algos/point.hpp"
 
 struct CollisionData {
   DinkyECS::Entity entity = DinkyECS::NONE;
diff --git a/src/boss/fight.cpp b/src/boss/fight.cpp
index b69d6a7..c9a913a 100644
--- a/src/boss/fight.cpp
+++ b/src/boss/fight.cpp
@@ -1,7 +1,7 @@
 #define FSM_DEBUG 1
 #include "boss/fight.hpp"
 #include "boss/system.hpp"
-#include "game_level.hpp"
+#include "game/level.hpp"
 #include <iostream>
 #include "algos/rand.hpp"
 #include "events.hpp"
diff --git a/src/boss/fight.hpp b/src/boss/fight.hpp
index 6105fbb..b741943 100644
--- a/src/boss/fight.hpp
+++ b/src/boss/fight.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "simplefsm.hpp"
-#include "dinkyecs.hpp"
+#include "algos/simplefsm.hpp"
+#include "algos/dinkyecs.hpp"
 #include "boss/ui.hpp"
 #include "events.hpp"
 #include "combat/battle.hpp"
diff --git a/src/boss/system.cpp b/src/boss/system.cpp
index 35bd422..5224d97 100644
--- a/src/boss/system.cpp
+++ b/src/boss/system.cpp
@@ -1,7 +1,7 @@
 #include "boss/system.hpp"
 #include <fmt/core.h>
-#include "components.hpp"
-#include "game_level.hpp"
+#include "game/components.hpp"
+#include "game/level.hpp"
 #include "ai/ai.hpp"
 #include "combat/battle.hpp"
 
diff --git a/src/boss/system.hpp b/src/boss/system.hpp
index ad0af9a..420a777 100644
--- a/src/boss/system.hpp
+++ b/src/boss/system.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "dinkyecs.hpp"
+#include "algos/dinkyecs.hpp"
 #include <memory>
 #include "boss/fight.hpp"
 
diff --git a/src/boss/ui.cpp b/src/boss/ui.cpp
index 1ad9da0..9926608 100644
--- a/src/boss/ui.cpp
+++ b/src/boss/ui.cpp
@@ -1,9 +1,9 @@
 #include "boss/ui.hpp"
 #include "graphics/scene.hpp"
 #include "constants.hpp"
-#include "components.hpp"
+#include "game/components.hpp"
 #include <fmt/xchar.h>
-#include "game_level.hpp"
+#include "game/level.hpp"
 #include "gui/guecstra.hpp"
 #include "events.hpp"
 
diff --git a/src/combat/battle.cpp b/src/combat/battle.cpp
index a71020f..2c337fd 100644
--- a/src/combat/battle.cpp
+++ b/src/combat/battle.cpp
@@ -1,4 +1,4 @@
-#include "rituals.hpp"
+#include "game/rituals.hpp"
 #include "combat/battle.hpp"
 
 namespace combat {
diff --git a/src/combat/battle.hpp b/src/combat/battle.hpp
index 90b4417..5e21d6c 100644
--- a/src/combat/battle.hpp
+++ b/src/combat/battle.hpp
@@ -1,9 +1,9 @@
 #pragma once
-#include "rituals.hpp"
-#include "config.hpp"
-#include "dinkyecs.hpp"
+#include "game/rituals.hpp"
+#include "game/config.hpp"
+#include "algos/dinkyecs.hpp"
 #include <optional>
-#include "components.hpp"
+#include "game/components.hpp"
 #include <unordered_map>
 
 namespace combat {
diff --git a/src/combat/combat.cpp b/src/combat/combat.cpp
index 0869b9a..042895b 100644
--- a/src/combat/combat.cpp
+++ b/src/combat/combat.cpp
@@ -1,4 +1,4 @@
-#include "components.hpp"
+#include "game/components.hpp"
 #include "algos/rand.hpp"
 
 namespace components {
diff --git a/src/game/autowalker.cpp b/src/game/autowalker.cpp
index 651f19d..39a34b3 100644
--- a/src/game/autowalker.cpp
+++ b/src/game/autowalker.cpp
@@ -1,8 +1,8 @@
-#include "autowalker.hpp"
+#include "game/autowalker.hpp"
 #include "ai/ai_debug.hpp"
 #include "gui/ritual_ui.hpp"
-#include "game_level.hpp"
-#include "systems.hpp"
+#include "game/level.hpp"
+#include "game/systems.hpp"
 
 struct InventoryStats {
   int healing = 0;
diff --git a/src/game/components.cpp b/src/game/components.cpp
index 4f918cf..09637e1 100644
--- a/src/game/components.cpp
+++ b/src/game/components.cpp
@@ -1,6 +1,6 @@
-#include "components.hpp"
+#include "game/components.hpp"
 
-#include "point.hpp"
+#include "algos/point.hpp"
 
 namespace components {
   static ComponentMap MAP;
diff --git a/src/game/components.hpp b/src/game/components.hpp
index 1d04831..ca64914 100644
--- a/src/game/components.hpp
+++ b/src/game/components.hpp
@@ -1,8 +1,8 @@
 #pragma once
-#include "config.hpp"
+#include "game/config.hpp"
 #include "constants.hpp"
-#include "dinkyecs.hpp"
-#include "point.hpp"
+#include "algos/dinkyecs.hpp"
+#include "algos/point.hpp"
 #include <SFML/Graphics/Rect.hpp>
 #include <SFML/Graphics/Shader.hpp>
 #include <SFML/Graphics/Sprite.hpp>
@@ -10,7 +10,7 @@
 #include <SFML/System/Vector2.hpp>
 #include <functional>
 #include <optional>
-#include "json_mods.hpp"
+#include "game/json_mods.hpp"
 #include "ai/goap.hpp"
 #include <array>
 
diff --git a/src/game/config.cpp b/src/game/config.cpp
index 8fd53cf..781cab7 100644
--- a/src/game/config.cpp
+++ b/src/game/config.cpp
@@ -1,4 +1,4 @@
-#include "config.hpp"
+#include "game/config.hpp"
 #include "dbc.hpp"
 #include <fmt/core.h>
 
diff --git a/src/game/inventory.cpp b/src/game/inventory.cpp
index e2890a1..3406b34 100644
--- a/src/game/inventory.cpp
+++ b/src/game/inventory.cpp
@@ -1,4 +1,4 @@
-#include "inventory.hpp"
+#include "game/inventory.hpp"
 
 namespace inventory {
   bool Model::add(const std::string in_slot, DinkyECS::Entity ent) {
diff --git a/src/game/inventory.hpp b/src/game/inventory.hpp
index e67ebcd..1a832cf 100644
--- a/src/game/inventory.hpp
+++ b/src/game/inventory.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "dinkyecs.hpp"
+#include "algos/dinkyecs.hpp"
 #include <unordered_map>
 
 // BUG: this should have a bool for "permanent" or "constant" so that
diff --git a/src/json_mods.hpp b/src/game/json_mods.hpp
similarity index 100%
rename from src/json_mods.hpp
rename to src/game/json_mods.hpp
diff --git a/src/game/level.cpp b/src/game/level.cpp
index 14747cb..2b9965a 100644
--- a/src/game/level.cpp
+++ b/src/game/level.cpp
@@ -1,10 +1,9 @@
-#include "game_level.hpp"
-#include "components.hpp"
-#include "worldbuilder.hpp"
+#include "game/level.hpp"
+#include "game/components.hpp"
+#include "game/worldbuilder.hpp"
 #include "constants.hpp"
-#include "systems.hpp"
-#include "components.hpp"
-#include "rituals.hpp"
+#include "game/systems.hpp"
+#include "game/rituals.hpp"
 #include "graphics/textures.hpp"
 #include <list>
 
diff --git a/src/game/level.hpp b/src/game/level.hpp
index 52c96c7..f41ec98 100644
--- a/src/game/level.hpp
+++ b/src/game/level.hpp
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "dinkyecs.hpp"
+#include "algos/dinkyecs.hpp"
 #include "boss/ui.hpp"
 #include "graphics/lights.hpp"
-#include "map.hpp"
+#include "game/map.hpp"
 #include <memory>
 #include "algos/spatialmap.hpp"
 
diff --git a/src/game/map.cpp b/src/game/map.cpp
index 3edbc65..30255ca 100644
--- a/src/game/map.cpp
+++ b/src/game/map.cpp
@@ -1,4 +1,4 @@
-#include "map.hpp"
+#include "game/map.hpp"
 #include "dbc.hpp"
 #include "algos/rand.hpp"
 #include <vector>
diff --git a/src/game/map.hpp b/src/game/map.hpp
index 851d89d..32e9ce7 100644
--- a/src/game/map.hpp
+++ b/src/game/map.hpp
@@ -5,7 +5,7 @@
 #include <random>
 #include <algorithm>
 #include <fmt/core.h>
-#include "point.hpp"
+#include "algos/point.hpp"
 #include "graphics/lights.hpp"
 #include "algos/pathing.hpp"
 #include "algos/matrix.hpp"
diff --git a/src/game/rituals.cpp b/src/game/rituals.cpp
index 087a0c1..3fb4a61 100644
--- a/src/game/rituals.cpp
+++ b/src/game/rituals.cpp
@@ -1,4 +1,4 @@
-#include "rituals.hpp"
+#include "game/rituals.hpp"
 #include "ai/ai_debug.hpp"
 #include "ai/ai.hpp"
 
diff --git a/src/game/rituals.hpp b/src/game/rituals.hpp
index ef80e20..cbbbf26 100644
--- a/src/game/rituals.hpp
+++ b/src/game/rituals.hpp
@@ -1,8 +1,8 @@
 #pragma once
 #include "ai/goap.hpp"
 #include "ai/ai.hpp"
-#include "config.hpp"
-#include "components.hpp"
+#include "game/config.hpp"
+#include "game/components.hpp"
 
 namespace ritual {
   using JunkItem = std::string;
diff --git a/src/game/sound.cpp b/src/game/sound.cpp
index 369d0f3..eb591f8 100644
--- a/src/game/sound.cpp
+++ b/src/game/sound.cpp
@@ -1,7 +1,7 @@
-#include "sound.hpp"
+#include "game/sound.hpp"
 #include "dbc.hpp"
 #include <fmt/core.h>
-#include "config.hpp"
+#include "game/config.hpp"
 
 namespace sound {
   static SoundManager SMGR;
diff --git a/src/game/systems.cpp b/src/game/systems.cpp
index f049475..57ba2aa 100644
--- a/src/game/systems.cpp
+++ b/src/game/systems.cpp
@@ -1,4 +1,4 @@
-#include "systems.hpp"
+#include "game/systems.hpp"
 #include <fmt/core.h>
 #include <string>
 #include <cmath>
@@ -7,16 +7,16 @@
 #include "dbc.hpp"
 #include "graphics/lights.hpp"
 #include "events.hpp"
-#include "sound.hpp"
+#include "game/sound.hpp"
 #include "ai/ai.hpp"
 #include "ai/ai_debug.hpp"
-#include "shiterator.hpp"
-#include "rituals.hpp"
+#include "algos/shiterator.hpp"
+#include "game/rituals.hpp"
 #include "combat/battle.hpp"
 #include <iostream>
 #include "graphics/shaders.hpp"
-#include "inventory.hpp"
-#include "game_level.hpp"
+#include "game/inventory.hpp"
+#include "game/level.hpp"
 #include "events.hpp"
 #include "graphics/animation.hpp"
 
diff --git a/src/game/systems.hpp b/src/game/systems.hpp
index b8902d3..e557a31 100644
--- a/src/game/systems.hpp
+++ b/src/game/systems.hpp
@@ -1,9 +1,9 @@
 #pragma once
-#include "components.hpp"
+#include "game/components.hpp"
 #include <SFML/Graphics/RenderTexture.hpp>
-#include "map.hpp"
+#include "game/map.hpp"
 #include "algos/spatialmap.hpp"
-#include "game_level.hpp"
+#include "game/level.hpp"
 
 namespace System {
   using namespace components;
diff --git a/src/game/worldbuilder.cpp b/src/game/worldbuilder.cpp
index 2c06356..eb09d10 100644
--- a/src/game/worldbuilder.cpp
+++ b/src/game/worldbuilder.cpp
@@ -1,13 +1,13 @@
-#include "worldbuilder.hpp"
+#include "game/worldbuilder.hpp"
 #include "algos/rand.hpp"
 #include <fmt/core.h>
 #include <iostream>
-#include "components.hpp"
-#include "rituals.hpp"
+#include "game/components.hpp"
+#include "game/rituals.hpp"
 #include "algos/maze.hpp"
 #include "graphics/textures.hpp"
-#include "inventory.hpp"
-#include "systems.hpp"
+#include "game/inventory.hpp"
+#include "game/systems.hpp"
 #include "graphics/animation.hpp"
 
 using namespace fmt;
diff --git a/src/game/worldbuilder.hpp b/src/game/worldbuilder.hpp
index 25bc7bf..891c05a 100644
--- a/src/game/worldbuilder.hpp
+++ b/src/game/worldbuilder.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "map.hpp"
-#include "dinkyecs.hpp"
-#include "components.hpp"
+#include "game/map.hpp"
+#include "algos/dinkyecs.hpp"
+#include "game/components.hpp"
 #include "algos/spatialmap.hpp"
 
 class WorldBuilder {
diff --git a/src/graphics/animation.cpp b/src/graphics/animation.cpp
index 38ec989..268cfa7 100644
--- a/src/graphics/animation.cpp
+++ b/src/graphics/animation.cpp
@@ -5,8 +5,8 @@
 #include "algos/rand.hpp"
 #include <iostream>
 #include <fstream>
-#include "sound.hpp"
-#include "components.hpp"
+#include "game/sound.hpp"
+#include "game/components.hpp"
 
 constexpr float SUB_FRAME_SENSITIVITY = 0.999f;
 
diff --git a/src/graphics/animation.hpp b/src/graphics/animation.hpp
index 2b97f43..d188eb0 100644
--- a/src/graphics/animation.hpp
+++ b/src/graphics/animation.hpp
@@ -10,9 +10,9 @@
 #include <functional>
 #include "graphics/easing.hpp"
 #include <fmt/core.h>
-#include "json_mods.hpp"
+#include "game/json_mods.hpp"
 #include <source_location>
-#include "dinkyecs.hpp"
+#include "algos/dinkyecs.hpp"
 
 namespace animation {
 
diff --git a/src/graphics/camera.cpp b/src/graphics/camera.cpp
index f49e3ac..aad0ebe 100644
--- a/src/graphics/camera.cpp
+++ b/src/graphics/camera.cpp
@@ -1,7 +1,7 @@
 #include "graphics/camera.hpp"
 #include <unordered_map>
-#include "components.hpp"
-#include "config.hpp"
+#include "game/components.hpp"
+#include "game/config.hpp"
 #include <algorithm>
 #include <iostream>
 #include <cstdlib>
diff --git a/src/graphics/lights.hpp b/src/graphics/lights.hpp
index 7a99fd8..b413e5c 100644
--- a/src/graphics/lights.hpp
+++ b/src/graphics/lights.hpp
@@ -1,11 +1,11 @@
 #pragma once
 #include <array>
 #include "dbc.hpp"
-#include "point.hpp"
+#include "algos/point.hpp"
 #include <algorithm>
 #include "algos/matrix.hpp"
 #include "algos/pathing.hpp"
-#include "components.hpp"
+#include "game/components.hpp"
 
 namespace lighting {
   using components::LightSource;
diff --git a/src/graphics/palette.cpp b/src/graphics/palette.cpp
index 7151169..200c94f 100644
--- a/src/graphics/palette.cpp
+++ b/src/graphics/palette.cpp
@@ -1,6 +1,6 @@
 #include <fmt/core.h>
 #include "graphics/palette.hpp"
-#include "config.hpp"
+#include "game/config.hpp"
 #include "dbc.hpp"
 
 namespace palette {
diff --git a/src/graphics/raycaster.cpp b/src/graphics/raycaster.cpp
index 28c61d7..fe2bb10 100644
--- a/src/graphics/raycaster.cpp
+++ b/src/graphics/raycaster.cpp
@@ -7,9 +7,9 @@
 #include <fmt/core.h>
 #include <memory>
 #include <numbers>
-#include "components.hpp"
+#include "game/components.hpp"
 #include "graphics/textures.hpp"
-#include "systems.hpp"
+#include "game/systems.hpp"
 #include "graphics/shaders.hpp"
 #include "graphics/animation.hpp"
 
diff --git a/src/graphics/raycaster.hpp b/src/graphics/raycaster.hpp
index f0245f4..a63212e 100644
--- a/src/graphics/raycaster.hpp
+++ b/src/graphics/raycaster.hpp
@@ -3,7 +3,7 @@
 #include <SFML/Graphics.hpp>
 #include <SFML/System/Clock.hpp>
 #include "algos/spatialmap.hpp"
-#include "game_level.hpp"
+#include "game/level.hpp"
 #include "graphics/textures.hpp"
 
 using matrix::Matrix;
diff --git a/src/graphics/scene.hpp b/src/graphics/scene.hpp
index 81201d2..2db737a 100644
--- a/src/graphics/scene.hpp
+++ b/src/graphics/scene.hpp
@@ -8,7 +8,7 @@
 #include "graphics/camera.hpp"
 #include <functional>
 #include "graphics/animation.hpp"
-#include "components.hpp"
+#include "game/components.hpp"
 
 namespace scene {
   using std::shared_ptr;
diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index 5a7c954..98a82be 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -2,7 +2,7 @@
 #include <SFML/Graphics/Image.hpp>
 #include "dbc.hpp"
 #include <fmt/core.h>
-#include "config.hpp"
+#include "game/config.hpp"
 #include "constants.hpp"
 #include <memory>
 
diff --git a/src/graphics/textures.cpp b/src/graphics/textures.cpp
index 4185623..c605fd0 100644
--- a/src/graphics/textures.cpp
+++ b/src/graphics/textures.cpp
@@ -2,7 +2,7 @@
 #include <SFML/Graphics/Image.hpp>
 #include "dbc.hpp"
 #include <fmt/core.h>
-#include "config.hpp"
+#include "game/config.hpp"
 #include "constants.hpp"
 #include <memory>
 #include <filesystem>
diff --git a/src/gui/backend.cpp b/src/gui/backend.cpp
index ce5a7a6..b9bafdc 100644
--- a/src/gui/backend.cpp
+++ b/src/gui/backend.cpp
@@ -1,8 +1,8 @@
 #include "backend.hpp"
 #include "graphics/shaders.hpp"
-#include "sound.hpp"
+#include "game/sound.hpp"
 #include "graphics/textures.hpp"
-#include "config.hpp"
+#include "game/config.hpp"
 #include "graphics/palette.hpp"
 
 namespace sfml {
diff --git a/src/gui/combat_ui.cpp b/src/gui/combat_ui.cpp
index c841cf2..dcf4ece 100644
--- a/src/gui/combat_ui.cpp
+++ b/src/gui/combat_ui.cpp
@@ -1,8 +1,8 @@
 #include "constants.hpp"
-#include "rituals.hpp"
+#include "game/rituals.hpp"
 #include <fmt/xchar.h>
 #include "gui/guecstra.hpp"
-#include "game_level.hpp"
+#include "game/level.hpp"
 #include "gui/combat_ui.hpp"
 
 namespace gui {
diff --git a/src/gui/debug_ui.cpp b/src/gui/debug_ui.cpp
index df04136..dd9030e 100644
--- a/src/gui/debug_ui.cpp
+++ b/src/gui/debug_ui.cpp
@@ -4,7 +4,7 @@
 #include <optional>
 #include <fmt/core.h>
 #include <fmt/xchar.h>
-#include "components.hpp"
+#include "game/components.hpp"
 
 namespace gui {
   using namespace guecs;
diff --git a/src/gui/debug_ui.hpp b/src/gui/debug_ui.hpp
index 5f79929..5474d84 100644
--- a/src/gui/debug_ui.hpp
+++ b/src/gui/debug_ui.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "game_level.hpp"
+#include "game/level.hpp"
 #include <SFML/Graphics/RenderWindow.hpp>
 #include <SFML/Graphics/Font.hpp>
 #include <guecs/ui.hpp>
diff --git a/src/gui/dnd_loot.hpp b/src/gui/dnd_loot.hpp
index 77cd1fb..0efd0bc 100644
--- a/src/gui/dnd_loot.hpp
+++ b/src/gui/dnd_loot.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "simplefsm.hpp"
+#include "algos/simplefsm.hpp"
 #include <guecs/ui.hpp>
 #include "gui/status_ui.hpp"
 #include "gui/loot_ui.hpp"
diff --git a/src/gui/event_router.hpp b/src/gui/event_router.hpp
index 120025e..2985889 100644
--- a/src/gui/event_router.hpp
+++ b/src/gui/event_router.hpp
@@ -1,7 +1,7 @@
 #pragma once
 #include "events.hpp"
 #include "events.hpp"
-#include "simplefsm.hpp"
+#include "algos/simplefsm.hpp"
 #include <SFML/Graphics.hpp>
 
 namespace gui {
diff --git a/src/gui/fsm.cpp b/src/gui/fsm.cpp
index 5bd3857..d80f8b2 100644
--- a/src/gui/fsm.cpp
+++ b/src/gui/fsm.cpp
@@ -3,15 +3,15 @@
 #include <chrono>
 #include <numeric>
 #include <functional>
-#include "components.hpp"
+#include "game/components.hpp"
 #include <numbers>
-#include "systems.hpp"
+#include "game/systems.hpp"
 #include "events.hpp"
-#include "sound.hpp"
+#include "game/sound.hpp"
 #include "graphics/shaders.hpp"
 #include <fmt/xchar.h>
 #include "gui/guecstra.hpp"
-#include "game_level.hpp"
+#include "game/level.hpp"
 #include "boss/system.hpp"
 
 namespace gui {
diff --git a/src/gui/fsm.hpp b/src/gui/fsm.hpp
index 55308b4..f3f5c4e 100644
--- a/src/gui/fsm.hpp
+++ b/src/gui/fsm.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "constants.hpp"
-#include "simplefsm.hpp"
+#include "algos/simplefsm.hpp"
 #include "gui/debug_ui.hpp"
 #include "gui/main_ui.hpp"
 #include "gui/combat_ui.hpp"
diff --git a/src/gui/guecstra.cpp b/src/gui/guecstra.cpp
index 23546d5..b4a58a1 100644
--- a/src/gui/guecstra.cpp
+++ b/src/gui/guecstra.cpp
@@ -1,5 +1,5 @@
 #include "gui/guecstra.hpp"
-#include "game_level.hpp"
+#include "game/level.hpp"
 
 namespace guecs {
 
diff --git a/src/gui/guecstra.hpp b/src/gui/guecstra.hpp
index a7335fc..63f7d6d 100644
--- a/src/gui/guecstra.hpp
+++ b/src/gui/guecstra.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "components.hpp"
+#include "game/components.hpp"
 #include "events.hpp"
 #include <guecs/ui.hpp>
 #include "graphics/textures.hpp"
diff --git a/src/gui/loot_ui.cpp b/src/gui/loot_ui.cpp
index 83a6e8e..c76049a 100644
--- a/src/gui/loot_ui.cpp
+++ b/src/gui/loot_ui.cpp
@@ -1,8 +1,8 @@
 #include "gui/loot_ui.hpp"
 #include "constants.hpp"
 #include <fmt/xchar.h>
-#include "systems.hpp"
-#include "game_level.hpp"
+#include "game/systems.hpp"
+#include "game/level.hpp"
 
 namespace gui {
   using namespace guecs;
diff --git a/src/gui/loot_ui.hpp b/src/gui/loot_ui.hpp
index 99039fa..51cf3c7 100644
--- a/src/gui/loot_ui.hpp
+++ b/src/gui/loot_ui.hpp
@@ -4,7 +4,7 @@
 #include <SFML/Graphics/Font.hpp>
 #include <guecs/ui.hpp>
 #include "events.hpp"
-#include "inventory.hpp"
+#include "game/inventory.hpp"
 
 namespace gui {
   class LootUI {
diff --git a/src/gui/main_ui.cpp b/src/gui/main_ui.cpp
index 0eef6b9..b25fc4e 100644
--- a/src/gui/main_ui.cpp
+++ b/src/gui/main_ui.cpp
@@ -1,9 +1,9 @@
 #include "gui/main_ui.hpp"
-#include "components.hpp"
+#include "game/components.hpp"
 #include <fmt/xchar.h>
 #include "graphics/animation.hpp"
 #include "constants.hpp"
-#include "game_level.hpp"
+#include "game/level.hpp"
 #include "ai/ai.hpp"
 
 namespace gui {
diff --git a/src/gui/map_view.cpp b/src/gui/map_view.cpp
index f85d6f4..8b21214 100644
--- a/src/gui/map_view.cpp
+++ b/src/gui/map_view.cpp
@@ -2,16 +2,16 @@
 #include <functional>
 #include <string>
 #include "dbc.hpp"
-#include "components.hpp"
+#include "game/components.hpp"
 #include "algos/rand.hpp"
-#include "systems.hpp"
+#include "game/systems.hpp"
 #include "algos/rand.hpp"
 #include <codecvt>
 #include <iostream>
 #include <fmt/xchar.h>
 #include <fstream>
 #include "graphics/palette.hpp"
-#include "game_level.hpp"
+#include "game/level.hpp"
 
 constexpr const int MAP_WIDTH=13;
 constexpr const int MAP_HEIGHT=13;
diff --git a/src/gui/map_view.hpp b/src/gui/map_view.hpp
index 92abe2e..8d64e35 100644
--- a/src/gui/map_view.hpp
+++ b/src/gui/map_view.hpp
@@ -3,8 +3,8 @@
 #include "algos/matrix.hpp"
 #include <guecs/ui.hpp>
 #include <string>
-#include "dinkyecs.hpp"
-#include "map.hpp"
+#include "algos/dinkyecs.hpp"
+#include "game/map.hpp"
 
 namespace gui {
   class MapViewUI {
diff --git a/src/gui/mini_map.cpp b/src/gui/mini_map.cpp
index f08fe2c..2a1663f 100644
--- a/src/gui/mini_map.cpp
+++ b/src/gui/mini_map.cpp
@@ -2,9 +2,9 @@
 #include <functional>
 #include <string>
 #include "dbc.hpp"
-#include "components.hpp"
+#include "game/components.hpp"
 #include "algos/rand.hpp"
-#include "systems.hpp"
+#include "game/systems.hpp"
 #include "algos/rand.hpp"
 #include <codecvt>
 #include <iostream>
diff --git a/src/gui/overlay_ui.cpp b/src/gui/overlay_ui.cpp
index 7178ab8..8d797b0 100644
--- a/src/gui/overlay_ui.cpp
+++ b/src/gui/overlay_ui.cpp
@@ -3,7 +3,7 @@
 #include "constants.hpp"
 #include "events.hpp"
 #include <optional>
-#include "game_level.hpp"
+#include "game/level.hpp"
 
 namespace gui {
   using namespace guecs;
diff --git a/src/gui/ritual_ui.cpp b/src/gui/ritual_ui.cpp
index fb23bf3..8e83efa 100644
--- a/src/gui/ritual_ui.cpp
+++ b/src/gui/ritual_ui.cpp
@@ -1,9 +1,9 @@
 #include "gui/ritual_ui.hpp"
 #include <guecs/ui.hpp>
 #include "algos/rand.hpp"
-#include "sound.hpp"
+#include "game/sound.hpp"
 #include "events.hpp"
-#include "game_level.hpp"
+#include "game/level.hpp"
 
 namespace gui {
   namespace ritual {
diff --git a/src/gui/ritual_ui.hpp b/src/gui/ritual_ui.hpp
index d2e998b..2afcdc3 100644
--- a/src/gui/ritual_ui.hpp
+++ b/src/gui/ritual_ui.hpp
@@ -3,8 +3,8 @@
 #include <deque>
 #include "graphics/textures.hpp"
 #include <guecs/ui.hpp>
-#include "rituals.hpp"
-#include "simplefsm.hpp"
+#include "game/rituals.hpp"
+#include "algos/simplefsm.hpp"
 #include "graphics/animation.hpp"
 
 namespace gui {
diff --git a/src/gui/status_ui.cpp b/src/gui/status_ui.cpp
index 9afdab6..a7befdf 100644
--- a/src/gui/status_ui.cpp
+++ b/src/gui/status_ui.cpp
@@ -1,12 +1,12 @@
 #include "gui/status_ui.hpp"
-#include "components.hpp"
+#include "game/components.hpp"
 #include <guecs/ui.hpp>
 #include "algos/rand.hpp"
 #include <fmt/xchar.h>
 #include "gui/guecstra.hpp"
-#include "systems.hpp"
-#include "inventory.hpp"
-#include "game_level.hpp"
+#include "game/systems.hpp"
+#include "game/inventory.hpp"
+#include "game/level.hpp"
 
 namespace gui {
   using namespace guecs;
diff --git a/src/main.cpp b/src/main.cpp
index e944f07..85fbc27 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,12 +1,12 @@
 #include "gui/fsm.hpp"
 #include "graphics/textures.hpp"
-#include "sound.hpp"
-#include "autowalker.hpp"
+#include "game/sound.hpp"
+#include "game/autowalker.hpp"
 #include "ai/ai.hpp"
 #include <iostream>
 #include "graphics/shaders.hpp"
 #include "gui/backend.hpp"
-#include "game_level.hpp"
+#include "game/level.hpp"
 #include "graphics/camera.hpp"
 
 int main(int argc, char* argv[]) {
diff --git a/src/meson.build b/src/meson.build
index c94ff37..0afa78f 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -33,15 +33,15 @@ sources = files(
   'storyboard/ui.cpp',
 
   # graphics
-  'graphics/textures.cpp',
-  'graphics/palette.cpp',
-  'graphics/shaders.cpp',
-  'graphics/scene.cpp',
   'graphics/animation.cpp',
-  'graphics/lights.cpp',
-  'graphics/raycaster.cpp',
-  'graphics/easing.cpp',
   'graphics/camera.cpp',
+  'graphics/easing.cpp',
+  'graphics/lights.cpp',
+  'graphics/palette.cpp',
+  'graphics/raycaster.cpp',
+  'graphics/scene.cpp',
+  'graphics/shaders.cpp',
+  'graphics/textures.cpp',
 
   # algos
   'algos/matrix.cpp',
@@ -52,16 +52,16 @@ sources = files(
   'algos/stats.cpp',
 
   # game
-  'systems.cpp',
-  'worldbuilder.cpp',
-  'rituals.cpp',
-  'inventory.cpp',
-  'autowalker.cpp',
-  'components.cpp',
-  'game_level.cpp',
-  'config.cpp',
-  'map.cpp',
-  'sound.cpp',
+  'game/worldbuilder.cpp',
+  'game/map.cpp',
+  'game/level.cpp',
+  'game/inventory.cpp',
+  'game/autowalker.cpp',
+  'game/rituals.cpp',
+  'game/sound.cpp',
+  'game/systems.cpp',
+  'game/components.cpp',
+  'game/config.cpp',
 
   # root
   'dbc.cpp',
diff --git a/src/storyboard/ui.cpp b/src/storyboard/ui.cpp
index d11b1ae..9ac3651 100644
--- a/src/storyboard/ui.cpp
+++ b/src/storyboard/ui.cpp
@@ -1,7 +1,7 @@
 #include "storyboard/ui.hpp"
-#include "components.hpp"
-#include "sound.hpp"
-#include "config.hpp"
+#include "game/components.hpp"
+#include "game/sound.hpp"
+#include "game/config.hpp"
 #include <chrono>
 #include <iostream>
 #include <locale>
diff --git a/src/storyboard/ui.hpp b/src/storyboard/ui.hpp
index f434613..4dfec3c 100644
--- a/src/storyboard/ui.hpp
+++ b/src/storyboard/ui.hpp
@@ -3,7 +3,7 @@
 #include <guecs/ui.hpp>
 #include "graphics/camera.hpp"
 #include <SFML/Audio/Sound.hpp>
-#include "components.hpp"
+#include "game/components.hpp"
 
 namespace storyboard {
 
diff --git a/tests/ai.cpp b/tests/ai.cpp
index 1674517..d6b3385 100644
--- a/tests/ai.cpp
+++ b/tests/ai.cpp
@@ -3,7 +3,7 @@
 #include "ai/ai.hpp"
 #include "ai/ai_debug.hpp"
 #include <iostream>
-#include "rituals.hpp"
+#include "game/rituals.hpp"
 
 using namespace dbc;
 using namespace nlohmann;
diff --git a/tests/animation.cpp b/tests/animation.cpp
index 7e8592b..69bf2c3 100644
--- a/tests/animation.cpp
+++ b/tests/animation.cpp
@@ -1,15 +1,15 @@
 #include <catch2/catch_test_macros.hpp>
 #include "graphics/textures.hpp"
-#include "dinkyecs.hpp"
-#include "config.hpp"
+#include "algos/dinkyecs.hpp"
+#include "game/config.hpp"
 #include <iostream>
 #include <memory>
 #include <chrono>
 #include <thread>
 #include "algos/rand.hpp"
 #include "graphics/animation.hpp"
-#include "sound.hpp"
-#include "components.hpp"
+#include "game/sound.hpp"
+#include "game/components.hpp"
 
 using namespace components;
 using namespace textures;
diff --git a/tests/battle.cpp b/tests/battle.cpp
index ef5d8e2..d00409f 100644
--- a/tests/battle.cpp
+++ b/tests/battle.cpp
@@ -1,14 +1,14 @@
 #include <catch2/catch_test_macros.hpp>
 #include <iostream>
 #include <set>
-#include "rituals.hpp"
+#include "game/rituals.hpp"
 #include "combat/battle.hpp"
-#include "simplefsm.hpp"
-#include "dinkyecs.hpp"
+#include "algos/simplefsm.hpp"
+#include "algos/dinkyecs.hpp"
 #include "boss/system.hpp"
 #include "gui/backend.hpp"
-#include "game_level.hpp"
-#include "components.hpp"
+#include "game/level.hpp"
+#include "game/components.hpp"
 #include "ai/ai.hpp"
 #include "graphics/palette.hpp"
 
diff --git a/tests/components.cpp b/tests/components.cpp
index d656dc3..7a38fba 100644
--- a/tests/components.cpp
+++ b/tests/components.cpp
@@ -1,7 +1,7 @@
 #include <catch2/catch_test_macros.hpp>
-#include "components.hpp"
-#include "dinkyecs.hpp"
-#include "config.hpp"
+#include "game/components.hpp"
+#include "algos/dinkyecs.hpp"
+#include "game/config.hpp"
 #include <iostream>
 
 using namespace components;
diff --git a/tests/config.cpp b/tests/config.cpp
index 1ac674e..cb7875f 100644
--- a/tests/config.cpp
+++ b/tests/config.cpp
@@ -1,5 +1,5 @@
 #include <catch2/catch_test_macros.hpp>
-#include "config.hpp"
+#include "game/config.hpp"
 #include <iostream>
 
 TEST_CASE("confirm basic config loader ops", "[config]") {
diff --git a/tests/dinkyecs.cpp b/tests/dinkyecs.cpp
index 7eec0c0..a0fb1fe 100644
--- a/tests/dinkyecs.cpp
+++ b/tests/dinkyecs.cpp
@@ -1,5 +1,5 @@
 #include <catch2/catch_test_macros.hpp>
-#include "dinkyecs.hpp"
+#include "algos/dinkyecs.hpp"
 #include <iostream>
 #include <fmt/core.h>
 
diff --git a/tests/fsm.cpp b/tests/fsm.cpp
index 9fe28ef..e3a1798 100644
--- a/tests/fsm.cpp
+++ b/tests/fsm.cpp
@@ -1,7 +1,7 @@
 #include <catch2/catch_test_macros.hpp>
 #include <fmt/core.h>
 #include <string>
-#include "simplefsm.hpp"
+#include "algos/simplefsm.hpp"
 
 using namespace fmt;
 using std::string;
diff --git a/tests/inventory.cpp b/tests/inventory.cpp
index 8a08fac..ce93daa 100644
--- a/tests/inventory.cpp
+++ b/tests/inventory.cpp
@@ -1,7 +1,7 @@
 #include <catch2/catch_test_macros.hpp>
 #include <fmt/core.h>
 #include <string>
-#include "inventory.hpp"
+#include "game/inventory.hpp"
 
 using namespace fmt;
 
diff --git a/tests/lighting.cpp b/tests/lighting.cpp
index d0f9bed..b8cd308 100644
--- a/tests/lighting.cpp
+++ b/tests/lighting.cpp
@@ -2,10 +2,10 @@
 #include <fmt/core.h>
 #include <nlohmann/json.hpp>
 #include <fstream>
-#include "map.hpp"
-#include "game_level.hpp"
+#include "game/map.hpp"
+#include "game/level.hpp"
 #include "graphics/lights.hpp"
-#include "point.hpp"
+#include "algos/point.hpp"
 
 using namespace lighting;
 
diff --git a/tests/loot.cpp b/tests/loot.cpp
index d37f3e8..6f72bd2 100644
--- a/tests/loot.cpp
+++ b/tests/loot.cpp
@@ -1,8 +1,8 @@
 #include <catch2/catch_test_macros.hpp>
 #include <fmt/core.h>
 #include <string>
-#include "components.hpp"
-#include "dinkyecs.hpp"
+#include "game/components.hpp"
+#include "algos/dinkyecs.hpp"
 
 using namespace fmt;
 using namespace components;
diff --git a/tests/map.cpp b/tests/map.cpp
index 314f658..b77ea3e 100644
--- a/tests/map.cpp
+++ b/tests/map.cpp
@@ -2,9 +2,9 @@
 #include <fmt/core.h>
 #include <nlohmann/json.hpp>
 #include <fstream>
-#include "map.hpp"
-#include "game_level.hpp"
-#include "systems.hpp"
+#include "game/map.hpp"
+#include "game/level.hpp"
+#include "game/systems.hpp"
 #include <cmath>
 #include "graphics/textures.hpp"
 
diff --git a/tests/matrix.cpp b/tests/matrix.cpp
index 0be82a0..3fee78e 100644
--- a/tests/matrix.cpp
+++ b/tests/matrix.cpp
@@ -1,13 +1,13 @@
 #include <catch2/catch_test_macros.hpp>
 #include <fmt/core.h>
 #include <string>
-#include "config.hpp"
+#include "game/config.hpp"
 #include "algos/matrix.hpp"
 #include "algos/rand.hpp"
-#include "game_level.hpp"
+#include "game/level.hpp"
 #include <nlohmann/json.hpp>
 #include <fstream>
-#include "map.hpp"
+#include "game/map.hpp"
 #include <memory>
 #include "graphics/textures.hpp"
 
diff --git a/tests/pathing.cpp b/tests/pathing.cpp
index 9e65c07..1052676 100644
--- a/tests/pathing.cpp
+++ b/tests/pathing.cpp
@@ -5,11 +5,11 @@
 #include "algos/pathing.hpp"
 #include "algos/matrix.hpp"
 #include "ai/ai.hpp"
-#include "game_level.hpp"
+#include "game/level.hpp"
 #include <chrono>
 #include <thread>
 #include "algos/rand.hpp"
-#include "systems.hpp"
+#include "game/systems.hpp"
 
 using namespace fmt;
 using namespace nlohmann;
diff --git a/tests/rituals.cpp b/tests/rituals.cpp
index eb8ccf2..fb59e7f 100644
--- a/tests/rituals.cpp
+++ b/tests/rituals.cpp
@@ -1,7 +1,7 @@
 #include <catch2/catch_test_macros.hpp>
 #include <iostream>
-#include "rituals.hpp"
-#include "simplefsm.hpp"
+#include "game/rituals.hpp"
+#include "algos/simplefsm.hpp"
 
 TEST_CASE("ritual::Engine basic tests", "[rituals]") {
   ritual::Engine re("assets/rituals.json");
diff --git a/tests/save.cpp b/tests/save.cpp
index b887106..3d4eef2 100644
--- a/tests/save.cpp
+++ b/tests/save.cpp
@@ -1,13 +1,13 @@
 #include <catch2/catch_test_macros.hpp>
 #include <fmt/core.h>
 #include <string>
-#include "dinkyecs.hpp"
-#include "components.hpp"
+#include "algos/dinkyecs.hpp"
+#include "game/components.hpp"
 #include "save.hpp"
 #include <optional>
 #include <iostream>
-#include "map.hpp"
-#include "worldbuilder.hpp"
+#include "game/map.hpp"
+#include "game/worldbuilder.hpp"
 #include "tser.hpp"
 
 using namespace fmt;
diff --git a/tests/sound.cpp b/tests/sound.cpp
index 968e650..0d5d13d 100644
--- a/tests/sound.cpp
+++ b/tests/sound.cpp
@@ -1,7 +1,7 @@
 #include <catch2/catch_test_macros.hpp>
 #include <fmt/core.h>
 #include <string>
-#include "sound.hpp"
+#include "game/sound.hpp"
 
 using namespace fmt;
 
diff --git a/tests/spatialmap.cpp b/tests/spatialmap.cpp
index 5702401..1c366a5 100644
--- a/tests/spatialmap.cpp
+++ b/tests/spatialmap.cpp
@@ -2,7 +2,7 @@
 #include <fmt/core.h>
 #include <string>
 #include "algos/spatialmap.hpp"
-#include "dinkyecs.hpp"
+#include "algos/dinkyecs.hpp"
 #include "algos/rand.hpp"
 #include <limits>
 #include <fmt/core.h>
diff --git a/tests/systems.cpp b/tests/systems.cpp
index 1d42126..18c6384 100644
--- a/tests/systems.cpp
+++ b/tests/systems.cpp
@@ -1,6 +1,6 @@
 #include <catch2/catch_test_macros.hpp>
 #include <fmt/core.h>
-#include "systems.hpp"
+#include "game/systems.hpp"
 #include <cmath>
 #include <numbers>
 
diff --git a/tests/textures.cpp b/tests/textures.cpp
index cb38292..d6cec02 100644
--- a/tests/textures.cpp
+++ b/tests/textures.cpp
@@ -3,7 +3,7 @@
 #include <string>
 #include "graphics/textures.hpp"
 #include "constants.hpp"
-#include "components.hpp"
+#include "game/components.hpp"
 
 using namespace fmt;
 
diff --git a/tools/animator.cpp b/tools/animator.cpp
index 3f6e72e..ee337ad 100644
--- a/tools/animator.cpp
+++ b/tools/animator.cpp
@@ -1,5 +1,5 @@
 #define FSM_DEBUG 1
-#include "sound.hpp"
+#include "game/sound.hpp"
 #include "ai/ai.hpp"
 #include <iostream>
 #include "graphics/shaders.hpp"
diff --git a/tools/arena.cpp b/tools/arena.cpp
index 294ef52..7c0cc8f 100644
--- a/tools/arena.cpp
+++ b/tools/arena.cpp
@@ -1,11 +1,11 @@
 #include "graphics/textures.hpp"
-#include "sound.hpp"
-#include "autowalker.hpp"
+#include "game/sound.hpp"
+#include "game/autowalker.hpp"
 #include "ai/ai.hpp"
 #include <iostream>
 #include "graphics/shaders.hpp"
 #include "gui/backend.hpp"
-#include "game_level.hpp"
+#include "game/level.hpp"
 #include "boss/system.hpp"
 #include "events.hpp"
 #include "constants.hpp"
diff --git a/tools/arena_ui.cpp b/tools/arena_ui.cpp
index d419fab..487be90 100644
--- a/tools/arena_ui.cpp
+++ b/tools/arena_ui.cpp
@@ -1,5 +1,5 @@
 #include "arena_ui.hpp"
-#include "sound.hpp"
+#include "game/sound.hpp"
 #include <fmt/xchar.h>
 
 namespace arena {
diff --git a/tools/arena_ui.hpp b/tools/arena_ui.hpp
index ab46cbe..70c39b7 100644
--- a/tools/arena_ui.hpp
+++ b/tools/arena_ui.hpp
@@ -3,7 +3,7 @@
 #include <SFML/Graphics/Font.hpp>
 #include "guecs.hpp"
 #include "graphics/textures.hpp"
-#include "components.hpp"
+#include "game/components.hpp"
 #include <SFML/System/Clock.hpp>
 
 // aspect ratio of art is 3/2 so 1.5
diff --git a/tools/icongen.cpp b/tools/icongen.cpp
index c4161cb..2719fb3 100644
--- a/tools/icongen.cpp
+++ b/tools/icongen.cpp
@@ -3,9 +3,9 @@
 #include <SFML/Graphics.hpp>
 #include <SFML/Graphics/RenderWindow.hpp>
 #include "constants.hpp"
-#include "config.hpp"
+#include "game/config.hpp"
 #include <filesystem>
-#include "shiterator.hpp"
+#include "algos/shiterator.hpp"
 #include <functional>
 #include <iostream>
 #include "graphics/textures.hpp"
diff --git a/tools/storyboard.cpp b/tools/storyboard.cpp
index 0b609bb..4254ab3 100644
--- a/tools/storyboard.cpp
+++ b/tools/storyboard.cpp
@@ -1,6 +1,6 @@
 #include "gui/fsm.hpp"
 #include "graphics/textures.hpp"
-#include "sound.hpp"
+#include "game/sound.hpp"
 #include <iostream>
 #include "graphics/shaders.hpp"
 #include "constants.hpp"