Final move of files to a better place. Only thing in the root is very common stuff.

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;

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;

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"
 

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;

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]") {

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>
 

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;

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;
 

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;
 

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;

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"
 

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"
 

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;

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");

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;

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;
 

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>

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>
 

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;