diff --git a/TrueCraft.Core/Logic/Items/AxeItem.cs b/TrueCraft.Core/Logic/Items/AxeItem.cs
new file mode 100644
index 0000000..7580adc
--- /dev/null
+++ b/TrueCraft.Core/Logic/Items/AxeItem.cs
@@ -0,0 +1,77 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using TrueCraft.API;
+
+namespace TrueCraft.Core.Logic.Items
+{
+    public abstract class AxeItem : ToolItem
+    {
+    }
+
+    public class WoodenAxeItem : AxeItem
+    {
+        public static readonly short ItemID = 0x10F;
+
+        public override short ID { get { return 0x10F; } }
+
+        public override ToolMaterial Material { get { return ToolMaterial.Wood; } }
+
+        public override short BaseDurability { get { return 60; } }
+
+        public override string DisplayName { get { return "Wooden Axe"; } }
+    }
+
+    public class StoneAxeItem : AxeItem
+    {
+        public static readonly short ItemID = 0x113;
+
+        public override short ID { get { return 0x113; } }
+
+        public override ToolMaterial Material { get { return ToolMaterial.Stone; } }
+
+        public override short BaseDurability { get { return 132; } }
+
+        public override string DisplayName { get { return "Stone Axe"; } }
+    }
+
+    public class IronAxeItem : AxeItem
+    {
+        public static readonly short ItemID = 0x102;
+
+        public override short ID { get { return 0x102; } }
+
+        public override ToolMaterial Material { get { return ToolMaterial.Iron; } }
+
+        public override short BaseDurability { get { return 251; } }
+
+        public override string DisplayName { get { return "Iron Axe"; } }
+    }
+
+    public class GoldenAxeItem : AxeItem
+    {
+        public static readonly short ItemID = 0x11E;
+
+        public override short ID { get { return 0x11E; } }
+
+        public override ToolMaterial Material { get { return ToolMaterial.Gold; } }
+
+        public override short BaseDurability { get { return 33; } }
+
+        public override string DisplayName { get { return "Golden Axe"; } }
+    }
+
+    public class DiamondAxeItem : AxeItem
+    {
+        public static readonly short ItemID = 0x117;
+
+        public override short ID { get { return 0x117; } }
+
+        public override ToolMaterial Material { get { return ToolMaterial.Diamond; } }
+
+        public override short BaseDurability { get { return 1562; } }
+
+        public override string DisplayName { get { return "Diamond Axe"; } }
+    }
+}
\ No newline at end of file
diff --git a/TrueCraft.Core/Logic/Items/BootsItem.cs b/TrueCraft.Core/Logic/Items/BootsItem.cs
new file mode 100644
index 0000000..1234a4f
--- /dev/null
+++ b/TrueCraft.Core/Logic/Items/BootsItem.cs
@@ -0,0 +1,83 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using TrueCraft.API;
+
+namespace TrueCraft.Core.Logic.Items
+{
+    public class LeatherBootsItem : ArmourItem
+    {
+        public static readonly short ItemID = 0x12D;
+
+        public override short ID { get { return 0x12D; } }
+
+        public override ArmourMaterial Material { get { return ArmourMaterial.Leather; } }
+
+        public override short BaseDurability { get { return 40; } }
+
+        public override float BaseArmour { get { return 1.5f; } }
+
+        public override string DisplayName { get { return "Leather Boots"; } }
+    }
+
+    public class IronBootsItem : ArmourItem
+    {
+        public static readonly short ItemID = 0x135;
+
+        public override short ID { get { return 0x135; } }
+
+        public override ArmourMaterial Material { get { return ArmourMaterial.Iron; } }
+
+        public override short BaseDurability { get { return 160; } }
+
+        public override float BaseArmour { get { return 1.5f; } }
+
+        public override string DisplayName { get { return "Iron Boots"; } }
+    }
+
+    public class GoldenBootsItem : ArmourItem
+    {
+        public static readonly short ItemID = 0x13D;
+
+        public override short ID { get { return 0x13D; } }
+
+        public override ArmourMaterial Material { get { return ArmourMaterial.Gold; } }
+
+        public override short BaseDurability { get { return 80; } }
+
+        public override float BaseArmour { get { return 1.5f; } }
+
+        public override string DisplayName { get { return "Golden Boots"; } }
+    }
+
+    public class DiamondBootsItem : ArmourItem
+    {
+        public static readonly short ItemID = 0x139;
+
+        public override short ID { get { return 0x139; } }
+
+        public override ArmourMaterial Material { get { return ArmourMaterial.Diamond; } }
+
+        public override short BaseDurability { get { return 320; } }
+
+        public override float BaseArmour { get { return 1.5f; } }
+
+        public override string DisplayName { get { return "Diamond Boots"; } }
+    }
+
+    public class ChainBootsItem : ArmourItem
+    {
+        public static readonly short ItemID = 0x131;
+
+        public override short ID { get { return 0x131; } }
+
+        public override ArmourMaterial Material { get { return ArmourMaterial.Chain; } }
+
+        public override short BaseDurability { get { return 79; } }
+
+        public override float BaseArmour { get { return 1.5f; } }
+
+        public override string DisplayName { get { return "Chain Boots"; } }
+    }
+}
\ No newline at end of file
diff --git a/TrueCraft.Core/Logic/Items/ChainBootsItem.cs b/TrueCraft.Core/Logic/Items/ChainBootsItem.cs
deleted file mode 100644
index 7946f9b..0000000
--- a/TrueCraft.Core/Logic/Items/ChainBootsItem.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using TrueCraft.API.Logic;
-using TrueCraft.API;
-
-namespace TrueCraft.Core.Logic.Items
-{
-    public class ChainBootsItem : ArmourItem
-    {
-        public static readonly short ItemID = 0x131;
-
-        public override short ID { get { return 0x131; } }
-
-        public override ArmourMaterial Material { get { return ArmourMaterial.Chain; } }
-
-        public override short BaseDurability { get { return 79; } }
-
-        public override float BaseArmour { get { return 1.5f; } }
-
-        public override string DisplayName { get { return "Chain Boots"; } }
-    }
-}
\ No newline at end of file
diff --git a/TrueCraft.Core/Logic/Items/ChainChestplateItem.cs b/TrueCraft.Core/Logic/Items/ChainChestplateItem.cs
deleted file mode 100644
index 80dab32..0000000
--- a/TrueCraft.Core/Logic/Items/ChainChestplateItem.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using TrueCraft.API.Logic;
-using TrueCraft.API;
-
-namespace TrueCraft.Core.Logic.Items
-{
-    public class ChainChestplateItem : ArmourItem
-    {
-        public static readonly short ItemID = 0x12F;
-
-        public override short ID { get { return 0x12F; } }
-
-        public override ArmourMaterial Material { get { return ArmourMaterial.Chain; } }
-
-        public override short BaseDurability { get { return 96; } }
-
-        public override float BaseArmour { get { return 4; } }
-
-        public override string DisplayName { get { return "Chain Chestplate"; } }
-    }
-}
\ No newline at end of file
diff --git a/TrueCraft.Core/Logic/Items/ChainHelmetItem.cs b/TrueCraft.Core/Logic/Items/ChainHelmetItem.cs
deleted file mode 100644
index 0843581..0000000
--- a/TrueCraft.Core/Logic/Items/ChainHelmetItem.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using TrueCraft.API.Logic;
-using TrueCraft.API;
-
-namespace TrueCraft.Core.Logic.Items
-{
-    public class ChainHelmetItem : ArmourItem
-    {
-        public static readonly short ItemID = 0x12E;
-
-        public override short ID { get { return 0x12E; } }
-
-        public override ArmourMaterial Material { get { return ArmourMaterial.Chain; } }
-
-        public override short BaseDurability { get { return 67; } }
-
-        public override float BaseArmour { get { return 1.5f; } }
-
-        public override string DisplayName { get { return "Chain Helmet"; } }
-    }
-}
\ No newline at end of file
diff --git a/TrueCraft.Core/Logic/Items/ChainLeggingsItem.cs b/TrueCraft.Core/Logic/Items/ChainLeggingsItem.cs
deleted file mode 100644
index 73022e4..0000000
--- a/TrueCraft.Core/Logic/Items/ChainLeggingsItem.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using TrueCraft.API.Logic;
-using TrueCraft.API;
-
-namespace TrueCraft.Core.Logic.Items
-{
-    public class ChainLeggingsItem : ArmourItem
-    {
-        public static readonly short ItemID = 0x130;
-
-        public override short ID { get { return 0x130; } }
-
-        public override ArmourMaterial Material { get { return ArmourMaterial.Chain; } }
-
-        public override short BaseDurability { get { return 92; } }
-
-        public override float BaseArmour { get { return 3; } }
-
-        public override string DisplayName { get { return "Chain Leggings"; } }
-    }
-}
\ No newline at end of file
diff --git a/TrueCraft.Core/Logic/Items/ChestplateItem.cs b/TrueCraft.Core/Logic/Items/ChestplateItem.cs
new file mode 100644
index 0000000..ce49d4b
--- /dev/null
+++ b/TrueCraft.Core/Logic/Items/ChestplateItem.cs
@@ -0,0 +1,83 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using TrueCraft.API;
+
+namespace TrueCraft.Core.Logic.Items
+{
+    public class LeatherTunicItem : ArmourItem
+    {
+        public static readonly short ItemID = 0x12B;
+
+        public override short ID { get { return 0x12B; } }
+
+        public override ArmourMaterial Material { get { return ArmourMaterial.Leather; } }
+
+        public override short BaseDurability { get { return 49; } }
+
+        public override float BaseArmour { get { return 4; } }
+
+        public override string DisplayName { get { return "Leather Tunic"; } }
+    }
+
+    public class IronChestplateItem : ArmourItem
+    {
+        public static readonly short ItemID = 0x133;
+
+        public override short ID { get { return 0x133; } }
+
+        public override ArmourMaterial Material { get { return ArmourMaterial.Iron; } }
+
+        public override short BaseDurability { get { return 192; } }
+
+        public override float BaseArmour { get { return 4; } }
+
+        public override string DisplayName { get { return "Iron Chestplate"; } }
+    }
+
+    public class GoldenChestplateItem : ArmourItem
+    {
+        public static readonly short ItemID = 0x13B;
+
+        public override short ID { get { return 0x13B; } }
+
+        public override ArmourMaterial Material { get { return ArmourMaterial.Gold; } }
+
+        public override short BaseDurability { get { return 96; } }
+
+        public override float BaseArmour { get { return 4; } }
+
+        public override string DisplayName { get { return "Golden Chestplate"; } }
+    }
+
+    public class DiamondChestplateItem : ArmourItem
+    {
+        public static readonly short ItemID = 0x137;
+
+        public override short ID { get { return 0x137; } }
+
+        public override ArmourMaterial Material { get { return ArmourMaterial.Diamond; } }
+
+        public override short BaseDurability { get { return 384; } }
+
+        public override float BaseArmour { get { return 4; } }
+
+        public override string DisplayName { get { return "Diamond Chestplate"; } }
+    }
+
+    public class ChainChestplateItem : ArmourItem
+    {
+        public static readonly short ItemID = 0x12F;
+
+        public override short ID { get { return 0x12F; } }
+
+        public override ArmourMaterial Material { get { return ArmourMaterial.Chain; } }
+
+        public override short BaseDurability { get { return 96; } }
+
+        public override float BaseArmour { get { return 4; } }
+
+        public override string DisplayName { get { return "Chain Chestplate"; } }
+    }
+}
\ No newline at end of file
diff --git a/TrueCraft.Core/Logic/Items/DiamondAxeItem.cs b/TrueCraft.Core/Logic/Items/DiamondAxeItem.cs
deleted file mode 100644
index 6c2939f..0000000
--- a/TrueCraft.Core/Logic/Items/DiamondAxeItem.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using TrueCraft.API.Logic;
-using TrueCraft.API;
-
-namespace TrueCraft.Core.Logic.Items
-{
-    public class DiamondAxeItem : AxeItem
-    {
-        public static readonly short ItemID = 0x117;
-
-        public override short ID { get { return 0x117; } }
-
-        public override ToolMaterial Material { get { return ToolMaterial.Diamond; } }
-
-        public override short BaseDurability { get { return 1562; } }
-
-        public override string DisplayName { get { return "Diamond Axe"; } }
-    }
-}
\ No newline at end of file
diff --git a/TrueCraft.Core/Logic/Items/DiamondBootsItem.cs b/TrueCraft.Core/Logic/Items/DiamondBootsItem.cs
deleted file mode 100644
index 26dca32..0000000
--- a/TrueCraft.Core/Logic/Items/DiamondBootsItem.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using TrueCraft.API.Logic;
-using TrueCraft.API;
-
-namespace TrueCraft.Core.Logic.Items
-{
-    public class DiamondBootsItem : ArmourItem
-    {
-        public static readonly short ItemID = 0x139;
-
-        public override short ID { get { return 0x139; } }
-
-        public override ArmourMaterial Material { get { return ArmourMaterial.Diamond; } }
-
-        public override short BaseDurability { get { return 320; } }
-
-        public override float BaseArmour { get { return 1.5f; } }
-
-        public override string DisplayName { get { return "Diamond Boots"; } }
-    }
-}
\ No newline at end of file
diff --git a/TrueCraft.Core/Logic/Items/DiamondChestplateItem.cs b/TrueCraft.Core/Logic/Items/DiamondChestplateItem.cs
deleted file mode 100644
index 79dfcd5..0000000
--- a/TrueCraft.Core/Logic/Items/DiamondChestplateItem.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using TrueCraft.API.Logic;
-using TrueCraft.API;
-
-namespace TrueCraft.Core.Logic.Items
-{
-    public class DiamondChestplateItem : ArmourItem
-    {
-        public static readonly short ItemID = 0x137;
-
-        public override short ID { get { return 0x137; } }
-
-        public override ArmourMaterial Material { get { return ArmourMaterial.Diamond; } }
-
-        public override short BaseDurability { get { return 384; } }
-
-        public override float BaseArmour { get { return 4; } }
-
-        public override string DisplayName { get { return "Diamond Chestplate"; } }
-    }
-}
\ No newline at end of file
diff --git a/TrueCraft.Core/Logic/Items/DiamondHelmetItem.cs b/TrueCraft.Core/Logic/Items/DiamondHelmetItem.cs
deleted file mode 100644
index fce2539..0000000
--- a/TrueCraft.Core/Logic/Items/DiamondHelmetItem.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using TrueCraft.API.Logic;
-using TrueCraft.API;
-
-namespace TrueCraft.Core.Logic.Items
-{
-    public class DiamondHelmetItem : ArmourItem
-    {
-        public static readonly short ItemID = 0x136;
-
-        public override short ID { get { return 0x136; } }
-
-        public override ArmourMaterial Material { get { return ArmourMaterial.Diamond; } }
-
-        public override short BaseDurability { get { return 272; } }
-
-        public override float BaseArmour { get { return 1.5f; } }
-
-        public override string DisplayName { get { return "Diamond Helmet"; } }
-    }
-}
\ No newline at end of file
diff --git a/TrueCraft.Core/Logic/Items/DiamondHoeItem.cs b/TrueCraft.Core/Logic/Items/DiamondHoeItem.cs
deleted file mode 100644
index 7afa444..0000000
--- a/TrueCraft.Core/Logic/Items/DiamondHoeItem.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using TrueCraft.API.Logic;
-using TrueCraft.API;
-
-namespace TrueCraft.Core.Logic.Items
-{
-    public class DiamondHoeItem : HoeItem
-    {
-        public static readonly short ItemID = 0x125;
-
-        public override short ID { get { return 0x125; } }
-
-        public override ToolMaterial Material { get { return ToolMaterial.Diamond; } }
-
-        public override short BaseDurability { get { return 1562; } }
-
-        public override string DisplayName { get { return "Diamond Hoe"; } }
-    }
-}
\ No newline at end of file
diff --git a/TrueCraft.Core/Logic/Items/DiamondLeggingsItem.cs b/TrueCraft.Core/Logic/Items/DiamondLeggingsItem.cs
deleted file mode 100644
index f4581de..0000000
--- a/TrueCraft.Core/Logic/Items/DiamondLeggingsItem.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using TrueCraft.API.Logic;
-using TrueCraft.API;
-
-namespace TrueCraft.Core.Logic.Items
-{
-    public class DiamondLeggingsItem : ArmourItem
-    {
-        public static readonly short ItemID = 0x138;
-
-        public override short ID { get { return 0x138; } }
-
-        public override ArmourMaterial Material { get { return ArmourMaterial.Diamond; } }
-
-        public override short BaseDurability { get { return 368; } }
-
-        public override float BaseArmour { get { return 3; } }
-
-        public override string DisplayName { get { return "Diamond Leggings"; } }
-    }
-}
\ No newline at end of file
diff --git a/TrueCraft.Core/Logic/Items/DiamondPickaxeItem.cs b/TrueCraft.Core/Logic/Items/DiamondPickaxeItem.cs
deleted file mode 100644
index dd70e5c..0000000
--- a/TrueCraft.Core/Logic/Items/DiamondPickaxeItem.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using TrueCraft.API.Logic;
-using TrueCraft.API;
-
-namespace TrueCraft.Core.Logic.Items
-{
-    public class DiamondPickaxeItem : PickaxeItem
-    {
-        public static readonly short ItemID = 0x116;
-
-        public override short ID { get { return 0x116; } }
-
-        public override ToolMaterial Material { get { return ToolMaterial.Diamond; } }
-
-        public override short BaseDurability { get { return 1562; } }
-
-        public override string DisplayName { get { return "Diamond Pickaxe"; } }
-    }
-}
\ No newline at end of file
diff --git a/TrueCraft.Core/Logic/Items/DiamondShovelItem.cs b/TrueCraft.Core/Logic/Items/DiamondShovelItem.cs
deleted file mode 100644
index 15056c0..0000000
--- a/TrueCraft.Core/Logic/Items/DiamondShovelItem.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using TrueCraft.API.Logic;
-using TrueCraft.API;
-
-namespace TrueCraft.Core.Logic.Items
-{
-    public class DiamondShovelItem : ShovelItem
-    {
-        public static readonly short ItemID = 0x115;
-
-        public override short ID { get { return 0x115; } }
-
-        public override ToolMaterial Material { get { return ToolMaterial.Diamond; } }
-
-        public override short BaseDurability { get { return 1562; } }
-
-        public override string DisplayName { get { return "Diamond Shovel"; } }
-    }
-}
\ No newline at end of file
diff --git a/TrueCraft.Core/Logic/Items/GoldenAxeItem.cs b/TrueCraft.Core/Logic/Items/GoldenAxeItem.cs
deleted file mode 100644
index 0f9d19c..0000000
--- a/TrueCraft.Core/Logic/Items/GoldenAxeItem.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using TrueCraft.API.Logic;
-using TrueCraft.API;
-
-namespace TrueCraft.Core.Logic.Items
-{
-    public class GoldenAxeItem : AxeItem
-    {
-        public static readonly short ItemID = 0x11E;
-
-        public override short ID { get { return 0x11E; } }
-
-        public override ToolMaterial Material { get { return ToolMaterial.Gold; } }
-
-        public override short BaseDurability { get { return 33; } }
-
-        public override string DisplayName { get { return "Golden Axe"; } }
-    }
-}
\ No newline at end of file
diff --git a/TrueCraft.Core/Logic/Items/GoldenBootsItem.cs b/TrueCraft.Core/Logic/Items/GoldenBootsItem.cs
deleted file mode 100644
index f85317f..0000000
--- a/TrueCraft.Core/Logic/Items/GoldenBootsItem.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using TrueCraft.API.Logic;
-using TrueCraft.API;
-
-namespace TrueCraft.Core.Logic.Items
-{
-    public class GoldenBootsItem : ArmourItem
-    {
-        public static readonly short ItemID = 0x13D;
-
-        public override short ID { get { return 0x13D; } }
-
-        public override ArmourMaterial Material { get { return ArmourMaterial.Gold; } }
-
-        public override short BaseDurability { get { return 80; } }
-
-        public override float BaseArmour { get { return 1.5f; } }
-
-        public override string DisplayName { get { return "Golden Boots"; } }
-    }
-}
\ No newline at end of file
diff --git a/TrueCraft.Core/Logic/Items/GoldenChestplateItem.cs b/TrueCraft.Core/Logic/Items/GoldenChestplateItem.cs
deleted file mode 100644
index 9d85f1d..0000000
--- a/TrueCraft.Core/Logic/Items/GoldenChestplateItem.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using TrueCraft.API.Logic;
-using TrueCraft.API;
-
-namespace TrueCraft.Core.Logic.Items
-{
-    public class GoldenChestplateItem : ArmourItem
-    {
-        public static readonly short ItemID = 0x13B;
-
-        public override short ID { get { return 0x13B; } }
-
-        public override ArmourMaterial Material { get { return ArmourMaterial.Gold; } }
-
-        public override short BaseDurability { get { return 96; } }
-
-        public override float BaseArmour { get { return 4; } }
-
-        public override string DisplayName { get { return "Golden Chestplate"; } }
-    }
-}
\ No newline at end of file
diff --git a/TrueCraft.Core/Logic/Items/GoldenHelmetItem.cs b/TrueCraft.Core/Logic/Items/GoldenHelmetItem.cs
deleted file mode 100644
index 77db865..0000000
--- a/TrueCraft.Core/Logic/Items/GoldenHelmetItem.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using TrueCraft.API.Logic;
-using TrueCraft.API;
-
-namespace TrueCraft.Core.Logic.Items
-{
-    public class GoldenHelmetItem : ArmourItem
-    {
-        public static readonly short ItemID = 0x13A;
-
-        public override short ID { get { return 0x13A; } }
-
-        public override ArmourMaterial Material { get { return ArmourMaterial.Gold; } }
-
-        public override short BaseDurability { get { return 68; } }
-
-        public override float BaseArmour { get { return 1.5f; } }
-
-        public override string DisplayName { get { return "Golden Helmet"; } }
-    }
-}
\ No newline at end of file
diff --git a/TrueCraft.Core/Logic/Items/GoldenHoeItem.cs b/TrueCraft.Core/Logic/Items/GoldenHoeItem.cs
deleted file mode 100644
index 8f450a9..0000000
--- a/TrueCraft.Core/Logic/Items/GoldenHoeItem.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using TrueCraft.API.Logic;
-using TrueCraft.API;
-
-namespace TrueCraft.Core.Logic.Items
-{
-    public class GoldenHoeItem : HoeItem
-    {
-        public static readonly short ItemID = 0x126;
-
-        public override short ID { get { return 0x126; } }
-
-        public override ToolMaterial Material { get { return ToolMaterial.Gold; } }
-
-        public override short BaseDurability { get { return 33; } }
-
-        public override string DisplayName { get { return "Golden Hoe"; } }
-    }
-}
\ No newline at end of file
diff --git a/TrueCraft.Core/Logic/Items/GoldenLeggingsItem.cs b/TrueCraft.Core/Logic/Items/GoldenLeggingsItem.cs
deleted file mode 100644
index cdeb3bd..0000000
--- a/TrueCraft.Core/Logic/Items/GoldenLeggingsItem.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using TrueCraft.API.Logic;
-using TrueCraft.API;
-
-namespace TrueCraft.Core.Logic.Items
-{
-    public class GoldenLeggingsItem : ArmourItem
-    {
-        public static readonly short ItemID = 0x13C;
-
-        public override short ID { get { return 0x13C; } }
-
-        public override ArmourMaterial Material { get { return ArmourMaterial.Gold; } }
-
-        public override short BaseDurability { get { return 92; } }
-
-        public override float BaseArmour { get { return 3; } }
-
-        public override string DisplayName { get { return "Golden Leggings"; } }
-    }
-}
\ No newline at end of file
diff --git a/TrueCraft.Core/Logic/Items/GoldenPickaxeItem.cs b/TrueCraft.Core/Logic/Items/GoldenPickaxeItem.cs
deleted file mode 100644
index 23261f5..0000000
--- a/TrueCraft.Core/Logic/Items/GoldenPickaxeItem.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using TrueCraft.API.Logic;
-using TrueCraft.API;
-
-namespace TrueCraft.Core.Logic.Items
-{
-    public class GoldenPickaxeItem : PickaxeItem
-    {
-        public static readonly short ItemID = 0x11D;
-
-        public override short ID { get { return 0x11D; } }
-
-        public override ToolMaterial Material { get { return ToolMaterial.Gold; } }
-
-        public override short BaseDurability { get { return 33; } }
-
-        public override string DisplayName { get { return "Golden Pickaxe"; } }
-    }
-}
\ No newline at end of file
diff --git a/TrueCraft.Core/Logic/Items/GoldenShovelItem.cs b/TrueCraft.Core/Logic/Items/GoldenShovelItem.cs
deleted file mode 100644
index 53e4580..0000000
--- a/TrueCraft.Core/Logic/Items/GoldenShovelItem.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using TrueCraft.API.Logic;
-using TrueCraft.API;
-
-namespace TrueCraft.Core.Logic.Items
-{
-    public class GoldenShovelItem : ShovelItem
-    {
-        public static readonly short ItemID = 0x11C;
-
-        public override short ID { get { return 0x11C; } }
-
-        public override ToolMaterial Material { get { return ToolMaterial.Gold; } }
-
-        public override short BaseDurability { get { return 33; } }
-
-        public override string DisplayName { get { return "Golden Shovel"; } }
-    }
-}
\ No newline at end of file
diff --git a/TrueCraft.Core/Logic/Items/HelmentItem.cs b/TrueCraft.Core/Logic/Items/HelmentItem.cs
new file mode 100644
index 0000000..0a9b6aa
--- /dev/null
+++ b/TrueCraft.Core/Logic/Items/HelmentItem.cs
@@ -0,0 +1,83 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using TrueCraft.API;
+
+namespace TrueCraft.Core.Logic.Items
+{
+    public class LeatherCapItem : ArmourItem
+    {
+        public static readonly short ItemID = 0x12A;
+
+        public override short ID { get { return 0x12A; } }
+
+        public override ArmourMaterial Material { get { return ArmourMaterial.Leather; } }
+
+        public override short BaseDurability { get { return 34; } }
+
+        public override float BaseArmour { get { return 1.5f; } }
+
+        public override string DisplayName { get { return "Leather Cap"; } }
+    }
+
+    public class IronHelmetItem : ArmourItem
+    {
+        public static readonly short ItemID = 0x132;
+
+        public override short ID { get { return 0x132; } }
+
+        public override ArmourMaterial Material { get { return ArmourMaterial.Iron; } }
+
+        public override short BaseDurability { get { return 136; } }
+
+        public override float BaseArmour { get { return 1.5f; } }
+
+        public override string DisplayName { get { return "Iron Helmet"; } }
+    }
+
+    public class GoldenHelmetItem : ArmourItem
+    {
+        public static readonly short ItemID = 0x13A;
+
+        public override short ID { get { return 0x13A; } }
+
+        public override ArmourMaterial Material { get { return ArmourMaterial.Gold; } }
+
+        public override short BaseDurability { get { return 68; } }
+
+        public override float BaseArmour { get { return 1.5f; } }
+
+        public override string DisplayName { get { return "Golden Helmet"; } }
+    }
+
+    public class DiamondHelmetItem : ArmourItem
+    {
+        public static readonly short ItemID = 0x136;
+
+        public override short ID { get { return 0x136; } }
+
+        public override ArmourMaterial Material { get { return ArmourMaterial.Diamond; } }
+
+        public override short BaseDurability { get { return 272; } }
+
+        public override float BaseArmour { get { return 1.5f; } }
+
+        public override string DisplayName { get { return "Diamond Helmet"; } }
+    }
+
+    public class ChainHelmetItem : ArmourItem
+    {
+        public static readonly short ItemID = 0x12E;
+
+        public override short ID { get { return 0x12E; } }
+
+        public override ArmourMaterial Material { get { return ArmourMaterial.Chain; } }
+
+        public override short BaseDurability { get { return 67; } }
+
+        public override float BaseArmour { get { return 1.5f; } }
+
+        public override string DisplayName { get { return "Chain Helmet"; } }
+    }
+}
\ No newline at end of file
diff --git a/TrueCraft.Core/Logic/Items/HoeItem.cs b/TrueCraft.Core/Logic/Items/HoeItem.cs
new file mode 100644
index 0000000..9f9c2da
--- /dev/null
+++ b/TrueCraft.Core/Logic/Items/HoeItem.cs
@@ -0,0 +1,77 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using TrueCraft.API;
+
+namespace TrueCraft.Core.Logic.Items
+{
+    public abstract class HoeItem : ToolItem
+    {
+    }
+
+    public class WoodenHoeItem : HoeItem
+    {
+        public static readonly short ItemID = 0x122;
+
+        public override short ID { get { return 0x122; } }
+
+        public override ToolMaterial Material { get { return ToolMaterial.Wood; } }
+
+        public override short BaseDurability { get { return 60; } }
+
+        public override string DisplayName { get { return "Wooden Hoe"; } }
+    }
+
+    public class StoneHoeItem : HoeItem
+    {
+        public static readonly short ItemID = 0x123;
+
+        public override short ID { get { return 0x123; } }
+
+        public override ToolMaterial Material { get { return ToolMaterial.Stone; } }
+
+        public override short BaseDurability { get { return 132; } }
+
+        public override string DisplayName { get { return "Stone Hoe"; } }
+    }
+
+    public class IronHoeItem : HoeItem
+    {
+        public static readonly short ItemID = 0x124;
+
+        public override short ID { get { return 0x124; } }
+
+        public override ToolMaterial Material { get { return ToolMaterial.Iron; } }
+
+        public override short BaseDurability { get { return 251; } }
+
+        public override string DisplayName { get { return "Iron Hoe"; } }
+    }
+
+    public class GoldenHoeItem : HoeItem
+    {
+        public static readonly short ItemID = 0x126;
+
+        public override short ID { get { return 0x126; } }
+
+        public override ToolMaterial Material { get { return ToolMaterial.Gold; } }
+
+        public override short BaseDurability { get { return 33; } }
+
+        public override string DisplayName { get { return "Golden Hoe"; } }
+    }
+
+    public class DiamondHoeItem : HoeItem
+    {
+        public static readonly short ItemID = 0x125;
+
+        public override short ID { get { return 0x125; } }
+
+        public override ToolMaterial Material { get { return ToolMaterial.Diamond; } }
+
+        public override short BaseDurability { get { return 1562; } }
+
+        public override string DisplayName { get { return "Diamond Hoe"; } }
+    }
+}
\ No newline at end of file
diff --git a/TrueCraft.Core/Logic/Items/IronAxeItem.cs b/TrueCraft.Core/Logic/Items/IronAxeItem.cs
deleted file mode 100644
index 662dbb3..0000000
--- a/TrueCraft.Core/Logic/Items/IronAxeItem.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using TrueCraft.API.Logic;
-using TrueCraft.API;
-
-namespace TrueCraft.Core.Logic.Items
-{
-    public class IronAxeItem : AxeItem
-    {
-        public static readonly short ItemID = 0x102;
-
-        public override short ID { get { return 0x102; } }
-
-        public override ToolMaterial Material { get { return ToolMaterial.Iron; } }
-
-        public override short BaseDurability { get { return 251; } }
-
-        public override string DisplayName { get { return "Iron Axe"; } }
-    }
-}
\ No newline at end of file
diff --git a/TrueCraft.Core/Logic/Items/IronBootsItem.cs b/TrueCraft.Core/Logic/Items/IronBootsItem.cs
deleted file mode 100644
index f2f3012..0000000
--- a/TrueCraft.Core/Logic/Items/IronBootsItem.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using TrueCraft.API.Logic;
-using TrueCraft.API;
-
-namespace TrueCraft.Core.Logic.Items
-{
-    public class IronBootsItem : ArmourItem
-    {
-        public static readonly short ItemID = 0x135;
-
-        public override short ID { get { return 0x135; } }
-
-        public override ArmourMaterial Material { get { return ArmourMaterial.Iron; } }
-
-        public override short BaseDurability { get { return 160; } }
-
-        public override float BaseArmour { get { return 1.5f; } }
-
-        public override string DisplayName { get { return "Iron Boots"; } }
-    }
-}
\ No newline at end of file
diff --git a/TrueCraft.Core/Logic/Items/IronChestplateItem.cs b/TrueCraft.Core/Logic/Items/IronChestplateItem.cs
deleted file mode 100644
index 9fc34c7..0000000
--- a/TrueCraft.Core/Logic/Items/IronChestplateItem.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using TrueCraft.API.Logic;
-using TrueCraft.API;
-
-namespace TrueCraft.Core.Logic.Items
-{
-    public class IronChestplateItem : ArmourItem
-    {
-        public static readonly short ItemID = 0x133;
-
-        public override short ID { get { return 0x133; } }
-
-        public override ArmourMaterial Material { get { return ArmourMaterial.Iron; } }
-
-        public override short BaseDurability { get { return 192; } }
-
-        public override float BaseArmour { get { return 4; } }
-
-        public override string DisplayName { get { return "Iron Chestplate"; } }
-    }
-}
\ No newline at end of file
diff --git a/TrueCraft.Core/Logic/Items/IronHelmetItem.cs b/TrueCraft.Core/Logic/Items/IronHelmetItem.cs
deleted file mode 100644
index 893d044..0000000
--- a/TrueCraft.Core/Logic/Items/IronHelmetItem.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using TrueCraft.API.Logic;
-using TrueCraft.API;
-
-namespace TrueCraft.Core.Logic.Items
-{
-    public class IronHelmetItem : ArmourItem
-    {
-        public static readonly short ItemID = 0x132;
-
-        public override short ID { get { return 0x132; } }
-
-        public override ArmourMaterial Material { get { return ArmourMaterial.Iron; } }
-
-        public override short BaseDurability { get { return 136; } }
-
-        public override float BaseArmour { get { return 1.5f; } }
-
-        public override string DisplayName { get { return "Iron Helmet"; } }
-    }
-}
\ No newline at end of file
diff --git a/TrueCraft.Core/Logic/Items/IronHoeItem.cs b/TrueCraft.Core/Logic/Items/IronHoeItem.cs
deleted file mode 100644
index fe2d24f..0000000
--- a/TrueCraft.Core/Logic/Items/IronHoeItem.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using TrueCraft.API.Logic;
-using TrueCraft.API;
-
-namespace TrueCraft.Core.Logic.Items
-{
-    public class IronHoeItem : HoeItem
-    {
-        public static readonly short ItemID = 0x124;
-
-        public override short ID { get { return 0x124; } }
-
-        public override ToolMaterial Material { get { return ToolMaterial.Iron; } }
-
-        public override short BaseDurability { get { return 251; } }
-
-        public override string DisplayName { get { return "Iron Hoe"; } }
-    }
-}
\ No newline at end of file
diff --git a/TrueCraft.Core/Logic/Items/IronLeggingsItem.cs b/TrueCraft.Core/Logic/Items/IronLeggingsItem.cs
deleted file mode 100644
index 8861734..0000000
--- a/TrueCraft.Core/Logic/Items/IronLeggingsItem.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using TrueCraft.API.Logic;
-using TrueCraft.API;
-
-namespace TrueCraft.Core.Logic.Items
-{
-    public class IronLeggingsItem : ArmourItem
-    {
-        public static readonly short ItemID = 0x134;
-
-        public override short ID { get { return 0x134; } }
-
-        public override ArmourMaterial Material { get { return ArmourMaterial.Iron; } }
-
-        public override short BaseDurability { get { return 184; } }
-
-        public override float BaseArmour { get { return 3; } }
-
-        public override string DisplayName { get { return "Iron Leggings"; } }
-    }
-}
\ No newline at end of file
diff --git a/TrueCraft.Core/Logic/Items/IronPickaxeItem.cs b/TrueCraft.Core/Logic/Items/IronPickaxeItem.cs
deleted file mode 100644
index 3ac85f6..0000000
--- a/TrueCraft.Core/Logic/Items/IronPickaxeItem.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using TrueCraft.API.Logic;
-using TrueCraft.API;
-
-namespace TrueCraft.Core.Logic.Items
-{
-    public class IronPickaxeItem : PickaxeItem
-    {
-        public static readonly short ItemID = 0x101;
-
-        public override short ID { get { return 0x101; } }
-
-        public override ToolMaterial Material { get { return ToolMaterial.Iron; } }
-
-        public override short BaseDurability { get { return 251; } }
-
-        public override string DisplayName { get { return "Iron Pickaxe"; } }
-    }
-}
\ No newline at end of file
diff --git a/TrueCraft.Core/Logic/Items/IronShovelItem.cs b/TrueCraft.Core/Logic/Items/IronShovelItem.cs
deleted file mode 100644
index abd2d0a..0000000
--- a/TrueCraft.Core/Logic/Items/IronShovelItem.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using TrueCraft.API.Logic;
-using TrueCraft.API;
-
-namespace TrueCraft.Core.Logic.Items
-{
-    public class IronShovelItem : ShovelItem
-    {
-        public static readonly short ItemID = 0x100;
-
-        public override short ID { get { return 0x100; } }
-
-        public override ToolMaterial Material { get { return ToolMaterial.Iron; } }
-
-        public override short BaseDurability { get { return 251; } }
-
-        public override string DisplayName { get { return "Iron Shovel"; } }
-    }
-}
\ No newline at end of file
diff --git a/TrueCraft.Core/Logic/Items/LeatherBootsItem.cs b/TrueCraft.Core/Logic/Items/LeatherBootsItem.cs
deleted file mode 100644
index 9bf5f8c..0000000
--- a/TrueCraft.Core/Logic/Items/LeatherBootsItem.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using TrueCraft.API.Logic;
-using TrueCraft.API;
-
-namespace TrueCraft.Core.Logic.Items
-{
-    public class LeatherBootsItem : ArmourItem
-    {
-        public static readonly short ItemID = 0x12D;
-
-        public override short ID { get { return 0x12D; } }
-
-        public override ArmourMaterial Material { get { return ArmourMaterial.Leather; } }
-
-        public override short BaseDurability { get { return 40; } }
-
-        public override float BaseArmour { get { return 1.5f; } }
-
-        public override string DisplayName { get { return "Leather Boots"; } }
-    }
-}
\ No newline at end of file
diff --git a/TrueCraft.Core/Logic/Items/LeatherCapItem.cs b/TrueCraft.Core/Logic/Items/LeatherCapItem.cs
deleted file mode 100644
index b6f6a79..0000000
--- a/TrueCraft.Core/Logic/Items/LeatherCapItem.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using TrueCraft.API.Logic;
-using TrueCraft.API;
-
-namespace TrueCraft.Core.Logic.Items
-{
-    public class LeatherCapItem : ArmourItem
-    {
-        public static readonly short ItemID = 0x12A;
-
-        public override short ID { get { return 0x12A; } }
-
-        public override ArmourMaterial Material { get { return ArmourMaterial.Leather; } }
-
-        public override short BaseDurability { get { return 34; } }
-
-        public override float BaseArmour { get { return 1.5f; } }
-
-        public override string DisplayName { get { return "Leather Cap"; } }
-    }
-}
\ No newline at end of file
diff --git a/TrueCraft.Core/Logic/Items/LeatherPantsItem.cs b/TrueCraft.Core/Logic/Items/LeatherPantsItem.cs
deleted file mode 100644
index 0555994..0000000
--- a/TrueCraft.Core/Logic/Items/LeatherPantsItem.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using TrueCraft.API.Logic;
-using TrueCraft.API;
-
-namespace TrueCraft.Core.Logic.Items
-{
-    public class LeatherPantsItem : ArmourItem
-    {
-        public static readonly short ItemID = 0x12C;
-
-        public override short ID { get { return 0x12C; } }
-
-        public override ArmourMaterial Material { get { return ArmourMaterial.Leather; } }
-
-        public override short BaseDurability { get { return 46; } }
-
-        public override float BaseArmour { get { return 3; } }
-
-        public override string DisplayName { get { return "Leather Pants"; } }
-    }
-}
\ No newline at end of file
diff --git a/TrueCraft.Core/Logic/Items/LeatherTunicItem.cs b/TrueCraft.Core/Logic/Items/LeatherTunicItem.cs
deleted file mode 100644
index aaba203..0000000
--- a/TrueCraft.Core/Logic/Items/LeatherTunicItem.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using TrueCraft.API.Logic;
-using TrueCraft.API;
-
-namespace TrueCraft.Core.Logic.Items
-{
-    public class LeatherTunicItem : ArmourItem
-    {
-        public static readonly short ItemID = 0x12B;
-
-        public override short ID { get { return 0x12B; } }
-
-        public override ArmourMaterial Material { get { return ArmourMaterial.Leather; } }
-
-        public override short BaseDurability { get { return 49; } }
-
-        public override float BaseArmour { get { return 4; } }
-
-        public override string DisplayName { get { return "Leather Tunic"; } }
-    }
-}
\ No newline at end of file
diff --git a/TrueCraft.Core/Logic/Items/LeggingsItem.cs b/TrueCraft.Core/Logic/Items/LeggingsItem.cs
new file mode 100644
index 0000000..9356d7e
--- /dev/null
+++ b/TrueCraft.Core/Logic/Items/LeggingsItem.cs
@@ -0,0 +1,83 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using TrueCraft.API;
+
+namespace TrueCraft.Core.Logic.Items
+{
+    public class LeatherPantsItem : ArmourItem
+    {
+        public static readonly short ItemID = 0x12C;
+
+        public override short ID { get { return 0x12C; } }
+
+        public override ArmourMaterial Material { get { return ArmourMaterial.Leather; } }
+
+        public override short BaseDurability { get { return 46; } }
+
+        public override float BaseArmour { get { return 3; } }
+
+        public override string DisplayName { get { return "Leather Pants"; } }
+    }
+
+    public class IronLeggingsItem : ArmourItem
+    {
+        public static readonly short ItemID = 0x134;
+
+        public override short ID { get { return 0x134; } }
+
+        public override ArmourMaterial Material { get { return ArmourMaterial.Iron; } }
+
+        public override short BaseDurability { get { return 184; } }
+
+        public override float BaseArmour { get { return 3; } }
+
+        public override string DisplayName { get { return "Iron Leggings"; } }
+    }
+
+    public class GoldenLeggingsItem : ArmourItem
+    {
+        public static readonly short ItemID = 0x13C;
+
+        public override short ID { get { return 0x13C; } }
+
+        public override ArmourMaterial Material { get { return ArmourMaterial.Gold; } }
+
+        public override short BaseDurability { get { return 92; } }
+
+        public override float BaseArmour { get { return 3; } }
+
+        public override string DisplayName { get { return "Golden Leggings"; } }
+    }
+
+    public class DiamondLeggingsItem : ArmourItem
+    {
+        public static readonly short ItemID = 0x138;
+
+        public override short ID { get { return 0x138; } }
+
+        public override ArmourMaterial Material { get { return ArmourMaterial.Diamond; } }
+
+        public override short BaseDurability { get { return 368; } }
+
+        public override float BaseArmour { get { return 3; } }
+
+        public override string DisplayName { get { return "Diamond Leggings"; } }
+    }
+
+    public class ChainLeggingsItem : ArmourItem
+    {
+        public static readonly short ItemID = 0x130;
+
+        public override short ID { get { return 0x130; } }
+
+        public override ArmourMaterial Material { get { return ArmourMaterial.Chain; } }
+
+        public override short BaseDurability { get { return 92; } }
+
+        public override float BaseArmour { get { return 3; } }
+
+        public override string DisplayName { get { return "Chain Leggings"; } }
+    }
+}
\ No newline at end of file
diff --git a/TrueCraft.Core/Logic/Items/PickaxeItem.cs b/TrueCraft.Core/Logic/Items/PickaxeItem.cs
new file mode 100644
index 0000000..36cf019
--- /dev/null
+++ b/TrueCraft.Core/Logic/Items/PickaxeItem.cs
@@ -0,0 +1,77 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using TrueCraft.API;
+
+namespace TrueCraft.Core.Logic.Items
+{
+    public abstract class PickaxeItem : ToolItem
+    {
+    }
+
+    public class WoodenPickaxeItem : PickaxeItem
+    {
+        public static readonly short ItemID = 0x10E;
+
+        public override short ID { get { return 0x10E; } }
+
+        public override ToolMaterial Material { get { return ToolMaterial.Wood; } }
+
+        public override short BaseDurability { get { return 60; } }
+
+        public override string DisplayName { get { return "Wooden Pickaxe"; } }
+    }
+
+    public class StonePickaxeItem : PickaxeItem
+    {
+        public static readonly short ItemID = 0x112;
+
+        public override short ID { get { return 0x112; } }
+
+        public override ToolMaterial Material { get { return ToolMaterial.Stone; } }
+
+        public override short BaseDurability { get { return 132; } }
+
+        public override string DisplayName { get { return "Stone Pickaxe"; } }
+    }
+
+    public class IronPickaxeItem : PickaxeItem
+    {
+        public static readonly short ItemID = 0x101;
+
+        public override short ID { get { return 0x101; } }
+
+        public override ToolMaterial Material { get { return ToolMaterial.Iron; } }
+
+        public override short BaseDurability { get { return 251; } }
+
+        public override string DisplayName { get { return "Iron Pickaxe"; } }
+    }
+
+    public class GoldenPickaxeItem : PickaxeItem
+    {
+        public static readonly short ItemID = 0x11D;
+
+        public override short ID { get { return 0x11D; } }
+
+        public override ToolMaterial Material { get { return ToolMaterial.Gold; } }
+
+        public override short BaseDurability { get { return 33; } }
+
+        public override string DisplayName { get { return "Golden Pickaxe"; } }
+    }
+
+    public class DiamondPickaxeItem : PickaxeItem
+    {
+        public static readonly short ItemID = 0x116;
+
+        public override short ID { get { return 0x116; } }
+
+        public override ToolMaterial Material { get { return ToolMaterial.Diamond; } }
+
+        public override short BaseDurability { get { return 1562; } }
+
+        public override string DisplayName { get { return "Diamond Pickaxe"; } }
+    }
+}
\ No newline at end of file
diff --git a/TrueCraft.Core/Logic/Items/ShovelItem.cs b/TrueCraft.Core/Logic/Items/ShovelItem.cs
new file mode 100644
index 0000000..1a768bc
--- /dev/null
+++ b/TrueCraft.Core/Logic/Items/ShovelItem.cs
@@ -0,0 +1,77 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using TrueCraft.API;
+
+namespace TrueCraft.Core.Logic.Items
+{
+    public abstract class ShovelItem : ToolItem
+    {
+    }
+
+    public class WoodenShovelItem : ShovelItem
+    {
+        public static readonly short ItemID = 0x10D;
+
+        public override short ID { get { return 0x10D; } }
+
+        public override ToolMaterial Material { get { return ToolMaterial.Wood; } }
+
+        public override short BaseDurability { get { return 60; } }
+
+        public override string DisplayName { get { return "Wooden Shovel"; } }
+    }
+
+    public class StoneShovelItem : ShovelItem
+    {
+        public static readonly short ItemID = 0x111;
+
+        public override short ID { get { return 0x111; } }
+
+        public override ToolMaterial Material { get { return ToolMaterial.Stone; } }
+
+        public override short BaseDurability { get { return 132; } }
+
+        public override string DisplayName { get { return "Stone Shovel"; } }
+    }
+
+    public class IronShovelItem : ShovelItem
+    {
+        public static readonly short ItemID = 0x100;
+
+        public override short ID { get { return 0x100; } }
+
+        public override ToolMaterial Material { get { return ToolMaterial.Iron; } }
+
+        public override short BaseDurability { get { return 251; } }
+
+        public override string DisplayName { get { return "Iron Shovel"; } }
+    }
+
+    public class GoldenShovelItem : ShovelItem
+    {
+        public static readonly short ItemID = 0x11C;
+
+        public override short ID { get { return 0x11C; } }
+
+        public override ToolMaterial Material { get { return ToolMaterial.Gold; } }
+
+        public override short BaseDurability { get { return 33; } }
+
+        public override string DisplayName { get { return "Golden Shovel"; } }
+    }
+
+    public class DiamondShovelItem : ShovelItem
+    {
+        public static readonly short ItemID = 0x115;
+
+        public override short ID { get { return 0x115; } }
+
+        public override ToolMaterial Material { get { return ToolMaterial.Diamond; } }
+
+        public override short BaseDurability { get { return 1562; } }
+
+        public override string DisplayName { get { return "Diamond Shovel"; } }
+    }
+}
\ No newline at end of file
diff --git a/TrueCraft.Core/Logic/Items/StoneAxeItem.cs b/TrueCraft.Core/Logic/Items/StoneAxeItem.cs
deleted file mode 100644
index 79116cf..0000000
--- a/TrueCraft.Core/Logic/Items/StoneAxeItem.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using TrueCraft.API.Logic;
-using TrueCraft.API;
-
-namespace TrueCraft.Core.Logic.Items
-{
-    public class StoneAxeItem : AxeItem
-    {
-        public static readonly short ItemID = 0x113;
-
-        public override short ID { get { return 0x113; } }
-
-        public override ToolMaterial Material { get { return ToolMaterial.Stone; } }
-
-        public override short BaseDurability { get { return 132; } }
-
-        public override string DisplayName { get { return "Stone Axe"; } }
-    }
-}
\ No newline at end of file
diff --git a/TrueCraft.Core/Logic/Items/StoneHoeItem.cs b/TrueCraft.Core/Logic/Items/StoneHoeItem.cs
deleted file mode 100644
index a691fd4..0000000
--- a/TrueCraft.Core/Logic/Items/StoneHoeItem.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using TrueCraft.API.Logic;
-using TrueCraft.API;
-
-namespace TrueCraft.Core.Logic.Items
-{
-    public class StoneHoeItem : HoeItem
-    {
-        public static readonly short ItemID = 0x123;
-
-        public override short ID { get { return 0x123; } }
-
-        public override ToolMaterial Material { get { return ToolMaterial.Stone; } }
-
-        public override short BaseDurability { get { return 132; } }
-
-        public override string DisplayName { get { return "Stone Hoe"; } }
-    }
-}
\ No newline at end of file
diff --git a/TrueCraft.Core/Logic/Items/StonePickaxeItem.cs b/TrueCraft.Core/Logic/Items/StonePickaxeItem.cs
deleted file mode 100644
index 6616bf9..0000000
--- a/TrueCraft.Core/Logic/Items/StonePickaxeItem.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using TrueCraft.API.Logic;
-using TrueCraft.API;
-
-namespace TrueCraft.Core.Logic.Items
-{
-    public class StonePickaxeItem : PickaxeItem
-    {
-        public static readonly short ItemID = 0x112;
-
-        public override short ID { get { return 0x112; } }
-
-        public override ToolMaterial Material { get { return ToolMaterial.Stone; } }
-
-        public override short BaseDurability { get { return 132; } }
-
-        public override string DisplayName { get { return "Stone Pickaxe"; } }
-    }
-}
\ No newline at end of file
diff --git a/TrueCraft.Core/Logic/Items/StoneShovelItem.cs b/TrueCraft.Core/Logic/Items/StoneShovelItem.cs
deleted file mode 100644
index 8cbebf5..0000000
--- a/TrueCraft.Core/Logic/Items/StoneShovelItem.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using TrueCraft.API.Logic;
-using TrueCraft.API;
-
-namespace TrueCraft.Core.Logic.Items
-{
-    public class StoneShovelItem : ShovelItem
-    {
-        public static readonly short ItemID = 0x111;
-
-        public override short ID { get { return 0x111; } }
-
-        public override ToolMaterial Material { get { return ToolMaterial.Stone; } }
-
-        public override short BaseDurability { get { return 132; } }
-
-        public override string DisplayName { get { return "Stone Shovel"; } }
-    }
-}
\ No newline at end of file
diff --git a/TrueCraft.Core/Logic/Items/ToolItem.cs b/TrueCraft.Core/Logic/Items/ToolItem.cs
index 0b2a5a4..bcb8c76 100644
--- a/TrueCraft.Core/Logic/Items/ToolItem.cs
+++ b/TrueCraft.Core/Logic/Items/ToolItem.cs
@@ -14,23 +14,4 @@ namespace TrueCraft.Core.Logic
 
         public override sbyte MaximumStack { get { return 1; } }
     }
