diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/decorative/CargoCrateBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/decorative/CargoCrateBlockEntity.kt
index b6b9af778..aa762442c 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/decorative/CargoCrateBlockEntity.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/decorative/CargoCrateBlockEntity.kt
@@ -36,7 +36,7 @@ import ru.dbotthepony.mc.otm.container.MatteryContainerHooks
 import ru.dbotthepony.mc.otm.core.TranslatableComponent
 import ru.dbotthepony.mc.otm.core.nbt.map
 import ru.dbotthepony.mc.otm.core.nbt.set
-import ru.dbotthepony.mc.otm.menu.CargoCrateMenu
+import ru.dbotthepony.mc.otm.menu.decorative.CargoCrateMenu
 import ru.dbotthepony.mc.otm.registry.MBlockEntities
 import ru.dbotthepony.mc.otm.registry.MSoundEvents
 
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/decorative/HoloSignBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/decorative/HoloSignBlockEntity.kt
index 760b447f4..7d2283702 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/decorative/HoloSignBlockEntity.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/decorative/HoloSignBlockEntity.kt
@@ -10,7 +10,7 @@ import net.minecraft.world.inventory.AbstractContainerMenu
 import net.minecraft.world.level.block.state.BlockState
 import ru.dbotthepony.mc.otm.block.entity.SynchronizedBlockEntity
 import ru.dbotthepony.mc.otm.core.nbt.set
-import ru.dbotthepony.mc.otm.menu.HoloSignMenu
+import ru.dbotthepony.mc.otm.menu.decorative.HoloSignMenu
 import ru.dbotthepony.mc.otm.registry.MBlockEntities
 import ru.dbotthepony.mc.otm.registry.MBlocks
 
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterCapacitorBankBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterCapacitorBankBlockEntity.kt
index b20dce44f..a12a8c866 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterCapacitorBankBlockEntity.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterCapacitorBankBlockEntity.kt
@@ -28,7 +28,7 @@ import ru.dbotthepony.mc.otm.core.ifPresentK
 import ru.dbotthepony.mc.otm.graph.Graph6Node
 import ru.dbotthepony.mc.otm.graph.matter.IMatterGraphNode
 import ru.dbotthepony.mc.otm.graph.matter.MatterNetworkGraph
-import ru.dbotthepony.mc.otm.menu.MatterCapacitorBankMenu
+import ru.dbotthepony.mc.otm.menu.matter.MatterCapacitorBankMenu
 import ru.dbotthepony.mc.otm.registry.MBlockEntities
 import ru.dbotthepony.mc.otm.core.nbt.map
 import ru.dbotthepony.mc.otm.core.nbt.set
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterDecomposerBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterDecomposerBlockEntity.kt
index c05623c36..2b6c5a25c 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterDecomposerBlockEntity.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterDecomposerBlockEntity.kt
@@ -32,7 +32,7 @@ import ru.dbotthepony.mc.otm.graph.Graph6Node
 import ru.dbotthepony.mc.otm.graph.matter.IMatterGraphNode
 import ru.dbotthepony.mc.otm.graph.matter.MatterNetworkGraph
 import ru.dbotthepony.mc.otm.item.MatterDustItem
-import ru.dbotthepony.mc.otm.menu.MatterDecomposerMenu
+import ru.dbotthepony.mc.otm.menu.matter.MatterDecomposerMenu
 import ru.dbotthepony.mc.otm.registry.MBlockEntities
 import ru.dbotthepony.mc.otm.registry.MBlocks
 import ru.dbotthepony.mc.otm.registry.MItems
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterPanelBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterPanelBlockEntity.kt
index 26494ce9d..2fe317f8d 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterPanelBlockEntity.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterPanelBlockEntity.kt
@@ -3,7 +3,7 @@ package ru.dbotthepony.mc.otm.block.entity.matter
 import net.minecraft.core.BlockPos
 import net.minecraft.core.Direction
 import net.minecraft.world.level.block.state.BlockState
-import ru.dbotthepony.mc.otm.menu.MatterPanelMenu
+import ru.dbotthepony.mc.otm.menu.matter.MatterPanelMenu
 import net.minecraft.world.entity.player.Inventory
 import net.minecraft.world.entity.player.Player
 import net.minecraft.world.inventory.AbstractContainerMenu
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterRecyclerBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterRecyclerBlockEntity.kt
index 12b1cfccd..66bbb4c06 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterRecyclerBlockEntity.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterRecyclerBlockEntity.kt
@@ -34,7 +34,7 @@ import ru.dbotthepony.mc.otm.graph.matter.IMatterGraphNode
 import ru.dbotthepony.mc.otm.graph.matter.MatterNetworkGraph
 import ru.dbotthepony.mc.otm.item.MatterDustItem
 import ru.dbotthepony.mc.otm.core.nbt.map
-import ru.dbotthepony.mc.otm.menu.MatterRecyclerMenu
+import ru.dbotthepony.mc.otm.menu.matter.MatterRecyclerMenu
 import ru.dbotthepony.mc.otm.registry.MBlockEntities
 import ru.dbotthepony.mc.otm.core.math.DecimalConfigValue
 import ru.dbotthepony.mc.otm.core.math.defineDecimal
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterScannerBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterScannerBlockEntity.kt
index 964f7e16a..be8ab1bb4 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterScannerBlockEntity.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterScannerBlockEntity.kt
@@ -33,7 +33,7 @@ import ru.dbotthepony.mc.otm.core.nbt.map
 import ru.dbotthepony.mc.otm.graph.Graph6Node
 import ru.dbotthepony.mc.otm.graph.matter.IMatterGraphNode
 import ru.dbotthepony.mc.otm.graph.matter.MatterNetworkGraph
-import ru.dbotthepony.mc.otm.menu.MatterScannerMenu
+import ru.dbotthepony.mc.otm.menu.matter.MatterScannerMenu
 import ru.dbotthepony.mc.otm.registry.MBlockEntities
 import ru.dbotthepony.mc.otm.registry.MBlocks
 import ru.dbotthepony.mc.otm.registry.MNames
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/PatternStorageBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/PatternStorageBlockEntity.kt
index e733387f1..759d29f70 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/PatternStorageBlockEntity.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/PatternStorageBlockEntity.kt
@@ -13,7 +13,7 @@ import net.minecraftforge.common.util.LazyOptional
 import net.minecraft.world.entity.player.Inventory
 import net.minecraft.world.entity.player.Player
 import net.minecraft.world.inventory.AbstractContainerMenu
-import ru.dbotthepony.mc.otm.menu.PatternStorageMenu
+import ru.dbotthepony.mc.otm.menu.matter.PatternStorageMenu
 import net.minecraft.MethodsReturnNonnullByDefault
 import net.minecraft.core.Direction
 import net.minecraft.network.chat.Component
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/storage/DriveRackBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/storage/DriveRackBlockEntity.kt
index f0fd113eb..8984c1174 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/storage/DriveRackBlockEntity.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/storage/DriveRackBlockEntity.kt
@@ -19,7 +19,7 @@ import ru.dbotthepony.mc.otm.graph.storage.BasicStorageGraphNode
 import ru.dbotthepony.mc.otm.capability.MatteryCapability
 import ru.dbotthepony.mc.otm.capability.energy.WorkerEnergyStorage
 import ru.dbotthepony.mc.otm.container.MatteryContainer
-import ru.dbotthepony.mc.otm.menu.DriveRackMenu
+import ru.dbotthepony.mc.otm.menu.storage.DriveRackMenu
 import ru.dbotthepony.mc.otm.core.nbt.map
 import ru.dbotthepony.mc.otm.core.nbt.set
 import ru.dbotthepony.mc.otm.graph.storage.StorageNetworkGraph
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/storage/StorageBusBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/storage/StorageBusBlockEntity.kt
index f9c6d2cb8..d85cdd401 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/storage/StorageBusBlockEntity.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/storage/StorageBusBlockEntity.kt
@@ -37,7 +37,7 @@ import ru.dbotthepony.mc.otm.graph.Graph6Node
 import ru.dbotthepony.mc.otm.graph.GraphNodeListener
 import ru.dbotthepony.mc.otm.graph.storage.BasicStorageGraphNode
 import ru.dbotthepony.mc.otm.graph.storage.StorageNetworkGraph
