diff --git a/src/main/java/ru/dbotthepony/mc/otm/OverdriveThatMatters.java b/src/main/java/ru/dbotthepony/mc/otm/OverdriveThatMatters.java
index 475b57574..d84af44df 100644
--- a/src/main/java/ru/dbotthepony/mc/otm/OverdriveThatMatters.java
+++ b/src/main/java/ru/dbotthepony/mc/otm/OverdriveThatMatters.java
@@ -46,8 +46,8 @@ import ru.dbotthepony.mc.otm.config.ServerCompatConfig;
 import ru.dbotthepony.mc.otm.config.ServerConfig;
 import ru.dbotthepony.mc.otm.config.ToolsConfig;
 import ru.dbotthepony.mc.otm.core.math.Decimal;
-import ru.dbotthepony.mc.otm.item.ExplosiveHammerItem;
-import ru.dbotthepony.mc.otm.item.TritaniumArmorItem;
+import ru.dbotthepony.mc.otm.item.tool.ExplosiveHammerItem;
+import ru.dbotthepony.mc.otm.item.tool.TritaniumArmorItem;
 import ru.dbotthepony.mc.otm.item.QuantumBatteryItem;
 import ru.dbotthepony.mc.otm.item.weapon.AbstractWeaponItem;
 import ru.dbotthepony.mc.otm.item.PortableCondensationDriveItem;
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 1a4b1df23..359024ca2 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
@@ -28,7 +28,7 @@ import ru.dbotthepony.mc.otm.core.nbt.set
 import ru.dbotthepony.mc.otm.core.util.WriteOnce
 import ru.dbotthepony.mc.otm.graph.matter.MatterGraph
 import ru.dbotthepony.mc.otm.graph.matter.SimpleMatterNode
-import ru.dbotthepony.mc.otm.item.MatterDustItem
+import ru.dbotthepony.mc.otm.item.matter.MatterDustItem
 import ru.dbotthepony.mc.otm.matter.MatterManager
 import ru.dbotthepony.mc.otm.menu.matter.MatterDecomposerMenu
 import ru.dbotthepony.mc.otm.registry.MBlockEntities
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 410079f8e..6bae9450c 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
@@ -2,7 +2,6 @@ package ru.dbotthepony.mc.otm.block.entity.matter
 
 import net.minecraft.core.BlockPos
 import net.minecraft.nbt.CompoundTag
-import net.minecraft.server.level.ServerLevel
 import net.minecraft.world.entity.player.Inventory
 import net.minecraft.world.entity.player.Player
 import net.minecraft.world.inventory.AbstractContainerMenu
@@ -18,14 +17,12 @@ import ru.dbotthepony.mc.otm.capability.energy.BlockEnergyStorageImpl
 import ru.dbotthepony.mc.otm.capability.MatteryCapability
 import ru.dbotthepony.mc.otm.capability.energy.ProfiledEnergyStorage
 import ru.dbotthepony.mc.otm.capability.energy.WorkerEnergyStorage
-import ru.dbotthepony.mc.otm.capability.matter.IMatterStorage
 import ru.dbotthepony.mc.otm.capability.matter.MatterStorageImpl
 import ru.dbotthepony.mc.otm.container.MatteryContainer
 import ru.dbotthepony.mc.otm.container.HandlerFilter
 import ru.dbotthepony.mc.otm.core.math.Decimal
-import ru.dbotthepony.mc.otm.graph.Graph6Node
 import ru.dbotthepony.mc.otm.graph.matter.MatterGraph
-import ru.dbotthepony.mc.otm.item.MatterDustItem
+import ru.dbotthepony.mc.otm.item.matter.MatterDustItem
 import ru.dbotthepony.mc.otm.menu.matter.MatterRecyclerMenu
 import ru.dbotthepony.mc.otm.registry.MBlockEntities
 import ru.dbotthepony.mc.otm.core.math.DecimalConfigValue
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/ProceduralExoPackSlotUpgradeItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/ProceduralExoPackSlotUpgradeItem.kt
index 9864f1be7..23432ea05 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/ProceduralExoPackSlotUpgradeItem.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/ProceduralExoPackSlotUpgradeItem.kt
@@ -12,6 +12,7 @@ import ru.dbotthepony.mc.otm.core.TranslatableComponent
 import ru.dbotthepony.mc.otm.core.nbt.set
 import ru.dbotthepony.mc.otm.core.tagNotNull
 import ru.dbotthepony.mc.otm.data.loot.IRandomizableItem