-
-    public abstract class AxeItem : ToolItem
-    {
-
-    }
-
-    public abstract class HoeItem : ToolItem
-    {
-
-    }
-
-    public abstract class PickaxeItem : ToolItem
-    {
-
-    }
-
-    public abstract class ShovelItem : ToolItem
-    {
-    }
-}
+}
\ No newline at end of file
diff --git a/TrueCraft.Core/Logic/Items/WoodenAxeItem.cs b/TrueCraft.Core/Logic/Items/WoodenAxeItem.cs
deleted file mode 100644
index ecc6aaf..0000000
--- a/TrueCraft.Core/Logic/Items/WoodenAxeItem.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using TrueCraft.API.Logic;
-using TrueCraft.API;
-
-namespace TrueCraft.Core.Logic.Items
-{
-    public class WoodenAxeItem : AxeItem
-    {
-        public static readonly short ItemID = 0x10F;
-
-        public override short ID { get { return 0x10F; } }
-
-        public override ToolMaterial Material { get { return ToolMaterial.Wood; } }
-
-        public override short BaseDurability { get { return 60; } }
-
-        public override string DisplayName { get { return "Wooden Axe"; } }
-    }
-}
\ No newline at end of file
diff --git a/TrueCraft.Core/Logic/Items/WoodenHoeItem.cs b/TrueCraft.Core/Logic/Items/WoodenHoeItem.cs
deleted file mode 100644
index 6b6e86e..0000000
--- a/TrueCraft.Core/Logic/Items/WoodenHoeItem.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using TrueCraft.API.Logic;
-using TrueCraft.API;
-
-namespace TrueCraft.Core.Logic.Items
-{
-    public class WoodenHoeItem : HoeItem
-    {
-        public static readonly short ItemID = 0x122;
-
-        public override short ID { get { return 0x122; } }
-
-        public override ToolMaterial Material { get { return ToolMaterial.Wood; } }
-
-        public override short BaseDurability { get { return 60; } }
-
-        public override string DisplayName { get { return "Wooden Hoe"; } }
-    }
-}
\ No newline at end of file
diff --git a/TrueCraft.Core/Logic/Items/WoodenPickaxeItem.cs b/TrueCraft.Core/Logic/Items/WoodenPickaxeItem.cs
deleted file mode 100644
index 9a62a39..0000000
--- a/TrueCraft.Core/Logic/Items/WoodenPickaxeItem.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using TrueCraft.API.Logic;
-using TrueCraft.API;
-
-namespace TrueCraft.Core.Logic.Items
-{
-    public class WoodenPickaxeItem : PickaxeItem
-    {
-        public static readonly short ItemID = 0x10E;
-
-        public override short ID { get { return 0x10E; } }
-
-        public override ToolMaterial Material { get { return ToolMaterial.Wood; } }
-
-        public override short BaseDurability { get { return 60; } }
-
-        public override string DisplayName { get { return "Wooden Pickaxe"; } }
-    }
-}
\ No newline at end of file
diff --git a/TrueCraft.Core/Logic/Items/WoodenShovelItem.cs b/TrueCraft.Core/Logic/Items/WoodenShovelItem.cs
deleted file mode 100644
index 6893044..0000000
--- a/TrueCraft.Core/Logic/Items/WoodenShovelItem.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using TrueCraft.API.Logic;
-using TrueCraft.API;
-
-namespace TrueCraft.Core.Logic.Items
-{
-    public class WoodenShovelItem : ShovelItem
-    {
-        public static readonly short ItemID = 0x10D;
-
-        public override short ID { get { return 0x10D; } }
-
-        public override ToolMaterial Material { get { return ToolMaterial.Wood; } }
-
-        public override short BaseDurability { get { return 60; } }
-
-        public override string DisplayName { get { return "Wooden Shovel"; } }
-    }
-}
\ No newline at end of file
diff --git a/TrueCraft.Core/TrueCraft.Core.csproj b/TrueCraft.Core/TrueCraft.Core.csproj
index 5264de2..a0546ae 100644
--- a/TrueCraft.Core/TrueCraft.Core.csproj
+++ b/TrueCraft.Core/TrueCraft.Core.csproj
@@ -39,20 +39,19 @@
     <Compile Include="Logic\Items\AppleItem.cs" />
     <Compile Include="Logic\Items\ArmourItem.cs" />
     <Compile Include="Logic\Items\ArrowItem.cs" />
