diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 88c25c46b..e36870f22 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -16,8 +16,8 @@
     <option name="RECENT_TEMPLATES">
       <list>
         <option value="Enum" />
-        <option value="Interface" />
         <option value="Class" />
+        <option value="Interface" />
       </list>
     </option>
   </component>
@@ -60,11 +60,11 @@
       <recent name="com.volmit.iris.gen.v2.scaffold.stream.sources" />
     </key>
     <key name="CopyClassDialog.RECENTS_KEY">
+      <recent name="com.volmit.iris.object" />
       <recent name="com.volmit.iris.gen.v2.generator.actuator" />
       <recent name="com.volmit.iris.gen.v2.scaffold.stream.utility" />
       <recent name="com.volmit.iris.gen.v2.scaffold.stream.arithmetic" />
       <recent name="com.volmit.iris.gen.v2.scaffold.stream.convert" />
-      <recent name="com.volmit.iris.gen.v2.scaffold.stream.api" />
     </key>
     <key name="CopyFile.RECENT_KEYS">
       <recent name="C:\Users\cyberpwn\Documents\development\workspace\Iris\src\main\java\com\volmit\iris\gen\v2\scaffold\hunk" />
diff --git a/src/main/java/com/volmit/iris/command/CommandIris.java b/src/main/java/com/volmit/iris/command/CommandIris.java
index ef9f5723d..c9633d384 100644
--- a/src/main/java/com/volmit/iris/command/CommandIris.java
+++ b/src/main/java/com/volmit/iris/command/CommandIris.java
@@ -2,7 +2,7 @@ package com.volmit.iris.command;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.IrisSettings;
-import com.volmit.iris.gen.v2.TestGen;
+import com.volmit.iris.v2.TestGen;
 import com.volmit.iris.util.Command;
 import com.volmit.iris.util.KList;
 import com.volmit.iris.util.MortarCommand;
diff --git a/src/main/java/com/volmit/iris/gen/ContextualTerrainProvider.java b/src/main/java/com/volmit/iris/gen/ContextualTerrainProvider.java
index 1ee81b400..5530eb7aa 100644
--- a/src/main/java/com/volmit/iris/gen/ContextualTerrainProvider.java
+++ b/src/main/java/com/volmit/iris/gen/ContextualTerrainProvider.java
@@ -31,7 +31,7 @@ import com.volmit.iris.gen.scaffold.Provisioned;
 import com.volmit.iris.gen.scaffold.TerrainChunk;
 import com.volmit.iris.gen.scaffold.TerrainProvider;
 import com.volmit.iris.gen.scaffold.TerrainTarget;
-import com.volmit.iris.gen.v2.DataProvider;
+import com.volmit.iris.v2.DataProvider;
 import com.volmit.iris.manager.IrisDataManager;
 import com.volmit.iris.noise.CNG;
 import com.volmit.iris.object.IrisBiome;
diff --git a/src/main/java/com/volmit/iris/noise/CNG.java b/src/main/java/com/volmit/iris/noise/CNG.java
index c19d8e201..0acf9be7c 100644
--- a/src/main/java/com/volmit/iris/noise/CNG.java
+++ b/src/main/java/com/volmit/iris/noise/CNG.java
@@ -3,9 +3,9 @@ package com.volmit.iris.noise;
 import java.util.List;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
-import com.volmit.iris.gen.v2.scaffold.stream.sources.CNGStream;
-import com.volmit.iris.gen.v2.scaffold.stream.arithmetic.FittedStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.sources.CNGStream;
+import com.volmit.iris.v2.scaffold.stream.arithmetic.FittedStream;
 import com.volmit.iris.util.IRare;
 import com.volmit.iris.util.IrisInterpolation;
 import com.volmit.iris.util.KList;
diff --git a/src/main/java/com/volmit/iris/object/IrisBiome.java b/src/main/java/com/volmit/iris/object/IrisBiome.java
index 899002d06..962180c1a 100644
--- a/src/main/java/com/volmit/iris/object/IrisBiome.java
+++ b/src/main/java/com/volmit/iris/object/IrisBiome.java
@@ -7,7 +7,7 @@ import org.bukkit.block.Biome;
 import com.volmit.iris.Iris;
 import com.volmit.iris.gen.ContextualTerrainProvider;
 import com.volmit.iris.gen.atomics.AtomicCache;
-import com.volmit.iris.gen.v2.DataProvider;
+import com.volmit.iris.v2.DataProvider;
 import com.volmit.iris.manager.IrisDataManager;
 import com.volmit.iris.noise.CNG;
 import com.volmit.iris.util.ArrayType;
diff --git a/src/main/java/com/volmit/iris/object/IrisBiomeGeneratorLink.java b/src/main/java/com/volmit/iris/object/IrisBiomeGeneratorLink.java
index a07a2bf66..ec74b7f71 100644
--- a/src/main/java/com/volmit/iris/object/IrisBiomeGeneratorLink.java
+++ b/src/main/java/com/volmit/iris/object/IrisBiomeGeneratorLink.java
@@ -2,7 +2,7 @@ package com.volmit.iris.object;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.gen.atomics.AtomicCache;
-import com.volmit.iris.gen.v2.DataProvider;
+import com.volmit.iris.v2.DataProvider;
 import com.volmit.iris.util.DependsOn;
 import com.volmit.iris.util.Desc;
 import com.volmit.iris.util.DontObfuscate;
diff --git a/src/main/java/com/volmit/iris/object/IrisDimension.java b/src/main/java/com/volmit/iris/object/IrisDimension.java
index b8ab4d8d6..f255a4b4f 100644
--- a/src/main/java/com/volmit/iris/object/IrisDimension.java
+++ b/src/main/java/com/volmit/iris/object/IrisDimension.java
@@ -50,6 +50,10 @@ public class IrisDimension extends IrisRegistrant
 	@Desc("The human readable name of this dimension")
 	private String name = "A Dimension";
 
+	@Desc("You can create mutliple dimensions on top of each other taking up less height of the same world. Such as the nether with a floor + ceiling.")
+	@ArrayType(min = 1,type = IrisDimensionIndex.class)
+	private KList<IrisDimensionIndex> dimensionalComposite = new KList<>();
+
 	@DontObfuscate
 	@Desc("Create an inverted dimension in the sky (like the nether)")
 	private IrisDimension sky = null;
diff --git a/src/main/java/com/volmit/iris/object/IrisDimensionIndex.java b/src/main/java/com/volmit/iris/object/IrisDimensionIndex.java
new file mode 100644
index 000000000..1343e695a
--- /dev/null
+++ b/src/main/java/com/volmit/iris/object/IrisDimensionIndex.java
@@ -0,0 +1,36 @@
+package com.volmit.iris.object;
+
+import com.volmit.iris.Iris;
+import com.volmit.iris.gen.atomics.AtomicCache;
+import com.volmit.iris.manager.IrisDataManager;
+import com.volmit.iris.util.*;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import org.bukkit.block.data.BlockData;
+
+@Accessors(chain = true)
+@NoArgsConstructor
+@AllArgsConstructor
+@Desc("Represents an index for dimensions to take up vertical slots in the same world")
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class IrisDimensionIndex
+{
+	@Required
+	@DontObfuscate
+	@Desc("The weight of this dimension. If there are 2 dimensions, if the weight is the same on both, both dimensions will take up 128 blocks of height.")
+	private double weight = 1D;
+
+	@DontObfuscate
+	@Desc("If inverted is set to true, the dimension will be updide down in the world")
+	private boolean inverted = false;
+
+	@DontObfuscate
+	@Required
+	@RegistryListDimension
+	@MinNumber(1)
+	private String dimension = "";
+}
diff --git a/src/main/java/com/volmit/iris/object/IrisRegion.java b/src/main/java/com/volmit/iris/object/IrisRegion.java
index 97f565b8c..ffcb8e8ef 100644
--- a/src/main/java/com/volmit/iris/object/IrisRegion.java
+++ b/src/main/java/com/volmit/iris/object/IrisRegion.java
@@ -2,7 +2,7 @@ package com.volmit.iris.object;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.gen.atomics.AtomicCache;
-import com.volmit.iris.gen.v2.DataProvider;
+import com.volmit.iris.v2.DataProvider;
 import com.volmit.iris.noise.CNG;
 import com.volmit.iris.util.ArrayType;
 import com.volmit.iris.util.Desc;
diff --git a/src/main/java/com/volmit/iris/object/NoiseStyle.java b/src/main/java/com/volmit/iris/object/NoiseStyle.java
index d7edfc904..9cb18f326 100644
--- a/src/main/java/com/volmit/iris/object/NoiseStyle.java
+++ b/src/main/java/com/volmit/iris/object/NoiseStyle.java
@@ -1,6 +1,6 @@
 package com.volmit.iris.object;
 
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 import com.volmit.iris.noise.CNG;
 import com.volmit.iris.noise.CNGFactory;
 import com.volmit.iris.noise.NoiseType;
diff --git a/src/main/java/com/volmit/iris/gen/v2/DataProvider.java b/src/main/java/com/volmit/iris/v2/DataProvider.java
similarity index 78%
rename from src/main/java/com/volmit/iris/gen/v2/DataProvider.java
rename to src/main/java/com/volmit/iris/v2/DataProvider.java
index 4896986d8..224681f96 100644
--- a/src/main/java/com/volmit/iris/gen/v2/DataProvider.java
+++ b/src/main/java/com/volmit/iris/v2/DataProvider.java
@@ -1,4 +1,4 @@
-package com.volmit.iris.gen.v2;
+package com.volmit.iris.v2;
 
 import com.volmit.iris.manager.IrisDataManager;
 
diff --git a/src/main/java/com/volmit/iris/gen/v2/IrisTerrainGenerator.java b/src/main/java/com/volmit/iris/v2/IrisTerrainGenerator.java
similarity index 95%
rename from src/main/java/com/volmit/iris/gen/v2/IrisTerrainGenerator.java
rename to src/main/java/com/volmit/iris/v2/IrisTerrainGenerator.java
index 089a059fa..e9136d5f6 100644
--- a/src/main/java/com/volmit/iris/gen/v2/IrisTerrainGenerator.java
+++ b/src/main/java/com/volmit/iris/v2/IrisTerrainGenerator.java
@@ -1,17 +1,17 @@
-package com.volmit.iris.gen.v2;
+package com.volmit.iris.v2;
 
 import java.util.Random;
 import java.util.function.Predicate;
 
-import com.volmit.iris.gen.v2.generator.IrisComplex;
+import com.volmit.iris.v2.generator.IrisComplex;
 import org.bukkit.Chunk;
 import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.block.Biome;
 import org.bukkit.block.data.BlockData;
 
-import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.hunk.Hunk;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 import com.volmit.iris.manager.IrisDataManager;
 import com.volmit.iris.object.IrisBiome;
 import com.volmit.iris.object.IrisDecorator;
diff --git a/src/main/java/com/volmit/iris/gen/v2/TestGen.java b/src/main/java/com/volmit/iris/v2/TestGen.java
similarity index 90%
rename from src/main/java/com/volmit/iris/gen/v2/TestGen.java
rename to src/main/java/com/volmit/iris/v2/TestGen.java
index 1d97f4f62..2d456528b 100644
--- a/src/main/java/com/volmit/iris/gen/v2/TestGen.java
+++ b/src/main/java/com/volmit/iris/v2/TestGen.java
@@ -1,12 +1,10 @@
-package com.volmit.iris.gen.v2;
+package com.volmit.iris.v2;
 
 import java.util.List;
 import java.util.Random;
 import java.util.UUID;
 
-import com.volmit.iris.util.J;
 import com.volmit.iris.util.KList;
-import net.minecraft.server.v1_16_R2.MinecraftServer;
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.WorldCreator;
@@ -16,7 +14,7 @@ import org.bukkit.generator.BlockPopulator;
 import org.bukkit.generator.ChunkGenerator;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
