13 files changed, 43 insertions, 43 deletions
diff --git a/sim/src/BaseBattle.cpp b/sim/src/BaseBattle.cpp
index 33e0957..3b56b0a 100644
--- a/sim/src/BaseBattle.cpp
+++ b/sim/src/BaseBattle.cpp
@@ -6,9 +6,9 @@
 #include <entt/entity/registry.hpp>
 #include <entt/signal/dispatcher.hpp>
 
-#include <kurator/battles/components.h>
-#include <kurator/battles/events.h>
-#include <kurator/battles/Scenario.h>
+#include <kurator/sim/components.h>
+#include <kurator/sim/events.h>
+#include <kurator/sim/Scenario.h>
 #include <kurator/universe.h>
 
 #include "Builder.h"
@@ -16,7 +16,7 @@
 
 namespace kurator
 {
-namespace battles
+namespace sim
 {
 
 
@@ -158,5 +158,5 @@ BaseBattle::kill_off_dead()
 }
 
 
-}  // namespace battles
+}  // namespace sim
 }  // namespace kurator
diff --git a/sim/src/BaseBattle.h b/sim/src/BaseBattle.h
index 8240fd2..13d7457 100644
--- a/sim/src/BaseBattle.h
+++ b/sim/src/BaseBattle.h
@@ -3,8 +3,8 @@
 #include <entt/entity/registry.hpp>
 #include <entt/signal/dispatcher.hpp>
 
-#include <kurator/battles/Battle.h>
-#include <kurator/battles/Scenario.h>
+#include <kurator/sim/Battle.h>
+#include <kurator/sim/Scenario.h>
 
 #include "RandomSpawner.h"
 #include "TeamManager.h"
@@ -12,7 +12,7 @@
 
 namespace kurator
 {
-namespace battles
+namespace sim
 {
 
 
@@ -36,5 +36,5 @@ private:
 };
 
 
-}  // namespace battles
+}  // namespace sim
 }  // namespace kurator
diff --git a/sim/src/Battle.cpp b/sim/src/Battle.cpp
index f44a88e..f8eacb5 100644
--- a/sim/src/Battle.cpp
+++ b/sim/src/Battle.cpp
@@ -1,15 +1,15 @@
-#include <kurator/battles/Battle.h>
+#include <kurator/sim/Battle.h>
 
 #include <memory>
 
-#include <kurator/battles/Scenario.h>
+#include <kurator/sim/Scenario.h>
 
 #include "BaseBattle.h"
 
 
 namespace kurator
 {
-namespace battles
+namespace sim
 {
 
 
@@ -20,5 +20,5 @@ prepare(const Scenario& scenario)
 }
 
 
-}  // namespace battles
+}  // namespace sim
 }  // namespace kurator
diff --git a/sim/src/Builder.cpp b/sim/src/Builder.cpp
index d7cc893..dd10326 100644
--- a/sim/src/Builder.cpp
+++ b/sim/src/Builder.cpp
@@ -2,8 +2,8 @@
 
 #include <entt/entity/registry.hpp>
 
-#include <kurator/battles/components.h>
-#include <kurator/battles/Point.h>
+#include <kurator/sim/components.h>
+#include <kurator/sim/Point.h>
 #include <kurator/universe/ShipType.h>
 #include <kurator/universe/TurretType.h>
 
@@ -12,7 +12,7 @@
 
 namespace kurator
 {
-namespace battles
+namespace sim
 {
 
 
@@ -53,5 +53,5 @@ Builder::operator()(const universe::TurretType& turret_type, const entt::entity&
 }
 
 
-}  // namespace battles
+}  // namespace sim
 }  // namespace kurator
diff --git a/sim/src/Builder.h b/sim/src/Builder.h
index df50c4e..31c7120 100644
--- a/sim/src/Builder.h
+++ b/sim/src/Builder.h
@@ -10,7 +10,7 @@
 
 namespace kurator
 {
-namespace battles
+namespace sim
 {
 
 
@@ -31,5 +31,5 @@ private:
 };
 
 
-}  // namespace battles
+}  // namespace sim
 }  // namespace kurator
diff --git a/sim/src/Point.cpp b/sim/src/Point.cpp
index 31aecae..1f49774 100644
--- a/sim/src/Point.cpp
+++ b/sim/src/Point.cpp
@@ -1,11 +1,11 @@
-#include <kurator/battles/Point.h>
+#include <kurator/sim/Point.h>
 
 #include <cmath>
 
 
 namespace kurator
 {
-namespace battles
+namespace sim
 {
 
 
@@ -68,5 +68,5 @@ Point::operator+(const Point& other) const
 }
 
 
-}  // namespace battles
+}  // namespace sim
 }  // namespace kurator
