diff --git a/core/include/cubos/core/ecs/event_pipe.hpp b/core/include/cubos/core/ecs/system/event/pipe.hpp
similarity index 98%
rename from core/include/cubos/core/ecs/event_pipe.hpp
rename to core/include/cubos/core/ecs/system/event/pipe.hpp
index 3b5372167b..f0bea9ac1f 100644
--- a/core/include/cubos/core/ecs/event_pipe.hpp
+++ b/core/include/cubos/core/ecs/system/event/pipe.hpp
@@ -1,6 +1,6 @@
 /// @file
 /// @brief Resource @ref cubos::core::ecs::EventPipe.
-/// @ingroup core-ecs
+/// @ingroup core-ecs-system
 
 #pragma once
 
@@ -15,7 +15,7 @@ namespace cubos::core::ecs
     /// @brief Resource which stores events of type @p T.
     /// @note This resource is meant to be used through @ref EventReader and @ref EventWriter.
     /// @tparam T Event type.
-    /// @ingroup core-ecs
+    /// @ingroup core-ecs-system
     template <typename T>
     class EventPipe
     {
diff --git a/core/include/cubos/core/ecs/event_reader.hpp b/core/include/cubos/core/ecs/system/event/reader.hpp
similarity index 97%
rename from core/include/cubos/core/ecs/event_reader.hpp
rename to core/include/cubos/core/ecs/system/event/reader.hpp
index 7421240852..c4a2ae41cd 100644
--- a/core/include/cubos/core/ecs/event_reader.hpp
+++ b/core/include/cubos/core/ecs/system/event/reader.hpp
@@ -1,12 +1,12 @@
 /// @file
 /// @brief Class @ref cubos::core::ecs::EventReader.
-/// @ingroup core-ecs
+/// @ingroup core-ecs-system
 
 #pragma once
 
 #include <optional>
 
-#include <cubos/core/ecs/event_pipe.hpp>
+#include <cubos/core/ecs/system/event/pipe.hpp>
 
 namespace cubos::core::ecs
 {
@@ -18,7 +18,7 @@ namespace cubos::core::ecs
     /// @see Systems can send events using @ref EventWriter.
     /// @tparam T Event.
     /// @tparam M Filter mask.
-    /// @ingroup core-ecs
+    /// @ingroup core-ecs-system
     template <typename T, unsigned int M = DEFAULT_FILTER_MASK>
     class EventReader
     {
diff --git a/core/include/cubos/core/ecs/event_writer.hpp b/core/include/cubos/core/ecs/system/event/writer.hpp
similarity index 90%
rename from core/include/cubos/core/ecs/event_writer.hpp
rename to core/include/cubos/core/ecs/system/event/writer.hpp
index 16149f5362..6dd99b8994 100644
--- a/core/include/cubos/core/ecs/event_writer.hpp
+++ b/core/include/cubos/core/ecs/system/event/writer.hpp
@@ -1,10 +1,10 @@
 /// @file
 /// @brief Class @ref cubos::core::ecs::EventWriter.
-/// @ingroup core-ecs
+/// @ingroup core-ecs-system
 
 #pragma once
 
-#include <cubos/core/ecs/event_pipe.hpp>
+#include <cubos/core/ecs/system/event/pipe.hpp>
 
 namespace cubos::core::ecs
 {
@@ -12,7 +12,7 @@ namespace cubos::core::ecs
     /// systems.
     /// @see Systems can read sent events using @ref EventReader.
     /// @tparam T
-    /// @ingroup core-ecs
+    /// @ingroup core-ecs-system
     template <typename T>
     class EventWriter
     {
diff --git a/core/include/cubos/core/ecs/system/module.dox b/core/include/cubos/core/ecs/system/module.dox
index a98ece4bc3..cd19b593c8 100644
--- a/core/include/cubos/core/ecs/system/module.dox
+++ b/core/include/cubos/core/ecs/system/module.dox
@@ -1,6 +1,9 @@
 /// @dir
 /// @brief @ref core-ecs-system directory.
 
+/// @dir event
+/// @brief Event system arguments directory.
+
 namespace cubos::core::ecs
 {
     /// @defgroup core-ecs-system System
diff --git a/core/include/cubos/core/ecs/system/system.hpp b/core/include/cubos/core/ecs/system/system.hpp
index b153e16f3c..5def106242 100644
--- a/core/include/cubos/core/ecs/system/system.hpp
+++ b/core/include/cubos/core/ecs/system/system.hpp
@@ -12,10 +12,10 @@
 #include <typeindex>
 #include <unordered_set>
 
-#include <cubos/core/ecs/event_reader.hpp>
-#include <cubos/core/ecs/event_writer.hpp>
 #include <cubos/core/ecs/system/accessors.hpp>
 #include <cubos/core/ecs/system/commands.hpp>
+#include <cubos/core/ecs/system/event/reader.hpp>
+#include <cubos/core/ecs/system/event/writer.hpp>
 #include <cubos/core/ecs/system/query.hpp>
 #include <cubos/core/ecs/world.hpp>
 
diff --git a/core/samples/ecs/events/main.cpp b/core/samples/ecs/events/main.cpp
index d31f2c88e6..a4c7f13ad6 100644
--- a/core/samples/ecs/events/main.cpp
+++ b/core/samples/ecs/events/main.cpp
@@ -1,6 +1,6 @@
-#include <cubos/core/ecs/event_pipe.hpp>
-#include <cubos/core/ecs/event_reader.hpp>
-#include <cubos/core/ecs/event_writer.hpp>
+#include <cubos/core/ecs/system/event/pipe.hpp>
+#include <cubos/core/ecs/system/event/reader.hpp>
+#include <cubos/core/ecs/system/event/writer.hpp>
 #include <cubos/core/log.hpp>
 #include <cubos/core/memory/stream.hpp>
 
diff --git a/engine/include/cubos/engine/cubos.hpp b/engine/include/cubos/engine/cubos.hpp
index 8e18ac13cf..8795511fb7 100644
--- a/engine/include/cubos/engine/cubos.hpp
+++ b/engine/include/cubos/engine/cubos.hpp
@@ -7,8 +7,8 @@
 #include <set>
 #include <string>
 
-#include <cubos/core/ecs/event_pipe.hpp>
 #include <cubos/core/ecs/system/dispatcher.hpp>
+#include <cubos/core/ecs/system/event/pipe.hpp>
 #include <cubos/core/ecs/system/system.hpp>
 #include <cubos/core/ecs/world.hpp>
 
diff --git a/engine/samples/events/main.cpp b/engine/samples/events/main.cpp
index ad28ea83db..fc34b35545 100644
--- a/engine/samples/events/main.cpp
+++ b/engine/samples/events/main.cpp
@@ -1,5 +1,5 @@
-#include <cubos/core/ecs/event_reader.hpp>
-#include <cubos/core/ecs/event_writer.hpp>
+#include <cubos/core/ecs/system/event/reader.hpp>
+#include <cubos/core/ecs/system/event/writer.hpp>
 
 #include <cubos/engine/cubos.hpp>