diff --git a/DangerousD/GameCore/GameObjects/LivingEntities/CoreEnemy.cs b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/CoreEnemy.cs
similarity index 90%
rename from DangerousD/GameCore/GameObjects/LivingEntities/CoreEnemy.cs
rename to DangerousD/GameCore/GameObjects/LivingEntities/Monsters/CoreEnemy.cs
index 1b28997..4fbe6ff 100644
--- a/DangerousD/GameCore/GameObjects/LivingEntities/CoreEnemy.cs
+++ b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/CoreEnemy.cs
@@ -24,11 +24,6 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities
 
         public override void Update(GameTime gameTime)
         {
-            if (monster_health <= 0)
-            {
-                Death();
-                isAlive = false;
-            }
             base.Update(gameTime);
         }
         public abstract void Death();
@@ -36,5 +31,15 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities
         public abstract void Attack();
 
         public abstract void Move(GameTime gameTime);
+
+        public void TakeDamage(int damage)
+        {
+            monster_health -= damage;
+            if (monster_health <= 0)
+            {
+                Death();
+                isAlive = false;
+            }
+        }
     }
 }
diff --git a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Zombie.cs b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Zombie.cs
index 22e32d0..dba2deb 100644
--- a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Zombie.cs
+++ b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Zombie.cs
@@ -106,11 +106,5 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
             }
             base.OnCollision(gameObject);
         }
-
-        public void TakeDamage(int damage)
-        {
-            monster_health -= damage;
-            //play take damage animation
-        }
     }
 }
diff --git a/DangerousD/GameCore/GameObjects/PlayerDeath/DeathRectangle.cs b/DangerousD/GameCore/GameObjects/LivingEntities/Player/DeathRectangle.cs
similarity index 100%
rename from DangerousD/GameCore/GameObjects/PlayerDeath/DeathRectangle.cs
rename to DangerousD/GameCore/GameObjects/LivingEntities/Player/DeathRectangle.cs
diff --git a/DangerousD/GameCore/GameObjects/LivingEntities/Player.cs b/DangerousD/GameCore/GameObjects/LivingEntities/Player/Player.cs
similarity index 100%
rename from DangerousD/GameCore/GameObjects/LivingEntities/Player.cs
rename to DangerousD/GameCore/GameObjects/LivingEntities/Player/Player.cs