diff --git a/src/main/java/com/seibel/lod/core/objects/a7/DHLevel.java b/src/main/java/com/seibel/lod/core/a7/DHLevel.java
similarity index 89%
rename from src/main/java/com/seibel/lod/core/objects/a7/DHLevel.java
rename to src/main/java/com/seibel/lod/core/a7/DHLevel.java
index f7a1fa12b..6a2c5e53f 100644
--- a/src/main/java/com/seibel/lod/core/objects/a7/DHLevel.java
+++ b/src/main/java/com/seibel/lod/core/a7/DHLevel.java
@@ -1,15 +1,12 @@
-package com.seibel.lod.core.objects.a7;
+package com.seibel.lod.core.a7;
 
-import com.seibel.lod.core.api.internal.InternalApiShared;
-import com.seibel.lod.core.api.internal.a7.ClientApi;
+import com.seibel.lod.core.a7.data.DataFileHandler;
+import com.seibel.lod.core.a7.pos.DhBlockPos2D;
+import com.seibel.lod.core.a7.render.RenderBufferHandler;
 import com.seibel.lod.core.config.Config;
 import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler;
-import com.seibel.lod.core.objects.a7.data.DataFileHandler;
-import com.seibel.lod.core.objects.a7.pos.DhBlockPos2D;
-import com.seibel.lod.core.objects.a7.render.RenderBufferHandler;
 import com.seibel.lod.core.objects.math.Mat4f;
 import com.seibel.lod.core.render.a7LodRenderer;
-import com.seibel.lod.core.util.DetailDistanceUtil;
 import com.seibel.lod.core.util.EventLoop;
 import com.seibel.lod.core.util.LodUtil;
 import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
diff --git a/src/main/java/com/seibel/lod/core/objects/a7/DHWorld.java b/src/main/java/com/seibel/lod/core/a7/DHWorld.java
similarity index 95%
rename from src/main/java/com/seibel/lod/core/objects/a7/DHWorld.java
rename to src/main/java/com/seibel/lod/core/a7/DHWorld.java
index dd09030c5..53f54e00d 100644
--- a/src/main/java/com/seibel/lod/core/objects/a7/DHWorld.java
+++ b/src/main/java/com/seibel/lod/core/a7/DHWorld.java
@@ -1,9 +1,9 @@
-package com.seibel.lod.core.objects.a7;
+package com.seibel.lod.core.a7;
 
+import com.seibel.lod.core.a7.io.DHFolderHandler;
+import com.seibel.lod.core.a7.io.LevelToFileMatcher;
 import com.seibel.lod.core.config.Config;
 import com.seibel.lod.core.logging.DhLoggerBuilder;
-import com.seibel.lod.core.objects.a7.io.DHFolderHandler;
-import com.seibel.lod.core.objects.a7.io.LevelToFileMatcher;
 import com.seibel.lod.core.util.DetailDistanceUtil;
 import com.seibel.lod.core.util.EventLoop;
 import com.seibel.lod.core.util.LodUtil;
diff --git a/src/main/java/com/seibel/lod/core/objects/a7/DhChunk.java b/src/main/java/com/seibel/lod/core/a7/DhChunk.java
similarity index 98%
rename from src/main/java/com/seibel/lod/core/objects/a7/DhChunk.java
rename to src/main/java/com/seibel/lod/core/a7/DhChunk.java
index 936a68ec6..cb53a53da 100644
--- a/src/main/java/com/seibel/lod/core/objects/a7/DhChunk.java
+++ b/src/main/java/com/seibel/lod/core/a7/DhChunk.java
@@ -1,4 +1,4 @@
-package com.seibel.lod.core.objects.a7;
+package com.seibel.lod.core.a7;
 
 import com.seibel.lod.core.wrapperInterfaces.block.IBlockDetailWrapper;
 import com.seibel.lod.core.wrapperInterfaces.world.IBiomeWrapper;
