diff --git a/src/main/java/com/volmit/iris/util/nbt/mca/nmspalettes/BitStorage.java b/src/main/java/com/volmit/iris/util/nbt/mca/palette/BitStorage.java
similarity index 99%
rename from src/main/java/com/volmit/iris/util/nbt/mca/nmspalettes/BitStorage.java
rename to src/main/java/com/volmit/iris/util/nbt/mca/palette/BitStorage.java
index e509b87cc..921cc77f4 100644
--- a/src/main/java/com/volmit/iris/util/nbt/mca/nmspalettes/BitStorage.java
+++ b/src/main/java/com/volmit/iris/util/nbt/mca/palette/BitStorage.java
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util.nbt.mca.nmspalettes;
+package com.volmit.iris.util.nbt.mca.palette;
 
 import org.apache.commons.lang3.Validate;
 
diff --git a/src/main/java/com/volmit/iris/util/nbt/mca/nmspalettes/CountConsumer.java b/src/main/java/com/volmit/iris/util/nbt/mca/palette/CountConsumer.java
similarity index 94%
rename from src/main/java/com/volmit/iris/util/nbt/mca/nmspalettes/CountConsumer.java
rename to src/main/java/com/volmit/iris/util/nbt/mca/palette/CountConsumer.java
index ede8a5404..e13256217 100644
--- a/src/main/java/com/volmit/iris/util/nbt/mca/nmspalettes/CountConsumer.java
+++ b/src/main/java/com/volmit/iris/util/nbt/mca/palette/CountConsumer.java
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util.nbt.mca.nmspalettes;
+package com.volmit.iris.util.nbt.mca.palette;
 
 @FunctionalInterface
 public interface CountConsumer<T> {
diff --git a/src/main/java/com/volmit/iris/util/nbt/mca/nmspalettes/CrudeIncrementalIntIdentityHashBiMap.java b/src/main/java/com/volmit/iris/util/nbt/mca/palette/CrudeIncrementalIntIdentityHashBiMap.java
similarity index 98%
rename from src/main/java/com/volmit/iris/util/nbt/mca/nmspalettes/CrudeIncrementalIntIdentityHashBiMap.java
rename to src/main/java/com/volmit/iris/util/nbt/mca/palette/CrudeIncrementalIntIdentityHashBiMap.java
index 5c40c7aa5..4d83d0ee5 100644
--- a/src/main/java/com/volmit/iris/util/nbt/mca/nmspalettes/CrudeIncrementalIntIdentityHashBiMap.java
+++ b/src/main/java/com/volmit/iris/util/nbt/mca/palette/CrudeIncrementalIntIdentityHashBiMap.java
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util.nbt.mca.nmspalettes;
+package com.volmit.iris.util.nbt.mca.palette;
 
 import com.google.common.base.Predicates;
 import com.google.common.collect.Iterators;
diff --git a/src/main/java/com/volmit/iris/util/nbt/mca/nmspalettes/GlobalPalette.java b/src/main/java/com/volmit/iris/util/nbt/mca/palette/GlobalPalette.java
similarity index 96%
rename from src/main/java/com/volmit/iris/util/nbt/mca/nmspalettes/GlobalPalette.java
rename to src/main/java/com/volmit/iris/util/nbt/mca/palette/GlobalPalette.java
index 82d59dad0..56a8e77d2 100644
--- a/src/main/java/com/volmit/iris/util/nbt/mca/nmspalettes/GlobalPalette.java
+++ b/src/main/java/com/volmit/iris/util/nbt/mca/palette/GlobalPalette.java
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util.nbt.mca.nmspalettes;
+package com.volmit.iris.util.nbt.mca.palette;
 
 import com.volmit.iris.util.nbt.tag.ListTag;
 
diff --git a/src/main/java/com/volmit/iris/util/nbt/mca/nmspalettes/HashMapPalette.java b/src/main/java/com/volmit/iris/util/nbt/mca/palette/HashMapPalette.java
similarity index 98%
rename from src/main/java/com/volmit/iris/util/nbt/mca/nmspalettes/HashMapPalette.java
rename to src/main/java/com/volmit/iris/util/nbt/mca/palette/HashMapPalette.java
index 09b77f912..e8cab650c 100644
--- a/src/main/java/com/volmit/iris/util/nbt/mca/nmspalettes/HashMapPalette.java
+++ b/src/main/java/com/volmit/iris/util/nbt/mca/palette/HashMapPalette.java
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util.nbt.mca.nmspalettes;
+package com.volmit.iris.util.nbt.mca.palette;
 
 import com.volmit.iris.util.nbt.tag.CompoundTag;
 import com.volmit.iris.util.nbt.tag.ListTag;
diff --git a/src/main/java/com/volmit/iris/util/nbt/mca/nmspalettes/IdMap.java b/src/main/java/com/volmit/iris/util/nbt/mca/palette/IdMap.java
similarity index 94%
rename from src/main/java/com/volmit/iris/util/nbt/mca/nmspalettes/IdMap.java
rename to src/main/java/com/volmit/iris/util/nbt/mca/palette/IdMap.java
index d3d63ea54..513f50f72 100644
--- a/src/main/java/com/volmit/iris/util/nbt/mca/nmspalettes/IdMap.java
+++ b/src/main/java/com/volmit/iris/util/nbt/mca/palette/IdMap.java
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util.nbt.mca.nmspalettes;
+package com.volmit.iris.util.nbt.mca.palette;
 
 public interface IdMap<T> extends Iterable<T> {
   int getId(T paramT);
diff --git a/src/main/java/com/volmit/iris/util/nbt/mca/nmspalettes/IdMapper.java b/src/main/java/com/volmit/iris/util/nbt/mca/palette/IdMapper.java
similarity index 97%
rename from src/main/java/com/volmit/iris/util/nbt/mca/nmspalettes/IdMapper.java
rename to src/main/java/com/volmit/iris/util/nbt/mca/palette/IdMapper.java
index 469e1c3c6..3e2d37bb5 100644
--- a/src/main/java/com/volmit/iris/util/nbt/mca/nmspalettes/IdMapper.java
+++ b/src/main/java/com/volmit/iris/util/nbt/mca/palette/IdMapper.java
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util.nbt.mca.nmspalettes;
+package com.volmit.iris.util.nbt.mca.palette;
 
 import com.google.common.base.Predicates;
 import com.google.common.collect.Iterators;
diff --git a/src/main/java/com/volmit/iris/util/nbt/mca/nmspalettes/LinearPalette.java b/src/main/java/com/volmit/iris/util/nbt/mca/palette/LinearPalette.java
similarity index 97%
rename from src/main/java/com/volmit/iris/util/nbt/mca/nmspalettes/LinearPalette.java
rename to src/main/java/com/volmit/iris/util/nbt/mca/palette/LinearPalette.java
index b7ba0e48b..e6e0fe3a5 100644
--- a/src/main/java/com/volmit/iris/util/nbt/mca/nmspalettes/LinearPalette.java
+++ b/src/main/java/com/volmit/iris/util/nbt/mca/palette/LinearPalette.java
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util.nbt.mca.nmspalettes;
+package com.volmit.iris.util.nbt.mca.palette;
 
 import com.volmit.iris.util.nbt.tag.CompoundTag;
 import com.volmit.iris.util.nbt.tag.ListTag;
diff --git a/src/main/java/com/volmit/iris/util/nbt/mca/nmspalettes/Mth.java b/src/main/java/com/volmit/iris/util/nbt/mca/palette/Mth.java
similarity index 99%
rename from src/main/java/com/volmit/iris/util/nbt/mca/nmspalettes/Mth.java
rename to src/main/java/com/volmit/iris/util/nbt/mca/palette/Mth.java
index 1c40f8f0b..0d793d784 100644
--- a/src/main/java/com/volmit/iris/util/nbt/mca/nmspalettes/Mth.java
+++ b/src/main/java/com/volmit/iris/util/nbt/mca/palette/Mth.java
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util.nbt.mca.nmspalettes;
+package com.volmit.iris.util.nbt.mca.palette;
 
 import java.util.Random;
 import java.util.UUID;
diff --git a/src/main/java/com/volmit/iris/util/nbt/mca/nmspalettes/Palette.java b/src/main/java/com/volmit/iris/util/nbt/mca/palette/Palette.java
similarity index 95%
rename from src/main/java/com/volmit/iris/util/nbt/mca/nmspalettes/Palette.java
rename to src/main/java/com/volmit/iris/util/nbt/mca/palette/Palette.java
index 886dbf861..526d0ed63 100644
--- a/src/main/java/com/volmit/iris/util/nbt/mca/nmspalettes/Palette.java
+++ b/src/main/java/com/volmit/iris/util/nbt/mca/palette/Palette.java
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util.nbt.mca.nmspalettes;
+package com.volmit.iris.util.nbt.mca.palette;
 
 import com.volmit.iris.util.nbt.tag.ListTag;
 
diff --git a/src/main/java/com/volmit/iris/util/nbt/mca/nmspalettes/PaletteAccess.java b/src/main/java/com/volmit/iris/util/nbt/mca/palette/PaletteAccess.java
similarity index 88%
rename from src/main/java/com/volmit/iris/util/nbt/mca/nmspalettes/PaletteAccess.java
rename to src/main/java/com/volmit/iris/util/nbt/mca/palette/PaletteAccess.java
index cdf5ae3a6..6879030dd 100644
--- a/src/main/java/com/volmit/iris/util/nbt/mca/nmspalettes/PaletteAccess.java
+++ b/src/main/java/com/volmit/iris/util/nbt/mca/palette/PaletteAccess.java
@@ -16,11 +16,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util.nbt.mca.nmspalettes;
+package com.volmit.iris.util.nbt.mca.palette;
 
-import com.volmit.iris.util.nbt.mca.NBTWorld;
 import com.volmit.iris.util.nbt.tag.CompoundTag;
-import org.bukkit.block.data.BlockData;
 
 public interface PaletteAccess {
     public void setBlock(int x, int y, int z, CompoundTag data);
diff --git a/src/main/java/com/volmit/iris/util/nbt/mca/nmspalettes/PaletteResize.java b/src/main/java/com/volmit/iris/util/nbt/mca/palette/PaletteResize.java
similarity index 94%
rename from src/main/java/com/volmit/iris/util/nbt/mca/nmspalettes/PaletteResize.java
rename to src/main/java/com/volmit/iris/util/nbt/mca/palette/PaletteResize.java
index dc5fe8d71..d4f64bcd0 100644
--- a/src/main/java/com/volmit/iris/util/nbt/mca/nmspalettes/PaletteResize.java
+++ b/src/main/java/com/volmit/iris/util/nbt/mca/palette/PaletteResize.java
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util.nbt.mca.nmspalettes;
+package com.volmit.iris.util.nbt.mca.palette;
 
 interface PaletteResize<T> {
   int onResize(int paramInt, T paramT);
diff --git a/src/main/java/com/volmit/iris/util/nbt/mca/nmspalettes/PalettedContainer.java b/src/main/java/com/volmit/iris/util/nbt/mca/palette/PalettedContainer.java
similarity index 96%
rename from src/main/java/com/volmit/iris/util/nbt/mca/nmspalettes/PalettedContainer.java
rename to src/main/java/com/volmit/iris/util/nbt/mca/palette/PalettedContainer.java
index 7039c5975..0c15e7a01 100644
--- a/src/main/java/com/volmit/iris/util/nbt/mca/nmspalettes/PalettedContainer.java
+++ b/src/main/java/com/volmit/iris/util/nbt/mca/palette/PalettedContainer.java
@@ -16,16 +16,12 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util.nbt.mca.nmspalettes;
+package com.volmit.iris.util.nbt.mca.palette;
 
 import com.volmit.iris.util.nbt.tag.CompoundTag;
 import com.volmit.iris.util.nbt.tag.ListTag;
-import it.unimi.dsi.fastutil.Pair;
 import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
-import net.minecraft.util.DebugBuffer;
-import net.minecraft.util.ThreadingDetector;
 
-import java.util.concurrent.Semaphore;
 import java.util.function.Function;
 import java.util.function.Predicate;
 
diff --git a/src/main/java/com/volmit/iris/util/nbt/mca/nmspalettes/WrappedPalettedContainer.java b/src/main/java/com/volmit/iris/util/nbt/mca/palette/WrappedPalettedContainer.java
similarity index 90%
rename from src/main/java/com/volmit/iris/util/nbt/mca/nmspalettes/WrappedPalettedContainer.java
rename to src/main/java/com/volmit/iris/util/nbt/mca/palette/WrappedPalettedContainer.java
index db6dfc651..4b1be8282 100644
--- a/src/main/java/com/volmit/iris/util/nbt/mca/nmspalettes/WrappedPalettedContainer.java
+++ b/src/main/java/com/volmit/iris/util/nbt/mca/palette/WrappedPalettedContainer.java
@@ -16,13 +16,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util.nbt.mca.nmspalettes;
+package com.volmit.iris.util.nbt.mca.palette;
 
-import com.volmit.iris.util.nbt.mca.MCAUtil;
-import com.volmit.iris.util.nbt.mca.NBTWorld;
 import com.volmit.iris.util.nbt.tag.CompoundTag;
 import lombok.RequiredArgsConstructor;
-import org.bukkit.block.data.BlockData;
 
 import java.util.function.Function;