%Refactored all of the GT related code into the xmod package instead of being in its own.

%Renamed intermod package to xmod.

118 files changed, 246 insertions, 245 deletions

diff --git a/src/Java/miscutil/MiscUtils.java b/src/Java/miscutil/MiscUtils.java
index e3bcb846ec..c3e14c5a8d 100644
--- a/src/Java/miscutil/MiscUtils.java
+++ b/src/Java/miscutil/MiscUtils.java
@@ -10,7 +10,7 @@ import miscutil.core.commands.CommandMath;
 import miscutil.core.common.CommonProxy;
 import miscutil.core.lib.CORE;
 import miscutil.core.util.Utils;
-import miscutil.gregtech.HANDLER_Gregtech;
+import miscutil.core.xmod.gregtech.HANDLER_Gregtech;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.config.Configuration;
 import cpw.mods.fml.common.FMLCommonHandler;
diff --git a/src/Java/miscutil/core/block/ModBlocks.java b/src/Java/miscutil/core/block/ModBlocks.java
index 7ab4a4c5c0..10918c9d06 100644
--- a/src/Java/miscutil/core/block/ModBlocks.java
+++ b/src/Java/miscutil/core/block/ModBlocks.java
@@ -3,7 +3,7 @@ package miscutil.core.block;
 import miscutil.core.block.base.BasicBlock;
 import miscutil.core.block.general.fluids.FluidRegistryHandler;
 import miscutil.core.util.Utils;
-import miscutil.gregtech.common.blocks.GregtechMetaCasingBlocks;
+import miscutil.core.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/common/CommonProxy.java b/src/Java/miscutil/core/common/CommonProxy.java
index 1d67860537..3a983916c5 100644
--- a/src/Java/miscutil/core/common/CommonProxy.java
+++ b/src/Java/miscutil/core/common/CommonProxy.java
@@ -17,7 +17,7 @@ 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.gregtech.common.Meta_GT_Proxy;
+import miscutil.core.xmod.gregtech.common.Meta_GT_Proxy;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.oredict.OreDictionary;
diff --git a/src/Java/miscutil/core/handler/COMPAT_HANDLER.java b/src/Java/miscutil/core/handler/COMPAT_HANDLER.java
index a62d7c6734..e57288f963 100644
--- a/src/Java/miscutil/core/handler/COMPAT_HANDLER.java
+++ b/src/Java/miscutil/core/handler/COMPAT_HANDLER.java
@@ -36,7 +36,7 @@ import miscutil.core.recipe.ShapedRecipeObject;
 import miscutil.core.util.Utils;
 import miscutil.core.util.item.UtilsItems;
 import miscutil.core.util.recipe.UtilsRecipe;
-import miscutil.gregtech.common.items.MetaGeneratedGregtechItems;
+import miscutil.core.xmod.gregtech.common.items.MetaGeneratedGregtechItems;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.oredict.OreDictionary;
diff --git a/src/Java/miscutil/core/handler/COMPAT_IntermodStaging.java b/src/Java/miscutil/core/handler/COMPAT_IntermodStaging.java
index 53e070a2d2..035049e40d 100644
--- a/src/Java/miscutil/core/handler/COMPAT_IntermodStaging.java
+++ b/src/Java/miscutil/core/handler/COMPAT_IntermodStaging.java
@@ -1,10 +1,10 @@
 package miscutil.core.handler;
 
