diff --git a/src/main/java/electrosphere/server/block/manager/BlockChunkCache.java b/src/main/java/electrosphere/client/block/BlockChunkCache.java
similarity index 98%
rename from src/main/java/electrosphere/server/block/manager/BlockChunkCache.java
rename to src/main/java/electrosphere/client/block/BlockChunkCache.java
index ba51e02b..10c1318b 100644
--- a/src/main/java/electrosphere/server/block/manager/BlockChunkCache.java
+++ b/src/main/java/electrosphere/client/block/BlockChunkCache.java
@@ -1,4 +1,4 @@
-package electrosphere.server.block.manager;
+package electrosphere.client.block;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -9,7 +9,6 @@ import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Semaphore;
 
-import electrosphere.client.block.BlockChunkData;
 import io.github.studiorailgun.HashUtils;
 
 /**
diff --git a/src/main/java/electrosphere/server/block/manager/ServerBlockChunkGenerationThread.java b/src/main/java/electrosphere/server/block/manager/ServerBlockChunkGenerationThread.java
index 589468fb..07340c1e 100644
--- a/src/main/java/electrosphere/server/block/manager/ServerBlockChunkGenerationThread.java
+++ b/src/main/java/electrosphere/server/block/manager/ServerBlockChunkGenerationThread.java
@@ -3,6 +3,7 @@ package electrosphere.server.block.manager;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 
+import electrosphere.client.block.BlockChunkCache;
 import electrosphere.client.block.BlockChunkData;
 import electrosphere.engine.Globals;
 import electrosphere.logger.LoggerInterface;
diff --git a/src/main/java/electrosphere/server/block/manager/ServerBlockManager.java b/src/main/java/electrosphere/server/block/manager/ServerBlockManager.java
index c12a1c75..33d551ee 100644
--- a/src/main/java/electrosphere/server/block/manager/ServerBlockManager.java
+++ b/src/main/java/electrosphere/server/block/manager/ServerBlockManager.java
@@ -1,5 +1,6 @@
 package electrosphere.server.block.manager;
 
+import electrosphere.client.block.BlockChunkCache;
 import electrosphere.client.block.BlockChunkData;
 import electrosphere.engine.Globals;
 import electrosphere.game.server.world.ServerWorldData;