cleanup, rename 2 items

client/src/main/java/client/Client.java

@@ -130,9 +130,9 @@ import common.init.SoundEvent;
 import common.init.UniverseRegistry;
 import common.inventory.InventoryPlayer;
 import common.item.Item;
-import common.item.ItemBlock;
 import common.item.ItemControl;
 import common.item.ItemStack;
+import common.item.block.ItemBlock;
 import common.log.Log;
 import common.log.LogLevel;
 import common.net.bootstrap.Bootstrap;

client/src/main/java/client/renderer/entity/RenderPotion.java

@@ -2,8 +2,8 @@ package client.renderer.entity;
 
 import common.entity.projectile.EntityPotion;
 import common.init.Items;
-import common.item.ItemPotion;
 import common.item.ItemStack;
+import common.item.tool.ItemPotion;
 
 public class RenderPotion extends RenderItemEntity<EntityPotion>
 {

client/src/main/java/client/renderer/layers/LayerArmor.java

@@ -7,8 +7,8 @@ import client.renderer.entity.RendererLivingEntity;
 import client.renderer.model.ModelArmor;
 import client.renderer.model.ModelBiped;
 import common.entity.types.EntityLiving;
-import common.item.ItemArmor;
 import common.item.ItemStack;
+import common.item.tool.ItemArmor;
 
 public class LayerArmor implements LayerRenderer<EntityLiving>
 {

client/src/main/java/client/renderer/layers/LayerHeldItem.java

@@ -9,8 +9,8 @@ import common.entity.npc.EntityNPC;
 import common.entity.types.EntityLiving;
 import common.init.Items;
 import common.item.Item;
-import common.item.ItemBlock;
 import common.item.ItemStack;
+import common.item.block.ItemBlock;
 import common.model.Transforms;
 
 public class LayerHeldItem implements LayerRenderer<EntityLiving>

client/src/main/java/client/renderer/particle/EntityFirework.java

@@ -5,7 +5,7 @@ import client.renderer.RenderBuffer;
 import client.world.WorldClient;
 import common.entity.Entity;
 import common.init.SoundEvent;
-import common.item.ItemDye;
+import common.item.material.ItemDye;
 import common.tags.TagObject;
 import java.util.List;
 import common.util.BoundingBox;

client/src/main/java/client/util/PlayerController.java

@@ -9,9 +9,9 @@ import common.entity.npc.EntityNPC;
 import common.init.BlockRegistry;
 import common.init.Blocks;
 import common.init.EntityRegistry;
-import common.item.ItemBlock;
 import common.item.ItemControl;
 import common.item.ItemStack;
+import common.item.block.ItemBlock;
 import common.packet.CPacketAction;
 import common.packet.CPacketBreak;
 import common.packet.CPacketClick;

client/src/main/java/client/world/WorldClient.java

@@ -19,8 +19,8 @@ import common.init.Blocks;
 import common.init.ItemRegistry;
 import common.init.Items;
 import common.init.SoundEvent;
-import common.item.ItemDye;
-import common.item.ItemPotion;
+import common.item.material.ItemDye;
+import common.item.tool.ItemPotion;
 import common.log.Log;
 import common.model.ParticleType;
 import common.rng.Random;