+import ru.dbotthepony.mc.otm.item.exopack.AbstractExoPackSlotUpgradeItem
 import java.util.*
 
 @Suppress("NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS") // .tab(null) is a legal statement because tab field itself is nullable
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/SingleUseBatteryItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/SingleUseBatteryItem.kt
index 336e24038..7c516755c 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/SingleUseBatteryItem.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/SingleUseBatteryItem.kt
@@ -38,7 +38,7 @@ open class SingleUseBatteryItem(
 		p_41424_: TooltipFlag
 	) {
 		super.appendHoverText(itemStack, p_41422_, list, p_41424_)
-		list.add(SINGLE_USE)
+		list.add(TranslatableComponent("otm.battery.single_use").withStyle(ChatFormatting.GRAY))
 		ItemEnergyStorageImpl.appendHoverText(itemStack, list)
 	}
 
@@ -57,10 +57,6 @@ open class SingleUseBatteryItem(
 	override fun getBarColor(p_150901_: ItemStack): Int {
 		return p_150901_.matteryEnergy?.getBarColor() ?: super.getBarColor(p_150901_)
 	}
-
-	companion object {
-		private val SINGLE_USE = TranslatableComponent("otm.battery.single_use").withStyle(ChatFormatting.GRAY)
-	}
 }
 
 class ZPMItem : SingleUseBatteryItem(ItemsConfig.Batteries.ZPM, Properties().stacksTo(1).rarity(Rarity.EPIC)) {
@@ -71,13 +67,6 @@ class ZPMItem : SingleUseBatteryItem(ItemsConfig.Batteries.ZPM, Properties().sta
 		p_41424_: TooltipFlag
 	) {
 		super.appendHoverText(itemStack, p_41422_, list, p_41424_)
-		list.add(DESCRIPTION)
-	}
-
-	companion object {
-		val MAX_STORAGE = Decimal(200_000_000_000_000L)
-		val THROUGHPUT = Decimal(200_000_000L)
-
-		private val DESCRIPTION = TranslatableComponent("item.${OverdriveThatMatters.MOD_ID}.zpm_battery.description").withStyle(ChatFormatting.DARK_GRAY)
+		list.add(TranslatableComponent("$descriptionId.description").withStyle(ChatFormatting.DARK_GRAY))
 	}
 }
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/AbstractExoPackSlotUpgradeItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/exopack/AbstractExoPackSlotUpgradeItem.kt
similarity index 98%
rename from src/main/kotlin/ru/dbotthepony/mc/otm/item/AbstractExoPackSlotUpgradeItem.kt
rename to src/main/kotlin/ru/dbotthepony/mc/otm/item/exopack/AbstractExoPackSlotUpgradeItem.kt
index 2fc022a71..e4dd48ac0 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/AbstractExoPackSlotUpgradeItem.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/exopack/AbstractExoPackSlotUpgradeItem.kt
@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.item
+package ru.dbotthepony.mc.otm.item.exopack
 
 import net.minecraft.ChatFormatting
 import net.minecraft.network.chat.Component
@@ -14,7 +14,6 @@ import net.minecraft.world.item.Rarity
 import net.minecraft.world.item.TooltipFlag
 import net.minecraft.world.item.UseAnim
 import net.minecraft.world.level.Level
