diff --git a/Assets/CoreSystems b/Assets/CoreSystems
index 2fd48d1..f2355fc 160000
--- a/Assets/CoreSystems
+++ b/Assets/CoreSystems
@@ -1 +1 @@
-Subproject commit 2fd48d1475f8116434c184e5812392a4c892b387
+Subproject commit f2355fc7825d8f09a407b31aaa4178b6fbdd3406
diff --git a/Assets/Entities/Entities.asmdef b/Assets/Entities/Entities.asmdef
index 9e0932f..a41f803 100644
--- a/Assets/Entities/Entities.asmdef
+++ b/Assets/Entities/Entities.asmdef
@@ -3,7 +3,8 @@
     "rootNamespace": "AsteroidGame",
     "references": [
         "GUID:17a5862fcd6383b4b97bad4dcb1e2e5d",
-        "GUID:eb3099ff524d60545a136315a154d67b"
+        "GUID:eb3099ff524d60545a136315a154d67b",
+        "GUID:5d38ea13ae8f69a4395d425d401a557a"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],
diff --git a/Assets/Interfaces.meta b/Assets/Interfaces.meta
deleted file mode 100644
index a3edc8b..0000000
--- a/Assets/Interfaces.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: b20f0794cd5868b4eadf6614b8ab88b9
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Interfaces/IBuildable.cs b/Assets/Interfaces/IBuildable.cs
deleted file mode 100644
index 64d55fb..0000000
--- a/Assets/Interfaces/IBuildable.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace AsteroidGame.Interfaces
-{
-    public interface IBuildable
-    {
-        public int GetCost();
-        public int SetCost(int newCost);
-    }
-}
\ No newline at end of file
diff --git a/Assets/Interfaces/IBuildable.cs.meta b/Assets/Interfaces/IBuildable.cs.meta
deleted file mode 100644
index 2cd13ee..0000000
--- a/Assets/Interfaces/IBuildable.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 99361805272d7f6419384097857e2bd6
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Interfaces/IDamageable.cs b/Assets/Interfaces/IDamageable.cs
deleted file mode 100644
index 28e12f5..0000000
--- a/Assets/Interfaces/IDamageable.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-namespace AsteroidGame.Interfaces
-{
-    public interface IDamageable
-    {
-        public void ModifyHealth(int healthChange);
-
-        #region PublicProperties
-
-        public bool IsInvulnerable { get; }
-
-        #endregion
-        
-        #region Setters
-        public void SetHealth(int newHealth);
-
-        public void SetMaxHealth(int newHealth);
-        
-        public void SetInvulnerable (bool newState);
-        
-        #endregion
-
-        #region Getters
-        public int GetHealth();
-
-        public int GetMaxHealth();
-
-        public float GetHealthFactor();
-
-        #endregion
-    }
-}
diff --git a/Assets/Interfaces/IDamageable.cs.meta b/Assets/Interfaces/IDamageable.cs.meta
deleted file mode 100644
index c2af229..0000000
--- a/Assets/Interfaces/IDamageable.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: d0290b6d2e8462547a0d40b67a1076e3
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Interfaces/IPowerSystem.cs b/Assets/Interfaces/IPowerSystem.cs
deleted file mode 100644
index 7eb0331..0000000
--- a/Assets/Interfaces/IPowerSystem.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-namespace AsteroidGame.Interfaces
-{
-    public interface IPowerSystem
-    {
-        public bool IsGenerator { get; }
-        
-        public bool IsConsumer { get; }
-        
-        public void SetMaxPower(int newValue);
-
-        public int GetMaxPower();
-
-        public int GetCurrentPower();
-
-        public float GetPowerFactor();
-    }
-}
diff --git a/Assets/Interfaces/IPowerSystem.cs.meta b/Assets/Interfaces/IPowerSystem.cs.meta
deleted file mode 100644
index 16813a0..0000000
--- a/Assets/Interfaces/IPowerSystem.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: c3e9b410a74a04f4ab85e908d2a684a8
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Interfaces/ITargetable.cs b/Assets/Interfaces/ITargetable.cs
deleted file mode 100644
index 397d4db..0000000
--- a/Assets/Interfaces/ITargetable.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using UnityEngine;
-
-namespace AsteroidGame.Interfaces
-{
-    public interface ITargetable
-    {
-        public Vector3 GetCenterPosition();
-        
-        public Vector3 GetBasePosition();
-    }
-}
diff --git a/Assets/Interfaces/ITargetable.cs.meta b/Assets/Interfaces/ITargetable.cs.meta
deleted file mode 100644
index 6d6d937..0000000
--- a/Assets/Interfaces/ITargetable.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 3d338501124dcf349b3852a83d20dbe4
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Interfaces/IWeapon.cs b/Assets/Interfaces/IWeapon.cs
deleted file mode 100644
index 9aee191..0000000
--- a/Assets/Interfaces/IWeapon.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace AsteroidGame.Interfaces
-{
-    public interface IWeapon
-    {
-        public float FireRate { get; set; }
-        public float Damage { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/Assets/Interfaces/IWeapon.cs.meta b/Assets/Interfaces/IWeapon.cs.meta
deleted file mode 100644
index 3c7920f..0000000
--- a/Assets/Interfaces/IWeapon.cs.meta
+++ /dev/null
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: a4d06a75a5a64c83aa191a8610f5080f
-timeCreated: 1664621279
\ No newline at end of file
diff --git a/Assets/Interfaces/Interfaces.asmdef b/Assets/Interfaces/Interfaces.asmdef
deleted file mode 100644
index 2bb5daf..0000000
--- a/Assets/Interfaces/Interfaces.asmdef
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "name": "Interfaces",
-    "rootNamespace": "AsteroidGame",
-    "references": [],
-    "includePlatforms": [],
-    "excludePlatforms": [],
-    "allowUnsafeCode": false,
-    "overrideReferences": false,
-    "precompiledReferences": [],
-    "autoReferenced": true,
-    "defineConstraints": [],
-    "versionDefines": [],
-    "noEngineReferences": false
-}
\ No newline at end of file
diff --git a/Assets/Interfaces/Interfaces.asmdef.meta b/Assets/Interfaces/Interfaces.asmdef.meta
deleted file mode 100644
index 19a6da9..0000000
--- a/Assets/Interfaces/Interfaces.asmdef.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 17a5862fcd6383b4b97bad4dcb1e2e5d
-AssemblyDefinitionImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: