diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/ArrayHunk.java b/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/storage/ArrayHunk.java
similarity index 82%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/ArrayHunk.java
rename to src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/storage/ArrayHunk.java
index 62bd489d8..8f60b735f 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/ArrayHunk.java
+++ b/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/storage/ArrayHunk.java
@@ -1,5 +1,6 @@
-package com.volmit.iris.gen.v2.scaffold.hunk;
+package com.volmit.iris.gen.v2.scaffold.hunk.storage;
 
+import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
 import org.bouncycastle.util.Arrays;
 
 import lombok.Data;
@@ -12,7 +13,7 @@ public class ArrayHunk<T> extends StorageHunk<T> implements Hunk<T>
 	private final T[] data;
 
 	@SuppressWarnings("unchecked")
-	protected ArrayHunk(int w, int h, int d)
+	public ArrayHunk(int w, int h, int d)
 	{
 		super(w, h, d);
 		data = (T[]) new Object[w * h * d];
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/AtomicDoubleHunk.java b/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/storage/AtomicDoubleHunk.java
similarity index 82%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/AtomicDoubleHunk.java
rename to src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/storage/AtomicDoubleHunk.java
index 54702e94c..fedd52500 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/AtomicDoubleHunk.java
+++ b/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/storage/AtomicDoubleHunk.java
@@ -1,7 +1,8 @@
-package com.volmit.iris.gen.v2.scaffold.hunk;
+package com.volmit.iris.gen.v2.scaffold.hunk.storage;
 
 import com.google.common.util.concurrent.AtomicDoubleArray;
 
+import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -11,7 +12,7 @@ public class AtomicDoubleHunk extends StorageHunk<Double> implements Hunk<Double
 {
 	private final AtomicDoubleArray data;
 
-	protected AtomicDoubleHunk(int w, int h, int d)
+	public AtomicDoubleHunk(int w, int h, int d)
 	{
 		super(w, h, d);
 		data = new AtomicDoubleArray(w * h * d);
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/AtomicHunk.java b/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/storage/AtomicHunk.java
similarity index 83%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/AtomicHunk.java
rename to src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/storage/AtomicHunk.java
index c0e731477..35ba075d9 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/AtomicHunk.java
+++ b/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/storage/AtomicHunk.java
@@ -1,7 +1,8 @@
-package com.volmit.iris.gen.v2.scaffold.hunk;
+package com.volmit.iris.gen.v2.scaffold.hunk.storage;
 
 import java.util.concurrent.atomic.AtomicReferenceArray;
 
+import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -11,7 +12,7 @@ public class AtomicHunk<T> extends StorageHunk<T> implements Hunk<T>
 {
 	private final AtomicReferenceArray<T> data;
 
-	protected AtomicHunk(int w, int h, int d)
+	public AtomicHunk(int w, int h, int d)
 	{
 		super(w, h, d);
 		data = new AtomicReferenceArray<T>(w * h * d);
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/AtomicIntegerHunk.java b/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/storage/AtomicIntegerHunk.java
similarity index 82%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/AtomicIntegerHunk.java
rename to src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/storage/AtomicIntegerHunk.java
index 7dfb93867..05a7b1795 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/AtomicIntegerHunk.java
+++ b/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/storage/AtomicIntegerHunk.java
@@ -1,7 +1,8 @@
-package com.volmit.iris.gen.v2.scaffold.hunk;
+package com.volmit.iris.gen.v2.scaffold.hunk.storage;
 
 import java.util.concurrent.atomic.AtomicIntegerArray;
 
+import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -11,7 +12,7 @@ public class AtomicIntegerHunk extends StorageHunk<Integer> implements Hunk<Inte
 {
 	private final AtomicIntegerArray data;
 
-	protected AtomicIntegerHunk(int w, int h, int d)
+	public AtomicIntegerHunk(int w, int h, int d)
 	{
 		super(w, h, d);
 		data = new AtomicIntegerArray(w * h * d);
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/AtomicLongHunk.java b/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/storage/AtomicLongHunk.java
similarity index 82%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/AtomicLongHunk.java
rename to src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/storage/AtomicLongHunk.java
index 0f89ed679..270720a6d 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/AtomicLongHunk.java
+++ b/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/storage/AtomicLongHunk.java
@@ -1,7 +1,8 @@
-package com.volmit.iris.gen.v2.scaffold.hunk;
+package com.volmit.iris.gen.v2.scaffold.hunk.storage;
 
 import java.util.concurrent.atomic.AtomicLongArray;
 
+import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -11,7 +12,7 @@ public class AtomicLongHunk extends StorageHunk<Long> implements Hunk<Long>
 {
 	private final AtomicLongArray data;
 
-	protected AtomicLongHunk(int w, int h, int d)
+	public AtomicLongHunk(int w, int h, int d)
 	{
 		super(w, h, d);
 		data = new AtomicLongArray(w * h * d);
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/MappedHunk.java b/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/storage/MappedHunk.java
similarity index 79%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/MappedHunk.java
rename to src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/storage/MappedHunk.java
index 92be58fa8..3df0f8b11 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/MappedHunk.java
+++ b/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/storage/MappedHunk.java
@@ -1,5 +1,6 @@
-package com.volmit.iris.gen.v2.scaffold.hunk;
+package com.volmit.iris.gen.v2.scaffold.hunk.storage;
 
+import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
 import com.volmit.iris.util.BlockPosition;
 import com.volmit.iris.util.KMap;
 
@@ -12,7 +13,7 @@ public class MappedHunk<T> extends StorageHunk<T> implements Hunk<T>
 {
 	private final KMap<BlockPosition, T> data;
 
-	protected MappedHunk(int w, int h, int d)
+	public MappedHunk(int w, int h, int d)
 	{
 		super(w, h, d);
 		data = new KMap<>();
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/StorageHunk.java b/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/storage/StorageHunk.java
similarity index 76%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/StorageHunk.java
rename to src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/storage/StorageHunk.java
index 64cd65355..82c46cec1 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/StorageHunk.java
+++ b/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/storage/StorageHunk.java
@@ -1,5 +1,6 @@
-package com.volmit.iris.gen.v2.scaffold.hunk;
+package com.volmit.iris.gen.v2.scaffold.hunk.storage;
 
+import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
 import lombok.Data;
 
 @Data
@@ -9,7 +10,7 @@ public abstract class StorageHunk<T> implements Hunk<T>
 	private final int height;
 	private final int depth;
 
-	protected StorageHunk(int width, int height, int depth)
+	public StorageHunk(int width, int height, int depth)
 	{
 		if(width <= 0 || height <= 0 || depth <= 0)
 		{
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/SynchronizedArrayHunk.java b/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/storage/SynchronizedArrayHunk.java
similarity index 83%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/SynchronizedArrayHunk.java
rename to src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/storage/SynchronizedArrayHunk.java
index 67cbcd7d3..aaf69f58a 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/SynchronizedArrayHunk.java
+++ b/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/storage/SynchronizedArrayHunk.java
@@ -1,5 +1,6 @@
-package com.volmit.iris.gen.v2.scaffold.hunk;
+package com.volmit.iris.gen.v2.scaffold.hunk.storage;
 
+import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
 import org.bouncycastle.util.Arrays;
 
 import lombok.Data;
@@ -12,7 +13,7 @@ public class SynchronizedArrayHunk<T> extends StorageHunk<T> implements Hunk<T>
 	private final T[] data;
 
 	@SuppressWarnings("unchecked")
-	protected SynchronizedArrayHunk(int w, int h, int d)
+	public SynchronizedArrayHunk(int w, int h, int d)
 	{
 		super(w, h, d);
 		data = (T[]) new Object[w * h * d];