+import com.volmit.iris.v2.scaffold.hunk.Hunk;
 import com.volmit.iris.util.Form;
 import com.volmit.iris.util.PrecisionStopwatch;
 import org.jetbrains.annotations.NotNull;
diff --git a/src/main/java/com/volmit/iris/v2/compound/EngineCompound.java b/src/main/java/com/volmit/iris/v2/compound/EngineCompound.java
new file mode 100644
index 000000000..8aa70f07b
--- /dev/null
+++ b/src/main/java/com/volmit/iris/v2/compound/EngineCompound.java
@@ -0,0 +1,13 @@
+package com.volmit.iris.v2.compound;
+
+import com.volmit.iris.v2.scaffold.engine.Engine;
+import org.bukkit.World;
+
+public interface EngineCompound
+{
+    public World getWorld();
+
+    public int getSize();
+
+    public Engine getEngine(int index);
+}
diff --git a/src/main/java/com/volmit/iris/gen/v2/generator/IrisComplex.java b/src/main/java/com/volmit/iris/v2/generator/IrisComplex.java
similarity index 97%
rename from src/main/java/com/volmit/iris/gen/v2/generator/IrisComplex.java
rename to src/main/java/com/volmit/iris/v2/generator/IrisComplex.java
index 80604a3d8..4271503ad 100644
--- a/src/main/java/com/volmit/iris/gen/v2/generator/IrisComplex.java
+++ b/src/main/java/com/volmit/iris/v2/generator/IrisComplex.java
@@ -1,15 +1,15 @@
-package com.volmit.iris.gen.v2.generator;
+package com.volmit.iris.v2.generator;
 
-import com.volmit.iris.gen.v2.DataProvider;
-import com.volmit.iris.gen.v2.scaffold.engine.Engine;
+import com.volmit.iris.v2.DataProvider;
+import com.volmit.iris.v2.scaffold.engine.Engine;
 import com.volmit.iris.util.B;
 import org.bukkit.Material;
 import org.bukkit.block.Biome;
 import org.bukkit.block.data.BlockData;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
-import com.volmit.iris.gen.v2.scaffold.stream.interpolation.Interpolated;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.interpolation.Interpolated;
 import com.volmit.iris.manager.IrisDataManager;
 import com.volmit.iris.noise.CNG;
 import com.volmit.iris.object.DecorationPart;
@@ -17,7 +17,6 @@ import com.volmit.iris.object.InferredType;
 import com.volmit.iris.object.IrisBiome;
 import com.volmit.iris.object.IrisDecorator;
 import com.volmit.iris.object.IrisBiomePaletteLayer;
-import com.volmit.iris.object.IrisDimension;
 import com.volmit.iris.object.IrisGenerator;
 import com.volmit.iris.object.IrisRegion;
 import com.volmit.iris.util.KList;
diff --git a/src/main/java/com/volmit/iris/gen/v2/generator/IrisEngine.java b/src/main/java/com/volmit/iris/v2/generator/IrisEngine.java
similarity index 64%
rename from src/main/java/com/volmit/iris/gen/v2/generator/IrisEngine.java
rename to src/main/java/com/volmit/iris/v2/generator/IrisEngine.java
index 76923516c..f8b0abbfc 100644
--- a/src/main/java/com/volmit/iris/gen/v2/generator/IrisEngine.java
+++ b/src/main/java/com/volmit/iris/v2/generator/IrisEngine.java
@@ -1,8 +1,8 @@
-package com.volmit.iris.gen.v2.generator;
+package com.volmit.iris.v2.generator;
 
-import com.volmit.iris.gen.v2.scaffold.engine.Engine;
-import com.volmit.iris.gen.v2.scaffold.engine.EngineFramework;
-import com.volmit.iris.gen.v2.scaffold.engine.EngineTarget;
+import com.volmit.iris.v2.scaffold.engine.Engine;
+import com.volmit.iris.v2.scaffold.engine.EngineFramework;
+import com.volmit.iris.v2.scaffold.engine.EngineTarget;
 import lombok.Getter;
 import lombok.Setter;
 
diff --git a/src/main/java/com/volmit/iris/gen/v2/generator/IrisEngineFramework.java b/src/main/java/com/volmit/iris/v2/generator/IrisEngineFramework.java
similarity index 65%
rename from src/main/java/com/volmit/iris/gen/v2/generator/IrisEngineFramework.java
rename to src/main/java/com/volmit/iris/v2/generator/IrisEngineFramework.java
index bc888d33a..f03908c7e 100644
--- a/src/main/java/com/volmit/iris/gen/v2/generator/IrisEngineFramework.java
+++ b/src/main/java/com/volmit/iris/v2/generator/IrisEngineFramework.java
@@ -1,11 +1,11 @@
-package com.volmit.iris.gen.v2.generator;
+package com.volmit.iris.v2.generator;
 
-import com.volmit.iris.gen.v2.generator.actuator.IrisBiomeActuator;
-import com.volmit.iris.gen.v2.generator.actuator.IrisDecorantActuator;
-import com.volmit.iris.gen.v2.generator.actuator.IrisTerrainActuator;
-import com.volmit.iris.gen.v2.scaffold.engine.Engine;
-import com.volmit.iris.gen.v2.scaffold.engine.EngineActuator;
-import com.volmit.iris.gen.v2.scaffold.engine.EngineFramework;
+import com.volmit.iris.v2.generator.actuator.IrisBiomeActuator;
+import com.volmit.iris.v2.generator.actuator.IrisDecorantActuator;
+import com.volmit.iris.v2.generator.actuator.IrisTerrainActuator;
+import com.volmit.iris.v2.scaffold.engine.Engine;
+import com.volmit.iris.v2.scaffold.engine.EngineActuator;
+import com.volmit.iris.v2.scaffold.engine.EngineFramework;
 import lombok.Getter;
 import org.bukkit.block.Biome;
 import org.bukkit.block.data.BlockData;
diff --git a/src/main/java/com/volmit/iris/gen/v2/generator/actuator/IrisBiomeActuator.java b/src/main/java/com/volmit/iris/v2/generator/actuator/IrisBiomeActuator.java
similarity index 59%
rename from src/main/java/com/volmit/iris/gen/v2/generator/actuator/IrisBiomeActuator.java
rename to src/main/java/com/volmit/iris/v2/generator/actuator/IrisBiomeActuator.java
index 77e1f4d3f..b46b7279c 100644
--- a/src/main/java/com/volmit/iris/gen/v2/generator/actuator/IrisBiomeActuator.java
+++ b/src/main/java/com/volmit/iris/v2/generator/actuator/IrisBiomeActuator.java
@@ -1,10 +1,9 @@
-package com.volmit.iris.gen.v2.generator.actuator;
+package com.volmit.iris.v2.generator.actuator;
 
-import com.volmit.iris.gen.v2.scaffold.engine.Engine;
-import com.volmit.iris.gen.v2.scaffold.engine.EngineAssignedActuator;
-import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
+import com.volmit.iris.v2.scaffold.engine.Engine;
+import com.volmit.iris.v2.scaffold.engine.EngineAssignedActuator;
+import com.volmit.iris.v2.scaffold.hunk.Hunk;
 import org.bukkit.block.Biome;
