diff --git a/server/src/main/java/org/allaymc/server/world/bitarray/BitArray.java b/server/src/main/java/org/allaymc/server/datastruct/bitarray/BitArray.java
similarity index 82%
rename from server/src/main/java/org/allaymc/server/world/bitarray/BitArray.java
rename to server/src/main/java/org/allaymc/server/datastruct/bitarray/BitArray.java
index 7743406a96..546062fa1e 100644
--- a/server/src/main/java/org/allaymc/server/world/bitarray/BitArray.java
+++ b/server/src/main/java/org/allaymc/server/datastruct/bitarray/BitArray.java
@@ -1,4 +1,4 @@
-package org.allaymc.server.world.bitarray;
+package org.allaymc.server.datastruct.bitarray;
 
 /**
  * @author JukeboxMC | daoge_cmd
diff --git a/server/src/main/java/org/allaymc/server/world/bitarray/BitArrayVersion.java b/server/src/main/java/org/allaymc/server/datastruct/bitarray/BitArrayVersion.java
similarity index 97%
rename from server/src/main/java/org/allaymc/server/world/bitarray/BitArrayVersion.java
rename to server/src/main/java/org/allaymc/server/datastruct/bitarray/BitArrayVersion.java
index 8c2f1c5e47..aa1df2b83f 100644
--- a/server/src/main/java/org/allaymc/server/world/bitarray/BitArrayVersion.java
+++ b/server/src/main/java/org/allaymc/server/datastruct/bitarray/BitArrayVersion.java
@@ -1,4 +1,4 @@
-package org.allaymc.server.world.bitarray;
+package org.allaymc.server.datastruct.bitarray;
 
 import com.google.common.base.Preconditions;
 import org.cloudburstmc.math.GenericMath;
diff --git a/server/src/main/java/org/allaymc/server/world/bitarray/PaddedBitArray.java b/server/src/main/java/org/allaymc/server/datastruct/bitarray/PaddedBitArray.java
similarity index 97%
rename from server/src/main/java/org/allaymc/server/world/bitarray/PaddedBitArray.java
rename to server/src/main/java/org/allaymc/server/datastruct/bitarray/PaddedBitArray.java
index 96e54d98c0..5a37be7b00 100644
--- a/server/src/main/java/org/allaymc/server/world/bitarray/PaddedBitArray.java
+++ b/server/src/main/java/org/allaymc/server/datastruct/bitarray/PaddedBitArray.java
@@ -1,4 +1,4 @@
-package org.allaymc.server.world.bitarray;
+package org.allaymc.server.datastruct.bitarray;
 
 import com.google.common.base.Objects;
 import org.cloudburstmc.math.GenericMath;
diff --git a/server/src/main/java/org/allaymc/server/world/bitarray/Pow2BitArray.java b/server/src/main/java/org/allaymc/server/datastruct/bitarray/Pow2BitArray.java
similarity index 97%
rename from server/src/main/java/org/allaymc/server/world/bitarray/Pow2BitArray.java
rename to server/src/main/java/org/allaymc/server/datastruct/bitarray/Pow2BitArray.java
index 0f5c780a53..a5dfa42fb2 100644
--- a/server/src/main/java/org/allaymc/server/world/bitarray/Pow2BitArray.java
+++ b/server/src/main/java/org/allaymc/server/datastruct/bitarray/Pow2BitArray.java
@@ -1,4 +1,4 @@
-package org.allaymc.server.world.bitarray;
+package org.allaymc.server.datastruct.bitarray;
 
 import com.google.common.base.Objects;
 import org.cloudburstmc.math.GenericMath;
diff --git a/server/src/main/java/org/allaymc/server/world/bitarray/SingletonBitArray.java b/server/src/main/java/org/allaymc/server/datastruct/bitarray/SingletonBitArray.java
similarity index 93%
rename from server/src/main/java/org/allaymc/server/world/bitarray/SingletonBitArray.java
rename to server/src/main/java/org/allaymc/server/datastruct/bitarray/SingletonBitArray.java
index e91bde9162..98fe5165de 100644
--- a/server/src/main/java/org/allaymc/server/world/bitarray/SingletonBitArray.java
+++ b/server/src/main/java/org/allaymc/server/datastruct/bitarray/SingletonBitArray.java
@@ -1,4 +1,4 @@
-package org.allaymc.server.world.bitarray;
+package org.allaymc.server.datastruct.bitarray;
 
 /**
  * @author JukeboxMC | daoge_cmd
diff --git a/server/src/main/java/org/allaymc/server/world/palette/Palette.java b/server/src/main/java/org/allaymc/server/datastruct/palette/Palette.java
similarity index 98%
rename from server/src/main/java/org/allaymc/server/world/palette/Palette.java
rename to server/src/main/java/org/allaymc/server/datastruct/palette/Palette.java
index 350dcbe301..c804b400fc 100644
--- a/server/src/main/java/org/allaymc/server/world/palette/Palette.java
+++ b/server/src/main/java/org/allaymc/server/datastruct/palette/Palette.java
@@ -1,4 +1,4 @@
-package org.allaymc.server.world.palette;
+package org.allaymc.server.datastruct.palette;
 
 import com.google.common.base.Objects;
 import io.netty.buffer.ByteBuf;
@@ -6,8 +6,8 @@
 import it.unimi.dsi.fastutil.objects.ReferenceArrayList;
 import lombok.extern.slf4j.Slf4j;
 import org.allaymc.api.world.chunk.Chunk;
-import org.allaymc.server.world.bitarray.BitArray;
-import org.allaymc.server.world.bitarray.BitArrayVersion;
+import org.allaymc.server.datastruct.bitarray.BitArray;
+import org.allaymc.server.datastruct.bitarray.BitArrayVersion;
 import org.cloudburstmc.nbt.NbtUtils;
 import org.cloudburstmc.protocol.common.util.VarInts;
 
diff --git a/server/src/main/java/org/allaymc/server/world/palette/PaletteException.java b/server/src/main/java/org/allaymc/server/datastruct/palette/PaletteException.java
similarity index 76%
rename from server/src/main/java/org/allaymc/server/world/palette/PaletteException.java
rename to server/src/main/java/org/allaymc/server/datastruct/palette/PaletteException.java
index d83779f784..bf84d45b13 100644
--- a/server/src/main/java/org/allaymc/server/world/palette/PaletteException.java
+++ b/server/src/main/java/org/allaymc/server/datastruct/palette/PaletteException.java
@@ -1,4 +1,4 @@
-package org.allaymc.server.world.palette;
+package org.allaymc.server.datastruct.palette;
 
 import lombok.experimental.StandardException;
 
diff --git a/server/src/main/java/org/allaymc/server/world/palette/PaletteUtils.java b/server/src/main/java/org/allaymc/server/datastruct/palette/PaletteUtils.java
similarity index 98%
rename from server/src/main/java/org/allaymc/server/world/palette/PaletteUtils.java
rename to server/src/main/java/org/allaymc/server/datastruct/palette/PaletteUtils.java
index 5901e4cea8..d49328aa42 100644
--- a/server/src/main/java/org/allaymc/server/world/palette/PaletteUtils.java
+++ b/server/src/main/java/org/allaymc/server/datastruct/palette/PaletteUtils.java
@@ -1,4 +1,4 @@
-package org.allaymc.server.world.palette;
+package org.allaymc.server.datastruct.palette;
 
 import io.netty.buffer.ByteBuf;
 import lombok.SneakyThrows;
diff --git a/server/src/main/java/org/allaymc/server/world/palette/PersistentDataDeserializer.java b/server/src/main/java/org/allaymc/server/datastruct/palette/PersistentDataDeserializer.java
similarity index 90%
rename from server/src/main/java/org/allaymc/server/world/palette/PersistentDataDeserializer.java
rename to server/src/main/java/org/allaymc/server/datastruct/palette/PersistentDataDeserializer.java
index c9123e6d62..5ac9b47b85 100644
--- a/server/src/main/java/org/allaymc/server/world/palette/PersistentDataDeserializer.java
+++ b/server/src/main/java/org/allaymc/server/datastruct/palette/PersistentDataDeserializer.java
@@ -1,4 +1,4 @@
-package org.allaymc.server.world.palette;
+package org.allaymc.server.datastruct.palette;
 
 import io.netty.buffer.ByteBuf;
 
diff --git a/server/src/main/java/org/allaymc/server/world/palette/PersistentDataSerializer.java b/server/src/main/java/org/allaymc/server/datastruct/palette/PersistentDataSerializer.java
similarity index 79%
rename from server/src/main/java/org/allaymc/server/world/palette/PersistentDataSerializer.java
rename to server/src/main/java/org/allaymc/server/datastruct/palette/PersistentDataSerializer.java
index ea60e852ab..8e3815cbd3 100644
--- a/server/src/main/java/org/allaymc/server/world/palette/PersistentDataSerializer.java
+++ b/server/src/main/java/org/allaymc/server/datastruct/palette/PersistentDataSerializer.java
@@ -1,4 +1,4 @@
-package org.allaymc.server.world.palette;
+package org.allaymc.server.datastruct.palette;
 
 import org.cloudburstmc.nbt.NbtMap;
 
diff --git a/server/src/main/java/org/allaymc/server/world/palette/RuntimeDataDeserializer.java b/server/src/main/java/org/allaymc/server/datastruct/palette/RuntimeDataDeserializer.java
similarity index 74%
rename from server/src/main/java/org/allaymc/server/world/palette/RuntimeDataDeserializer.java
rename to server/src/main/java/org/allaymc/server/datastruct/palette/RuntimeDataDeserializer.java
index 85f6dd8ca9..96ceb7df41 100644
--- a/server/src/main/java/org/allaymc/server/world/palette/RuntimeDataDeserializer.java
+++ b/server/src/main/java/org/allaymc/server/datastruct/palette/RuntimeDataDeserializer.java
@@ -1,4 +1,4 @@
-package org.allaymc.server.world.palette;
+package org.allaymc.server.datastruct.palette;
 
 /**
  * @author JukeboxMC | daoge_cmd
diff --git a/server/src/main/java/org/allaymc/server/world/palette/RuntimeDataSerializer.java b/server/src/main/java/org/allaymc/server/datastruct/palette/RuntimeDataSerializer.java
similarity index 74%
rename from server/src/main/java/org/allaymc/server/world/palette/RuntimeDataSerializer.java
rename to server/src/main/java/org/allaymc/server/datastruct/palette/RuntimeDataSerializer.java
index 7f3a6b42f8..707fe2ee81 100644
--- a/server/src/main/java/org/allaymc/server/world/palette/RuntimeDataSerializer.java
+++ b/server/src/main/java/org/allaymc/server/datastruct/palette/RuntimeDataSerializer.java
@@ -1,4 +1,4 @@
-package org.allaymc.server.world.palette;
+package org.allaymc.server.datastruct.palette;
 
 /**
  * @author JukeboxMC | daoge_cmd
diff --git a/server/src/main/java/org/allaymc/server/world/chunk/ChunkSection.java b/server/src/main/java/org/allaymc/server/world/chunk/ChunkSection.java
index 6766b42c8d..03cb3d2e37 100644
--- a/server/src/main/java/org/allaymc/server/world/chunk/ChunkSection.java
+++ b/server/src/main/java/org/allaymc/server/world/chunk/ChunkSection.java
@@ -4,7 +4,7 @@
 import org.allaymc.api.block.type.BlockState;
 import org.allaymc.api.world.biome.BiomeId;
 import org.allaymc.api.world.biome.BiomeType;
-import org.allaymc.server.world.palette.Palette;
+import org.allaymc.server.datastruct.palette.Palette;
 
 import javax.annotation.concurrent.NotThreadSafe;
 
diff --git a/server/src/main/java/org/allaymc/server/world/storage/AllayLevelDBWorldStorage.java b/server/src/main/java/org/allaymc/server/world/storage/AllayLevelDBWorldStorage.java
index 730adc7998..0feb4c91b5 100644
--- a/server/src/main/java/org/allaymc/server/world/storage/AllayLevelDBWorldStorage.java
+++ b/server/src/main/java/org/allaymc/server/world/storage/AllayLevelDBWorldStorage.java
@@ -23,13 +23,13 @@
 import org.allaymc.api.world.gamerule.GameRules;
 import org.allaymc.api.world.storage.WorldStorage;
 import org.allaymc.api.world.storage.WorldStorageException;
+import org.allaymc.server.datastruct.palette.Palette;
+import org.allaymc.server.datastruct.palette.PaletteException;
+import org.allaymc.server.datastruct.palette.PaletteUtils;
 import org.allaymc.server.world.AllayWorldData;
 import org.allaymc.server.world.HeightMap;
 import org.allaymc.server.world.chunk.AllayUnsafeChunk;
 import org.allaymc.server.world.chunk.ChunkSection;
-import org.allaymc.server.world.palette.Palette;
-import org.allaymc.server.world.palette.PaletteException;
-import org.allaymc.server.world.palette.PaletteUtils;
 import org.allaymc.updater.block.BlockStateUpdaters;
 import org.cloudburstmc.nbt.*;
 import org.cloudburstmc.nbt.util.stream.LittleEndianDataInputStream;