diff --git a/Assets/Scripts/Core/Entities/Mobs/AccompaniableEnemyEntity.cs b/Assets/Scripts/Core/Entities/Mobs/BossEntity.cs
similarity index 100%
rename from Assets/Scripts/Core/Entities/Mobs/AccompaniableEnemyEntity.cs
rename to Assets/Scripts/Core/Entities/Mobs/BossEntity.cs
diff --git a/Assets/Scripts/Core/Entities/Mobs/AccompaniableEnemyEntity.cs.meta b/Assets/Scripts/Core/Entities/Mobs/BossEntity.cs.meta
similarity index 83%
rename from Assets/Scripts/Core/Entities/Mobs/AccompaniableEnemyEntity.cs.meta
rename to Assets/Scripts/Core/Entities/Mobs/BossEntity.cs.meta
index 2a9f879bc8c3b47b5d9482a4fbcdf8e8087226cd..e63b341fd95769b6432283bbf6da89aa9474384a 100644
--- a/Assets/Scripts/Core/Entities/Mobs/AccompaniableEnemyEntity.cs.meta
+++ b/Assets/Scripts/Core/Entities/Mobs/BossEntity.cs.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: e8f8664fc9280974c8995cf856525826
+guid: 323e83dbde258f047aa895c80f9b71f9
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Assets/Scripts/Core/Entities/Mobs/EnemyEntity.cs.meta b/Assets/Scripts/Core/Entities/Mobs/EnemyEntity.cs.meta
index 2b1ee35fd34cfce905fd11c46f078ece2ec6d337..6a9a3a25bcedb7b623e2ffb150c98dcb706fc45d 100644
--- a/Assets/Scripts/Core/Entities/Mobs/EnemyEntity.cs.meta
+++ b/Assets/Scripts/Core/Entities/Mobs/EnemyEntity.cs.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: d1479526765a99742be35fd8fd220c8c
+guid: 199f64257f4e3484fa9e78732f2c9658
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Assets/Scripts/Core/Player/Player.cs b/Assets/Scripts/Core/Player/Player.cs
index 87e7e5a2febe8dd6beb135962c5ce163e9132796..8f40213fa257cd98f56147e70949aee01552b261 100644
--- a/Assets/Scripts/Core/Player/Player.cs
+++ b/Assets/Scripts/Core/Player/Player.cs
@@ -3,7 +3,7 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 
-public class Player : AccompaniableCombatant{
+public class Player : AccompaniableCombatant {
     // Attributes
     private PlayerAnimationController animationController;
     private PlayerMovementController movementController;
diff --git a/Assets/Scripts/Library/BaseClasses/AccompaniableCombatant.cs.meta b/Assets/Scripts/Library/BaseClasses/AccompaniableCombatant.cs.meta
index b084917adb5e37cffc7d65f700e35375226c17c8..2bc105db9c17a146afc4cc698e758e0f00652b25 100644
--- a/Assets/Scripts/Library/BaseClasses/AccompaniableCombatant.cs.meta
+++ b/Assets/Scripts/Library/BaseClasses/AccompaniableCombatant.cs.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 70ede02eebb60bf4f9f966141d3e789e
+guid: 8d7e2e0a598a70944b4589e5c4f40d9b
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Assets/Scripts/Library/BaseClasses/Combatant.cs.meta b/Assets/Scripts/Library/BaseClasses/Combatant.cs.meta
index 05c2ffbd16499bdf66046225f8735b2c4a3949ac..f601748105a0a3080a57b75cee971c866fc1a23b 100644
--- a/Assets/Scripts/Library/BaseClasses/Combatant.cs.meta
+++ b/Assets/Scripts/Library/BaseClasses/Combatant.cs.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: b2fe9e2bde921f845ac7507ed7e559ae
+guid: d9f338f834a60914eab19477f9cec204
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Assets/Scripts/Library/BaseClasses/Entity-Object.meta b/Assets/Scripts/Library/BaseClasses/EntityObject.meta
similarity index 100%
rename from Assets/Scripts/Library/BaseClasses/Entity-Object.meta
rename to Assets/Scripts/Library/BaseClasses/EntityObject.meta
diff --git a/Assets/Scripts/Library/BaseClasses/Entity-Object/AttackEntity.cs b/Assets/Scripts/Library/BaseClasses/EntityObject/AttackEntity.cs
similarity index 100%
rename from Assets/Scripts/Library/BaseClasses/Entity-Object/AttackEntity.cs
rename to Assets/Scripts/Library/BaseClasses/EntityObject/AttackEntity.cs
diff --git a/Assets/Scripts/Library/BaseClasses/Entity-Object/AttackEntity.cs.meta b/Assets/Scripts/Library/BaseClasses/EntityObject/AttackEntity.cs.meta
similarity index 100%
rename from Assets/Scripts/Library/BaseClasses/Entity-Object/AttackEntity.cs.meta
rename to Assets/Scripts/Library/BaseClasses/EntityObject/AttackEntity.cs.meta
diff --git a/Assets/Scripts/Library/BaseClasses/Entity-Object/AttackObject.cs b/Assets/Scripts/Library/BaseClasses/EntityObject/AttackObject.cs
similarity index 100%
rename from Assets/Scripts/Library/BaseClasses/Entity-Object/AttackObject.cs
rename to Assets/Scripts/Library/BaseClasses/EntityObject/AttackObject.cs
diff --git a/Assets/Scripts/Library/BaseClasses/Entity-Object/AttackObject.cs.meta b/Assets/Scripts/Library/BaseClasses/EntityObject/AttackObject.cs.meta
similarity index 100%
rename from Assets/Scripts/Library/BaseClasses/Entity-Object/AttackObject.cs.meta
rename to Assets/Scripts/Library/BaseClasses/EntityObject/AttackObject.cs.meta
diff --git a/Assets/Scripts/Library/BaseClasses/Entity-Object/DamageableEntity.cs b/Assets/Scripts/Library/BaseClasses/EntityObject/DamageableEntity.cs
similarity index 100%
rename from Assets/Scripts/Library/BaseClasses/Entity-Object/DamageableEntity.cs
rename to Assets/Scripts/Library/BaseClasses/EntityObject/DamageableEntity.cs
diff --git a/Assets/Scripts/Library/BaseClasses/Entity-Object/DamageableEntity.cs.meta b/Assets/Scripts/Library/BaseClasses/EntityObject/DamageableEntity.cs.meta
similarity index 100%
rename from Assets/Scripts/Library/BaseClasses/Entity-Object/DamageableEntity.cs.meta
rename to Assets/Scripts/Library/BaseClasses/EntityObject/DamageableEntity.cs.meta
diff --git a/Assets/Scripts/Library/BaseClasses/Entity-Object/DamageableObject.cs b/Assets/Scripts/Library/BaseClasses/EntityObject/DamageableObject.cs
similarity index 100%
rename from Assets/Scripts/Library/BaseClasses/Entity-Object/DamageableObject.cs
rename to Assets/Scripts/Library/BaseClasses/EntityObject/DamageableObject.cs
diff --git a/Assets/Scripts/Library/BaseClasses/Entity-Object/DamageableObject.cs.meta b/Assets/Scripts/Library/BaseClasses/EntityObject/DamageableObject.cs.meta
similarity index 100%
rename from Assets/Scripts/Library/BaseClasses/Entity-Object/DamageableObject.cs.meta
rename to Assets/Scripts/Library/BaseClasses/EntityObject/DamageableObject.cs.meta
diff --git a/Assets/Scripts/Library/BaseClasses/Entity-Object/RigidEntity.cs b/Assets/Scripts/Library/BaseClasses/EntityObject/RigidEntity.cs
similarity index 100%
rename from Assets/Scripts/Library/BaseClasses/Entity-Object/RigidEntity.cs
rename to Assets/Scripts/Library/BaseClasses/EntityObject/RigidEntity.cs
diff --git a/Assets/Scripts/Library/BaseClasses/Entity-Object/RigidEntity.cs.meta b/Assets/Scripts/Library/BaseClasses/EntityObject/RigidEntity.cs.meta
similarity index 100%
rename from Assets/Scripts/Library/BaseClasses/Entity-Object/RigidEntity.cs.meta
rename to Assets/Scripts/Library/BaseClasses/EntityObject/RigidEntity.cs.meta