diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index f90140098..3c55e30e8 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -73,13 +73,13 @@ set(CUBOS_CORE_SOURCE
     "src/cubos/core/ecs/entity/entity.cpp"
     "src/cubos/core/ecs/entity/hash.cpp"
     "src/cubos/core/ecs/entity/manager.cpp"
+    "src/cubos/core/ecs/component/registry.cpp"
     "src/cubos/core/ecs/component/manager.cpp"
     "src/cubos/core/ecs/commands.cpp"
     "src/cubos/core/ecs/blueprint.cpp"
     "src/cubos/core/ecs/world.cpp"
     "src/cubos/core/ecs/system.cpp"
     "src/cubos/core/ecs/dispatcher.cpp"
-    "src/cubos/core/ecs/registry.cpp"
 )
 
 # Create core library
diff --git a/core/include/cubos/core/ecs/registry.hpp b/core/include/cubos/core/ecs/component/registry.hpp
similarity index 98%
rename from core/include/cubos/core/ecs/registry.hpp
rename to core/include/cubos/core/ecs/component/registry.hpp
index 6337e4a13..d485d963c 100644
--- a/core/include/cubos/core/ecs/registry.hpp
+++ b/core/include/cubos/core/ecs/component/registry.hpp
@@ -1,6 +1,6 @@
 /// @file
 /// @brief Class @ref cubos::core::ecs::Registry and registration macro.
-/// @ingroup core-ecs
+/// @ingroup core-ecs-component
 
 #pragma once
 
@@ -17,7 +17,7 @@ namespace cubos::core::ecs
     /// It stores information regarding the components so that they can be handled in a type-erased
     /// manner.
     ///
-    /// @ingroup core-ecs
+    /// @ingroup core-ecs-component
     class Registry final
     {
     public:
@@ -119,7 +119,7 @@ namespace cubos::core::ecs
 /// @warning Care must be taken to ensure that this macro is included from at least one translation
 /// unit (think of it as a .cpp file) in the executable, otherwise the component type may not be
 /// registered. E.g.: keeping it hidden in a .cpp file on a library may not work.
-/// @ingroup core-ecs
+/// @ingroup core-ecs-component
 #define CUBOS_REGISTER_COMPONENT(type, storageType, name)                                                              \
     namespace cubos::core::ecs::impl                                                                                   \
     {                                                                                                                  \
diff --git a/core/samples/ecs/general/main.cpp b/core/samples/ecs/general/main.cpp
index ba219dba2..16b0ad765 100644
--- a/core/samples/ecs/general/main.cpp
+++ b/core/samples/ecs/general/main.cpp
@@ -2,10 +2,10 @@
 
 #include <cubos/core/ecs/blueprint.hpp>
 #include <cubos/core/ecs/commands.hpp>
+#include <cubos/core/ecs/component/registry.hpp>
 #include <cubos/core/ecs/dispatcher.hpp>
 #include <cubos/core/ecs/map_storage.hpp>
 #include <cubos/core/ecs/null_storage.hpp>
-#include <cubos/core/ecs/registry.hpp>
 #include <cubos/core/ecs/system.hpp>
 #include <cubos/core/ecs/vec_storage.hpp>
 #include <cubos/core/ecs/world.hpp>
diff --git a/core/src/cubos/core/ecs/blueprint.cpp b/core/src/cubos/core/ecs/blueprint.cpp
index ba52253ec..be0df4f7e 100644
--- a/core/src/cubos/core/ecs/blueprint.cpp
+++ b/core/src/cubos/core/ecs/blueprint.cpp
@@ -1,5 +1,5 @@
 #include <cubos/core/ecs/blueprint.hpp>
-#include <cubos/core/ecs/registry.hpp>
+#include <cubos/core/ecs/component/registry.hpp>
 
 using namespace cubos::core::ecs;
 
diff --git a/core/src/cubos/core/ecs/component/manager.cpp b/core/src/cubos/core/ecs/component/manager.cpp
index 9af66e90c..565ca3206 100644
--- a/core/src/cubos/core/ecs/component/manager.cpp
+++ b/core/src/cubos/core/ecs/component/manager.cpp
@@ -1,5 +1,5 @@
 #include <cubos/core/ecs/component/manager.hpp>
-#include <cubos/core/ecs/registry.hpp>
+#include <cubos/core/ecs/component/registry.hpp>
 
 using namespace cubos::core;
 using namespace cubos::core::ecs;
diff --git a/core/src/cubos/core/ecs/registry.cpp b/core/src/cubos/core/ecs/component/registry.cpp
similarity index 96%
rename from core/src/cubos/core/ecs/registry.cpp
rename to core/src/cubos/core/ecs/component/registry.cpp
index ca7cefd0e..002a2209f 100644
--- a/core/src/cubos/core/ecs/registry.cpp
+++ b/core/src/cubos/core/ecs/component/registry.cpp
@@ -1,4 +1,4 @@
-#include <cubos/core/ecs/registry.hpp>
+#include <cubos/core/ecs/component/registry.hpp>
 
 using namespace cubos::core;
 using namespace cubos::core::ecs;
diff --git a/core/src/cubos/core/ecs/world.cpp b/core/src/cubos/core/ecs/world.cpp
index 23fbd5e07..4abc2a03f 100644
--- a/core/src/cubos/core/ecs/world.cpp
+++ b/core/src/cubos/core/ecs/world.cpp
@@ -1,4 +1,4 @@
-#include <cubos/core/ecs/registry.hpp>
+#include <cubos/core/ecs/component/registry.hpp>
 #include <cubos/core/ecs/world.hpp>
 
 using namespace cubos::core;
diff --git a/core/tests/ecs/registry.cpp b/core/tests/ecs/registry.cpp
index 3a2a82501..16e6b045e 100644
--- a/core/tests/ecs/registry.cpp
+++ b/core/tests/ecs/registry.cpp
@@ -1,6 +1,6 @@
 #include <doctest/doctest.h>
 
-#include <cubos/core/ecs/registry.hpp>
+#include <cubos/core/ecs/component/registry.hpp>
 #include <cubos/core/ecs/vec_storage.hpp>
 
 #include "utils.hpp"
diff --git a/tools/quadrados-gen/src/main.cpp b/tools/quadrados-gen/src/main.cpp
index fbf3f6416..f7de4467b 100644
--- a/tools/quadrados-gen/src/main.cpp
+++ b/tools/quadrados-gen/src/main.cpp
@@ -791,7 +791,7 @@ static bool generate(const GenerateOptions& options)
     file << "/// This file was generated by quadrados-gen." << std::endl;
     file << "/// Do not edit this file." << std::endl;
     file << std::endl;
-    file << "#include <cubos/core/ecs/registry.hpp>" << std::endl;
+    file << "#include <cubos/core/ecs/component/registry.hpp>" << std::endl;
     file << "#include <cubos/core/ecs/vec_storage.hpp>" << std::endl;
     file << "#include <cubos/core/ecs/map_storage.hpp>" << std::endl;
     file << "#include <cubos/core/ecs/null_storage.hpp>" << std::endl;