-import ru.dbotthepony.mc.otm.menu.StorageBusMenu
+import ru.dbotthepony.mc.otm.menu.storage.StorageBusMenu
 import ru.dbotthepony.mc.otm.registry.MBlockEntities
 import ru.dbotthepony.mc.otm.registry.MBlocks
 import ru.dbotthepony.mc.otm.storage.*
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/storage/StorageInterfaces.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/storage/StorageInterfaces.kt
index 0e5f177a0..80c059349 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/storage/StorageInterfaces.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/storage/StorageInterfaces.kt
@@ -36,8 +36,8 @@ import ru.dbotthepony.mc.otm.graph.Graph6Node
 import ru.dbotthepony.mc.otm.graph.GraphNodeListener
 import ru.dbotthepony.mc.otm.graph.storage.BasicStorageGraphNode
 import ru.dbotthepony.mc.otm.graph.storage.StorageNetworkGraph
-import ru.dbotthepony.mc.otm.menu.StorageExporterMenu
-import ru.dbotthepony.mc.otm.menu.StorageImporterMenu
+import ru.dbotthepony.mc.otm.menu.storage.StorageExporterMenu
+import ru.dbotthepony.mc.otm.menu.storage.StorageImporterMenu
 import ru.dbotthepony.mc.otm.registry.MBlockEntities
 import ru.dbotthepony.mc.otm.registry.MNames
 import ru.dbotthepony.mc.otm.storage.*
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/storage/StoragePowerSupplierBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/storage/StoragePowerSupplierBlockEntity.kt
index a9e2f61ab..d9cc36200 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/storage/StoragePowerSupplierBlockEntity.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/storage/StoragePowerSupplierBlockEntity.kt
@@ -22,7 +22,7 @@ import ru.dbotthepony.mc.otm.capability.energy.transferChecked
 import ru.dbotthepony.mc.otm.core.math.Decimal
 import ru.dbotthepony.mc.otm.graph.storage.BasicStorageGraphNode
 import ru.dbotthepony.mc.otm.graph.storage.StorageNetworkGraph
-import ru.dbotthepony.mc.otm.menu.StoragePowerSupplierMenu
+import ru.dbotthepony.mc.otm.menu.storage.StoragePowerSupplierMenu
 import ru.dbotthepony.mc.otm.registry.MBlockEntities
 import ru.dbotthepony.mc.otm.registry.MNames
 import ru.dbotthepony.mc.otm.core.math.getDecimal
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/AndroidStationBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/AndroidStationBlockEntity.kt
index 433a754a6..1779b1100 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/AndroidStationBlockEntity.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/AndroidStationBlockEntity.kt
@@ -19,7 +19,7 @@ import ru.dbotthepony.mc.otm.core.math.Decimal
 import ru.dbotthepony.mc.otm.core.math.DecimalConfigValue
 import ru.dbotthepony.mc.otm.core.math.defineDecimal
 import ru.dbotthepony.mc.otm.core.ifPresentK
-import ru.dbotthepony.mc.otm.menu.AndroidStationMenu
+import ru.dbotthepony.mc.otm.menu.tech.AndroidStationMenu
 import ru.dbotthepony.mc.otm.registry.MBlockEntities
 import ru.dbotthepony.mc.otm.registry.MBlocks
 import ru.dbotthepony.mc.otm.registry.MNames
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/BatteryBankBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/BatteryBankBlockEntity.kt
index 56f62e2ab..5e6b4ab70 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/BatteryBankBlockEntity.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/BatteryBankBlockEntity.kt
@@ -31,7 +31,7 @@ import ru.dbotthepony.mc.otm.core.math.Decimal
 import ru.dbotthepony.mc.otm.core.math.unaryMinus
 import ru.dbotthepony.mc.otm.core.nbt.set
 import ru.dbotthepony.mc.otm.core.util.BESubscribeList
