diff --git a/src/main/java/com/seibel/lod/builders/bufferBuilding/LodBufferBuilderFactory.java b/src/main/java/com/seibel/lod/builders/bufferBuilding/LodBufferBuilderFactory.java
index 21a999bda..fcceb02b6 100644
--- a/src/main/java/com/seibel/lod/builders/bufferBuilding/LodBufferBuilderFactory.java
+++ b/src/main/java/com/seibel/lod/builders/bufferBuilding/LodBufferBuilderFactory.java
@@ -58,8 +58,8 @@ import com.seibel.lod.util.LodThreadFactory;
 import com.seibel.lod.util.LodUtil;
 import com.seibel.lod.util.ThreadMapUtil;
 import com.seibel.lod.wrappers.MinecraftWrapper;
-import com.seibel.lod.wrappers.Block.BlockPosWrapper;
-import com.seibel.lod.wrappers.Chunk.ChunkPosWrapper;
+import com.seibel.lod.wrappers.block.BlockPosWrapper;
+import com.seibel.lod.wrappers.chunk.ChunkPosWrapper;
 
 /**
  * This object creates the buffers that are
diff --git a/src/main/java/com/seibel/lod/builders/bufferBuilding/lodTemplates/AbstractLodTemplate.java b/src/main/java/com/seibel/lod/builders/bufferBuilding/lodTemplates/AbstractLodTemplate.java
index 5f11a3057..4dca9bab9 100644
--- a/src/main/java/com/seibel/lod/builders/bufferBuilding/lodTemplates/AbstractLodTemplate.java
+++ b/src/main/java/com/seibel/lod/builders/bufferBuilding/lodTemplates/AbstractLodTemplate.java
@@ -25,8 +25,7 @@ import com.seibel.lod.enums.rendering.DebugMode;
 import com.seibel.lod.objects.Box;
 import com.seibel.lod.objects.opengl.LodBufferBuilder;
 import com.seibel.lod.util.ColorUtil;
-import com.seibel.lod.wrappers.Block.BlockPosWrapper;
-
+import com.seibel.lod.wrappers.block.BlockPosWrapper;
 import com.seibel.lod.enums.LodDirection;
 
 /**
diff --git a/src/main/java/com/seibel/lod/builders/bufferBuilding/lodTemplates/CubicLodTemplate.java b/src/main/java/com/seibel/lod/builders/bufferBuilding/lodTemplates/CubicLodTemplate.java
index c0e6a6557..0475ad70e 100644
--- a/src/main/java/com/seibel/lod/builders/bufferBuilding/lodTemplates/CubicLodTemplate.java
+++ b/src/main/java/com/seibel/lod/builders/bufferBuilding/lodTemplates/CubicLodTemplate.java
@@ -27,8 +27,7 @@ import com.seibel.lod.objects.opengl.LodBufferBuilder;
 import com.seibel.lod.util.ColorUtil;
 import com.seibel.lod.util.DataPointUtil;
 import com.seibel.lod.util.LodUtil;
-import com.seibel.lod.wrappers.Block.BlockPosWrapper;
-
+import com.seibel.lod.wrappers.block.BlockPosWrapper;
 import com.seibel.lod.enums.LodDirection;
 
 /**
diff --git a/src/main/java/com/seibel/lod/builders/bufferBuilding/lodTemplates/DynamicLodTemplate.java b/src/main/java/com/seibel/lod/builders/bufferBuilding/lodTemplates/DynamicLodTemplate.java
index 2d2513162..977d6dab8 100644
--- a/src/main/java/com/seibel/lod/builders/bufferBuilding/lodTemplates/DynamicLodTemplate.java
+++ b/src/main/java/com/seibel/lod/builders/bufferBuilding/lodTemplates/DynamicLodTemplate.java
@@ -25,8 +25,7 @@ import com.seibel.lod.enums.rendering.DebugMode;
 import com.seibel.lod.lodApi.ClientApi;
 import com.seibel.lod.objects.Box;
 import com.seibel.lod.objects.opengl.LodBufferBuilder;
-import com.seibel.lod.wrappers.Block.BlockPosWrapper;
-
+import com.seibel.lod.wrappers.block.BlockPosWrapper;
 import com.seibel.lod.enums.LodDirection;
 
 /**
diff --git a/src/main/java/com/seibel/lod/builders/bufferBuilding/lodTemplates/TriangularLodTemplate.java b/src/main/java/com/seibel/lod/builders/bufferBuilding/lodTemplates/TriangularLodTemplate.java
index 29e679973..1c653ebe3 100644
--- a/src/main/java/com/seibel/lod/builders/bufferBuilding/lodTemplates/TriangularLodTemplate.java
+++ b/src/main/java/com/seibel/lod/builders/bufferBuilding/lodTemplates/TriangularLodTemplate.java
@@ -25,8 +25,7 @@ import com.seibel.lod.enums.rendering.DebugMode;
 import com.seibel.lod.lodApi.ClientApi;
 import com.seibel.lod.objects.Box;
 import com.seibel.lod.objects.opengl.LodBufferBuilder;
-import com.seibel.lod.wrappers.Block.BlockPosWrapper;
-
+import com.seibel.lod.wrappers.block.BlockPosWrapper;
 import com.seibel.lod.enums.LodDirection;
 
 /**
diff --git a/src/main/java/com/seibel/lod/builders/lodBuilding/LodBuilder.java b/src/main/java/com/seibel/lod/builders/lodBuilding/LodBuilder.java
index e1689170d..da6aed52f 100644
--- a/src/main/java/com/seibel/lod/builders/lodBuilding/LodBuilder.java
+++ b/src/main/java/com/seibel/lod/builders/lodBuilding/LodBuilder.java
@@ -36,14 +36,14 @@ import com.seibel.lod.util.LodThreadFactory;
 import com.seibel.lod.util.LodUtil;
 import com.seibel.lod.util.ThreadMapUtil;
 import com.seibel.lod.wrappers.MinecraftWrapper;
-import com.seibel.lod.wrappers.Block.BlockColorWrapper;
-import com.seibel.lod.wrappers.Block.BlockPosWrapper;
-import com.seibel.lod.wrappers.Block.BlockShapeWrapper;
-import com.seibel.lod.wrappers.Chunk.ChunkPosWrapper;
-import com.seibel.lod.wrappers.Chunk.ChunkWrapper;
-import com.seibel.lod.wrappers.World.BiomeWrapper;
-import com.seibel.lod.wrappers.World.DimensionTypeWrapper;
-import com.seibel.lod.wrappers.World.WorldWrapper;
+import com.seibel.lod.wrappers.block.BlockColorWrapper;
+import com.seibel.lod.wrappers.block.BlockPosWrapper;
+import com.seibel.lod.wrappers.block.BlockShapeWrapper;
+import com.seibel.lod.wrappers.chunk.ChunkPosWrapper;
+import com.seibel.lod.wrappers.chunk.ChunkWrapper;
+import com.seibel.lod.wrappers.world.BiomeWrapper;
+import com.seibel.lod.wrappers.world.DimensionTypeWrapper;
+import com.seibel.lod.wrappers.world.WorldWrapper;
 
 /**
  * This object is in charge of creating Lod related objects.
diff --git a/src/main/java/com/seibel/lod/builders/worldGeneration/LodGenWorker.java b/src/main/java/com/seibel/lod/builders/worldGeneration/LodGenWorker.java
index 02bdf36e9..fea111652 100644
--- a/src/main/java/com/seibel/lod/builders/worldGeneration/LodGenWorker.java
+++ b/src/main/java/com/seibel/lod/builders/worldGeneration/LodGenWorker.java
@@ -29,9 +29,9 @@ import com.seibel.lod.enums.config.DistanceGenerationMode;
 import com.seibel.lod.lodApi.ClientApi;
 import com.seibel.lod.objects.lod.LodDimension;
 import com.seibel.lod.util.LodUtil;
-import com.seibel.lod.wrappers.WorldGeneratorWrapper;
-import com.seibel.lod.wrappers.Chunk.ChunkPosWrapper;
-import com.seibel.lod.wrappers.World.WorldWrapper;
+import com.seibel.lod.wrappers.chunk.ChunkPosWrapper;
+import com.seibel.lod.wrappers.world.WorldWrapper;
+import com.seibel.lod.wrappers.worldGeneration.WorldGeneratorWrapper;
 
 import net.minecraftforge.common.WorldWorkerManager.IWorker;
 
diff --git a/src/main/java/com/seibel/lod/builders/worldGeneration/LodWorldGenerator.java b/src/main/java/com/seibel/lod/builders/worldGeneration/LodWorldGenerator.java
index 014fb64ee..dbf9cd54f 100644
--- a/src/main/java/com/seibel/lod/builders/worldGeneration/LodWorldGenerator.java
+++ b/src/main/java/com/seibel/lod/builders/worldGeneration/LodWorldGenerator.java
@@ -36,13 +36,14 @@ import com.seibel.lod.util.LevelPosUtil;
 import com.seibel.lod.util.LodThreadFactory;
 import com.seibel.lod.util.LodUtil;
 import com.seibel.lod.wrappers.MinecraftWrapper;
-import com.seibel.lod.wrappers.Chunk.ChunkPosWrapper;
-import com.seibel.lod.wrappers.World.WorldWrapper;
+import com.seibel.lod.wrappers.chunk.ChunkPosWrapper;
+import com.seibel.lod.wrappers.world.WorldWrapper;
 
 import net.minecraftforge.common.WorldWorkerManager;
 
 /**
  * A singleton that handles all long distance LOD world generation.
+ * @author Leonardo Amato
  * @author James Seibel
  * @version 9-25-2021
  */
