Restructuring

CMakeLists.txt

@@ -12,8 +12,8 @@ include(GNUInstallDirs)
 
 include_directories(headers)
 add_library(${PROJECT_NAME} SHARED
-            "source/ECS/Component.cpp"
+            "source/Systems/ECS/Component.cpp"
-            "source/ECS/World.cpp"
+            "source/Systems/ECS/World.cpp"
             "source/Systems/Logging.cpp"
             "source/Systems/Random.cpp"
             "source/Types/UUID.cpp")

headers/Systems/ECS.hpp

@@ -15,10 +15,10 @@
 #include <unordered_map>
 #include <utility>
 
-#include "Systems/Logging.hpp"
+#include "../Types.hpp"
-#include "Types.hpp"
+#include "Logging.hpp"
 
-namespace Tourmaline::ECS {
+namespace Tourmaline::Systems::ECS {
 using Entity = Tourmaline::Type::UUID;
 class World;
 
@@ -142,5 +142,5 @@ private:
                     Tourmaline::Systems::Logging::LogLevel severity =
                         Systems::Logging::LogLevel::Warning);
 };
-} // namespace Tourmaline::ECS
+} // namespace Tourmaline::Systems::ECS
 #endif

source/Systems/ECS/Component.cpp

@@ -7,8 +7,8 @@
  * obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "../../headers/ECS.hpp"
+#include "../../../headers/Systems/ECS.hpp"
 
-using namespace Tourmaline::ECS;
+using namespace Tourmaline::Systems::ECS;
 
 const Entity &BaseComponent::GetOwner() { return *this->owner; }

source/Systems/ECS/World.cpp

@@ -7,10 +7,10 @@
  * obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "../../headers/ECS.hpp"
+#include "../../../headers/Systems/ECS.hpp"
-#include "../../headers/Systems/Random.hpp"
+#include "../../../headers/Systems/Random.hpp"
 
-using namespace Tourmaline::ECS;
+using namespace Tourmaline::Systems::ECS;
 
 Entity World::CreateEntity() {
   auto [iterator, success] =