-import org.bukkit.block.data.BlockData;
 
 public class IrisBiomeActuator extends EngineAssignedActuator<Biome>
 {
diff --git a/src/main/java/com/volmit/iris/gen/v2/generator/actuator/IrisDecorantActuator.java b/src/main/java/com/volmit/iris/v2/generator/actuator/IrisDecorantActuator.java
similarity index 94%
rename from src/main/java/com/volmit/iris/gen/v2/generator/actuator/IrisDecorantActuator.java
rename to src/main/java/com/volmit/iris/v2/generator/actuator/IrisDecorantActuator.java
index 829ed0ffb..bef1f8059 100644
--- a/src/main/java/com/volmit/iris/gen/v2/generator/actuator/IrisDecorantActuator.java
+++ b/src/main/java/com/volmit/iris/v2/generator/actuator/IrisDecorantActuator.java
@@ -1,8 +1,8 @@
-package com.volmit.iris.gen.v2.generator.actuator;
+package com.volmit.iris.v2.generator.actuator;
 
-import com.volmit.iris.gen.v2.scaffold.engine.Engine;
-import com.volmit.iris.gen.v2.scaffold.engine.EngineAssignedActuator;
-import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
+import com.volmit.iris.v2.scaffold.engine.Engine;
+import com.volmit.iris.v2.scaffold.engine.EngineAssignedActuator;
+import com.volmit.iris.v2.scaffold.hunk.Hunk;
 import com.volmit.iris.object.IrisBiome;
 import com.volmit.iris.object.IrisDecorator;
 import com.volmit.iris.util.RNG;
diff --git a/src/main/java/com/volmit/iris/gen/v2/generator/actuator/IrisTerrainActuator.java b/src/main/java/com/volmit/iris/v2/generator/actuator/IrisTerrainActuator.java
similarity index 64%
rename from src/main/java/com/volmit/iris/gen/v2/generator/actuator/IrisTerrainActuator.java
rename to src/main/java/com/volmit/iris/v2/generator/actuator/IrisTerrainActuator.java
index c8eef12c8..4c6cf8ff0 100644
--- a/src/main/java/com/volmit/iris/gen/v2/generator/actuator/IrisTerrainActuator.java
+++ b/src/main/java/com/volmit/iris/v2/generator/actuator/IrisTerrainActuator.java
@@ -1,8 +1,8 @@
-package com.volmit.iris.gen.v2.generator.actuator;
+package com.volmit.iris.v2.generator.actuator;
 
-import com.volmit.iris.gen.v2.scaffold.engine.Engine;
-import com.volmit.iris.gen.v2.scaffold.engine.EngineAssignedActuator;
-import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
+import com.volmit.iris.v2.scaffold.engine.Engine;
+import com.volmit.iris.v2.scaffold.engine.EngineAssignedActuator;
+import com.volmit.iris.v2.scaffold.hunk.Hunk;
 import org.bukkit.block.data.BlockData;
 
 public class IrisTerrainActuator extends EngineAssignedActuator<BlockData>
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/ArraySignificance.java b/src/main/java/com/volmit/iris/v2/scaffold/ArraySignificance.java
similarity index 96%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/ArraySignificance.java
rename to src/main/java/com/volmit/iris/v2/scaffold/ArraySignificance.java
index 550d9d3cf..53375510a 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/ArraySignificance.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/ArraySignificance.java
@@ -1,4 +1,4 @@
-package com.volmit.iris.gen.v2.scaffold;
+package com.volmit.iris.v2.scaffold;
 
 import com.volmit.iris.util.KList;
 
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/GenStage.java b/src/main/java/com/volmit/iris/v2/scaffold/GenStage.java
similarity index 65%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/GenStage.java
rename to src/main/java/com/volmit/iris/v2/scaffold/GenStage.java
index ee9ed07ea..306ada2f5 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/GenStage.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/GenStage.java
@@ -1,4 +1,4 @@
-package com.volmit.iris.gen.v2.scaffold;
+package com.volmit.iris.v2.scaffold;
 
 public enum GenStage
 {
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/Significance.java b/src/main/java/com/volmit/iris/v2/scaffold/Significance.java
similarity index 81%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/Significance.java
rename to src/main/java/com/volmit/iris/v2/scaffold/Significance.java
index 7da91fcb6..3e4d256ad 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/Significance.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/Significance.java
@@ -1,4 +1,4 @@
-package com.volmit.iris.gen.v2.scaffold;
+package com.volmit.iris.v2.scaffold;
 
 import com.volmit.iris.util.KList;
 
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/data/DataPalette.java b/src/main/java/com/volmit/iris/v2/scaffold/data/DataPalette.java
similarity index 95%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/data/DataPalette.java
rename to src/main/java/com/volmit/iris/v2/scaffold/data/DataPalette.java
index 8be6fc055..f10ba307d 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/data/DataPalette.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/data/DataPalette.java
@@ -1,8 +1,7 @@
-package com.volmit.iris.gen.v2.scaffold.data;
+package com.volmit.iris.v2.scaffold.data;
 
 import com.volmit.iris.util.KList;
 
-import java.io.DataInput;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/data/IOAdapter.java b/src/main/java/com/volmit/iris/v2/scaffold/data/IOAdapter.java
similarity index 57%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/data/IOAdapter.java
rename to src/main/java/com/volmit/iris/v2/scaffold/data/IOAdapter.java
index 4c8d12600..a7cf8f069 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/data/IOAdapter.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/data/IOAdapter.java
@@ -1,7 +1,4 @@
-package com.volmit.iris.gen.v2.scaffold.data;
-
-import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
-import com.volmit.iris.util.Function3;
+package com.volmit.iris.v2.scaffold.data;
 
 import java.io.*;
 
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/engine/Engine.java b/src/main/java/com/volmit/iris/v2/scaffold/engine/Engine.java
similarity index 86%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/engine/Engine.java
rename to src/main/java/com/volmit/iris/v2/scaffold/engine/Engine.java
index 8e2ca7cf3..1a9917d8b 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/engine/Engine.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/engine/Engine.java
@@ -1,6 +1,6 @@
-package com.volmit.iris.gen.v2.scaffold.engine;
+package com.volmit.iris.v2.scaffold.engine;
 
-import com.volmit.iris.gen.v2.scaffold.parallax.ParallaxAccess;
+import com.volmit.iris.v2.scaffold.parallax.ParallaxAccess;
 import com.volmit.iris.manager.IrisDataManager;
 import com.volmit.iris.object.IrisDimension;
 import org.bukkit.World;
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/engine/EngineActuator.java b/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineActuator.java
similarity index 82%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/engine/EngineActuator.java
rename to src/main/java/com/volmit/iris/v2/scaffold/engine/EngineActuator.java
index c461add24..d995cdc01 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/engine/EngineActuator.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineActuator.java
@@ -1,8 +1,8 @@
-package com.volmit.iris.gen.v2.scaffold.engine;
+package com.volmit.iris.v2.scaffold.engine;
 
-import com.volmit.iris.gen.v2.generator.IrisComplex;
-import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
-import com.volmit.iris.gen.v2.scaffold.parallax.ParallaxAccess;
+import com.volmit.iris.v2.generator.IrisComplex;
+import com.volmit.iris.v2.scaffold.hunk.Hunk;
+import com.volmit.iris.v2.scaffold.parallax.ParallaxAccess;
 import com.volmit.iris.manager.IrisDataManager;
 import com.volmit.iris.object.IrisDimension;
 
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/engine/EngineAssignedActuator.java b/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineAssignedActuator.java
similarity index 80%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/engine/EngineAssignedActuator.java
rename to src/main/java/com/volmit/iris/v2/scaffold/engine/EngineAssignedActuator.java
index 05b24e6b0..3b2a1a8bb 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/engine/EngineAssignedActuator.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineAssignedActuator.java
@@ -1,4 +1,4 @@
-package com.volmit.iris.gen.v2.scaffold.engine;
+package com.volmit.iris.v2.scaffold.engine;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/engine/EngineFramework.java b/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineFramework.java
similarity index 70%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/engine/EngineFramework.java
rename to src/main/java/com/volmit/iris/v2/scaffold/engine/EngineFramework.java
index 83386e8cc..8df3cdc09 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/engine/EngineFramework.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineFramework.java
@@ -1,7 +1,7 @@
-package com.volmit.iris.gen.v2.scaffold.engine;
+package com.volmit.iris.v2.scaffold.engine;
 
-import com.volmit.iris.gen.v2.generator.IrisComplex;
-import com.volmit.iris.gen.v2.generator.IrisEngine;
+import com.volmit.iris.v2.generator.IrisComplex;
+import com.volmit.iris.v2.generator.IrisEngine;
 import org.bukkit.block.Biome;
 import org.bukkit.block.data.BlockData;
 
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/engine/EngineTarget.java b/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineTarget.java
similarity index 85%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/engine/EngineTarget.java
rename to src/main/java/com/volmit/iris/v2/scaffold/engine/EngineTarget.java
index 3453ad222..8b0bb642a 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/engine/EngineTarget.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineTarget.java
@@ -1,6 +1,6 @@
-package com.volmit.iris.gen.v2.scaffold.engine;
+package com.volmit.iris.v2.scaffold.engine;
 
-import com.volmit.iris.gen.v2.scaffold.parallax.ParallaxWorld;
+import com.volmit.iris.v2.scaffold.parallax.ParallaxWorld;
 import com.volmit.iris.manager.IrisDataManager;
 import com.volmit.iris.object.IrisDimension;
 import lombok.Data;
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/Hunk.java b/src/main/java/com/volmit/iris/v2/scaffold/hunk/Hunk.java
similarity index 98%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/Hunk.java
rename to src/main/java/com/volmit/iris/v2/scaffold/hunk/Hunk.java
index 595eb0ef2..258bf4b60 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/Hunk.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/hunk/Hunk.java
@@ -1,15 +1,14 @@
-package com.volmit.iris.gen.v2.scaffold.hunk;
+package com.volmit.iris.v2.scaffold.hunk;
 
-import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Predicate;
 
-import com.volmit.iris.gen.v2.scaffold.hunk.io.HunkIOAdapter;
-import com.volmit.iris.gen.v2.scaffold.hunk.storage.*;
-import com.volmit.iris.gen.v2.scaffold.hunk.view.*;
+import com.volmit.iris.v2.scaffold.hunk.io.HunkIOAdapter;
+import com.volmit.iris.v2.scaffold.hunk.storage.*;
+import com.volmit.iris.v2.scaffold.hunk.view.*;
 import com.volmit.iris.util.*;
 import org.bukkit.Chunk;
 import org.bukkit.block.Biome;
@@ -17,8 +16,8 @@ import org.bukkit.block.data.BlockData;
 import org.bukkit.generator.ChunkGenerator.BiomeGrid;
 import org.bukkit.generator.ChunkGenerator.ChunkData;
 
-import com.volmit.iris.gen.v2.scaffold.multicore.BurstExecutor;
-import com.volmit.iris.gen.v2.scaffold.multicore.MultiBurst;
+import com.volmit.iris.v2.scaffold.parallel.BurstExecutor;
+import com.volmit.iris.v2.scaffold.parallel.MultiBurst;
 
 public interface Hunk<T>
 {
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/HunkFace.java b/src/main/java/com/volmit/iris/v2/scaffold/hunk/HunkFace.java
similarity index 60%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/HunkFace.java
rename to src/main/java/com/volmit/iris/v2/scaffold/hunk/HunkFace.java
index 27d9e9157..4d187e0a9 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/HunkFace.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/hunk/HunkFace.java
@@ -1,4 +1,4 @@
-package com.volmit.iris.gen.v2.scaffold.hunk;
+package com.volmit.iris.v2.scaffold.hunk;
 
 public enum HunkFace
 {
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/HunkView.java b/src/main/java/com/volmit/iris/v2/scaffold/hunk/HunkView.java
similarity index 95%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/HunkView.java
rename to src/main/java/com/volmit/iris/v2/scaffold/hunk/HunkView.java
index 7009549de..5a9a78635 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/HunkView.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/hunk/HunkView.java
@@ -1,4 +1,4 @@
-package com.volmit.iris.gen.v2.scaffold.hunk;
+package com.volmit.iris.v2.scaffold.hunk;
 
 public class HunkView<T> implements Hunk<T>
 {
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/io/BasicHunkIOAdapter.java b/src/main/java/com/volmit/iris/v2/scaffold/hunk/io/BasicHunkIOAdapter.java
similarity index 93%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/io/BasicHunkIOAdapter.java
rename to src/main/java/com/volmit/iris/v2/scaffold/hunk/io/BasicHunkIOAdapter.java
index e38e8d89b..524903c92 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/io/BasicHunkIOAdapter.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/hunk/io/BasicHunkIOAdapter.java
@@ -1,8 +1,7 @@
-package com.volmit.iris.gen.v2.scaffold.hunk.io;
+package com.volmit.iris.v2.scaffold.hunk.io;
 
-import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
+import com.volmit.iris.v2.scaffold.hunk.Hunk;
 import com.volmit.iris.util.Function3;
-import com.volmit.iris.util.Function4;
 
 import java.io.*;
 import java.util.concurrent.atomic.AtomicBoolean;
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/io/BlockDataHunkIOAdapter.java b/src/main/java/com/volmit/iris/v2/scaffold/hunk/io/BlockDataHunkIOAdapter.java
similarity index 87%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/io/BlockDataHunkIOAdapter.java
rename to src/main/java/com/volmit/iris/v2/scaffold/hunk/io/BlockDataHunkIOAdapter.java
index 99c3028f2..e37b1ec43 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/io/BlockDataHunkIOAdapter.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/hunk/io/BlockDataHunkIOAdapter.java
@@ -1,7 +1,6 @@
-package com.volmit.iris.gen.v2.scaffold.hunk.io;
+package com.volmit.iris.v2.scaffold.hunk.io;
 
 import com.volmit.iris.util.B;
-import org.bukkit.Bukkit;
 import org.bukkit.block.data.BlockData;
 
 import java.io.DataInputStream;
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/io/BooleanHunkIOAdapter.java b/src/main/java/com/volmit/iris/v2/scaffold/hunk/io/BooleanHunkIOAdapter.java
similarity index 89%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/io/BooleanHunkIOAdapter.java
rename to src/main/java/com/volmit/iris/v2/scaffold/hunk/io/BooleanHunkIOAdapter.java
index efe5447b0..c823ddcc6 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/io/BooleanHunkIOAdapter.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/hunk/io/BooleanHunkIOAdapter.java
@@ -1,4 +1,4 @@
-package com.volmit.iris.gen.v2.scaffold.hunk.io;
+package com.volmit.iris.v2.scaffold.hunk.io;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/io/HunkIOAdapter.java b/src/main/java/com/volmit/iris/v2/scaffold/hunk/io/HunkIOAdapter.java
similarity index 90%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/io/HunkIOAdapter.java
rename to src/main/java/com/volmit/iris/v2/scaffold/hunk/io/HunkIOAdapter.java
index 7597fc1f9..e6bd56c5b 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/io/HunkIOAdapter.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/hunk/io/HunkIOAdapter.java
@@ -1,8 +1,8 @@
-package com.volmit.iris.gen.v2.scaffold.hunk.io;
+package com.volmit.iris.v2.scaffold.hunk.io;
 
 import com.volmit.iris.IrisSettings;
-import com.volmit.iris.gen.v2.scaffold.data.IOAdapter;
-import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
+import com.volmit.iris.v2.scaffold.data.IOAdapter;
+import com.volmit.iris.v2.scaffold.hunk.Hunk;
 import com.volmit.iris.util.ByteArrayTag;
 import com.volmit.iris.util.CustomOutputStream;
 import com.volmit.iris.util.Function3;
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/io/HunkRegion.java b/src/main/java/com/volmit/iris/v2/scaffold/hunk/io/HunkRegion.java
similarity index 96%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/io/HunkRegion.java
rename to src/main/java/com/volmit/iris/v2/scaffold/hunk/io/HunkRegion.java
index c0b91cbd5..d388e3009 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/io/HunkRegion.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/hunk/io/HunkRegion.java
@@ -1,4 +1,4 @@
-package com.volmit.iris.gen.v2.scaffold.hunk.io;
+package com.volmit.iris.v2.scaffold.hunk.io;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -13,8 +13,6 @@ import com.volmit.iris.util.NBTInputStream;
 import com.volmit.iris.util.NBTOutputStream;
 import com.volmit.iris.util.Tag;
 
-import lombok.Data;
-
 public class HunkRegion
 {
 	private final File folder;
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/io/HunkRegionSlice.java b/src/main/java/com/volmit/iris/v2/scaffold/hunk/io/HunkRegionSlice.java
similarity index 97%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/io/HunkRegionSlice.java
rename to src/main/java/com/volmit/iris/v2/scaffold/hunk/io/HunkRegionSlice.java
index 5e647934c..953b41ecf 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/io/HunkRegionSlice.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/hunk/io/HunkRegionSlice.java
@@ -1,4 +1,4 @@
-package com.volmit.iris.gen.v2.scaffold.hunk.io;
+package com.volmit.iris.v2.scaffold.hunk.io;
 
 import java.io.IOException;
 
@@ -6,7 +6,7 @@ import com.volmit.iris.util.*;
 import org.bukkit.block.data.BlockData;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
+import com.volmit.iris.v2.scaffold.hunk.Hunk;
 
 public class HunkRegionSlice<T>
 {
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/io/PaletteHunkIOAdapter.java b/src/main/java/com/volmit/iris/v2/scaffold/hunk/io/PaletteHunkIOAdapter.java
similarity index 94%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/io/PaletteHunkIOAdapter.java
rename to src/main/java/com/volmit/iris/v2/scaffold/hunk/io/PaletteHunkIOAdapter.java
index e212fabd9..2be678b61 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/io/PaletteHunkIOAdapter.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/hunk/io/PaletteHunkIOAdapter.java
@@ -1,7 +1,7 @@
-package com.volmit.iris.gen.v2.scaffold.hunk.io;
+package com.volmit.iris.v2.scaffold.hunk.io;
 
-import com.volmit.iris.gen.v2.scaffold.data.DataPalette;
-import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
+import com.volmit.iris.v2.scaffold.data.DataPalette;
+import com.volmit.iris.v2.scaffold.hunk.Hunk;
 import com.volmit.iris.util.Function3;
 
 import java.io.*;
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/io/StringHunkIOAdapter.java b/src/main/java/com/volmit/iris/v2/scaffold/hunk/io/StringHunkIOAdapter.java
similarity index 77%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/io/StringHunkIOAdapter.java
rename to src/main/java/com/volmit/iris/v2/scaffold/hunk/io/StringHunkIOAdapter.java
index 2f1054856..dcf55290a 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/io/StringHunkIOAdapter.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/hunk/io/StringHunkIOAdapter.java
@@ -1,7 +1,4 @@
-package com.volmit.iris.gen.v2.scaffold.hunk.io;
-
-import com.volmit.iris.util.B;
-import org.bukkit.block.data.BlockData;
+package com.volmit.iris.v2.scaffold.hunk.io;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/storage/ArrayHunk.java b/src/main/java/com/volmit/iris/v2/scaffold/hunk/storage/ArrayHunk.java
similarity index 87%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/storage/ArrayHunk.java
rename to src/main/java/com/volmit/iris/v2/scaffold/hunk/storage/ArrayHunk.java
index 8f60b735f..12e8fe993 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/storage/ArrayHunk.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/hunk/storage/ArrayHunk.java
@@ -1,6 +1,6 @@
-package com.volmit.iris.gen.v2.scaffold.hunk.storage;
+package com.volmit.iris.v2.scaffold.hunk.storage;
 
-import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
+import com.volmit.iris.v2.scaffold.hunk.Hunk;
 import org.bouncycastle.util.Arrays;
 
 import lombok.Data;
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/storage/AtomicDoubleHunk.java b/src/main/java/com/volmit/iris/v2/scaffold/hunk/storage/AtomicDoubleHunk.java
similarity index 88%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/storage/AtomicDoubleHunk.java
rename to src/main/java/com/volmit/iris/v2/scaffold/hunk/storage/AtomicDoubleHunk.java
index fedd52500..0e8aee9ab 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/storage/AtomicDoubleHunk.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/hunk/storage/AtomicDoubleHunk.java
@@ -1,8 +1,8 @@
-package com.volmit.iris.gen.v2.scaffold.hunk.storage;
+package com.volmit.iris.v2.scaffold.hunk.storage;
 
 import com.google.common.util.concurrent.AtomicDoubleArray;
 
-import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
+import com.volmit.iris.v2.scaffold.hunk.Hunk;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/storage/AtomicHunk.java b/src/main/java/com/volmit/iris/v2/scaffold/hunk/storage/AtomicHunk.java
similarity index 87%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/storage/AtomicHunk.java
rename to src/main/java/com/volmit/iris/v2/scaffold/hunk/storage/AtomicHunk.java
index 35ba075d9..0b96d509a 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/storage/AtomicHunk.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/hunk/storage/AtomicHunk.java
@@ -1,8 +1,8 @@
-package com.volmit.iris.gen.v2.scaffold.hunk.storage;
+package com.volmit.iris.v2.scaffold.hunk.storage;
 
 import java.util.concurrent.atomic.AtomicReferenceArray;
 
-import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
+import com.volmit.iris.v2.scaffold.hunk.Hunk;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/storage/AtomicIntegerHunk.java b/src/main/java/com/volmit/iris/v2/scaffold/hunk/storage/AtomicIntegerHunk.java
similarity index 88%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/storage/AtomicIntegerHunk.java
rename to src/main/java/com/volmit/iris/v2/scaffold/hunk/storage/AtomicIntegerHunk.java
index 05a7b1795..20e74027b 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/storage/AtomicIntegerHunk.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/hunk/storage/AtomicIntegerHunk.java
@@ -1,8 +1,8 @@
-package com.volmit.iris.gen.v2.scaffold.hunk.storage;
+package com.volmit.iris.v2.scaffold.hunk.storage;
 
 import java.util.concurrent.atomic.AtomicIntegerArray;
 
-import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
+import com.volmit.iris.v2.scaffold.hunk.Hunk;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/storage/AtomicLongHunk.java b/src/main/java/com/volmit/iris/v2/scaffold/hunk/storage/AtomicLongHunk.java
similarity index 87%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/storage/AtomicLongHunk.java
rename to src/main/java/com/volmit/iris/v2/scaffold/hunk/storage/AtomicLongHunk.java
index 270720a6d..2310f29ba 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/storage/AtomicLongHunk.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/hunk/storage/AtomicLongHunk.java
@@ -1,8 +1,8 @@
-package com.volmit.iris.gen.v2.scaffold.hunk.storage;
+package com.volmit.iris.v2.scaffold.hunk.storage;
 
 import java.util.concurrent.atomic.AtomicLongArray;
 
-import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
+import com.volmit.iris.v2.scaffold.hunk.Hunk;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/storage/MappedHunk.java b/src/main/java/com/volmit/iris/v2/scaffold/hunk/storage/MappedHunk.java
similarity index 85%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/storage/MappedHunk.java
rename to src/main/java/com/volmit/iris/v2/scaffold/hunk/storage/MappedHunk.java
index 3df0f8b11..696e3dfaa 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/storage/MappedHunk.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/hunk/storage/MappedHunk.java
@@ -1,6 +1,6 @@
-package com.volmit.iris.gen.v2.scaffold.hunk.storage;
+package com.volmit.iris.v2.scaffold.hunk.storage;
 
-import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
+import com.volmit.iris.v2.scaffold.hunk.Hunk;
 import com.volmit.iris.util.BlockPosition;
 import com.volmit.iris.util.KMap;
 
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/storage/StorageHunk.java b/src/main/java/com/volmit/iris/v2/scaffold/hunk/storage/StorageHunk.java
similarity index 84%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/storage/StorageHunk.java
rename to src/main/java/com/volmit/iris/v2/scaffold/hunk/storage/StorageHunk.java
index 82c46cec1..a71fba824 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/storage/StorageHunk.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/hunk/storage/StorageHunk.java
@@ -1,6 +1,6 @@
-package com.volmit.iris.gen.v2.scaffold.hunk.storage;
+package com.volmit.iris.v2.scaffold.hunk.storage;
 
-import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
+import com.volmit.iris.v2.scaffold.hunk.Hunk;
 import lombok.Data;
 
 @Data
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/storage/SynchronizedArrayHunk.java b/src/main/java/com/volmit/iris/v2/scaffold/hunk/storage/SynchronizedArrayHunk.java
similarity index 88%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/storage/SynchronizedArrayHunk.java
rename to src/main/java/com/volmit/iris/v2/scaffold/hunk/storage/SynchronizedArrayHunk.java
index aaf69f58a..7111f695a 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/storage/SynchronizedArrayHunk.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/hunk/storage/SynchronizedArrayHunk.java
@@ -1,6 +1,6 @@
-package com.volmit.iris.gen.v2.scaffold.hunk.storage;
+package com.volmit.iris.v2.scaffold.hunk.storage;
 
-import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
+import com.volmit.iris.v2.scaffold.hunk.Hunk;
 import org.bouncycastle.util.Arrays;
 
 import lombok.Data;
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/view/BiomeGridHunkView.java b/src/main/java/com/volmit/iris/v2/scaffold/hunk/view/BiomeGridHunkView.java
similarity index 85%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/view/BiomeGridHunkView.java
rename to src/main/java/com/volmit/iris/v2/scaffold/hunk/view/BiomeGridHunkView.java
index 8d4687328..8c4f04051 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/view/BiomeGridHunkView.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/hunk/view/BiomeGridHunkView.java
@@ -1,6 +1,6 @@
-package com.volmit.iris.gen.v2.scaffold.hunk.view;
+package com.volmit.iris.v2.scaffold.hunk.view;
 
-import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
+import com.volmit.iris.v2.scaffold.hunk.Hunk;
 import org.bukkit.block.Biome;
 import org.bukkit.generator.ChunkGenerator.BiomeGrid;
 
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/view/ChunkBiomeHunkView.java b/src/main/java/com/volmit/iris/v2/scaffold/hunk/view/ChunkBiomeHunkView.java
similarity index 88%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/view/ChunkBiomeHunkView.java
rename to src/main/java/com/volmit/iris/v2/scaffold/hunk/view/ChunkBiomeHunkView.java
index 09f5ccde4..eb853b5b7 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/view/ChunkBiomeHunkView.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/hunk/view/ChunkBiomeHunkView.java
@@ -1,6 +1,6 @@
-package com.volmit.iris.gen.v2.scaffold.hunk.view;
+package com.volmit.iris.v2.scaffold.hunk.view;
 
-import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
+import com.volmit.iris.v2.scaffold.hunk.Hunk;
 import org.bukkit.Chunk;
 import org.bukkit.block.Biome;
 
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/view/ChunkDataHunkView.java b/src/main/java/com/volmit/iris/v2/scaffold/hunk/view/ChunkDataHunkView.java
similarity index 89%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/view/ChunkDataHunkView.java
rename to src/main/java/com/volmit/iris/v2/scaffold/hunk/view/ChunkDataHunkView.java
index 9efe03a62..02187c6d6 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/view/ChunkDataHunkView.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/hunk/view/ChunkDataHunkView.java
@@ -1,6 +1,6 @@
-package com.volmit.iris.gen.v2.scaffold.hunk.view;
+package com.volmit.iris.v2.scaffold.hunk.view;
 
-import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
+import com.volmit.iris.v2.scaffold.hunk.Hunk;
 import org.bukkit.block.data.BlockData;
 import org.bukkit.generator.ChunkGenerator.ChunkData;
 
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/view/ChunkHunkView.java b/src/main/java/com/volmit/iris/v2/scaffold/hunk/view/ChunkHunkView.java
similarity index 88%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/view/ChunkHunkView.java
rename to src/main/java/com/volmit/iris/v2/scaffold/hunk/view/ChunkHunkView.java
index 047e9d5e1..c090961d0 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/view/ChunkHunkView.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/hunk/view/ChunkHunkView.java
@@ -1,6 +1,6 @@
-package com.volmit.iris.gen.v2.scaffold.hunk.view;
+package com.volmit.iris.v2.scaffold.hunk.view;
 
-import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
+import com.volmit.iris.v2.scaffold.hunk.Hunk;
 import org.bukkit.Chunk;
 import org.bukkit.block.data.BlockData;
 
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/view/DriftHunkView.java b/src/main/java/com/volmit/iris/v2/scaffold/hunk/view/DriftHunkView.java
similarity index 88%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/view/DriftHunkView.java
rename to src/main/java/com/volmit/iris/v2/scaffold/hunk/view/DriftHunkView.java
index 9440c50cd..52b92d03c 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/view/DriftHunkView.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/hunk/view/DriftHunkView.java
@@ -1,6 +1,6 @@
-package com.volmit.iris.gen.v2.scaffold.hunk.view;
+package com.volmit.iris.v2.scaffold.hunk.view;
 
-import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
+import com.volmit.iris.v2.scaffold.hunk.Hunk;
 
 public class DriftHunkView<T> implements Hunk<T>
 {
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/view/InvertedHunkView.java b/src/main/java/com/volmit/iris/v2/scaffold/hunk/view/InvertedHunkView.java
similarity index 85%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/view/InvertedHunkView.java
rename to src/main/java/com/volmit/iris/v2/scaffold/hunk/view/InvertedHunkView.java
index 1c2773e73..df34f46ef 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/view/InvertedHunkView.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/hunk/view/InvertedHunkView.java
@@ -1,6 +1,6 @@
-package com.volmit.iris.gen.v2.scaffold.hunk.view;
+package com.volmit.iris.v2.scaffold.hunk.view;
 
-import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
+import com.volmit.iris.v2.scaffold.hunk.Hunk;
 
 public class InvertedHunkView<T> implements Hunk<T>
 {
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/view/ReadOnlyHunk.java b/src/main/java/com/volmit/iris/v2/scaffold/hunk/view/ReadOnlyHunk.java
similarity index 91%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/view/ReadOnlyHunk.java
rename to src/main/java/com/volmit/iris/v2/scaffold/hunk/view/ReadOnlyHunk.java
index dd22f807f..9b6c79893 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/view/ReadOnlyHunk.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/hunk/view/ReadOnlyHunk.java
@@ -1,6 +1,6 @@
-package com.volmit.iris.gen.v2.scaffold.hunk.view;
+package com.volmit.iris.v2.scaffold.hunk.view;
 
-import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
+import com.volmit.iris.v2.scaffold.hunk.Hunk;
 
 public class ReadOnlyHunk<T> implements Hunk<T> {
     private final Hunk<T> src;
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/view/RotatedXHunkView.java b/src/main/java/com/volmit/iris/v2/scaffold/hunk/view/RotatedXHunkView.java
similarity index 92%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/view/RotatedXHunkView.java
rename to src/main/java/com/volmit/iris/v2/scaffold/hunk/view/RotatedXHunkView.java
index ba650fd79..cb008dc9d 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/view/RotatedXHunkView.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/hunk/view/RotatedXHunkView.java
@@ -1,6 +1,6 @@
-package com.volmit.iris.gen.v2.scaffold.hunk.view;
+package com.volmit.iris.v2.scaffold.hunk.view;
 
-import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
+import com.volmit.iris.v2.scaffold.hunk.Hunk;
 
 public class RotatedXHunkView<T> implements Hunk<T>
 {
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/view/RotatedYHunkView.java b/src/main/java/com/volmit/iris/v2/scaffold/hunk/view/RotatedYHunkView.java
similarity index 92%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/view/RotatedYHunkView.java
rename to src/main/java/com/volmit/iris/v2/scaffold/hunk/view/RotatedYHunkView.java
index d0b8b67f3..20e312ad4 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/view/RotatedYHunkView.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/hunk/view/RotatedYHunkView.java
@@ -1,6 +1,6 @@
-package com.volmit.iris.gen.v2.scaffold.hunk.view;
+package com.volmit.iris.v2.scaffold.hunk.view;
 
-import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
+import com.volmit.iris.v2.scaffold.hunk.Hunk;
 
 public class RotatedYHunkView<T> implements Hunk<T>
 {
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/view/RotatedZHunkView.java b/src/main/java/com/volmit/iris/v2/scaffold/hunk/view/RotatedZHunkView.java
similarity index 92%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/view/RotatedZHunkView.java
rename to src/main/java/com/volmit/iris/v2/scaffold/hunk/view/RotatedZHunkView.java
index 2b2b0064f..a8c99bb34 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/view/RotatedZHunkView.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/hunk/view/RotatedZHunkView.java
@@ -1,6 +1,6 @@
-package com.volmit.iris.gen.v2.scaffold.hunk.view;
+package com.volmit.iris.v2.scaffold.hunk.view;
 
-import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
+import com.volmit.iris.v2.scaffold.hunk.Hunk;
 
 public class RotatedZHunkView<T> implements Hunk<T>
 {
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/parallax/ParallaxAccess.java b/src/main/java/com/volmit/iris/v2/scaffold/parallax/ParallaxAccess.java
similarity index 95%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/parallax/ParallaxAccess.java
rename to src/main/java/com/volmit/iris/v2/scaffold/parallax/ParallaxAccess.java
index 437821836..7ee05afa6 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/parallax/ParallaxAccess.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/parallax/ParallaxAccess.java
@@ -1,6 +1,6 @@
-package com.volmit.iris.gen.v2.scaffold.parallax;
+package com.volmit.iris.v2.scaffold.parallax;
 
-import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
+import com.volmit.iris.v2.scaffold.hunk.Hunk;
 import org.bukkit.block.data.BlockData;
 
 public interface ParallaxAccess
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/parallax/ParallaxChunkMeta.java b/src/main/java/com/volmit/iris/v2/scaffold/parallax/ParallaxChunkMeta.java
similarity index 85%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/parallax/ParallaxChunkMeta.java
rename to src/main/java/com/volmit/iris/v2/scaffold/parallax/ParallaxChunkMeta.java
index c454fd5f2..ab29bcb7c 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/parallax/ParallaxChunkMeta.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/parallax/ParallaxChunkMeta.java
@@ -1,7 +1,7 @@
-package com.volmit.iris.gen.v2.scaffold.parallax;
+package com.volmit.iris.v2.scaffold.parallax;
 
-import com.volmit.iris.gen.v2.scaffold.hunk.io.HunkIOAdapter;
-import com.volmit.iris.gen.v2.scaffold.hunk.io.PaletteHunkIOAdapter;
+import com.volmit.iris.v2.scaffold.hunk.io.HunkIOAdapter;
+import com.volmit.iris.v2.scaffold.hunk.io.PaletteHunkIOAdapter;
 import com.volmit.iris.util.CompoundTag;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/parallax/ParallaxRegion.java b/src/main/java/com/volmit/iris/v2/scaffold/parallax/ParallaxRegion.java
similarity index 90%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/parallax/ParallaxRegion.java
rename to src/main/java/com/volmit/iris/v2/scaffold/parallax/ParallaxRegion.java
index c9766275d..9640514ab 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/parallax/ParallaxRegion.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/parallax/ParallaxRegion.java
@@ -1,18 +1,15 @@
-package com.volmit.iris.gen.v2.scaffold.parallax;
+package com.volmit.iris.v2.scaffold.parallax;
 
 import java.io.File;
 import java.io.IOException;
 
-import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
-import com.volmit.iris.gen.v2.scaffold.hunk.io.HunkIOAdapter;
-import com.volmit.iris.gen.v2.scaffold.hunk.io.HunkRegion;
-import com.volmit.iris.gen.v2.scaffold.hunk.io.HunkRegionSlice;
+import com.volmit.iris.v2.scaffold.hunk.Hunk;
+import com.volmit.iris.v2.scaffold.hunk.io.HunkIOAdapter;
+import com.volmit.iris.v2.scaffold.hunk.io.HunkRegion;
+import com.volmit.iris.v2.scaffold.hunk.io.HunkRegionSlice;
 import com.volmit.iris.util.*;
-import javassist.bytecode.ByteArray;
 import org.bukkit.block.data.BlockData;
 
-import lombok.Getter;
-
 public class ParallaxRegion extends HunkRegion
 {
 	private boolean dirtyMeta;
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/parallax/ParallaxWorld.java b/src/main/java/com/volmit/iris/v2/scaffold/parallax/ParallaxWorld.java
similarity index 97%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/parallax/ParallaxWorld.java
rename to src/main/java/com/volmit/iris/v2/scaffold/parallax/ParallaxWorld.java
index eaaaec11e..c453e76e9 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/parallax/ParallaxWorld.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/parallax/ParallaxWorld.java
@@ -1,4 +1,4 @@
-package com.volmit.iris.gen.v2.scaffold.parallax;
+package com.volmit.iris.v2.scaffold.parallax;
 
 import java.io.File;
 import java.io.IOException;
@@ -6,7 +6,7 @@ import java.io.IOException;
 import com.volmit.iris.util.*;
 import org.bukkit.block.data.BlockData;
 
-import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
+import com.volmit.iris.v2.scaffold.hunk.Hunk;
 
 public class ParallaxWorld implements ParallaxAccess
 {
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/multicore/BurstExecutor.java b/src/main/java/com/volmit/iris/v2/scaffold/parallel/BurstExecutor.java
similarity index 94%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/multicore/BurstExecutor.java
rename to src/main/java/com/volmit/iris/v2/scaffold/parallel/BurstExecutor.java
index a57a30c6d..434222524 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/multicore/BurstExecutor.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/parallel/BurstExecutor.java
@@ -1,4 +1,4 @@
-package com.volmit.iris.gen.v2.scaffold.multicore;
+package com.volmit.iris.v2.scaffold.parallel;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/multicore/BurstedHunk.java b/src/main/java/com/volmit/iris/v2/scaffold/parallel/BurstedHunk.java
similarity index 57%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/multicore/BurstedHunk.java
rename to src/main/java/com/volmit/iris/v2/scaffold/parallel/BurstedHunk.java
index 2568b99af..d58ea0341 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/multicore/BurstedHunk.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/parallel/BurstedHunk.java
@@ -1,6 +1,6 @@
-package com.volmit.iris.gen.v2.scaffold.multicore;
+package com.volmit.iris.v2.scaffold.parallel;
 
-import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
+import com.volmit.iris.v2.scaffold.hunk.Hunk;
 
 public interface BurstedHunk<T> extends Hunk<T>
 {
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/multicore/MultiBurst.java b/src/main/java/com/volmit/iris/v2/scaffold/parallel/MultiBurst.java
similarity index 90%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/multicore/MultiBurst.java
rename to src/main/java/com/volmit/iris/v2/scaffold/parallel/MultiBurst.java
index 6242b88ad..afc619274 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/multicore/MultiBurst.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/parallel/MultiBurst.java
@@ -1,4 +1,4 @@
-package com.volmit.iris.gen.v2.scaffold.multicore;
+package com.volmit.iris.v2.scaffold.parallel;
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/BasicLayer.java b/src/main/java/com/volmit/iris/v2/scaffold/stream/BasicLayer.java
similarity index 90%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/stream/BasicLayer.java
rename to src/main/java/com/volmit/iris/v2/scaffold/stream/BasicLayer.java
index 86e1aab10..ac642b437 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/BasicLayer.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/stream/BasicLayer.java
@@ -1,4 +1,4 @@
-package com.volmit.iris.gen.v2.scaffold.stream;
+package com.volmit.iris.v2.scaffold.stream;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/BasicStream.java b/src/main/java/com/volmit/iris/v2/scaffold/stream/BasicStream.java
similarity index 93%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/stream/BasicStream.java
rename to src/main/java/com/volmit/iris/v2/scaffold/stream/BasicStream.java
index ca670d624..7f171eb8a 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/BasicStream.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/stream/BasicStream.java
@@ -1,4 +1,4 @@
-package com.volmit.iris.gen.v2.scaffold.stream;
+package com.volmit.iris.v2.scaffold.stream;
 
 public abstract class BasicStream<T> extends BasicLayer implements ProceduralStream<T>
 {
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/ProceduralLayer.java b/src/main/java/com/volmit/iris/v2/scaffold/stream/ProceduralLayer.java
similarity index 78%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/stream/ProceduralLayer.java
rename to src/main/java/com/volmit/iris/v2/scaffold/stream/ProceduralLayer.java
index 8e6281a14..ab82845c9 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/ProceduralLayer.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/stream/ProceduralLayer.java
@@ -1,4 +1,4 @@
-package com.volmit.iris.gen.v2.scaffold.stream;
+package com.volmit.iris.v2.scaffold.stream;
 
 public interface ProceduralLayer
 {
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/ProceduralStream.java b/src/main/java/com/volmit/iris/v2/scaffold/stream/ProceduralStream.java
similarity index 94%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/stream/ProceduralStream.java
rename to src/main/java/com/volmit/iris/v2/scaffold/stream/ProceduralStream.java
index ccb1f03df..919475260 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/ProceduralStream.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/stream/ProceduralStream.java
@@ -1,19 +1,18 @@
-package com.volmit.iris.gen.v2.scaffold.stream;
+package com.volmit.iris.v2.scaffold.stream;
 
-import java.awt.*;
 import java.util.List;
 import java.util.function.Function;
 
-import com.volmit.iris.gen.v2.scaffold.Significance;
-import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
-import com.volmit.iris.gen.v2.scaffold.stream.arithmetic.*;
-import com.volmit.iris.gen.v2.scaffold.stream.convert.*;
-import com.volmit.iris.gen.v2.scaffold.stream.interpolation.Interpolated;
-import com.volmit.iris.gen.v2.scaffold.stream.sources.FunctionStream;
-import com.volmit.iris.gen.v2.scaffold.stream.utility.CachedStream2D;
-import com.volmit.iris.gen.v2.scaffold.stream.utility.ProfiledStream;
-import com.volmit.iris.gen.v2.scaffold.stream.utility.SemaphoreStream;
-import com.volmit.iris.gen.v2.scaffold.stream.utility.SynchronizedStream;
+import com.volmit.iris.v2.scaffold.Significance;
+import com.volmit.iris.v2.scaffold.hunk.Hunk;
+import com.volmit.iris.v2.scaffold.stream.arithmetic.*;
+import com.volmit.iris.v2.scaffold.stream.convert.*;
+import com.volmit.iris.v2.scaffold.stream.interpolation.Interpolated;
+import com.volmit.iris.v2.scaffold.stream.sources.FunctionStream;
+import com.volmit.iris.v2.scaffold.stream.utility.CachedStream2D;
+import com.volmit.iris.v2.scaffold.stream.utility.ProfiledStream;
+import com.volmit.iris.v2.scaffold.stream.utility.SemaphoreStream;
+import com.volmit.iris.v2.scaffold.stream.utility.SynchronizedStream;
 import com.volmit.iris.util.Function2;
 import com.volmit.iris.util.Function3;
 import com.volmit.iris.util.Function4;
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/arithmetic/AddingStream.java b/src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/AddingStream.java
similarity index 84%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/stream/arithmetic/AddingStream.java
rename to src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/AddingStream.java
index ed6a735b8..e0bfb86d9 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/arithmetic/AddingStream.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/AddingStream.java
@@ -1,7 +1,7 @@
-package com.volmit.iris.gen.v2.scaffold.stream.arithmetic;
+package com.volmit.iris.v2.scaffold.stream.arithmetic;
 
-import com.volmit.iris.gen.v2.scaffold.stream.BasicStream;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.BasicStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 import com.volmit.iris.util.Function2;
 import com.volmit.iris.util.Function3;
 
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/arithmetic/ClampedStream.java b/src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/ClampedStream.java
similarity index 81%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/stream/arithmetic/ClampedStream.java
rename to src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/ClampedStream.java
index 621293254..260ecb9f2 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/arithmetic/ClampedStream.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/ClampedStream.java
@@ -1,7 +1,7 @@
-package com.volmit.iris.gen.v2.scaffold.stream.arithmetic;
+package com.volmit.iris.v2.scaffold.stream.arithmetic;
 
-import com.volmit.iris.gen.v2.scaffold.stream.BasicStream;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.BasicStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 
 public class ClampedStream<T> extends BasicStream<T> implements ProceduralStream<T>
 {
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/arithmetic/CoordinateBitShiftLeftStream.java b/src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/CoordinateBitShiftLeftStream.java
similarity index 79%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/stream/arithmetic/CoordinateBitShiftLeftStream.java
rename to src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/CoordinateBitShiftLeftStream.java
index 0988fc86e..1f0edae1f 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/arithmetic/CoordinateBitShiftLeftStream.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/CoordinateBitShiftLeftStream.java
@@ -1,7 +1,7 @@
-package com.volmit.iris.gen.v2.scaffold.stream.arithmetic;
+package com.volmit.iris.v2.scaffold.stream.arithmetic;
 
-import com.volmit.iris.gen.v2.scaffold.stream.BasicStream;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.BasicStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 
 public class CoordinateBitShiftLeftStream<T> extends BasicStream<T> implements ProceduralStream<T>
 {
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/arithmetic/CoordinateBitShiftRightStream.java b/src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/CoordinateBitShiftRightStream.java
similarity index 79%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/stream/arithmetic/CoordinateBitShiftRightStream.java
rename to src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/CoordinateBitShiftRightStream.java
index f30ba0809..da80ebf01 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/arithmetic/CoordinateBitShiftRightStream.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/CoordinateBitShiftRightStream.java
@@ -1,7 +1,7 @@
-package com.volmit.iris.gen.v2.scaffold.stream.arithmetic;
+package com.volmit.iris.v2.scaffold.stream.arithmetic;
 
-import com.volmit.iris.gen.v2.scaffold.stream.BasicStream;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.BasicStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 
 public class CoordinateBitShiftRightStream<T> extends BasicStream<T> implements ProceduralStream<T>
 {
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/arithmetic/DividingStream.java b/src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/DividingStream.java
similarity index 85%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/stream/arithmetic/DividingStream.java
rename to src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/DividingStream.java
index 2a1f6f7ba..418ca9786 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/arithmetic/DividingStream.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/DividingStream.java
@@ -1,7 +1,7 @@
-package com.volmit.iris.gen.v2.scaffold.stream.arithmetic;
+package com.volmit.iris.v2.scaffold.stream.arithmetic;
 
-import com.volmit.iris.gen.v2.scaffold.stream.BasicStream;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.BasicStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 import com.volmit.iris.util.Function2;
 import com.volmit.iris.util.Function3;
 
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/arithmetic/FittedStream.java b/src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/FittedStream.java
similarity index 85%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/stream/arithmetic/FittedStream.java
rename to src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/FittedStream.java
index fcd2d6103..9e6c4efc2 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/arithmetic/FittedStream.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/FittedStream.java
@@ -1,7 +1,7 @@
-package com.volmit.iris.gen.v2.scaffold.stream.arithmetic;
+package com.volmit.iris.v2.scaffold.stream.arithmetic;
 
-import com.volmit.iris.gen.v2.scaffold.stream.BasicStream;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.BasicStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 
 public class FittedStream<T> extends BasicStream<T> implements ProceduralStream<T>
 {
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/arithmetic/MaxingStream.java b/src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/MaxingStream.java
similarity index 85%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/stream/arithmetic/MaxingStream.java
rename to src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/MaxingStream.java
index e58a49a87..d03ea39fa 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/arithmetic/MaxingStream.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/MaxingStream.java
@@ -1,7 +1,7 @@
-package com.volmit.iris.gen.v2.scaffold.stream.arithmetic;
+package com.volmit.iris.v2.scaffold.stream.arithmetic;
 
-import com.volmit.iris.gen.v2.scaffold.stream.BasicStream;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.BasicStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 import com.volmit.iris.util.Function2;
 import com.volmit.iris.util.Function3;
 
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/arithmetic/MinningStream.java b/src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/MinningStream.java
similarity index 85%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/stream/arithmetic/MinningStream.java
rename to src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/MinningStream.java
index fc356c0c0..7e948f38a 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/arithmetic/MinningStream.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/MinningStream.java
@@ -1,7 +1,7 @@
-package com.volmit.iris.gen.v2.scaffold.stream.arithmetic;
+package com.volmit.iris.v2.scaffold.stream.arithmetic;
 
-import com.volmit.iris.gen.v2.scaffold.stream.BasicStream;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.BasicStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 import com.volmit.iris.util.Function2;
 import com.volmit.iris.util.Function3;
 
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/arithmetic/ModuloStream.java b/src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/ModuloStream.java
similarity index 84%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/stream/arithmetic/ModuloStream.java
rename to src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/ModuloStream.java
index 495251d05..d484ba846 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/arithmetic/ModuloStream.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/ModuloStream.java
@@ -1,7 +1,7 @@
-package com.volmit.iris.gen.v2.scaffold.stream.arithmetic;
+package com.volmit.iris.v2.scaffold.stream.arithmetic;
 
-import com.volmit.iris.gen.v2.scaffold.stream.BasicStream;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.BasicStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 import com.volmit.iris.util.Function2;
 import com.volmit.iris.util.Function3;
 
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/arithmetic/MultiplyingStream.java b/src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/MultiplyingStream.java
similarity index 85%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/stream/arithmetic/MultiplyingStream.java
rename to src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/MultiplyingStream.java
index 767235efe..4a14c54ac 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/arithmetic/MultiplyingStream.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/MultiplyingStream.java
@@ -1,7 +1,7 @@
-package com.volmit.iris.gen.v2.scaffold.stream.arithmetic;
+package com.volmit.iris.v2.scaffold.stream.arithmetic;
 
-import com.volmit.iris.gen.v2.scaffold.stream.BasicStream;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.BasicStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 import com.volmit.iris.util.Function2;
 import com.volmit.iris.util.Function3;
 
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/arithmetic/OffsetStream.java b/src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/OffsetStream.java
similarity index 79%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/stream/arithmetic/OffsetStream.java
rename to src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/OffsetStream.java
index 9a4354e6a..cabca18cf 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/arithmetic/OffsetStream.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/OffsetStream.java
@@ -1,7 +1,7 @@
-package com.volmit.iris.gen.v2.scaffold.stream.arithmetic;
+package com.volmit.iris.v2.scaffold.stream.arithmetic;
 
-import com.volmit.iris.gen.v2.scaffold.stream.BasicStream;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.BasicStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 
 public class OffsetStream<T> extends BasicStream<T> implements ProceduralStream<T>
 {
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/arithmetic/RadialStream.java b/src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/RadialStream.java
similarity index 81%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/stream/arithmetic/RadialStream.java
rename to src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/RadialStream.java
index 961d5779e..3c6caa259 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/arithmetic/RadialStream.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/RadialStream.java
@@ -1,7 +1,7 @@
-package com.volmit.iris.gen.v2.scaffold.stream.arithmetic;
+package com.volmit.iris.v2.scaffold.stream.arithmetic;
 
-import com.volmit.iris.gen.v2.scaffold.stream.BasicStream;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.BasicStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 
 public class RadialStream<T> extends BasicStream<T> implements ProceduralStream<T>
 {
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/arithmetic/RoundingDoubleStream.java b/src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/RoundingDoubleStream.java
similarity index 77%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/stream/arithmetic/RoundingDoubleStream.java
rename to src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/RoundingDoubleStream.java
index 9eb6ac0f8..d42cc12bf 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/arithmetic/RoundingDoubleStream.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/RoundingDoubleStream.java
@@ -1,7 +1,7 @@
-package com.volmit.iris.gen.v2.scaffold.stream.arithmetic;
+package com.volmit.iris.v2.scaffold.stream.arithmetic;
 
-import com.volmit.iris.gen.v2.scaffold.stream.BasicStream;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.BasicStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 
 public class RoundingDoubleStream extends BasicStream<Double>
 {
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/arithmetic/SlopeStream.java b/src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/SlopeStream.java
similarity index 85%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/stream/arithmetic/SlopeStream.java
rename to src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/SlopeStream.java
index 847aa293a..65dc3010e 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/arithmetic/SlopeStream.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/SlopeStream.java
@@ -1,7 +1,7 @@
-package com.volmit.iris.gen.v2.scaffold.stream.arithmetic;
+package com.volmit.iris.v2.scaffold.stream.arithmetic;
 
-import com.volmit.iris.gen.v2.scaffold.stream.BasicStream;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.BasicStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 
 public class SlopeStream<T> extends BasicStream<T>
 {
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/arithmetic/SubtractingStream.java b/src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/SubtractingStream.java
similarity index 85%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/stream/arithmetic/SubtractingStream.java
rename to src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/SubtractingStream.java
index 1978d5732..1e566a6dd 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/arithmetic/SubtractingStream.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/SubtractingStream.java
@@ -1,7 +1,7 @@
-package com.volmit.iris.gen.v2.scaffold.stream.arithmetic;
+package com.volmit.iris.v2.scaffold.stream.arithmetic;
 
-import com.volmit.iris.gen.v2.scaffold.stream.BasicStream;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.BasicStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 import com.volmit.iris.util.Function2;
 import com.volmit.iris.util.Function3;
 
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/arithmetic/ZoomStream.java b/src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/ZoomStream.java
similarity index 78%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/stream/arithmetic/ZoomStream.java
rename to src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/ZoomStream.java
index 331e56b24..893414ad1 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/arithmetic/ZoomStream.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/ZoomStream.java
@@ -1,7 +1,7 @@
-package com.volmit.iris.gen.v2.scaffold.stream.arithmetic;
+package com.volmit.iris.v2.scaffold.stream.arithmetic;
 
-import com.volmit.iris.gen.v2.scaffold.stream.BasicStream;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.BasicStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 
 public class ZoomStream<T> extends BasicStream<T>
 {
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/convert/AwareConversionStream2D.java b/src/main/java/com/volmit/iris/v2/scaffold/stream/convert/AwareConversionStream2D.java
similarity index 82%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/stream/convert/AwareConversionStream2D.java
rename to src/main/java/com/volmit/iris/v2/scaffold/stream/convert/AwareConversionStream2D.java
index fd806958c..bdb17e66b 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/convert/AwareConversionStream2D.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/stream/convert/AwareConversionStream2D.java
@@ -1,7 +1,7 @@
-package com.volmit.iris.gen.v2.scaffold.stream.convert;
+package com.volmit.iris.v2.scaffold.stream.convert;
 
-import com.volmit.iris.gen.v2.scaffold.stream.BasicStream;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.BasicStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 import com.volmit.iris.util.Function3;
 
 public class AwareConversionStream2D<T, V> extends BasicStream<V>
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/convert/AwareConversionStream3D.java b/src/main/java/com/volmit/iris/v2/scaffold/stream/convert/AwareConversionStream3D.java
similarity index 83%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/stream/convert/AwareConversionStream3D.java
rename to src/main/java/com/volmit/iris/v2/scaffold/stream/convert/AwareConversionStream3D.java
index c63aca49f..4e651c495 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/convert/AwareConversionStream3D.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/stream/convert/AwareConversionStream3D.java
@@ -1,7 +1,7 @@
-package com.volmit.iris.gen.v2.scaffold.stream.convert;
+package com.volmit.iris.v2.scaffold.stream.convert;
 
-import com.volmit.iris.gen.v2.scaffold.stream.BasicStream;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.BasicStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 import com.volmit.iris.util.Function4;
 
 public class AwareConversionStream3D<T, V> extends BasicStream<V>
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/convert/CachedConversionStream.java b/src/main/java/com/volmit/iris/v2/scaffold/stream/convert/CachedConversionStream.java
similarity index 85%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/stream/convert/CachedConversionStream.java
rename to src/main/java/com/volmit/iris/v2/scaffold/stream/convert/CachedConversionStream.java
index 85a2ba1a4..8ed6c8d02 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/convert/CachedConversionStream.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/stream/convert/CachedConversionStream.java
@@ -1,9 +1,9 @@
-package com.volmit.iris.gen.v2.scaffold.stream.convert;
+package com.volmit.iris.v2.scaffold.stream.convert;
 
 import java.util.function.Function;
 
-import com.volmit.iris.gen.v2.scaffold.stream.BasicLayer;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.BasicLayer;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 import com.volmit.iris.util.KMap;
 
 public class CachedConversionStream<T, V> extends BasicLayer implements ProceduralStream<V>
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/convert/ConversionStream.java b/src/main/java/com/volmit/iris/v2/scaffold/stream/convert/ConversionStream.java
similarity index 83%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/stream/convert/ConversionStream.java
rename to src/main/java/com/volmit/iris/v2/scaffold/stream/convert/ConversionStream.java
index ec6053f62..82464ffbe 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/convert/ConversionStream.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/stream/convert/ConversionStream.java
@@ -1,9 +1,9 @@
-package com.volmit.iris.gen.v2.scaffold.stream.convert;
+package com.volmit.iris.v2.scaffold.stream.convert;
 
 import java.util.function.Function;
 
-import com.volmit.iris.gen.v2.scaffold.stream.BasicLayer;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.BasicLayer;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 
 public class ConversionStream<T, V> extends BasicLayer implements ProceduralStream<V>
 {
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/convert/ForceDoubleStream.java b/src/main/java/com/volmit/iris/v2/scaffold/stream/convert/ForceDoubleStream.java
similarity index 74%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/stream/convert/ForceDoubleStream.java
rename to src/main/java/com/volmit/iris/v2/scaffold/stream/convert/ForceDoubleStream.java
index 5976d4b42..1c59729e5 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/convert/ForceDoubleStream.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/stream/convert/ForceDoubleStream.java
@@ -1,7 +1,7 @@
-package com.volmit.iris.gen.v2.scaffold.stream.convert;
+package com.volmit.iris.v2.scaffold.stream.convert;
 
-import com.volmit.iris.gen.v2.scaffold.stream.BasicStream;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.BasicStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 
 public class ForceDoubleStream extends BasicStream<Double>
 {
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/convert/RoundingStream.java b/src/main/java/com/volmit/iris/v2/scaffold/stream/convert/RoundingStream.java
similarity index 78%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/stream/convert/RoundingStream.java
rename to src/main/java/com/volmit/iris/v2/scaffold/stream/convert/RoundingStream.java
index 7e2e1f24a..c4ebd1ec3 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/convert/RoundingStream.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/stream/convert/RoundingStream.java
@@ -1,7 +1,7 @@
-package com.volmit.iris.gen.v2.scaffold.stream.convert;
+package com.volmit.iris.v2.scaffold.stream.convert;
 
-import com.volmit.iris.gen.v2.scaffold.stream.BasicStream;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.BasicStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 
 public class RoundingStream extends BasicStream<Integer>
 {
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/convert/SelectionStream.java b/src/main/java/com/volmit/iris/v2/scaffold/stream/convert/SelectionStream.java
similarity index 82%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/stream/convert/SelectionStream.java
rename to src/main/java/com/volmit/iris/v2/scaffold/stream/convert/SelectionStream.java
index 5275389f7..862d289a7 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/convert/SelectionStream.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/stream/convert/SelectionStream.java
@@ -1,9 +1,9 @@
-package com.volmit.iris.gen.v2.scaffold.stream.convert;
+package com.volmit.iris.v2.scaffold.stream.convert;
 
 import java.util.List;
 
-import com.volmit.iris.gen.v2.scaffold.stream.BasicStream;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.BasicStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 
 public class SelectionStream<T> extends BasicStream<T>
 {
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/convert/SignificanceStream.java b/src/main/java/com/volmit/iris/v2/scaffold/stream/convert/SignificanceStream.java
similarity index 82%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/stream/convert/SignificanceStream.java
rename to src/main/java/com/volmit/iris/v2/scaffold/stream/convert/SignificanceStream.java
index 8d649601f..e6a9467d1 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/convert/SignificanceStream.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/stream/convert/SignificanceStream.java
@@ -1,9 +1,9 @@
-package com.volmit.iris.gen.v2.scaffold.stream.convert;
+package com.volmit.iris.v2.scaffold.stream.convert;
 
-import com.volmit.iris.gen.v2.scaffold.ArraySignificance;
-import com.volmit.iris.gen.v2.scaffold.Significance;
-import com.volmit.iris.gen.v2.scaffold.stream.BasicStream;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.ArraySignificance;
+import com.volmit.iris.v2.scaffold.Significance;
+import com.volmit.iris.v2.scaffold.stream.BasicStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 import com.volmit.iris.util.KList;
 
 public class SignificanceStream<K extends Significance<T>, T> extends BasicStream<K>
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/convert/To3DStream.java b/src/main/java/com/volmit/iris/v2/scaffold/stream/convert/To3DStream.java
similarity index 75%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/stream/convert/To3DStream.java
rename to src/main/java/com/volmit/iris/v2/scaffold/stream/convert/To3DStream.java
index 3c9440973..e51a100e2 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/convert/To3DStream.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/stream/convert/To3DStream.java
@@ -1,7 +1,7 @@
-package com.volmit.iris.gen.v2.scaffold.stream.convert;
+package com.volmit.iris.v2.scaffold.stream.convert;
 
-import com.volmit.iris.gen.v2.scaffold.stream.BasicStream;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.BasicStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 
 public class To3DStream<T> extends BasicStream<T>
 {
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/interpolation/BiHermiteStream.java b/src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/BiHermiteStream.java
similarity index 92%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/stream/interpolation/BiHermiteStream.java
rename to src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/BiHermiteStream.java
index cc2ad0f05..9c5bb9b6d 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/interpolation/BiHermiteStream.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/BiHermiteStream.java
@@ -1,7 +1,7 @@
-package com.volmit.iris.gen.v2.scaffold.stream.interpolation;
+package com.volmit.iris.v2.scaffold.stream.interpolation;
 
-import com.volmit.iris.gen.v2.scaffold.stream.BasicStream;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.BasicStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 import com.volmit.iris.util.IrisInterpolation;
 
 public class BiHermiteStream<T> extends BasicStream<T> implements Interpolator<T>
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/interpolation/BiStarcastStream.java b/src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/BiStarcastStream.java
similarity index 84%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/stream/interpolation/BiStarcastStream.java
rename to src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/BiStarcastStream.java
index ec24419cb..6959c6f9a 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/interpolation/BiStarcastStream.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/BiStarcastStream.java
@@ -1,7 +1,7 @@
-package com.volmit.iris.gen.v2.scaffold.stream.interpolation;
+package com.volmit.iris.v2.scaffold.stream.interpolation;
 
-import com.volmit.iris.gen.v2.scaffold.stream.BasicStream;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.BasicStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 
 public class BiStarcastStream<T> extends BasicStream<T> implements Interpolator<T>
 {
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/interpolation/BicubicStream.java b/src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/BicubicStream.java
similarity index 91%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/stream/interpolation/BicubicStream.java
rename to src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/BicubicStream.java
index 96a5a9c6d..a1802e55a 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/interpolation/BicubicStream.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/BicubicStream.java
@@ -1,7 +1,7 @@
-package com.volmit.iris.gen.v2.scaffold.stream.interpolation;
+package com.volmit.iris.v2.scaffold.stream.interpolation;
 
-import com.volmit.iris.gen.v2.scaffold.stream.BasicStream;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.BasicStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 import com.volmit.iris.util.IrisInterpolation;
 
 public class BicubicStream<T> extends BasicStream<T> implements Interpolator<T>
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/interpolation/BilinearStream.java b/src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/BilinearStream.java
similarity index 87%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/stream/interpolation/BilinearStream.java
rename to src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/BilinearStream.java
index d7240b637..b7b4093d4 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/interpolation/BilinearStream.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/BilinearStream.java
@@ -1,7 +1,7 @@
-package com.volmit.iris.gen.v2.scaffold.stream.interpolation;
+package com.volmit.iris.v2.scaffold.stream.interpolation;
 
-import com.volmit.iris.gen.v2.scaffold.stream.BasicStream;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.BasicStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 import com.volmit.iris.util.IrisInterpolation;
 
 public class BilinearStream<T> extends BasicStream<T> implements Interpolator<T>
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/interpolation/Interpolated.java b/src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/Interpolated.java
similarity index 89%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/stream/interpolation/Interpolated.java
rename to src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/Interpolated.java
index 0dafec074..36c1859e8 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/interpolation/Interpolated.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/Interpolated.java
@@ -1,8 +1,8 @@
-package com.volmit.iris.gen.v2.scaffold.stream.interpolation;
+package com.volmit.iris.v2.scaffold.stream.interpolation;
 
 import java.util.function.Function;
 
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 import org.bukkit.block.data.BlockData;
 
 import com.volmit.iris.util.RNG;
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/interpolation/InterpolatingStream.java b/src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/InterpolatingStream.java
similarity index 84%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/stream/interpolation/InterpolatingStream.java
rename to src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/InterpolatingStream.java
index 3e98d4976..64207e318 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/interpolation/InterpolatingStream.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/InterpolatingStream.java
@@ -1,7 +1,7 @@
-package com.volmit.iris.gen.v2.scaffold.stream.interpolation;
+package com.volmit.iris.v2.scaffold.stream.interpolation;
 
-import com.volmit.iris.gen.v2.scaffold.stream.BasicStream;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.BasicStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 import com.volmit.iris.object.InterpolationMethod;
 import com.volmit.iris.util.IrisInterpolation;
 import com.volmit.iris.util.NoiseProvider;
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/interpolation/Interpolator.java b/src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/Interpolator.java
similarity index 66%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/stream/interpolation/Interpolator.java
rename to src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/Interpolator.java
index e6dc9493b..bf1837852 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/interpolation/Interpolator.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/Interpolator.java
@@ -1,6 +1,6 @@
-package com.volmit.iris.gen.v2.scaffold.stream.interpolation;
+package com.volmit.iris.v2.scaffold.stream.interpolation;
 
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 
 public interface Interpolator<T>
 {
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/interpolation/InterpolatorFactory.java b/src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/InterpolatorFactory.java
similarity index 94%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/stream/interpolation/InterpolatorFactory.java
rename to src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/InterpolatorFactory.java
index 373ad2b57..9428dcc4c 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/interpolation/InterpolatorFactory.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/InterpolatorFactory.java
@@ -1,6 +1,6 @@
-package com.volmit.iris.gen.v2.scaffold.stream.interpolation;
+package com.volmit.iris.v2.scaffold.stream.interpolation;
 
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 import com.volmit.iris.object.InterpolationMethod;
 
 public class InterpolatorFactory<T>
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/interpolation/TriHermiteStream.java b/src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/TriHermiteStream.java
similarity index 96%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/stream/interpolation/TriHermiteStream.java
rename to src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/TriHermiteStream.java
index c1cc43dbd..9f2e7cd1f 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/interpolation/TriHermiteStream.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/TriHermiteStream.java
@@ -1,7 +1,7 @@
-package com.volmit.iris.gen.v2.scaffold.stream.interpolation;
+package com.volmit.iris.v2.scaffold.stream.interpolation;
 
-import com.volmit.iris.gen.v2.scaffold.stream.BasicStream;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.BasicStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 import com.volmit.iris.util.IrisInterpolation;
 
 public class TriHermiteStream<T> extends BasicStream<T> implements Interpolator<T>
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/interpolation/TriStarcastStream.java b/src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/TriStarcastStream.java
similarity index 85%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/stream/interpolation/TriStarcastStream.java
rename to src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/TriStarcastStream.java
index a5f2d5e27..2968dac3e 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/interpolation/TriStarcastStream.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/TriStarcastStream.java
@@ -1,7 +1,7 @@
-package com.volmit.iris.gen.v2.scaffold.stream.interpolation;
+package com.volmit.iris.v2.scaffold.stream.interpolation;
 
-import com.volmit.iris.gen.v2.scaffold.stream.BasicStream;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.BasicStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 
 public class TriStarcastStream<T> extends BasicStream<T> implements Interpolator<T>
 {
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/interpolation/TricubicStream.java b/src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/TricubicStream.java
similarity index 96%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/stream/interpolation/TricubicStream.java
rename to src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/TricubicStream.java
index c7dcd632b..6a4c0c6b9 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/interpolation/TricubicStream.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/TricubicStream.java
@@ -1,7 +1,7 @@
-package com.volmit.iris.gen.v2.scaffold.stream.interpolation;
+package com.volmit.iris.v2.scaffold.stream.interpolation;
 
-import com.volmit.iris.gen.v2.scaffold.stream.BasicStream;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.BasicStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 import com.volmit.iris.util.IrisInterpolation;
 
 public class TricubicStream<T> extends BasicStream<T> implements Interpolator<T>
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/interpolation/TrilinearStream.java b/src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/TrilinearStream.java
similarity index 90%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/stream/interpolation/TrilinearStream.java
rename to src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/TrilinearStream.java
index f9faa307b..fd03df2e6 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/interpolation/TrilinearStream.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/TrilinearStream.java
@@ -1,7 +1,7 @@
-package com.volmit.iris.gen.v2.scaffold.stream.interpolation;
+package com.volmit.iris.v2.scaffold.stream.interpolation;
 
-import com.volmit.iris.gen.v2.scaffold.stream.BasicStream;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.BasicStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 import com.volmit.iris.util.IrisInterpolation;
 
 public class TrilinearStream<T> extends BasicStream<T> implements Interpolator<T>
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/sources/CNGStream.java b/src/main/java/com/volmit/iris/v2/scaffold/stream/sources/CNGStream.java
similarity index 85%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/stream/sources/CNGStream.java
rename to src/main/java/com/volmit/iris/v2/scaffold/stream/sources/CNGStream.java
index 350c427c5..3465ada6c 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/sources/CNGStream.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/stream/sources/CNGStream.java
@@ -1,7 +1,7 @@
-package com.volmit.iris.gen.v2.scaffold.stream.sources;
+package com.volmit.iris.v2.scaffold.stream.sources;
 
-import com.volmit.iris.gen.v2.scaffold.stream.BasicLayer;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.BasicLayer;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 import com.volmit.iris.noise.CNG;
 
 public class CNGStream extends BasicLayer implements ProceduralStream<Double>
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/sources/FunctionStream.java b/src/main/java/com/volmit/iris/v2/scaffold/stream/sources/FunctionStream.java
similarity index 80%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/stream/sources/FunctionStream.java
rename to src/main/java/com/volmit/iris/v2/scaffold/stream/sources/FunctionStream.java
index 87207d338..d692148cb 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/sources/FunctionStream.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/stream/sources/FunctionStream.java
@@ -1,7 +1,7 @@
-package com.volmit.iris.gen.v2.scaffold.stream.sources;
+package com.volmit.iris.v2.scaffold.stream.sources;
 
-import com.volmit.iris.gen.v2.scaffold.stream.BasicStream;
-import com.volmit.iris.gen.v2.scaffold.stream.interpolation.Interpolated;
+import com.volmit.iris.v2.scaffold.stream.BasicStream;
+import com.volmit.iris.v2.scaffold.stream.interpolation.Interpolated;
 import com.volmit.iris.util.Function2;
 import com.volmit.iris.util.Function3;
 
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/utility/CachedStream2D.java b/src/main/java/com/volmit/iris/v2/scaffold/stream/utility/CachedStream2D.java
similarity index 83%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/stream/utility/CachedStream2D.java
rename to src/main/java/com/volmit/iris/v2/scaffold/stream/utility/CachedStream2D.java
index 4cf3ead31..1b905273d 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/utility/CachedStream2D.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/stream/utility/CachedStream2D.java
@@ -1,9 +1,9 @@
-package com.volmit.iris.gen.v2.scaffold.stream.utility;
+package com.volmit.iris.v2.scaffold.stream.utility;
 
 import com.github.benmanes.caffeine.cache.Caffeine;
 import com.github.benmanes.caffeine.cache.LoadingCache;
-import com.volmit.iris.gen.v2.scaffold.stream.BasicStream;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.BasicStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 import com.volmit.iris.util.ChunkPosition;
 
 public class CachedStream2D<T> extends BasicStream<T> implements ProceduralStream<T>
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/utility/ProfiledStream.java b/src/main/java/com/volmit/iris/v2/scaffold/stream/utility/ProfiledStream.java
similarity index 95%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/stream/utility/ProfiledStream.java
rename to src/main/java/com/volmit/iris/v2/scaffold/stream/utility/ProfiledStream.java
index 7161a427d..20b6b71b3 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/utility/ProfiledStream.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/stream/utility/ProfiledStream.java
@@ -1,7 +1,7 @@
-package com.volmit.iris.gen.v2.scaffold.stream.utility;
+package com.volmit.iris.v2.scaffold.stream.utility;
 
-import com.volmit.iris.gen.v2.scaffold.stream.BasicStream;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.BasicStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 import com.volmit.iris.util.Form;
 import com.volmit.iris.util.KList;
 import com.volmit.iris.util.PrecisionStopwatch;
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/utility/SemaphoreStream.java b/src/main/java/com/volmit/iris/v2/scaffold/stream/utility/SemaphoreStream.java
similarity index 80%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/stream/utility/SemaphoreStream.java
rename to src/main/java/com/volmit/iris/v2/scaffold/stream/utility/SemaphoreStream.java
index a93cb3cfc..ffec33fc7 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/utility/SemaphoreStream.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/stream/utility/SemaphoreStream.java
@@ -1,7 +1,7 @@
-package com.volmit.iris.gen.v2.scaffold.stream.utility;
+package com.volmit.iris.v2.scaffold.stream.utility;
 
-import com.volmit.iris.gen.v2.scaffold.stream.BasicStream;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.BasicStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 
 import java.util.concurrent.Semaphore;
 
diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/utility/SynchronizedStream.java b/src/main/java/com/volmit/iris/v2/scaffold/stream/utility/SynchronizedStream.java
similarity index 68%
rename from src/main/java/com/volmit/iris/gen/v2/scaffold/stream/utility/SynchronizedStream.java
rename to src/main/java/com/volmit/iris/v2/scaffold/stream/utility/SynchronizedStream.java
index e7331b965..0db6da731 100644
--- a/src/main/java/com/volmit/iris/gen/v2/scaffold/stream/utility/SynchronizedStream.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/stream/utility/SynchronizedStream.java
@@ -1,9 +1,7 @@
-package com.volmit.iris.gen.v2.scaffold.stream.utility;
+package com.volmit.iris.v2.scaffold.stream.utility;
 
-import com.volmit.iris.gen.v2.scaffold.stream.BasicStream;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
-import com.volmit.iris.util.PrecisionStopwatch;
-import com.volmit.iris.util.RollingSequence;
+import com.volmit.iris.v2.scaffold.stream.BasicStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 
 public class SynchronizedStream<T> extends BasicStream<T>
 {