diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index c2ec1b49..1621095b 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/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;
diff --git a/src/main/java/org/bukkit/Biome.java b/src/main/java/org/bukkit/block/Biome.java
similarity index 90%
rename from src/main/java/org/bukkit/Biome.java
rename to src/main/java/org/bukkit/block/Biome.java
index 265b99ce..711dea71 100644
--- a/src/main/java/org/bukkit/Biome.java
+++ b/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
diff --git a/src/main/java/org/bukkit/Block.java b/src/main/java/org/bukkit/block/Block.java
similarity index 97%
rename from src/main/java/org/bukkit/Block.java
rename to src/main/java/org/bukkit/block/Block.java
index 6a28c798..36fbbeb5 100644
--- a/src/main/java/org/bukkit/Block.java
+++ b/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;
 
 /**
diff --git a/src/main/java/org/bukkit/BlockDamageLevel.java b/src/main/java/org/bukkit/block/BlockDamageLevel.java
similarity index 90%
rename from src/main/java/org/bukkit/BlockDamageLevel.java
rename to src/main/java/org/bukkit/block/BlockDamageLevel.java
index bb8e4b23..65fb73ba 100644
--- a/src/main/java/org/bukkit/BlockDamageLevel.java
+++ b/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);
diff --git a/src/main/java/org/bukkit/BlockFace.java b/src/main/java/org/bukkit/block/BlockFace.java
similarity index 98%
rename from src/main/java/org/bukkit/BlockFace.java
rename to src/main/java/org/bukkit/block/BlockFace.java
index 7c476bca..63bc38d1 100644
--- a/src/main/java/org/bukkit/BlockFace.java
+++ b/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
diff --git a/src/main/java/org/bukkit/block/BlockState.java b/src/main/java/org/bukkit/block/BlockState.java
index 82d94f88..5f4569c8 100644
--- a/src/main/java/org/bukkit/block/BlockState.java
+++ b/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;
diff --git a/src/main/java/org/bukkit/event/block/BlockCanBuildEvent.java b/src/main/java/org/bukkit/event/block/BlockCanBuildEvent.java
index b73bbf58..68e9f7d0 100644
--- a/src/main/java/org/bukkit/event/block/BlockCanBuildEvent.java
+++ b/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;
 
 /**
diff --git a/src/main/java/org/bukkit/event/block/BlockDamageEvent.java b/src/main/java/org/bukkit/event/block/BlockDamageEvent.java
index fa4b3d23..dd63d937 100644
--- a/src/main/java/org/bukkit/event/block/BlockDamageEvent.java
+++ b/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.BlockDamageLevel;
+import org.bukkit.block.Block;
+import org.bukkit.block.BlockDamageLevel;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Cancellable;
 
diff --git a/src/main/java/org/bukkit/event/block/BlockEvent.java b/src/main/java/org/bukkit/event/block/BlockEvent.java
index 6e50caed..08a42c45 100644
--- a/src/main/java/org/bukkit/event/block/BlockEvent.java
+++ b/src/main/java/org/bukkit/event/block/BlockEvent.java
@@ -1,24 +1,24 @@
-package org.bukkit.event.block;
-
-import org.bukkit.Block;
-import org.bukkit.event.Event;
-
-/**
- * Represents a block related event
- */
-public class BlockEvent extends Event {
-    protected Block block;
-
-    public BlockEvent(final Event.Type type, final Block theBlock) {
-        super(type);
-        block = theBlock;
-    }
-
-    /**
-     * Returns the block involved in this event
-     * @return Block which block is involved in this event
-     */
-    public final Block getBlock() {
-        return block;
-    }
-}
+package org.bukkit.event.block;
+
+import org.bukkit.block.Block;
+import org.bukkit.event.Event;
+
+/**
+ * Represents a block related event
+ */
+public class BlockEvent extends Event {
+    protected Block block;
+
+    public BlockEvent(final Event.Type type, final Block theBlock) {
+        super(type);
+        block = theBlock;
+    }
+
+    /**
+     * Returns the block involved in this event
+     * @return Block which block is involved in this event
+     */
+    public final Block getBlock() {
+        return block;
+    }
+}
diff --git a/src/main/java/org/bukkit/event/block/BlockFromToEvent.java b/src/main/java/org/bukkit/event/block/BlockFromToEvent.java
index 928c842a..ab1927de 100644
--- a/src/main/java/org/bukkit/event/block/BlockFromToEvent.java
+++ b/src/main/java/org/bukkit/event/block/BlockFromToEvent.java
@@ -1,48 +1,48 @@
-package org.bukkit.event.block;
-
-import org.bukkit.Block;
-import org.bukkit.BlockFace;
-import org.bukkit.event.Cancellable;
-import org.bukkit.event.Event;
-
-/**
- * Holds information for events with a source block and a destination block
- */
-public class BlockFromToEvent extends BlockEvent implements Cancellable {
-    protected Block from;
-    protected BlockFace face;
-    protected boolean cancel;
-
-    public BlockFromToEvent(final Event.Type type, final Block block, final BlockFace face) {
-        super(type, block);
-        this.face = face;
-        this.from = block.getRelative(face.getModX(), face.getModY(), face.getModZ());
-        this.cancel = false;
-    }
-
-    /**
-     * Gets the location this player moved to
-     *
-     * @return Block the block is event originated from
-     */
-    public BlockFace getFace() {
-        return face;
-    }
-
-    /**
-     * Convenience method for getting the faced block
-     * 
-     * @return Block the faced block
-     */
-    public Block getFromBlock() {
-        return from; 
-    }
-
-    public boolean isCancelled() {
-        return cancel;
-    }
-
-    public void setCancelled(boolean cancel) {
-        this.cancel = cancel;
-    }
-}
+package org.bukkit.event.block;
+
+import org.bukkit.block.Block;
+import org.bukkit.block.BlockFace;
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.Event;
+
+/**
+ * Holds information for events with a source block and a destination block
+ */
+public class BlockFromToEvent extends BlockEvent implements Cancellable {
+    protected Block from;
+    protected BlockFace face;
+    protected boolean cancel;
+
+    public BlockFromToEvent(final Event.Type type, final Block block, final BlockFace face) {
+        super(type, block);
+        this.face = face;
+        this.from = block.getRelative(face.getModX(), face.getModY(), face.getModZ());
+        this.cancel = false;
+    }
+
+    /**
+     * Gets the location this player moved to
+     *
+     * @return Block the block is event originated from
+     */
+    public BlockFace getFace() {
+        return face;
+    }
+
+    /**
+     * Convenience method for getting the faced block
+     * 
+     * @return Block the faced block
+     */
+    public Block getFromBlock() {
+        return from; 
+    }
+
+    public boolean isCancelled() {
+        return cancel;
+    }
+
+    public void setCancelled(boolean cancel) {
+        this.cancel = cancel;
+    }
+}
diff --git a/src/main/java/org/bukkit/event/block/BlockIgniteEvent.java b/src/main/java/org/bukkit/event/block/BlockIgniteEvent.java
index 90a14ca6..deb66f19 100644
--- a/src/main/java/org/bukkit/event/block/BlockIgniteEvent.java
+++ b/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;
diff --git a/src/main/java/org/bukkit/event/block/BlockInteractEvent.java b/src/main/java/org/bukkit/event/block/BlockInteractEvent.java
index a3e28c26..f121b96d 100644
--- a/src/main/java/org/bukkit/event/block/BlockInteractEvent.java
+++ b/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;
diff --git a/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java b/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java
index cba0088d..d3e00f6e 100644
--- a/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java
+++ b/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;
 
