diff --git a/src/divine_equipment/common/Divine_Content.java b/src/divine_equipment/common/Divine_Content.java
index 6111083..326ec5d 100644
--- a/src/divine_equipment/common/Divine_Content.java
+++ b/src/divine_equipment/common/Divine_Content.java
@@ -7,7 +7,9 @@ import blocks.tainted.TaintedWood;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.common.registry.LanguageRegistry;
 import divine_equipment.Divine_Equipment;
-import items.HiddenSigil;
+import items.Sigil;
+import items.ender.EnderSword;
+import items.tainted.TaintedAxe;
 import items.blessed.*;
 import items.tainted.*;
 import net.minecraft.block.Block;
@@ -26,68 +28,6 @@ import net.minecraftforge.common.EnumHelper;
 public class Divine_Content {
 
     public static String modid = Divine_Equipment.modid;
-    int TaintedStoneID = Divine_Equipment.TaintedStoneID;
-    int TaintedWoodID = Divine_Equipment.TaintedWoodID;
-    int BlesssedStoneID = Divine_Equipment.BlesssedStoneID;
-    int BlessedWoodID = Divine_Equipment.BlessedWoodID;
-    int BlankSigilID = Divine_Equipment.BlankSigilID;
-    int TaintedSigilID = Divine_Equipment.TaintedSigilID;
-    int BlessedSigilID = Divine_Equipment.BlessedSigilID;
-    int EnderSigilID = Divine_Equipment.EnderSigilID;
-    int HiddenSigilID = Divine_Equipment.HiddenSigilID;
-
-    int TaintedDiamondSwordID = Divine_Equipment.TaintedDiamondSwordID;
-    int TaintedGoldSwordID = Divine_Equipment.TaintedGoldSwordID;
-    int TaintedIronSwordID = Divine_Equipment.TaintedIronSwordID;
-    int TaintedStoneSwordID = Divine_Equipment.TaintedStoneSwordID;
-    int TaintedWoodSwordID = Divine_Equipment.TaintedWoodSwordID;
-    int TaintedDiamondPickaxeID = Divine_Equipment.TaintedDiamondPickaxeID;
-    int TaintedGoldPickaxeID = Divine_Equipment.TaintedGoldPickaxeID;
-    int TaintedIronPickaxeID = Divine_Equipment.TaintedIronPickaxeID;
-    int TaintedStonePickaxeID = Divine_Equipment.TaintedStonePickaxeID;
-    int TaintedWoodPickaxeID = Divine_Equipment.TaintedWoodPickaxeID;
-    int TaintedDiamondAxeID = Divine_Equipment.TaintedDiamondAxeID;
-    int TaintedGoldAxeID = Divine_Equipment.TaintedGoldAxeID;
-    int TaintedIronAxeID = Divine_Equipment.TaintedIronAxeID;
-    int TaintedStoneAxeID = Divine_Equipment.TaintedStoneAxeID;
-    int TaintedWoodAxeID = Divine_Equipment.TaintedWoodAxeID;
-    int TaintedDiamondShovelID = Divine_Equipment.TaintedDiamondShovelID;
-    int TaintedGoldShovelID = Divine_Equipment.TaintedGoldShovelID;
-    int TaintedIronShovelID = Divine_Equipment.TaintedIronShovelID;
-    int TaintedStoneShovelID = Divine_Equipment.TaintedStoneShovelID;
-    int TaintedWoodShovelID = Divine_Equipment.TaintedWoodShovelID;
-    int TaintedDiamondHoeID = Divine_Equipment.TaintedDiamondHoeID;
-    int TaintedGoldHoeID = Divine_Equipment.TaintedGoldHoeID;
-    int TaintedIronHoeID = Divine_Equipment.TaintedIronHoeID;
-    int TaintedStoneHoeID = Divine_Equipment.TaintedStoneHoeID;
-    int TaintedWoodHoeID = Divine_Equipment.TaintedWoodHoeID;
-
-    int BlessedDiamondSwordID = Divine_Equipment.BlessedDiamondSwordID;
-    int BlessedGoldSwordID = Divine_Equipment.BlessedGoldSwordID;
-    int BlessedIronSwordID = Divine_Equipment.BlessedIronSwordID;
-    int BlessedStoneSwordID = Divine_Equipment.BlessedStoneSwordID;
-    int BlessedWoodSwordID = Divine_Equipment.BlessedWoodSwordID;
-    int BlessedDiamondPickaxeID = Divine_Equipment.BlessedDiamondPickaxeID;
-    int BlessedGoldPickaxeID = Divine_Equipment.BlessedGoldPickaxeID;
-    int BlessedIronPickaxeID = Divine_Equipment.BlessedIronPickaxeID;
-    int BlessedStonePickaxeID = Divine_Equipment.BlessedStonePickaxeID;
-    int BlessedWoodPickaxeID = Divine_Equipment.BlessedWoodPickaxeID;
-    int BlessedDiamondAxeID = Divine_Equipment.BlessedDiamondAxeID;
-    int BlessedGoldAxeID = Divine_Equipment.BlessedGoldAxeID;
-    int BlessedIronAxeID = Divine_Equipment.BlessedIronAxeID;
-    int BlessedStoneAxeID = Divine_Equipment.BlessedStoneAxeID;
-    int BlessedWoodAxeID = Divine_Equipment.BlessedWoodAxeID;
-    int BlessedDiamondShovelID = Divine_Equipment.BlessedDiamondShovelID;
-    int BlessedGoldShovelID = Divine_Equipment.BlessedGoldShovelID;
-    int BlessedIronShovelID = Divine_Equipment.BlessedIronShovelID;
-    int BlessedStoneShovelID = Divine_Equipment.BlessedStoneShovelID;
-    int BlessedWoodShovelID = Divine_Equipment.BlessedWoodShovelID;
-    int BlessedDiamondHoeID = Divine_Equipment.BlessedDiamondHoeID;
-    int BlessedGoldHoeID = Divine_Equipment.BlessedGoldHoeID;
-    int BlessedIronHoeID = Divine_Equipment.BlessedIronHoeID;
-    int BlessedStoneHoeID = Divine_Equipment.BlessedStoneHoeID;
-    int BlessedWoodHoeID = Divine_Equipment.BlessedWoodHoeID;
-    int EnderSwordID = Divine_Equipment.EnderSwordID;
     // Blocks
     public static Block blessedstone, blessedwood, taintedstone, taintedwood, BlessedAlter, TaintedAlter, EnderAlter, HiddenAlter;
     // Items
@@ -107,17 +47,17 @@ public class Divine_Content {
     public void registerBlocks()
     {
     // Blessed Blocks
-    blessedstone = new BlessedRock(BlesssedStoneID, Material.rock).setUnlocalizedName("Blessed Stone").setTextureName("divine_equipment:BlessedStone");
+    blessedstone = new BlessedRock(Divine_Equipment.BlessedSigil, Material.rock).setUnlocalizedName("Blessed Stone").setTextureName("divine_equipment:BlessedStone");
     GameRegistry.registerBlock(blessedstone, modid+ blessedstone.getUnlocalizedName().substring(5));
     LanguageRegistry.addName(blessedstone, "Blessed Stone");
-    blessedwood = new BlessedWood(BlessedWoodID, Material.wood).setUnlocalizedName("Blessed Wood").setTextureName("divine_equipment:BlessedWood");
+    blessedwood = new BlessedWood(Divine_Equipment.BlessedWood, Material.wood).setUnlocalizedName("Blessed Wood").setTextureName("divine_equipment:BlessedWood");
     GameRegistry.registerBlock(blessedwood, modid+ blessedwood.getUnlocalizedName().substring(5));
     LanguageRegistry.addName(blessedwood, "Blessed Wood");
     // Tainted Blocks
-    taintedstone = new TaintedRock(TaintedStoneID, Material.rock).setUnlocalizedName("Tainted Stone").setTextureName("divine_equipment:TaintedStone");
+    taintedstone = new TaintedRock(Divine_Equipment.TaintedStone, Material.rock).setUnlocalizedName("Tainted Stone").setTextureName("divine_equipment:TaintedStone");
     GameRegistry.registerBlock(taintedstone, modid+ taintedstone.getUnlocalizedName().substring(5));
     LanguageRegistry.addName(taintedstone, "Tainted Stone");
-    taintedwood = new TaintedWood(TaintedWoodID, Material.wood).setUnlocalizedName("Tainted Wood").setTextureName("divine_equipment:TaintedWood");
+    taintedwood = new TaintedWood(Divine_Equipment.TaintedWood, Material.wood).setUnlocalizedName("Tainted Wood").setTextureName("divine_equipment:TaintedWood");
     GameRegistry.registerBlock(taintedwood, modid+ taintedwood.getUnlocalizedName().substring(5));
     LanguageRegistry.addName(taintedwood, "Tainted Wood");
     }
@@ -154,139 +94,139 @@ public class Divine_Content {
     //Telling forge that we are creating stuff
         // Sigils
 
-        BlankSigil = new items.BlankSigil(BlankSigilID).setUnlocalizedName("Blank_Sigil").setTextureName("divine_equipment:Blank_Sigil");
+        BlankSigil = new Sigil(Divine_Equipment.BlankSigil, "Blank_Sigil", "divine_equipment:Blank_Sigil");
         LanguageRegistry.addName(BlankSigil, "Blank Sigil");
         GameRegistry.addRecipe(new ItemStack(BlankSigil), " s ", "sgs", " s ", 's', Block.stone, 'g', Item.gunpowder);
 
-        TaintedSigil = new items.tainted.TaintedSigil(TaintedSigilID).setUnlocalizedName("Tainted_Sigil").setTextureName("divine_equipment:Tainted_Sigil");
+        TaintedSigil = new Sigil(Divine_Equipment.TaintedSigil, "Tainted_Sigil", "divine_equipment:Tainted_Sigil");
         LanguageRegistry.addName(TaintedSigil, "Tainted Sigil");
         GameRegistry.addRecipe(new ItemStack(TaintedSigil), "rrr", "rbr", "rrr", 'b', BlankSigil , 'r', Item.blazeRod);
 
-        BlessedSigil = new items.blessed.BlessedSigil(BlessedSigilID).setUnlocalizedName("Blessed_Sigil").setTextureName("divine_equipment:Blessed_Sigil");
+        BlessedSigil = new Sigil(Divine_Equipment.BlessedSigil, "Blessed_Sigil", "divine_equipment:Blessed_Sigil");
         LanguageRegistry.addName(BlessedSigil, "Blessed Sigil");
         GameRegistry.addRecipe(new ItemStack(BlessedSigil), "ggg", "gbg", "ggg", 'b', BlankSigil, 'g', Item.ingotGold);
 
-        EnderSigil = new items.ender.EnderSigil(EnderSigilID).setUnlocalizedName("Ender_Sigil").setTextureName("divine_equipment:Ender_Sigil");
+        EnderSigil = new Sigil(Divine_Equipment.EnderSigil, "Ender_Sigil", "divine_equipment:Ender_Sigil");
         LanguageRegistry.addName(EnderSigil, "Ender Sigil");
         GameRegistry.addRecipe(new ItemStack(EnderSigil), "eee", "ebe", "eee", 'b', BlankSigil , 'e', Item.eyeOfEnder);
 
-        HiddenSigil = new HiddenSigil(HiddenSigilID).setUnlocalizedName("Hidden_Sigil").setTextureName("divine_equipment:Hidden_Sigil");
+        HiddenSigil = new Sigil(Divine_Equipment.HiddenSigil, "Hidden_Sigil", "Hidden_Sigil");
         LanguageRegistry.addName(HiddenSigil, "Hidden Sigil");
         GameRegistry.addRecipe(new ItemStack(HiddenSigil), "beb", "ene", "tet", 'b', BlessedSigil, 'n', Item.netherStar, 'e', EnderSigil, 't', TaintedSigil );
     // Tainted Items
         // Tainted Swords
-        TaintedDiamondSword = new items.tainted.TaintedDiamondSword(TaintedDiamondSwordID, TaintedDiamondTool).setUnlocalizedName("Tainted_Sword_Diamond").setTextureName("divine_equipment:Tainted_Sword_Diamond");
+        TaintedDiamondSword = new TaintedSword(Divine_Equipment.TaintedDiamondSword, TaintedDiamondTool).setUnlocalizedName("Tainted_Sword_Diamond").setTextureName("divine_equipment:Tainted_Sword_Diamond");
         LanguageRegistry.addName(TaintedDiamondSword, "Tainted Diamond Sword");
         GameRegistry.addRecipe(new ItemStack(TaintedDiamondSword), " m ", " S ", " s ", 'S', TaintedSigil, 'm', Item.diamond, 's', Item.stick);
 
-        TaintedGoldSword = new items.tainted.TaintedGoldSword(TaintedGoldSwordID, TaintedGoldTool).setUnlocalizedName("Tainted_Sword_Gold").setTextureName("divine_equipment:Tainted_Sword_Gold");
+        TaintedGoldSword = new TaintedSword(Divine_Equipment.TaintedGoldSword, TaintedGoldTool).setUnlocalizedName("Tainted_Sword_Gold").setTextureName("divine_equipment:Tainted_Sword_Gold");
         LanguageRegistry.addName(TaintedGoldSword, "Tainted Gold Sword");
         GameRegistry.addRecipe(new ItemStack(TaintedGoldSword), " m ", " S ", " s ", 'S', TaintedSigil, 'm', Item.ingotGold, 's', Item.stick);
 
-        TaintedIronSword = new TaintedIronSword(TaintedIronSwordID, TaintedIronTool).setUnlocalizedName("Tainted_Sword_Iron").setTextureName("divine_equipment:Tainted_Sword_Iron");
+        TaintedIronSword = new TaintedSword(Divine_Equipment.TaintedIronSword, TaintedIronTool).setUnlocalizedName("Tainted_Sword_Iron").setTextureName("divine_equipment:Tainted_Sword_Iron");
         LanguageRegistry.addName(TaintedIronSword, "Tainted Iron Sword");
         GameRegistry.addRecipe(new ItemStack(TaintedIronSword), " m ", " S ", " s ", 'S', TaintedSigil, 'm', Item.ingotIron, 's', Item.stick);
 
-        TaintedStoneSword = new TaintedStoneSword(TaintedStoneSwordID, TaintedStoneTool).setUnlocalizedName("Tainted_Sword_Stone").setTextureName("divine_equipment:Tainted_Sword_Stone");
+        TaintedStoneSword = new TaintedSword(Divine_Equipment.TaintedStoneSword, TaintedStoneTool).setUnlocalizedName("Tainted_Sword_Stone").setTextureName("divine_equipment:Tainted_Sword_Stone");
         LanguageRegistry.addName(TaintedStoneSword, "Tainted Stone Sword");
         GameRegistry.addRecipe(new ItemStack(TaintedStoneSword), " m ", " S ", " s ", 'S', TaintedSigil, 'm', Block.stone, 's', Item.stick);
 
-        TaintedWoodSword = new TaintedWoodSword(TaintedWoodSwordID, TaintedWoodTool).setUnlocalizedName("Tainted_Sword_Wood").setTextureName("divine_equipment:Tainted_Sword_Wood");
+        TaintedWoodSword = new TaintedSword(Divine_Equipment.TaintedWoodSword, TaintedWoodTool).setUnlocalizedName("Tainted_Sword_Wood").setTextureName("divine_equipment:Tainted_Sword_Wood");
         LanguageRegistry.addName(TaintedWoodSword, "Tainted Wooden Sword");
         GameRegistry.addRecipe(new ItemStack(TaintedWoodSword), " m ", " S ", " s ", 'S', TaintedSigil, 'm', Block.planks, 's', Item.stick);
 
         // Pickaxes
 
-        TaintedDiamondPickaxe = new items.tainted.TaintedDiamondPickaxe(TaintedDiamondPickaxeID, TaintedDiamondTool).setUnlocalizedName("Tainted_Pickaxe_Diamond").setTextureName("divine_equipment:Tainted_Pickaxe_Diamond");
+        TaintedDiamondPickaxe = new TaintedPickaxe(Divine_Equipment.TaintedDiamondPickaxe, TaintedDiamondTool).setUnlocalizedName("Tainted_Pickaxe_Diamond").setTextureName("divine_equipment:Tainted_Pickaxe_Diamond");
         LanguageRegistry.addName(TaintedDiamondPickaxe, "Tainted Diamond Pickaxe");
         GameRegistry.addRecipe(new ItemStack(TaintedDiamondPickaxe), "mSm", " s ", " s ", 'S', TaintedSigil, 'm', Item.diamond, 's', Item.stick);
 
-        TaintedGoldPickaxe = new items.tainted.TaintedGoldPickaxe(TaintedGoldPickaxeID, TaintedGoldTool).setUnlocalizedName("Tainted_Pickaxe_Gold").setTextureName("divine_equipment:Tainted_Pickaxe_Gold");
+        TaintedGoldPickaxe = new TaintedPickaxe(Divine_Equipment.TaintedGoldPickaxe, TaintedGoldTool).setUnlocalizedName("Tainted_Pickaxe_Gold").setTextureName("divine_equipment:Tainted_Pickaxe_Gold");
         LanguageRegistry.addName(TaintedGoldPickaxe, "Tainted Gold Pickaxe");
         GameRegistry.addRecipe(new ItemStack(TaintedGoldPickaxe), "mSm", " s ", " s ", 'S', TaintedSigil, 'm', Item.ingotGold, 's', Item.stick);
 
-        TaintedIronPickaxe = new items.tainted.TaintedIronPickaxe(TaintedIronPickaxeID, TaintedIronTool).setUnlocalizedName("Tainted_Pickaxe_Iron").setTextureName("divine_equipment:Tainted_Pickaxe_Iron");
+        TaintedIronPickaxe = new TaintedPickaxe(Divine_Equipment.TaintedIronPickaxe, TaintedIronTool).setUnlocalizedName("Tainted_Pickaxe_Iron").setTextureName("divine_equipment:Tainted_Pickaxe_Iron");
         LanguageRegistry.addName(TaintedIronPickaxe, "Tainted Iron Pickaxe");
         GameRegistry.addRecipe(new ItemStack(TaintedIronPickaxe), "mSm", " s ", " s ", 'S', TaintedSigil, 'm', Item.ingotIron, 's', Item.stick);
 
-        TaintedStonePickaxe = new TaintedStonePickaxe(TaintedStonePickaxeID, TaintedStoneTool).setUnlocalizedName("Tainted_Pickaxe_Stone").setTextureName("divine_equipment:Tainted_Pickaxe_Stone");
+        TaintedStonePickaxe = new TaintedPickaxe(Divine_Equipment.TaintedStonePickaxe, TaintedStoneTool).setUnlocalizedName("Tainted_Pickaxe_Stone").setTextureName("divine_equipment:Tainted_Pickaxe_Stone");
         LanguageRegistry.addName(TaintedStonePickaxe, "Tainted Stone Pickaxe");
         GameRegistry.addRecipe(new ItemStack(TaintedStonePickaxe), "mSm", " s ", " s ", 'S', TaintedSigil, 'm', Block.stone, 's', Item.stick);
 
-        TaintedWoodPickaxe = new TaintedWoodPickaxe(TaintedWoodPickaxeID, TaintedWoodTool).setUnlocalizedName("Tainted_Pickaxe_Wood").setTextureName("divine_equipment:Tainted_Pickaxe_Wood");
+        TaintedWoodPickaxe = new TaintedPickaxe(Divine_Equipment.TaintedWoodPickaxe, TaintedWoodTool).setUnlocalizedName("Tainted_Pickaxe_Wood").setTextureName("divine_equipment:Tainted_Pickaxe_Wood");
         LanguageRegistry.addName(TaintedWoodPickaxe, "Tainted Wooden Pickaxe");
         GameRegistry.addRecipe(new ItemStack(TaintedWoodPickaxe), "mSm", " s ", " s ", 'S', TaintedSigil, 'm', Block.planks, 's', Item.stick);
 
         // Axes
 
-        TaintedDiamondAxe = new items.tainted.TaintedDiamondAxe(TaintedDiamondAxeID, TaintedDiamondTool).setUnlocalizedName("Tainted_Axe_Diamond").setTextureName("divine_equipment:Tainted_Axe_Diamond");
+        TaintedDiamondAxe = new TaintedAxe(Divine_Equipment.TaintedDiamondAxe, TaintedDiamondTool).setUnlocalizedName("Tainted_Axe_Diamond").setTextureName("divine_equipment:Tainted_Axe_Diamond");
         LanguageRegistry.addName(TaintedDiamondAxe, "Tainted Diamond Axe");
         GameRegistry.addRecipe(new ItemStack(TaintedDiamondAxe), "mS ", "ms ", " s ", 'S', TaintedSigil, 'm', Item.diamond, 's', Item.stick);
         GameRegistry.addRecipe(new ItemStack(TaintedDiamondAxe), " Sm", " sm", " s ", 'S', TaintedSigil, 'm', Item.diamond, 's', Item.stick);
 
-        TaintedGoldAxe = new items.tainted.TaintedGoldAxe(TaintedGoldAxeID, TaintedGoldTool).setUnlocalizedName("Tainted_Axe_Gold").setTextureName("divine_equipment:Tainted_Axe_Gold");
+        TaintedGoldAxe = new TaintedAxe(Divine_Equipment.TaintedGoldAxe, TaintedGoldTool).setUnlocalizedName("Tainted_Axe_Gold").setTextureName("divine_equipment:Tainted_Axe_Gold");
         LanguageRegistry.addName(TaintedGoldAxe, "Tainted Gold Axe");
         GameRegistry.addRecipe(new ItemStack(TaintedGoldAxe), "mS ", "ms ", " s ", 'S', TaintedSigil, 'm', Item.ingotGold, 's', Item.stick);
 
-        TaintedIronAxe = new items.tainted.TaintedIronAxe(TaintedIronAxeID, TaintedIronTool).setUnlocalizedName("Tainted_Axe_Iron").setTextureName("divine_equipment:Tainted_Axe_Iron");
+        TaintedIronAxe = new TaintedAxe(Divine_Equipment.TaintedIronAxe, TaintedIronTool).setUnlocalizedName("Tainted_Axe_Iron").setTextureName("divine_equipment:Tainted_Axe_Iron");
         LanguageRegistry.addName(TaintedIronAxe, "Tainted Iron Axe");
         GameRegistry.addRecipe(new ItemStack(TaintedIronAxe), "mS ", "ms ", " s ", 'S', TaintedSigil, 'm', Item.ingotIron, 's', Item.stick);
         GameRegistry.addRecipe(new ItemStack(TaintedGoldAxe), " Sm", " sm", " s ", 'S', TaintedSigil, 'm', Item.ingotGold, 's', Item.stick);
 
-        TaintedStoneAxe = new TaintedStoneAxe(TaintedStoneAxeID, TaintedStoneTool).setUnlocalizedName("Tainted_Axe_Stone").setTextureName("divine_equipment:Tainted_Axe_Stone");
+        TaintedStoneAxe = new TaintedAxe(Divine_Equipment.TaintedStoneAxe, TaintedStoneTool).setUnlocalizedName("Tainted_Axe_Stone").setTextureName("divine_equipment:Tainted_Axe_Stone");
         LanguageRegistry.addName(TaintedStoneAxe, "Tainted Stone Axe");
         GameRegistry.addRecipe(new ItemStack(TaintedStoneAxe), "mS ", "ms ", " s ", 'S', TaintedSigil, 'm', Block.stone, 's', Item.stick);
         GameRegistry.addRecipe(new ItemStack(TaintedStoneAxe), " Sm", " sm", " s ", 'S', TaintedSigil, 'm', Block.stone, 's', Item.stick);
 
-        TaintedWoodAxe = new TaintedWoodAxe(TaintedWoodAxeID, TaintedWoodTool).setUnlocalizedName("Tainted_Axe_Wood").setTextureName("divine_equipment:Tainted_Axe_Wood");
+        TaintedWoodAxe = new TaintedAxe(Divine_Equipment.TaintedWoodAxe, TaintedWoodTool).setUnlocalizedName("Tainted_Axe_Wood").setTextureName("divine_equipment:Tainted_Axe_Wood");
         LanguageRegistry.addName(TaintedWoodAxe, "Tainted Wooden Axe");
         GameRegistry.addRecipe(new ItemStack(TaintedWoodAxe), "mS ", "ms ", " s ", 'S', TaintedSigil, 'm', Block.planks, 's', Item.stick);
         GameRegistry.addRecipe(new ItemStack(TaintedWoodAxe), " Sm", " sm", " s ", 'S', TaintedSigil, 'm', Block.planks, 's', Item.stick);
 
         // Shovels
 
-        TaintedDiamondShovel = new items.tainted.TaintedDiamondShovel(TaintedDiamondShovelID, TaintedDiamondTool).setUnlocalizedName("Tainted_Shovel_Diamond").setTextureName("divine_equipment:Tainted_Shovel_Diamond");
+        TaintedDiamondShovel = new TaintedShovel(Divine_Equipment.TaintedDiamondShovel, TaintedDiamondTool).setUnlocalizedName("Tainted_Shovel_Diamond").setTextureName("divine_equipment:Tainted_Shovel_Diamond");
         LanguageRegistry.addName(TaintedDiamondShovel, "Tainted Diamond Shovel");
         GameRegistry.addRecipe(new ItemStack(TaintedDiamondShovel), " m ", " S ", " s ", 'S', TaintedSigil, 'm', Item.diamond, 's', Item.stick);
 
-        TaintedGoldShovel = new items.tainted.TaintedGoldShovel(TaintedGoldShovelID, TaintedGoldTool).setUnlocalizedName("Tainted_Shovel_Gold").setTextureName("divine_equipment:Tainted_Shovel_Gold");
+        TaintedGoldShovel = new TaintedShovel(Divine_Equipment.TaintedGoldShovel, TaintedGoldTool).setUnlocalizedName("Tainted_Shovel_Gold").setTextureName("divine_equipment:Tainted_Shovel_Gold");
         LanguageRegistry.addName(TaintedGoldShovel, "Tainted Gold Shovel");
         GameRegistry.addRecipe(new ItemStack(TaintedGoldShovel), " m ", " S ", " s ", 'S', TaintedSigil, 'm', Item.ingotGold, 's', Item.stick);
 
-        TaintedIronShovel = new items.tainted.TaintedIronShovel(TaintedIronShovelID, TaintedIronTool).setUnlocalizedName("Tainted_Shovel_Iron").setTextureName("divine_equipment:Tainted_Shovel_Iron");
+        TaintedIronShovel = new TaintedShovel(Divine_Equipment.TaintedIronShovel, TaintedIronTool).setUnlocalizedName("Tainted_Shovel_Iron").setTextureName("divine_equipment:Tainted_Shovel_Iron");
         LanguageRegistry.addName(TaintedIronShovel, "Tainted Iron Shovel");
         GameRegistry.addRecipe(new ItemStack(TaintedIronShovel), " m ", " S ", " s ", 'S', TaintedSigil, 'm', Item.ingotIron, 's', Item.stick);
 
-        TaintedStoneShovel = new TaintedStoneShovel(TaintedStoneShovelID, TaintedStoneTool).setUnlocalizedName("Tainted_Shovel_Stone").setTextureName("divine_equipment:Tainted_Shovel_Stone");
+        TaintedStoneShovel = new TaintedShovel(Divine_Equipment.TaintedStoneShovel, TaintedStoneTool).setUnlocalizedName("Tainted_Shovel_Stone").setTextureName("divine_equipment:Tainted_Shovel_Stone");
         LanguageRegistry.addName(TaintedStoneShovel, "Tainted Stone Shovel");
         GameRegistry.addRecipe(new ItemStack(TaintedStoneShovel), " m ", " S ", " s ", 'S', TaintedSigil, 'm', Block.stone, 's', Item.stick);
 
-        TaintedWoodShovel = new TaintedWoodShovel(TaintedWoodShovelID, TaintedWoodTool).setUnlocalizedName("Tainted_Shovel_Wood").setTextureName("divine_equipment:Tainted_Shovel_Wood");
+        TaintedWoodShovel = new TaintedShovel(Divine_Equipment.TaintedWoodShovel, TaintedWoodTool).setUnlocalizedName("Tainted_Shovel_Wood").setTextureName("divine_equipment:Tainted_Shovel_Wood");
         LanguageRegistry.addName(TaintedWoodShovel, "Tainted Wooden Shovel");
         GameRegistry.addRecipe(new ItemStack(TaintedWoodShovel), " m ", " S ", " s ", 'S', TaintedSigil, 'm', Block.planks, 's', Item.stick);
 
         // Tainted Hoes
 
-        TaintedDiamondHoe = new TaintedDiamondHoe(TaintedDiamondHoeID, TaintedDiamondTool).setUnlocalizedName("Tainted_Hoe_Diamond").setTextureName("divine_equipment:Tainted_Hoe_Diamond");
+        TaintedDiamondHoe = new TaintedHoe(Divine_Equipment.TaintedDiamondHoe, TaintedDiamondTool).setUnlocalizedName("Tainted_Hoe_Diamond").setTextureName("divine_equipment:Tainted_Hoe_Diamond");
         LanguageRegistry.addName(TaintedDiamondHoe, "Tainted Diamond Hoe");
         GameRegistry.addRecipe(new ItemStack(TaintedDiamondHoe), "mS ", " s ", " s ", 'S', TaintedSigil, 'm', Item.diamond, 's', Item.stick);
         GameRegistry.addRecipe(new ItemStack(TaintedDiamondHoe), " Sm", " s ", " s ", 'S', TaintedSigil, 'm', Item.diamond, 's', Item.stick);
 
-        TaintedGoldHoe = new items.tainted.TaintedGoldHoe(TaintedGoldHoeID, TaintedGoldTool).setUnlocalizedName("Tainted_Hoe_Gold").setTextureName("divine_equipment:Tainted_Hoe_Gold");
+        TaintedGoldHoe = new TaintedHoe(Divine_Equipment.TaintedGoldHoe, TaintedGoldTool).setUnlocalizedName("Tainted_Hoe_Gold").setTextureName("divine_equipment:Tainted_Hoe_Gold");
         LanguageRegistry.addName(TaintedGoldHoe, "Tainted Gold Hoe");
         GameRegistry.addRecipe(new ItemStack(TaintedGoldHoe), "mS ", " s ", " s ", 'S', TaintedSigil, 'm', Item.ingotGold, 's', Item.stick);
 
-        TaintedIronHoe = new items.tainted.TaintedIronHoe(TaintedIronHoeID, TaintedIronTool).setUnlocalizedName("Tainted_Hoe_Iron").setTextureName("divine_equipment:Tainted_Hoe_Iron");
+        TaintedIronHoe = new TaintedHoe(Divine_Equipment.TaintedIronHoe, TaintedIronTool).setUnlocalizedName("Tainted_Hoe_Iron").setTextureName("divine_equipment:Tainted_Hoe_Iron");
         LanguageRegistry.addName(TaintedIronHoe, "Tainted Iron Hoe");
         GameRegistry.addRecipe(new ItemStack(TaintedIronHoe), "mS ", " s ", " s ", 'S', TaintedSigil, 'm', Item.ingotIron, 's', Item.stick);
         GameRegistry.addRecipe(new ItemStack(TaintedGoldHoe), " Sm", " s ", " s ", 'S', TaintedSigil, 'm', Item.ingotGold, 's', Item.stick);
 
-        TaintedStoneHoe = new TaintedStoneHoe(TaintedStoneHoeID, TaintedStoneTool).setUnlocalizedName("Tainted_Hoe_Stone").setTextureName("divine_equipment:Tainted_Hoe_Stone");
+        TaintedStoneHoe = new TaintedHoe(Divine_Equipment.TaintedStoneHoe, TaintedStoneTool).setUnlocalizedName("Tainted_Hoe_Stone").setTextureName("divine_equipment:Tainted_Hoe_Stone");
         LanguageRegistry.addName(TaintedStoneHoe, "Tainted Stone Hoe");
         GameRegistry.addRecipe(new ItemStack(TaintedStoneHoe), "mS ", " s ", " s ", 'S', TaintedSigil, 'm', Block.stone, 's', Item.stick);
         GameRegistry.addRecipe(new ItemStack(TaintedStoneHoe), " Sm", " s ", " s ", 'S', TaintedSigil, 'm', Block.stone, 's', Item.stick);
 
-        TaintedWoodHoe = new TaintedWoodHoe(TaintedWoodHoeID, TaintedWoodTool).setUnlocalizedName("Tainted_Hoe_Wood").setTextureName("divine_equipment:Tainted_Hoe_Wood");
+        TaintedWoodHoe = new TaintedHoe(Divine_Equipment.TaintedWoodHoe, TaintedWoodTool).setUnlocalizedName("Tainted_Hoe_Wood").setTextureName("divine_equipment:Tainted_Hoe_Wood");
         LanguageRegistry.addName(TaintedWoodHoe, "Tainted Wooden Hoe");
         GameRegistry.addRecipe(new ItemStack(TaintedWoodHoe), "mS ", " s ", " s ", 'S', TaintedSigil, 'm', Block.planks, 's', Item.stick);
         GameRegistry.addRecipe(new ItemStack(TaintedWoodHoe), " Sm", " s ", " s ", 'S', TaintedSigil, 'm', Block.planks, 's', Item.stick);
@@ -295,127 +235,127 @@ public class Divine_Content {
 
         // Blessed Swords
 
-        BlessedDiamondSword = new items.blessed.BlessedDiamondSword(BlessedDiamondSwordID, BlessedDiamondTool).setUnlocalizedName("Blessed_Sword_Diamond").setTextureName("divine_equipment:Blessed_Sword_Diamond");
+        BlessedDiamondSword = new BlessedSword(Divine_Equipment.BlessedDiamondSword, BlessedDiamondTool).setUnlocalizedName("Blessed_Sword_Diamond").setTextureName("divine_equipment:Blessed_Sword_Diamond");
         LanguageRegistry.addName(BlessedDiamondSword, "Blessed Diamond Sword");
         GameRegistry.addRecipe(new ItemStack(BlessedDiamondSword), " m ", " S ", " s ", 'S', BlessedSigil, 'm', Item.diamond, 's', Item.stick);
 
-        BlessedGoldSword = new items.blessed.BlessedGoldSword(BlessedGoldSwordID, BlessedGoldTool).setUnlocalizedName("Blessed_Sword_Gold").setTextureName("divine_equipment:Blessed_Sword_Gold");
+        BlessedGoldSword = new BlessedSword(Divine_Equipment.BlessedGoldSword, BlessedGoldTool).setUnlocalizedName("Blessed_Sword_Gold").setTextureName("divine_equipment:Blessed_Sword_Gold");
         LanguageRegistry.addName(BlessedGoldSword, "Blessed Gold Sword");
         GameRegistry.addRecipe(new ItemStack(BlessedGoldSword), " m ", " S ", " s ", 'S', BlessedSigil, 'm', Item.ingotGold, 's', Item.stick);
 
-        BlessedIronSword = new BlessedIronSword(BlessedIronSwordID, BlessedIronTool).setUnlocalizedName("Blessed_Sword_Iron").setTextureName("divine_equipment:Blessed_Sword_Iron");
+        BlessedIronSword = new BlessedSword(Divine_Equipment.BlessedIronSword, BlessedIronTool).setUnlocalizedName("Blessed_Sword_Iron").setTextureName("divine_equipment:Blessed_Sword_Iron");
         LanguageRegistry.addName(BlessedIronSword, "Blessed Iron Sword");
         GameRegistry.addRecipe(new ItemStack(BlessedIronSword), " m ", " S ", " s ", 'S', BlessedSigil, 'm', Item.ingotIron, 's', Item.stick);
 
-        BlessedStoneSword = new BlessedStoneSword(BlessedStoneSwordID, BlessedStoneTool).setUnlocalizedName("Blessed_Sword_Stone").setTextureName("divine_equipment:Blessed_Sword_Stone");
+        BlessedStoneSword = new BlessedSword(Divine_Equipment.BlessedStoneSword, BlessedStoneTool).setUnlocalizedName("Blessed_Sword_Stone").setTextureName("divine_equipment:Blessed_Sword_Stone");
         LanguageRegistry.addName(BlessedStoneSword, "Blessed Stone Sword");
         GameRegistry.addRecipe(new ItemStack(BlessedStoneSword), " m ", " S ", " s ", 'S', BlessedSigil, 'm', Block.stone, 's', Item.stick);
 
-        BlessedWoodSword = new BlessedWoodSword(BlessedWoodSwordID, BlessedWoodTool).setUnlocalizedName("Blessed_Sword_Wood").setTextureName("divine_equipment:Blessed_Sword_Wood");
+        BlessedWoodSword = new BlessedSword(Divine_Equipment.BlessedWoodSword, BlessedWoodTool).setUnlocalizedName("Blessed_Sword_Wood").setTextureName("divine_equipment:Blessed_Sword_Wood");
         LanguageRegistry.addName(BlessedWoodSword, "Blessed Wooden Sword");
         GameRegistry.addRecipe(new ItemStack(BlessedWoodSword), " m ", " S ", " s ", 'S', BlessedSigil, 'm', Block.planks, 's', Item.stick);
 
         // Pickaxes
 
-        BlessedDiamondPickaxe = new items.blessed.BlessedDiamondPickaxe(BlessedDiamondPickaxeID, BlessedDiamondTool).setUnlocalizedName("Blessed_Pickaxe_Diamond").setTextureName("divine_equipment:Blessed_Pickaxe_Diamond");
+        BlessedDiamondPickaxe = new BlessedPickaxe(Divine_Equipment.BlessedDiamondPickaxe, BlessedDiamondTool).setUnlocalizedName("Blessed_Pickaxe_Diamond").setTextureName("divine_equipment:Blessed_Pickaxe_Diamond");
         LanguageRegistry.addName(BlessedDiamondPickaxe, "Blessed Diamond Pickaxe");
         GameRegistry.addRecipe(new ItemStack(BlessedDiamondPickaxe), "mSm", " s ", " s ", 'S', BlessedSigil, 'm', Item.diamond, 's', Item.stick);
 
-        BlessedGoldPickaxe = new items.blessed.BlessedGoldPickaxe(BlessedGoldPickaxeID, BlessedGoldTool).setUnlocalizedName("Blessed_Pickaxe_Gold").setTextureName("divine_equipment:Blessed_Pickaxe_Gold");
+        BlessedGoldPickaxe = new BlessedPickaxe(Divine_Equipment.BlessedGoldPickaxe, BlessedGoldTool).setUnlocalizedName("Blessed_Pickaxe_Gold").setTextureName("divine_equipment:Blessed_Pickaxe_Gold");
         LanguageRegistry.addName(BlessedGoldPickaxe, "Blessed Gold Pickaxe");
         GameRegistry.addRecipe(new ItemStack(BlessedGoldPickaxe), "mSm", " s ", " s ", 'S', BlessedSigil, 'm', Item.ingotGold, 's', Item.stick);
 
-        BlessedIronPickaxe = new items.blessed.BlessedIronPickaxe(BlessedIronPickaxeID, BlessedIronTool).setUnlocalizedName("Blessed_Pickaxe_Iron").setTextureName("divine_equipment:Blessed_Pickaxe_Iron");
+        BlessedIronPickaxe = new BlessedPickaxe(Divine_Equipment.BlessedIronPickaxe, BlessedIronTool).setUnlocalizedName("Blessed_Pickaxe_Iron").setTextureName("divine_equipment:Blessed_Pickaxe_Iron");
         LanguageRegistry.addName(BlessedIronPickaxe, "Blessed Iron Pickaxe");
         GameRegistry.addRecipe(new ItemStack(BlessedIronPickaxe), "mSm", " s ", " s ", 'S', BlessedSigil, 'm', Item.ingotIron, 's', Item.stick);
 
-        BlessedStonePickaxe = new BlessedStonePickaxe(BlessedStonePickaxeID, BlessedStoneTool).setUnlocalizedName("Blessed_Pickaxe_Stone").setTextureName("divine_equipment:Blessed_Pickaxe_Stone");
+        BlessedStonePickaxe = new BlessedPickaxe(Divine_Equipment.BlessedStonePickaxe, BlessedStoneTool).setUnlocalizedName("Blessed_Pickaxe_Stone").setTextureName("divine_equipment:Blessed_Pickaxe_Stone");
         LanguageRegistry.addName(BlessedStonePickaxe, "Blessed Stone Pickaxe");
         GameRegistry.addRecipe(new ItemStack(BlessedStonePickaxe), "mSm", " s ", " s ", 'S', BlessedSigil, 'm', Block.stone, 's', Item.stick);
 
-        BlessedWoodPickaxe = new BlessedWoodPickaxe(BlessedWoodPickaxeID, BlessedWoodTool).setUnlocalizedName("Blessed_Pickaxe_Wood").setTextureName("divine_equipment:Blessed_Pickaxe_Wood");
+        BlessedWoodPickaxe = new BlessedPickaxe(Divine_Equipment.BlessedWoodPickaxe, BlessedWoodTool).setUnlocalizedName("Blessed_Pickaxe_Wood").setTextureName("divine_equipment:Blessed_Pickaxe_Wood");
         LanguageRegistry.addName(BlessedWoodPickaxe, "Blessed Wooden Pickaxe");
         GameRegistry.addRecipe(new ItemStack(BlessedWoodPickaxe), "mSm", " s ", " s ", 'S', BlessedSigil, 'm', Block.planks, 's', Item.stick);
 
        // Axes
 
-        BlessedDiamondAxe = new BlessedDiamondAxe(BlessedDiamondAxeID, BlessedDiamondTool).setUnlocalizedName("Blessed_Axe_Diamond").setTextureName("divine_equipment:Blessed_Axe_Diamond");
+        BlessedDiamondAxe = new BlessedAxe(Divine_Equipment.BlessedDiamondAxe, BlessedDiamondTool).setUnlocalizedName("Blessed_Axe_Diamond").setTextureName("divine_equipment:Blessed_Axe_Diamond");
         LanguageRegistry.addName(BlessedDiamondAxe, "Blessed Diamond Axe");
         GameRegistry.addRecipe(new ItemStack(BlessedDiamondAxe), "mS ", "ms ", " s ", 'S', BlessedSigil, 'm', Item.diamond, 's', Item.stick);
         GameRegistry.addRecipe(new ItemStack(BlessedDiamondAxe), " Sm", " sm", " s ", 'S', BlessedSigil, 'm', Item.diamond, 's', Item.stick);
 
-        BlessedGoldAxe = new BlessedGoldAxe(BlessedGoldAxeID, BlessedGoldTool).setUnlocalizedName("Blessed_Axe_Gold").setTextureName("divine_equipment:Blessed_Axe_Gold");
+        BlessedGoldAxe = new BlessedAxe(Divine_Equipment.BlessedGoldAxe, BlessedGoldTool).setUnlocalizedName("Blessed_Axe_Gold").setTextureName("divine_equipment:Blessed_Axe_Gold");
         LanguageRegistry.addName(BlessedGoldAxe, "Blessed Gold Axe");
         GameRegistry.addRecipe(new ItemStack(BlessedGoldAxe), "mS ", "ms ", " s ", 'S', BlessedSigil, 'm', Item.ingotGold, 's', Item.stick);
         GameRegistry.addRecipe(new ItemStack(BlessedGoldAxe), " Sm", " sm", " s ", 'S', BlessedSigil, 'm', Item.ingotGold, 's', Item.stick);
 
 
-        BlessedIronAxe = new BlessedIronAxe(BlessedIronAxeID, BlessedIronTool).setUnlocalizedName("Blessed_Axe_Iron").setTextureName("divine_equipment:Blessed_Axe_Iron");
+        BlessedIronAxe = new BlessedAxe(Divine_Equipment.BlessedIronAxe, BlessedIronTool).setUnlocalizedName("Blessed_Axe_Iron").setTextureName("divine_equipment:Blessed_Axe_Iron");
         LanguageRegistry.addName(BlessedIronAxe, "Blessed Iron Axe");
         GameRegistry.addRecipe(new ItemStack(BlessedIronAxe), "mS ", "ms ", " s ", 'S', BlessedSigil, 'm', Item.ingotIron, 's', Item.stick);
         GameRegistry.addRecipe(new ItemStack(BlessedGoldAxe), " Sm", " sm", " s ", 'S', BlessedSigil, 'm', Item.ingotGold, 's', Item.stick);
 
-        BlessedStoneAxe = new BlessedStoneAxe(BlessedStoneAxeID, BlessedStoneTool).setUnlocalizedName("Blessed_Axe_Stone").setTextureName("divine_equipment:Blessed_Axe_Stone");
+        BlessedStoneAxe = new BlessedAxe(Divine_Equipment.BlessedStoneAxe, BlessedStoneTool).setUnlocalizedName("Blessed_Axe_Stone").setTextureName("divine_equipment:Blessed_Axe_Stone");
         LanguageRegistry.addName(BlessedStoneAxe, "Blessed Stone Axe");
         GameRegistry.addRecipe(new ItemStack(BlessedStoneAxe), "mS ", "ms ", " s ", 'S', BlessedSigil, 'm', Block.stone, 's', Item.stick);
         GameRegistry.addRecipe(new ItemStack(BlessedStoneAxe), " Sm", " sm", " s ", 'S', BlessedSigil, 'm', Block.stone, 's', Item.stick);
 
-        BlessedWoodAxe = new BlessedWoodAxe(BlessedWoodAxeID, BlessedWoodTool).setUnlocalizedName("Blessed_Axe_Wood").setTextureName("divine_equipment:Blessed_Axe_Wood");
+        BlessedWoodAxe = new BlessedAxe(Divine_Equipment.BlessedWoodAxe, BlessedWoodTool).setUnlocalizedName("Blessed_Axe_Wood").setTextureName("divine_equipment:Blessed_Axe_Wood");
         LanguageRegistry.addName(BlessedWoodAxe, "Blessed Wooden Axe");
         GameRegistry.addRecipe(new ItemStack(BlessedWoodAxe), "mS ", "ms ", " s ", 'S', BlessedSigil, 'm', Block.planks, 's', Item.stick);
         GameRegistry.addRecipe(new ItemStack(BlessedWoodAxe), " Sm", " sm", " s ", 'S', BlessedSigil, 'm', Block.planks, 's', Item.stick);
 
         // Shovels
 
-        BlessedDiamondShovel = new BlessedDiamondShovel(BlessedDiamondShovelID, BlessedDiamondTool).setUnlocalizedName("Blessed_Shovel_Diamond").setTextureName("divine_equipment:Blessed_Shovel_Diamond");
+        BlessedDiamondShovel = new BlessedShovel(Divine_Equipment.BlessedDiamondShovel, BlessedDiamondTool).setUnlocalizedName("Blessed_Shovel_Diamond").setTextureName("divine_equipment:Blessed_Shovel_Diamond");
         LanguageRegistry.addName(BlessedDiamondShovel, "Blessed Diamond Shovel");
         GameRegistry.addRecipe(new ItemStack(BlessedDiamondShovel), " m ", " S ", " s ", 'S', BlessedSigil, 'm', Item.diamond, 's', Item.stick);
 
-        BlessedGoldShovel = new BlessedGoldShovel(BlessedGoldShovelID, BlessedGoldTool).setUnlocalizedName("Blessed_Shovel_Gold").setTextureName("divine_equipment:Blessed_Shovel_Gold");
+        BlessedGoldShovel = new BlessedShovel(Divine_Equipment.BlessedGoldShovel, BlessedGoldTool).setUnlocalizedName("Blessed_Shovel_Gold").setTextureName("divine_equipment:Blessed_Shovel_Gold");
         LanguageRegistry.addName(BlessedGoldShovel, "Blessed Gold Shovel");
         GameRegistry.addRecipe(new ItemStack(BlessedGoldShovel), " m ", " S ", " s ", 'S', BlessedSigil, 'm', Item.ingotGold, 's', Item.stick);
 
-        BlessedIronShovel = new BlessedIronShovel(BlessedIronShovelID, BlessedIronTool).setUnlocalizedName("Blessed_Shovel_Iron").setTextureName("divine_equipment:Blessed_Shovel_Iron");
+        BlessedIronShovel = new BlessedShovel(Divine_Equipment.BlessedIronShovel, BlessedIronTool).setUnlocalizedName("Blessed_Shovel_Iron").setTextureName("divine_equipment:Blessed_Shovel_Iron");
         LanguageRegistry.addName(BlessedIronShovel, "Blessed Iron Shovel");
         GameRegistry.addRecipe(new ItemStack(BlessedIronShovel), " m ", " S ", " s ", 'S', BlessedSigil, 'm', Item.ingotIron, 's', Item.stick);
 
-        BlessedStoneShovel = new BlessedStoneShovel(BlessedStoneShovelID, BlessedStoneTool).setUnlocalizedName("Blessed_Shovel_Stone").setTextureName("divine_equipment:Blessed_Shovel_Stone");
+        BlessedStoneShovel = new BlessedShovel(Divine_Equipment.BlessedStoneShovel, BlessedStoneTool).setUnlocalizedName("Blessed_Shovel_Stone").setTextureName("divine_equipment:Blessed_Shovel_Stone");
         LanguageRegistry.addName(BlessedStoneShovel, "Blessed Stone Shovel");
         GameRegistry.addRecipe(new ItemStack(BlessedStoneShovel), " m ", " S ", " s ", 'S', BlessedSigil, 'm', Block.stone, 's', Item.stick);
 
-        BlessedWoodShovel = new BlessedWoodShovel(BlessedWoodShovelID, BlessedWoodTool).setUnlocalizedName("Blessed_Shovel_Wood").setTextureName("divine_equipment:Blessed_Shovel_Wood");
+        BlessedWoodShovel = new BlessedShovel(Divine_Equipment.BlessedWoodShovel, BlessedWoodTool).setUnlocalizedName("Blessed_Shovel_Wood").setTextureName("divine_equipment:Blessed_Shovel_Wood");
         LanguageRegistry.addName(BlessedWoodShovel, "Blessed Wooden Shovel");
         GameRegistry.addRecipe(new ItemStack(BlessedWoodShovel), " m ", " S ", " s ", 'S', BlessedSigil, 'm', Block.planks, 's', Item.stick);
 
         // Blessed Hoes
 
-        BlessedDiamondHoe = new BlessedDiamondHoe(BlessedDiamondHoeID, BlessedDiamondTool).setUnlocalizedName("Blessed_Hoe_Diamond").setTextureName("divine_equipment:Blessed_Hoe_Diamond");
+        BlessedDiamondHoe = new BlessedHoe(Divine_Equipment.BlessedDiamondHoe, BlessedDiamondTool).setUnlocalizedName("Blessed_Hoe_Diamond").setTextureName("divine_equipment:Blessed_Hoe_Diamond");
         LanguageRegistry.addName(BlessedDiamondHoe, "Blessed Diamond Hoe");
         GameRegistry.addRecipe(new ItemStack(BlessedDiamondHoe), "mS ", " s ", " s ", 'S', BlessedSigil, 'm', Item.diamond, 's', Item.stick);
         GameRegistry.addRecipe(new ItemStack(BlessedDiamondHoe), " Sm", " s ", " s ", 'S', BlessedSigil, 'm', Item.diamond, 's', Item.stick);
 
-        BlessedGoldHoe = new BlessedGoldHoe(BlessedGoldHoeID, BlessedGoldTool).setUnlocalizedName("Blessed_Hoe_Gold").setTextureName("divine_equipment:Blessed_Hoe_Gold");
+        BlessedGoldHoe = new BlessedHoe(Divine_Equipment.BlessedGoldHoe, BlessedGoldTool).setUnlocalizedName("Blessed_Hoe_Gold").setTextureName("divine_equipment:Blessed_Hoe_Gold");
         LanguageRegistry.addName(BlessedGoldHoe, "Blessed Gold Hoe");
         GameRegistry.addRecipe(new ItemStack(BlessedGoldHoe), "mS ", " s ", " s ", 'S', BlessedSigil, 'm', Item.ingotGold, 's', Item.stick);
 
-        BlessedIronHoe = new BlessedIronHoe(BlessedIronHoeID, BlessedIronTool).setUnlocalizedName("Blessed_Hoe_Iron").setTextureName("divine_equipment:Blessed_Hoe_Iron");
+        BlessedIronHoe = new BlessedHoe(Divine_Equipment.BlessedIronHoe, BlessedIronTool).setUnlocalizedName("Blessed_Hoe_Iron").setTextureName("divine_equipment:Blessed_Hoe_Iron");
         LanguageRegistry.addName(BlessedIronHoe, "Blessed Iron Hoe");
         GameRegistry.addRecipe(new ItemStack(BlessedIronHoe), "mS ", " s ", " s ", 'S', BlessedSigil, 'm', Item.ingotIron, 's', Item.stick);
         GameRegistry.addRecipe(new ItemStack(BlessedGoldHoe), " Sm", " s ", " s ", 'S', BlessedSigil, 'm', Item.ingotGold, 's', Item.stick);
 
-        BlessedStoneHoe = new BlessedStoneHoe(BlessedStoneHoeID, BlessedStoneTool).setUnlocalizedName("Blessed_Hoe_Stone").setTextureName("divine_equipment:Blessed_Hoe_Stone");
+        BlessedStoneHoe = new BlessedHoe(Divine_Equipment.BlessedStoneHoe, BlessedStoneTool).setUnlocalizedName("Blessed_Hoe_Stone").setTextureName("divine_equipment:Blessed_Hoe_Stone");
         LanguageRegistry.addName(BlessedStoneHoe, "Blessed Stone Hoe");
         GameRegistry.addRecipe(new ItemStack(BlessedStoneHoe), "mS ", " s ", " s ", 'S', BlessedSigil, 'm', Block.stone, 's', Item.stick);
         GameRegistry.addRecipe(new ItemStack(BlessedStoneHoe), " Sm", " s ", " s ", 'S', BlessedSigil, 'm', Block.stone, 's', Item.stick);
 
-        BlessedWoodHoe = new BlessedWoodHoe(BlessedWoodHoeID, BlessedWoodTool).setUnlocalizedName("Blessed_Hoe_Wood").setTextureName("divine_equipment:Blessed_Hoe_Wood");
+        BlessedWoodHoe = new BlessedHoe(Divine_Equipment.BlessedWoodHoe, BlessedWoodTool).setUnlocalizedName("Blessed_Hoe_Wood").setTextureName("divine_equipment:Blessed_Hoe_Wood");
         LanguageRegistry.addName(BlessedWoodHoe, "Blessed Wooden Hoe");
         GameRegistry.addRecipe(new ItemStack(BlessedWoodHoe), "mS ", " s ", " s ", 'S', BlessedSigil, 'm', Block.planks, 's', Item.stick);
         GameRegistry.addRecipe(new ItemStack(BlessedWoodHoe), " Sm", " s ", " s ", 'S', BlessedSigil, 'm', Block.planks, 's', Item.stick);
 
         // Ender Items
 
-        EnderSword = new items.ender.EnderSword(EnderSwordID, EnumToolMaterial.EMERALD).setUnlocalizedName("Ender_Sword").setTextureName("divine_equipment:EnderSword");
+        EnderSword = new items.ender.EnderSword(Divine_Equipment.EnderSword, EnumToolMaterial.EMERALD).setUnlocalizedName("Ender_Sword").setTextureName("divine_equipment:EnderSword");
         LanguageRegistry.addName(EnderSword, "Ender Sword");
         GameRegistry.addRecipe(new ItemStack(EnderSword), " s ", " s ", " S ", 's', EnderSigil, 'S', Item.stick);
     }
diff --git a/src/divine_equipment/divine_equipment/Divine_Equipment.java b/src/divine_equipment/divine_equipment/Divine_Equipment.java
index d3ea174..8be0aca 100644
--- a/src/divine_equipment/divine_equipment/Divine_Equipment.java
+++ b/src/divine_equipment/divine_equipment/Divine_Equipment.java
@@ -28,18 +28,18 @@ public class Divine_Equipment {
 
     // Common
     private int BaseBlockID = 500;
-    private int BaseID = 4666;
+    private int BaseID = 1200;
     // Blocks
-    public static int TaintedStoneID, TaintedWoodID, BlesssedStoneID, BlessedWoodID;
+    public static int TaintedStone, TaintedWood, BlesssedStone, BlessedWood;
 
     // Sigils
-    public static int BlankSigilID, TaintedSigilID, BlessedSigilID, EnderSigilID, HiddenSigilID;
+    public static int BlankSigil, TaintedSigil, BlessedSigil, EnderSigil, HiddenSigil;
     // Tainted
-    public static int TaintedDiamondSwordID, TaintedGoldSwordID, TaintedIronSwordID, TaintedStoneSwordID, TaintedWoodSwordID, TaintedDiamondPickaxeID, TaintedGoldPickaxeID, TaintedIronPickaxeID, TaintedStonePickaxeID, TaintedWoodPickaxeID, TaintedDiamondAxeID, TaintedGoldAxeID, TaintedIronAxeID, TaintedStoneAxeID, TaintedWoodAxeID, TaintedDiamondShovelID, TaintedGoldShovelID, TaintedIronShovelID, TaintedStoneShovelID, TaintedWoodShovelID, TaintedDiamondHoeID, TaintedGoldHoeID, TaintedIronHoeID, TaintedStoneHoeID, TaintedWoodHoeID;
+    public static int TaintedDiamondSword, TaintedGoldSword, TaintedIronSword, TaintedStoneSword, TaintedWoodSword, TaintedDiamondPickaxe, TaintedGoldPickaxe, TaintedIronPickaxe, TaintedStonePickaxe, TaintedWoodPickaxe, TaintedDiamondAxe, TaintedGoldAxe, TaintedIronAxe, TaintedStoneAxe, TaintedWoodAxe, TaintedDiamondShovel, TaintedGoldShovel, TaintedIronShovel, TaintedStoneShovel, TaintedWoodShovel, TaintedDiamondHoe, TaintedGoldHoe, TaintedIronHoe, TaintedStoneHoe, TaintedWoodHoe;
     // Blessed
-    public static int BlessedDiamondSwordID, BlessedGoldSwordID, BlessedIronSwordID, BlessedStoneSwordID, BlessedWoodSwordID, BlessedDiamondPickaxeID, BlessedGoldPickaxeID, BlessedIronPickaxeID, BlessedStonePickaxeID, BlessedWoodPickaxeID, BlessedDiamondAxeID, BlessedGoldAxeID, BlessedIronAxeID, BlessedStoneAxeID, BlessedWoodAxeID, BlessedDiamondShovelID, BlessedGoldShovelID, BlessedIronShovelID, BlessedStoneShovelID, BlessedWoodShovelID, BlessedDiamondHoeID, BlessedGoldHoeID, BlessedIronHoeID, BlessedStoneHoeID, BlessedWoodHoeID;
+    public static int BlessedDiamondSword, BlessedGoldSword, BlessedIronSword, BlessedStoneSword, BlessedWoodSword, BlessedDiamondPickaxe, BlessedGoldPickaxe, BlessedIronPickaxe, BlessedStonePickaxe, BlessedWoodPickaxe, BlessedDiamondAxe, BlessedGoldAxe, BlessedIronAxe, BlessedStoneAxe, BlessedWoodAxe, BlessedDiamondShovel, BlessedGoldShovel, BlessedIronShovel, BlessedStoneShovel, BlessedWoodShovel, BlessedDiamondHoe, BlessedGoldHoe, BlessedIronHoe, BlessedStoneHoe, BlessedWoodHoe;
     // Ender Items
-    public static int EnderSwordID;
+    public static int EnderSword;
 
 
     public Divine_Equipment()
@@ -48,75 +48,75 @@ public class Divine_Equipment {
    }
     @Mod.EventHandler
     public void preInit(FMLPreInitializationEvent event){
-    Configuration DivineEquipment = new Configuration(event.getSuggestedConfigurationFile());
 
-        DivineEquipment.load();
-        TaintedStoneID = DivineEquipment.get("tainted stone", "BlockID", BaseBlockID).getInt(BaseBlockID);
-        TaintedWoodID = DivineEquipment.get("tainted wood", "BlockID", BaseBlockID+1).getInt(BaseBlockID+1);
-        BlesssedStoneID = DivineEquipment.get("blessed stone", "BlockID", BaseBlockID+2).getInt(BaseBlockID+2);
-        BlessedWoodID = DivineEquipment.get("blessed wood", "BlockID", BaseBlockID+3).getInt(BaseBlockID+3);
-        BlankSigilID = DivineEquipment.get("Blank Sigil", "ItemID", BaseID+4).getInt(BaseID+4);
-        TaintedSigilID = DivineEquipment.get("Tainted Sigil", "ItemID", BaseID+5).getInt(BaseID+5);
-        BlessedSigilID = DivineEquipment.get("Blessed Sigil", "ItemID", BaseID+6).getInt(BaseID+6);
-        EnderSigilID = DivineEquipment.get("Ender Sigil", "ItemID", BaseID+7).getInt(BaseID+7);
-        HiddenSigilID = DivineEquipment.get("Hidden Sigil", "ItemID", BaseID+8).getInt(BaseID+8);
+    Configuration Config = new Configuration(event.getSuggestedConfigurationFile());
 
-        TaintedDiamondSwordID = DivineEquipment.get("Tainted Diamond Sword", "ItemID", BaseID+9).getInt(BaseID+9);
-        TaintedGoldSwordID = DivineEquipment.get("Tainted Gold Sword", "ItemID", BaseID+10).getInt(BaseID+10);
-        TaintedIronSwordID = DivineEquipment.get("Tainted Iron Sword", "ItemID", BaseID+11).getInt(BaseID+11);
-        TaintedStoneSwordID = DivineEquipment.get("Tainted Stone Sword", "ItemID", BaseID+12).getInt(BaseID+12);
-        TaintedWoodSwordID = DivineEquipment.get("Tainted Wood Sword", "ItemID", BaseID+13).getInt(BaseID+13);
-        TaintedDiamondPickaxeID = DivineEquipment.get("Tainted Diamond Pickaxe", "ItemID", BaseID+14).getInt(BaseID+14);
-        TaintedGoldPickaxeID = DivineEquipment.get("Tainted Gold Pickaxe", "ItemID", BaseID+15).getInt(BaseID+15);
-        TaintedIronPickaxeID = DivineEquipment.get("Tainted Iron Pickaxe", "ItemID", BaseID+16).getInt(BaseID+16);
-        TaintedStonePickaxeID = DivineEquipment.get("Tainted Stone Pickaxe", "ItemID", BaseID+17).getInt(BaseID+17);
-        TaintedWoodPickaxeID = DivineEquipment.get("Tainted Wood Pickaxe", "ItemID", BaseID+18).getInt(BaseID+18);
-        TaintedDiamondAxeID = DivineEquipment.get("Tainted Diamond Axe", "ItemID", BaseID+19).getInt(BaseID+19);
-        TaintedGoldAxeID = DivineEquipment.get("Tainted Gold Axe", "ItemID", BaseID+20).getInt(BaseID+20);
-        TaintedIronAxeID = DivineEquipment.get("Tainted Iron Axe", "ItemID", BaseID+21).getInt(BaseID+21);
-        TaintedStoneAxeID = DivineEquipment.get("Tainted Stone Axe", "ItemID", BaseID+22).getInt(BaseID+22);
-        TaintedWoodAxeID = DivineEquipment.get("Tainted Wood Axe", "ItemID", BaseID+23).getInt(BaseID+23);
-        TaintedDiamondShovelID = DivineEquipment.get("Tainted Diamond Shovel", "ItemID", BaseID+24).getInt(BaseID+24);
-        TaintedGoldShovelID = DivineEquipment.get("Tainted Gold Shovel", "ItemID", BaseID+25).getInt(BaseID+25);
-        TaintedIronShovelID = DivineEquipment.get("Tainted Iron Shovel", "ItemID", BaseID+26).getInt(BaseID+26);
-        TaintedStoneShovelID = DivineEquipment.get("Tainted Stone Shovel", "ItemID", BaseID+27).getInt(BaseID+27);
-        TaintedWoodShovelID = DivineEquipment.get("Tainted Wood Shovel", "ItemID", BaseID+28).getInt(BaseID+28);
-        TaintedDiamondHoeID = DivineEquipment.get("Tainted Diamond Hoe", "ItemID", BaseID+29).getInt(BaseID+29);
-        TaintedGoldHoeID = DivineEquipment.get("Tainted Gold Hoe", "ItemID", BaseID+30).getInt(BaseID+30);
-        TaintedIronHoeID = DivineEquipment.get("Tainted Iron Hoe", "ItemID", BaseID+31).getInt(BaseID+31);
-        TaintedStoneHoeID = DivineEquipment.get("Tainted Stone Hoe", "ItemID", BaseID+32).getInt(BaseID+32);
-        TaintedWoodHoeID = DivineEquipment.get("Tainted Wood Hoe", "ItemID", BaseID+33).getInt(BaseID+33);
+        Config.load();
+        TaintedStone = Config.get("tainted stone", "BlockID", BaseBlockID).getInt(BaseBlockID);
+        TaintedWood = Config.get("tainted wood", "BlockID", BaseBlockID+ 1).getInt(BaseBlockID+1);
+        BlessedSigil = Config.get("blessed stone", "BlockID", BaseBlockID+2).getInt(BaseBlockID+2);
+        BlessedWood = Config.get("blessed wood", "BlockID", BaseBlockID+3).getInt(BaseBlockID+3);
+        BlankSigil = Config.get("Blank Sigil", "ItemID", BaseID+4).getInt(BaseID+4);
+        TaintedSigil = Config.get("Tainted Sigil", "ItemID", BaseID+5).getInt(BaseID+5);
+        BlessedSigil = Config.get("Blessed Sigil", "ItemID", BaseID+6).getInt(BaseID+6);
+        EnderSigil = Config.get("Ender Sigil", "ItemID", BaseID+7).getInt(BaseID+7);
+        HiddenSigil = Config.get("Hidden Sigil", "ItemID", BaseID+8).getInt(BaseID+8);
 
-        BlessedDiamondSwordID = DivineEquipment.get("Blessed Diamond Sword", "ItemID", BaseID+34).getInt(BaseID+34);
-        BlessedGoldSwordID = DivineEquipment.get("Blessed Gold Sword", "ItemID", BaseID+35).getInt(BaseID+35);
-        BlessedIronSwordID = DivineEquipment.get("Blessed Iron Sword", "ItemID", BaseID+36).getInt(BaseID+36);
-        BlessedStoneSwordID = DivineEquipment.get("Blessed Stone Sword", "ItemID", BaseID+37).getInt(BaseID+37);
-        BlessedWoodSwordID = DivineEquipment.get("Blessed Wood Sword", "ItemID", BaseID+38).getInt(BaseID+38);
-        BlessedDiamondPickaxeID = DivineEquipment.get("Blessed Diamond Pickaxe", "ItemID", BaseID+39).getInt(BaseID+39);
-        BlessedGoldPickaxeID = DivineEquipment.get("Blessed Gold Pickaxe", "ItemID", BaseID+40).getInt(BaseID+40);
-        BlessedIronPickaxeID = DivineEquipment.get("Blessed Iron Pickaxe", "ItemID", BaseID+41).getInt(BaseID+41);
-        BlessedStonePickaxeID = DivineEquipment.get("Blessed Stone Pickaxe", "ItemID", BaseID+42).getInt(BaseID+42);
-        BlessedWoodPickaxeID = DivineEquipment.get("Blessed Wood Pickaxe", "ItemID", BaseID+43).getInt(BaseID+43);
-        BlessedDiamondAxeID = DivineEquipment.get("Blessed Diamond Axe", "ItemID", BaseID+44).getInt(BaseID+44);
-        BlessedGoldAxeID = DivineEquipment.get("Blessed Gold Axe", "ItemID", BaseID+45).getInt(BaseID+45);
-        BlessedIronAxeID = DivineEquipment.get("Blessed Iron Axe", "ItemID", BaseID+46).getInt(BaseID+46);
-        BlessedStoneAxeID = DivineEquipment.get("Blessed Stone Axe", "ItemID", BaseID+47).getInt(BaseID+47);
-        BlessedWoodAxeID = DivineEquipment.get("Blessed Wood Axe", "ItemID", BaseID+48).getInt(BaseID+48);
-        BlessedDiamondShovelID = DivineEquipment.get("Blessed Diamond Shovel", "ItemID", BaseID+49).getInt(BaseID+49);
-        BlessedGoldShovelID = DivineEquipment.get("Blessed Gold Shovel", "ItemID", BaseID+50).getInt(BaseID+50);
-        BlessedIronShovelID = DivineEquipment.get("Blessed Iron Shovel", "ItemID", BaseID+51).getInt(BaseID+51);
-        BlessedStoneShovelID = DivineEquipment.get("Blessed Stone Shovel", "ItemID", BaseID+52).getInt(BaseID+52);
-        BlessedWoodShovelID = DivineEquipment.get("Blessed Wood Shovel", "ItemID", BaseID+53).getInt(BaseID+53);
-        BlessedDiamondHoeID = DivineEquipment.get("Blessed Diamond Hoe", "ItemID", BaseID+54).getInt(BaseID+54);
-        BlessedGoldHoeID = DivineEquipment.get("Blessed Gold Hoe", "ItemID", BaseID+55).getInt(BaseID+55);
-        BlessedIronHoeID = DivineEquipment.get("Blessed Iron Hoe", "ItemID", BaseID+56).getInt(BaseID+56);
-        BlessedStoneHoeID = DivineEquipment.get("Blessed Stone Hoe", "ItemID", BaseID+57).getInt(BaseID+57);
-        BlessedWoodHoeID = DivineEquipment.get("Blessed Wood Hoe", "ItemID", BaseID+58).getInt(BaseID+58);
+        TaintedDiamondSword = Config.get("Tainted Diamond Sword", "ItemID", BaseID+9).getInt(BaseID+9);
+        TaintedGoldSword = Config.get("Tainted Gold Sword", "ItemID", BaseID+10).getInt(BaseID+10);
+        TaintedIronSword = Config.get("Tainted Iron Sword", "ItemID", BaseID+11).getInt(BaseID+11);
+        TaintedStoneSword = Config.get("Tainted Stone Sword", "ItemID", BaseID+12).getInt(BaseID+12);
+        TaintedWoodSword = Config.get("Tainted Wood Sword", "ItemID", BaseID+13).getInt(BaseID+13);
+        TaintedDiamondPickaxe = Config.get("Tainted Diamond Pickaxe", "ItemID", BaseID+14).getInt(BaseID+14);
+        TaintedGoldPickaxe = Config.get("Tainted Gold Pickaxe", "ItemID", BaseID+15).getInt(BaseID+15);
+        TaintedIronPickaxe = Config.get("Tainted Iron Pickaxe", "ItemID", BaseID+16).getInt(BaseID+16);
+        TaintedStonePickaxe = Config.get("Tainted Stone Pickaxe", "ItemID", BaseID+17).getInt(BaseID+17);
+        TaintedWoodPickaxe = Config.get("Tainted Wood Pickaxe", "ItemID", BaseID+18).getInt(BaseID+18);
+        TaintedDiamondAxe = Config.get("Tainted Diamond Axe", "ItemID", BaseID+19).getInt(BaseID+19);
+        TaintedGoldAxe = Config.get("Tainted Gold Axe", "ItemID", BaseID+20).getInt(BaseID+20);
+        TaintedIronAxe = Config.get("Tainted Iron Axe", "ItemID", BaseID+21).getInt(BaseID+21);
+        TaintedStoneAxe = Config.get("Tainted Stone Axe", "ItemID", BaseID+22).getInt(BaseID+22);
+        TaintedWoodAxe = Config.get("Tainted Wood Axe", "ItemID", BaseID+23).getInt(BaseID+23);
+        TaintedDiamondShovel = Config.get("Tainted Diamond Shovel", "ItemID", BaseID+24).getInt(BaseID+24);
+        TaintedGoldShovel = Config.get("Tainted Gold Shovel", "ItemID", BaseID+25).getInt(BaseID+25);
+        TaintedIronShovel = Config.get("Tainted Iron Shovel", "ItemID", BaseID+26).getInt(BaseID+26);
+        TaintedStoneShovel = Config.get("Tainted Stone Shovel", "ItemID", BaseID+27).getInt(BaseID+27);
+        TaintedWoodShovel = Config.get("Tainted Wood Shovel", "ItemID", BaseID+28).getInt(BaseID+28);
+        TaintedDiamondHoe = Config.get("Tainted Diamond Hoe", "ItemID", BaseID+29).getInt(BaseID+29);
+        TaintedGoldHoe = Config.get("Tainted Gold Hoe", "ItemID", BaseID+30).getInt(BaseID+30);
+        TaintedIronHoe = Config.get("Tainted Iron Hoe", "ItemID", BaseID+31).getInt(BaseID+31);
+        TaintedStoneHoe = Config.get("Tainted Stone Hoe", "ItemID", BaseID+32).getInt(BaseID+32);
+        TaintedWoodHoe = Config.get("Tainted Wood Hoe", "ItemID", BaseID+33).getInt(BaseID+33);
 
-        EnderSwordID = DivineEquipment.get("Ender Sword", "ItemID", BaseID+59).getInt(BaseID+59);
-        if(DivineEquipment.hasChanged())
-        {
-            DivineEquipment.save();
+        BlessedDiamondSword = Config.get("Blessed Diamond Sword", "ItemID", BaseID+34).getInt(BaseID+34);
+        BlessedGoldSword = Config.get("Blessed Gold Sword", "ItemID", BaseID+35).getInt(BaseID+35);
+        BlessedIronSword = Config.get("Blessed Iron Sword", "ItemID", BaseID+36).getInt(BaseID+36);
+        BlessedStoneSword = Config.get("Blessed Stone Sword", "ItemID", BaseID+37).getInt(BaseID+37);
+        BlessedWoodSword = Config.get("Blessed Wood Sword", "ItemID", BaseID+38).getInt(BaseID+38);
+        BlessedDiamondPickaxe = Config.get("Blessed Diamond Pickaxe", "ItemID", BaseID+39).getInt(BaseID+39);
+        BlessedGoldPickaxe = Config.get("Blessed Gold Pickaxe", "ItemID", BaseID+40).getInt(BaseID+40);
+        BlessedIronPickaxe = Config.get("Blessed Iron Pickaxe", "ItemID", BaseID+41).getInt(BaseID+41);
+        BlessedStonePickaxe = Config.get("Blessed Stone Pickaxe", "ItemID", BaseID+42).getInt(BaseID+42);
+        BlessedWoodPickaxe = Config.get("Blessed Wood Pickaxe", "ItemID", BaseID+43).getInt(BaseID+43);
+        BlessedDiamondAxe = Config.get("Blessed Diamond Axe", "ItemID", BaseID+44).getInt(BaseID+44);
+        BlessedGoldAxe = Config.get("Blessed Gold Axe", "ItemID", BaseID+45).getInt(BaseID+45);
+        BlessedIronAxe = Config.get("Blessed Iron Axe", "ItemID", BaseID+46).getInt(BaseID+46);
+        BlessedStoneAxe = Config.get("Blessed Stone Axe", "ItemID", BaseID+47).getInt(BaseID+47);
+        BlessedWoodAxe = Config.get("Blessed Wood Axe", "ItemID", BaseID+48).getInt(BaseID+48);
+        BlessedDiamondShovel = Config.get("Blessed Diamond Shovel", "ItemID", BaseID+49).getInt(BaseID+49);
+        BlessedGoldShovel = Config.get("Blessed Gold Shovel", "ItemID", BaseID+50).getInt(BaseID+50);
+        BlessedIronShovel = Config.get("Blessed Iron Shovel", "ItemID", BaseID+51).getInt(BaseID+51);
+        BlessedStoneShovel = Config.get("Blessed Stone Shovel", "ItemID", BaseID+52).getInt(BaseID+52);
+        BlessedWoodShovel = Config.get("Blessed Wood Shovel", "ItemID", BaseID+53).getInt(BaseID+53);
+        BlessedDiamondHoe = Config.get("Blessed Diamond Hoe", "ItemID", BaseID+54).getInt(BaseID+54);
+        BlessedGoldHoe = Config.get("Blessed Gold Hoe", "ItemID", BaseID+55).getInt(BaseID+55);
+        BlessedIronHoe = Config.get("Blessed Iron Hoe", "ItemID", BaseID+56).getInt(BaseID+56);
+        BlessedStoneHoe = Config.get("Blessed Stone Hoe", "ItemID", BaseID+57).getInt(BaseID+57);
+        BlessedWoodHoe = Config.get("Blessed Wood Hoe", "ItemID", BaseID+58).getInt(BaseID+58);
+
+        EnderSword = Config.get("Ender Sword", "ItemID", BaseID+59).getInt(BaseID+59);
+        if (Config.hasChanged()) {
+        Config.save();
         }
         content = new Divine_Content();
         achivements = new Divine_Achievements();
diff --git a/src/divine_equipment/items/BlankSigil.java b/src/divine_equipment/items/BlankSigil.java
deleted file mode 100644
index 9dc7e03..0000000
--- a/src/divine_equipment/items/BlankSigil.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package items;
-
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.Item;
-
-/**
- * User: Orthus
- * Date: 10/4/13
- */
-public class BlankSigil extends Item {
-    public BlankSigil(int id){
-        super(id);
-        setCreativeTab(CreativeTabs.tabMaterials);
-    }
-}
diff --git a/src/divine_equipment/items/HiddenSigil.java b/src/divine_equipment/items/HiddenSigil.java
deleted file mode 100644
index ceee595..0000000
--- a/src/divine_equipment/items/HiddenSigil.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package items;
-
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.Item;
-
-/**
- * User: Orthus
- * Date: 10/7/13
- */
-public class HiddenSigil extends Item {
-    public HiddenSigil(int id){
-        super(id);
-        setCreativeTab(CreativeTabs.tabMaterials);
-    }
-}
diff --git a/src/divine_equipment/items/Sigil.java b/src/divine_equipment/items/Sigil.java
new file mode 100644
index 0000000..3c56ce8
--- /dev/null
+++ b/src/divine_equipment/items/Sigil.java
@@ -0,0 +1,22 @@
+package items;
+
+import divine_equipment.Divine_Equipment;
+import net.minecraft.item.Item;
+import net.minecraft.creativetab.CreativeTabs;
+/**
+ * User: Orthus
+ * Date: 11/25/13
+ */
+public class Sigil extends Item
+{
+    public Sigil(int fID, String fName, String fTexture)
+    {
+        super(fID);
+
+        setMaxStackSize(1);
+        setCreativeTab(CreativeTabs.tabMisc);
+        setTextureName(fName);
+
+        this.setTextureName(Divine_Equipment.modid + ":" + fTexture);
+    }
+}
diff --git a/src/divine_equipment/items/base/BlessedSwordBase.java b/src/divine_equipment/items/base/BlessedSwordBase.java
deleted file mode 100644
index 910e99e..0000000
--- a/src/divine_equipment/items/base/BlessedSwordBase.java
+++ /dev/null
@@ -1,153 +0,0 @@
-package items.base;
-
-import com.google.common.collect.Multimap;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.SharedMonsterAttributes;
-import net.minecraft.entity.ai.attributes.AttributeModifier;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.EnumAction;
-import net.minecraft.item.EnumToolMaterial;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
-
-public class BlessedSwordBase extends Item
-{
-    private float weaponDamage;
-    private final EnumToolMaterial toolMaterial;
-
-    public BlessedSwordBase(int par1, EnumToolMaterial par2EnumToolMaterial)
-    {
-        super(par1);
-        this.toolMaterial = par2EnumToolMaterial;
-        this.maxStackSize = 1;
-        this.setMaxDamage(par2EnumToolMaterial.getMaxUses());
-        this.setCreativeTab(CreativeTabs.tabCombat);
-        this.weaponDamage = 4.0F + par2EnumToolMaterial.getDamageVsEntity();
-    }
-
-    public float func_82803_g()
-    {
-        return this.toolMaterial.getDamageVsEntity();
-    }
-
-    /**
-     * Returns the strength of the stack against a given block. 1.0F base, (Quality+1)*2 if correct blocktype, 1.5F if
-     * sword
-     */
-    public float getStrVsBlock(ItemStack par1ItemStack, Block par2Block)
-    {
-        if (par2Block.blockID == Block.web.blockID)
-        {
-            return 15.0F;
-        }
-        else
-        {
-            Material material = par2Block.blockMaterial;
-            return material != Material.plants && material != Material.vine && material != Material.coral && material != Material.leaves && material != Material.pumpkin ? 1.0F : 1.5F;
-        }
-    }
-
-    /**
-     * Current implementations of this method in child classes do not use the entry argument beside ev. They just raise
-     * the damage on the stack.
-     */
-    public boolean hitEntity(ItemStack par1ItemStack, EntityLivingBase par2EntityLivingBase, EntityLivingBase par3EntityLivingBase)
-    {
-        par1ItemStack.damageItem(1, par3EntityLivingBase);
-        return true;
-    }
-
-    public boolean onBlockDestroyed(ItemStack par1ItemStack, World par2World, int par3, int par4, int par5, int par6, EntityLivingBase par7EntityLivingBase)
-    {
-        if ((double)Block.blocksList[par3].getBlockHardness(par2World, par4, par5, par6) != 0.0D)
-        {
-            par1ItemStack.damageItem(2, par7EntityLivingBase);
-        }
-
-        return true;
-    }
-
-    @SideOnly(Side.CLIENT)
-
-    /**
-     * Returns True is the item is renderer in full 3D when hold.
-     */
-    public boolean isFull3D()
-    {
-        return true;
-    }
-
-    /**
-     * returns the action that specifies what animation to play when the items is being used
-     */
-    // Right Click
-    public EnumAction getItemUseAction(ItemStack par1ItemStack)
-    {
-        return EnumAction.bow;
-    }
-
-    /**
-     * How long it takes to use or consume an item
-     */
-    public int getMaxItemUseDuration(ItemStack par1ItemStack)
-    {
-        return 72000;
-    }
-
-    /**
-     * Called whenever this item is equipped and the right mouse button is pressed. Args: itemStack, world, entityPlayer
-     */
-    public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
-    {
-        par3EntityPlayer.setItemInUse(par1ItemStack, this.getMaxItemUseDuration(par1ItemStack));
-        return par1ItemStack;
-    }
-
-    /**
-     * Returns if the item (tool) can harvest results from the block type.
-     */
-    public boolean canHarvestBlock(Block par1Block)
-    {
-        return par1Block.blockID == Block.web.blockID;
-    }
-
-    /**
-     * Return the enchantability factor of the item, most of the time is based on material.
-     */
-    public int getItemEnchantability()
-    {
-        return this.toolMaterial.getEnchantability();
-    }
-
-    /**
-     * Return the name for this tool's material.
-     */
-    public String getToolMaterialName()
-    {
-        return this.toolMaterial.toString();
-    }
-
-    /**
-     * Return whether this item is repairable in an anvil.
-     */
-    public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack)
-    {
-        return this.toolMaterial.getToolCraftingMaterial() == par2ItemStack.itemID ? true : super.getIsRepairable(par1ItemStack, par2ItemStack);
-    }
-
-    /**
-     * Gets a map of item attribute modifiers, used by ItemSword to increase hit damage.
-     */
-    public Multimap getItemAttributeModifiers()
-    {
-        Multimap multimap = super.getItemAttributeModifiers();
-        multimap.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), new AttributeModifier(field_111210_e, "Weapon modifier", (double)this.weaponDamage, 0));
-        return multimap;
-    }
-}
diff --git a/src/divine_equipment/items/blessed/BlessedGoldAxe.java b/src/divine_equipment/items/blessed/BlessedAxe.java
similarity index 70%
rename from src/divine_equipment/items/blessed/BlessedGoldAxe.java
rename to src/divine_equipment/items/blessed/BlessedAxe.java
index b1f17df..ebbe206 100644
--- a/src/divine_equipment/items/blessed/BlessedGoldAxe.java
+++ b/src/divine_equipment/items/blessed/BlessedAxe.java
@@ -8,8 +8,8 @@ import net.minecraft.item.ItemAxe;
  * User: Orthus
  * Date: 10/8/13
  */
-public class BlessedGoldAxe extends ItemAxe {
-    public BlessedGoldAxe(int par1, EnumToolMaterial par2EnumToolMaterial) {
+public class BlessedAxe extends ItemAxe {
+    public BlessedAxe(int par1, EnumToolMaterial par2EnumToolMaterial) {
         super(par1, par2EnumToolMaterial);
         setCreativeTab(CreativeTabs.tabTools);
     }
diff --git a/src/divine_equipment/items/blessed/BlessedDiamondAxe.java b/src/divine_equipment/items/blessed/BlessedDiamondAxe.java
deleted file mode 100644
index 97900ca..0000000
--- a/src/divine_equipment/items/blessed/BlessedDiamondAxe.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package items.blessed;
-
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.EnumToolMaterial;
-import net.minecraft.item.ItemAxe;
-
-/**
- * User: Orthus
- * Date: 10/8/13
- */
-public class BlessedDiamondAxe extends ItemAxe {
-    public BlessedDiamondAxe(int par1, EnumToolMaterial par2EnumToolMaterial) {
-        super(par1, par2EnumToolMaterial);
-        setCreativeTab(CreativeTabs.tabTools);
-    }
-}
diff --git a/src/divine_equipment/items/blessed/BlessedDiamondHoe.java b/src/divine_equipment/items/blessed/BlessedDiamondHoe.java
deleted file mode 100644
index 48a157a..0000000
--- a/src/divine_equipment/items/blessed/BlessedDiamondHoe.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package items.blessed;
-
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.EnumToolMaterial;
-import net.minecraft.item.ItemHoe;
-
-/**
- * User: Orthus
- * Date: 10/8/13
- */
-public class BlessedDiamondHoe extends ItemHoe {
-    public BlessedDiamondHoe(int par1, EnumToolMaterial par2EnumToolMaterial) {
-        super(par1, par2EnumToolMaterial);
-        setCreativeTab(CreativeTabs.tabTools);
-    }
-}
diff --git a/src/divine_equipment/items/blessed/BlessedDiamondPickaxe.java b/src/divine_equipment/items/blessed/BlessedDiamondPickaxe.java
deleted file mode 100644
index 98a781c..0000000
--- a/src/divine_equipment/items/blessed/BlessedDiamondPickaxe.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package items.blessed;
-
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.EnumToolMaterial;
-import net.minecraft.item.ItemPickaxe;
-
-/**
- * User: Orthus
- * Date: 9/30/13
- */
-public class BlessedDiamondPickaxe extends ItemPickaxe {
-    public BlessedDiamondPickaxe(int id, EnumToolMaterial material){
-        super(id, material);
-        setCreativeTab(CreativeTabs.tabTools);
-    }
-}
\ No newline at end of file
diff --git a/src/divine_equipment/items/blessed/BlessedDiamondShovel.java b/src/divine_equipment/items/blessed/BlessedDiamondShovel.java
deleted file mode 100644
index 77317f3..0000000
--- a/src/divine_equipment/items/blessed/BlessedDiamondShovel.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package items.blessed;
-
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.EnumToolMaterial;
-import net.minecraft.item.ItemSpade;
-
-/**
- * User: Orthus
- * Date: 10/8/13
- */
-public class BlessedDiamondShovel extends ItemSpade {
-    public BlessedDiamondShovel(int par1, EnumToolMaterial par2EnumToolMaterial) {
-        super(par1, par2EnumToolMaterial);
-        setCreativeTab(CreativeTabs.tabTools);
-    }
-}
diff --git a/src/divine_equipment/items/blessed/BlessedGold.java b/src/divine_equipment/items/blessed/BlessedGold.java
deleted file mode 100644
index f800199..0000000
--- a/src/divine_equipment/items/blessed/BlessedGold.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package items.blessed;
-
-/**
- * User: Orthus
- * Date: 9/30/13
- */
-public class BlessedGold {
-}
diff --git a/src/divine_equipment/items/blessed/BlessedGoldHoe.java b/src/divine_equipment/items/blessed/BlessedGoldHoe.java
deleted file mode 100644
index 253ce14..0000000
--- a/src/divine_equipment/items/blessed/BlessedGoldHoe.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package items.blessed;
-
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.EnumToolMaterial;
-import net.minecraft.item.ItemHoe;
-
-/**
- * User: Orthus
- * Date: 10/8/13
- */
-public class BlessedGoldHoe extends ItemHoe {
-    public BlessedGoldHoe(int par1, EnumToolMaterial par2EnumToolMaterial) {
-        super(par1, par2EnumToolMaterial);
-        setCreativeTab(CreativeTabs.tabTools);
-    }
-}
diff --git a/src/divine_equipment/items/blessed/BlessedGoldPickaxe.java b/src/divine_equipment/items/blessed/BlessedGoldPickaxe.java
deleted file mode 100644
index 79a4145..0000000
--- a/src/divine_equipment/items/blessed/BlessedGoldPickaxe.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package items.blessed;
-
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.EnumToolMaterial;
-import net.minecraft.item.ItemPickaxe;
-
-/**
- * User: Orthus
- * Date: 9/30/13
- */
-public class BlessedGoldPickaxe extends ItemPickaxe {
-    public BlessedGoldPickaxe(int id, EnumToolMaterial material){
-        super(id, material);
-        setCreativeTab(CreativeTabs.tabTools);
-    }
-}
\ No newline at end of file
diff --git a/src/divine_equipment/items/blessed/BlessedGoldShovel.java b/src/divine_equipment/items/blessed/BlessedGoldShovel.java
deleted file mode 100644
index a50afcb..0000000
--- a/src/divine_equipment/items/blessed/BlessedGoldShovel.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package items.blessed;
-
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.EnumToolMaterial;
-import net.minecraft.item.ItemSpade;
-
-/**
- * User: Orthus
- * Date: 10/8/13
- */
-public class BlessedGoldShovel extends ItemSpade {
-    public BlessedGoldShovel(int par1, EnumToolMaterial par2EnumToolMaterial) {
-        super(par1, par2EnumToolMaterial);
-        setCreativeTab(CreativeTabs.tabTools);
-    }
-}
diff --git a/src/divine_equipment/items/blessed/BlessedGoldSword.java b/src/divine_equipment/items/blessed/BlessedGoldSword.java
deleted file mode 100644
index 3b3a044..0000000
--- a/src/divine_equipment/items/blessed/BlessedGoldSword.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package items.blessed;
-
-import net.minecraft.creativetab.*;
-import net.minecraft.item.EnumToolMaterial;
-import net.minecraft.item.ItemSword;
-
-/**
- * User: Orthus
- * Date: 9/30/13
- */
-public class BlessedGoldSword extends ItemSword {
-    public BlessedGoldSword(int par1, EnumToolMaterial BlessedGold){
-        super(par1, BlessedGold);
-        setCreativeTab(CreativeTabs.tabCombat);
-    }
-}
\ No newline at end of file
diff --git a/src/divine_equipment/items/blessed/BlessedIronHoe.java b/src/divine_equipment/items/blessed/BlessedHoe.java
similarity index 70%
rename from src/divine_equipment/items/blessed/BlessedIronHoe.java
rename to src/divine_equipment/items/blessed/BlessedHoe.java
index 439d8bc..ee41f91 100644
--- a/src/divine_equipment/items/blessed/BlessedIronHoe.java
+++ b/src/divine_equipment/items/blessed/BlessedHoe.java
@@ -8,8 +8,8 @@ import net.minecraft.item.ItemHoe;
  * User: Orthus
  * Date: 10/8/13
  */
-public class BlessedIronHoe extends ItemHoe {
-    public BlessedIronHoe(int par1, EnumToolMaterial par2EnumToolMaterial) {
+public class BlessedHoe extends ItemHoe {
+    public BlessedHoe(int par1, EnumToolMaterial par2EnumToolMaterial) {
         super(par1, par2EnumToolMaterial);
         setCreativeTab(CreativeTabs.tabTools);
     }
diff --git a/src/divine_equipment/items/blessed/BlessedIron.java b/src/divine_equipment/items/blessed/BlessedIron.java
deleted file mode 100644
index 37dd288..0000000
--- a/src/divine_equipment/items/blessed/BlessedIron.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package items.blessed;
-
-/**
- * User: Orthus
- * Date: 9/30/13
- */
-public class BlessedIron {
-}
diff --git a/src/divine_equipment/items/blessed/BlessedIronAxe.java b/src/divine_equipment/items/blessed/BlessedIronAxe.java
deleted file mode 100644
index fcbeabc..0000000
--- a/src/divine_equipment/items/blessed/BlessedIronAxe.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package items.blessed;
-
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.EnumToolMaterial;
-import net.minecraft.item.ItemAxe;
-
-/**
- * User: Orthus
- * Date: 10/8/13
- */
-public class BlessedIronAxe extends ItemAxe {
-    public BlessedIronAxe(int par1, EnumToolMaterial par2EnumToolMaterial) {
-        super(par1, par2EnumToolMaterial);
-        setCreativeTab(CreativeTabs.tabTools);
-    }
-}
diff --git a/src/divine_equipment/items/blessed/BlessedIronPickaxe.java b/src/divine_equipment/items/blessed/BlessedIronPickaxe.java
deleted file mode 100644
index 377cf06..0000000
--- a/src/divine_equipment/items/blessed/BlessedIronPickaxe.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package items.blessed;
-
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.EnumToolMaterial;
-import net.minecraft.item.ItemPickaxe;
-
-/**
- * User: Orthus
- * Date: 9/30/13
- */
-public class BlessedIronPickaxe extends ItemPickaxe {
-    public BlessedIronPickaxe(int id, EnumToolMaterial material){
-        super(id, material);
-        setCreativeTab(CreativeTabs.tabTools);
-    }
-}
\ No newline at end of file
diff --git a/src/divine_equipment/items/blessed/BlessedIronSword.java b/src/divine_equipment/items/blessed/BlessedIronSword.java
deleted file mode 100644
index 6c3619f..0000000
--- a/src/divine_equipment/items/blessed/BlessedIronSword.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package items.blessed;
-
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.EnumToolMaterial;
-import net.minecraft.item.ItemSword;
-
-/**
- * User: Orthus
- * Date: 9/30/13
- */
-public class BlessedIronSword extends ItemSword {
-    public BlessedIronSword(int par1, EnumToolMaterial par2){
-        super(par1, par2);
-        setCreativeTab(CreativeTabs.tabCombat);
-    }
-}
diff --git a/src/divine_equipment/items/blessed/BlessedWoodPickaxe.java b/src/divine_equipment/items/blessed/BlessedPickaxe.java
similarity index 69%
rename from src/divine_equipment/items/blessed/BlessedWoodPickaxe.java
rename to src/divine_equipment/items/blessed/BlessedPickaxe.java
index 39dc7d1..9bcee5b 100644
--- a/src/divine_equipment/items/blessed/BlessedWoodPickaxe.java
+++ b/src/divine_equipment/items/blessed/BlessedPickaxe.java
@@ -8,8 +8,8 @@ import net.minecraft.item.ItemPickaxe;
  * User: Orthus
  * Date: 9/30/13
  */
-public class BlessedWoodPickaxe extends ItemPickaxe {
-    public BlessedWoodPickaxe(int id, EnumToolMaterial material){
+public class BlessedPickaxe extends ItemPickaxe {
+    public BlessedPickaxe(int id, EnumToolMaterial material){
         super(id, material);
         setCreativeTab(CreativeTabs.tabTools);
     }
diff --git a/src/divine_equipment/items/blessed/BlessedIronShovel.java b/src/divine_equipment/items/blessed/BlessedShovel.java
similarity index 69%
rename from src/divine_equipment/items/blessed/BlessedIronShovel.java
rename to src/divine_equipment/items/blessed/BlessedShovel.java
index e0b121b..fa4cc9b 100644
--- a/src/divine_equipment/items/blessed/BlessedIronShovel.java
+++ b/src/divine_equipment/items/blessed/BlessedShovel.java
@@ -8,8 +8,8 @@ import net.minecraft.item.ItemSpade;
  * User: Orthus
  * Date: 10/8/13
  */
-public class BlessedIronShovel extends ItemSpade {
-    public BlessedIronShovel(int par1, EnumToolMaterial par2EnumToolMaterial) {
+public class BlessedShovel extends ItemSpade {
+    public BlessedShovel(int par1, EnumToolMaterial par2EnumToolMaterial) {
         super(par1, par2EnumToolMaterial);
         setCreativeTab(CreativeTabs.tabTools);
     }
diff --git a/src/divine_equipment/items/blessed/BlessedSigil.java b/src/divine_equipment/items/blessed/BlessedSigil.java
deleted file mode 100644
index afbd94d..0000000
--- a/src/divine_equipment/items/blessed/BlessedSigil.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package items.blessed;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
-
-/**
- * User: Orthus
- * Date: 10/4/13
- */
-public class BlessedSigil extends Item {
-    public BlessedSigil(int id){
-        super(id);
-        setCreativeTab(CreativeTabs.tabMaterials);
-    }
-
-    @Override
-    public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) {
-        return super.onItemRightClick(par1ItemStack, par2World, par3EntityPlayer);    //To change body of overridden methods use File | Settings | File Templates.
-    }
-}
diff --git a/src/divine_equipment/items/blessed/BlessedStone.java b/src/divine_equipment/items/blessed/BlessedStone.java
deleted file mode 100644
index 03063e1..0000000
--- a/src/divine_equipment/items/blessed/BlessedStone.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package items.blessed;
-
-/**
- * User: Orthus
- * Date: 10/3/13
- */
-public class BlessedStone {
-}
diff --git a/src/divine_equipment/items/blessed/BlessedStoneAxe.java b/src/divine_equipment/items/blessed/BlessedStoneAxe.java
deleted file mode 100644
index 3cd7434..0000000
--- a/src/divine_equipment/items/blessed/BlessedStoneAxe.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package items.blessed;
-
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.EnumToolMaterial;
-import net.minecraft.item.ItemAxe;
-
-/**
- * User: Orthus
- * Date: 10/8/13
- */
-public class BlessedStoneAxe extends ItemAxe {
-    public BlessedStoneAxe(int par1, EnumToolMaterial par2EnumToolMaterial) {
-        super(par1, par2EnumToolMaterial);
-        setCreativeTab(CreativeTabs.tabTools);
-    }
-}
diff --git a/src/divine_equipment/items/blessed/BlessedStoneHoe.java b/src/divine_equipment/items/blessed/BlessedStoneHoe.java
deleted file mode 100644
index 3698ef2..0000000
--- a/src/divine_equipment/items/blessed/BlessedStoneHoe.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package items.blessed;
-
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.EnumToolMaterial;
-import net.minecraft.item.ItemHoe;
-
-/**
- * User: Orthus
- * Date: 10/8/13
- */
-public class BlessedStoneHoe extends ItemHoe {
-    public BlessedStoneHoe(int par1, EnumToolMaterial par2EnumToolMaterial) {
-        super(par1, par2EnumToolMaterial);
-        setCreativeTab(CreativeTabs.tabTools);
-    }
-}
diff --git a/src/divine_equipment/items/blessed/BlessedStonePickaxe.java b/src/divine_equipment/items/blessed/BlessedStonePickaxe.java
deleted file mode 100644
index f3b0785..0000000
--- a/src/divine_equipment/items/blessed/BlessedStonePickaxe.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package items.blessed;
-
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.EnumToolMaterial;
-import net.minecraft.item.ItemPickaxe;
-
-/**
- * User: Orthus
- * Date: 9/30/13
- */
-public class BlessedStonePickaxe extends ItemPickaxe {
-    public BlessedStonePickaxe(int id, EnumToolMaterial material){
-        super(id, material);
-        setCreativeTab(CreativeTabs.tabTools);
-    }
-}
\ No newline at end of file
diff --git a/src/divine_equipment/items/blessed/BlessedStoneShovel.java b/src/divine_equipment/items/blessed/BlessedStoneShovel.java
deleted file mode 100644
index 6eaae00..0000000
--- a/src/divine_equipment/items/blessed/BlessedStoneShovel.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package items.blessed;
-
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.EnumToolMaterial;
-import net.minecraft.item.ItemSpade;
-
-/**
- * User: Orthus
- * Date: 10/8/13
- */
-public class BlessedStoneShovel extends ItemSpade {
-    public BlessedStoneShovel(int par1, EnumToolMaterial par2EnumToolMaterial) {
-        super(par1, par2EnumToolMaterial);
-        setCreativeTab(CreativeTabs.tabTools);
-    }
-}
diff --git a/src/divine_equipment/items/blessed/BlessedStoneSword.java b/src/divine_equipment/items/blessed/BlessedStoneSword.java
deleted file mode 100644
index 204490f..0000000
--- a/src/divine_equipment/items/blessed/BlessedStoneSword.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package items.blessed;
-
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.EnumToolMaterial;
-import net.minecraft.item.ItemSword;
-
-/**
- * User: Orthus
- * Date: 9/29/13
- */
-public class BlessedStoneSword extends ItemSword {
-    public BlessedStoneSword(int par1, EnumToolMaterial par2){
-        super(par1, par2);
-        setCreativeTab(CreativeTabs.tabCombat);
-    }
-}
\ No newline at end of file
diff --git a/src/divine_equipment/items/blessed/BlessedDiamondSword.java b/src/divine_equipment/items/blessed/BlessedSword.java
similarity index 62%
rename from src/divine_equipment/items/blessed/BlessedDiamondSword.java
rename to src/divine_equipment/items/blessed/BlessedSword.java
index 41bed84..cfad928 100644
--- a/src/divine_equipment/items/blessed/BlessedDiamondSword.java
+++ b/src/divine_equipment/items/blessed/BlessedSword.java
@@ -1,6 +1,5 @@
 package items.blessed;
 
-import items.base.BlessedSwordBase;
 import net.minecraft.creativetab.*;
 import net.minecraft.item.EnumToolMaterial;
 import net.minecraft.item.ItemSword;
@@ -9,8 +8,8 @@ import net.minecraft.item.ItemSword;
  * User: Orthus
  * Date: 9/30/13
  */
-public class BlessedDiamondSword extends BlessedSwordBase {
-    public BlessedDiamondSword(int id, EnumToolMaterial material){
+public class BlessedSword extends ItemSword {
+    public BlessedSword(int id, EnumToolMaterial material){
         super(id, material);
         setCreativeTab(CreativeTabs.tabCombat);
     }
diff --git a/src/divine_equipment/items/blessed/BlessedWoodAxe.java b/src/divine_equipment/items/blessed/BlessedWoodAxe.java
deleted file mode 100644
index 7924896..0000000
--- a/src/divine_equipment/items/blessed/BlessedWoodAxe.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package items.blessed;
-
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.EnumToolMaterial;
-import net.minecraft.item.ItemAxe;
-
-/**
- * User: Orthus
- * Date: 10/8/13
- */
-public class BlessedWoodAxe extends ItemAxe {
-    public BlessedWoodAxe(int par1, EnumToolMaterial par2EnumToolMaterial) {
-        super(par1, par2EnumToolMaterial);
-        setCreativeTab(CreativeTabs.tabTools);
-    }
-}
diff --git a/src/divine_equipment/items/blessed/BlessedWoodHoe.java b/src/divine_equipment/items/blessed/BlessedWoodHoe.java
deleted file mode 100644
index 331d126..0000000
--- a/src/divine_equipment/items/blessed/BlessedWoodHoe.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package items.blessed;
-
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.EnumToolMaterial;
-import net.minecraft.item.ItemHoe;
-
-/**
- * User: Orthus
- * Date: 10/8/13
- */
-public class BlessedWoodHoe extends ItemHoe {
-    public BlessedWoodHoe(int par1, EnumToolMaterial par2EnumToolMaterial) {
-        super(par1, par2EnumToolMaterial);
-        setCreativeTab(CreativeTabs.tabTools);
-    }
-}
diff --git a/src/divine_equipment/items/blessed/BlessedWoodShovel.java b/src/divine_equipment/items/blessed/BlessedWoodShovel.java
deleted file mode 100644
index e4e7ade..0000000
--- a/src/divine_equipment/items/blessed/BlessedWoodShovel.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package items.blessed;
-
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.EnumToolMaterial;
-import net.minecraft.item.ItemSpade;
-
-/**
- * User: Orthus
- * Date: 10/8/13
- */
-public class BlessedWoodShovel extends ItemSpade {
-    public BlessedWoodShovel(int par1, EnumToolMaterial par2EnumToolMaterial) {
-        super(par1, par2EnumToolMaterial);
-        setCreativeTab(CreativeTabs.tabTools);
-    }
-}
diff --git a/src/divine_equipment/items/blessed/BlessedWoodSword.java b/src/divine_equipment/items/blessed/BlessedWoodSword.java
deleted file mode 100644
index 2fa76f6..0000000
--- a/src/divine_equipment/items/blessed/BlessedWoodSword.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package items.blessed;
-
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.EnumToolMaterial;
-import net.minecraft.item.ItemSword;
-
-/**
- * User: Orthus
- * Date: 9/30/13
- */
-public class BlessedWoodSword extends ItemSword {
-    public BlessedWoodSword(int id, EnumToolMaterial material){
-        super(id, material);
-        setCreativeTab(CreativeTabs.tabCombat);
-    }
-}
\ No newline at end of file
diff --git a/src/divine_equipment/items/ender/EnderSigil.java b/src/divine_equipment/items/ender/EnderSigil.java
deleted file mode 100644
index 9029edc..0000000
--- a/src/divine_equipment/items/ender/EnderSigil.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package items.ender;
-
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.Item;
-
-/**
- * User: Orthus
- * Date: 10/4/13
- */
-public class EnderSigil extends Item {
-    public EnderSigil(int id){
-        super(id);
-        setCreativeTab(CreativeTabs.tabMaterials);
-    }
-}
diff --git a/src/divine_equipment/items/tainted/TaintedAxe.java b/src/divine_equipment/items/tainted/TaintedAxe.java
new file mode 100644
index 0000000..ad7a56b
--- /dev/null
+++ b/src/divine_equipment/items/tainted/TaintedAxe.java
@@ -0,0 +1,18 @@
+package items.tainted;
+
+import divine_equipment.Divine_Equipment;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.EnumToolMaterial;
+import net.minecraft.item.ItemAxe;
+
+/**
+ * User: Orthus
+ * Date: 10/8/13
+ */
+public class TaintedAxe extends ItemAxe
+    {
+        public TaintedAxe(int par1, EnumToolMaterial par2EnumToolMaterial) {
+            super(par1, par2EnumToolMaterial);
+            setCreativeTab(CreativeTabs.tabTools);
+        }
+    }
\ No newline at end of file
diff --git a/src/divine_equipment/items/tainted/TaintedDiamondAxe.java b/src/divine_equipment/items/tainted/TaintedDiamondAxe.java
deleted file mode 100644
index 3c060ec..0000000
--- a/src/divine_equipment/items/tainted/TaintedDiamondAxe.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package items.tainted;
-
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.EnumToolMaterial;
-import net.minecraft.item.ItemAxe;
-
-/**
- * User: Orthus
- * Date: 10/8/13
- */
-public class TaintedDiamondAxe extends ItemAxe {
-    public TaintedDiamondAxe(int par1, EnumToolMaterial par2EnumToolMaterial) {
-        super(par1, par2EnumToolMaterial);
-        setCreativeTab(CreativeTabs.tabTools);
-    }
-}
diff --git a/src/divine_equipment/items/tainted/TaintedDiamondHoe.java b/src/divine_equipment/items/tainted/TaintedDiamondHoe.java
deleted file mode 100644
index 6db8e77..0000000
--- a/src/divine_equipment/items/tainted/TaintedDiamondHoe.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package items.tainted;
-
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.EnumToolMaterial;
-import net.minecraft.item.ItemHoe;
-
-/**
- * User: Orthus
- * Date: 10/8/13
- */
-public class TaintedDiamondHoe extends ItemHoe {
-    public TaintedDiamondHoe(int par1, EnumToolMaterial par2EnumToolMaterial) {
-        super(par1, par2EnumToolMaterial);
-        setCreativeTab(CreativeTabs.tabTools);
-    }
-}
diff --git a/src/divine_equipment/items/tainted/TaintedDiamondPickaxe.java b/src/divine_equipment/items/tainted/TaintedDiamondPickaxe.java
deleted file mode 100644
index 97590ff..0000000
--- a/src/divine_equipment/items/tainted/TaintedDiamondPickaxe.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package items.tainted;
-
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.EnumToolMaterial;
-import net.minecraft.item.ItemPickaxe;
-
-/**
- * User: Orthus
- * Date: 9/30/13
- */
-public class TaintedDiamondPickaxe extends ItemPickaxe {
-    public TaintedDiamondPickaxe(int id, EnumToolMaterial material){
-        super(id, material);
-        setCreativeTab(CreativeTabs.tabTools);
-    }
-}
\ No newline at end of file
diff --git a/src/divine_equipment/items/tainted/TaintedDiamondShovel.java b/src/divine_equipment/items/tainted/TaintedDiamondShovel.java
deleted file mode 100644
index 8a70acf..0000000
--- a/src/divine_equipment/items/tainted/TaintedDiamondShovel.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package items.tainted;
-
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.EnumToolMaterial;
-import net.minecraft.item.ItemSpade;
-
-/**
- * User: Orthus
- * Date: 10/8/13
- */
-public class TaintedDiamondShovel extends ItemSpade {
-    public TaintedDiamondShovel(int par1, EnumToolMaterial par2EnumToolMaterial) {
-        super(par1, par2EnumToolMaterial);
-        setCreativeTab(CreativeTabs.tabTools);
-    }
-}
diff --git a/src/divine_equipment/items/tainted/TaintedDiamondSword.java b/src/divine_equipment/items/tainted/TaintedDiamondSword.java
deleted file mode 100644
index 880369a..0000000
--- a/src/divine_equipment/items/tainted/TaintedDiamondSword.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package items.tainted;
-
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.EnumToolMaterial;
-import net.minecraft.item.ItemSword;
-
-/**
- * User: Orthus
- * Date: 9/29/13
- */
-public class TaintedDiamondSword extends ItemSword {
-    public TaintedDiamondSword(int id, EnumToolMaterial material){
-        super(id, material);
-        setCreativeTab(CreativeTabs.tabCombat);
-
-    }
-}
diff --git a/src/divine_equipment/items/tainted/TaintedGold.java b/src/divine_equipment/items/tainted/TaintedGold.java
deleted file mode 100644
index b011247..0000000
--- a/src/divine_equipment/items/tainted/TaintedGold.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package items.tainted;
-
-/**
- * User: Orthus
- * Date: 9/30/13
- */
-public class TaintedGold {
-}
diff --git a/src/divine_equipment/items/tainted/TaintedGoldAxe.java b/src/divine_equipment/items/tainted/TaintedGoldAxe.java
deleted file mode 100644
index 909cd4e..0000000
--- a/src/divine_equipment/items/tainted/TaintedGoldAxe.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package items.tainted;
-
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.EnumToolMaterial;
-import net.minecraft.item.ItemAxe;
-
-/**
- * User: Orthus
- * Date: 10/8/13
- */
-public class TaintedGoldAxe extends ItemAxe {
-    public TaintedGoldAxe(int par1, EnumToolMaterial par2EnumToolMaterial) {
-        super(par1, par2EnumToolMaterial);
-        setCreativeTab(CreativeTabs.tabTools);
-    }
-}
diff --git a/src/divine_equipment/items/tainted/TaintedGoldHoe.java b/src/divine_equipment/items/tainted/TaintedHoe.java
similarity index 70%
rename from src/divine_equipment/items/tainted/TaintedGoldHoe.java
rename to src/divine_equipment/items/tainted/TaintedHoe.java
index a518467..6d257ef 100644
--- a/src/divine_equipment/items/tainted/TaintedGoldHoe.java
+++ b/src/divine_equipment/items/tainted/TaintedHoe.java
@@ -8,8 +8,8 @@ import net.minecraft.item.ItemHoe;
  * User: Orthus
  * Date: 10/8/13
  */
-public class TaintedGoldHoe extends ItemHoe {
-    public TaintedGoldHoe(int par1, EnumToolMaterial par2EnumToolMaterial) {
+public class TaintedHoe extends ItemHoe {
+    public TaintedHoe(int par1, EnumToolMaterial par2EnumToolMaterial) {
         super(par1, par2EnumToolMaterial);
         setCreativeTab(CreativeTabs.tabTools);
     }
diff --git a/src/divine_equipment/items/tainted/TaintedIron.java b/src/divine_equipment/items/tainted/TaintedIron.java
deleted file mode 100644
index e4f5f6a..0000000
--- a/src/divine_equipment/items/tainted/TaintedIron.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package items.tainted;
-
-/**
- * User: Orthus
- * Date: 9/30/13
- */
-public class TaintedIron {
-}
diff --git a/src/divine_equipment/items/tainted/TaintedIronAxe.java b/src/divine_equipment/items/tainted/TaintedIronAxe.java
deleted file mode 100644
index 1d00741..0000000
--- a/src/divine_equipment/items/tainted/TaintedIronAxe.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package items.tainted;
-
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.EnumToolMaterial;
-import net.minecraft.item.ItemAxe;
-
-/**
- * User: Orthus
- * Date: 10/8/13
- */
-public class TaintedIronAxe extends ItemAxe {
-    public TaintedIronAxe(int par1, EnumToolMaterial par2EnumToolMaterial) {
-        super(par1, par2EnumToolMaterial);
-        setCreativeTab(CreativeTabs.tabTools);
-    }
-}
diff --git a/src/divine_equipment/items/tainted/TaintedIronHoe.java b/src/divine_equipment/items/tainted/TaintedIronHoe.java
deleted file mode 100644
index 8acbf68..0000000
--- a/src/divine_equipment/items/tainted/TaintedIronHoe.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package items.tainted;
-
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.EnumToolMaterial;
-import net.minecraft.item.ItemHoe;
-
-/**
- * User: Orthus
- * Date: 10/8/13
- */
-public class TaintedIronHoe extends ItemHoe {
-    public TaintedIronHoe(int par1, EnumToolMaterial par2EnumToolMaterial) {
-        super(par1, par2EnumToolMaterial);
-        setCreativeTab(CreativeTabs.tabTools);
-    }
-}
diff --git a/src/divine_equipment/items/tainted/TaintedIronPickaxe.java b/src/divine_equipment/items/tainted/TaintedIronPickaxe.java
deleted file mode 100644
index d31657e..0000000
--- a/src/divine_equipment/items/tainted/TaintedIronPickaxe.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package items.tainted;
-
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.EnumToolMaterial;
-import net.minecraft.item.ItemPickaxe;
-
-/**
- * User: Orthus
- * Date: 9/30/13
- */
-public class TaintedIronPickaxe extends ItemPickaxe {
-    public TaintedIronPickaxe(int id, EnumToolMaterial material){
-        super(id, material);
-        setCreativeTab(CreativeTabs.tabTools);
-    }
-}
\ No newline at end of file
diff --git a/src/divine_equipment/items/tainted/TaintedIronShovel.java b/src/divine_equipment/items/tainted/TaintedIronShovel.java
deleted file mode 100644
index ae630b9..0000000
--- a/src/divine_equipment/items/tainted/TaintedIronShovel.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package items.tainted;
-
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.EnumToolMaterial;
-import net.minecraft.item.ItemSpade;
-
-/**
- * User: Orthus
- * Date: 10/8/13
- */
-public class TaintedIronShovel extends ItemSpade {
-    public TaintedIronShovel(int par1, EnumToolMaterial par2EnumToolMaterial) {
-        super(par1, par2EnumToolMaterial);
-        setCreativeTab(CreativeTabs.tabTools);
-    }
-}
diff --git a/src/divine_equipment/items/tainted/TaintedIronSword.java b/src/divine_equipment/items/tainted/TaintedIronSword.java
deleted file mode 100644
index 2dd89f7..0000000
--- a/src/divine_equipment/items/tainted/TaintedIronSword.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package items.tainted;
-
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.EnumToolMaterial;
-import net.minecraft.item.ItemSword;
-
-/**
- * User: Orthus
- * Date: 9/30/13
- */
-public class TaintedIronSword extends ItemSword {
-    public TaintedIronSword(int id, EnumToolMaterial material){
-        super(id, material);
-        setCreativeTab(CreativeTabs.tabCombat);
-    }
-}
\ No newline at end of file
diff --git a/src/divine_equipment/items/tainted/TaintedGoldPickaxe.java b/src/divine_equipment/items/tainted/TaintedPickaxe.java
similarity index 69%
rename from src/divine_equipment/items/tainted/TaintedGoldPickaxe.java
rename to src/divine_equipment/items/tainted/TaintedPickaxe.java
index 49779dc..7311785 100644
--- a/src/divine_equipment/items/tainted/TaintedGoldPickaxe.java
+++ b/src/divine_equipment/items/tainted/TaintedPickaxe.java
@@ -8,8 +8,8 @@ import net.minecraft.item.ItemPickaxe;
  * User: Orthus
  * Date: 9/30/13
  */
-public class TaintedGoldPickaxe extends ItemPickaxe {
-    public TaintedGoldPickaxe(int id, EnumToolMaterial material){
+public class TaintedPickaxe extends ItemPickaxe {
+    public TaintedPickaxe(int id, EnumToolMaterial material){
         super(id, material);
         setCreativeTab(CreativeTabs.tabTools);
     }
diff --git a/src/divine_equipment/items/tainted/TaintedGoldShovel.java b/src/divine_equipment/items/tainted/TaintedShovel.java
similarity index 69%
rename from src/divine_equipment/items/tainted/TaintedGoldShovel.java
rename to src/divine_equipment/items/tainted/TaintedShovel.java
index 2f68a9c..8ebfad3 100644
--- a/src/divine_equipment/items/tainted/TaintedGoldShovel.java
+++ b/src/divine_equipment/items/tainted/TaintedShovel.java
@@ -8,8 +8,8 @@ import net.minecraft.item.ItemSpade;
  * User: Orthus
  * Date: 10/8/13
  */
-public class TaintedGoldShovel extends ItemSpade {
-    public TaintedGoldShovel(int par1, EnumToolMaterial par2EnumToolMaterial) {
+public class TaintedShovel extends ItemSpade {
+    public TaintedShovel(int par1, EnumToolMaterial par2EnumToolMaterial) {
         super(par1, par2EnumToolMaterial);
         setCreativeTab(CreativeTabs.tabTools);
     }
diff --git a/src/divine_equipment/items/tainted/TaintedSigil.java b/src/divine_equipment/items/tainted/TaintedSigil.java
deleted file mode 100644
index 1094e57..0000000
--- a/src/divine_equipment/items/tainted/TaintedSigil.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package items.tainted;
-
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.Item;
-
-/**
- * User: Orthus
- * Date: 10/4/13
- */
-public class TaintedSigil extends Item {
-    public TaintedSigil(int id){
-        super(id);
-        setCreativeTab(CreativeTabs.tabMaterials);
-    }
-}
diff --git a/src/divine_equipment/items/tainted/TaintedStone.java b/src/divine_equipment/items/tainted/TaintedStone.java
deleted file mode 100644
index 54918bb..0000000
--- a/src/divine_equipment/items/tainted/TaintedStone.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package items.tainted;
-
-/**
- * User: Orthus
- * Date: 9/30/13
- */
-public class TaintedStone {
-}
diff --git a/src/divine_equipment/items/tainted/TaintedStoneAxe.java b/src/divine_equipment/items/tainted/TaintedStoneAxe.java
deleted file mode 100644
index 1a37b25..0000000
--- a/src/divine_equipment/items/tainted/TaintedStoneAxe.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package items.tainted;
-
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.EnumToolMaterial;
-import net.minecraft.item.ItemAxe;
-
-/**
- * User: Orthus
- * Date: 10/8/13
- */
-public class TaintedStoneAxe extends ItemAxe {
-    public TaintedStoneAxe(int par1, EnumToolMaterial par2EnumToolMaterial) {
-        super(par1, par2EnumToolMaterial);
-        setCreativeTab(CreativeTabs.tabTools);
-    }
-}
diff --git a/src/divine_equipment/items/tainted/TaintedStoneHoe.java b/src/divine_equipment/items/tainted/TaintedStoneHoe.java
deleted file mode 100644
index 06e1cd5..0000000
--- a/src/divine_equipment/items/tainted/TaintedStoneHoe.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package items.tainted;
-
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.EnumToolMaterial;
-import net.minecraft.item.ItemHoe;
-
-/**
- * User: Orthus
- * Date: 10/8/13
- */
-public class TaintedStoneHoe extends ItemHoe {
-    public TaintedStoneHoe(int par1, EnumToolMaterial par2EnumToolMaterial) {
-        super(par1, par2EnumToolMaterial);
-        setCreativeTab(CreativeTabs.tabTools);
-    }
-}
diff --git a/src/divine_equipment/items/tainted/TaintedStonePickaxe.java b/src/divine_equipment/items/tainted/TaintedStonePickaxe.java
deleted file mode 100644
index 59e45fe..0000000
--- a/src/divine_equipment/items/tainted/TaintedStonePickaxe.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package items.tainted;
-
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.EnumToolMaterial;
-import net.minecraft.item.ItemPickaxe;
-
-/**
- * User: Orthus
- * Date: 9/30/13
- */
-public class TaintedStonePickaxe extends ItemPickaxe {
-    public TaintedStonePickaxe(int id, EnumToolMaterial material){
-        super(id, material);
-        setCreativeTab(CreativeTabs.tabTools);
-    }
-}
\ No newline at end of file
diff --git a/src/divine_equipment/items/tainted/TaintedStoneShovel.java b/src/divine_equipment/items/tainted/TaintedStoneShovel.java
deleted file mode 100644
index 3a7f0e8..0000000
--- a/src/divine_equipment/items/tainted/TaintedStoneShovel.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package items.tainted;
-
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.EnumToolMaterial;
-import net.minecraft.item.ItemSpade;
-
-/**
- * User: Orthus
- * Date: 10/8/13
- */
-public class TaintedStoneShovel extends ItemSpade {
-    public TaintedStoneShovel(int par1, EnumToolMaterial par2EnumToolMaterial) {
-        super(par1, par2EnumToolMaterial);
-        setCreativeTab(CreativeTabs.tabTools);
-    }
-}
diff --git a/src/divine_equipment/items/tainted/TaintedStoneSword.java b/src/divine_equipment/items/tainted/TaintedStoneSword.java
deleted file mode 100644
index 3771b9f..0000000
--- a/src/divine_equipment/items/tainted/TaintedStoneSword.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package items.tainted;
-
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.EnumToolMaterial;
-import net.minecraft.item.ItemSword;
-
-/**
- * User: Orthus
- * Date: 9/30/13
- */
-public class TaintedStoneSword extends ItemSword {
-    public TaintedStoneSword(int id, EnumToolMaterial material){
-        super(id, material);
-        setCreativeTab(CreativeTabs.tabCombat);
-    }
-}
\ No newline at end of file
diff --git a/src/divine_equipment/items/tainted/TaintedGoldSword.java b/src/divine_equipment/items/tainted/TaintedSword.java
similarity index 70%
rename from src/divine_equipment/items/tainted/TaintedGoldSword.java
rename to src/divine_equipment/items/tainted/TaintedSword.java
index 2dc38d5..61c5365 100644
--- a/src/divine_equipment/items/tainted/TaintedGoldSword.java
+++ b/src/divine_equipment/items/tainted/TaintedSword.java
@@ -8,9 +8,10 @@ import net.minecraft.item.ItemSword;
  * User: Orthus
  * Date: 9/29/13
  */
-public class TaintedGoldSword extends ItemSword {
-    public TaintedGoldSword(int id, EnumToolMaterial material){
+public class TaintedSword extends ItemSword {
+    public TaintedSword(int id, EnumToolMaterial material){
         super(id, material);
         setCreativeTab(CreativeTabs.tabCombat);
+
     }
-}
\ No newline at end of file
+}
diff --git a/src/divine_equipment/items/tainted/TaintedWoodAxe.java b/src/divine_equipment/items/tainted/TaintedWoodAxe.java
deleted file mode 100644
index 375ad88..0000000
--- a/src/divine_equipment/items/tainted/TaintedWoodAxe.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package items.tainted;
-
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.EnumToolMaterial;
-import net.minecraft.item.ItemAxe;
-
-/**
- * User: Orthus
- * Date: 10/8/13
- */
-public class TaintedWoodAxe extends ItemAxe {
-    public TaintedWoodAxe(int par1, EnumToolMaterial par2EnumToolMaterial) {
-        super(par1, par2EnumToolMaterial);
-        setCreativeTab(CreativeTabs.tabTools);
-    }
-}
diff --git a/src/divine_equipment/items/tainted/TaintedWoodHoe.java b/src/divine_equipment/items/tainted/TaintedWoodHoe.java
deleted file mode 100644
index f4b244e..0000000
--- a/src/divine_equipment/items/tainted/TaintedWoodHoe.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package items.tainted;
-
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.EnumToolMaterial;
-import net.minecraft.item.ItemHoe;
-
-/**
- * User: Orthus
- * Date: 10/8/13
- */
-public class TaintedWoodHoe extends ItemHoe {
-    public TaintedWoodHoe(int par1, EnumToolMaterial par2EnumToolMaterial) {
-        super(par1, par2EnumToolMaterial);
-        setCreativeTab(CreativeTabs.tabTools);
-    }
-}
diff --git a/src/divine_equipment/items/tainted/TaintedWoodPickaxe.java b/src/divine_equipment/items/tainted/TaintedWoodPickaxe.java
deleted file mode 100644
index e897a86..0000000
--- a/src/divine_equipment/items/tainted/TaintedWoodPickaxe.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package items.tainted;
-
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.EnumToolMaterial;
-import net.minecraft.item.ItemPickaxe;
-
-/**
- * User: Orthus
- * Date: 9/30/13
- */
-public class TaintedWoodPickaxe extends ItemPickaxe {
-    public TaintedWoodPickaxe(int id, EnumToolMaterial material){
-        super(id, material);
-        setCreativeTab(CreativeTabs.tabTools);
-    }
-}
\ No newline at end of file
diff --git a/src/divine_equipment/items/tainted/TaintedWoodShovel.java b/src/divine_equipment/items/tainted/TaintedWoodShovel.java
deleted file mode 100644
index a4581b8..0000000
--- a/src/divine_equipment/items/tainted/TaintedWoodShovel.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package items.tainted;
-
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.EnumToolMaterial;
-import net.minecraft.item.ItemSpade;
-
-/**
- * User: Orthus
- * Date: 10/8/13
- */
-public class TaintedWoodShovel extends ItemSpade {
-    public TaintedWoodShovel(int par1, EnumToolMaterial par2EnumToolMaterial) {
-        super(par1, par2EnumToolMaterial);
-        setCreativeTab(CreativeTabs.tabTools);
-    }
-}
diff --git a/src/divine_equipment/items/tainted/TaintedWoodSword.java b/src/divine_equipment/items/tainted/TaintedWoodSword.java
deleted file mode 100644
index be41cc0..0000000
--- a/src/divine_equipment/items/tainted/TaintedWoodSword.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package items.tainted;
-
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.EnumToolMaterial;
-import net.minecraft.item.ItemSword;
-
-/**
- * User: Orthus
- * Date: 9/30/13
- */
-public class TaintedWoodSword extends ItemSword {
-    public TaintedWoodSword(int id, EnumToolMaterial material){
-        super(id, material);
-        setCreativeTab(CreativeTabs.tabCombat);
-    }
-}
\ No newline at end of file