diff --git a/include/Game/Events/ESpawnerSpawn.h b/include/Engine/Core/ESpawnerSpawn.h
similarity index 100%
rename from include/Game/Events/ESpawnerSpawn.h
rename to include/Engine/Core/ESpawnerSpawn.h
diff --git a/include/Engine/Core/RespawnSystem.h b/include/Engine/Core/RespawnSystem.h
new file mode 100644
index 00000000..e69de29b
diff --git a/include/Game/Systems/SpawnerSystem.h b/include/Engine/Core/SpawnerSystem.h
similarity index 96%
rename from include/Game/Systems/SpawnerSystem.h
rename to include/Engine/Core/SpawnerSystem.h
index f36f7259..3583efb3 100644
--- a/include/Game/Systems/SpawnerSystem.h
+++ b/include/Engine/Core/SpawnerSystem.h
@@ -5,7 +5,7 @@
 #include "Common.h"
 #include "GLM.h"
 #include "Core/System.h"
-#include "Events/ESpawnerSpawn.h"
+#include "Core/ESpawnerSpawn.h"
 #include "Core/Transform.h"
 #include "Core/EntityFile.h"
 
diff --git a/include/Engine/Editor/EditorGUI.h b/include/Engine/Editor/EditorGUI.h
index 807bfc8b..f33e33ff 100644
--- a/include/Engine/Editor/EditorGUI.h
+++ b/include/Engine/Editor/EditorGUI.h
@@ -22,7 +22,7 @@
 #include "../Core/ELockMouse.h"
 #include "../Core/EFileDropped.h"
 #include "../Rendering/Texture.h"
-#include "Game/Events/ESpawnerSpawn.h"
+#include "../Core/ESpawnerSpawn.h"
 
 class EditorGUI
 {
diff --git a/include/Game/Systems/MainMenuSystem.h b/include/Game/Systems/MainMenuSystem.h
index ddefcbf4..7948d830 100644
--- a/include/Game/Systems/MainMenuSystem.h
+++ b/include/Game/Systems/MainMenuSystem.h
@@ -5,7 +5,7 @@
 #include "Rendering/IRenderer.h"
 #include "Core/ResourceManager.h"
 #include "Core/Event.h"
-#include "Systems/SpawnerSystem.h"
+#include "Core/SpawnerSystem.h"
 
 
 #include "GUI/EButtonClicked.h"
diff --git a/include/Game/Systems/PlayerSpawnSystem.h b/include/Game/Systems/PlayerSpawnSystem.h
index f74032f7..c4840dec 100644
--- a/include/Game/Systems/PlayerSpawnSystem.h
+++ b/include/Game/Systems/PlayerSpawnSystem.h
@@ -1,7 +1,7 @@
 #include "Core/System.h"
 #include "Input/EInputCommand.h"
-#include "Systems/SpawnerSystem.h"
-#include "Events/ESpawnerSpawn.h"
+#include "Core/SpawnerSystem.h"
+#include "Core/ESpawnerSpawn.h"
 #include "Core/EPlayerSpawned.h"
 #include "Core/EPlayerDeath.h"
 #include "Rendering/ESetCamera.h"
diff --git a/include/Game/Systems/ServerListSystem.h b/include/Game/Systems/ServerListSystem.h
index 014c8881..bb1ad539 100644
--- a/include/Game/Systems/ServerListSystem.h
+++ b/include/Game/Systems/ServerListSystem.h
@@ -5,7 +5,7 @@
 #include "Rendering/IRenderer.h"
 #include "Core/ResourceManager.h"
 #include "Core/Event.h"
-#include "Systems/SpawnerSystem.h"
+#include "Core/SpawnerSystem.h"
 #include "Core/EventBroker.h"
 
 #include "Network/ESearchForServers.h"
diff --git a/include/Game/Systems/Weapon/WeaponBehaviour.h b/include/Game/Systems/Weapon/WeaponBehaviour.h
index cd067f36..801da3f7 100644
--- a/include/Game/Systems/Weapon/WeaponBehaviour.h
+++ b/include/Game/Systems/Weapon/WeaponBehaviour.h
@@ -6,7 +6,7 @@
 #include "Core/Octree.h"
 #include "Collision/EntityAABB.h"
 #include "Input/EInputCommand.h"
-#include "Systems/SpawnerSystem.h"
+#include "Core/SpawnerSystem.h"
 #include "Rendering/ESetCamera.h"
 #include "Core/ConfigFile.h"
 #include "Rendering/EAutoAnimationBlend.h"
diff --git a/src/Game/Systems/SpawnerSystem.cpp b/src/Engine/Core/SpawnerSystem.cpp
similarity index 99%
rename from src/Game/Systems/SpawnerSystem.cpp
rename to src/Engine/Core/SpawnerSystem.cpp
index 282c958b..78a6da12 100644
--- a/src/Game/Systems/SpawnerSystem.cpp
+++ b/src/Engine/Core/SpawnerSystem.cpp
@@ -1,4 +1,4 @@
-#include "Systems/SpawnerSystem.h"
+#include "Core/SpawnerSystem.h"
 #include "Collision/Collision.h"
 
 SpawnerSystem::SpawnerSystem(SystemParams params)
diff --git a/src/Game/Game.cpp b/src/Game/Game.cpp
index 7b80727e..d30023bf 100644
--- a/src/Game/Game.cpp
+++ b/src/Game/Game.cpp
@@ -7,7 +7,7 @@
 #include "Systems/RaptorCopterSystem.h"
 #include "Systems/HealthSystem.h"
 #include "Systems/PlayerMovementSystem.h"
-#include "Systems/SpawnerSystem.h"
+#include "Core/SpawnerSystem.h"
 #include "Systems/PlayerSpawnSystem.h"
 #include "Systems/PlayerDeathSystem.h"
 #include "Systems/FloatingEffectSystem.h"