diff --git a/src/main/java/com/seibel/lod/core/objects/a7/IdMappingUtil.java b/src/main/java/com/seibel/lod/core/a7/IdMappingUtil.java
similarity index 72%
rename from src/main/java/com/seibel/lod/core/objects/a7/IdMappingUtil.java
rename to src/main/java/com/seibel/lod/core/a7/IdMappingUtil.java
index 857b58f69..974d24ec8 100644
--- a/src/main/java/com/seibel/lod/core/objects/a7/IdMappingUtil.java
+++ b/src/main/java/com/seibel/lod/core/a7/IdMappingUtil.java
@@ -1,4 +1,4 @@
-package com.seibel.lod.core.objects.a7;
+package com.seibel.lod.core.a7;
 
 public class IdMappingUtil {
     public static final String BLOCKSTATE_ID_AIR = "air";
diff --git a/src/main/java/com/seibel/lod/core/objects/a7/LodQuadTree.java b/src/main/java/com/seibel/lod/core/a7/LodQuadTree.java
similarity index 98%
rename from src/main/java/com/seibel/lod/core/objects/a7/LodQuadTree.java
rename to src/main/java/com/seibel/lod/core/a7/LodQuadTree.java
index bba0bfdda..7ab266684 100644
--- a/src/main/java/com/seibel/lod/core/objects/a7/LodQuadTree.java
+++ b/src/main/java/com/seibel/lod/core/a7/LodQuadTree.java
@@ -1,19 +1,16 @@
-package com.seibel.lod.core.objects.a7;
+package com.seibel.lod.core.a7;
 
+import com.seibel.lod.core.a7.datatype.column.ColumnDatatype;
+import com.seibel.lod.core.a7.pos.DhBlockPos2D;
+import com.seibel.lod.core.a7.pos.DhSectionPos;
+import com.seibel.lod.core.a7.render.RenderDataSourceLoader;
 import com.seibel.lod.core.logging.DhLoggerBuilder;
-import com.seibel.lod.core.objects.a7.datatype.column.ColumnDatatype;
-import com.seibel.lod.core.objects.a7.datatype.full.FullDatatype;
-import com.seibel.lod.core.objects.a7.pos.DhBlockPos2D;
-import com.seibel.lod.core.objects.a7.pos.DhSectionPos;
-import com.seibel.lod.core.objects.a7.render.RenderDataSource;
-import com.seibel.lod.core.objects.a7.render.RenderDataSourceLoader;
 import com.seibel.lod.core.util.DetailDistanceUtil;
 import com.seibel.lod.core.util.LodUtil;
 import com.seibel.lod.core.util.gridList.MovableGridRingList;
 import org.apache.logging.log4j.Logger;
 
 import java.util.ArrayList;
-import java.util.Collections;
 
 // QuadTree built from several layers of 2d ring buffers
 
diff --git a/src/main/java/com/seibel/lod/core/objects/a7/LodSection.java b/src/main/java/com/seibel/lod/core/a7/LodSection.java
similarity index 91%
rename from src/main/java/com/seibel/lod/core/objects/a7/LodSection.java
rename to src/main/java/com/seibel/lod/core/a7/LodSection.java
index fafd8e83c..dc90c1108 100644
--- a/src/main/java/com/seibel/lod/core/objects/a7/LodSection.java
+++ b/src/main/java/com/seibel/lod/core/a7/LodSection.java
@@ -1,8 +1,8 @@
-package com.seibel.lod.core.objects.a7;
+package com.seibel.lod.core.a7;
 
-import com.seibel.lod.core.objects.a7.pos.DhSectionPos;
-import com.seibel.lod.core.objects.a7.render.RenderDataSource;
-import com.seibel.lod.core.objects.a7.render.RenderDataSourceLoader;
+import com.seibel.lod.core.a7.pos.DhSectionPos;
+import com.seibel.lod.core.a7.render.RenderDataSource;
+import com.seibel.lod.core.a7.render.RenderDataSourceLoader;
 
 import java.util.concurrent.CompletableFuture;
 
diff --git a/src/main/java/com/seibel/lod/core/objects/a7/ProtoSection.java b/src/main/java/com/seibel/lod/core/a7/ProtoSection.java
similarity index 93%
rename from src/main/java/com/seibel/lod/core/objects/a7/ProtoSection.java
rename to src/main/java/com/seibel/lod/core/a7/ProtoSection.java
index 64bd238fc..796a3b820 100644
--- a/src/main/java/com/seibel/lod/core/objects/a7/ProtoSection.java
+++ b/src/main/java/com/seibel/lod/core/a7/ProtoSection.java
@@ -1,4 +1,4 @@
-package com.seibel.lod.core.objects.a7;
+package com.seibel.lod.core.a7;
 
 import com.seibel.lod.core.wrapperInterfaces.block.IBlockDetailWrapper;
 import com.seibel.lod.core.wrapperInterfaces.world.IBiomeWrapper;
diff --git a/src/main/java/com/seibel/lod/core/a7/RenderDataProvider.java b/src/main/java/com/seibel/lod/core/a7/RenderDataProvider.java
new file mode 100644
index 000000000..d31be3fbf
--- /dev/null
+++ b/src/main/java/com/seibel/lod/core/a7/RenderDataProvider.java
@@ -0,0 +1,11 @@
+package com.seibel.lod.core.a7;
+
+import com.seibel.lod.core.a7.pos.DhSectionPos;
+import com.seibel.lod.core.a7.render.RenderDataSource;
+import com.seibel.lod.core.a7.render.RenderDataSourceLoader;
+
+import java.util.concurrent.CompletableFuture;
+
+public interface RenderDataProvider {
+    CompletableFuture<RenderDataSource> createRenderData(RenderDataSourceLoader renderSourceLoader, DhSectionPos pos);
+}
diff --git a/src/main/java/com/seibel/lod/core/objects/a7/Server.java b/src/main/java/com/seibel/lod/core/a7/Server.java
similarity index 80%
rename from src/main/java/com/seibel/lod/core/objects/a7/Server.java
rename to src/main/java/com/seibel/lod/core/a7/Server.java
index fc167eb7c..d22b6e573 100644
--- a/src/main/java/com/seibel/lod/core/objects/a7/Server.java
+++ b/src/main/java/com/seibel/lod/core/a7/Server.java
@@ -1,4 +1,4 @@
-package com.seibel.lod.core.objects.a7;
+package com.seibel.lod.core.a7;
 
 public class Server {
     public final boolean isSinglePlayer;
diff --git a/src/main/java/com/seibel/lod/core/objects/a7/UncheckedInterruptedException.java b/src/main/java/com/seibel/lod/core/a7/UncheckedInterruptedException.java
similarity index 95%
rename from src/main/java/com/seibel/lod/core/objects/a7/UncheckedInterruptedException.java
rename to src/main/java/com/seibel/lod/core/a7/UncheckedInterruptedException.java
index a00e89b02..3e087481d 100644
--- a/src/main/java/com/seibel/lod/core/objects/a7/UncheckedInterruptedException.java
+++ b/src/main/java/com/seibel/lod/core/a7/UncheckedInterruptedException.java
@@ -1,4 +1,4 @@
-package com.seibel.lod.core.objects.a7;
+package com.seibel.lod.core.a7;
 
 public class UncheckedInterruptedException extends RuntimeException {
     public UncheckedInterruptedException(String message) {
diff --git a/src/main/java/com/seibel/lod/core/objects/a7/data/CompleteDataContainer.java b/src/main/java/com/seibel/lod/core/a7/data/CompleteDataContainer.java
similarity index 87%
rename from src/main/java/com/seibel/lod/core/objects/a7/data/CompleteDataContainer.java
rename to src/main/java/com/seibel/lod/core/a7/data/CompleteDataContainer.java
index abcea08eb..d98214cbe 100644
--- a/src/main/java/com/seibel/lod/core/objects/a7/data/CompleteDataContainer.java
+++ b/src/main/java/com/seibel/lod/core/a7/data/CompleteDataContainer.java
@@ -1,10 +1,9 @@
-package com.seibel.lod.core.objects.a7.data;
+package com.seibel.lod.core.a7.data;
 
-import com.seibel.lod.core.objects.a7.IdMappingUtil;
-import com.seibel.lod.core.objects.a7.pos.DhSectionPos;
+import com.seibel.lod.core.a7.IdMappingUtil;
+import com.seibel.lod.core.a7.pos.DhSectionPos;
 import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper;
 
-import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.HashMap;
 
diff --git a/src/main/java/com/seibel/lod/core/objects/a7/data/Data.java b/src/main/java/com/seibel/lod/core/a7/data/Data.java
similarity index 97%
rename from src/main/java/com/seibel/lod/core/objects/a7/data/Data.java
rename to src/main/java/com/seibel/lod/core/a7/data/Data.java
index 19710c01a..4a7303fb6 100644
--- a/src/main/java/com/seibel/lod/core/objects/a7/data/Data.java
+++ b/src/main/java/com/seibel/lod/core/a7/data/Data.java
@@ -1,4 +1,4 @@
-package com.seibel.lod.core.objects.a7.data;
+package com.seibel.lod.core.a7.data;
 
 // Static class for the data format:
 // ID: blockState id    Y: Height(signed)    DP: Depth(signed?)
diff --git a/src/main/java/com/seibel/lod/core/objects/a7/data/DataFileHandler.java b/src/main/java/com/seibel/lod/core/a7/data/DataFileHandler.java
similarity index 92%
rename from src/main/java/com/seibel/lod/core/objects/a7/data/DataFileHandler.java
rename to src/main/java/com/seibel/lod/core/a7/data/DataFileHandler.java
index 6805470bb..119813ded 100644
--- a/src/main/java/com/seibel/lod/core/objects/a7/data/DataFileHandler.java
+++ b/src/main/java/com/seibel/lod/core/a7/data/DataFileHandler.java
@@ -1,18 +1,17 @@
-package com.seibel.lod.core.objects.a7.data;
+package com.seibel.lod.core.a7.data;
 
 import com.google.common.collect.HashMultimap;
-import com.seibel.lod.core.objects.a7.DHLevel;
-import com.seibel.lod.core.objects.a7.RenderDataProvider;
-import com.seibel.lod.core.objects.a7.datatype.column.DataSourceSaver;
-import com.seibel.lod.core.objects.a7.pos.DhSectionPos;
-import com.seibel.lod.core.objects.a7.render.RenderDataSource;
-import com.seibel.lod.core.objects.a7.render.RenderDataSourceLoader;
+import com.seibel.lod.core.a7.RenderDataProvider;
+import com.seibel.lod.core.a7.DHLevel;
+import com.seibel.lod.core.a7.datatype.column.DataSourceSaver;
+import com.seibel.lod.core.a7.pos.DhSectionPos;
+import com.seibel.lod.core.a7.render.RenderDataSource;
+import com.seibel.lod.core.a7.render.RenderDataSourceLoader;
 import com.seibel.lod.core.util.LodUtil;
 
 import java.io.Closeable;
 import java.io.File;
 import java.io.IOException;
-import java.rmi.server.ExportException;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutorService;
diff --git a/src/main/java/com/seibel/lod/core/objects/a7/data/DataSourceLoader.java b/src/main/java/com/seibel/lod/core/a7/data/DataSourceLoader.java
similarity index 94%
rename from src/main/java/com/seibel/lod/core/objects/a7/data/DataSourceLoader.java
rename to src/main/java/com/seibel/lod/core/a7/data/DataSourceLoader.java
index e3099b134..4057435c8 100644
--- a/src/main/java/com/seibel/lod/core/objects/a7/data/DataSourceLoader.java
+++ b/src/main/java/com/seibel/lod/core/a7/data/DataSourceLoader.java
@@ -1,8 +1,8 @@
-package com.seibel.lod.core.objects.a7.data;
+package com.seibel.lod.core.a7.data;
 
 import com.google.common.collect.HashMultimap;
-import com.seibel.lod.core.objects.a7.DHLevel;
-import com.seibel.lod.core.objects.a7.io.file.DataMetaFile;
+import com.seibel.lod.core.a7.DHLevel;
+import com.seibel.lod.core.a7.io.file.DataMetaFile;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/src/main/java/com/seibel/lod/core/objects/a7/data/LodDataSource.java b/src/main/java/com/seibel/lod/core/a7/data/LodDataSource.java
similarity index 53%
rename from src/main/java/com/seibel/lod/core/objects/a7/data/LodDataSource.java
rename to src/main/java/com/seibel/lod/core/a7/data/LodDataSource.java
index 33a3e35f7..21dd067d2 100644
--- a/src/main/java/com/seibel/lod/core/objects/a7/data/LodDataSource.java
+++ b/src/main/java/com/seibel/lod/core/a7/data/LodDataSource.java
@@ -1,9 +1,6 @@
-package com.seibel.lod.core.objects.a7.data;
+package com.seibel.lod.core.a7.data;
 
-import com.seibel.lod.core.objects.a7.pos.DhSectionPos;
-
-import java.util.HashMap;
-import java.util.Objects;
+import com.seibel.lod.core.a7.pos.DhSectionPos;
 
 public interface LodDataSource {
     DataSourceLoader getLatestLoader();
diff --git a/src/main/java/com/seibel/lod/core/objects/a7/data/OldFileConverter.java b/src/main/java/com/seibel/lod/core/a7/data/OldFileConverter.java
similarity index 62%
rename from src/main/java/com/seibel/lod/core/objects/a7/data/OldFileConverter.java
rename to src/main/java/com/seibel/lod/core/a7/data/OldFileConverter.java
index 8e8082d2b..473a9ea56 100644
--- a/src/main/java/com/seibel/lod/core/objects/a7/data/OldFileConverter.java
+++ b/src/main/java/com/seibel/lod/core/a7/data/OldFileConverter.java
@@ -1,6 +1,6 @@
-package com.seibel.lod.core.objects.a7.data;
+package com.seibel.lod.core.a7.data;
 
-import com.seibel.lod.core.objects.a7.DHLevel;
+import com.seibel.lod.core.a7.DHLevel;
 
 import java.io.File;
 import java.util.List;
diff --git a/src/main/java/com/seibel/lod/core/objects/a7/datatype/column/Alpha6DataLoader.java b/src/main/java/com/seibel/lod/core/a7/datatype/column/Alpha6DataLoader.java
similarity index 90%
rename from src/main/java/com/seibel/lod/core/objects/a7/datatype/column/Alpha6DataLoader.java
rename to src/main/java/com/seibel/lod/core/a7/datatype/column/Alpha6DataLoader.java
index 2c9ca7ff0..74231cee8 100644
--- a/src/main/java/com/seibel/lod/core/objects/a7/datatype/column/Alpha6DataLoader.java
+++ b/src/main/java/com/seibel/lod/core/a7/datatype/column/Alpha6DataLoader.java
@@ -1,10 +1,13 @@
-package com.seibel.lod.core.objects.a7.datatype.column;
+package com.seibel.lod.core.a7.datatype.column;
 
+import com.seibel.lod.core.a7.data.DataFileHandler;
+import com.seibel.lod.core.a7.data.LodDataSource;
+import com.seibel.lod.core.a7.data.OldFileConverter;
+import com.seibel.lod.core.a7.pos.DhSectionPos;
 import com.seibel.lod.core.enums.config.EVerticalQuality;
-import com.seibel.lod.core.objects.a7.DHLevel;
+import com.seibel.lod.core.a7.DHLevel;
 import com.seibel.lod.core.objects.a7.data.*;
-import com.seibel.lod.core.objects.a7.io.file.DataMetaFile;
-import com.seibel.lod.core.objects.a7.pos.DhSectionPos;
+import com.seibel.lod.core.a7.io.file.DataMetaFile;
 import org.apache.commons.compress.compressors.xz.XZCompressorInputStream;
 
 import java.io.*;
diff --git a/src/main/java/com/seibel/lod/core/objects/a7/datatype/column/ColumnArrayView.java b/src/main/java/com/seibel/lod/core/a7/datatype/column/ColumnArrayView.java
similarity index 98%
rename from src/main/java/com/seibel/lod/core/objects/a7/datatype/column/ColumnArrayView.java
rename to src/main/java/com/seibel/lod/core/a7/datatype/column/ColumnArrayView.java
index b4b61b596..e3e33ca0c 100644
--- a/src/main/java/com/seibel/lod/core/objects/a7/datatype/column/ColumnArrayView.java
+++ b/src/main/java/com/seibel/lod/core/a7/datatype/column/ColumnArrayView.java
@@ -1,8 +1,7 @@
-package com.seibel.lod.core.objects.a7.datatype.column;
+package com.seibel.lod.core.a7.datatype.column;
 
 
 import java.util.Arrays;
-import java.util.Iterator;
 
 public final class ColumnArrayView implements ColumnDataView {
     private final long[] data;
diff --git a/src/main/java/com/seibel/lod/core/objects/a7/datatype/column/ColumnBox.java b/src/main/java/com/seibel/lod/core/a7/datatype/column/ColumnBox.java
similarity index 99%
rename from src/main/java/com/seibel/lod/core/objects/a7/datatype/column/ColumnBox.java
rename to src/main/java/com/seibel/lod/core/a7/datatype/column/ColumnBox.java
index e306d4371..5f72190b1 100644
--- a/src/main/java/com/seibel/lod/core/objects/a7/datatype/column/ColumnBox.java
+++ b/src/main/java/com/seibel/lod/core/a7/datatype/column/ColumnBox.java
@@ -17,7 +17,7 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.seibel.lod.core.objects.a7.datatype.column;
+package com.seibel.lod.core.a7.datatype.column;
 
 import com.seibel.lod.core.builders.lodBuilding.bufferBuilding.LodQuadBuilder;
 import com.seibel.lod.core.enums.ELodDirection;
diff --git a/src/main/java/com/seibel/lod/core/objects/a7/datatype/column/ColumnDataLoader.java b/src/main/java/com/seibel/lod/core/a7/datatype/column/ColumnDataLoader.java
similarity index 85%
rename from src/main/java/com/seibel/lod/core/objects/a7/datatype/column/ColumnDataLoader.java
rename to src/main/java/com/seibel/lod/core/a7/datatype/column/ColumnDataLoader.java
index cc4e38c34..c3e296a17 100644
--- a/src/main/java/com/seibel/lod/core/objects/a7/datatype/column/ColumnDataLoader.java
+++ b/src/main/java/com/seibel/lod/core/a7/datatype/column/ColumnDataLoader.java
@@ -1,13 +1,13 @@
-package com.seibel.lod.core.objects.a7.datatype.column;
+package com.seibel.lod.core.a7.datatype.column;
 
+import com.seibel.lod.core.a7.data.DataFileHandler;
+import com.seibel.lod.core.a7.data.LodDataSource;
+import com.seibel.lod.core.a7.io.MetaFile;
+import com.seibel.lod.core.a7.pos.DhSectionPos;
 import com.seibel.lod.core.config.Config;
 import com.seibel.lod.core.enums.config.EVerticalQuality;
-import com.seibel.lod.core.objects.a7.DHLevel;
-import com.seibel.lod.core.objects.a7.data.DataFileHandler;
-import com.seibel.lod.core.objects.a7.data.LodDataSource;
-import com.seibel.lod.core.objects.a7.io.MetaFile;
-import com.seibel.lod.core.objects.a7.io.file.DataMetaFile;
-import com.seibel.lod.core.objects.a7.pos.DhSectionPos;
+import com.seibel.lod.core.a7.DHLevel;
+import com.seibel.lod.core.a7.io.file.DataMetaFile;
 
 import java.io.*;
 import java.util.ArrayList;
diff --git a/src/main/java/com/seibel/lod/core/objects/a7/datatype/column/ColumnDataPoint.java b/src/main/java/com/seibel/lod/core/a7/datatype/column/ColumnDataPoint.java
similarity index 99%
rename from src/main/java/com/seibel/lod/core/objects/a7/datatype/column/ColumnDataPoint.java
rename to src/main/java/com/seibel/lod/core/a7/datatype/column/ColumnDataPoint.java
index bb2d23895..222707ec6 100644
--- a/src/main/java/com/seibel/lod/core/objects/a7/datatype/column/ColumnDataPoint.java
+++ b/src/main/java/com/seibel/lod/core/a7/datatype/column/ColumnDataPoint.java
@@ -17,7 +17,7 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.seibel.lod.core.objects.a7.datatype.column;
+package com.seibel.lod.core.a7.datatype.column;
 
 import com.seibel.lod.core.logging.SpamReducedLogger;
 import com.seibel.lod.core.util.ColorUtil;
diff --git a/src/main/java/com/seibel/lod/core/objects/a7/datatype/column/ColumnDataView.java b/src/main/java/com/seibel/lod/core/a7/datatype/column/ColumnDataView.java
similarity index 92%
rename from src/main/java/com/seibel/lod/core/objects/a7/datatype/column/ColumnDataView.java
rename to src/main/java/com/seibel/lod/core/a7/datatype/column/ColumnDataView.java
index baba3c272..ffefe4616 100644
--- a/src/main/java/com/seibel/lod/core/objects/a7/datatype/column/ColumnDataView.java
+++ b/src/main/java/com/seibel/lod/core/a7/datatype/column/ColumnDataView.java
@@ -1,4 +1,4 @@
-package com.seibel.lod.core.objects.a7.datatype.column;
+package com.seibel.lod.core.a7.datatype.column;
 
 import java.util.Iterator;
 
diff --git a/src/main/java/com/seibel/lod/core/objects/a7/datatype/column/ColumnDatatype.java b/src/main/java/com/seibel/lod/core/a7/datatype/column/ColumnDatatype.java
similarity index 96%
rename from src/main/java/com/seibel/lod/core/objects/a7/datatype/column/ColumnDatatype.java
rename to src/main/java/com/seibel/lod/core/a7/datatype/column/ColumnDatatype.java
index 210ed26c7..e87fa0746 100644
--- a/src/main/java/com/seibel/lod/core/objects/a7/datatype/column/ColumnDatatype.java
+++ b/src/main/java/com/seibel/lod/core/a7/datatype/column/ColumnDatatype.java
@@ -1,14 +1,14 @@
-package com.seibel.lod.core.objects.a7.datatype.column;
+package com.seibel.lod.core.a7.datatype.column;
 
+import com.seibel.lod.core.a7.data.DataSourceLoader;
+import com.seibel.lod.core.a7.pos.DhSectionPos;
+import com.seibel.lod.core.a7.render.RenderBuffer;
 import com.seibel.lod.core.enums.ELodDirection;
 import com.seibel.lod.core.objects.LodDataView;
-import com.seibel.lod.core.objects.a7.DHLevel;
-import com.seibel.lod.core.objects.a7.LodQuadTree;
-import com.seibel.lod.core.objects.a7.LodSection;
-import com.seibel.lod.core.objects.a7.data.DataSourceLoader;
-import com.seibel.lod.core.objects.a7.pos.DhSectionPos;
-import com.seibel.lod.core.objects.a7.render.RenderDataSource;
-import com.seibel.lod.core.objects.a7.render.RenderBuffer;
+import com.seibel.lod.core.a7.DHLevel;
+import com.seibel.lod.core.a7.LodQuadTree;
+import com.seibel.lod.core.a7.LodSection;
+import com.seibel.lod.core.a7.render.RenderDataSource;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
diff --git a/src/main/java/com/seibel/lod/core/objects/a7/datatype/column/ColumnQuadView.java b/src/main/java/com/seibel/lod/core/a7/datatype/column/ColumnQuadView.java
similarity index 98%
rename from src/main/java/com/seibel/lod/core/objects/a7/datatype/column/ColumnQuadView.java
rename to src/main/java/com/seibel/lod/core/a7/datatype/column/ColumnQuadView.java
index e4e8d21c4..a4d06130e 100644
--- a/src/main/java/com/seibel/lod/core/objects/a7/datatype/column/ColumnQuadView.java
+++ b/src/main/java/com/seibel/lod/core/a7/datatype/column/ColumnQuadView.java
@@ -1,6 +1,4 @@
-package com.seibel.lod.core.objects.a7.datatype.column;
-
-import java.util.Iterator;
+package com.seibel.lod.core.a7.datatype.column;
 
 public class ColumnQuadView implements ColumnDataView {
     private final long[] data;
diff --git a/src/main/java/com/seibel/lod/core/objects/a7/datatype/column/ColumnRenderBuffer.java b/src/main/java/com/seibel/lod/core/a7/datatype/column/ColumnRenderBuffer.java
similarity index 98%
rename from src/main/java/com/seibel/lod/core/objects/a7/datatype/column/ColumnRenderBuffer.java
rename to src/main/java/com/seibel/lod/core/a7/datatype/column/ColumnRenderBuffer.java
index 42070ae91..6ff4e56c2 100644
--- a/src/main/java/com/seibel/lod/core/objects/a7/datatype/column/ColumnRenderBuffer.java
+++ b/src/main/java/com/seibel/lod/core/a7/datatype/column/ColumnRenderBuffer.java
@@ -1,5 +1,7 @@
-package com.seibel.lod.core.objects.a7.datatype.column;
+package com.seibel.lod.core.a7.datatype.column;
 
+import com.seibel.lod.core.a7.UncheckedInterruptedException;
+import com.seibel.lod.core.a7.render.RenderBuffer;
 import com.seibel.lod.core.config.Config;
 import com.seibel.lod.core.api.internal.ClientApi;
 import com.seibel.lod.core.builders.lodBuilding.LodBuilder;
@@ -12,8 +14,6 @@ import com.seibel.lod.core.enums.rendering.EDebugMode;
 import com.seibel.lod.core.enums.rendering.EGLProxyContext;
 import com.seibel.lod.core.logging.ConfigBasedLogger;
 import com.seibel.lod.core.logging.DhLoggerBuilder;
-import com.seibel.lod.core.objects.a7.UncheckedInterruptedException;
-import com.seibel.lod.core.objects.a7.render.RenderBuffer;
 import com.seibel.lod.core.render.GLProxy;
 import com.seibel.lod.core.render.LodRenderProgram;
 import com.seibel.lod.core.render.LodRenderer;
diff --git a/src/main/java/com/seibel/lod/core/objects/a7/datatype/column/ColumnRenderLoader.java b/src/main/java/com/seibel/lod/core/a7/datatype/column/ColumnRenderLoader.java
similarity index 95%
rename from src/main/java/com/seibel/lod/core/objects/a7/datatype/column/ColumnRenderLoader.java
rename to src/main/java/com/seibel/lod/core/a7/datatype/column/ColumnRenderLoader.java
index fdd2da6d4..ace4ca734 100644
--- a/src/main/java/com/seibel/lod/core/objects/a7/datatype/column/ColumnRenderLoader.java
+++ b/src/main/java/com/seibel/lod/core/a7/datatype/column/ColumnRenderLoader.java
@@ -1,12 +1,12 @@
-package com.seibel.lod.core.objects.a7.datatype.column;
+package com.seibel.lod.core.a7.datatype.column;
 
-import com.seibel.lod.core.objects.a7.DHLevel;
+import com.seibel.lod.core.a7.data.LodDataSource;
+import com.seibel.lod.core.a7.datatype.full.FullDatatype;
+import com.seibel.lod.core.a7.pos.DhSectionPos;
+import com.seibel.lod.core.a7.render.RenderDataSource;
+import com.seibel.lod.core.a7.render.RenderDataSourceLoader;
+import com.seibel.lod.core.a7.DHLevel;
 import com.seibel.lod.core.objects.a7.data.DataFile;
-import com.seibel.lod.core.objects.a7.data.LodDataSource;
-import com.seibel.lod.core.objects.a7.datatype.full.FullDatatype;
-import com.seibel.lod.core.objects.a7.pos.DhSectionPos;
-import com.seibel.lod.core.objects.a7.render.RenderDataSource;
-import com.seibel.lod.core.objects.a7.render.RenderDataSourceLoader;
 import com.seibel.lod.core.util.DetailDistanceUtil;
 import com.seibel.lod.core.util.LodUtil;
 
@@ -15,7 +15,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Objects;
 
-class ColumnRenderLoader extends RenderDataSourceLoader  {
+class ColumnRenderLoader extends RenderDataSourceLoader {
     public ColumnRenderLoader() {
         super(4);
     }
diff --git a/src/main/java/com/seibel/lod/core/objects/a7/datatype/column/DataSourceSaver.java b/src/main/java/com/seibel/lod/core/a7/datatype/column/DataSourceSaver.java
similarity index 70%
rename from src/main/java/com/seibel/lod/core/objects/a7/datatype/column/DataSourceSaver.java
rename to src/main/java/com/seibel/lod/core/a7/datatype/column/DataSourceSaver.java
index 2a784a292..6e871bdbc 100644
--- a/src/main/java/com/seibel/lod/core/objects/a7/datatype/column/DataSourceSaver.java
+++ b/src/main/java/com/seibel/lod/core/a7/datatype/column/DataSourceSaver.java
@@ -1,13 +1,12 @@
-package com.seibel.lod.core.objects.a7.datatype.column;
+package com.seibel.lod.core.a7.datatype.column;
 
-import com.seibel.lod.core.objects.a7.DHLevel;
-import com.seibel.lod.core.objects.a7.data.DataFileHandler;
-import com.seibel.lod.core.objects.a7.data.DataSourceLoader;
-import com.seibel.lod.core.objects.a7.data.LodDataSource;
-import com.seibel.lod.core.objects.a7.io.MetaFile;
-import com.seibel.lod.core.objects.a7.pos.DhSectionPos;
+import com.seibel.lod.core.a7.data.DataFileHandler;
+import com.seibel.lod.core.a7.data.DataSourceLoader;
+import com.seibel.lod.core.a7.data.LodDataSource;
+import com.seibel.lod.core.a7.io.MetaFile;
+import com.seibel.lod.core.a7.pos.DhSectionPos;
+import com.seibel.lod.core.a7.DHLevel;
 
-import java.io.DataOutputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/src/main/java/com/seibel/lod/core/objects/a7/datatype/column/IColumnDatatype.java b/src/main/java/com/seibel/lod/core/a7/datatype/column/IColumnDatatype.java
similarity index 92%
rename from src/main/java/com/seibel/lod/core/objects/a7/datatype/column/IColumnDatatype.java
rename to src/main/java/com/seibel/lod/core/a7/datatype/column/IColumnDatatype.java
index 9adb4b047..2d13609a4 100644
--- a/src/main/java/com/seibel/lod/core/objects/a7/datatype/column/IColumnDatatype.java
+++ b/src/main/java/com/seibel/lod/core/a7/datatype/column/IColumnDatatype.java
@@ -1,7 +1,7 @@
-package com.seibel.lod.core.objects.a7.datatype.column;
+package com.seibel.lod.core.a7.datatype.column;
 
+import com.seibel.lod.core.a7.data.LodDataSource;
 import com.seibel.lod.core.objects.LodDataView;
-import com.seibel.lod.core.objects.a7.data.LodDataSource;
 
 public interface IColumnDatatype extends LodDataSource {
     byte getDetailOffset();
diff --git a/src/main/java/com/seibel/lod/core/objects/a7/datatype/column/OldColumnDatatype.java b/src/main/java/com/seibel/lod/core/a7/datatype/column/OldColumnDatatype.java
similarity index 97%
rename from src/main/java/com/seibel/lod/core/objects/a7/datatype/column/OldColumnDatatype.java
rename to src/main/java/com/seibel/lod/core/a7/datatype/column/OldColumnDatatype.java
index 83496219f..3310e2f5b 100644
--- a/src/main/java/com/seibel/lod/core/objects/a7/datatype/column/OldColumnDatatype.java
+++ b/src/main/java/com/seibel/lod/core/a7/datatype/column/OldColumnDatatype.java
@@ -1,9 +1,9 @@
-package com.seibel.lod.core.objects.a7.datatype.column;
+package com.seibel.lod.core.a7.datatype.column;
 
+import com.seibel.lod.core.a7.data.DataSourceLoader;
+import com.seibel.lod.core.a7.pos.DhSectionPos;
 import com.seibel.lod.core.objects.LodDataView;
-import com.seibel.lod.core.objects.a7.DHLevel;
-import com.seibel.lod.core.objects.a7.data.DataSourceLoader;
-import com.seibel.lod.core.objects.a7.pos.DhSectionPos;
+import com.seibel.lod.core.a7.DHLevel;
 
 import java.io.DataInputStream;
 import java.io.IOException;
diff --git a/src/main/java/com/seibel/lod/core/objects/a7/datatype/column/OldDataSourceLoader.java b/src/main/java/com/seibel/lod/core/a7/datatype/column/OldDataSourceLoader.java
similarity index 70%
rename from src/main/java/com/seibel/lod/core/objects/a7/datatype/column/OldDataSourceLoader.java
rename to src/main/java/com/seibel/lod/core/a7/datatype/column/OldDataSourceLoader.java
index c3524f1ab..3a84fd4b7 100644
--- a/src/main/java/com/seibel/lod/core/objects/a7/datatype/column/OldDataSourceLoader.java
+++ b/src/main/java/com/seibel/lod/core/a7/datatype/column/OldDataSourceLoader.java
@@ -1,7 +1,7 @@
-package com.seibel.lod.core.objects.a7.datatype.column;
+package com.seibel.lod.core.a7.datatype.column;
 
-import com.seibel.lod.core.objects.a7.data.DataSourceLoader;
-import com.seibel.lod.core.objects.a7.data.LodDataSource;
+import com.seibel.lod.core.a7.data.DataSourceLoader;
+import com.seibel.lod.core.a7.data.LodDataSource;
 
 public abstract class OldDataSourceLoader extends DataSourceLoader {
 
diff --git a/src/main/java/com/seibel/lod/core/objects/a7/datatype/full/FullDatatype.java b/src/main/java/com/seibel/lod/core/a7/datatype/full/FullDatatype.java
similarity index 56%
rename from src/main/java/com/seibel/lod/core/objects/a7/datatype/full/FullDatatype.java
rename to src/main/java/com/seibel/lod/core/a7/datatype/full/FullDatatype.java
index 55cc25ccb..826ab55ad 100644
--- a/src/main/java/com/seibel/lod/core/objects/a7/datatype/full/FullDatatype.java
+++ b/src/main/java/com/seibel/lod/core/a7/datatype/full/FullDatatype.java
@@ -1,8 +1,8 @@
-package com.seibel.lod.core.objects.a7.datatype.full;
+package com.seibel.lod.core.a7.datatype.full;
 
-import com.seibel.lod.core.objects.a7.data.DataSourceLoader;
-import com.seibel.lod.core.objects.a7.data.LodDataSource;
-import com.seibel.lod.core.objects.a7.pos.DhSectionPos;
+import com.seibel.lod.core.a7.data.DataSourceLoader;
+import com.seibel.lod.core.a7.data.LodDataSource;
+import com.seibel.lod.core.a7.pos.DhSectionPos;
 
 public class FullDatatype implements LodDataSource {
     @Override
diff --git a/src/main/java/com/seibel/lod/core/objects/a7/io/DHFolderHandler.java b/src/main/java/com/seibel/lod/core/a7/io/DHFolderHandler.java
similarity index 99%
rename from src/main/java/com/seibel/lod/core/objects/a7/io/DHFolderHandler.java
rename to src/main/java/com/seibel/lod/core/a7/io/DHFolderHandler.java
index 6679ce459..914901700 100644
--- a/src/main/java/com/seibel/lod/core/objects/a7/io/DHFolderHandler.java
+++ b/src/main/java/com/seibel/lod/core/a7/io/DHFolderHandler.java
@@ -1,4 +1,4 @@
-package com.seibel.lod.core.objects.a7.io;
+package com.seibel.lod.core.a7.io;
 
 import com.seibel.lod.core.config.Config;
 import com.seibel.lod.core.enums.config.EServerFolderNameMode;
diff --git a/src/main/java/com/seibel/lod/core/objects/a7/io/DataSourceProvider.java b/src/main/java/com/seibel/lod/core/a7/io/DataSourceProvider.java
similarity index 53%
rename from src/main/java/com/seibel/lod/core/objects/a7/io/DataSourceProvider.java
rename to src/main/java/com/seibel/lod/core/a7/io/DataSourceProvider.java
index dc1689619..17718105f 100644
--- a/src/main/java/com/seibel/lod/core/objects/a7/io/DataSourceProvider.java
+++ b/src/main/java/com/seibel/lod/core/a7/io/DataSourceProvider.java
@@ -1,8 +1,8 @@
-package com.seibel.lod.core.objects.a7.io;
+package com.seibel.lod.core.a7.io;
 
-import com.seibel.lod.core.objects.a7.data.LodDataSource;
-import com.seibel.lod.core.objects.a7.datatype.full.FullDatatype;
-import com.seibel.lod.core.objects.a7.pos.DhSectionPos;
+import com.seibel.lod.core.a7.data.LodDataSource;
+import com.seibel.lod.core.a7.datatype.full.FullDatatype;
+import com.seibel.lod.core.a7.pos.DhSectionPos;
 
 import java.util.concurrent.CompletableFuture;
 
diff --git a/src/main/java/com/seibel/lod/core/a7/io/FileScanner.java b/src/main/java/com/seibel/lod/core/a7/io/FileScanner.java
new file mode 100644
index 000000000..34518e7d2
--- /dev/null
+++ b/src/main/java/com/seibel/lod/core/a7/io/FileScanner.java
@@ -0,0 +1,4 @@
+package com.seibel.lod.core.a7.io;
+
+public class FileScanner {
+}
diff --git a/src/main/java/com/seibel/lod/core/a7/io/LevelFileHandler.java b/src/main/java/com/seibel/lod/core/a7/io/LevelFileHandler.java
new file mode 100644
index 000000000..9371e2055
--- /dev/null
+++ b/src/main/java/com/seibel/lod/core/a7/io/LevelFileHandler.java
@@ -0,0 +1,4 @@
+package com.seibel.lod.core.a7.io;
+
+public class LevelFileHandler {
+}
diff --git a/src/main/java/com/seibel/lod/core/objects/a7/io/LevelToFileMatcher.java b/src/main/java/com/seibel/lod/core/a7/io/LevelToFileMatcher.java
similarity index 99%
rename from src/main/java/com/seibel/lod/core/objects/a7/io/LevelToFileMatcher.java
rename to src/main/java/com/seibel/lod/core/a7/io/LevelToFileMatcher.java
index f6dee64c6..0e1524b5c 100644
--- a/src/main/java/com/seibel/lod/core/objects/a7/io/LevelToFileMatcher.java
+++ b/src/main/java/com/seibel/lod/core/a7/io/LevelToFileMatcher.java
@@ -1,4 +1,4 @@
-package com.seibel.lod.core.objects.a7.io;
+package com.seibel.lod.core.a7.io;
 
 import com.seibel.lod.core.api.internal.InternalApiShared;
 import com.seibel.lod.core.builders.lodBuilding.LodBuilder;
@@ -14,8 +14,8 @@ import com.seibel.lod.core.handlers.dimensionFinder.SubDimCompare;
 import com.seibel.lod.core.logging.ConfigBasedLogger;
 import com.seibel.lod.core.objects.DHChunkPos;
 import com.seibel.lod.core.objects.DHRegionPos;
-import com.seibel.lod.core.objects.a7.DHLevel;
-import com.seibel.lod.core.objects.a7.DHWorld;
+import com.seibel.lod.core.a7.DHLevel;
+import com.seibel.lod.core.a7.DHWorld;
 import com.seibel.lod.core.objects.lod.LodDimension;
 import com.seibel.lod.core.objects.lod.LodRegion;
 import com.seibel.lod.core.util.DataPointUtil;
diff --git a/src/main/java/com/seibel/lod/core/objects/a7/io/MetaFile.java b/src/main/java/com/seibel/lod/core/a7/io/MetaFile.java
similarity index 97%
rename from src/main/java/com/seibel/lod/core/objects/a7/io/MetaFile.java
rename to src/main/java/com/seibel/lod/core/a7/io/MetaFile.java
index b4e1514f1..8c085abde 100644
--- a/src/main/java/com/seibel/lod/core/objects/a7/io/MetaFile.java
+++ b/src/main/java/com/seibel/lod/core/a7/io/MetaFile.java
@@ -1,4 +1,4 @@
-package com.seibel.lod.core.objects.a7.io;
+package com.seibel.lod.core.a7.io;
 
 import java.io.*;
 import java.nio.ByteBuffer;
@@ -12,10 +12,9 @@ import java.util.function.BiConsumer;
 import java.util.zip.Adler32;
 import java.util.zip.CheckedOutputStream;
 
-import com.seibel.lod.core.objects.a7.data.DataSourceLoader;
-import com.seibel.lod.core.objects.a7.pos.DhSectionPos;
+import com.seibel.lod.core.a7.data.DataSourceLoader;
+import com.seibel.lod.core.a7.pos.DhSectionPos;
 import com.seibel.lod.core.util.LodUtil;
-import net.fabricmc.mapping.tree.Mapped;
 
 public class MetaFile {
     //Metadata format:
diff --git a/src/main/java/com/seibel/lod/core/objects/a7/io/file/DataMetaFile.java b/src/main/java/com/seibel/lod/core/a7/io/file/DataMetaFile.java
similarity index 94%
rename from src/main/java/com/seibel/lod/core/objects/a7/io/file/DataMetaFile.java
rename to src/main/java/com/seibel/lod/core/a7/io/file/DataMetaFile.java
index 778ffab27..ac4781df8 100644
--- a/src/main/java/com/seibel/lod/core/objects/a7/io/file/DataMetaFile.java
+++ b/src/main/java/com/seibel/lod/core/a7/io/file/DataMetaFile.java
@@ -1,4 +1,4 @@
-package com.seibel.lod.core.objects.a7.io.file;
+package com.seibel.lod.core.a7.io.file;
 
 import java.io.*;
 import java.lang.ref.SoftReference;
@@ -11,15 +11,15 @@ import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.function.BiConsumer;
 
+import com.seibel.lod.core.a7.data.DataSourceLoader;
+import com.seibel.lod.core.a7.data.LodDataSource;
+import com.seibel.lod.core.a7.datatype.full.FullDatatype;
+import com.seibel.lod.core.a7.io.MetaFile;
+import com.seibel.lod.core.a7.pos.DhSectionPos;
 import com.seibel.lod.core.logging.DhLoggerBuilder;
-import com.seibel.lod.core.objects.a7.DHLevel;
-import com.seibel.lod.core.objects.a7.data.DataSourceLoader;
-import com.seibel.lod.core.objects.a7.data.LodDataSource;
-import com.seibel.lod.core.objects.a7.datatype.column.DataSourceSaver;
-import com.seibel.lod.core.objects.a7.datatype.column.OldDataSourceLoader;
-import com.seibel.lod.core.objects.a7.datatype.full.FullDatatype;
-import com.seibel.lod.core.objects.a7.io.MetaFile;
-import com.seibel.lod.core.objects.a7.pos.DhSectionPos;
+import com.seibel.lod.core.a7.DHLevel;
+import com.seibel.lod.core.a7.datatype.column.DataSourceSaver;
+import com.seibel.lod.core.a7.datatype.column.OldDataSourceLoader;
 import com.seibel.lod.core.util.LodUtil;
 import org.apache.logging.log4j.Logger;
 
diff --git a/src/main/java/com/seibel/lod/core/objects/a7/io/file/LocalDataFileHandler.java b/src/main/java/com/seibel/lod/core/a7/io/file/LocalDataFileHandler.java
similarity index 94%
rename from src/main/java/com/seibel/lod/core/objects/a7/io/file/LocalDataFileHandler.java
rename to src/main/java/com/seibel/lod/core/a7/io/file/LocalDataFileHandler.java
index feeb0a758..ce1764f6f 100644
--- a/src/main/java/com/seibel/lod/core/objects/a7/io/file/LocalDataFileHandler.java
+++ b/src/main/java/com/seibel/lod/core/a7/io/file/LocalDataFileHandler.java
@@ -1,12 +1,12 @@
-package com.seibel.lod.core.objects.a7.io.file;
+package com.seibel.lod.core.a7.io.file;
 
 import com.google.common.collect.HashMultimap;
+import com.seibel.lod.core.a7.data.LodDataSource;
+import com.seibel.lod.core.a7.datatype.full.FullDatatype;
+import com.seibel.lod.core.a7.io.DataSourceProvider;
+import com.seibel.lod.core.a7.pos.DhSectionPos;
 import com.seibel.lod.core.logging.DhLoggerBuilder;
-import com.seibel.lod.core.objects.a7.DHLevel;
-import com.seibel.lod.core.objects.a7.data.LodDataSource;
-import com.seibel.lod.core.objects.a7.datatype.full.FullDatatype;
-import com.seibel.lod.core.objects.a7.io.DataSourceProvider;
-import com.seibel.lod.core.objects.a7.pos.DhSectionPos;
+import com.seibel.lod.core.a7.DHLevel;
 import com.seibel.lod.core.util.LodUtil;
 import org.apache.logging.log4j.Logger;
 
diff --git a/src/main/java/com/seibel/lod/core/objects/a7/io/render/RenderFileHandler.java b/src/main/java/com/seibel/lod/core/a7/io/render/RenderFileHandler.java
similarity index 66%
rename from src/main/java/com/seibel/lod/core/objects/a7/io/render/RenderFileHandler.java
rename to src/main/java/com/seibel/lod/core/a7/io/render/RenderFileHandler.java
index afbc77f9a..136981c76 100644
--- a/src/main/java/com/seibel/lod/core/objects/a7/io/render/RenderFileHandler.java
+++ b/src/main/java/com/seibel/lod/core/a7/io/render/RenderFileHandler.java
@@ -1,14 +1,12 @@
-package com.seibel.lod.core.objects.a7.io.render;
+package com.seibel.lod.core.a7.io.render;
 
+import com.seibel.lod.core.a7.RenderDataProvider;
+import com.seibel.lod.core.a7.datatype.full.FullDatatype;
+import com.seibel.lod.core.a7.io.DataSourceProvider;
+import com.seibel.lod.core.a7.pos.DhSectionPos;
 import com.seibel.lod.core.logging.DhLoggerBuilder;
-import com.seibel.lod.core.objects.a7.RenderDataProvider;
-import com.seibel.lod.core.objects.a7.data.DataSourceLoader;
-import com.seibel.lod.core.objects.a7.data.LodDataSource;
-import com.seibel.lod.core.objects.a7.datatype.full.FullDatatype;
-import com.seibel.lod.core.objects.a7.io.DataSourceProvider;
-import com.seibel.lod.core.objects.a7.pos.DhSectionPos;
-import com.seibel.lod.core.objects.a7.render.RenderDataSource;
-import com.seibel.lod.core.objects.a7.render.RenderDataSourceLoader;
+import com.seibel.lod.core.a7.render.RenderDataSource;
+import com.seibel.lod.core.a7.render.RenderDataSourceLoader;
 import com.seibel.lod.core.util.LodUtil;
 import org.apache.logging.log4j.Logger;
 
diff --git a/src/main/java/com/seibel/lod/core/objects/a7/io/render/RenderMetaFile.java b/src/main/java/com/seibel/lod/core/a7/io/render/RenderMetaFile.java
similarity index 64%
rename from src/main/java/com/seibel/lod/core/objects/a7/io/render/RenderMetaFile.java
rename to src/main/java/com/seibel/lod/core/a7/io/render/RenderMetaFile.java
index 69e10ea12..3ad35fe0e 100644
--- a/src/main/java/com/seibel/lod/core/objects/a7/io/render/RenderMetaFile.java
+++ b/src/main/java/com/seibel/lod/core/a7/io/render/RenderMetaFile.java
@@ -1,7 +1,7 @@
-package com.seibel.lod.core.objects.a7.io.render;
+package com.seibel.lod.core.a7.io.render;
 
-import com.seibel.lod.core.objects.a7.io.MetaFile;
-import com.seibel.lod.core.objects.a7.pos.DhSectionPos;
+import com.seibel.lod.core.a7.io.MetaFile;
+import com.seibel.lod.core.a7.pos.DhSectionPos;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/src/main/java/com/seibel/lod/core/objects/a7/pos/DhBlockPos2D.java b/src/main/java/com/seibel/lod/core/a7/pos/DhBlockPos2D.java
similarity index 96%
rename from src/main/java/com/seibel/lod/core/objects/a7/pos/DhBlockPos2D.java
rename to src/main/java/com/seibel/lod/core/a7/pos/DhBlockPos2D.java
index 8e3ad19d7..7e1305f9f 100644
--- a/src/main/java/com/seibel/lod/core/objects/a7/pos/DhBlockPos2D.java
+++ b/src/main/java/com/seibel/lod/core/a7/pos/DhBlockPos2D.java
@@ -1,4 +1,4 @@
-package com.seibel.lod.core.objects.a7.pos;
+package com.seibel.lod.core.a7.pos;
 
 import com.seibel.lod.core.objects.DHBlockPos;
 import com.seibel.lod.core.objects.Pos2D;
diff --git a/src/main/java/com/seibel/lod/core/objects/a7/pos/DhLodPos.java b/src/main/java/com/seibel/lod/core/a7/pos/DhLodPos.java
similarity index 95%
rename from src/main/java/com/seibel/lod/core/objects/a7/pos/DhLodPos.java
rename to src/main/java/com/seibel/lod/core/a7/pos/DhLodPos.java
index 3f32be619..b4c79abbc 100644
--- a/src/main/java/com/seibel/lod/core/objects/a7/pos/DhLodPos.java
+++ b/src/main/java/com/seibel/lod/core/a7/pos/DhLodPos.java
@@ -1,6 +1,5 @@
-package com.seibel.lod.core.objects.a7.pos;
+package com.seibel.lod.core.a7.pos;
 
-import com.seibel.lod.core.objects.DHBlockPos;
 import com.seibel.lod.core.util.LodUtil;
 
 import java.util.Objects;
diff --git a/src/main/java/com/seibel/lod/core/objects/a7/pos/DhLodUnit.java b/src/main/java/com/seibel/lod/core/a7/pos/DhLodUnit.java
similarity index 94%
rename from src/main/java/com/seibel/lod/core/objects/a7/pos/DhLodUnit.java
rename to src/main/java/com/seibel/lod/core/a7/pos/DhLodUnit.java
index 1d6b335e9..4e1cbe0a6 100644
--- a/src/main/java/com/seibel/lod/core/objects/a7/pos/DhLodUnit.java
+++ b/src/main/java/com/seibel/lod/core/a7/pos/DhLodUnit.java
@@ -1,4 +1,4 @@
-package com.seibel.lod.core.objects.a7.pos;
+package com.seibel.lod.core.a7.pos;
 
 public class DhLodUnit {
     public final byte detail;
diff --git a/src/main/java/com/seibel/lod/core/objects/a7/pos/DhSectionPos.java b/src/main/java/com/seibel/lod/core/a7/pos/DhSectionPos.java
similarity index 98%
rename from src/main/java/com/seibel/lod/core/objects/a7/pos/DhSectionPos.java
rename to src/main/java/com/seibel/lod/core/a7/pos/DhSectionPos.java
index a2dd4f0b9..a8b1295a8 100644
--- a/src/main/java/com/seibel/lod/core/objects/a7/pos/DhSectionPos.java
+++ b/src/main/java/com/seibel/lod/core/a7/pos/DhSectionPos.java
@@ -1,4 +1,4 @@
-package com.seibel.lod.core.objects.a7.pos;
+package com.seibel.lod.core.a7.pos;
 
 import com.seibel.lod.core.enums.ELodDirection;
 import com.seibel.lod.core.util.LodUtil;
diff --git a/src/main/java/com/seibel/lod/core/objects/a7/render/EmptyRenderContainer.java b/src/main/java/com/seibel/lod/core/a7/render/EmptyRenderContainer.java
similarity index 74%
rename from src/main/java/com/seibel/lod/core/objects/a7/render/EmptyRenderContainer.java
rename to src/main/java/com/seibel/lod/core/a7/render/EmptyRenderContainer.java
index 447e611ae..6422c92e2 100644
--- a/src/main/java/com/seibel/lod/core/objects/a7/render/EmptyRenderContainer.java
+++ b/src/main/java/com/seibel/lod/core/a7/render/EmptyRenderContainer.java
@@ -1,9 +1,6 @@
-package com.seibel.lod.core.objects.a7.render;
+package com.seibel.lod.core.a7.render;
 
-import com.seibel.lod.core.objects.a7.LodQuadTree;
-import com.seibel.lod.core.objects.a7.data.LodDataSource;
-import com.seibel.lod.core.objects.a7.pos.DhSectionPos;
-import com.seibel.lod.core.objects.a7.render.RenderBuffer;
+import com.seibel.lod.core.a7.LodQuadTree;
 
 import java.util.concurrent.atomic.AtomicReference;
 
diff --git a/src/main/java/com/seibel/lod/core/objects/a7/render/RenderBuffer.java b/src/main/java/com/seibel/lod/core/a7/render/RenderBuffer.java
similarity index 97%
rename from src/main/java/com/seibel/lod/core/objects/a7/render/RenderBuffer.java
rename to src/main/java/com/seibel/lod/core/a7/render/RenderBuffer.java
index 7f85c356e..6a4e8ecb8 100644
--- a/src/main/java/com/seibel/lod/core/objects/a7/render/RenderBuffer.java
+++ b/src/main/java/com/seibel/lod/core/a7/render/RenderBuffer.java
@@ -17,7 +17,7 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package com.seibel.lod.core.objects.a7.render;
+package com.seibel.lod.core.a7.render;
 
 import com.seibel.lod.core.render.LodRenderProgram;
 import com.seibel.lod.core.util.StatsMap;
diff --git a/src/main/java/com/seibel/lod/core/objects/a7/render/RenderBufferHandler.java b/src/main/java/com/seibel/lod/core/a7/render/RenderBufferHandler.java
similarity index 96%
rename from src/main/java/com/seibel/lod/core/objects/a7/render/RenderBufferHandler.java
rename to src/main/java/com/seibel/lod/core/a7/render/RenderBufferHandler.java
index d3e31a747..cebb8a7d7 100644
--- a/src/main/java/com/seibel/lod/core/objects/a7/render/RenderBufferHandler.java
+++ b/src/main/java/com/seibel/lod/core/a7/render/RenderBufferHandler.java
@@ -1,9 +1,9 @@
-package com.seibel.lod.core.objects.a7.render;
+package com.seibel.lod.core.a7.render;
 
 import com.seibel.lod.core.objects.Pos2D;
-import com.seibel.lod.core.objects.a7.LodQuadTree;
-import com.seibel.lod.core.objects.a7.LodSection;
-import com.seibel.lod.core.objects.a7.pos.DhSectionPos;
+import com.seibel.lod.core.a7.LodQuadTree;
+import com.seibel.lod.core.a7.LodSection;
+import com.seibel.lod.core.a7.pos.DhSectionPos;
 import com.seibel.lod.core.render.LodRenderProgram;
 import com.seibel.lod.core.util.LodUtil;
 import com.seibel.lod.core.util.gridList.MovableGridRingList;
diff --git a/src/main/java/com/seibel/lod/core/objects/a7/render/RenderDataSource.java b/src/main/java/com/seibel/lod/core/a7/render/RenderDataSource.java
similarity index 92%
rename from src/main/java/com/seibel/lod/core/objects/a7/render/RenderDataSource.java
rename to src/main/java/com/seibel/lod/core/a7/render/RenderDataSource.java
index 01e9ba842..d3134107c 100644
--- a/src/main/java/com/seibel/lod/core/objects/a7/render/RenderDataSource.java
+++ b/src/main/java/com/seibel/lod/core/a7/render/RenderDataSource.java
@@ -1,9 +1,7 @@
-package com.seibel.lod.core.objects.a7.render;
+package com.seibel.lod.core.a7.render;
 
-import com.seibel.lod.core.objects.a7.LodQuadTree;
-import com.seibel.lod.core.objects.a7.render.RenderBuffer;
+import com.seibel.lod.core.a7.LodQuadTree;
 
-import java.util.*;
 import java.util.concurrent.atomic.AtomicReference;
 
 /**
diff --git a/src/main/java/com/seibel/lod/core/objects/a7/render/RenderDataSourceLoader.java b/src/main/java/com/seibel/lod/core/a7/render/RenderDataSourceLoader.java
similarity index 75%
rename from src/main/java/com/seibel/lod/core/objects/a7/render/RenderDataSourceLoader.java
rename to src/main/java/com/seibel/lod/core/a7/render/RenderDataSourceLoader.java
index 6f5f5ab18..29932af98 100644
--- a/src/main/java/com/seibel/lod/core/objects/a7/render/RenderDataSourceLoader.java
+++ b/src/main/java/com/seibel/lod/core/a7/render/RenderDataSourceLoader.java
@@ -1,9 +1,9 @@
-package com.seibel.lod.core.objects.a7.render;
+package com.seibel.lod.core.a7.render;
 
-import com.seibel.lod.core.objects.a7.DHLevel;
+import com.seibel.lod.core.a7.data.LodDataSource;
+import com.seibel.lod.core.a7.pos.DhSectionPos;
+import com.seibel.lod.core.a7.DHLevel;
 import com.seibel.lod.core.objects.a7.data.DataFile;
-import com.seibel.lod.core.objects.a7.data.LodDataSource;
-import com.seibel.lod.core.objects.a7.pos.DhSectionPos;
 
 import java.util.*;
 import java.util.stream.Collectors;
diff --git a/src/main/java/com/seibel/lod/core/api/internal/a7/ClientApi.java b/src/main/java/com/seibel/lod/core/api/internal/a7/ClientApi.java
index 9192df489..0dfacd3f4 100644
--- a/src/main/java/com/seibel/lod/core/api/internal/a7/ClientApi.java
+++ b/src/main/java/com/seibel/lod/core/api/internal/a7/ClientApi.java
@@ -27,9 +27,9 @@ import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler;
 import com.seibel.lod.core.logging.ConfigBasedLogger;
 import com.seibel.lod.core.logging.ConfigBasedSpamLogger;
 import com.seibel.lod.core.logging.SpamReducedLogger;
-import com.seibel.lod.core.objects.a7.DHLevel;
-import com.seibel.lod.core.objects.a7.DHWorld;
-import com.seibel.lod.core.objects.a7.Server;
+import com.seibel.lod.core.a7.DHLevel;
+import com.seibel.lod.core.a7.DHWorld;
+import com.seibel.lod.core.a7.Server;
 import com.seibel.lod.core.objects.math.Mat4f;
 import com.seibel.lod.core.render.GLProxy;
 import com.seibel.lod.core.render.RenderSystemTest;
diff --git a/src/main/java/com/seibel/lod/core/api/internal/a7/ServerApi.java b/src/main/java/com/seibel/lod/core/api/internal/a7/ServerApi.java
index 9f4d765fe..e034d35d3 100644
--- a/src/main/java/com/seibel/lod/core/api/internal/a7/ServerApi.java
+++ b/src/main/java/com/seibel/lod/core/api/internal/a7/ServerApi.java
@@ -21,8 +21,8 @@ package com.seibel.lod.core.api.internal.a7;
 
 import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler;
 import com.seibel.lod.core.logging.DhLoggerBuilder;
-import com.seibel.lod.core.objects.a7.DHWorld;
-import com.seibel.lod.core.objects.a7.Server;
+import com.seibel.lod.core.a7.DHWorld;
+import com.seibel.lod.core.a7.Server;
 import com.seibel.lod.core.wrapperInterfaces.IVersionConstants;
 import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper;
 import com.seibel.lod.core.wrapperInterfaces.world.IWorldWrapper;
diff --git a/src/main/java/com/seibel/lod/core/api/internal/a7/SharedApi.java b/src/main/java/com/seibel/lod/core/api/internal/a7/SharedApi.java
index d7edee7e9..2bc284909 100644
--- a/src/main/java/com/seibel/lod/core/api/internal/a7/SharedApi.java
+++ b/src/main/java/com/seibel/lod/core/api/internal/a7/SharedApi.java
@@ -1,12 +1,9 @@
 package com.seibel.lod.core.api.internal.a7;
 
 import com.seibel.lod.core.logging.DhLoggerBuilder;
-import com.seibel.lod.core.objects.a7.DHWorld;
-import com.seibel.lod.core.objects.a7.Server;
-import com.seibel.lod.core.util.LodUtil;
-import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
+import com.seibel.lod.core.a7.DHWorld;
+import com.seibel.lod.core.a7.Server;
 import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftSharedWrapper;
-import com.seibel.lod.core.wrapperInterfaces.world.IWorldWrapper;
 import org.apache.logging.log4j.Logger;
 
 public class SharedApi {
diff --git a/src/main/java/com/seibel/lod/core/builders/lodBuilding/bufferBuilding/CubicLodTemplate.java b/src/main/java/com/seibel/lod/core/builders/lodBuilding/bufferBuilding/CubicLodTemplate.java
index 0160d6610..873ba91aa 100644
--- a/src/main/java/com/seibel/lod/core/builders/lodBuilding/bufferBuilding/CubicLodTemplate.java
+++ b/src/main/java/com/seibel/lod/core/builders/lodBuilding/bufferBuilding/CubicLodTemplate.java
@@ -22,8 +22,8 @@ package com.seibel.lod.core.builders.lodBuilding.bufferBuilding;
 import com.seibel.lod.core.enums.rendering.EDebugMode;
 import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler;
 import com.seibel.lod.core.objects.LodDataView;
-import com.seibel.lod.core.objects.a7.datatype.column.ColumnArrayView;
-import com.seibel.lod.core.objects.a7.datatype.column.ColumnBox;
+import com.seibel.lod.core.a7.datatype.column.ColumnArrayView;
+import com.seibel.lod.core.a7.datatype.column.ColumnBox;
 import com.seibel.lod.core.objects.opengl.LodBox;
 import com.seibel.lod.core.util.ColorUtil;
 import com.seibel.lod.core.util.DataPointUtil;
diff --git a/src/main/java/com/seibel/lod/core/objects/a7/RenderDataProvider.java b/src/main/java/com/seibel/lod/core/objects/a7/RenderDataProvider.java
deleted file mode 100644
index 35f040dda..000000000
--- a/src/main/java/com/seibel/lod/core/objects/a7/RenderDataProvider.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.seibel.lod.core.objects.a7;
-
-import com.seibel.lod.core.objects.a7.pos.DhSectionPos;
-import com.seibel.lod.core.objects.a7.render.RenderDataSource;
-import com.seibel.lod.core.objects.a7.render.RenderDataSourceLoader;
-
-import java.util.concurrent.CompletableFuture;
-
-public interface RenderDataProvider {
-    CompletableFuture<RenderDataSource> createRenderData(RenderDataSourceLoader renderSourceLoader, DhSectionPos pos);
-}
diff --git a/src/main/java/com/seibel/lod/core/objects/a7/io/FileScanner.java b/src/main/java/com/seibel/lod/core/objects/a7/io/FileScanner.java
deleted file mode 100644
index 23700f561..000000000
--- a/src/main/java/com/seibel/lod/core/objects/a7/io/FileScanner.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.seibel.lod.core.objects.a7.io;
-
-public class FileScanner {
-}
diff --git a/src/main/java/com/seibel/lod/core/objects/a7/io/LevelFileHandler.java b/src/main/java/com/seibel/lod/core/objects/a7/io/LevelFileHandler.java
deleted file mode 100644
index c4193b72d..000000000
--- a/src/main/java/com/seibel/lod/core/objects/a7/io/LevelFileHandler.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.seibel.lod.core.objects.a7.io;
-
-public class LevelFileHandler {
-}
diff --git a/src/main/java/com/seibel/lod/core/render/a7LodRenderer.java b/src/main/java/com/seibel/lod/core/render/a7LodRenderer.java
index 8099edadb..ca22c7efc 100644
--- a/src/main/java/com/seibel/lod/core/render/a7LodRenderer.java
+++ b/src/main/java/com/seibel/lod/core/render/a7LodRenderer.java
@@ -28,8 +28,8 @@ import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler;
 import com.seibel.lod.core.logging.ConfigBasedLogger;
 import com.seibel.lod.core.logging.ConfigBasedSpamLogger;
 import com.seibel.lod.core.objects.DHBlockPos;
-import com.seibel.lod.core.objects.a7.DHLevel;
-import com.seibel.lod.core.objects.a7.render.RenderBufferHandler;
+import com.seibel.lod.core.a7.DHLevel;
+import com.seibel.lod.core.a7.render.RenderBufferHandler;
 import com.seibel.lod.core.objects.math.Mat4f;
 import com.seibel.lod.core.objects.math.Vec3d;
 import com.seibel.lod.core.objects.math.Vec3f;