diff --git a/include/Engine/Core/EAmmoPickup.h b/include/Engine/Core/EAmmoPickup.h
deleted file mode 100644
index 6d854d48..00000000
--- a/include/Engine/Core/EAmmoPickup.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef EAmmoPickup_h__
-#define EAmmoPickup_h__
-
-#include "EventBroker.h"
-#include "../Core/EntityWrapper.h"
-
-namespace Events
-{
-
-    struct AmmoPickup : Event
-    {
-        EntityWrapper Player;
-        int AmmoGain;
-    };
-
-}
-
-#endif
\ No newline at end of file
diff --git a/include/Engine/Core/EPlayerHealthPickup.h b/include/Engine/Core/EPlayerHealthPickup.h
deleted file mode 100644
index 7d44e544..00000000
--- a/include/Engine/Core/EPlayerHealthPickup.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef EPlayerHealthPickup_h__
-#define EPlayerHealthPickup_h__
-
-#include "EventBroker.h"
-#include "../Core/EntityWrapper.h"
-
-namespace Events
-{
-
-    struct PlayerHealthPickup : Event
-    {
-        EntityWrapper Player;
-        double HealthAmount;
-    };
-
-}
-
-#endif
\ No newline at end of file
diff --git a/include/Game/Events/EAmmoPickup.h b/include/Game/Events/EAmmoPickup.h
new file mode 100644
index 00000000..fe0d3538
--- /dev/null
+++ b/include/Game/Events/EAmmoPickup.h
@@ -0,0 +1,18 @@
+#ifndef EAmmoPickup_h__
+#define EAmmoPickup_h__
+
+#include "Core/EventBroker.h"
+#include "Core/EntityWrapper.h"
+
+namespace Events
+{
+
+struct AmmoPickup : Event
+{
+    EntityWrapper Player;
+    int AmmoGain;
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/include/Engine/Core/ECaptured.h b/include/Game/Events/ECaptured.h
similarity index 57%
rename from include/Engine/Core/ECaptured.h
rename to include/Game/Events/ECaptured.h
index d891c7b0..70018eae 100644
--- a/include/Engine/Core/ECaptured.h
+++ b/include/Game/Events/ECaptured.h
@@ -1,14 +1,13 @@
 #ifndef ECaptured_h__
 #define ECaptured_h__
 
-#include "EventBroker.h"
-#include "../Core/Entity.h"
-#include "Engine/GLM.h"
+#include "Core/EventBroker.h"
+#include "Core/Entity.h"
 
 namespace Events
 {
 
-    //triggers when a capturePoint has been taken over
+//triggers when a capturePoint has been taken over
 struct Captured : Event
 {
     int TeamNumberThatCapturedCapturePoint;
diff --git a/include/Engine/Core/EPickupSpawned.h b/include/Game/Events/EPickupSpawned.h
similarity index 100%
rename from include/Engine/Core/EPickupSpawned.h
rename to include/Game/Events/EPickupSpawned.h
diff --git a/include/Game/Events/EPlayerHealthPickup.h b/include/Game/Events/EPlayerHealthPickup.h
new file mode 100644
index 00000000..0c644712
--- /dev/null
+++ b/include/Game/Events/EPlayerHealthPickup.h
@@ -0,0 +1,18 @@
+#ifndef EPlayerHealthPickup_h__
+#define EPlayerHealthPickup_h__
+
+#include "Core/EventBroker.h"
+#include "Core/EntityWrapper.h"
+
+namespace Events
+{
+
+struct PlayerHealthPickup : Event
+{
+    EntityWrapper Player;
+    double HealthAmount;
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/include/Engine/Core/EWin.h b/include/Game/Events/EWin.h
similarity index 50%
rename from include/Engine/Core/EWin.h
rename to include/Game/Events/EWin.h
index a2e96139..160b39c1 100644
--- a/include/Engine/Core/EWin.h
+++ b/include/Game/Events/EWin.h
@@ -1,14 +1,13 @@
 #ifndef EWin_h__
 #define EWin_h__
 
-#include "EventBroker.h"
-#include "../Core/Entity.h"
-#include "Engine/GLM.h"
+#include "Core/EventBroker.h"
+#include "Core/Entity.h"
 
 namespace Events
 {
 
-    //triggers when a team has captured all capturePoints
+//triggers when a team has captured all capturePoints
 struct Win : Event
 {
     //can be 0 = none, 1,2
diff --git a/include/Game/Systems/AmmoPickupSystem.h b/include/Game/Systems/AmmoPickupSystem.h
index a54b8495..053e1b9f 100644
--- a/include/Game/Systems/AmmoPickupSystem.h
+++ b/include/Game/Systems/AmmoPickupSystem.h
@@ -5,8 +5,8 @@
 #include "Core/Transform.h"
 #include "Core/ResourceManager.h"
 #include "Core/EntityFileParser.h"
-#include "Core/EPickupSpawned.h"
-#include "Core/EAmmoPickup.h"
+#include "Events/EPickupSpawned.h"
+#include "Events/EAmmoPickup.h"
 #include "Engine/Collision/ETrigger.h"
 #include "Common.h"
 
diff --git a/include/Game/Systems/CapturePointSystem.h b/include/Game/Systems/CapturePointSystem.h
index 34a23e14..2c24b383 100644
--- a/include/Game/Systems/CapturePointSystem.h
+++ b/include/Game/Systems/CapturePointSystem.h
@@ -7,8 +7,8 @@
 #include "Common.h"
 #include "Core/System.h"
 #include "Engine/Collision/ETrigger.h"
-#include "Core/ECaptured.h"
-#include "Core/EWin.h"
+#include "Events/ECaptured.h"
+#include "Events/EWin.h"
 
 #include <tuple>
 #include <vector>
diff --git a/include/Game/Systems/HealthSystem.h b/include/Game/Systems/HealthSystem.h
index 962e3737..0b6616c7 100644
--- a/include/Game/Systems/HealthSystem.h
+++ b/include/Game/Systems/HealthSystem.h
@@ -7,8 +7,8 @@
 #include "Common.h"
 #include "Core/System.h"
 #include "Core/EPlayerDamage.h"
-#include "Core/EPlayerHealthPickup.h"
 #include "Core/EPlayerDeath.h"
+#include "Events/EPlayerHealthPickup.h"
 #include "Core/ConfigFile.h"
 #include "Input/EInputCommand.h"
 
diff --git a/include/Game/Systems/PickupSpawnSystem.h b/include/Game/Systems/PickupSpawnSystem.h
index f912e8ff..895bbcb5 100644
--- a/include/Game/Systems/PickupSpawnSystem.h
+++ b/include/Game/Systems/PickupSpawnSystem.h
@@ -5,8 +5,8 @@
 #include "Core/Transform.h"
 #include "Core/ResourceManager.h"
 #include "Core/EntityFileParser.h"
-#include "Core/EPickupSpawned.h"
-#include "Core/EPlayerHealthPickup.h"
+#include "Events/EPickupSpawned.h"
+#include "Events/EPlayerHealthPickup.h"
 #include "Engine/Collision/ETrigger.h"
 #include "Common.h"
 #include <tuple>
diff --git a/include/Game/Systems/SoundSystem.h b/include/Game/Systems/SoundSystem.h
index 962eb085..0d0114fb 100644
--- a/include/Game/Systems/SoundSystem.h
+++ b/include/Game/Systems/SoundSystem.h
@@ -13,10 +13,10 @@
 #include "../Engine/Core/EShoot.h"
 #include "../Engine/Core/EPlayerSpawned.h"
 #include "../Engine/Input/EInputCommand.h"
-#include "../Engine/Core/ECaptured.h"
+#include "Events/ECaptured.h"
 #include "../Engine/Core/EPlayerDamage.h"
 #include "../Engine/Core/EPlayerDeath.h"
-#include "../Engine/Core/EPlayerHealthPickup.h"
+#include "Events/EPlayerHealthPickup.h"
 #include "../Engine/Collision/ETrigger.h"
 #include "../Engine/Sound/EPlaySoundOnEntity.h"
 #include "../Engine/Sound/EPlayBackgroundMusic.h"
diff --git a/src/Game/Systems/SoundSystem.cpp b/src/Game/Systems/SoundSystem.cpp
index 7101311d..e5edf3e4 100644
--- a/src/Game/Systems/SoundSystem.cpp
+++ b/src/Game/Systems/SoundSystem.cpp
@@ -14,6 +14,7 @@ SoundSystem::SoundSystem(SystemParams params)
         EVENT_SUBSCRIBE_MEMBER(m_EPlayerDamage, &SoundSystem::OnPlayerDamage);
         EVENT_SUBSCRIBE_MEMBER(m_ECaptured, &SoundSystem::OnCaptured);
         EVENT_SUBSCRIBE_MEMBER(m_ETriggerTouch, &SoundSystem::OnTriggerTouch);
+        EVENT_SUBSCRIBE_MEMBER(m_EPlayerHealthPickup, &SoundSystem::OnPlayerHealthPickup);
     }
 }