+    <Compile Include="Logic\Items\AxeItem.cs" />
     <Compile Include="Logic\Items\BedItem.cs" />
     <Compile Include="Logic\Items\BoatItem.cs" />
     <Compile Include="Logic\Items\BoneItem.cs" />
     <Compile Include="Logic\Items\BookItem.cs" />
+    <Compile Include="Logic\Items\BootsItem.cs" />
     <Compile Include="Logic\Items\BowItem.cs" />
     <Compile Include="Logic\Items\BowlItem.cs" />
     <Compile Include="Logic\Items\BreadItem.cs" />
     <Compile Include="Logic\Items\BrickItem.cs" />
     <Compile Include="Logic\Items\BucketItem.cs" />
     <Compile Include="Logic\Items\CakeItem.cs" />
-    <Compile Include="Logic\Items\ChainBootsItem.cs" />
-    <Compile Include="Logic\Items\ChainChestplateItem.cs" />
-    <Compile Include="Logic\Items\ChainHelmetItem.cs" />
-    <Compile Include="Logic\Items\ChainLeggingsItem.cs" />
+    <Compile Include="Logic\Items\ChestplateItem.cs" />
     <Compile Include="Logic\Items\ClayItem.cs" />
     <Compile Include="Logic\Items\ClockItem.cs" />
     <Compile Include="Logic\Items\CoalItem.cs" />