-import ru.dbotthepony.mc.otm.OverdriveThatMatters
 import ru.dbotthepony.mc.otm.config.ServerConfig
 import ru.dbotthepony.mc.otm.capability.matteryPlayer
 import ru.dbotthepony.mc.otm.client.minecraft
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/ExoPackCraftingUpgradeItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/exopack/ExoPackCraftingUpgradeItem.kt
similarity index 98%
rename from src/main/kotlin/ru/dbotthepony/mc/otm/item/ExoPackCraftingUpgradeItem.kt
rename to src/main/kotlin/ru/dbotthepony/mc/otm/item/exopack/ExoPackCraftingUpgradeItem.kt
index b753f7291..86f904785 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/ExoPackCraftingUpgradeItem.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/exopack/ExoPackCraftingUpgradeItem.kt
@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.item
+package ru.dbotthepony.mc.otm.item.exopack
 
 import net.minecraft.ChatFormatting
 import net.minecraft.network.chat.Component
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/ExoPackProbeItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/exopack/ExoPackProbeItem.kt
similarity index 98%
rename from src/main/kotlin/ru/dbotthepony/mc/otm/item/ExoPackProbeItem.kt
rename to src/main/kotlin/ru/dbotthepony/mc/otm/item/exopack/ExoPackProbeItem.kt
index 12bfbaf5f..afa6cb200 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/ExoPackProbeItem.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/exopack/ExoPackProbeItem.kt
@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.item
+package ru.dbotthepony.mc.otm.item.exopack
 
 import net.minecraft.ChatFormatting
 import net.minecraft.network.chat.Component
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/ExoPackSlotUpgradeItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/exopack/ExoPackSlotUpgradeItem.kt
similarity index 97%
rename from src/main/kotlin/ru/dbotthepony/mc/otm/item/ExoPackSlotUpgradeItem.kt
rename to src/main/kotlin/ru/dbotthepony/mc/otm/item/exopack/ExoPackSlotUpgradeItem.kt
index 76f14b5a9..d029c75fe 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/ExoPackSlotUpgradeItem.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/exopack/ExoPackSlotUpgradeItem.kt
@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.item
+package ru.dbotthepony.mc.otm.item.exopack
 
 import net.minecraft.world.item.ItemStack
 import net.minecraft.world.item.Rarity
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/CreativePatternItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/matter/CreativePatternItem.kt
similarity index 96%
rename from src/main/kotlin/ru/dbotthepony/mc/otm/item/CreativePatternItem.kt
rename to src/main/kotlin/ru/dbotthepony/mc/otm/item/matter/CreativePatternItem.kt
index 195e20896..8dd5a4659 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/CreativePatternItem.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/matter/CreativePatternItem.kt
@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.item
+package ru.dbotthepony.mc.otm.item.matter
 
 import net.minecraft.ChatFormatting
 import net.minecraft.core.Direction
@@ -13,7 +13,6 @@ import net.minecraftforge.common.capabilities.Capability
 import net.minecraftforge.common.capabilities.ICapabilityProvider
 import net.minecraftforge.common.util.LazyOptional
 import net.minecraftforge.registries.ForgeRegistries
-import ru.dbotthepony.mc.otm.OverdriveThatMatters
 import ru.dbotthepony.mc.otm.capability.MatteryCapability
 import ru.dbotthepony.mc.otm.capability.matter.IPatternState
 import ru.dbotthepony.mc.otm.capability.matter.IPatternStorage
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/MatterCapacitorItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/matter/MatterCapacitorItem.kt
similarity index 99%
rename from src/main/kotlin/ru/dbotthepony/mc/otm/item/MatterCapacitorItem.kt
rename to src/main/kotlin/ru/dbotthepony/mc/otm/item/matter/MatterCapacitorItem.kt
index 465ee309a..c2ef417ad 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/MatterCapacitorItem.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/matter/MatterCapacitorItem.kt
@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.item
+package ru.dbotthepony.mc.otm.item.matter
 
 import net.minecraft.ChatFormatting
 import net.minecraft.MethodsReturnNonnullByDefault
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/MatterDustItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/matter/MatterDustItem.kt
similarity index 98%
rename from src/main/kotlin/ru/dbotthepony/mc/otm/item/MatterDustItem.kt
rename to src/main/kotlin/ru/dbotthepony/mc/otm/item/matter/MatterDustItem.kt
index 06b29621e..ccc0b3735 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/MatterDustItem.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/matter/MatterDustItem.kt
@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.item
+package ru.dbotthepony.mc.otm.item.matter
 
 import net.minecraft.ChatFormatting
 import net.minecraft.network.chat.Component
@@ -11,7 +11,6 @@ import net.minecraft.world.item.ItemStack
 import net.minecraft.world.item.TooltipFlag
 import net.minecraft.world.level.Level
 import ru.dbotthepony.mc.otm.config.ItemsConfig