-import miscutil.core.intermod.forestry.HANDLER_Forestry;
-import miscutil.core.intermod.growthcraft.HANDLER_Growthcraft;
-import miscutil.core.intermod.psychedelicraft.HANDLER_Psychedelicraft;
-import miscutil.core.intermod.thermalfoundation.HANDLER_ThermalFoundation;
-import miscutil.gregtech.HANDLER_Gregtech;
+import miscutil.core.xmod.forestry.HANDLER_Forestry;
+import miscutil.core.xmod.gregtech.HANDLER_Gregtech;
+import miscutil.core.xmod.growthcraft.HANDLER_Growthcraft;
+import miscutil.core.xmod.psychedelicraft.HANDLER_Psychedelicraft;
+import miscutil.core.xmod.thermalfoundation.HANDLER_ThermalFoundation;
 
 public class COMPAT_IntermodStaging {
 
diff --git a/src/Java/miscutil/core/handler/events/PickaxeBlockBreakEventHandler.java b/src/Java/miscutil/core/handler/events/PickaxeBlockBreakEventHandler.java
index 524adfc97f..9f5cdb943e 100644
--- a/src/Java/miscutil/core/handler/events/PickaxeBlockBreakEventHandler.java
+++ b/src/Java/miscutil/core/handler/events/PickaxeBlockBreakEventHandler.java
@@ -5,7 +5,7 @@ import gregtech.api.metatileentity.BaseMetaPipeEntity;
 import gregtech.api.metatileentity.BaseMetaTileEntity;
 import gregtech.api.metatileentity.BaseTileEntity;
 import miscutil.core.util.Utils;
-import miscutil.gregtech.api.metatileentity.implementations.base.GregtechMetaSafeBlockBase;
+import miscutil.core.xmod.gregtech.api.metatileentity.implementations.base.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/miscutil/core/handler/events/UnbreakableBlockManager.java
index 9ce59cb2c2..4309079d31 100644
--- a/src/Java/miscutil/core/handler/events/UnbreakableBlockManager.java
+++ b/src/Java/miscutil/core/handler/events/UnbreakableBlockManager.java
@@ -5,7 +5,7 @@ import gregtech.api.metatileentity.BaseMetaPipeEntity;
 import gregtech.api.metatileentity.BaseMetaTileEntity;
 import gregtech.api.metatileentity.BaseTileEntity;
 import miscutil.core.util.Utils;
-import miscutil.gregtech.api.metatileentity.implementations.GregtechMetaSafeBlock;
+import miscutil.core.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/handler/registration/gregtech/GregtechCobbleGenerator.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechCobbleGenerator.java
index 00323bce33..c68c3dc831 100644
--- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechCobbleGenerator.java
+++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechCobbleGenerator.java
@@ -5,8 +5,8 @@ import gregtech.api.enums.Materials;
 import gregtech.api.enums.OreDictNames;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.util.GT_ModHandler;
-import miscutil.gregtech.api.enums.GregtechItemList;
-import miscutil.gregtech.api.metatileentity.implementations.base.GregtechSteelBoiler;
+import miscutil.core.xmod.gregtech.api.enums.GregtechItemList;
+import miscutil.core.xmod.gregtech.api.metatileentity.implementations.base.GregtechSteelBoiler;
 import cpw.mods.fml.common.FMLLog;
 
 public class GregtechCobbleGenerator
diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechConduits.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechConduits.java
index 370a5d94a8..6844e707f4 100644
--- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechConduits.java
+++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechConduits.java
@@ -7,7 +7,7 @@ import gregtech.api.enums.OrePrefixes;
 import gregtech.api.util.GT_OreDictUnificator;
 import miscutil.core.lib.LoadedMods;
 import miscutil.core.util.Utils;
-import miscutil.gregtech.api.metatileentity.implementations.GregtechMetaPipeEntity_Cable;
+import miscutil.core.xmod.gregtech.api.metatileentity.implementations.GregtechMetaPipeEntity_Cable;
 
 public class GregtechConduits {
 	/**
diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechEnergyBuffer.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechEnergyBuffer.java
index b6fe9fe07d..e36a11748e 100644
--- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechEnergyBuffer.java
+++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechEnergyBuffer.java
@@ -5,10 +5,10 @@ import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.util.GT_ModHandler;
 import miscutil.core.util.Utils;
-import miscutil.gregtech.api.enums.GregtechOreDictNames;
-import miscutil.gregtech.api.enums.GregtechItemList;
-import miscutil.gregtech.api.metatileentity.implementations.GregtechMetaEnergyBuffer;
-import miscutil.gregtech.api.metatileentity.implementations.creative.GregtechMetaCreativeEnergyBuffer;
+import miscutil.core.xmod.gregtech.api.enums.GregtechItemList;
+import miscutil.core.xmod.gregtech.api.enums.GregtechOreDictNames;
+import miscutil.core.xmod.gregtech.api.metatileentity.implementations.GregtechMetaEnergyBuffer;
+import miscutil.core.xmod.gregtech.api.metatileentity.implementations.creative.GregtechMetaCreativeEnergyBuffer;
 
 public class GregtechEnergyBuffer
 {
diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialCentrifuge.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialCentrifuge.java
index 324131155d..096b0e7b69 100644
--- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialCentrifuge.java
+++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialCentrifuge.java
@@ -1,8 +1,8 @@
 package miscutil.core.handler.registration.gregtech;
 
 import miscutil.core.util.Utils;
-import miscutil.gregtech.api.enums.GregtechItemList;
-import miscutil.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialCentrifuge;
+import miscutil.core.xmod.gregtech.api.enums.GregtechItemList;
+import miscutil.core.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialCentrifuge;
 
 public class GregtechIndustrialCentrifuge
 {
diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialCokeOven.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialCokeOven.java
index 53f540609c..dd589a61a1 100644
--- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialCokeOven.java
+++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialCokeOven.java
@@ -1,8 +1,8 @@
 package miscutil.core.handler.registration.gregtech;
 
 import miscutil.core.util.Utils;
-import miscutil.gregtech.api.enums.GregtechItemList;
-import miscutil.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialCokeOven;
+import miscutil.core.xmod.gregtech.api.enums.GregtechItemList;
+import miscutil.core.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialCokeOven;
 
 public class GregtechIndustrialCokeOven
 {
diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialPlatePress.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialPlatePress.java
index eba567ea42..1a4698482b 100644
--- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialPlatePress.java
+++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialPlatePress.java
@@ -1,7 +1,7 @@
 package miscutil.core.handler.registration.gregtech;
 
-import miscutil.gregtech.api.enums.GregtechItemList;
-import miscutil.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialPlatePress;
+import miscutil.core.xmod.gregtech.api.enums.GregtechItemList;
+import miscutil.core.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialPlatePress;
 
 public class GregtechIndustrialPlatePress
 {
diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechRocketFuelGenerator.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechRocketFuelGenerator.java
index 13e15e35ab..df1f58aca4 100644
--- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechRocketFuelGenerator.java
+++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechRocketFuelGenerator.java
@@ -6,10 +6,10 @@ import gregtech.api.enums.OrePrefixes;
 import gregtech.api.util.GT_ModHandler;
 import miscutil.core.lib.LoadedMods;
 import miscutil.core.util.Utils;
-import miscutil.gregtech.api.enums.GregtechItemList;
-import miscutil.gregtech.api.enums.GregtechOrePrefixes;
-import miscutil.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
-import miscutil.gregtech.common.tileentities.generators.GregtechMetaTileEntityRocketFuelGenerator;
+import miscutil.core.xmod.gregtech.api.enums.GregtechItemList;
+import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes;
+import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
+import miscutil.core.xmod.gregtech.common.tileentities.generators.GregtechMetaTileEntityRocketFuelGenerator;
 
 public class GregtechRocketFuelGenerator {
 	
diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechSafeBlock.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechSafeBlock.java
index a285970602..6149a4f39d 100644
--- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechSafeBlock.java
+++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechSafeBlock.java
@@ -6,8 +6,8 @@ import gregtech.api.enums.OreDictNames;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.util.GT_ModHandler;
 import miscutil.core.util.Utils;
-import miscutil.gregtech.api.enums.GregtechItemList;
-import miscutil.gregtech.api.metatileentity.implementations.GregtechMetaSafeBlock;
+import miscutil.core.xmod.gregtech.api.enums.GregtechItemList;
+import miscutil.core.xmod.gregtech.api.metatileentity.implementations.GregtechMetaSafeBlock;
 
 public class GregtechSafeBlock
 {
diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechSteamCondenser.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechSteamCondenser.java
index 781daccde3..a0c9ab5553 100644
--- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechSteamCondenser.java
+++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechSteamCondenser.java
@@ -1,10 +1,10 @@
 package miscutil.core.handler.registration.gregtech;
 
 import miscutil.core.util.Utils;
-import miscutil.gregtech.api.enums.GregtechItemList;
-import miscutil.gregtech.api.metatileentity.implementations.GregtechMetaCondensor;
-import miscutil.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityElectricBlastFurnace;
-import miscutil.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIronBlastFurnace;
+import miscutil.core.xmod.gregtech.api.enums.GregtechItemList;
+import miscutil.core.xmod.gregtech.api.metatileentity.implementations.GregtechMetaCondensor;
+import miscutil.core.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityElectricBlastFurnace;
+import miscutil.core.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIronBlastFurnace;
 
 public class GregtechSteamCondenser
 {
diff --git a/src/Java/miscutil/core/lib/CORE.java b/src/Java/miscutil/core/lib/CORE.java
index 35eac45e26..e8315a2446 100644
--- a/src/Java/miscutil/core/lib/CORE.java
+++ b/src/Java/miscutil/core/lib/CORE.java
@@ -5,8 +5,8 @@ import java.util.List;
 import java.util.Map;
 
 import miscutil.core.creative.AddToCreativeTab;
-import miscutil.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
-import miscutil.gregtech.api.interfaces.internal.IGregtech_RecipeAdder;
+import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
+import miscutil.core.xmod.gregtech.api.interfaces.internal.IGregtech_RecipeAdder;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
diff --git a/src/Java/miscutil/core/lib/LoadedMods.java b/src/Java/miscutil/core/lib/LoadedMods.java
index f4241b945c..352fffa3df 100644
--- a/src/Java/miscutil/core/lib/LoadedMods.java
+++ b/src/Java/miscutil/core/lib/LoadedMods.java
@@ -1,7 +1,7 @@
 package miscutil.core.lib;
 
 import miscutil.core.util.Utils;
-import miscutil.gregtech.common.GregtechRecipeAdder;
+import miscutil.core.xmod.gregtech.common.GregtechRecipeAdder;
 import cpw.mods.fml.common.Loader;
 
 public class LoadedMods {
diff --git a/src/Java/miscutil/core/recipe/RECIPES_LaserEngraver.java b/src/Java/miscutil/core/recipe/RECIPES_LaserEngraver.java
index 3d8f7862ee..8570a0d1b1 100644
--- a/src/Java/miscutil/core/recipe/RECIPES_LaserEngraver.java
+++ b/src/Java/miscutil/core/recipe/RECIPES_LaserEngraver.java
@@ -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.gregtech.api.enums.GregtechItemList;
+import miscutil.core.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_MachineComponents.java b/src/Java/miscutil/core/recipe/RECIPES_MachineComponents.java
index 1cefaadd1e..cead9d8cd6 100644
--- a/src/Java/miscutil/core/recipe/RECIPES_MachineComponents.java
+++ b/src/Java/miscutil/core/recipe/RECIPES_MachineComponents.java
@@ -8,7 +8,7 @@ import gregtech.api.enums.SubTag;
 import gregtech.api.util.GT_OreDictUnificator;
 import miscutil.core.util.Utils;
 import miscutil.core.util.recipe.UtilsRecipe;
-import miscutil.gregtech.api.enums.GregtechItemList;
+import miscutil.core.xmod.gregtech.api.enums.GregtechItemList;
 import net.minecraft.item.ItemStack;
 
 public class RECIPES_MachineComponents {
diff --git a/src/Java/miscutil/core/recipe/RECIPES_Machines.java b/src/Java/miscutil/core/recipe/RECIPES_Machines.java
index 6f74b873b4..02d64ba341 100644
--- a/src/Java/miscutil/core/recipe/RECIPES_Machines.java
+++ b/src/Java/miscutil/core/recipe/RECIPES_Machines.java
@@ -5,7 +5,7 @@ import miscutil.core.lib.LoadedMods;
 import miscutil.core.util.Utils;
 import miscutil.core.util.item.UtilsItems;
 import miscutil.core.util.recipe.UtilsRecipe;
-import miscutil.gregtech.api.enums.GregtechItemList;
+import miscutil.core.xmod.gregtech.api.enums.GregtechItemList;
 import net.minecraft.item.ItemStack;
 
 public class RECIPES_Machines {
diff --git a/src/Java/miscutil/core/intermod/forestry/HANDLER_Forestry.java b/src/Java/miscutil/core/xmod/forestry/HANDLER_Forestry.java
index 166dd1ce01..94beb5618e 100644
--- a/src/Java/miscutil/core/intermod/forestry/HANDLER_Forestry.java
+++ b/src/Java/miscutil/core/xmod/forestry/HANDLER_Forestry.java
@@ -1,9 +1,9 @@
-package miscutil.core.intermod.forestry;
+package miscutil.core.xmod.forestry;
 
-import miscutil.core.intermod.forestry.apiculture.blocks.FR_BlockRegistryApiculture;
-import miscutil.core.intermod.forestry.apiculture.items.FR_ItemRegistryApiculture;
-import miscutil.core.intermod.forestry.apiculture.tiles.FR_TileHandler;
 import miscutil.core.lib.LoadedMods;
+import miscutil.core.xmod.forestry.apiculture.blocks.FR_BlockRegistryApiculture;
+import miscutil.core.xmod.forestry.apiculture.items.FR_ItemRegistryApiculture;
+import miscutil.core.xmod.forestry.apiculture.tiles.FR_TileHandler;
 
 public class HANDLER_Forestry {
 
diff --git a/src/Java/miscutil/core/intermod/forestry/apiculture/blocks/FR_BlockAlveary.java b/src/Java/miscutil/core/xmod/forestry/apiculture/blocks/FR_BlockAlveary.java
index f22404e2f0..62669ef8d0 100644
--- a/src/Java/miscutil/core/intermod/forestry/apiculture/blocks/FR_BlockAlveary.java
+++ b/src/Java/miscutil/core/xmod/forestry/apiculture/blocks/FR_BlockAlveary.java
@@ -8,13 +8,13 @@
  * Various Contributors including, but not limited to:
  * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
  ******************************************************************************/
-package miscutil.core.intermod.forestry.apiculture.blocks;
+package miscutil.core.xmod.forestry.apiculture.blocks;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import miscutil.core.creative.AddToCreativeTab;
-import miscutil.core.intermod.forestry.apiculture.multiblock.TileAlvearyMutatron;
+import miscutil.core.xmod.forestry.apiculture.multiblock.TileAlvearyMutatron;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
diff --git a/src/Java/miscutil/core/intermod/forestry/apiculture/blocks/FR_BlockRegistryApiculture.java b/src/Java/miscutil/core/xmod/forestry/apiculture/blocks/FR_BlockRegistryApiculture.java
index 499c20ff95..ebde18655f 100644
--- a/src/Java/miscutil/core/intermod/forestry/apiculture/blocks/FR_BlockRegistryApiculture.java
+++ b/src/Java/miscutil/core/xmod/forestry/apiculture/blocks/FR_BlockRegistryApiculture.java
@@ -8,7 +8,7 @@
  * Various Contributors including, but not limited to:
  * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
  ******************************************************************************/
-package miscutil.core.intermod.forestry.apiculture.blocks;
+package miscutil.core.xmod.forestry.apiculture.blocks;
 
 import miscutil.core.lib.CORE;
 import net.minecraft.block.Block;
diff --git a/src/Java/miscutil/core/intermod/forestry/apiculture/items/FR_ItemHiveFrame.java b/src/Java/miscutil/core/xmod/forestry/apiculture/items/FR_ItemHiveFrame.java
index de8de491af..cd517fd1ad 100644
--- a/src/Java/miscutil/core/intermod/forestry/apiculture/items/FR_ItemHiveFrame.java
+++ b/src/Java/miscutil/core/xmod/forestry/apiculture/items/FR_ItemHiveFrame.java
@@ -8,7 +8,7 @@
  * Various Contributors including, but not limited to:
  * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
  ******************************************************************************/
-package miscutil.core.intermod.forestry.apiculture.items;
+package miscutil.core.xmod.forestry.apiculture.items;
 
 import miscutil.core.creative.AddToCreativeTab;
 import net.minecraft.item.Item;
diff --git a/src/Java/miscutil/core/intermod/forestry/apiculture/items/FR_ItemRegistryApiculture.java b/src/Java/miscutil/core/xmod/forestry/apiculture/items/FR_ItemRegistryApiculture.java
index f648077f4e..f2a64a9f90 100644
--- a/src/Java/miscutil/core/intermod/forestry/apiculture/items/FR_ItemRegistryApiculture.java
+++ b/src/Java/miscutil/core/xmod/forestry/apiculture/items/FR_ItemRegistryApiculture.java
@@ -8,9 +8,9 @@
  * Various Contributors including, but not limited to:
  * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
  ******************************************************************************/
-package miscutil.core.intermod.forestry.apiculture.items;
-import miscutil.core.intermod.forestry.apiculture.items.magicbees.MB_HiveFrameType;
-import miscutil.core.intermod.forestry.apiculture.items.magicbees.MB_ItemMagicHiveFrame;
+package miscutil.core.xmod.forestry.apiculture.items;
+import miscutil.core.xmod.forestry.apiculture.items.magicbees.MB_HiveFrameType;
+import miscutil.core.xmod.forestry.apiculture.items.magicbees.MB_ItemMagicHiveFrame;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.WeightedRandomChestContent;
diff --git a/src/Java/miscutil/core/intermod/forestry/apiculture/items/magicbees/FR_StringManager.java b/src/Java/miscutil/core/xmod/forestry/apiculture/items/magicbees/FR_StringManager.java
index 991b961ba9..f08f1fd542 100644
--- a/src/Java/miscutil/core/intermod/forestry/apiculture/items/magicbees/FR_StringManager.java
+++ b/src/Java/miscutil/core/xmod/forestry/apiculture/items/magicbees/FR_StringManager.java
@@ -1,4 +1,4 @@
-package miscutil.core.intermod.forestry.apiculture.items.magicbees;
+package miscutil.core.xmod.forestry.apiculture.items.magicbees;
 
 import net.minecraft.util.StatCollector;
 
diff --git a/src/Java/miscutil/core/intermod/forestry/apiculture/items/magicbees/MB_HiveFrameType.java b/src/Java/miscutil/core/xmod/forestry/apiculture/items/magicbees/MB_HiveFrameType.java
index a168c8157b..5921867eae 100644
--- a/src/Java/miscutil/core/intermod/forestry/apiculture/items/magicbees/MB_HiveFrameType.java
+++ b/src/Java/miscutil/core/xmod/forestry/apiculture/items/magicbees/MB_HiveFrameType.java
@@ -1,4 +1,4 @@
-package miscutil.core.intermod.forestry.apiculture.items.magicbees;
+package miscutil.core.xmod.forestry.apiculture.items.magicbees;
 
 import forestry.api.apiculture.IBeeGenome;
 import forestry.api.apiculture.IBeeModifier;
diff --git a/src/Java/miscutil/core/intermod/forestry/apiculture/items/magicbees/MB_ItemMagicHiveFrame.java b/src/Java/miscutil/core/xmod/forestry/apiculture/items/magicbees/MB_ItemMagicHiveFrame.java
index 14234e7aae..78e0afb55b 100644
--- a/src/Java/miscutil/core/intermod/forestry/apiculture/items/magicbees/MB_ItemMagicHiveFrame.java
+++ b/src/Java/miscutil/core/xmod/forestry/apiculture/items/magicbees/MB_ItemMagicHiveFrame.java
@@ -1,4 +1,4 @@
-package miscutil.core.intermod.forestry.apiculture.items.magicbees;
+package miscutil.core.xmod.forestry.apiculture.items.magicbees;
 
 import miscutil.core.creative.AddToCreativeTab;
 import miscutil.core.lib.CORE;
diff --git a/src/Java/miscutil/core/intermod/forestry/apiculture/multiblock/FR_TileAlveary.java b/src/Java/miscutil/core/xmod/forestry/apiculture/multiblock/FR_TileAlveary.java
index 29c4a7f445..06633a87cf 100644
--- a/src/Java/miscutil/core/intermod/forestry/apiculture/multiblock/FR_TileAlveary.java
+++ b/src/Java/miscutil/core/xmod/forestry/apiculture/multiblock/FR_TileAlveary.java
@@ -8,12 +8,12 @@
  * Various Contributors including, but not limited to:
  * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
  ******************************************************************************/
-package miscutil.core.intermod.forestry.apiculture.multiblock;
+package miscutil.core.xmod.forestry.apiculture.multiblock;
 
 import java.io.IOException;
 import java.util.List;
 
-import miscutil.core.intermod.forestry.apiculture.blocks.FR_BlockAlveary;
+import miscutil.core.xmod.forestry.apiculture.blocks.FR_BlockAlveary;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.ChunkCoordinates;
 import net.minecraft.util.Vec3;
diff --git a/src/Java/miscutil/core/intermod/forestry/apiculture/multiblock/TileAlvearyMutatron.java b/src/Java/miscutil/core/xmod/forestry/apiculture/multiblock/TileAlvearyMutatron.java
index c396acf325..c784f69ea7 100644
--- a/src/Java/miscutil/core/intermod/forestry/apiculture/multiblock/TileAlvearyMutatron.java
+++ b/src/Java/miscutil/core/xmod/forestry/apiculture/multiblock/TileAlvearyMutatron.java
@@ -8,15 +8,15 @@
  * Various Contributors including, but not limited to:
  * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
  ******************************************************************************/
-package miscutil.core.intermod.forestry.apiculture.multiblock;
+package miscutil.core.xmod.forestry.apiculture.multiblock;
 
 import java.util.Map.Entry;
 import java.util.Stack;
 
-import miscutil.core.intermod.forestry.apiculture.blocks.FR_BlockAlveary;
-import miscutil.core.intermod.forestry.apiculture.multiblock.inventory.FR_ContainerAlvearyMutatron;
-import miscutil.core.intermod.forestry.apiculture.multiblock.inventory.FR_GuiAlvearyMutatron;
-import miscutil.core.intermod.forestry.apiculture.multiblock.inventory.FR_InventoryMutatron;
+import miscutil.core.xmod.forestry.apiculture.blocks.FR_BlockAlveary;
+import miscutil.core.xmod.forestry.apiculture.multiblock.inventory.FR_ContainerAlvearyMutatron;
+import miscutil.core.xmod.forestry.apiculture.multiblock.inventory.FR_GuiAlvearyMutatron;
+import miscutil.core.xmod.forestry.apiculture.multiblock.inventory.FR_InventoryMutatron;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.ISidedInventory;
 import net.minecraft.item.ItemStack;
diff --git a/src/Java/miscutil/core/intermod/forestry/apiculture/multiblock/inventory/FR_ContainerAlvearyMutatron.java b/src/Java/miscutil/core/xmod/forestry/apiculture/multiblock/inventory/FR_ContainerAlvearyMutatron.java
index 3a4f76dfaa..5af0978631 100644
--- a/src/Java/miscutil/core/intermod/forestry/apiculture/multiblock/inventory/FR_ContainerAlvearyMutatron.java
+++ b/src/Java/miscutil/core/xmod/forestry/apiculture/multiblock/inventory/FR_ContainerAlvearyMutatron.java
@@ -1,6 +1,6 @@
-package miscutil.core.intermod.forestry.apiculture.multiblock.inventory;
+package miscutil.core.xmod.forestry.apiculture.multiblock.inventory;
 
-import miscutil.core.intermod.forestry.apiculture.multiblock.TileAlvearyMutatron;
+import miscutil.core.xmod.forestry.apiculture.multiblock.TileAlvearyMutatron;
 import net.minecraft.entity.player.InventoryPlayer;
 import forestry.core.gui.ContainerTile;
 import forestry.core.gui.slots.SlotFiltered;
diff --git a/src/Java/miscutil/core/intermod/forestry/apiculture/multiblock/inventory/FR_GuiAlvearyMutatron.java b/src/Java/miscutil/core/xmod/forestry/apiculture/multiblock/inventory/FR_GuiAlvearyMutatron.java
index 212fff895c..b85d5e38a0 100644
--- a/src/Java/miscutil/core/intermod/forestry/apiculture/multiblock/inventory/FR_GuiAlvearyMutatron.java
+++ b/src/Java/miscutil/core/xmod/forestry/apiculture/multiblock/inventory/FR_GuiAlvearyMutatron.java
@@ -1,8 +1,8 @@
-package miscutil.core.intermod.forestry.apiculture.multiblock.inventory;
+package miscutil.core.xmod.forestry.apiculture.multiblock.inventory;
 
-import miscutil.core.intermod.forestry.apiculture.multiblock.TileAlvearyMutatron;
-import miscutil.core.intermod.forestry.core.gui.FR_GuiForestryTitled;
 import miscutil.core.lib.CORE;
+import miscutil.core.xmod.forestry.apiculture.multiblock.TileAlvearyMutatron;
+import miscutil.core.xmod.forestry.core.gui.FR_GuiForestryTitled;
 import net.minecraft.entity.player.InventoryPlayer;
 
 public class FR_GuiAlvearyMutatron extends FR_GuiForestryTitled<FR_ContainerAlvearyMutatron, TileAlvearyMutatron> {
diff --git a/src/Java/miscutil/core/intermod/forestry/apiculture/multiblock/inventory/FR_InventoryMutatron.java b/src/Java/miscutil/core/xmod/forestry/apiculture/multiblock/inventory/FR_InventoryMutatron.java
index 16032046f9..aa51d3ebb1 100644
--- a/src/Java/miscutil/core/intermod/forestry/apiculture/multiblock/inventory/FR_InventoryMutatron.java
+++ b/src/Java/miscutil/core/xmod/forestry/apiculture/multiblock/inventory/FR_InventoryMutatron.java
@@ -1,6 +1,6 @@
-package miscutil.core.intermod.forestry.apiculture.multiblock.inventory;
+package miscutil.core.xmod.forestry.apiculture.multiblock.inventory;
 
-import miscutil.core.intermod.forestry.apiculture.multiblock.TileAlvearyMutatron;
+import miscutil.core.xmod.forestry.apiculture.multiblock.TileAlvearyMutatron;
 import net.minecraft.item.ItemStack;
 import forestry.api.apiculture.BeeManager;
 import forestry.core.inventory.InventoryAdapterTile;
diff --git a/src/Java/miscutil/core/intermod/forestry/apiculture/multiblock/inventory/MutatronHandler.java b/src/Java/miscutil/core/xmod/forestry/apiculture/multiblock/inventory/MutatronHandler.java
index 1a66cafb0d..e629eeca51 100644
--- a/src/Java/miscutil/core/intermod/forestry/apiculture/multiblock/inventory/MutatronHandler.java
+++ b/src/Java/miscutil/core/xmod/forestry/apiculture/multiblock/inventory/MutatronHandler.java
@@ -8,7 +8,7 @@
  * Various Contributors including, but not limited to:
  * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
  ******************************************************************************/
-package miscutil.core.intermod.forestry.apiculture.multiblock.inventory;
+package miscutil.core.xmod.forestry.apiculture.multiblock.inventory;
 
 public class MutatronHandler {
 
diff --git a/src/Java/miscutil/core/intermod/forestry/apiculture/tiles/FR_TileHandler.java b/src/Java/miscutil/core/xmod/forestry/apiculture/tiles/FR_TileHandler.java
index b04518b270..7ab787052b 100644
--- a/src/Java/miscutil/core/intermod/forestry/apiculture/tiles/FR_TileHandler.java
+++ b/src/Java/miscutil/core/xmod/forestry/apiculture/tiles/FR_TileHandler.java
@@ -1,7 +1,7 @@
-package miscutil.core.intermod.forestry.apiculture.tiles;
+package miscutil.core.xmod.forestry.apiculture.tiles;
 
-import miscutil.core.intermod.forestry.apiculture.multiblock.TileAlvearyMutatron;
 import miscutil.core.lib.CORE;
+import miscutil.core.xmod.forestry.apiculture.multiblock.TileAlvearyMutatron;
 import cpw.mods.fml.common.registry.GameRegistry;
 
 public class FR_TileHandler {
diff --git a/src/Java/miscutil/core/intermod/forestry/core/gui/FR_FontRenderer.java b/src/Java/miscutil/core/xmod/forestry/core/gui/FR_FontRenderer.java
index 62876c0bea..27de0a712c 100644
--- a/src/Java/miscutil/core/intermod/forestry/core/gui/FR_FontRenderer.java
+++ b/src/Java/miscutil/core/xmod/forestry/core/gui/FR_FontRenderer.java
@@ -8,7 +8,7 @@
  * Various Contributors including, but not limited to:
  * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
  ******************************************************************************/
-package miscutil.core.intermod.forestry.core.gui;
+package miscutil.core.xmod.forestry.core.gui;
 
 import net.minecraft.client.gui.FontRenderer;
 
diff --git a/src/Java/miscutil/core/intermod/forestry/core/gui/FR_GuiForestry.java b/src/Java/miscutil/core/xmod/forestry/core/gui/FR_GuiForestry.java
index 1bfbbd388e..1a2863a528 100644
--- a/src/Java/miscutil/core/intermod/forestry/core/gui/FR_GuiForestry.java
+++ b/src/Java/miscutil/core/xmod/forestry/core/gui/FR_GuiForestry.java
@@ -8,7 +8,7 @@
  * Various Contributors including, but not limited to:
  * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
  ******************************************************************************/
-package miscutil.core.intermod.forestry.core.gui;
+package miscutil.core.xmod.forestry.core.gui;
 
 import java.util.List;
 
diff --git a/src/Java/miscutil/core/intermod/forestry/core/gui/FR_GuiForestryTitled.java b/src/Java/miscutil/core/xmod/forestry/core/gui/FR_GuiForestryTitled.java
index c338c83ce0..95a08da1bd 100644
--- a/src/Java/miscutil/core/intermod/forestry/core/gui/FR_GuiForestryTitled.java
+++ b/src/Java/miscutil/core/xmod/forestry/core/gui/FR_GuiForestryTitled.java
@@ -8,7 +8,7 @@
  * Various Contributors including, but not limited to:
  * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
  ******************************************************************************/
-package miscutil.core.intermod.forestry.core.gui;
+package miscutil.core.xmod.forestry.core.gui;
 
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.IInventory;
diff --git a/src/Java/miscutil/core/intermod/forestry/core/gui/FR_GuiUtil.java b/src/Java/miscutil/core/xmod/forestry/core/gui/FR_GuiUtil.java
index a4118812c4..d30324041f 100644
--- a/src/Java/miscutil/core/intermod/forestry/core/gui/FR_GuiUtil.java
+++ b/src/Java/miscutil/core/xmod/forestry/core/gui/FR_GuiUtil.java
@@ -8,7 +8,7 @@
  * Various Contributors including, but not limited to:
  * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
  ******************************************************************************/
-package miscutil.core.intermod.forestry.core.gui;
+package miscutil.core.xmod.forestry.core.gui;
 
 import java.awt.Color;
 import java.util.Collection;
diff --git a/src/Java/miscutil/core/intermod/forestry/core/gui/FR_WidgetManager.java b/src/Java/miscutil/core/xmod/forestry/core/gui/FR_WidgetManager.java
index 5f068b4189..ce809c1066 100644
--- a/src/Java/miscutil/core/intermod/forestry/core/gui/FR_WidgetManager.java
+++ b/src/Java/miscutil/core/xmod/forestry/core/gui/FR_WidgetManager.java
@@ -8,7 +8,7 @@
  * Various Contributors including, but not limited to:
  * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
  ******************************************************************************/
-package miscutil.core.intermod.forestry.core.gui;
+package miscutil.core.xmod.forestry.core.gui;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/Java/miscutil/gregtech/HANDLER_Gregtech.java b/src/Java/miscutil/core/xmod/gregtech/HANDLER_Gregtech.java
index c00013055d..3f07b08f9b 100644
--- a/src/Java/miscutil/gregtech/HANDLER_Gregtech.java
+++ b/src/Java/miscutil/core/xmod/gregtech/HANDLER_Gregtech.java
@@ -1,8 +1,8 @@
-package miscutil.gregtech;
+package miscutil.core.xmod.gregtech;
 
 import gregtech.api.util.GT_Config;
-import miscutil.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
-import miscutil.gregtech.common.blocks.fluid.GregtechFluidHandler;
+import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
+import miscutil.core.xmod.gregtech.common.blocks.fluid.GregtechFluidHandler;
 
 public class HANDLER_Gregtech {
 	
diff --git a/src/Java/miscutil/gregtech/api/energy/IC2ElectricItem.java b/src/Java/miscutil/core/xmod/gregtech/api/energy/IC2ElectricItem.java
index eae47b9910..24b5fa32c8 100644
--- a/src/Java/miscutil/gregtech/api/energy/IC2ElectricItem.java
+++ b/src/Java/miscutil/core/xmod/gregtech/api/energy/IC2ElectricItem.java
@@ -1,4 +1,4 @@
-package miscutil.gregtech.api.energy;
+package miscutil.core.xmod.gregtech.api.energy;
 
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
diff --git a/src/Java/miscutil/gregtech/api/energy/IC2ElectricItemManager.java b/src/Java/miscutil/core/xmod/gregtech/api/energy/IC2ElectricItemManager.java
index 4b2fcb2fec..71f31cff46 100644
--- a/src/Java/miscutil/gregtech/api/energy/IC2ElectricItemManager.java
+++ b/src/Java/miscutil/core/xmod/gregtech/api/energy/IC2ElectricItemManager.java
@@ -1,4 +1,4 @@
-package miscutil.gregtech.api.energy;
+package miscutil.core.xmod.gregtech.api.energy;
 
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.item.ItemStack;
diff --git a/src/Java/miscutil/gregtech/api/enums/GregtechItemList.java b/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechItemList.java
index 4dfa9c674c..43b8f53cdb 100644
--- a/src/Java/miscutil/gregtech/api/enums/GregtechItemList.java
+++ b/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechItemList.java
@@ -1,10 +1,10 @@
-package miscutil.gregtech.api.enums;
+package miscutil.core.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.gregtech.api.interfaces.GregtechItemContainer;
+import miscutil.core.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/gregtech/api/enums/GregtechOreDictNames.java b/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechOreDictNames.java
index 7720ed8c0f..1e338c70a7 100644
--- a/src/Java/miscutil/gregtech/api/enums/GregtechOreDictNames.java
+++ b/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechOreDictNames.java
@@ -1,4 +1,4 @@
-package miscutil.gregtech.api.enums;
+package miscutil.core.xmod.gregtech.api.enums;
 
 /* Electric Components.
 *
diff --git a/src/Java/miscutil/gregtech/api/enums/GregtechOrePrefixes.java b/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechOrePrefixes.java
index 89f1b46e52..29621f7a23 100644
--- a/src/Java/miscutil/gregtech/api/enums/GregtechOrePrefixes.java
+++ b/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechOrePrefixes.java
@@ -1,4 +1,4 @@
-package miscutil.gregtech.api.enums;
+package miscutil.core.xmod.gregtech.api.enums;
 
 import static gregtech.api.enums.GT_Values.B;
 import static gregtech.api.enums.GT_Values.D2;
@@ -27,9 +27,9 @@ import java.util.HashSet;
 import java.util.List;
 
 import miscutil.core.lib.CORE;
-import miscutil.gregtech.api.interfaces.internal.Interface_OreRecipeRegistrator;
-import miscutil.gregtech.api.objects.GregtechItemData;
-import miscutil.gregtech.api.objects.GregtechMaterialStack;
+import miscutil.core.xmod.gregtech.api.interfaces.internal.Interface_OreRecipeRegistrator;
+import miscutil.core.xmod.gregtech.api.objects.GregtechItemData;
+import miscutil.core.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/gregtech/api/enums/GregtechTextureSet.java b/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechTextureSet.java
index e8d10d4d32..5f2f8b5236 100644
--- a/src/Java/miscutil/gregtech/api/enums/GregtechTextureSet.java
+++ b/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechTextureSet.java
@@ -1,4 +1,4 @@
-package miscutil.gregtech.api.enums;
+package miscutil.core.xmod.gregtech.api.enums;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
diff --git a/src/Java/miscutil/gregtech/api/enums/GregtechTextures.java b/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechTextures.java
index 816f1ba543..3bfe26fe11 100644
--- a/src/Java/miscutil/gregtech/api/enums/GregtechTextures.java
+++ b/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechTextures.java
@@ -1,4 +1,4 @@
-package miscutil.gregtech.api.enums;
+package miscutil.core.xmod.gregtech.api.enums;
 
 import gregtech.api.GregTech_API;
 import gregtech.api.interfaces.IIconContainer;
diff --git a/src/Java/miscutil/gregtech/api/gui/CONTAINER_IronBlastFurnace.java b/src/Java/miscutil/core/xmod/gregtech/api/gui/CONTAINER_IronBlastFurnace.java
index 3015e43f2a..facc0769cd 100644
--- a/src/Java/miscutil/gregtech/api/gui/CONTAINER_IronBlastFurnace.java
+++ b/src/Java/miscutil/core/xmod/gregtech/api/gui/CONTAINER_IronBlastFurnace.java
@@ -1,4 +1,4 @@
-package miscutil.gregtech.api.gui;
+package miscutil.core.xmod.gregtech.api.gui;
 
 import gregtech.api.gui.GT_ContainerMetaTile_Machine;
 import gregtech.api.gui.GT_Slot_Output;
diff --git a/src/Java/miscutil/gregtech/api/gui/CONTAINER_MultiMachine.java b/src/Java/miscutil/core/xmod/gregtech/api/gui/CONTAINER_MultiMachine.java
index 417dae03f8..92fbb37af5 100644
--- a/src/Java/miscutil/gregtech/api/gui/CONTAINER_MultiMachine.java
+++ b/src/Java/miscutil/core/xmod/gregtech/api/gui/CONTAINER_MultiMachine.java
@@ -1,4 +1,4 @@
-package miscutil.gregtech.api.gui;
+package miscutil.core.xmod.gregtech.api.gui;
 
 import gregtech.api.gui.GT_ContainerMetaTile_Machine;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
diff --git a/src/Java/miscutil/gregtech/api/gui/CONTAINER_SafeBlock.java b/src/Java/miscutil/core/xmod/gregtech/api/gui/CONTAINER_SafeBlock.java
index d4a5ad59f6..520787e286 100644
--- a/src/Java/miscutil/gregtech/api/gui/CONTAINER_SafeBlock.java
+++ b/src/Java/miscutil/core/xmod/gregtech/api/gui/CONTAINER_SafeBlock.java
@@ -1,10 +1,10 @@
-package miscutil.gregtech.api.gui;
+package miscutil.core.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 miscutil.core.util.player.PlayerCache;
-import miscutil.gregtech.api.metatileentity.implementations.GregtechMetaSafeBlock;
+import miscutil.core.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/gregtech/api/gui/CONTAINER_SteamCondenser.java b/src/Java/miscutil/core/xmod/gregtech/api/gui/CONTAINER_SteamCondenser.java
index 9a283b8de3..0cc4fc259b 100644
--- a/src/Java/miscutil/gregtech/api/gui/CONTAINER_SteamCondenser.java
+++ b/src/Java/miscutil/core/xmod/gregtech/api/gui/CONTAINER_SteamCondenser.java
@@ -1,11 +1,11 @@
-package miscutil.gregtech.api.gui;
+package miscutil.core.xmod.gregtech.api.gui;
 
 import gregtech.api.gui.GT_ContainerMetaTile_Machine;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 
 import java.util.Iterator;
 
-import miscutil.gregtech.api.metatileentity.implementations.base.GregtechMetaBoilerBase;
+import miscutil.core.xmod.gregtech.api.metatileentity.implementations.base.GregtechMetaBoilerBase;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.ICrafting;
 import net.minecraft.inventory.Slot;
diff --git a/src/Java/miscutil/gregtech/api/gui/GUI_IronBlastFurnace.java b/src/Java/miscutil/core/xmod/gregtech/api/gui/GUI_IronBlastFurnace.java
index 92ed9bd702..fa0f996a63 100644
--- a/src/Java/miscutil/gregtech/api/gui/GUI_IronBlastFurnace.java
+++ b/src/Java/miscutil/core/xmod/gregtech/api/gui/GUI_IronBlastFurnace.java
@@ -1,4 +1,4 @@
-package miscutil.gregtech.api.gui;
+package miscutil.core.xmod.gregtech.api.gui;
 
 import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
diff --git a/src/Java/miscutil/gregtech/api/gui/GUI_MultiMachine.java b/src/Java/miscutil/core/xmod/gregtech/api/gui/GUI_MultiMachine.java
index c56690ed76..2fc2242a60 100644
--- a/src/Java/miscutil/gregtech/api/gui/GUI_MultiMachine.java
+++ b/src/Java/miscutil/core/xmod/gregtech/api/gui/GUI_MultiMachine.java
@@ -1,4 +1,4 @@
-package miscutil.gregtech.api.gui;
+package miscutil.core.xmod.gregtech.api.gui;
 
 import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
diff --git a/src/Java/miscutil/gregtech/api/gui/GUI_SafeBlock.java b/src/Java/miscutil/core/xmod/gregtech/api/gui/GUI_SafeBlock.java
index 65ef072281..71b52a1af5 100644
--- a/src/Java/miscutil/gregtech/api/gui/GUI_SafeBlock.java
+++ b/src/Java/miscutil/core/xmod/gregtech/api/gui/GUI_SafeBlock.java
@@ -1,4 +1,4 @@
-package miscutil.gregtech.api.gui;
+package miscutil.core.xmod.gregtech.api.gui;
 
 import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
diff --git a/src/Java/miscutil/gregtech/api/gui/GUI_SteamCondenser.java b/src/Java/miscutil/core/xmod/gregtech/api/gui/GUI_SteamCondenser.java
index 2227302bb5..f75e180a12 100644
--- a/src/Java/miscutil/gregtech/api/gui/GUI_SteamCondenser.java
+++ b/src/Java/miscutil/core/xmod/gregtech/api/gui/GUI_SteamCondenser.java
@@ -1,4 +1,4 @@
-package miscutil.gregtech.api.gui;
+package miscutil.core.xmod.gregtech.api.gui;
 
 import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
diff --git a/src/Java/miscutil/gregtech/api/interfaces/GregtechItemContainer.java b/src/Java/miscutil/core/xmod/gregtech/api/interfaces/GregtechItemContainer.java
index 2f613006b7..e118e414f2 100644
--- a/src/Java/miscutil/gregtech/api/interfaces/GregtechItemContainer.java
+++ b/src/Java/miscutil/core/xmod/gregtech/api/interfaces/GregtechItemContainer.java
@@ -1,4 +1,4 @@
-package miscutil.gregtech.api.interfaces;
+package miscutil.core.xmod.gregtech.api.interfaces;
 
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
diff --git a/src/Java/miscutil/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java b/src/Java/miscutil/core/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java
index efd3b12506..3668dd51db 100644
--- a/src/Java/miscutil/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java
+++ b/src/Java/miscutil/core/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java
@@ -1,4 +1,4 @@
-package miscutil.gregtech.api.interfaces.internal;
+package miscutil.core.xmod.gregtech.api.interfaces.internal;
 
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
diff --git a/src/Java/miscutil/gregtech/api/interfaces/internal/Interface_ItemBehaviour.java b/src/Java/miscutil/core/xmod/gregtech/api/interfaces/internal/Interface_ItemBehaviour.java
index 74980e5d3c..fd6b953f7b 100644
--- a/src/Java/miscutil/gregtech/api/interfaces/internal/Interface_ItemBehaviour.java
+++ b/src/Java/miscutil/core/xmod/gregtech/api/interfaces/internal/Interface_ItemBehaviour.java
@@ -1,10 +1,10 @@
-package miscutil.gregtech.api.interfaces.internal;
+package miscutil.core.xmod.gregtech.api.interfaces.internal;
 
 import gregtech.api.enums.SubTag;
 
 import java.util.List;
 
-import miscutil.gregtech.api.items.Gregtech_MetaItem_Base;
+import miscutil.core.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/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator.java b/src/Java/miscutil/core/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator.java
index 4c80bd1cd6..a81539df29 100644
--- a/src/Java/miscutil/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator.java
+++ b/src/Java/miscutil/core/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator.java
@@ -1,7 +1,7 @@
-package miscutil.gregtech.api.interfaces.internal;
+package miscutil.core.xmod.gregtech.api.interfaces.internal;
 
-import miscutil.gregtech.api.enums.GregtechOrePrefixes;
-import miscutil.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
+import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes;
+import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
 import net.minecraft.item.ItemStack;
 
 public interface Interface_OreRecipeRegistrator {
diff --git a/src/Java/miscutil/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator_GT.java b/src/Java/miscutil/core/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator_GT.java
index 468c690ccf..dd9751f4db 100644
--- a/src/Java/miscutil/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator_GT.java
+++ b/src/Java/miscutil/core/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator_GT.java
@@ -1,7 +1,7 @@
-package miscutil.gregtech.api.interfaces.internal;
+package miscutil.core.xmod.gregtech.api.interfaces.internal;
 
 import gregtech.api.enums.OrePrefixes;
-import miscutil.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
+import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
 import net.minecraft.item.ItemStack;
 
 public interface Interface_OreRecipeRegistrator_GT {
diff --git a/src/Java/miscutil/gregtech/api/interfaces/internal/Interface_ToolStats.java b/src/Java/miscutil/core/xmod/gregtech/api/interfaces/internal/Interface_ToolStats.java
index 3ac112ecc4..ff3952ba96 100644
--- a/src/Java/miscutil/gregtech/api/interfaces/internal/Interface_ToolStats.java
+++ b/src/Java/miscutil/core/xmod/gregtech/api/interfaces/internal/Interface_ToolStats.java
@@ -1,10 +1,10 @@
-package miscutil.gregtech.api.interfaces.internal;
+package miscutil.core.xmod.gregtech.api.interfaces.internal;
 
 import gregtech.api.interfaces.IIconContainer;
 
 import java.util.List;
 
-import miscutil.gregtech.api.items.Gregtech_MetaTool;
+import miscutil.core.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/gregtech/api/items/Gregtech_Generic_Item.java b/src/Java/miscutil/core/xmod/gregtech/api/items/Gregtech_Generic_Item.java
index 987267ae64..7eaeacf23d 100644
--- a/src/Java/miscutil/gregtech/api/items/Gregtech_Generic_Item.java
+++ b/src/Java/miscutil/core/xmod/gregtech/api/items/Gregtech_Generic_Item.java
@@ -1,4 +1,4 @@
-package miscutil.gregtech.api.items;
+package miscutil.core.xmod.gregtech.api.items;
 
 import gregtech.api.enums.SubTag;
 import gregtech.api.interfaces.IProjectileItem;
diff --git a/src/Java/miscutil/gregtech/api/items/Gregtech_MetaItem.java b/src/Java/miscutil/core/xmod/gregtech/api/items/Gregtech_MetaItem.java
index d7a3f3bbf3..37fa2b2a80 100644
--- a/src/Java/miscutil/gregtech/api/items/Gregtech_MetaItem.java
+++ b/src/Java/miscutil/core/xmod/gregtech/api/items/Gregtech_MetaItem.java
@@ -1,4 +1,4 @@
-package miscutil.gregtech.api.items;
+package miscutil.core.xmod.gregtech.api.items;
 
 import static gregtech.api.enums.GT_Values.D1;
 import gregtech.api.GregTech_API;
@@ -21,7 +21,7 @@ import java.util.List;
 
 import miscutil.core.creative.AddToCreativeTab;
 import miscutil.core.lib.CORE;
-import miscutil.gregtech.api.interfaces.internal.Interface_ItemBehaviour;
+import miscutil.core.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/gregtech/api/items/Gregtech_MetaItem_Base.java b/src/Java/miscutil/core/xmod/gregtech/api/items/Gregtech_MetaItem_Base.java
index 5186e1905c..f58120e06a 100644
--- a/src/Java/miscutil/gregtech/api/items/Gregtech_MetaItem_Base.java
+++ b/src/Java/miscutil/core/xmod/gregtech/api/items/Gregtech_MetaItem_Base.java
@@ -1,4 +1,4 @@
-package miscutil.gregtech.api.items;
+package miscutil.core.xmod.gregtech.api.items;
 
 import static gregtech.api.enums.GT_Values.D1;
 import static gregtech.api.enums.GT_Values.V;
@@ -16,7 +16,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
-import miscutil.gregtech.api.interfaces.internal.Interface_ItemBehaviour;
+import miscutil.core.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/gregtech/api/items/Gregtech_MetaItem_X32.java b/src/Java/miscutil/core/xmod/gregtech/api/items/Gregtech_MetaItem_X32.java
index 815eb04239..b66c84bef8 100644
--- a/src/Java/miscutil/gregtech/api/items/Gregtech_MetaItem_X32.java
+++ b/src/Java/miscutil/core/xmod/gregtech/api/items/Gregtech_MetaItem_X32.java
@@ -1,4 +1,4 @@
-package miscutil.gregtech.api.items;
+package miscutil.core.xmod.gregtech.api.items;
 
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.GT_Values;
diff --git a/src/Java/miscutil/gregtech/api/items/Gregtech_MetaTool.java b/src/Java/miscutil/core/xmod/gregtech/api/items/Gregtech_MetaTool.java
index 8e659b959a..dfc9f3161e 100644
--- a/src/Java/miscutil/gregtech/api/items/Gregtech_MetaTool.java
+++ b/src/Java/miscutil/core/xmod/gregtech/api/items/Gregtech_MetaTool.java
@@ -1,4 +1,4 @@
-package miscutil.gregtech.api.items;
+package miscutil.core.xmod.gregtech.api.items;
 
 import static gregtech.api.enums.GT_Values.MOD_ID_RC;
 import gregtech.api.GregTech_API;
@@ -18,7 +18,7 @@ import java.util.Map.Entry;
 import java.util.Random;
 
 import miscutil.core.creative.AddToCreativeTab;
-import miscutil.gregtech.api.interfaces.internal.Interface_ToolStats;
+import miscutil.core.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/gregtech/api/metatileentity/implementations/GregtechMetaCondensor.java b/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/GregtechMetaCondensor.java
index b05e863241..9b7d23d5bf 100644
--- a/src/Java/miscutil/gregtech/api/metatileentity/implementations/GregtechMetaCondensor.java
+++ b/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/GregtechMetaCondensor.java
@@ -1,4 +1,4 @@
-package miscutil.gregtech.api.metatileentity.implementations;
+package miscutil.core.xmod.gregtech.api.metatileentity.implementations;
 
 import gregtech.api.enums.Dyes;
 import gregtech.api.enums.Textures;
@@ -8,9 +8,9 @@ import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_ModHandler;
 import miscutil.core.util.Utils;
-import miscutil.gregtech.api.gui.CONTAINER_SteamCondenser;
-import miscutil.gregtech.api.gui.GUI_SteamCondenser;
-import miscutil.gregtech.api.metatileentity.implementations.base.GregtechMetaBoilerBase;
+import miscutil.core.xmod.gregtech.api.gui.CONTAINER_SteamCondenser;
+import miscutil.core.xmod.gregtech.api.gui.GUI_SteamCondenser;
+import miscutil.core.xmod.gregtech.api.metatileentity.implementations.base.GregtechMetaBoilerBase;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraftforge.common.util.ForgeDirection;
diff --git a/src/Java/miscutil/gregtech/api/metatileentity/implementations/GregtechMetaEnergyBuffer.java b/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/GregtechMetaEnergyBuffer.java
index a7db28154d..361a2682ec 100644
--- a/src/Java/miscutil/gregtech/api/metatileentity/implementations/GregtechMetaEnergyBuffer.java
+++ b/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/GregtechMetaEnergyBuffer.java
@@ -1,4 +1,4 @@
-package miscutil.gregtech.api.metatileentity.implementations;
+package miscutil.core.xmod.gregtech.api.metatileentity.implementations;
 
 import static gregtech.api.enums.GT_Values.V;
 import gregtech.api.enums.Textures;
@@ -19,7 +19,7 @@ import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_Utility;
 import ic2.api.item.IElectricItem;
 import miscutil.core.util.Utils;
-import miscutil.gregtech.api.metatileentity.implementations.base.GregtechMetaTileEntity;
+import miscutil.core.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/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java b/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java
index bc9408319e..4bcfbf7949 100644
--- a/src/Java/miscutil/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java
+++ b/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java
@@ -1,4 +1,4 @@
-package miscutil.gregtech.api.metatileentity.implementations;
+package miscutil.core.xmod.gregtech.api.metatileentity.implementations;
 
 import static gregtech.api.enums.GT_Values.VN;
 import gregtech.api.GregTech_API;
diff --git a/src/Java/miscutil/gregtech/api/metatileentity/implementations/GregtechMetaSafeBlock.java b/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/GregtechMetaSafeBlock.java
index b45c698c97..d2a1a8e230 100644
--- a/src/Java/miscutil/gregtech/api/metatileentity/implementations/GregtechMetaSafeBlock.java
+++ b/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/GregtechMetaSafeBlock.java
@@ -1,4 +1,4 @@
-package miscutil.gregtech.api.metatileentity.implementations;
+package miscutil.core.xmod.gregtech.api.metatileentity.implementations;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
@@ -6,9 +6,9 @@ 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.gregtech.api.gui.CONTAINER_SafeBlock;
-import miscutil.gregtech.api.gui.GUI_SafeBlock;
-import miscutil.gregtech.api.metatileentity.implementations.base.GregtechMetaSafeBlockBase;
+import miscutil.core.xmod.gregtech.api.gui.CONTAINER_SafeBlock;
+import miscutil.core.xmod.gregtech.api.gui.GUI_SafeBlock;
+import miscutil.core.xmod.gregtech.api.metatileentity.implementations.base.GregtechMetaSafeBlockBase;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.util.EnumChatFormatting;
 
diff --git a/src/Java/miscutil/gregtech/api/metatileentity/implementations/base/GregtechMetaBoilerBase.java b/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaBoilerBase.java
index 12e807bc34..e3ae40a45d 100644
--- a/src/Java/miscutil/gregtech/api/metatileentity/implementations/base/GregtechMetaBoilerBase.java
+++ b/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaBoilerBase.java
@@ -1,4 +1,4 @@
-package miscutil.gregtech.api.metatileentity.implementations.base;
+package miscutil.core.xmod.gregtech.api.metatileentity.implementations.base;
 
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.Materials;
diff --git a/src/Java/miscutil/gregtech/api/metatileentity/implementations/base/GregtechMetaSafeBlockBase.java b/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaSafeBlockBase.java
index 5060edfeee..e9793f3c32 100644
--- a/src/Java/miscutil/gregtech/api/metatileentity/implementations/base/GregtechMetaSafeBlockBase.java
+++ b/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaSafeBlockBase.java
@@ -1,4 +1,4 @@
-package miscutil.gregtech.api.metatileentity.implementations.base;
+package miscutil.core.xmod.gregtech.api.metatileentity.implementations.base;
 
 import static gregtech.api.enums.GT_Values.V;
 import gregtech.api.enums.Textures;
diff --git a/src/Java/miscutil/gregtech/api/metatileentity/implementations/base/GregtechMetaTileEntity.java b/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaTileEntity.java
index de9a98c644..02962a6dcb 100644
--- a/src/Java/miscutil/gregtech/api/metatileentity/implementations/base/GregtechMetaTileEntity.java
+++ b/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaTileEntity.java
@@ -1,4 +1,4 @@
-package miscutil.gregtech.api.metatileentity.implementations.base;
+package miscutil.core.xmod.gregtech.api.metatileentity.implementations.base;
 
 import static gregtech.api.enums.GT_Values.GT;
 import gregtech.api.interfaces.ITexture;
diff --git a/src/Java/miscutil/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java b/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
index b807589d78..fe81a22c51 100644
--- a/src/Java/miscutil/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
+++ b/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
@@ -1,4 +1,4 @@
-package miscutil.gregtech.api.metatileentity.implementations.base;
+package miscutil.core.xmod.gregtech.api.metatileentity.implementations.base;
 
 import static gregtech.api.enums.GT_Values.V;
 import gregtech.GT_Mod;
@@ -28,8 +28,8 @@ import gregtech.common.items.GT_MetaGenerated_Tool_01;
 
 import java.util.ArrayList;
 
-import miscutil.gregtech.api.gui.CONTAINER_MultiMachine;
-import miscutil.gregtech.api.gui.GUI_MultiMachine;
+import miscutil.core.xmod.gregtech.api.gui.CONTAINER_MultiMachine;
+import miscutil.core.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/gregtech/api/metatileentity/implementations/base/GregtechRocketFuelGeneratorBase.java b/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/GregtechRocketFuelGeneratorBase.java
index cd5dbfbafe..de35f79403 100644
--- a/src/Java/miscutil/gregtech/api/metatileentity/implementations/base/GregtechRocketFuelGeneratorBase.java
+++ b/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/GregtechRocketFuelGeneratorBase.java
@@ -1,4 +1,4 @@
-package miscutil.gregtech.api.metatileentity.implementations.base;
+package miscutil.core.xmod.gregtech.api.metatileentity.implementations.base;
 
 import static gregtech.api.enums.GT_Values.V;
 import gregtech.api.enums.Textures;
diff --git a/src/Java/miscutil/gregtech/api/metatileentity/implementations/base/GregtechSteelBoiler.java b/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/GregtechSteelBoiler.java
index 0a6920c794..5d017024e9 100644
--- a/src/Java/miscutil/gregtech/api/metatileentity/implementations/base/GregtechSteelBoiler.java
+++ b/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/GregtechSteelBoiler.java
@@ -1,4 +1,4 @@
-package miscutil.gregtech.api.metatileentity.implementations.base;
+package miscutil.core.xmod.gregtech.api.metatileentity.implementations.base;
 
 import gregtech.api.enums.Dyes;
 import gregtech.api.enums.Materials;
diff --git a/src/Java/miscutil/gregtech/api/metatileentity/implementations/creative/GregtechMetaCreativeEnergyBuffer.java b/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/creative/GregtechMetaCreativeEnergyBuffer.java
index 25df527d30..701e128ab7 100644
--- a/src/Java/miscutil/gregtech/api/metatileentity/implementations/creative/GregtechMetaCreativeEnergyBuffer.java
+++ b/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/creative/GregtechMetaCreativeEnergyBuffer.java
@@ -1,4 +1,4 @@
-package miscutil.gregtech.api.metatileentity.implementations.creative;
+package miscutil.core.xmod.gregtech.api.metatileentity.implementations.creative;
 
 import static gregtech.api.enums.GT_Values.V;
 import gregtech.api.enums.Textures;
@@ -18,7 +18,7 @@ import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_Utility;
 import ic2.api.item.IElectricItem;
-import miscutil.gregtech.api.metatileentity.implementations.GregtechMetaEnergyBuffer;
+import miscutil.core.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/gregtech/api/objects/GregtechFluid.java b/src/Java/miscutil/core/xmod/gregtech/api/objects/GregtechFluid.java
index 03b1ddfc10..f894b6e45b 100644
--- a/src/Java/miscutil/gregtech/api/objects/GregtechFluid.java
+++ b/src/Java/miscutil/core/xmod/gregtech/api/objects/GregtechFluid.java
@@ -1,4 +1,4 @@
-package miscutil.gregtech.api.objects;
+package miscutil.core.xmod.gregtech.api.objects;
 
 import gregtech.api.GregTech_API;
 import miscutil.core.lib.CORE;
diff --git a/src/Java/miscutil/gregtech/api/objects/GregtechItemData.java b/src/Java/miscutil/core/xmod/gregtech/api/objects/GregtechItemData.java
index 35c0eb2c74..864cf77c31 100644
--- a/src/Java/miscutil/gregtech/api/objects/GregtechItemData.java
+++ b/src/Java/miscutil/core/xmod/gregtech/api/objects/GregtechItemData.java
@@ -1,4 +1,4 @@
-package miscutil.gregtech.api.objects;
+package miscutil.core.xmod.gregtech.api.objects;
 
 import gregtech.api.objects.GT_ArrayList;
 
@@ -8,8 +8,8 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
-import miscutil.gregtech.api.enums.GregtechOrePrefixes;
-import miscutil.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
+import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes;
+import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
 import net.minecraft.item.ItemStack;
 
 public class GregtechItemData {
diff --git a/src/Java/miscutil/gregtech/api/objects/GregtechMaterialStack.java b/src/Java/miscutil/core/xmod/gregtech/api/objects/GregtechMaterialStack.java
index 936689de97..56410757f6 100644
--- a/src/Java/miscutil/gregtech/api/objects/GregtechMaterialStack.java
+++ b/src/Java/miscutil/core/xmod/gregtech/api/objects/GregtechMaterialStack.java
@@ -1,6 +1,6 @@
-package miscutil.gregtech.api.objects;
+package miscutil.core.xmod.gregtech.api.objects;
 
-import miscutil.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
+import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
 
 public class GregtechMaterialStack implements Cloneable {
     public long mAmount;
diff --git a/src/Java/miscutil/gregtech/api/objects/GregtechRenderedTexture.java b/src/Java/miscutil/core/xmod/gregtech/api/objects/GregtechRenderedTexture.java
index 5c87109ef0..0f56400d0c 100644
--- a/src/Java/miscutil/gregtech/api/objects/GregtechRenderedTexture.java
+++ b/src/Java/miscutil/core/xmod/gregtech/api/objects/GregtechRenderedTexture.java
@@ -1,4 +1,4 @@
-package miscutil.gregtech.api.objects;
+package miscutil.core.xmod.gregtech.api.objects;
 
 import gregtech.api.enums.Dyes;
 import gregtech.api.interfaces.IColorModulationContainer;
diff --git a/src/Java/miscutil/gregtech/api/util/GregtechOreDictUnificator.java b/src/Java/miscutil/core/xmod/gregtech/api/util/GregtechOreDictUnificator.java
index 6f24217110..bdc01ccdf0 100644
--- a/src/Java/miscutil/gregtech/api/util/GregtechOreDictUnificator.java
+++ b/src/Java/miscutil/core/xmod/gregtech/api/util/GregtechOreDictUnificator.java
@@ -1,4 +1,4 @@
-package miscutil.gregtech.api.util;
+package miscutil.core.xmod.gregtech.api.util;
 
 import static gregtech.api.enums.GT_Values.E;
 import static gregtech.api.enums.GT_Values.M;
@@ -18,10 +18,10 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map.Entry;
 
-import miscutil.gregtech.api.enums.GregtechOrePrefixes;
-import miscutil.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
-import miscutil.gregtech.api.objects.GregtechItemData;
-import miscutil.gregtech.api.objects.GregtechMaterialStack;
+import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes;
+import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
+import miscutil.core.xmod.gregtech.api.objects.GregtechItemData;
+import miscutil.core.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/gregtech/api/util/GregtechRecipe.java b/src/Java/miscutil/core/xmod/gregtech/api/util/GregtechRecipe.java
index b6eb424e32..6d73a94364 100644
--- a/src/Java/miscutil/gregtech/api/util/GregtechRecipe.java
+++ b/src/Java/miscutil/core/xmod/gregtech/api/util/GregtechRecipe.java
@@ -1,4 +1,4 @@
-package miscutil.gregtech.api.util;
+package miscutil.core.xmod.gregtech.api.util;
 
 import static gregtech.api.enums.GT_Values.E;
 import static gregtech.api.enums.GT_Values.RES_PATH_GUI;
diff --git a/src/Java/miscutil/gregtech/api/util/GregtechRecipeRegistrator.java b/src/Java/miscutil/core/xmod/gregtech/api/util/GregtechRecipeRegistrator.java
index 81a8780a54..120cef762d 100644
--- a/src/Java/miscutil/gregtech/api/util/GregtechRecipeRegistrator.java
+++ b/src/Java/miscutil/core/xmod/gregtech/api/util/GregtechRecipeRegistrator.java
@@ -1,4 +1,4 @@
-package miscutil.gregtech.api.util;
+package miscutil.core.xmod.gregtech.api.util;
 
 import static gregtech.api.enums.GT_Values.L;
 import static gregtech.api.enums.GT_Values.M;
@@ -17,10 +17,10 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import miscutil.gregtech.api.enums.GregtechOrePrefixes;
-import miscutil.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
-import miscutil.gregtech.api.objects.GregtechItemData;
-import miscutil.gregtech.api.objects.GregtechMaterialStack;
+import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes;
+import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
+import miscutil.core.xmod.gregtech.api.objects.GregtechItemData;
+import miscutil.core.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/gregtech/common/GregtechRecipeAdder.java b/src/Java/miscutil/core/xmod/gregtech/common/GregtechRecipeAdder.java
index af75e71324..076915b633 100644
--- a/src/Java/miscutil/gregtech/common/GregtechRecipeAdder.java
+++ b/src/Java/miscutil/core/xmod/gregtech/common/GregtechRecipeAdder.java
@@ -1,9 +1,9 @@
-package miscutil.gregtech.common;
+package miscutil.core.xmod.gregtech.common;
 
 import gregtech.api.GregTech_API;
 import miscutil.core.util.Utils;
-import miscutil.gregtech.api.interfaces.internal.IGregtech_RecipeAdder;
-import miscutil.gregtech.api.util.GregtechRecipe;
+import miscutil.core.xmod.gregtech.api.interfaces.internal.IGregtech_RecipeAdder;
+import miscutil.core.xmod.gregtech.api.util.GregtechRecipe;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 
diff --git a/src/Java/miscutil/gregtech/common/Meta_GT_Proxy.java b/src/Java/miscutil/core/xmod/gregtech/common/Meta_GT_Proxy.java
index 14e16c06d2..99aaec4e33 100644
--- a/src/Java/miscutil/gregtech/common/Meta_GT_Proxy.java
+++ b/src/Java/miscutil/core/xmod/gregtech/common/Meta_GT_Proxy.java
@@ -1,4 +1,4 @@
-package miscutil.gregtech.common;
+package miscutil.core.xmod.gregtech.common;
 
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.ConfigCategories;
@@ -15,12 +15,12 @@ import java.util.HashSet;
 import java.util.Iterator;
 
 import miscutil.core.lib.CORE;
-import miscutil.gregtech.api.enums.GregtechOrePrefixes;
-import miscutil.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
-import miscutil.gregtech.api.objects.GregtechFluid;
-import miscutil.gregtech.api.util.GregtechOreDictUnificator;
-import miscutil.gregtech.api.util.GregtechRecipeRegistrator;
-import miscutil.gregtech.common.items.MetaGeneratedGregtechItems;
+import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes;
+import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
+import miscutil.core.xmod.gregtech.api.objects.GregtechFluid;
+import miscutil.core.xmod.gregtech.api.util.GregtechOreDictUnificator;
+import miscutil.core.xmod.gregtech.api.util.GregtechRecipeRegistrator;
+import miscutil.core.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/gregtech/common/blocks/GregtechMetaCasingBlocks.java b/src/Java/miscutil/core/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java
index b3716ab3e2..20088c8ecd 100644
--- a/src/Java/miscutil/gregtech/common/blocks/GregtechMetaCasingBlocks.java
+++ b/src/Java/miscutil/core/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java
@@ -1,4 +1,4 @@
-package miscutil.gregtech.common.blocks;
+package miscutil.core.xmod.gregtech.common.blocks;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
@@ -6,8 +6,8 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.objects.GT_CopiedBlockTexture;
 import gregtech.api.util.GT_LanguageManager;
 import gregtech.common.blocks.GT_Material_Casings;
-import miscutil.gregtech.api.enums.GregtechItemList;
-import miscutil.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialCentrifuge;
+import miscutil.core.xmod.gregtech.api.enums.GregtechItemList;
+import miscutil.core.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialCentrifuge;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
diff --git a/src/Java/miscutil/gregtech/common/blocks/GregtechMetaCasingBlocksAbstract.java b/src/Java/miscutil/core/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksAbstract.java
index d4ac2a03c3..d3ce273bdd 100644
--- a/src/Java/miscutil/gregtech/common/blocks/GregtechMetaCasingBlocksAbstract.java
+++ b/src/Java/miscutil/core/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksAbstract.java
@@ -1,4 +1,4 @@
-package miscutil.gregtech.common.blocks;
+package miscutil.core.xmod.gregtech.common.blocks;
 
 import gregtech.api.GregTech_API;
 import gregtech.api.util.GT_LanguageManager;
diff --git a/src/Java/miscutil/gregtech/common/blocks/GregtechMetaCasingItems.java b/src/Java/miscutil/core/xmod/gregtech/common/blocks/GregtechMetaCasingItems.java
index c549ebcc31..96ef4e2983 100644
--- a/src/Java/miscutil/gregtech/common/blocks/GregtechMetaCasingItems.java
+++ b/src/Java/miscutil/core/xmod/gregtech/common/blocks/GregtechMetaCasingItems.java
@@ -1,4 +1,4 @@
-package miscutil.gregtech.common.blocks;
+package miscutil.core.xmod.gregtech.common.blocks;
 
 import gregtech.common.blocks.GT_Item_Casings_Abstract;
 import net.minecraft.block.Block;
diff --git a/src/Java/miscutil/gregtech/common/blocks/GregtechMetaItemCasings1.java b/src/Java/miscutil/core/xmod/gregtech/common/blocks/GregtechMetaItemCasings1.java
index 41c5552de2..17ee8f9853 100644
--- a/src/Java/miscutil/gregtech/common/blocks/GregtechMetaItemCasings1.java
+++ b/src/Java/miscutil/core/xmod/gregtech/common/blocks/GregtechMetaItemCasings1.java
@@ -1,4 +1,4 @@
-package miscutil.gregtech.common.blocks;
+package miscutil.core.xmod.gregtech.common.blocks;
 
 import java.util.List;
 
diff --git a/src/Java/miscutil/gregtech/common/blocks/GregtechMetaItemCasingsAbstract.java b/src/Java/miscutil/core/xmod/gregtech/common/blocks/GregtechMetaItemCasingsAbstract.java
index b43fa35190..ad87cd51f7 100644
--- a/src/Java/miscutil/gregtech/common/blocks/GregtechMetaItemCasingsAbstract.java
+++ b/src/Java/miscutil/core/xmod/gregtech/common/blocks/GregtechMetaItemCasingsAbstract.java
@@ -1,4 +1,4 @@
-package miscutil.gregtech.common.blocks;
+package miscutil.core.xmod.gregtech.common.blocks;
 
 import gregtech.api.util.GT_LanguageManager;
 
diff --git a/src/Java/miscutil/gregtech/common/blocks/fluid/GregtechFluidHandler.java b/src/Java/miscutil/core/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java
index 8483d1f96f..8d7ea692f8 100644
--- a/src/Java/miscutil/gregtech/common/blocks/fluid/GregtechFluidHandler.java
+++ b/src/Java/miscutil/core/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java
@@ -1,10 +1,10 @@
-package miscutil.gregtech.common.blocks.fluid;
+package miscutil.core.xmod.gregtech.common.blocks.fluid;
 
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.util.GT_OreDictUnificator;
-import miscutil.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
-import miscutil.gregtech.common.Meta_GT_Proxy;
+import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
+import miscutil.core.xmod.gregtech.common.Meta_GT_Proxy;
 
 public class GregtechFluidHandler {
 
diff --git a/src/Java/miscutil/gregtech/common/items/MetaGeneratedGregtechItems.java b/src/Java/miscutil/core/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
index f1cc7eaa76..20599a500d 100644
--- a/src/Java/miscutil/gregtech/common/items/MetaGeneratedGregtechItems.java
+++ b/src/Java/miscutil/core/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
@@ -1,4 +1,4 @@
-package miscutil.gregtech.common.items;
+package miscutil.core.xmod.gregtech.common.items;
 
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.OrePrefixes;
@@ -10,10 +10,10 @@ import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.common.covers.GT_Cover_Arm;
 import gregtech.common.covers.GT_Cover_Conveyor;
 import gregtech.common.covers.GT_Cover_Pump;
-import miscutil.gregtech.api.enums.GregtechItemList;
-import miscutil.gregtech.api.enums.GregtechOrePrefixes;
-import miscutil.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
-import miscutil.gregtech.api.items.Gregtech_MetaItem_X32;
+import miscutil.core.xmod.gregtech.api.enums.GregtechItemList;
+import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes;
+import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
+import miscutil.core.xmod.gregtech.api.items.Gregtech_MetaItem_X32;
 
 public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
     public MetaGeneratedGregtechItems INSTANCE;
diff --git a/src/Java/miscutil/gregtech/common/items/MetaGeneratedGregtechTools.java b/src/Java/miscutil/core/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java
index d2800fa2c0..94504290ac 100644
--- a/src/Java/miscutil/gregtech/common/items/MetaGeneratedGregtechTools.java
+++ b/src/Java/miscutil/core/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java
@@ -1,7 +1,7 @@
-package miscutil.gregtech.common.items;
+package miscutil.core.xmod.gregtech.common.items;
 
-import miscutil.gregtech.api.items.Gregtech_MetaTool;
-import miscutil.gregtech.common.tools.TOOL_Gregtech_MaxEfficiencyMultiBlockItem;
+import miscutil.core.xmod.gregtech.api.items.Gregtech_MetaTool;
+import miscutil.core.xmod.gregtech.common.tools.TOOL_Gregtech_MaxEfficiencyMultiBlockItem;
 
 public class MetaGeneratedGregtechTools extends Gregtech_MetaTool {
     
diff --git a/src/Java/miscutil/gregtech/common/tileentities/generators/GregtechMetaTileEntityRocketFuelGenerator.java b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityRocketFuelGenerator.java
index ecf292392a..454e7f3a90 100644
--- a/src/Java/miscutil/gregtech/common/tileentities/generators/GregtechMetaTileEntityRocketFuelGenerator.java
+++ b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityRocketFuelGenerator.java
@@ -1,4 +1,4 @@
-package miscutil.gregtech.common.tileentities.generators;
+package miscutil.core.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.gregtech.api.metatileentity.implementations.base.GregtechRocketFuelGeneratorBase;
+import miscutil.core.xmod.gregtech.api.metatileentity.implementations.base.GregtechRocketFuelGeneratorBase;
 import net.minecraft.item.ItemStack;
 import cpw.mods.fml.common.registry.GameRegistry;
 
diff --git a/src/Java/miscutil/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityElectricBlastFurnace.java b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityElectricBlastFurnace.java
index 0b77693648..7f82c8a25d 100644
--- a/src/Java/miscutil/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityElectricBlastFurnace.java
+++ b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityElectricBlastFurnace.java
@@ -1,4 +1,4 @@
-package miscutil.gregtech.common.tileentities.machines.multi;
+package miscutil.core.xmod.gregtech.common.tileentities.machines.multi;
 
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.Textures;
diff --git a/src/Java/miscutil/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCentrifuge.java b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCentrifuge.java
index ebc56ff629..39c795b409 100644
--- a/src/Java/miscutil/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCentrifuge.java
+++ b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCentrifuge.java
@@ -1,4 +1,4 @@
-package miscutil.gregtech.common.tileentities.machines.multi;
+package miscutil.core.xmod.gregtech.common.tileentities.machines.multi;
 
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.Textures;
@@ -15,10 +15,10 @@ import java.util.Arrays;
 
 import miscutil.core.block.ModBlocks;
 import miscutil.core.util.Utils;
-import miscutil.gregtech.api.gui.GUI_MultiMachine;
-import miscutil.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
-import miscutil.gregtech.api.objects.GregtechRenderedTexture;
-import miscutil.gregtech.api.util.GregtechRecipe;
+import miscutil.core.xmod.gregtech.api.gui.GUI_MultiMachine;
+import miscutil.core.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
+import miscutil.core.xmod.gregtech.api.objects.GregtechRenderedTexture;
+import miscutil.core.xmod.gregtech.api.util.GregtechRecipe;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
diff --git a/src/Java/miscutil/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCokeOven.java b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCokeOven.java
index 7bd5d3115c..a3d046d73d 100644
--- a/src/Java/miscutil/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCokeOven.java
+++ b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCokeOven.java
@@ -1,4 +1,4 @@
-package miscutil.gregtech.common.tileentities.machines.multi;
+package miscutil.core.xmod.gregtech.common.tileentities.machines.multi;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
@@ -13,8 +13,8 @@ import java.util.ArrayList;
 import java.util.Arrays;
 
 import miscutil.core.block.ModBlocks;
-import miscutil.gregtech.api.gui.GUI_MultiMachine;
-import miscutil.gregtech.api.util.GregtechRecipe;
+import miscutil.core.xmod.gregtech.api.gui.GUI_MultiMachine;
+import miscutil.core.xmod.gregtech.api.util.GregtechRecipe;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.util.ForgeDirection;
diff --git a/src/Java/miscutil/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialPlatePress.java b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialPlatePress.java
index e733c55c1c..9f09b8db55 100644
--- a/src/Java/miscutil/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialPlatePress.java
+++ b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialPlatePress.java
@@ -1,4 +1,4 @@
-package miscutil.gregtech.common.tileentities.machines.multi;
+package miscutil.core.xmod.gregtech.common.tileentities.machines.multi;
 
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.Textures;
diff --git a/src/Java/miscutil/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIronBlastFurnace.java b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIronBlastFurnace.java
index 630d5054f9..6b60c40a48 100644
--- a/src/Java/miscutil/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIronBlastFurnace.java
+++ b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIronBlastFurnace.java
@@ -1,4 +1,4 @@
-package miscutil.gregtech.common.tileentities.machines.multi;
+package miscutil.core.xmod.gregtech.common.tileentities.machines.multi;
 
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.Materials;
@@ -12,8 +12,8 @@ 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.gregtech.api.gui.CONTAINER_IronBlastFurnace;
-import miscutil.gregtech.api.gui.GUI_IronBlastFurnace;
+import miscutil.core.xmod.gregtech.api.gui.CONTAINER_IronBlastFurnace;
+import miscutil.core.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/gregtech/common/tools/TOOL_Gregtech_Base.java b/src/Java/miscutil/core/xmod/gregtech/common/tools/TOOL_Gregtech_Base.java
index 79afb7025d..4d7228c4a5 100644
--- a/src/Java/miscutil/gregtech/common/tools/TOOL_Gregtech_Base.java
+++ b/src/Java/miscutil/core/xmod/gregtech/common/tools/TOOL_Gregtech_Base.java
@@ -1,12 +1,12 @@
-package miscutil.gregtech.common.tools;
+package miscutil.core.xmod.gregtech.common.tools;
 
 import gregtech.api.GregTech_API;
 import gregtech.api.damagesources.GT_DamageSources;
 
 import java.util.List;
 
-import miscutil.gregtech.api.interfaces.internal.Interface_ToolStats;
-import miscutil.gregtech.api.items.Gregtech_MetaTool;
+import miscutil.core.xmod.gregtech.api.interfaces.internal.Interface_ToolStats;
+import miscutil.core.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/gregtech/common/tools/TOOL_Gregtech_BaseMultiblockItem.java b/src/Java/miscutil/core/xmod/gregtech/common/tools/TOOL_Gregtech_BaseMultiblockItem.java
index b1225ffcc5..421d8d02a8 100644
--- a/src/Java/miscutil/gregtech/common/tools/TOOL_Gregtech_BaseMultiblockItem.java
+++ b/src/Java/miscutil/core/xmod/gregtech/common/tools/TOOL_Gregtech_BaseMultiblockItem.java
@@ -1,7 +1,7 @@
-package miscutil.gregtech.common.tools;
+package miscutil.core.xmod.gregtech.common.tools;
 
 import gregtech.api.interfaces.IIconContainer;
-import miscutil.gregtech.api.items.Gregtech_MetaTool;
+import miscutil.core.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/gregtech/common/tools/TOOL_Gregtech_MaxEfficiencyMultiBlockItem.java b/src/Java/miscutil/core/xmod/gregtech/common/tools/TOOL_Gregtech_MaxEfficiencyMultiBlockItem.java
index bf3921f9b6..c1c5c92212 100644
--- a/src/Java/miscutil/gregtech/common/tools/TOOL_Gregtech_MaxEfficiencyMultiBlockItem.java
+++ b/src/Java/miscutil/core/xmod/gregtech/common/tools/TOOL_Gregtech_MaxEfficiencyMultiBlockItem.java
@@ -1,4 +1,4 @@
-package miscutil.gregtech.common.tools;
+package miscutil.core.xmod.gregtech.common.tools;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
diff --git a/src/Java/miscutil/gregtech/loaders/Processing_Block.java b/src/Java/miscutil/core/xmod/gregtech/loaders/Processing_Block.java
index e2389a43d5..409be09a1f 100644
--- a/src/Java/miscutil/gregtech/loaders/Processing_Block.java
+++ b/src/Java/miscutil/core/xmod/gregtech/loaders/Processing_Block.java
@@ -1,4 +1,4 @@
-package miscutil.gregtech.loaders;
+package miscutil.core.xmod.gregtech.loaders;
 
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.ConfigCategories;
@@ -8,10 +8,10 @@ import gregtech.api.enums.SubTag;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_Utility;
 import miscutil.core.util.Utils;
-import miscutil.gregtech.api.enums.GregtechOrePrefixes;
-import miscutil.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
-import miscutil.gregtech.api.interfaces.internal.Interface_OreRecipeRegistrator;
-import miscutil.gregtech.api.util.GregtechOreDictUnificator;
+import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes;
+import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
+import miscutil.core.xmod.gregtech.api.interfaces.internal.Interface_OreRecipeRegistrator;
+import miscutil.core.xmod.gregtech.api.util.GregtechOreDictUnificator;
 import net.minecraft.item.ItemStack;
 
 public class Processing_Block implements Interface_OreRecipeRegistrator {
diff --git a/src/Java/miscutil/gregtech/loaders/Processing_Ingot1.java b/src/Java/miscutil/core/xmod/gregtech/loaders/Processing_Ingot1.java
index 77097042d6..cd1db13c57 100644
--- a/src/Java/miscutil/gregtech/loaders/Processing_Ingot1.java
+++ b/src/Java/miscutil/core/xmod/gregtech/loaders/Processing_Ingot1.java
@@ -1,4 +1,4 @@
-package miscutil.gregtech.loaders;
+package miscutil.core.xmod.gregtech.loaders;
 
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.ItemList;
@@ -8,10 +8,10 @@ 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.gregtech.api.enums.GregtechOrePrefixes;
-import miscutil.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
-import miscutil.gregtech.api.interfaces.internal.Interface_OreRecipeRegistrator;
-import miscutil.gregtech.api.util.GregtechRecipeRegistrator;
+import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes;
+import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
+import miscutil.core.xmod.gregtech.api.interfaces.internal.Interface_OreRecipeRegistrator;
+import miscutil.core.xmod.gregtech.api.util.GregtechRecipeRegistrator;
 import net.minecraft.item.ItemStack;
 
 public class Processing_Ingot1 implements Interface_OreRecipeRegistrator {
diff --git a/src/Java/miscutil/gregtech/loaders/Processing_Plate1.java b/src/Java/miscutil/core/xmod/gregtech/loaders/Processing_Plate1.java
index 636d8c5377..a63a938310 100644
--- a/src/Java/miscutil/gregtech/loaders/Processing_Plate1.java
+++ b/src/Java/miscutil/core/xmod/gregtech/loaders/Processing_Plate1.java
@@ -1,4 +1,4 @@
-package miscutil.gregtech.loaders;
+package miscutil.core.xmod.gregtech.loaders;
 
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.ItemList;
@@ -8,8 +8,8 @@ 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.gregtech.api.enums.GregtechOrePrefixes;
-import miscutil.gregtech.api.interfaces.internal.Interface_OreRecipeRegistrator;
+import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes;
+import miscutil.core.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/core/intermod/growthcraft/HANDLER_Growthcraft.java b/src/Java/miscutil/core/xmod/growthcraft/HANDLER_Growthcraft.java
index 9ff80c735a..f227b1dc46 100644
--- a/src/Java/miscutil/core/intermod/growthcraft/HANDLER_Growthcraft.java
+++ b/src/Java/miscutil/core/xmod/growthcraft/HANDLER_Growthcraft.java
@@ -1,4 +1,4 @@
-package miscutil.core.intermod.growthcraft;
+package miscutil.core.xmod.growthcraft;
 
 import growthcraft.api.cellar.Booze;
 import growthcraft.api.cellar.CellarRegistry;
diff --git a/src/Java/miscutil/core/intermod/psychedelicraft/HANDLER_Psychedelicraft.java b/src/Java/miscutil/core/xmod/psychedelicraft/HANDLER_Psychedelicraft.java
index f92b794cd0..b4facc6a2d 100644
--- a/src/Java/miscutil/core/intermod/psychedelicraft/HANDLER_Psychedelicraft.java
+++ b/src/Java/miscutil/core/xmod/psychedelicraft/HANDLER_Psychedelicraft.java
@@ -1,7 +1,7 @@
-package miscutil.core.intermod.psychedelicraft;
+package miscutil.core.xmod.psychedelicraft;
 
-import miscutil.core.intermod.psychedelicraft.fluids.PS_Fluids;
 import miscutil.core.lib.LoadedMods;
+import miscutil.core.xmod.psychedelicraft.fluids.PS_Fluids;
 
 
 public class HANDLER_Psychedelicraft {
diff --git a/src/Java/miscutil/core/intermod/psychedelicraft/fluids/PS_Fluids.java b/src/Java/miscutil/core/xmod/psychedelicraft/fluids/PS_Fluids.java
index 641979408a..5bba9d5857 100644
--- a/src/Java/miscutil/core/intermod/psychedelicraft/fluids/PS_Fluids.java
+++ b/src/Java/miscutil/core/xmod/psychedelicraft/fluids/PS_Fluids.java
@@ -1,4 +1,4 @@
-package miscutil.core.intermod.psychedelicraft.fluids;
+package miscutil.core.xmod.psychedelicraft.fluids;
 
 import ivorius.ivtoolkit.gui.IntegerRange;
 import ivorius.psychedelicraft.blocks.TileEntityMashTub;
diff --git a/src/Java/miscutil/core/intermod/thermalfoundation/HANDLER_ThermalFoundation.java b/src/Java/miscutil/core/xmod/thermalfoundation/HANDLER_ThermalFoundation.java
index df23361504..7c77d413e5 100644
--- a/src/Java/miscutil/core/intermod/thermalfoundation/HANDLER_ThermalFoundation.java
+++ b/src/Java/miscutil/core/xmod/thermalfoundation/HANDLER_ThermalFoundation.java
@@ -1,10 +1,10 @@
-package miscutil.core.intermod.thermalfoundation;
+package miscutil.core.xmod.thermalfoundation;
 
-import miscutil.core.intermod.thermalfoundation.block.TF_Blocks;
-import miscutil.core.intermod.thermalfoundation.fluid.TF_Fluids;
-import miscutil.core.intermod.thermalfoundation.item.TF_Items;
-import miscutil.core.intermod.thermalfoundation.recipe.TF_Gregtech_Recipes;
 import miscutil.core.lib.LoadedMods;
+import miscutil.core.xmod.thermalfoundation.block.TF_Blocks;
+import miscutil.core.xmod.thermalfoundation.fluid.TF_Fluids;
+import miscutil.core.xmod.thermalfoundation.item.TF_Items;
+import miscutil.core.xmod.thermalfoundation.recipe.TF_Gregtech_Recipes;
 
 public class HANDLER_ThermalFoundation {
 
diff --git a/src/Java/miscutil/core/intermod/thermalfoundation/block/TF_Block_Fluid_Cryotheum.java b/src/Java/miscutil/core/xmod/thermalfoundation/block/TF_Block_Fluid_Cryotheum.java
index dbf0f8a26e..8865da678e 100644
--- a/src/Java/miscutil/core/intermod/thermalfoundation/block/TF_Block_Fluid_Cryotheum.java
+++ b/src/Java/miscutil/core/xmod/thermalfoundation/block/TF_Block_Fluid_Cryotheum.java
@@ -1,9 +1,9 @@
-package miscutil.core.intermod.thermalfoundation.block;
+package miscutil.core.xmod.thermalfoundation.block;
 
 import java.util.Random;
 
-import miscutil.core.intermod.thermalfoundation.fluid.TF_Fluids;
 import miscutil.core.lib.CORE;
+import miscutil.core.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/core/intermod/thermalfoundation/block/TF_Block_Fluid_Pyrotheum.java b/src/Java/miscutil/core/xmod/thermalfoundation/block/TF_Block_Fluid_Pyrotheum.java
index cb6f432262..2b3234f511 100644
--- a/src/Java/miscutil/core/intermod/thermalfoundation/block/TF_Block_Fluid_Pyrotheum.java
+++ b/src/Java/miscutil/core/xmod/thermalfoundation/block/TF_Block_Fluid_Pyrotheum.java
@@ -1,9 +1,9 @@
-package miscutil.core.intermod.thermalfoundation.block;
+package miscutil.core.xmod.thermalfoundation.block;
 
 import java.util.Random;
 
-import miscutil.core.intermod.thermalfoundation.fluid.TF_Fluids;
 import miscutil.core.lib.CORE;
+import miscutil.core.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/core/intermod/thermalfoundation/block/TF_Blocks.java b/src/Java/miscutil/core/xmod/thermalfoundation/block/TF_Blocks.java
index 4dadc4b688..68c893170f 100644
--- a/src/Java/miscutil/core/intermod/thermalfoundation/block/TF_Blocks.java
+++ b/src/Java/miscutil/core/xmod/thermalfoundation/block/TF_Blocks.java
@@ -1,4 +1,4 @@
-package miscutil.core.intermod.thermalfoundation.block;
+package miscutil.core.xmod.thermalfoundation.block;
 
 import cofh.core.fluid.BlockFluidCoFHBase;
 
diff --git a/src/Java/miscutil/core/intermod/thermalfoundation/fluid/TF_Fluids.java b/src/Java/miscutil/core/xmod/thermalfoundation/fluid/TF_Fluids.java
index 214f592558..db73b110c8 100644
--- a/src/Java/miscutil/core/intermod/thermalfoundation/fluid/TF_Fluids.java
+++ b/src/Java/miscutil/core/xmod/thermalfoundation/fluid/TF_Fluids.java
@@ -1,6 +1,6 @@
-package miscutil.core.intermod.thermalfoundation.fluid;
+package miscutil.core.xmod.thermalfoundation.fluid;
 
-import miscutil.core.intermod.thermalfoundation.item.TF_Items;
+import miscutil.core.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/core/intermod/thermalfoundation/item/TF_Items.java b/src/Java/miscutil/core/xmod/thermalfoundation/item/TF_Items.java
index 257bc29113..99febd00db 100644
--- a/src/Java/miscutil/core/intermod/thermalfoundation/item/TF_Items.java
+++ b/src/Java/miscutil/core/xmod/thermalfoundation/item/TF_Items.java
@@ -1,9 +1,9 @@
-package miscutil.core.intermod.thermalfoundation.item;
+package miscutil.core.xmod.thermalfoundation.item;
 
 import miscutil.core.creative.AddToCreativeTab;
-import miscutil.core.intermod.thermalfoundation.block.TF_Blocks;
-import miscutil.core.intermod.thermalfoundation.fluid.TF_Fluids;
 import miscutil.core.util.item.UtilsItems;
+import miscutil.core.xmod.thermalfoundation.block.TF_Blocks;
+import miscutil.core.xmod.thermalfoundation.fluid.TF_Fluids;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidContainerRegistry;
diff --git a/src/Java/miscutil/core/intermod/thermalfoundation/recipe/TF_Gregtech_Recipes.java b/src/Java/miscutil/core/xmod/thermalfoundation/recipe/TF_Gregtech_Recipes.java
index deb513d770..dc35a59927 100644
--- a/src/Java/miscutil/core/intermod/thermalfoundation/recipe/TF_Gregtech_Recipes.java
+++ b/src/Java/miscutil/core/xmod/thermalfoundation/recipe/TF_Gregtech_Recipes.java
@@ -1,13 +1,13 @@
-package miscutil.core.intermod.thermalfoundation.recipe;
+package miscutil.core.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.intermod.thermalfoundation.item.TF_Items;
 import miscutil.core.util.Utils;
 import miscutil.core.util.item.UtilsItems;
+import miscutil.core.xmod.thermalfoundation.item.TF_Items;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidRegistry;
@@ -26,15 +26,16 @@ public class TF_Gregtech_Recipes {
 		ItemStack dust_Blizz = TF_Items.itemDustBlizz.copy();
 		ItemStack dust_Blizz3 = UtilsItems.simpleMetaStack(TF_Items.itemMaterial, 2, 3);
 		ItemStack rod_Blizz = TF_Items.itemRodBlizz.copy();	
+		FluidStack moltenRedstone = getFluidStack("molten.redstone", 250);
 
 		//Gelid Cryotheum
 		Utils.LOG_INFO("Adding Recipes for Gelid Cryotheum");
-		GT_Values.RA.addFluidExtractionRecipe(dust_Cryotheum, GT_Values.NI, getFluidStack("cryotheum", 250), 10000, 240, 2);
-		GT_Values.RA.addChemicalBathRecipe((GT_OreDictUnificator.get(OrePrefixes.ore, Materials.Cinnabar, 1L)), getFluidStack("cryotheum", 200), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cinnabar, 2L), GT_Values.NI, GT_Values.NI, null, 400, 2);
+		GT_Values.RA.addFluidExtractionRecipe(dust_Cryotheum, GT_Values.NI, getFluidStack("cryotheum", 250), 10000, 200, 240);
+		GT_Values.RA.addChemicalBathRecipe((GT_OreDictUnificator.get(OrePrefixes.ore, Materials.Cinnabar, 1L)), getFluidStack("cryotheum", 200), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cinnabar, 3L), GT_Values.NI, GT_Values.NI, null, 400, 30);
 
 		//Blizz Powder
 		Utils.LOG_INFO("Adding Recipes for Blizz Powder");
-		GT_Values.RA.addChemicalBathRecipe(new ItemStack(Items.snowball, 1), getFluidStack("molten.redstone", 200), dust_Blizz, GT_Values.NI, GT_Values.NI, null, 400, 2);
+		GT_Values.RA.addChemicalBathRecipe(new ItemStack(Items.snowball, 4), moltenRedstone, dust_Blizz, GT_Values.NI, GT_Values.NI, null, 400, 240);
 
 		//Blizz Rod
 		Utils.LOG_INFO("Adding Recipes for Blizz Rod");
@@ -43,7 +44,7 @@ public class TF_Gregtech_Recipes {
 
 		//Blazing Pyrotheum
 		Utils.LOG_INFO("Adding Recipes for Blazing Pyrotheum");	
-		GT_Values.RA.addFluidExtractionRecipe(dust_Pyrotheum, GT_Values.NI, getFluidStack("pyrotheum", 250), 10000, 240, 2);	
+		GT_Values.RA.addFluidExtractionRecipe(dust_Pyrotheum, GT_Values.NI, getFluidStack("pyrotheum", 250), 10000, 200, 240);	
 
 	}