@@ -60,16 +59,7 @@
     <Compile Include="Logic\Items\CookedFishItem.cs" />
     <Compile Include="Logic\Items\CookedPorkchopItem.cs" />
     <Compile Include="Logic\Items\CookieItem.cs" />
-    <Compile Include="Logic\Items\DiamondAxeItem.cs" />
-    <Compile Include="Logic\Items\DiamondBootsItem.cs" />
-    <Compile Include="Logic\Items\DiamondChestplateItem.cs" />
-    <Compile Include="Logic\Items\DiamondHelmetItem.cs" />
-    <Compile Include="Logic\Items\DiamondHoeItem.cs" />
     <Compile Include="Logic\Items\DiamondItem.cs" />
-    <Compile Include="Logic\Items\DiamondLeggingsItem.cs" />
-    <Compile Include="Logic\Items\DiamondPickaxeItem.cs" />
-    <Compile Include="Logic\Items\DiamondShovelItem.cs" />
-    <Compile Include="Logic\Items\DiamondSwordItem.cs" />
     <Compile Include="Logic\Items\DoorItem.cs" />
     <Compile Include="Logic\Items\DyeItem.cs" />
     <Compile Include="Logic\Items\EggItem.cs" />
@@ -80,38 +70,20 @@
     <Compile Include="Logic\Items\FoodItem.cs" />
     <Compile Include="Logic\Items\GlowstoneDustItem.cs" />
     <Compile Include="Logic\Items\GoldenAppleItem.cs" />
