diff --git a/ZoFo/GameCore/GameObjects/Bullet.cs b/ZoFo/GameCore/GameObjects/AttackEntities/Bullet.cs
similarity index 100%
rename from ZoFo/GameCore/GameObjects/Bullet.cs
rename to ZoFo/GameCore/GameObjects/AttackEntities/Bullet.cs
diff --git a/ZoFo/GameCore/GameObjects/GunAttack.cs b/ZoFo/GameCore/GameObjects/AttackEntities/GunAttack.cs
similarity index 100%
rename from ZoFo/GameCore/GameObjects/GunAttack.cs
rename to ZoFo/GameCore/GameObjects/AttackEntities/GunAttack.cs
diff --git a/ZoFo/GameCore/GameObjects/HandAttack.cs b/ZoFo/GameCore/GameObjects/AttackEntities/HandAttack.cs
similarity index 100%
rename from ZoFo/GameCore/GameObjects/HandAttack.cs
rename to ZoFo/GameCore/GameObjects/AttackEntities/HandAttack.cs
diff --git a/ZoFo/GameCore/GameObjects/Rock.cs b/ZoFo/GameCore/GameObjects/AttackEntities/Rock.cs
similarity index 100%
rename from ZoFo/GameCore/GameObjects/Rock.cs
rename to ZoFo/GameCore/GameObjects/AttackEntities/Rock.cs
diff --git a/ZoFo/GameCore/GameObjects/SwordAttack.cs b/ZoFo/GameCore/GameObjects/AttackEntities/SwordAttack.cs
similarity index 100%
rename from ZoFo/GameCore/GameObjects/SwordAttack.cs
rename to ZoFo/GameCore/GameObjects/AttackEntities/SwordAttack.cs
diff --git a/ZoFo/GameCore/GameObjects/Collectable.cs b/ZoFo/GameCore/GameObjects/BaseClasses/Collectable.cs
similarity index 100%
rename from ZoFo/GameCore/GameObjects/Collectable.cs
rename to ZoFo/GameCore/GameObjects/BaseClasses/Collectable.cs
diff --git a/ZoFo/GameCore/GameObjects/Entity.cs b/ZoFo/GameCore/GameObjects/BaseClasses/Entity.cs
similarity index 100%
rename from ZoFo/GameCore/GameObjects/Entity.cs
rename to ZoFo/GameCore/GameObjects/BaseClasses/Entity.cs
diff --git a/ZoFo/GameCore/GameObjects/GameObject.cs b/ZoFo/GameCore/GameObjects/BaseClasses/GameObject.cs
similarity index 100%
rename from ZoFo/GameCore/GameObjects/GameObject.cs
rename to ZoFo/GameCore/GameObjects/BaseClasses/GameObject.cs
diff --git a/ZoFo/GameCore/GameObjects/LivingEntity.cs b/ZoFo/GameCore/GameObjects/BaseClasses/LivingEntity.cs
similarity index 100%
rename from ZoFo/GameCore/GameObjects/LivingEntity.cs
rename to ZoFo/GameCore/GameObjects/BaseClasses/LivingEntity.cs
diff --git a/ZoFo/GameCore/GameObjects/IPlayerWeaponAttack.cs b/ZoFo/GameCore/GameObjects/Player/IPlayerWeaponAttack.cs
similarity index 100%
rename from ZoFo/GameCore/GameObjects/IPlayerWeaponAttack.cs
rename to ZoFo/GameCore/GameObjects/Player/IPlayerWeaponAttack.cs
diff --git a/ZoFo/GameCore/GameObjects/LootData.cs b/ZoFo/GameCore/GameObjects/Player/LootData.cs
similarity index 100%
rename from ZoFo/GameCore/GameObjects/LootData.cs
rename to ZoFo/GameCore/GameObjects/Player/LootData.cs
diff --git a/ZoFo/GameCore/GameObjects/Player.cs b/ZoFo/GameCore/GameObjects/Player/Player.cs
similarity index 100%
rename from ZoFo/GameCore/GameObjects/Player.cs
rename to ZoFo/GameCore/GameObjects/Player/Player.cs
diff --git a/ZoFo/GameCore/GameObjects/StopObject.cs b/ZoFo/GameCore/GameObjects/Tiles/StopObject.cs
similarity index 100%
rename from ZoFo/GameCore/GameObjects/StopObject.cs
rename to ZoFo/GameCore/GameObjects/Tiles/StopObject.cs
diff --git a/ZoFo/GameCore/GameObjects/Tile.cs b/ZoFo/GameCore/GameObjects/Tiles/Tile.cs
similarity index 100%
rename from ZoFo/GameCore/GameObjects/Tile.cs
rename to ZoFo/GameCore/GameObjects/Tiles/Tile.cs
diff --git a/ZoFo/GameCore/Server.cs b/ZoFo/GameCore/Server.cs
index 7bf421a..8be4c50 100644
--- a/ZoFo/GameCore/Server.cs
+++ b/ZoFo/GameCore/Server.cs
@@ -40,5 +40,10 @@ namespace ZoFo.GameCore
         internal void Update(GameTime gameTime)
         { 
         }
+
+        public void RegisterEntity(GameObject gameObject)
+        {
+          gameObjects.Add(gameObject);
+        }
     }
 }