diff --git a/src/main/java/electrosphere/client/ui/components/EquipmentInventoryPanel.java b/src/main/java/electrosphere/client/ui/components/EquipmentInventoryPanel.java
index a5fd3bb2..7ffba097 100644
--- a/src/main/java/electrosphere/client/ui/components/EquipmentInventoryPanel.java
+++ b/src/main/java/electrosphere/client/ui/components/EquipmentInventoryPanel.java
@@ -5,6 +5,7 @@ import java.util.List;
 import electrosphere.audio.VirtualAudioSourceManager.VirtualAudioSourceType;
 import electrosphere.client.ui.menu.WindowStrings;
 import electrosphere.client.ui.menu.WindowUtils;
+import electrosphere.client.ui.menu.ingame.PlayerInventoryWindow;
 import electrosphere.data.creature.equip.EquipPoint;
 import electrosphere.data.item.Item;
 import electrosphere.engine.Globals;
diff --git a/src/main/java/electrosphere/client/ui/components/ItemIconPanel.java b/src/main/java/electrosphere/client/ui/components/ItemIconPanel.java
index 72902dfa..b7a3efad 100644
--- a/src/main/java/electrosphere/client/ui/components/ItemIconPanel.java
+++ b/src/main/java/electrosphere/client/ui/components/ItemIconPanel.java
@@ -3,6 +3,7 @@ package electrosphere.client.ui.components;
 import electrosphere.audio.VirtualAudioSourceManager.VirtualAudioSourceType;
 import electrosphere.client.ui.menu.WindowStrings;
 import electrosphere.client.ui.menu.WindowUtils;
+import electrosphere.client.ui.menu.ingame.PlayerInventoryWindow;
 import electrosphere.data.item.Item;
 import electrosphere.engine.Globals;
 import electrosphere.engine.assetmanager.AssetDataStrings;
diff --git a/src/main/java/electrosphere/client/ui/components/NaturalInventoryPanel.java b/src/main/java/electrosphere/client/ui/components/NaturalInventoryPanel.java
index 262049d9..93ede7f5 100644
--- a/src/main/java/electrosphere/client/ui/components/NaturalInventoryPanel.java
+++ b/src/main/java/electrosphere/client/ui/components/NaturalInventoryPanel.java
@@ -3,6 +3,7 @@ package electrosphere.client.ui.components;
 import electrosphere.audio.VirtualAudioSourceManager.VirtualAudioSourceType;
 import electrosphere.client.ui.menu.WindowStrings;
 import electrosphere.client.ui.menu.WindowUtils;
+import electrosphere.client.ui.menu.ingame.PlayerInventoryWindow;
 import electrosphere.data.item.Item;
 import electrosphere.engine.Globals;
 import electrosphere.engine.assetmanager.AssetDataStrings;
diff --git a/src/main/java/electrosphere/client/ui/components/ToolbarInventoryPanel.java b/src/main/java/electrosphere/client/ui/components/ToolbarInventoryPanel.java
index 36d7794a..84af6154 100644
--- a/src/main/java/electrosphere/client/ui/components/ToolbarInventoryPanel.java
+++ b/src/main/java/electrosphere/client/ui/components/ToolbarInventoryPanel.java
@@ -5,6 +5,7 @@ import org.joml.Vector4f;
 import electrosphere.audio.VirtualAudioSourceManager.VirtualAudioSourceType;
 import electrosphere.client.ui.menu.WindowStrings;
 import electrosphere.client.ui.menu.WindowUtils;
+import electrosphere.client.ui.menu.ingame.PlayerInventoryWindow;
 import electrosphere.data.item.Item;
 import electrosphere.engine.Globals;
 import electrosphere.engine.assetmanager.AssetDataStrings;
diff --git a/src/main/java/electrosphere/client/ui/menu/WindowUtils.java b/src/main/java/electrosphere/client/ui/menu/WindowUtils.java
index cbaf807d..3457d1b0 100644
--- a/src/main/java/electrosphere/client/ui/menu/WindowUtils.java
+++ b/src/main/java/electrosphere/client/ui/menu/WindowUtils.java
@@ -1,10 +1,10 @@
 package electrosphere.client.ui.menu;
 
 import electrosphere.audio.VirtualAudioSourceManager.VirtualAudioSourceType;