-    <Compile Include="Logic\Items\GoldenAxeItem.cs" />
-    <Compile Include="Logic\Items\GoldenBootsItem.cs" />
-    <Compile Include="Logic\Items\GoldenChestplateItem.cs" />
-    <Compile Include="Logic\Items\GoldenHelmetItem.cs" />
-    <Compile Include="Logic\Items\GoldenHoeItem.cs" />
-    <Compile Include="Logic\Items\GoldenLeggingsItem.cs" />
-    <Compile Include="Logic\Items\GoldenPickaxeItem.cs" />
-    <Compile Include="Logic\Items\GoldenShovelItem.cs" />
-    <Compile Include="Logic\Items\GoldenSwordItem.cs" />
     <Compile Include="Logic\Items\GoldIngotItem.cs" />
     <Compile Include="Logic\Items\GunpowderItem.cs" />
-    <Compile Include="Logic\Items\IronAxeItem.cs" />
-    <Compile Include="Logic\Items\IronBootsItem.cs" />
-    <Compile Include="Logic\Items\IronChestplateItem.cs" />
-    <Compile Include="Logic\Items\IronHelmetItem.cs" />
-    <Compile Include="Logic\Items\IronHoeItem.cs" />
+    <Compile Include="Logic\Items\HelmentItem.cs" />
+    <Compile Include="Logic\Items\HoeItem.cs" />
     <Compile Include="Logic\Items\IronIngotItem.cs" />
