diff --git a/src/main/java/electrosphere/client/ui/menu/debug/ImGuiGriddedManager.java b/src/main/java/electrosphere/client/ui/menu/debug/ImGuiGriddedManager.java
index 76c17b6e..03a73db4 100644
--- a/src/main/java/electrosphere/client/ui/menu/debug/ImGuiGriddedManager.java
+++ b/src/main/java/electrosphere/client/ui/menu/debug/ImGuiGriddedManager.java
@@ -3,8 +3,8 @@ package electrosphere.client.ui.menu.debug;
 import electrosphere.engine.Globals;
 import electrosphere.renderer.ui.imgui.ImGuiWindow;
 import electrosphere.renderer.ui.imgui.ImGuiWindow.ImGuiWindowCallback;
-import electrosphere.server.datacell.GriddedDataCellManager;
 import electrosphere.server.datacell.Realm;
+import electrosphere.server.datacell.gridded.GriddedDataCellManager;
 import imgui.ImGui;
 
 /**
diff --git a/src/main/java/electrosphere/client/ui/menu/debug/ImGuiTestGen.java b/src/main/java/electrosphere/client/ui/menu/debug/ImGuiTestGen.java
index 0c0157a8..30e52bbb 100644
--- a/src/main/java/electrosphere/client/ui/menu/debug/ImGuiTestGen.java
+++ b/src/main/java/electrosphere/client/ui/menu/debug/ImGuiTestGen.java
@@ -4,7 +4,7 @@ import electrosphere.engine.Globals;
 import electrosphere.engine.signal.Signal.SignalType;
 import electrosphere.renderer.ui.imgui.ImGuiWindow;
 import electrosphere.renderer.ui.imgui.ImGuiWindow.ImGuiWindowCallback;
-import electrosphere.server.datacell.GriddedDataCellManager;
+import electrosphere.server.datacell.gridded.GriddedDataCellManager;
 import electrosphere.server.terrain.generation.TestGenerationChunkGenerator;
 import electrosphere.server.terrain.models.TerrainModel;
 import imgui.ImGui;
diff --git a/src/main/java/electrosphere/client/ui/menu/mainmenu/MenuGeneratorsLevelEditor.java b/src/main/java/electrosphere/client/ui/menu/mainmenu/MenuGeneratorsLevelEditor.java
index d6931c55..21c97546 100644
--- a/src/main/java/electrosphere/client/ui/menu/mainmenu/MenuGeneratorsLevelEditor.java
+++ b/src/main/java/electrosphere/client/ui/menu/mainmenu/MenuGeneratorsLevelEditor.java
@@ -22,7 +22,7 @@ import electrosphere.renderer.ui.elementtypes.ContainerElement.YogaAlignment;
 import electrosphere.renderer.ui.elementtypes.ContainerElement.YogaJustification;
 import electrosphere.renderer.ui.events.NavigationEvent;
 import electrosphere.renderer.ui.events.ValueChangeEvent;
-import electrosphere.server.datacell.GriddedDataCellManager;
+import electrosphere.server.datacell.gridded.GriddedDataCellManager;
 import electrosphere.server.saves.SaveUtils;
 
 /**
diff --git a/src/main/java/electrosphere/entity/scene/SceneGenerator.java b/src/main/java/electrosphere/entity/scene/SceneGenerator.java
index 2c6cadeb..5bb40e42 100644
--- a/src/main/java/electrosphere/entity/scene/SceneGenerator.java
+++ b/src/main/java/electrosphere/entity/scene/SceneGenerator.java
@@ -1,6 +1,6 @@
 package electrosphere.entity.scene;
 
-import electrosphere.server.datacell.GriddedDataCellManager;
+import electrosphere.server.datacell.gridded.GriddedDataCellManager;
 import electrosphere.server.terrain.generation.TestGenerationChunkGenerator;
 
 /**
diff --git a/src/main/java/electrosphere/entity/scene/SceneLoader.java b/src/main/java/electrosphere/entity/scene/SceneLoader.java
index 0272a990..4286febc 100644
--- a/src/main/java/electrosphere/entity/scene/SceneLoader.java
+++ b/src/main/java/electrosphere/entity/scene/SceneLoader.java
@@ -10,8 +10,8 @@ import electrosphere.entity.types.creature.CreatureUtils;
 import electrosphere.entity.types.item.ItemUtils;
 import electrosphere.game.server.world.ServerWorldData;
 import electrosphere.server.content.ServerContentManager;
-import electrosphere.server.datacell.GriddedDataCellManager;
 import electrosphere.server.datacell.Realm;
+import electrosphere.server.datacell.gridded.GriddedDataCellManager;
 import electrosphere.server.terrain.generation.DefaultChunkGenerator;
 import electrosphere.server.terrain.manager.ServerTerrainChunk;
 import electrosphere.util.FileUtils;
diff --git a/src/main/java/electrosphere/server/datacell/RealmManager.java b/src/main/java/electrosphere/server/datacell/RealmManager.java
index 722126d1..b5a21d3e 100644
--- a/src/main/java/electrosphere/server/datacell/RealmManager.java
+++ b/src/main/java/electrosphere/server/datacell/RealmManager.java
@@ -18,6 +18,7 @@ import electrosphere.net.server.player.Player;
 import electrosphere.server.chemistry.ServerChemistryCollisionCallback;
 import electrosphere.server.collision.ServerHitboxResolutionCallback;
 import electrosphere.server.content.ServerContentManager;
+import electrosphere.server.datacell.gridded.GriddedDataCellManager;
 import electrosphere.server.fluid.simulator.FluidAcceleratedSimulator;
 
 /**
diff --git a/src/main/java/electrosphere/server/datacell/GriddedDataCellManager.java b/src/main/java/electrosphere/server/datacell/gridded/GriddedDataCellManager.java
similarity index 99%
rename from src/main/java/electrosphere/server/datacell/GriddedDataCellManager.java
rename to src/main/java/electrosphere/server/datacell/gridded/GriddedDataCellManager.java
index 861feb28..9b4bd913 100644
--- a/src/main/java/electrosphere/server/datacell/GriddedDataCellManager.java
+++ b/src/main/java/electrosphere/server/datacell/gridded/GriddedDataCellManager.java
@@ -1,4 +1,4 @@
-package electrosphere.server.datacell;
+package electrosphere.server.datacell.gridded;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -32,6 +32,8 @@ import electrosphere.net.server.player.Player;
 import electrosphere.net.server.protocol.TerrainProtocol;
 import electrosphere.server.block.manager.ServerBlockManager;
 import electrosphere.server.content.ServerContentManager;
+import electrosphere.server.datacell.Realm;
+import electrosphere.server.datacell.ServerDataCell;
 import electrosphere.server.datacell.interfaces.DataCellManager;
 import electrosphere.server.datacell.interfaces.VoxelCellManager;
 import electrosphere.server.datacell.physics.PhysicsDataCell;