diff --git a/src/main/java/com/seibel/lod/wrappers/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/BlockPosWrapper.java
rename to src/main/java/com/seibel/lod/wrappers/Block/BlockPosWrapper.java
index 212c3a655..270b8b25a 100644
--- a/src/main/java/com/seibel/lod/wrappers/BlockPosWrapper.java
+++ b/src/main/java/com/seibel/lod/wrappers/Block/BlockPosWrapper.java
@@ -1,4 +1,4 @@
-package com.seibel.lod.wrappers;
+package com.seibel.lod.wrappers.Block;
 
 import com.seibel.lod.util.ColorUtil;
 import net.minecraft.block.*;
diff --git a/src/main/java/com/seibel/lod/wrappers/BlockWrapper.java b/src/main/java/com/seibel/lod/wrappers/Block/BlockWrapper.java
similarity index 98%
rename from src/main/java/com/seibel/lod/wrappers/BlockWrapper.java
rename to src/main/java/com/seibel/lod/wrappers/Block/BlockWrapper.java
index e55f92bb3..0f5bb38aa 100644
--- a/src/main/java/com/seibel/lod/wrappers/BlockWrapper.java
+++ b/src/main/java/com/seibel/lod/wrappers/Block/BlockWrapper.java
@@ -1,10 +1,10 @@
-package com.seibel.lod.wrappers;
+package com.seibel.lod.wrappers.Block;
 
 import com.seibel.lod.util.ColorUtil;
+import com.seibel.lod.wrappers.MinecraftWrapper;
 import net.minecraft.block.*;
 import net.minecraft.client.renderer.model.BakedQuad;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
-import net.minecraft.state.properties.BlockStateProperties;
 import net.minecraft.util.Direction;
 import net.minecraftforge.client.model.data.ModelDataMap;
 
diff --git a/src/main/java/com/seibel/lod/wrappers/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/ChunkGenerator.java
rename to src/main/java/com/seibel/lod/wrappers/Chunk/ChunkGenerator.java
index f4ccc8761..44be855ae 100644
--- a/src/main/java/com/seibel/lod/wrappers/ChunkGenerator.java
+++ b/src/main/java/com/seibel/lod/wrappers/Chunk/ChunkGenerator.java
@@ -1,4 +1,4 @@
-package com.seibel.lod.wrappers;
+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
new file mode 100644
index 000000000..16e8f5201
--- /dev/null
+++ b/src/main/java/com/seibel/lod/wrappers/Chunk/ChunkPosWrapper.java
@@ -0,0 +1,44 @@
+package com.seibel.lod.wrappers.Chunk;
+
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.ChunkPos;
+
+import java.util.Objects;
+
+
+//This class wraps the minecraft ChunkPos class
+public class ChunkPosWrapper
+{
+	private ChunkPos chunkPos;
+	
+	public ChunkPosWrapper(ChunkPos chunkPos)
+	{
+		this.chunkPos = chunkPos;
+	}
+	
+	public int getX()
+	{
+		return chunkPos.getX();
+	}
+	
+	public int getZ()
+	{
+		return chunkPos.getZ();
+	}
+	
+	public ChunkPos getChunkPos()
+	{
+		return chunkPos;
+	}
+	
+	@Override public boolean equals(Object o)
+	{
+		return chunkPos.equals(o);
+	}
+	
+	@Override public int hashCode()
+	{
+		return Objects.hash(chunkPos);
+	}
+	
+}
diff --git a/src/main/java/com/seibel/lod/wrappers/ChunkWrapper.java b/src/main/java/com/seibel/lod/wrappers/Chunk/ChunkWrapper.java
similarity index 60%
rename from src/main/java/com/seibel/lod/wrappers/ChunkWrapper.java
rename to src/main/java/com/seibel/lod/wrappers/Chunk/ChunkWrapper.java
index 0a0e536ca..084db34e1 100644
--- a/src/main/java/com/seibel/lod/wrappers/ChunkWrapper.java
+++ b/src/main/java/com/seibel/lod/wrappers/Chunk/ChunkWrapper.java
@@ -1,18 +1,19 @@
-package com.seibel.lod.wrappers;
+package com.seibel.lod.wrappers.Chunk;
 
-import jdk.nashorn.internal.ir.Block;
-import net.minecraft.util.math.BlockPos;
+import com.seibel.lod.wrappers.Block.BlockWrapper;
+import com.seibel.lod.wrappers.Block.BlockPosWrapper;
 import net.minecraft.world.chunk.IChunk;
 
 public class ChunkWrapper
 {
 	
 	private IChunk chunk;
-	
+	private ChunkPosWrapper chunkPos;
 	
 	public ChunkWrapper(IChunk chunk)
 	{
 		this.chunk = chunk;
+		this.chunkPos = new ChunkPosWrapper(chunk.getPos());
 	}
 	
 	public BlockWrapper getBlock(BlockPosWrapper blockPos)
@@ -20,6 +21,9 @@ public class ChunkWrapper
 		return BlockWrapper.getBlockWrapper(chunk.getBlockState(blockPos.getBlockPos()).getBlock());
 	}
 	