-import electrosphere.client.ui.components.PlayerInventoryWindow;
 import electrosphere.client.ui.menu.ingame.CraftingWindow;
 import electrosphere.client.ui.menu.ingame.InteractionTargetMenu;
 import electrosphere.client.ui.menu.ingame.MenuGeneratorsInventory;
+import electrosphere.client.ui.menu.ingame.PlayerInventoryWindow;
 import electrosphere.client.ui.menu.mainmenu.MenuGeneratorsTitleMenu;
 import electrosphere.controls.ControlHandler.ControlsState;
 import electrosphere.engine.Globals;
diff --git a/src/main/java/electrosphere/client/ui/menu/ingame/MenuGeneratorsInventory.java b/src/main/java/electrosphere/client/ui/menu/ingame/MenuGeneratorsInventory.java
index c917e633..39a0bc1b 100644
--- a/src/main/java/electrosphere/client/ui/menu/ingame/MenuGeneratorsInventory.java
+++ b/src/main/java/electrosphere/client/ui/menu/ingame/MenuGeneratorsInventory.java
@@ -1,7 +1,6 @@
 package electrosphere.client.ui.menu.ingame;
 
 import electrosphere.audio.VirtualAudioSourceManager.VirtualAudioSourceType;
-import electrosphere.client.ui.components.PlayerInventoryWindow;
 import electrosphere.client.ui.menu.WindowStrings;
 import electrosphere.client.ui.menu.WindowUtils;
 import electrosphere.data.item.Item;
diff --git a/src/main/java/electrosphere/client/ui/components/PlayerInventoryWindow.java b/src/main/java/electrosphere/client/ui/menu/ingame/PlayerInventoryWindow.java
similarity index 91%
rename from src/main/java/electrosphere/client/ui/components/PlayerInventoryWindow.java
rename to src/main/java/electrosphere/client/ui/menu/ingame/PlayerInventoryWindow.java
index 0a5f5463..21cb3358 100644
--- a/src/main/java/electrosphere/client/ui/components/PlayerInventoryWindow.java
+++ b/src/main/java/electrosphere/client/ui/menu/ingame/PlayerInventoryWindow.java
@@ -1,6 +1,10 @@
-package electrosphere.client.ui.components;
+package electrosphere.client.ui.menu.ingame;
 
 import electrosphere.audio.VirtualAudioSourceManager.VirtualAudioSourceType;
+import electrosphere.client.ui.components.EquipmentInventoryPanel;
+import electrosphere.client.ui.components.ItemIconPanel;
+import electrosphere.client.ui.components.NaturalInventoryPanel;
+import electrosphere.client.ui.components.ToolbarInventoryPanel;
 import electrosphere.client.ui.menu.WindowStrings;
 import electrosphere.client.ui.menu.WindowUtils;
 import electrosphere.controls.ControlHandler.ControlsState;
diff --git a/src/main/java/electrosphere/controls/categories/ControlCategoryMainGame.java b/src/main/java/electrosphere/controls/categories/ControlCategoryMainGame.java
index ad3f1e32..eff723a7 100644
--- a/src/main/java/electrosphere/controls/categories/ControlCategoryMainGame.java
+++ b/src/main/java/electrosphere/controls/categories/ControlCategoryMainGame.java
@@ -11,11 +11,11 @@ import electrosphere.client.entity.camera.CameraEntityUtils;
 import electrosphere.client.entity.crosshair.Crosshair;
 import electrosphere.client.interact.ButtonInteraction;
 import electrosphere.client.interact.ItemActions;
-import electrosphere.client.ui.components.PlayerInventoryWindow;
 import electrosphere.client.ui.menu.WindowStrings;
 import electrosphere.client.ui.menu.WindowUtils;
 import electrosphere.client.ui.menu.ingame.CraftingWindow;
 import electrosphere.client.ui.menu.ingame.MenuGeneratorsInGame;
+import electrosphere.client.ui.menu.ingame.PlayerInventoryWindow;
 import electrosphere.controls.Control;
 import electrosphere.controls.Control.ControlMethod;
 import electrosphere.controls.Control.ControlType;