diff --git a/src/main/java/com/seibel/lod/lodApi/EventApi.java b/src/main/java/com/seibel/lod/lodApi/EventApi.java
index a415ff2e7..b8d50d11e 100644
--- a/src/main/java/com/seibel/lod/lodApi/EventApi.java
+++ b/src/main/java/com/seibel/lod/lodApi/EventApi.java
@@ -32,9 +32,9 @@ import com.seibel.lod.util.DetailDistanceUtil;
 import com.seibel.lod.util.LodUtil;
 import com.seibel.lod.util.ThreadMapUtil;
 import com.seibel.lod.wrappers.MinecraftWrapper;
-import com.seibel.lod.wrappers.Chunk.ChunkWrapper;
-import com.seibel.lod.wrappers.World.DimensionTypeWrapper;
-import com.seibel.lod.wrappers.World.WorldWrapper;
+import com.seibel.lod.wrappers.chunk.ChunkWrapper;
+import com.seibel.lod.wrappers.world.DimensionTypeWrapper;
+import com.seibel.lod.wrappers.world.WorldWrapper;
 
 /**
  * This holds the methods that should be called
diff --git a/src/main/java/com/seibel/lod/objects/Box.java b/src/main/java/com/seibel/lod/objects/Box.java
index 74be674cc..b6fa5d0e8 100644
--- a/src/main/java/com/seibel/lod/objects/Box.java
+++ b/src/main/java/com/seibel/lod/objects/Box.java
@@ -31,7 +31,7 @@ import com.seibel.lod.util.ColorUtil;
 import com.seibel.lod.util.DataPointUtil;
 import com.seibel.lod.util.LodUtil;
 import com.seibel.lod.wrappers.MinecraftWrapper;
-import com.seibel.lod.wrappers.Block.BlockPosWrapper;
+import com.seibel.lod.wrappers.block.BlockPosWrapper;
 
 /**
  * Similar to Minecraft's AxisAlignedBoundingBox.
diff --git a/src/main/java/com/seibel/lod/objects/lod/LodDimension.java b/src/main/java/com/seibel/lod/objects/lod/LodDimension.java
index b7f11b708..24819b132 100644
--- a/src/main/java/com/seibel/lod/objects/lod/LodDimension.java
+++ b/src/main/java/com/seibel/lod/objects/lod/LodDimension.java
@@ -37,8 +37,8 @@ import com.seibel.lod.util.LevelPosUtil;
 import com.seibel.lod.util.LodThreadFactory;
 import com.seibel.lod.util.LodUtil;
 import com.seibel.lod.wrappers.MinecraftWrapper;
-import com.seibel.lod.wrappers.World.DimensionTypeWrapper;
-import com.seibel.lod.wrappers.World.WorldWrapper;
+import com.seibel.lod.wrappers.world.DimensionTypeWrapper;
+import com.seibel.lod.wrappers.world.WorldWrapper;
 
 import net.minecraft.util.math.ChunkPos;
 
diff --git a/src/main/java/com/seibel/lod/objects/lod/LodWorld.java b/src/main/java/com/seibel/lod/objects/lod/LodWorld.java
index bbeab344e..33fcb95e6 100644
--- a/src/main/java/com/seibel/lod/objects/lod/LodWorld.java
+++ b/src/main/java/com/seibel/lod/objects/lod/LodWorld.java
@@ -23,7 +23,7 @@ import java.util.Hashtable;
 import java.util.Map;
 
 import com.seibel.lod.lodApi.ClientApi;
-import com.seibel.lod.wrappers.World.DimensionTypeWrapper;
+import com.seibel.lod.wrappers.world.DimensionTypeWrapper;
 
 /**
  * This stores all LODs for a given world.
diff --git a/src/main/java/com/seibel/lod/objects/lod/RegionPos.java b/src/main/java/com/seibel/lod/objects/lod/RegionPos.java
index 2f3c72565..cf0a441ea 100644
--- a/src/main/java/com/seibel/lod/objects/lod/RegionPos.java
+++ b/src/main/java/com/seibel/lod/objects/lod/RegionPos.java
@@ -20,8 +20,8 @@
 package com.seibel.lod.objects.lod;
 
 import com.seibel.lod.util.LodUtil;
-import com.seibel.lod.wrappers.Block.BlockPosWrapper;
-import com.seibel.lod.wrappers.Chunk.ChunkPosWrapper;
+import com.seibel.lod.wrappers.block.BlockPosWrapper;
+import com.seibel.lod.wrappers.chunk.ChunkPosWrapper;
 
 /**
  * This object is similar to ChunkPos or BlockPos.
diff --git a/src/main/java/com/seibel/lod/proxy/ClientProxy.java b/src/main/java/com/seibel/lod/proxy/ClientProxy.java
index ddb8a0bac..ee0fb652c 100644
--- a/src/main/java/com/seibel/lod/proxy/ClientProxy.java
+++ b/src/main/java/com/seibel/lod/proxy/ClientProxy.java
@@ -20,9 +20,9 @@
 package com.seibel.lod.proxy;
 
 import com.seibel.lod.lodApi.EventApi;
-import com.seibel.lod.wrappers.Chunk.ChunkWrapper;
-import com.seibel.lod.wrappers.World.DimensionTypeWrapper;
-import com.seibel.lod.wrappers.World.WorldWrapper;
+import com.seibel.lod.wrappers.chunk.ChunkWrapper;
+import com.seibel.lod.wrappers.world.DimensionTypeWrapper;
+import com.seibel.lod.wrappers.world.WorldWrapper;
 
 import net.minecraftforge.client.event.InputEvent;
 import net.minecraftforge.event.TickEvent;
diff --git a/src/main/java/com/seibel/lod/render/LodRenderer.java b/src/main/java/com/seibel/lod/render/LodRenderer.java
index 8466ab44e..9de0caf51 100644
--- a/src/main/java/com/seibel/lod/render/LodRenderer.java
+++ b/src/main/java/com/seibel/lod/render/LodRenderer.java
@@ -48,8 +48,8 @@ import com.seibel.lod.util.LevelPosUtil;
 import com.seibel.lod.util.LodUtil;
 import com.seibel.lod.wrappers.McObjectConverter;
 import com.seibel.lod.wrappers.MinecraftWrapper;
-import com.seibel.lod.wrappers.Block.BlockPosWrapper;
-import com.seibel.lod.wrappers.Chunk.ChunkPosWrapper;
+import com.seibel.lod.wrappers.block.BlockPosWrapper;
+import com.seibel.lod.wrappers.chunk.ChunkPosWrapper;
 
 import net.minecraft.client.renderer.ActiveRenderInfo;
 import net.minecraft.client.renderer.GameRenderer;
diff --git a/src/main/java/com/seibel/lod/render/RenderUtil.java b/src/main/java/com/seibel/lod/render/RenderUtil.java
index 5397dcf04..c3a29a56a 100644
--- a/src/main/java/com/seibel/lod/render/RenderUtil.java
+++ b/src/main/java/com/seibel/lod/render/RenderUtil.java
@@ -21,8 +21,8 @@ package com.seibel.lod.render;
 
 import com.seibel.lod.util.LodUtil;
 import com.seibel.lod.wrappers.MinecraftWrapper;
-import com.seibel.lod.wrappers.Block.BlockPosWrapper;
-import com.seibel.lod.wrappers.Chunk.ChunkPosWrapper;
+import com.seibel.lod.wrappers.block.BlockPosWrapper;
+import com.seibel.lod.wrappers.chunk.ChunkPosWrapper;
 
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.vector.Vector3f;
diff --git a/src/main/java/com/seibel/lod/util/LodUtil.java b/src/main/java/com/seibel/lod/util/LodUtil.java
index 5e6778b25..290f41d42 100644
--- a/src/main/java/com/seibel/lod/util/LodUtil.java
+++ b/src/main/java/com/seibel/lod/util/LodUtil.java
@@ -33,10 +33,10 @@ import com.seibel.lod.objects.lod.RegionPos;
 import com.seibel.lod.objects.opengl.DefaultLodVertexFormats;
 import com.seibel.lod.objects.opengl.LodVertexFormat;
 import com.seibel.lod.wrappers.MinecraftWrapper;
-import com.seibel.lod.wrappers.Block.BlockPosWrapper;
-import com.seibel.lod.wrappers.Chunk.ChunkPosWrapper;
-import com.seibel.lod.wrappers.World.DimensionTypeWrapper;
-import com.seibel.lod.wrappers.World.WorldWrapper;
+import com.seibel.lod.wrappers.block.BlockPosWrapper;
+import com.seibel.lod.wrappers.chunk.ChunkPosWrapper;
+import com.seibel.lod.wrappers.world.DimensionTypeWrapper;
+import com.seibel.lod.wrappers.world.WorldWrapper;
 
 import net.minecraft.client.multiplayer.ServerData;
 import net.minecraft.client.renderer.WorldRenderer;
diff --git a/src/main/java/com/seibel/lod/wrappers/MinecraftWrapper.java b/src/main/java/com/seibel/lod/wrappers/MinecraftWrapper.java
index 5ed8a474c..410cb8e03 100644
--- a/src/main/java/com/seibel/lod/wrappers/MinecraftWrapper.java
+++ b/src/main/java/com/seibel/lod/wrappers/MinecraftWrapper.java
@@ -27,10 +27,10 @@ import com.seibel.lod.ModInfo;
 import com.seibel.lod.enums.LodDirection;
 import com.seibel.lod.lodApi.ClientApi;
 import com.seibel.lod.util.LodUtil;
-import com.seibel.lod.wrappers.Block.BlockPosWrapper;
-import com.seibel.lod.wrappers.Chunk.ChunkPosWrapper;
-import com.seibel.lod.wrappers.World.DimensionTypeWrapper;
-import com.seibel.lod.wrappers.World.WorldWrapper;
+import com.seibel.lod.wrappers.block.BlockPosWrapper;
+import com.seibel.lod.wrappers.chunk.ChunkPosWrapper;
+import com.seibel.lod.wrappers.world.DimensionTypeWrapper;
+import com.seibel.lod.wrappers.world.WorldWrapper;
 
 import net.minecraft.client.GameSettings;
 import net.minecraft.client.MainWindow;
diff --git a/src/main/java/com/seibel/lod/wrappers/Vertex/BufferBuilderWrapper.java b/src/main/java/com/seibel/lod/wrappers/Vertex/BufferBuilderWrapper.java
deleted file mode 100644
index 672c484d6..000000000
--- a/src/main/java/com/seibel/lod/wrappers/Vertex/BufferBuilderWrapper.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.seibel.lod.wrappers.Vertex;
-
-public class BufferBuilderWrapper
-{
-}
diff --git a/src/main/java/com/seibel/lod/wrappers/Vertex/VertexBufferWrapper.java b/src/main/java/com/seibel/lod/wrappers/Vertex/VertexBufferWrapper.java
deleted file mode 100644
index c7fa61f00..000000000
--- a/src/main/java/com/seibel/lod/wrappers/Vertex/VertexBufferWrapper.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.seibel.lod.wrappers.Vertex;
-
-public class VertexBufferWrapper
-{
-}
diff --git a/src/main/java/com/seibel/lod/wrappers/Block/BlockColorWrapper.java b/src/main/java/com/seibel/lod/wrappers/block/BlockColorWrapper.java
similarity index 99%
rename from src/main/java/com/seibel/lod/wrappers/Block/BlockColorWrapper.java
rename to src/main/java/com/seibel/lod/wrappers/block/BlockColorWrapper.java
index d7988731c..259919a2c 100644
--- a/src/main/java/com/seibel/lod/wrappers/Block/BlockColorWrapper.java
+++ b/src/main/java/com/seibel/lod/wrappers/block/BlockColorWrapper.java
@@ -1,4 +1,4 @@
-package com.seibel.lod.wrappers.Block;
+package com.seibel.lod.wrappers.block;
 
 import java.util.List;
 import java.util.Objects;
diff --git a/src/main/java/com/seibel/lod/wrappers/Block/BlockPosWrapper.java b/src/main/java/com/seibel/lod/wrappers/block/BlockPosWrapper.java
similarity index 96%
rename from src/main/java/com/seibel/lod/wrappers/Block/BlockPosWrapper.java
rename to src/main/java/com/seibel/lod/wrappers/block/BlockPosWrapper.java
index b0d5b6aef..5eb39473e 100644
--- a/src/main/java/com/seibel/lod/wrappers/Block/BlockPosWrapper.java
+++ b/src/main/java/com/seibel/lod/wrappers/block/BlockPosWrapper.java
@@ -1,4 +1,4 @@
-package com.seibel.lod.wrappers.Block;
+package com.seibel.lod.wrappers.block;
 
 import com.seibel.lod.enums.LodDirection;
 import net.minecraft.util.math.BlockPos;
diff --git a/src/main/java/com/seibel/lod/wrappers/Block/BlockShapeWrapper.java b/src/main/java/com/seibel/lod/wrappers/block/BlockShapeWrapper.java
similarity index 97%
rename from src/main/java/com/seibel/lod/wrappers/Block/BlockShapeWrapper.java
rename to src/main/java/com/seibel/lod/wrappers/block/BlockShapeWrapper.java
index 88f17f17d..4b22259d2 100644
--- a/src/main/java/com/seibel/lod/wrappers/Block/BlockShapeWrapper.java
+++ b/src/main/java/com/seibel/lod/wrappers/block/BlockShapeWrapper.java
@@ -1,7 +1,6 @@
 
-package com.seibel.lod.wrappers.Block;
+package com.seibel.lod.wrappers.block;
 
-import com.seibel.lod.wrappers.Chunk.ChunkWrapper;
 import net.minecraft.block.Block;
 import net.minecraft.block.Blocks;
 import net.minecraft.block.SixWayBlock;
@@ -14,6 +13,8 @@ import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
+import com.seibel.lod.wrappers.chunk.ChunkWrapper;
+
 
 //This class wraps the minecraft Block class
 public class BlockShapeWrapper
diff --git a/src/main/java/com/seibel/lod/wrappers/Chunk/ChunkGenerator.java b/src/main/java/com/seibel/lod/wrappers/chunk/ChunkGenerator.java
similarity index 74%
rename from src/main/java/com/seibel/lod/wrappers/Chunk/ChunkGenerator.java
rename to src/main/java/com/seibel/lod/wrappers/chunk/ChunkGenerator.java
index 44be855ae..56c53f9d7 100644
--- a/src/main/java/com/seibel/lod/wrappers/Chunk/ChunkGenerator.java
+++ b/src/main/java/com/seibel/lod/wrappers/chunk/ChunkGenerator.java
@@ -1,4 +1,4 @@
-package com.seibel.lod.wrappers.Chunk;
+package com.seibel.lod.wrappers.chunk;
 
 
 //This class will contain all methods usefull to generate the fake ChunkWrapper
diff --git a/src/main/java/com/seibel/lod/wrappers/Chunk/ChunkPosWrapper.java b/src/main/java/com/seibel/lod/wrappers/chunk/ChunkPosWrapper.java
similarity index 94%
rename from src/main/java/com/seibel/lod/wrappers/Chunk/ChunkPosWrapper.java
rename to src/main/java/com/seibel/lod/wrappers/chunk/ChunkPosWrapper.java
index 2e6ff6723..0ddd51727 100644
--- a/src/main/java/com/seibel/lod/wrappers/Chunk/ChunkPosWrapper.java
+++ b/src/main/java/com/seibel/lod/wrappers/chunk/ChunkPosWrapper.java
@@ -1,12 +1,12 @@
-package com.seibel.lod.wrappers.Chunk;
-
-import com.seibel.lod.wrappers.Block.BlockPosWrapper;
+package com.seibel.lod.wrappers.chunk;
 
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.ChunkPos;
 
 import java.util.Objects;
 
+import com.seibel.lod.wrappers.block.BlockPosWrapper;
+
 
 //This class wraps the minecraft ChunkPos class
 public class ChunkPosWrapper
diff --git a/src/main/java/com/seibel/lod/wrappers/Chunk/ChunkWrapper.java b/src/main/java/com/seibel/lod/wrappers/chunk/ChunkWrapper.java
similarity index 90%
rename from src/main/java/com/seibel/lod/wrappers/Chunk/ChunkWrapper.java
rename to src/main/java/com/seibel/lod/wrappers/chunk/ChunkWrapper.java
index 6f36a5500..db9fffd60 100644
--- a/src/main/java/com/seibel/lod/wrappers/Chunk/ChunkWrapper.java
+++ b/src/main/java/com/seibel/lod/wrappers/chunk/ChunkWrapper.java
@@ -1,10 +1,11 @@
-package com.seibel.lod.wrappers.Chunk;
+package com.seibel.lod.wrappers.chunk;
 
 import com.seibel.lod.util.LodUtil;
-import com.seibel.lod.wrappers.Block.BlockColorWrapper;
-import com.seibel.lod.wrappers.Block.BlockPosWrapper;
-import com.seibel.lod.wrappers.Block.BlockShapeWrapper;
-import com.seibel.lod.wrappers.World.BiomeWrapper;
+import com.seibel.lod.wrappers.block.BlockColorWrapper;
+import com.seibel.lod.wrappers.block.BlockPosWrapper;
+import com.seibel.lod.wrappers.block.BlockShapeWrapper;
+import com.seibel.lod.wrappers.world.BiomeWrapper;
+
 import net.minecraft.block.BlockState;
 import net.minecraft.block.ILiquidContainer;
 import net.minecraft.block.IWaterLoggable;
diff --git a/src/main/java/com/seibel/lod/wrappers/openGl/BufferBuilderWrapper.java b/src/main/java/com/seibel/lod/wrappers/openGl/BufferBuilderWrapper.java
new file mode 100644
index 000000000..c7bda22dd
--- /dev/null
+++ b/src/main/java/com/seibel/lod/wrappers/openGl/BufferBuilderWrapper.java
@@ -0,0 +1,5 @@
+package com.seibel.lod.wrappers.openGl;
+
+public class BufferBuilderWrapper
+{
+}
diff --git a/src/main/java/com/seibel/lod/wrappers/openGl/VertexBufferWrapper.java b/src/main/java/com/seibel/lod/wrappers/openGl/VertexBufferWrapper.java
new file mode 100644
index 000000000..b3b766e3a
--- /dev/null
+++ b/src/main/java/com/seibel/lod/wrappers/openGl/VertexBufferWrapper.java
@@ -0,0 +1,5 @@
+package com.seibel.lod.wrappers.openGl;
+
+public class VertexBufferWrapper
+{
+}
diff --git a/src/main/java/com/seibel/lod/wrappers/World/BiomeColorWrapper.java b/src/main/java/com/seibel/lod/wrappers/world/BiomeColorWrapper.java
similarity index 93%
rename from src/main/java/com/seibel/lod/wrappers/World/BiomeColorWrapper.java
rename to src/main/java/com/seibel/lod/wrappers/world/BiomeColorWrapper.java
index 98ce7f595..03e8d2e29 100644
--- a/src/main/java/com/seibel/lod/wrappers/World/BiomeColorWrapper.java
+++ b/src/main/java/com/seibel/lod/wrappers/world/BiomeColorWrapper.java
@@ -17,9 +17,9 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.seibel.lod.wrappers.World;
+package com.seibel.lod.wrappers.world;
 
-import com.seibel.lod.wrappers.Block.BlockPosWrapper;
+import com.seibel.lod.wrappers.block.BlockPosWrapper;
 
 import net.minecraft.world.biome.BiomeColors;
 
diff --git a/src/main/java/com/seibel/lod/wrappers/World/BiomeWrapper.java b/src/main/java/com/seibel/lod/wrappers/world/BiomeWrapper.java
similarity index 97%
rename from src/main/java/com/seibel/lod/wrappers/World/BiomeWrapper.java
rename to src/main/java/com/seibel/lod/wrappers/world/BiomeWrapper.java
index 8e513a848..e673a7de7 100644
--- a/src/main/java/com/seibel/lod/wrappers/World/BiomeWrapper.java
+++ b/src/main/java/com/seibel/lod/wrappers/world/BiomeWrapper.java
@@ -1,7 +1,8 @@
-package com.seibel.lod.wrappers.World;
+package com.seibel.lod.wrappers.world;
 
 import com.seibel.lod.util.ColorUtil;
-import com.seibel.lod.wrappers.Block.BlockColorWrapper;
+import com.seibel.lod.wrappers.block.BlockColorWrapper;
+
 import net.minecraft.block.Blocks;
 import net.minecraft.world.biome.Biome;
 
diff --git a/src/main/java/com/seibel/lod/wrappers/World/DimensionTypeWrapper.java b/src/main/java/com/seibel/lod/wrappers/world/DimensionTypeWrapper.java
similarity index 97%
rename from src/main/java/com/seibel/lod/wrappers/World/DimensionTypeWrapper.java
rename to src/main/java/com/seibel/lod/wrappers/world/DimensionTypeWrapper.java
index c595ef60f..1c91e811b 100644
--- a/src/main/java/com/seibel/lod/wrappers/World/DimensionTypeWrapper.java
+++ b/src/main/java/com/seibel/lod/wrappers/world/DimensionTypeWrapper.java
@@ -1,4 +1,4 @@
-package com.seibel.lod.wrappers.World;
+package com.seibel.lod.wrappers.world;
 
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
diff --git a/src/main/java/com/seibel/lod/wrappers/World/WorldLightWrapper.java b/src/main/java/com/seibel/lod/wrappers/world/WorldLightWrapper.java
similarity index 79%
rename from src/main/java/com/seibel/lod/wrappers/World/WorldLightWrapper.java
rename to src/main/java/com/seibel/lod/wrappers/world/WorldLightWrapper.java
index e3a4483f6..cac67baf7 100644
--- a/src/main/java/com/seibel/lod/wrappers/World/WorldLightWrapper.java
+++ b/src/main/java/com/seibel/lod/wrappers/world/WorldLightWrapper.java
@@ -1,4 +1,4 @@
-package com.seibel.lod.wrappers.World;
+package com.seibel.lod.wrappers.world;
 
 
 //We will use this class to get all the light information from the game like skylight, blocklight and light emission;
diff --git a/src/main/java/com/seibel/lod/wrappers/World/WorldWrapper.java b/src/main/java/com/seibel/lod/wrappers/world/WorldWrapper.java
similarity index 97%
rename from src/main/java/com/seibel/lod/wrappers/World/WorldWrapper.java
rename to src/main/java/com/seibel/lod/wrappers/world/WorldWrapper.java
index 4e9e8e6a5..f0c1ef89e 100644
--- a/src/main/java/com/seibel/lod/wrappers/World/WorldWrapper.java
+++ b/src/main/java/com/seibel/lod/wrappers/world/WorldWrapper.java
@@ -1,11 +1,11 @@
-package com.seibel.lod.wrappers.World;
+package com.seibel.lod.wrappers.world;
 
 import java.io.File;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
 import com.seibel.lod.enums.WorldType;
-import com.seibel.lod.wrappers.Block.BlockPosWrapper;
+import com.seibel.lod.wrappers.block.BlockPosWrapper;
 
 import net.minecraft.client.world.ClientWorld;
 import net.minecraft.world.IWorld;
diff --git a/src/main/java/com/seibel/lod/builders/worldGeneration/LodServerWorld.java b/src/main/java/com/seibel/lod/wrappers/worldGeneration/LodServerWorld.java
similarity index 99%
rename from src/main/java/com/seibel/lod/builders/worldGeneration/LodServerWorld.java
rename to src/main/java/com/seibel/lod/wrappers/worldGeneration/LodServerWorld.java
index 1229a853c..bbb103501 100644
--- a/src/main/java/com/seibel/lod/builders/worldGeneration/LodServerWorld.java
+++ b/src/main/java/com/seibel/lod/wrappers/worldGeneration/LodServerWorld.java
@@ -17,7 +17,7 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.seibel.lod.builders.worldGeneration;
+package com.seibel.lod.wrappers.worldGeneration;
 
 import java.util.HashMap;
 import java.util.List;
diff --git a/src/main/java/com/seibel/lod/wrappers/WorldGeneratorWrapper.java b/src/main/java/com/seibel/lod/wrappers/worldGeneration/WorldGeneratorWrapper.java
similarity index 98%
rename from src/main/java/com/seibel/lod/wrappers/WorldGeneratorWrapper.java
rename to src/main/java/com/seibel/lod/wrappers/worldGeneration/WorldGeneratorWrapper.java
index eb1cb439e..aabe3b6c6 100644
--- a/src/main/java/com/seibel/lod/wrappers/WorldGeneratorWrapper.java
+++ b/src/main/java/com/seibel/lod/wrappers/worldGeneration/WorldGeneratorWrapper.java
@@ -1,4 +1,4 @@
-package com.seibel.lod.wrappers;
+package com.seibel.lod.wrappers.worldGeneration;
 
 import java.util.ConcurrentModificationException;
 import java.util.HashSet;
@@ -9,14 +9,13 @@ import java.util.function.Supplier;
 
 import com.seibel.lod.builders.lodBuilding.LodBuilder;
 import com.seibel.lod.builders.lodBuilding.LodBuilderConfig;
-import com.seibel.lod.builders.worldGeneration.LodServerWorld;
 import com.seibel.lod.config.LodConfig;
 import com.seibel.lod.enums.config.DistanceGenerationMode;
 import com.seibel.lod.objects.lod.LodDimension;
 import com.seibel.lod.util.LodUtil;
-import com.seibel.lod.wrappers.Chunk.ChunkPosWrapper;
-import com.seibel.lod.wrappers.Chunk.ChunkWrapper;
-import com.seibel.lod.wrappers.World.WorldWrapper;
+import com.seibel.lod.wrappers.chunk.ChunkPosWrapper;
+import com.seibel.lod.wrappers.chunk.ChunkWrapper;
+import com.seibel.lod.wrappers.world.WorldWrapper;
 
 import net.minecraft.util.palette.UpgradeData;
 import net.minecraft.util.registry.Registry;