-    <Compile Include="Logic\Items\IronLeggingsItem.cs" />
-    <Compile Include="Logic\Items\IronPickaxeItem.cs" />
-    <Compile Include="Logic\Items\IronShovelItem.cs" />
-    <Compile Include="Logic\Items\IronSwordItem.cs" />
-    <Compile Include="Logic\Items\LeatherBootsItem.cs" />
-    <Compile Include="Logic\Items\LeatherCapItem.cs" />
     <Compile Include="Logic\Items\LeatherItem.cs" />
-    <Compile Include="Logic\Items\LeatherPantsItem.cs" />
-    <Compile Include="Logic\Items\LeatherTunicItem.cs" />
+    <Compile Include="Logic\Items\LeggingsItem.cs" />
     <Compile Include="Logic\Items\MapItem.cs" />
     <Compile Include="Logic\Items\MinecartItem.cs" />
     <Compile Include="Logic\Items\MushroomStewItem.cs" />
     <Compile Include="Logic\Items\MusicDiscItem.cs" />
     <Compile Include="Logic\Items\PaintingItem.cs" />
     <Compile Include="Logic\Items\PaperItem.cs" />
+    <Compile Include="Logic\Items\PickaxeItem.cs" />
     <Compile Include="Logic\Items\RawFishItem.cs" />
     <Compile Include="Logic\Items\RawPorkchopItem.cs" />
     <Compile Include="Logic\Items\RedstoneItem.cs" />
