diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/FluidTankItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/block/FluidTankItem.kt
similarity index 87%
rename from src/main/kotlin/ru/dbotthepony/mc/otm/item/FluidTankItem.kt
rename to src/main/kotlin/ru/dbotthepony/mc/otm/item/block/FluidTankItem.kt
index 1474eafd9..1052cde34 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/FluidTankItem.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/block/FluidTankItem.kt
@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.item
+package ru.dbotthepony.mc.otm.item.block
 
 import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer
 import net.minecraft.network.chat.Component
@@ -16,6 +16,7 @@ import ru.dbotthepony.mc.otm.capability.fluid.BlockMatteryFluidHandler
 import ru.dbotthepony.mc.otm.client.render.blockentity.FluidTankRenderer
 import ru.dbotthepony.mc.otm.core.TooltipList
 import ru.dbotthepony.mc.otm.core.TranslatableComponent
+import ru.dbotthepony.mc.otm.item.FluidCapsuleItem
 import ru.dbotthepony.mc.otm.registry.CapabilitiesRegisterListener
 import java.util.function.Consumer
 import java.util.function.IntSupplier
@@ -36,9 +37,18 @@ class FluidTankItem(block: FluidTankBlock, properties: Properties, val capacity:
 		if (pContext.player?.isCrouching == true)
 			return InteractionResult.PASS
 
-		val context = FluidCapsuleItem.Context(pContext.clickedPos, pContext.level.getBlockState(pContext.clickedPos), pContext.clickedFace)
+		val context = FluidCapsuleItem.Context(
+			pContext.clickedPos,
+			pContext.level.getBlockState(pContext.clickedPos),
+			pContext.clickedFace
+		)
 
-		if (FluidCapsuleItem.canInteract(pContext.itemInHand, pContext.player ?: return InteractionResult.FAIL, context))
+		if (FluidCapsuleItem.canInteract(
+				pContext.itemInHand,
+				pContext.player ?: return InteractionResult.FAIL,
+				context
+			)
+		)
 			return FluidCapsuleItem.interact(pContext.itemInHand, pContext.player!!, context)
 
 		return super.onItemUseFirst(stack, pContext)
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MItems.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MItems.kt
index f27eb70ca..ec2c208ae 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MItems.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MItems.kt
@@ -25,7 +25,6 @@ import net.minecraft.world.item.Tiers
 import net.minecraft.world.item.crafting.Ingredient
 import net.minecraft.world.level.block.Block
 import net.neoforged.bus.api.IEventBus
-import net.neoforged.neoforge.capabilities.RegisterCapabilitiesEvent
 import net.neoforged.neoforge.common.SimpleTier
 import ru.dbotthepony.mc.otm.capability.ITieredUpgradeSet
 import ru.dbotthepony.mc.otm.capability.MatteryPlayer
@@ -43,7 +42,7 @@ import ru.dbotthepony.mc.otm.item.CrudeBatteryItem
 import ru.dbotthepony.mc.otm.item.EssenceCapsuleItem
 import ru.dbotthepony.mc.otm.item.EssenceServoItem
 import ru.dbotthepony.mc.otm.item.FluidCapsuleItem
-import ru.dbotthepony.mc.otm.item.FluidTankItem
+import ru.dbotthepony.mc.otm.item.block.FluidTankItem
 import ru.dbotthepony.mc.otm.item.GravitationalDisruptorItem
 import ru.dbotthepony.mc.otm.item.HealPillItem
 import ru.dbotthepony.mc.otm.item.MatteryItem
@@ -324,7 +323,7 @@ object MItems {
 	val ESSENCE_DRIVE: EssenceCapsuleItem by registry.register("essence_drive") { EssenceCapsuleItem(true) }
 
 	val FLUID_CAPSULE: FluidCapsuleItem by registry.register("fluid_capsule") { FluidCapsuleItem(ItemsConfig::FLUID_CAPSULE_CAPACITY) }
-	val FLUID_TANK: FluidTankItem by registry.register(MNames.FLUID_TANK) { FluidTankItem(MBlocks.FLUID_TANK, Item.Properties().stacksTo(1), ItemsConfig::FLUID_TANK_CAPACITY) }
+	val FLUID_TANK: FluidTankItem by registry.register(MNames.FLUID_TANK) { FluidTankItem(MBlocks.FLUID_TANK, Properties().stacksTo(1), ItemsConfig::FLUID_TANK_CAPACITY) }
 	val LIQUID_XP_BUCKET: BucketItem by registry.register("liquid_xp_bucket") { BucketItem(MFluids.LIQUID_XP, Item.Properties().stacksTo(1).rarity(Rarity.UNCOMMON)) }
 
 	val TRITANIUM_COMPONENT: SimpleTier = SimpleTier(