diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftMappable.java b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftMappable.java
index 8e411846bd..8a0de5e21b 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftMappable.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftMappable.java
@@ -1,5 +1,7 @@
 package org.bukkit.craftbukkit;
 
+import org.bukkit.craftbukkit.entity.CraftEntity;
+
 /**
  * Indicates that an object has a method to get its CraftBukkit-equivalent
  * CraftEntity object from its Minecraft net.minecraft.server.Entity object.
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftPoweredMinecart.java b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftPoweredMinecart.java
index 84b5707d93..313c6563b5 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftPoweredMinecart.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftPoweredMinecart.java
@@ -1,5 +1,6 @@
 package org.bukkit.craftbukkit;
 
+import org.bukkit.craftbukkit.entity.CraftMinecart;
 import net.minecraft.server.EntityMinecart;
 import org.bukkit.entity.PoweredMinecart;
 
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index b9609c8e4c..46d4eff54d 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1,5 +1,16 @@
 package org.bukkit.craftbukkit;
 
+import org.bukkit.craftbukkit.entity.CraftEntity;
+import org.bukkit.craftbukkit.entity.CraftEgg;
+import org.bukkit.craftbukkit.entity.CraftBoat;
+import org.bukkit.craftbukkit.entity.CraftLivingEntity;
+import org.bukkit.craftbukkit.entity.CraftSnowball;
+import org.bukkit.craftbukkit.entity.CraftHumanEntity;
+import org.bukkit.craftbukkit.entity.CraftPlayer;
+import org.bukkit.craftbukkit.entity.CraftArrow;
+import org.bukkit.craftbukkit.entity.CraftMinecart;
+import org.bukkit.craftbukkit.entity.CraftStorageMinecart;
+import org.bukkit.craftbukkit.entity.CraftItemDrop;
 import java.util.HashMap;
 import java.util.Map;
 
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftArrow.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
similarity index 61%
rename from paper-server/src/main/java/org/bukkit/craftbukkit/CraftArrow.java
rename to paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
index 71cb39e18e..8749a4ef9d 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftArrow.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
@@ -1,7 +1,8 @@
-package org.bukkit.craftbukkit;
+package org.bukkit.craftbukkit.entity;
 
 import org.bukkit.entity.Arrow;
 import net.minecraft.server.EntityArrow;
+import org.bukkit.craftbukkit.CraftServer;
 
 /**
  * Represents an arrow.
@@ -9,7 +10,7 @@ import net.minecraft.server.EntityArrow;
  * @author sk89q
  */
 public class CraftArrow extends CraftEntity implements Arrow {
-    CraftArrow(CraftServer server, EntityArrow entity) {
+    public CraftArrow(CraftServer server, EntityArrow entity) {
         super(server, entity);
     }
 }
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftBoat.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftBoat.java
similarity index 80%
rename from paper-server/src/main/java/org/bukkit/craftbukkit/CraftBoat.java
rename to paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftBoat.java
index 740d4c90c2..da80e33231 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftBoat.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftBoat.java
@@ -1,6 +1,7 @@
-package org.bukkit.craftbukkit;
+package org.bukkit.craftbukkit.entity;
 
 import net.minecraft.server.EntityBoat;
+import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.entity.Boat;
 
 /**
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftEgg.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEgg.java
similarity index 76%
rename from paper-server/src/main/java/org/bukkit/craftbukkit/CraftEgg.java
rename to paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEgg.java
index 5b8fe147cd..b1babc6b0a 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftEgg.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEgg.java
@@ -1,6 +1,7 @@
-package org.bukkit.craftbukkit;
+package org.bukkit.craftbukkit.entity;
 
 import net.minecraft.server.EntityEgg;
+import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.entity.Egg;
 
 /**
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftEntity.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
similarity index 96%
rename from paper-server/src/main/java/org/bukkit/craftbukkit/CraftEntity.java
rename to paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index a07cda547a..e6be1ca4bb 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftEntity.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -1,10 +1,11 @@
-package org.bukkit.craftbukkit;
+package org.bukkit.craftbukkit.entity;
 
 import net.minecraft.server.Entity;
 import net.minecraft.server.WorldServer;
 import org.bukkit.Location;
 import org.bukkit.Vector;
 import org.bukkit.World;
+import org.bukkit.craftbukkit.CraftServer;
 
 public abstract class CraftEntity implements org.bukkit.entity.Entity {
     protected final CraftServer server;
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftHumanEntity.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
similarity index 89%
rename from paper-server/src/main/java/org/bukkit/craftbukkit/CraftHumanEntity.java
rename to paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
index ad2477fcc6..d1a0afc7a6 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftHumanEntity.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
@@ -1,10 +1,12 @@
 
-package org.bukkit.craftbukkit;
+package org.bukkit.craftbukkit.entity;
 
 import net.minecraft.server.EntityPlayer;
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.ItemStack;
 import org.bukkit.PlayerInventory;
+import org.bukkit.craftbukkit.CraftInventoryPlayer;
+import org.bukkit.craftbukkit.CraftServer;
 
 public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
     private EntityPlayer entity;
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftItemDrop.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftItemDrop.java
similarity index 78%
rename from paper-server/src/main/java/org/bukkit/craftbukkit/CraftItemDrop.java
rename to paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftItemDrop.java
index af21e98505..f8a545557e 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftItemDrop.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftItemDrop.java
@@ -1,8 +1,10 @@
-package org.bukkit.craftbukkit;
+package org.bukkit.craftbukkit.entity;
 
 import net.minecraft.server.EntityItem;
 import org.bukkit.entity.ItemDrop;
 import org.bukkit.ItemStack;
+import org.bukkit.craftbukkit.CraftItemStack;
+import org.bukkit.craftbukkit.CraftServer;
 
 /**
  * Represents an item drop.
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftLivingEntity.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
similarity index 95%
rename from paper-server/src/main/java/org/bukkit/craftbukkit/CraftLivingEntity.java
rename to paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index 31012e4f12..8a3f274c84 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftLivingEntity.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -1,11 +1,13 @@
 
-package org.bukkit.craftbukkit;
+package org.bukkit.craftbukkit.entity;
 
 import net.minecraft.server.Entity;
 import net.minecraft.server.EntityArrow;
 import net.minecraft.server.EntityEgg;
 import net.minecraft.server.EntityLiving;
 import net.minecraft.server.EntitySnowball;
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.craftbukkit.CraftWorld;
 
 import org.bukkit.entity.Arrow;
 import org.bukkit.entity.Egg;
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftMinecart.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecart.java
similarity index 92%
rename from paper-server/src/main/java/org/bukkit/craftbukkit/CraftMinecart.java
rename to paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecart.java
index 86e442ae8f..cc89d70acf 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftMinecart.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecart.java
@@ -1,6 +1,8 @@
-package org.bukkit.craftbukkit;
+package org.bukkit.craftbukkit.entity;
 
 import net.minecraft.server.EntityMinecart;
+import org.bukkit.craftbukkit.CraftPoweredMinecart;
+import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.entity.Minecart;
 
 /**
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftPlayer.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
similarity index 96%
rename from paper-server/src/main/java/org/bukkit/craftbukkit/CraftPlayer.java
rename to paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index e0a1336bf9..1c03f38ab2 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftPlayer.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1,4 +1,4 @@
-package org.bukkit.craftbukkit;
+package org.bukkit.craftbukkit.entity;
 
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
@@ -6,6 +6,7 @@ import net.minecraft.server.EntityPlayer;
 import net.minecraft.server.EntityPlayerMP;
 import net.minecraft.server.Packet3Chat;
 import org.bukkit.Location;
+import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.entity.Player;
 
 public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftSnowball.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowball.java
similarity index 78%
rename from paper-server/src/main/java/org/bukkit/craftbukkit/CraftSnowball.java
rename to paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowball.java
index d0ebd11d03..220e917e26 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftSnowball.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowball.java
@@ -1,6 +1,7 @@
-package org.bukkit.craftbukkit;
+package org.bukkit.craftbukkit.entity;
 
 import net.minecraft.server.EntitySnowball;
+import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.entity.Snowball;
 
 /**
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftStorageMinecart.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftStorageMinecart.java
similarity index 80%
rename from paper-server/src/main/java/org/bukkit/craftbukkit/CraftStorageMinecart.java
rename to paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftStorageMinecart.java
index c854d8aa7c..8e9d8f4df6 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftStorageMinecart.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftStorageMinecart.java
@@ -1,8 +1,10 @@
-package org.bukkit.craftbukkit;
+package org.bukkit.craftbukkit.entity;
 
 import net.minecraft.server.EntityMinecart;
 
 import org.bukkit.Inventory;
+import org.bukkit.craftbukkit.CraftInventory;
+import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.entity.StorageMinecart;
 
 /**
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftVehicle.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftVehicle.java
similarity index 87%
rename from paper-server/src/main/java/org/bukkit/craftbukkit/CraftVehicle.java
rename to paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftVehicle.java
index e0a240160a..2a9a1fae5f 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftVehicle.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftVehicle.java
@@ -1,5 +1,7 @@
-package org.bukkit.craftbukkit;
+package org.bukkit.craftbukkit.entity;
 
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.craftbukkit.CraftWorld;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Vehicle;