$ Tree Farmer Work.

% Package cleanup.
- Removed /Bed command.

69 files changed, 564 insertions, 456 deletions

diff --git a/src/Java/gregtech/api/util/FishPondFakeRecipe.java b/src/Java/gregtech/api/util/FishPondFakeRecipe.java
index d8661c23bd..9cb82bf5e0 100644
--- a/src/Java/gregtech/api/util/FishPondFakeRecipe.java
+++ b/src/Java/gregtech/api/util/FishPondFakeRecipe.java
@@ -3,8 +3,8 @@ package gregtech.api.util;
 import java.util.ArrayList;
 
 import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.recipe.common.CI;
-import gtPlusPlus.core.util.array.AutoMap;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.WeightedRandomFishable;
diff --git a/src/Java/gtPlusPlus/GTplusplus.java b/src/Java/gtPlusPlus/GTplusplus.java
index dedbbb6c11..74b81b63b3 100644
--- a/src/Java/gtPlusPlus/GTplusplus.java
+++ b/src/Java/gtPlusPlus/GTplusplus.java
@@ -1,6 +1,6 @@
 package gtPlusPlus;
 
-import static gtPlusPlus.api.objects.ChunkManager.mChunkLoaderManagerMap;
+import static gtPlusPlus.api.objects.minecraft.ChunkManager.mChunkLoaderManagerMap;
 import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableCustomCapes;
 import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableUpdateChecker;
 
@@ -20,23 +20,23 @@ import gregtech.api.enums.Materials;
 import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.Recipe_GT;
 import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
-import gtPlusPlus.api.analytics.SegmentAnalytics;
-import gtPlusPlus.api.analytics.SegmentHelper;
-import gtPlusPlus.api.objects.ChunkManager;
-import gtPlusPlus.api.objects.DimChunkPos;
 import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.data.Triplet;
+import gtPlusPlus.api.objects.minecraft.ChunkManager;
+import gtPlusPlus.api.objects.minecraft.DimChunkPos;
 import gtPlusPlus.core.commands.CommandMath;
 import gtPlusPlus.core.common.CommonProxy;
 import gtPlusPlus.core.config.ConfigHandler;
 import gtPlusPlus.core.handler.BookHandler;
 import gtPlusPlus.core.handler.Recipes.RegistrationHandler;
+import gtPlusPlus.core.handler.analytics.SegmentAnalytics;
+import gtPlusPlus.core.handler.analytics.SegmentHelper;
 import gtPlusPlus.core.handler.events.BlockEventHandler;
 import gtPlusPlus.core.handler.events.LoginEventHandler;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.material.nuclear.FLUORIDES;
 import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.array.Triplet;
 import gtPlusPlus.core.util.geo.GeoUtils;
 import gtPlusPlus.core.util.item.ItemUtils;
 import gtPlusPlus.core.util.networking.NetworkUtils;
diff --git a/src/Java/gtPlusPlus/api/damage/DamageTeslaTower.java b/src/Java/gtPlusPlus/api/damage/DamageTeslaTower.java
index ada2ba5c3d..ecde9fe930 100644
--- a/src/Java/gtPlusPlus/api/damage/DamageTeslaTower.java
+++ b/src/Java/gtPlusPlus/api/damage/DamageTeslaTower.java
@@ -1,5 +1,6 @@
 package gtPlusPlus.api.damage;
 
+import gtPlusPlus.core.world.damage.BaseCustomDamageSource;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.util.ChatComponentTranslation;
diff --git a/src/Java/gtPlusPlus/api/objects/MaterialHelper.java b/src/Java/gtPlusPlus/api/helpers/MaterialHelper.java
index d63ab7a15a..bb30727992 100644
--- a/src/Java/gtPlusPlus/api/objects/MaterialHelper.java
+++ b/src/Java/gtPlusPlus/api/helpers/MaterialHelper.java
@@ -1,4 +1,4 @@
-package gtPlusPlus.api.objects;
+package gtPlusPlus.api.helpers;
 
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
diff --git a/src/Java/gtPlusPlus/api/interfaces/IEntityCatcher.java b/src/Java/gtPlusPlus/api/interfaces/IEntityCatcher.java
index ca2d80de53..12813e1dd0 100644
--- a/src/Java/gtPlusPlus/api/interfaces/IEntityCatcher.java
+++ b/src/Java/gtPlusPlus/api/interfaces/IEntityCatcher.java
@@ -1,6 +1,6 @@
 package gtPlusPlus.api.interfaces;
 
-import gtPlusPlus.core.util.array.BlockPos;
+import gtPlusPlus.api.objects.minecraft.BlockPos;
 import net.minecraft.entity.Entity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
diff --git a/src/Java/gtPlusPlus/core/util/array/AutoMap.java b/src/Java/gtPlusPlus/api/objects/data/AutoMap.java
index ea5e1dd25e..a8d24d36d8 100644
--- a/src/Java/gtPlusPlus/core/util/array/AutoMap.java
+++ b/src/Java/gtPlusPlus/api/objects/data/AutoMap.java
@@ -1,4 +1,4 @@
-package gtPlusPlus.core.util.array;
+package gtPlusPlus.api.objects.data;
 
 import java.io.Serializable;
 import java.util.*;
diff --git a/src/Java/gtPlusPlus/core/util/array/Pair.java b/src/Java/gtPlusPlus/api/objects/data/Pair.java
index 1d2c0ef7cb..6ab781cf1e 100644
--- a/src/Java/gtPlusPlus/core/util/array/Pair.java
+++ b/src/Java/gtPlusPlus/api/objects/data/Pair.java
@@ -1,4 +1,4 @@
-package gtPlusPlus.core.util.array;
+package gtPlusPlus.api.objects.data;
 
 import java.io.Serializable;
 