-import ru.dbotthepony.mc.otm.menu.BatteryBankMenu
+import ru.dbotthepony.mc.otm.menu.tech.BatteryBankMenu
 import ru.dbotthepony.mc.otm.registry.MBlockEntities
 
 class BatteryBankBlockEntity(p_155229_: BlockPos, p_155230_: BlockState) : MatteryBlockEntity(MBlockEntities.BATTERY_BANK, p_155229_, p_155230_), IDroppableContainer {
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/ChemicalGeneratorBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/ChemicalGeneratorBlockEntity.kt
index 31cb59c84..fdb3b94f7 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/ChemicalGeneratorBlockEntity.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/ChemicalGeneratorBlockEntity.kt
@@ -27,7 +27,7 @@ import ru.dbotthepony.mc.otm.capability.energy.GeneratorEnergyStorage
 import ru.dbotthepony.mc.otm.container.MatteryContainer
 import ru.dbotthepony.mc.otm.container.MatteryContainerHooks
 import ru.dbotthepony.mc.otm.core.*
-import ru.dbotthepony.mc.otm.menu.ChemicalGeneratorMenu
+import ru.dbotthepony.mc.otm.menu.tech.ChemicalGeneratorMenu
 import ru.dbotthepony.mc.otm.registry.MBlockEntities
 import ru.dbotthepony.mc.otm.registry.MNames
 import ru.dbotthepony.mc.otm.core.util.WriteOnce
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/EnergyCounterBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/EnergyCounterBlockEntity.kt
index 63849e236..c7dbf226e 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/EnergyCounterBlockEntity.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/EnergyCounterBlockEntity.kt
@@ -29,7 +29,7 @@ import ru.dbotthepony.mc.otm.core.nbt.ifHas
 import ru.dbotthepony.mc.otm.core.nbt.map
 import ru.dbotthepony.mc.otm.core.nbt.set
 import ru.dbotthepony.mc.otm.core.util.BESubscribeList
-import ru.dbotthepony.mc.otm.menu.EnergyCounterMenu
+import ru.dbotthepony.mc.otm.menu.tech.EnergyCounterMenu
 import ru.dbotthepony.mc.otm.registry.MBlockEntities
 import java.util.*
 
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/EnergyServoBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/EnergyServoBlockEntity.kt
index ba0c52a5d..d7c4b9655 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/EnergyServoBlockEntity.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/EnergyServoBlockEntity.kt
@@ -29,7 +29,7 @@ import ru.dbotthepony.mc.otm.container.MatteryContainerHooks
 import ru.dbotthepony.mc.otm.core.math.Decimal
 import ru.dbotthepony.mc.otm.core.nbt.map
 import ru.dbotthepony.mc.otm.core.nbt.set
-import ru.dbotthepony.mc.otm.menu.EnergyServoMenu
+import ru.dbotthepony.mc.otm.menu.tech.EnergyServoMenu
 import ru.dbotthepony.mc.otm.registry.MBlockEntities
 import ru.dbotthepony.mc.otm.registry.MBlocks
 
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/PlatePressBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/PlatePressBlockEntity.kt
index 42513baaf..9b6804ed4 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/PlatePressBlockEntity.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/PlatePressBlockEntity.kt
@@ -21,7 +21,7 @@ import ru.dbotthepony.mc.otm.capability.energy.WorkerEnergyStorage
 import ru.dbotthepony.mc.otm.container.MatteryContainer
 import ru.dbotthepony.mc.otm.container.MatteryContainerHooks
 import ru.dbotthepony.mc.otm.core.math.Decimal
-import ru.dbotthepony.mc.otm.menu.PlatePressMenu
+import ru.dbotthepony.mc.otm.menu.tech.PlatePressMenu
 import ru.dbotthepony.mc.otm.registry.MBlockEntities
 import ru.dbotthepony.mc.otm.registry.MRecipes
 import ru.dbotthepony.mc.otm.core.nbt.map
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/AndroidStationScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/AndroidStationScreen.kt
index 0f62c7a4d..fddf2072f 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/AndroidStationScreen.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/AndroidStationScreen.kt
@@ -30,7 +30,7 @@ import ru.dbotthepony.mc.otm.client.screen.panels.buttons.ButtonPanel
 import ru.dbotthepony.mc.otm.client.screen.widget.WidePowerGaugePanel
 import ru.dbotthepony.mc.otm.core.math.RGBAColor
 import ru.dbotthepony.mc.otm.core.ifPresentK
-import ru.dbotthepony.mc.otm.menu.AndroidStationMenu
+import ru.dbotthepony.mc.otm.menu.tech.AndroidStationMenu
 import ru.dbotthepony.mc.otm.network.MatteryPlayerNetworkChannel
 import ru.dbotthepony.mc.otm.network.AndroidResearchRequestPacket
 import java.util.*
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/BatteryBankScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/BatteryBankScreen.kt
index 8cb61abca..130c7aae1 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/BatteryBankScreen.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/BatteryBankScreen.kt
@@ -1,12 +1,10 @@
 package ru.dbotthepony.mc.otm.client.screen
 
 import net.minecraft.network.chat.Component
-import ru.dbotthepony.mc.otm.menu.BatteryBankMenu
+import ru.dbotthepony.mc.otm.menu.tech.BatteryBankMenu
 import net.minecraft.world.entity.player.Inventory
 import ru.dbotthepony.mc.otm.client.screen.panels.BatterySlotPanel
 import ru.dbotthepony.mc.otm.client.screen.panels.FramePanel
-import ru.dbotthepony.mc.otm.client.screen.panels.SlotPanel
-import ru.dbotthepony.mc.otm.client.screen.widget.PowerGaugePanel
 import ru.dbotthepony.mc.otm.client.screen.widget.WidePowerGaugePanel
 
 class BatteryBankScreen(menu: BatteryBankMenu, p_97742_: Inventory, p_97743_: Component) :
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/CargoCrateScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/CargoCrateScreen.kt
index f941a1f48..d9f37fa14 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/CargoCrateScreen.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/CargoCrateScreen.kt
@@ -5,8 +5,8 @@ import net.minecraft.world.entity.player.Inventory
 import ru.dbotthepony.mc.otm.client.screen.panels.FramePanel
 import ru.dbotthepony.mc.otm.client.screen.panels.GridPanel
 import ru.dbotthepony.mc.otm.client.screen.panels.SlotPanel
-import ru.dbotthepony.mc.otm.menu.CargoCrateMenu
-import ru.dbotthepony.mc.otm.menu.MinecartCargoCrateMenu
+import ru.dbotthepony.mc.otm.menu.decorative.CargoCrateMenu
+import ru.dbotthepony.mc.otm.menu.decorative.MinecartCargoCrateMenu
 
 class CargoCrateScreen(menu: CargoCrateMenu, inventory: Inventory, title: Component) : MatteryScreen<CargoCrateMenu>(menu, inventory, title) {
 	override fun makeMainFrame(): FramePanel<MatteryScreen<*>> {
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ChemicalGeneratorScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ChemicalGeneratorScreen.kt
index 3558493f9..303647e70 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ChemicalGeneratorScreen.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ChemicalGeneratorScreen.kt
@@ -6,7 +6,7 @@ import ru.dbotthepony.mc.otm.core.TranslatableComponent
 import ru.dbotthepony.mc.otm.client.screen.panels.*
 import ru.dbotthepony.mc.otm.client.screen.widget.ProgressGaugePanel
 import ru.dbotthepony.mc.otm.client.screen.widget.WidePowerGaugePanel
-import ru.dbotthepony.mc.otm.menu.ChemicalGeneratorMenu
+import ru.dbotthepony.mc.otm.menu.tech.ChemicalGeneratorMenu
 
 class ChemicalGeneratorScreen(menu: ChemicalGeneratorMenu, inventory: Inventory, title: Component) : MatteryScreen<ChemicalGeneratorMenu>(menu, inventory, title) {
 	override fun makeMainFrame(): FramePanel<out MatteryScreen<*>> {
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/DriveRackScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/DriveRackScreen.kt
index 225590967..eb4459045 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/DriveRackScreen.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/DriveRackScreen.kt
@@ -1,12 +1,11 @@
 package ru.dbotthepony.mc.otm.client.screen
 
 import net.minecraft.network.chat.Component
-import ru.dbotthepony.mc.otm.menu.DriveRackMenu
+import ru.dbotthepony.mc.otm.menu.storage.DriveRackMenu
 import net.minecraft.world.entity.player.Inventory
 import ru.dbotthepony.mc.otm.client.screen.panels.BatterySlotPanel
 import ru.dbotthepony.mc.otm.client.screen.panels.FramePanel
 import ru.dbotthepony.mc.otm.client.screen.panels.SlotPanel
-import ru.dbotthepony.mc.otm.client.screen.widget.PowerGaugePanel
 import ru.dbotthepony.mc.otm.client.screen.widget.WidePowerGaugePanel
 
 class DriveRackScreen(menu: DriveRackMenu, inventory: Inventory, title: Component) :
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/EnergyCounterScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/EnergyCounterScreen.kt
index 46955192e..15b5cd9d6 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/EnergyCounterScreen.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/EnergyCounterScreen.kt
@@ -6,7 +6,7 @@ import ru.dbotthepony.mc.otm.core.TranslatableComponent
 import ru.dbotthepony.mc.otm.client.screen.panels.*
 import ru.dbotthepony.mc.otm.client.screen.panels.buttons.ButtonPanel
 import ru.dbotthepony.mc.otm.core.util.formatPower
-import ru.dbotthepony.mc.otm.menu.EnergyCounterMenu
+import ru.dbotthepony.mc.otm.menu.tech.EnergyCounterMenu
 
 class EnergyCounterScreen(menu: EnergyCounterMenu, inventory: Inventory, title: Component) : MatteryScreen<EnergyCounterMenu>(menu, inventory, title) {
 	override fun makeMainFrame(): FramePanel<out MatteryScreen<*>> {
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/EnergyServoScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/EnergyServoScreen.kt
index 16cbe0c0c..1f7e61d93 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/EnergyServoScreen.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/EnergyServoScreen.kt
@@ -11,7 +11,7 @@ import ru.dbotthepony.mc.otm.client.screen.panels.FramePanel
 import ru.dbotthepony.mc.otm.client.screen.widget.HorizontalPowerGaugePanel
 import ru.dbotthepony.mc.otm.client.screen.widget.ProgressGaugePanel
 import ru.dbotthepony.mc.otm.client.screen.widget.TallHorizontalPowerGaugePanel
-import ru.dbotthepony.mc.otm.menu.EnergyServoMenu
+import ru.dbotthepony.mc.otm.menu.tech.EnergyServoMenu
 
 class EnergyServoScreen(menu: EnergyServoMenu, inventory: Inventory, title: Component) : MatteryScreen<EnergyServoMenu>(menu, inventory, title) {
 	override fun makeMainFrame(): FramePanel<MatteryScreen<*>> {
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/HoloSignScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/HoloSignScreen.kt
index bedffd2d8..07580cefa 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/HoloSignScreen.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/HoloSignScreen.kt
@@ -4,10 +4,8 @@ import net.minecraft.network.chat.Component
 import net.minecraft.world.entity.player.Inventory
 import ru.dbotthepony.mc.otm.client.screen.panels.Dock
 import ru.dbotthepony.mc.otm.client.screen.panels.FramePanel
-import ru.dbotthepony.mc.otm.client.screen.panels.TextInputPanel
 import ru.dbotthepony.mc.otm.client.screen.panels.input.NetworkedStringInputPanel
-import ru.dbotthepony.mc.otm.menu.HoloSignMenu
-import ru.dbotthepony.mc.otm.milliTime
+import ru.dbotthepony.mc.otm.menu.decorative.HoloSignMenu
 
 class HoloSignScreen(menu: HoloSignMenu, inventory: Inventory, title: Component) : MatteryScreen<HoloSignMenu>(menu, title) {
 	override fun makeMainFrame(): FramePanel<MatteryScreen<*>> {
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/MatterCapacitorBankScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/MatterCapacitorBankScreen.kt
index a104919dc..67189909f 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/MatterCapacitorBankScreen.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/MatterCapacitorBankScreen.kt
@@ -1,11 +1,10 @@
 package ru.dbotthepony.mc.otm.client.screen
 
 import net.minecraft.network.chat.Component
-import ru.dbotthepony.mc.otm.menu.MatterCapacitorBankMenu
+import ru.dbotthepony.mc.otm.menu.matter.MatterCapacitorBankMenu
 import net.minecraft.world.entity.player.Inventory
 import ru.dbotthepony.mc.otm.client.screen.panels.FramePanel
 import ru.dbotthepony.mc.otm.client.screen.panels.MatterCapacitorSlotPanel
-import ru.dbotthepony.mc.otm.client.screen.panels.SlotPanel
 import ru.dbotthepony.mc.otm.client.screen.widget.MatterGaugePanel
 
 class MatterCapacitorBankScreen(p_97741_: MatterCapacitorBankMenu, p_97742_: Inventory, p_97743_: Component) :
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/MatterDecomposerScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/MatterDecomposerScreen.kt
index a95600d33..7a49939cb 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/MatterDecomposerScreen.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/MatterDecomposerScreen.kt
@@ -1,7 +1,7 @@
 package ru.dbotthepony.mc.otm.client.screen
 
 import net.minecraft.network.chat.Component
-import ru.dbotthepony.mc.otm.menu.MatterDecomposerMenu
+import ru.dbotthepony.mc.otm.menu.matter.MatterDecomposerMenu
 import net.minecraft.world.entity.player.Inventory
 import ru.dbotthepony.mc.otm.client.screen.panels.BatterySlotPanel
 import ru.dbotthepony.mc.otm.client.screen.panels.FramePanel
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/MatterPanelScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/MatterPanelScreen.kt
index 15af82304..f2d82cedf 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/MatterPanelScreen.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/MatterPanelScreen.kt
@@ -12,7 +12,7 @@ import ru.dbotthepony.mc.otm.client.screen.panels.*
 import ru.dbotthepony.mc.otm.client.screen.panels.buttons.ButtonPanel
 import ru.dbotthepony.mc.otm.core.TranslatableComponent
 import ru.dbotthepony.mc.otm.core.math.integerDivisionDown
-import ru.dbotthepony.mc.otm.menu.MatterPanelMenu
+import ru.dbotthepony.mc.otm.menu.matter.MatterPanelMenu
 import ru.dbotthepony.mc.otm.menu.ReplicationRequestPacket
 import ru.dbotthepony.mc.otm.network.MenuNetworkChannel
 import yalter.mousetweaks.api.MouseTweaksDisableWheelTweak
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/MatterRecyclerScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/MatterRecyclerScreen.kt
index a6e9b0a2d..f9f99af63 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/MatterRecyclerScreen.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/MatterRecyclerScreen.kt
@@ -8,7 +8,7 @@ import ru.dbotthepony.mc.otm.client.screen.panels.SlotPanel
 import ru.dbotthepony.mc.otm.client.screen.widget.MatterGaugePanel
 import ru.dbotthepony.mc.otm.client.screen.widget.PowerGaugePanel
 import ru.dbotthepony.mc.otm.client.screen.widget.ProgressGaugePanel
-import ru.dbotthepony.mc.otm.menu.MatterRecyclerMenu
+import ru.dbotthepony.mc.otm.menu.matter.MatterRecyclerMenu
 
 class MatterRecyclerScreen(menu: MatterRecyclerMenu, inventory: Inventory, title: Component) : MatteryScreen<MatterRecyclerMenu>(menu, inventory, title) {
 	override fun makeMainFrame(): FramePanel<out MatteryScreen<*>> {
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/MatterScannerScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/MatterScannerScreen.kt
index 9e3c414ed..baf34c53a 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/MatterScannerScreen.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/MatterScannerScreen.kt
@@ -1,7 +1,7 @@
 package ru.dbotthepony.mc.otm.client.screen
 
 import net.minecraft.network.chat.Component
-import ru.dbotthepony.mc.otm.menu.MatterScannerMenu
+import ru.dbotthepony.mc.otm.menu.matter.MatterScannerMenu
 import net.minecraft.world.entity.player.Inventory
 import ru.dbotthepony.mc.otm.client.screen.panels.BatterySlotPanel
 import ru.dbotthepony.mc.otm.client.screen.panels.FramePanel
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/PatternStorageScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/PatternStorageScreen.kt
index 9ef311ae5..57278f817 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/PatternStorageScreen.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/PatternStorageScreen.kt
@@ -1,11 +1,10 @@
 package ru.dbotthepony.mc.otm.client.screen
 
 import net.minecraft.network.chat.Component
-import ru.dbotthepony.mc.otm.menu.PatternStorageMenu
+import ru.dbotthepony.mc.otm.menu.matter.PatternStorageMenu
 import net.minecraft.world.entity.player.Inventory
 import ru.dbotthepony.mc.otm.client.screen.panels.FramePanel
 import ru.dbotthepony.mc.otm.client.screen.panels.PatternSlotPanel
-import ru.dbotthepony.mc.otm.client.screen.panels.SlotPanel
 import ru.dbotthepony.mc.otm.client.screen.widget.PatternGaugePanel
 
 class PatternStorageScreen(p_97741_: PatternStorageMenu, p_97742_: Inventory, p_97743_: Component) :
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/PlatePressScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/PlatePressScreen.kt
index 24cbe87d0..d5bfd55aa 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/PlatePressScreen.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/PlatePressScreen.kt
@@ -5,10 +5,9 @@ import net.minecraft.world.entity.player.Inventory
 import ru.dbotthepony.mc.otm.client.screen.panels.BatterySlotPanel
 import ru.dbotthepony.mc.otm.client.screen.panels.FramePanel
 import ru.dbotthepony.mc.otm.client.screen.panels.SlotPanel
-import ru.dbotthepony.mc.otm.client.screen.widget.PowerGaugePanel
 import ru.dbotthepony.mc.otm.client.screen.widget.ProgressGaugePanel
 import ru.dbotthepony.mc.otm.client.screen.widget.WidePowerGaugePanel
-import ru.dbotthepony.mc.otm.menu.PlatePressMenu
+import ru.dbotthepony.mc.otm.menu.tech.PlatePressMenu
 
 class PlatePressScreen(menu: PlatePressMenu, inventory: Inventory, title: Component) :
 	MatteryScreen<PlatePressMenu>(menu, inventory, title) {
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/StorageBusScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/StorageBusScreen.kt
index e2546153b..1587e2a56 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/StorageBusScreen.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/StorageBusScreen.kt
@@ -7,7 +7,7 @@ import ru.dbotthepony.mc.otm.client.screen.panels.*
 import ru.dbotthepony.mc.otm.client.screen.panels.buttons.CheckBoxLabelInputPanel
 import ru.dbotthepony.mc.otm.client.screen.widget.WidePowerGaugePanel
 
-import ru.dbotthepony.mc.otm.menu.StorageBusMenu
+import ru.dbotthepony.mc.otm.menu.storage.StorageBusMenu
 
 class StorageBusScreen(menu: StorageBusMenu, inventory: Inventory, title: Component) :
 	MatteryScreen<StorageBusMenu>(menu, inventory, title) {
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/StorageExporterScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/StorageExporterScreen.kt
index ff6276da6..2046ef281 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/StorageExporterScreen.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/StorageExporterScreen.kt
@@ -7,7 +7,7 @@ import ru.dbotthepony.mc.otm.client.screen.panels.*
 import ru.dbotthepony.mc.otm.client.screen.panels.buttons.CheckBoxLabelInputPanel
 import ru.dbotthepony.mc.otm.client.screen.widget.WidePowerGaugePanel
 
-import ru.dbotthepony.mc.otm.menu.StorageExporterMenu
+import ru.dbotthepony.mc.otm.menu.storage.StorageExporterMenu
 
 class StorageExporterScreen(menu: StorageExporterMenu, inventory: Inventory, title: Component) :
 	MatteryScreen<StorageExporterMenu>(menu, inventory, title) {
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/StorageImporterScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/StorageImporterScreen.kt
index 5da4971ac..99f7cee3e 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/StorageImporterScreen.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/StorageImporterScreen.kt
@@ -7,7 +7,7 @@ import ru.dbotthepony.mc.otm.client.screen.panels.*
 import ru.dbotthepony.mc.otm.client.screen.panels.buttons.CheckBoxLabelInputPanel
 import ru.dbotthepony.mc.otm.client.screen.widget.WidePowerGaugePanel
 
-import ru.dbotthepony.mc.otm.menu.StorageImporterMenu
+import ru.dbotthepony.mc.otm.menu.storage.StorageImporterMenu
 
 class StorageImporterScreen(menu: StorageImporterMenu, inventory: Inventory, title: Component) :
 	MatteryScreen<StorageImporterMenu>(menu, inventory, title) {
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/StoragePowerSupplierScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/StoragePowerSupplierScreen.kt
index e3bc34cef..b63cf5435 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/StoragePowerSupplierScreen.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/StoragePowerSupplierScreen.kt
@@ -7,7 +7,7 @@ import ru.dbotthepony.mc.otm.client.screen.panels.*
 import ru.dbotthepony.mc.otm.client.screen.widget.HorizontalPowerGaugePanel
 import ru.dbotthepony.mc.otm.core.util.formatPower
 
-import ru.dbotthepony.mc.otm.menu.StoragePowerSupplierMenu
+import ru.dbotthepony.mc.otm.menu.storage.StoragePowerSupplierMenu
 
 class StoragePowerSupplierScreen(menu: StoragePowerSupplierMenu, inventory: Inventory, title: Component) :
 	MatteryScreen<StoragePowerSupplierMenu>(menu, inventory, title) {
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/entity/MinecartCargoCrate.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/entity/MinecartCargoCrate.kt
index 6f205d8f8..d1a2e24f5 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/entity/MinecartCargoCrate.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/entity/MinecartCargoCrate.kt
@@ -18,7 +18,7 @@ import net.minecraft.world.level.gameevent.GameEvent
 import ru.dbotthepony.mc.otm.block.decorative.CargoCrateBlock
 import ru.dbotthepony.mc.otm.block.entity.decorative.CargoCrateBlockEntity
 import ru.dbotthepony.mc.otm.core.position
-import ru.dbotthepony.mc.otm.menu.MinecartCargoCrateMenu
+import ru.dbotthepony.mc.otm.menu.decorative.MinecartCargoCrateMenu
 import ru.dbotthepony.mc.otm.registry.MItems
 import ru.dbotthepony.mc.otm.registry.MRegistry
 import ru.dbotthepony.mc.otm.registry.MSoundEvents
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/CargoCrateMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/decorative/CargoCrateMenu.kt
similarity index 88%
rename from src/main/kotlin/ru/dbotthepony/mc/otm/menu/CargoCrateMenu.kt
rename to src/main/kotlin/ru/dbotthepony/mc/otm/menu/decorative/CargoCrateMenu.kt
index b3681244f..824ecf6e0 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/CargoCrateMenu.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/decorative/CargoCrateMenu.kt
@@ -1,10 +1,12 @@
-package ru.dbotthepony.mc.otm.menu
+package ru.dbotthepony.mc.otm.menu.decorative
 
 import net.minecraft.world.SimpleContainer
 import net.minecraft.world.entity.player.Inventory
 import net.minecraft.world.entity.player.Player
 import ru.dbotthepony.mc.otm.core.ImmutableList
 import ru.dbotthepony.mc.otm.block.entity.decorative.CargoCrateBlockEntity
+import ru.dbotthepony.mc.otm.menu.MatteryMenu
+import ru.dbotthepony.mc.otm.menu.MatterySlot
 import ru.dbotthepony.mc.otm.registry.MMenus
 
 class CargoCrateMenu @JvmOverloads constructor(
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/HoloSignMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/decorative/HoloSignMenu.kt
similarity index 87%
rename from src/main/kotlin/ru/dbotthepony/mc/otm/menu/HoloSignMenu.kt
rename to src/main/kotlin/ru/dbotthepony/mc/otm/menu/decorative/HoloSignMenu.kt
index 07e36ac5e..871f21e60 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/HoloSignMenu.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/decorative/HoloSignMenu.kt
@@ -1,9 +1,9 @@
-package ru.dbotthepony.mc.otm.menu
+package ru.dbotthepony.mc.otm.menu.decorative
 
 import net.minecraft.world.entity.player.Inventory
 import net.minecraft.world.inventory.Slot
 import ru.dbotthepony.mc.otm.block.entity.decorative.HoloSignBlockEntity
-import ru.dbotthepony.mc.otm.core.util.BinaryStringCodec
+import ru.dbotthepony.mc.otm.menu.MatteryMenu
 import ru.dbotthepony.mc.otm.menu.input.NetworkedStringInput
 import ru.dbotthepony.mc.otm.registry.MMenus
 
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/MinecartCargoCrateMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/decorative/MinecartCargoCrateMenu.kt
similarity index 90%
rename from src/main/kotlin/ru/dbotthepony/mc/otm/menu/MinecartCargoCrateMenu.kt
rename to src/main/kotlin/ru/dbotthepony/mc/otm/menu/decorative/MinecartCargoCrateMenu.kt
index e6564d7d0..8959e986f 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/MinecartCargoCrateMenu.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/decorative/MinecartCargoCrateMenu.kt
@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.menu
+package ru.dbotthepony.mc.otm.menu.decorative
 
 import net.minecraft.world.Container
 import net.minecraft.world.SimpleContainer
@@ -7,6 +7,8 @@ import net.minecraft.world.entity.player.Player
 import ru.dbotthepony.mc.otm.core.ImmutableList
 import ru.dbotthepony.mc.otm.block.entity.decorative.CargoCrateBlockEntity
 import ru.dbotthepony.mc.otm.entity.MinecartCargoCrate
+import ru.dbotthepony.mc.otm.menu.MatteryMenu
+import ru.dbotthepony.mc.otm.menu.MatterySlot
 import ru.dbotthepony.mc.otm.registry.MMenus
 
 class MinecartCargoCrateMenu @JvmOverloads constructor(
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatterBottlerMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/matter/MatterBottlerMenu.kt
similarity index 93%
rename from src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatterBottlerMenu.kt
rename to src/main/kotlin/ru/dbotthepony/mc/otm/menu/matter/MatterBottlerMenu.kt
index 3f73cd46a..bfcc044d2 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatterBottlerMenu.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/matter/MatterBottlerMenu.kt
@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.menu
+package ru.dbotthepony.mc.otm.menu.matter
 
 import net.minecraft.world.SimpleContainer
 import net.minecraft.world.entity.player.Inventory
@@ -12,6 +12,8 @@ import ru.dbotthepony.mc.otm.menu.input.NetworkedBooleanInput
 import ru.dbotthepony.mc.otm.menu.widget.LevelGaugeWidget
 import ru.dbotthepony.mc.otm.menu.widget.ProgressGaugeWidget
 import ru.dbotthepony.mc.otm.core.orNull
+import ru.dbotthepony.mc.otm.menu.MatteryPoweredMenu
+import ru.dbotthepony.mc.otm.menu.MatterySlot
 import ru.dbotthepony.mc.otm.registry.MMenus
 
 class MatterBottlerMenu @JvmOverloads constructor(
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatterCapacitorBankMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/matter/MatterCapacitorBankMenu.kt
similarity index 89%
rename from src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatterCapacitorBankMenu.kt
rename to src/main/kotlin/ru/dbotthepony/mc/otm/menu/matter/MatterCapacitorBankMenu.kt
index b03c8411b..c96ac0f08 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatterCapacitorBankMenu.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/matter/MatterCapacitorBankMenu.kt
@@ -1,10 +1,12 @@
-package ru.dbotthepony.mc.otm.menu
+package ru.dbotthepony.mc.otm.menu.matter
 
 import net.minecraft.world.SimpleContainer
 import net.minecraft.world.entity.player.Inventory
 import ru.dbotthepony.mc.otm.core.ImmutableList
 import ru.dbotthepony.mc.otm.block.entity.matter.MatterCapacitorBankBlockEntity
 import ru.dbotthepony.mc.otm.core.math.Decimal
+import ru.dbotthepony.mc.otm.menu.MatterContainerInputSlot
+import ru.dbotthepony.mc.otm.menu.MatteryMenu
 import ru.dbotthepony.mc.otm.menu.widget.LevelGaugeWidget
 import ru.dbotthepony.mc.otm.registry.MMenus
 
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatterDecomposerMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/matter/MatterDecomposerMenu.kt
similarity index 90%
rename from src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatterDecomposerMenu.kt
rename to src/main/kotlin/ru/dbotthepony/mc/otm/menu/matter/MatterDecomposerMenu.kt
index 9156eb5bb..6d6b58960 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatterDecomposerMenu.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/matter/MatterDecomposerMenu.kt
@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.menu
+package ru.dbotthepony.mc.otm.menu.matter
 
 import com.google.common.collect.ImmutableList
 import kotlin.jvm.JvmOverloads
@@ -12,6 +12,9 @@ import net.minecraft.world.item.ItemStack
 import ru.dbotthepony.mc.otm.capability.MatteryCapability
 import ru.dbotthepony.mc.otm.core.orNull
 import ru.dbotthepony.mc.otm.matter.MatterManager
+import ru.dbotthepony.mc.otm.menu.MachineOutputSlot
+import ru.dbotthepony.mc.otm.menu.MatteryPoweredMenu
+import ru.dbotthepony.mc.otm.menu.MatterySlot
 import ru.dbotthepony.mc.otm.registry.MMenus
 
 class MatterDecomposerMenu @JvmOverloads constructor(
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatterPanelMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/matter/MatterPanelMenu.kt
similarity index 98%
rename from src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatterPanelMenu.kt
rename to src/main/kotlin/ru/dbotthepony/mc/otm/menu/matter/MatterPanelMenu.kt
index 04f6ae207..250d8d8df 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatterPanelMenu.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/matter/MatterPanelMenu.kt
@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.menu
+package ru.dbotthepony.mc.otm.menu.matter
 
 import net.minecraft.network.FriendlyByteBuf
 import net.minecraft.server.level.ServerPlayer
@@ -8,12 +8,12 @@ import net.minecraft.world.inventory.Slot
 import net.minecraftforge.network.NetworkEvent
 import net.minecraftforge.network.PacketDistributor
 import org.apache.logging.log4j.LogManager
-import ru.dbotthepony.mc.otm.OverdriveThatMatters
 import ru.dbotthepony.mc.otm.block.entity.matter.MatterPanelBlockEntity
 import ru.dbotthepony.mc.otm.capability.matter.*
 import ru.dbotthepony.mc.otm.client.minecraft
 import ru.dbotthepony.mc.otm.graph.matter.IMatterGraphListener
 import ru.dbotthepony.mc.otm.graph.matter.MatterNetworkGraph
+import ru.dbotthepony.mc.otm.menu.MatteryMenu
 import ru.dbotthepony.mc.otm.network.*
 import ru.dbotthepony.mc.otm.registry.MMenus
 import java.util.*
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatterRecyclerMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/matter/MatterRecyclerMenu.kt
similarity index 90%
rename from src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatterRecyclerMenu.kt
rename to src/main/kotlin/ru/dbotthepony/mc/otm/menu/matter/MatterRecyclerMenu.kt
index fc9a02bb1..1c6e4b6b0 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatterRecyclerMenu.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/matter/MatterRecyclerMenu.kt
@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.menu
+package ru.dbotthepony.mc.otm.menu.matter
 
 import com.google.common.collect.ImmutableList
 import net.minecraft.world.SimpleContainer
@@ -7,6 +7,8 @@ import net.minecraft.world.inventory.Slot
 import net.minecraft.world.item.ItemStack
 import ru.dbotthepony.mc.otm.block.entity.matter.MatterRecyclerBlockEntity
 import ru.dbotthepony.mc.otm.item.MatterDustItem
+import ru.dbotthepony.mc.otm.menu.MatteryPoweredMenu
+import ru.dbotthepony.mc.otm.menu.MatterySlot
 import ru.dbotthepony.mc.otm.menu.widget.LevelGaugeWidget
 import ru.dbotthepony.mc.otm.menu.widget.ProgressGaugeWidget
 import ru.dbotthepony.mc.otm.registry.MMenus
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatterReplicatorMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/matter/MatterReplicatorMenu.kt
similarity index 89%
rename from src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatterReplicatorMenu.kt
rename to src/main/kotlin/ru/dbotthepony/mc/otm/menu/matter/MatterReplicatorMenu.kt
index 39e16d5d3..a5fbfa75d 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatterReplicatorMenu.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/matter/MatterReplicatorMenu.kt
@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.menu
+package ru.dbotthepony.mc.otm.menu.matter
 
 import kotlin.jvm.JvmOverloads
 import net.minecraft.world.entity.player.Inventory
@@ -6,8 +6,9 @@ import ru.dbotthepony.mc.otm.block.entity.matter.MatterReplicatorBlockEntity
 import ru.dbotthepony.mc.otm.menu.widget.LevelGaugeWidget
 import ru.dbotthepony.mc.otm.menu.widget.ProgressGaugeWidget
 import net.minecraft.world.SimpleContainer
-import net.minecraft.world.inventory.Slot
 import ru.dbotthepony.mc.otm.core.ImmutableList
+import ru.dbotthepony.mc.otm.menu.MachineOutputSlot
+import ru.dbotthepony.mc.otm.menu.MatteryPoweredMenu
 import ru.dbotthepony.mc.otm.registry.MMenus
 
 class MatterReplicatorMenu @JvmOverloads constructor(
@@ -40,4 +41,4 @@ class MatterReplicatorMenu @JvmOverloads constructor(
 
 		addInventorySlots()
 	}
-}
\ No newline at end of file
+}
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatterScannerMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/matter/MatterScannerMenu.kt
similarity index 91%
rename from src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatterScannerMenu.kt
rename to src/main/kotlin/ru/dbotthepony/mc/otm/menu/matter/MatterScannerMenu.kt
index 81eb2fea8..8357aeb71 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatterScannerMenu.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/matter/MatterScannerMenu.kt
@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.menu
+package ru.dbotthepony.mc.otm.menu.matter
 
 import kotlin.jvm.JvmOverloads
 import net.minecraft.world.entity.player.Inventory
@@ -9,6 +9,8 @@ import net.minecraft.world.SimpleContainer
 import net.minecraft.world.item.ItemStack
 import ru.dbotthepony.mc.otm.core.math.Decimal
 import ru.dbotthepony.mc.otm.matter.MatterManager
+import ru.dbotthepony.mc.otm.menu.MatteryPoweredMenu
+import ru.dbotthepony.mc.otm.menu.MatterySlot
 import ru.dbotthepony.mc.otm.registry.MMenus
 
 class MatterScannerMenu @JvmOverloads constructor(
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/PatternStorageMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/matter/PatternStorageMenu.kt
similarity index 90%
rename from src/main/kotlin/ru/dbotthepony/mc/otm/menu/PatternStorageMenu.kt
rename to src/main/kotlin/ru/dbotthepony/mc/otm/menu/matter/PatternStorageMenu.kt
index 146e867e2..4257dd380 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/PatternStorageMenu.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/matter/PatternStorageMenu.kt
@@ -1,10 +1,12 @@
-package ru.dbotthepony.mc.otm.menu
+package ru.dbotthepony.mc.otm.menu.matter
 
 import net.minecraft.world.SimpleContainer
 import net.minecraft.world.entity.player.Inventory
 import ru.dbotthepony.mc.otm.core.ImmutableList
 import ru.dbotthepony.mc.otm.block.entity.matter.PatternStorageBlockEntity
 import ru.dbotthepony.mc.otm.core.math.Decimal
+import ru.dbotthepony.mc.otm.menu.MatteryMenu
+import ru.dbotthepony.mc.otm.menu.PatternSlot
 import ru.dbotthepony.mc.otm.menu.widget.LevelGaugeWidget
 import ru.dbotthepony.mc.otm.registry.MMenus
 
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/DriveRackMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/storage/DriveRackMenu.kt
similarity index 78%
rename from src/main/kotlin/ru/dbotthepony/mc/otm/menu/DriveRackMenu.kt
rename to src/main/kotlin/ru/dbotthepony/mc/otm/menu/storage/DriveRackMenu.kt
index 7b31075c2..fd0bad009 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/DriveRackMenu.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/storage/DriveRackMenu.kt
@@ -1,9 +1,12 @@
-package ru.dbotthepony.mc.otm.menu
+package ru.dbotthepony.mc.otm.menu.storage
 
 import net.minecraft.world.SimpleContainer
 import net.minecraft.world.entity.player.Inventory
 import ru.dbotthepony.mc.otm.core.ImmutableList
 import ru.dbotthepony.mc.otm.block.entity.storage.DriveRackBlockEntity
+import ru.dbotthepony.mc.otm.menu.DriveSlot
+import ru.dbotthepony.mc.otm.menu.MatteryPoweredMenu
+import ru.dbotthepony.mc.otm.menu.MatterySlot
 import ru.dbotthepony.mc.otm.registry.MMenus
 
 class DriveRackMenu @JvmOverloads constructor(
@@ -24,4 +27,4 @@ class DriveRackMenu @JvmOverloads constructor(
 
 		addInventorySlots()
 	}
-}
\ No newline at end of file
+}
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/DriveViewerMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/storage/DriveViewerMenu.kt
similarity index 97%
rename from src/main/kotlin/ru/dbotthepony/mc/otm/menu/DriveViewerMenu.kt
rename to src/main/kotlin/ru/dbotthepony/mc/otm/menu/storage/DriveViewerMenu.kt
index cd32121ae..f30c08c7b 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/DriveViewerMenu.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/storage/DriveViewerMenu.kt
@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.menu
+package ru.dbotthepony.mc.otm.menu.storage
 
 import com.google.common.collect.ImmutableList
 import net.minecraft.world.SimpleContainer
@@ -13,6 +13,8 @@ import ru.dbotthepony.mc.otm.capability.drive.IMatteryDrive
 import ru.dbotthepony.mc.otm.container.ItemFilter
 import ru.dbotthepony.mc.otm.core.ifPresentK
 import ru.dbotthepony.mc.otm.item.PortableCondensationDriveItem
+import ru.dbotthepony.mc.otm.menu.MatteryPoweredMenu
+import ru.dbotthepony.mc.otm.menu.MatterySlot
 import ru.dbotthepony.mc.otm.menu.data.INetworkedItemViewProvider
 import ru.dbotthepony.mc.otm.menu.data.NetworkedItemView
 import ru.dbotthepony.mc.otm.menu.input.NetworkedBooleanInput
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/ItemMonitorMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/storage/ItemMonitorMenu.kt
similarity index 98%
rename from src/main/kotlin/ru/dbotthepony/mc/otm/menu/ItemMonitorMenu.kt
rename to src/main/kotlin/ru/dbotthepony/mc/otm/menu/storage/ItemMonitorMenu.kt
index 925cec1ef..6fb8bbddb 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/ItemMonitorMenu.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/storage/ItemMonitorMenu.kt
@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.menu
+package ru.dbotthepony.mc.otm.menu.storage
 
 import net.minecraft.server.level.ServerPlayer
 import net.minecraft.world.Container
@@ -12,6 +12,8 @@ import ru.dbotthepony.mc.otm.block.entity.storage.ItemMonitorBlockEntity
 import ru.dbotthepony.mc.otm.block.entity.storage.ItemMonitorPlayerSettings
 import ru.dbotthepony.mc.otm.container.get
 import ru.dbotthepony.mc.otm.core.collect.nonEmpty
+import ru.dbotthepony.mc.otm.menu.MatteryPoweredMenu
+import ru.dbotthepony.mc.otm.menu.MatterySlot
 import ru.dbotthepony.mc.otm.menu.data.INetworkedItemViewProvider
 import ru.dbotthepony.mc.otm.menu.data.NetworkedItemView
 import ru.dbotthepony.mc.otm.network.MenuNetworkChannel
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/StorageBusMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/storage/StorageBusMenu.kt
similarity index 91%
rename from src/main/kotlin/ru/dbotthepony/mc/otm/menu/StorageBusMenu.kt
rename to src/main/kotlin/ru/dbotthepony/mc/otm/menu/storage/StorageBusMenu.kt
index 052ef14c7..8cfa1a5f3 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/StorageBusMenu.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/storage/StorageBusMenu.kt
@@ -1,9 +1,10 @@
-package ru.dbotthepony.mc.otm.menu
+package ru.dbotthepony.mc.otm.menu.storage
 
 import net.minecraft.world.entity.player.Inventory
 import net.minecraft.world.inventory.Slot
 import ru.dbotthepony.mc.otm.block.entity.storage.StorageBusBlockEntity
 import ru.dbotthepony.mc.otm.container.ItemFilterNetworkSlot
+import ru.dbotthepony.mc.otm.menu.MatteryPoweredMenu
 import ru.dbotthepony.mc.otm.menu.input.NetworkedBooleanInput
 import ru.dbotthepony.mc.otm.registry.MMenus
 
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/StorageExporterMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/storage/StorageExporterMenu.kt
similarity index 91%
rename from src/main/kotlin/ru/dbotthepony/mc/otm/menu/StorageExporterMenu.kt
rename to src/main/kotlin/ru/dbotthepony/mc/otm/menu/storage/StorageExporterMenu.kt
index eff1d2179..840ee3fd4 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/StorageExporterMenu.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/storage/StorageExporterMenu.kt
@@ -1,9 +1,10 @@
-package ru.dbotthepony.mc.otm.menu
+package ru.dbotthepony.mc.otm.menu.storage
 
 import net.minecraft.world.entity.player.Inventory
 import net.minecraft.world.inventory.Slot
 import ru.dbotthepony.mc.otm.block.entity.storage.StorageExporterBlockEntity
 import ru.dbotthepony.mc.otm.container.ItemFilterNetworkSlot
+import ru.dbotthepony.mc.otm.menu.MatteryPoweredMenu
 import ru.dbotthepony.mc.otm.menu.input.NetworkedBooleanInput
 import ru.dbotthepony.mc.otm.registry.MMenus
 
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/StorageImporterMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/storage/StorageImporterMenu.kt
similarity index 91%
rename from src/main/kotlin/ru/dbotthepony/mc/otm/menu/StorageImporterMenu.kt
rename to src/main/kotlin/ru/dbotthepony/mc/otm/menu/storage/StorageImporterMenu.kt
index bcce606d3..bc41f66ac 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/StorageImporterMenu.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/storage/StorageImporterMenu.kt
@@ -1,9 +1,10 @@
-package ru.dbotthepony.mc.otm.menu
+package ru.dbotthepony.mc.otm.menu.storage
 
 import net.minecraft.world.entity.player.Inventory
 import net.minecraft.world.inventory.Slot
 import ru.dbotthepony.mc.otm.block.entity.storage.StorageImporterBlockEntity
 import ru.dbotthepony.mc.otm.container.ItemFilterNetworkSlot
+import ru.dbotthepony.mc.otm.menu.MatteryPoweredMenu
 import ru.dbotthepony.mc.otm.menu.input.NetworkedBooleanInput
 import ru.dbotthepony.mc.otm.registry.MMenus
 
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/StoragePowerSupplierMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/storage/StoragePowerSupplierMenu.kt
similarity index 90%
rename from src/main/kotlin/ru/dbotthepony/mc/otm/menu/StoragePowerSupplierMenu.kt
rename to src/main/kotlin/ru/dbotthepony/mc/otm/menu/storage/StoragePowerSupplierMenu.kt
index 0e7483177..a4be8757b 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/StoragePowerSupplierMenu.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/storage/StoragePowerSupplierMenu.kt
@@ -1,8 +1,9 @@
-package ru.dbotthepony.mc.otm.menu
+package ru.dbotthepony.mc.otm.menu.storage
 
 import net.minecraft.world.entity.player.Inventory
 import net.minecraft.world.inventory.Slot
 import ru.dbotthepony.mc.otm.block.entity.storage.StoragePowerSupplierBlockEntity
+import ru.dbotthepony.mc.otm.menu.MatteryPoweredMenu
 import ru.dbotthepony.mc.otm.registry.MMenus
 
 class StoragePowerSupplierMenu @JvmOverloads constructor(
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/AndroidStationMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/AndroidStationMenu.kt
similarity index 96%
rename from src/main/kotlin/ru/dbotthepony/mc/otm/menu/AndroidStationMenu.kt
rename to src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/AndroidStationMenu.kt
index 1c61ad696..aafee79a1 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/AndroidStationMenu.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/AndroidStationMenu.kt
@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.menu
+package ru.dbotthepony.mc.otm.menu.tech
 
 import com.google.common.collect.ImmutableList
 import net.minecraft.server.level.ServerPlayer
@@ -12,6 +12,8 @@ import net.minecraftforge.common.capabilities.ForgeCapabilities
 import ru.dbotthepony.mc.otm.block.entity.tech.AndroidStationBlockEntity
 import ru.dbotthepony.mc.otm.capability.MatteryPlayerCapability
 import ru.dbotthepony.mc.otm.capability.matteryPlayer
+import ru.dbotthepony.mc.otm.menu.MatteryPoweredMenu
+import ru.dbotthepony.mc.otm.menu.MatterySlot
 import ru.dbotthepony.mc.otm.registry.MMenus
 import kotlin.reflect.KMutableProperty0
 
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/BatteryBankMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/BatteryBankMenu.kt
similarity index 86%
rename from src/main/kotlin/ru/dbotthepony/mc/otm/menu/BatteryBankMenu.kt
rename to src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/BatteryBankMenu.kt
index 8bb3fa687..e470ad129 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/BatteryBankMenu.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/BatteryBankMenu.kt
@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.menu
+package ru.dbotthepony.mc.otm.menu.tech
 
 import net.minecraft.world.Container
 import kotlin.jvm.JvmOverloads
@@ -9,6 +9,9 @@ import ru.dbotthepony.mc.otm.core.ImmutableList
 import ru.dbotthepony.mc.otm.menu.widget.LevelGaugeWidget
 import ru.dbotthepony.mc.otm.capability.MatteryCapability
 import ru.dbotthepony.mc.otm.core.orNull
+import ru.dbotthepony.mc.otm.menu.BatterySlot
+import ru.dbotthepony.mc.otm.menu.MatteryMenu
+import ru.dbotthepony.mc.otm.menu.MatterySlot
 import ru.dbotthepony.mc.otm.registry.MMenus
 
 class BatteryBankMenu @JvmOverloads constructor(
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/ChemicalGeneratorMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/ChemicalGeneratorMenu.kt
similarity index 93%
rename from src/main/kotlin/ru/dbotthepony/mc/otm/menu/ChemicalGeneratorMenu.kt
rename to src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/ChemicalGeneratorMenu.kt
index f01b5a004..4950063cd 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/ChemicalGeneratorMenu.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/ChemicalGeneratorMenu.kt
@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.menu
+package ru.dbotthepony.mc.otm.menu.tech
 
 import net.minecraft.world.SimpleContainer
 import net.minecraft.world.entity.player.Inventory
@@ -7,6 +7,8 @@ import net.minecraftforge.common.ForgeHooks
 import net.minecraftforge.common.capabilities.ForgeCapabilities
 import ru.dbotthepony.mc.otm.block.entity.tech.ChemicalGeneratorBlockEntity
 import ru.dbotthepony.mc.otm.core.ifPresentK
+import ru.dbotthepony.mc.otm.menu.MatteryMenu
+import ru.dbotthepony.mc.otm.menu.MatterySlot
 import ru.dbotthepony.mc.otm.menu.widget.LevelGaugeWidget
 import ru.dbotthepony.mc.otm.menu.widget.ProgressGaugeWidget
 import ru.dbotthepony.mc.otm.registry.MMenus
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/EnergyCounterMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/EnergyCounterMenu.kt
similarity index 95%
rename from src/main/kotlin/ru/dbotthepony/mc/otm/menu/EnergyCounterMenu.kt
rename to src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/EnergyCounterMenu.kt
index 106203c19..01aac2e7d 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/EnergyCounterMenu.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/EnergyCounterMenu.kt
@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.menu
+package ru.dbotthepony.mc.otm.menu.tech
 
 import net.minecraft.core.Direction
 import kotlin.jvm.JvmOverloads
@@ -8,6 +8,7 @@ import net.minecraft.world.level.block.Block
 import ru.dbotthepony.mc.otm.block.tech.EnergyCounterBlock
 import ru.dbotthepony.mc.otm.block.entity.tech.EnergyCounterBlockEntity
 import ru.dbotthepony.mc.otm.core.math.Decimal
+import ru.dbotthepony.mc.otm.menu.MatteryMenu
 import ru.dbotthepony.mc.otm.registry.MMenus
 import java.math.BigDecimal
 
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/EnergyServoMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/EnergyServoMenu.kt
similarity index 91%
rename from src/main/kotlin/ru/dbotthepony/mc/otm/menu/EnergyServoMenu.kt
rename to src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/EnergyServoMenu.kt
index a96ca4071..c452c4a83 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/EnergyServoMenu.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/EnergyServoMenu.kt
@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.menu
+package ru.dbotthepony.mc.otm.menu.tech
 
 import com.google.common.collect.ImmutableList
 import net.minecraft.world.SimpleContainer
@@ -7,6 +7,8 @@ import net.minecraft.world.inventory.Slot
 import net.minecraft.world.item.ItemStack
 import ru.dbotthepony.mc.otm.block.entity.tech.EnergyServoBlockEntity
 import ru.dbotthepony.mc.otm.capability.energy
+import ru.dbotthepony.mc.otm.menu.MatteryMenu
+import ru.dbotthepony.mc.otm.menu.MatterySlot
 import ru.dbotthepony.mc.otm.menu.widget.LevelGaugeWidget
 import ru.dbotthepony.mc.otm.registry.MMenus
 
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/PlatePressMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/PlatePressMenu.kt
similarity index 84%
rename from src/main/kotlin/ru/dbotthepony/mc/otm/menu/PlatePressMenu.kt
rename to src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/PlatePressMenu.kt
index ecf50b2bb..ff88899f7 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/PlatePressMenu.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/PlatePressMenu.kt
@@ -1,9 +1,12 @@
-package ru.dbotthepony.mc.otm.menu
+package ru.dbotthepony.mc.otm.menu.tech
 
 import com.google.common.collect.ImmutableList
 import net.minecraft.world.SimpleContainer
 import net.minecraft.world.entity.player.Inventory
 import ru.dbotthepony.mc.otm.block.entity.tech.PlatePressBlockEntity
+import ru.dbotthepony.mc.otm.menu.MachineOutputSlot
+import ru.dbotthepony.mc.otm.menu.MatteryPoweredMenu
+import ru.dbotthepony.mc.otm.menu.MatterySlot
 import ru.dbotthepony.mc.otm.menu.widget.ProgressGaugeWidget
 import ru.dbotthepony.mc.otm.registry.MMenus
 
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/network/MatteryPlayerNetworkChannel.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/network/MatteryPlayerNetworkChannel.kt
index 755bae55d..0abf41fb7 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/network/MatteryPlayerNetworkChannel.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/network/MatteryPlayerNetworkChannel.kt
@@ -27,7 +27,7 @@ import ru.dbotthepony.mc.otm.client.render.ShockwaveRenderer
 import ru.dbotthepony.mc.otm.container.get
 import ru.dbotthepony.mc.otm.container.set
 import ru.dbotthepony.mc.otm.core.math.Vector
-import ru.dbotthepony.mc.otm.menu.AndroidStationMenu
+import ru.dbotthepony.mc.otm.menu.tech.AndroidStationMenu
 import ru.dbotthepony.mc.otm.menu.ExoPackInventoryMenu
 import ru.dbotthepony.mc.otm.registry.AndroidFeatures
 import ru.dbotthepony.mc.otm.registry.MRegistry
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/network/MenuNetworkChannel.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/network/MenuNetworkChannel.kt
index e6fa318e0..c8fb6826b 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/network/MenuNetworkChannel.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/network/MenuNetworkChannel.kt
@@ -9,11 +9,11 @@ import ru.dbotthepony.mc.otm.block.entity.storage.ItemMonitorPlayerSettings
 import ru.dbotthepony.mc.otm.client.minecraft
 import ru.dbotthepony.mc.otm.compat.InventoryScrollPacket
 import ru.dbotthepony.mc.otm.container.ItemFilterSlotPacket
-import ru.dbotthepony.mc.otm.menu.CancelTaskPacket
+import ru.dbotthepony.mc.otm.menu.matter.CancelTaskPacket
 import ru.dbotthepony.mc.otm.menu.MatteryMenu
-import ru.dbotthepony.mc.otm.menu.PatternsChangePacket
+import ru.dbotthepony.mc.otm.menu.matter.PatternsChangePacket
 import ru.dbotthepony.mc.otm.menu.ReplicationRequestPacket
-import ru.dbotthepony.mc.otm.menu.TasksChangePacket
+import ru.dbotthepony.mc.otm.menu.matter.TasksChangePacket
 import ru.dbotthepony.mc.otm.menu.data.ClearItemViewPacket
 import ru.dbotthepony.mc.otm.menu.data.ItemViewInteractPacket
 import ru.dbotthepony.mc.otm.menu.data.StackAddPacket
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MMenus.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MMenus.kt
index ae03a7a64..52dc1f3ec 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MMenus.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MMenus.kt
@@ -4,12 +4,31 @@ import net.minecraft.client.gui.screens.MenuScreens
 import net.minecraft.world.inventory.MenuType
 import net.minecraftforge.eventbus.api.IEventBus
 import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent
-import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext
 import net.minecraftforge.registries.DeferredRegister
 import net.minecraftforge.registries.ForgeRegistries
 import ru.dbotthepony.mc.otm.OverdriveThatMatters
 import ru.dbotthepony.mc.otm.client.screen.*
 import ru.dbotthepony.mc.otm.menu.*
+import ru.dbotthepony.mc.otm.menu.decorative.CargoCrateMenu
+import ru.dbotthepony.mc.otm.menu.decorative.HoloSignMenu
+import ru.dbotthepony.mc.otm.menu.decorative.MinecartCargoCrateMenu
+import ru.dbotthepony.mc.otm.menu.matter.MatterCapacitorBankMenu
+import ru.dbotthepony.mc.otm.menu.matter.MatterDecomposerMenu
+import ru.dbotthepony.mc.otm.menu.matter.MatterPanelMenu
+import ru.dbotthepony.mc.otm.menu.matter.MatterRecyclerMenu
+import ru.dbotthepony.mc.otm.menu.matter.MatterScannerMenu
+import ru.dbotthepony.mc.otm.menu.matter.PatternStorageMenu
+import ru.dbotthepony.mc.otm.menu.storage.DriveRackMenu
+import ru.dbotthepony.mc.otm.menu.storage.StorageBusMenu
+import ru.dbotthepony.mc.otm.menu.storage.StorageExporterMenu
+import ru.dbotthepony.mc.otm.menu.storage.StorageImporterMenu
+import ru.dbotthepony.mc.otm.menu.storage.StoragePowerSupplierMenu
+import ru.dbotthepony.mc.otm.menu.tech.AndroidStationMenu
+import ru.dbotthepony.mc.otm.menu.tech.BatteryBankMenu
+import ru.dbotthepony.mc.otm.menu.tech.ChemicalGeneratorMenu
+import ru.dbotthepony.mc.otm.menu.tech.EnergyCounterMenu
+import ru.dbotthepony.mc.otm.menu.tech.EnergyServoMenu
+import ru.dbotthepony.mc.otm.menu.tech.PlatePressMenu
 
 object MMenus {
 	private val registry = DeferredRegister.create(ForgeRegistries.MENU_TYPES, OverdriveThatMatters.MOD_ID)