@@ -119,25 +91,17 @@
     <Compile Include="Logic\Items\SaddleItem.cs" />
     <Compile Include="Logic\Items\SeedsItem.cs" />
     <Compile Include="Logic\Items\ShearsItem.cs" />
+    <Compile Include="Logic\Items\ShovelItem.cs" />
     <Compile Include="Logic\Items\SignItem.cs" />
     <Compile Include="Logic\Items\SlimeballItem.cs" />
     <Compile Include="Logic\Items\SnowballItem.cs" />
     <Compile Include="Logic\Items\StickItem.cs" />
-    <Compile Include="Logic\Items\StoneAxeItem.cs" />
-    <Compile Include="Logic\Items\StoneHoeItem.cs" />
-    <Compile Include="Logic\Items\StonePickaxeItem.cs" />
-    <Compile Include="Logic\Items\StoneShovelItem.cs" />
-    <Compile Include="Logic\Items\StoneSwordItem.cs" />
     <Compile Include="Logic\Items\StringItem.cs" />
     <Compile Include="Logic\Items\SugarCanesItem.cs" />
     <Compile Include="Logic\Items\SugarItem.cs" />
+    <Compile Include="Logic\Items\SwordItem.cs" />
     <Compile Include="Logic\Items\ToolItem.cs" />
     <Compile Include="Logic\Items\WheatItem.cs" />
-    <Compile Include="Logic\Items\WoodenAxeItem.cs" />
-    <Compile Include="Logic\Items\WoodenHoeItem.cs" />
-    <Compile Include="Logic\Items\WoodenPickaxeItem.cs" />
-    <Compile Include="Logic\Items\WoodenShovelItem.cs" />
-    <Compile Include="Logic\Items\WoodenSwordItem.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Networking\MinecraftStream.cs" />
     <Compile Include="Networking\PacketReader.cs" />