diff --git a/ZoFo/GameCore/GameManagers/CollisionManager/CollisionComponent.cs b/ZoFo/GameCore/GameManagers/CollisionManager/CollisionComponent.cs
index 755fc11..0ba9816 100644
--- a/ZoFo/GameCore/GameManagers/CollisionManager/CollisionComponent.cs
+++ b/ZoFo/GameCore/GameManagers/CollisionManager/CollisionComponent.cs
@@ -5,7 +5,7 @@ using System.Linq;
using System.Reflection.Metadata;
using System.Text;
using System.Threading.Tasks;
-using ZoFo.GameCore.GameObjects;
+using ZoFo.GameCore.GameObjects.Entities.LivingEntities.Player;
namespace ZoFo.GameCore.GameManagers.CollisionManager
{
diff --git a/ZoFo/GameCore/GameObjects/AttackEntities/Bullet.cs b/ZoFo/GameCore/GameObjects/AttackEntities/Bullet.cs
deleted file mode 100644
index 4e2197d..0000000
--- a/ZoFo/GameCore/GameObjects/AttackEntities/Bullet.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-using System;
-
-namespace ZoFo.GameCore.GameObjects;
-public class Bullet : Projectile
-{
-
-}
diff --git a/ZoFo/GameCore/GameObjects/AttackEntities/Rock.cs b/ZoFo/GameCore/GameObjects/AttackEntities/Rock.cs
deleted file mode 100644
index 1ff7a29..0000000
--- a/ZoFo/GameCore/GameObjects/AttackEntities/Rock.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-using System;
-
-namespace ZoFo.GameCore.GameObjects;
-public class Rock : Projectile
-{
-
-}
diff --git a/ZoFo/GameCore/GameObjects/BaseClasses/Collectable.cs b/ZoFo/GameCore/GameObjects/BaseClasses/Collectable.cs
deleted file mode 100644
index 7a32b43..0000000
--- a/ZoFo/GameCore/GameObjects/BaseClasses/Collectable.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-using System;
-
-namespace ZoFo.GameCore.GameObjects;
-public class Collectable : Entity
-{
-
-}
diff --git a/ZoFo/GameCore/GameObjects/BaseClasses/Entity.cs b/ZoFo/GameCore/GameObjects/Entities/Entity.cs
similarity index 76%
rename from ZoFo/GameCore/GameObjects/BaseClasses/Entity.cs
rename to ZoFo/GameCore/GameObjects/Entities/Entity.cs
index d6809dd..b6b6865 100644
--- a/ZoFo/GameCore/GameObjects/BaseClasses/Entity.cs
+++ b/ZoFo/GameCore/GameObjects/Entities/Entity.cs
@@ -1,33 +1,33 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
-
-namespace ZoFo.GameCore.GameObjects
-{
- public abstract class Entity : GameObject
- {
- public int Id { get; set; }
- public void CollisionComponent()
- {
-
- }
-
- public void AnimationComponent()
- {
-
- }
-
- public void UpdateLogic()
- {
-
- }
-
- }
-}
-
-//вектор
-//вилосити
-//поситион
-//текстура
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Graphics;
+
+namespace ZoFo.GameCore.GameObjects.Entities
+{
+ public abstract class Entity : GameObject
+ {
+ public int Id { get; set; }
+ public void CollisionComponent()
+ {
+
+ }
+
+ public void AnimationComponent()
+ {
+
+ }
+
+ public void UpdateLogic()
+ {
+
+ }
+
+ }
+}
+
+//вектор
+//вилосити
+//поситион
+//текстура
diff --git a/ZoFo/GameCore/GameObjects/Entities/Interactables/Collectables/Collectable.cs b/ZoFo/GameCore/GameObjects/Entities/Interactables/Collectables/Collectable.cs
new file mode 100644
index 0000000..843258f
--- /dev/null
+++ b/ZoFo/GameCore/GameObjects/Entities/Interactables/Collectables/Collectable.cs
@@ -0,0 +1,7 @@
+using System;
+
+namespace ZoFo.GameCore.GameObjects.Entities.Interactables.Collectables;
+public class Collectable : Entity
+{
+
+}
diff --git a/ZoFo/GameCore/GameObjects/Enemy.cs b/ZoFo/GameCore/GameObjects/Entities/LivingEntities/Enemies/Enemy.cs
similarity index 71%
rename from ZoFo/GameCore/GameObjects/Enemy.cs
rename to ZoFo/GameCore/GameObjects/Entities/LivingEntities/Enemies/Enemy.cs
index 934da77..9a3b320 100644
--- a/ZoFo/GameCore/GameObjects/Enemy.cs
+++ b/ZoFo/GameCore/GameObjects/Entities/LivingEntities/Enemies/Enemy.cs
@@ -1,11 +1,11 @@
-using System;
-using System.Collections.Generic;
-using System.Net.Mime;
-using System.Reflection;
-using Microsoft.Xna.Framework.Content;
-
-namespace ZoFo.GameCore.GameObjects;
-public class Enemy : LivingEntity
-{
-
+using System;
+using System.Collections.Generic;
+using System.Net.Mime;
+using System.Reflection;
+using Microsoft.Xna.Framework.Content;
+
+namespace ZoFo.GameCore.GameObjects.Entities.LivingEntities.Enemies;
+public class Enemy : LivingEntity
+{
+
}
\ No newline at end of file
diff --git a/ZoFo/GameCore/GameObjects/BaseClasses/LivingEntity.cs b/ZoFo/GameCore/GameObjects/Entities/LivingEntities/LivingEntity.cs
similarity index 71%
rename from ZoFo/GameCore/GameObjects/BaseClasses/LivingEntity.cs
rename to ZoFo/GameCore/GameObjects/Entities/LivingEntities/LivingEntity.cs
index d8c8ed7..2f9cf7a 100644
--- a/ZoFo/GameCore/GameObjects/BaseClasses/LivingEntity.cs
+++ b/ZoFo/GameCore/GameObjects/Entities/LivingEntities/LivingEntity.cs
@@ -1,20 +1,21 @@
-using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
-using System;
-
-namespace ZoFo.GameCore.GameObjects;
-public class LivingEntity : Entity
-{
- public Vector2 velocity;
- public Vector2 position;
-
- public void TextureLoad(SpriteBatch spriteBatch)
- {
-
- }
-
-}
-
-
-
-
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Graphics;
+using System;
+using ZoFo.GameCore.GameObjects.Entities;
+
+namespace ZoFo.GameCore.GameObjects.Entities.LivingEntities;
+public class LivingEntity : Entity
+{
+ public Vector2 velocity;
+ public Vector2 position;
+
+ public void TextureLoad(SpriteBatch spriteBatch)
+ {
+
+ }
+
+}
+
+
+
+
diff --git a/ZoFo/GameCore/GameObjects/Player/IPlayerWeaponAttack.cs b/ZoFo/GameCore/GameObjects/Entities/LivingEntities/Player/IPlayerWeaponAttack.cs
similarity index 72%
rename from ZoFo/GameCore/GameObjects/Player/IPlayerWeaponAttack.cs
rename to ZoFo/GameCore/GameObjects/Entities/LivingEntities/Player/IPlayerWeaponAttack.cs
index f47220e..3fafa2b 100644
--- a/ZoFo/GameCore/GameObjects/Player/IPlayerWeaponAttack.cs
+++ b/ZoFo/GameCore/GameObjects/Entities/LivingEntities/Player/IPlayerWeaponAttack.cs
@@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
-namespace ZoFo.GameCore.GameObjects
+namespace ZoFo.GameCore.GameObjects.Entities.LivingEntities.Player
{
internal interface IPlayerWeaponAttack
{
diff --git a/ZoFo/GameCore/GameObjects/Player/LootData.cs b/ZoFo/GameCore/GameObjects/Entities/LivingEntities/Player/LootData.cs
similarity index 81%
rename from ZoFo/GameCore/GameObjects/Player/LootData.cs
rename to ZoFo/GameCore/GameObjects/Entities/LivingEntities/Player/LootData.cs
index 93f67f1..5336e7b 100644
--- a/ZoFo/GameCore/GameObjects/Player/LootData.cs
+++ b/ZoFo/GameCore/GameObjects/Entities/LivingEntities/Player/LootData.cs
@@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
-namespace ZoFo.GameCore.GameObjects
+namespace ZoFo.GameCore.GameObjects.Entities.LivingEntities.Player
{
internal class LootData
{
diff --git a/ZoFo/GameCore/GameObjects/Entities/LivingEntities/Player/Player.cs b/ZoFo/GameCore/GameObjects/Entities/LivingEntities/Player/Player.cs
new file mode 100644
index 0000000..a1333ea
--- /dev/null
+++ b/ZoFo/GameCore/GameObjects/Entities/LivingEntities/Player/Player.cs
@@ -0,0 +1,7 @@
+using System;
+
+namespace ZoFo.GameCore.GameObjects.Entities.LivingEntities.Player;
+public class Player : LivingEntity
+{
+
+}
diff --git a/ZoFo/GameCore/GameObjects/AttackEntities/GunAttack.cs b/ZoFo/GameCore/GameObjects/Entities/LivingEntities/Player/PlayerAttacks/GunAttack.cs
similarity index 50%
rename from ZoFo/GameCore/GameObjects/AttackEntities/GunAttack.cs
rename to ZoFo/GameCore/GameObjects/Entities/LivingEntities/Player/PlayerAttacks/GunAttack.cs
index b3a611e..ffa2869 100644
--- a/ZoFo/GameCore/GameObjects/AttackEntities/GunAttack.cs
+++ b/ZoFo/GameCore/GameObjects/Entities/LivingEntities/Player/PlayerAttacks/GunAttack.cs
@@ -4,9 +4,9 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
-namespace ZoFo.GameCore.GameObjects
+namespace ZoFo.GameCore.GameObjects.Entities.LivingEntities.Player.PlayerAttacks
{
- internal class GunAttack:IPlayerWeaponAttack
+ internal class GunAttack : IPlayerWeaponAttack
{
}
diff --git a/ZoFo/GameCore/GameObjects/AttackEntities/HandAttack.cs b/ZoFo/GameCore/GameObjects/Entities/LivingEntities/Player/PlayerAttacks/HandAttack.cs
similarity index 50%
rename from ZoFo/GameCore/GameObjects/AttackEntities/HandAttack.cs
rename to ZoFo/GameCore/GameObjects/Entities/LivingEntities/Player/PlayerAttacks/HandAttack.cs
index 3d73249..b993cc0 100644
--- a/ZoFo/GameCore/GameObjects/AttackEntities/HandAttack.cs
+++ b/ZoFo/GameCore/GameObjects/Entities/LivingEntities/Player/PlayerAttacks/HandAttack.cs
@@ -4,9 +4,9 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
-namespace ZoFo.GameCore.GameObjects
+namespace ZoFo.GameCore.GameObjects.Entities.LivingEntities.Player.PlayerAttacks
{
- internal class HandAttack:IPlayerWeaponAttack
+ internal class HandAttack : IPlayerWeaponAttack
{
}
diff --git a/ZoFo/GameCore/GameObjects/AttackEntities/SwordAttack.cs b/ZoFo/GameCore/GameObjects/Entities/LivingEntities/Player/PlayerAttacks/SwordAttack.cs
similarity index 50%
rename from ZoFo/GameCore/GameObjects/AttackEntities/SwordAttack.cs
rename to ZoFo/GameCore/GameObjects/Entities/LivingEntities/Player/PlayerAttacks/SwordAttack.cs
index 507ae6b..508f02f 100644
--- a/ZoFo/GameCore/GameObjects/AttackEntities/SwordAttack.cs
+++ b/ZoFo/GameCore/GameObjects/Entities/LivingEntities/Player/PlayerAttacks/SwordAttack.cs
@@ -4,9 +4,9 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
-namespace ZoFo.GameCore.GameObjects
+namespace ZoFo.GameCore.GameObjects.Entities.LivingEntities.Player.PlayerAttacks
{
- internal class SwordAttack:IPlayerWeaponAttack
+ internal class SwordAttack : IPlayerWeaponAttack
{
}
diff --git a/ZoFo/GameCore/GameObjects/Entities/LivingEntities/Projectiles/Bullet.cs b/ZoFo/GameCore/GameObjects/Entities/LivingEntities/Projectiles/Bullet.cs
new file mode 100644
index 0000000..83643f0
--- /dev/null
+++ b/ZoFo/GameCore/GameObjects/Entities/LivingEntities/Projectiles/Bullet.cs
@@ -0,0 +1,7 @@
+using System;
+
+namespace ZoFo.GameCore.GameObjects.Entities.LivingEntities.Projectiles;
+public class Bullet : Projectile
+{
+
+}
diff --git a/ZoFo/GameCore/GameObjects/Entities/LivingEntities/Projectiles/Rock.cs b/ZoFo/GameCore/GameObjects/Entities/LivingEntities/Projectiles/Rock.cs
new file mode 100644
index 0000000..caf91a4
--- /dev/null
+++ b/ZoFo/GameCore/GameObjects/Entities/LivingEntities/Projectiles/Rock.cs
@@ -0,0 +1,7 @@
+using System;
+
+namespace ZoFo.GameCore.GameObjects.Entities.LivingEntities.Projectiles;
+public class Rock : Projectile
+{
+
+}
diff --git a/ZoFo/GameCore/GameObjects/BaseClasses/GameObject.cs b/ZoFo/GameCore/GameObjects/GameObject.cs
similarity index 100%
rename from ZoFo/GameCore/GameObjects/BaseClasses/GameObject.cs
rename to ZoFo/GameCore/GameObjects/GameObject.cs
diff --git a/ZoFo/GameCore/GameObjects/Player/Player.cs b/ZoFo/GameCore/GameObjects/Player/Player.cs
deleted file mode 100644
index 5a033e3..0000000
--- a/ZoFo/GameCore/GameObjects/Player/Player.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-using System;
-
-namespace ZoFo.GameCore.GameObjects;
-public class Player : LivingEntity
-{
-
-}
diff --git a/ZoFo/GameCore/GameObjects/Projectile.cs b/ZoFo/GameCore/GameObjects/Projectile.cs
index 80cbf5a..c8df157 100644
--- a/ZoFo/GameCore/GameObjects/Projectile.cs
+++ b/ZoFo/GameCore/GameObjects/Projectile.cs
@@ -1,4 +1,5 @@
using System;
+using ZoFo.GameCore.GameObjects.Entities.LivingEntities;
namespace ZoFo.GameCore.GameObjects;
public class Projectile : LivingEntity
diff --git a/ZoFo/GameCore/GameObjects/StopObjects/StopObject.cs b/ZoFo/GameCore/GameObjects/StopObjects/StopObject.cs
new file mode 100644
index 0000000..85f95b4
--- /dev/null
+++ b/ZoFo/GameCore/GameObjects/StopObjects/StopObject.cs
@@ -0,0 +1,8 @@
+using System;
+
+namespace ZoFo.GameCore.GameObjects.StopObjects;
+
+public class StopObject
+{
+
+}
diff --git a/ZoFo/GameCore/GameObjects/Tiles/StopObject.cs b/ZoFo/GameCore/GameObjects/Tiles/StopObject.cs
deleted file mode 100644
index cddb0d5..0000000
--- a/ZoFo/GameCore/GameObjects/Tiles/StopObject.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using System;
-
-namespace ZoFo.GameCore.GameObjects;
-
-public class StopObject
-{
-
-}
diff --git a/ZoFo/GameCore/Server.cs b/ZoFo/GameCore/Server.cs
index c0fa6f8..b62dbba 100644
--- a/ZoFo/GameCore/Server.cs
+++ b/ZoFo/GameCore/Server.cs
@@ -9,6 +9,7 @@ using ZoFo.GameCore.GameManagers.NetworkManager;
using ZoFo.GameCore.GameManagers.NetworkManager.Updates;
using ZoFo.GameCore.GameManagers.NetworkManager.Updates.ServerToClient;
using ZoFo.GameCore.GameObjects;
+using ZoFo.GameCore.GameObjects.Entities;
namespace ZoFo.GameCore
{
diff --git a/ZoFo/ZoFo.csproj b/ZoFo/ZoFo.csproj
index 747eafe..4c3c3f7 100644
--- a/ZoFo/ZoFo.csproj
+++ b/ZoFo/ZoFo.csproj
@@ -10,6 +10,11 @@
app.manifest
Icon.ico
+
+
+
+
+