diff --git a/src/main/java/ru/dbotthepony/mc/otm/OverdriveThatMatters.java b/src/main/java/ru/dbotthepony/mc/otm/OverdriveThatMatters.java
index d84af44df..1eaa1daa5 100644
--- a/src/main/java/ru/dbotthepony/mc/otm/OverdriveThatMatters.java
+++ b/src/main/java/ru/dbotthepony/mc/otm/OverdriveThatMatters.java
@@ -47,7 +47,7 @@ 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.tool.ExplosiveHammerItem;
-import ru.dbotthepony.mc.otm.item.tool.TritaniumArmorItem;
+import ru.dbotthepony.mc.otm.item.armor.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/config/ToolsConfig.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/config/ToolsConfig.kt
index 4a23f9c26..cc4e41e41 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/config/ToolsConfig.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/config/ToolsConfig.kt
@@ -1,6 +1,6 @@
 package ru.dbotthepony.mc.otm.config
 
-import ru.dbotthepony.mc.otm.item.tool.EnergySwordItem
+import ru.dbotthepony.mc.otm.item.weapon.EnergySwordItem
 
 object ToolsConfig : AbstractConfig("tools") {
 	val AXES_BREAK_LEAVES_INSTANTLY: Boolean by builder.define("AXES_BREAK_LEAVES_INSTANTLY", true)
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/tool/PortableGravitationStabilizerItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/armor/PortableGravitationStabilizerItem.kt
similarity index 98%
rename from src/main/kotlin/ru/dbotthepony/mc/otm/item/tool/PortableGravitationStabilizerItem.kt
rename to src/main/kotlin/ru/dbotthepony/mc/otm/item/armor/PortableGravitationStabilizerItem.kt
index 4185f2dde..2bf541b69 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/tool/PortableGravitationStabilizerItem.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/armor/PortableGravitationStabilizerItem.kt
@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.item.tool
+package ru.dbotthepony.mc.otm.item.armor
 
 import net.minecraft.ChatFormatting
 import net.minecraft.client.model.HumanoidModel
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/tool/SimpleTritaniumArmorItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/armor/SimpleTritaniumArmorItem.kt
similarity index 97%
rename from src/main/kotlin/ru/dbotthepony/mc/otm/item/tool/SimpleTritaniumArmorItem.kt
rename to src/main/kotlin/ru/dbotthepony/mc/otm/item/armor/SimpleTritaniumArmorItem.kt
index 1745174ba..55988f2e4 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/tool/SimpleTritaniumArmorItem.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/armor/SimpleTritaniumArmorItem.kt
@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.item.tool
+package ru.dbotthepony.mc.otm.item.armor
 
 import net.minecraft.sounds.SoundEvent
 import net.minecraft.sounds.SoundEvents
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/tool/TritaniumArmorItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/armor/TritaniumArmorItem.kt
similarity index 98%
rename from src/main/kotlin/ru/dbotthepony/mc/otm/item/tool/TritaniumArmorItem.kt
rename to src/main/kotlin/ru/dbotthepony/mc/otm/item/armor/TritaniumArmorItem.kt
index 102db11db..0c2c8b954 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/tool/TritaniumArmorItem.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/armor/TritaniumArmorItem.kt
@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.item.tool
+package ru.dbotthepony.mc.otm.item.armor
 
 import net.minecraft.client.model.HumanoidModel
 import net.minecraft.sounds.SoundEvent
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/tool/EnergySwordItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/weapon/EnergySwordItem.kt
similarity index 99%
rename from src/main/kotlin/ru/dbotthepony/mc/otm/item/tool/EnergySwordItem.kt
rename to src/main/kotlin/ru/dbotthepony/mc/otm/item/weapon/EnergySwordItem.kt
index 2a4464e49..e79e22482 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/tool/EnergySwordItem.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/weapon/EnergySwordItem.kt
@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.item.tool
+package ru.dbotthepony.mc.otm.item.weapon
 
 import com.google.common.collect.ImmutableMultimap
 import com.google.common.collect.Multimap
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 dbc747d96..2909e31f5 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MItems.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MItems.kt
@@ -26,12 +26,12 @@ 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.weapon.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.armor.PortableGravitationStabilizerItem
+import ru.dbotthepony.mc.otm.item.armor.SimpleTritaniumArmorItem
+import ru.dbotthepony.mc.otm.item.armor.TritaniumArmorItem
 import ru.dbotthepony.mc.otm.item.weapon.PlasmaRifleItem
 
 object MItems {
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt
index 50af44563..67addb73f 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt
@@ -28,7 +28,7 @@ import ru.dbotthepony.mc.otm.block.decorative.CargoCrateBlock
 import ru.dbotthepony.mc.otm.block.decorative.TritaniumPressurePlate
 import ru.dbotthepony.mc.otm.capability.matteryEnergy
 import ru.dbotthepony.mc.otm.core.math.Decimal
-import ru.dbotthepony.mc.otm.item.tool.EnergySwordItem
+import ru.dbotthepony.mc.otm.item.weapon.EnergySwordItem
 import ru.dbotthepony.mc.otm.registry.objects.ColoredDecorativeBlock
 import ru.dbotthepony.mc.otm.registry.objects.CrateProperties
 import ru.dbotthepony.mc.otm.registry.objects.DecorativeBlock