Package sorting around the place.

src/main/java/vazkii/botania/client/render/tile/RenderTileEnchanter.java

@@ -27,7 +27,7 @@ import org.lwjgl.opengl.GL11;
 
 import vazkii.botania.client.core.handler.ClientTickHandler;
 import vazkii.botania.client.core.helper.ShaderHelper;
-import vazkii.botania.common.block.BlockEnchanter;
+import vazkii.botania.common.block.mana.BlockEnchanter;
 import vazkii.botania.common.block.tile.TileEnchanter;
 
 public class RenderTileEnchanter extends TileEntitySpecialRenderer {

src/main/java/vazkii/botania/client/render/tile/RenderTileTerraPlate.java

@@ -26,8 +26,8 @@ import org.lwjgl.opengl.GL11;
 
 import vazkii.botania.client.core.handler.ClientTickHandler;
 import vazkii.botania.client.core.helper.ShaderHelper;
-import vazkii.botania.common.block.BlockEnchanter;
-import vazkii.botania.common.block.BlockTerraPlate;
+import vazkii.botania.common.block.mana.BlockEnchanter;
+import vazkii.botania.common.block.mana.BlockTerraPlate;
 import vazkii.botania.common.block.tile.TileTerraPlate;
 
 public class RenderTileTerraPlate extends TileEntitySpecialRenderer {

src/main/java/vazkii/botania/common/block/BlockAltar.java

@@ -34,8 +34,8 @@ import vazkii.botania.api.mana.ManaItemHandler;
 import vazkii.botania.client.lib.LibRenderIDs;
 import vazkii.botania.common.block.tile.TileAltar;
 import vazkii.botania.common.block.tile.TileSimpleInventory;
-import vazkii.botania.common.item.ItemWaterRod;
 import vazkii.botania.common.item.ModItems;
+import vazkii.botania.common.item.rod.ItemWaterRod;
 import vazkii.botania.common.lexicon.LexiconData;
 import vazkii.botania.common.lib.LibBlockNames;
 

src/main/java/vazkii/botania/common/block/ModBlocks.java

@@ -70,6 +70,21 @@ import vazkii.botania.common.block.decor.stairs.prismarine.BlockPrismarineBrickS
 import vazkii.botania.common.block.decor.stairs.prismarine.BlockPrismarineStairs;
 import vazkii.botania.common.block.dispenser.BehaviourSeeds;
 import vazkii.botania.common.block.dispenser.BehaviourWand;
+import vazkii.botania.common.block.mana.BlockAlchemyCatalyst;
+import vazkii.botania.common.block.mana.BlockBrewery;
+import vazkii.botania.common.block.mana.BlockConjurationCatalyst;
+import vazkii.botania.common.block.mana.BlockDistributor;
+import vazkii.botania.common.block.mana.BlockEnchanter;
+import vazkii.botania.common.block.mana.BlockForestDrum;
+import vazkii.botania.common.block.mana.BlockManaDetector;
+import vazkii.botania.common.block.mana.BlockManaVoid;
+import vazkii.botania.common.block.mana.BlockPool;
+import vazkii.botania.common.block.mana.BlockRFGenerator;
+import vazkii.botania.common.block.mana.BlockRuneAltar;
+import vazkii.botania.common.block.mana.BlockSpawnerClaw;
+import vazkii.botania.common.block.mana.BlockSpreader;
+import vazkii.botania.common.block.mana.BlockTerraPlate;
+import vazkii.botania.common.block.mana.BlockTurntable;
 import vazkii.botania.common.block.string.BlockRedStringComparator;
 import vazkii.botania.common.block.string.BlockRedStringContainer;
 import vazkii.botania.common.block.string.BlockRedStringDispenser;

src/main/java/vazkii/botania/common/block/mana/BlockAlchemyCatalyst.java

@@ -9,7 +9,7 @@
  * 
  * File Created @ [May 2, 2014, 7:18:49 PM (GMT)]
  */
-package vazkii.botania.common.block;
+package vazkii.botania.common.block.mana;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
@@ -22,6 +22,7 @@ import vazkii.botania.api.lexicon.ILexiconable;
 import vazkii.botania.api.lexicon.LexiconEntry;
 import vazkii.botania.api.mana.IPoolOverlayProvider;
 import vazkii.botania.client.core.helper.IconHelper;
+import vazkii.botania.common.block.BlockMod;
 import vazkii.botania.common.lexicon.LexiconData;
 import vazkii.botania.common.lib.LibBlockNames;
 

src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java

@@ -9,7 +9,7 @@
  * 
  * File Created @ [Oct 31, 2014, 4:37:29 PM (GMT)]
  */
-package vazkii.botania.common.block;
+package vazkii.botania.common.block.mana;
 
 import java.util.Random;
 
@@ -27,6 +27,7 @@ import net.minecraft.world.World;
 import vazkii.botania.api.lexicon.ILexiconable;
 import vazkii.botania.api.lexicon.LexiconEntry;
 import vazkii.botania.client.lib.LibRenderIDs;
+import vazkii.botania.common.block.BlockModContainer;
 import vazkii.botania.common.block.tile.TileBrewery;
 import vazkii.botania.common.block.tile.TileRuneAltar;
 import vazkii.botania.common.block.tile.TileSimpleInventory;
@@ -37,7 +38,7 @@ public class BlockBrewery extends BlockModContainer implements ILexiconable {
 
 	Random random;
 	
-	protected BlockBrewery() {
+	public BlockBrewery() {
 		super(Material.rock);
 		float f = 6F / 16F;
 		setBlockBounds(f, 0.05F, f, 1F - f, 0.95F, 1F - f);

src/main/java/vazkii/botania/common/block/mana/BlockConjurationCatalyst.java

@@ -9,7 +9,7 @@
  * 
  * File Created @ [Jun 20, 2014, 1:27:14 AM (GMT)]
  */
-package vazkii.botania.common.block;
+package vazkii.botania.common.block.mana;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;

src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java

@@ -9,7 +9,7 @@
  * 
  * File Created @ [Mar 3, 2014, 1:44:29 AM (GMT)]
  */
-package vazkii.botania.common.block;
+package vazkii.botania.common.block.mana;
 
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -21,6 +21,8 @@ import net.minecraft.world.World;
 import vazkii.botania.api.lexicon.ILexiconable;
 import vazkii.botania.api.lexicon.LexiconEntry;
 import vazkii.botania.client.core.helper.IconHelper;
+import vazkii.botania.common.block.BlockModContainer;
+import vazkii.botania.common.block.ModBlocks;
 import vazkii.botania.common.block.tile.mana.TileDistributor;
 import vazkii.botania.common.lexicon.LexiconData;
 import vazkii.botania.common.lib.LibBlockNames;
@@ -29,7 +31,7 @@ public class BlockDistributor extends BlockModContainer implements ILexiconable
 
 	IIcon iconSide, iconTop;
 
-	protected BlockDistributor() {
+	public BlockDistributor() {
 		super(Material.rock);
 		setHardness(2.0F);
 		setResistance(10.0F);

src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java

@@ -9,7 +9,7 @@
  * 
  * File Created @ [Mar 15, 2014, 4:08:26 PM (GMT)]
  */
-package vazkii.botania.common.block;
+package vazkii.botania.common.block.mana;
 
 import java.util.Random;
 
@@ -30,6 +30,7 @@ import vazkii.botania.api.lexicon.ILexiconable;
 import vazkii.botania.api.lexicon.LexiconEntry;
 import vazkii.botania.api.wand.IWandable;
 import vazkii.botania.client.core.helper.IconHelper;
+import vazkii.botania.common.block.BlockModContainer;
 import vazkii.botania.common.block.tile.TileEnchanter;
 import vazkii.botania.common.item.ModItems;
 import vazkii.botania.common.lexicon.LexiconData;

src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java

@@ -9,7 +9,7 @@
  * 
  * File Created @ [May 16, 2014, 7:34:37 PM (GMT)]
  */
-package vazkii.botania.common.block;
+package vazkii.botania.common.block.mana;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -35,6 +35,7 @@ import vazkii.botania.api.lexicon.ILexiconable;
 import vazkii.botania.api.lexicon.LexiconEntry;
 import vazkii.botania.api.mana.IManaTrigger;
 import vazkii.botania.client.core.helper.IconHelper;
+import vazkii.botania.common.block.BlockMod;
 import vazkii.botania.common.item.ItemGrassHorn;
 import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName;
 import vazkii.botania.common.lexicon.LexiconData;

src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java

@@ -9,7 +9,7 @@
  * 
  * File Created @ [Mar 10, 2014, 7:57:38 PM (GMT)]
  */
-package vazkii.botania.common.block;
+package vazkii.botania.common.block.mana;
 
 import java.util.List;
 
@@ -28,6 +28,7 @@ import vazkii.botania.api.internal.IManaBurst;
 import vazkii.botania.api.lexicon.ILexiconable;
 import vazkii.botania.api.lexicon.LexiconEntry;
 import vazkii.botania.client.core.helper.IconHelper;
+import vazkii.botania.common.block.BlockModContainer;
 import vazkii.botania.common.block.tile.mana.TileManaDetector;
 import vazkii.botania.common.lexicon.LexiconData;
 import vazkii.botania.common.lib.LibBlockNames;
@@ -36,7 +37,7 @@ public class BlockManaDetector extends BlockModContainer implements ILexiconable
 
 	IIcon[] icons;
 
-	protected BlockManaDetector() {
+	public BlockManaDetector() {
 		super(Material.rock);
 		setHardness(2.0F);
 		setResistance(10.0F);

src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java

@@ -9,7 +9,7 @@
  * 
  * File Created @ [Mar 5, 2014, 12:55:47 AM (GMT)]
  */
-package vazkii.botania.common.block;
+package vazkii.botania.common.block.mana;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
@@ -23,6 +23,7 @@ import vazkii.botania.api.lexicon.ILexiconable;
 import vazkii.botania.api.lexicon.LexiconEntry;
 import vazkii.botania.api.mana.IPoolOverlayProvider;
 import vazkii.botania.client.core.helper.IconHelper;
+import vazkii.botania.common.block.BlockModContainer;
 import vazkii.botania.common.block.tile.mana.TileManaVoid;
 import vazkii.botania.common.lexicon.LexiconData;
 import vazkii.botania.common.lib.LibBlockNames;
@@ -31,7 +32,7 @@ public class BlockManaVoid extends BlockModContainer implements ILexiconable, IP
 
 	IIcon overlay;
 
-	protected BlockManaVoid() {
+	public BlockManaVoid() {
 		super(Material.rock);
 		setHardness(2.0F);
 		setResistance(2000F);

src/main/java/vazkii/botania/common/block/mana/BlockPool.java

@@ -9,7 +9,7 @@
  * 
  * File Created @ [Jan 26, 2014, 12:22:58 AM (GMT)]
  */
-package vazkii.botania.common.block;
+package vazkii.botania.common.block.mana;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -33,6 +33,8 @@ import vazkii.botania.api.lexicon.LexiconEntry;
 import vazkii.botania.api.wand.IWandHUD;
 import vazkii.botania.api.wand.IWandable;
 import vazkii.botania.client.lib.LibRenderIDs;
+import vazkii.botania.common.block.BlockModContainer;
+import vazkii.botania.common.block.ModBlocks;
 import vazkii.botania.common.block.tile.mana.TilePool;
 import vazkii.botania.common.item.block.ItemBlockPool;
 import vazkii.botania.common.lexicon.LexiconData;
@@ -43,7 +45,7 @@ public class BlockPool extends BlockModContainer implements IWandHUD, IWandable,
 
 	boolean lastFragile = false;
 
-	protected BlockPool() {
+	public BlockPool() {
 		super(Material.rock);
 		setHardness(2.0F);
 		setResistance(10.0F);

src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java

@@ -9,7 +9,7 @@
  * 
  * File Created @ [Aug 29, 2014, 9:51:58 PM (GMT)]
  */
-package vazkii.botania.common.block;
+package vazkii.botania.common.block.mana;
 
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.player.EntityPlayer;
@@ -19,6 +19,7 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import vazkii.botania.api.lexicon.ILexiconable;
 import vazkii.botania.api.lexicon.LexiconEntry;
+import vazkii.botania.common.block.BlockModContainer;
 import vazkii.botania.common.block.tile.mana.TileRFGenerator;
 import vazkii.botania.common.lexicon.LexiconData;
 import vazkii.botania.common.lib.LibBlockNames;
@@ -26,7 +27,7 @@ import cpw.mods.fml.common.Optional;
 
 public class BlockRFGenerator extends BlockModContainer implements ILexiconable {
 
-	protected BlockRFGenerator() {
+	public BlockRFGenerator() {
 		super(Material.rock);
 		setHardness(2.0F);
 		setResistance(10.0F);

src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java

@@ -9,7 +9,7 @@
  * 
  * File Created @ [Feb 2, 2014, 2:10:14 PM (GMT)]
  */
-package vazkii.botania.common.block;
+package vazkii.botania.common.block.mana;
 
 import java.util.Random;
 
@@ -30,6 +30,7 @@ import vazkii.botania.api.lexicon.LexiconEntry;
 import vazkii.botania.api.wand.IWandHUD;
 import vazkii.botania.api.wand.IWandable;
 import vazkii.botania.client.core.helper.IconHelper;
+import vazkii.botania.common.block.BlockModContainer;
 import vazkii.botania.common.block.tile.TileRuneAltar;
 import vazkii.botania.common.block.tile.TileSimpleInventory;
 import vazkii.botania.common.block.tile.mana.TileSpreader;

src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java

@@ -9,7 +9,7 @@
  * 
  * File Created @ [Jul 23, 2014, 5:28:55 PM (GMT)]
  */
-package vazkii.botania.common.block;
+package vazkii.botania.common.block.mana;
 
 import java.util.List;
 
@@ -25,13 +25,14 @@ import net.minecraft.world.World;
 import vazkii.botania.api.lexicon.ILexiconable;
 import vazkii.botania.api.lexicon.LexiconEntry;
 import vazkii.botania.client.lib.LibRenderIDs;
+import vazkii.botania.common.block.BlockModContainer;
 import vazkii.botania.common.block.tile.TileSpawnerClaw;
 import vazkii.botania.common.lexicon.LexiconData;
 import vazkii.botania.common.lib.LibBlockNames;
 
 public class BlockSpawnerClaw extends BlockModContainer implements ILexiconable {
 
-	protected BlockSpawnerClaw() {
+	public BlockSpawnerClaw() {
 		super(Material.iron);
 		setHardness(3.0F);
 		setBlockName(LibBlockNames.SPAWNER_CLAW);

src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java

@@ -9,7 +9,7 @@
  * 
  * File Created @ [Jan 25, 2014, 9:38:23 PM (GMT)]
  */
-package vazkii.botania.common.block;
+package vazkii.botania.common.block.mana;
 
 import java.util.List;
 import java.util.Random;
@@ -38,6 +38,8 @@ import vazkii.botania.api.wand.IWandHUD;
 import vazkii.botania.api.wand.IWandable;
 import vazkii.botania.api.wand.IWireframeAABBProvider;
 import vazkii.botania.client.lib.LibRenderIDs;
+import vazkii.botania.common.block.BlockModContainer;
+import vazkii.botania.common.block.ModBlocks;
 import vazkii.botania.common.block.tile.TileSimpleInventory;
 import vazkii.botania.common.block.tile.mana.TileSpreader;
 import vazkii.botania.common.item.ModItems;
@@ -50,7 +52,7 @@ public class BlockSpreader extends BlockModContainer implements IWandable, IWand
 
 	Random random;
 
-	protected BlockSpreader() {
+	public BlockSpreader() {
 		super(Material.wood);
 		setHardness(2.0F);
 		setStepSound(soundTypeWood);

src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java

@@ -9,11 +9,12 @@
  * 
  * File Created @ [Nov 8, 2014, 5:25:12 PM (GMT)]
  */
-package vazkii.botania.common.block;
+package vazkii.botania.common.block.mana;
 
 import vazkii.botania.api.lexicon.ILexiconable;
 import vazkii.botania.api.lexicon.LexiconEntry;
 import vazkii.botania.client.core.helper.IconHelper;
+import vazkii.botania.common.block.BlockModContainer;
 import vazkii.botania.common.block.tile.TileTerraPlate;
 import vazkii.botania.common.lexicon.LexiconData;
 import vazkii.botania.common.lib.LibBlockNames;
@@ -30,7 +31,7 @@ public class BlockTerraPlate extends BlockModContainer implements ILexiconable {
 	public static IIcon overlay;
 	IIcon[] icons;
 	
-	protected BlockTerraPlate() {
+	public BlockTerraPlate() {
 		super(Material.iron);
 		setBlockBounds(0F, 0F, 0F, 1F, 3F / 16F, 1F);
 		setHardness(3F);

src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java

@@ -9,7 +9,7 @@
  * 
  * File Created @ [Mar 16, 2014, 10:08:14 PM (GMT)]
  */
-package vazkii.botania.common.block;
+package vazkii.botania.common.block.mana;
 
 import net.minecraft.block.material.Material;
 import net.minecraft.client.Minecraft;
@@ -25,6 +25,7 @@ import vazkii.botania.api.lexicon.LexiconEntry;
 import vazkii.botania.api.wand.IWandHUD;
 import vazkii.botania.api.wand.IWandable;
 import vazkii.botania.client.core.helper.IconHelper;
+import vazkii.botania.common.block.BlockModContainer;
 import vazkii.botania.common.block.tile.mana.TileTurntable;
 import vazkii.botania.common.lexicon.LexiconData;
 import vazkii.botania.common.lib.LibBlockNames;
@@ -33,7 +34,7 @@ public class BlockTurntable extends BlockModContainer implements IWandable, IWan
 
 	IIcon[] icons;
 
-	protected BlockTurntable() {
+	public BlockTurntable() {
 		super(Material.wood);
 		setHardness(2.0F);
 		setStepSound(soundTypeWood);

src/main/java/vazkii/botania/common/item/ModItems.java

@@ -68,6 +68,22 @@ import vazkii.botania.common.item.interaction.thaumcraft.ItemElementiumHelmRevea
 import vazkii.botania.common.item.interaction.thaumcraft.ItemManaInkwell;
 import vazkii.botania.common.item.interaction.thaumcraft.ItemManasteelHelmRevealing;
 import vazkii.botania.common.item.interaction.thaumcraft.ItemTerrasteelHelmRevealing;
+import vazkii.botania.common.item.material.ItemDye;
+import vazkii.botania.common.item.material.ItemManaPetal;
+import vazkii.botania.common.item.material.ItemManaResource;
+import vazkii.botania.common.item.material.ItemPestleAndMortar;
+import vazkii.botania.common.item.material.ItemPetal;
+import vazkii.botania.common.item.material.ItemQuartz;
+import vazkii.botania.common.item.material.ItemRune;
+import vazkii.botania.common.item.rod.ItemDirtRod;
+import vazkii.botania.common.item.rod.ItemDiviningRod;
+import vazkii.botania.common.item.rod.ItemFireRod;
+import vazkii.botania.common.item.rod.ItemGravityRod;
+import vazkii.botania.common.item.rod.ItemRainbowRod;
+import vazkii.botania.common.item.rod.ItemSkyDirtRod;
+import vazkii.botania.common.item.rod.ItemTerraformRod;
+import vazkii.botania.common.item.rod.ItemTornadoRod;
+import vazkii.botania.common.item.rod.ItemWaterRod;
 import vazkii.botania.common.lib.LibOreDict;
 
 public final class ModItems {

src/main/java/vazkii/botania/common/item/material/ItemDye.java

@@ -9,13 +9,14 @@
  * 
  * File Created @ [Jan 19, 2014, 4:10:47 PM (GMT)]
  */
-package vazkii.botania.common.item;
+package vazkii.botania.common.item.material;
 
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
+import vazkii.botania.common.item.Item16Colors;
 import vazkii.botania.common.lib.LibItemNames;
 
 public class ItemDye extends Item16Colors {

src/main/java/vazkii/botania/common/item/material/ItemManaPetal.java

@@ -9,11 +9,12 @@
  * 
  * File Created @ [Feb 2, 2014, 12:57:22 PM (GMT)]
  */
-package vazkii.botania.common.item;
+package vazkii.botania.common.item.material;
 
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
 import vazkii.botania.api.recipe.IFlowerComponent;
+import vazkii.botania.common.item.Item16Colors;
 import vazkii.botania.common.lib.LibItemNames;
 
 public class ItemManaPetal extends Item16Colors implements IFlowerComponent {

src/main/java/vazkii/botania/common/item/material/ItemManaResource.java

@@ -9,7 +9,7 @@
  * 
  * File Created @ [Jan 30, 2014, 4:49:16 PM (GMT)]
  */
-package vazkii.botania.common.item;
+package vazkii.botania.common.item.material;
 
 import java.awt.Color;
 import java.util.List;
@@ -27,6 +27,7 @@ import vazkii.botania.api.recipe.IFlowerComponent;
 import vazkii.botania.client.core.helper.IconHelper;
 import vazkii.botania.common.Botania;
 import vazkii.botania.common.entity.EntityDoppleganger;
+import vazkii.botania.common.item.ItemMod;
 import vazkii.botania.common.lib.LibItemNames;
 
 public class ItemManaResource extends ItemMod implements IFlowerComponent, IElvenItem {

src/main/java/vazkii/botania/common/item/material/ItemPestleAndMortar.java

@@ -9,9 +9,10 @@
  * 
  * File Created @ [Jan 19, 2014, 7:00:34 PM (GMT)]
  */
-package vazkii.botania.common.item;
+package vazkii.botania.common.item.material;
 
 import net.minecraft.item.ItemStack;
+import vazkii.botania.common.item.ItemMod;
 import vazkii.botania.common.lib.LibItemNames;
 
 public class ItemPestleAndMortar extends ItemMod {

src/main/java/vazkii/botania/common/item/material/ItemPetal.java

@@ -9,7 +9,7 @@
  * 
  * File Created @ [Jan 19, 2014, 3:28:21 PM (GMT)]
  */
-package vazkii.botania.common.item;
+package vazkii.botania.common.item.material;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
@@ -17,6 +17,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 import vazkii.botania.api.recipe.IFlowerComponent;
 import vazkii.botania.common.block.ModBlocks;
+import vazkii.botania.common.item.Item16Colors;
 import vazkii.botania.common.lib.LibItemNames;
 
 public class ItemPetal extends Item16Colors implements IFlowerComponent {

src/main/java/vazkii/botania/common/item/material/ItemQuartz.java

@@ -9,7 +9,7 @@
  * 
  * File Created @ [Jun 11, 2014, 2:16:47 AM (GMT)]
  */
-package vazkii.botania.common.item;
+package vazkii.botania.common.item.material;
 
 import java.util.List;
 
@@ -21,6 +21,7 @@ import net.minecraft.util.IIcon;
 import vazkii.botania.api.recipe.IElvenItem;
 import vazkii.botania.client.core.helper.IconHelper;
 import vazkii.botania.common.core.handler.ConfigHandler;
+import vazkii.botania.common.item.ItemMod;
 import vazkii.botania.common.lib.LibItemNames;
 
 public class ItemQuartz extends ItemMod implements IElvenItem {

src/main/java/vazkii/botania/common/item/material/ItemRune.java

@@ -9,7 +9,7 @@
  * 
  * File Created @ [Feb 7, 2014, 9:46:24 PM (GMT)]
  */
-package vazkii.botania.common.item;
+package vazkii.botania.common.item.material;
 
 import java.util.List;
 
@@ -21,6 +21,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 import vazkii.botania.api.recipe.IFlowerComponent;
 import vazkii.botania.client.core.helper.IconHelper;
+import vazkii.botania.common.item.ItemMod;
 import vazkii.botania.common.lib.LibItemNames;
 
 public class ItemRune extends ItemMod implements IFlowerComponent {

src/main/java/vazkii/botania/common/item/rod/ItemDirtRod.java

@@ -9,7 +9,7 @@
  * 
  * File Created @ [Apr 11, 2014, 2:53:41 PM (GMT)]
  */
-package vazkii.botania.common.item;
+package vazkii.botania.common.item.rod;
 
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
@@ -21,6 +21,7 @@ import net.minecraftforge.common.util.ForgeDirection;
 import vazkii.botania.api.mana.IManaUsingItem;
 import vazkii.botania.api.mana.ManaItemHandler;
 import vazkii.botania.common.Botania;
+import vazkii.botania.common.item.ItemMod;
 import vazkii.botania.common.lib.LibItemNames;
 
 public class ItemDirtRod extends ItemMod implements IManaUsingItem {

src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java

@@ -9,7 +9,7 @@
  * 
  * File Created @ [Aug 25, 2014, 2:57:16 PM (GMT)]
  */
-package vazkii.botania.common.item;
+package vazkii.botania.common.item.rod;
 
 import java.util.Random;
 
@@ -22,6 +22,7 @@ import net.minecraftforge.oredict.OreDictionary;
 import vazkii.botania.api.mana.IManaUsingItem;
 import vazkii.botania.api.mana.ManaItemHandler;
 import vazkii.botania.common.Botania;
+import vazkii.botania.common.item.ItemMod;
 import vazkii.botania.common.lib.LibItemNames;
 
 public class ItemDiviningRod extends ItemMod implements IManaUsingItem {

src/main/java/vazkii/botania/common/item/rod/ItemFireRod.java

@@ -9,7 +9,7 @@
  * 
  * File Created @ [Jun 26, 2014, 12:08:06 AM (GMT)]
  */
-package vazkii.botania.common.item;
+package vazkii.botania.common.item.rod;
 
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
@@ -18,6 +18,7 @@ import net.minecraft.world.World;
 import vazkii.botania.api.mana.IManaUsingItem;
 import vazkii.botania.api.mana.ManaItemHandler;
 import vazkii.botania.common.entity.EntityFlameRing;
+import vazkii.botania.common.item.ItemMod;
 import vazkii.botania.common.lib.LibItemNames;
 
 public class ItemFireRod extends ItemMod implements IManaUsingItem {

src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java

@@ -9,7 +9,7 @@
  * 
  * File Created @ [Aug 25, 2014, 2:57:16 PM (GMT)]
  */
-package vazkii.botania.common.item;
+package vazkii.botania.common.item.rod;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -29,6 +29,8 @@ import vazkii.botania.common.Botania;
 import vazkii.botania.common.core.helper.ItemNBTHelper;
 import vazkii.botania.common.core.helper.Vector3;
 import vazkii.botania.common.entity.EntityThrownItem;
+import vazkii.botania.common.item.ItemMod;
+import vazkii.botania.common.item.ModItems;
 import vazkii.botania.common.lib.LibItemNames;
 
 public class ItemGravityRod extends ItemMod implements IManaUsingItem {

src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java

@@ -9,7 +9,7 @@
  * 
  * File Created @ [Jun 20, 2014, 7:09:51 PM (GMT)]
  */
-package vazkii.botania.common.item;
+package vazkii.botania.common.item.rod;
 
 import net.minecraft.block.Block;
 import net.minecraft.entity.Entity;
@@ -22,6 +22,7 @@ import vazkii.botania.common.Botania;
 import vazkii.botania.common.block.ModBlocks;
 import vazkii.botania.common.block.tile.TileBifrost;
 import vazkii.botania.common.core.helper.Vector3;
+import vazkii.botania.common.item.ItemMod;
 import vazkii.botania.common.lib.LibItemNames;
 
 public class ItemRainbowRod extends ItemMod implements IManaUsingItem {

src/main/java/vazkii/botania/common/item/rod/ItemSkyDirtRod.java

@@ -9,7 +9,7 @@
  * 
  * File Created @ [Jul 23, 2014, 1:06:51 AM (GMT)]
  */
-package vazkii.botania.common.item;
+package vazkii.botania.common.item.rod;
 
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;

src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java

@@ -9,7 +9,7 @@
  * 
  * File Created @ [Apr 11, 2014, 2:56:39 PM (GMT)]
  */
-package vazkii.botania.common.item;
+package vazkii.botania.common.item.rod;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -28,6 +28,7 @@ import vazkii.botania.api.mana.IManaUsingItem;
 import vazkii.botania.api.mana.ManaItemHandler;
 import vazkii.botania.api.subtile.ISpecialFlower;
 import vazkii.botania.common.Botania;
+import vazkii.botania.common.item.ItemMod;
 import vazkii.botania.common.lib.LibItemNames;
 import vazkii.botania.common.lib.LibMisc;
 

src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java

@@ -9,7 +9,7 @@
  * 
  * File Created @ [Jun 25, 2014, 4:36:13 PM (GMT)]
  */
-package vazkii.botania.common.item;
+package vazkii.botania.common.item.rod;
 
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.Entity;
@@ -23,6 +23,7 @@ import vazkii.botania.api.mana.ManaItemHandler;
 import vazkii.botania.client.core.helper.IconHelper;
 import vazkii.botania.common.Botania;
 import vazkii.botania.common.core.helper.ItemNBTHelper;
+import vazkii.botania.common.item.ItemMod;
 import vazkii.botania.common.lib.LibItemNames;
 import vazkii.botania.common.lib.LibObfuscation;
 import cpw.mods.fml.relauncher.ReflectionHelper;

src/main/java/vazkii/botania/common/item/rod/ItemWaterRod.java

@@ -1,4 +1,4 @@
-package vazkii.botania.common.item;
+package vazkii.botania.common.item.rod;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
@@ -8,6 +8,7 @@ import net.minecraftforge.common.util.ForgeDirection;
 import vazkii.botania.api.mana.IManaUsingItem;
 import vazkii.botania.api.mana.ManaItemHandler;
 import vazkii.botania.common.Botania;
+import vazkii.botania.common.item.ItemMod;
 import vazkii.botania.common.lib.LibItemNames;
 
 public class ItemWaterRod extends ItemMod implements IManaUsingItem {