diff --git a/Zennysoft.Game.Abstractions/App/IAppRepo.cs b/Zennysoft.Game.Abstractions/App/IAppRepo.cs
new file mode 100644
index 00000000..e2309e2d
--- /dev/null
+++ b/Zennysoft.Game.Abstractions/App/IAppRepo.cs
@@ -0,0 +1,22 @@
+namespace Zennysoft.Game.Abstractions;
+
+public interface IAppRepo : IDisposable
+{
+  event Action? GameEntered;
+
+  event Action? GameExited;
+
+  event Action? SplashScreenSkipped;
+
+  event Action? MainMenuEntered;
+
+  void SkipSplashScreen();
+
+  void OnMainMenuEntered();
+
+  void OnEnterGame();
+
+  void OnExitGame();
+
+  void OnGameOver();
+}
diff --git a/Zennysoft.Game.Ma/src/enemy/ICanPatrol.cs b/Zennysoft.Game.Abstractions/NPCs/ICanPatrol.cs
similarity index 57%
rename from Zennysoft.Game.Ma/src/enemy/ICanPatrol.cs
rename to Zennysoft.Game.Abstractions/NPCs/ICanPatrol.cs
index 3b3703ec..e54ef7db 100644
--- a/Zennysoft.Game.Ma/src/enemy/ICanPatrol.cs
+++ b/Zennysoft.Game.Abstractions/NPCs/ICanPatrol.cs
@@ -1,4 +1,4 @@
-namespace Zennysoft.Game.Ma.src.enemy;
+namespace Zennysoft.Game.Abstractions;
 
 public interface ICanPatrol
 {
diff --git a/Zennysoft.Game.Ma/src/app/domain/AppRepo.cs b/Zennysoft.Game.Ma.Implementation/App/AppRepo.cs
similarity index 72%
rename from Zennysoft.Game.Ma/src/app/domain/AppRepo.cs
rename to Zennysoft.Game.Ma.Implementation/App/AppRepo.cs
index 1d659603..1be22c50 100644
--- a/Zennysoft.Game.Ma/src/app/domain/AppRepo.cs
+++ b/Zennysoft.Game.Ma.Implementation/App/AppRepo.cs
@@ -1,27 +1,6 @@
-using System;
+using Zennysoft.Game.Abstractions;
 
-namespace Zennysoft.Game.Ma;
-
-public interface IAppRepo : IDisposable
-{
-  event Action? GameEntered;
-
-  event Action? GameExited;
-
-  event Action? SplashScreenSkipped;
-
-  event Action? MainMenuEntered;
-
-  void SkipSplashScreen();
-
-  void OnMainMenuEntered();
-
-  void OnEnterGame();
-
-  void OnExitGame();
-
-  void OnGameOver();
-}
+namespace Zennysoft.Game.Ma.Implementation;
 
 public class AppRepo : IAppRepo
 {
diff --git a/Zennysoft.Game.Ma/src/app/state/AppLogic.Data.cs b/Zennysoft.Game.Ma.Implementation/App/State/AppLogic.Data.cs
similarity index 70%
rename from Zennysoft.Game.Ma/src/app/state/AppLogic.Data.cs
rename to Zennysoft.Game.Ma.Implementation/App/State/AppLogic.Data.cs
index 771b590d..e464a5e5 100644
--- a/Zennysoft.Game.Ma/src/app/state/AppLogic.Data.cs
+++ b/Zennysoft.Game.Ma.Implementation/App/State/AppLogic.Data.cs
@@ -1,4 +1,5 @@
-namespace Zennysoft.Game.Ma;
+namespace Zennysoft.Game.Ma.Implementation;
+
 public partial class AppLogic
 {
   public record Data
diff --git a/Zennysoft.Game.Ma/src/app/state/AppLogic.Input.cs b/Zennysoft.Game.Ma.Implementation/App/State/AppLogic.Input.cs
similarity index 91%
rename from Zennysoft.Game.Ma/src/app/state/AppLogic.Input.cs
rename to Zennysoft.Game.Ma.Implementation/App/State/AppLogic.Input.cs
index fb526f46..51fb60d8 100644
--- a/Zennysoft.Game.Ma/src/app/state/AppLogic.Input.cs
+++ b/Zennysoft.Game.Ma.Implementation/App/State/AppLogic.Input.cs
@@ -1,4 +1,4 @@
-namespace Zennysoft.Game.Ma;
+namespace Zennysoft.Game.Ma.Implementation;
 
 public partial class AppLogic
 {
diff --git a/Zennysoft.Game.Ma/src/app/state/AppLogic.Output.cs b/Zennysoft.Game.Ma.Implementation/App/State/AppLogic.Output.cs
similarity index 93%
rename from Zennysoft.Game.Ma/src/app/state/AppLogic.Output.cs
rename to Zennysoft.Game.Ma.Implementation/App/State/AppLogic.Output.cs
index 4ae181e1..8e5dc135 100644
--- a/Zennysoft.Game.Ma/src/app/state/AppLogic.Output.cs
+++ b/Zennysoft.Game.Ma.Implementation/App/State/AppLogic.Output.cs
@@ -1,4 +1,4 @@
-namespace Zennysoft.Game.Ma;
+namespace Zennysoft.Game.Ma.Implementation;
 
 public partial class AppLogic
 {
diff --git a/Zennysoft.Game.Ma/src/app/state/AppLogic.State.cs b/Zennysoft.Game.Ma.Implementation/App/State/AppLogic.State.cs
similarity index 79%
rename from Zennysoft.Game.Ma/src/app/state/AppLogic.State.cs
rename to Zennysoft.Game.Ma.Implementation/App/State/AppLogic.State.cs
index 72c54744..0be4c24c 100644
--- a/Zennysoft.Game.Ma/src/app/state/AppLogic.State.cs
+++ b/Zennysoft.Game.Ma.Implementation/App/State/AppLogic.State.cs
@@ -1,7 +1,7 @@
 using Chickensoft.Introspection;
 using Chickensoft.LogicBlocks;
 
-namespace Zennysoft.Game.Ma;
+namespace Zennysoft.Game.Ma.Implementation;
 
 public partial class AppLogic
 {
diff --git a/Zennysoft.Game.Ma/src/app/state/AppLogic.cs b/Zennysoft.Game.Ma.Implementation/App/State/AppLogic.cs
similarity index 88%
rename from Zennysoft.Game.Ma/src/app/state/AppLogic.cs
rename to Zennysoft.Game.Ma.Implementation/App/State/AppLogic.cs
index 8556a0b4..6fde3930 100644
--- a/Zennysoft.Game.Ma/src/app/state/AppLogic.cs
+++ b/Zennysoft.Game.Ma.Implementation/App/State/AppLogic.cs
@@ -1,7 +1,7 @@
 using Chickensoft.Introspection;
 using Chickensoft.LogicBlocks;
 
-namespace Zennysoft.Game.Ma;
+namespace Zennysoft.Game.Ma.Implementation;
 
 public interface IAppLogic : ILogicBlock<AppLogic.State>;
 
diff --git a/Zennysoft.Game.Ma/src/app/state/states/AppLogic.State.InGame.cs b/Zennysoft.Game.Ma.Implementation/App/State/States/AppLogic.State.InGame.cs
similarity index 91%
rename from Zennysoft.Game.Ma/src/app/state/states/AppLogic.State.InGame.cs
rename to Zennysoft.Game.Ma.Implementation/App/State/States/AppLogic.State.InGame.cs
index eec31392..41d48f89 100644
--- a/Zennysoft.Game.Ma/src/app/state/states/AppLogic.State.InGame.cs
+++ b/Zennysoft.Game.Ma.Implementation/App/State/States/AppLogic.State.InGame.cs
@@ -1,7 +1,8 @@
 using Chickensoft.Introspection;
 using Chickensoft.LogicBlocks;
+using Zennysoft.Game.Abstractions;
 
-namespace Zennysoft.Game.Ma;
+namespace Zennysoft.Game.Ma.Implementation;
 
 public partial class AppLogic
 {
diff --git a/Zennysoft.Game.Ma/src/app/state/states/AppLogic.State.LeavingMenu.cs b/Zennysoft.Game.Ma.Implementation/App/State/States/AppLogic.State.LeavingMenu.cs
similarity index 91%
rename from Zennysoft.Game.Ma/src/app/state/states/AppLogic.State.LeavingMenu.cs
rename to Zennysoft.Game.Ma.Implementation/App/State/States/AppLogic.State.LeavingMenu.cs
index e6f9808e..a157ebfa 100644
--- a/Zennysoft.Game.Ma/src/app/state/states/AppLogic.State.LeavingMenu.cs
+++ b/Zennysoft.Game.Ma.Implementation/App/State/States/AppLogic.State.LeavingMenu.cs
@@ -1,4 +1,4 @@
-namespace Zennysoft.Game.Ma;
+namespace Zennysoft.Game.Ma.Implementation;
 
 using Chickensoft.Introspection;
 using Chickensoft.LogicBlocks;
diff --git a/Zennysoft.Game.Ma/src/app/state/states/AppLogic.State.LoadingSaveFile.cs b/Zennysoft.Game.Ma.Implementation/App/State/States/AppLogic.State.LoadingSaveFile.cs
similarity index 90%
rename from Zennysoft.Game.Ma/src/app/state/states/AppLogic.State.LoadingSaveFile.cs
rename to Zennysoft.Game.Ma.Implementation/App/State/States/AppLogic.State.LoadingSaveFile.cs
index ce666587..7da6ae19 100644
--- a/Zennysoft.Game.Ma/src/app/state/states/AppLogic.State.LoadingSaveFile.cs
+++ b/Zennysoft.Game.Ma.Implementation/App/State/States/AppLogic.State.LoadingSaveFile.cs
@@ -1,4 +1,4 @@
-namespace Zennysoft.Game.Ma;
+namespace Zennysoft.Game.Ma.Implementation;
 
 using Chickensoft.Introspection;
 using Chickensoft.LogicBlocks;
diff --git a/Zennysoft.Game.Ma/src/app/state/states/AppLogic.State.MainMenu.cs b/Zennysoft.Game.Ma.Implementation/App/State/States/AppLogic.State.MainMenu.cs
similarity index 92%
rename from Zennysoft.Game.Ma/src/app/state/states/AppLogic.State.MainMenu.cs
rename to Zennysoft.Game.Ma.Implementation/App/State/States/AppLogic.State.MainMenu.cs
index 0a1ad078..5c5111cd 100644
--- a/Zennysoft.Game.Ma/src/app/state/states/AppLogic.State.MainMenu.cs
+++ b/Zennysoft.Game.Ma.Implementation/App/State/States/AppLogic.State.MainMenu.cs
@@ -1,7 +1,8 @@
 using Chickensoft.Introspection;
 using Chickensoft.LogicBlocks;
+using Zennysoft.Game.Abstractions;
 
-namespace Zennysoft.Game.Ma;
+namespace Zennysoft.Game.Ma.Implementation;
 
 public partial class AppLogic
 {
diff --git a/Zennysoft.Game.Ma/src/app/state/states/AppLogic.State.SplashScreen.cs b/Zennysoft.Game.Ma.Implementation/App/State/States/AppLogic.State.SplashScreen.cs
similarity index 89%
rename from Zennysoft.Game.Ma/src/app/state/states/AppLogic.State.SplashScreen.cs
rename to Zennysoft.Game.Ma.Implementation/App/State/States/AppLogic.State.SplashScreen.cs
index 6a8b8c5c..1c428ef8 100644
--- a/Zennysoft.Game.Ma/src/app/state/states/AppLogic.State.SplashScreen.cs
+++ b/Zennysoft.Game.Ma.Implementation/App/State/States/AppLogic.State.SplashScreen.cs
@@ -1,7 +1,8 @@
-namespace Zennysoft.Game.Ma;
+namespace Zennysoft.Game.Ma.Implementation;
 
 using Chickensoft.Introspection;
 using Chickensoft.LogicBlocks;
+using Zennysoft.Game.Abstractions;
 
 public partial class AppLogic
 {
diff --git a/Zennysoft.Game.Ma.Implementation/Item/Tags/AccessoryTag.cs b/Zennysoft.Game.Ma.Implementation/Item/Tags/AccessoryTag.cs
new file mode 100644
index 00000000..4dce21db
--- /dev/null
+++ b/Zennysoft.Game.Ma.Implementation/Item/Tags/AccessoryTag.cs
@@ -0,0 +1,8 @@
+namespace Zennysoft.Game.Ma.Implementation;
+
+public enum AccessoryTag
+{
+  None,
+  HalfVTConsumption,
+  StatusEffectImmunity
+}
diff --git a/Zennysoft.Game.Ma.Implementation/Item/Tags/BoxItemTag.cs b/Zennysoft.Game.Ma.Implementation/Item/Tags/BoxItemTag.cs
new file mode 100644
index 00000000..cb86e989
--- /dev/null
+++ b/Zennysoft.Game.Ma.Implementation/Item/Tags/BoxItemTag.cs
@@ -0,0 +1,6 @@
+namespace Zennysoft.Game.Ma.Implementation;
+
+public enum BoxItemTag
+{
+  RandomNewItem,
+}
diff --git a/Zennysoft.Game.Ma.Implementation/Item/Tags/ElementType.cs b/Zennysoft.Game.Ma.Implementation/Item/Tags/ElementType.cs
new file mode 100644
index 00000000..02448dae
--- /dev/null
+++ b/Zennysoft.Game.Ma.Implementation/Item/Tags/ElementType.cs
@@ -0,0 +1,11 @@
+namespace Zennysoft.Game.Ma.Implementation;
+
+public enum ElementType
+{
+  None,
+  Aeolic,
+  Telluric,
+  Hydric,
+  Igneous,
+  Ferrum
+}
diff --git a/Zennysoft.Game.Ma.Implementation/Item/Tags/ItemTag.cs b/Zennysoft.Game.Ma.Implementation/Item/Tags/ItemTag.cs
new file mode 100644
index 00000000..1cd57646
--- /dev/null
+++ b/Zennysoft.Game.Ma.Implementation/Item/Tags/ItemTag.cs
@@ -0,0 +1,7 @@
+namespace Zennysoft.Game.Ma.Implementation;
+
+public enum ItemTag
+{
+  None,
+  BreaksOnChange
+}
diff --git a/Zennysoft.Game.Ma.Implementation/Item/Tags/ThrowableItemTag.cs b/Zennysoft.Game.Ma.Implementation/Item/Tags/ThrowableItemTag.cs
new file mode 100644
index 00000000..397ab19a
--- /dev/null
+++ b/Zennysoft.Game.Ma.Implementation/Item/Tags/ThrowableItemTag.cs
@@ -0,0 +1,10 @@
+namespace Zennysoft.Game.Ma.Implementation;
+
+public enum ThrowableItemTag
+{
+  None,
+  LowerTargetTo1HP,
+  CanChangeAffinity,
+  TeleportToRandomLocation,
+  WarpToExitIfFound
+}
diff --git a/Zennysoft.Game.Ma.Implementation/Item/Tags/UsableItemTag.cs b/Zennysoft.Game.Ma.Implementation/Item/Tags/UsableItemTag.cs
new file mode 100644
index 00000000..495ebc7c
--- /dev/null
+++ b/Zennysoft.Game.Ma.Implementation/Item/Tags/UsableItemTag.cs
@@ -0,0 +1,20 @@
+namespace Zennysoft.Game.Ma.Implementation;
+
+public enum UsableItemTag
+{
+  None,
+  DoubleEXP,
+  IdentifyAllItemsCostHP,
+  BriefImmunity,
+  SwapHPAndVT,
+  TeleportAllEnemiesToRoom,
+  TurnAllEnemiesIntoHealingItem,
+  KillHalfEnemiesInRoom,
+  AbsorbHPFromAllEnemiesInRoom,
+  HealsAllInRoomToMaxHP,
+  DealElementalDamageToAllEnemiesInRoom,
+  RaiseCurrentWeaponAttack,
+  RaiseCurrentDefenseArmor,
+  RaiseLevel,
+  RandomEffect,
+}
diff --git a/Zennysoft.Game.Ma.Implementation/Item/Tags/WeaponTag.cs b/Zennysoft.Game.Ma.Implementation/Item/Tags/WeaponTag.cs
new file mode 100644
index 00000000..84659be2
--- /dev/null
+++ b/Zennysoft.Game.Ma.Implementation/Item/Tags/WeaponTag.cs
@@ -0,0 +1,9 @@
+namespace Zennysoft.Game.Ma.Implementation;
+
+public enum WeaponTag
+{
+  None,
+  SelfDamage,
+  IgnoreAffinity,
+  Knockback,
+}
diff --git a/Zennysoft.Game.Ma.Implementation/EnumTypes.cs b/Zennysoft.Game.Ma.Implementation/JsonConverters/EnumConverters.cs
similarity index 50%
rename from Zennysoft.Game.Ma.Implementation/EnumTypes.cs
rename to Zennysoft.Game.Ma.Implementation/JsonConverters/EnumConverters.cs
index 78b04e56..c3689a8e 100644
--- a/Zennysoft.Game.Ma.Implementation/EnumTypes.cs
+++ b/Zennysoft.Game.Ma.Implementation/JsonConverters/EnumConverters.cs
@@ -2,87 +2,23 @@
 
 namespace Zennysoft.Game.Ma.Implementation;
 
-public enum WeaponTag
-{
-  None,
-  SelfDamage,
-  IgnoreAffinity,
-  Knockback,
-}
-
 [JsonSerializable(typeof(WeaponTag))]
 public partial class WeaponTagEnumContext : JsonSerializerContext;
 
-public enum ItemTag
-{
-  None,
-  BreaksOnChange
-}
-
 [JsonSerializable(typeof(ItemTag))]
 public partial class ItemTagEnumContext : JsonSerializerContext;
 
-public enum AccessoryTag
-{
-  None,
-  HalfVTConsumption,
-  StatusEffectImmunity
-}
-
 [JsonSerializable(typeof(AccessoryTag))]
 public partial class AccessoryTagEnumContext : JsonSerializerContext;
 
-public enum ThrowableItemTag
-{
-  None,
-  LowerTargetTo1HP,
-  CanChangeAffinity,
-  TeleportToRandomLocation,
-  WarpToExitIfFound
-}
-
 [JsonSerializable(typeof(ThrowableItemTag))]
 public partial class ThrowableItemTagEnumContext : JsonSerializerContext;
 
-public enum UsableItemTag
-{
-  None,
-  DoubleEXP,
-  IdentifyAllItemsCostHP,
-  BriefImmunity,
-  SwapHPAndVT,
-  TeleportAllEnemiesToRoom,
-  TurnAllEnemiesIntoHealingItem,
-  KillHalfEnemiesInRoom,
-  AbsorbHPFromAllEnemiesInRoom,
-  HealsAllInRoomToMaxHP,
-  DealElementalDamageToAllEnemiesInRoom,
-  RaiseCurrentWeaponAttack,
-  RaiseCurrentDefenseArmor,
-  RaiseLevel,
-  RandomEffect,
-}
-
 [JsonSerializable(typeof(UsableItemTag))]
 public partial class UsableItemTagEnumContext : JsonSerializerContext;
 
-public enum BoxItemTag
-{
-  RandomNewItem,
-}
-
 [JsonSerializable(typeof(BoxItemTag))]
 public partial class BoxItemTagEnumContext : JsonSerializerContext;
 
-public enum ElementType
-{
-  None,
-  Aeolic,
-  Telluric,
-  Hydric,
-  Igneous,
-  Ferrum
-}
-
 [JsonSerializable(typeof(ElementType))]
 public partial class ElementTypeEnumContext : JsonSerializerContext;
diff --git a/Zennysoft.Game.Ma.Implementation/Texture2DConverter.cs b/Zennysoft.Game.Ma.Implementation/JsonConverters/Texture2DConverter.cs
similarity index 100%
rename from Zennysoft.Game.Ma.Implementation/Texture2DConverter.cs
rename to Zennysoft.Game.Ma.Implementation/JsonConverters/Texture2DConverter.cs
diff --git a/Zennysoft.Game.Ma.Implementation/Zennysoft.Game.Ma.Implementation.csproj b/Zennysoft.Game.Ma.Implementation/Zennysoft.Game.Ma.Implementation.csproj
index c44c8107..e3c32ac0 100644
--- a/Zennysoft.Game.Ma.Implementation/Zennysoft.Game.Ma.Implementation.csproj
+++ b/Zennysoft.Game.Ma.Implementation/Zennysoft.Game.Ma.Implementation.csproj
@@ -10,17 +10,14 @@
 		<PackageReference Include="Chickensoft.GodotNodeInterfaces" Version="2.4.0" />
 		<PackageReference Include="Chickensoft.Introspection" Version="2.2.0" />
 		<PackageReference Include="Chickensoft.Introspection.Generator" Version="2.2.0" />
+		<PackageReference Include="Chickensoft.LogicBlocks" Version="5.16.0" />
 		<PackageReference Include="Chickensoft.Serialization.Godot" Version="0.7.6" />
-		<PackageReference Include="GodotSharp.SourceGenerators" Version="2.5.0" />
-		<PackageReference Include="System.IO.Abstractions" Version="21.2.1" />
+		<PackageReference Include="GodotSharp.SourceGenerators" Version="2.6.0-250131-2115.Release" />
+		<PackageReference Include="System.IO.Abstractions" Version="22.0.11" />
 	</ItemGroup>
 
 	<ItemGroup>
 	  <ProjectReference Include="..\Zennysoft.Game.Abstractions\Zennysoft.Game.Abstractions.csproj" />
 	</ItemGroup>
 
-	<ItemGroup>
-	  <Folder Include="Enums\" />
-	</ItemGroup>
-
 </Project>
diff --git a/Zennysoft.Game.Ma/Ma.csproj b/Zennysoft.Game.Ma/Ma.csproj
index a4da56dc..5cff1b7b 100644
--- a/Zennysoft.Game.Ma/Ma.csproj
+++ b/Zennysoft.Game.Ma/Ma.csproj
@@ -1,51 +1,51 @@
 <Project Sdk="Godot.NET.Sdk/4.4.0">
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <EnableDynamicLoading>true</EnableDynamicLoading>
-    <!-- Use NativeAOT. -->
-    <PublishAot>true</PublishAot>	
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Remove="src\items\weapons\models\**" />
-    <EmbeddedResource Remove="src\items\weapons\models\**" />
-  </ItemGroup>
-  <ItemGroup>
-    <!-- Root the assemblies to avoid trimming. -->
-    <TrimmerRootAssembly Include="GodotSharp" />
-    <TrimmerRootAssembly Include="$(TargetName)" />  
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Chickensoft.AutoInject" Version="2.5.0" />
-    <PackageReference Include="Chickensoft.GodotNodeInterfaces" Version="2.4.0" />
-    <PackageReference Include="Chickensoft.Introspection" Version="2.2.0" />
-    <PackageReference Include="Chickensoft.Introspection.Generator" Version="2.2.0" />
-    <PackageReference Include="Chickensoft.LogicBlocks" Version="5.15.0" />
-    <PackageReference Include="Chickensoft.LogicBlocks.DiagramGenerator" Version="5.15.0" />
-    <PackageReference Include="Chickensoft.SaveFileBuilder" Version="1.1.0" />
-    <PackageReference Include="Chickensoft.Serialization.Godot" Version="0.7.6" />
-    <PackageReference Include="GodotSharp.SourceGenerators" Version="2.5.0" />
-    <PackageReference Include="SimpleInjector" Version="5.5.0" />
-    <PackageReference Include="SSH.NET" Version="2024.2.0" />
-    <PackageReference Include="System.IO.Abstractions" Version="21.2.1" />
-    <PackageReference Include="Zeroconf" Version="3.7.16" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="src\ui\dialogue\" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include=".editorconfig" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Zennysoft.Game.Abstractions\Zennysoft.Game.Abstractions.csproj" />
-    <ProjectReference Include="..\Zennysoft.Game.Ma.Implementation\Zennysoft.Game.Ma.Implementation.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Update="Godot.SourceGenerators" Version="4.4.0-dev.2" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Update="GodotSharp" Version="4.4.0-dev.2" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Update="GodotSharpEditor" Version="4.4.0-dev.2" />
-  </ItemGroup>
+	<PropertyGroup>
+		<TargetFramework>net8.0</TargetFramework>
+		<EnableDynamicLoading>true</EnableDynamicLoading>
+		<!-- Use NativeAOT. -->
+		<PublishAot>true</PublishAot>
+	</PropertyGroup>
+	<ItemGroup>
+		<Compile Remove="src\items\weapons\models\**" />
+		<EmbeddedResource Remove="src\items\weapons\models\**" />
+	</ItemGroup>
+	<ItemGroup>
+		<!-- Root the assemblies to avoid trimming. -->
+		<TrimmerRootAssembly Include="GodotSharp" />
+		<TrimmerRootAssembly Include="$(TargetName)" />
+	</ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="Chickensoft.AutoInject" Version="2.5.0" />
+		<PackageReference Include="Chickensoft.GodotNodeInterfaces" Version="2.4.0" />
+		<PackageReference Include="Chickensoft.Introspection" Version="2.2.0" />
+		<PackageReference Include="Chickensoft.Introspection.Generator" Version="2.2.0" />
+		<PackageReference Include="Chickensoft.LogicBlocks" Version="5.16.0" />
+		<PackageReference Include="Chickensoft.LogicBlocks.DiagramGenerator" Version="5.16.0" />
+		<PackageReference Include="Chickensoft.SaveFileBuilder" Version="1.1.0" />
+		<PackageReference Include="Chickensoft.Serialization.Godot" Version="0.7.6" />
+		<PackageReference Include="GodotSharp.SourceGenerators" Version="2.6.0-250131-2115.Release" />
+		<PackageReference Include="SimpleInjector" Version="5.5.0" />
+		<PackageReference Include="SSH.NET" Version="2024.2.0" />
+		<PackageReference Include="System.IO.Abstractions" Version="22.0.11" />
+		<PackageReference Include="Zeroconf" Version="3.7.16" />
+	</ItemGroup>
+	<ItemGroup>
+		<Folder Include="src\ui\dialogue\" />
+	</ItemGroup>
+	<ItemGroup>
+		<None Include=".editorconfig" />
+	</ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\Zennysoft.Game.Abstractions\Zennysoft.Game.Abstractions.csproj" />
+		<ProjectReference Include="..\Zennysoft.Game.Ma.Implementation\Zennysoft.Game.Ma.Implementation.csproj" />
+	</ItemGroup>
+	<ItemGroup>
+		<PackageReference Update="Godot.SourceGenerators" Version="4.4.0-dev.2" />
+	</ItemGroup>
+	<ItemGroup>
+		<PackageReference Update="GodotSharp" Version="4.4.0-dev.2" />
+	</ItemGroup>
+	<ItemGroup>
+		<PackageReference Update="GodotSharpEditor" Version="4.4.0-dev.2" />
+	</ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Zennysoft.Game.Ma/src/app/App.cs b/Zennysoft.Game.Ma/src/app/App.cs
index bdb69111..a2ac706e 100644
--- a/Zennysoft.Game.Ma/src/app/App.cs
+++ b/Zennysoft.Game.Ma/src/app/App.cs
@@ -2,7 +2,11 @@
 using Chickensoft.GodotNodeInterfaces;
 using Chickensoft.Introspection;
 using Godot;
-using static Zennysoft.Game.Ma.AppLogic.Input;
+using SimpleInjector;
+using SimpleInjector.Lifestyles;
+using Zennysoft.Game.Abstractions;
+using Zennysoft.Game.Ma.Implementation;
+using static Zennysoft.Game.Ma.Implementation.AppLogic.Input;
 
 namespace Zennysoft.Game.Ma;
 
@@ -35,9 +39,17 @@ public partial class App : CanvasLayer, IApp
 
   public void Initialize()
   {
+    var container = new SimpleInjector.Container();
+    container.Options.DefaultScopedLifestyle = new AsyncScopedLifestyle();
+    container.Register<IAppRepo, AppRepo>(Lifestyle.Singleton);
+    container.Register<IAppLogic, AppLogic>(Lifestyle.Singleton);
+    container.Verify();
+
     Instantiator = new Instantiator(GetTree());
-    AppRepo = new AppRepo();
-    AppLogic = new AppLogic();
+
+    AppRepo = container.GetInstance<IAppRepo>();
+    AppLogic = container.GetInstance<IAppLogic>();
+
     AppLogic.Set(AppRepo);
     AppLogic.Set(new AppLogic.Data());
 
diff --git a/Zennysoft.Game.Ma/src/app/domain/AppRepo.cs.uid b/Zennysoft.Game.Ma/src/app/domain/AppRepo.cs.uid
deleted file mode 100644
index 5d5f7646..00000000
--- a/Zennysoft.Game.Ma/src/app/domain/AppRepo.cs.uid
+++ /dev/null
@@ -1 +0,0 @@
-uid://dyd1r1pl5beku
diff --git a/Zennysoft.Game.Ma/src/app/state/AppLogic.Data.cs.uid b/Zennysoft.Game.Ma/src/app/state/AppLogic.Data.cs.uid
deleted file mode 100644
index 79e3b2b9..00000000
--- a/Zennysoft.Game.Ma/src/app/state/AppLogic.Data.cs.uid
+++ /dev/null
@@ -1 +0,0 @@
-uid://cbqvl36d7foae
diff --git a/Zennysoft.Game.Ma/src/app/state/AppLogic.Input.cs.uid b/Zennysoft.Game.Ma/src/app/state/AppLogic.Input.cs.uid
deleted file mode 100644
index d11303c0..00000000
--- a/Zennysoft.Game.Ma/src/app/state/AppLogic.Input.cs.uid
+++ /dev/null
@@ -1 +0,0 @@
-uid://b2hwfi78870pf
diff --git a/Zennysoft.Game.Ma/src/app/state/AppLogic.Output.cs.uid b/Zennysoft.Game.Ma/src/app/state/AppLogic.Output.cs.uid
deleted file mode 100644
index 861b29d3..00000000
--- a/Zennysoft.Game.Ma/src/app/state/AppLogic.Output.cs.uid
+++ /dev/null
@@ -1 +0,0 @@
-uid://dfygx4qdyomdw
diff --git a/Zennysoft.Game.Ma/src/app/state/AppLogic.State.cs.uid b/Zennysoft.Game.Ma/src/app/state/AppLogic.State.cs.uid
deleted file mode 100644
index 4fb055db..00000000
--- a/Zennysoft.Game.Ma/src/app/state/AppLogic.State.cs.uid
+++ /dev/null
@@ -1 +0,0 @@
-uid://dqc8wddrx0txd
diff --git a/Zennysoft.Game.Ma/src/app/state/AppLogic.cs.uid b/Zennysoft.Game.Ma/src/app/state/AppLogic.cs.uid
deleted file mode 100644
index bb3f8cf0..00000000
--- a/Zennysoft.Game.Ma/src/app/state/AppLogic.cs.uid
+++ /dev/null
@@ -1 +0,0 @@
-uid://e51dlkiwpksy
diff --git a/Zennysoft.Game.Ma/src/app/state/AppLogic.g.puml b/Zennysoft.Game.Ma/src/app/state/AppLogic.g.puml
deleted file mode 100644
index ad06be5c..00000000
--- a/Zennysoft.Game.Ma/src/app/state/AppLogic.g.puml
+++ /dev/null
@@ -1,30 +0,0 @@
-@startuml AppLogic
-state "AppLogic State" as Zennysoft_Game_Ma_AppLogic_State {
-  state "InGame" as Zennysoft_Game_Ma_AppLogic_State_InGame
-  state "LeavingMenu" as Zennysoft_Game_Ma_AppLogic_State_LeavingMenu
-  state "LoadingSaveFile" as Zennysoft_Game_Ma_AppLogic_State_LoadingSaveFile
-  state "MainMenu" as Zennysoft_Game_Ma_AppLogic_State_MainMenu
-  state "SplashScreen" as Zennysoft_Game_Ma_AppLogic_State_SplashScreen
-}
-
-Zennysoft_Game_Ma_AppLogic_State_InGame --> Zennysoft_Game_Ma_AppLogic_State_MainMenu : GameOver
-Zennysoft_Game_Ma_AppLogic_State_LeavingMenu --> Zennysoft_Game_Ma_AppLogic_State_InGame : FadeOutFinished
-Zennysoft_Game_Ma_AppLogic_State_LeavingMenu --> Zennysoft_Game_Ma_AppLogic_State_LoadingSaveFile : FadeOutFinished
-Zennysoft_Game_Ma_AppLogic_State_LoadingSaveFile --> Zennysoft_Game_Ma_AppLogic_State_InGame : SaveFileLoaded
-Zennysoft_Game_Ma_AppLogic_State_MainMenu --> Zennysoft_Game_Ma_AppLogic_State_LeavingMenu : LoadGame
-Zennysoft_Game_Ma_AppLogic_State_MainMenu --> Zennysoft_Game_Ma_AppLogic_State_LeavingMenu : NewGame
-Zennysoft_Game_Ma_AppLogic_State_MainMenu --> Zennysoft_Game_Ma_AppLogic_State_MainMenu : QuitGame
-Zennysoft_Game_Ma_AppLogic_State_SplashScreen --> Zennysoft_Game_Ma_AppLogic_State_MainMenu : FadeOutFinished
-
-Zennysoft_Game_Ma_AppLogic_State_InGame : OnEnter → ShowGame
-Zennysoft_Game_Ma_AppLogic_State_InGame : OnExit → HideGame
-Zennysoft_Game_Ma_AppLogic_State_InGame : OnGameOver → RemoveExistingGame
-Zennysoft_Game_Ma_AppLogic_State_LeavingMenu : OnEnter → FadeToBlack
-Zennysoft_Game_Ma_AppLogic_State_LoadingSaveFile : OnEnter → StartLoadingSaveFile
-Zennysoft_Game_Ma_AppLogic_State_MainMenu : OnEnter → SetupGameScene, ShowMainMenu
-Zennysoft_Game_Ma_AppLogic_State_MainMenu : OnQuitGame → ExitGame
-Zennysoft_Game_Ma_AppLogic_State_SplashScreen : OnEnter → ShowSplashScreen
-Zennysoft_Game_Ma_AppLogic_State_SplashScreen : OnSplashScreenSkipped() → HideSplashScreen
-
-[*] --> Zennysoft_Game_Ma_AppLogic_State_SplashScreen
-@enduml
\ No newline at end of file
diff --git a/Zennysoft.Game.Ma/src/app/state/states/AppLogic.State.InGame.cs.uid b/Zennysoft.Game.Ma/src/app/state/states/AppLogic.State.InGame.cs.uid
deleted file mode 100644
index cea3173d..00000000
--- a/Zennysoft.Game.Ma/src/app/state/states/AppLogic.State.InGame.cs.uid
+++ /dev/null
@@ -1 +0,0 @@
-uid://ckb88dvtckagu
diff --git a/Zennysoft.Game.Ma/src/app/state/states/AppLogic.State.LeavingMenu.cs.uid b/Zennysoft.Game.Ma/src/app/state/states/AppLogic.State.LeavingMenu.cs.uid
deleted file mode 100644
index 384dfea9..00000000
--- a/Zennysoft.Game.Ma/src/app/state/states/AppLogic.State.LeavingMenu.cs.uid
+++ /dev/null
@@ -1 +0,0 @@
-uid://du7y6o0h004sm
diff --git a/Zennysoft.Game.Ma/src/app/state/states/AppLogic.State.LoadingSaveFile.cs.uid b/Zennysoft.Game.Ma/src/app/state/states/AppLogic.State.LoadingSaveFile.cs.uid
deleted file mode 100644
index eea01249..00000000
--- a/Zennysoft.Game.Ma/src/app/state/states/AppLogic.State.LoadingSaveFile.cs.uid
+++ /dev/null
@@ -1 +0,0 @@
-uid://b5j2df20jd05i
diff --git a/Zennysoft.Game.Ma/src/app/state/states/AppLogic.State.MainMenu.cs.uid b/Zennysoft.Game.Ma/src/app/state/states/AppLogic.State.MainMenu.cs.uid
deleted file mode 100644
index 9719320d..00000000
--- a/Zennysoft.Game.Ma/src/app/state/states/AppLogic.State.MainMenu.cs.uid
+++ /dev/null
@@ -1 +0,0 @@
-uid://b5ehfb8l8u2fy
diff --git a/Zennysoft.Game.Ma/src/app/state/states/AppLogic.State.SetupGameScene.cs.uid b/Zennysoft.Game.Ma/src/app/state/states/AppLogic.State.SetupGameScene.cs.uid
deleted file mode 100644
index a568e995..00000000
--- a/Zennysoft.Game.Ma/src/app/state/states/AppLogic.State.SetupGameScene.cs.uid
+++ /dev/null
@@ -1 +0,0 @@
-uid://ddceu88ak7e41
diff --git a/Zennysoft.Game.Ma/src/app/state/states/AppLogic.State.SplashScreen.cs.uid b/Zennysoft.Game.Ma/src/app/state/states/AppLogic.State.SplashScreen.cs.uid
deleted file mode 100644
index 8e595471..00000000
--- a/Zennysoft.Game.Ma/src/app/state/states/AppLogic.State.SplashScreen.cs.uid
+++ /dev/null
@@ -1 +0,0 @@
-uid://dxbrwt7jduxu8
diff --git a/Zennysoft.Game.Ma/src/app/state/states/InGame.cs.uid b/Zennysoft.Game.Ma/src/app/state/states/InGame.cs.uid
deleted file mode 100644
index 1180ec0b..00000000
--- a/Zennysoft.Game.Ma/src/app/state/states/InGame.cs.uid
+++ /dev/null
@@ -1 +0,0 @@
-uid://xix7akau8f8g
diff --git a/Zennysoft.Game.Ma/src/app/state/states/LoadingScreen.cs.uid b/Zennysoft.Game.Ma/src/app/state/states/LoadingScreen.cs.uid
deleted file mode 100644
index 720c7ac8..00000000
--- a/Zennysoft.Game.Ma/src/app/state/states/LoadingScreen.cs.uid
+++ /dev/null
@@ -1 +0,0 @@
-uid://cm2spwox38qgx
diff --git a/Zennysoft.Game.Ma/src/app/state/states/MainMenu.cs.uid b/Zennysoft.Game.Ma/src/app/state/states/MainMenu.cs.uid
deleted file mode 100644
index 7d0c0e2d..00000000
--- a/Zennysoft.Game.Ma/src/app/state/states/MainMenu.cs.uid
+++ /dev/null
@@ -1 +0,0 @@
-uid://bjhw05eivyte3
diff --git a/Zennysoft.Game.Ma/src/audio/InGameAudio.cs b/Zennysoft.Game.Ma/src/audio/InGameAudio.cs
index bc8bdcdb..3f53992b 100644
--- a/Zennysoft.Game.Ma/src/audio/InGameAudio.cs
+++ b/Zennysoft.Game.Ma/src/audio/InGameAudio.cs
@@ -2,6 +2,7 @@ using Chickensoft.AutoInject;
 using Chickensoft.GodotNodeInterfaces;
 using Chickensoft.Introspection;
 using Godot;
+using Zennysoft.Game.Abstractions;
 
 namespace Zennysoft.Game.Ma;
 
diff --git a/Zennysoft.Game.Ma/src/enemy/NavigationAgentClient.cs b/Zennysoft.Game.Ma/src/enemy/NavigationAgentClient.cs
index 097e0003..ef325656 100644
--- a/Zennysoft.Game.Ma/src/enemy/NavigationAgentClient.cs
+++ b/Zennysoft.Game.Ma/src/enemy/NavigationAgentClient.cs
@@ -1,9 +1,9 @@
 using Chickensoft.AutoInject;
 using Chickensoft.Introspection;
-using Zennysoft.Game.Ma.src.enemy;
 using Godot;
 using System;
 using System.Threading.Tasks;
+using Zennysoft.Game.Abstractions;
 
 namespace Zennysoft.Game.Ma;
 
diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/01. sproingy/Sproingy.cs b/Zennysoft.Game.Ma/src/enemy/enemy_types/01. sproingy/Sproingy.cs
index 11dee248..98ca1699 100644
--- a/Zennysoft.Game.Ma/src/enemy/enemy_types/01. sproingy/Sproingy.cs	
+++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/01. sproingy/Sproingy.cs	
@@ -1,7 +1,7 @@
 using Chickensoft.AutoInject;
 using Chickensoft.Introspection;
-using Zennysoft.Game.Ma.src.enemy;
 using Godot;
+using Zennysoft.Game.Abstractions;
 using Zennysoft.Game.Ma.Implementation;
 
 namespace Zennysoft.Game.Ma;
diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/02. michael/Michael.cs b/Zennysoft.Game.Ma/src/enemy/enemy_types/02. michael/Michael.cs
index 64c1308c..79aefe56 100644
--- a/Zennysoft.Game.Ma/src/enemy/enemy_types/02. michael/Michael.cs	
+++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/02. michael/Michael.cs	
@@ -1,7 +1,7 @@
 using Chickensoft.AutoInject;
 using Chickensoft.Introspection;
-using Zennysoft.Game.Ma.src.enemy;
 using Godot;
+using Zennysoft.Game.Abstractions;
 using Zennysoft.Game.Ma.Implementation;
 
 namespace Zennysoft.Game.Ma;
diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/07. chinthe/Chinthe.cs b/Zennysoft.Game.Ma/src/enemy/enemy_types/07. chinthe/Chinthe.cs
index 19848318..515d1cb3 100644
--- a/Zennysoft.Game.Ma/src/enemy/enemy_types/07. chinthe/Chinthe.cs	
+++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/07. chinthe/Chinthe.cs	
@@ -1,7 +1,7 @@
 using Chickensoft.AutoInject;
 using Chickensoft.Introspection;
-using Zennysoft.Game.Ma.src.enemy;
 using Godot;
+using Zennysoft.Game.Abstractions;
 using Zennysoft.Game.Ma.Implementation;
 
 namespace Zennysoft.Game.Ma;
diff --git a/Zennysoft.Game.Ma/src/game/state/states/GameLogic.State.MenuBackdrop.cs b/Zennysoft.Game.Ma/src/game/state/states/GameLogic.State.MenuBackdrop.cs
index d05531f8..79797531 100644
--- a/Zennysoft.Game.Ma/src/game/state/states/GameLogic.State.MenuBackdrop.cs
+++ b/Zennysoft.Game.Ma/src/game/state/states/GameLogic.State.MenuBackdrop.cs
@@ -1,6 +1,7 @@
 namespace Zennysoft.Game.Ma;
 
 using Chickensoft.Introspection;
+using Zennysoft.Game.Abstractions;
 
 public partial class GameLogic
 {
diff --git a/Zennysoft.Game.Ma/src/menu/splash/Splash.cs b/Zennysoft.Game.Ma/src/menu/splash/Splash.cs
index f31f3908..b7e2cb72 100644
--- a/Zennysoft.Game.Ma/src/menu/splash/Splash.cs
+++ b/Zennysoft.Game.Ma/src/menu/splash/Splash.cs
@@ -2,6 +2,7 @@
 using Chickensoft.GodotNodeInterfaces;
 using Chickensoft.Introspection;
 using Godot;
+using Zennysoft.Game.Abstractions;
 
 namespace Zennysoft.Game.Ma;
 
diff --git a/Zennysoft.Game.Ma/src/player/state/states/PlayerLogic.State.Disabled.cs b/Zennysoft.Game.Ma/src/player/state/states/PlayerLogic.State.Disabled.cs
index 04065a78..3c8f663c 100644
--- a/Zennysoft.Game.Ma/src/player/state/states/PlayerLogic.State.Disabled.cs
+++ b/Zennysoft.Game.Ma/src/player/state/states/PlayerLogic.State.Disabled.cs
@@ -1,4 +1,5 @@
 using Chickensoft.Introspection;
+using Zennysoft.Game.Abstractions;
 
 namespace Zennysoft.Game.Ma;