diff --git a/src/Java/gtPlusPlus/core/util/array/Quad.java b/src/Java/gtPlusPlus/api/objects/data/Quad.java
index 417c3b6ebc..01c62e95e6 100644
--- a/src/Java/gtPlusPlus/core/util/array/Quad.java
+++ b/src/Java/gtPlusPlus/api/objects/data/Quad.java
@@ -1,4 +1,4 @@
-package gtPlusPlus.core.util.array;
+package gtPlusPlus.api.objects.data;
 
 public class Quad<K,V,C,R> {
 
diff --git a/src/Java/gtPlusPlus/core/util/array/Triplet.java b/src/Java/gtPlusPlus/api/objects/data/Triplet.java
index 01f836ae72..affb03d868 100644
--- a/src/Java/gtPlusPlus/core/util/array/Triplet.java
+++ b/src/Java/gtPlusPlus/api/objects/data/Triplet.java
@@ -1,4 +1,4 @@
-package gtPlusPlus.core.util.array;
+package gtPlusPlus.api.objects.data;
 
 public class Triplet<K,V,C> {
 
diff --git a/src/Java/gtPlusPlus/api/objects/minecraft/BlockPos.java b/src/Java/gtPlusPlus/api/objects/minecraft/BlockPos.java
new file mode 100644
index 0000000000..d258d1fe73
--- /dev/null
+++ b/src/Java/gtPlusPlus/api/objects/minecraft/BlockPos.java
@@ -0,0 +1,85 @@
+package gtPlusPlus.api.objects.minecraft;
+
+import java.io.Serializable;
+
+public class BlockPos implements Serializable{
+
+	private static final long serialVersionUID = -7271947491316682006L;
+	public final int xPos;
+	public final int yPos;
+	public final int zPos;
+	public final int dim;
+
+	public BlockPos(int x, int y, int z){
+		this(x, y, z, 0);
+	}
+
+	public BlockPos(int x, int y, int z, int dim){
+		this.xPos = x;
+		this.yPos = y;
+		this.zPos = z;
+		this.dim = dim;
+	}
+
+	public String getLocationString() {
+		return "[X: "+this.xPos+"][Y: "+this.yPos+"][Z: "+this.zPos+"][Dim: "+this.dim+"]";
+	}
+
+	@Override
+	public  int hashCode() {
+		int hash = 5;
+		hash += (13 * this.xPos);
+		hash += (19 * this.yPos);
+		hash += (31 * this.zPos);
+		hash += (17 * this.dim);
+		return hash;
+	}
+
+	@Override
+	public boolean equals(Object other) {
+		if (other == null) {
+			return false;
+		}
+		if (other == this) {
+			return true;
+		}
+		if(!(other instanceof BlockPos)) {
+			return false;
+		}
+		BlockPos otherPoint = (BlockPos)other;
+		return this.xPos == otherPoint.xPos && this.yPos == otherPoint.yPos && this.zPos == otherPoint.zPos && this.dim == otherPoint.dim;
+	}
+
+	public int distanceFrom(BlockPos target) {
+		if (target.dim != this.dim) {
+			return Short.MIN_VALUE;
+		}    	
+		return distanceFrom(target.xPos, target.yPos, target.zPos);
+	}
+
+	/**
+	 *
+	 * @param x X coordinate of target.
+	 * @param y Y coordinate of target.
+	 * @param z Z coordinate of target.
+	 * @return square of distance
+	 */
+	public int distanceFrom(int x, int y, int z) {
+		int distanceX = this.xPos - x;
+		int distanceY = this.yPos - y;
+		int distanceZ = this.zPos - z;
+		return distanceX * distanceX + distanceY * distanceY + distanceZ * distanceZ;
+	}
+
+	public boolean isWithinRange(BlockPos target, int range) {    	
+		if (target.dim != this.dim) {
+			return false;
+		}    	
+		return isWithinRange(target.xPos, target.yPos, target.zPos, range);
+	}
+
+	public boolean isWithinRange(int x, int y, int z, int range) {
+		return distanceFrom(x, y, z) <= (range * range);
+	}
+
+}
diff --git a/src/Java/gtPlusPlus/api/objects/ChunkManager.java b/src/Java/gtPlusPlus/api/objects/minecraft/ChunkManager.java
index 0bace04bf8..b411e8875a 100644
--- a/src/Java/gtPlusPlus/api/objects/ChunkManager.java
+++ b/src/Java/gtPlusPlus/api/objects/minecraft/ChunkManager.java
@@ -6,14 +6,14 @@
  * permission unless otherwise specified on the
  * license page at http://railcraft.info/wiki/info:license.
  */
-package gtPlusPlus.api.objects;
+package gtPlusPlus.api.objects.minecraft;
 
 import com.google.common.collect.LinkedListMultimap;
 import com.google.common.collect.ListMultimap;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import gtPlusPlus.GTplusplus;
-import gtPlusPlus.core.util.array.BlockPos;
-import gtPlusPlus.core.util.array.Triplet;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.data.Triplet;
 import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaTileEntityChunkLoader;
 
 import java.util.HashSet;
diff --git a/src/Java/gtPlusPlus/api/objects/DimChunkPos.java b/src/Java/gtPlusPlus/api/objects/minecraft/DimChunkPos.java
index bea0a4ec3b..010e522a14 100644
--- a/src/Java/gtPlusPlus/api/objects/DimChunkPos.java
+++ b/src/Java/gtPlusPlus/api/objects/minecraft/DimChunkPos.java
@@ -1,6 +1,5 @@
-package gtPlusPlus.api.objects;
+package gtPlusPlus.api.objects.minecraft;
 
-import gtPlusPlus.core.util.array.BlockPos;
 import net.minecraft.client.Minecraft;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
diff --git a/src/Java/gtPlusPlus/api/objects/GenericStack.java b/src/Java/gtPlusPlus/api/objects/minecraft/GenericStack.java
index b3bc94364f..f5db1d9e3a 100644
--- a/src/Java/gtPlusPlus/api/objects/GenericStack.java
+++ b/src/Java/gtPlusPlus/api/objects/minecraft/GenericStack.java
@@ -1,4 +1,4 @@
-package gtPlusPlus.api.objects;
+package gtPlusPlus.api.objects.minecraft;
 
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
diff --git a/src/Java/gtPlusPlus/api/objects/CSPRNG_DO_NOT_USE.java b/src/Java/gtPlusPlus/api/objects/random/CSPRNG_DO_NOT_USE.java
index 19200846ca..b2dc984456 100644
--- a/src/Java/gtPlusPlus/api/objects/CSPRNG_DO_NOT_USE.java
+++ b/src/Java/gtPlusPlus/api/objects/random/CSPRNG_DO_NOT_USE.java
@@ -33,7 +33,7 @@
  * http://www.opensource.org/licenses/bsd-license.php
  */
 
-package gtPlusPlus.api.objects;
+package gtPlusPlus.api.objects.random;
 import java.math.BigInteger;
 import java.security.SecureRandom;
 import java.util.Random;
diff --git a/src/Java/gtPlusPlus/api/objects/XSTR.java b/src/Java/gtPlusPlus/api/objects/random/XSTR.java
index 3ff0792f6e..7f83df52c4 100644
--- a/src/Java/gtPlusPlus/api/objects/XSTR.java
+++ b/src/Java/gtPlusPlus/api/objects/random/XSTR.java
@@ -1,4 +1,4 @@
-package gtPlusPlus.api.objects;
+package gtPlusPlus.api.objects.random;
 /**
  * A subclass of java.util.random that implements the Xorshift random number
  * generator
diff --git a/src/Java/gtPlusPlus/core/block/general/BlockTankXpConverter.java b/src/Java/gtPlusPlus/core/block/general/BlockTankXpConverter.java
index ea55a9177d..56ba60a5f3 100644
--- a/src/Java/gtPlusPlus/core/block/general/BlockTankXpConverter.java
+++ b/src/Java/gtPlusPlus/core/block/general/BlockTankXpConverter.java
@@ -9,12 +9,12 @@ import cpw.mods.fml.common.registry.LanguageRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.common.items.GT_MetaGenerated_Tool_01;
+import gtPlusPlus.api.objects.data.Triplet;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.item.base.itemblock.ItemBlockEntityBase;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.tileentities.general.TileEntityXpConverter;
 import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.array.Triplet;
 import gtPlusPlus.core.util.enchanting.EnchantingUtils;
 import gtPlusPlus.core.util.player.PlayerUtils;
 import net.minecraft.block.BlockContainer;
diff --git a/src/Java/gtPlusPlus/core/block/general/HellFire.java b/src/Java/gtPlusPlus/core/block/general/HellFire.java
index a682a0d98d..ef15f373ae 100644
--- a/src/Java/gtPlusPlus/core/block/general/HellFire.java
+++ b/src/Java/gtPlusPlus/core/block/general/HellFire.java
@@ -17,7 +17,7 @@ import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.common.registry.LanguageRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.api.objects.XSTR;
+import gtPlusPlus.api.objects.random.XSTR;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.math.MathUtils;
diff --git a/src/Java/gtPlusPlus/core/client/renderer/RenderPlasmaBolt.java b/src/Java/gtPlusPlus/core/client/renderer/RenderPlasmaBolt.java
index f505824bc9..cb17793c59 100644
--- a/src/Java/gtPlusPlus/core/client/renderer/RenderPlasmaBolt.java
+++ b/src/Java/gtPlusPlus/core/client/renderer/RenderPlasmaBolt.java
@@ -3,7 +3,7 @@ package gtPlusPlus.core.client.renderer;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.XSTR;
+import gtPlusPlus.api.objects.random.XSTR;
 import gtPlusPlus.core.entity.EntityTeslaTowerLightning;
 
 import java.util.Random;
diff --git a/src/Java/gtPlusPlus/core/commands/CommandMath.java b/src/Java/gtPlusPlus/core/commands/CommandMath.java
index 27c963bf81..8e8dfbc36c 100644
--- a/src/Java/gtPlusPlus/core/commands/CommandMath.java
+++ b/src/Java/gtPlusPlus/core/commands/CommandMath.java
@@ -4,10 +4,13 @@ import java.util.ArrayList;
 import java.util.List;
 
 import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.core.util.item.ItemUtils;
 import gtPlusPlus.core.util.player.PlayerUtils;
 import net.minecraft.command.ICommand;
 import net.minecraft.command.ICommandSender;
 import net.minecraft.entity.Entity;
+import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.item.EntityXPOrb;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.ChunkCoordinates;
@@ -21,61 +24,82 @@ public class CommandMath implements ICommand
 	protected String fullEntityName;
 	protected Entity conjuredEntity;
 
-	public CommandMath()
-	{
+	public CommandMath(){
 		this.aliases = new ArrayList<>();
-
-		this.aliases.add("hometele");
-
-		this.aliases.add("warphome");
-
+		//this.aliases.add("hometele");
+		//this.aliases.add("warphome");
 	}
 
 	@Override
-	public int compareTo(final Object o)
-	{
+	public int compareTo(final Object o){
 		return 0;
 
 	}
 
 	@Override
-	public String getCommandName()
-	{
-		return "bed";
+	public String getCommandName(){
+		return "alkalus";
 
 	}
 
 	@Override
-	public String getCommandUsage(final ICommandSender var1)
-	{
-		return "/bed [Teleports you to your bed for XP]";
+	public String getCommandUsage(final ICommandSender var1){
+		return "/alkalus [Dev Command]";
 
 	}
 
 	@Override
-	public List<String> getCommandAliases()
-	{
+	public List<String> getCommandAliases(){
 		return this.aliases;
 
 	}
 
 	@Override
-	public void processCommand(final ICommandSender S, final String[] argString)
-	{
+	public void processCommand(final ICommandSender S, final String[] argString){
 		final World W = S.getEntityWorld();
-		final CommandUtils C = new CommandUtils();
-		final EntityPlayer P = C.getPlayer(S);
-		//System.out.println(P.getCommandSenderName());
-		//System.out.println(P.getDisplayName());
-		if (W.isRemote)
-
-		{
-
-			System.out.println("Not processing on Client side");
-
+		final EntityPlayer P = CommandUtils.getPlayer(S);
+		if (!W.isRemote){
+			if (P.getDisplayName().toLowerCase().equals("draknyte1") || P.getCommandSenderName().toLowerCase().equals("draknyte1")) {				
+				String[] prefixes = new String[] {
+						"ingot",
+						"plate",
+						"dust",
+						"gearGt",
+						"block",
+						"ore"
+				};
+				String[] loots = new String[] {
+						"Iron",
+						"Iron",
+						"Iron",
+						"Copper",
+						"Copper",
+						"Copper",
+						"Tin",
+						"Mica",
+						"Steel",
+						"Steel",
+						"Steel",
+						"Invar",
+						"Titanium",
+						"Gold",
+						"Silver",
+						"Lead",
+						"Aluminium"
+				};			
+				AutoMap<EntityItem> itemEntities = new AutoMap<EntityItem>();			
+				for (String g : prefixes) {
+					for (String s : loots) {
+						itemEntities.put(new EntityItem(W, P.posX, P.posY, P.posZ, ItemUtils.getItemStackOfAmountFromOreDictNoBroken(g+s, 64)));
+					}}
+				for (EntityItem e : itemEntities.values()) {
+					e.lifespan = 30000;
+				}
+						   
+			}
 		}
 
-		else
+		/*else
 
 		{
 
@@ -167,36 +191,30 @@ public class CommandMath implements ICommand
 				gregtech.api.util.GT_Utility.sendChatToPlayer(P, "You don't feel you're able to do this yet.");
 			}
 
-		}
+		}*/
 	}
 
 	@Override
-	public boolean canCommandSenderUseCommand(final ICommandSender var1)
-	{
-		return true;
-
+	public boolean canCommandSenderUseCommand(final ICommandSender var1){
+		final EntityPlayer P = CommandUtils.getPlayer(var1);
+		if (P.getDisplayName().toLowerCase().equals("draknyte1") || P.getCommandSenderName().toLowerCase().equals("draknyte1")) {
+			return true;
+		}
+		return false;
 	}
 
 	@Override
-	public List<?> addTabCompletionOptions(final ICommandSender var1, final String[] var2)
-	{
-		// TODO Auto-generated method stub
-
+	public List<?> addTabCompletionOptions(final ICommandSender var1, final String[] var2){
 		return null;
-
 	}
 
 	@Override
-	public boolean isUsernameIndex(final String[] var1, final int var2)
-	{
+	public boolean isUsernameIndex(final String[] var1, final int var2){
 		// TODO Auto-generated method stub
-
 		return false;
-
 	}
 
-	public boolean playerUsesCommand(final World W, final EntityPlayer P, final int cost)
-	{
+	public boolean playerUsesCommand(final World W, final EntityPlayer P, final int cost){
 
 
 		return true;
diff --git a/src/Java/gtPlusPlus/core/common/CommonProxy.java b/src/Java/gtPlusPlus/core/common/CommonProxy.java
index d5f4d95aef..421a522945 100644
--- a/src/Java/gtPlusPlus/core/common/CommonProxy.java
+++ b/src/Java/gtPlusPlus/core/common/CommonProxy.java
@@ -5,8 +5,8 @@ import static gtPlusPlus.core.lib.CORE.DEBUG;
 import cpw.mods.fml.common.event.*;
 import cpw.mods.fml.common.registry.GameRegistry;
 import gtPlusPlus.GTplusplus;
-import gtPlusPlus.api.objects.ChunkManager;
 import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.minecraft.ChunkManager;
 import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.entity.InternalEntityRegistry;
diff --git a/src/Java/gtPlusPlus/core/entity/EntityTeslaTowerLightning.java b/src/Java/gtPlusPlus/core/entity/EntityTeslaTowerLightning.java
index 0cd5bd85bf..d1528747a1 100644
--- a/src/Java/gtPlusPlus/core/entity/EntityTeslaTowerLightning.java
+++ b/src/Java/gtPlusPlus/core/entity/EntityTeslaTowerLightning.java
@@ -5,7 +5,7 @@ import java.util.UUID;
 
 import gtPlusPlus.api.damage.DamageTeslaTower;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.XSTR;
+import gtPlusPlus.api.objects.random.XSTR;
 import gtPlusPlus.core.util.entity.EntityUtils;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.Entity;
diff --git a/src/Java/gtPlusPlus/core/entity/projectile/EntityHydrofluoricAcidPotion.java b/src/Java/gtPlusPlus/core/entity/projectile/EntityHydrofluoricAcidPotion.java
index c935409650..7517011673 100644
--- a/src/Java/gtPlusPlus/core/entity/projectile/EntityHydrofluoricAcidPotion.java
+++ b/src/Java/gtPlusPlus/core/entity/projectile/EntityHydrofluoricAcidPotion.java
@@ -1,7 +1,7 @@
 package gtPlusPlus.core.entity.projectile;
 
 import gregtech.api.util.GT_Utility;
-import gtPlusPlus.core.util.array.BlockPos;
+import gtPlusPlus.api.objects.minecraft.BlockPos;
 import gtPlusPlus.core.util.entity.EntityUtils;
 import gtPlusPlus.core.util.math.MathUtils;
 import net.minecraft.block.Block;
diff --git a/src/Java/gtPlusPlus/core/entity/projectile/EntitySulfuricAcidPotion.java b/src/Java/gtPlusPlus/core/entity/projectile/EntitySulfuricAcidPotion.java
index cd4bec52bf..dfab6fa8ec 100644
--- a/src/Java/gtPlusPlus/core/entity/projectile/EntitySulfuricAcidPotion.java
+++ b/src/Java/gtPlusPlus/core/entity/projectile/EntitySulfuricAcidPotion.java
@@ -1,7 +1,7 @@
 package gtPlusPlus.core.entity.projectile;
 
 import gregtech.api.util.GT_Utility;
-import gtPlusPlus.core.util.array.BlockPos;
+import gtPlusPlus.api.objects.minecraft.BlockPos;
 import gtPlusPlus.core.util.entity.EntityUtils;
 import gtPlusPlus.core.util.math.MathUtils;
 import net.minecraft.block.Block;
diff --git a/src/Java/gtPlusPlus/core/handler/BurnableFuelHandler.java b/src/Java/gtPlusPlus/core/handler/BurnableFuelHandler.java
index 79ca0ad174..8bcdaca6a8 100644
--- a/src/Java/gtPlusPlus/core/handler/BurnableFuelHandler.java
+++ b/src/Java/gtPlusPlus/core/handler/BurnableFuelHandler.java
@@ -1,8 +1,8 @@
 package gtPlusPlus.core.handler;
 
 import cpw.mods.fml.common.IFuelHandler;
+import gtPlusPlus.api.objects.data.Pair;
 import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.array.Pair;
 import gtPlusPlus.core.util.item.ItemUtils;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
diff --git a/src/Java/gtPlusPlus/api/analytics/AnalyticsLoggingPlugin.java b/src/Java/gtPlusPlus/core/handler/analytics/AnalyticsLoggingPlugin.java
index 2423eaa65c..808c62d7aa 100644
--- a/src/Java/gtPlusPlus/api/analytics/AnalyticsLoggingPlugin.java
+++ b/src/Java/gtPlusPlus/core/handler/analytics/AnalyticsLoggingPlugin.java
@@ -1,4 +1,4 @@
-package gtPlusPlus.api.analytics;
+package gtPlusPlus.core.handler.analytics;
 
 import com.segment.analytics.Analytics;
 import com.segment.analytics.Callback;
diff --git a/src/Java/gtPlusPlus/api/analytics/BlockingFlush.java b/src/Java/gtPlusPlus/core/handler/analytics/BlockingFlush.java
index dddb37fefb..09d1cd5104 100644
--- a/src/Java/gtPlusPlus/api/analytics/BlockingFlush.java
+++ b/src/Java/gtPlusPlus/core/handler/analytics/BlockingFlush.java
@@ -1,4 +1,4 @@
-package gtPlusPlus.api.analytics;
+package gtPlusPlus.core.handler.analytics;
 
 import com.segment.analytics.Analytics;
 import com.segment.analytics.Callback;
diff --git a/src/Java/gtPlusPlus/api/analytics/SegmentAnalytics.java b/src/Java/gtPlusPlus/core/handler/analytics/SegmentAnalytics.java
index c4ef82b9ef..a217f896cf 100644
--- a/src/Java/gtPlusPlus/api/analytics/SegmentAnalytics.java
+++ b/src/Java/gtPlusPlus/core/handler/analytics/SegmentAnalytics.java
@@ -1,4 +1,4 @@
-package gtPlusPlus.api.analytics;
+package gtPlusPlus.core.handler.analytics;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
diff --git a/src/Java/gtPlusPlus/api/analytics/SegmentHelper.java b/src/Java/gtPlusPlus/core/handler/analytics/SegmentHelper.java
index 6e264fe1d2..79b95eda24 100644
--- a/src/Java/gtPlusPlus/api/analytics/SegmentHelper.java
+++ b/src/Java/gtPlusPlus/core/handler/analytics/SegmentHelper.java
@@ -1,4 +1,4 @@
-package gtPlusPlus.api.analytics;
+package gtPlusPlus.core.handler.analytics;
 
 import com.segment.analytics.Analytics;
 import com.segment.analytics.Callback;
diff --git a/src/Java/gtPlusPlus/core/handler/events/BlockEventHandler.java b/src/Java/gtPlusPlus/core/handler/events/BlockEventHandler.java
index cd79cf7fe6..0c6e798edd 100644
--- a/src/Java/gtPlusPlus/core/handler/events/BlockEventHandler.java
+++ b/src/Java/gtPlusPlus/core/handler/events/BlockEventHandler.java
@@ -9,9 +9,9 @@ import java.util.Map;
 import java.util.Random;
 
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import gtPlusPlus.api.analytics.SegmentAnalytics;
-import gtPlusPlus.api.analytics.SegmentHelper;
 import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.handler.analytics.SegmentAnalytics;
+import gtPlusPlus.core.handler.analytics.SegmentHelper;
 import gtPlusPlus.core.item.ModItems;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.lib.LoadedMods;
diff --git a/src/Java/gtPlusPlus/core/handler/events/LoginEventHandler.java b/src/Java/gtPlusPlus/core/handler/events/LoginEventHandler.java
index 09365e3caf..c8c6a23bca 100644
--- a/src/Java/gtPlusPlus/core/handler/events/LoginEventHandler.java
+++ b/src/Java/gtPlusPlus/core/handler/events/LoginEventHandler.java
@@ -4,9 +4,9 @@ import java.util.*;
 
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.gameevent.PlayerEvent;
-import gtPlusPlus.api.analytics.SegmentAnalytics;
-import gtPlusPlus.api.analytics.SegmentHelper;
 import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.handler.analytics.SegmentAnalytics;
+import gtPlusPlus.core.handler.analytics.SegmentHelper;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.proxy.ClientProxy;
diff --git a/src/Java/gtPlusPlus/core/handler/events/ZombieBackupSpawnEventHandler.java b/src/Java/gtPlusPlus/core/handler/events/ZombieBackupSpawnEventHandler.java
index 877b0c6ced..572f52124f 100644
--- a/src/Java/gtPlusPlus/core/handler/events/ZombieBackupSpawnEventHandler.java
+++ b/src/Java/gtPlusPlus/core/handler/events/ZombieBackupSpawnEventHandler.java
@@ -7,8 +7,8 @@ import org.apache.commons.lang3.reflect.FieldUtils;
 import cpw.mods.fml.common.eventhandler.Event.Result;
 import cpw.mods.fml.common.eventhandler.EventPriority;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import gtPlusPlus.api.analytics.SegmentHelper;
 import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.handler.analytics.SegmentHelper;
 import net.minecraftforge.event.entity.living.ZombieEvent;
 
 public class ZombieBackupSpawnEventHandler {
diff --git a/src/Java/gtPlusPlus/core/item/base/BaseEuItem.java b/src/Java/gtPlusPlus/core/item/base/BaseEuItem.java
index 8f8d0eed72..a32ff20353 100644
--- a/src/Java/gtPlusPlus/core/item/base/BaseEuItem.java
+++ b/src/Java/gtPlusPlus/core/item/base/BaseEuItem.java
@@ -16,9 +16,9 @@ import gregtech.api.interfaces.IItemBehaviour;
 import gregtech.api.interfaces.IItemContainer;
 import gregtech.api.objects.ItemData;
 import gregtech.api.util.*;
+import gtPlusPlus.api.objects.data.Pair;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.array.Pair;
 import ic2.api.item.*;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemBurnable.java b/src/Java/gtPlusPlus/core/item/base/BaseItemBurnable.java
index 42aadfa91d..76d66069f5 100644
--- a/src/Java/gtPlusPlus/core/item/base/BaseItemBurnable.java
+++ b/src/Java/gtPlusPlus/core/item/base/BaseItemBurnable.java
@@ -1,7 +1,7 @@
 package gtPlusPlus.core.item.base;
 
+import gtPlusPlus.api.objects.data.Pair;
 import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.array.Pair;
 import gtPlusPlus.core.util.item.ItemUtils;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.ItemStack;
diff --git a/src/Java/gtPlusPlus/core/item/general/ItemAreaClear.java b/src/Java/gtPlusPlus/core/item/general/ItemAreaClear.java
index fc92d5d82c..a3f7b78888 100644
--- a/src/Java/gtPlusPlus/core/item/general/ItemAreaClear.java
+++ b/src/Java/gtPlusPlus/core/item/general/ItemAreaClear.java
@@ -3,11 +3,11 @@ package gtPlusPlus.core.item.general;
 import java.util.List;
 
 import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.minecraft.BlockPos;
 import gtPlusPlus.core.block.base.BlockBaseOre;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.item.base.CoreItem;
 import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.array.BlockPos;
 import gtPlusPlus.core.util.entity.EntityUtils;
 import gtPlusPlus.core.util.math.MathUtils;
 import net.minecraft.client.renderer.texture.IIconRegister;
diff --git a/src/Java/gtPlusPlus/core/item/general/capture/ItemEntityCatcher.java b/src/Java/gtPlusPlus/core/item/general/capture/ItemEntityCatcher.java
index 1b8ab947e5..64f1c4e139 100644
--- a/src/Java/gtPlusPlus/core/item/general/capture/ItemEntityCatcher.java
+++ b/src/Java/gtPlusPlus/core/item/general/capture/ItemEntityCatcher.java
@@ -6,10 +6,10 @@ import java.util.UUID;
 import cpw.mods.fml.common.registry.GameRegistry;
 import gtPlusPlus.api.interfaces.IEntityCatcher;
 import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.minecraft.BlockPos;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.array.BlockPos;
 import gtPlusPlus.core.util.nbt.NBTUtils;
 import gtPlusPlus.core.util.player.PlayerUtils;
 import net.minecraft.entity.*;
diff --git a/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java b/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java
index 45e0bd8fe6..66b4d87511 100644
--- a/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java
+++ b/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java
@@ -6,10 +6,10 @@ import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.data.Pair;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.array.Pair;
 import gtPlusPlus.core.util.item.ItemUtils;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.recipe.RecipeUtils;
diff --git a/src/Java/gtPlusPlus/core/lib/CORE.java b/src/Java/gtPlusPlus/core/lib/CORE.java
index 4cff84d646..ce2f4f4432 100644
--- a/src/Java/gtPlusPlus/core/lib/CORE.java
+++ b/src/Java/gtPlusPlus/core/lib/CORE.java
@@ -6,10 +6,10 @@ import java.util.concurrent.ConcurrentHashMap;
 import com.mojang.authlib.GameProfile;
 
 import gregtech.api.GregTech_API;
-import gtPlusPlus.api.objects.CSPRNG_DO_NOT_USE;
-import gtPlusPlus.api.objects.XSTR;
+import gtPlusPlus.api.objects.data.Pair;
+import gtPlusPlus.api.objects.random.CSPRNG_DO_NOT_USE;
+import gtPlusPlus.api.objects.random.XSTR;
 import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.array.Pair;
 import gtPlusPlus.core.util.geo.GeoUtils;
 import gtPlusPlus.core.util.gregtech.recipehandlers.GregtechRecipe;
 import gtPlusPlus.core.util.networking.NetworkUtils;
diff --git a/src/Java/gtPlusPlus/core/material/Material.java b/src/Java/gtPlusPlus/core/material/Material.java
index eca3c595ec..22c65c5a2b 100644
--- a/src/Java/gtPlusPlus/core/material/Material.java
+++ b/src/Java/gtPlusPlus/core/material/Material.java
@@ -7,13 +7,13 @@ import java.util.Map.Entry;
 
 import gregtech.api.enums.*;
 import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.api.objects.data.Pair;
 import gtPlusPlus.core.item.base.cell.BaseItemCell;
 import gtPlusPlus.core.material.state.MaterialState;
 import gtPlusPlus.core.util.StringUtils;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.array.ArrayUtils;
-import gtPlusPlus.core.util.array.AutoMap;
-import gtPlusPlus.core.util.array.Pair;
 import gtPlusPlus.core.util.fluid.FluidUtils;
 import gtPlusPlus.core.util.item.ItemUtils;
 import gtPlusPlus.core.util.materials.MaterialUtils;
diff --git a/src/Java/gtPlusPlus/core/slots/SlotModularBaubleUpgrades.java b/src/Java/gtPlusPlus/core/slots/SlotModularBaubleUpgrades.java
index 85de0df60e..b6930dfe27 100644
--- a/src/Java/gtPlusPlus/core/slots/SlotModularBaubleUpgrades.java
+++ b/src/Java/gtPlusPlus/core/slots/SlotModularBaubleUpgrades.java
@@ -7,7 +7,7 @@ import java.util.Iterator;
 import java.util.Map.Entry;
 
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.util.array.Pair;
+import gtPlusPlus.api.objects.data.Pair;
 import gtPlusPlus.core.util.nbt.ModularArmourUtils.BT;
 import gtPlusPlus.core.util.nbt.ModularArmourUtils.Modifiers;
 import net.minecraft.inventory.IInventory;
diff --git a/src/Java/gtPlusPlus/core/tileentities/base/TilePoweredGT.java b/src/Java/gtPlusPlus/core/tileentities/base/TilePoweredGT.java
index 72153964e9..8b789f922f 100644
--- a/src/Java/gtPlusPlus/core/tileentities/base/TilePoweredGT.java
+++ b/src/Java/gtPlusPlus/core/tileentities/base/TilePoweredGT.java
@@ -10,9 +10,9 @@ import gregtech.api.net.GT_Packet_TileEntity;
 import gregtech.api.net.IGT_NetworkHandler;
 import gregtech.api.util.GT_Utility;
 import gtPlusPlus.api.interfaces.IGregtechPower;
+import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.array.AutoMap;
 import ic2.api.info.Info;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockFire;
diff --git a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityModularityTable.java b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityModularityTable.java
index 252b92984e..abff5fd755 100644
--- a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityModularityTable.java
+++ b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityModularityTable.java
@@ -5,12 +5,12 @@ import java.util.Map.Entry;
 
 import gregtech.api.enums.ItemList;
 import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.data.Pair;
 import gtPlusPlus.core.container.Container_ModularityTable;
 import gtPlusPlus.core.inventories.modulartable.InventoryModularMain;
 import gtPlusPlus.core.inventories.modulartable.InventoryModularOutput;
 import gtPlusPlus.core.item.bauble.ModularBauble;
 import gtPlusPlus.core.tileentities.base.TileEntityBase;
-import gtPlusPlus.core.util.array.Pair;
 import gtPlusPlus.core.util.item.ItemUtils;
 import gtPlusPlus.core.util.nbt.ModularArmourUtils;
 import gtPlusPlus.core.util.nbt.ModularArmourUtils.BT;
diff --git a/src/Java/gtPlusPlus/core/util/Utils.java b/src/Java/gtPlusPlus/core/util/Utils.java
index 0909e4bf2d..e15f8ba202 100644
--- a/src/Java/gtPlusPlus/core/util/Utils.java
+++ b/src/Java/gtPlusPlus/core/util/Utils.java
@@ -34,10 +34,10 @@ import gregtech.api.util.GT_Log;
 import gregtech.api.util.GT_Utility;
 import gtPlusPlus.GTplusplus;
 import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.data.Pair;
 import gtPlusPlus.core.item.ModItems;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.material.Material;
-import gtPlusPlus.core.util.array.Pair;
 import gtPlusPlus.core.util.fluid.FluidUtils;
 import gtPlusPlus.core.util.item.ItemUtils;
 import gtPlusPlus.core.util.math.MathUtils;
diff --git a/src/Java/gtPlusPlus/core/util/array/BlockPos.java b/src/Java/gtPlusPlus/core/util/array/BlockPos.java
deleted file mode 100644
index fbf7676627..0000000000
--- a/src/Java/gtPlusPlus/core/util/array/BlockPos.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package gtPlusPlus.core.util.array;
-
-import java.io.Serializable;
-
-public class BlockPos implements Serializable{
-
-	private static final long serialVersionUID = -7271947491316682006L;
-	public final int xPos;
-	public final int yPos;
-	public final int zPos;
-	public final int dim;
-	
-	public BlockPos(int x, int y, int z){
-		this(x, y, z, 0);
-	}
-	
-	public BlockPos(int x, int y, int z, int dim){
-		this.xPos = x;
-		this.yPos = y;
-		this.zPos = z;
-		this.dim = dim;
-	}
-	
-	public String getLocationString() {
-		return "[X: "+this.xPos+"][Y: "+this.yPos+"][Z: "+this.zPos+"]";
-	}
-	
-}
diff --git a/src/Java/gtPlusPlus/core/util/entity/EntityUtils.java b/src/Java/gtPlusPlus/core/util/entity/EntityUtils.java
index 79c643a95d..27412d647f 100644
--- a/src/Java/gtPlusPlus/core/util/entity/EntityUtils.java
+++ b/src/Java/gtPlusPlus/core/util/entity/EntityUtils.java
@@ -5,7 +5,7 @@ import java.lang.reflect.Method;
 
 import cpw.mods.fml.common.registry.EntityRegistry;
 import gregtech.api.util.GT_Utility;
-import gtPlusPlus.core.util.array.BlockPos;
+import gtPlusPlus.api.objects.minecraft.BlockPos;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import ic2.core.IC2Potion;
 import ic2.core.item.armor.ItemArmorHazmat;
diff --git a/src/Java/gtPlusPlus/core/util/item/ItemUtils.java b/src/Java/gtPlusPlus/core/util/item/ItemUtils.java
index 367539b49d..d5caad9dee 100644
--- a/src/Java/gtPlusPlus/core/util/item/ItemUtils.java
+++ b/src/Java/gtPlusPlus/core/util/item/ItemUtils.java
@@ -10,6 +10,7 @@ import gregtech.api.enums.OrePrefixes;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_OreDictUnificator;
 import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.data.Pair;
 import gtPlusPlus.core.item.ModItems;
 import gtPlusPlus.core.item.base.BasicSpawnEgg;
 import gtPlusPlus.core.item.base.dusts.BaseItemDust;
@@ -23,7 +24,6 @@ import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.array.Pair;
 import gtPlusPlus.core.util.materials.MaterialUtils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import gtPlusPlus.core.util.wrapper.var;
diff --git a/src/Java/gtPlusPlus/core/util/math/MathUtils.java b/src/Java/gtPlusPlus/core/util/math/MathUtils.java
index 313d1059ca..6d61335fe8 100644
--- a/src/Java/gtPlusPlus/core/util/math/MathUtils.java
+++ b/src/Java/gtPlusPlus/core/util/math/MathUtils.java
@@ -4,8 +4,8 @@ import java.util.Map;
 import java.util.Random;
 
 import gregtech.api.enums.GT_Values;
-import gtPlusPlus.api.objects.CSPRNG_DO_NOT_USE;
 import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.random.CSPRNG_DO_NOT_USE;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
 
diff --git a/src/Java/gtPlusPlus/core/util/nbt/ModularArmourUtils.java b/src/Java/gtPlusPlus/core/util/nbt/ModularArmourUtils.java
index 2e8e29c372..c9ac557fee 100644
--- a/src/Java/gtPlusPlus/core/util/nbt/ModularArmourUtils.java
+++ b/src/Java/gtPlusPlus/core/util/nbt/ModularArmourUtils.java
@@ -3,7 +3,7 @@ package gtPlusPlus.core.util.nbt;
 import baubles.api.BaubleType;
 import gregtech.api.util.GT_Utility;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.util.array.Pair;
+import gtPlusPlus.api.objects.data.Pair;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 
diff --git a/src/Java/gtPlusPlus/core/util/uuid/UUIDGenerator.java b/src/Java/gtPlusPlus/core/util/uuid/UUIDGenerator.java
index 0fd2d8c6a5..bf0ac3d1f5 100644
--- a/src/Java/gtPlusPlus/core/util/uuid/UUIDGenerator.java
+++ b/src/Java/gtPlusPlus/core/util/uuid/UUIDGenerator.java
@@ -5,7 +5,7 @@ import java.net.InetAddress;
 import java.util.Random;
 import java.util.UUID;
 
-import gtPlusPlus.api.objects.CSPRNG_DO_NOT_USE;
+import gtPlusPlus.api.objects.random.CSPRNG_DO_NOT_USE;
 
 /**
  * 
diff --git a/src/Java/gtPlusPlus/api/damage/BaseCustomDamageSource.java b/src/Java/gtPlusPlus/core/world/damage/BaseCustomDamageSource.java
index 24348988d6..3778beacfb 100644
--- a/src/Java/gtPlusPlus/api/damage/BaseCustomDamageSource.java
+++ b/src/Java/gtPlusPlus/core/world/damage/BaseCustomDamageSource.java
@@ -1,4 +1,4 @@
-package gtPlusPlus.api.damage;
+package gtPlusPlus.core.world.damage;
 
 import net.minecraft.entity.Entity;
 import net.minecraft.util.EntityDamageSourceIndirect;
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_GT_Base.java b/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_GT_Base.java
index 6be899e5de..301a2154c2 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_GT_Base.java
+++ b/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_GT_Base.java
@@ -6,7 +6,7 @@ import cpw.mods.fml.common.IWorldGenerator;
 import cpw.mods.fml.common.registry.GameRegistry;
 import gregtech.api.util.GT_Log;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.XSTR;
+import gtPlusPlus.api.objects.random.XSTR;
 import gtPlusPlus.core.material.ELEMENT;
 import gtPlusPlus.core.world.darkworld.Dimension_DarkWorld;
 import gtPlusPlus.xmod.gregtech.HANDLER_GT;
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_Ores.java b/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_Ores.java
index 4b099ee4cf..8b28e2d4e8 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_Ores.java
+++ b/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_Ores.java
@@ -4,12 +4,12 @@ import java.util.Hashtable;
 
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
-import gtPlusPlus.api.objects.MaterialHelper;
+import gtPlusPlus.api.helpers.MaterialHelper;
+import gtPlusPlus.api.objects.data.Pair;
 import gtPlusPlus.core.material.ELEMENT;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.material.ORES;
 import gtPlusPlus.core.material.nuclear.FLUORIDES;
-import gtPlusPlus.core.util.array.Pair;
 import gtPlusPlus.core.util.materials.MaterialUtils;
 import gtPlusPlus.core.world.darkworld.object.BoxedQuad;
 import net.minecraft.block.Block;
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/object/BoxedQuad.java b/src/Java/gtPlusPlus/core/world/darkworld/object/BoxedQuad.java
index d3c400896b..fd3d734e08 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/object/BoxedQuad.java
+++ b/src/Java/gtPlusPlus/core/world/darkworld/object/BoxedQuad.java
@@ -1,6 +1,6 @@
 package gtPlusPlus.core.world.darkworld.object;
 
-import gtPlusPlus.core.util.array.Pair;
+import gtPlusPlus.api.objects.data.Pair;
 import net.minecraft.block.Block;
 
 public class BoxedQuad<K,V,C,R> {
diff --git a/src/Java/gtPlusPlus/core/world/explosions/MiningExplosion.java b/src/Java/gtPlusPlus/core/world/explosions/MiningExplosion.java
index 50fa08f55f..bcbb16a3b6 100644
--- a/src/Java/gtPlusPlus/core/world/explosions/MiningExplosion.java
+++ b/src/Java/gtPlusPlus/core/world/explosions/MiningExplosion.java
@@ -2,7 +2,7 @@ package gtPlusPlus.core.world.explosions;
 
 import java.util.*;
 
-import gtPlusPlus.api.objects.XSTR;
+import gtPlusPlus.api.objects.random.XSTR;
 import gtPlusPlus.core.entity.EntityPrimedMiningExplosive;
 import gtPlusPlus.core.util.math.MathUtils;
 import net.minecraft.block.Block;
diff --git a/src/Java/gtPlusPlus/plugin/manager/Core_Manager.java b/src/Java/gtPlusPlus/plugin/manager/Core_Manager.java
index 2fc6102779..2fd6096d32 100644
--- a/src/Java/gtPlusPlus/plugin/manager/Core_Manager.java
+++ b/src/Java/gtPlusPlus/plugin/manager/Core_Manager.java
@@ -2,7 +2,7 @@ package gtPlusPlus.plugin.manager;
 
 import gtPlusPlus.api.interfaces.IPlugin;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.util.array.AutoMap;
+import gtPlusPlus.api.objects.data.AutoMap;
 
 public class Core_Manager {
 
diff --git a/src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_ClassTransformer2.java b/src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_ClassTransformer2.java
index c6edd94238..4a8a0a1e3c 100644
--- a/src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_ClassTransformer2.java
+++ b/src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_ClassTransformer2.java
@@ -19,8 +19,8 @@ import gregtech.api.metatileentity.BaseMetaTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.common.blocks.GT_Block_Machines;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.XSTR;
-import gtPlusPlus.core.util.array.BlockPos;
+import gtPlusPlus.api.objects.minecraft.BlockPos;
+import gtPlusPlus.api.objects.random.XSTR;
 import gtPlusPlus.core.util.item.ItemUtils;
 import gtPlusPlus.core.util.nbt.NBTUtils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_DeluxeMachine.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_DeluxeMachine.java
index df886220c2..14586a91f8 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_DeluxeMachine.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_DeluxeMachine.java
@@ -15,7 +15,7 @@ import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
 import gregtech.api.util.GT_Utility;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.XSTR;
+import gtPlusPlus.api.objects.random.XSTR;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/ChargingHelper.java b/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/ChargingHelper.java
index 210603ec0d..7aaabe6ef1 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/ChargingHelper.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/ChargingHelper.java
@@ -8,9 +8,9 @@ import gregtech.api.enums.GT_Values;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.common.items.*;
 import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.data.Pair;
+import gtPlusPlus.api.objects.minecraft.BlockPos;
 import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.array.BlockPos;
-import gtPlusPlus.core.util.array.Pair;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.nbt.NBTUtils;
 import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaWirelessCharger;
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java b/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java
index 8070c16f4d..7b1da9738b 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java
@@ -3,6 +3,7 @@ package gtPlusPlus.xmod.gregtech.common.helpers;
 import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableTreeFarmerParticles;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -29,13 +30,13 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.items.GT_MetaGenerated_Tool;
 import gregtech.common.items.GT_MetaGenerated_Item_02;
 import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.api.objects.minecraft.BlockPos;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.players.FakeFarmer;
 import gtPlusPlus.core.slots.SlotBuzzSaw.SAWTOOL;
 import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.array.AutoMap;
-import gtPlusPlus.core.util.array.BlockPos;
 import gtPlusPlus.core.util.fluid.FluidUtils;
 import gtPlusPlus.core.util.item.ItemUtils;
 import gtPlusPlus.core.util.math.MathUtils;
@@ -372,7 +373,7 @@ public class TreeFarmHelper {
 		if (log.getLocalizedName().toLowerCase().contains("leaves")){
 			return true;
 		}
-		return  OrePrefixes.leaves.contains(new ItemStack(log, 1)) || (log.getMaterial() == Material.leaves);
+		return  OrePrefixes.leaves.contains(new ItemStack(log, 1)) || log.getMaterial() == Material.leaves || OrePrefixes.treeLeaves.contains(new ItemStack(log, 1)) || log.getMaterial() == Material.vine || OrePrefixes.mushroom.contains(new ItemStack(log, 1)) || log.getMaterial() == Material.cactus;
 	}
 
 	public static boolean isSapling(final Block log){
@@ -397,17 +398,12 @@ public class TreeFarmHelper {
 	}
 
 	public static boolean isAirBlock(final Block air){
-
 		if (air.getLocalizedName().toLowerCase().contains("air")){
 			return true;
 		}
-
 		if (air.getClass().getName().toLowerCase().contains("residual") || air.getClass().getName().toLowerCase().contains("heat")){
 			return true;
 		}
-
-		//Utils.LOG_INFO("Found "+air.getLocalizedName());
-
 		return (air == Blocks.air ? true : (air instanceof BlockAir ? true : false));
 	}
 
@@ -423,9 +419,9 @@ public class TreeFarmHelper {
 				for (int h = 0; h <= 1; h++) {
 					//Farm Floor inner 14x14
 					if (((i != -7) && (i != 7)) && ((j != -7) && (j != 7))) {
-						if (h == 1) {														
-							if (!isFenceBlock(aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j)) && TreeFarmHelper.isWoodLog(aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j))) {
-								//Logger.INFO("Found a Log");
+						if (h == 1) {
+							if (TreeFarmHelper.isWoodLog(aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j))) {
+								Logger.INFO("Found a Log");
 								return new BlockPos(aBaseMetaTileEntity.getXCoord()+xDir + i, aBaseMetaTileEntity.getYCoord()+h, aBaseMetaTileEntity.getZCoord()+zDir + j);
 							}
 						}
@@ -436,142 +432,68 @@ public class TreeFarmHelper {
 		return null;
 	}
 
-
-
 	public static ItemStack[] findTreeFromBase(World world, BlockPos h) {
-
+		int HARD_LIMIT = 10000;
+		int mCount = 0;	
+		Logger.INFO("Finding Rest of Tree.");
 		BlockPos mFirstSpot = h;
-		Set<BlockPos> mFirstSearch = new HashSet<BlockPos>();
-		Set<BlockPos> mSecondSearch = new HashSet<BlockPos>();
-		Set<BlockPos> mThirdSearch = new HashSet<BlockPos>();
-		Set<BlockPos> mAllSearched = new HashSet<BlockPos>();
-
-		Set<BlockPos> mTempSearch = new HashSet<BlockPos>();
-
-		mAllSearched.add(mFirstSpot);
-
-		mFirstSearch = findTreeViaBranching(world, h);
-
-		if (mFirstSearch.size() > 0) {
-			Iterator<BlockPos> j = mFirstSearch.iterator();
-			while (j.hasNext()){
-				BlockPos M = j.next();
-				if (!mAllSearched.contains(M)) {
-					mAllSearched.add(M);
-					mTempSearch = findTreeViaBranching(world, M);					
-					if (mTempSearch.size() > 0) {
-						Iterator<BlockPos> D = mTempSearch.iterator();
-						while (D.hasNext()){
-							BlockPos F = D.next();
-							onBlockStartBreak(F.xPos, F.yPos, F.zPos, world);
-						}
-					}
-				}
-			}
-		}
-
-
-		/*if (mFirstSearch.size() > 0) {
-			Iterator<BlockPos> j = mFirstSearch.iterator();
-			while (j.hasNext()){
-				BlockPos M = j.next();
-				if (!mAllSearched.contains(M))
-					mAllSearched.add(M);
-				if (!mSecondSearch.contains(M))
-					mSecondSearch.add(M);
-			}
-		}*/
-		/*if (mSecondSearch.size() > 0) {
-			Iterator<BlockPos> j = mSecondSearch.iterator();
-			while (j.hasNext()){
-				BlockPos M = j.next();
-				if (!mAllSearched.contains(M))
-					mAllSearched.add(M);
-				if (!mThirdSearch.contains(M))
-					mThirdSearch.add(M);				
-			}
-		}*/
-
-		/*if (mSecondSearch.size() > 0) {
-			Iterator<BlockPos> j = mSecondSearch.iterator();
-			while (j.hasNext()){
-				BlockPos M = j.next();
-				if (!mAllSearched.contains(M)) {
-					mAllSearched.add(M);
-					mTempSearch = findTreeViaBranching(world, M);					
-					if (mTempSearch.size() > 0) {
-						Iterator<BlockPos> D = mTempSearch.iterator();
-						while (D.hasNext()){
-							BlockPos F = D.next();
-							if (!mAllSearched.contains(F))
-								mAllSearched.add(F);
-						}
-					}
-					if (!mThirdSearch.contains(M)) {
-						mThirdSearch.add(M);
-					}
-				}					
+		Set<BlockPos> mSearchedSpaces = new HashSet<BlockPos>();
+		Set<BlockPos> mTreeSet = getConnectedBlocks(world, mFirstSpot, mSearchedSpaces);
+		Set<Set<BlockPos>> mTreeSet2 = new HashSet<Set<BlockPos>>();
+		Set<BlockPos> mFinalTree = new HashSet<BlockPos>();
+		Iterator<BlockPos> it = mTreeSet.iterator();
+		
+
+		Logger.INFO("Running first iteration.");
+		while(it.hasNext()){
+			BlockPos G = it.next();
+			mSearchedSpaces.add(G);		
+			mTreeSet2.add(getConnectedBlocks(world, G, mSearchedSpaces));	
+			mCount++;	
+			Logger.INFO("First Search: "+G.getLocationString());
+			if (mCount > HARD_LIMIT) {
+				break;
 			}
 		}
 
-
-		if (mThirdSearch.size() > 0) {
-			Iterator<BlockPos> j = mThirdSearch.iterator();
-			while (j.hasNext()){
-				BlockPos M = j.next();
-				if (!mAllSearched.contains(M)) {
-					mAllSearched.add(M);
-					mTempSearch = findTreeViaBranching(world, M);					
-					if (mTempSearch.size() > 0) {
-						Iterator<BlockPos> D = mTempSearch.iterator();
-						while (D.hasNext()){
-							BlockPos F = D.next();
-							if (!mAllSearched.contains(F))
-								mAllSearched.add(F);
-						}
-					}
-				}					
-			}
-		}*/
-
-
-		/*Set<BlockPos> mBaseLayer = new HashSet<BlockPos>();
-		Set<Set<BlockPos>> mAllLayers = new HashSet<Set<BlockPos>>();
-		Set<BlockPos> mFinalSet = new HashSet<BlockPos>();
-
-		mBaseLayer = findTreeViaBranching(world, h);		
-		mAllLayers.add(mBaseLayer);		
-		Logger.INFO("Initial Search found "+mBaseLayer.size()+" blocks to search around.");
-		for (Iterator<BlockPos> flavoursIter = mBaseLayer.iterator(); flavoursIter.hasNext();){
-			Set<BlockPos> x = findTreeViaBranching(world, flavoursIter.next());
-			if (!mAllLayers.contains(x)) {
-				Logger.INFO("Branching.");
-				mAllLayers.add(x);		
-			}			
-		}*/
-
-
-		/*if (mAllLayers.size() > 0) {
-			for (Iterator<Set<BlockPos>> flavoursIter = mAllLayers.iterator(); flavoursIter.hasNext();){
-				for (Iterator<BlockPos> flavoursIter2 = flavoursIter.next().iterator(); flavoursIter2.hasNext();){
-					Set<BlockPos> x = findTreeViaBranching(world, flavoursIter2.next());
-					for (Iterator<BlockPos> flavoursIter3 = x.iterator(); flavoursIter3.hasNext();){
-						if (!mFinalSet.contains(flavoursIter3.next())) {
-							Logger.INFO("Branching II.");
-							mFinalSet.add(flavoursIter3.next());		
-						}
-					}					
+		mCount = 0;	
+		Iterator<Set<BlockPos>> it2 = mTreeSet2.iterator();
+		Iterator<BlockPos> it3;
+		Logger.INFO("Running second iteration.");
+		while(it2.hasNext()){
+			Set<BlockPos> G = it2.next();
+			it3 = G.iterator();
+			while(it3.hasNext()){
+				BlockPos G2 = it3.next();				
+				mSearchedSpaces.add(G2);
+				mFinalTree.add(G2);	
+				mCount++;
+				Logger.INFO("Second Search: "+G2.getLocationString());			
+				if (mCount > HARD_LIMIT) {
+					break;
 				}
+			}			
+			if (mCount > HARD_LIMIT) {
+				break;
 			}
-		}*/
-
-
-		if (mAllSearched.size() > 0) {
-			Logger.INFO("Queuing "+mAllSearched.size()+" to Harvest Manager.");
+		}
+		
+		
+		if (mFinalTree.size() > 0) {
+			Logger.INFO("Queuing "+mFinalTree.size()+" to Harvest Manager.");
 			TreeCutter harvestManager = new TreeCutter(world);
-			for (Iterator<BlockPos> flavoursIter = mAllSearched.iterator(); flavoursIter.hasNext();){
-				harvestManager.queue(flavoursIter.next());
-			}
+			
+			Iterator<BlockPos> ith = mFinalTree.iterator();
+			while(ith.hasNext()){
+				BlockPos G = ith.next();
+				harvestManager.queue(G);
+				mCount++;
+				Logger.INFO("Queued: "+G.getLocationString());				
+				if (mCount > HARD_LIMIT) {
+					break;
+				}
+			}		
+			
 			if (harvestManager.isValid) {
 				ItemStack[] loot = harvestManager.getDrops();
 				if (loot.length > 0) {
@@ -583,50 +505,162 @@ public class TreeFarmHelper {
 		return new ItemStack[] {};
 	}
 
-	public static Set<BlockPos> findTreeViaBranching(World world, BlockPos h) {	
-
-		Set<BlockPos> results = new HashSet<BlockPos>();
-
-		//Map<String, BlockPos> results = new ConcurrentHashMap<String, BlockPos>();
-		final Block block = world.getBlock(h.xPos, h.yPos, h.zPos);
-
-		Logger.INFO("--------------------------" + "Searching around "+h.getLocationString() + "--------------------------");
-		int xRel = h.xPos, yRel = h.yPos, zRel = h.zPos;		
-		//if (TreeFarmHelper.isWoodLog(block)) {			
-		for (int a=-4;a<5;a++) {
-			for (int b=-4;b<5;b++) {
-				for (int c=-4;c<5;c++) {						
-					//Check block
-					Logger.INFO("Looking at X: "+(xRel+a)+" | Y: "+(yRel+b)+" | Z: "+(zRel+c));
-					Block log = world.getBlock(xRel+a, yRel+b, zRel+c);					
-					BlockPos P = new BlockPos(xRel+a, yRel+b, zRel+c); 
-					if ((!isFenceBlock(log)) && (isWoodLog(log) || isLeaves(log))) {	
-						Logger.INFO("Was Logs/leaves. "+P.getLocationString());
-						if (!results.contains(P)) {	
-							Logger.INFO("Caching result.");
-							results.add(P);
-						}
-						else {
-							if (P != null && results.contains(P)) {
-								Logger.INFO("Results were already cached.");									
-							}
-						}
-					}
+
+	public static Set<BlockPos> getConnectedBlocks(World W, BlockPos P, Set<BlockPos> checkedSpaces) {
+		int HARD_LIMIT = 1000;
+		int mCount = 0;	
+		Logger.INFO("Finding blocks connected to "+P.getLocationString()+".");
+		Set<BlockPos> mCheckedSpaces = checkedSpaces;
+		Set<BlockPos> mStartSearch = searchSixFaces(W, P, mCheckedSpaces, false);
+		Set<BlockPos> mSecondSearch = new HashSet<BlockPos>();	
+		Set<BlockPos> mThirdSearch = new HashSet<BlockPos>();
+		Iterator<BlockPos> it = mStartSearch.iterator();
+		while(it.hasNext()){
+			Logger.INFO("Running first iteration. [II]");
+			BlockPos G = it.next();
+			mCheckedSpaces.add(G);
+			Set<BlockPos> mBranchSearch = searchSixFaces(W, G, mCheckedSpaces, true);
+			Iterator<BlockPos> it2 = mBranchSearch.iterator();
+			while(it2.hasNext()){
+				Logger.INFO("Running second iteration. [II]");
+				BlockPos G2 = it2.next();
+				mCheckedSpaces.add(G2);
+				mSecondSearch.add(G2);
+				mCount++;			
+				if (mCount > HARD_LIMIT) {
+					break;
 				}
+			}			
+			if (mCount > HARD_LIMIT) {
+				break;
 			}
 		}
+		mCount = 0;	
+		Iterator<BlockPos> itx = mSecondSearch.iterator();
+		while(itx.hasNext()){
+			BlockPos G = itx.next();
+			mCheckedSpaces.add(G);
+			Set<BlockPos> mBranchSearch = searchSixFaces(W, G, mCheckedSpaces, true);
+			Iterator<BlockPos> it2 = mBranchSearch.iterator();
+			while(it2.hasNext()){
+				BlockPos G2 = it2.next();
+				mCheckedSpaces.add(G2);
+				mThirdSearch.add(G2);
+				mCount++;			
+				if (mCount > HARD_LIMIT) {
+					break;
+				}
+			}			
+			if (mCount > HARD_LIMIT) {
+				break;
+			}			
+		}
+		return mThirdSearch;
+	}
 
-		Logger.INFO("----------------------------------------------------------");
-
-		//}
-		if (results.isEmpty()) {
-			Logger.INFO("Returning Empty Branch Iteration.");	
-			return new HashSet<BlockPos>();
+	public static Set<BlockPos> searchSixFaces(World W, BlockPos P, Set<BlockPos> checkedSpaces, boolean checkLeaves) {
+		Set<BlockPos> mConnected = new HashSet<BlockPos>();	
+		int x = P.xPos;
+		int y = P.yPos;
+		int z = P.zPos;
+		if (checkLeaves) {
+			if (isWoodLog(W.getBlock(x-1, y, z)) || isLeaves(W.getBlock(x-1, y, z))) {
+				BlockPos L = new BlockPos(x-1, y, z);
+				if (!checkedSpaces.contains(L)) {
+					mConnected.add(L);
+					Logger.INFO("Found Connected. [III]");
+				}
+			}
+			if (isWoodLog(W.getBlock(x+1, y, z)) || isLeaves(W.getBlock(x+1, y, z))) {
+				BlockPos L = new BlockPos(x+1, y, z);
+				if (!checkedSpaces.contains(L)) {
+					mConnected.add(L);
+					Logger.INFO("Found Connected. [III]");
+				}
+			}
+			if (isWoodLog(W.getBlock(x, y-1, z)) || isLeaves(W.getBlock(x, y-1, z))) {
+				BlockPos L = new BlockPos(x, y-1, z);
+				if (!checkedSpaces.contains(L)) {
+					mConnected.add(L);
+					Logger.INFO("Found Connected. [III]");
+				}
+			}
+			if (isWoodLog(W.getBlock(x, y+1, z)) || isLeaves(W.getBlock(x, y+1, z))) {
+				BlockPos L = new BlockPos(x, y+1, z);
+				if (!checkedSpaces.contains(L)) {
+					mConnected.add(L);
+					Logger.INFO("Found Connected. [III]");
+				}
+			}
+			if (isWoodLog(W.getBlock(x, y, z-1)) || isLeaves(W.getBlock(x, y, z-1))) {
+				BlockPos L = new BlockPos(x, y, z-1);
+				if (!checkedSpaces.contains(L)) {
+					mConnected.add(L);
+					Logger.INFO("Found Connected. [III]");
+				}
+			}
+			if (isWoodLog(W.getBlock(x, y, z+1)) || isLeaves(W.getBlock(x, y, z+1))) {
+				BlockPos L = new BlockPos(x, y, z+1);
+				if (!checkedSpaces.contains(L)) {
+					mConnected.add(L);
+					Logger.INFO("Found Connected. [III]");
+				}
+			}
 		}
 		else {
-			Logger.INFO("Returning Valid Branch Iteration. "+results.size());
-			return results;
-		}
+			if (isWoodLog(W.getBlock(x-1, y, z))) {
+				BlockPos L = new BlockPos(x-1, y, z);
+				//if (!checkedSpaces.contains(L)) {
+					mConnected.add(L);
+					Logger.INFO("Found Connected. [III]");
+				//}
+			}
+			if (isWoodLog(W.getBlock(x+1, y, z))) {
+				BlockPos L = new BlockPos(x+1, y, z);
+				//if (!checkedSpaces.contains(L)) {
+					mConnected.add(L);
+					Logger.INFO("Found Connected. [III]");
+				//}
+			}
+			if (isWoodLog(W.getBlock(x, y-1, z))) {
+				BlockPos L = new BlockPos(x, y-1, z);
+				//if (!checkedSpaces.contains(L)) {
+					mConnected.add(L);
+					Logger.INFO("Found Connected. [III]");
+				//}
+			}
+			if (isWoodLog(W.getBlock(x, y+1, z))) {
+				BlockPos L = new BlockPos(x, y+1, z);
+				//if (!checkedSpaces.contains(L)) {
+					mConnected.add(L);
+					Logger.INFO("Found Connected. [III]");
+				//}
+			}
+			if (isWoodLog(W.getBlock(x, y, z-1))) {
+				BlockPos L = new BlockPos(x, y, z-1);
+				//if (!checkedSpaces.contains(L)) {
+					mConnected.add(L);
+					Logger.INFO("Found Connected. [III]");
+				//}
+			}
+			if (isWoodLog(W.getBlock(x, y, z+1))) {
+				BlockPos L = new BlockPos(x, y, z+1);
+				//if (!checkedSpaces.contains(L)) {
+					mConnected.add(L);
+					Logger.INFO("Found Connected. [III]");
+				//}
+			}
+		}		
+		return mConnected;
+	}
+
+	public static <T> Set<T> combineSetData(Set<T> S, Set<T> J) {
+		Set<T> mData = new HashSet<T>();
+		T[] array1 = (T[]) S.toArray();		
+		Collections.addAll(mData, array1);
+		T[] array2 = (T[]) J.toArray();		
+		Collections.addAll(mData, array2);		
+		return mData;
 	}
 
 
@@ -734,22 +768,22 @@ public class TreeFarmHelper {
 		}
 		return farmerAI;		
 	}
-	
+
 	public static boolean onBlockStartBreak (int x, int y, int z, World world){       
-        final Block wood = world.getBlock(x, y, z);
-        if (wood == null){
-        	return false;
-        }
-        if (wood.isWood(world, x, y, z) || wood.getMaterial() == Material.sponge)
-            if(detectTree(world, x,y,z)) {
-                TreeChopTask chopper = new TreeChopTask(new ChunkPosition(x, y, z), checkFakePlayer(world), 128);
-                FMLCommonHandler.instance().bus().register(chopper);
-                // custom block breaking code, don't call vanilla code
-                return true;
-            }
-        //return onBlockStartBreak(stack, x, y, z, player);
-        return false;
-    }
+		final Block wood = world.getBlock(x, y, z);
+		if (wood == null){
+			return false;
+		}
+		if (wood.isWood(world, x, y, z) || wood.getMaterial() == Material.sponge)
+			if(detectTree(world, x,y,z)) {
+				TreeChopTask chopper = new TreeChopTask(new ChunkPosition(x, y, z), checkFakePlayer(world), 128);
+				FMLCommonHandler.instance().bus().register(chopper);
+				// custom block breaking code, don't call vanilla code
+				return true;
+			}
+		//return onBlockStartBreak(stack, x, y, z, player);
+		return false;
+	}
 
 	public static boolean detectTree(World world, int pX, int pY, int pZ) {
 		ChunkPosition pos = null;
@@ -803,14 +837,14 @@ public class TreeFarmHelper {
 		return false;
 	}
 
-    public static class TreeChopTask {
+	public static class TreeChopTask {
 
-        public final World world;
-        public final EntityPlayer player;
-        public final int blocksPerTick;
+		public final World world;
+		public final EntityPlayer player;
+		public final int blocksPerTick;
 
-        public Queue<ChunkPosition> blocks = Lists.newLinkedList();
-        public Set<ChunkPosition> visited = new THashSet<>();
+		public Queue<ChunkPosition> blocks = Lists.newLinkedList();
+		public Set<ChunkPosition> visited = new THashSet<>();
 
 		public TreeChopTask(ChunkPosition start, EntityPlayer player, int blocksPerTick) {
 			this.world = player.getEntityWorld();
@@ -888,103 +922,101 @@ public class TreeFarmHelper {
 			// goodbye cruel world
 			FMLCommonHandler.instance().bus().unregister(this);
 		}
-}
+	}
+
+
+	public static void breakExtraBlock(World world, int x, int y, int z, int sidehit, EntityPlayer playerEntity, int refX, int refY, int refZ) {
+		// prevent calling that stuff for air blocks, could lead to unexpected behaviour since it fires events
+		if (world.isAirBlock(x, y, z))
+			return;
+
+		// what?
+		if(!(playerEntity instanceof EntityPlayerMP))
+			return;
+		EntityPlayerMP player = (EntityPlayerMP) playerEntity;
+
+		// check if the block can be broken, since extra block breaks shouldn't instantly break stuff like obsidian
+		// or precious ores you can't harvest while mining stone
+		Block block = world.getBlock(x, y, z);
+		int meta = world.getBlockMetadata(x, y, z);
 
+		// only effective materials
+		if (!isWoodLog(block))
+			return;
 
-    public static void breakExtraBlock(World world, int x, int y, int z, int sidehit, EntityPlayer playerEntity, int refX, int refY, int refZ) {
-        // prevent calling that stuff for air blocks, could lead to unexpected behaviour since it fires events
-        if (world.isAirBlock(x, y, z))
-            return;
-
-        // what?
-        if(!(playerEntity instanceof EntityPlayerMP))
-            return;
-        EntityPlayerMP player = (EntityPlayerMP) playerEntity;
-
-        // check if the block can be broken, since extra block breaks shouldn't instantly break stuff like obsidian
-        // or precious ores you can't harvest while mining stone
-        Block block = world.getBlock(x, y, z);
-        int meta = world.getBlockMetadata(x, y, z);
-
-        // only effective materials
-        if (!isWoodLog(block))
-            return;
-
-        Block refBlock = world.getBlock(refX, refY, refZ);
-        float refStrength = ForgeHooks.blockStrength(refBlock, player, world, refX, refY, refZ);
-        float strength = ForgeHooks.blockStrength(block, player, world, x,y,z);
-
-        // only harvestable blocks that aren't impossibly slow to harvest
-        if (!ForgeHooks.canHarvestBlock(block, player, meta) || refStrength/strength > 10f)
-            return;
-
-        // send the blockbreak event
-        BlockEvent.BreakEvent event = ForgeHooks.onBlockBreakEvent(world, player.theItemInWorldManager.getGameType(), player, x,y,z);
-        if(event.isCanceled())
-            return;
-
-        if (player.capabilities.isCreativeMode) {
-            block.onBlockHarvested(world, x, y, z, meta, player);
-            if (block.removedByPlayer(world, player, x, y, z, false))
-                block.onBlockDestroyedByPlayer(world, x, y, z, meta);
-
-            // send update to client
-            if (!world.isRemote) {
-                player.playerNetServerHandler.sendPacket(new S23PacketBlockChange(x, y, z, world));
-            }
-            return;
-        }
-
-        // callback to the tool the player uses. Called on both sides. This damages the tool n stuff.
-        player.getCurrentEquippedItem().func_150999_a(world, block, x, y, z, player);
-
-        // server sided handling
-        if (!world.isRemote) {
-            // serverside we reproduce ItemInWorldManager.tryHarvestBlock
-
-            // ItemInWorldManager.removeBlock
-            block.onBlockHarvested(world, x,y,z, meta, player);
-
-            if(block.removedByPlayer(world, player, x,y,z, true)) // boolean is if block can be harvested, checked above
-            {
-                block.onBlockDestroyedByPlayer( world, x,y,z, meta);
-                block.harvestBlock(world, player, x,y,z, meta);
-                block.dropXpOnBlockBreak(world, x,y,z, event.getExpToDrop());
-            }
-
-            // always send block update to client
-            player.playerNetServerHandler.sendPacket(new S23PacketBlockChange(x, y, z, world));
-        }
-        // client sided handling
-        else {
-            //PlayerControllerMP pcmp = Minecraft.getMinecraft().playerController;
-            // clientside we do a "this clock has been clicked on long enough to be broken" call. This should not send any new packets
-            // the code above, executed on the server, sends a block-updates that give us the correct state of the block we destroy.
-
-            // following code can be found in PlayerControllerMP.onPlayerDestroyBlock
-            world.playAuxSFX(2001, x, y, z, Block.getIdFromBlock(block) + (meta << 12));
-            if(block.removedByPlayer(world, player, x,y,z, true))
-            {
-                block.onBlockDestroyedByPlayer(world, x,y,z, meta);
-            }
-            // callback to the tool
-            ItemStack itemstack = player.getCurrentEquippedItem();
-            if (itemstack != null)
-            {
-                itemstack.func_150999_a(world, block, x, y, z, player);
-
-                if (itemstack.stackSize == 0)
-                {
-                    player.destroyCurrentEquippedItem();
-                }
-            }
-
-            // send an update to the server, so we get an update back
-            //if(PHConstruct.extraBlockUpdates)
-                //Minecraft.getMinecraft().getNetHandler().addToSendQueue(new C07PacketPlayerDigging(2, x,y,z, Minecraft.getMinecraft().objectMouseOver.sideHit));
-        }
-    }
+		Block refBlock = world.getBlock(refX, refY, refZ);
+		float refStrength = ForgeHooks.blockStrength(refBlock, player, world, refX, refY, refZ);
+		float strength = ForgeHooks.blockStrength(block, player, world, x,y,z);
+
+		// only harvestable blocks that aren't impossibly slow to harvest
+		if (!ForgeHooks.canHarvestBlock(block, player, meta) || refStrength/strength > 10f)
+			return;
+
+		// send the blockbreak event
+		BlockEvent.BreakEvent event = ForgeHooks.onBlockBreakEvent(world, player.theItemInWorldManager.getGameType(), player, x,y,z);
+		if(event.isCanceled())
+			return;
+
+		if (player.capabilities.isCreativeMode) {
+			block.onBlockHarvested(world, x, y, z, meta, player);
+			if (block.removedByPlayer(world, player, x, y, z, false))
+				block.onBlockDestroyedByPlayer(world, x, y, z, meta);
+
+			// send update to client
+			if (!world.isRemote) {
+				player.playerNetServerHandler.sendPacket(new S23PacketBlockChange(x, y, z, world));
+			}
+			return;
+		}
 
+		// callback to the tool the player uses. Called on both sides. This damages the tool n stuff.
+		player.getCurrentEquippedItem().func_150999_a(world, block, x, y, z, player);
 
+		// server sided handling
+		if (!world.isRemote) {
+			// serverside we reproduce ItemInWorldManager.tryHarvestBlock
+
+			// ItemInWorldManager.removeBlock
+			block.onBlockHarvested(world, x,y,z, meta, player);
+
+			if(block.removedByPlayer(world, player, x,y,z, true)) // boolean is if block can be harvested, checked above
+			{
+				block.onBlockDestroyedByPlayer( world, x,y,z, meta);
+				block.harvestBlock(world, player, x,y,z, meta);
+				block.dropXpOnBlockBreak(world, x,y,z, event.getExpToDrop());
+			}
+
+			// always send block update to client
+			player.playerNetServerHandler.sendPacket(new S23PacketBlockChange(x, y, z, world));
+		}
+		// client sided handling
+		else {
+			//PlayerControllerMP pcmp = Minecraft.getMinecraft().playerController;
+			// clientside we do a "this clock has been clicked on long enough to be broken" call. This should not send any new packets
+			// the code above, executed on the server, sends a block-updates that give us the correct state of the block we destroy.
+
+			// following code can be found in PlayerControllerMP.onPlayerDestroyBlock
+			world.playAuxSFX(2001, x, y, z, Block.getIdFromBlock(block) + (meta << 12));
+			if(block.removedByPlayer(world, player, x,y,z, true))
+			{
+				block.onBlockDestroyedByPlayer(world, x,y,z, meta);
+			}
+			// callback to the tool
+			ItemStack itemstack = player.getCurrentEquippedItem();
+			if (itemstack != null)
+			{
+				itemstack.func_150999_a(world, block, x, y, z, player);
+
+				if (itemstack.stackSize == 0)
+				{
+					player.destroyCurrentEquippedItem();
+				}
+			}
+
+			// send an update to the server, so we get an update back
+			//if(PHConstruct.extraBlockUpdates)
+			//Minecraft.getMinecraft().getNetHandler().addToSendQueue(new C07PacketPlayerDigging(2, x,y,z, Minecraft.getMinecraft().objectMouseOver.sideHit));
+		}
+	}
 
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityChunkLoader.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityChunkLoader.java
index 7bdc5ae2f2..297db1d7a0 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityChunkLoader.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityChunkLoader.java
@@ -1,7 +1,8 @@
 package gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic;
 
 import static gregtech.api.enums.GT_Values.V;
-import static gtPlusPlus.api.objects.ChunkManager.mChunkLoaderManagerMap;
+import static gtPlusPlus.api.objects.minecraft.ChunkManager.mChunkLoaderManagerMap;
+
 import java.io.File;
 import java.io.IOException;
 import java.util.Map;
@@ -17,11 +18,11 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachi
 import gregtech.api.objects.GT_RenderedTexture;
 import gtPlusPlus.GTplusplus;
 import gtPlusPlus.api.interfaces.IChunkLoader;
-import gtPlusPlus.api.objects.ChunkManager;
-import gtPlusPlus.api.objects.DimChunkPos;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.util.array.BlockPos;
-import gtPlusPlus.core.util.array.Triplet;
+import gtPlusPlus.api.objects.data.Triplet;
+import gtPlusPlus.api.objects.minecraft.BlockPos;
+import gtPlusPlus.api.objects.minecraft.ChunkManager;
+import gtPlusPlus.api.objects.minecraft.DimChunkPos;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java
index 7f70712ee9..e88840573d 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java
@@ -11,8 +11,8 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Utility;
+import gtPlusPlus.api.objects.minecraft.BlockPos;
 import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.array.BlockPos;
 import gtPlusPlus.core.util.entity.EntityUtils;
 import gtPlusPlus.core.util.player.PlayerUtils;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMetaTileEntity;
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMTE_TeslaTower.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMTE_TeslaTower.java
index b2b6b83d0b..4540c41bd5 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMTE_TeslaTower.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMTE_TeslaTower.java
@@ -19,10 +19,10 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energ
 import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Utility;
 import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.data.Pair;
 import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.entity.EntityTeslaTowerLightning;
 import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.array.Pair;
 import gtPlusPlus.core.util.materials.MaterialUtils;
 import gtPlusPlus.core.util.player.PlayerUtils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityTreeFarm.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityTreeFarm.java
index b6cf3893eb..f0123c2a08 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityTreeFarm.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityTreeFarm.java
@@ -11,11 +11,11 @@ import gregtech.api.objects.GT_ItemStack;
 import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.*;
 import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.minecraft.BlockPos;
 import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.players.FakeFarmer;
 import gtPlusPlus.core.slots.SlotBuzzSaw.SAWTOOL;
-import gtPlusPlus.core.util.array.BlockPos;
 import gtPlusPlus.xmod.gregtech.api.gui.CONTAINER_TreeFarmer;
 import gtPlusPlus.xmod.gregtech.api.gui.GUI_TreeFarmer;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialFishingPond.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialFishingPond.java
index 98dc3140bb..62279f0461 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialFishingPond.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialFishingPond.java
@@ -17,10 +17,10 @@ import gregtech.api.util.FishPondFakeRecipe;
 import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Utility;
 import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.recipe.common.CI;
-import gtPlusPlus.core.util.array.AutoMap;
 import gtPlusPlus.core.util.fluid.FluidUtils;
 import gtPlusPlus.core.util.item.ItemUtils;
 import gtPlusPlus.core.util.math.MathUtils;
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_MassFabricator.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_MassFabricator.java
index a64057f3cc..f5cf674578 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_MassFabricator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_MassFabricator.java
@@ -24,15 +24,15 @@ import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
 import gregtech.api.util.GT_Utility;
 import gregtech.api.util.Recipe_GT;
-import gtPlusPlus.api.objects.GenericStack;
 import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.api.objects.data.Pair;
+import gtPlusPlus.api.objects.data.Triplet;
+import gtPlusPlus.api.objects.minecraft.GenericStack;
 import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.array.AutoMap;
-import gtPlusPlus.core.util.array.Pair;
-import gtPlusPlus.core.util.array.Triplet;
 import gtPlusPlus.core.util.fluid.FluidUtils;
 import gtPlusPlus.core.util.item.ItemUtils;
 import gtPlusPlus.core.util.math.MathUtils;
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_MultiTank.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_MultiTank.java
index 7176db5d97..db6b1d9e6a 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_MultiTank.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_MultiTank.java
@@ -14,9 +14,9 @@ import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Utility;
 import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.data.Pair;
 import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.array.Pair;
 import gtPlusPlus.core.util.fluid.FluidUtils;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/GT_Material_Loader.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/GT_Material_Loader.java
index c57ad71fc7..b36ba2f69e 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/GT_Material_Loader.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/GT_Material_Loader.java
@@ -7,9 +7,9 @@ import java.util.Map;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.array.AutoMap;
 import gtPlusPlus.core.util.materials.MaterialUtils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
 
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MaterialProcessing.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MaterialProcessing.java
index 32fa282b0c..590296eee9 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MaterialProcessing.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MaterialProcessing.java
@@ -4,12 +4,12 @@ import gregtech.api.GregTech_API;
 import gregtech.api.enums.GT_Values;
 import gregtech.api.util.GT_Recipe;
 import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.api.objects.data.Pair;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.material.MaterialStack;
 import gtPlusPlus.core.material.state.MaterialState;
-import gtPlusPlus.core.util.array.AutoMap;
-import gtPlusPlus.core.util.array.Pair;
 import gtPlusPlus.core.util.item.ItemUtils;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java
index bdcb30f930..d7fb58366b 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java
@@ -5,14 +5,14 @@ import gregtech.api.enums.GT_Values;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_Recipe;
 import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.api.objects.data.Pair;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.material.ELEMENT;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.material.MaterialStack;
 import gtPlusPlus.core.material.state.MaterialState;
 import gtPlusPlus.core.recipe.common.CI;
-import gtPlusPlus.core.util.array.AutoMap;
-import gtPlusPlus.core.util.array.Pair;
 import gtPlusPlus.core.util.item.ItemUtils;
 import gtPlusPlus.core.util.recipe.RecipeUtils;
 import net.minecraft.item.ItemStack;
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java
index 72c09eed0a..00feb26ca5 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java
@@ -11,11 +11,11 @@ import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.util.*;
 import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.api.objects.data.Pair;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.material.state.MaterialState;
 import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.array.AutoMap;
-import gtPlusPlus.core.util.array.Pair;
 import gtPlusPlus.core.util.item.ItemUtils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import net.minecraft.item.ItemStack;