-import ru.dbotthepony.mc.otm.config.ServerConfig
 import ru.dbotthepony.mc.otm.core.TranslatableComponent
 import ru.dbotthepony.mc.otm.core.math.Decimal
 import ru.dbotthepony.mc.otm.matter.IMatterItem
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/PatternStorageItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/matter/PatternStorageItem.kt
similarity index 99%
rename from src/main/kotlin/ru/dbotthepony/mc/otm/item/PatternStorageItem.kt
rename to src/main/kotlin/ru/dbotthepony/mc/otm/item/matter/PatternStorageItem.kt
index db5c2a7d5..0f91e014e 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/PatternStorageItem.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/matter/PatternStorageItem.kt
@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.item
+package ru.dbotthepony.mc.otm.item.matter
 
 import net.minecraft.world.item.ItemStack
 import net.minecraft.nbt.CompoundTag
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/EnergySwordItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/tool/EnergySwordItem.kt
similarity index 96%
rename from src/main/kotlin/ru/dbotthepony/mc/otm/item/EnergySwordItem.kt
rename to src/main/kotlin/ru/dbotthepony/mc/otm/item/tool/EnergySwordItem.kt
index 49dc70d01..2a4464e49 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/EnergySwordItem.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/tool/EnergySwordItem.kt
@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.item
+package ru.dbotthepony.mc.otm.item.tool
 
 import com.google.common.collect.ImmutableMultimap
 import com.google.common.collect.Multimap
@@ -45,18 +45,6 @@ import ru.dbotthepony.mc.otm.core.orNull
 import ru.dbotthepony.mc.otm.registry.EMPDamageSource
 import ru.dbotthepony.mc.otm.core.util.WriteOnce
 
-/**
- * This is called from [net.minecraft.world.item.enchantment.EnchantmentHelper.getSweepingDamageRatio]
- * by coremod patch
- */
-fun getSweepingDamageRatioHook(ply: LivingEntity): Float? {
-	if (ply.mainHandItem.item is EnergySwordItem && ply.mainHandItem.matteryEnergy?.extractEnergyExact(EnergySwordItem.ENERGY_PER_SWING, true) == true) {
-		return 1f
-	}
-
-	return null
-}
-
 class EnergySwordItem : Item(Properties().stacksTo(1).rarity(Rarity.RARE)), Vanishable {
 	val chargedAttributes: Multimap<Attribute, AttributeModifier>
 	val dischargedAttributes: Multimap<Attribute, AttributeModifier>
@@ -257,6 +245,19 @@ class EnergySwordItem : Item(Properties().stacksTo(1).rarity(Rarity.RARE)), Vani
 			builder.pop()
 		}
 
+		/**
+		 * This is called from [net.minecraft.world.item.enchantment.EnchantmentHelper.getSweepingDamageRatio]
+		 * by coremod patch
+		 */
+		@JvmStatic
+		fun getSweepingDamageRatioHook(ply: LivingEntity): Float? {
+			if (ply.mainHandItem.item is EnergySwordItem && ply.mainHandItem.matteryEnergy?.extractEnergyExact(ENERGY_PER_SWING, true) == true) {
+				return 1f
+			}
+
+			return null
+		}
+
 		private val DESCRIPTION = TranslatableComponent("item.overdrive_that_matters.energy_sword.desc").withStyle(ChatFormatting.DARK_GRAY)
 		private val DESCRIPTION2 = TranslatableComponent("item.overdrive_that_matters.energy_sword.desc2").withStyle(ChatFormatting.DARK_GRAY)
 		private val DESCRIPTION3 = TranslatableComponent("item.overdrive_that_matters.energy_sword.desc3").withStyle(ChatFormatting.DARK_GRAY)
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/ExplosiveHammerItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/tool/ExplosiveHammerItem.kt
similarity index 99%
rename from src/main/kotlin/ru/dbotthepony/mc/otm/item/ExplosiveHammerItem.kt
rename to src/main/kotlin/ru/dbotthepony/mc/otm/item/tool/ExplosiveHammerItem.kt
index b6962151b..fe9502518 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/ExplosiveHammerItem.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/tool/ExplosiveHammerItem.kt
@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.item
+package ru.dbotthepony.mc.otm.item.tool
 
 import it.unimi.dsi.fastutil.objects.ObjectArraySet
 import net.minecraft.ChatFormatting
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/MatteryAxeItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/tool/MatteryAxeItem.kt
similarity index 94%
rename from src/main/kotlin/ru/dbotthepony/mc/otm/item/MatteryAxeItem.kt
rename to src/main/kotlin/ru/dbotthepony/mc/otm/item/tool/MatteryAxeItem.kt
index 2de16d329..4ca35f083 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/MatteryAxeItem.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/tool/MatteryAxeItem.kt
@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.item
+package ru.dbotthepony.mc.otm.item.tool
 
 import net.minecraft.world.item.AxeItem
 import net.minecraft.world.item.ItemStack
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/PortableGravitationStabilizerItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/tool/PortableGravitationStabilizerItem.kt
similarity index 95%
rename from src/main/kotlin/ru/dbotthepony/mc/otm/item/PortableGravitationStabilizerItem.kt
rename to src/main/kotlin/ru/dbotthepony/mc/otm/item/tool/PortableGravitationStabilizerItem.kt
index c09244d5e..4185f2dde 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/PortableGravitationStabilizerItem.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/tool/PortableGravitationStabilizerItem.kt
@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.item
+package ru.dbotthepony.mc.otm.item.tool
 
 import net.minecraft.ChatFormatting
 import net.minecraft.client.model.HumanoidModel
