diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
index 4df63732af..ef09a416ab 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
@@ -5,7 +5,7 @@ import net.minecraft.server.EntityPlayer;
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.PlayerInventory;
-import org.bukkit.craftbukkit.CraftInventoryPlayer;
+import org.bukkit.craftbukkit.inventory.CraftInventoryPlayer;
 import org.bukkit.craftbukkit.CraftServer;
 
 public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftItemDrop.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftItemDrop.java
index adf610412c..21e279d155 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftItemDrop.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftItemDrop.java
@@ -3,7 +3,7 @@ package org.bukkit.craftbukkit.entity;
 import net.minecraft.server.EntityItem;
 import org.bukkit.entity.ItemDrop;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.craftbukkit.CraftItemStack;
+import org.bukkit.craftbukkit.inventory.CraftItemStack;
 import org.bukkit.craftbukkit.CraftServer;
 
 /**
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftStorageMinecart.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftStorageMinecart.java
index af118dbdd6..aed9d8519e 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftStorageMinecart.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftStorageMinecart.java
@@ -3,7 +3,7 @@ package org.bukkit.craftbukkit.entity;
 import net.minecraft.server.EntityMinecart;
 
 import org.bukkit.inventory.Inventory;
-import org.bukkit.craftbukkit.CraftInventory;
+import org.bukkit.craftbukkit.inventory.CraftInventory;
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.entity.StorageMinecart;
 
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftInventory.java b/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
similarity index 99%
rename from paper-server/src/main/java/org/bukkit/craftbukkit/CraftInventory.java
rename to paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
index 913e96bc42..a96b1b8317 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftInventory.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
@@ -1,4 +1,4 @@
-package org.bukkit.craftbukkit;
+package org.bukkit.craftbukkit.inventory;
 
 import java.util.HashMap;
 
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftInventoryPlayer.java b/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
similarity index 97%
rename from paper-server/src/main/java/org/bukkit/craftbukkit/CraftInventoryPlayer.java
rename to paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
index 9cb55fe7a5..7140d36f15 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftInventoryPlayer.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
@@ -1,4 +1,4 @@
-package org.bukkit.craftbukkit;
+package org.bukkit.craftbukkit.inventory;
 
 import net.minecraft.server.InventoryPlayer;
 
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftItemStack.java b/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
similarity index 98%
rename from paper-server/src/main/java/org/bukkit/craftbukkit/CraftItemStack.java
rename to paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
index c2b277da0c..17aa929651 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftItemStack.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
@@ -1,4 +1,4 @@
-package org.bukkit.craftbukkit;
+package org.bukkit.craftbukkit.inventory;
 
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.Material;
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftSlot.java b/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftSlot.java
similarity index 92%
rename from paper-server/src/main/java/org/bukkit/craftbukkit/CraftSlot.java
rename to paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftSlot.java
index 3cd1edb363..aaa7426ee7 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftSlot.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftSlot.java
@@ -1,4 +1,4 @@
-package org.bukkit.craftbukkit;
+package org.bukkit.craftbukkit.inventory;
 
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;