Moved block stuff from org.bukkit to org.bukkit.block

src/main/java/org/bukkit/World.java

@@ -1,6 +1,7 @@
 
 package org.bukkit;
 
+import org.bukkit.block.Block;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.entity.ItemDrop;
 import org.bukkit.entity.PoweredMinecart;

src/main/java/org/bukkit/block/Biome.java

@@ -1,5 +1,5 @@
 
-package org.bukkit;
+package org.bukkit.block;
 
 /**
  * Holds all accepted Biomes in the default server

src/main/java/org/bukkit/block/Block.java

@@ -1,5 +1,8 @@
-package org.bukkit;
+package org.bukkit.block;
 
+import org.bukkit.Chunk;
+import org.bukkit.Material;
+import org.bukkit.World;
 import org.bukkit.block.BlockState;
 
 /**

src/main/java/org/bukkit/block/BlockDamageLevel.java

@@ -1,4 +1,4 @@
-package org.bukkit;
+package org.bukkit.block;
 
 public enum BlockDamageLevel {
     STARTED(0), DIGGING(1), BROKEN(3), STOPPED(2);

src/main/java/org/bukkit/block/BlockFace.java

@@ -1,4 +1,4 @@
-package org.bukkit;
+package org.bukkit.block;
 
 /**
  * Represents the face of a block

src/main/java/org/bukkit/block/BlockState.java

@@ -1,7 +1,6 @@
 
 package org.bukkit.block;
 
-import org.bukkit.Block;
 import org.bukkit.Chunk;
 import org.bukkit.Material;
 import org.bukkit.World;

src/main/java/org/bukkit/event/block/BlockCanBuildEvent.java

@@ -3,7 +3,7 @@
  */
 package org.bukkit.event.block;
 
-import org.bukkit.Block;
+import org.bukkit.block.Block;
 import org.bukkit.Material;
 
 /**

src/main/java/org/bukkit/event/block/BlockDamageEvent.java

@@ -1,7 +1,7 @@
 package org.bukkit.event.block;
 
-import org.bukkit.Block;
+import org.bukkit.block.Block;
-import org.bukkit.BlockDamageLevel;
+import org.bukkit.block.BlockDamageLevel;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Cancellable;
 

src/main/java/org/bukkit/event/block/BlockEvent.java

@@ -1,6 +1,6 @@
 package org.bukkit.event.block;
 
-import org.bukkit.Block;
+import org.bukkit.block.Block;
 import org.bukkit.event.Event;
 
 /**

src/main/java/org/bukkit/event/block/BlockFromToEvent.java

@@ -1,7 +1,7 @@
 package org.bukkit.event.block;
 
-import org.bukkit.Block;
+import org.bukkit.block.Block;
-import org.bukkit.BlockFace;
+import org.bukkit.block.BlockFace;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
 

src/main/java/org/bukkit/event/block/BlockIgniteEvent.java

@@ -1,6 +1,6 @@
 package org.bukkit.event.block;
 
-import org.bukkit.Block;
+import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;

src/main/java/org/bukkit/event/block/BlockInteractEvent.java

@@ -1,6 +1,6 @@
 package org.bukkit.event.block;
 
-import org.bukkit.Block;
+import org.bukkit.block.Block;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Cancellable;

src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java

@@ -1,6 +1,6 @@
 package org.bukkit.event.block;
 
-import org.bukkit.Block;
+import org.bukkit.block.Block;
 import org.bukkit.Material;
 import org.bukkit.event.Event;
 

src/main/java/org/bukkit/event/block/BlockPlaceEvent.java

@@ -1,6 +1,6 @@
 package org.bukkit.event.block;
 
-import org.bukkit.Block;
+import org.bukkit.block.Block;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Cancellable;

src/main/java/org/bukkit/event/block/BlockRedstoneEvent.java

@@ -5,8 +5,8 @@
 
 package org.bukkit.event.block;
 
-import org.bukkit.Block;
+import org.bukkit.block.Block;
-import org.bukkit.BlockFace;
+import org.bukkit.block.BlockFace;
 
 /**
  *

src/main/java/org/bukkit/event/block/BlockRightClickEvent.java

@@ -1,7 +1,7 @@
 package org.bukkit.event.block;
 
-import org.bukkit.Block;
+import org.bukkit.block.Block;
-import org.bukkit.BlockFace;
+import org.bukkit.block.BlockFace;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.entity.Player;
 

src/main/java/org/bukkit/event/block/LeavesDecayEvent.java

@@ -1,7 +1,7 @@
 
 package org.bukkit.event.block;
 
-import org.bukkit.Block;
+import org.bukkit.block.Block;
 import org.bukkit.event.Cancellable;
 
 /**

src/main/java/org/bukkit/event/entity/EntityDamageByBlockEvent.java

@@ -1,6 +1,6 @@
 package org.bukkit.event.entity;
 
-import org.bukkit.Block;
+import org.bukkit.block.Block;
 import org.bukkit.entity.Entity;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;

src/main/java/org/bukkit/event/player/PlayerItemEvent.java

@@ -1,7 +1,7 @@
 package org.bukkit.event.player;
 
-import org.bukkit.Block;
+import org.bukkit.block.Block;
-import org.bukkit.BlockFace;
+import org.bukkit.block.BlockFace;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;

src/main/java/org/bukkit/event/vehicle/VehicleBlockCollisionEvent.java

@@ -1,6 +1,6 @@
 package org.bukkit.event.vehicle;
 
-import org.bukkit.Block;
+import org.bukkit.block.Block;
 import org.bukkit.entity.Vehicle;
 
 /**

src/main/java/org/bukkit/material/Attachable.java

@@ -1,7 +1,7 @@
 
 package org.bukkit.material;
 
-import org.bukkit.BlockFace;
+import org.bukkit.block.BlockFace;
 
 /**
  * Indicates that a block can be attached to another block

src/main/java/org/bukkit/material/Button.java

@@ -1,7 +1,7 @@
 
 package org.bukkit.material;
 
-import org.bukkit.BlockFace;
+import org.bukkit.block.BlockFace;
 import org.bukkit.Material;
 
 /**

src/main/java/org/bukkit/material/Ladder.java

@@ -1,7 +1,7 @@
 
 package org.bukkit.material;
 
-import org.bukkit.BlockFace;
+import org.bukkit.block.BlockFace;
 import org.bukkit.Material;
 
 /**

src/main/java/org/bukkit/material/Lever.java

@@ -1,7 +1,7 @@
 
 package org.bukkit.material;
 
-import org.bukkit.BlockFace;
+import org.bukkit.block.BlockFace;
 import org.bukkit.Material;
 
 /**

src/main/java/org/bukkit/material/Sign.java

@@ -1,7 +1,7 @@
 
 package org.bukkit.material;
 
-import org.bukkit.BlockFace;
+import org.bukkit.block.BlockFace;
 import org.bukkit.Material;
 
 /**

src/main/java/org/bukkit/material/Torch.java

@@ -1,7 +1,7 @@
 
 package org.bukkit.material;
 
-import org.bukkit.BlockFace;
+import org.bukkit.block.BlockFace;
 import org.bukkit.Material;
 
 /**