diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index aa646c10af..dd69de78fd 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1,5 +1,6 @@
 package org.bukkit.craftbukkit;
 
+import org.bukkit.craftbukkit.entity.CraftPoweredMinecart;
 import org.bukkit.craftbukkit.entity.CraftEntity;
 import org.bukkit.craftbukkit.entity.CraftEgg;
 import org.bukkit.craftbukkit.entity.CraftBoat;
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecart.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecart.java
index cc89d70acf..0463bfd8e9 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecart.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecart.java
@@ -1,7 +1,6 @@
 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/src/main/java/org/bukkit/craftbukkit/CraftPoweredMinecart.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPoweredMinecart.java
similarity index 83%
rename from src/main/java/org/bukkit/craftbukkit/CraftPoweredMinecart.java
rename to src/main/java/org/bukkit/craftbukkit/entity/CraftPoweredMinecart.java
index 313c6563b5..704b8b5314 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftPoweredMinecart.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPoweredMinecart.java
@@ -1,7 +1,8 @@
-package org.bukkit.craftbukkit;
+package org.bukkit.craftbukkit.entity;
 
 import org.bukkit.craftbukkit.entity.CraftMinecart;
 import net.minecraft.server.EntityMinecart;
+import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.entity.PoweredMinecart;
 
 /**