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 c8af3edbbe..195ad95681 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,6 @@
 package org.bukkit.craftbukkit;
 
+import org.bukkit.craftbukkit.block.CraftBlock;
 import org.bukkit.craftbukkit.entity.CraftPoweredMinecart;
 import org.bukkit.craftbukkit.entity.CraftEntity;
 import org.bukkit.craftbukkit.entity.CraftEgg;
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftBlock.java b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
similarity index 98%
rename from paper-server/src/main/java/org/bukkit/craftbukkit/CraftBlock.java
rename to paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
index ad7d386583..4a60fb837a 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftBlock.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
@@ -1,5 +1,5 @@
 
-package org.bukkit.craftbukkit;
+package org.bukkit.craftbukkit.block;
 
 import org.bukkit.block.BlockFace;
 import org.bukkit.block.Biome;
@@ -7,6 +7,8 @@ import org.bukkit.block.Block;
 import net.minecraft.server.MobSpawnerBase;
 import org.bukkit.*;
 import org.bukkit.block.BlockState;
+import org.bukkit.craftbukkit.CraftChunk;
+import org.bukkit.craftbukkit.CraftWorld;
 import org.bukkit.craftbukkit.block.CraftBlockState;
 import org.bukkit.craftbukkit.block.CraftSign;