12 files changed, 15 insertions, 12 deletions
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index c2d9432d..c2ec1b49 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.inventory.ItemStack;
 import org.bukkit.entity.ItemDrop;
 import org.bukkit.entity.PoweredMinecart;
 import org.bukkit.entity.Minecart;
diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
index 34ea3e8c..25f59c8c 100644
--- a/src/main/java/org/bukkit/entity/HumanEntity.java
+++ b/src/main/java/org/bukkit/entity/HumanEntity.java
@@ -1,8 +1,8 @@
 
 package org.bukkit.entity;
 
-import org.bukkit.ItemStack;
-import org.bukkit.PlayerInventory;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.PlayerInventory;
 
 /**
  * Represents a human entity, such as an NPC or a player
diff --git a/src/main/java/org/bukkit/entity/ItemDrop.java b/src/main/java/org/bukkit/entity/ItemDrop.java
index 0ab8ab0a..b43159ee 100644
--- a/src/main/java/org/bukkit/entity/ItemDrop.java
+++ b/src/main/java/org/bukkit/entity/ItemDrop.java
@@ -1,6 +1,6 @@
 package org.bukkit.entity;
 
-import org.bukkit.ItemStack;
+import org.bukkit.inventory.ItemStack;
 
 /**
  * Represents a dropped item.
diff --git a/src/main/java/org/bukkit/entity/StorageMinecart.java b/src/main/java/org/bukkit/entity/StorageMinecart.java
index 6b0f2e32..81b588ff 100644
--- a/src/main/java/org/bukkit/entity/StorageMinecart.java
+++ b/src/main/java/org/bukkit/entity/StorageMinecart.java
@@ -1,6 +1,6 @@
 package org.bukkit.entity;
 
-import org.bukkit.Inventory;
+import org.bukkit.inventory.Inventory;
 
 /**
  * Represents a storage minecart.
diff --git a/src/main/java/org/bukkit/event/block/BlockPlaceEvent.java b/src/main/java/org/bukkit/event/block/BlockPlaceEvent.java
index 4074b338..023f0615 100644
--- a/src/main/java/org/bukkit/event/block/BlockPlaceEvent.java
+++ b/src/main/java/org/bukkit/event/block/BlockPlaceEvent.java
@@ -1,7 +1,7 @@
 package org.bukkit.event.block;
 
 import org.bukkit.Block;
-import org.bukkit.ItemStack;
+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/BlockRightClickEvent.java b/src/main/java/org/bukkit/event/block/BlockRightClickEvent.java
index d0df4c1b..ae7c2891 100644
--- a/src/main/java/org/bukkit/event/block/BlockRightClickEvent.java
+++ b/src/main/java/org/bukkit/event/block/BlockRightClickEvent.java
@@ -2,7 +2,7 @@ package org.bukkit.event.block;
 
 import org.bukkit.Block;
 import org.bukkit.BlockFace;
-import org.bukkit.ItemStack;
+import org.bukkit.inventory.ItemStack;
 import org.bukkit.entity.Player;
 
 /**
diff --git a/src/main/java/org/bukkit/event/player/PlayerItemEvent.java b/src/main/java/org/bukkit/event/player/PlayerItemEvent.java
index af727972..ab53067a 100644
--- a/src/main/java/org/bukkit/event/player/PlayerItemEvent.java
+++ b/src/main/java/org/bukkit/event/player/PlayerItemEvent.java
@@ -2,7 +2,7 @@ package org.bukkit.event.player;
 
 import org.bukkit.Block;
 import org.bukkit.BlockFace;
-import org.bukkit.ItemStack;
+import org.bukkit.inventory.ItemStack;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Cancellable;
diff --git a/src/main/java/org/bukkit/Inventory.java b/src/main/java/org/bukkit/inventory/Inventory.java
index 6a51c6d2..149f8185 100644
--- a/src/main/java/org/bukkit/Inventory.java
+++ b/src/main/java/org/bukkit/inventory/Inventory.java
@@ -1,6 +1,7 @@
-package org.bukkit;
+package org.bukkit.inventory;
 
 import java.util.HashMap;
+import org.bukkit.Material;
 
 /**
  * Interface to the various inventories
diff --git a/src/main/java/org/bukkit/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
index 8e4e04cb..3d6df5d3 100644
--- a/src/main/java/org/bukkit/ItemStack.java
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
@@ -1,6 +1,7 @@
 
-package org.bukkit;
+package org.bukkit.inventory;
 
+import org.bukkit.Material;
 import org.bukkit.material.MaterialData;
 
 /**
diff --git a/src/main/java/org/bukkit/PlayerInventory.java b/src/main/java/org/bukkit/inventory/PlayerInventory.java
index 9dfffc6d..13bff851 100644
--- a/src/main/java/org/bukkit/PlayerInventory.java
+++ b/src/main/java/org/bukkit/inventory/PlayerInventory.java
@@ -1,4 +1,4 @@
-package org.bukkit;
+package org.bukkit.inventory;
 
 /**
  * Includes interface to the 4 armor slots
diff --git a/src/main/java/org/bukkit/Slot.java b/src/main/java/org/bukkit/inventory/Slot.java
index 008c464f..ff6121cc 100644
--- a/src/main/java/org/bukkit/Slot.java
+++ b/src/main/java/org/bukkit/inventory/Slot.java
@@ -1,4 +1,4 @@
-package org.bukkit;
+package org.bukkit.inventory;
 
 /**
  * Represents a slot in an inventory
diff --git a/src/main/java/org/bukkit/material/MaterialData.java b/src/main/java/org/bukkit/material/MaterialData.java
index e5a5b085..4ccea609 100644
--- a/src/main/java/org/bukkit/material/MaterialData.java
+++ b/src/main/java/org/bukkit/material/MaterialData.java
@@ -1,7 +1,7 @@
 
 package org.bukkit.material;
 
-import org.bukkit.ItemStack;
+import org.bukkit.inventory.ItemStack;
 import org.bukkit.Material;
 
 /**