diff --git a/paper-api/src/main/java/org/bukkit/World.java b/paper-api/src/main/java/org/bukkit/World.java
index c2d9432d15..c2ec1b4997 100644
--- a/paper-api/src/main/java/org/bukkit/World.java
+++ b/paper-api/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/paper-api/src/main/java/org/bukkit/entity/HumanEntity.java b/paper-api/src/main/java/org/bukkit/entity/HumanEntity.java
index 34ea3e8cfe..25f59c8c45 100644
--- a/paper-api/src/main/java/org/bukkit/entity/HumanEntity.java
+++ b/paper-api/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/paper-api/src/main/java/org/bukkit/entity/ItemDrop.java b/paper-api/src/main/java/org/bukkit/entity/ItemDrop.java
index 0ab8ab0ad2..b43159ee8a 100644
--- a/paper-api/src/main/java/org/bukkit/entity/ItemDrop.java
+++ b/paper-api/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/paper-api/src/main/java/org/bukkit/entity/StorageMinecart.java b/paper-api/src/main/java/org/bukkit/entity/StorageMinecart.java
index 6b0f2e32ee..81b588ff9d 100644
--- a/paper-api/src/main/java/org/bukkit/entity/StorageMinecart.java
+++ b/paper-api/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/paper-api/src/main/java/org/bukkit/event/block/BlockPlaceEvent.java b/paper-api/src/main/java/org/bukkit/event/block/BlockPlaceEvent.java
index 4074b338d4..023f06150e 100644
--- a/paper-api/src/main/java/org/bukkit/event/block/BlockPlaceEvent.java
+++ b/paper-api/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/paper-api/src/main/java/org/bukkit/event/block/BlockRightClickEvent.java b/paper-api/src/main/java/org/bukkit/event/block/BlockRightClickEvent.java
index d0df4c1b57..ae7c289152 100644
--- a/paper-api/src/main/java/org/bukkit/event/block/BlockRightClickEvent.java
+++ b/paper-api/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/paper-api/src/main/java/org/bukkit/event/player/PlayerItemEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerItemEvent.java
index af7279726c..ab53067a7c 100644
--- a/paper-api/src/main/java/org/bukkit/event/player/PlayerItemEvent.java
+++ b/paper-api/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/paper-api/src/main/java/org/bukkit/Inventory.java b/paper-api/src/main/java/org/bukkit/inventory/Inventory.java
similarity index 98%
rename from paper-api/src/main/java/org/bukkit/Inventory.java
rename to paper-api/src/main/java/org/bukkit/inventory/Inventory.java
index 6a51c6d2be..149f8185d0 100644
--- a/paper-api/src/main/java/org/bukkit/Inventory.java
+++ b/paper-api/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/paper-api/src/main/java/org/bukkit/ItemStack.java b/paper-api/src/main/java/org/bukkit/inventory/ItemStack.java
similarity index 95%
rename from paper-api/src/main/java/org/bukkit/ItemStack.java
rename to paper-api/src/main/java/org/bukkit/inventory/ItemStack.java
index 8e4e04cbdf..3d6df5d38e 100644
--- a/paper-api/src/main/java/org/bukkit/ItemStack.java
+++ b/paper-api/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/paper-api/src/main/java/org/bukkit/PlayerInventory.java b/paper-api/src/main/java/org/bukkit/inventory/PlayerInventory.java
similarity index 94%
rename from paper-api/src/main/java/org/bukkit/PlayerInventory.java
rename to paper-api/src/main/java/org/bukkit/inventory/PlayerInventory.java
index 9dfffc6d68..13bff85142 100644
--- a/paper-api/src/main/java/org/bukkit/PlayerInventory.java
+++ b/paper-api/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/paper-api/src/main/java/org/bukkit/Slot.java b/paper-api/src/main/java/org/bukkit/inventory/Slot.java
similarity index 93%
rename from paper-api/src/main/java/org/bukkit/Slot.java
rename to paper-api/src/main/java/org/bukkit/inventory/Slot.java
index 008c464fcc..ff6121cc6d 100644
--- a/paper-api/src/main/java/org/bukkit/Slot.java
+++ b/paper-api/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/paper-api/src/main/java/org/bukkit/material/MaterialData.java b/paper-api/src/main/java/org/bukkit/material/MaterialData.java
index e5a5b0855a..4ccea6093e 100644
--- a/paper-api/src/main/java/org/bukkit/material/MaterialData.java
+++ b/paper-api/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;
 
 /**