diff --git a/src/main/java/me/cortex/voxy/api/VoxyApi.java b/src/main/java/me/cortex/voxy/api/VoxyApi.java
deleted file mode 100644
index 77f50a91..00000000
--- a/src/main/java/me/cortex/voxy/api/VoxyApi.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package me.cortex.voxy.api;
-
-import me.cortex.voxy.common.world.WorldSection;
-
-public class VoxyApi {
-    private VoxyApi(String useIdentifier) {
-
-    }
-
-    public static VoxyApi makeAPI(String identifier) {
-        return new VoxyApi(identifier);
-    }
-
-    public interface ArbitraryGenerateCallback {
-        int ALL_DARK = -1;
-        int OK = 0;
-        int ALL_SKY = 1;
-        int generate(int lodLevel, int x, int y, int z, long[] outputBuffer);
-    }
-
-    public void setArbitraryGenerator(ArbitraryGenerateCallback generator) {
-
-    }
-
-    public WorldSection acquireSection(int level, int x, int y, int z) {
-        return null;
-    }
-}
diff --git a/src/main/java/me/cortex/voxy/client/config/VoxyConfig.java b/src/main/java/me/cortex/voxy/client/config/VoxyConfig.java
index 87fe9059..9f0e0786 100644
--- a/src/main/java/me/cortex/voxy/client/config/VoxyConfig.java
+++ b/src/main/java/me/cortex/voxy/client/config/VoxyConfig.java
@@ -3,10 +3,8 @@ package me.cortex.voxy.client.config;
 import com.google.gson.FieldNamingPolicy;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import me.cortex.voxy.client.core.Capabilities;
 import me.cortex.voxy.client.saver.ContextSelectionSystem;
 import net.fabricmc.loader.api.FabricLoader;
-import org.lwjgl.opengl.GL;
 
 import java.io.FileReader;
 import java.io.IOException;
diff --git a/src/main/java/me/cortex/voxy/client/core/VoxelCore.java b/src/main/java/me/cortex/voxy/client/core/VoxelCore.java
index d5e1d196..95b107d1 100644
--- a/src/main/java/me/cortex/voxy/client/core/VoxelCore.java
+++ b/src/main/java/me/cortex/voxy/client/core/VoxelCore.java
@@ -2,6 +2,7 @@ package me.cortex.voxy.client.core;
 
 import com.mojang.blaze3d.systems.RenderSystem;
 import me.cortex.voxy.client.config.VoxyConfig;
+import me.cortex.voxy.client.core.gl.Capabilities;
 import me.cortex.voxy.client.core.gl.GlBuffer;
 import me.cortex.voxy.client.core.model.ModelBakerySubsystem;
 import me.cortex.voxy.client.core.rendering.*;
diff --git a/src/main/java/me/cortex/voxy/client/core/Capabilities.java b/src/main/java/me/cortex/voxy/client/core/gl/Capabilities.java
similarity index 91%
rename from src/main/java/me/cortex/voxy/client/core/Capabilities.java
rename to src/main/java/me/cortex/voxy/client/core/gl/Capabilities.java
index 4d6d5ab3..8eb6ed7d 100644
--- a/src/main/java/me/cortex/voxy/client/core/Capabilities.java
+++ b/src/main/java/me/cortex/voxy/client/core/gl/Capabilities.java
@@ -1,12 +1,10 @@
-package me.cortex.voxy.client.core;
+package me.cortex.voxy.client.core.gl;
 
-import me.cortex.voxy.client.core.gl.shader.Shader;
 import me.cortex.voxy.client.core.gl.shader.ShaderType;
 import org.lwjgl.opengl.GL;
 import org.lwjgl.opengl.GL20C;
 
 import static org.lwjgl.opengl.GL32.glGetInteger64;