@@ -41,7 +41,7 @@ private object GravitationStabilizerArmorRenderProperties : IClientItemExtension
 	}
 }
 
-class ItemPortableGravitationStabilizer : ArmorItem(GravitationStabilizerArmorMaterial, EquipmentSlot.CHEST, Properties().stacksTo(1).rarity(Rarity.RARE)) {
+class PortableGravitationStabilizerItem : ArmorItem(GravitationStabilizerArmorMaterial, EquipmentSlot.CHEST, Properties().stacksTo(1).rarity(Rarity.RARE)) {
 	override fun initializeClient(consumer: Consumer<IClientItemExtensions>) {
 		super.initializeClient(consumer)
 		consumer.accept(GravitationStabilizerArmorRenderProperties)
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/SimpleTritaniumArmorItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/tool/SimpleTritaniumArmorItem.kt
similarity index 97%
rename from src/main/kotlin/ru/dbotthepony/mc/otm/item/SimpleTritaniumArmorItem.kt
rename to src/main/kotlin/ru/dbotthepony/mc/otm/item/tool/SimpleTritaniumArmorItem.kt
index 6dbeacff7..1745174ba 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/SimpleTritaniumArmorItem.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/tool/SimpleTritaniumArmorItem.kt
@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.item
+package ru.dbotthepony.mc.otm.item.tool
 
 import net.minecraft.sounds.SoundEvent
 import net.minecraft.sounds.SoundEvents
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/TritaniumArmorItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/tool/TritaniumArmorItem.kt
similarity index 98%
rename from src/main/kotlin/ru/dbotthepony/mc/otm/item/TritaniumArmorItem.kt
rename to src/main/kotlin/ru/dbotthepony/mc/otm/item/tool/TritaniumArmorItem.kt
index 5cab53c53..102db11db 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/TritaniumArmorItem.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/tool/TritaniumArmorItem.kt
@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.item
+package ru.dbotthepony.mc.otm.item.tool
 
 import net.minecraft.client.model.HumanoidModel
 import net.minecraft.sounds.SoundEvent
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/matter/MatterRecyclerMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/matter/MatterRecyclerMenu.kt
index a999638b2..373719f59 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/matter/MatterRecyclerMenu.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/matter/MatterRecyclerMenu.kt
@@ -4,7 +4,7 @@ import net.minecraft.world.SimpleContainer
 import net.minecraft.world.entity.player.Inventory
 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.item.matter.MatterDustItem
 import ru.dbotthepony.mc.otm.menu.MatteryPoweredMenu
 import ru.dbotthepony.mc.otm.menu.MatterySlot
 import ru.dbotthepony.mc.otm.menu.input.EnergyConfigPlayerInput
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/ExplosiveHammerPrimingRecipe.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/ExplosiveHammerPrimingRecipe.kt
index 925c5f3f1..db921ef0e 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/ExplosiveHammerPrimingRecipe.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/ExplosiveHammerPrimingRecipe.kt
@@ -18,7 +18,7 @@ import ru.dbotthepony.mc.otm.container.stream
 import ru.dbotthepony.mc.otm.core.isActuallyEmpty
 import ru.dbotthepony.mc.otm.core.isNotEmpty
 import ru.dbotthepony.mc.otm.core.set
-import ru.dbotthepony.mc.otm.item.ExplosiveHammerItem
+import ru.dbotthepony.mc.otm.item.tool.ExplosiveHammerItem
 import ru.dbotthepony.mc.otm.registry.MItems
 
 class ExplosiveHammerPrimingRecipe(private val _id: ResourceLocation, val payload: Ingredient) : CraftingRecipe {
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 c90fb40e2..dbc747d96 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MItems.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MItems.kt
@@ -19,6 +19,19 @@ import ru.dbotthepony.mc.otm.config.ItemsConfig
 import ru.dbotthepony.mc.otm.core.collect.SupplierList
 import ru.dbotthepony.mc.otm.core.TranslatableComponent
 import ru.dbotthepony.mc.otm.item.*
+import ru.dbotthepony.mc.otm.item.exopack.ExoPackCraftingUpgradeItem
+import ru.dbotthepony.mc.otm.item.exopack.ExoPackProbeItem
+import ru.dbotthepony.mc.otm.item.exopack.ExoPackSlotUpgradeItem
+import ru.dbotthepony.mc.otm.item.matter.CreativePatternItem
+import ru.dbotthepony.mc.otm.item.matter.MatterCapacitorItem
+import ru.dbotthepony.mc.otm.item.matter.MatterDustItem
+import ru.dbotthepony.mc.otm.item.matter.PatternStorageItem
+import ru.dbotthepony.mc.otm.item.tool.EnergySwordItem
+import ru.dbotthepony.mc.otm.item.tool.ExplosiveHammerItem
+import ru.dbotthepony.mc.otm.item.tool.MatteryAxeItem
+import ru.dbotthepony.mc.otm.item.tool.PortableGravitationStabilizerItem
+import ru.dbotthepony.mc.otm.item.tool.SimpleTritaniumArmorItem
+import ru.dbotthepony.mc.otm.item.tool.TritaniumArmorItem
 import ru.dbotthepony.mc.otm.item.weapon.PlasmaRifleItem
 
 object MItems {
@@ -190,7 +203,7 @@ object MItems {
 
 	val TRITANIUM_SHIELD: ShieldItem by registry.register(MNames.TRITANIUM_SHIELD) { object : ShieldItem(Properties().durability(2048)) {
 		override fun isValidRepairItem(pToRepair: ItemStack, pRepair: ItemStack): Boolean {
-			return pRepair.`is`(MItemTags.TRITANIUM_INGOTS)
+			return pRepair.`is`(MItemTags.REINFORCED_TRITANIUM_PLATES)
 		}
 	} }
 
@@ -250,7 +263,7 @@ object MItems {
 
 	val GRAVITATION_FIELD_LIMITER: Item by registry.register(MNames.GRAVITATION_FIELD_LIMITER) { Item(DEFAULT_PROPERTIES) }
 	val GRAVITATION_FIELD_SENSOR: Item by registry.register(MNames.GRAVITATION_FIELD_SENSOR) { Item(DEFAULT_PROPERTIES) }
-	val PORTABLE_GRAVITATION_STABILIZER: Item by registry.register(MNames.PORTABLE_GRAVITATION_STABILIZER) { ItemPortableGravitationStabilizer() }
+	val PORTABLE_GRAVITATION_STABILIZER: Item by registry.register(MNames.PORTABLE_GRAVITATION_STABILIZER) { PortableGravitationStabilizerItem() }
 
 	val BLACK_HOLE: Item by registry.register(MNames.BLACK_HOLE) { BlockItem(MBlocks.BLACK_HOLE, DEFAULT_PROPERTIES) }
 
diff --git a/src/main/resources/coremods/code_injector.js b/src/main/resources/coremods/code_injector.js
index 78cb5895f..a57584172 100644
--- a/src/main/resources/coremods/code_injector.js
+++ b/src/main/resources/coremods/code_injector.js
@@ -894,7 +894,7 @@ function initializeCoreMod() {
 
 				var next = new MethodInsnNode(
 					opcodesRemapped.invokestatic,
-					'ru/dbotthepony/mc/otm/item/EnergySwordItemKt',
+					'ru/dbotthepony/mc/otm/item/tool/EnergySwordItem',
 					'getSweepingDamageRatioHook',
 					'(Lnet/minecraft/world/entity/LivingEntity;)Ljava/lang/Float;',
 					false