diff --git a/src/main/java/org/bukkit/event/block/BlockPlaceEvent.java b/src/main/java/org/bukkit/event/block/BlockPlaceEvent.java
index 023f0615..3c9489e2 100644
--- a/src/main/java/org/bukkit/event/block/BlockPlaceEvent.java
+++ b/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;
diff --git a/src/main/java/org/bukkit/event/block/BlockRedstoneEvent.java b/src/main/java/org/bukkit/event/block/BlockRedstoneEvent.java
index b2abd482..5c9b5bf9 100644
--- a/src/main/java/org/bukkit/event/block/BlockRedstoneEvent.java
+++ b/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.BlockFace;
+import org.bukkit.block.Block;
+import org.bukkit.block.BlockFace;
 
 /**
  *
diff --git a/src/main/java/org/bukkit/event/block/BlockRightClickEvent.java b/src/main/java/org/bukkit/event/block/BlockRightClickEvent.java
index ae7c2891..32e4cd13 100644
--- a/src/main/java/org/bukkit/event/block/BlockRightClickEvent.java
+++ b/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.BlockFace;
+import org.bukkit.block.Block;
+import org.bukkit.block.BlockFace;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.entity.Player;
 
diff --git a/src/main/java/org/bukkit/event/block/LeavesDecayEvent.java b/src/main/java/org/bukkit/event/block/LeavesDecayEvent.java
index 1ee2f403..e1758e81 100644
--- a/src/main/java/org/bukkit/event/block/LeavesDecayEvent.java
+++ b/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;
 
 /**
diff --git a/src/main/java/org/bukkit/event/entity/EntityDamageByBlockEvent.java b/src/main/java/org/bukkit/event/entity/EntityDamageByBlockEvent.java
index dfdd2c77..93c8115c 100644
--- a/src/main/java/org/bukkit/event/entity/EntityDamageByBlockEvent.java
+++ b/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;
diff --git a/src/main/java/org/bukkit/event/player/PlayerItemEvent.java b/src/main/java/org/bukkit/event/player/PlayerItemEvent.java
index ab53067a..fa68ceaf 100644
--- a/src/main/java/org/bukkit/event/player/PlayerItemEvent.java
+++ b/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.BlockFace;
+import org.bukkit.block.Block;
+import org.bukkit.block.BlockFace;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
diff --git a/src/main/java/org/bukkit/event/vehicle/VehicleBlockCollisionEvent.java b/src/main/java/org/bukkit/event/vehicle/VehicleBlockCollisionEvent.java
index a16fe0b0..3c9dcab2 100644
--- a/src/main/java/org/bukkit/event/vehicle/VehicleBlockCollisionEvent.java
+++ b/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;
 
 /**
diff --git a/src/main/java/org/bukkit/material/Attachable.java b/src/main/java/org/bukkit/material/Attachable.java
index 241aca8a..cab9be91 100644
--- a/src/main/java/org/bukkit/material/Attachable.java
+++ b/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
diff --git a/src/main/java/org/bukkit/material/Button.java b/src/main/java/org/bukkit/material/Button.java
index 75b4d3da..c6d1aede 100644
--- a/src/main/java/org/bukkit/material/Button.java
+++ b/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;
 
 /**
diff --git a/src/main/java/org/bukkit/material/Ladder.java b/src/main/java/org/bukkit/material/Ladder.java
index 313580d2..a5d5c208 100644
--- a/src/main/java/org/bukkit/material/Ladder.java
+++ b/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;
 
 /**
diff --git a/src/main/java/org/bukkit/material/Lever.java b/src/main/java/org/bukkit/material/Lever.java
index 85c27496..737d16c2 100644
--- a/src/main/java/org/bukkit/material/Lever.java
+++ b/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;
 
 /**
diff --git a/src/main/java/org/bukkit/material/Sign.java b/src/main/java/org/bukkit/material/Sign.java
index 1e4cc94c..4d6f2a04 100644
--- a/src/main/java/org/bukkit/material/Sign.java
+++ b/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;
 
 /**
diff --git a/src/main/java/org/bukkit/material/Torch.java b/src/main/java/org/bukkit/material/Torch.java
index 0405d18e..cef646fc 100644
--- a/src/main/java/org/bukkit/material/Torch.java
+++ b/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;
 
 /**