327 files changed, 1349 insertions, 1214 deletions

diff --git a/src/Java/gregtech/api/util/Recipe_GT.java b/src/Java/gregtech/api/util/Recipe_GT.java
index 986b7c7ac4..94eaa0f927 100644
--- a/src/Java/gregtech/api/util/Recipe_GT.java
+++ b/src/Java/gregtech/api/util/Recipe_GT.java
@@ -7,6 +7,8 @@ import gregtech.api.GregTech_API;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.interfaces.tileentity.IHasWorldObjectAndCoords;
 import gregtech.api.objects.GT_ItemStack;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.item.UtilsItems;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -14,8 +16,6 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 
-import miscutil.core.util.Utils;
-import miscutil.core.util.item.UtilsItems;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
diff --git a/src/Java/miscutil/MiscUtils.java b/src/Java/gtPlusPlus/GTplusplus.java
index 040b187af0..a67213251c 100644
--- a/src/Java/miscutil/MiscUtils.java
+++ b/src/Java/gtPlusPlus/GTplusplus.java
@@ -1,33 +1,33 @@
-package miscutil;
-
-import static miscutil.core.lib.CORE.DEBUG;
-import static miscutil.core.lib.CORE.configSwitches.disableEnderIOIntegration;
-import static miscutil.core.lib.CORE.configSwitches.disableIC2Recipes;
-import static miscutil.core.lib.CORE.configSwitches.disableStaballoyBlastFurnaceRecipe;
-import static miscutil.core.lib.CORE.configSwitches.enableAlternativeBatteryAlloy;
-import static miscutil.core.lib.CORE.configSwitches.enableAlternativeDivisionSigilRecipe;
-import static miscutil.core.lib.CORE.configSwitches.enableCustomAlvearyBlocks;
-import static miscutil.core.lib.CORE.configSwitches.enableSolarGenerators;
-import static miscutil.core.lib.CORE.configSwitches.enableThaumcraftShardUnification;
+package gtPlusPlus;
+
+import static gtPlusPlus.core.lib.CORE.DEBUG;
+import static gtPlusPlus.core.lib.CORE.configSwitches.disableEnderIOIntegration;
+import static gtPlusPlus.core.lib.CORE.configSwitches.disableIC2Recipes;
+import static gtPlusPlus.core.lib.CORE.configSwitches.disableStaballoyBlastFurnaceRecipe;
+import static gtPlusPlus.core.lib.CORE.configSwitches.enableAlternativeBatteryAlloy;
+import static gtPlusPlus.core.lib.CORE.configSwitches.enableAlternativeDivisionSigilRecipe;
+import static gtPlusPlus.core.lib.CORE.configSwitches.enableCustomAlvearyBlocks;
+import static gtPlusPlus.core.lib.CORE.configSwitches.enableSolarGenerators;
+import static gtPlusPlus.core.lib.CORE.configSwitches.enableThaumcraftShardUnification;
 import gregtech.api.util.GT_Config;
 import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
 import gregtech.api.util.Recipe_GT.Gregtech_Recipe_Map;
+import gtPlusPlus.core.commands.CommandMath;
+import gtPlusPlus.core.common.CommonProxy;
+import gtPlusPlus.core.handler.events.LoginEventHandler;
+import gtPlusPlus.core.item.general.RF2EU_Battery;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.math.MathUtils;
+import gtPlusPlus.xmod.gregtech.HANDLER_GT;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.io.File;
 import java.util.Collection;
 
-import miscutil.core.commands.CommandMath;
-import miscutil.core.common.CommonProxy;
-import miscutil.core.handler.events.LoginEventHandler;
-import miscutil.core.item.general.RF2EU_Battery;
-import miscutil.core.lib.CORE;
-import miscutil.core.util.Utils;
-import miscutil.core.util.item.UtilsItems;
-import miscutil.core.util.math.MathUtils;
-import miscutil.xmod.gregtech.HANDLER_GT;
 import net.minecraftforge.common.config.Configuration;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.Mod;
@@ -40,14 +40,14 @@ import cpw.mods.fml.common.event.FMLServerStartingEvent;
 import cpw.mods.fml.common.event.FMLServerStoppingEvent;
 
 @Mod(modid=CORE.MODID, name=CORE.name, version=CORE.VERSION, dependencies="required-after:Forge; after:IC2; after:ihl; after:psychedelicraft; after:gregtech; after:Forestry; after:MagicBees; after:CoFHCore; after:Growthcraft; after:Railcraft; after:CompactWindmills; after:ForbiddenMagic; after:MorePlanet; after:PneumaticCraft; after:ExtraUtilities; after:Thaumcraft; after:rftools; after:simplyjetpacks; after:BigReactors; after:EnderIO;")
-public class MiscUtils
+public class GTplusplus
 implements ActionListener
 { 
 
 	@Mod.Instance(CORE.MODID)
-	public static MiscUtils instance;
+	public static GTplusplus instance;
 
-	@SidedProxy(clientSide="miscutil.core.proxy.ClientProxy", serverSide="miscutil.core.proxy.ServerProxy")
+	@SidedProxy(clientSide="gtPlusPlus.core.proxy.ClientProxy", serverSide="gtPlusPlus.core.proxy.ServerProxy")
 	public static CommonProxy proxy;
 
 
@@ -94,10 +94,10 @@ implements ActionListener
 		String infusedDust2 = "dustInfused"+infusedDusts[b];
 		String infusedDust3 = "dustInfused"+infusedDusts[c];
 		String infusedDust4 = "dustInfused"+infusedDusts[d];
-		Utils.LOG_INFO("Found the aspect of "+infusedDust1+" to embody into energy crystals.");
-		Utils.LOG_INFO("Found the aspect of "+infusedDust2+" to embody into energy crystals.");
-		Utils.LOG_INFO("Found the aspect of "+infusedDust3+" to embody into energy crystals.");
-		Utils.LOG_INFO("Found the aspect of "+infusedDust4+" to embody into energy crystals.");
+		Utils.LOG_INFO("Found the aspect of "+infusedDusts[a]+" to embody into energy crystals.");
+		Utils.LOG_INFO("Found the aspect of "+infusedDusts[b]+" to embody into energy crystals.");
+		Utils.LOG_INFO("Found the aspect of "+infusedDusts[c]+" to embody into energy crystals.");
+		Utils.LOG_INFO("Found the aspect of "+infusedDusts[d]+" to embody into energy crystals.");
 		randomDust_A = infusedDust1;
 		randomDust_B = infusedDust2;
 		randomDust_C = infusedDust3;
@@ -124,7 +124,7 @@ implements ActionListener
 		handleConfigFile(event);
 		proxy.registerTileEntities();
 		proxy.registerRenderThings();
-		HANDLER_GT.mMaterialProperties = new GT_Config(new Configuration(new File(new File(event.getModConfigurationDirectory(), "MiscUtils"), "MaterialProperties.cfg")));
+		HANDLER_GT.mMaterialProperties = new GT_Config(new Configuration(new File(new File(event.getModConfigurationDirectory(), "GTplusplus"), "MaterialProperties.cfg")));
 		proxy.preInit(event);
 	}
 
@@ -143,10 +143,11 @@ implements ActionListener
 	public void postInit(FMLPostInitializationEvent event) {
 		proxy.postInit(event);	
 		
+		if (DEBUG){
 		dumpGtRecipeMap(Gregtech_Recipe_Map.sChemicalDehydratorRecipes);
 		dumpGtRecipeMap(Gregtech_Recipe_Map.sCokeOvenRecipes);
 		dumpGtRecipeMap(Gregtech_Recipe_Map.sMatterFab2Recipes);
-		
+		}
 	}
 
 	@EventHandler
diff --git a/src/Java/miscutil/core/block/ModBlocks.java b/src/Java/gtPlusPlus/core/block/ModBlocks.java
index cf36ecea0a..ceb8880299 100644
--- a/src/Java/miscutil/core/block/ModBlocks.java
+++ b/src/Java/gtPlusPlus/core/block/ModBlocks.java
@@ -1,10 +1,10 @@
-package miscutil.core.block;
+package gtPlusPlus.core.block;
 
-import miscutil.core.block.general.LightGlass;
-import miscutil.core.block.general.fluids.FluidRegistryHandler;
-import miscutil.core.lib.CORE;
-import miscutil.core.util.Utils;
-import miscutil.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks;
+import gtPlusPlus.core.block.general.LightGlass;
+import gtPlusPlus.core.block.general.fluids.FluidRegistryHandler;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraftforge.fluids.Fluid;
diff --git a/src/Java/miscutil/core/block/base/AdvancedBlock.java b/src/Java/gtPlusPlus/core/block/base/AdvancedBlock.java
index 78e8c3cbe0..b7ac24a71b 100644
--- a/src/Java/miscutil/core/block/base/AdvancedBlock.java
+++ b/src/Java/gtPlusPlus/core/block/base/AdvancedBlock.java
@@ -1,6 +1,6 @@
-package miscutil.core.block.base;
+package gtPlusPlus.core.block.base;
 
-import miscutil.core.lib.CORE;
+import gtPlusPlus.core.lib.CORE;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.creativetab.CreativeTabs;
diff --git a/src/Java/miscutil/core/block/base/BasicBlock.java b/src/Java/gtPlusPlus/core/block/base/BasicBlock.java
index 385ba8d266..cd879167ba 100644
--- a/src/Java/miscutil/core/block/base/BasicBlock.java
+++ b/src/Java/gtPlusPlus/core/block/base/BasicBlock.java
@@ -1,8 +1,8 @@
-package miscutil.core.block.base;
+package gtPlusPlus.core.block.base;
 
-import miscutil.core.creative.AddToCreativeTab;
-import miscutil.core.lib.CORE;
-import miscutil.core.util.Utils;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 
diff --git a/src/Java/miscutil/core/block/base/BlockBaseModular.java b/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java
index 311c34b2cc..9654caac00 100644
--- a/src/Java/miscutil/core/block/base/BlockBaseModular.java
+++ b/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java
@@ -1,10 +1,10 @@
-package miscutil.core.block.base;
+package gtPlusPlus.core.block.base;
 
-import miscutil.core.item.base.itemblock.ItemBlockGtBlock;
-import miscutil.core.item.base.itemblock.ItemBlockGtFrameBox;
-import miscutil.core.lib.CORE;
-import miscutil.core.util.Utils;
-import miscutil.core.util.math.MathUtils;
+import gtPlusPlus.core.item.base.itemblock.ItemBlockGtBlock;
+import gtPlusPlus.core.item.base.itemblock.ItemBlockGtFrameBox;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.math.MathUtils;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.world.IBlockAccess;
diff --git a/src/Java/miscutil/core/block/base/MetaBlock.java b/src/Java/gtPlusPlus/core/block/base/MetaBlock.java
index 79aeb42afe..4009c36726 100644
--- a/src/Java/miscutil/core/block/base/MetaBlock.java
+++ b/src/Java/gtPlusPlus/core/block/base/MetaBlock.java
@@ -1,4 +1,4 @@
-package miscutil.core.block.base;
+package gtPlusPlus.core.block.base;
 
 import java.util.List;
 
diff --git a/src/Java/miscutil/core/block/base/MultiTextureBlock.java b/src/Java/gtPlusPlus/core/block/base/MultiTextureBlock.java
index 033139be89..4f022bae6d 100644
--- a/src/Java/miscutil/core/block/base/MultiTextureBlock.java
+++ b/src/Java/gtPlusPlus/core/block/base/MultiTextureBlock.java
@@ -1,7 +1,7 @@
-package miscutil.core.block.base;
+package gtPlusPlus.core.block.base;
 
-import miscutil.core.creative.AddToCreativeTab;
-import miscutil.core.lib.CORE;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
diff --git a/src/Java/miscutil/core/block/general/LightGlass.java b/src/Java/gtPlusPlus/core/block/general/LightGlass.java
index f2b751bdd0..5aa9f5b818 100644
--- a/src/Java/miscutil/core/block/general/LightGlass.java
+++ b/src/Java/gtPlusPlus/core/block/general/LightGlass.java
@@ -1,10 +1,11 @@
-package miscutil.core.block.general;
+package gtPlusPlus.core.block.general;
+
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
 
 import java.util.Random;
 
-import miscutil.core.creative.AddToCreativeTab;
-import miscutil.core.lib.CORE;
-import miscutil.core.util.Utils;
 import net.minecraft.block.BlockBreakable;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
diff --git a/src/Java/miscutil/core/block/general/antigrief/TowerDevice.java b/src/Java/gtPlusPlus/core/block/general/antigrief/TowerDevice.java
index 9ff0d36b33..7fa890b6c8 100644
--- a/src/Java/miscutil/core/block/general/antigrief/TowerDevice.java
+++ b/src/Java/gtPlusPlus/core/block/general/antigrief/TowerDevice.java
@@ -1,14 +1,14 @@
-package miscutil.core.block.general.antigrief;
+package gtPlusPlus.core.block.general.antigrief;
 
-import static miscutil.core.block.ModBlocks.blockGriefSaver;
+import static gtPlusPlus.core.block.ModBlocks.blockGriefSaver;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.tileentities.general.TileEntityReverter;
+import gtPlusPlus.core.util.Utils;
 
 import java.util.List;
 import java.util.Random;
 
-import miscutil.core.creative.AddToCreativeTab;
-import miscutil.core.lib.CORE;
-import miscutil.core.tileentities.general.TileEntityReverter;
-import miscutil.core.util.Utils;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
diff --git a/src/Java/miscutil/core/block/general/fluids/BlockFluidJackDaniels.java b/src/Java/gtPlusPlus/core/block/general/fluids/BlockFluidJackDaniels.java
index 1ddfcbe081..6096da7054 100644
--- a/src/Java/miscutil/core/block/general/fluids/BlockFluidJackDaniels.java
+++ b/src/Java/gtPlusPlus/core/block/general/fluids/BlockFluidJackDaniels.java
@@ -1,7 +1,7 @@
-package miscutil.core.block.general.fluids;
+package gtPlusPlus.core.block.general.fluids;
 
-import miscutil.core.creative.AddToCreativeTab;
-import miscutil.core.lib.CORE;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.util.IIcon;
diff --git a/src/Java/miscutil/core/block/general/fluids/FluidRegistryHandler.java b/src/Java/gtPlusPlus/core/block/general/fluids/FluidRegistryHandler.java
index 09f7236e33..bda2aae35b 100644
--- a/src/Java/miscutil/core/block/general/fluids/FluidRegistryHandler.java
+++ b/src/Java/gtPlusPlus/core/block/general/fluids/FluidRegistryHandler.java
@@ -1,8 +1,8 @@
-package miscutil.core.block.general.fluids;
+package gtPlusPlus.core.block.general.fluids;
 
-import static miscutil.core.block.ModBlocks.blockFluidJackDaniels;
-import static miscutil.core.block.ModBlocks.fluidJackDaniels;
-import miscutil.core.lib.CORE;
+import static gtPlusPlus.core.block.ModBlocks.blockFluidJackDaniels;
+import static gtPlusPlus.core.block.ModBlocks.fluidJackDaniels;
+import gtPlusPlus.core.lib.CORE;
 import net.minecraft.block.material.Material;
 import net.minecraftforge.fluids.FluidRegistry;
 import cpw.mods.fml.common.registry.GameRegistry;
diff --git a/src/Java/miscutil/core/block/machine/BlockGtFrameBox.java b/src/Java/gtPlusPlus/core/block/machine/BlockGtFrameBox.java
index 9c0f58364d..2832d4d0a4 100644
--- a/src/Java/miscutil/core/block/machine/BlockGtFrameBox.java
+++ b/src/Java/gtPlusPlus/core/block/machine/BlockGtFrameBox.java
@@ -1,8 +1,8 @@
-package miscutil.core.block.machine;
+package gtPlusPlus.core.block.machine;
 
-import miscutil.core.block.base.BasicBlock.BlockTypes;
-import miscutil.core.block.base.MetaBlock;
-import miscutil.core.lib.CORE;
+import gtPlusPlus.core.block.base.MetaBlock;
+import gtPlusPlus.core.block.base.BasicBlock.BlockTypes;
+import gtPlusPlus.core.lib.CORE;
 import net.minecraft.block.material.Material;
 import net.minecraft.world.IBlockAccess;
 
diff --git a/src/Java/miscutil/core/block/machine/Machine_Charger.java b/src/Java/gtPlusPlus/core/block/machine/Machine_Charger.java
index 9efb539afb..4f426b99c9 100644
--- a/src/Java/miscutil/core/block/machine/Machine_Charger.java
+++ b/src/Java/gtPlusPlus/core/block/machine/Machine_Charger.java
@@ -1,11 +1,12 @@
-package miscutil.core.block.machine;
+package gtPlusPlus.core.block.machine;
+
+import gtPlusPlus.GTplusplus;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.tileentities.machines.TileEntityCharger;
 
 import java.util.ArrayList;
 
-import miscutil.MiscUtils;
-import miscutil.core.creative.AddToCreativeTab;
-import miscutil.core.lib.CORE;
-import miscutil.core.tileentities.machines.TileEntityCharger;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
@@ -39,7 +40,7 @@ public class Machine_Charger extends BlockContainer
         TileEntity te = world.getTileEntity(x, y, z);
         if (te != null && te instanceof TileEntityCharger)
         {
-            player.openGui(MiscUtils.instance, 1, world, x, y, z);
+            player.openGui(GTplusplus.instance, 1, world, x, y, z);
             return true;
         }
         return false;
diff --git a/src/Java/miscutil/core/block/machine/Machine_NHG.java b/src/Java/gtPlusPlus/core/block/machine/Machine_NHG.java
index fe06577307..011e293000 100644
--- a/src/Java/miscutil/core/block/machine/Machine_NHG.java
+++ b/src/Java/gtPlusPlus/core/block/machine/Machine_NHG.java
@@ -1,11 +1,12 @@
-package miscutil.core.block.machine;
+package gtPlusPlus.core.block.machine;
+
+import gtPlusPlus.GTplusplus;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.tileentities.machines.TileEntityNHG;
 
 import java.util.ArrayList;
 
-import miscutil.MiscUtils;
-import miscutil.core.creative.AddToCreativeTab;
-import miscutil.core.lib.CORE;
-import miscutil.core.tileentities.machines.TileEntityNHG;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
@@ -39,7 +40,7 @@ public class Machine_NHG extends BlockContainer
         TileEntity te = world.getTileEntity(x, y, z);
         if (te != null && te instanceof TileEntityNHG)
         {
-            player.openGui(MiscUtils.instance, 0, world, x, y, z);
+            player.openGui(GTplusplus.instance, 0, world, x, y, z);
             return true;
         }
         return false;