diff --git a/sim/src/RandomSpawner.cpp b/sim/src/RandomSpawner.cpp
index b85d140..8c401b2 100644
--- a/sim/src/RandomSpawner.cpp
+++ b/sim/src/RandomSpawner.cpp
@@ -2,13 +2,13 @@
 
 #include <cmath>
 
-#include <kurator/battles/components.h>
-#include <kurator/battles/Point.h>
+#include <kurator/sim/components.h>
+#include <kurator/sim/Point.h>
 
 
 namespace kurator
 {
-namespace battles
+namespace sim
 {
 
 
@@ -38,5 +38,5 @@ RandomSpawner::get(const int team)
 }
 
 
-}  // namespace battles
+}  // namespace sim
 }  // namespace kurator
diff --git a/sim/src/RandomSpawner.h b/sim/src/RandomSpawner.h
index 1ef2f20..d34e1ba 100644
--- a/sim/src/RandomSpawner.h
+++ b/sim/src/RandomSpawner.h
@@ -2,14 +2,14 @@
 
 #include <random>
 
-#include <kurator/battles/components.h>
+#include <kurator/sim/components.h>
 
 #include "Spawner.h"
 
 
 namespace kurator
 {
-namespace battles
+namespace sim
 {
 
 
@@ -26,5 +26,5 @@ private:
 };
 
 
-}  // namespace battles
+}  // namespace sim
 }  // namespace kurator
diff --git a/sim/src/Scenario.cpp b/sim/src/Scenario.cpp
index 49a9c7c..49201c3 100644
--- a/sim/src/Scenario.cpp
+++ b/sim/src/Scenario.cpp
@@ -1,9 +1,9 @@
-#include <kurator/battles/Scenario.h>
+#include <kurator/sim/Scenario.h>
 
 
 namespace kurator
 {
-namespace battles
+namespace sim
 {
 
 
@@ -19,5 +19,5 @@ Scenario::total_teams() const
 }
 
 
-}  // namespace battles
+}  // namespace sim
 }  // namespace kurator
diff --git a/sim/src/Spawner.h b/sim/src/Spawner.h
index ebae699..ae3f2fd 100644
--- a/sim/src/Spawner.h
+++ b/sim/src/Spawner.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include <kurator/battles/components.h>
+#include <kurator/sim/components.h>
 
 
 namespace kurator
 {
-namespace battles
+namespace sim
 {
 
 
@@ -17,5 +17,5 @@ public:
 };
 
 
-}  // namespace battles
+}  // namespace sim
 }  // namespace kurator
diff --git a/sim/src/TeamManager.cpp b/sim/src/TeamManager.cpp
index 9dc90e3..2dc3196 100644
--- a/sim/src/TeamManager.cpp
+++ b/sim/src/TeamManager.cpp
@@ -10,7 +10,7 @@
 
 namespace kurator
 {
-namespace battles
+namespace sim
 {
 
 
@@ -58,5 +58,5 @@ TeamManager::clear(entt::registry& registry)
 }
 
 
-}  // namespace battles
+}  // namespace sim
 }  // namespace kurator
diff --git a/sim/src/TeamManager.h b/sim/src/TeamManager.h
index 384d9ee..abc6d23 100644
--- a/sim/src/TeamManager.h
+++ b/sim/src/TeamManager.h
@@ -8,7 +8,7 @@
 
 namespace kurator
 {
-namespace battles
+namespace sim
 {
 
 
@@ -27,5 +27,5 @@ private:
 };
 
 
-}  // namespace battles
+}  // namespace sim
 }  // namespace kurator
diff --git a/sim/src/scenarios.cpp b/sim/src/scenarios.cpp
index 34b4a24..65588bf 100644
--- a/sim/src/scenarios.cpp
+++ b/sim/src/scenarios.cpp
@@ -1,11 +1,11 @@
-#include <kurator/battles/scenarios.h>
+#include <kurator/sim/scenarios.h>
 
-#include <kurator/battles/Scenario.h>
+#include <kurator/sim/Scenario.h>
 
 
 namespace kurator
 {
-namespace battles
+namespace sim
 {
 namespace scenarios
 {
@@ -39,5 +39,5 @@ example()
 
 
 }  // namespace scenarios
-}  // namespace battles
+}  // namespace sim
 }  // namespace kurator