+	public ChunkPosWrapper getChunkPos(){
+		return chunkPos;
+	}
 	public int getEmittedBrightness(BlockPosWrapper blockPos)
 	{
 		return chunk.getLightEmission(blockPos.getBlockPos());
diff --git a/src/main/java/com/seibel/lod/wrappers/LigthMapWrapper.java b/src/main/java/com/seibel/lod/wrappers/LigthMapWrapper.java
index 4b92b8cbf..bb5eabf19 100644
--- a/src/main/java/com/seibel/lod/wrappers/LigthMapWrapper.java
+++ b/src/main/java/com/seibel/lod/wrappers/LigthMapWrapper.java
@@ -1,5 +1,19 @@
 package com.seibel.lod.wrappers;
 
+import net.minecraft.client.renderer.texture.NativeImage;
+
+
 public class LigthMapWrapper
 {
+	static NativeImage lightMap = null;
+	
+	public static void setLightMap(NativeImage lightMap)
+	{
+		lightMap = null;
+	}
+	
+	public static int getLightValue(int skyLight, int blockLight)
+	{
+		return lightMap.getPixelRGBA(skyLight, blockLight);
+	}
 }
diff --git a/src/main/java/com/seibel/lod/wrappers/MutableBlockPosWrapper.java b/src/main/java/com/seibel/lod/wrappers/MutableBlockPosWrapper.java
deleted file mode 100644
index 7a140c32d..000000000
--- a/src/main/java/com/seibel/lod/wrappers/MutableBlockPosWrapper.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.seibel.lod.wrappers;
-
-public class MutableBlockPosWrapper
-{
-}
diff --git a/src/main/java/com/seibel/lod/wrappers/Vertex/BufferBuilderWrapper.java b/src/main/java/com/seibel/lod/wrappers/Vertex/BufferBuilderWrapper.java
new file mode 100644
index 000000000..672c484d6
--- /dev/null
+++ b/src/main/java/com/seibel/lod/wrappers/Vertex/BufferBuilderWrapper.java
@@ -0,0 +1,5 @@
+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
new file mode 100644
index 000000000..c7fa61f00
--- /dev/null
+++ b/src/main/java/com/seibel/lod/wrappers/Vertex/VertexBufferWrapper.java
@@ -0,0 +1,5 @@
+package com.seibel.lod.wrappers.Vertex;
+
+public class VertexBufferWrapper
+{
+}
diff --git a/src/main/java/com/seibel/lod/wrappers/BiomeWrapper.java b/src/main/java/com/seibel/lod/wrappers/World/BiomeWrapper.java
similarity index 94%
rename from src/main/java/com/seibel/lod/wrappers/BiomeWrapper.java
rename to src/main/java/com/seibel/lod/wrappers/World/BiomeWrapper.java
index 397a3e3d5..f14485f8c 100644
--- a/src/main/java/com/seibel/lod/wrappers/BiomeWrapper.java
+++ b/src/main/java/com/seibel/lod/wrappers/World/BiomeWrapper.java
@@ -1,13 +1,10 @@
-package com.seibel.lod.wrappers;
+package com.seibel.lod.wrappers.World;
 
 import com.seibel.lod.util.ColorUtil;
-import com.seibel.lod.util.LodUtil;
-import net.minecraft.block.Block;
+import com.seibel.lod.wrappers.Block.BlockWrapper;
 import net.minecraft.block.Blocks;
-import net.minecraft.block.material.MaterialColor;
 import net.minecraft.world.biome.Biome;
 
-import java.awt.*;
 import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
diff --git a/src/main/java/com/seibel/lod/wrappers/DimensionTypeWrapper.java b/src/main/java/com/seibel/lod/wrappers/World/DimensionTypeWrapper.java
similarity index 96%
rename from src/main/java/com/seibel/lod/wrappers/DimensionTypeWrapper.java
rename to src/main/java/com/seibel/lod/wrappers/World/DimensionTypeWrapper.java
index d1036dbf8..44965431e 100644
--- a/src/main/java/com/seibel/lod/wrappers/DimensionTypeWrapper.java
+++ b/src/main/java/com/seibel/lod/wrappers/World/DimensionTypeWrapper.java
@@ -1,4 +1,4 @@
-package com.seibel.lod.wrappers;
+package com.seibel.lod.wrappers.World;
 
 import net.minecraft.world.DimensionType;
 
diff --git a/src/main/java/com/seibel/lod/wrappers/WorldWrapper.java b/src/main/java/com/seibel/lod/wrappers/World/WorldWrapper.java
similarity index 94%
rename from src/main/java/com/seibel/lod/wrappers/WorldWrapper.java
rename to src/main/java/com/seibel/lod/wrappers/World/WorldWrapper.java
index 7f7540bee..4589c225a 100644
--- a/src/main/java/com/seibel/lod/wrappers/WorldWrapper.java
+++ b/src/main/java/com/seibel/lod/wrappers/World/WorldWrapper.java
@@ -1,7 +1,7 @@
-package com.seibel.lod.wrappers;
+package com.seibel.lod.wrappers.World;
 
+import com.seibel.lod.wrappers.Block.BlockPosWrapper;
 import net.minecraft.world.IWorld;
-import net.minecraft.world.biome.Biome;
 
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;