diff --git a/src/Java/miscutil/core/block/machine/Machine_WireiusDeletus.java b/src/Java/gtPlusPlus/core/block/machine/Machine_WireiusDeletus.java
index 02b3a9f397..e964a9da01 100644
--- a/src/Java/miscutil/core/block/machine/Machine_WireiusDeletus.java
+++ b/src/Java/gtPlusPlus/core/block/machine/Machine_WireiusDeletus.java
@@ -1,4 +1,4 @@
-package miscutil.core.block.machine;
+package gtPlusPlus.core.block.machine;
 
 public class Machine_WireiusDeletus { //A Block that removes GT Cable and Wire from it's inventory.
 
diff --git a/src/Java/miscutil/core/block/machine/heliumgen/block/HeliumGenerator.java b/src/Java/gtPlusPlus/core/block/machine/heliumgen/block/HeliumGenerator.java
index 83897db5e0..7a76b09cca 100644
--- a/src/Java/miscutil/core/block/machine/heliumgen/block/HeliumGenerator.java
+++ b/src/Java/gtPlusPlus/core/block/machine/heliumgen/block/HeliumGenerator.java
@@ -1,11 +1,12 @@
-package miscutil.core.block.machine.heliumgen.block;
+package gtPlusPlus.core.block.machine.heliumgen.block;
+
+import gtPlusPlus.GTplusplus;
+import gtPlusPlus.core.block.machine.heliumgen.tileentity.TileEntityHeliumGenerator;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
 
 import java.util.Random;
 
-import miscutil.MiscUtils;
-import miscutil.core.block.machine.heliumgen.tileentity.TileEntityHeliumGenerator;
-import miscutil.core.creative.AddToCreativeTab;
-import miscutil.core.lib.CORE;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
@@ -79,7 +80,7 @@ public class HeliumGenerator extends BlockContainer {
         {
             return true;
         }
-		player.openGui(MiscUtils.instance, 2, world, x, y, z);
+		player.openGui(GTplusplus.instance, 2, world, x, y, z);
 		return true;
     }
 
diff --git a/src/Java/miscutil/core/block/machine/heliumgen/container/ContainerHeliumGenerator.java b/src/Java/gtPlusPlus/core/block/machine/heliumgen/container/ContainerHeliumGenerator.java
index 17389a5abe..d701f6f125 100644
--- a/src/Java/miscutil/core/block/machine/heliumgen/container/ContainerHeliumGenerator.java
+++ b/src/Java/gtPlusPlus/core/block/machine/heliumgen/container/ContainerHeliumGenerator.java
@@ -1,11 +1,11 @@
-package miscutil.core.block.machine.heliumgen.container;
+package gtPlusPlus.core.block.machine.heliumgen.container;
 
+import gtPlusPlus.core.block.machine.heliumgen.tileentity.TileEntityHeliumGenerator;
 import ic2.core.ContainerBase;
 import ic2.core.slot.SlotInvSlot;
 
 import java.util.List;
 
-import miscutil.core.block.machine.heliumgen.tileentity.TileEntityHeliumGenerator;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Slot;
 import net.minecraft.inventory.SlotFurnace;
diff --git a/src/Java/miscutil/core/block/machine/heliumgen/gui/GUIHeliumGenerator.java b/src/Java/gtPlusPlus/core/block/machine/heliumgen/gui/GUIHeliumGenerator.java
index 708ba9c924..2106f144be 100644
--- a/src/Java/miscutil/core/block/machine/heliumgen/gui/GUIHeliumGenerator.java
+++ b/src/Java/gtPlusPlus/core/block/machine/heliumgen/gui/GUIHeliumGenerator.java
@@ -1,8 +1,8 @@
-package miscutil.core.block.machine.heliumgen.gui;
+package gtPlusPlus.core.block.machine.heliumgen.gui;
 
-import miscutil.core.block.machine.heliumgen.container.ContainerHeliumGenerator;
-import miscutil.core.block.machine.heliumgen.tileentity.TileEntityHeliumGenerator;
-import miscutil.core.lib.CORE;
+import gtPlusPlus.core.block.machine.heliumgen.container.ContainerHeliumGenerator;
+import gtPlusPlus.core.block.machine.heliumgen.tileentity.TileEntityHeliumGenerator;
+import gtPlusPlus.core.lib.CORE;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.util.ResourceLocation;
diff --git a/src/Java/miscutil/core/block/machine/heliumgen/slots/InvSlotRadiation.java b/src/Java/gtPlusPlus/core/block/machine/heliumgen/slots/InvSlotRadiation.java
index d8a9c38897..86507a2d64 100644
--- a/src/Java/miscutil/core/block/machine/heliumgen/slots/InvSlotRadiation.java
+++ b/src/Java/gtPlusPlus/core/block/machine/heliumgen/slots/InvSlotRadiation.java
@@ -1,7 +1,7 @@
-package miscutil.core.block.machine.heliumgen.slots;
+package gtPlusPlus.core.block.machine.heliumgen.slots;
 
+import gtPlusPlus.core.block.machine.heliumgen.tileentity.TileEntityHeliumGenerator;
 import ic2.core.block.invslot.InvSlot;
-import miscutil.core.block.machine.heliumgen.tileentity.TileEntityHeliumGenerator;
 import net.minecraft.item.ItemStack;
 
 public class InvSlotRadiation extends InvSlot
diff --git a/src/Java/miscutil/core/block/machine/heliumgen/tileentity/TileEntityHeliumGenerator.java b/src/Java/gtPlusPlus/core/block/machine/heliumgen/tileentity/TileEntityHeliumGenerator.java
index 809537f346..06c13f997a 100644
--- a/src/Java/miscutil/core/block/machine/heliumgen/tileentity/TileEntityHeliumGenerator.java
+++ b/src/Java/gtPlusPlus/core/block/machine/heliumgen/tileentity/TileEntityHeliumGenerator.java
@@ -1,5 +1,10 @@
-package miscutil.core.block.machine.heliumgen.tileentity;
+package gtPlusPlus.core.block.machine.heliumgen.tileentity;
 
+import gtPlusPlus.core.block.ModBlocks;
+import gtPlusPlus.core.block.machine.heliumgen.slots.InvSlotRadiation;
+import gtPlusPlus.core.item.ModItems;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.item.UtilsItems;
 import ic2.api.Direction;
 import ic2.api.reactor.IReactor;
 import ic2.api.reactor.IReactorComponent;
@@ -15,11 +20,6 @@ import ic2.core.util.ConfigUtil;
 
 import java.util.List;
 
-import miscutil.core.block.ModBlocks;
-import miscutil.core.block.machine.heliumgen.slots.InvSlotRadiation;
-import miscutil.core.item.ModItems;
-import miscutil.core.util.Utils;
-import miscutil.core.util.item.UtilsItems;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.Entity;
diff --git a/src/Java/miscutil/core/commands/CommandMath.java b/src/Java/gtPlusPlus/core/commands/CommandMath.java
index a099d7b5a0..2a726dd8b1 100644
--- a/src/Java/miscutil/core/commands/CommandMath.java
+++ b/src/Java/gtPlusPlus/core/commands/CommandMath.java
@@ -1,9 +1,10 @@
-package miscutil.core.commands;
+package gtPlusPlus.core.commands;
+
+import gtPlusPlus.core.util.Utils;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import miscutil.core.util.Utils;
 import net.minecraft.command.ICommand;
 import net.minecraft.command.ICommandSender;
 import net.minecraft.entity.Entity;
diff --git a/src/Java/miscutil/core/commands/CommandUtils.java b/src/Java/gtPlusPlus/core/commands/CommandUtils.java
index f33263fa40..32e7a75370 100644
--- a/src/Java/miscutil/core/commands/CommandUtils.java
+++ b/src/Java/gtPlusPlus/core/commands/CommandUtils.java
@@ -1,4 +1,4 @@
-package miscutil.core.commands;
+package gtPlusPlus.core.commands;
 
 import net.minecraft.command.ICommandSender;
 import net.minecraft.entity.player.EntityPlayer;
diff --git a/src/Java/miscutil/core/common/CommonProxy.java b/src/Java/gtPlusPlus/core/common/CommonProxy.java
index 79c4a7b665..f3ed741bf0 100644
--- a/src/Java/miscutil/core/common/CommonProxy.java
+++ b/src/Java/gtPlusPlus/core/common/CommonProxy.java
@@ -1,24 +1,24 @@
-package miscutil.core.common;
+package gtPlusPlus.core.common;
 
-import static miscutil.core.lib.CORE.DEBUG;
+import static gtPlusPlus.core.lib.CORE.DEBUG;
+import gtPlusPlus.core.block.ModBlocks;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.handler.COMPAT_HANDLER;
+import gtPlusPlus.core.handler.COMPAT_IntermodStaging;
+import gtPlusPlus.core.handler.GuiHandler;
+import gtPlusPlus.core.handler.events.PickaxeBlockBreakEventHandler;
+import gtPlusPlus.core.item.ModItems;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.core.recipe.RECIPE_CONSTANTS;
+import gtPlusPlus.core.tileentities.ModTileEntities;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.debug.DEBUG_INIT;
+import gtPlusPlus.core.util.player.PlayerCache;
+import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy;
 
 import java.util.Iterator;
 
-import miscutil.core.block.ModBlocks;
-import miscutil.core.creative.AddToCreativeTab;
-import miscutil.core.handler.COMPAT_HANDLER;
-import miscutil.core.handler.COMPAT_IntermodStaging;
-import miscutil.core.handler.GuiHandler;
-import miscutil.core.handler.events.PickaxeBlockBreakEventHandler;
-import miscutil.core.item.ModItems;
-import miscutil.core.lib.CORE;
-import miscutil.core.lib.LoadedMods;
-import miscutil.core.recipe.RECIPE_CONSTANTS;
-import miscutil.core.tileentities.ModTileEntities;
-import miscutil.core.util.Utils;
-import miscutil.core.util.debug.DEBUG_INIT;
-import miscutil.core.util.player.PlayerCache;
-import miscutil.xmod.gregtech.common.Meta_GT_Proxy;
 import net.minecraft.entity.Entity;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.MinecraftForge;
diff --git a/src/Java/miscutil/core/common/compat/COMPAT_BigReactors.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_BigReactors.java
index a5f2b9021a..7f4aa0541a 100644
--- a/src/Java/miscutil/core/common/compat/COMPAT_BigReactors.java
+++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_BigReactors.java
@@ -1,7 +1,7 @@
-package miscutil.core.common.compat;
+package gtPlusPlus.core.common.compat;
 
 import gregtech.api.util.GT_OreDictUnificator;
-import miscutil.core.item.ModItems;
+import gtPlusPlus.core.item.ModItems;
 import net.minecraft.item.ItemStack;
 
 public class COMPAT_BigReactors {
diff --git a/src/Java/miscutil/core/common/compat/COMPAT_CompactWindmills.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_CompactWindmills.java
index 0760696e86..efa86f0009 100644
--- a/src/Java/miscutil/core/common/compat/COMPAT_CompactWindmills.java
+++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_CompactWindmills.java
@@ -1,9 +1,9 @@
-package miscutil.core.common.compat;
+package gtPlusPlus.core.common.compat;
 
-import static miscutil.core.handler.COMPAT_HANDLER.AddRecipeQueue;
-import static miscutil.core.handler.COMPAT_HANDLER.RemoveRecipeQueue;
-import miscutil.core.recipe.ShapedRecipeObject;
-import miscutil.core.util.item.UtilsItems;
+import static gtPlusPlus.core.handler.COMPAT_HANDLER.AddRecipeQueue;
+import static gtPlusPlus.core.handler.COMPAT_HANDLER.RemoveRecipeQueue;
+import gtPlusPlus.core.recipe.ShapedRecipeObject;
+import gtPlusPlus.core.util.item.UtilsItems;
 import net.minecraft.item.ItemStack;
 
 
diff --git a/src/Java/miscutil/core/common/compat/COMPAT_EnderIO.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_EnderIO.java
index 8c0f1f72bc..d538b2df3d 100644
--- a/src/Java/miscutil/core/common/compat/COMPAT_EnderIO.java
+++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_EnderIO.java
@@ -1,8 +1,8 @@
-package miscutil.core.common.compat;
+package gtPlusPlus.core.common.compat;
 
 import gregtech.api.util.GT_OreDictUnificator;
-import miscutil.core.item.ModItems;
-import miscutil.core.util.item.UtilsItems;
+import gtPlusPlus.core.item.ModItems;
+import gtPlusPlus.core.util.item.UtilsItems;
 import net.minecraft.item.ItemStack;
 
 public class COMPAT_EnderIO {
diff --git a/src/Java/miscutil/core/common/compat/COMPAT_ExtraUtils.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java
index 4790394675..c77f1475b9 100644
--- a/src/Java/miscutil/core/common/compat/COMPAT_ExtraUtils.java
+++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java
@@ -1,11 +1,11 @@
-package miscutil.core.common.compat;
+package gtPlusPlus.core.common.compat;
 
 import gregtech.api.util.GT_OreDictUnificator;
-import miscutil.core.item.ModItems;
-import miscutil.core.lib.CORE.configSwitches;
-import miscutil.core.recipe.RECIPES_Tools;
-import miscutil.core.util.item.UtilsItems;
-import miscutil.core.util.recipe.UtilsRecipe;
+import gtPlusPlus.core.item.ModItems;
+import gtPlusPlus.core.lib.CORE.configSwitches;
+import gtPlusPlus.core.recipe.RECIPES_Tools;
+import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.recipe.UtilsRecipe;
 import net.minecraft.item.ItemStack;
 
 public class COMPAT_ExtraUtils {
diff --git a/src/Java/miscutil/core/common/compat/COMPAT_IC2.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_IC2.java
index abea1c87f1..14ec5dfd4d 100644
--- a/src/Java/miscutil/core/common/compat/COMPAT_IC2.java
+++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_IC2.java
@@ -1,11 +1,11 @@
-package miscutil.core.common.compat;
+package gtPlusPlus.core.common.compat;
 
 
-import static miscutil.core.handler.COMPAT_HANDLER.RemoveRecipeQueue;
-import miscutil.core.lib.CORE.configSwitches;
-import miscutil.core.lib.LoadedMods;
-import miscutil.core.recipe.ShapedRecipeObject;
-import miscutil.core.util.item.UtilsItems;
+import static gtPlusPlus.core.handler.COMPAT_HANDLER.RemoveRecipeQueue;
+import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.core.lib.CORE.configSwitches;
+import gtPlusPlus.core.recipe.ShapedRecipeObject;
+import gtPlusPlus.core.util.item.UtilsItems;
 import net.minecraft.item.ItemStack;
 
 
diff --git a/src/Java/miscutil/core/common/compat/COMPAT_MorePlanets.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_MorePlanets.java
index 855a5d8fc2..3a996ed849 100644
--- a/src/Java/miscutil/core/common/compat/COMPAT_MorePlanets.java
+++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_MorePlanets.java
@@ -1,6 +1,6 @@
-package miscutil.core.common.compat;
+package gtPlusPlus.core.common.compat;
 
-import miscutil.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.item.UtilsItems;
 
 public class COMPAT_MorePlanets {
 
diff --git a/src/Java/miscutil/core/common/compat/COMPAT_PneumaticCraft.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_PneumaticCraft.java
index 1e79d7a9f1..d471535e81 100644
--- a/src/Java/miscutil/core/common/compat/COMPAT_PneumaticCraft.java
+++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_PneumaticCraft.java
@@ -1,7 +1,7 @@
-package miscutil.core.common.compat;
+package gtPlusPlus.core.common.compat;
 
 import gregtech.api.util.GT_OreDictUnificator;
-import miscutil.core.item.ModItems;
+import gtPlusPlus.core.item.ModItems;
 import net.minecraft.item.ItemStack;
 
 public class COMPAT_PneumaticCraft {
diff --git a/src/Java/miscutil/core/common/compat/COMPAT_RFTools.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_RFTools.java
index c8ee0c0618..4db8006a89 100644
--- a/src/Java/miscutil/core/common/compat/COMPAT_RFTools.java
+++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_RFTools.java
@@ -1,7 +1,7 @@
-package miscutil.core.common.compat;
+package gtPlusPlus.core.common.compat;
 
 import gregtech.api.util.GT_OreDictUnificator;
-import miscutil.core.item.ModItems;
+import gtPlusPlus.core.item.ModItems;
 import net.minecraft.item.ItemStack;
 
 public class COMPAT_RFTools {
diff --git a/src/Java/miscutil/core/common/compat/COMPAT_SimplyJetpacks.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_SimplyJetpacks.java
index c000be9aa8..6d7f08b55d 100644
--- a/src/Java/miscutil/core/common/compat/COMPAT_SimplyJetpacks.java
+++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_SimplyJetpacks.java
@@ -1,7 +1,7 @@
-package miscutil.core.common.compat;
+package gtPlusPlus.core.common.compat;
 
 import gregtech.api.util.GT_OreDictUnificator;
-import miscutil.core.item.ModItems;
+import gtPlusPlus.core.item.ModItems;
 import net.minecraft.item.ItemStack;
 
 public class COMPAT_SimplyJetpacks {
diff --git a/src/Java/miscutil/core/common/compat/COMPAT_Thaumcraft.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java
index 6402144d4a..87fde9fa96 100644
--- a/src/Java/miscutil/core/common/compat/COMPAT_Thaumcraft.java
+++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java
@@ -1,10 +1,10 @@
-package miscutil.core.common.compat;
+package gtPlusPlus.core.common.compat;
 
 import gregtech.api.util.GT_OreDictUnificator;
-import miscutil.core.item.ModItems;
-import miscutil.core.lib.CORE.configSwitches;
-import miscutil.core.lib.LoadedMods;
-import miscutil.core.util.item.UtilsItems;
+import gtPlusPlus.core.item.ModItems;
+import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.core.lib.CORE.configSwitches;
+import gtPlusPlus.core.util.item.UtilsItems;
 import net.minecraft.item.ItemStack;
 
 public class COMPAT_Thaumcraft {
diff --git a/src/Java/miscutil/core/container/Container_BackpackBase.java b/src/Java/gtPlusPlus/core/container/Container_BackpackBase.java
index 7d997b92ed..f156f6dcaf 100644
--- a/src/Java/miscutil/core/container/Container_BackpackBase.java
+++ b/src/Java/gtPlusPlus/core/container/Container_BackpackBase.java
@@ -1,7 +1,7 @@
-package miscutil.core.container;
+package gtPlusPlus.core.container;
 
-import miscutil.core.inventories.BaseInventoryBackpack;
-import miscutil.core.slots.SlotItemBackpackInv;
+import gtPlusPlus.core.inventories.BaseInventoryBackpack;
+import gtPlusPlus.core.slots.SlotItemBackpackInv;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
diff --git a/src/Java/miscutil/core/container/Container_Charger.java b/src/Java/gtPlusPlus/core/container/Container_Charger.java
index cbe7156d0e..4b6c43ada6 100644
--- a/src/Java/miscutil/core/container/Container_Charger.java
+++ b/src/Java/gtPlusPlus/core/container/Container_Charger.java
@@ -1,6 +1,6 @@
-package miscutil.core.container;
+package gtPlusPlus.core.container;
 
-import miscutil.core.tileentities.machines.TileEntityCharger;
+import gtPlusPlus.core.tileentities.machines.TileEntityCharger;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
diff --git a/src/Java/miscutil/core/container/Container_NHG.java b/src/Java/gtPlusPlus/core/container/Container_NHG.java
index 78461ad2b7..64a84ce680 100644
--- a/src/Java/miscutil/core/container/Container_NHG.java
+++ b/src/Java/gtPlusPlus/core/container/Container_NHG.java
@@ -1,6 +1,6 @@
-package miscutil.core.container;
+package gtPlusPlus.core.container;
 
-import miscutil.core.tileentities.machines.TileEntityNHG;
+import gtPlusPlus.core.tileentities.machines.TileEntityNHG;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
diff --git a/src/Java/miscutil/core/creative/AddToCreativeTab.java b/src/Java/gtPlusPlus/core/creative/AddToCreativeTab.java
index 7655a639ad..31613f2b85 100644
--- a/src/Java/miscutil/core/creative/AddToCreativeTab.java
+++ b/src/Java/gtPlusPlus/core/creative/AddToCreativeTab.java
@@ -1,11 +1,11 @@
-package miscutil.core.creative;
+package gtPlusPlus.core.creative;
 
-import miscutil.core.creative.tabs.MiscUtilCreativeTabBlock;
-import miscutil.core.creative.tabs.MiscUtilCreativeTabMachines;
-import miscutil.core.creative.tabs.MiscUtilCreativeTabMisc;
-import miscutil.core.creative.tabs.MiscUtilCreativeTabOther;
-import miscutil.core.creative.tabs.MiscUtilCreativeTabTools;
-import miscutil.core.lib.CORE;
+import gtPlusPlus.core.creative.tabs.MiscUtilCreativeTabBlock;
+import gtPlusPlus.core.creative.tabs.MiscUtilCreativeTabMachines;
+import gtPlusPlus.core.creative.tabs.MiscUtilCreativeTabMisc;
+import gtPlusPlus.core.creative.tabs.MiscUtilCreativeTabOther;
+import gtPlusPlus.core.creative.tabs.MiscUtilCreativeTabTools;
+import gtPlusPlus.core.lib.CORE;
 import net.minecraft.creativetab.CreativeTabs;
 
 public class AddToCreativeTab {
diff --git a/src/Java/miscutil/core/creative/tabs/MiscUtilCreativeTabBlock.java b/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabBlock.java
index 21782a2ad5..1220fb1af8 100644
--- a/src/Java/miscutil/core/creative/tabs/MiscUtilCreativeTabBlock.java
+++ b/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabBlock.java
@@ -1,6 +1,6 @@
-package miscutil.core.creative.tabs;
+package gtPlusPlus.core.creative.tabs;
 
-import miscutil.core.block.ModBlocks;
+import gtPlusPlus.core.block.ModBlocks;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
 
diff --git a/src/Java/miscutil/core/creative/tabs/MiscUtilCreativeTabMachines.java b/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMachines.java
index 21cacd8dab..932f80ed7f 100644
--- a/src/Java/miscutil/core/creative/tabs/MiscUtilCreativeTabMachines.java
+++ b/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMachines.java
@@ -1,6 +1,6 @@
-package miscutil.core.creative.tabs;
+package gtPlusPlus.core.creative.tabs;
 
-import miscutil.core.item.ModItems;
+import gtPlusPlus.core.item.ModItems;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
 
diff --git a/src/Java/miscutil/core/creative/tabs/MiscUtilCreativeTabMisc.java b/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMisc.java
index af2fe4ae6b..619803e6e1 100644
--- a/src/Java/miscutil/core/creative/tabs/MiscUtilCreativeTabMisc.java
+++ b/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMisc.java
@@ -1,6 +1,6 @@
-package miscutil.core.creative.tabs;
+package gtPlusPlus.core.creative.tabs;
 
-import miscutil.core.item.ModItems;
+import gtPlusPlus.core.item.ModItems;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
 
diff --git a/src/Java/miscutil/core/creative/tabs/MiscUtilCreativeTabOther.java b/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabOther.java
index aeae534413..6b7c55fcb8 100644
--- a/src/Java/miscutil/core/creative/tabs/MiscUtilCreativeTabOther.java
+++ b/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabOther.java
@@ -1,6 +1,6 @@
-package miscutil.core.creative.tabs;
+package gtPlusPlus.core.creative.tabs;
 
-import miscutil.core.item.ModItems;
+import gtPlusPlus.core.item.ModItems;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
 
diff --git a/src/Java/miscutil/core/creative/tabs/MiscUtilCreativeTabTools.java b/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabTools.java
index feddf0e5aa..fe61ea6f11 100644
--- a/src/Java/miscutil/core/creative/tabs/MiscUtilCreativeTabTools.java
+++ b/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabTools.java
@@ -1,6 +1,6 @@
-package miscutil.core.creative.tabs;
+package gtPlusPlus.core.creative.tabs;
 
-import miscutil.core.item.ModItems;
+import gtPlusPlus.core.item.ModItems;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
 
diff --git a/src/Java/miscutil/core/entity/EntityTeleportFX.java b/src/Java/gtPlusPlus/core/entity/EntityTeleportFX.java
index 18867c20cc..eff516c289 100644
--- a/src/Java/miscutil/core/entity/EntityTeleportFX.java
+++ b/src/Java/gtPlusPlus/core/entity/EntityTeleportFX.java
@@ -1,4 +1,4 @@
-package miscutil.core.entity;
+package gtPlusPlus.core.entity;
 
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.item.EntityItem;
diff --git a/src/Java/miscutil/core/gui/beta/Gui_ID_Registry.java b/src/Java/gtPlusPlus/core/gui/beta/Gui_ID_Registry.java
index 11c97e8f9a..b3531ceb3e 100644
--- a/src/Java/miscutil/core/gui/beta/Gui_ID_Registry.java
+++ b/src/Java/gtPlusPlus/core/gui/beta/Gui_ID_Registry.java
@@ -1,11 +1,11 @@
-package miscutil.core.gui.beta;
+package gtPlusPlus.core.gui.beta;
+
+import gtPlusPlus.core.interfaces.IGuiManagerMiscUtils;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import miscutil.core.interfaces.IGuiManagerMiscUtils;
-
 public class Gui_ID_Registry
 {
 	private static final Map<Class<? extends IGuiManagerMiscUtils>, MU_GuiId> classMap = new HashMap();
diff --git a/src/Java/miscutil/core/gui/beta/Gui_Types.java b/src/Java/gtPlusPlus/core/gui/beta/Gui_Types.java
index 79e5a21dbd..428cae93d5 100644
--- a/src/Java/miscutil/core/gui/beta/Gui_Types.java
+++ b/src/Java/gtPlusPlus/core/gui/beta/Gui_Types.java
@@ -1,4 +1,4 @@
-package miscutil.core.gui.beta;
+package gtPlusPlus.core.gui.beta;
 
 public enum Gui_Types
   {
diff --git a/src/Java/miscutil/core/gui/beta/MU_GuiId.java b/src/Java/gtPlusPlus/core/gui/beta/MU_GuiId.java
index 2c97e62039..7d17870743 100644
--- a/src/Java/miscutil/core/gui/beta/MU_GuiId.java
+++ b/src/Java/gtPlusPlus/core/gui/beta/MU_GuiId.java
@@ -1,5 +1,5 @@
-package miscutil.core.gui.beta;
-import miscutil.core.interfaces.IGuiManagerMiscUtils;
+package gtPlusPlus.core.gui.beta;
+import gtPlusPlus.core.interfaces.IGuiManagerMiscUtils;
 
 public class MU_GuiId
   {
diff --git a/src/Java/miscutil/core/gui/item/GuiBaseBackpack.java b/src/Java/gtPlusPlus/core/gui/item/GuiBaseBackpack.java
index 180f0c50eb..9f1b775fb0 100644
--- a/src/Java/miscutil/core/gui/item/GuiBaseBackpack.java
+++ b/src/Java/gtPlusPlus/core/gui/item/GuiBaseBackpack.java
@@ -1,8 +1,8 @@
-package miscutil.core.gui.item;
+package gtPlusPlus.core.gui.item;
 
-import miscutil.core.container.Container_BackpackBase;
-import miscutil.core.inventories.BaseInventoryBackpack;
-import miscutil.core.lib.CORE;
+import gtPlusPlus.core.container.Container_BackpackBase;
+import gtPlusPlus.core.inventories.BaseInventoryBackpack;
+import gtPlusPlus.core.lib.CORE;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.client.renderer.OpenGlHelper;
diff --git a/src/Java/miscutil/core/gui/machine/GUI_Charger.java b/src/Java/gtPlusPlus/core/gui/machine/GUI_Charger.java
index deca8d4f09..c1f687c554 100644
--- a/src/Java/miscutil/core/gui/machine/GUI_Charger.java
+++ b/src/Java/gtPlusPlus/core/gui/machine/GUI_Charger.java
@@ -1,8 +1,8 @@
-package miscutil.core.gui.machine;
+package gtPlusPlus.core.gui.machine;
 
-import miscutil.core.container.Container_Charger;
-import miscutil.core.lib.CORE;
-import miscutil.core.tileentities.machines.TileEntityCharger;
+import gtPlusPlus.core.container.Container_Charger;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.tileentities.machines.TileEntityCharger;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.client.resources.I18n;
diff --git a/src/Java/miscutil/core/gui/machine/GUI_NHG.java b/src/Java/gtPlusPlus/core/gui/machine/GUI_NHG.java
index e2239d6d40..09b2ee93d8 100644
--- a/src/Java/miscutil/core/gui/machine/GUI_NHG.java
+++ b/src/Java/gtPlusPlus/core/gui/machine/GUI_NHG.java
@@ -1,8 +1,8 @@
-package miscutil.core.gui.machine;
+package gtPlusPlus.core.gui.machine;
 
-import miscutil.core.container.Container_NHG;
-import miscutil.core.lib.CORE;
-import miscutil.core.tileentities.machines.TileEntityNHG;
+import gtPlusPlus.core.container.Container_NHG;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.tileentities.machines.TileEntityNHG;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.client.resources.I18n;
diff --git a/src/Java/miscutil/core/handler/COMPAT_HANDLER.java b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
index 188b5ec3aa..92003cbcad 100644
--- a/src/Java/miscutil/core/handler/COMPAT_HANDLER.java
+++ b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
@@ -1,48 +1,48 @@
-package miscutil.core.handler;
+package gtPlusPlus.core.handler;
 
-import static miscutil.core.lib.LoadedMods.Gregtech;
+import static gtPlusPlus.core.lib.LoadedMods.Gregtech;
 import gregtech.api.util.GT_OreDictUnificator;
+import gtPlusPlus.core.common.compat.COMPAT_BigReactors;
+import gtPlusPlus.core.common.compat.COMPAT_CompactWindmills;
+import gtPlusPlus.core.common.compat.COMPAT_EnderIO;
+import gtPlusPlus.core.common.compat.COMPAT_ExtraUtils;
+import gtPlusPlus.core.common.compat.COMPAT_IC2;
+import gtPlusPlus.core.common.compat.COMPAT_MorePlanets;
+import gtPlusPlus.core.common.compat.COMPAT_PneumaticCraft;
+import gtPlusPlus.core.common.compat.COMPAT_RFTools;
+import gtPlusPlus.core.common.compat.COMPAT_SimplyJetpacks;
+import gtPlusPlus.core.common.compat.COMPAT_Thaumcraft;
+import gtPlusPlus.core.handler.Recipes.LateRegistrationHandler;
+import gtPlusPlus.core.handler.Recipes.RegistrationHandler;
+import gtPlusPlus.core.item.ModItems;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.core.recipe.RECIPES_GREGTECH;
+import gtPlusPlus.core.recipe.RECIPES_LaserEngraver;
+import gtPlusPlus.core.recipe.ShapedRecipeObject;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.recipe.UtilsRecipe;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechDehydrator;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechEnergyBuffer;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialCentrifuge;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialCokeOven;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialElectrolyzer;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialMacerator;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialMassFabricator;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialPlatePress;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialWiremill;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIronBlastFurnace;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechPowerSubStation;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechRocketFuelGenerator;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechSafeBlock;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechSolarGenerators;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechSteamCondenser;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechSuperConductionPoint;
 
 import java.util.LinkedList;
 import java.util.Queue;
 
-import miscutil.core.common.compat.COMPAT_BigReactors;
-import miscutil.core.common.compat.COMPAT_CompactWindmills;
-import miscutil.core.common.compat.COMPAT_EnderIO;
-import miscutil.core.common.compat.COMPAT_ExtraUtils;
-import miscutil.core.common.compat.COMPAT_IC2;
-import miscutil.core.common.compat.COMPAT_MorePlanets;
-import miscutil.core.common.compat.COMPAT_PneumaticCraft;
-import miscutil.core.common.compat.COMPAT_RFTools;
-import miscutil.core.common.compat.COMPAT_SimplyJetpacks;
-import miscutil.core.common.compat.COMPAT_Thaumcraft;
-import miscutil.core.handler.Recipes.LateRegistrationHandler;
-import miscutil.core.handler.Recipes.RegistrationHandler;
-import miscutil.core.item.ModItems;
-import miscutil.core.lib.CORE;
-import miscutil.core.lib.LoadedMods;
-import miscutil.core.recipe.RECIPES_GREGTECH;
-import miscutil.core.recipe.RECIPES_LaserEngraver;
-import miscutil.core.recipe.ShapedRecipeObject;
-import miscutil.core.util.Utils;
-import miscutil.core.util.item.UtilsItems;
-import miscutil.core.util.recipe.UtilsRecipe;
-import miscutil.xmod.gregtech.registration.gregtech.GregtechDehydrator;
-import miscutil.xmod.gregtech.registration.gregtech.GregtechEnergyBuffer;
-import miscutil.xmod.gregtech.registration.gregtech.GregtechIndustrialCentrifuge;
-import miscutil.xmod.gregtech.registration.gregtech.GregtechIndustrialCokeOven;
-import miscutil.xmod.gregtech.registration.gregtech.GregtechIndustrialElectrolyzer;
-import miscutil.xmod.gregtech.registration.gregtech.GregtechIndustrialMacerator;
-import miscutil.xmod.gregtech.registration.gregtech.GregtechIndustrialMassFabricator;
-import miscutil.xmod.gregtech.registration.gregtech.GregtechIndustrialPlatePress;
-import miscutil.xmod.gregtech.registration.gregtech.GregtechIndustrialWiremill;
-import miscutil.xmod.gregtech.registration.gregtech.GregtechIronBlastFurnace;
-import miscutil.xmod.gregtech.registration.gregtech.GregtechPowerSubStation;
-import miscutil.xmod.gregtech.registration.gregtech.GregtechRocketFuelGenerator;
-import miscutil.xmod.gregtech.registration.gregtech.GregtechSafeBlock;
-import miscutil.xmod.gregtech.registration.gregtech.GregtechSolarGenerators;
-import miscutil.xmod.gregtech.registration.gregtech.GregtechSteamCondenser;
-import miscutil.xmod.gregtech.registration.gregtech.GregtechSuperConductionPoint;
 import net.minecraft.item.ItemStack;
 
 public class COMPAT_HANDLER {
diff --git a/src/Java/miscutil/core/handler/COMPAT_IntermodStaging.java b/src/Java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java
index b9bb097ba4..97b7369134 100644
--- a/src/Java/miscutil/core/handler/COMPAT_IntermodStaging.java
+++ b/src/Java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java
@@ -1,11 +1,11 @@
-package miscutil.core.handler;
+package gtPlusPlus.core.handler;
 
-import miscutil.xmod.forestry.HANDLER_FR;
-import miscutil.xmod.gregtech.HANDLER_GT;
-import miscutil.xmod.growthcraft.HANDLER_GC;
-import miscutil.xmod.ic2.HANDLER_IC2;
-import miscutil.xmod.psychedelicraft.HANDLER_Psych;
-import miscutil.xmod.thermalfoundation.HANDLER_TF;
+import gtPlusPlus.xmod.forestry.HANDLER_FR;
+import gtPlusPlus.xmod.gregtech.HANDLER_GT;
+import gtPlusPlus.xmod.growthcraft.HANDLER_GC;
+import gtPlusPlus.xmod.ic2.HANDLER_IC2;
+import gtPlusPlus.xmod.psychedelicraft.HANDLER_Psych;
+import gtPlusPlus.xmod.thermalfoundation.HANDLER_TF;
 
 public class COMPAT_IntermodStaging {
 
diff --git a/src/Java/miscutil/core/handler/CraftingManager.java b/src/Java/gtPlusPlus/core/handler/CraftingManager.java
index 144b5a0726..bd0f114b1a 100644
--- a/src/Java/miscutil/core/handler/CraftingManager.java
+++ b/src/Java/gtPlusPlus/core/handler/CraftingManager.java
@@ -1,4 +1,4 @@
-package miscutil.core.handler;
+package gtPlusPlus.core.handler;
 
 public class CraftingManager {
 
diff --git a/src/Java/miscutil/core/handler/GuiHandler.java b/src/Java/gtPlusPlus/core/handler/GuiHandler.java
index 13693e2ffc..7c9c7a7625 100644
--- a/src/Java/miscutil/core/handler/GuiHandler.java
+++ b/src/Java/gtPlusPlus/core/handler/GuiHandler.java
@@ -1,17 +1,17 @@
-package miscutil.core.handler;
-
-import miscutil.MiscUtils;
-import miscutil.core.container.Container_BackpackBase;
-import miscutil.core.gui.beta.Gui_ID_Registry;
-import miscutil.core.gui.beta.MU_GuiId;
-import miscutil.core.gui.item.GuiBaseBackpack;
-import miscutil.core.interfaces.IGuiManager;
-import miscutil.core.inventories.BaseInventoryBackpack;
-import miscutil.core.lib.CORE;
-import miscutil.core.util.Utils;
-import miscutil.xmod.forestry.bees.alveary.TileAlvearyFrameHousing;
-import miscutil.xmod.forestry.bees.alveary.gui.CONTAINER_FrameHousing;
-import miscutil.xmod.forestry.bees.alveary.gui.GUI_FrameHousing;
+package gtPlusPlus.core.handler;
+
+import gtPlusPlus.GTplusplus;
+import gtPlusPlus.core.container.Container_BackpackBase;
+import gtPlusPlus.core.gui.beta.Gui_ID_Registry;
+import gtPlusPlus.core.gui.beta.MU_GuiId;
+import gtPlusPlus.core.gui.item.GuiBaseBackpack;
+import gtPlusPlus.core.interfaces.IGuiManager;
+import gtPlusPlus.core.inventories.BaseInventoryBackpack;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.xmod.forestry.bees.alveary.TileAlvearyFrameHousing;
+import gtPlusPlus.xmod.forestry.bees.alveary.gui.CONTAINER_FrameHousing;
+import gtPlusPlus.xmod.forestry.bees.alveary.gui.GUI_FrameHousing;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ChunkCoordinates;
@@ -35,9 +35,9 @@ public class GuiHandler implements IGuiHandler {
 	public static void init(){ 	
 
 		Utils.LOG_INFO("Registering GUIs."); 	
-		NetworkRegistry.INSTANCE.registerGuiHandler(MiscUtils.instance, new GuiHandler()); 	
+		NetworkRegistry.INSTANCE.registerGuiHandler(GTplusplus.instance, new GuiHandler()); 	
 		//Register GuiHandler 	
-		//NetworkRegistry.INSTANCE.registerGuiHandler(MiscUtils.instance, new GuiHandler()); 	
+		//NetworkRegistry.INSTANCE.registerGuiHandler(GTplusplus.instance, new GuiHandler()); 	
 	}
 
 
@@ -105,7 +105,7 @@ public class GuiHandler implements IGuiHandler {
 	{
 		int guiData = encodeGuiData(guiHandler, data);
 		ChunkCoordinates coordinates = guiHandler.getCoordinates();
-		entityplayer.openGui(MiscUtils.instance, guiData, entityplayer.worldObj, coordinates.posX, coordinates.posY, coordinates.posZ);
+		entityplayer.openGui(GTplusplus.instance, guiData, entityplayer.worldObj, coordinates.posX, coordinates.posY, coordinates.posZ);
 	}
 
 	private static int encodeGuiData(IGuiManager guiHandler, short data)
diff --git a/src/Java/miscutil/core/handler/Recipes/LateRegistrationHandler.java b/src/Java/gtPlusPlus/core/handler/Recipes/LateRegistrationHandler.java
index 84af30a748..7d739bdca3 100644
--- a/src/Java/miscutil/core/handler/Recipes/LateRegistrationHandler.java
+++ b/src/Java/gtPlusPlus/core/handler/Recipes/LateRegistrationHandler.java
@@ -1,8 +1,8 @@
-package miscutil.core.handler.Recipes;
+package gtPlusPlus.core.handler.Recipes;
 
-import miscutil.core.handler.COMPAT_HANDLER;
-import miscutil.core.recipe.ShapedRecipeObject;
-import miscutil.core.util.Utils;
+import gtPlusPlus.core.handler.COMPAT_HANDLER;
+import gtPlusPlus.core.recipe.ShapedRecipeObject;
+import gtPlusPlus.core.util.Utils;
 
 public class LateRegistrationHandler {
 
diff --git a/src/Java/miscutil/core/handler/Recipes/RegistrationHandler.java b/src/Java/gtPlusPlus/core/handler/Recipes/RegistrationHandler.java
index be48d27752..affb56566d 100644
--- a/src/Java/miscutil/core/handler/Recipes/RegistrationHandler.java
+++ b/src/Java/gtPlusPlus/core/handler/Recipes/RegistrationHandler.java
@@ -1,12 +1,12 @@
-package miscutil.core.handler.Recipes;
+package gtPlusPlus.core.handler.Recipes;
 
-import miscutil.core.handler.COMPAT_HANDLER;
-import miscutil.core.recipe.RECIPES_MachineComponents;
-import miscutil.core.recipe.RECIPES_Machines;
-import miscutil.core.recipe.RECIPES_Shapeless;
-import miscutil.core.recipe.RECIPES_Tools;
-import miscutil.core.recipe.RECIPE_Batteries;
-import miscutil.core.util.Utils;
+import gtPlusPlus.core.handler.COMPAT_HANDLER;
+import gtPlusPlus.core.recipe.RECIPES_MachineComponents;
+import gtPlusPlus.core.recipe.RECIPES_Machines;
+import gtPlusPlus.core.recipe.RECIPES_Shapeless;
+import gtPlusPlus.core.recipe.RECIPES_Tools;
+import gtPlusPlus.core.recipe.RECIPE_Batteries;
+import gtPlusPlus.core.util.Utils;
 
 public class RegistrationHandler {
 
diff --git a/src/Java/miscutil/core/handler/events/LoginEventHandler.java b/src/Java/gtPlusPlus/core/handler/events/LoginEventHandler.java
index 12c8578735..9cf0cb8bb7 100644
--- a/src/Java/miscutil/core/handler/events/LoginEventHandler.java
+++ b/src/Java/gtPlusPlus/core/handler/events/LoginEventHandler.java
@@ -1,9 +1,10 @@
-package miscutil.core.handler.events;
+package gtPlusPlus.core.handler.events;
+
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.player.PlayerCache;
 
 import java.util.UUID;
 
-import miscutil.core.util.Utils;
-import miscutil.core.util.player.PlayerCache;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
diff --git a/src/Java/miscutil/core/handler/events/PickaxeBlockBreakEventHandler.java b/src/Java/gtPlusPlus/core/handler/events/PickaxeBlockBreakEventHandler.java
index ddf6372fed..a7c689a79a 100644
--- a/src/Java/miscutil/core/handler/events/PickaxeBlockBreakEventHandler.java
+++ b/src/Java/gtPlusPlus/core/handler/events/PickaxeBlockBreakEventHandler.java
@@ -1,14 +1,14 @@
-package miscutil.core.handler.events;
+package gtPlusPlus.core.handler.events;
 
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.metatileentity.BaseMetaPipeEntity;
 import gregtech.api.metatileentity.BaseMetaTileEntity;
 import gregtech.api.metatileentity.BaseTileEntity;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.machines.GregtechMetaSafeBlockBase;
 
 import java.util.UUID;
 
-import miscutil.core.util.Utils;
-import miscutil.xmod.gregtech.api.metatileentity.implementations.base.machines.GregtechMetaSafeBlockBase;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
diff --git a/src/Java/miscutil/core/handler/events/UnbreakableBlockManager.java b/src/Java/gtPlusPlus/core/handler/events/UnbreakableBlockManager.java
index 14d3d6b177..3e126d4463 100644
--- a/src/Java/miscutil/core/handler/events/UnbreakableBlockManager.java
+++ b/src/Java/gtPlusPlus/core/handler/events/UnbreakableBlockManager.java
@@ -1,11 +1,11 @@
-package miscutil.core.handler.events;
+package gtPlusPlus.core.handler.events;
 
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.metatileentity.BaseMetaPipeEntity;
 import gregtech.api.metatileentity.BaseMetaTileEntity;
 import gregtech.api.metatileentity.BaseTileEntity;
-import miscutil.core.util.Utils;
-import miscutil.xmod.gregtech.api.metatileentity.implementations.GregtechMetaSafeBlock;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GregtechMetaSafeBlock;
 import net.minecraft.block.Block;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
diff --git a/src/Java/miscutil/core/interfaces/IGuiManager.java b/src/Java/gtPlusPlus/core/interfaces/IGuiManager.java
index bca5b90ecf..1d0ad9ed87 100644
--- a/src/Java/miscutil/core/interfaces/IGuiManager.java
+++ b/src/Java/gtPlusPlus/core/interfaces/IGuiManager.java
@@ -1,4 +1,4 @@
-package miscutil.core.interfaces;
+package gtPlusPlus.core.interfaces;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.ChunkCoordinates;
diff --git a/src/Java/miscutil/core/interfaces/IGuiManagerMiscUtils.java b/src/Java/gtPlusPlus/core/interfaces/IGuiManagerMiscUtils.java
index 1a5ab4a3a6..cf46c67a54 100644
--- a/src/Java/miscutil/core/interfaces/IGuiManagerMiscUtils.java
+++ b/src/Java/gtPlusPlus/core/interfaces/IGuiManagerMiscUtils.java
@@ -1,3 +1,3 @@
-package miscutil.core.interfaces;
+package gtPlusPlus.core.interfaces;
 
 public abstract interface IGuiManagerMiscUtils {}
\ No newline at end of file
diff --git a/src/Java/miscutil/core/inventories/BaseInventoryBackpack.java b/src/Java/gtPlusPlus/core/inventories/BaseInventoryBackpack.java
index ba3acbc79e..59fe8aa4fa 100644
--- a/src/Java/miscutil/core/inventories/BaseInventoryBackpack.java
+++ b/src/Java/gtPlusPlus/core/inventories/BaseInventoryBackpack.java
@@ -1,8 +1,9 @@
-package miscutil.core.inventories;
+package gtPlusPlus.core.inventories;
+
+import gtPlusPlus.core.item.base.BaseItemBackpack;
 
 import java.util.UUID;
 
-import miscutil.core.item.base.BaseItemBackpack;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
diff --git a/src/Java/miscutil/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index 56750dfb62..3ceaf84228 100644
--- a/src/Java/miscutil/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -1,41 +1,41 @@
-package miscutil.core.item;
-import static miscutil.core.creative.AddToCreativeTab.tabMachines;
-import static miscutil.core.creative.AddToCreativeTab.tabMisc;
-import static miscutil.core.lib.CORE.LOAD_ALL_CONTENT;
+package gtPlusPlus.core.item;
+import static gtPlusPlus.core.creative.AddToCreativeTab.tabMachines;
+import static gtPlusPlus.core.creative.AddToCreativeTab.tabMisc;
+import static gtPlusPlus.core.lib.CORE.LOAD_ALL_CONTENT;
 import gregtech.api.enums.Materials;
 import gregtech.api.util.GT_OreDictUnificator;
-import miscutil.core.creative.AddToCreativeTab;
-import miscutil.core.item.base.BaseItemBackpack;
-import miscutil.core.item.base.CoreItem;
-import miscutil.core.item.base.bolts.BaseItemBolt;
-import miscutil.core.item.base.foods.BaseItemFood;
-import miscutil.core.item.base.foods.BaseItemHotFood;
-import miscutil.core.item.base.gears.BaseItemGear;
-import miscutil.core.item.base.ingots.BaseItemIngot;
-import miscutil.core.item.base.ingots.BaseItemIngotHot;
-import miscutil.core.item.base.plates.BaseItemPlate;
-import miscutil.core.item.base.rings.BaseItemRing;
-import miscutil.core.item.base.rods.BaseItemRod;
-import miscutil.core.item.base.rotors.BaseItemRotor;
-import miscutil.core.item.base.screws.BaseItemScrew;
-import miscutil.core.item.effects.RarityUncommon;
-import miscutil.core.item.general.BufferCore;
-import miscutil.core.item.general.ItemCloakingDevice;
-import miscutil.core.item.general.ItemHealingDevice;
-import miscutil.core.item.general.RF2EU_Battery;
-import miscutil.core.item.general.fuelrods.FuelRod_Base;
-import miscutil.core.item.init.ItemsFoods;
-import miscutil.core.item.tool.misc.SandstoneHammer;
-import miscutil.core.item.tool.staballoy.MultiPickaxeBase;
-import miscutil.core.item.tool.staballoy.StaballoyAxe;
-import miscutil.core.item.tool.staballoy.StaballoyPickaxe;
-import miscutil.core.lib.CORE;
-import miscutil.core.lib.CORE.configSwitches;
-import miscutil.core.lib.LoadedMods;
-import miscutil.core.lib.MaterialInfo;
-import miscutil.core.util.Utils;
-import miscutil.core.util.debug.DEBUG_INIT;
-import miscutil.core.util.item.UtilsItems;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.item.base.BaseItemBackpack;
+import gtPlusPlus.core.item.base.CoreItem;
+import gtPlusPlus.core.item.base.bolts.BaseItemBolt;
+import gtPlusPlus.core.item.base.foods.BaseItemFood;
+import gtPlusPlus.core.item.base.foods.BaseItemHotFood;
+import gtPlusPlus.core.item.base.gears.BaseItemGear;
+import gtPlusPlus.core.item.base.ingots.BaseItemIngot;
+import gtPlusPlus.core.item.base.ingots.BaseItemIngotHot;
+import gtPlusPlus.core.item.base.plates.BaseItemPlate;
+import gtPlusPlus.core.item.base.rings.BaseItemRing;
+import gtPlusPlus.core.item.base.rods.BaseItemRod;
+import gtPlusPlus.core.item.base.rotors.BaseItemRotor;
+import gtPlusPlus.core.item.base.screws.BaseItemScrew;
+import gtPlusPlus.core.item.effects.RarityUncommon;
+import gtPlusPlus.core.item.general.BufferCore;
+import gtPlusPlus.core.item.general.ItemCloakingDevice;
+import gtPlusPlus.core.item.general.ItemHealingDevice;
+import gtPlusPlus.core.item.general.RF2EU_Battery;
+import gtPlusPlus.core.item.general.fuelrods.FuelRod_Base;
+import gtPlusPlus.core.item.init.ItemsFoods;
+import gtPlusPlus.core.item.tool.misc.SandstoneHammer;
+import gtPlusPlus.core.item.tool.staballoy.MultiPickaxeBase;
+import gtPlusPlus.core.item.tool.staballoy.StaballoyAxe;
+import gtPlusPlus.core.item.tool.staballoy.StaballoyPickaxe;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.core.lib.MaterialInfo;
+import gtPlusPlus.core.lib.CORE.configSwitches;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.debug.DEBUG_INIT;
+import gtPlusPlus.core.util.item.UtilsItems;
 import net.minecraft.item.Item;
 import net.minecraft.item.Item.ToolMaterial;
 import net.minecraft.item.ItemFood;
diff --git a/src/Java/miscutil/core/item/base/BaseItemBackpack.java b/src/Java/gtPlusPlus/core/item/base/BaseItemBackpack.java
index f8a44b76c8..316f922639 100644
--- a/src/Java/miscutil/core/item/base/BaseItemBackpack.java
+++ b/src/Java/gtPlusPlus/core/item/base/BaseItemBackpack.java
@@ -1,12 +1,12 @@
-package miscutil.core.item.base;
+package gtPlusPlus.core.item.base;
 
 import gregtech.api.util.GT_OreDictUnificator;
-import miscutil.MiscUtils;
-import miscutil.core.creative.AddToCreativeTab;
-import miscutil.core.handler.GuiHandler;
-import miscutil.core.lib.CORE;
-import miscutil.core.util.item.UtilsItems;
-import miscutil.core.util.math.MathUtils;
+import gtPlusPlus.GTplusplus;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.handler.GuiHandler;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.math.MathUtils;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
@@ -46,7 +46,7 @@ public class BaseItemBackpack extends Item{
 		{
 			// If player not sneaking, open the inventory gui
 			if (!player.isSneaking()) {
-				player.openGui(MiscUtils.instance, GuiHandler.GUI3, world, 0, 0, 0);
+				player.openGui(GTplusplus.instance, GuiHandler.GUI3, world, 0, 0, 0);
 			}
 			
 			// Otherwise, stealthily place some diamonds in there for a nice surprise next time you open it up :)
diff --git a/src/Java/miscutil/core/item/base/BaseItemGeneric.java b/src/Java/gtPlusPlus/core/item/base/BaseItemGeneric.java
index 56b9c9d7fe..a6cc29497e 100644
--- a/src/Java/miscutil/core/item/base/BaseItemGeneric.java
+++ b/src/Java/gtPlusPlus/core/item/base/BaseItemGeneric.java
@@ -1,8 +1,9 @@
-package miscutil.core.item.base;
+package gtPlusPlus.core.item.base;
+
+import gtPlusPlus.core.lib.CORE;
 
 import java.util.List;
 
-import miscutil.core.lib.CORE;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
diff --git a/src/Java/miscutil/core/item/base/BaseItemWithCharge.java b/src/Java/gtPlusPlus/core/item/base/BaseItemWithCharge.java
index 7c88a62ed0..c793776e37 100644
--- a/src/Java/miscutil/core/item/base/BaseItemWithCharge.java
+++ b/src/Java/gtPlusPlus/core/item/base/BaseItemWithCharge.java
@@ -1,9 +1,10 @@
-package miscutil.core.item.base;
+package gtPlusPlus.core.item.base;
+
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
 
 import java.util.List;
 
-import miscutil.core.creative.AddToCreativeTab;
-import miscutil.core.lib.CORE;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
diff --git a/src/Java/miscutil/core/item/base/BaseItemWithDamageValue.java b/src/Java/gtPlusPlus/core/item/base/BaseItemWithDamageValue.java
index fdd770139d..ec052ef1f9 100644
--- a/src/Java/miscutil/core/item/base/BaseItemWithDamageValue.java
+++ b/src/Java/gtPlusPlus/core/item/base/BaseItemWithDamageValue.java
@@ -1,8 +1,9 @@
-package miscutil.core.item.base;
+package gtPlusPlus.core.item.base;
+
+import gtPlusPlus.core.lib.CORE;
 
 import java.util.List;
 
-import miscutil.core.lib.CORE;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
diff --git a/src/Java/miscutil/core/item/base/BasicSpawnEgg.java b/src/Java/gtPlusPlus/core/item/base/BasicSpawnEgg.java
index fd80fab854..9407689cfc 100644
--- a/src/Java/miscutil/core/item/base/BasicSpawnEgg.java
+++ b/src/Java/gtPlusPlus/core/item/base/BasicSpawnEgg.java
@@ -1,10 +1,11 @@
-package miscutil.core.item.base;
+package gtPlusPlus.core.item.base;
 
 
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.util.Utils;
+
 import java.util.List;
 
-import miscutil.core.creative.AddToCreativeTab;
-import miscutil.core.util.Utils;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockLiquid;
 import net.minecraft.client.renderer.texture.IIconRegister;
diff --git a/src/Java/miscutil/core/item/base/CoreItem.java b/src/Java/gtPlusPlus/core/item/base/CoreItem.java
index 55a468980c..b77b2d336e 100644
--- a/src/Java/miscutil/core/item/base/CoreItem.java
+++ b/src/Java/gtPlusPlus/core/item/base/CoreItem.java
@@ -1,8 +1,9 @@
-package miscutil.core.item.base;
+package gtPlusPlus.core.item.base;
+
+import gtPlusPlus.core.lib.CORE;
 
 import java.util.List;
 
-import miscutil.core.lib.CORE;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.EnumRarity;
diff --git a/src/Java/miscutil/core/item/base/bolts/BaseItemBolt.java b/src/Java/gtPlusPlus/core/item/base/bolts/BaseItemBolt.java
index a30b7f7acb..0f56730177 100644
--- a/src/Java/miscutil/core/item/base/bolts/BaseItemBolt.java
+++ b/src/Java/gtPlusPlus/core/item/base/bolts/BaseItemBolt.java
@@ -1,16 +1,16 @@
-package miscutil.core.item.base.bolts;
+package gtPlusPlus.core.item.base.bolts;
 
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.ItemList;
 import gregtech.api.util.GT_OreDictUnificator;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.math.MathUtils;
 
 import java.util.List;
 
-import miscutil.core.creative.AddToCreativeTab;
-import miscutil.core.lib.CORE;
-import miscutil.core.util.Utils;
-import miscutil.core.util.item.UtilsItems;
-import miscutil.core.util.math.MathUtils;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
diff --git a/src/Java/miscutil/core/item/base/dusts/BaseItemDust.java b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java
index 2723debd7b..6d12624487 100644
--- a/src/Java/miscutil/core/item/base/dusts/BaseItemDust.java
+++ b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java
@@ -1,18 +1,18 @@
-package miscutil.core.item.base.dusts;
+package gtPlusPlus.core.item.base.dusts;
 
-import static miscutil.core.creative.AddToCreativeTab.tabMisc;
+import static gtPlusPlus.core.creative.AddToCreativeTab.tabMisc;
 import gregtech.api.enums.GT_Values;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_OreDictUnificator;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.MaterialInfo;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.math.MathUtils;
+import gtPlusPlus.core.util.recipe.UtilsRecipe;
 
 import java.util.List;
 
-import miscutil.core.lib.CORE;
-import miscutil.core.lib.MaterialInfo;
-import miscutil.core.util.Utils;
-import miscutil.core.util.item.UtilsItems;
-import miscutil.core.util.math.MathUtils;
-import miscutil.core.util.recipe.UtilsRecipe;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
diff --git a/src/Java/miscutil/core/item/base/dusts/BaseItemDustAbstract.java b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustAbstract.java
index f32ed1fbe9..a49dc58188 100644
--- a/src/Java/miscutil/core/item/base/dusts/BaseItemDustAbstract.java
+++ b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustAbstract.java
@@ -1,8 +1,9 @@
-package miscutil.core.item.base.dusts;
+package gtPlusPlus.core.item.base.dusts;
+
+import gtPlusPlus.core.lib.CORE;
 
 import java.util.List;
 
-import miscutil.core.lib.CORE;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
diff --git a/src/Java/miscutil/core/item/base/foods/BaseItemFood.java b/src/Java/gtPlusPlus/core/item/base/foods/BaseItemFood.java
index 34e332e629..7b0663d9cf 100644
--- a/src/Java/miscutil/core/item/base/foods/BaseItemFood.java
+++ b/src/Java/gtPlusPlus/core/item/base/foods/BaseItemFood.java
@@ -1,7 +1,7 @@
-package miscutil.core.item.base.foods;
+package gtPlusPlus.core.item.base.foods;
 
-import miscutil.core.creative.AddToCreativeTab;
-import miscutil.core.lib.CORE;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemFood;
 import net.minecraft.item.ItemStack;
diff --git a/src/Java/miscutil/core/item/base/foods/BaseItemHotFood.java b/src/Java/gtPlusPlus/core/item/base/foods/BaseItemHotFood.java
index a56f2293f4..aaad22be9c 100644
--- a/src/Java/miscutil/core/item/base/foods/BaseItemHotFood.java
+++ b/src/Java/gtPlusPlus/core/item/base/foods/BaseItemHotFood.java
@@ -1,10 +1,11 @@
-package miscutil.core.item.base.foods;
+package gtPlusPlus.core.item.base.foods;
+
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.math.MathUtils;
 
 import java.util.List;
 
-import miscutil.core.util.Utils;
-import miscutil.core.util.item.UtilsItems;
-import miscutil.core.util.math.MathUtils;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
diff --git a/src/Java/miscutil/core/item/base/gears/BaseItemGear.java b/src/Java/gtPlusPlus/core/item/base/gears/BaseItemGear.java
index 96559bf7d7..ba41625b25 100644
--- a/src/Java/miscutil/core/item/base/gears/BaseItemGear.java
+++ b/src/Java/gtPlusPlus/core/item/base/gears/BaseItemGear.java
@@ -1,16 +1,16 @@
-package miscutil.core.item.base.gears;
+package gtPlusPlus.core.item.base.gears;
 
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.ItemList;
 import gregtech.api.util.GT_OreDictUnificator;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.math.MathUtils;
 
 import java.util.List;
 
-import miscutil.core.creative.AddToCreativeTab;
-import miscutil.core.lib.CORE;
-import miscutil.core.util.Utils;
-import miscutil.core.util.item.UtilsItems;
-import miscutil.core.util.math.MathUtils;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
diff --git a/src/Java/miscutil/core/item/base/ingots/BaseItemIngot.java b/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot.java
index c726614be6..e193636043 100644
--- a/src/Java/miscutil/core/item/base/ingots/BaseItemIngot.java
+++ b/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot.java
@@ -1,15 +1,15 @@
-package miscutil.core.item.base.ingots;
+package gtPlusPlus.core.item.base.ingots;
 
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_OreDictUnificator;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.math.MathUtils;
 
 import java.util.List;
 
-import miscutil.core.creative.AddToCreativeTab;
-import miscutil.core.lib.CORE;
-import miscutil.core.util.Utils;
-import miscutil.core.util.item.UtilsItems;
-import miscutil.core.util.math.MathUtils;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
diff --git a/src/Java/miscutil/core/item/base/ingots/BaseItemIngotHot.java b/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java
index bc6447a1a8..6fa358f36f 100644
--- a/src/Java/miscutil/core/item/base/ingots/BaseItemIngotHot.java
+++ b/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java
@@ -1,12 +1,12 @@
-package miscutil.core.item.base.ingots;
+package gtPlusPlus.core.item.base.ingots;
 
 import gregtech.api.enums.GT_Values;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.item.UtilsItems;
 
 import java.util.List;
 
-import miscutil.core.lib.CORE;
-import miscutil.core.util.Utils;
-import miscutil.core.util.item.UtilsItems;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
diff --git a/src/Java/miscutil/core/item/base/itemblock/ItemBlockBase.java b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockBase.java
index ca04497049..488f9a6f60 100644
--- a/src/Java/miscutil/core/item/base/itemblock/ItemBlockBase.java
+++ b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockBase.java
@@ -1,6 +1,6 @@
-package miscutil.core.item.base.itemblock;
+package gtPlusPlus.core.item.base.itemblock;
 
-import miscutil.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.creative.AddToCreativeTab;
 import net.minecraft.block.Block;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
diff --git a/src/Java/miscutil/core/item/base/itemblock/ItemBlockGtBlock.java b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java
index 9c701ab51f..04d01c2c97 100644
--- a/src/Java/miscutil/core/item/base/itemblock/ItemBlockGtBlock.java
+++ b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java
@@ -1,12 +1,12 @@
-package miscutil.core.item.base.itemblock;
+package gtPlusPlus.core.item.base.itemblock;
 
 import gregtech.api.util.GT_OreDictUnificator;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.item.UtilsItems;
 
 import java.util.List;
 
-import miscutil.core.lib.CORE;
-import miscutil.core.util.Utils;
-import miscutil.core.util.item.UtilsItems;
 import net.minecraft.block.Block;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
diff --git a/src/Java/miscutil/core/item/base/itemblock/ItemBlockGtFrameBox.java b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtFrameBox.java
index 93784ca78a..c8d791b905 100644
--- a/src/Java/miscutil/core/item/base/itemblock/ItemBlockGtFrameBox.java
+++ b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtFrameBox.java
@@ -1,7 +1,7 @@
-package miscutil.core.item.base.itemblock;
+package gtPlusPlus.core.item.base.itemblock;
 
 import gregtech.api.util.GT_OreDictUnificator;
-import miscutil.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.item.UtilsItems;
 import net.minecraft.block.Block;
 import net.minecraft.item.ItemBlock;
 
diff --git a/src/Java/miscutil/core/item/base/plates/BaseItemPlate.java b/src/Java/gtPlusPlus/core/item/base/plates/BaseItemPlate.java
index b802ed51bf..9d21198033 100644
--- a/src/Java/miscutil/core/item/base/plates/BaseItemPlate.java
+++ b/src/Java/gtPlusPlus/core/item/base/plates/BaseItemPlate.java
@@ -1,15 +1,15 @@
-package miscutil.core.item.base.plates;
+package gtPlusPlus.core.item.base.plates;
 
 import gregtech.api.enums.GT_Values;
 import gregtech.api.util.GT_OreDictUnificator;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.math.MathUtils;
 
 import java.util.List;
 
-import miscutil.core.creative.AddToCreativeTab;
-import miscutil.core.lib.CORE;
-import miscutil.core.util.Utils;
-import miscutil.core.util.item.UtilsItems;
-import miscutil.core.util.math.MathUtils;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
diff --git a/src/Java/miscutil/core/item/base/rings/BaseItemRing.java b/src/Java/gtPlusPlus/core/item/base/rings/BaseItemRing.java
index ead6f3f15f..d5c513c37d 100644
--- a/src/Java/miscutil/core/item/base/rings/BaseItemRing.java
+++ b/src/Java/gtPlusPlus/core/item/base/rings/BaseItemRing.java
@@ -1,16 +1,16 @@
-package miscutil.core.item.base.rings;
+package gtPlusPlus.core.item.base.rings;
 
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.ItemList;
 import gregtech.api.util.GT_OreDictUnificator;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.math.MathUtils;
 
 import java.util.List;
 
-import miscutil.core.creative.AddToCreativeTab;
-import miscutil.core.lib.CORE;
-import miscutil.core.util.Utils;
-import miscutil.core.util.item.UtilsItems;
-import miscutil.core.util.math.MathUtils;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
diff --git a/src/Java/miscutil/core/item/base/rods/BaseItemRod.java b/src/Java/gtPlusPlus/core/item/base/rods/BaseItemRod.java
index c007887b59..befe7552ec 100644
--- a/src/Java/miscutil/core/item/base/rods/BaseItemRod.java
+++ b/src/Java/gtPlusPlus/core/item/base/rods/BaseItemRod.java
@@ -1,17 +1,17 @@
-package miscutil.core.item.base.rods;
+package gtPlusPlus.core.item.base.rods;
 
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.ItemList;
 import gregtech.api.util.GT_OreDictUnificator;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.math.MathUtils;
+import gtPlusPlus.core.util.recipe.UtilsRecipe;
 
 import java.util.List;
 
-import miscutil.core.creative.AddToCreativeTab;
-import miscutil.core.lib.CORE;
-import miscutil.core.util.Utils;
-import miscutil.core.util.item.UtilsItems;
-import miscutil.core.util.math.MathUtils;
-import miscutil.core.util.recipe.UtilsRecipe;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
diff --git a/src/Java/miscutil/core/item/base/rods/BaseItemRodLong.java b/src/Java/gtPlusPlus/core/item/base/rods/BaseItemRodLong.java
index c02254488a..4e157d22b1 100644
--- a/src/Java/miscutil/core/item/base/rods/BaseItemRodLong.java
+++ b/src/Java/gtPlusPlus/core/item/base/rods/BaseItemRodLong.java
@@ -1,16 +1,16 @@
-package miscutil.core.item.base.rods;
+package gtPlusPlus.core.item.base.rods;
 
 import gregtech.api.enums.GT_Values;
 import gregtech.api.util.GT_OreDictUnificator;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.math.MathUtils;
+import gtPlusPlus.core.util.recipe.UtilsRecipe;
 
 import java.util.List;
 
-import miscutil.core.creative.AddToCreativeTab;
-import miscutil.core.lib.CORE;
-import miscutil.core.util.Utils;
-import miscutil.core.util.item.UtilsItems;
-import miscutil.core.util.math.MathUtils;
-import miscutil.core.util.recipe.UtilsRecipe;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
diff --git a/src/Java/miscutil/core/item/base/rotors/BaseItemRotor.java b/src/Java/gtPlusPlus/core/item/base/rotors/BaseItemRotor.java
index 1249637981..d8ecea32bd 100644
--- a/src/Java/miscutil/core/item/base/rotors/BaseItemRotor.java
+++ b/src/Java/gtPlusPlus/core/item/base/rotors/BaseItemRotor.java
@@ -1,15 +1,15 @@
-package miscutil.core.item.base.rotors;
+package gtPlusPlus.core.item.base.rotors;
 
 import gregtech.api.util.GT_OreDictUnificator;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.math.MathUtils;
+import gtPlusPlus.core.util.recipe.UtilsRecipe;
 
 import java.util.List;
 
-import miscutil.core.creative.AddToCreativeTab;
-import miscutil.core.lib.CORE;
-import miscutil.core.util.Utils;
-import miscutil.core.util.item.UtilsItems;
-import miscutil.core.util.math.MathUtils;
-import miscutil.core.util.recipe.UtilsRecipe;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
diff --git a/src/Java/miscutil/core/item/base/screws/BaseItemScrew.java b/src/Java/gtPlusPlus/core/item/base/screws/BaseItemScrew.java
index fe86b4dcd8..953c3a99a3 100644
--- a/src/Java/miscutil/core/item/base/screws/BaseItemScrew.java
+++ b/src/Java/gtPlusPlus/core/item/base/screws/BaseItemScrew.java
@@ -1,16 +1,16 @@
-package miscutil.core.item.base.screws;
+package gtPlusPlus.core.item.base.screws;
 
 import gregtech.api.enums.GT_Values;
 import gregtech.api.util.GT_OreDictUnificator;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.math.MathUtils;
+import gtPlusPlus.core.util.recipe.UtilsRecipe;
 
 import java.util.List;
 
-import miscutil.core.creative.AddToCreativeTab;
-import miscutil.core.lib.CORE;
-import miscutil.core.util.Utils;
-import miscutil.core.util.item.UtilsItems;
-import miscutil.core.util.math.MathUtils;
-import miscutil.core.util.recipe.UtilsRecipe;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
diff --git a/src/Java/miscutil/core/item/effects/RarityEffect.java b/src/Java/gtPlusPlus/core/item/effects/RarityEffect.java
index 41ba2d6baf..cd5149b622 100644
--- a/src/Java/miscutil/core/item/effects/RarityEffect.java
+++ b/src/Java/gtPlusPlus/core/item/effects/RarityEffect.java
@@ -1,4 +1,4 @@
-package miscutil.core.item.effects;
+package gtPlusPlus.core.item.effects;
 
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.EnumRarity;
diff --git a/src/Java/miscutil/core/item/effects/RarityEpic.java b/src/Java/gtPlusPlus/core/item/effects/RarityEpic.java
index dfcaaa9007..35c5527d16 100644
--- a/src/Java/miscutil/core/item/effects/RarityEpic.java
+++ b/src/Java/gtPlusPlus/core/item/effects/RarityEpic.java
@@ -1,4 +1,4 @@
-package miscutil.core.item.effects;
+package gtPlusPlus.core.item.effects;
 
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.EnumRarity;
diff --git a/src/Java/miscutil/core/item/effects/RarityRare.java b/src/Java/gtPlusPlus/core/item/effects/RarityRare.java
index 6afc9b6733..c64accb7aa 100644
--- a/src/Java/miscutil/core/item/effects/RarityRare.java
+++ b/src/Java/gtPlusPlus/core/item/effects/RarityRare.java
@@ -1,4 +1,4 @@
-package miscutil.core.item.effects;
+package gtPlusPlus.core.item.effects;
 
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.EnumRarity;
diff --git a/src/Java/miscutil/core/item/effects/RarityUncommon.java b/src/Java/gtPlusPlus/core/item/effects/RarityUncommon.java
index 4347dc70f5..398217a24a 100644
--- a/src/Java/miscutil/core/item/effects/RarityUncommon.java
+++ b/src/Java/gtPlusPlus/core/item/effects/RarityUncommon.java
@@ -1,4 +1,4 @@
-package miscutil.core.item.effects;
+package gtPlusPlus.core.item.effects;
 
 import net.minecraft.item.EnumRarity;
 import net.minecraft.item.Item;
diff --git a/src/Java/miscutil/core/item/general/BedLocator_Base.java b/src/Java/gtPlusPlus/core/item/general/BedLocator_Base.java
index b4402e0689..5a05ac7655 100644
--- a/src/Java/miscutil/core/item/general/BedLocator_Base.java
+++ b/src/Java/gtPlusPlus/core/item/general/BedLocator_Base.java
@@ -1,9 +1,10 @@
-package miscutil.core.item.general;
+package gtPlusPlus.core.item.general;
+
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
 
 import java.util.List;
 
-import miscutil.core.creative.AddToCreativeTab;
-import miscutil.core.lib.CORE;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
diff --git a/src/Java/miscutil/core/item/general/BufferCore.java b/src/Java/gtPlusPlus/core/item/general/BufferCore.java
index 7d014155ba..6343ede855 100644
--- a/src/Java/miscutil/core/item/general/BufferCore.java
+++ b/src/Java/gtPlusPlus/core/item/general/BufferCore.java
@@ -1,9 +1,10 @@
-package miscutil.core.item.general;
+package gtPlusPlus.core.item.general;
+
+import gtPlusPlus.core.item.base.BaseItemWithDamageValue;
+import gtPlusPlus.core.lib.CORE;
 
 import java.util.List;
 
-import miscutil.core.item.base.BaseItemWithDamageValue;
-import miscutil.core.lib.CORE;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
diff --git a/src/Java/miscutil/core/item/general/ItemCloakingDevice.java b/src/Java/gtPlusPlus/core/item/general/ItemCloakingDevice.java
index 112a13cf26..22b6ed27f1 100644
--- a/src/Java/miscutil/core/item/general/ItemCloakingDevice.java
+++ b/src/Java/gtPlusPlus/core/item/general/ItemCloakingDevice.java
@@ -1,15 +1,15 @@
-package miscutil.core.item.general;
+package gtPlusPlus.core.item.general;
 
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.math.MathUtils;
 import ic2.api.item.ElectricItem;
 import ic2.api.item.IElectricItem;
 import ic2.api.item.IElectricItemManager;
 
 import java.util.List;
 
-import miscutil.core.creative.AddToCreativeTab;
-import miscutil.core.lib.CORE;
-import miscutil.core.util.item.UtilsItems;
-import miscutil.core.util.math.MathUtils;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
diff --git a/src/Java/miscutil/core/item/general/ItemHealingDevice.java b/src/Java/gtPlusPlus/core/item/general/ItemHealingDevice.java
index 385ab06fdd..728d498e2b 100644
--- a/src/Java/miscutil/core/item/general/ItemHealingDevice.java
+++ b/src/Java/gtPlusPlus/core/item/general/ItemHealingDevice.java
@@ -1,16 +1,16 @@
-package miscutil.core.item.general;
+package gtPlusPlus.core.item.general;
 
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.math.MathUtils;
 import ic2.api.item.ElectricItem;
 import ic2.api.item.IElectricItem;
 import ic2.api.item.IElectricItemManager;
 
 import java.util.List;
 
-import miscutil.core.creative.AddToCreativeTab;
-import miscutil.core.lib.CORE;
-import miscutil.core.util.Utils;
-import miscutil.core.util.item.UtilsItems;
-import miscutil.core.util.math.MathUtils;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
diff --git a/src/Java/miscutil/core/item/general/NuclearFuelRodBase.java b/src/Java/gtPlusPlus/core/item/general/NuclearFuelRodBase.java
index 7de0f93fab..f452b83a73 100644
--- a/src/Java/miscutil/core/item/general/NuclearFuelRodBase.java
+++ b/src/Java/gtPlusPlus/core/item/general/NuclearFuelRodBase.java
@@ -1,4 +1,4 @@
-package miscutil.core.item.general;
+package gtPlusPlus.core.item.general;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
diff --git a/src/Java/miscutil/core/item/general/RF2EU_Battery.java b/src/Java/gtPlusPlus/core/item/general/RF2EU_Battery.java
index 9c024c27f4..f1141e1ef4 100644
--- a/src/Java/miscutil/core/item/general/RF2EU_Battery.java
+++ b/src/Java/gtPlusPlus/core/item/general/RF2EU_Battery.java
@@ -1,15 +1,15 @@
-package miscutil.core.item.general;
+package gtPlusPlus.core.item.general;
 
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.math.MathUtils;
 import ic2.api.item.ElectricItem;
 import ic2.api.item.IElectricItem;
 import ic2.api.item.IElectricItemManager;
 
 import java.util.List;
 
-import miscutil.core.creative.AddToCreativeTab;
-import miscutil.core.lib.CORE;
-import miscutil.core.util.item.UtilsItems;
-import miscutil.core.util.math.MathUtils;
 import net.minecraft.client.Minecraft;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
diff --git a/src/Java/miscutil/core/item/general/fuelrods/FuelRod_Base.java b/src/Java/gtPlusPlus/core/item/general/fuelrods/FuelRod_Base.java
index 4aa9f57092..36e6c66df8 100644
--- a/src/Java/miscutil/core/item/general/fuelrods/FuelRod_Base.java
+++ b/src/Java/gtPlusPlus/core/item/general/fuelrods/FuelRod_Base.java
@@ -1,9 +1,10 @@
-package miscutil.core.item.general.fuelrods;
+package gtPlusPlus.core.item.general.fuelrods;
+
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
 
 import java.util.List;
 
-import miscutil.core.creative.AddToCreativeTab;
-import miscutil.core.lib.CORE;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
diff --git a/src/Java/miscutil/core/item/general/fuelrods/FuelRod_Thorium.java b/src/Java/gtPlusPlus/core/item/general/fuelrods/FuelRod_Thorium.java
index 0e8230645b..9b852cb1ea 100644
--- a/src/Java/miscutil/core/item/general/fuelrods/FuelRod_Thorium.java
+++ b/src/Java/gtPlusPlus/core/item/general/fuelrods/FuelRod_Thorium.java
@@ -1,4 +1,4 @@
-package miscutil.core.item.general.fuelrods;
+package gtPlusPlus.core.item.general.fuelrods;
 
 public class FuelRod_Thorium extends FuelRod_Base{
 
diff --git a/src/Java/miscutil/core/item/init/ItemsFoods.java b/src/Java/gtPlusPlus/core/item/init/ItemsFoods.java
index abb18f628d..8f1a2083ac 100644
--- a/src/Java/miscutil/core/item/init/ItemsFoods.java
+++ b/src/Java/gtPlusPlus/core/item/init/ItemsFoods.java
@@ -1,11 +1,11 @@
-package miscutil.core.item.init;
+package gtPlusPlus.core.item.init;
 
 import gregtech.api.util.GT_OreDictUnificator;
-import miscutil.core.item.ModItems;
-import miscutil.core.item.base.foods.BaseItemFood;
-import miscutil.core.item.base.foods.BaseItemHotFood;
-import miscutil.core.lib.CORE;
-import miscutil.core.util.item.UtilsItems;
+import gtPlusPlus.core.item.ModItems;
+import gtPlusPlus.core.item.base.foods.BaseItemFood;
+import gtPlusPlus.core.item.base.foods.BaseItemHotFood;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.item.UtilsItems;
 import net.minecraft.potion.Potion;
 import net.minecraft.potion.PotionEffect;
 
diff --git a/src/Java/miscutil/core/item/materials/MaterialHandler.java b/src/Java/gtPlusPlus/core/item/materials/MaterialHandler.java
index 7a4f8aba05..0f89f2a0ff 100644
--- a/src/Java/miscutil/core/item/materials/MaterialHandler.java
+++ b/src/Java/gtPlusPlus/core/item/materials/MaterialHandler.java
@@ -1,4 +1,4 @@
-package miscutil.core.item.materials;
+package gtPlusPlus.core.item.materials;
 
 public class MaterialHandler {
 
diff --git a/src/Java/miscutil/core/item/tool/misc/SandstoneHammer.java b/src/Java/gtPlusPlus/core/item/tool/misc/SandstoneHammer.java
index b3b1684e23..108ac4b83d 100644
--- a/src/Java/miscutil/core/item/tool/misc/SandstoneHammer.java
+++ b/src/Java/gtPlusPlus/core/item/tool/misc/SandstoneHammer.java
@@ -1,9 +1,10 @@
-package miscutil.core.item.tool.misc;
+package gtPlusPlus.core.item.tool.misc;
+
+import gtPlusPlus.core.item.base.BaseItemWithDamageValue;
+import gtPlusPlus.core.lib.CORE;
 
 import java.util.List;
 
-import miscutil.core.item.base.BaseItemWithDamageValue;
-import miscutil.core.lib.CORE;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.EnumRarity;
 import net.minecraft.item.ItemStack;
diff --git a/src/Java/miscutil/core/item/tool/staballoy/MultiPickaxeBase.java b/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java
index 49d62956a8..ea59ed2b7e 100644
--- a/src/Java/miscutil/core/item/tool/staballoy/MultiPickaxeBase.java
+++ b/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java
@@ -1,10 +1,10 @@
-package miscutil.core.item.tool.staballoy;
+package gtPlusPlus.core.item.tool.staballoy;
 
-import miscutil.core.creative.AddToCreativeTab;
-import miscutil.core.lib.CORE;
-import miscutil.core.util.Utils;
-import miscutil.core.util.math.MathUtils;
-import miscutil.core.util.player.UtilsMining;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.math.MathUtils;
+import gtPlusPlus.core.util.player.UtilsMining;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
diff --git a/src/Java/miscutil/core/item/tool/staballoy/StaballoyAxe.java b/src/Java/gtPlusPlus/core/item/tool/staballoy/StaballoyAxe.java
index 667c57fddc..07c5800a1f 100644
--- a/src/Java/miscutil/core/item/tool/staballoy/StaballoyAxe.java
+++ b/src/Java/gtPlusPlus/core/item/tool/staballoy/StaballoyAxe.java
@@ -1,8 +1,9 @@
-package miscutil.core.item.tool.staballoy;
+package gtPlusPlus.core.item.tool.staballoy;
+
+import gtPlusPlus.core.lib.CORE;
 
 import java.util.List;
 
-import miscutil.core.lib.CORE;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockAir;
 import net.minecraft.block.BlockCocoa;
diff --git a/src/Java/miscutil/core/item/tool/staballoy/StaballoyPickaxe.java b/src/Java/gtPlusPlus/core/item/tool/staballoy/StaballoyPickaxe.java
index c25dc07d88..a21ee7e6ad 100644
--- a/src/Java/miscutil/core/item/tool/staballoy/StaballoyPickaxe.java
+++ b/src/Java/gtPlusPlus/core/item/tool/staballoy/StaballoyPickaxe.java
@@ -1,10 +1,11 @@
-package miscutil.core.item.tool.staballoy;
+package gtPlusPlus.core.item.tool.staballoy;
+
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.player.UtilsMining;
 
 import java.util.List;
 
-import miscutil.core.lib.CORE;
-import miscutil.core.util.Utils;
-import miscutil.core.util.player.UtilsMining;
 import net.minecraft.block.Block;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
diff --git a/src/Java/miscutil/core/lib/CORE.java b/src/Java/gtPlusPlus/core/lib/CORE.java
index b2f29b8ad9..262f46b831 100644
--- a/src/Java/miscutil/core/lib/CORE.java
+++ b/src/Java/gtPlusPlus/core/lib/CORE.java
@@ -1,14 +1,15 @@
-package miscutil.core.lib;
+package gtPlusPlus.core.lib;
+
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.util.gregtech.recipehandlers.GregtechRecipe;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
+import gtPlusPlus.xmod.gregtech.api.interfaces.internal.IGregtech_RecipeAdder;
+import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import miscutil.core.creative.AddToCreativeTab;
-import miscutil.core.util.gregtech.recipehandlers.GregtechRecipe;
-import miscutil.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
-import miscutil.xmod.gregtech.api.interfaces.internal.IGregtech_RecipeAdder;
-import miscutil.xmod.gregtech.common.Meta_GT_Proxy;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraftforge.common.config.Configuration;
diff --git a/src/Java/miscutil/core/lib/LoadedMods.java b/src/Java/gtPlusPlus/core/lib/LoadedMods.java
index 7b454ac3c0..f1cc7eb830 100644
--- a/src/Java/miscutil/core/lib/LoadedMods.java
+++ b/src/Java/gtPlusPlus/core/lib/LoadedMods.java
@@ -1,9 +1,9 @@
-package miscutil.core.lib;
+package gtPlusPlus.core.lib;
 
-import miscutil.core.lib.CORE.configSwitches;
-import miscutil.core.util.Utils;
-import miscutil.xmod.gregtech.api.enums.GregtechTextures;
-import miscutil.xmod.gregtech.recipes.GregtechRecipeAdder;
+import gtPlusPlus.core.lib.CORE.configSwitches;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechTextures;
+import gtPlusPlus.xmod.gregtech.recipes.GregtechRecipeAdder;
 import cpw.mods.fml.common.Loader;
 
 public class LoadedMods {
diff --git a/src/Java/miscutil/core/lib/MaterialInfo.java b/src/Java/gtPlusPlus/core/lib/MaterialInfo.java
index 4d651f4476..5f80224bca 100644
--- a/src/Java/miscutil/core/lib/MaterialInfo.java
+++ b/src/Java/gtPlusPlus/core/lib/MaterialInfo.java
@@ -1,16 +1,20 @@
-package miscutil.core.lib;
+package gtPlusPlus.core.lib;
 
-import static miscutil.core.lib.CORE.noItem;
-import static miscutil.core.util.item.UtilsItems.getItemStackOfAmountFromOreDict;
+import static gtPlusPlus.core.lib.CORE.noItem;
+import static gtPlusPlus.core.util.item.UtilsItems.getItemStackOfAmountFromOreDict;
+import gregtech.api.enums.Dyes;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.TextureSet;
+import gtPlusPlus.GTplusplus;
+import gtPlusPlus.core.util.materials.MaterialUtils;
 
 import java.util.List;
 
-import miscutil.MiscUtils;
 import net.minecraft.item.ItemStack;
 
 public enum MaterialInfo {
 		
-	ENERGYCRYSTAL(MiscUtils.randomDust_A, 8, MiscUtils.randomDust_B, 8, MiscUtils.randomDust_C, 8, MiscUtils.randomDust_D, 8, "dustEnergyCrystal", 1, noItem, 0),
+	ENERGYCRYSTAL(GTplusplus.randomDust_A, 8, GTplusplus.randomDust_B, 8, GTplusplus.randomDust_C, 8, GTplusplus.randomDust_D, 8, "dustEnergyCrystal", 1, noItem, 0),
 	BLOODSTEEL(noItem, 0, noItem, 0, noItem, 0, noItem, 0, noItem, 0, noItem, 0),
 	STABALLOY("dustTitanium", 1, "dustUranium", 8, noItem, 0, noItem, 0, "dustStaballoy", 1, noItem, 0),
 	TANTALLOY60("dustTungsten", 1, "dustTantalum", 8, "dustTinyTitanium", 5, noItem, 0,	"dustTantalloy60", 1, noItem, 0),
@@ -57,6 +61,7 @@ public enum MaterialInfo {
 	private int outAmount1;
 	private int outAmount2;
 	public static List<String> nonLoadedInputs;
+	public final Materials materialGT;
 	
 	private MaterialInfo (
 			String inputMaterial_1, int amountIn1,
@@ -77,6 +82,14 @@ public enum MaterialInfo {
 		this.out2 = output_B;
 		this.outAmount1 = amount1;
 		this.outAmount2 = amount2;
+		
+		
+		
+		this.materialGT = MaterialUtils.addGtMaterial(
+				getMaterialName().toLowerCase(), TextureSet.SET_DULL, 2f, 512, 2,
+				1 | 2 | 16 | 32 | 64 | 128,
+				193, 211, 217, 0, getMaterialName(), 0, 0, 3015, 2150, true,
+				false, 1, 2, 1, Dyes.dyeWhite, 2, null, null);		
 	}
 
 	public ItemStack[] getInputs() {
@@ -115,7 +128,8 @@ public enum MaterialInfo {
 		return inputArray;
 	}
 	
-	public static ItemStack getStack(String i, int r){
+	@SuppressWarnings("static-method")
+	public ItemStack getStack(String i, int r){
 		if (i == ""){
 			return null;
 		}
@@ -125,6 +139,11 @@ public enum MaterialInfo {
 		}
 		return temp;
 	}
+	
+	public String getMaterialName(){
+		String x = this.name();
+		return x;
+	}
 
 
 }
diff --git a/src/Java/miscutil/core/proxy/ClientProxy.java b/src/Java/gtPlusPlus/core/proxy/ClientProxy.java
index 5e088b47b4..3019a71266 100644
--- a/src/Java/miscutil/core/proxy/ClientProxy.java
+++ b/src/Java/gtPlusPlus/core/proxy/ClientProxy.java
@@ -1,7 +1,7 @@
-package miscutil.core.proxy;
+package gtPlusPlus.core.proxy;
 
-import miscutil.core.common.CommonProxy;
-import miscutil.core.util.particles.EntityParticleFXMysterious;
+import gtPlusPlus.core.common.CommonProxy;
+import gtPlusPlus.core.util.particles.EntityParticleFXMysterious;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.particle.EntityFX;
 import net.minecraft.entity.Entity;
diff --git a/src/Java/miscutil/core/proxy/ServerProxy.java b/src/Java/gtPlusPlus/core/proxy/ServerProxy.java
index 358436084d..1f912b9022 100644
--- a/src/Java/miscutil/core/proxy/ServerProxy.java
+++ b/src/Java/gtPlusPlus/core/proxy/ServerProxy.java
@@ -1,6 +1,6 @@
-package miscutil.core.proxy;
+package gtPlusPlus.core.proxy;
 
-import miscutil.core.common.CommonProxy;
+import gtPlusPlus.core.common.CommonProxy;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
 import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
diff --git a/src/Java/miscutil/core/recipe/Gregtech_Recipe_Adder.java b/src/Java/gtPlusPlus/core/recipe/Gregtech_Recipe_Adder.java
index 631d4d4bea..0f31c4c61d 100644
--- a/src/Java/miscutil/core/recipe/Gregtech_Recipe_Adder.java
+++ b/src/Java/gtPlusPlus/core/recipe/Gregtech_Recipe_Adder.java
@@ -1,9 +1,9 @@
-package miscutil.core.recipe;
+package gtPlusPlus.core.recipe;
 
 import gregtech.api.enums.GT_Values;
 import gregtech.api.util.GT_ModHandler;
-import miscutil.core.util.Utils;
-import miscutil.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.item.UtilsItems;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 
diff --git a/src/Java/miscutil/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index bff73a4db9..addeb8b74a 100644
--- a/src/Java/miscutil/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -1,4 +1,4 @@
-package miscutil.core.recipe;
+package gtPlusPlus.core.recipe;
 
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.ItemList;
@@ -6,12 +6,12 @@ import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_OreDictUnificator;
-import miscutil.core.item.ModItems;
-import miscutil.core.lib.CORE;
-import miscutil.core.util.Utils;
-import miscutil.core.util.fluid.FluidUtils;
-import miscutil.core.util.item.UtilsItems;
-import miscutil.xmod.gregtech.api.enums.GregtechItemList;
+import gtPlusPlus.core.item.ModItems;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.fluid.FluidUtils;
+import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import net.minecraft.item.ItemStack;
 
 public class RECIPES_GREGTECH {
diff --git a/src/Java/miscutil/core/recipe/RECIPES_LaserEngraver.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java
index ba53337de3..94a1d85ae3 100644
--- a/src/Java/miscutil/core/recipe/RECIPES_LaserEngraver.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java
@@ -1,4 +1,4 @@
-package miscutil.core.recipe;
+package gtPlusPlus.core.recipe;
 
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.Materials;
@@ -7,7 +7,7 @@ import gregtech.api.enums.OrePrefixes;
 import gregtech.api.interfaces.IOreRecipeRegistrator;
 import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Utility;
-import miscutil.xmod.gregtech.api.enums.GregtechItemList;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import net.minecraft.item.ItemStack;
 
 public class RECIPES_LaserEngraver implements IOreRecipeRegistrator {
diff --git a/src/Java/miscutil/core/recipe/RECIPES_MTWRAPPER.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_MTWRAPPER.java
index 2f31d133db..6d81ba42ad 100644
--- a/src/Java/miscutil/core/recipe/RECIPES_MTWRAPPER.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_MTWRAPPER.java
@@ -1,11 +1,12 @@
-package miscutil.core.recipe;
+package gtPlusPlus.core.recipe;
+
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.recipe.UtilsRecipe;
+import gtPlusPlus.core.util.wrapper.var;
 
 import java.util.ArrayList;
 
-import miscutil.core.util.Utils;
-import miscutil.core.util.item.UtilsItems;
-import miscutil.core.util.recipe.UtilsRecipe;
-import miscutil.core.util.wrapper.var;
 import net.minecraft.item.ItemStack;
 
 public class RECIPES_MTWRAPPER {
diff --git a/src/Java/miscutil/core/recipe/RECIPES_MachineComponents.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java
index 9f9716fbbb..f5e3fd1ad5 100644
--- a/src/Java/miscutil/core/recipe/RECIPES_MachineComponents.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java
@@ -1,4 +1,4 @@
-package miscutil.core.recipe;
+package gtPlusPlus.core.recipe;
 
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.ItemList;
@@ -6,10 +6,10 @@ import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.SubTag;
 import gregtech.api.util.GT_OreDictUnificator;
-import miscutil.core.lib.CORE;
-import miscutil.core.util.Utils;
-import miscutil.core.util.recipe.UtilsRecipe;
-import miscutil.xmod.gregtech.api.enums.GregtechItemList;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.recipe.UtilsRecipe;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 
 public class RECIPES_MachineComponents {
 	
diff --git a/src/Java/miscutil/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index 55584cf2ac..a0d244ea85 100644
--- a/src/Java/miscutil/core/recipe/RECIPES_Machines.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -1,14 +1,14 @@
-package miscutil.core.recipe;
+package gtPlusPlus.core.recipe;
 
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
-import miscutil.core.lib.LoadedMods;
-import miscutil.core.util.Utils;
-import miscutil.core.util.item.UtilsItems;
-import miscutil.core.util.recipe.UtilsRecipe;
-import miscutil.xmod.gregtech.api.enums.GregtechItemList;
-import miscutil.xmod.gregtech.api.enums.GregtechOrePrefixes;
-import miscutil.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
+import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.recipe.UtilsRecipe;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
 import net.minecraft.item.ItemStack;
 
 public class RECIPES_Machines {
diff --git a/src/Java/miscutil/core/recipe/RECIPES_Shapeless.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Shapeless.java
index f969e18b19..2a79aa92c9 100644
--- a/src/Java/miscutil/core/recipe/RECIPES_Shapeless.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Shapeless.java
@@ -1,9 +1,9 @@
-package miscutil.core.recipe;
+package gtPlusPlus.core.recipe;
 
 import gregtech.api.enums.ItemList;
-import miscutil.core.lib.LoadedMods;
-import miscutil.core.util.Utils;
-import miscutil.core.util.recipe.UtilsRecipe;
+import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.recipe.UtilsRecipe;
 import net.minecraft.item.ItemStack;
 
 public class RECIPES_Shapeless {
diff --git a/src/Java/miscutil/core/recipe/RECIPES_Tools.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Tools.java
index 49742512ed..2f97d7e7ff 100644
--- a/src/Java/miscutil/core/recipe/RECIPES_Tools.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Tools.java
@@ -1,8 +1,8 @@
-package miscutil.core.recipe;
+package gtPlusPlus.core.recipe;
 
-import miscutil.core.item.ModItems;
-import miscutil.core.util.item.UtilsItems;
-import miscutil.core.util.recipe.UtilsRecipe;
+import gtPlusPlus.core.item.ModItems;
+import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.recipe.UtilsRecipe;
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
diff --git a/src/Java/miscutil/core/recipe/RECIPE_Batteries.java b/src/Java/gtPlusPlus/core/recipe/RECIPE_Batteries.java
index fcd3993745..80ee79e292 100644
--- a/src/Java/miscutil/core/recipe/RECIPE_Batteries.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPE_Batteries.java
@@ -1,10 +1,10 @@
-package miscutil.core.recipe;
+package gtPlusPlus.core.recipe;
 
 import gregtech.api.enums.ItemList;
-import miscutil.core.lib.LoadedMods;
-import miscutil.core.util.item.UtilsItems;
-import miscutil.core.util.recipe.UtilsRecipe;
-import miscutil.xmod.gregtech.api.enums.GregtechItemList;
+import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.recipe.UtilsRecipe;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import net.minecraft.item.ItemStack;
 
 public class RECIPE_Batteries {
diff --git a/src/Java/miscutil/core/recipe/RECIPE_CONSTANTS.java b/src/Java/gtPlusPlus/core/recipe/RECIPE_CONSTANTS.java
index 569cd8cf15..df945bf9ec 100644
--- a/src/Java/miscutil/core/recipe/RECIPE_CONSTANTS.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPE_CONSTANTS.java
@@ -1,8 +1,8 @@
-package miscutil.core.recipe;
+package gtPlusPlus.core.recipe;
 
-import miscutil.core.lib.CORE;
-import miscutil.core.util.item.UtilsItems;
-import miscutil.xmod.gregtech.api.enums.GregtechItemList;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import net.minecraft.item.ItemStack;
 
 public class RECIPE_CONSTANTS {
diff --git a/src/Java/miscutil/core/recipe/ShapedRecipeObject.java b/src/Java/gtPlusPlus/core/recipe/ShapedRecipeObject.java
index bde574b3e6..c6dc1ede1b 100644
--- a/src/Java/miscutil/core/recipe/ShapedRecipeObject.java
+++ b/src/Java/gtPlusPlus/core/recipe/ShapedRecipeObject.java
@@ -1,7 +1,7 @@
-package miscutil.core.recipe;
+package gtPlusPlus.core.recipe;
 
-import miscutil.core.util.Utils;
-import miscutil.core.util.recipe.UtilsRecipe;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.recipe.UtilsRecipe;
 import net.minecraft.item.ItemStack;
 
 public class ShapedRecipeObject {
diff --git a/src/Java/miscutil/core/slots/SlotFrame.java b/src/Java/gtPlusPlus/core/slots/SlotFrame.java
index 8deca37d1e..13bc8fa717 100644
--- a/src/Java/miscutil/core/slots/SlotFrame.java
+++ b/src/Java/gtPlusPlus/core/slots/SlotFrame.java
@@ -1,4 +1,4 @@
-package miscutil.core.slots;
+package gtPlusPlus.core.slots;
 
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;
diff --git a/src/Java/miscutil/core/slots/SlotItemBackpackInv.java b/src/Java/gtPlusPlus/core/slots/SlotItemBackpackInv.java
index 534230ba59..7a22086949 100644
--- a/src/Java/miscutil/core/slots/SlotItemBackpackInv.java
+++ b/src/Java/gtPlusPlus/core/slots/SlotItemBackpackInv.java
@@ -1,6 +1,6 @@
-package miscutil.core.slots;
+package gtPlusPlus.core.slots;
 
-import miscutil.core.item.base.BaseItemBackpack;
+import gtPlusPlus.core.item.base.BaseItemBackpack;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
diff --git a/src/Java/miscutil/core/slots/SlotRTG.java b/src/Java/gtPlusPlus/core/slots/SlotRTG.java
index b653cc62d1..1f16463de2 100644
--- a/src/Java/miscutil/core/slots/SlotRTG.java
+++ b/src/Java/gtPlusPlus/core/slots/SlotRTG.java
@@ -1,4 +1,4 @@
-package miscutil.core.slots;
+package gtPlusPlus.core.slots;
 
 import ic2.core.Ic2Items;
 import net.minecraft.inventory.IInventory;
diff --git a/src/Java/miscutil/core/tileentities/ModTileEntities.java b/src/Java/gtPlusPlus/core/tileentities/ModTileEntities.java
index 0f5ba5ed56..246c7ff285 100644
--- a/src/Java/miscutil/core/tileentities/ModTileEntities.java
+++ b/src/Java/gtPlusPlus/core/tileentities/ModTileEntities.java
@@ -1,6 +1,6 @@
-package miscutil.core.tileentities;
+package gtPlusPlus.core.tileentities;
 
-import miscutil.core.util.Utils;
+import gtPlusPlus.core.util.Utils;
 
 public class ModTileEntities {
 
diff --git a/src/Java/miscutil/core/tileentities/base/TILE_ENTITY_BASE.java b/src/Java/gtPlusPlus/core/tileentities/base/TILE_ENTITY_BASE.java
index 20bee0b07c..67c592c79c 100644
--- a/src/Java/miscutil/core/tileentities/base/TILE_ENTITY_BASE.java
+++ b/src/Java/gtPlusPlus/core/tileentities/base/TILE_ENTITY_BASE.java
@@ -1,4 +1,4 @@
-package miscutil.core.tileentities.base;
+package gtPlusPlus.core.tileentities.base;
 
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.network.NetworkManager;
diff --git a/src/Java/miscutil/core/tileentities/general/TileEntityReverter.java b/src/Java/gtPlusPlus/core/tileentities/general/TileEntityReverter.java
index 8793271985..8767b6607c 100644
--- a/src/Java/miscutil/core/tileentities/general/TileEntityReverter.java
+++ b/src/Java/gtPlusPlus/core/tileentities/general/TileEntityReverter.java
@@ -1,8 +1,9 @@
-package miscutil.core.tileentities.general;
+package gtPlusPlus.core.tileentities.general;
+
+import gtPlusPlus.core.block.ModBlocks;
 
 import java.util.Random;
 
-import miscutil.core.block.ModBlocks;
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.tileentity.TileEntity;
diff --git a/src/Java/miscutil/core/tileentities/machines/TileEntityCharger.java b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityCharger.java
index 6d78cb829e..9ec6aa3b24 100644
--- a/src/Java/miscutil/core/tileentities/machines/TileEntityCharger.java
+++ b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityCharger.java
@@ -1,6 +1,6 @@
-package miscutil.core.tileentities.machines;
+package gtPlusPlus.core.tileentities.machines;
 
-import miscutil.core.item.base.BaseItemWithCharge;
+import gtPlusPlus.core.item.base.BaseItemWithCharge;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
diff --git a/src/Java/miscutil/core/tileentities/machines/TileEntityNHG.java b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityNHG.java
index 4d124cae3e..3a9dbbd4c7 100644
--- a/src/Java/miscutil/core/tileentities/machines/TileEntityNHG.java
+++ b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityNHG.java
@@ -1,9 +1,9 @@
-package miscutil.core.tileentities.machines;
+package gtPlusPlus.core.tileentities.machines;
 
-import miscutil.core.item.ModItems;
-import miscutil.core.item.general.fuelrods.FuelRod_Base;
-import miscutil.core.util.Utils;
-import miscutil.core.util.math.MathUtils;
+import gtPlusPlus.core.item.ModItems;
+import gtPlusPlus.core.item.general.fuelrods.FuelRod_Base;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.math.MathUtils;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
diff --git a/src/Java/miscutil/core/util/BaseHandler.java b/src/Java/gtPlusPlus/core/util/BaseHandler.java
index ac613f043e..63f22f3763 100644
--- a/src/Java/miscutil/core/util/BaseHandler.java
+++ b/src/Java/gtPlusPlus/core/util/BaseHandler.java
@@ -1,4 +1,4 @@
-package miscutil.core.util;
+package gtPlusPlus.core.util;
 
 public abstract class BaseHandler {
 
diff --git a/src/Java/miscutil/core/util/ClassUtils.java b/src/Java/gtPlusPlus/core/util/ClassUtils.java
index ecf83f8b8f..ba3db748f9 100644
--- a/src/Java/miscutil/core/util/ClassUtils.java
+++ b/src/Java/gtPlusPlus/core/util/ClassUtils.java
@@ -1,4 +1,4 @@
-package miscutil.core.util;
+package gtPlusPlus.core.util;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
diff --git a/src/Java/miscutil/core/util/Log.java b/src/Java/gtPlusPlus/core/util/Log.java
index 90c9dbdf79..ea7076e453 100644
--- a/src/Java/miscutil/core/util/Log.java
+++ b/src/Java/gtPlusPlus/core/util/Log.java
@@ -1,4 +1,4 @@
-package miscutil.core.util;
+package gtPlusPlus.core.util;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
diff --git a/src/Java/miscutil/core/util/LoggingUtils.java b/src/Java/gtPlusPlus/core/util/LoggingUtils.java
index 5942ead120..7783577ee2 100644
--- a/src/Java/miscutil/core/util/LoggingUtils.java
+++ b/src/Java/gtPlusPlus/core/util/LoggingUtils.java
@@ -1,4 +1,4 @@
-package miscutil.core.util;
+package gtPlusPlus.core.util;
 
 import java.io.BufferedWriter;
 import java.io.File;
diff --git a/src/Java/miscutil/core/util/Utils.java b/src/Java/gtPlusPlus/core/util/Utils.java
index 24236b0e0a..f6430cc75d 100644
--- a/src/Java/miscutil/core/util/Utils.java
+++ b/src/Java/gtPlusPlus/core/util/Utils.java
@@ -1,8 +1,13 @@
-package miscutil.core.util;
+package gtPlusPlus.core.util;
 
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.TC_Aspects;
 import gregtech.api.enums.TC_Aspects.TC_AspectStack;
+import gtPlusPlus.GTplusplus;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.fluid.FluidUtils;
+import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.math.MathUtils;
 import ic2.core.IC2Potion;
 import ic2.core.Ic2Items;
 import ic2.core.init.InternalName;
@@ -21,11 +26,6 @@ import java.util.Timer;
 import java.util.TimerTask;
 import java.util.UUID;
 
-import miscutil.MiscUtils;
-import miscutil.core.lib.CORE;
-import miscutil.core.util.fluid.FluidUtils;
-import miscutil.core.util.item.UtilsItems;
-import miscutil.core.util.math.MathUtils;
 import net.minecraft.block.Block;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLiving;
@@ -300,7 +300,7 @@ public class Utils {
 	}
 
 	public static void spawnCustomParticle(Entity entity){
-		MiscUtils.proxy.generateMysteriousParticles(entity);
+		GTplusplus.proxy.generateMysteriousParticles(entity);
 	}	
 
 	public static void spawnFX(World world, int x, int y, int z, String particleName, Object particleName2){
diff --git a/src/Java/miscutil/core/util/UtilsChatFormatting.java b/src/Java/gtPlusPlus/core/util/UtilsChatFormatting.java
index 5a7691f8aa..9e358b3074 100644
--- a/src/Java/miscutil/core/util/UtilsChatFormatting.java
+++ b/src/Java/gtPlusPlus/core/util/UtilsChatFormatting.java
@@ -1,4 +1,4 @@
-package miscutil.core.util;
+package gtPlusPlus.core.util;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/src/Java/miscutil/core/util/UtilsRarity.java b/src/Java/gtPlusPlus/core/util/UtilsRarity.java
index 9369e3b534..19339b7717 100644
--- a/src/Java/miscutil/core/util/UtilsRarity.java
+++ b/src/Java/gtPlusPlus/core/util/UtilsRarity.java
@@ -1,4 +1,4 @@
-package miscutil.core.util;
+package gtPlusPlus.core.util;
 
 import net.minecraft.util.EnumChatFormatting;
 
diff --git a/src/Java/miscutil/core/util/UtilsText.java b/src/Java/gtPlusPlus/core/util/UtilsText.java
index 79f2b4d4ac..e91fa95e4c 100644
--- a/src/Java/miscutil/core/util/UtilsText.java
+++ b/src/Java/gtPlusPlus/core/util/UtilsText.java
@@ -1,4 +1,4 @@
-package miscutil.core.util;
+package gtPlusPlus.core.util;
 
 public enum UtilsText {
 
diff --git a/src/Java/miscutil/core/util/debug/DEBUG_BLOCK_ShapeSpawner.java b/src/Java/gtPlusPlus/core/util/debug/DEBUG_BLOCK_ShapeSpawner.java
index 2c39fe0917..74df9f90ba 100644
--- a/src/Java/miscutil/core/util/debug/DEBUG_BLOCK_ShapeSpawner.java
+++ b/src/Java/gtPlusPlus/core/util/debug/DEBUG_BLOCK_ShapeSpawner.java
@@ -1,9 +1,9 @@
-package miscutil.core.util.debug;
+package gtPlusPlus.core.util.debug;
 
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import miscutil.core.util.Utils;
+import gtPlusPlus.core.util.Utils;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.util.ForgeDirection;
 
diff --git a/src/Java/miscutil/core/util/debug/DEBUG_INIT.java b/src/Java/gtPlusPlus/core/util/debug/DEBUG_INIT.java
index 6e85c06ccd..440949471c 100644
--- a/src/Java/miscutil/core/util/debug/DEBUG_INIT.java
+++ b/src/Java/gtPlusPlus/core/util/debug/DEBUG_INIT.java
@@ -1,10 +1,10 @@
-package miscutil.core.util.debug;
+package gtPlusPlus.core.util.debug;
 
-import miscutil.core.creative.AddToCreativeTab;
-import miscutil.core.item.ModItems;
-import miscutil.core.item.base.BaseItemWithCharge;
-import miscutil.core.item.general.BedLocator_Base;
-import miscutil.core.lib.CORE;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.item.ModItems;
+import gtPlusPlus.core.item.base.BaseItemWithCharge;
+import gtPlusPlus.core.item.general.BedLocator_Base;
+import gtPlusPlus.core.lib.CORE;
 import net.minecraftforge.common.MinecraftForge;
 import cpw.mods.fml.common.registry.GameRegistry;
 
diff --git a/src/Java/miscutil/core/util/debug/DEBUG_ITEM_ShapeSpawner.java b/src/Java/gtPlusPlus/core/util/debug/DEBUG_ITEM_ShapeSpawner.java
index 47bf9977ff..bfaa7404e1 100644
--- a/src/Java/miscutil/core/util/debug/DEBUG_ITEM_ShapeSpawner.java
+++ b/src/Java/gtPlusPlus/core/util/debug/DEBUG_ITEM_ShapeSpawner.java
@@ -1,12 +1,12 @@
-package miscutil.core.util.debug;
+package gtPlusPlus.core.util.debug;
 
 import static net.minecraftforge.event.entity.player.PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.item.base.BaseItemGeneric;
+import gtPlusPlus.core.util.Utils;
 
 import java.util.List;
 
-import miscutil.core.creative.AddToCreativeTab;
-import miscutil.core.item.base.BaseItemGeneric;
-import miscutil.core.util.Utils;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
diff --git a/src/Java/miscutil/core/util/debug/DEBUG_MULTIBLOCK_ShapeSpawner.java b/src/Java/gtPlusPlus/core/util/debug/DEBUG_MULTIBLOCK_ShapeSpawner.java
index b81a08ecf6..78acb27cfb 100644
--- a/src/Java/miscutil/core/util/debug/DEBUG_MULTIBLOCK_ShapeSpawner.java
+++ b/src/Java/gtPlusPlus/core/util/debug/DEBUG_MULTIBLOCK_ShapeSpawner.java
@@ -1,4 +1,4 @@
-package miscutil.core.util.debug;
+package gtPlusPlus.core.util.debug;
 
 import static gregtech.api.enums.GT_Values.V;
 import gregtech.GT_Mod;
diff --git a/src/Java/miscutil/core/util/debug/DEBUG_ScreenOverlay.java b/src/Java/gtPlusPlus/core/util/debug/DEBUG_ScreenOverlay.java
index aefe66fc04..9153543eaf 100644
--- a/src/Java/miscutil/core/util/debug/DEBUG_ScreenOverlay.java
+++ b/src/Java/gtPlusPlus/core/util/debug/DEBUG_ScreenOverlay.java
@@ -1,4 +1,4 @@
-package miscutil.core.util.debug;
+package gtPlusPlus.core.util.debug;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
diff --git a/src/Java/miscutil/core/util/debug/DEBUG_TimerThread.java b/src/Java/gtPlusPlus/core/util/debug/DEBUG_TimerThread.java
index db960dbadf..1eb69eb11b 100644
--- a/src/Java/miscutil/core/util/debug/DEBUG_TimerThread.java
+++ b/src/Java/gtPlusPlus/core/util/debug/DEBUG_TimerThread.java
@@ -1,8 +1,9 @@
-package miscutil.core.util.debug;
+package gtPlusPlus.core.util.debug;
+
+import gtPlusPlus.core.util.Utils;
 
 import java.util.concurrent.TimeUnit;
 
-import miscutil.core.util.Utils;
 import net.minecraft.client.Minecraft;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
diff --git a/src/Java/miscutil/core/util/debug/UtilityGL11Debug.java b/src/Java/gtPlusPlus/core/util/debug/UtilityGL11Debug.java
index 2e25986cfa..59c652d73b 100644
--- a/src/Java/miscutil/core/util/debug/UtilityGL11Debug.java
+++ b/src/Java/gtPlusPlus/core/util/debug/UtilityGL11Debug.java
@@ -1,4 +1,4 @@
-package miscutil.core.util.debug;
+package gtPlusPlus.core.util.debug;
 
 import java.nio.ByteBuffer;
 
diff --git a/src/Java/miscutil/core/util/fluid/FluidUtils.java b/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java
index 8977b0e8ea..53873c6e4e 100644
--- a/src/Java/miscutil/core/util/fluid/FluidUtils.java
+++ b/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java
@@ -1,6 +1,6 @@
-package miscutil.core.util.fluid;
+package gtPlusPlus.core.util.fluid;
 
-import miscutil.core.util.Utils;
+import gtPlusPlus.core.util.Utils;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 
diff --git a/src/Java/miscutil/core/util/gregtech/recipehandlers/GregtechRecipe.java b/src/Java/gtPlusPlus/core/util/gregtech/recipehandlers/GregtechRecipe.java
index bab4c1ff0d..d1857ffefc 100644
--- a/src/Java/miscutil/core/util/gregtech/recipehandlers/GregtechRecipe.java
+++ b/src/Java/gtPlusPlus/core/util/gregtech/recipehandlers/GregtechRecipe.java
@@ -1,11 +1,11 @@
-package miscutil.core.util.gregtech.recipehandlers;
+package gtPlusPlus.core.util.gregtech.recipehandlers;
 
 import gregtech.api.util.GT_ModHandler;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
 
 import java.lang.reflect.Method;
 
-import miscutil.core.lib.CORE;
-import miscutil.core.util.Utils;
 import net.minecraft.item.ItemStack;
 
 public final class GregtechRecipe {
diff --git a/src/Java/miscutil/core/util/item/UtilsItems.java b/src/Java/gtPlusPlus/core/util/item/UtilsItems.java
index e7d7ca6f8e..623fc1707c 100644
--- a/src/Java/miscutil/core/util/item/UtilsItems.java
+++ b/src/Java/gtPlusPlus/core/util/item/UtilsItems.java
@@ -1,31 +1,31 @@
-package miscutil.core.util.item;
+package gtPlusPlus.core.util.item;
 
 import gregtech.api.enums.Materials;
 import gregtech.api.util.GT_OreDictUnificator;
+import gtPlusPlus.core.block.base.BlockBaseModular;
+import gtPlusPlus.core.block.base.BasicBlock.BlockTypes;
+import gtPlusPlus.core.item.ModItems;
+import gtPlusPlus.core.item.base.BasicSpawnEgg;
+import gtPlusPlus.core.item.base.bolts.BaseItemBolt;
+import gtPlusPlus.core.item.base.dusts.BaseItemDust;
+import gtPlusPlus.core.item.base.gears.BaseItemGear;
+import gtPlusPlus.core.item.base.ingots.BaseItemIngot;
+import gtPlusPlus.core.item.base.ingots.BaseItemIngotHot;
+import gtPlusPlus.core.item.base.plates.BaseItemPlate;
+import gtPlusPlus.core.item.base.rings.BaseItemRing;
+import gtPlusPlus.core.item.base.rods.BaseItemRod;
+import gtPlusPlus.core.item.base.rods.BaseItemRodLong;
+import gtPlusPlus.core.item.base.rotors.BaseItemRotor;
+import gtPlusPlus.core.item.base.screws.BaseItemScrew;
+import gtPlusPlus.core.item.tool.staballoy.MultiPickaxeBase;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.core.lib.MaterialInfo;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.wrapper.var;
 
 import java.util.ArrayList;
 
-import miscutil.core.block.base.BasicBlock.BlockTypes;
-import miscutil.core.block.base.BlockBaseModular;
-import miscutil.core.item.ModItems;
-import miscutil.core.item.base.BasicSpawnEgg;
-import miscutil.core.item.base.bolts.BaseItemBolt;
-import miscutil.core.item.base.dusts.BaseItemDust;
-import miscutil.core.item.base.gears.BaseItemGear;
-import miscutil.core.item.base.ingots.BaseItemIngot;
-import miscutil.core.item.base.ingots.BaseItemIngotHot;
-import miscutil.core.item.base.plates.BaseItemPlate;
-import miscutil.core.item.base.rings.BaseItemRing;
-import miscutil.core.item.base.rods.BaseItemRod;
-import miscutil.core.item.base.rods.BaseItemRodLong;
-import miscutil.core.item.base.rotors.BaseItemRotor;
-import miscutil.core.item.base.screws.BaseItemScrew;
-import miscutil.core.item.tool.staballoy.MultiPickaxeBase;
-import miscutil.core.lib.CORE;
-import miscutil.core.lib.LoadedMods;
-import miscutil.core.lib.MaterialInfo;
-import miscutil.core.util.Utils;
-import miscutil.core.util.wrapper.var;
 import net.minecraft.block.Block;
 import net.minecraft.client.Minecraft;
 import net.minecraft.item.Item;
diff --git a/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java b/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java
new file mode 100644
index 0000000000..69548eb49a
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java
@@ -0,0 +1,87 @@
+package gtPlusPlus.core.util.materials;
+
+import gregtech.api.enums.Dyes;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.TC_Aspects.TC_AspectStack;
+import gregtech.api.enums.TextureSet;
+import gregtech.api.objects.MaterialStack;
+import gtPlusPlus.core.lib.MaterialInfo;
+import gtPlusPlus.core.util.Utils;
+
+import java.util.List;
+
+import net.minecraftforge.common.util.EnumHelper;
+
+public class MaterialUtils {
+	
+	public static short firstID = 791;
+
+	private static Class[][] commonTypes =
+		{{Materials.class, int.class, TextureSet.class, float.class, int.class,
+			int.class, int.class, int.class, int.class, int.class, int.class,
+			String.class, int.class, int.class, int.class, int.class, boolean.class,
+			boolean.class, int.class, int.class, int.class, Dyes.class, int.class,
+			List.class , List.class}};
+	
+	public static Materials addGtMaterial(String enumNameForMaterial, TextureSet aIconSet, float aToolSpeed, int aToolDurability, int aToolQuality, int aTypes, int aR, int aG, int aB, int aA, String aLocalName, int aFuelType, int aFuelPower, int aMeltingPoint, int aBlastFurnaceTemp, boolean aBlastFurnaceRequired, boolean aTransparent, int aOreValue, int aDensityMultiplier, int aDensityDivider, Dyes aColor, int aExtraData, List<MaterialStack> aMaterialList, List<TC_AspectStack> aAspects)
+    {
+		Utils.LOG_INFO("Attempting to add GT material: "+enumNameForMaterial);
+		return EnumHelper.addEnum(Materials.class, enumNameForMaterial, commonTypes, firstID++, aIconSet, aToolSpeed, aToolDurability, aToolQuality, aTypes, aR, aG, aB, aA, aLocalName,
+				aFuelType, aFuelPower, aMeltingPoint, aBlastFurnaceTemp, aBlastFurnaceRequired, aTransparent, aOreValue, aDensityMultiplier, aDensityDivider,
+				aColor, aExtraData, aMaterialList, aAspects);
+		}
+	
+
+	/*
+	 * That's shown, many times, in the EnumHelper code, all the add functions just wrap the addEnum function.
+	You need the target enum class, and 2 arrays, 1 holding the types for the constructor arguments, 
+	and the other holding the constructor argument values (the things being passed to the constructor)
+
+	The 'decompiled' Boolean should be set to true if the class you're adding to has been decompiled/recompiled again. 
+	(it adds a 2nd enum arguments that need to be accounted for, but isn't actually useful to you) 
+
+	 *
+	 *new Class[{int.class, TextureSet.class, float.class, int.class,
+	int.class, int.class, int.class, int.class, int.class, int.class,
+	String.class, int.class, int.class, int.class, int.class, boolean.class,
+	boolean.class, int.class, int.class, int.class, Dyes.class, int.class,
+					List.class , List.class}],
+	 */
+
+	
+
+	public static Materials GenerateGtMaterialForSingleUse(MaterialInfo s){
+
+		Materials yourName = EnumHelper.addEnum(
+
+				Materials.class, s.name(),
+
+
+
+				new Object[0]
+
+				);
+		try
+		{
+
+
+
+			/*Class<? extends ItemCell> clz = item.getClass();
+			Method methode = clz.getDeclaredMethod("addCell", int.class, InternalName.class, Block[].class);
+			methode.setAccessible(true);
+			ItemStack temp = (ItemStack) methode.invoke(item, cellID++, yourName, new Block[0]);*/
+
+
+
+
+
+
+			return Materials.Abyssal;
+		}
+		catch(Exception e){
+			e.printStackTrace();
+		}
+		return null;
+	}
+
+}
diff --git a/src/Java/miscutil/core/util/math/MathUtils.java b/src/Java/gtPlusPlus/core/util/math/MathUtils.java
index bc3cb2843c..3df5693bc3 100644
--- a/src/Java/miscutil/core/util/math/MathUtils.java
+++ b/src/Java/gtPlusPlus/core/util/math/MathUtils.java
@@ -1,10 +1,10 @@
-package miscutil.core.util.math;
+package gtPlusPlus.core.util.math;
+
+import gtPlusPlus.core.util.Utils;
 
 import java.util.Map;
 import java.util.Random;
 
-import miscutil.core.util.Utils;
-
 public class MathUtils {
 
 	/**
diff --git a/src/Java/miscutil/core/util/particles/EntityParticleFXMysterious.java b/src/Java/gtPlusPlus/core/util/particles/EntityParticleFXMysterious.java
index bcdfd25be9..2c704e48a6 100644
--- a/src/Java/miscutil/core/util/particles/EntityParticleFXMysterious.java
+++ b/src/Java/gtPlusPlus/core/util/particles/EntityParticleFXMysterious.java
@@ -1,4 +1,4 @@
-package miscutil.core.util.particles;
+package gtPlusPlus.core.util.particles;
 
 import net.minecraft.client.particle.EntityAuraFX;
 import net.minecraft.world.World;
diff --git a/src/Java/miscutil/core/util/player/PlayerCache.java b/src/Java/gtPlusPlus/core/util/player/PlayerCache.java
index ce43ccf36a..095eb543db 100644
--- a/src/Java/miscutil/core/util/player/PlayerCache.java
+++ b/src/Java/gtPlusPlus/core/util/player/PlayerCache.java
@@ -1,4 +1,7 @@
-package miscutil.core.util.player;
+package gtPlusPlus.core.util.player;
+
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -16,8 +19,6 @@ import java.util.Objects;
 import java.util.Properties;
 import java.util.UUID;
 
-import miscutil.core.lib.CORE;
-import miscutil.core.util.Utils;
 import net.minecraft.client.Minecraft;
 import net.minecraft.world.World;
 
diff --git a/src/Java/miscutil/core/util/player/UtilsMining.java b/src/Java/gtPlusPlus/core/util/player/UtilsMining.java
index 81e69c1aff..1b6b957b32 100644
--- a/src/Java/miscutil/core/util/player/UtilsMining.java
+++ b/src/Java/gtPlusPlus/core/util/player/UtilsMining.java
@@ -1,6 +1,6 @@
-package miscutil.core.util.player;
+package gtPlusPlus.core.util.player;
 
-import miscutil.core.util.Utils;
+import gtPlusPlus.core.util.Utils;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
diff --git a/src/Java/miscutil/core/util/recipe/UtilsRecipe.java b/src/Java/gtPlusPlus/core/util/recipe/UtilsRecipe.java
index 3c5617a7c6..997aaa95c9 100644
--- a/src/Java/miscutil/core/util/recipe/UtilsRecipe.java
+++ b/src/Java/gtPlusPlus/core/util/recipe/UtilsRecipe.java
@@ -1,17 +1,17 @@
-package miscutil.core.util.recipe;
+package gtPlusPlus.core.util.recipe;
 
 import gregtech.api.util.GT_ModHandler;
+import gtPlusPlus.core.handler.COMPAT_HANDLER;
+import gtPlusPlus.core.handler.Recipes.LateRegistrationHandler;
+import gtPlusPlus.core.handler.Recipes.RegistrationHandler;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.item.UtilsItems;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import miscutil.core.handler.COMPAT_HANDLER;
-import miscutil.core.handler.Recipes.LateRegistrationHandler;
-import miscutil.core.handler.Recipes.RegistrationHandler;
-import miscutil.core.lib.CORE;
-import miscutil.core.util.Utils;
-import miscutil.core.util.item.UtilsItems;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.CraftingManager;
diff --git a/src/Java/miscutil/core/util/wrapper/var.java b/src/Java/gtPlusPlus/core/util/wrapper/var.java
index 7f24b26646..d5e55bd658 100644
--- a/src/Java/miscutil/core/util/wrapper/var.java
+++ b/src/Java/gtPlusPlus/core/util/wrapper/var.java
@@ -1,8 +1,8 @@
-package miscutil.core.util.wrapper;
+package gtPlusPlus.core.util.wrapper;
 
-import miscutil.core.lib.LoadedMods;
-import miscutil.core.util.Utils;
-import miscutil.core.util.item.UtilsItems;
+import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.item.UtilsItems;
 import net.minecraft.item.ItemStack;
 
 public class var{
diff --git a/src/Java/miscutil/xmod/forestry/HANDLER_FR.java b/src/Java/gtPlusPlus/xmod/forestry/HANDLER_FR.java
index 2d204bc269..ff26064e98 100644
--- a/src/Java/miscutil/xmod/forestry/HANDLER_FR.java
+++ b/src/Java/gtPlusPlus/xmod/forestry/HANDLER_FR.java
@@ -1,10 +1,10 @@
-package miscutil.xmod.forestry;
+package gtPlusPlus.xmod.forestry;
 
-import miscutil.core.lib.CORE;
-import miscutil.core.lib.LoadedMods;
-import miscutil.xmod.forestry.bees.alveary.TileAlvearyFrameHousing;
-import miscutil.xmod.forestry.bees.items.FR_ItemRegistry;
-import miscutil.xmod.forestry.bees.recipe.FR_Gregtech_Recipes;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.xmod.forestry.bees.alveary.TileAlvearyFrameHousing;
+import gtPlusPlus.xmod.forestry.bees.items.FR_ItemRegistry;
+import gtPlusPlus.xmod.forestry.bees.recipe.FR_Gregtech_Recipes;
 import cpw.mods.fml.common.registry.GameRegistry;
 
 public class HANDLER_FR {
diff --git a/src/Java/miscutil/xmod/forestry/bees/alveary/FR_AlvearyFrameBlock.java b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/FR_AlvearyFrameBlock.java
index a123aa623d..2f4437afd1 100644
--- a/src/Java/miscutil/xmod/forestry/bees/alveary/FR_AlvearyFrameBlock.java
+++ b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/FR_AlvearyFrameBlock.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.forestry.bees.alveary;
+package gtPlusPlus.xmod.forestry.bees.alveary;
 
 import net.minecraft.util.ChunkCoordinates;
 
diff --git a/src/Java/miscutil/xmod/forestry/bees/alveary/FR_BlockAlveary.java b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/FR_BlockAlveary.java
index 614dfcb820..f087ad75f4 100644
--- a/src/Java/miscutil/xmod/forestry/bees/alveary/FR_BlockAlveary.java
+++ b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/FR_BlockAlveary.java
@@ -1,10 +1,8 @@
-package miscutil.xmod.forestry.bees.alveary;
+package gtPlusPlus.xmod.forestry.bees.alveary;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import miscutil.MiscUtils;
-import miscutil.core.creative.AddToCreativeTab;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
@@ -22,6 +20,8 @@ import forestry.apiculture.MaterialBeehive;
 import forestry.apiculture.multiblock.TileAlvearyPlain;
 import forestry.core.blocks.BlockStructure;
 import forestry.core.render.TextureManager;
+import gtPlusPlus.GTplusplus;
+import gtPlusPlus.core.creative.AddToCreativeTab;
 
 public class FR_BlockAlveary extends BlockStructure
 {
@@ -58,12 +58,12 @@ public class FR_BlockAlveary extends BlockStructure
         TileEntity te = world.getTileEntity(x, y, z);
         if (te != null && te instanceof TileAlvearyFrameHousing)
         {
-            player.openGui(MiscUtils.instance, 0, world, x, y, z);
+            player.openGui(GTplusplus.instance, 0, world, x, y, z);
             return true;
         }
         /*else if (te != null && te instanceof TileAlvearyFrameHousing)
         {
-            player.openGui(MiscUtils.instance, 0, world, x, y, z);
+            player.openGui(GTplusplus.instance, 0, world, x, y, z);
             return true;
         }*/
         return false;
diff --git a/src/Java/miscutil/xmod/forestry/bees/alveary/FR_TileAlveary.java b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/FR_TileAlveary.java
index 5c588f20ca..b5b3b73e6b 100644
--- a/src/Java/miscutil/xmod/forestry/bees/alveary/FR_TileAlveary.java
+++ b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/FR_TileAlveary.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.forestry.bees.alveary;
+package gtPlusPlus.xmod.forestry.bees.alveary;
 
 import java.io.IOException;
 import java.util.List;
diff --git a/src/Java/miscutil/xmod/forestry/bees/alveary/IAlvearyComponentAdvanced.java b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/IAlvearyComponentAdvanced.java
index 8383f09f0f..b55d2d37a6 100644
--- a/src/Java/miscutil/xmod/forestry/bees/alveary/IAlvearyComponentAdvanced.java
+++ b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/IAlvearyComponentAdvanced.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.forestry.bees.alveary;
+package gtPlusPlus.xmod.forestry.bees.alveary;
 
 import forestry.api.apiculture.IBeeModifier;
 import forestry.api.core.IClimateControlled;
diff --git a/src/Java/miscutil/xmod/forestry/bees/alveary/ISidedFrameWearingInventory.java b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/ISidedFrameWearingInventory.java
index 4b4de16075..523c3e2434 100644
--- a/src/Java/miscutil/xmod/forestry/bees/alveary/ISidedFrameWearingInventory.java
+++ b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/ISidedFrameWearingInventory.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.forestry.bees.alveary;
+package gtPlusPlus.xmod.forestry.bees.alveary;
 
 import net.minecraft.inventory.ISidedInventory;
 import forestry.api.apiculture.IBeeHousing;
diff --git a/src/Java/miscutil/xmod/forestry/bees/alveary/TileAlvearyFrameHousing.java b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/TileAlvearyFrameHousing.java
index 556b70f1f3..12f97b5f0c 100644
--- a/src/Java/miscutil/xmod/forestry/bees/alveary/TileAlvearyFrameHousing.java
+++ b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/TileAlvearyFrameHousing.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.forestry.bees.alveary;
+package gtPlusPlus.xmod.forestry.bees.alveary;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -7,9 +7,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Stack;
 
-import miscutil.xmod.forestry.bees.alveary.gui.CONTAINER_FrameHousing;
-import miscutil.xmod.forestry.bees.alveary.gui.GUI_FrameHousing;
-import miscutil.xmod.forestry.bees.alveary.gui.InventoryFrameHousing;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.Item;
@@ -35,6 +32,9 @@ import forestry.core.inventory.wrappers.InventoryIterator;
 import forestry.core.proxy.Proxies;
 import forestry.core.tiles.IActivatable;
 import forestry.core.utils.ItemStackUtil;
+import gtPlusPlus.xmod.forestry.bees.alveary.gui.CONTAINER_FrameHousing;
+import gtPlusPlus.xmod.forestry.bees.alveary.gui.GUI_FrameHousing;
+import gtPlusPlus.xmod.forestry.bees.alveary.gui.InventoryFrameHousing;
 
 public class TileAlvearyFrameHousing
 extends FR_TileAlveary
diff --git a/src/Java/miscutil/xmod/forestry/bees/alveary/gui/CONTAINER_FrameHousing.java b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/gui/CONTAINER_FrameHousing.java
index 78dc096f65..c685482266 100644
--- a/src/Java/miscutil/xmod/forestry/bees/alveary/gui/CONTAINER_FrameHousing.java
+++ b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/gui/CONTAINER_FrameHousing.java
@@ -1,8 +1,5 @@
-package miscutil.xmod.forestry.bees.alveary.gui;
+package gtPlusPlus.xmod.forestry.bees.alveary.gui;
 
-import miscutil.core.lib.CORE;
-import miscutil.core.slots.SlotFrame;
-import miscutil.xmod.forestry.bees.alveary.TileAlvearyFrameHousing;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
@@ -10,6 +7,9 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
 import forestry.api.apiculture.IHiveFrame;
 import forestry.core.gui.tooltips.ToolTip;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.slots.SlotFrame;
+import gtPlusPlus.xmod.forestry.bees.alveary.TileAlvearyFrameHousing;
 
 public class CONTAINER_FrameHousing extends Container
 {
diff --git a/src/Java/miscutil/xmod/forestry/bees/alveary/gui/GUI_FrameHousing.java b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/gui/GUI_FrameHousing.java
index 35b982cd9a..dcf8da3a1a 100644
--- a/src/Java/miscutil/xmod/forestry/bees/alveary/gui/GUI_FrameHousing.java
+++ b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/gui/GUI_FrameHousing.java
@@ -1,7 +1,7 @@
-package miscutil.xmod.forestry.bees.alveary.gui;
+package gtPlusPlus.xmod.forestry.bees.alveary.gui;
 
-import miscutil.core.lib.CORE;
-import miscutil.xmod.forestry.bees.alveary.TileAlvearyFrameHousing;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.xmod.forestry.bees.alveary.TileAlvearyFrameHousing;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.client.resources.I18n;
diff --git a/src/Java/miscutil/xmod/forestry/bees/alveary/gui/InventoryFrameHousing.java b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/gui/InventoryFrameHousing.java
index cdd3def450..406c3c47cb 100644
--- a/src/Java/miscutil/xmod/forestry/bees/alveary/gui/InventoryFrameHousing.java
+++ b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/gui/InventoryFrameHousing.java
@@ -1,10 +1,10 @@
-package miscutil.xmod.forestry.bees.alveary.gui;
+package gtPlusPlus.xmod.forestry.bees.alveary.gui;
 
-import miscutil.xmod.forestry.bees.alveary.TileAlvearyFrameHousing;
 import net.minecraft.item.ItemStack;
 import forestry.api.apiculture.BeeManager;
 import forestry.core.inventory.InventoryAdapterTile;
 import forestry.core.utils.ItemStackUtil;
+import gtPlusPlus.xmod.forestry.bees.alveary.TileAlvearyFrameHousing;
 
 public class InventoryFrameHousing extends InventoryAdapterTile<TileAlvearyFrameHousing>
 {
diff --git a/src/Java/miscutil/xmod/forestry/bees/items/FR_ItemRegistry.java b/src/Java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java
index 14b49e0762..edd04661d7 100644
--- a/src/Java/miscutil/xmod/forestry/bees/items/FR_ItemRegistry.java
+++ b/src/Java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java
@@ -8,10 +8,7 @@
  * Various Contributors including, but not limited to:
  * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
  ******************************************************************************/
-package miscutil.xmod.forestry.bees.items;
-import miscutil.core.lib.CORE;
-import miscutil.core.lib.LoadedMods;
-import miscutil.xmod.forestry.bees.alveary.FR_BlockAlveary;
+package gtPlusPlus.xmod.forestry.bees.items;
 import net.minecraft.block.Block;
 import net.minecraft.item.EnumRarity;
 import net.minecraft.item.Item;
@@ -22,6 +19,9 @@ import net.minecraftforge.common.ChestGenHooks;
 import cpw.mods.fml.common.registry.GameRegistry;
 import forestry.core.items.ItemBlockForestry;
 import forestry.core.utils.StringUtil;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.xmod.forestry.bees.alveary.FR_BlockAlveary;
 
 public class FR_ItemRegistry {
 
diff --git a/src/Java/miscutil/xmod/forestry/bees/items/FR_StringUtil.java b/src/Java/gtPlusPlus/xmod/forestry/bees/items/FR_StringUtil.java
index 9005a927aa..69065bec24 100644
--- a/src/Java/miscutil/xmod/forestry/bees/items/FR_StringUtil.java
+++ b/src/Java/gtPlusPlus/xmod/forestry/bees/items/FR_StringUtil.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.forestry.bees.items;
+package gtPlusPlus.xmod.forestry.bees.items;
 
 import net.minecraft.util.StatCollector;
 
diff --git a/src/Java/miscutil/xmod/forestry/bees/items/MB_FrameType.java b/src/Java/gtPlusPlus/xmod/forestry/bees/items/MB_FrameType.java
index 3cf8879562..5a61c94196 100644
--- a/src/Java/miscutil/xmod/forestry/bees/items/MB_FrameType.java
+++ b/src/Java/gtPlusPlus/xmod/forestry/bees/items/MB_FrameType.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.forestry.bees.items;
+package gtPlusPlus.xmod.forestry.bees.items;
 
 import forestry.api.apiculture.IBeeGenome;
 import forestry.api.apiculture.IBeeModifier;
diff --git a/src/Java/miscutil/xmod/forestry/bees/items/MB_ItemFrame.java b/src/Java/gtPlusPlus/xmod/forestry/bees/items/MB_ItemFrame.java
index 6811228681..0f0e7d3109 100644
--- a/src/Java/miscutil/xmod/forestry/bees/items/MB_ItemFrame.java
+++ b/src/Java/gtPlusPlus/xmod/forestry/bees/items/MB_ItemFrame.java
@@ -1,9 +1,7 @@
-package miscutil.xmod.forestry.bees.items;
+package gtPlusPlus.xmod.forestry.bees.items;
 
 import java.util.List;
 
-import miscutil.core.creative.AddToCreativeTab;
-import miscutil.core.lib.CORE;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.EnumRarity;
@@ -18,6 +16,8 @@ import forestry.api.apiculture.IBeeGenome;
 import forestry.api.apiculture.IBeeHousing;
 import forestry.api.apiculture.IBeeModifier;
 import forestry.api.apiculture.IHiveFrame;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
 
 public class MB_ItemFrame extends Item implements IHiveFrame
 {
diff --git a/src/Java/miscutil/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java b/src/Java/gtPlusPlus/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java
index ff6d23fd52..95049df43b 100644
--- a/src/Java/miscutil/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java
+++ b/src/Java/gtPlusPlus/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java
@@ -1,9 +1,9 @@
-package miscutil.xmod.forestry.bees.recipe;
+package gtPlusPlus.xmod.forestry.bees.recipe;
 
-import miscutil.core.lib.LoadedMods;
-import miscutil.core.util.item.UtilsItems;
-import miscutil.core.util.recipe.UtilsRecipe;
-import miscutil.xmod.forestry.bees.items.FR_ItemRegistry;
+import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.recipe.UtilsRecipe;
+import gtPlusPlus.xmod.forestry.bees.items.FR_ItemRegistry;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
diff --git a/src/Java/miscutil/xmod/gregtech/HANDLER_GT.java b/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java
index ae8200a320..2217aecab9 100644
--- a/src/Java/miscutil/xmod/gregtech/HANDLER_GT.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java
@@ -1,10 +1,10 @@
-package miscutil.xmod.gregtech;
+package gtPlusPlus.xmod.gregtech;
 
 import gregtech.api.util.GT_Config;
-import miscutil.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
-import miscutil.xmod.gregtech.common.blocks.fluid.GregtechFluidHandler;
-import miscutil.xmod.gregtech.common.items.MetaGeneratedGregtechItems;
-import miscutil.xmod.gregtech.registration.gregtech.GregtechConduits;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
+import gtPlusPlus.xmod.gregtech.common.blocks.fluid.GregtechFluidHandler;
+import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechItems;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechConduits;
 
 public class HANDLER_GT {
 	
diff --git a/src/Java/miscutil/xmod/gregtech/api/energy/IC2ElectricItem.java b/src/Java/gtPlusPlus/xmod/gregtech/api/energy/IC2ElectricItem.java
index 5b0db2ed33..4ec4589c03 100644
--- a/src/Java/miscutil/xmod/gregtech/api/energy/IC2ElectricItem.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/energy/IC2ElectricItem.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.gregtech.api.energy;
+package gtPlusPlus.xmod.gregtech.api.energy;
 
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
diff --git a/src/Java/miscutil/xmod/gregtech/api/energy/IC2ElectricItemManager.java b/src/Java/gtPlusPlus/xmod/gregtech/api/energy/IC2ElectricItemManager.java
index 1b5c7bbab8..311947e5e6 100644
--- a/src/Java/miscutil/xmod/gregtech/api/energy/IC2ElectricItemManager.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/energy/IC2ElectricItemManager.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.gregtech.api.energy;
+package gtPlusPlus.xmod.gregtech.api.energy;
 
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.item.ItemStack;
diff --git a/src/Java/miscutil/xmod/gregtech/api/enums/GregtechItemList.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
index 20f1ff9516..81252899e7 100644
--- a/src/Java/miscutil/xmod/gregtech/api/enums/GregtechItemList.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
@@ -1,10 +1,10 @@
-package miscutil.xmod.gregtech.api.enums;
+package gtPlusPlus.xmod.gregtech.api.enums;
 
 import static gregtech.api.enums.GT_Values.W;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Utility;
-import miscutil.xmod.gregtech.api.interfaces.GregtechItemContainer;
+import gtPlusPlus.xmod.gregtech.api.interfaces.GregtechItemContainer;
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
diff --git a/src/Java/miscutil/xmod/gregtech/api/enums/GregtechOreDictNames.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOreDictNames.java
index 6870f6cd87..dcb075349d 100644
--- a/src/Java/miscutil/xmod/gregtech/api/enums/GregtechOreDictNames.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOreDictNames.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.gregtech.api.enums;
+package gtPlusPlus.xmod.gregtech.api.enums;
 
 /* Electric Components.
 *
diff --git a/src/Java/miscutil/xmod/gregtech/api/enums/GregtechOrePrefixes.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java
index 7079c40ed3..93ac3463fb 100644
--- a/src/Java/miscutil/xmod/gregtech/api/enums/GregtechOrePrefixes.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java
@@ -1,9 +1,9 @@
-package miscutil.xmod.gregtech.api.enums;
+package gtPlusPlus.xmod.gregtech.api.enums;
 
 import static gregtech.api.enums.GT_Values.B;
 import static gregtech.api.enums.GT_Values.D2;
 import static gregtech.api.enums.GT_Values.M;
-import static miscutil.core.util.Utils.getTcAspectStack;
+import static gtPlusPlus.core.util.Utils.getTcAspectStack;
 import gregtech.api.enums.ConfigCategories;
 import gregtech.api.enums.Dyes;
 import gregtech.api.enums.Element;
@@ -20,6 +20,10 @@ import gregtech.api.objects.MaterialStack;
 import gregtech.api.util.GT_Config;
 import gregtech.api.util.GT_Log;
 import gregtech.api.util.GT_Utility;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_OreRecipeRegistrator;
+import gtPlusPlus.xmod.gregtech.api.objects.GregtechItemData;
+import gtPlusPlus.xmod.gregtech.api.objects.GregtechMaterialStack;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -27,10 +31,6 @@ import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
 
-import miscutil.core.lib.CORE;
-import miscutil.xmod.gregtech.api.interfaces.internal.Interface_OreRecipeRegistrator;
-import miscutil.xmod.gregtech.api.objects.GregtechItemData;
-import miscutil.xmod.gregtech.api.objects.GregtechMaterialStack;
 import net.minecraft.enchantment.Enchantment;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.Fluid;
diff --git a/src/Java/miscutil/xmod/gregtech/api/enums/GregtechTextureSet.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextureSet.java
index 365bdf496f..0b8c605e42 100644
--- a/src/Java/miscutil/xmod/gregtech/api/enums/GregtechTextureSet.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextureSet.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.gregtech.api.enums;
+package gtPlusPlus.xmod.gregtech.api.enums;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
diff --git a/src/Java/miscutil/xmod/gregtech/api/enums/GregtechTextures.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextures.java
index 5866f415f7..705f5b338e 100644
--- a/src/Java/miscutil/xmod/gregtech/api/enums/GregtechTextures.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextures.java
@@ -1,9 +1,9 @@
-package miscutil.xmod.gregtech.api.enums;
+package gtPlusPlus.xmod.gregtech.api.enums;
 
 import gregtech.api.GregTech_API;
-import miscutil.core.lib.CORE;
-import miscutil.xmod.gregtech.api.interfaces.internal.Interface_IconContainer;
-import miscutil.xmod.gregtech.api.interfaces.internal.Interface_Texture;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_IconContainer;
+import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_Texture;
 import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.util.IIcon;
 import net.minecraft.util.ResourceLocation;
diff --git a/src/Java/miscutil/xmod/gregtech/api/enums/GregtechToolDictNames.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechToolDictNames.java
index 5bf7cd82d3..aa0e347ca9 100644
--- a/src/Java/miscutil/xmod/gregtech/api/enums/GregtechToolDictNames.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechToolDictNames.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.gregtech.api.enums;
+package gtPlusPlus.xmod.gregtech.api.enums;
 
 public enum GregtechToolDictNames {
   
diff --git a/src/Java/miscutil/xmod/gregtech/api/gui/CONTAINER_IndustrialCentrifuge.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_IndustrialCentrifuge.java
index 3b48c752ea..4083875fdb 100644
--- a/src/Java/miscutil/xmod/gregtech/api/gui/CONTAINER_IndustrialCentrifuge.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_IndustrialCentrifuge.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.gregtech.api.gui;
+package gtPlusPlus.xmod.gregtech.api.gui;
 
 import gregtech.api.gui.GT_ContainerMetaTile_Machine;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
diff --git a/src/Java/miscutil/xmod/gregtech/api/gui/CONTAINER_IronBlastFurnace.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_IronBlastFurnace.java
index aa5fbeac90..0a19c62d0c 100644
--- a/src/Java/miscutil/xmod/gregtech/api/gui/CONTAINER_IronBlastFurnace.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_IronBlastFurnace.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.gregtech.api.gui;
+package gtPlusPlus.xmod.gregtech.api.gui;
 
 import gregtech.api.gui.GT_ContainerMetaTile_Machine;
 import gregtech.api.gui.GT_Slot_Output;
diff --git a/src/Java/miscutil/xmod/gregtech/api/gui/CONTAINER_MatterFab.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MatterFab.java
index 3c3bd3bfb8..a258274f07 100644
--- a/src/Java/miscutil/xmod/gregtech/api/gui/CONTAINER_MatterFab.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MatterFab.java
@@ -1,8 +1,8 @@
-package miscutil.xmod.gregtech.api.gui;
+package gtPlusPlus.xmod.gregtech.api.gui;
 
 import gregtech.api.gui.GT_ContainerMetaTile_Machine;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import miscutil.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityMassFabricator;
+import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityMassFabricator;
 import net.minecraft.entity.player.InventoryPlayer;
 
 /**
diff --git a/src/Java/miscutil/xmod/gregtech/api/gui/CONTAINER_MultiMachine.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MultiMachine.java
index 02d765f79a..9e0a7869e5 100644
--- a/src/Java/miscutil/xmod/gregtech/api/gui/CONTAINER_MultiMachine.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MultiMachine.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.gregtech.api.gui;
+package gtPlusPlus.xmod.gregtech.api.gui;
 
 import gregtech.api.gui.GT_ContainerMetaTile_Machine;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
diff --git a/src/Java/miscutil/xmod/gregtech/api/gui/CONTAINER_SafeBlock.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SafeBlock.java
index 1242bd4472..4a10923760 100644
--- a/src/Java/miscutil/xmod/gregtech/api/gui/CONTAINER_SafeBlock.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SafeBlock.java
@@ -1,13 +1,13 @@
-package miscutil.xmod.gregtech.api.gui;
+package gtPlusPlus.xmod.gregtech.api.gui;
 
 import gregtech.api.gui.GT_ContainerMetaTile_Machine;
 import gregtech.api.gui.GT_Slot_Holo;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gtPlusPlus.core.util.player.PlayerCache;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GregtechMetaSafeBlock;
 
 import java.util.UUID;
 
-import miscutil.core.util.player.PlayerCache;
-import miscutil.xmod.gregtech.api.metatileentity.implementations.GregtechMetaSafeBlock;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Slot;
diff --git a/src/Java/miscutil/xmod/gregtech/api/gui/CONTAINER_SolarGenerator.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SolarGenerator.java
index d5f6b25e8a..46c8720651 100644
--- a/src/Java/miscutil/xmod/gregtech/api/gui/CONTAINER_SolarGenerator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SolarGenerator.java
@@ -1,11 +1,11 @@
-package miscutil.xmod.gregtech.api.gui;
+package gtPlusPlus.xmod.gregtech.api.gui;
 
 import gregtech.api.gui.GT_ContainerMetaTile_Machine;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GregtechMetaTileEntitySolarGenerator;
 
 import java.util.Iterator;
 
-import miscutil.xmod.gregtech.common.tileentities.generators.GregtechMetaTileEntitySolarGenerator;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.ICrafting;
 import cpw.mods.fml.relauncher.Side;
diff --git a/src/Java/miscutil/xmod/gregtech/api/gui/CONTAINER_SteamCondenser.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SteamCondenser.java
index be57e07d53..3feea9d2df 100644
--- a/src/Java/miscutil/xmod/gregtech/api/gui/CONTAINER_SteamCondenser.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SteamCondenser.java
@@ -1,11 +1,11 @@
-package miscutil.xmod.gregtech.api.gui;
+package gtPlusPlus.xmod.gregtech.api.gui;
 
 import gregtech.api.gui.GT_ContainerMetaTile_Machine;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.generators.GregtechMetaBoilerBase;
 
 import java.util.Iterator;
 
-import miscutil.xmod.gregtech.api.metatileentity.implementations.base.generators.GregtechMetaBoilerBase;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.ICrafting;
 import net.minecraft.inventory.Slot;
diff --git a/src/Java/miscutil/xmod/gregtech/api/gui/GUI_IndustrialCentrifuge.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_IndustrialCentrifuge.java
index 581aa4eab1..38726f12d8 100644
--- a/src/Java/miscutil/xmod/gregtech/api/gui/GUI_IndustrialCentrifuge.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_IndustrialCentrifuge.java
@@ -1,9 +1,9 @@
-package miscutil.xmod.gregtech.api.gui;
+package gtPlusPlus.xmod.gregtech.api.gui;
 
 
 import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import miscutil.core.lib.CORE;
+import gtPlusPlus.core.lib.CORE;
 import net.minecraft.entity.player.InventoryPlayer;
 
 
diff --git a/src/Java/miscutil/xmod/gregtech/api/gui/GUI_IronBlastFurnace.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_IronBlastFurnace.java
index 9c0be36535..1ce7bdea68 100644
--- a/src/Java/miscutil/xmod/gregtech/api/gui/GUI_IronBlastFurnace.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_IronBlastFurnace.java
@@ -1,8 +1,8 @@
-package miscutil.xmod.gregtech.api.gui;
+package gtPlusPlus.xmod.gregtech.api.gui;
 
 import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import miscutil.core.lib.CORE;
+import gtPlusPlus.core.lib.CORE;
 import net.minecraft.entity.player.InventoryPlayer;
 
 public class GUI_IronBlastFurnace
diff --git a/src/Java/miscutil/xmod/gregtech/api/gui/GUI_MatterFab.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MatterFab.java
index d28182c1f8..f7101e5ae4 100644
--- a/src/Java/miscutil/xmod/gregtech/api/gui/GUI_MatterFab.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MatterFab.java
@@ -1,9 +1,9 @@
-package miscutil.xmod.gregtech.api.gui;
+package gtPlusPlus.xmod.gregtech.api.gui;
 
 
 import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import miscutil.core.lib.CORE;
+import gtPlusPlus.core.lib.CORE;
 import net.minecraft.entity.player.InventoryPlayer;
 
 /**
@@ -56,7 +56,7 @@ public class GUI_MatterFab extends GT_GUIContainerMetaTile_Machine {
                     uumMade = ((CONTAINER_MatterFab) mContainer).mUUM_MADE;
                     fontRendererObj.drawString("Running perfectly.", 10, 16, 16448255);
                     fontRendererObj.drawString("UU-Amplifier Used: "+uuaUsed, 10, 24, 16448255);
-                    fontRendererObj.drawString("UU_Matter Fabricated: "+uumMade, 10, 32, 16448255);
+                    fontRendererObj.drawString("UU-Matter Fabricated: "+uumMade, 10, 32, 16448255);
                 }
             }
         }
diff --git a/src/Java/miscutil/xmod/gregtech/api/gui/GUI_MultiMachine.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MultiMachine.java
index 3cf3d5ee69..c4114e70e1 100644
--- a/src/Java/miscutil/xmod/gregtech/api/gui/GUI_MultiMachine.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MultiMachine.java
@@ -1,9 +1,9 @@
-package miscutil.xmod.gregtech.api.gui;
+package gtPlusPlus.xmod.gregtech.api.gui;
 
 
 import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import miscutil.core.lib.CORE;
+import gtPlusPlus.core.lib.CORE;
 import net.minecraft.entity.player.InventoryPlayer;
 
 /**
diff --git a/src/Java/miscutil/xmod/gregtech/api/gui/GUI_SafeBlock.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SafeBlock.java
index 7e3335cb34..d5f970870b 100644
--- a/src/Java/miscutil/xmod/gregtech/api/gui/GUI_SafeBlock.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SafeBlock.java
@@ -1,8 +1,8 @@
-package miscutil.xmod.gregtech.api.gui;
+package gtPlusPlus.xmod.gregtech.api.gui;
 
 import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import miscutil.core.lib.CORE;
+import gtPlusPlus.core.lib.CORE;
 import net.minecraft.entity.player.InventoryPlayer;
 
 public class GUI_SafeBlock
diff --git a/src/Java/miscutil/xmod/gregtech/api/gui/GUI_SolarGenerator.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SolarGenerator.java
index 7f48472ac4..7c185ebb94 100644
--- a/src/Java/miscutil/xmod/gregtech/api/gui/GUI_SolarGenerator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SolarGenerator.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.gregtech.api.gui;
+package gtPlusPlus.xmod.gregtech.api.gui;
 
 import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
diff --git a/src/Java/miscutil/xmod/gregtech/api/gui/GUI_SteamCondenser.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SteamCondenser.java
index 75b19ecb2f..9c4e14f0dc 100644
--- a/src/Java/miscutil/xmod/gregtech/api/gui/GUI_SteamCondenser.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SteamCondenser.java
@@ -1,8 +1,8 @@
-package miscutil.xmod.gregtech.api.gui;
+package gtPlusPlus.xmod.gregtech.api.gui;
 
 import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import miscutil.core.lib.CORE;
+import gtPlusPlus.core.lib.CORE;
 import net.minecraft.entity.player.InventoryPlayer;
 
 public class GUI_SteamCondenser extends GT_GUIContainerMetaTile_Machine
diff --git a/src/Java/miscutil/xmod/gregtech/api/interfaces/GregtechItemContainer.java b/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/GregtechItemContainer.java
index dd73b74dd7..3c29b34e27 100644
--- a/src/Java/miscutil/xmod/gregtech/api/interfaces/GregtechItemContainer.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/GregtechItemContainer.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.gregtech.api.interfaces;
+package gtPlusPlus.xmod.gregtech.api.interfaces;
 
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
diff --git a/src/Java/miscutil/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java b/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java
index 10e3b32b58..6aada2bdac 100644
--- a/src/Java/miscutil/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.gregtech.api.interfaces.internal;
+package gtPlusPlus.xmod.gregtech.api.interfaces.internal;
 
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
diff --git a/src/Java/miscutil/xmod/gregtech/api/interfaces/internal/Interface_IconContainer.java b/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_IconContainer.java
index cc2a214f5c..8e1715caf5 100644
--- a/src/Java/miscutil/xmod/gregtech/api/interfaces/internal/Interface_IconContainer.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_IconContainer.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.gregtech.api.interfaces.internal;
+package gtPlusPlus.xmod.gregtech.api.interfaces.internal;
 
 import net.minecraft.util.IIcon;
 import net.minecraft.util.ResourceLocation;
diff --git a/src/Java/miscutil/xmod/gregtech/api/interfaces/internal/Interface_ItemBehaviour.java b/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_ItemBehaviour.java
index 68f965de86..03f7b1bd1e 100644
--- a/src/Java/miscutil/xmod/gregtech/api/interfaces/internal/Interface_ItemBehaviour.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_ItemBehaviour.java
@@ -1,10 +1,10 @@
-package miscutil.xmod.gregtech.api.interfaces.internal;
+package gtPlusPlus.xmod.gregtech.api.interfaces.internal;
 
 import gregtech.api.enums.SubTag;
+import gtPlusPlus.xmod.gregtech.api.items.Gregtech_MetaItem_Base;
 
 import java.util.List;
 
-import miscutil.xmod.gregtech.api.items.Gregtech_MetaItem_Base;
 import net.minecraft.dispenser.IBlockSource;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
diff --git a/src/Java/miscutil/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator.java b/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator.java
index 9b5e95452f..f1583764f7 100644
--- a/src/Java/miscutil/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator.java
@@ -1,7 +1,7 @@
-package miscutil.xmod.gregtech.api.interfaces.internal;
+package gtPlusPlus.xmod.gregtech.api.interfaces.internal;
 
-import miscutil.xmod.gregtech.api.enums.GregtechOrePrefixes;
-import miscutil.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
 import net.minecraft.item.ItemStack;
 
 public interface Interface_OreRecipeRegistrator {
diff --git a/src/Java/miscutil/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator_GT.java b/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator_GT.java
index fee89a927e..ed276ad3f9 100644
--- a/src/Java/miscutil/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator_GT.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator_GT.java
@@ -1,7 +1,7 @@
-package miscutil.xmod.gregtech.api.interfaces.internal;
+package gtPlusPlus.xmod.gregtech.api.interfaces.internal;
 
 import gregtech.api.enums.OrePrefixes;
-import miscutil.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
 import net.minecraft.item.ItemStack;
 
 public interface Interface_OreRecipeRegistrator_GT {
diff --git a/src/Java/miscutil/xmod/gregtech/api/interfaces/internal/Interface_Texture.java b/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_Texture.java
index df3ed57b33..76c5113186 100644
--- a/src/Java/miscutil/xmod/gregtech/api/interfaces/internal/Interface_Texture.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_Texture.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.gregtech.api.interfaces.internal;
+package gtPlusPlus.xmod.gregtech.api.interfaces.internal;
 
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;
diff --git a/src/Java/miscutil/xmod/gregtech/api/interfaces/internal/Interface_ToolStats.java b/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_ToolStats.java
index 53fd2e475c..3d94d449a6 100644
--- a/src/Java/miscutil/xmod/gregtech/api/interfaces/internal/Interface_ToolStats.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_ToolStats.java
@@ -1,10 +1,10 @@
-package miscutil.xmod.gregtech.api.interfaces.internal;
+package gtPlusPlus.xmod.gregtech.api.interfaces.internal;
 
 import gregtech.api.interfaces.IIconContainer;
+import gtPlusPlus.xmod.gregtech.api.items.Gregtech_MetaTool;
 
 import java.util.List;
 
-import miscutil.xmod.gregtech.api.items.Gregtech_MetaTool;
 import net.minecraft.block.Block;
 import net.minecraft.enchantment.Enchantment;
 import net.minecraft.entity.Entity;
diff --git a/src/Java/miscutil/xmod/gregtech/api/items/Gregtech_Generic_Item.java b/src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_Generic_Item.java
index 0a928203ca..1c135a7f92 100644
--- a/src/Java/miscutil/xmod/gregtech/api/items/Gregtech_Generic_Item.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_Generic_Item.java
@@ -1,16 +1,16 @@
-package miscutil.xmod.gregtech.api.items;
+package gtPlusPlus.xmod.gregtech.api.items;
 
 import gregtech.api.enums.SubTag;
 import gregtech.api.interfaces.IProjectileItem;
 import gregtech.api.util.GT_LanguageManager;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_Utility;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
 
 import java.util.List;
 
-import miscutil.core.creative.AddToCreativeTab;
-import miscutil.core.lib.CORE;
-import miscutil.core.util.Utils;
 import net.minecraft.block.BlockDispenser;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.dispenser.BehaviorDefaultDispenseItem;
diff --git a/src/Java/miscutil/xmod/gregtech/api/items/Gregtech_MetaItem.java b/src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem.java
index e7901074c0..484cc19ea7 100644
--- a/src/Java/miscutil/xmod/gregtech/api/items/Gregtech_MetaItem.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.gregtech.api.items;
+package gtPlusPlus.xmod.gregtech.api.items;
 
 import static gregtech.api.enums.GT_Values.D1;
 import gregtech.api.GregTech_API;
@@ -12,6 +12,9 @@ import gregtech.api.objects.ItemData;
 import gregtech.api.util.GT_LanguageManager;
 import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Utility;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_ItemBehaviour;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -19,9 +22,6 @@ import java.util.BitSet;
 import java.util.HashMap;
 import java.util.List;
 
-import miscutil.core.creative.AddToCreativeTab;
-import miscutil.core.lib.CORE;
-import miscutil.xmod.gregtech.api.interfaces.internal.Interface_ItemBehaviour;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
diff --git a/src/Java/miscutil/xmod/gregtech/api/items/Gregtech_MetaItem_Base.java b/src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_Base.java
index 08f343ecc2..5f0e677d9b 100644
--- a/src/Java/miscutil/xmod/gregtech/api/items/Gregtech_MetaItem_Base.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_Base.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.gregtech.api.items;
+package gtPlusPlus.xmod.gregtech.api.items;
 
 import static gregtech.api.enums.GT_Values.D1;
 import static gregtech.api.enums.GT_Values.V;
@@ -7,6 +7,8 @@ import gregtech.api.util.GT_LanguageManager;
 import gregtech.api.util.GT_Log;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_Utility;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_ItemBehaviour;
 import ic2.api.item.ElectricItem;
 import ic2.api.item.IElectricItem;
 import ic2.api.item.IElectricItemManager;
@@ -16,8 +18,6 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
-import miscutil.core.util.Utils;
-import miscutil.xmod.gregtech.api.interfaces.internal.Interface_ItemBehaviour;
 import net.minecraft.dispenser.IBlockSource;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
diff --git a/src/Java/miscutil/xmod/gregtech/api/items/Gregtech_MetaItem_X32.java b/src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_X32.java
index 85c86a84e2..5ef60e442a 100644
--- a/src/Java/miscutil/xmod/gregtech/api/items/Gregtech_MetaItem_X32.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_X32.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.gregtech.api.items;
+package gtPlusPlus.xmod.gregtech.api.items;
 
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.GT_Values;
@@ -8,11 +8,11 @@ import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.util.GT_LanguageManager;
 import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Utility;
+import gtPlusPlus.core.util.Utils;
 
 import java.util.Arrays;
 import java.util.List;
 
-import miscutil.core.util.Utils;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
diff --git a/src/Java/miscutil/xmod/gregtech/api/items/Gregtech_MetaTool.java b/src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaTool.java
index 3fdd76a2ce..20163eecb4 100644
--- a/src/Java/miscutil/xmod/gregtech/api/items/Gregtech_MetaTool.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaTool.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.gregtech.api.items;
+package gtPlusPlus.xmod.gregtech.api.items;
 
 import static gregtech.api.enums.GT_Values.MOD_ID_RC;
 import gregtech.api.GregTech_API;
@@ -10,6 +10,8 @@ import gregtech.api.util.GT_LanguageManager;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Utility;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_ToolStats;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -17,8 +19,6 @@ import java.util.List;
 import java.util.Map.Entry;
 import java.util.Random;
 
-import miscutil.core.creative.AddToCreativeTab;
-import miscutil.xmod.gregtech.api.interfaces.internal.Interface_ToolStats;
 import mods.railcraft.api.core.items.IToolCrowbar;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.texture.IIconRegister;
diff --git a/src/Java/miscutil/xmod/gregtech/api/items/types/ToolType_Base.java b/src/Java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_Base.java
index 88e192d06a..ed663188d9 100644
--- a/src/Java/miscutil/xmod/gregtech/api/items/types/ToolType_Base.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_Base.java
@@ -1,11 +1,11 @@
-package miscutil.xmod.gregtech.api.items.types;
+package gtPlusPlus.xmod.gregtech.api.items.types;
 
 import gregtech.api.enums.SubTag;
+import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_ItemBehaviour;
+import gtPlusPlus.xmod.gregtech.api.items.Gregtech_MetaItem_Base;
 
 import java.util.List;
 
-import miscutil.xmod.gregtech.api.interfaces.internal.Interface_ItemBehaviour;
-import miscutil.xmod.gregtech.api.items.Gregtech_MetaItem_Base;
 import net.minecraft.block.BlockDispenser;
 import net.minecraft.dispenser.BehaviorDefaultDispenseItem;
 import net.minecraft.dispenser.IBlockSource;
diff --git a/src/Java/miscutil/xmod/gregtech/api/items/types/ToolType_HardHammer.java b/src/Java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_HardHammer.java
index 015fee3377..c59b4fe37f 100644
--- a/src/Java/miscutil/xmod/gregtech/api/items/types/ToolType_HardHammer.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_HardHammer.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.gregtech.api.items.types;
+package gtPlusPlus.xmod.gregtech.api.items.types;
 
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.Materials;
diff --git a/src/Java/miscutil/xmod/gregtech/api/items/types/ToolType_Wrench.java b/src/Java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_Wrench.java
index 6ff440e57c..9eb44d91d6 100644
--- a/src/Java/miscutil/xmod/gregtech/api/items/types/ToolType_Wrench.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_Wrench.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.gregtech.api.items.types;
+package gtPlusPlus.xmod.gregtech.api.items.types;
 
 import gregtech.api.GregTech_API;
 import gregtech.api.items.GT_MetaBase_Item;
diff --git a/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/GregtechMetaCondensor.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaCondensor.java
index 0a21655308..dcecc3ff34 100644
--- a/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/GregtechMetaCondensor.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaCondensor.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.gregtech.api.metatileentity.implementations;
+package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations;
 
 import gregtech.api.enums.Dyes;
 import gregtech.api.enums.Textures;
@@ -7,12 +7,12 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_ModHandler;
-import miscutil.core.lib.CORE;
-import miscutil.core.util.Utils;
-import miscutil.core.util.math.MathUtils;
-import miscutil.xmod.gregtech.api.gui.CONTAINER_SteamCondenser;
-import miscutil.xmod.gregtech.api.gui.GUI_SteamCondenser;
-import miscutil.xmod.gregtech.api.metatileentity.implementations.base.generators.GregtechMetaBoilerBase;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.math.MathUtils;
+import gtPlusPlus.xmod.gregtech.api.gui.CONTAINER_SteamCondenser;
+import gtPlusPlus.xmod.gregtech.api.gui.GUI_SteamCondenser;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.generators.GregtechMetaBoilerBase;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.FluidStack;
diff --git a/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/GregtechMetaEnergyBuffer.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaEnergyBuffer.java
index 7647dd3a5a..45f05f4495 100644
--- a/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/GregtechMetaEnergyBuffer.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaEnergyBuffer.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.gregtech.api.metatileentity.implementations;
+package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations;
 
 import static gregtech.api.enums.GT_Values.V;
 import gregtech.api.enums.Textures;
@@ -11,10 +11,10 @@ import gregtech.api.items.GT_MetaBase_Item;
 import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_Utility;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMetaTileEntity;
 import ic2.api.item.IElectricItem;
-import miscutil.core.lib.CORE;
-import miscutil.core.util.Utils;
-import miscutil.xmod.gregtech.api.metatileentity.implementations.base.GregtechMetaTileEntity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
diff --git a/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntityFluid.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntityFluid.java
index dd9a7ebd74..9fe37dd2dc 100644
--- a/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntityFluid.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntityFluid.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.gregtech.api.metatileentity.implementations;
+package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations;
 
 import static gregtech.api.enums.GT_Values.D1;
 import gregtech.api.GregTech_API;
@@ -14,13 +14,13 @@ import gregtech.api.metatileentity.MetaPipeEntity;
 import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Log;
 import gregtech.api.util.GT_Utility;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map.Entry;
 
-import miscutil.core.lib.CORE;
-import miscutil.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.item.ItemStack;
diff --git a/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java
index 528bd8db85..587996a5c6 100644
--- a/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.gregtech.api.metatileentity.implementations;
+package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations;
 
 import static gregtech.api.enums.GT_Values.VN;
 import gregtech.api.GregTech_API;
@@ -16,12 +16,12 @@ import gregtech.api.metatileentity.BaseMetaPipeEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Cable;
 import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Utility;
+import gtPlusPlus.core.lib.CORE;
 import ic2.api.energy.tile.IEnergySink;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 
-import miscutil.core.lib.CORE;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.tileentity.TileEntity;
diff --git a/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_SuperConductor.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_SuperConductor.java
index e0c23ad263..7f903576c2 100644
--- a/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_SuperConductor.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_SuperConductor.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.gregtech.api.metatileentity.implementations;
+package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations;
 
 import static gregtech.api.enums.GT_Values.VN;
 import gregtech.api.GregTech_API;
@@ -14,14 +14,14 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.BaseMetaPipeEntity;
 import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Utility;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMetaPipeEntityBase_Cable;
 import ic2.api.energy.tile.IEnergySink;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 
-import miscutil.core.lib.CORE;
-import miscutil.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
-import miscutil.xmod.gregtech.api.metatileentity.implementations.base.GregtechMetaPipeEntityBase_Cable;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.tileentity.TileEntity;
diff --git a/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/GregtechMetaSafeBlock.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaSafeBlock.java
index 743885531b..c574087020 100644
--- a/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/GregtechMetaSafeBlock.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaSafeBlock.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.gregtech.api.metatileentity.implementations;
+package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
@@ -6,10 +6,10 @@ 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 miscutil.core.lib.CORE;
-import miscutil.xmod.gregtech.api.gui.CONTAINER_SafeBlock;
-import miscutil.xmod.gregtech.api.gui.GUI_SafeBlock;
-import miscutil.xmod.gregtech.api.metatileentity.implementations.base.machines.GregtechMetaSafeBlockBase;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.xmod.gregtech.api.gui.CONTAINER_SafeBlock;
+import gtPlusPlus.xmod.gregtech.api.gui.GUI_SafeBlock;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.machines.GregtechMetaSafeBlockBase;
 import net.minecraft.entity.player.InventoryPlayer;
 
 public class GregtechMetaSafeBlock
diff --git a/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/GregtechMetaSuperConductorNodeBase.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaSuperConductorNodeBase.java
index 0da6d966e5..15cbf92516 100644
--- a/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/GregtechMetaSuperConductorNodeBase.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaSuperConductorNodeBase.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.gregtech.api.metatileentity.implementations;
+package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations;
 
 import static gregtech.api.enums.GT_Values.V;
 import gregtech.api.enums.Textures;
@@ -7,11 +7,11 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
 import gregtech.api.util.GT_Utility;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.lossless.GregtechMetaTileEntityLosslessBasicTank;
 
 import java.util.Collection;
 
-import miscutil.core.lib.CORE;
-import miscutil.xmod.gregtech.api.metatileentity.implementations.base.lossless.GregtechMetaTileEntityLosslessBasicTank;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
diff --git a/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/base/GT_MTE_BasicMachine_Custom_Recipe.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GT_MTE_BasicMachine_Custom_Recipe.java
index 0c501af33a..c7f84f1095 100644
--- a/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/base/GT_MTE_BasicMachine_Custom_Recipe.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GT_MTE_BasicMachine_Custom_Recipe.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.gregtech.api.metatileentity.implementations.base;
+package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base;
 
 import static gregtech.api.enums.GT_Values.V;
 import static gregtech.api.enums.GT_Values.W;
@@ -16,10 +16,10 @@ import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_ModHandler.RecipeBits;
 import gregtech.api.util.GT_Utility;
+import gtPlusPlus.xmod.gregtech.api.util.GregtechRecipe_OLD.Gregtech_Recipe_Map;
 
 import java.util.Random;
 
-import miscutil.xmod.gregtech.api.util.GregtechRecipe_OLD.Gregtech_Recipe_Map;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
diff --git a/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/base/GT_MTE_CustomRecipe_BasicMachine.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GT_MTE_CustomRecipe_BasicMachine.java
index c2852c3c1a..521b23a42e 100644
--- a/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/base/GT_MTE_CustomRecipe_BasicMachine.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GT_MTE_CustomRecipe_BasicMachine.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.gregtech.api.metatileentity.implementations.base;
+package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base;
 
 import static gregtech.api.enums.GT_Values.V;
 import gregtech.api.GregTech_API;
@@ -13,11 +13,11 @@ import gregtech.api.objects.GT_ItemStack;
 import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Utility;
+import gtPlusPlus.xmod.gregtech.api.util.GregtechRecipe_OLD;
+import gtPlusPlus.xmod.gregtech.api.util.GregtechRecipe_OLD.Gregtech_Recipe_Map;
 
 import java.util.Arrays;
 
-import miscutil.xmod.gregtech.api.util.GregtechRecipe_OLD;
-import miscutil.xmod.gregtech.api.util.GregtechRecipe_OLD.Gregtech_Recipe_Map;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
diff --git a/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaPipeEntityBase_Cable.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaPipeEntityBase_Cable.java
index 384c9e29ed..5434dcf671 100644
--- a/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaPipeEntityBase_Cable.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaPipeEntityBase_Cable.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.gregtech.api.metatileentity.implementations.base;
+package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base;
 
 import static gregtech.api.enums.GT_Values.VN;
 import gregtech.GT_Mod;
@@ -16,12 +16,12 @@ import gregtech.api.metatileentity.BaseMetaPipeEntity;
 import gregtech.api.metatileentity.MetaPipeEntity;
 import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Utility;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
 import ic2.api.energy.tile.IEnergySink;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 
-import miscutil.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.item.ItemStack;
diff --git a/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaTileEntity.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaTileEntity.java
index 7291bf4302..cd91d05970 100644
--- a/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaTileEntity.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaTileEntity.java
@@ -1,9 +1,9 @@
-package miscutil.xmod.gregtech.api.metatileentity.implementations.base;
+package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base;
 
 import static gregtech.api.enums.GT_Values.GT;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.metatileentity.MetaTileEntity;
-import miscutil.core.lib.CORE;
+import gtPlusPlus.core.lib.CORE;
 
 public abstract class GregtechMetaTileEntity extends MetaTileEntity {
 	/**
diff --git a/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
index 808c7ba4ad..59f98b8767 100644
--- a/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.gregtech.api.metatileentity.implementations.base;
+package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base;
 
 import static gregtech.api.enums.GT_Values.V;
 import gregtech.GT_Mod;
@@ -25,11 +25,11 @@ import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
 import gregtech.api.util.GT_Utility;
 import gregtech.common.items.GT_MetaGenerated_Tool_01;
+import gtPlusPlus.xmod.gregtech.api.gui.CONTAINER_MultiMachine;
+import gtPlusPlus.xmod.gregtech.api.gui.GUI_MultiMachine;
 
 import java.util.ArrayList;
 
-import miscutil.xmod.gregtech.api.gui.CONTAINER_MultiMachine;
-import miscutil.xmod.gregtech.api.gui.GUI_MultiMachine;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
diff --git a/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechMetaBoilerBase.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechMetaBoilerBase.java
index 07c76a9d46..ac27c32360 100644
--- a/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechMetaBoilerBase.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechMetaBoilerBase.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.gregtech.api.metatileentity.implementations.base.generators;
+package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.generators;
 
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.Materials;
@@ -10,7 +10,7 @@ import gregtech.api.objects.GT_ItemStack;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Utility;
-import miscutil.core.util.math.MathUtils;
+import gtPlusPlus.core.util.math.MathUtils;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
diff --git a/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechMetaSolarGenerator.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechMetaSolarGenerator.java
index 7ecc70d31d..e43b7db9aa 100644
--- a/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechMetaSolarGenerator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechMetaSolarGenerator.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.gregtech.api.metatileentity.implementations.base.generators;
+package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.generators;
 
 import static gregtech.api.enums.GT_Values.V;
 import gregtech.api.enums.Textures;
diff --git a/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechRocketFuelGeneratorBase.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechRocketFuelGeneratorBase.java
index 084cf68f5b..ec75e82114 100644
--- a/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechRocketFuelGeneratorBase.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechRocketFuelGeneratorBase.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.gregtech.api.metatileentity.implementations.base.generators;
+package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.generators;
 
 import static gregtech.api.enums.GT_Values.V;
 import gregtech.api.enums.Textures;
@@ -8,10 +8,10 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank;
 import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
 import gregtech.api.util.GT_Utility;
+import gtPlusPlus.core.lib.CORE;
 
 import java.util.Collection;
 
-import miscutil.core.lib.CORE;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
diff --git a/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/base/lossless/GregtechBaseMetaTileEntityLossless.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/lossless/GregtechBaseMetaTileEntityLossless.java
index f119823e94..e9ac788e7b 100644
--- a/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/base/lossless/GregtechBaseMetaTileEntityLossless.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/lossless/GregtechBaseMetaTileEntityLossless.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.gregtech.api.metatileentity.implementations.base.lossless;
+package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.lossless;
 
 import static gregtech.api.enums.GT_Values.NW;
 import static gregtech.api.enums.GT_Values.V;
diff --git a/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/base/lossless/GregtechMetaPipeEntity_BaseSuperConductor.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/lossless/GregtechMetaPipeEntity_BaseSuperConductor.java
index 056cfb9911..47189bd4f4 100644
--- a/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/base/lossless/GregtechMetaPipeEntity_BaseSuperConductor.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/lossless/GregtechMetaPipeEntity_BaseSuperConductor.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.gregtech.api.metatileentity.implementations.base.lossless;
+package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.lossless;
 
 import static gregtech.api.enums.GT_Values.GT;
 import static gregtech.api.enums.GT_Values.V;
diff --git a/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/base/lossless/GregtechMetaTileEntityLossless.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/lossless/GregtechMetaTileEntityLossless.java
index 12fea91c17..f62b8b69ff 100644
--- a/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/base/lossless/GregtechMetaTileEntityLossless.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/lossless/GregtechMetaTileEntityLossless.java
@@ -1,8 +1,8 @@
-package miscutil.xmod.gregtech.api.metatileentity.implementations.base.lossless;
+package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.lossless;
 
 import static gregtech.api.enums.GT_Values.GT;
 import gregtech.api.interfaces.ITexture;
-import miscutil.core.lib.CORE;
+import gtPlusPlus.core.lib.CORE;
 
 public abstract class GregtechMetaTileEntityLossless extends MetaTileEntityLossless {
 	/**
diff --git a/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/base/lossless/GregtechMetaTileEntityLosslessBasicTank.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/lossless/GregtechMetaTileEntityLosslessBasicTank.java
index e915957218..aee474d9bf 100644
--- a/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/base/lossless/GregtechMetaTileEntityLosslessBasicTank.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/lossless/GregtechMetaTileEntityLosslessBasicTank.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.gregtech.api.metatileentity.implementations.base.lossless;
+package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.lossless;
 
 import gregtech.api.enums.ItemList;
 import gregtech.api.gui.GT_Container_BasicTank;
diff --git a/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/base/lossless/GregtechMetaTileEntityLosslessTieredMachineBlock.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/lossless/GregtechMetaTileEntityLosslessTieredMachineBlock.java
index 9ba2299140..7f4c1a4ed8 100644
--- a/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/base/lossless/GregtechMetaTileEntityLosslessTieredMachineBlock.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/lossless/GregtechMetaTileEntityLosslessTieredMachineBlock.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.gregtech.api.metatileentity.implementations.base.lossless;
+package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.lossless;
 
 import static gregtech.api.enums.GT_Values.GT;
 import gregtech.api.interfaces.ITexture;
diff --git a/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/base/lossless/MetaTileEntityLossless.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/lossless/MetaTileEntityLossless.java
index 2bc937177b..7ec9547ab4 100644
--- a/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/base/lossless/MetaTileEntityLossless.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/lossless/MetaTileEntityLossless.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.gregtech.api.metatileentity.implementations.base.lossless;
+package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.lossless;
 
 import static gregtech.api.enums.GT_Values.GT;
 import static gregtech.api.enums.GT_Values.V;
diff --git a/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaSafeBlockBase.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaSafeBlockBase.java
index 70e2400881..ddbc5aab96 100644
--- a/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaSafeBlockBase.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaSafeBlockBase.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.gregtech.api.metatileentity.implementations.base.machines;
+package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.machines;
 
 import static gregtech.api.enums.GT_Values.V;
 import gregtech.api.enums.Textures;
@@ -7,12 +7,12 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock;
 import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Utility;
+import gtPlusPlus.core.handler.events.UnbreakableBlockManager;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.player.PlayerCache;
 
 import java.util.UUID;
 
-import miscutil.core.handler.events.UnbreakableBlockManager;
-import miscutil.core.util.Utils;
-import miscutil.core.util.player.PlayerCache;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
diff --git a/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/creative/GregtechMetaCreativeEnergyBuffer.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/creative/GregtechMetaCreativeEnergyBuffer.java
index f1ee9c9a0d..348e7dd118 100644
--- a/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/creative/GregtechMetaCreativeEnergyBuffer.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/creative/GregtechMetaCreativeEnergyBuffer.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.gregtech.api.metatileentity.implementations.creative;
+package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.creative;
 
 import static gregtech.api.enums.GT_Values.V;
 import gregtech.api.enums.Textures;
@@ -17,8 +17,8 @@ import gregtech.api.items.GT_MetaBase_Item;
 import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_Utility;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GregtechMetaEnergyBuffer;
 import ic2.api.item.IElectricItem;
-import miscutil.xmod.gregtech.api.metatileentity.implementations.GregtechMetaEnergyBuffer;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
diff --git a/src/Java/miscutil/xmod/gregtech/api/objects/GregtechFluid.java b/src/Java/gtPlusPlus/xmod/gregtech/api/objects/GregtechFluid.java
index 2a9ce9965a..56a48602c9 100644
--- a/src/Java/miscutil/xmod/gregtech/api/objects/GregtechFluid.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/objects/GregtechFluid.java
@@ -1,7 +1,7 @@
-package miscutil.xmod.gregtech.api.objects;
+package gtPlusPlus.xmod.gregtech.api.objects;
 
 import gregtech.api.GregTech_API;
-import miscutil.core.lib.CORE;
+import gtPlusPlus.core.lib.CORE;
 import net.minecraftforge.fluids.Fluid;
 
 public class GregtechFluid extends Fluid implements Runnable {
diff --git a/src/Java/miscutil/xmod/gregtech/api/objects/GregtechItemData.java b/src/Java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java
index 7c650ae7c3..2994bb1b71 100644
--- a/src/Java/miscutil/xmod/gregtech/api/objects/GregtechItemData.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java
@@ -1,6 +1,8 @@
-package miscutil.xmod.gregtech.api.objects;
+package gtPlusPlus.xmod.gregtech.api.objects;
 
 import gregtech.api.objects.GT_ArrayList;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -8,8 +10,6 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
-import miscutil.xmod.gregtech.api.enums.GregtechOrePrefixes;
-import miscutil.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
 import net.minecraft.item.ItemStack;
 
 public class GregtechItemData {
diff --git a/src/Java/miscutil/xmod/gregtech/api/objects/GregtechMaterialStack.java b/src/Java/gtPlusPlus/xmod/gregtech/api/objects/GregtechMaterialStack.java
index 0c863dfc74..245db1745f 100644
--- a/src/Java/miscutil/xmod/gregtech/api/objects/GregtechMaterialStack.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/objects/GregtechMaterialStack.java
@@ -1,6 +1,6 @@
-package miscutil.xmod.gregtech.api.objects;
+package gtPlusPlus.xmod.gregtech.api.objects;
 
-import miscutil.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
 
 public class GregtechMaterialStack implements Cloneable {
     public long mAmount;
diff --git a/src/Java/miscutil/xmod/gregtech/api/objects/GregtechRenderedTexture.java b/src/Java/gtPlusPlus/xmod/gregtech/api/objects/GregtechRenderedTexture.java
index 458f0ddec4..03c59c7ac6 100644
--- a/src/Java/miscutil/xmod/gregtech/api/objects/GregtechRenderedTexture.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/objects/GregtechRenderedTexture.java
@@ -1,10 +1,10 @@
-package miscutil.xmod.gregtech.api.objects;
+package gtPlusPlus.xmod.gregtech.api.objects;
 
 import gregtech.api.enums.Dyes;
 import gregtech.api.interfaces.IColorModulationContainer;
 import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.ITexture;
-import miscutil.core.util.Utils;
+import gtPlusPlus.core.util.Utils;
 import net.minecraft.block.Block;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.RenderBlocks;
diff --git a/src/Java/miscutil/xmod/gregtech/api/recipe/ProcessingSkookumChoocherToolRecipes.java b/src/Java/gtPlusPlus/xmod/gregtech/api/recipe/ProcessingSkookumChoocherToolRecipes.java
index 1078805254..f6c74ad12b 100644
--- a/src/Java/miscutil/xmod/gregtech/api/recipe/ProcessingSkookumChoocherToolRecipes.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/recipe/ProcessingSkookumChoocherToolRecipes.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.gregtech.api.recipe;
+package gtPlusPlus.xmod.gregtech.api.recipe;
 
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
diff --git a/src/Java/miscutil/xmod/gregtech/api/util/GregtechOreDictUnificator.java b/src/Java/gtPlusPlus/xmod/gregtech/api/util/GregtechOreDictUnificator.java
index 1ffc88b4ba..de41b3cafa 100644
--- a/src/Java/miscutil/xmod/gregtech/api/util/GregtechOreDictUnificator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/util/GregtechOreDictUnificator.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.gregtech.api.util;
+package gtPlusPlus.xmod.gregtech.api.util;
 
 import static gregtech.api.enums.GT_Values.E;
 import static gregtech.api.enums.GT_Values.M;
@@ -13,15 +13,15 @@ import gregtech.api.util.GT_Log;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_Utility;
 import gregtech.common.GT_Proxy.OreDictEventContainer;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
+import gtPlusPlus.xmod.gregtech.api.objects.GregtechItemData;
+import gtPlusPlus.xmod.gregtech.api.objects.GregtechMaterialStack;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map.Entry;
 
-import miscutil.xmod.gregtech.api.enums.GregtechOrePrefixes;
-import miscutil.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
-import miscutil.xmod.gregtech.api.objects.GregtechItemData;
-import miscutil.xmod.gregtech.api.objects.GregtechMaterialStack;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.oredict.OreDictionary;
diff --git a/src/Java/miscutil/xmod/gregtech/api/util/GregtechRecipeRegistrator.java b/src/Java/gtPlusPlus/xmod/gregtech/api/util/GregtechRecipeRegistrator.java
index 0b2c04a193..027b89c8e1 100644
--- a/src/Java/miscutil/xmod/gregtech/api/util/GregtechRecipeRegistrator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/util/GregtechRecipeRegistrator.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.gregtech.api.util;
+package gtPlusPlus.xmod.gregtech.api.util;
 
 import static gregtech.api.enums.GT_Values.L;
 import static gregtech.api.enums.GT_Values.M;
@@ -12,16 +12,16 @@ import gregtech.api.enums.TC_Aspects.TC_AspectStack;
 import gregtech.api.interfaces.internal.IThaumcraftCompat;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_Utility;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
+import gtPlusPlus.xmod.gregtech.api.objects.GregtechItemData;
+import gtPlusPlus.xmod.gregtech.api.objects.GregtechMaterialStack;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import miscutil.core.lib.CORE;
-import miscutil.xmod.gregtech.api.enums.GregtechOrePrefixes;
-import miscutil.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
-import miscutil.xmod.gregtech.api.objects.GregtechItemData;
-import miscutil.xmod.gregtech.api.objects.GregtechMaterialStack;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
diff --git a/src/Java/miscutil/xmod/gregtech/api/util/GregtechRecipe_OLD.java b/src/Java/gtPlusPlus/xmod/gregtech/api/util/GregtechRecipe_OLD.java
index fd91ba40ae..60583ed27b 100644
--- a/src/Java/miscutil/xmod/gregtech/api/util/GregtechRecipe_OLD.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/util/GregtechRecipe_OLD.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.gregtech.api.util;
+package gtPlusPlus.xmod.gregtech.api.util;
 
 import static gregtech.api.enums.GT_Values.E;
 import static gregtech.api.enums.GT_Values.RES_PATH_GUI;
@@ -14,6 +14,8 @@ import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
 import gregtech.api.util.GT_Utility;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.item.UtilsItems;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -22,8 +24,6 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 
-import miscutil.core.util.Utils;
-import miscutil.core.util.item.UtilsItems;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.Fluid;
diff --git a/src/Java/miscutil/xmod/gregtech/common/Meta_GT_Proxy.java b/src/Java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java
index 8cf95102ba..64f612ad61 100644
--- a/src/Java/miscutil/xmod/gregtech/common/Meta_GT_Proxy.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.gregtech.common;
+package gtPlusPlus.xmod.gregtech.common;
 
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.ConfigCategories;
@@ -10,20 +10,20 @@ import gregtech.api.util.GT_Log;
 import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Utility;
 import gregtech.common.GT_Proxy.OreDictEventContainer;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
+import gtPlusPlus.xmod.gregtech.api.objects.GregtechFluid;
+import gtPlusPlus.xmod.gregtech.api.util.GregtechOreDictUnificator;
+import gtPlusPlus.xmod.gregtech.api.util.GregtechRecipeRegistrator;
+import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechItems;
 
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Iterator;
 
-import miscutil.core.lib.CORE;
-import miscutil.core.util.Utils;
-import miscutil.xmod.gregtech.api.enums.GregtechOrePrefixes;
-import miscutil.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
-import miscutil.xmod.gregtech.api.objects.GregtechFluid;
-import miscutil.xmod.gregtech.api.util.GregtechOreDictUnificator;
-import miscutil.xmod.gregtech.api.util.GregtechRecipeRegistrator;
-import miscutil.xmod.gregtech.common.items.MetaGeneratedGregtechItems;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
diff --git a/src/Java/miscutil/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java
index 6371764894..7bd49b1ccd 100644
--- a/src/Java/miscutil/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java
@@ -1,11 +1,11 @@
-package miscutil.xmod.gregtech.common.blocks;
+package gtPlusPlus.xmod.gregtech.common.blocks;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.objects.GT_CopiedBlockTexture;
 import gregtech.api.util.GT_LanguageManager;
 import gregtech.common.blocks.GT_Material_Casings;
-import miscutil.xmod.gregtech.api.enums.GregtechItemList;
-import miscutil.xmod.gregtech.common.blocks.textures.CasingTextureHandler;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
+import gtPlusPlus.xmod.gregtech.common.blocks.textures.CasingTextureHandler;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
diff --git a/src/Java/miscutil/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksAbstract.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksAbstract.java
index 3286fa51c4..14ce2afc93 100644
--- a/src/Java/miscutil/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksAbstract.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksAbstract.java
@@ -1,13 +1,13 @@
-package miscutil.xmod.gregtech.common.blocks;
+package gtPlusPlus.xmod.gregtech.common.blocks;
 
 import gregtech.api.GregTech_API;
 import gregtech.api.util.GT_LanguageManager;
 import gregtech.common.blocks.GT_Block_Casings_Abstract;
+import gtPlusPlus.core.creative.AddToCreativeTab;
 
 import java.util.List;
 import java.util.Random;
 
-import miscutil.core.creative.AddToCreativeTab;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
diff --git a/src/Java/miscutil/xmod/gregtech/common/blocks/GregtechMetaCasingItems.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingItems.java
index a3307e4946..1b9b571ef7 100644
--- a/src/Java/miscutil/xmod/gregtech/common/blocks/GregtechMetaCasingItems.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingItems.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.gregtech.common.blocks;
+package gtPlusPlus.xmod.gregtech.common.blocks;
 
 import gregtech.common.blocks.GT_Item_Casings_Abstract;
 import net.minecraft.block.Block;
diff --git a/src/Java/miscutil/xmod/gregtech/common/blocks/GregtechMetaItemCasings1.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaItemCasings1.java
index fbc8d1e06c..b2fd9e197a 100644
--- a/src/Java/miscutil/xmod/gregtech/common/blocks/GregtechMetaItemCasings1.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaItemCasings1.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.gregtech.common.blocks;
+package gtPlusPlus.xmod.gregtech.common.blocks;
 
 import java.util.List;
 
diff --git a/src/Java/miscutil/xmod/gregtech/common/blocks/GregtechMetaItemCasingsAbstract.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaItemCasingsAbstract.java
index e2cd31174d..967121c312 100644
--- a/src/Java/miscutil/xmod/gregtech/common/blocks/GregtechMetaItemCasingsAbstract.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaItemCasingsAbstract.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.gregtech.common.blocks;
+package gtPlusPlus.xmod.gregtech.common.blocks;
 
 import gregtech.api.util.GT_LanguageManager;
 
diff --git a/src/Java/miscutil/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java
index 2357c5baa0..fbba69bf93 100644
--- a/src/Java/miscutil/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java
@@ -1,15 +1,15 @@
-package miscutil.xmod.gregtech.common.blocks.fluid;
+package gtPlusPlus.xmod.gregtech.common.blocks.fluid;
 
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.util.GT_OreDictUnificator;
-import miscutil.core.lib.LoadedMods;
-import miscutil.core.util.Utils;
-import miscutil.core.util.fluid.FluidUtils;
-import miscutil.core.util.item.UtilsItems;
-import miscutil.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
-import miscutil.xmod.gregtech.common.Meta_GT_Proxy;
+import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.fluid.FluidUtils;
+import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
+import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy;
 import net.minecraftforge.fluids.FluidStack;
 
 public class GregtechFluidHandler {
diff --git a/src/Java/miscutil/xmod/gregtech/common/blocks/textures/CasingTextureHandler.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler.java
index c304c3edf6..1e7f3c157e 100644
--- a/src/Java/miscutil/xmod/gregtech/common/blocks/textures/CasingTextureHandler.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler.java
@@ -1,8 +1,8 @@
-package miscutil.xmod.gregtech.common.blocks.textures;
+package gtPlusPlus.xmod.gregtech.common.blocks.textures;
 
 import gregtech.api.enums.Textures;
-import miscutil.core.lib.CORE;
-import miscutil.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
 
diff --git a/src/Java/miscutil/xmod/gregtech/common/blocks/textures/TexturesGregtech58.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGregtech58.java
index 112c07fbc4..869df45989 100644
--- a/src/Java/miscutil/xmod/gregtech/common/blocks/textures/TexturesGregtech58.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGregtech58.java
@@ -1,10 +1,10 @@
-package miscutil.xmod.gregtech.common.blocks.textures;
+package gtPlusPlus.xmod.gregtech.common.blocks.textures;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import miscutil.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks;
-import miscutil.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialCentrifuge;
+import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks;
+import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialCentrifuge;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
diff --git a/src/Java/miscutil/xmod/gregtech/common/blocks/textures/TexturesGregtech59.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGregtech59.java
index c08edbd489..c0b1e1ec4a 100644
--- a/src/Java/miscutil/xmod/gregtech/common/blocks/textures/TexturesGregtech59.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGregtech59.java
@@ -1,10 +1,10 @@
-package miscutil.xmod.gregtech.common.blocks.textures;
+package gtPlusPlus.xmod.gregtech.common.blocks.textures;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import miscutil.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks;
-import miscutil.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialCentrifuge;
+import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks;
+import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialCentrifuge;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
diff --git a/src/Java/miscutil/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java b/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
index 53e2112d4b..3946e93bbb 100644
--- a/src/Java/miscutil/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.gregtech.common.items;
+package gtPlusPlus.xmod.gregtech.common.items;
 
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.GT_Values;
@@ -12,12 +12,12 @@ import gregtech.api.util.GT_FoodStat;
 import gregtech.common.covers.GT_Cover_Arm;
 import gregtech.common.covers.GT_Cover_Conveyor;
 import gregtech.common.covers.GT_Cover_Pump;
-import miscutil.core.lib.CORE;
-import miscutil.core.util.Utils;
-import miscutil.xmod.gregtech.api.enums.GregtechItemList;
-import miscutil.xmod.gregtech.api.enums.GregtechOrePrefixes;
-import miscutil.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
-import miscutil.xmod.gregtech.api.items.Gregtech_MetaItem_X32;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
+import gtPlusPlus.xmod.gregtech.api.items.Gregtech_MetaItem_X32;
 import net.minecraft.item.EnumAction;
 import net.minecraft.util.EnumChatFormatting;
 
diff --git a/src/Java/miscutil/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java b/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java
index ad17253421..2ee00f99d4 100644
--- a/src/Java/miscutil/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java
@@ -1,11 +1,11 @@
-package miscutil.xmod.gregtech.common.items;
+package gtPlusPlus.xmod.gregtech.common.items;
 
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.TC_Aspects;
 import gregtech.api.enums.ToolDictNames;
-import miscutil.xmod.gregtech.api.enums.GregtechToolDictNames;
-import miscutil.xmod.gregtech.api.items.Gregtech_MetaTool;
-import miscutil.xmod.gregtech.common.tools.TOOL_Gregtech_Choocher;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechToolDictNames;
+import gtPlusPlus.xmod.gregtech.api.items.Gregtech_MetaTool;
+import gtPlusPlus.xmod.gregtech.common.tools.TOOL_Gregtech_Choocher;
 
 public class MetaGeneratedGregtechTools extends Gregtech_MetaTool {
     
diff --git a/src/Java/miscutil/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Solar.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Solar.java
index 8cad8882ef..c2cadab478 100644
--- a/src/Java/miscutil/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Solar.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Solar.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.gregtech.common.tileentities.generators;
+package gtPlusPlus.xmod.gregtech.common.tileentities.generators;
 
 import gregtech.api.enums.Dyes;
 import gregtech.api.enums.Textures;
diff --git a/src/Java/miscutil/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityRocketFuelGenerator.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityRocketFuelGenerator.java
index 95fc5bef7c..20ebd611a2 100644
--- a/src/Java/miscutil/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityRocketFuelGenerator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityRocketFuelGenerator.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.gregtech.common.tileentities.generators;
+package gtPlusPlus.xmod.gregtech.common.tileentities.generators;
 
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.ConfigCategories;
@@ -10,7 +10,7 @@ import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_Recipe;
-import miscutil.xmod.gregtech.api.metatileentity.implementations.base.generators.GregtechRocketFuelGeneratorBase;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.generators.GregtechRocketFuelGeneratorBase;
 import net.minecraft.item.ItemStack;
 import cpw.mods.fml.common.registry.GameRegistry;
 
diff --git a/src/Java/miscutil/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySolarGenerator.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySolarGenerator.java
index fa9cbdd055..c41c1851fa 100644
--- a/src/Java/miscutil/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySolarGenerator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySolarGenerator.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.gregtech.common.tileentities.generators;
+package gtPlusPlus.xmod.gregtech.common.tileentities.generators;
 
 import static gregtech.api.enums.GT_Values.V;
 import gregtech.api.GregTech_API;
@@ -8,10 +8,10 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.objects.GT_RenderedTexture;
-import miscutil.core.util.Utils;
-import miscutil.xmod.gregtech.api.gui.CONTAINER_SolarGenerator;
-import miscutil.xmod.gregtech.api.gui.GUI_SolarGenerator;
-import miscutil.xmod.gregtech.api.metatileentity.implementations.base.generators.GregtechMetaSolarGenerator;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.xmod.gregtech.api.gui.CONTAINER_SolarGenerator;
+import gtPlusPlus.xmod.gregtech.api.gui.GUI_SolarGenerator;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.generators.GregtechMetaSolarGenerator;
 import net.minecraft.entity.player.InventoryPlayer;
 
 public class GregtechMetaTileEntitySolarGenerator extends GregtechMetaSolarGenerator {
diff --git a/src/Java/miscutil/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySuperCondensor.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySuperCondensor.java
index fd27e13ba5..5d1befbbad 100644
--- a/src/Java/miscutil/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySuperCondensor.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySuperCondensor.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.gregtech.common.tileentities.generators;
+package gtPlusPlus.xmod.gregtech.common.tileentities.generators;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
@@ -6,7 +6,7 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Recipe;
-import miscutil.xmod.gregtech.api.metatileentity.implementations.GregtechMetaSuperConductorNodeBase;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GregtechMetaSuperConductorNodeBase;
 
 public class GregtechMetaTileEntitySuperCondensor
         extends GregtechMetaSuperConductorNodeBase {
diff --git a/src/Java/miscutil/xmod/gregtech/common/tileentities/machines/multi/GregtechMTENuclearReactor.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMTENuclearReactor.java
index 523525c017..32bae133ba 100644
--- a/src/Java/miscutil/xmod/gregtech/common/tileentities/machines/multi/GregtechMTENuclearReactor.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMTENuclearReactor.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.gregtech.common.tileentities.machines.multi;
+package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
@@ -10,15 +10,15 @@ import gregtech.api.util.GT_Config;
 import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Utility;
 import gregtech.api.util.Recipe_GT;
+import gtPlusPlus.core.block.ModBlocks;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.xmod.gregtech.api.gui.GUI_MultiMachine;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 
-import miscutil.core.block.ModBlocks;
-import miscutil.core.lib.CORE;
-import miscutil.core.util.Utils;
-import miscutil.core.util.item.UtilsItems;
-import miscutil.xmod.gregtech.api.gui.GUI_MultiMachine;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
diff --git a/src/Java/miscutil/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCentrifuge.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCentrifuge.java
index 9d6fdbf8c9..13ae8e424f 100644
--- a/src/Java/miscutil/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCentrifuge.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCentrifuge.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.gregtech.common.tileentities.machines.multi;
+package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi;
 
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.Textures;
@@ -10,16 +10,16 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Maint
 import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Utility;
+import gtPlusPlus.core.block.ModBlocks;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.CORE.configSwitches;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.xmod.gregtech.api.gui.GUI_MultiMachine;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import miscutil.core.block.ModBlocks;
-import miscutil.core.lib.CORE;
-import miscutil.core.lib.CORE.configSwitches;
-import miscutil.core.util.Utils;
-import miscutil.xmod.gregtech.api.gui.GUI_MultiMachine;
-import miscutil.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.entity.player.InventoryPlayer;
diff --git a/src/Java/miscutil/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCokeOven.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCokeOven.java
index 0f9765a319..9c67502cae 100644
--- a/src/Java/miscutil/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCokeOven.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCokeOven.java
@@ -1,6 +1,6 @@
-package miscutil.xmod.gregtech.common.tileentities.machines.multi;
+package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi;
 
-import static miscutil.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks.GTID;
+import static gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks.GTID;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
@@ -9,14 +9,14 @@ import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Utility;
 import gregtech.api.util.Recipe_GT;
+import gtPlusPlus.core.block.ModBlocks;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.xmod.gregtech.api.gui.GUI_MultiMachine;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 
-import miscutil.core.block.ModBlocks;
-import miscutil.core.lib.CORE;
-import miscutil.xmod.gregtech.api.gui.GUI_MultiMachine;
-import miscutil.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.util.ForgeDirection;
diff --git a/src/Java/miscutil/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialElectrolyzer.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialElectrolyzer.java
index 265d0547f5..e300de3d88 100644
--- a/src/Java/miscutil/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialElectrolyzer.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialElectrolyzer.java
@@ -1,6 +1,6 @@
-package miscutil.xmod.gregtech.common.tileentities.machines.multi;
+package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi;
 
-import static miscutil.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks.GTID;
+import static gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks.GTID;
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
@@ -10,14 +10,14 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockB
 import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Utility;
+import gtPlusPlus.core.block.ModBlocks;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.xmod.gregtech.api.gui.GUI_MultiMachine;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import miscutil.core.block.ModBlocks;
-import miscutil.core.lib.CORE;
-import miscutil.xmod.gregtech.api.gui.GUI_MultiMachine;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
diff --git a/src/Java/miscutil/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialMacerator.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialMacerator.java
index ddba959930..ff8b6c7f22 100644
--- a/src/Java/miscutil/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialMacerator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialMacerator.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.gregtech.common.tileentities.machines.multi;
+package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi;
 
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.Textures;
@@ -9,16 +9,16 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Outpu
 import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Utility;
+import gtPlusPlus.core.block.ModBlocks;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.xmod.gregtech.api.gui.GUI_MultiMachine;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Random;
 
-import miscutil.core.block.ModBlocks;
-import miscutil.core.lib.CORE;
-import miscutil.core.util.Utils;
-import miscutil.xmod.gregtech.api.gui.GUI_MultiMachine;
-import miscutil.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
diff --git a/src/Java/miscutil/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialPlatePress.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialPlatePress.java
index c79096386d..df60138c60 100644
--- a/src/Java/miscutil/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialPlatePress.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialPlatePress.java
@@ -1,6 +1,6 @@
-package miscutil.xmod.gregtech.common.tileentities.machines.multi;
+package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi;
 
-import static miscutil.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks.GTID;
+import static gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks.GTID;
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
@@ -10,13 +10,13 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockB
 import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Utility;
+import gtPlusPlus.core.block.ModBlocks;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.xmod.gregtech.api.gui.GUI_MultiMachine;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 
-import miscutil.core.block.ModBlocks;
-import miscutil.core.lib.CORE;
-import miscutil.xmod.gregtech.api.gui.GUI_MultiMachine;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
diff --git a/src/Java/miscutil/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialSinter.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialSinter.java
index 79a2543659..ca5e102521 100644
--- a/src/Java/miscutil/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialSinter.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialSinter.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.gregtech.common.tileentities.machines.multi;
+package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
@@ -10,13 +10,13 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockB
 import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Utility;
+import gtPlusPlus.core.block.ModBlocks;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.xmod.gregtech.api.gui.GUI_MultiMachine;
 
 import java.util.ArrayList;
 
-import miscutil.core.block.ModBlocks;
-import miscutil.core.lib.CORE;
-import miscutil.core.util.Utils;
-import miscutil.xmod.gregtech.api.gui.GUI_MultiMachine;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.entity.player.InventoryPlayer;
diff --git a/src/Java/miscutil/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialWireMill.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialWireMill.java
index 60ad31f1aa..b0bc87c74a 100644
--- a/src/Java/miscutil/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialWireMill.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialWireMill.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.gregtech.common.tileentities.machines.multi;
+package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
@@ -10,13 +10,13 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockB
 import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Utility;
+import gtPlusPlus.core.block.ModBlocks;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.xmod.gregtech.api.gui.GUI_MultiMachine;
 
 import java.util.ArrayList;
 
-import miscutil.core.block.ModBlocks;
-import miscutil.core.lib.CORE;
-import miscutil.core.util.Utils;
-import miscutil.xmod.gregtech.api.gui.GUI_MultiMachine;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
diff --git a/src/Java/miscutil/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIronBlastFurnace.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIronBlastFurnace.java
index e52ea88ca7..3edb17efcb 100644
--- a/src/Java/miscutil/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIronBlastFurnace.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIronBlastFurnace.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.gregtech.common.tileentities.machines.multi;
+package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi;
 
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.Materials;
@@ -11,10 +11,10 @@ import gregtech.api.objects.GT_ItemStack;
 import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Utility;
-import miscutil.core.block.ModBlocks;
-import miscutil.core.lib.CORE;
-import miscutil.xmod.gregtech.api.gui.CONTAINER_IronBlastFurnace;
-import miscutil.xmod.gregtech.api.gui.GUI_IronBlastFurnace;
+import gtPlusPlus.core.block.ModBlocks;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.xmod.gregtech.api.gui.CONTAINER_IronBlastFurnace;
+import gtPlusPlus.xmod.gregtech.api.gui.GUI_IronBlastFurnace;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.init.Blocks;
diff --git a/src/Java/miscutil/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityMassFabricator.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityMassFabricator.java
index 3195c884df..2cd7164fe1 100644
--- a/src/Java/miscutil/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityMassFabricator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityMassFabricator.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.gregtech.common.tileentities.machines.multi;
+package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi;
 
 import gregtech.api.enums.ConfigCategories;
 import gregtech.api.enums.Materials;
@@ -12,16 +12,16 @@ import gregtech.api.util.GT_Config;
 import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Utility;
 import gregtech.api.util.Recipe_GT;
+import gtPlusPlus.core.block.ModBlocks;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.fluid.FluidUtils;
+import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.xmod.gregtech.api.gui.GUI_MatterFab;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 
-import miscutil.core.block.ModBlocks;
-import miscutil.core.lib.CORE;
-import miscutil.core.util.Utils;
-import miscutil.core.util.fluid.FluidUtils;
-import miscutil.core.util.item.UtilsItems;
-import miscutil.xmod.gregtech.api.gui.GUI_MatterFab;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
@@ -150,7 +150,7 @@ public class GregtechMetaTileEntityMassFabricator extends GT_MetaTileEntity_Mult
 						mMatterProduced++;
 						mAmplifierUsed++;
 						updateSlots();
-						//Utils.LOG_INFO("Recipes Finished: "+recipeCounter);
+						Utils.LOG_INFO("Recipes Finished: "+mMatterProduced);
 						return true;
 					}
 				}
@@ -185,7 +185,7 @@ public class GregtechMetaTileEntityMassFabricator extends GT_MetaTileEntity_Mult
 				ArrayUtils.reverse(mOutputFluids);
 				mMatterProduced++;
 				updateSlots();
-				//Utils.LOG_INFO("Recipes Finished: "+recipeCounter);
+				Utils.LOG_INFO("Recipes Finished: "+mMatterProduced);
 				return true;
 			}
 		}
diff --git a/src/Java/miscutil/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityPowerSubStationController.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityPowerSubStationController.java
index b4f4f732d1..b85e011115 100644
--- a/src/Java/miscutil/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityPowerSubStationController.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityPowerSubStationController.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.gregtech.common.tileentities.machines.multi;
+package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
@@ -7,10 +7,10 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase;
 import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Config;
-import miscutil.core.block.ModBlocks;
-import miscutil.core.lib.CORE;
-import miscutil.core.util.Utils;
-import miscutil.xmod.gregtech.api.gui.GUI_MultiMachine;
+import gtPlusPlus.core.block.ModBlocks;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.xmod.gregtech.api.gui.GUI_MultiMachine;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.util.ForgeDirection;
diff --git a/src/Java/miscutil/xmod/gregtech/common/tools/TOOL_Gregtech_Base.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Base.java
index aae55041c7..11e8a6b240 100644
--- a/src/Java/miscutil/xmod/gregtech/common/tools/TOOL_Gregtech_Base.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Base.java
@@ -1,12 +1,12 @@
-package miscutil.xmod.gregtech.common.tools;
+package gtPlusPlus.xmod.gregtech.common.tools;
 
 import gregtech.api.GregTech_API;
 import gregtech.api.damagesources.GT_DamageSources;
+import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_ToolStats;
+import gtPlusPlus.xmod.gregtech.api.items.Gregtech_MetaTool;
 
 import java.util.List;
 
-import miscutil.xmod.gregtech.api.interfaces.internal.Interface_ToolStats;
-import miscutil.xmod.gregtech.api.items.Gregtech_MetaTool;
 import net.minecraft.block.Block;
 import net.minecraft.enchantment.Enchantment;
 import net.minecraft.entity.Entity;
diff --git a/src/Java/miscutil/xmod/gregtech/common/tools/TOOL_Gregtech_BaseMultiblockItem.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_BaseMultiblockItem.java
index 7ed7bcefd3..d4f566dcd4 100644
--- a/src/Java/miscutil/xmod/gregtech/common/tools/TOOL_Gregtech_BaseMultiblockItem.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_BaseMultiblockItem.java
@@ -1,7 +1,7 @@
-package miscutil.xmod.gregtech.common.tools;
+package gtPlusPlus.xmod.gregtech.common.tools;
 
 import gregtech.api.interfaces.IIconContainer;
-import miscutil.xmod.gregtech.api.items.Gregtech_MetaTool;
+import gtPlusPlus.xmod.gregtech.api.items.Gregtech_MetaTool;
 import net.minecraft.block.Block;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.item.ItemStack;
diff --git a/src/Java/miscutil/xmod/gregtech/common/tools/TOOL_Gregtech_Choocher.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Choocher.java
index 71bb4768d4..43afea2310 100644
--- a/src/Java/miscutil/xmod/gregtech/common/tools/TOOL_Gregtech_Choocher.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Choocher.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.gregtech.common.tools;
+package gtPlusPlus.xmod.gregtech.common.tools;
 
 import gregtech.GT_Mod;
 import gregtech.api.GregTech_API;
@@ -6,13 +6,13 @@ import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Utility;
+import gtPlusPlus.xmod.gregtech.api.items.Gregtech_MetaTool;
+import gtPlusPlus.xmod.gregtech.api.items.types.ToolType_HardHammer;
+import gtPlusPlus.xmod.gregtech.api.items.types.ToolType_Wrench;
 
 import java.util.Arrays;
 import java.util.List;
 
-import miscutil.xmod.gregtech.api.items.Gregtech_MetaTool;
-import miscutil.xmod.gregtech.api.items.types.ToolType_HardHammer;
-import miscutil.xmod.gregtech.api.items.types.ToolType_Wrench;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.Entity;
diff --git a/src/Java/miscutil/xmod/gregtech/common/tools/TOOL_Gregtech_MaxEfficiencyMultiBlockItem.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_MaxEfficiencyMultiBlockItem.java
index aed6c9b4eb..a9a43a9444 100644
--- a/src/Java/miscutil/xmod/gregtech/common/tools/TOOL_Gregtech_MaxEfficiencyMultiBlockItem.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_MaxEfficiencyMultiBlockItem.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.gregtech.common.tools;
+package gtPlusPlus.xmod.gregtech.common.tools;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
diff --git a/src/Java/miscutil/xmod/gregtech/loaders/Processing_Block.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/Processing_Block.java
index 2440a4d673..d368e5b9c9 100644
--- a/src/Java/miscutil/xmod/gregtech/loaders/Processing_Block.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/Processing_Block.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.gregtech.loaders;
+package gtPlusPlus.xmod.gregtech.loaders;
 
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.ConfigCategories;
@@ -7,11 +7,11 @@ import gregtech.api.enums.ItemList;
 import gregtech.api.enums.SubTag;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_Utility;
-import miscutil.core.util.Utils;
-import miscutil.xmod.gregtech.api.enums.GregtechOrePrefixes;
-import miscutil.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
-import miscutil.xmod.gregtech.api.interfaces.internal.Interface_OreRecipeRegistrator;
-import miscutil.xmod.gregtech.api.util.GregtechOreDictUnificator;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
+import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_OreRecipeRegistrator;
+import gtPlusPlus.xmod.gregtech.api.util.GregtechOreDictUnificator;
 import net.minecraft.item.ItemStack;
 
 public class Processing_Block implements Interface_OreRecipeRegistrator {
diff --git a/src/Java/miscutil/xmod/gregtech/loaders/Processing_HotIngots.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/Processing_HotIngots.java
index 34c9e8258f..e895b7cc0c 100644
--- a/src/Java/miscutil/xmod/gregtech/loaders/Processing_HotIngots.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/Processing_HotIngots.java
@@ -1,13 +1,13 @@
-package miscutil.xmod.gregtech.loaders;
+package gtPlusPlus.xmod.gregtech.loaders;
 
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Utility;
-import miscutil.core.util.Utils;
-import miscutil.xmod.gregtech.api.enums.GregtechOrePrefixes;
-import miscutil.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
-import miscutil.xmod.gregtech.api.interfaces.internal.Interface_OreRecipeRegistrator;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
+import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_OreRecipeRegistrator;
 import net.minecraft.item.ItemStack;
 
 public class Processing_HotIngots implements Interface_OreRecipeRegistrator {
diff --git a/src/Java/miscutil/xmod/gregtech/loaders/Processing_Ingot1.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/Processing_Ingot1.java
index d8b13e2df0..913597e47e 100644
--- a/src/Java/miscutil/xmod/gregtech/loaders/Processing_Ingot1.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/Processing_Ingot1.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.gregtech.loaders;
+package gtPlusPlus.xmod.gregtech.loaders;
 
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.ItemList;
@@ -7,11 +7,11 @@ import gregtech.api.enums.SubTag;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Utility;
-import miscutil.core.util.Utils;
-import miscutil.xmod.gregtech.api.enums.GregtechOrePrefixes;
-import miscutil.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
-import miscutil.xmod.gregtech.api.interfaces.internal.Interface_OreRecipeRegistrator;
-import miscutil.xmod.gregtech.api.util.GregtechRecipeRegistrator;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
+import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_OreRecipeRegistrator;
+import gtPlusPlus.xmod.gregtech.api.util.GregtechRecipeRegistrator;
 import net.minecraft.item.ItemStack;
 
 public class Processing_Ingot1 implements Interface_OreRecipeRegistrator {
diff --git a/src/Java/miscutil/xmod/gregtech/loaders/Processing_Plate1.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/Processing_Plate1.java
index c7e17397f8..3d4f439ef0 100644
--- a/src/Java/miscutil/xmod/gregtech/loaders/Processing_Plate1.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/Processing_Plate1.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.gregtech.loaders;
+package gtPlusPlus.xmod.gregtech.loaders;
 
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.ItemList;
@@ -7,9 +7,9 @@ import gregtech.api.enums.OrePrefixes;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Utility;
-import miscutil.core.util.Utils;
-import miscutil.xmod.gregtech.api.enums.GregtechOrePrefixes;
-import miscutil.xmod.gregtech.api.interfaces.internal.Interface_OreRecipeRegistrator;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes;
+import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_OreRecipeRegistrator;
 import net.minecraft.item.ItemStack;
 
 public class Processing_Plate1 implements Interface_OreRecipeRegistrator {
diff --git a/src/Java/miscutil/xmod/gregtech/loaders/Processing_Textures_Items.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/Processing_Textures_Items.java
index f19bfccddb..41e0511ace 100644
--- a/src/Java/miscutil/xmod/gregtech/loaders/Processing_Textures_Items.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/Processing_Textures_Items.java
@@ -1,6 +1,6 @@
-package miscutil.xmod.gregtech.loaders;
+package gtPlusPlus.xmod.gregtech.loaders;
 
-import miscutil.xmod.gregtech.api.enums.GregtechTextures.ItemIcons.CustomIcon;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechTextures.ItemIcons.CustomIcon;
 
 public class Processing_Textures_Items {
 	
diff --git a/src/Java/miscutil/xmod/gregtech/recipes/GregtechRecipeAdder.java b/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
index 2eca5b40be..f5aa8720ef 100644
--- a/src/Java/miscutil/xmod/gregtech/recipes/GregtechRecipeAdder.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
@@ -1,13 +1,13 @@
-package miscutil.xmod.gregtech.recipes;
+package gtPlusPlus.xmod.gregtech.recipes;
 
 import gregtech.api.GregTech_API;
 import gregtech.api.util.Recipe_GT;
-import miscutil.core.util.Utils;
-import miscutil.core.util.item.UtilsItems;
-import miscutil.xmod.gregtech.api.interfaces.internal.IGregtech_RecipeAdder;
-import miscutil.xmod.gregtech.recipes.machines.RECIPEHANDLER_CokeOven;
-import miscutil.xmod.gregtech.recipes.machines.RECIPEHANDLER_Dehydrator;
-import miscutil.xmod.gregtech.recipes.machines.RECIPEHANDLER_MatterFabricator;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.xmod.gregtech.api.interfaces.internal.IGregtech_RecipeAdder;
+import gtPlusPlus.xmod.gregtech.recipes.machines.RECIPEHANDLER_CokeOven;
+import gtPlusPlus.xmod.gregtech.recipes.machines.RECIPEHANDLER_Dehydrator;
+import gtPlusPlus.xmod.gregtech.recipes.machines.RECIPEHANDLER_MatterFabricator;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 
diff --git a/src/Java/miscutil/xmod/gregtech/recipes/machines/RECIPEHANDLER_CokeOven.java b/src/Java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_CokeOven.java
index 66c761564b..01b62e23ca 100644
--- a/src/Java/miscutil/xmod/gregtech/recipes/machines/RECIPEHANDLER_CokeOven.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_CokeOven.java
@@ -1,6 +1,6 @@
-package miscutil.xmod.gregtech.recipes.machines;
+package gtPlusPlus.xmod.gregtech.recipes.machines;
 
-import miscutil.core.util.Utils;
+import gtPlusPlus.core.util.Utils;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 
diff --git a/src/Java/miscutil/xmod/gregtech/recipes/machines/RECIPEHANDLER_Dehydrator.java b/src/Java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_Dehydrator.java
index 9cab3c2549..ea30cc1e6f 100644
--- a/src/Java/miscutil/xmod/gregtech/recipes/machines/RECIPEHANDLER_Dehydrator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_Dehydrator.java
@@ -1,7 +1,7 @@
-package miscutil.xmod.gregtech.recipes.machines;
+package gtPlusPlus.xmod.gregtech.recipes.machines;
 
-import miscutil.core.util.Utils;
-import miscutil.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.item.UtilsItems;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 
diff --git a/src/Java/miscutil/xmod/gregtech/recipes/machines/RECIPEHANDLER_MatterFabricator.java b/src/Java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_MatterFabricator.java
index 0e92004390..ff9f87d805 100644
--- a/src/Java/miscutil/xmod/gregtech/recipes/machines/RECIPEHANDLER_MatterFabricator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_MatterFabricator.java
@@ -1,6 +1,6 @@
-package miscutil.xmod.gregtech.recipes.machines;
+package gtPlusPlus.xmod.gregtech.recipes.machines;
 
-import miscutil.core.util.Utils;
+import gtPlusPlus.core.util.Utils;
 import net.minecraftforge.fluids.FluidStack;
 
 public class RECIPEHANDLER_MatterFabricator {
diff --git a/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechConduits.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java
index 4c3258b069..1f3537f355 100644
--- a/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechConduits.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java
@@ -1,25 +1,25 @@
-package miscutil.xmod.gregtech.registration.gregtech;
+package gtPlusPlus.xmod.gregtech.registration.gregtech;
 
-import static miscutil.core.lib.LoadedMods.Gregtech;
+import static gtPlusPlus.core.lib.LoadedMods.Gregtech;
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Fluid;
 import gregtech.api.util.GT_OreDictUnificator;
+import gtPlusPlus.core.item.ModItems;
+import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.recipe.UtilsRecipe;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GregtechMetaPipeEntityFluid;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GregtechMetaPipeEntity_Cable;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GregtechMetaPipeEntity_SuperConductor;
 
 import java.util.ArrayList;
 
-import miscutil.core.item.ModItems;
-import miscutil.core.lib.LoadedMods;
-import miscutil.core.util.Utils;
-import miscutil.core.util.item.UtilsItems;
-import miscutil.core.util.recipe.UtilsRecipe;
-import miscutil.xmod.gregtech.api.enums.GregtechOrePrefixes;
-import miscutil.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
-import miscutil.xmod.gregtech.api.metatileentity.implementations.GregtechMetaPipeEntityFluid;
-import miscutil.xmod.gregtech.api.metatileentity.implementations.GregtechMetaPipeEntity_Cable;
-import miscutil.xmod.gregtech.api.metatileentity.implementations.GregtechMetaPipeEntity_SuperConductor;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.oredict.OreDictionary;
 
diff --git a/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechDehydrator.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java
index a4949bc292..fd4ec45fbb 100644
--- a/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechDehydrator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java
@@ -1,11 +1,11 @@
-package miscutil.xmod.gregtech.registration.gregtech;
+package gtPlusPlus.xmod.gregtech.registration.gregtech;
 
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe;
 import gregtech.api.util.Recipe_GT;
-import miscutil.core.lib.CORE;
-import miscutil.core.lib.LoadedMods;
-import miscutil.core.util.Utils;
-import miscutil.xmod.gregtech.api.enums.GregtechItemList;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 
 public class GregtechDehydrator
 {
diff --git a/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java
index b882950be1..6f81f5c44c 100644
--- a/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java
@@ -1,14 +1,14 @@
-package miscutil.xmod.gregtech.registration.gregtech;
+package gtPlusPlus.xmod.gregtech.registration.gregtech;
 
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.util.GT_ModHandler;
-import miscutil.core.util.Utils;
-import miscutil.xmod.gregtech.api.enums.GregtechItemList;
-import miscutil.xmod.gregtech.api.enums.GregtechOreDictNames;
-import miscutil.xmod.gregtech.api.metatileentity.implementations.GregtechMetaEnergyBuffer;
-import miscutil.xmod.gregtech.api.metatileentity.implementations.creative.GregtechMetaCreativeEnergyBuffer;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechOreDictNames;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GregtechMetaEnergyBuffer;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.creative.GregtechMetaCreativeEnergyBuffer;
 
 public class GregtechEnergyBuffer
 {
@@ -18,7 +18,7 @@ public class GregtechEnergyBuffer
 	
 	public static void run()
 	{
-		if (miscutil.core.lib.LoadedMods.Gregtech){
+		if (gtPlusPlus.core.lib.LoadedMods.Gregtech){
 			Utils.LOG_INFO("Gregtech5u Content | Registering Energy Buffer Blocks.");
 			run1();
 		}
diff --git a/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechIndustrialCentrifuge.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCentrifuge.java
index 54840ca463..14ccd6a142 100644
--- a/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechIndustrialCentrifuge.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCentrifuge.java
@@ -1,8 +1,8 @@
-package miscutil.xmod.gregtech.registration.gregtech;
+package gtPlusPlus.xmod.gregtech.registration.gregtech;
 
-import miscutil.core.util.Utils;
-import miscutil.xmod.gregtech.api.enums.GregtechItemList;
-import miscutil.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialCentrifuge;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
+import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialCentrifuge;
 
 public class GregtechIndustrialCentrifuge
 {
@@ -11,7 +11,7 @@ public class GregtechIndustrialCentrifuge
 
 	public static void run()
 	{
-		if (miscutil.core.lib.LoadedMods.Gregtech){
+		if (gtPlusPlus.core.lib.LoadedMods.Gregtech){
 			Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Centrifuge Multiblock.");
 			run1();
 		}
diff --git a/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechIndustrialCokeOven.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCokeOven.java
index ab551cc88a..15e1be1e6a 100644
--- a/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechIndustrialCokeOven.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCokeOven.java
@@ -1,8 +1,8 @@
-package miscutil.xmod.gregtech.registration.gregtech;
+package gtPlusPlus.xmod.gregtech.registration.gregtech;
 
-import miscutil.core.util.Utils;
-import miscutil.xmod.gregtech.api.enums.GregtechItemList;
-import miscutil.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialCokeOven;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
+import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialCokeOven;
 
 public class GregtechIndustrialCokeOven
 {
@@ -11,7 +11,7 @@ public class GregtechIndustrialCokeOven
 
 	public static void run()
 	{
-		if (miscutil.core.lib.LoadedMods.Gregtech){
+		if (gtPlusPlus.core.lib.LoadedMods.Gregtech){
 			Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Coke Oven Multiblock.");
 			run1();
 		}
diff --git a/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechIndustrialElectrolyzer.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElectrolyzer.java
index 30c199193e..e165430580 100644
--- a/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechIndustrialElectrolyzer.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElectrolyzer.java
@@ -1,8 +1,8 @@
-package miscutil.xmod.gregtech.registration.gregtech;
+package gtPlusPlus.xmod.gregtech.registration.gregtech;
 
-import miscutil.core.util.Utils;
-import miscutil.xmod.gregtech.api.enums.GregtechItemList;
-import miscutil.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialElectrolyzer;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
+import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialElectrolyzer;
 
 public class GregtechIndustrialElectrolyzer
 {
@@ -11,7 +11,7 @@ public class GregtechIndustrialElectrolyzer
 
 	public static void run()
 	{
-		if (miscutil.core.lib.LoadedMods.Gregtech){
+		if (gtPlusPlus.core.lib.LoadedMods.Gregtech){
 			Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Electrolyzer Multiblock.");
 			run1();
 		}
diff --git a/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechIndustrialMacerator.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMacerator.java
index b00175b29c..110e729f75 100644
--- a/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechIndustrialMacerator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMacerator.java
@@ -1,8 +1,8 @@
-package miscutil.xmod.gregtech.registration.gregtech;
+package gtPlusPlus.xmod.gregtech.registration.gregtech;
 
-import miscutil.core.util.Utils;
-import miscutil.xmod.gregtech.api.enums.GregtechItemList;
-import miscutil.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialMacerator;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
+import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialMacerator;
 
 public class GregtechIndustrialMacerator
 {
@@ -11,7 +11,7 @@ public class GregtechIndustrialMacerator
 
 	public static void run()
 	{
-		if (miscutil.core.lib.LoadedMods.Gregtech){
+		if (gtPlusPlus.core.lib.LoadedMods.Gregtech){
 			Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Maceration Stack Multiblock.");
 			run1();
 		}
diff --git a/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java
index 8de2b1c211..dcbc25ae88 100644
--- a/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java
@@ -1,8 +1,8 @@
-package miscutil.xmod.gregtech.registration.gregtech;
+package gtPlusPlus.xmod.gregtech.registration.gregtech;
 
-import miscutil.core.util.Utils;
-import miscutil.xmod.gregtech.api.enums.GregtechItemList;
-import miscutil.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityMassFabricator;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
+import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityMassFabricator;
 
 public class GregtechIndustrialMassFabricator
 {
@@ -11,7 +11,7 @@ public class GregtechIndustrialMassFabricator
 
 	public static void run()
 	{
-		if (miscutil.core.lib.LoadedMods.Gregtech){
+		if (gtPlusPlus.core.lib.LoadedMods.Gregtech){
 			Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Mass Fabricator Multiblock.");
 			run1();
 		}
diff --git a/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechIndustrialPlatePress.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialPlatePress.java
index 627ac158b3..96f26f050a 100644
--- a/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechIndustrialPlatePress.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialPlatePress.java
@@ -1,8 +1,8 @@
-package miscutil.xmod.gregtech.registration.gregtech;
+package gtPlusPlus.xmod.gregtech.registration.gregtech;
 
-import miscutil.core.util.Utils;
-import miscutil.xmod.gregtech.api.enums.GregtechItemList;
-import miscutil.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialPlatePress;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
+import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialPlatePress;
 
 public class GregtechIndustrialPlatePress
 {
@@ -11,7 +11,7 @@ public class GregtechIndustrialPlatePress
 
 	public static void run()
 	{
-		if (miscutil.core.lib.LoadedMods.Gregtech){
+		if (gtPlusPlus.core.lib.LoadedMods.Gregtech){
 			Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Press Multiblock.");
 			run1();
 		}
diff --git a/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechIndustrialSinter.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialSinter.java
index e4f54edc83..d8ce73f460 100644
--- a/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechIndustrialSinter.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialSinter.java
@@ -1,14 +1,14 @@
-package miscutil.xmod.gregtech.registration.gregtech;
+package gtPlusPlus.xmod.gregtech.registration.gregtech;
 
-import miscutil.core.util.Utils;
-import miscutil.xmod.gregtech.api.enums.GregtechItemList;
-import miscutil.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialSinter;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
+import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialSinter;
 
 public class GregtechIndustrialSinter{
 
 	public static void run()
 	{
-		if (miscutil.core.lib.LoadedMods.Gregtech){
+		if (gtPlusPlus.core.lib.LoadedMods.Gregtech){
 			Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Sinter Furnace Multiblock.");
 			run1();
 		}
diff --git a/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechIndustrialWiremill.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWiremill.java
index 50ffd83851..2d69a2c6e3 100644
--- a/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechIndustrialWiremill.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWiremill.java
@@ -1,8 +1,8 @@
-package miscutil.xmod.gregtech.registration.gregtech;
+package gtPlusPlus.xmod.gregtech.registration.gregtech;
 
-import miscutil.core.util.Utils;
-import miscutil.xmod.gregtech.api.enums.GregtechItemList;
-import miscutil.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialWireMill;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
+import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialWireMill;
 
 public class GregtechIndustrialWiremill
 {
@@ -11,7 +11,7 @@ public class GregtechIndustrialWiremill
 
 	public static void run()
 	{
-		if (miscutil.core.lib.LoadedMods.Gregtech){
+		if (gtPlusPlus.core.lib.LoadedMods.Gregtech){
 			Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Wire Factory Multiblock.");
 			run1();
 		}
diff --git a/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechIronBlastFurnace.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIronBlastFurnace.java
index 7c5479259e..38768557bc 100644
--- a/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechIronBlastFurnace.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIronBlastFurnace.java
@@ -1,8 +1,8 @@
-package miscutil.xmod.gregtech.registration.gregtech;
+package gtPlusPlus.xmod.gregtech.registration.gregtech;
 
-import miscutil.core.util.Utils;
-import miscutil.xmod.gregtech.api.enums.GregtechItemList;
-import miscutil.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIronBlastFurnace;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
+import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIronBlastFurnace;
 
 public class GregtechIronBlastFurnace
 {
@@ -11,7 +11,7 @@ public class GregtechIronBlastFurnace
 
 	public static void run()
 	{
-		if (miscutil.core.lib.LoadedMods.Gregtech){
+		if (gtPlusPlus.core.lib.LoadedMods.Gregtech){
 			Utils.LOG_INFO("Gregtech5u Content | Registering Iron Blast Furnace.");
 			run1();
 		}
diff --git a/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechPowerSubStation.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerSubStation.java
index 3c555d5cf1..05ef99f79f 100644
--- a/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechPowerSubStation.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerSubStation.java
@@ -1,8 +1,8 @@
-package miscutil.xmod.gregtech.registration.gregtech;
+package gtPlusPlus.xmod.gregtech.registration.gregtech;
 
-import miscutil.core.util.Utils;
-import miscutil.xmod.gregtech.api.enums.GregtechItemList;
-import miscutil.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityPowerSubStationController;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
+import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityPowerSubStationController;
 
 public class GregtechPowerSubStation
 {
@@ -11,7 +11,7 @@ public class GregtechPowerSubStation
 
 	public static void run()
 	{
-		if (miscutil.core.lib.LoadedMods.Gregtech){
+		if (gtPlusPlus.core.lib.LoadedMods.Gregtech){
 			Utils.LOG_INFO("Gregtech5u Content | Registering Power Substation Node.");
 			run1();
 		}
diff --git a/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java
index cc40d0d753..a58d258ff3 100644
--- a/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java
@@ -1,9 +1,9 @@
-package miscutil.xmod.gregtech.registration.gregtech;
+package gtPlusPlus.xmod.gregtech.registration.gregtech;
 
-import miscutil.core.lib.LoadedMods;
-import miscutil.core.util.Utils;
-import miscutil.xmod.gregtech.api.enums.GregtechItemList;
-import miscutil.xmod.gregtech.common.tileentities.generators.GregtechMetaTileEntityRocketFuelGenerator;
+import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
+import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GregtechMetaTileEntityRocketFuelGenerator;
 
 public class GregtechRocketFuelGenerator {
 	
diff --git a/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechSafeBlock.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSafeBlock.java
index ff4dd7d223..e0632c1f0a 100644
--- a/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechSafeBlock.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSafeBlock.java
@@ -1,19 +1,19 @@
-package miscutil.xmod.gregtech.registration.gregtech;
+package gtPlusPlus.xmod.gregtech.registration.gregtech;
 
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OreDictNames;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.util.GT_ModHandler;
-import miscutil.core.util.Utils;
-import miscutil.xmod.gregtech.api.enums.GregtechItemList;
-import miscutil.xmod.gregtech.api.metatileentity.implementations.GregtechMetaSafeBlock;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GregtechMetaSafeBlock;
 
 public class GregtechSafeBlock
 {
 	public static void run()
 	{
-		if (miscutil.core.lib.LoadedMods.Gregtech){
+		if (gtPlusPlus.core.lib.LoadedMods.Gregtech){
 			Utils.LOG_INFO("Gregtech5u Content | Registering Lockable Safe Blocks.");
 			run1();
 		}
diff --git a/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechSolarGenerators.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarGenerators.java
index f9c6bbc625..aaa60d377d 100644
--- a/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechSolarGenerators.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarGenerators.java
@@ -1,10 +1,10 @@
-package miscutil.xmod.gregtech.registration.gregtech;
+package gtPlusPlus.xmod.gregtech.registration.gregtech;
 
-import miscutil.core.lib.CORE.configSwitches;
-import miscutil.core.lib.LoadedMods;
-import miscutil.core.util.Utils;
-import miscutil.xmod.gregtech.api.enums.GregtechItemList;
-import miscutil.xmod.gregtech.common.tileentities.generators.GregtechMetaTileEntitySolarGenerator;
+import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.core.lib.CORE.configSwitches;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
+import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GregtechMetaTileEntitySolarGenerator;
 
 public class GregtechSolarGenerators
 {
diff --git a/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechSteamCondenser.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSteamCondenser.java
index f0c9f741d0..a3b92daea0 100644
--- a/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechSteamCondenser.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSteamCondenser.java
@@ -1,8 +1,8 @@
-package miscutil.xmod.gregtech.registration.gregtech;
+package gtPlusPlus.xmod.gregtech.registration.gregtech;
 
-import miscutil.core.util.Utils;
-import miscutil.xmod.gregtech.api.enums.GregtechItemList;
-import miscutil.xmod.gregtech.api.metatileentity.implementations.GregtechMetaCondensor;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GregtechMetaCondensor;
 
 public class GregtechSteamCondenser
 {
@@ -11,7 +11,7 @@ public class GregtechSteamCondenser
 
 	public static void run()
 	{
-		if (miscutil.core.lib.LoadedMods.Gregtech){
+		if (gtPlusPlus.core.lib.LoadedMods.Gregtech){
 			Utils.LOG_INFO("Gregtech5u Content | Registering Steam Condensor.");
 			run1();
 		}
diff --git a/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechSuperConductionPoint.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperConductionPoint.java
index 9b62af15d3..fc7927d3f2 100644
--- a/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechSuperConductionPoint.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperConductionPoint.java
@@ -1,8 +1,8 @@
-package miscutil.xmod.gregtech.registration.gregtech;
+package gtPlusPlus.xmod.gregtech.registration.gregtech;
 
-import miscutil.core.util.Utils;
-import miscutil.xmod.gregtech.api.enums.GregtechItemList;
-import miscutil.xmod.gregtech.common.tileentities.generators.GregtechMetaTileEntitySuperCondensor;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
+import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GregtechMetaTileEntitySuperCondensor;
 
 public class GregtechSuperConductionPoint
 {
@@ -11,7 +11,7 @@ public class GregtechSuperConductionPoint
 
 	public static void run()
 	{
-		if (miscutil.core.lib.LoadedMods.Gregtech){
+		if (gtPlusPlus.core.lib.LoadedMods.Gregtech){
 			Utils.LOG_INFO("Gregtech5u Content | Registering Super Conductor Input Node.");
 			run1();
 		}
diff --git a/src/Java/miscutil/xmod/growthcraft/HANDLER_GC.java b/src/Java/gtPlusPlus/xmod/growthcraft/HANDLER_GC.java
index 6046efa16f..fae897734b 100644
--- a/src/Java/miscutil/xmod/growthcraft/HANDLER_GC.java
+++ b/src/Java/gtPlusPlus/xmod/growthcraft/HANDLER_GC.java
@@ -1,7 +1,7 @@
-package miscutil.xmod.growthcraft;
+package gtPlusPlus.xmod.growthcraft;
 
-import miscutil.core.lib.LoadedMods;
-import miscutil.xmod.growthcraft.booze.Register_Booze;
+import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.xmod.growthcraft.booze.Register_Booze;
 
 public class HANDLER_GC {
 
diff --git a/src/Java/miscutil/xmod/growthcraft/booze/Register_Booze.java b/src/Java/gtPlusPlus/xmod/growthcraft/booze/Register_Booze.java
index 4dcb11e203..88174aac4e 100644
--- a/src/Java/miscutil/xmod/growthcraft/booze/Register_Booze.java
+++ b/src/Java/gtPlusPlus/xmod/growthcraft/booze/Register_Booze.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.growthcraft.booze;
+package gtPlusPlus.xmod.growthcraft.booze;
 
 import growthcraft.api.cellar.Booze;
 import growthcraft.api.cellar.CellarRegistry;
@@ -8,7 +8,7 @@ import growthcraft.cellar.item.ItemBoozeBucketDEPRECATED;
 import growthcraft.cellar.item.ItemBucketBooze;
 import growthcraft.cellar.utils.BoozeRegistryHelper;
 import growthcraft.hops.GrowthCraftHops;
-import miscutil.core.lib.LoadedMods;
+import gtPlusPlus.core.lib.LoadedMods;
 import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.potion.Potion;
diff --git a/src/Java/miscutil/xmod/ic2/HANDLER_IC2.java b/src/Java/gtPlusPlus/xmod/ic2/HANDLER_IC2.java
index cf2e0e3d17..55875fc02d 100644
--- a/src/Java/miscutil/xmod/ic2/HANDLER_IC2.java
+++ b/src/Java/gtPlusPlus/xmod/ic2/HANDLER_IC2.java
@@ -1,10 +1,10 @@
-package miscutil.xmod.ic2;
+package gtPlusPlus.xmod.ic2;
 
+import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.xmod.ic2.block.RTGGenerator.BlockRTG;
+import gtPlusPlus.xmod.ic2.item.IC2_Items;
+import gtPlusPlus.xmod.ic2.recipe.RECIPE_IC2;
 import ic2.core.init.InternalName;
-import miscutil.core.lib.LoadedMods;
-import miscutil.xmod.ic2.block.RTGGenerator.BlockRTG;
-import miscutil.xmod.ic2.item.IC2_Items;
-import miscutil.xmod.ic2.recipe.RECIPE_IC2;
 
 public class HANDLER_IC2{
 
diff --git a/src/Java/miscutil/xmod/ic2/block/RTGGenerator/BlockRTG.java b/src/Java/gtPlusPlus/xmod/ic2/block/RTGGenerator/BlockRTG.java
index b9ae02f10d..9d238e4c97 100644
--- a/src/Java/miscutil/xmod/ic2/block/RTGGenerator/BlockRTG.java
+++ b/src/Java/gtPlusPlus/xmod/ic2/block/RTGGenerator/BlockRTG.java
@@ -1,5 +1,9 @@
-package miscutil.xmod.ic2.block.RTGGenerator;
+package gtPlusPlus.xmod.ic2.block.RTGGenerator;
 
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.xmod.ic2.block.kieticgenerator.tileentity.TileEntityKineticWindGenerator;
+import gtPlusPlus.xmod.ic2.item.IC2_Items;
+import gtPlusPlus.xmod.ic2.item.ItemGenerators;
 import ic2.core.IC2;
 import ic2.core.Ic2Items;
 import ic2.core.block.BlockMultiID;
@@ -10,10 +14,6 @@ import ic2.core.init.InternalName;
 import java.util.List;
 import java.util.Random;
 
-import miscutil.core.creative.AddToCreativeTab;
-import miscutil.xmod.ic2.block.kieticgenerator.tileentity.TileEntityKineticWindGenerator;
-import miscutil.xmod.ic2.item.IC2_Items;
-import miscutil.xmod.ic2.item.ItemGenerators;
 import net.minecraft.block.material.Material;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
diff --git a/src/Java/miscutil/xmod/ic2/block/RTGGenerator/TileEntityRTG.java b/src/Java/gtPlusPlus/xmod/ic2/block/RTGGenerator/TileEntityRTG.java
index c42ecd3fa9..cea09bdd5c 100644
--- a/src/Java/miscutil/xmod/ic2/block/RTGGenerator/TileEntityRTG.java
+++ b/src/Java/gtPlusPlus/xmod/ic2/block/RTGGenerator/TileEntityRTG.java
@@ -1,12 +1,12 @@
-package miscutil.xmod.ic2.block.RTGGenerator;
+package gtPlusPlus.xmod.ic2.block.RTGGenerator;
 
+import gtPlusPlus.xmod.ic2.block.RTGGenerator.gui.CONTAINER_RTG;
+import gtPlusPlus.xmod.ic2.block.RTGGenerator.gui.GUI_RTG;
 import ic2.core.ContainerBase;
 import ic2.core.Ic2Items;
 import ic2.core.block.generator.tileentity.TileEntityRTGenerator;
 import ic2.core.block.invslot.InvSlotConsumable;
 import ic2.core.block.invslot.InvSlotConsumableId;
-import miscutil.xmod.ic2.block.RTGGenerator.gui.CONTAINER_RTG;
-import miscutil.xmod.ic2.block.RTGGenerator.gui.GUI_RTG;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
diff --git a/src/Java/miscutil/xmod/ic2/block/RTGGenerator/gui/CONTAINER_RTG.java b/src/Java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/CONTAINER_RTG.java
index d3e96ee673..e9c7b5cc81 100644
--- a/src/Java/miscutil/xmod/ic2/block/RTGGenerator/gui/CONTAINER_RTG.java
+++ b/src/Java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/CONTAINER_RTG.java
@@ -1,11 +1,11 @@
-package miscutil.xmod.ic2.block.RTGGenerator.gui;
+package gtPlusPlus.xmod.ic2.block.RTGGenerator.gui;
 
+import gtPlusPlus.xmod.ic2.block.RTGGenerator.TileEntityRTG;
 import ic2.core.block.generator.container.ContainerRTGenerator;
 import ic2.core.slot.SlotInvSlot;
 
 import java.util.List;
 
-import miscutil.xmod.ic2.block.RTGGenerator.TileEntityRTG;
 import net.minecraft.entity.player.EntityPlayer;
 
 public class CONTAINER_RTG
diff --git a/src/Java/miscutil/xmod/ic2/block/RTGGenerator/gui/GUI_RTG.java b/src/Java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/GUI_RTG.java
index 8d7f73eb08..0d5f701b7a 100644
--- a/src/Java/miscutil/xmod/ic2/block/RTGGenerator/gui/GUI_RTG.java
+++ b/src/Java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/GUI_RTG.java
@@ -1,9 +1,9 @@
-package miscutil.xmod.ic2.block.RTGGenerator.gui;
+package gtPlusPlus.xmod.ic2.block.RTGGenerator.gui;
 
+import gtPlusPlus.xmod.ic2.block.RTGGenerator.TileEntityRTG;
 import ic2.core.IC2;
 import ic2.core.block.generator.gui.GuiRTGenerator;
 import ic2.core.util.GuiTooltipHelper;
-import miscutil.xmod.ic2.block.RTGGenerator.TileEntityRTG;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.StatCollector;
 
diff --git a/src/Java/miscutil/xmod/ic2/block/kieticgenerator/IC2_BlockKineticGenerator.java b/src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_BlockKineticGenerator.java
index 75f4f5f072..74d94011ea 100644
--- a/src/Java/miscutil/xmod/ic2/block/kieticgenerator/IC2_BlockKineticGenerator.java
+++ b/src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_BlockKineticGenerator.java
@@ -1,11 +1,11 @@
-package miscutil.xmod.ic2.block.kieticgenerator;
+package gtPlusPlus.xmod.ic2.block.kieticgenerator;
 
+import gtPlusPlus.core.creative.AddToCreativeTab;
 import ic2.core.block.BlockMultiID;
 import ic2.core.block.kineticgenerator.tileentity.TileEntityManualKineticGenerator;
 import ic2.core.block.kineticgenerator.tileentity.TileEntityWindKineticGenerator;
 import ic2.core.init.InternalName;
 import ic2.core.item.block.ItemKineticGenerator;
-import miscutil.core.creative.AddToCreativeTab;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.player.EntityPlayer;
diff --git a/src/Java/miscutil/xmod/ic2/block/kieticgenerator/IC2_TEComponent.java b/src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_TEComponent.java
index bd417968d6..f356441921 100644
--- a/src/Java/miscutil/xmod/ic2/block/kieticgenerator/IC2_TEComponent.java
+++ b/src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_TEComponent.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.ic2.block.kieticgenerator;
+package gtPlusPlus.xmod.ic2.block.kieticgenerator;
 
 import ic2.core.block.TileEntityBlock;
 
diff --git a/src/Java/miscutil/xmod/ic2/block/kieticgenerator/container/ContainerKineticWindgenerator.java b/src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/container/ContainerKineticWindgenerator.java
index c8c6b05c1e..b3ceea52d4 100644
--- a/src/Java/miscutil/xmod/ic2/block/kieticgenerator/container/ContainerKineticWindgenerator.java
+++ b/src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/container/ContainerKineticWindgenerator.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.ic2.block.kieticgenerator.container;
+package gtPlusPlus.xmod.ic2.block.kieticgenerator.container;
 
 import ic2.core.ContainerFullInv;
 import ic2.core.block.kineticgenerator.tileentity.TileEntityWindKineticGenerator;
diff --git a/src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/container/IC2_ContainerBase.java b/src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/container/IC2_ContainerBase.java
new file mode 100644
index 0000000000..740991c5d3
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/container/IC2_ContainerBase.java
@@ -0,0 +1,5 @@
+package gtPlusPlus.xmod.ic2.block.kieticgenerator.container;
+
+public class IC2_ContainerBase {
+
+}
diff --git a/src/Java/miscutil/xmod/ic2/block/kieticgenerator/gui/GuiKineticWindGenerator.java b/src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/gui/GuiKineticWindGenerator.java
index f92636f08e..f677e7fcfb 100644
--- a/src/Java/miscutil/xmod/ic2/block/kieticgenerator/gui/GuiKineticWindGenerator.java
+++ b/src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/gui/GuiKineticWindGenerator.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.ic2.block.kieticgenerator.gui;
+package gtPlusPlus.xmod.ic2.block.kieticgenerator.gui;
 
 import ic2.core.IC2;
 import ic2.core.block.kineticgenerator.container.ContainerWindKineticGenerator;
diff --git a/src/Java/miscutil/xmod/ic2/block/kieticgenerator/tileentity/TileEntityKineticWindGenerator.java b/src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/tileentity/TileEntityKineticWindGenerator.java
index 3670dcc36e..f094c8f928 100644
--- a/src/Java/miscutil/xmod/ic2/block/kieticgenerator/tileentity/TileEntityKineticWindGenerator.java
+++ b/src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/tileentity/TileEntityKineticWindGenerator.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.ic2.block.kieticgenerator.tileentity;
+package gtPlusPlus.xmod.ic2.block.kieticgenerator.tileentity;
 
 import ic2.api.energy.tile.IKineticSource;
 import ic2.api.item.IKineticRotor;
diff --git a/src/Java/miscutil/xmod/ic2/item/IC2_ItemGradual.java b/src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradual.java
index 66f40576da..b6ec4d66df 100644
--- a/src/Java/miscutil/xmod/ic2/item/IC2_ItemGradual.java
+++ b/src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradual.java
@@ -1,9 +1,10 @@
-package miscutil.xmod.ic2.item;
+package gtPlusPlus.xmod.ic2.item;
+
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.item.base.CoreItem;
 
 import java.util.List;
 
-import miscutil.core.creative.AddToCreativeTab;
-import miscutil.core.item.base.CoreItem;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.EnumRarity;
 import net.minecraft.item.Item;
diff --git a/src/Java/miscutil/xmod/ic2/item/IC2_ItemGradualInteger.java b/src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradualInteger.java
index 28fce8fc6e..4922e0f806 100644
--- a/src/Java/miscutil/xmod/ic2/item/IC2_ItemGradualInteger.java
+++ b/src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradualInteger.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.ic2.item;
+package gtPlusPlus.xmod.ic2.item;
 
 import ic2.api.item.ICustomDamageItem;
 import ic2.core.util.StackUtil;
diff --git a/src/Java/miscutil/xmod/ic2/item/IC2_ItemIC2.java b/src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemIC2.java
index 0c6a28a4bc..852830dc5c 100644
--- a/src/Java/miscutil/xmod/ic2/item/IC2_ItemIC2.java
+++ b/src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemIC2.java
@@ -1,7 +1,7 @@
-package miscutil.xmod.ic2.item;
+package gtPlusPlus.xmod.ic2.item;
 
-import miscutil.core.creative.AddToCreativeTab;
-import miscutil.core.lib.CORE;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
 import net.minecraft.item.EnumRarity;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
diff --git a/src/Java/miscutil/xmod/ic2/item/IC2_Items.java b/src/Java/gtPlusPlus/xmod/ic2/item/IC2_Items.java
index 227c8970b0..bf6f3bc1cd 100644
--- a/src/Java/miscutil/xmod/ic2/item/IC2_Items.java
+++ b/src/Java/gtPlusPlus/xmod/ic2/item/IC2_Items.java
@@ -1,10 +1,10 @@
-package miscutil.xmod.ic2.item;
+package gtPlusPlus.xmod.ic2.item;
 
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.item.base.CoreItem;
+import gtPlusPlus.core.lib.LoadedMods;
 import ic2.core.IC2;
 import ic2.core.init.InternalName;
-import miscutil.core.creative.AddToCreativeTab;
-import miscutil.core.item.base.CoreItem;
-import miscutil.core.lib.LoadedMods;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
 
diff --git a/src/Java/miscutil/xmod/ic2/item/ItemGenerators.java b/src/Java/gtPlusPlus/xmod/ic2/item/ItemGenerators.java
index d7437a0b69..2d73638ce9 100644
--- a/src/Java/miscutil/xmod/ic2/item/ItemGenerators.java
+++ b/src/Java/gtPlusPlus/xmod/ic2/item/ItemGenerators.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.ic2.item;
+package gtPlusPlus.xmod.ic2.item;
 
 import ic2.core.item.block.ItemBlockIC2;
 
diff --git a/src/Java/miscutil/xmod/ic2/item/RotorBase.java b/src/Java/gtPlusPlus/xmod/ic2/item/RotorBase.java
index 8ddfff20c9..06e33d6793 100644
--- a/src/Java/miscutil/xmod/ic2/item/RotorBase.java
+++ b/src/Java/gtPlusPlus/xmod/ic2/item/RotorBase.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.ic2.item;
+package gtPlusPlus.xmod.ic2.item;
 
 import ic2.api.item.IKineticRotor;
 import ic2.core.block.kineticgenerator.gui.GuiWaterKineticGenerator;
diff --git a/src/Java/miscutil/xmod/ic2/item/RotorIridium.java b/src/Java/gtPlusPlus/xmod/ic2/item/RotorIridium.java
index a4037410d5..f35b1e88f0 100644
--- a/src/Java/miscutil/xmod/ic2/item/RotorIridium.java
+++ b/src/Java/gtPlusPlus/xmod/ic2/item/RotorIridium.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.ic2.item;
+package gtPlusPlus.xmod.ic2.item;
 
 import ic2.api.item.IKineticRotor;
 import ic2.core.block.kineticgenerator.gui.GuiWaterKineticGenerator;
diff --git a/src/Java/miscutil/xmod/ic2/recipe/RECIPE_IC2.java b/src/Java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java
index b50ce28480..af648e73e2 100644
--- a/src/Java/miscutil/xmod/ic2/recipe/RECIPE_IC2.java
+++ b/src/Java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.ic2.recipe;
+package gtPlusPlus.xmod.ic2.recipe;
 
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.ItemList;
@@ -7,12 +7,12 @@ import gregtech.api.enums.OrePrefixes;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Utility;
-import miscutil.core.lib.LoadedMods;
-import miscutil.core.util.Utils;
-import miscutil.core.util.item.UtilsItems;
-import miscutil.core.util.recipe.UtilsRecipe;
-import miscutil.xmod.gregtech.api.enums.GregtechItemList;
-import miscutil.xmod.ic2.item.IC2_Items;
+import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.recipe.UtilsRecipe;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
+import gtPlusPlus.xmod.ic2.item.IC2_Items;
 import net.minecraft.item.ItemStack;
 
 public class RECIPE_IC2 {
diff --git a/src/Java/miscutil/xmod/psychedelicraft/HANDLER_Psych.java b/src/Java/gtPlusPlus/xmod/psychedelicraft/HANDLER_Psych.java
index 423d164a3b..2e13745564 100644
--- a/src/Java/miscutil/xmod/psychedelicraft/HANDLER_Psych.java
+++ b/src/Java/gtPlusPlus/xmod/psychedelicraft/HANDLER_Psych.java
@@ -1,7 +1,7 @@
-package miscutil.xmod.psychedelicraft;
+package gtPlusPlus.xmod.psychedelicraft;
 
-import miscutil.core.lib.LoadedMods;
-import miscutil.xmod.psychedelicraft.fluids.PS_Fluids;
+import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.xmod.psychedelicraft.fluids.PS_Fluids;
 
 
 public class HANDLER_Psych {
diff --git a/src/Java/miscutil/xmod/psychedelicraft/fluids/PS_Fluids.java b/src/Java/gtPlusPlus/xmod/psychedelicraft/fluids/PS_Fluids.java
index ada7cb21bd..4de44c7efc 100644
--- a/src/Java/miscutil/xmod/psychedelicraft/fluids/PS_Fluids.java
+++ b/src/Java/gtPlusPlus/xmod/psychedelicraft/fluids/PS_Fluids.java
@@ -1,11 +1,11 @@
-package miscutil.xmod.psychedelicraft.fluids;
+package gtPlusPlus.xmod.psychedelicraft.fluids;
 
+import gtPlusPlus.core.lib.CORE;
 import ivorius.ivtoolkit.gui.IntegerRange;
 import ivorius.psychedelicraft.blocks.TileEntityMashTub;
 import ivorius.psychedelicraft.config.PSConfig;
 import ivorius.psychedelicraft.fluids.FluidAlcohol;
 import ivorius.psychedelicraft.items.PSItems;
-import miscutil.core.lib.CORE;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
diff --git a/src/Java/miscutil/xmod/thermalfoundation/HANDLER_TF.java b/src/Java/gtPlusPlus/xmod/thermalfoundation/HANDLER_TF.java
index b44d7bf206..e28ad4a145 100644
--- a/src/Java/miscutil/xmod/thermalfoundation/HANDLER_TF.java
+++ b/src/Java/gtPlusPlus/xmod/thermalfoundation/HANDLER_TF.java
@@ -1,10 +1,10 @@
-package miscutil.xmod.thermalfoundation;
+package gtPlusPlus.xmod.thermalfoundation;
 
-import miscutil.core.lib.LoadedMods;
-import miscutil.xmod.thermalfoundation.block.TF_Blocks;
-import miscutil.xmod.thermalfoundation.fluid.TF_Fluids;
-import miscutil.xmod.thermalfoundation.item.TF_Items;
-import miscutil.xmod.thermalfoundation.recipe.TF_Gregtech_Recipes;
+import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.xmod.thermalfoundation.block.TF_Blocks;
+import gtPlusPlus.xmod.thermalfoundation.fluid.TF_Fluids;
+import gtPlusPlus.xmod.thermalfoundation.item.TF_Items;
+import gtPlusPlus.xmod.thermalfoundation.recipe.TF_Gregtech_Recipes;
 
 public class HANDLER_TF{
 
diff --git a/src/Java/miscutil/xmod/thermalfoundation/block/TF_Block_Fluid_Cryotheum.java b/src/Java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Cryotheum.java
index ce33959a1d..58afd0c52c 100644
--- a/src/Java/miscutil/xmod/thermalfoundation/block/TF_Block_Fluid_Cryotheum.java
+++ b/src/Java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Cryotheum.java
@@ -1,9 +1,10 @@
-package miscutil.xmod.thermalfoundation.block;
+package gtPlusPlus.xmod.thermalfoundation.block;
+
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.xmod.thermalfoundation.fluid.TF_Fluids;
 
 import java.util.Random;
 
-import miscutil.core.lib.CORE;
-import miscutil.xmod.thermalfoundation.fluid.TF_Fluids;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.MapColor;
 import net.minecraft.block.material.Material;
diff --git a/src/Java/miscutil/xmod/thermalfoundation/block/TF_Block_Fluid_Pyrotheum.java b/src/Java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Pyrotheum.java
index d8c2bf6a14..f45cc1d839 100644
--- a/src/Java/miscutil/xmod/thermalfoundation/block/TF_Block_Fluid_Pyrotheum.java
+++ b/src/Java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Pyrotheum.java
@@ -1,9 +1,10 @@
-package miscutil.xmod.thermalfoundation.block;
+package gtPlusPlus.xmod.thermalfoundation.block;
+
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.xmod.thermalfoundation.fluid.TF_Fluids;
 
 import java.util.Random;
 
-import miscutil.core.lib.CORE;
-import miscutil.xmod.thermalfoundation.fluid.TF_Fluids;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.MapColor;
 import net.minecraft.block.material.Material;
diff --git a/src/Java/miscutil/xmod/thermalfoundation/block/TF_Blocks.java b/src/Java/gtPlusPlus/xmod/thermalfoundation/block/TF_Blocks.java
index d42508db30..867f8c7f7d 100644
--- a/src/Java/miscutil/xmod/thermalfoundation/block/TF_Blocks.java
+++ b/src/Java/gtPlusPlus/xmod/thermalfoundation/block/TF_Blocks.java
@@ -1,4 +1,4 @@
-package miscutil.xmod.thermalfoundation.block;
+package gtPlusPlus.xmod.thermalfoundation.block;
 
 import cofh.core.fluid.BlockFluidCoFHBase;
 
diff --git a/src/Java/miscutil/xmod/thermalfoundation/fluid/TF_Fluids.java b/src/Java/gtPlusPlus/xmod/thermalfoundation/fluid/TF_Fluids.java
index 1ab23f0c6b..984ff4604b 100644
--- a/src/Java/miscutil/xmod/thermalfoundation/fluid/TF_Fluids.java
+++ b/src/Java/gtPlusPlus/xmod/thermalfoundation/fluid/TF_Fluids.java
@@ -1,8 +1,8 @@
-package miscutil.xmod.thermalfoundation.fluid;
+package gtPlusPlus.xmod.thermalfoundation.fluid;
 
-import miscutil.core.lib.LoadedMods;
-import miscutil.core.util.Utils;
-import miscutil.xmod.thermalfoundation.item.TF_Items;
+import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.xmod.thermalfoundation.item.TF_Items;
 import net.minecraft.block.BlockDispenser;
 import net.minecraft.init.Items;
 import net.minecraft.item.EnumRarity;
diff --git a/src/Java/miscutil/xmod/thermalfoundation/item/TF_Items.java b/src/Java/gtPlusPlus/xmod/thermalfoundation/item/TF_Items.java
index 8f99b6efc5..86037d3a0c 100644
--- a/src/Java/miscutil/xmod/thermalfoundation/item/TF_Items.java
+++ b/src/Java/gtPlusPlus/xmod/thermalfoundation/item/TF_Items.java
@@ -1,9 +1,9 @@
-package miscutil.xmod.thermalfoundation.item;
+package gtPlusPlus.xmod.thermalfoundation.item;
 
-import miscutil.core.creative.AddToCreativeTab;
-import miscutil.core.util.item.UtilsItems;
-import miscutil.xmod.thermalfoundation.block.TF_Blocks;
-import miscutil.xmod.thermalfoundation.fluid.TF_Fluids;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.xmod.thermalfoundation.block.TF_Blocks;
+import gtPlusPlus.xmod.thermalfoundation.fluid.TF_Fluids;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidContainerRegistry;
@@ -32,8 +32,8 @@ public class TF_Items {
 	public static void preInit(){
 
 
-		itemBucket = (ItemBucket)new ItemBucket("MiscUtils").setUnlocalizedName("bucket").setCreativeTab(AddToCreativeTab.tabMisc);
-	    itemMaterial = (ItemBase)new ItemBase("MiscUtils").setUnlocalizedName("material").setCreativeTab(AddToCreativeTab.tabMisc);
+		itemBucket = (ItemBucket)new ItemBucket("GTplusplus").setUnlocalizedName("bucket").setCreativeTab(AddToCreativeTab.tabMisc);
+	    itemMaterial = (ItemBase)new ItemBase("GTplusplus").setUnlocalizedName("material").setCreativeTab(AddToCreativeTab.tabMisc);
 	    
 
 		bucketPyrotheum = itemBucket.addOreDictItem(1, "bucketPyrotheum");
diff --git a/src/Java/miscutil/xmod/thermalfoundation/recipe/TF_Gregtech_Recipes.java b/src/Java/gtPlusPlus/xmod/thermalfoundation/recipe/TF_Gregtech_Recipes.java
index a84606576a..24096749f2 100644
--- a/src/Java/miscutil/xmod/thermalfoundation/recipe/TF_Gregtech_Recipes.java
+++ b/src/Java/gtPlusPlus/xmod/thermalfoundation/recipe/TF_Gregtech_Recipes.java
@@ -1,13 +1,13 @@
-package miscutil.xmod.thermalfoundation.recipe;
+package gtPlusPlus.xmod.thermalfoundation.recipe;
 
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_OreDictUnificator;
-import miscutil.core.util.Utils;
-import miscutil.core.util.item.UtilsItems;
-import miscutil.xmod.thermalfoundation.item.TF_Items;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.xmod.thermalfoundation.item.TF_Items;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidRegistry;
diff --git a/src/Java/miscutil/xmod/ic2/block/kieticgenerator/container/IC2_ContainerBase.java b/src/Java/miscutil/xmod/ic2/block/kieticgenerator/container/IC2_ContainerBase.java
deleted file mode 100644
index 6892220b06..0000000000
--- a/src/Java/miscutil/xmod/ic2/block/kieticgenerator/container/IC2_ContainerBase.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package miscutil.xmod.ic2.block.kieticgenerator.container;
-
-public class IC2_ContainerBase {
-
-}