diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/buttons/CheckBoxInputPanel.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/buttons/CheckBoxInputPanel.kt
index 3c2210d1f..7e705b038 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/buttons/CheckBoxInputPanel.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/buttons/CheckBoxInputPanel.kt
@@ -3,7 +3,7 @@ package ru.dbotthepony.mc.otm.client.screen.panels.buttons
 import net.minecraft.client.gui.screens.Screen
 import ru.dbotthepony.mc.otm.client.minecraft
 import ru.dbotthepony.mc.otm.client.screen.panels.EditablePanel
-import ru.dbotthepony.mc.otm.menu.widget.NetworkedBooleanInput
+import ru.dbotthepony.mc.otm.menu.input.NetworkedBooleanInput
 
 open class CheckBoxInputPanel<out S : Screen> @JvmOverloads constructor(
 	screen: S,
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/buttons/CheckBoxLabelInputPanel.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/buttons/CheckBoxLabelInputPanel.kt
index 106c63ea8..1cdb14217 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/buttons/CheckBoxLabelInputPanel.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/buttons/CheckBoxLabelInputPanel.kt
@@ -4,7 +4,7 @@ import net.minecraft.client.gui.screens.Screen
 import net.minecraft.network.chat.Component
 import ru.dbotthepony.mc.otm.client.screen.panels.EditablePanel
 import ru.dbotthepony.mc.otm.client.screen.panels.Label
-import ru.dbotthepony.mc.otm.menu.widget.NetworkedBooleanInput
+import ru.dbotthepony.mc.otm.menu.input.NetworkedBooleanInput
 
 open class CheckBoxLabelInputPanel<out S : Screen> @JvmOverloads constructor(
 	screen: S,
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/DriveViewerMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/DriveViewerMenu.kt
index 8c1487933..56c538b55 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/DriveViewerMenu.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/DriveViewerMenu.kt
@@ -15,7 +15,7 @@ import ru.dbotthepony.mc.otm.core.ifPresentK
 import ru.dbotthepony.mc.otm.item.PortableCondensationDriveItem
 import ru.dbotthepony.mc.otm.menu.data.INetworkedItemViewProvider
 import ru.dbotthepony.mc.otm.menu.data.NetworkedItemView
-import ru.dbotthepony.mc.otm.menu.widget.NetworkedBooleanInput
+import ru.dbotthepony.mc.otm.menu.input.NetworkedBooleanInput
 import ru.dbotthepony.mc.otm.registry.MMenus
 import ru.dbotthepony.mc.otm.storage.ITEM_STORAGE
 import ru.dbotthepony.mc.otm.storage.ItemStackWrapper
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatterBottlerMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatterBottlerMenu.kt
index ab79c71da..4dd49a0fa 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatterBottlerMenu.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatterBottlerMenu.kt
@@ -8,7 +8,7 @@ import ru.dbotthepony.mc.otm.block.entity.matter.MatterBottlerBlockEntity
 import ru.dbotthepony.mc.otm.capability.MatteryCapability
 import ru.dbotthepony.mc.otm.capability.matter.canExtractMatter
 import ru.dbotthepony.mc.otm.capability.matter.canReceiveMatter
-import ru.dbotthepony.mc.otm.menu.widget.NetworkedBooleanInput
+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
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/StorageBusMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/StorageBusMenu.kt
index 6f13278d0..56d8a394a 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/StorageBusMenu.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/StorageBusMenu.kt
@@ -4,7 +4,7 @@ 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.widget.NetworkedBooleanInput
+import ru.dbotthepony.mc.otm.menu.input.NetworkedBooleanInput
 import ru.dbotthepony.mc.otm.registry.MMenus
 
 class StorageBusMenu @JvmOverloads constructor(
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/StorageExporterMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/StorageExporterMenu.kt
index d16a7c3c7..6902e798e 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/StorageExporterMenu.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/StorageExporterMenu.kt
@@ -4,7 +4,7 @@ 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.widget.NetworkedBooleanInput
+import ru.dbotthepony.mc.otm.menu.input.NetworkedBooleanInput
 import ru.dbotthepony.mc.otm.registry.MMenus
 
 class StorageExporterMenu @JvmOverloads constructor(
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/StorageImporterMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/StorageImporterMenu.kt
index 3ccd5fa1e..b821aaaa6 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/StorageImporterMenu.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/StorageImporterMenu.kt
@@ -4,7 +4,7 @@ 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.widget.NetworkedBooleanInput
+import ru.dbotthepony.mc.otm.menu.input.NetworkedBooleanInput
 import ru.dbotthepony.mc.otm.registry.MMenus
 
 class StorageImporterMenu @JvmOverloads constructor(
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/widget/NetworkedBooleanInput.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/input/NetworkedBooleanInput.kt
similarity index 96%
rename from src/main/kotlin/ru/dbotthepony/mc/otm/menu/widget/NetworkedBooleanInput.kt
rename to src/main/kotlin/ru/dbotthepony/mc/otm/menu/input/NetworkedBooleanInput.kt
index 52d705aa0..7d41df71f 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/widget/NetworkedBooleanInput.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/input/NetworkedBooleanInput.kt
@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.menu.widget
+package ru.dbotthepony.mc.otm.menu.input
 
 import net.minecraft.world.entity.player.Player
 import ru.dbotthepony.mc.otm.menu.MatteryMenu