-import static org.lwjgl.opengl.GL32C.glGetInteger64i;
 import static org.lwjgl.opengl.GL43C.GL_MAX_SHADER_STORAGE_BLOCK_SIZE;
 
 public class Capabilities {
diff --git a/src/main/java/me/cortex/voxy/client/core/rendering/building/RenderDataFactory.java b/src/main/java/me/cortex/voxy/client/core/rendering/building/RenderDataFactory.java
index ab666dfc..db5e582a 100644
--- a/src/main/java/me/cortex/voxy/client/core/rendering/building/RenderDataFactory.java
+++ b/src/main/java/me/cortex/voxy/client/core/rendering/building/RenderDataFactory.java
@@ -1,7 +1,7 @@
 package me.cortex.voxy.client.core.rendering.building;
 
 import it.unimi.dsi.fastutil.longs.LongArrayList;
-import me.cortex.voxy.client.core.Capabilities;
+import me.cortex.voxy.client.core.gl.Capabilities;
 import me.cortex.voxy.client.core.model.ModelFactory;
 import me.cortex.voxy.client.core.model.ModelQueries;
 import me.cortex.voxy.client.core.util.Mesher2D;
diff --git a/src/main/java/me/cortex/voxy/client/core/rendering/building/RenderDataFactory4.java b/src/main/java/me/cortex/voxy/client/core/rendering/building/RenderDataFactory4.java
index edc37626..e5409ea4 100644
--- a/src/main/java/me/cortex/voxy/client/core/rendering/building/RenderDataFactory4.java
+++ b/src/main/java/me/cortex/voxy/client/core/rendering/building/RenderDataFactory4.java
@@ -1,6 +1,6 @@
 package me.cortex.voxy.client.core.rendering.building;
 
-import me.cortex.voxy.client.core.Capabilities;
+import me.cortex.voxy.client.core.gl.Capabilities;
 import me.cortex.voxy.client.core.model.ModelFactory;
 import me.cortex.voxy.client.core.model.ModelQueries;
 import me.cortex.voxy.client.core.util.Mesher2D;
diff --git a/src/main/java/me/cortex/voxy/client/core/rendering/util/BufferArena.java b/src/main/java/me/cortex/voxy/client/core/rendering/util/BufferArena.java
index 1828b5e8..3485afdd 100644
--- a/src/main/java/me/cortex/voxy/client/core/rendering/util/BufferArena.java
+++ b/src/main/java/me/cortex/voxy/client/core/rendering/util/BufferArena.java
@@ -1,12 +1,11 @@
 package me.cortex.voxy.client.core.rendering.util;
 
-import me.cortex.voxy.client.core.Capabilities;
+import me.cortex.voxy.client.core.gl.Capabilities;
 import me.cortex.voxy.client.core.gl.GlBuffer;
-import me.cortex.voxy.client.core.util.AllocationArena;
+import me.cortex.voxy.common.util.AllocationArena;
 import me.cortex.voxy.common.util.MemoryBuffer;
 import me.cortex.voxy.common.util.UnsafeUtil;
 import me.cortex.voxy.commonImpl.VoxyCommon;
-import org.lwjgl.system.MemoryUtil;
 
 import java.util.function.Consumer;
 
diff --git a/src/main/java/me/cortex/voxy/client/core/rendering/util/DownloadStream.java b/src/main/java/me/cortex/voxy/client/core/rendering/util/DownloadStream.java
index 3eafdb3c..453f11e7 100644
--- a/src/main/java/me/cortex/voxy/client/core/rendering/util/DownloadStream.java
+++ b/src/main/java/me/cortex/voxy/client/core/rendering/util/DownloadStream.java
@@ -1,12 +1,10 @@
 package me.cortex.voxy.client.core.rendering.util;
 
 import it.unimi.dsi.fastutil.longs.LongArrayList;
-import it.unimi.dsi.fastutil.longs.LongConsumer;
-import it.unimi.dsi.fastutil.objects.ObjectArrayList;
 import me.cortex.voxy.client.core.gl.GlBuffer;
 import me.cortex.voxy.client.core.gl.GlFence;
 import me.cortex.voxy.client.core.gl.GlPersistentMappedBuffer;
-import me.cortex.voxy.client.core.util.AllocationArena;
+import me.cortex.voxy.common.util.AllocationArena;
 import me.cortex.voxy.common.util.MemoryBuffer;
 
 import java.util.ArrayDeque;
@@ -14,14 +12,12 @@ import java.util.ArrayList;
 import java.util.Deque;
 import java.util.function.Consumer;
 
-import static me.cortex.voxy.client.core.util.AllocationArena.SIZE_LIMIT;
+import static me.cortex.voxy.common.util.AllocationArena.SIZE_LIMIT;
 import static org.lwjgl.opengl.ARBDirectStateAccess.glCopyNamedBufferSubData;
-import static org.lwjgl.opengl.ARBDirectStateAccess.glFlushMappedNamedBufferRange;
 import static org.lwjgl.opengl.ARBMapBufferRange.*;
 import static org.lwjgl.opengl.GL11.glFinish;
 import static org.lwjgl.opengl.GL42.glMemoryBarrier;
 import static org.lwjgl.opengl.GL42C.GL_BUFFER_UPDATE_BARRIER_BIT;
-import static org.lwjgl.opengl.GL43.GL_SHADER_STORAGE_BARRIER_BIT;
 import static org.lwjgl.opengl.GL44.GL_CLIENT_MAPPED_BUFFER_BARRIER_BIT;
 import static org.lwjgl.opengl.GL44.GL_MAP_COHERENT_BIT;
 
diff --git a/src/main/java/me/cortex/voxy/client/core/rendering/util/RawDownloadStream.java b/src/main/java/me/cortex/voxy/client/core/rendering/util/RawDownloadStream.java
index 5bad0d0a..226126e2 100644
--- a/src/main/java/me/cortex/voxy/client/core/rendering/util/RawDownloadStream.java
+++ b/src/main/java/me/cortex/voxy/client/core/rendering/util/RawDownloadStream.java
@@ -1,10 +1,9 @@
 package me.cortex.voxy.client.core.rendering.util;
 
 
-import me.cortex.voxy.client.core.gl.GlBuffer;
 import me.cortex.voxy.client.core.gl.GlFence;
 import me.cortex.voxy.client.core.gl.GlPersistentMappedBuffer;
-import me.cortex.voxy.client.core.util.AllocationArena;
+import me.cortex.voxy.common.util.AllocationArena;
 
 import java.util.ArrayDeque;
 import java.util.ArrayList;
diff --git a/src/main/java/me/cortex/voxy/client/core/rendering/util/UploadStream.java b/src/main/java/me/cortex/voxy/client/core/rendering/util/UploadStream.java
index 0fb586cf..56492b17 100644
--- a/src/main/java/me/cortex/voxy/client/core/rendering/util/UploadStream.java
+++ b/src/main/java/me/cortex/voxy/client/core/rendering/util/UploadStream.java
@@ -4,21 +4,18 @@ import it.unimi.dsi.fastutil.longs.LongArrayList;
 import me.cortex.voxy.client.core.gl.GlBuffer;
 import me.cortex.voxy.client.core.gl.GlFence;
 import me.cortex.voxy.client.core.gl.GlPersistentMappedBuffer;
-import me.cortex.voxy.client.core.util.AllocationArena;
+import me.cortex.voxy.common.util.AllocationArena;
 
 import java.util.ArrayDeque;
 import java.util.Deque;
 
-import static me.cortex.voxy.client.core.util.AllocationArena.SIZE_LIMIT;
+import static me.cortex.voxy.common.util.AllocationArena.SIZE_LIMIT;
 import static org.lwjgl.opengl.ARBDirectStateAccess.glCopyNamedBufferSubData;
-import static org.lwjgl.opengl.ARBDirectStateAccess.glFlushMappedNamedBufferRange;
 import static org.lwjgl.opengl.ARBMapBufferRange.*;
 import static org.lwjgl.opengl.GL11.glFinish;
-import static org.lwjgl.opengl.GL42.GL_ALL_BARRIER_BITS;
 import static org.lwjgl.opengl.GL42.glMemoryBarrier;
 import static org.lwjgl.opengl.GL42C.GL_BUFFER_UPDATE_BARRIER_BIT;
 import static org.lwjgl.opengl.GL43.GL_SHADER_STORAGE_BARRIER_BIT;
-import static org.lwjgl.opengl.GL44.GL_CLIENT_MAPPED_BUFFER_BARRIER_BIT;
 import static org.lwjgl.opengl.GL44.GL_MAP_COHERENT_BIT;
 
 public class UploadStream {
diff --git a/src/main/java/me/cortex/voxy/client/importers/WorldImporter.java b/src/main/java/me/cortex/voxy/client/importers/WorldImporter.java
index c91326bc..a15ca8db 100644
--- a/src/main/java/me/cortex/voxy/client/importers/WorldImporter.java
+++ b/src/main/java/me/cortex/voxy/client/importers/WorldImporter.java
@@ -57,11 +57,11 @@ public class WorldImporter {
     private volatile boolean isRunning;
     public WorldImporter(WorldEngine worldEngine, World mcWorld, ServiceThreadPool servicePool) {
         this.world = worldEngine;
-        this.threadPool = servicePool.createServiceNoCleanup("World importer", 1, ()->()->jobQueue.poll().run(), ()->this.world.savingService.getTaskCount() < 4000);
+        this.threadPool = servicePool.createServiceNoCleanup("World importer", 1, ()->()->this.jobQueue.poll().run(), ()->this.world.savingService.getTaskCount() < 4000);
 
         var biomeRegistry = mcWorld.getRegistryManager().getOrThrow(RegistryKeys.BIOME);
         var defaultBiome = biomeRegistry.getOrThrow(BiomeKeys.PLAINS);
-        this.defaultBiomeProvider = new ReadableContainer<RegistryEntry<Biome>>() {
+        this.defaultBiomeProvider = new ReadableContainer<>() {
             @Override
             public RegistryEntry<Biome> get(int x, int y, int z) {
                 return defaultBiome;
diff --git a/src/main/java/me/cortex/voxy/client/core/util/AllocationArena.java b/src/main/java/me/cortex/voxy/common/util/AllocationArena.java
similarity index 99%
rename from src/main/java/me/cortex/voxy/client/core/util/AllocationArena.java
rename to src/main/java/me/cortex/voxy/common/util/AllocationArena.java
index 4b8a98e8..b439c327 100644
--- a/src/main/java/me/cortex/voxy/client/core/util/AllocationArena.java
+++ b/src/main/java/me/cortex/voxy/common/util/AllocationArena.java
@@ -1,4 +1,4 @@
-package me.cortex.voxy.client.core.util;
+package me.cortex.voxy.common.util;
 
 import it.unimi.dsi.fastutil.longs.LongRBTreeSet;