diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..5156c48
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "src/Libs/External/MonoGame.ImGuiNet"]
+	path = src/Libs/External/MonoGame.ImGuiNet
+	url = git@github.com:Mezo-hx/MonoGame.ImGuiNet.git
diff --git a/src/Libs/External/MonoGame.ImGuiNet b/src/Libs/External/MonoGame.ImGuiNet
new file mode 160000
index 0000000..b4c81c6
--- /dev/null
+++ b/src/Libs/External/MonoGame.ImGuiNet
@@ -0,0 +1 @@
+Subproject commit b4c81c63cb0cf7ecfbf8877d0f7a6fea301c001f
diff --git a/src/Libs/Features.Debugging/EntitiesList.cs b/src/Libs/Systems.Debugging/EntitiesList.cs
similarity index 93%
rename from src/Libs/Features.Debugging/EntitiesList.cs
rename to src/Libs/Systems.Debugging/EntitiesList.cs
index 5653e6e..530664d 100644
--- a/src/Libs/Features.Debugging/EntitiesList.cs
+++ b/src/Libs/Systems.Debugging/EntitiesList.cs
@@ -1,7 +1,7 @@
 using Components.Data;
 using Scellecs.Morpeh;
 
-namespace Features.Debugging;
+namespace Systems.Debugging;
 
 public class EntitiesList : ISystem
 {
diff --git a/src/Libs/Systems.Debugging/Systems.Debugging.csproj b/src/Libs/Systems.Debugging/Systems.Debugging.csproj
index b85a1a4..49dd10b 100644
--- a/src/Libs/Systems.Debugging/Systems.Debugging.csproj
+++ b/src/Libs/Systems.Debugging/Systems.Debugging.csproj
@@ -10,4 +10,14 @@
       <PackageReference Include="Serilog" Version="2.12.0" />
     </ItemGroup>
 
+    <ItemGroup>
+      <Reference Include="Scellecs.Morpeh">
+        <HintPath>..\..\..\..\..\.nuget\packages\scellecs.morpeh\2023.1.0\lib\netstandard2.1\Scellecs.Morpeh.dll</HintPath>
+      </Reference>
+    </ItemGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\Components\Components.csproj" />
+    </ItemGroup>
+
 </Project>