diff --git a/src/main/java/com/volmit/iris/util/inventory/C.java b/src/main/java/com/volmit/iris/util/C.java
similarity index 100%
rename from src/main/java/com/volmit/iris/util/inventory/C.java
rename to src/main/java/com/volmit/iris/util/C.java
diff --git a/src/main/java/com/volmit/iris/util/Callback.java b/src/main/java/com/volmit/iris/util/Callback.java
index b4b0b3bfb..321b184bb 100644
--- a/src/main/java/com/volmit/iris/util/Callback.java
+++ b/src/main/java/com/volmit/iris/util/Callback.java
@@ -1,4 +1,4 @@
-package com.volmit.iris.util;
+package com.volmit.iris.util.inventory;
 
 /**
  * Callback for async workers
diff --git a/src/main/java/com/volmit/iris/util/Element.java b/src/main/java/com/volmit/iris/util/Element.java
index b02d4549b..a8e451b8b 100644
--- a/src/main/java/com/volmit/iris/util/Element.java
+++ b/src/main/java/com/volmit/iris/util/Element.java
@@ -1,13 +1,14 @@
-package com.volmit.iris.util;
+package com.volmit.iris.util.inventory;
 
-import org.bukkit.block.data.BlockData;
 import org.bukkit.inventory.ItemStack;
 
+import com.volmit.iris.util.KList;
+
 public interface Element
 {
-	public BlockData getMaterial();
+	public MaterialBlock getMaterial();
 
-	public Element setMaterial(BlockData b);
+	public Element setMaterial(MaterialBlock b);
 
 	public boolean isEnchanted();
 
diff --git a/src/main/java/com/volmit/iris/util/ElementEvent.java b/src/main/java/com/volmit/iris/util/ElementEvent.java
index 2208c1344..642d4c23b 100644
--- a/src/main/java/com/volmit/iris/util/ElementEvent.java
+++ b/src/main/java/com/volmit/iris/util/ElementEvent.java
@@ -1,4 +1,4 @@
-package com.volmit.iris.util;
+package com.volmit.iris.util.inventory;
 
 /**
  * Element Event.
diff --git a/src/main/java/com/volmit/iris/util/inventory/MaterialBlock.java b/src/main/java/com/volmit/iris/util/MaterialBlock.java
similarity index 100%
rename from src/main/java/com/volmit/iris/util/inventory/MaterialBlock.java
rename to src/main/java/com/volmit/iris/util/MaterialBlock.java
diff --git a/src/main/java/com/volmit/iris/gen/parallax/ParallaxChunk.java b/src/main/java/com/volmit/iris/util/ParallaxChunk.java
similarity index 100%
rename from src/main/java/com/volmit/iris/gen/parallax/ParallaxChunk.java
rename to src/main/java/com/volmit/iris/util/ParallaxChunk.java
diff --git a/src/main/java/com/volmit/iris/gen/parallax/ParallaxRegion.java b/src/main/java/com/volmit/iris/util/ParallaxRegion.java
similarity index 100%
rename from src/main/java/com/volmit/iris/gen/parallax/ParallaxRegion.java
rename to src/main/java/com/volmit/iris/util/ParallaxRegion.java
diff --git a/src/main/java/com/volmit/iris/gen/parallax/ParallaxSection.java b/src/main/java/com/volmit/iris/util/ParallaxSection.java
similarity index 100%
rename from src/main/java/com/volmit/iris/gen/parallax/ParallaxSection.java
rename to src/main/java/com/volmit/iris/util/ParallaxSection.java
diff --git a/src/main/java/com/volmit/iris/gen/parallax/ParallaxWorld.java b/src/main/java/com/volmit/iris/util/ParallaxWorld.java
similarity index 100%
rename from src/main/java/com/volmit/iris/gen/parallax/ParallaxWorld.java
rename to src/main/java/com/volmit/iris/util/ParallaxWorld.java
diff --git a/src/main/java/com/volmit/iris/util/vec/Point3d.java b/src/main/java/com/volmit/iris/util/Point3d.java
similarity index 100%
rename from src/main/java/com/volmit/iris/util/vec/Point3d.java
rename to src/main/java/com/volmit/iris/util/Point3d.java
diff --git a/src/main/java/com/volmit/iris/util/vec/Point3f.java b/src/main/java/com/volmit/iris/util/Point3f.java
similarity index 100%
rename from src/main/java/com/volmit/iris/util/vec/Point3f.java
rename to src/main/java/com/volmit/iris/util/Point3f.java
diff --git a/src/main/java/com/volmit/iris/util/vec/Point4d.java b/src/main/java/com/volmit/iris/util/Point4d.java
similarity index 100%
rename from src/main/java/com/volmit/iris/util/vec/Point4d.java
rename to src/main/java/com/volmit/iris/util/Point4d.java
diff --git a/src/main/java/com/volmit/iris/util/vec/Point4f.java b/src/main/java/com/volmit/iris/util/Point4f.java
similarity index 100%
rename from src/main/java/com/volmit/iris/util/vec/Point4f.java
rename to src/main/java/com/volmit/iris/util/Point4f.java
diff --git a/src/main/java/com/volmit/iris/util/vec/Tuple2d.java b/src/main/java/com/volmit/iris/util/Tuple2d.java
similarity index 100%
rename from src/main/java/com/volmit/iris/util/vec/Tuple2d.java
rename to src/main/java/com/volmit/iris/util/Tuple2d.java
diff --git a/src/main/java/com/volmit/iris/util/vec/Tuple2f.java b/src/main/java/com/volmit/iris/util/Tuple2f.java
similarity index 100%
rename from src/main/java/com/volmit/iris/util/vec/Tuple2f.java
rename to src/main/java/com/volmit/iris/util/Tuple2f.java
diff --git a/src/main/java/com/volmit/iris/util/vec/Tuple3d.java b/src/main/java/com/volmit/iris/util/Tuple3d.java
similarity index 100%
rename from src/main/java/com/volmit/iris/util/vec/Tuple3d.java
rename to src/main/java/com/volmit/iris/util/Tuple3d.java
diff --git a/src/main/java/com/volmit/iris/util/vec/Tuple3f.java b/src/main/java/com/volmit/iris/util/Tuple3f.java
similarity index 100%
rename from src/main/java/com/volmit/iris/util/vec/Tuple3f.java
rename to src/main/java/com/volmit/iris/util/Tuple3f.java
diff --git a/src/main/java/com/volmit/iris/util/vec/Tuple4d.java b/src/main/java/com/volmit/iris/util/Tuple4d.java
similarity index 100%
rename from src/main/java/com/volmit/iris/util/vec/Tuple4d.java
rename to src/main/java/com/volmit/iris/util/Tuple4d.java
diff --git a/src/main/java/com/volmit/iris/util/vec/Tuple4f.java b/src/main/java/com/volmit/iris/util/Tuple4f.java
similarity index 100%
rename from src/main/java/com/volmit/iris/util/vec/Tuple4f.java
rename to src/main/java/com/volmit/iris/util/Tuple4f.java
diff --git a/src/main/java/com/volmit/iris/util/inventory/UIElement.java b/src/main/java/com/volmit/iris/util/UIElement.java
similarity index 100%
rename from src/main/java/com/volmit/iris/util/inventory/UIElement.java
rename to src/main/java/com/volmit/iris/util/UIElement.java
diff --git a/src/main/java/com/volmit/iris/util/inventory/UIStaticDecorator.java b/src/main/java/com/volmit/iris/util/UIStaticDecorator.java
similarity index 100%
rename from src/main/java/com/volmit/iris/util/inventory/UIStaticDecorator.java
rename to src/main/java/com/volmit/iris/util/UIStaticDecorator.java
diff --git a/src/main/java/com/volmit/iris/util/inventory/UIVoidDecorator.java b/src/main/java/com/volmit/iris/util/UIVoidDecorator.java
similarity index 100%
rename from src/main/java/com/volmit/iris/util/inventory/UIVoidDecorator.java
rename to src/main/java/com/volmit/iris/util/UIVoidDecorator.java
diff --git a/src/main/java/com/volmit/iris/util/inventory/UIWindow.java b/src/main/java/com/volmit/iris/util/UIWindow.java
similarity index 100%
rename from src/main/java/com/volmit/iris/util/inventory/UIWindow.java
rename to src/main/java/com/volmit/iris/util/UIWindow.java
diff --git a/src/main/java/com/volmit/iris/util/vec/VecMathUtil.java b/src/main/java/com/volmit/iris/util/VecMathUtil.java
similarity index 100%
rename from src/main/java/com/volmit/iris/util/vec/VecMathUtil.java
rename to src/main/java/com/volmit/iris/util/VecMathUtil.java
diff --git a/src/main/java/com/volmit/iris/util/vec/Vector2d.java b/src/main/java/com/volmit/iris/util/Vector2d.java
similarity index 100%
rename from src/main/java/com/volmit/iris/util/vec/Vector2d.java
rename to src/main/java/com/volmit/iris/util/Vector2d.java
diff --git a/src/main/java/com/volmit/iris/util/vec/Vector2f.java b/src/main/java/com/volmit/iris/util/Vector2f.java
similarity index 100%
rename from src/main/java/com/volmit/iris/util/vec/Vector2f.java
rename to src/main/java/com/volmit/iris/util/Vector2f.java
diff --git a/src/main/java/com/volmit/iris/util/vec/Vector3d.java b/src/main/java/com/volmit/iris/util/Vector3d.java
similarity index 100%
rename from src/main/java/com/volmit/iris/util/vec/Vector3d.java
rename to src/main/java/com/volmit/iris/util/Vector3d.java
diff --git a/src/main/java/com/volmit/iris/util/vec/Vector3f.java b/src/main/java/com/volmit/iris/util/Vector3f.java
similarity index 100%
rename from src/main/java/com/volmit/iris/util/vec/Vector3f.java
rename to src/main/java/com/volmit/iris/util/Vector3f.java
diff --git a/src/main/java/com/volmit/iris/util/inventory/Window.java b/src/main/java/com/volmit/iris/util/Window.java
similarity index 100%
rename from src/main/java/com/volmit/iris/util/inventory/Window.java
rename to src/main/java/com/volmit/iris/util/Window.java
diff --git a/src/main/java/com/volmit/iris/util/inventory/WindowDecorator.java b/src/main/java/com/volmit/iris/util/WindowDecorator.java
similarity index 100%
rename from src/main/java/com/volmit/iris/util/inventory/WindowDecorator.java
rename to src/main/java/com/volmit/iris/util/WindowDecorator.java
diff --git a/src/main/java/com/volmit/iris/util/inventory/WindowResolution.java b/src/main/java/com/volmit/iris/util/WindowResolution.java
similarity index 100%
rename from src/main/java/com/volmit/iris/util/inventory/WindowResolution.java
rename to src/main/java/com/volmit/iris/util/WindowResolution.java
diff --git a/src/main/java/com/volmit/iris/util/inventory/Callback.java b/src/main/java/com/volmit/iris/util/inventory/Callback.java
deleted file mode 100644
index 321b184bb..000000000
--- a/src/main/java/com/volmit/iris/util/inventory/Callback.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.volmit.iris.util.inventory;
-
-/**
- * Callback for async workers
- *
- * @author cyberpwn
- *
- * @param <T>
- *            the type of object to be returned in the runnable
- */
-@FunctionalInterface
-public interface Callback<T>
-{
-	/**
-	 * Called when the callback calls back...
-	 *
-	 * @param t
-	 *            the object to be called back
-	 */
-	public void run(T t);
-}
diff --git a/src/main/java/com/volmit/iris/util/inventory/Element.java b/src/main/java/com/volmit/iris/util/inventory/Element.java
deleted file mode 100644
index a8e451b8b..000000000
--- a/src/main/java/com/volmit/iris/util/inventory/Element.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.volmit.iris.util.inventory;
-
-import org.bukkit.inventory.ItemStack;
-
-import com.volmit.iris.util.KList;
-
-public interface Element
-{
-	public MaterialBlock getMaterial();
-
-	public Element setMaterial(MaterialBlock b);
-
-	public boolean isEnchanted();
-
-	public Element setEnchanted(boolean enchanted);
-
-	public String getId();
-
-	public String getName();
-
-	public Element setProgress(double progress);
-
-	public double getProgress();
-
-	public short getEffectiveDurability();
-
-	public Element setCount(int c);
-
-	public int getCount();
-
-	public ItemStack computeItemStack();
-
-	public Element setBackground(boolean bg);
-
-	public boolean isBackgrond();
-
-	public Element setName(String name);
-
-	public Element addLore(String loreLine);
-
-	public KList<String> getLore();
-
-	public Element call(ElementEvent event, Element context);
-
-	public Element onLeftClick(Callback<Element> clicked);
-
-	public Element onRightClick(Callback<Element> clicked);
-
-	public Element onShiftLeftClick(Callback<Element> clicked);
-
-	public Element onShiftRightClick(Callback<Element> clicked);
-
-	public Element onDraggedInto(Callback<Element> into);
-
-	public Element onOtherDraggedInto(Callback<Element> other);
-}
diff --git a/src/main/java/com/volmit/iris/util/inventory/ElementEvent.java b/src/main/java/com/volmit/iris/util/inventory/ElementEvent.java
deleted file mode 100644
index 642d4c23b..000000000
--- a/src/main/java/com/volmit/iris/util/inventory/ElementEvent.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.volmit.iris.util.inventory;
-
-/**
- * Element Event.
- *
- * @author cyberpwn
- *
- */
-public enum ElementEvent
-{
-	LEFT,
-	RIGHT,
-	SHIFT_LEFT,
-	SHIFT_RIGHT,
-	DRAG_INTO,
-	OTHER_DRAG_INTO;
-}