180 files changed, 1451 insertions, 362 deletions

diff --git a/src/Java/miscutil/MiscUtils.java b/src/Java/miscutil/MiscUtils.java
index a3a6ec16de..49cd448dc5 100644
--- a/src/Java/miscutil/MiscUtils.java
+++ b/src/Java/miscutil/MiscUtils.java
@@ -21,7 +21,7 @@ import miscutil.core.handler.events.LoginEventHandler;
 import miscutil.core.item.general.RF2EU_Battery;
 import miscutil.core.lib.CORE;
 import miscutil.core.util.Utils;
-import miscutil.core.xmod.gregtech.HANDLER_GT;
+import miscutil.xmod.gregtech.HANDLER_GT;
 import net.minecraftforge.client.event.RenderWorldLastEvent;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.config.Configuration;
diff --git a/src/Java/miscutil/core/block/ModBlocks.java b/src/Java/miscutil/core/block/ModBlocks.java
index a59ba21bc7..ce4ad6c19e 100644
--- a/src/Java/miscutil/core/block/ModBlocks.java
+++ b/src/Java/miscutil/core/block/ModBlocks.java
@@ -5,7 +5,7 @@ import miscutil.core.block.general.LightGlass;
 import miscutil.core.block.general.fluids.FluidRegistryHandler;
 import miscutil.core.lib.CORE;
 import miscutil.core.util.Utils;
-import miscutil.core.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks;
+import miscutil.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 6bad498027..eec65c0bb3 100644
--- a/src/Java/miscutil/core/common/CommonProxy.java
+++ b/src/Java/miscutil/core/common/CommonProxy.java
@@ -18,7 +18,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.core.xmod.gregtech.common.Meta_GT_Proxy;
+import miscutil.xmod.gregtech.common.Meta_GT_Proxy;
 import net.minecraft.entity.Entity;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.MinecraftForge;
diff --git a/src/Java/miscutil/core/handler/COMPAT_IntermodStaging.java b/src/Java/miscutil/core/handler/COMPAT_IntermodStaging.java
index 12cb385604..b9bb097ba4 100644
--- a/src/Java/miscutil/core/handler/COMPAT_IntermodStaging.java
+++ b/src/Java/miscutil/core/handler/COMPAT_IntermodStaging.java
@@ -1,11 +1,11 @@
 package miscutil.core.handler;
 
-import miscutil.core.xmod.forestry.HANDLER_FR;
-import miscutil.core.xmod.gregtech.HANDLER_GT;
-import miscutil.core.xmod.growthcraft.HANDLER_GC;
-import miscutil.core.xmod.ic2.HANDLER_IC2;
-import miscutil.core.xmod.psychedelicraft.HANDLER_Psych;
-import miscutil.core.xmod.thermalfoundation.HANDLER_TF;
+import miscutil.xmod.forestry.HANDLER_FR;
+import miscutil.xmod.gregtech.HANDLER_GT;
+import miscutil.xmod.growthcraft.HANDLER_GC;
+import miscutil.xmod.ic2.HANDLER_IC2;
+import miscutil.xmod.psychedelicraft.HANDLER_Psych;
+import miscutil.xmod.thermalfoundation.HANDLER_TF;
 
 public class COMPAT_IntermodStaging {
 
diff --git a/src/Java/miscutil/core/handler/GuiHandler.java b/src/Java/miscutil/core/handler/GuiHandler.java
index a1a1ef98c1..b617ef645f 100644
--- a/src/Java/miscutil/core/handler/GuiHandler.java
+++ b/src/Java/miscutil/core/handler/GuiHandler.java
@@ -1,17 +1,17 @@
 package miscutil.core.handler;
 
 import miscutil.MiscUtils;
-import miscutil.core.container.Container_Charger;
 import miscutil.core.gui.beta.Gui_ID_Registry;
 import miscutil.core.gui.beta.MU_GuiId;
-import miscutil.core.gui.machine.GUI_Charger;
 import miscutil.core.interfaces.IGuiManager;
 import miscutil.core.lib.CORE;
-import miscutil.core.tileentities.machines.TileEntityCharger;
 import miscutil.core.util.Utils;
-import miscutil.core.xmod.forestry.bees.alveary.TileAlvearyFrameHousing;
-import miscutil.core.xmod.forestry.bees.alveary.gui.CONTAINER_FrameHousing;
-import miscutil.core.xmod.forestry.bees.alveary.gui.GUI_FrameHousing;
+import miscutil.xmod.forestry.bees.alveary.TileAlvearyFrameHousing;
+import miscutil.xmod.forestry.bees.alveary.gui.CONTAINER_FrameHousing;
+import miscutil.xmod.forestry.bees.alveary.gui.GUI_FrameHousing;
+import miscutil.xmod.ic2.block.RTGGenerator.TileEntityRTG;
+import miscutil.xmod.ic2.block.RTGGenerator.gui.CONTAINER_RadioThermalGenerator;
+import miscutil.xmod.ic2.block.RTGGenerator.gui.GUI_RadioThermalGenerator;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ChunkCoordinates;
@@ -21,8 +21,8 @@ import cpw.mods.fml.common.network.NetworkRegistry;
 
 public class GuiHandler implements IGuiHandler {
 
-	private static final int GUI1 = 0;      //Nuclear Helium Gen.
-	private static final int GUI2 = 1;      //Energy Charger
+	private static final int GUI1 = 0;      //Frame Alveary
+	private static final int GUI2 = 1;      //RTG
 
 
 	public static void init(){ 	
@@ -45,7 +45,7 @@ public class GuiHandler implements IGuiHandler {
 				}
 			}
 			else if (ID == GUI2){
-				return new Container_Charger((TileEntityCharger)te, player);
+				return new CONTAINER_RadioThermalGenerator((TileEntityRTG)te, player);
 			}
 
 
@@ -66,8 +66,8 @@ public class GuiHandler implements IGuiHandler {
 				}
 			}
 			else  if (ID == GUI2){
-				Utils.LOG_WARNING("Opening Gui with Id: "+ID+" Charger");
-				return new GUI_Charger((TileEntityCharger) te, player);
+				Utils.LOG_WARNING("Opening Gui with Id: "+ID+" RTG");
+				return new GUI_RadioThermalGenerator((TileEntityRTG) te, player);
 			}
 		}
 		return null;
diff --git a/src/Java/miscutil/core/handler/events/PickaxeBlockBreakEventHandler.java b/src/Java/miscutil/core/handler/events/PickaxeBlockBreakEventHandler.java
index dff067d9c7..ddf6372fed 100644
--- a/src/Java/miscutil/core/handler/events/PickaxeBlockBreakEventHandler.java
+++ b/src/Java/miscutil/core/handler/events/PickaxeBlockBreakEventHandler.java
@@ -8,7 +8,7 @@ import gregtech.api.metatileentity.BaseTileEntity;
 import java.util.UUID;
 
 import miscutil.core.util.Utils;
-import miscutil.core.xmod.gregtech.api.metatileentity.implementations.base.machines.GregtechMetaSafeBlockBase;
+import miscutil.xmod.gregtech.api.metatileentity.implementations.base.machines.GregtechMetaSafeBlockBase;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
diff --git a/src/Java/miscutil/core/handler/events/UnbreakableBlockManager.java b/src/Java/miscutil/core/handler/events/UnbreakableBlockManager.java
index 4309079d31..14d3d6b177 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.core.xmod.gregtech.api.metatileentity.implementations.GregtechMetaSafeBlock;
+import miscutil.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/GregtechConduits.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechConduits.java
index ed65802d0d..e10780a11d 100644
--- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechConduits.java
+++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechConduits.java
@@ -7,10 +7,10 @@ import gregtech.api.enums.OrePrefixes;
 import gregtech.api.util.GT_OreDictUnificator;
 import miscutil.core.lib.LoadedMods;
 import miscutil.core.util.Utils;
-import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes;
-import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
-import miscutil.core.xmod.gregtech.api.metatileentity.implementations.GregtechMetaPipeEntity_Cable;
-import miscutil.core.xmod.gregtech.api.metatileentity.implementations.GregtechMetaPipeEntity_SuperConductor;
+import miscutil.xmod.gregtech.api.enums.GregtechOrePrefixes;
+import miscutil.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
+import miscutil.xmod.gregtech.api.metatileentity.implementations.GregtechMetaPipeEntity_Cable;
+import miscutil.xmod.gregtech.api.metatileentity.implementations.GregtechMetaPipeEntity_SuperConductor;
 import net.minecraft.item.ItemStack;
 
 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 8766afc097..21e74c1614 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.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;
+import miscutil.xmod.gregtech.api.enums.GregtechItemList;
+import miscutil.xmod.gregtech.api.enums.GregtechOreDictNames;
+import miscutil.xmod.gregtech.api.metatileentity.implementations.GregtechMetaEnergyBuffer;
+import miscutil.xmod.gregtech.api.metatileentity.implementations.creative.GregtechMetaCreativeEnergyBuffer;
 
 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 9475b213f2..6e0324966f 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.core.xmod.gregtech.api.enums.GregtechItemList;
-import miscutil.core.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialCentrifuge;
+import miscutil.xmod.gregtech.api.enums.GregtechItemList;
+import miscutil.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 208fb7883f..bd3d9f4d89 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.core.xmod.gregtech.api.enums.GregtechItemList;
-import miscutil.core.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialCokeOven;
+import miscutil.xmod.gregtech.api.enums.GregtechItemList;
+import miscutil.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialCokeOven;
 
 public class GregtechIndustrialCokeOven
 {
diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialElectrolyzer.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialElectrolyzer.java
index 98386cf4b0..c4ad9c122b 100644
--- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialElectrolyzer.java
+++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialElectrolyzer.java
@@ -1,8 +1,8 @@
 package miscutil.core.handler.registration.gregtech;
 
 import miscutil.core.util.Utils;
-import miscutil.core.xmod.gregtech.api.enums.GregtechItemList;
-import miscutil.core.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialElectrolyzer;
+import miscutil.xmod.gregtech.api.enums.GregtechItemList;
+import miscutil.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialElectrolyzer;
 
 public class GregtechIndustrialElectrolyzer
 {
diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialMacerator.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialMacerator.java
index ccd81e6dd2..fa3663fb81 100644
--- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialMacerator.java
+++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialMacerator.java
@@ -1,8 +1,8 @@
 package miscutil.core.handler.registration.gregtech;
 
 import miscutil.core.util.Utils;
-import miscutil.core.xmod.gregtech.api.enums.GregtechItemList;
-import miscutil.core.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialMacerator;
+import miscutil.xmod.gregtech.api.enums.GregtechItemList;
+import miscutil.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialMacerator;
 
 public class GregtechIndustrialMacerator
 {
diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialMassFabricator.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialMassFabricator.java
index 72bf99b6b5..cbb4be3115 100644
--- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialMassFabricator.java
+++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialMassFabricator.java
@@ -1,8 +1,8 @@
 package miscutil.core.handler.registration.gregtech;
 
 import miscutil.core.util.Utils;
-import miscutil.core.xmod.gregtech.api.enums.GregtechItemList;
-import miscutil.core.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityMassFabricator;
+import miscutil.xmod.gregtech.api.enums.GregtechItemList;
+import miscutil.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityMassFabricator;
 
 public class GregtechIndustrialMassFabricator
 {
diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialPlatePress.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialPlatePress.java
index 87364565ea..4e25ff3475 100644
--- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialPlatePress.java
+++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialPlatePress.java
@@ -1,8 +1,8 @@
 package miscutil.core.handler.registration.gregtech;
 
 import miscutil.core.util.Utils;
-import miscutil.core.xmod.gregtech.api.enums.GregtechItemList;
-import miscutil.core.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialPlatePress;
+import miscutil.xmod.gregtech.api.enums.GregtechItemList;
+import miscutil.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialPlatePress;
 
 public class GregtechIndustrialPlatePress
 {
diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialSinter.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialSinter.java
index 0c0ffb8cbd..03ad7cce7f 100644
--- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialSinter.java
+++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialSinter.java
@@ -1,8 +1,8 @@
 package miscutil.core.handler.registration.gregtech;
 
 import miscutil.core.util.Utils;
-import miscutil.core.xmod.gregtech.api.enums.GregtechItemList;
-import miscutil.core.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialSinter;
+import miscutil.xmod.gregtech.api.enums.GregtechItemList;
+import miscutil.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialSinter;
 
 public class GregtechIndustrialSinter{
 
diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialWiremill.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialWiremill.java
index d5ba679edb..5672775a56 100644
--- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialWiremill.java
+++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialWiremill.java
@@ -1,8 +1,8 @@
 package miscutil.core.handler.registration.gregtech;
 
 import miscutil.core.util.Utils;
-import miscutil.core.xmod.gregtech.api.enums.GregtechItemList;
-import miscutil.core.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialWireMill;
+import miscutil.xmod.gregtech.api.enums.GregtechItemList;
+import miscutil.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialWireMill;
 
 public class GregtechIndustrialWiremill
 {
diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIronBlastFurnace.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIronBlastFurnace.java
index 8dea539053..d5271181f9 100644
--- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIronBlastFurnace.java
+++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIronBlastFurnace.java
@@ -1,8 +1,8 @@
 package miscutil.core.handler.registration.gregtech;
 
 import miscutil.core.util.Utils;
-import miscutil.core.xmod.gregtech.api.enums.GregtechItemList;
-import miscutil.core.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIronBlastFurnace;
+import miscutil.xmod.gregtech.api.enums.GregtechItemList;
+import miscutil.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIronBlastFurnace;
 
 public class GregtechIronBlastFurnace
 {
diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechRocketFuelGenerator.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechRocketFuelGenerator.java
index 01cf22e8b1..3a61884782 100644
--- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechRocketFuelGenerator.java
+++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechRocketFuelGenerator.java
@@ -2,8 +2,8 @@ package miscutil.core.handler.registration.gregtech;
 
 import miscutil.core.lib.LoadedMods;
 import miscutil.core.util.Utils;
-import miscutil.core.xmod.gregtech.api.enums.GregtechItemList;
-import miscutil.core.xmod.gregtech.common.tileentities.generators.GregtechMetaTileEntityRocketFuelGenerator;
+import miscutil.xmod.gregtech.api.enums.GregtechItemList;
+import miscutil.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 99bb28e8c7..5def5e1a92 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.core.xmod.gregtech.api.enums.GregtechItemList;
-import miscutil.core.xmod.gregtech.api.metatileentity.implementations.GregtechMetaSafeBlock;
+import miscutil.xmod.gregtech.api.enums.GregtechItemList;
+import miscutil.xmod.gregtech.api.metatileentity.implementations.GregtechMetaSafeBlock;
 
 public class GregtechSafeBlock
 {
diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechSolarGenerators.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechSolarGenerators.java
index e4d9a36fe1..3c58d69209 100644
--- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechSolarGenerators.java
+++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechSolarGenerators.java
@@ -3,8 +3,8 @@ package miscutil.core.handler.registration.gregtech;
 import miscutil.core.lib.CORE.configSwitches;
 import miscutil.core.lib.LoadedMods;
 import miscutil.core.util.Utils;
-import miscutil.core.xmod.gregtech.api.enums.GregtechItemList;
-import miscutil.core.xmod.gregtech.common.tileentities.generators.GregtechMetaTileEntitySolarGenerator;
+import miscutil.xmod.gregtech.api.enums.GregtechItemList;
+import miscutil.xmod.gregtech.common.tileentities.generators.GregtechMetaTileEntitySolarGenerator;
 
 public class GregtechSolarGenerators
 {
diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechSteamCondenser.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechSteamCondenser.java
index 64c386dec0..7cd222205d 100644
--- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechSteamCondenser.java
+++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechSteamCondenser.java
@@ -1,8 +1,8 @@
 package miscutil.core.handler.registration.gregtech;
 
 import miscutil.core.util.Utils;
-import miscutil.core.xmod.gregtech.api.enums.GregtechItemList;
-import miscutil.core.xmod.gregtech.api.metatileentity.implementations.GregtechMetaCondensor;
+import miscutil.xmod.gregtech.api.enums.GregtechItemList;
+import miscutil.xmod.gregtech.api.metatileentity.implementations.GregtechMetaCondensor;
 
 public class GregtechSteamCondenser
 {
diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechSuperConductionPoint.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechSuperConductionPoint.java
index b7f5fb6157..d18a9ed3c3 100644
--- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechSuperConductionPoint.java
+++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechSuperConductionPoint.java
@@ -1,8 +1,8 @@
 package miscutil.core.handler.registration.gregtech;
 
 import miscutil.core.util.Utils;
-import miscutil.core.xmod.gregtech.api.enums.GregtechItemList;
-import miscutil.core.xmod.gregtech.common.tileentities.generators.GregtechMetaTileEntitySuperCondensor;
+import miscutil.xmod.gregtech.api.enums.GregtechItemList;
+import miscutil.xmod.gregtech.common.tileentities.generators.GregtechMetaTileEntitySuperCondensor;
 
 public class GregtechSuperConductionPoint
 {
diff --git a/src/Java/miscutil/core/item/ModItems.java b/src/Java/miscutil/core/item/ModItems.java
index 7406c3eca6..ef5dc581a7 100644
--- a/src/Java/miscutil/core/item/ModItems.java
+++ b/src/Java/miscutil/core/item/ModItems.java
@@ -166,6 +166,7 @@ public final class ModItems {
 	
 	public static Item RfEuBattery;
 	public static Item itemPersonalCloakingDevice;
+	public static Item itemPersonalCloakingDeviceCharged;
 	public static Item itemPersonalHealingDevice;
 
 
@@ -350,7 +351,8 @@ public final class ModItems {
 			FuelRod_Uranium = new FuelRod_Base("itemFuelRod_Uranium", "Uranium", 2500, 2500);
 			FuelRod_Plutonium = new FuelRod_Base("itemFuelRod_Plutonium", "Plutonium", 5000, 5000);
 			RfEuBattery = new RF2EU_Battery();
-			itemPersonalCloakingDevice = new ItemCloakingDevice();
+			itemPersonalCloakingDevice = new ItemCloakingDevice(0);
+			//itemPersonalCloakingDeviceCharged = new ItemCloakingDevice(0).set;
 			itemPersonalHealingDevice = new ItemHealingDevice();
 			//Registry
 			//GameRegistry.registerItem(FuelRod_Empty, "itemFuelRod_Empty");
diff --git a/src/Java/miscutil/core/item/general/ItemCloakingDevice.java b/src/Java/miscutil/core/item/general/ItemCloakingDevice.java
index b54bb08a87..afd2fc5c58 100644
--- a/src/Java/miscutil/core/item/general/ItemCloakingDevice.java
+++ b/src/Java/miscutil/core/item/general/ItemCloakingDevice.java
@@ -27,16 +27,21 @@ public class ItemCloakingDevice extends Item implements IElectricItem, IElectric
 
 	private final String unlocalizedName = "personalCloakingDevice";
 	private final ItemStack thisStack;
-	private final static int maxValueEU = 8196*20*5*60;
+	private final static int maxValueEU = 10000*20*500;
 	protected double chargeEU = 0;
 
-	public ItemCloakingDevice(){
+	public ItemCloakingDevice(double charge){
+		this.chargeEU = charge;
 		this.setCreativeTab(AddToCreativeTab.tabMachines);
 		this.setUnlocalizedName(unlocalizedName);
 		this.setMaxStackSize(1);
 		this.setTextureName(CORE.MODID + ":" + "personalCloakingDevice");
 		this.thisStack = UtilsItems.getSimpleStack(this);
-		GameRegistry.registerItem(this, unlocalizedName);
+		this.charge(thisStack, charge, 3, true, false);
+		if (charge == 10000*20*500){
+			this.setDamage(thisStack, 13);	
+		}
+		GameRegistry.registerItem(this, unlocalizedName+"-"+charge);
 	}
 
 	@Override
@@ -119,7 +124,7 @@ public class ItemCloakingDevice extends Item implements IElectricItem, IElectric
 	
 	public int secondsLeft(ItemStack stack){
 		double r = 0;
-		r = getCharge(stack)/(8196*20);
+		r = getCharge(stack)/(10000*20);
 		return (int) MathUtils.decimalRounding(r);
 	}
 
@@ -127,10 +132,10 @@ public class ItemCloakingDevice extends Item implements IElectricItem, IElectric
 	public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) {				
 		list.add("");				
 		list.add(EnumChatFormatting.GREEN+"Worn as a Belt within Baubles."+EnumChatFormatting.GRAY);	
-		list.add(EnumChatFormatting.GREEN+"Drains 8196Eu/t to provide invisibility."+EnumChatFormatting.GRAY);			
+		list.add(EnumChatFormatting.GREEN+"Drains 10,000Eu/t to provide invisibility."+EnumChatFormatting.GRAY);			
 		list.add("");			
 		list.add(EnumChatFormatting.GOLD+"IC2/EU Information"+EnumChatFormatting.GRAY);	
-		list.add(EnumChatFormatting.GRAY+"Tier: ["+EnumChatFormatting.YELLOW+getTier(thisStack)+EnumChatFormatting.GRAY+"] Transfer Limit: ["+EnumChatFormatting.YELLOW+getTransferLimit(thisStack)+EnumChatFormatting.GRAY +"Eu/t]");
+		list.add(EnumChatFormatting.GRAY+"Tier: ["+EnumChatFormatting.YELLOW+getTier(thisStack)+EnumChatFormatting.GRAY+"] Input Limit: ["+EnumChatFormatting.YELLOW+getTransferLimit(thisStack)+EnumChatFormatting.GRAY +"Eu/t]");
 		list.add(EnumChatFormatting.GRAY+"Current Power: ["+EnumChatFormatting.YELLOW+(long) getCharge(stack)+EnumChatFormatting.GRAY+"Eu] ["+EnumChatFormatting.YELLOW+MathUtils.findPercentage(getCharge(stack), getMaxCharge(stack))+EnumChatFormatting.GRAY +"%]");
 		list.add(EnumChatFormatting.GRAY+"Time Remaining: ["+EnumChatFormatting.YELLOW+secondsLeft(stack)+ EnumChatFormatting.GRAY +" seconds]");
 		super.addInformation(stack, aPlayer, list, bool);
@@ -236,9 +241,9 @@ public class ItemCloakingDevice extends Item implements IElectricItem, IElectric
 	public void onWornTick(ItemStack arg0, EntityLivingBase arg1) {
 		//Utils.LOG_INFO("Trying to Tick Belt. 1");
 		if (!arg1.worldObj.isRemote){
-			if (getCharge(arg0) >= 2048){
+			if (getCharge(arg0) >= 10000){
 				arg1.addPotionEffect(new PotionEffect(Potion.invisibility.id, 10, 2));
-				discharge(arg0, 2048, 5, true, true, false);
+				discharge(arg0, 10000, 5, true, true, false);
 			}
 			else {
 				if (arg1.isPotionActive((Potion.invisibility))){
diff --git a/src/Java/miscutil/core/lib/CORE.java b/src/Java/miscutil/core/lib/CORE.java
index a02da08339..057d0f030a 100644
--- a/src/Java/miscutil/core/lib/CORE.java
+++ b/src/Java/miscutil/core/lib/CORE.java
@@ -5,9 +5,9 @@ import java.util.List;
 import java.util.Map;
 
 import miscutil.core.creative.AddToCreativeTab;
-import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
-import miscutil.core.xmod.gregtech.api.interfaces.internal.IGregtech_RecipeAdder;
-import miscutil.core.xmod.gregtech.common.Meta_GT_Proxy;
+import miscutil.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
+import miscutil.xmod.gregtech.api.interfaces.internal.IGregtech_RecipeAdder;
+import miscutil.xmod.gregtech.common.Meta_GT_Proxy;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraftforge.common.config.Configuration;
@@ -18,8 +18,8 @@ public class CORE {
 
 	public static final String name = "GT++";	
 	public static final String MODID = "miscutils";
-	public static final String VERSION = "1.4.3.9-release";
-	public static boolean DEBUG = true;	
+	public static final String VERSION = "1.4.3.11-release";
+	public static boolean DEBUG = false;	
 	public static final boolean LOAD_ALL_CONTENT = false;
 	public static final int GREG_FIRST_ID = 760;
 	public static Map PlayerCache;
diff --git a/src/Java/miscutil/core/lib/LoadedMods.java b/src/Java/miscutil/core/lib/LoadedMods.java
index 6b25b197fe..d79f727560 100644
--- a/src/Java/miscutil/core/lib/LoadedMods.java
+++ b/src/Java/miscutil/core/lib/LoadedMods.java
@@ -2,8 +2,8 @@ package miscutil.core.lib;
 
 import miscutil.core.lib.CORE.configSwitches;
 import miscutil.core.util.Utils;
-import miscutil.core.xmod.gregtech.api.enums.GregtechTextures;
-import miscutil.core.xmod.gregtech.recipes.GregtechRecipeAdder;
+import miscutil.xmod.gregtech.api.enums.GregtechTextures;
+import miscutil.xmod.gregtech.recipes.GregtechRecipeAdder;
 import cpw.mods.fml.common.Loader;
 
 public class LoadedMods {
diff --git a/src/Java/miscutil/core/recipe/RECIPES_GREGTECH.java b/src/Java/miscutil/core/recipe/RECIPES_GREGTECH.java
index e27963150a..724c0a2cac 100644
--- a/src/Java/miscutil/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/miscutil/core/recipe/RECIPES_GREGTECH.java
@@ -10,7 +10,7 @@ import miscutil.core.lib.CORE;
 import miscutil.core.util.Utils;
 import miscutil.core.util.fluid.FluidUtils;
 import miscutil.core.util.item.UtilsItems;
-import miscutil.core.xmod.gregtech.api.enums.GregtechItemList;
+import miscutil.xmod.gregtech.api.enums.GregtechItemList;
 
 public class RECIPES_GREGTECH {
 
diff --git a/src/Java/miscutil/core/recipe/RECIPES_LaserEngraver.java b/src/Java/miscutil/core/recipe/RECIPES_LaserEngraver.java
index 8570a0d1b1..ba53337de3 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.core.xmod.gregtech.api.enums.GregtechItemList;
+import miscutil.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 4625263eee..9f9716fbbb 100644
--- a/src/Java/miscutil/core/recipe/RECIPES_MachineComponents.java
+++ b/src/Java/miscutil/core/recipe/RECIPES_MachineComponents.java
@@ -9,7 +9,7 @@ import gregtech.api.util.GT_OreDictUnificator;
 import miscutil.core.lib.CORE;
 import miscutil.core.util.Utils;
 import miscutil.core.util.recipe.UtilsRecipe;
-import miscutil.core.xmod.gregtech.api.enums.GregtechItemList;
+import miscutil.xmod.gregtech.api.enums.GregtechItemList;
 
 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 dc1f3caabc..55584cf2ac 100644
--- a/src/Java/miscutil/core/recipe/RECIPES_Machines.java
+++ b/src/Java/miscutil/core/recipe/RECIPES_Machines.java
@@ -6,9 +6,9 @@ import miscutil.core.lib.LoadedMods;
 import miscutil.core.util.Utils;
 import miscutil.core.util.item.UtilsItems;
 import miscutil.core.util.recipe.UtilsRecipe;
-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.xmod.gregtech.api.enums.GregtechItemList;
+import miscutil.xmod.gregtech.api.enums.GregtechOrePrefixes;
+import miscutil.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
 import net.minecraft.item.ItemStack;
 
 public class RECIPES_Machines {
diff --git a/src/Java/miscutil/core/recipe/RECIPE_Batteries.java b/src/Java/miscutil/core/recipe/RECIPE_Batteries.java
index 9764e4d590..fcd3993745 100644
--- a/src/Java/miscutil/core/recipe/RECIPE_Batteries.java
+++ b/src/Java/miscutil/core/recipe/RECIPE_Batteries.java
@@ -4,7 +4,7 @@ import gregtech.api.enums.ItemList;
 import miscutil.core.lib.LoadedMods;
 import miscutil.core.util.item.UtilsItems;
 import miscutil.core.util.recipe.UtilsRecipe;
-import miscutil.core.xmod.gregtech.api.enums.GregtechItemList;
+import miscutil.xmod.gregtech.api.enums.GregtechItemList;
 import net.minecraft.item.ItemStack;
 
 public class RECIPE_Batteries {
diff --git a/src/Java/miscutil/core/recipe/RECIPE_CONSTANTS.java b/src/Java/miscutil/core/recipe/RECIPE_CONSTANTS.java
index 9bb1b24bd8..569cd8cf15 100644
--- a/src/Java/miscutil/core/recipe/RECIPE_CONSTANTS.java
+++ b/src/Java/miscutil/core/recipe/RECIPE_CONSTANTS.java
@@ -2,7 +2,7 @@ package miscutil.core.recipe;
 
 import miscutil.core.lib.CORE;
 import miscutil.core.util.item.UtilsItems;
-import miscutil.core.xmod.gregtech.api.enums.GregtechItemList;
+import miscutil.xmod.gregtech.api.enums.GregtechItemList;
 import net.minecraft.item.ItemStack;
 
 public class RECIPE_CONSTANTS {
diff --git a/src/Java/miscutil/core/slots/SlotRTG.java b/src/Java/miscutil/core/slots/SlotRTG.java
new file mode 100644
index 0000000000..b653cc62d1
--- /dev/null
+++ b/src/Java/miscutil/core/slots/SlotRTG.java
@@ -0,0 +1,25 @@
+package miscutil.core.slots;
+
+import ic2.core.Ic2Items;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
+
+public class SlotRTG extends Slot{
+
+	public SlotRTG(IInventory inventory, int x, int y, int z) {
+		super(inventory, x, y, z);
+
+	}
+
+	@Override
+	public boolean isItemValid(ItemStack itemstack) {
+		return itemstack.getItem().getClass() == Ic2Items.RTGPellets.getItem().getClass();
+	}
+
+	@Override
+	public int getSlotStackLimit() {
+		return 1;
+	}
+
+}
diff --git a/src/Java/miscutil/core/xmod/forestry/HANDLER_FR.java b/src/Java/miscutil/xmod/forestry/HANDLER_FR.java
index 8f5426e1fa..2d204bc269 100644
--- a/src/Java/miscutil/core/xmod/forestry/HANDLER_FR.java
+++ b/src/Java/miscutil/xmod/forestry/HANDLER_FR.java
@@ -1,10 +1,10 @@
-package miscutil.core.xmod.forestry;
+package miscutil.xmod.forestry;
 
 import miscutil.core.lib.CORE;
 import miscutil.core.lib.LoadedMods;
-import miscutil.core.xmod.forestry.bees.alveary.TileAlvearyFrameHousing;
-import miscutil.core.xmod.forestry.bees.items.FR_ItemRegistry;
-import miscutil.core.xmod.forestry.bees.recipe.FR_Gregtech_Recipes;
+import miscutil.xmod.forestry.bees.alveary.TileAlvearyFrameHousing;
+import miscutil.xmod.forestry.bees.items.FR_ItemRegistry;
+import miscutil.xmod.forestry.bees.recipe.FR_Gregtech_Recipes;
 import cpw.mods.fml.common.registry.GameRegistry;
 
 public class HANDLER_FR {
diff --git a/src/Java/miscutil/core/xmod/forestry/bees/alveary/FR_AlvearyFrameBlock.java b/src/Java/miscutil/xmod/forestry/bees/alveary/FR_AlvearyFrameBlock.java
index d8fb9827de..a123aa623d 100644
--- a/src/Java/miscutil/core/xmod/forestry/bees/alveary/FR_AlvearyFrameBlock.java
+++ b/src/Java/miscutil/xmod/forestry/bees/alveary/FR_AlvearyFrameBlock.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.forestry.bees.alveary;
+package miscutil.xmod.forestry.bees.alveary;
 
 import net.minecraft.util.ChunkCoordinates;
 
diff --git a/src/Java/miscutil/core/xmod/forestry/bees/alveary/FR_BlockAlveary.java b/src/Java/miscutil/xmod/forestry/bees/alveary/FR_BlockAlveary.java
index ff08464405..614dfcb820 100644
--- a/src/Java/miscutil/core/xmod/forestry/bees/alveary/FR_BlockAlveary.java
+++ b/src/Java/miscutil/xmod/forestry/bees/alveary/FR_BlockAlveary.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.forestry.bees.alveary;
+package miscutil.xmod.forestry.bees.alveary;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/Java/miscutil/core/xmod/forestry/bees/alveary/FR_TileAlveary.java b/src/Java/miscutil/xmod/forestry/bees/alveary/FR_TileAlveary.java
index cae1aaba5e..5c588f20ca 100644
--- a/src/Java/miscutil/core/xmod/forestry/bees/alveary/FR_TileAlveary.java
+++ b/src/Java/miscutil/xmod/forestry/bees/alveary/FR_TileAlveary.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.forestry.bees.alveary;
+package miscutil.xmod.forestry.bees.alveary;
 
 import java.io.IOException;
 import java.util.List;
diff --git a/src/Java/miscutil/core/xmod/forestry/bees/alveary/IAlvearyComponentAdvanced.java b/src/Java/miscutil/xmod/forestry/bees/alveary/IAlvearyComponentAdvanced.java
index 46b65842b1..8383f09f0f 100644
--- a/src/Java/miscutil/core/xmod/forestry/bees/alveary/IAlvearyComponentAdvanced.java
+++ b/src/Java/miscutil/xmod/forestry/bees/alveary/IAlvearyComponentAdvanced.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.forestry.bees.alveary;
+package miscutil.xmod.forestry.bees.alveary;
 
 import forestry.api.apiculture.IBeeModifier;
 import forestry.api.core.IClimateControlled;
diff --git a/src/Java/miscutil/core/xmod/forestry/bees/alveary/ISidedFrameWearingInventory.java b/src/Java/miscutil/xmod/forestry/bees/alveary/ISidedFrameWearingInventory.java
index f618e4f77b..4b4de16075 100644
--- a/src/Java/miscutil/core/xmod/forestry/bees/alveary/ISidedFrameWearingInventory.java
+++ b/src/Java/miscutil/xmod/forestry/bees/alveary/ISidedFrameWearingInventory.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.forestry.bees.alveary;
+package miscutil.xmod.forestry.bees.alveary;
 
 import net.minecraft.inventory.ISidedInventory;
 import forestry.api.apiculture.IBeeHousing;
diff --git a/src/Java/miscutil/core/xmod/forestry/bees/alveary/TileAlvearyFrameHousing.java b/src/Java/miscutil/xmod/forestry/bees/alveary/TileAlvearyFrameHousing.java
index 1500e7dcef..556b70f1f3 100644
--- a/src/Java/miscutil/core/xmod/forestry/bees/alveary/TileAlvearyFrameHousing.java
+++ b/src/Java/miscutil/xmod/forestry/bees/alveary/TileAlvearyFrameHousing.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.forestry.bees.alveary;
+package miscutil.xmod.forestry.bees.alveary;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -7,9 +7,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.Stack;
 
-import miscutil.core.xmod.forestry.bees.alveary.gui.CONTAINER_FrameHousing;
-import miscutil.core.xmod.forestry.bees.alveary.gui.GUI_FrameHousing;
-import miscutil.core.xmod.forestry.bees.alveary.gui.InventoryFrameHousing;
+import miscutil.xmod.forestry.bees.alveary.gui.CONTAINER_FrameHousing;
+import miscutil.xmod.forestry.bees.alveary.gui.GUI_FrameHousing;
+import miscutil.xmod.forestry.bees.alveary.gui.InventoryFrameHousing;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.Item;
diff --git a/src/Java/miscutil/core/xmod/forestry/bees/alveary/gui/CONTAINER_FrameHousing.java b/src/Java/miscutil/xmod/forestry/bees/alveary/gui/CONTAINER_FrameHousing.java
index 7a04b7b05e..78dc096f65 100644
--- a/src/Java/miscutil/core/xmod/forestry/bees/alveary/gui/CONTAINER_FrameHousing.java
+++ b/src/Java/miscutil/xmod/forestry/bees/alveary/gui/CONTAINER_FrameHousing.java
@@ -1,8 +1,8 @@
-package miscutil.core.xmod.forestry.bees.alveary.gui;
+package miscutil.xmod.forestry.bees.alveary.gui;
 
 import miscutil.core.lib.CORE;
 import miscutil.core.slots.SlotFrame;
-import miscutil.core.xmod.forestry.bees.alveary.TileAlvearyFrameHousing;
+import miscutil.xmod.forestry.bees.alveary.TileAlvearyFrameHousing;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
diff --git a/src/Java/miscutil/core/xmod/forestry/bees/alveary/gui/GUI_FrameHousing.java b/src/Java/miscutil/xmod/forestry/bees/alveary/gui/GUI_FrameHousing.java
index f2ab1e1e7e..35b982cd9a 100644
--- a/src/Java/miscutil/core/xmod/forestry/bees/alveary/gui/GUI_FrameHousing.java
+++ b/src/Java/miscutil/xmod/forestry/bees/alveary/gui/GUI_FrameHousing.java
@@ -1,7 +1,7 @@
-package miscutil.core.xmod.forestry.bees.alveary.gui;
+package miscutil.xmod.forestry.bees.alveary.gui;
 
 import miscutil.core.lib.CORE;
-import miscutil.core.xmod.forestry.bees.alveary.TileAlvearyFrameHousing;
+import miscutil.xmod.forestry.bees.alveary.TileAlvearyFrameHousing;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.client.resources.I18n;
diff --git a/src/Java/miscutil/core/xmod/forestry/bees/alveary/gui/InventoryFrameHousing.java b/src/Java/miscutil/xmod/forestry/bees/alveary/gui/InventoryFrameHousing.java
index b9f60efc6c..cdd3def450 100644
--- a/src/Java/miscutil/core/xmod/forestry/bees/alveary/gui/InventoryFrameHousing.java
+++ b/src/Java/miscutil/xmod/forestry/bees/alveary/gui/InventoryFrameHousing.java
@@ -1,6 +1,6 @@
-package miscutil.core.xmod.forestry.bees.alveary.gui;
+package miscutil.xmod.forestry.bees.alveary.gui;
 
-import miscutil.core.xmod.forestry.bees.alveary.TileAlvearyFrameHousing;
+import miscutil.xmod.forestry.bees.alveary.TileAlvearyFrameHousing;
 import net.minecraft.item.ItemStack;
 import forestry.api.apiculture.BeeManager;
 import forestry.core.inventory.InventoryAdapterTile;
diff --git a/src/Java/miscutil/core/xmod/forestry/bees/items/FR_ItemRegistry.java b/src/Java/miscutil/xmod/forestry/bees/items/FR_ItemRegistry.java
index 3a9a1e2040..14b49e0762 100644
--- a/src/Java/miscutil/core/xmod/forestry/bees/items/FR_ItemRegistry.java
+++ b/src/Java/miscutil/xmod/forestry/bees/items/FR_ItemRegistry.java
@@ -8,10 +8,10 @@
  * Various Contributors including, but not limited to:
  * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
  ******************************************************************************/
-package miscutil.core.xmod.forestry.bees.items;
+package miscutil.xmod.forestry.bees.items;
 import miscutil.core.lib.CORE;
 import miscutil.core.lib.LoadedMods;
-import miscutil.core.xmod.forestry.bees.alveary.FR_BlockAlveary;
+import miscutil.xmod.forestry.bees.alveary.FR_BlockAlveary;
 import net.minecraft.block.Block;
 import net.minecraft.item.EnumRarity;
 import net.minecraft.item.Item;
diff --git a/src/Java/miscutil/core/xmod/forestry/bees/items/FR_StringUtil.java b/src/Java/miscutil/xmod/forestry/bees/items/FR_StringUtil.java
index 324fd79a55..9005a927aa 100644
--- a/src/Java/miscutil/core/xmod/forestry/bees/items/FR_StringUtil.java
+++ b/src/Java/miscutil/xmod/forestry/bees/items/FR_StringUtil.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.forestry.bees.items;
+package miscutil.xmod.forestry.bees.items;
 
 import net.minecraft.util.StatCollector;
 
diff --git a/src/Java/miscutil/core/xmod/forestry/bees/items/MB_FrameType.java b/src/Java/miscutil/xmod/forestry/bees/items/MB_FrameType.java
index 40443dc566..3cf8879562 100644
--- a/src/Java/miscutil/core/xmod/forestry/bees/items/MB_FrameType.java
+++ b/src/Java/miscutil/xmod/forestry/bees/items/MB_FrameType.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.forestry.bees.items;
+package miscutil.xmod.forestry.bees.items;
 
 import forestry.api.apiculture.IBeeGenome;
 import forestry.api.apiculture.IBeeModifier;
diff --git a/src/Java/miscutil/core/xmod/forestry/bees/items/MB_ItemFrame.java b/src/Java/miscutil/xmod/forestry/bees/items/MB_ItemFrame.java
index 00aac532fd..6811228681 100644
--- a/src/Java/miscutil/core/xmod/forestry/bees/items/MB_ItemFrame.java
+++ b/src/Java/miscutil/xmod/forestry/bees/items/MB_ItemFrame.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.forestry.bees.items;
+package miscutil.xmod.forestry.bees.items;
 
 import java.util.List;
 
diff --git a/src/Java/miscutil/core/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java b/src/Java/miscutil/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java
index d707eb89ef..ff6d23fd52 100644
--- a/src/Java/miscutil/core/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java
+++ b/src/Java/miscutil/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java
@@ -1,9 +1,9 @@
-package miscutil.core.xmod.forestry.bees.recipe;
+package miscutil.xmod.forestry.bees.recipe;
 
 import miscutil.core.lib.LoadedMods;
 import miscutil.core.util.item.UtilsItems;
 import miscutil.core.util.recipe.UtilsRecipe;
-import miscutil.core.xmod.forestry.bees.items.FR_ItemRegistry;
+import miscutil.xmod.forestry.bees.items.FR_ItemRegistry;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
diff --git a/src/Java/miscutil/core/xmod/gregtech/HANDLER_GT.java b/src/Java/miscutil/xmod/gregtech/HANDLER_GT.java
index 6c3d871d33..5f5de99ad7 100644
--- a/src/Java/miscutil/core/xmod/gregtech/HANDLER_GT.java
+++ b/src/Java/miscutil/xmod/gregtech/HANDLER_GT.java
@@ -1,9 +1,9 @@
-package miscutil.core.xmod.gregtech;
+package miscutil.xmod.gregtech;
 
 import gregtech.api.util.GT_Config;
-import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
-import miscutil.core.xmod.gregtech.common.blocks.fluid.GregtechFluidHandler;
-import miscutil.core.xmod.gregtech.common.items.MetaGeneratedGregtechItems;
+import miscutil.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
+import miscutil.xmod.gregtech.common.blocks.fluid.GregtechFluidHandler;
+import miscutil.xmod.gregtech.common.items.MetaGeneratedGregtechItems;
 
 public class HANDLER_GT {
 	
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/energy/IC2ElectricItem.java b/src/Java/miscutil/xmod/gregtech/api/energy/IC2ElectricItem.java
index 24b5fa32c8..5b0db2ed33 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/energy/IC2ElectricItem.java
+++ b/src/Java/miscutil/xmod/gregtech/api/energy/IC2ElectricItem.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.api.energy;
+package miscutil.xmod.gregtech.api.energy;
 
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/energy/IC2ElectricItemManager.java b/src/Java/miscutil/xmod/gregtech/api/energy/IC2ElectricItemManager.java
index 71f31cff46..1b5c7bbab8 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/energy/IC2ElectricItemManager.java
+++ b/src/Java/miscutil/xmod/gregtech/api/energy/IC2ElectricItemManager.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.api.energy;
+package miscutil.xmod.gregtech.api.energy;
 
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.item.ItemStack;
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechItemList.java b/src/Java/miscutil/xmod/gregtech/api/enums/GregtechItemList.java
index 6f8935c51d..32e7cb157e 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechItemList.java
+++ b/src/Java/miscutil/xmod/gregtech/api/enums/GregtechItemList.java
@@ -1,10 +1,10 @@
-package miscutil.core.xmod.gregtech.api.enums;
+package miscutil.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.core.xmod.gregtech.api.interfaces.GregtechItemContainer;
+import miscutil.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/core/xmod/gregtech/api/enums/GregtechOreDictNames.java b/src/Java/miscutil/xmod/gregtech/api/enums/GregtechOreDictNames.java
index 1e338c70a7..6870f6cd87 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechOreDictNames.java
+++ b/src/Java/miscutil/xmod/gregtech/api/enums/GregtechOreDictNames.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.api.enums;
+package miscutil.xmod.gregtech.api.enums;
 
 /* Electric Components.
 *
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechOrePrefixes.java b/src/Java/miscutil/xmod/gregtech/api/enums/GregtechOrePrefixes.java
index d06a893377..739ed17af3 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechOrePrefixes.java
+++ b/src/Java/miscutil/xmod/gregtech/api/enums/GregtechOrePrefixes.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.api.enums;
+package miscutil.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.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 miscutil.xmod.gregtech.api.interfaces.internal.Interface_OreRecipeRegistrator;
+import miscutil.xmod.gregtech.api.objects.GregtechItemData;
+import miscutil.xmod.gregtech.api.objects.GregtechMaterialStack;
 import net.minecraft.enchantment.Enchantment;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.Fluid;
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechTextureSet.java b/src/Java/miscutil/xmod/gregtech/api/enums/GregtechTextureSet.java
index c5473ea958..365bdf496f 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechTextureSet.java
+++ b/src/Java/miscutil/xmod/gregtech/api/enums/GregtechTextureSet.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.api.enums;
+package miscutil.xmod.gregtech.api.enums;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechTextures.java b/src/Java/miscutil/xmod/gregtech/api/enums/GregtechTextures.java
index b11dc385f9..5866f415f7 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechTextures.java
+++ b/src/Java/miscutil/xmod/gregtech/api/enums/GregtechTextures.java
@@ -1,9 +1,9 @@
-package miscutil.core.xmod.gregtech.api.enums;
+package miscutil.xmod.gregtech.api.enums;
 
 import gregtech.api.GregTech_API;
 import miscutil.core.lib.CORE;
-import miscutil.core.xmod.gregtech.api.interfaces.internal.Interface_IconContainer;
-import miscutil.core.xmod.gregtech.api.interfaces.internal.Interface_Texture;
+import miscutil.xmod.gregtech.api.interfaces.internal.Interface_IconContainer;
+import miscutil.xmod.gregtech.api.interfaces.internal.Interface_Texture;
 import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.util.IIcon;
 import net.minecraft.util.ResourceLocation;
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechToolDictNames.java b/src/Java/miscutil/xmod/gregtech/api/enums/GregtechToolDictNames.java
index 25831f9a48..5bf7cd82d3 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechToolDictNames.java
+++ b/src/Java/miscutil/xmod/gregtech/api/enums/GregtechToolDictNames.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.api.enums;
+package miscutil.xmod.gregtech.api.enums;
 
 public enum GregtechToolDictNames {
   
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/gui/CONTAINER_IndustrialCentrifuge.java b/src/Java/miscutil/xmod/gregtech/api/gui/CONTAINER_IndustrialCentrifuge.java
index 0741812a74..3b48c752ea 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/gui/CONTAINER_IndustrialCentrifuge.java
+++ b/src/Java/miscutil/xmod/gregtech/api/gui/CONTAINER_IndustrialCentrifuge.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.api.gui;
+package miscutil.xmod.gregtech.api.gui;
 
 import gregtech.api.gui.GT_ContainerMetaTile_Machine;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/gui/CONTAINER_IronBlastFurnace.java b/src/Java/miscutil/xmod/gregtech/api/gui/CONTAINER_IronBlastFurnace.java
index facc0769cd..aa5fbeac90 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/gui/CONTAINER_IronBlastFurnace.java
+++ b/src/Java/miscutil/xmod/gregtech/api/gui/CONTAINER_IronBlastFurnace.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.api.gui;
+package miscutil.xmod.gregtech.api.gui;
 
 import gregtech.api.gui.GT_ContainerMetaTile_Machine;
 import gregtech.api.gui.GT_Slot_Output;
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/gui/CONTAINER_MultiMachine.java b/src/Java/miscutil/xmod/gregtech/api/gui/CONTAINER_MultiMachine.java
index 29d734c22c..02d765f79a 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/gui/CONTAINER_MultiMachine.java
+++ b/src/Java/miscutil/xmod/gregtech/api/gui/CONTAINER_MultiMachine.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.api.gui;
+package miscutil.xmod.gregtech.api.gui;
 
 import gregtech.api.gui.GT_ContainerMetaTile_Machine;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/gui/CONTAINER_SafeBlock.java b/src/Java/miscutil/xmod/gregtech/api/gui/CONTAINER_SafeBlock.java
index 1145ebfa67..1242bd4472 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/gui/CONTAINER_SafeBlock.java
+++ b/src/Java/miscutil/xmod/gregtech/api/gui/CONTAINER_SafeBlock.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.api.gui;
+package miscutil.xmod.gregtech.api.gui;
 
 import gregtech.api.gui.GT_ContainerMetaTile_Machine;
 import gregtech.api.gui.GT_Slot_Holo;
@@ -7,7 +7,7 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import java.util.UUID;
 
 import miscutil.core.util.player.PlayerCache;
-import miscutil.core.xmod.gregtech.api.metatileentity.implementations.GregtechMetaSafeBlock;
+import miscutil.xmod.gregtech.api.metatileentity.implementations.GregtechMetaSafeBlock;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Slot;
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/gui/CONTAINER_SolarGenerator.java b/src/Java/miscutil/xmod/gregtech/api/gui/CONTAINER_SolarGenerator.java
index a57699ad97..d5f6b25e8a 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/gui/CONTAINER_SolarGenerator.java
+++ b/src/Java/miscutil/xmod/gregtech/api/gui/CONTAINER_SolarGenerator.java
@@ -1,11 +1,11 @@
-package miscutil.core.xmod.gregtech.api.gui;
+package miscutil.xmod.gregtech.api.gui;
 
 import gregtech.api.gui.GT_ContainerMetaTile_Machine;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 
 import java.util.Iterator;
 
-import miscutil.core.xmod.gregtech.common.tileentities.generators.GregtechMetaTileEntitySolarGenerator;
+import miscutil.xmod.gregtech.common.tileentities.generators.GregtechMetaTileEntitySolarGenerator;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.ICrafting;
 import cpw.mods.fml.relauncher.Side;
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/gui/CONTAINER_SteamCondenser.java b/src/Java/miscutil/xmod/gregtech/api/gui/CONTAINER_SteamCondenser.java
index 0b7d80c940..be57e07d53 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/gui/CONTAINER_SteamCondenser.java
+++ b/src/Java/miscutil/xmod/gregtech/api/gui/CONTAINER_SteamCondenser.java
@@ -1,11 +1,11 @@
-package miscutil.core.xmod.gregtech.api.gui;
+package miscutil.xmod.gregtech.api.gui;
 
 import gregtech.api.gui.GT_ContainerMetaTile_Machine;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 
 import java.util.Iterator;
 
-import miscutil.core.xmod.gregtech.api.metatileentity.implementations.base.generators.GregtechMetaBoilerBase;
+import miscutil.xmod.gregtech.api.metatileentity.implementations.base.generators.GregtechMetaBoilerBase;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.ICrafting;
 import net.minecraft.inventory.Slot;
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/gui/GUI_IndustrialCentrifuge.java b/src/Java/miscutil/xmod/gregtech/api/gui/GUI_IndustrialCentrifuge.java
index 24218d5e13..581aa4eab1 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/gui/GUI_IndustrialCentrifuge.java
+++ b/src/Java/miscutil/xmod/gregtech/api/gui/GUI_IndustrialCentrifuge.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.api.gui;
+package miscutil.xmod.gregtech.api.gui;
 
 
 import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/gui/GUI_IronBlastFurnace.java b/src/Java/miscutil/xmod/gregtech/api/gui/GUI_IronBlastFurnace.java
index fa0f996a63..9c0be36535 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/gui/GUI_IronBlastFurnace.java
+++ b/src/Java/miscutil/xmod/gregtech/api/gui/GUI_IronBlastFurnace.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.api.gui;
+package miscutil.xmod.gregtech.api.gui;
 
 import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/gui/GUI_MultiMachine.java b/src/Java/miscutil/xmod/gregtech/api/gui/GUI_MultiMachine.java
index 7501af3fce..3cf3d5ee69 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/gui/GUI_MultiMachine.java
+++ b/src/Java/miscutil/xmod/gregtech/api/gui/GUI_MultiMachine.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.api.gui;
+package miscutil.xmod.gregtech.api.gui;
 
 
 import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/gui/GUI_SafeBlock.java b/src/Java/miscutil/xmod/gregtech/api/gui/GUI_SafeBlock.java
index 71b52a1af5..7e3335cb34 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/gui/GUI_SafeBlock.java
+++ b/src/Java/miscutil/xmod/gregtech/api/gui/GUI_SafeBlock.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.api.gui;
+package miscutil.xmod.gregtech.api.gui;
 
 import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/gui/GUI_SolarGenerator.java b/src/Java/miscutil/xmod/gregtech/api/gui/GUI_SolarGenerator.java
index 61e29d93cb..7f48472ac4 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/gui/GUI_SolarGenerator.java
+++ b/src/Java/miscutil/xmod/gregtech/api/gui/GUI_SolarGenerator.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.api.gui;
+package miscutil.xmod.gregtech.api.gui;
 
 import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/gui/GUI_SteamCondenser.java b/src/Java/miscutil/xmod/gregtech/api/gui/GUI_SteamCondenser.java
index f75e180a12..75b19ecb2f 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/gui/GUI_SteamCondenser.java
+++ b/src/Java/miscutil/xmod/gregtech/api/gui/GUI_SteamCondenser.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.api.gui;
+package miscutil.xmod.gregtech.api.gui;
 
 import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/interfaces/GregtechItemContainer.java b/src/Java/miscutil/xmod/gregtech/api/interfaces/GregtechItemContainer.java
index e118e414f2..dd73b74dd7 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/interfaces/GregtechItemContainer.java
+++ b/src/Java/miscutil/xmod/gregtech/api/interfaces/GregtechItemContainer.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.api.interfaces;
+package miscutil.xmod.gregtech.api.interfaces;
 
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java b/src/Java/miscutil/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java
index 6ee921f4bf..b39c206ecd 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java
+++ b/src/Java/miscutil/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.api.interfaces.internal;
+package miscutil.xmod.gregtech.api.interfaces.internal;
 
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/interfaces/internal/Interface_IconContainer.java b/src/Java/miscutil/xmod/gregtech/api/interfaces/internal/Interface_IconContainer.java
index 4609a981dc..cc2a214f5c 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/interfaces/internal/Interface_IconContainer.java
+++ b/src/Java/miscutil/xmod/gregtech/api/interfaces/internal/Interface_IconContainer.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.api.interfaces.internal;
+package miscutil.xmod.gregtech.api.interfaces.internal;
 
 import net.minecraft.util.IIcon;
 import net.minecraft.util.ResourceLocation;
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/interfaces/internal/Interface_ItemBehaviour.java b/src/Java/miscutil/xmod/gregtech/api/interfaces/internal/Interface_ItemBehaviour.java
index fd6b953f7b..68f965de86 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/interfaces/internal/Interface_ItemBehaviour.java
+++ b/src/Java/miscutil/xmod/gregtech/api/interfaces/internal/Interface_ItemBehaviour.java
@@ -1,10 +1,10 @@
-package miscutil.core.xmod.gregtech.api.interfaces.internal;
+package miscutil.xmod.gregtech.api.interfaces.internal;
 
 import gregtech.api.enums.SubTag;
 
 import java.util.List;
 
-import miscutil.core.xmod.gregtech.api.items.Gregtech_MetaItem_Base;
+import miscutil.xmod.gregtech.api.items.Gregtech_MetaItem_Base;
 import net.minecraft.dispenser.IBlockSource;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator.java b/src/Java/miscutil/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator.java
index a81539df29..9b5e95452f 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator.java
+++ b/src/Java/miscutil/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator.java
@@ -1,7 +1,7 @@
-package miscutil.core.xmod.gregtech.api.interfaces.internal;
+package miscutil.xmod.gregtech.api.interfaces.internal;
 
-import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes;
-import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
+import miscutil.xmod.gregtech.api.enums.GregtechOrePrefixes;
+import miscutil.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
 import net.minecraft.item.ItemStack;
 
 public interface Interface_OreRecipeRegistrator {
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator_GT.java b/src/Java/miscutil/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator_GT.java
index dd9751f4db..fee89a927e 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator_GT.java
+++ b/src/Java/miscutil/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator_GT.java
@@ -1,7 +1,7 @@
-package miscutil.core.xmod.gregtech.api.interfaces.internal;
+package miscutil.xmod.gregtech.api.interfaces.internal;
 
 import gregtech.api.enums.OrePrefixes;
-import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
+import miscutil.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
 import net.minecraft.item.ItemStack;
 
 public interface Interface_OreRecipeRegistrator_GT {
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/interfaces/internal/Interface_Texture.java b/src/Java/miscutil/xmod/gregtech/api/interfaces/internal/Interface_Texture.java
index 5e70e9b2b2..df3ed57b33 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/interfaces/internal/Interface_Texture.java
+++ b/src/Java/miscutil/xmod/gregtech/api/interfaces/internal/Interface_Texture.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.api.interfaces.internal;
+package miscutil.xmod.gregtech.api.interfaces.internal;
 
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/interfaces/internal/Interface_ToolStats.java b/src/Java/miscutil/xmod/gregtech/api/interfaces/internal/Interface_ToolStats.java
index e2a7c4b5cf..53fd2e475c 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/interfaces/internal/Interface_ToolStats.java
+++ b/src/Java/miscutil/xmod/gregtech/api/interfaces/internal/Interface_ToolStats.java
@@ -1,10 +1,10 @@
-package miscutil.core.xmod.gregtech.api.interfaces.internal;
+package miscutil.xmod.gregtech.api.interfaces.internal;
 
 import gregtech.api.interfaces.IIconContainer;
 
 import java.util.List;
 
-import miscutil.core.xmod.gregtech.api.items.Gregtech_MetaTool;
+import miscutil.xmod.gregtech.api.items.Gregtech_MetaTool;
 import net.minecraft.block.Block;
 import net.minecraft.enchantment.Enchantment;
 import net.minecraft.entity.Entity;
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/items/Gregtech_Generic_Item.java b/src/Java/miscutil/xmod/gregtech/api/items/Gregtech_Generic_Item.java
index eed3a228cd..0a928203ca 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/items/Gregtech_Generic_Item.java
+++ b/src/Java/miscutil/xmod/gregtech/api/items/Gregtech_Generic_Item.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.api.items;
+package miscutil.xmod.gregtech.api.items;
 
 import gregtech.api.enums.SubTag;
 import gregtech.api.interfaces.IProjectileItem;
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/items/Gregtech_MetaItem.java b/src/Java/miscutil/xmod/gregtech/api/items/Gregtech_MetaItem.java
index 37fa2b2a80..e7901074c0 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/items/Gregtech_MetaItem.java
+++ b/src/Java/miscutil/xmod/gregtech/api/items/Gregtech_MetaItem.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.api.items;
+package miscutil.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.core.xmod.gregtech.api.interfaces.internal.Interface_ItemBehaviour;
+import miscutil.xmod.gregtech.api.interfaces.internal.Interface_ItemBehaviour;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/items/Gregtech_MetaItem_Base.java b/src/Java/miscutil/xmod/gregtech/api/items/Gregtech_MetaItem_Base.java
index 5a05800863..08f343ecc2 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/items/Gregtech_MetaItem_Base.java
+++ b/src/Java/miscutil/xmod/gregtech/api/items/Gregtech_MetaItem_Base.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.api.items;
+package miscutil.xmod.gregtech.api.items;
 
 import static gregtech.api.enums.GT_Values.D1;
 import static gregtech.api.enums.GT_Values.V;
@@ -17,7 +17,7 @@ import java.util.HashMap;
 import java.util.List;
 
 import miscutil.core.util.Utils;
-import miscutil.core.xmod.gregtech.api.interfaces.internal.Interface_ItemBehaviour;
+import miscutil.xmod.gregtech.api.interfaces.internal.Interface_ItemBehaviour;
 import net.minecraft.dispenser.IBlockSource;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/items/Gregtech_MetaItem_X32.java b/src/Java/miscutil/xmod/gregtech/api/items/Gregtech_MetaItem_X32.java
index c8eca07595..85c86a84e2 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/items/Gregtech_MetaItem_X32.java
+++ b/src/Java/miscutil/xmod/gregtech/api/items/Gregtech_MetaItem_X32.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.api.items;
+package miscutil.xmod.gregtech.api.items;
 
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.GT_Values;
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/items/Gregtech_MetaTool.java b/src/Java/miscutil/xmod/gregtech/api/items/Gregtech_MetaTool.java
index dfc9f3161e..3fdd76a2ce 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/items/Gregtech_MetaTool.java
+++ b/src/Java/miscutil/xmod/gregtech/api/items/Gregtech_MetaTool.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.api.items;
+package miscutil.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.core.xmod.gregtech.api.interfaces.internal.Interface_ToolStats;
+import miscutil.xmod.gregtech.api.interfaces.internal.Interface_ToolStats;
 import mods.railcraft.api.core.items.IToolCrowbar;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.texture.IIconRegister;
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/items/types/ToolType_Base.java b/src/Java/miscutil/xmod/gregtech/api/items/types/ToolType_Base.java
index e0899d22c0..88e192d06a 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/items/types/ToolType_Base.java
+++ b/src/Java/miscutil/xmod/gregtech/api/items/types/ToolType_Base.java
@@ -1,11 +1,11 @@
-package miscutil.core.xmod.gregtech.api.items.types;
+package miscutil.xmod.gregtech.api.items.types;
 
 import gregtech.api.enums.SubTag;
 
 import java.util.List;
 
-import miscutil.core.xmod.gregtech.api.interfaces.internal.Interface_ItemBehaviour;
-import miscutil.core.xmod.gregtech.api.items.Gregtech_MetaItem_Base;
+import miscutil.xmod.gregtech.api.interfaces.internal.Interface_ItemBehaviour;
+import miscutil.xmod.gregtech.api.items.Gregtech_MetaItem_Base;
 import net.minecraft.block.BlockDispenser;
 import net.minecraft.dispenser.BehaviorDefaultDispenseItem;
 import net.minecraft.dispenser.IBlockSource;
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/items/types/ToolType_HardHammer.java b/src/Java/miscutil/xmod/gregtech/api/items/types/ToolType_HardHammer.java
index ff9ef0a208..015fee3377 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/items/types/ToolType_HardHammer.java
+++ b/src/Java/miscutil/xmod/gregtech/api/items/types/ToolType_HardHammer.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.api.items.types;
+package miscutil.xmod.gregtech.api.items.types;
 
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.Materials;
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/items/types/ToolType_Wrench.java b/src/Java/miscutil/xmod/gregtech/api/items/types/ToolType_Wrench.java
index ade388b894..6ff440e57c 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/items/types/ToolType_Wrench.java
+++ b/src/Java/miscutil/xmod/gregtech/api/items/types/ToolType_Wrench.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.api.items.types;
+package miscutil.xmod.gregtech.api.items.types;
 
 import gregtech.api.GregTech_API;
 import gregtech.api.items.GT_MetaBase_Item;
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/GregtechMetaCondensor.java b/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/GregtechMetaCondensor.java
index 4ab969c483..0a21655308 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/GregtechMetaCondensor.java
+++ b/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/GregtechMetaCondensor.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.api.metatileentity.implementations;
+package miscutil.xmod.gregtech.api.metatileentity.implementations;
 
 import gregtech.api.enums.Dyes;
 import gregtech.api.enums.Textures;
@@ -10,9 +10,9 @@ import gregtech.api.util.GT_ModHandler;
 import miscutil.core.lib.CORE;
 import miscutil.core.util.Utils;
 import miscutil.core.util.math.MathUtils;
-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.generators.GregtechMetaBoilerBase;
+import miscutil.xmod.gregtech.api.gui.CONTAINER_SteamCondenser;
+import miscutil.xmod.gregtech.api.gui.GUI_SteamCondenser;
+import miscutil.xmod.gregtech.api.metatileentity.implementations.base.generators.GregtechMetaBoilerBase;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.FluidStack;
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/GregtechMetaEnergyBuffer.java b/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/GregtechMetaEnergyBuffer.java
index 9034a27e70..7647dd3a5a 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/GregtechMetaEnergyBuffer.java
+++ b/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/GregtechMetaEnergyBuffer.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.api.metatileentity.implementations;
+package miscutil.xmod.gregtech.api.metatileentity.implementations;
 
 import static gregtech.api.enums.GT_Values.V;
 import gregtech.api.enums.Textures;
@@ -14,7 +14,7 @@ import gregtech.api.util.GT_Utility;
 import ic2.api.item.IElectricItem;
 import miscutil.core.lib.CORE;
 import miscutil.core.util.Utils;
-import miscutil.core.xmod.gregtech.api.metatileentity.implementations.base.GregtechMetaTileEntity;
+import miscutil.xmod.gregtech.api.metatileentity.implementations.base.GregtechMetaTileEntity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java b/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java
index 59001bb8cf..528bd8db85 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java
+++ b/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.api.metatileentity.implementations;
+package miscutil.xmod.gregtech.api.metatileentity.implementations;
 
 import static gregtech.api.enums.GT_Values.VN;
 import gregtech.api.GregTech_API;
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_SuperConductor.java b/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_SuperConductor.java
index 7b6c670be4..e0c23ad263 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_SuperConductor.java
+++ b/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_SuperConductor.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.api.metatileentity.implementations;
+package miscutil.xmod.gregtech.api.metatileentity.implementations;
 
 import static gregtech.api.enums.GT_Values.VN;
 import gregtech.api.GregTech_API;
@@ -20,8 +20,8 @@ import java.util.ArrayList;
 import java.util.Arrays;
 
 import miscutil.core.lib.CORE;
-import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
-import miscutil.core.xmod.gregtech.api.metatileentity.implementations.base.GregtechMetaPipeEntityBase_Cable;
+import miscutil.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
+import miscutil.xmod.gregtech.api.metatileentity.implementations.base.GregtechMetaPipeEntityBase_Cable;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.tileentity.TileEntity;
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/GregtechMetaSafeBlock.java b/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/GregtechMetaSafeBlock.java
index abe5832a9e..743885531b 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/GregtechMetaSafeBlock.java
+++ b/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/GregtechMetaSafeBlock.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.api.metatileentity.implementations;
+package miscutil.xmod.gregtech.api.metatileentity.implementations;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
@@ -7,9 +7,9 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Utility;
 import miscutil.core.lib.CORE;
-import miscutil.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.machines.GregtechMetaSafeBlockBase;
+import miscutil.xmod.gregtech.api.gui.CONTAINER_SafeBlock;
+import miscutil.xmod.gregtech.api.gui.GUI_SafeBlock;
+import miscutil.xmod.gregtech.api.metatileentity.implementations.base.machines.GregtechMetaSafeBlockBase;
 import net.minecraft.entity.player.InventoryPlayer;
 
 public class GregtechMetaSafeBlock
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/GregtechMetaSuperConductorNodeBase.java b/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/GregtechMetaSuperConductorNodeBase.java
index 0c37078646..0da6d966e5 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/GregtechMetaSuperConductorNodeBase.java
+++ b/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/GregtechMetaSuperConductorNodeBase.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.api.metatileentity.implementations;
+package miscutil.xmod.gregtech.api.metatileentity.implementations;
 
 import static gregtech.api.enums.GT_Values.V;
 import gregtech.api.enums.Textures;
@@ -11,7 +11,7 @@ import gregtech.api.util.GT_Utility;
 import java.util.Collection;
 
 import miscutil.core.lib.CORE;
-import miscutil.core.xmod.gregtech.api.metatileentity.implementations.base.lossless.GregtechMetaTileEntityLosslessBasicTank;
+import miscutil.xmod.gregtech.api.metatileentity.implementations.base.lossless.GregtechMetaTileEntityLosslessBasicTank;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaPipeEntityBase_Cable.java b/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaPipeEntityBase_Cable.java
index 901dec8457..384c9e29ed 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaPipeEntityBase_Cable.java
+++ b/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaPipeEntityBase_Cable.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.api.metatileentity.implementations.base;
+package miscutil.xmod.gregtech.api.metatileentity.implementations.base;
 
 import static gregtech.api.enums.GT_Values.VN;
 import gregtech.GT_Mod;
@@ -21,7 +21,7 @@ import ic2.api.energy.tile.IEnergySink;
 import java.util.ArrayList;
 import java.util.Arrays;
 
-import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
+import miscutil.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.item.ItemStack;
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaTileEntity.java b/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaTileEntity.java
index 8a1dbf78b1..7291bf4302 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaTileEntity.java
+++ b/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaTileEntity.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.api.metatileentity.implementations.base;
+package miscutil.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/core/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java b/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
index ff922e5b96..808c7ba4ad 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
+++ b/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.api.metatileentity.implementations.base;
+package miscutil.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.core.xmod.gregtech.api.gui.CONTAINER_MultiMachine;
-import miscutil.core.xmod.gregtech.api.gui.GUI_MultiMachine;
+import miscutil.xmod.gregtech.api.gui.CONTAINER_MultiMachine;
+import miscutil.xmod.gregtech.api.gui.GUI_MultiMachine;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechMetaBoilerBase.java b/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechMetaBoilerBase.java
index b38bd019be..07c76a9d46 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechMetaBoilerBase.java
+++ b/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechMetaBoilerBase.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.api.metatileentity.implementations.base.generators;
+package miscutil.xmod.gregtech.api.metatileentity.implementations.base.generators;
 
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.Materials;
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechMetaSolarGenerator.java b/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechMetaSolarGenerator.java
index 23ab350f7c..7ecc70d31d 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechMetaSolarGenerator.java
+++ b/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechMetaSolarGenerator.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.api.metatileentity.implementations.base.generators;
+package miscutil.xmod.gregtech.api.metatileentity.implementations.base.generators;
 
 import static gregtech.api.enums.GT_Values.V;
 import gregtech.api.enums.Textures;
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechRocketFuelGeneratorBase.java b/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechRocketFuelGeneratorBase.java
index 75f771ff38..084cf68f5b 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechRocketFuelGeneratorBase.java
+++ b/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechRocketFuelGeneratorBase.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.api.metatileentity.implementations.base.generators;
+package miscutil.xmod.gregtech.api.metatileentity.implementations.base.generators;
 
 import static gregtech.api.enums.GT_Values.V;
 import gregtech.api.enums.Textures;
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/lossless/GregtechBaseMetaTileEntityLossless.java b/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/base/lossless/GregtechBaseMetaTileEntityLossless.java
index d0ac4ab204..fbe0a64771 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/lossless/GregtechBaseMetaTileEntityLossless.java
+++ b/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/base/lossless/GregtechBaseMetaTileEntityLossless.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.api.metatileentity.implementations.base.lossless;
+package miscutil.xmod.gregtech.api.metatileentity.implementations.base.lossless;
 
 import static gregtech.api.enums.GT_Values.NW;
 import static gregtech.api.enums.GT_Values.V;
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/lossless/GregtechMetaPipeEntity_BaseSuperConductor.java b/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/base/lossless/GregtechMetaPipeEntity_BaseSuperConductor.java
index c48234cdb0..056cfb9911 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/lossless/GregtechMetaPipeEntity_BaseSuperConductor.java
+++ b/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/base/lossless/GregtechMetaPipeEntity_BaseSuperConductor.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.api.metatileentity.implementations.base.lossless;
+package miscutil.xmod.gregtech.api.metatileentity.implementations.base.lossless;
 
 import static gregtech.api.enums.GT_Values.GT;
 import static gregtech.api.enums.GT_Values.V;
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/lossless/GregtechMetaTileEntityLossless.java b/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/base/lossless/GregtechMetaTileEntityLossless.java
index bc4403ec6d..12fea91c17 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/lossless/GregtechMetaTileEntityLossless.java
+++ b/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/base/lossless/GregtechMetaTileEntityLossless.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.api.metatileentity.implementations.base.lossless;
+package miscutil.xmod.gregtech.api.metatileentity.implementations.base.lossless;
 
 import static gregtech.api.enums.GT_Values.GT;
 import gregtech.api.interfaces.ITexture;
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/lossless/GregtechMetaTileEntityLosslessBasicTank.java b/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/base/lossless/GregtechMetaTileEntityLosslessBasicTank.java
index 507bd4de94..e915957218 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/lossless/GregtechMetaTileEntityLosslessBasicTank.java
+++ b/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/base/lossless/GregtechMetaTileEntityLosslessBasicTank.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.api.metatileentity.implementations.base.lossless;
+package miscutil.xmod.gregtech.api.metatileentity.implementations.base.lossless;
 
 import gregtech.api.enums.ItemList;
 import gregtech.api.gui.GT_Container_BasicTank;
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/lossless/GregtechMetaTileEntityLosslessTieredMachineBlock.java b/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/base/lossless/GregtechMetaTileEntityLosslessTieredMachineBlock.java
index a092f85f7a..9ba2299140 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/lossless/GregtechMetaTileEntityLosslessTieredMachineBlock.java
+++ b/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/base/lossless/GregtechMetaTileEntityLosslessTieredMachineBlock.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.api.metatileentity.implementations.base.lossless;
+package miscutil.xmod.gregtech.api.metatileentity.implementations.base.lossless;
 
 import static gregtech.api.enums.GT_Values.GT;
 import gregtech.api.interfaces.ITexture;
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/lossless/MetaTileEntityLossless.java b/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/base/lossless/MetaTileEntityLossless.java
index 75919f76e4..2bc937177b 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/lossless/MetaTileEntityLossless.java
+++ b/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/base/lossless/MetaTileEntityLossless.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.api.metatileentity.implementations.base.lossless;
+package miscutil.xmod.gregtech.api.metatileentity.implementations.base.lossless;
 
 import static gregtech.api.enums.GT_Values.GT;
 import static gregtech.api.enums.GT_Values.V;
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaSafeBlockBase.java b/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaSafeBlockBase.java
index 991f1b5d6e..70e2400881 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaSafeBlockBase.java
+++ b/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaSafeBlockBase.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.api.metatileentity.implementations.base.machines;
+package miscutil.xmod.gregtech.api.metatileentity.implementations.base.machines;
 
 import static gregtech.api.enums.GT_Values.V;
 import gregtech.api.enums.Textures;
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/creative/GregtechMetaCreativeEnergyBuffer.java b/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/creative/GregtechMetaCreativeEnergyBuffer.java
index e2dd128d8b..f1ee9c9a0d 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/creative/GregtechMetaCreativeEnergyBuffer.java
+++ b/src/Java/miscutil/xmod/gregtech/api/metatileentity/implementations/creative/GregtechMetaCreativeEnergyBuffer.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.api.metatileentity.implementations.creative;
+package miscutil.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.core.xmod.gregtech.api.metatileentity.implementations.GregtechMetaEnergyBuffer;
+import miscutil.xmod.gregtech.api.metatileentity.implementations.GregtechMetaEnergyBuffer;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/objects/GregtechFluid.java b/src/Java/miscutil/xmod/gregtech/api/objects/GregtechFluid.java
index f894b6e45b..2a9ce9965a 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/objects/GregtechFluid.java
+++ b/src/Java/miscutil/xmod/gregtech/api/objects/GregtechFluid.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.api.objects;
+package miscutil.xmod.gregtech.api.objects;
 
 import gregtech.api.GregTech_API;
 import miscutil.core.lib.CORE;
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/objects/GregtechItemData.java b/src/Java/miscutil/xmod/gregtech/api/objects/GregtechItemData.java
index 864cf77c31..7c650ae7c3 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/objects/GregtechItemData.java
+++ b/src/Java/miscutil/xmod/gregtech/api/objects/GregtechItemData.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.api.objects;
+package miscutil.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.core.xmod.gregtech.api.enums.GregtechOrePrefixes;
-import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
+import miscutil.xmod.gregtech.api.enums.GregtechOrePrefixes;
+import miscutil.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
 import net.minecraft.item.ItemStack;
 
 public class GregtechItemData {
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/objects/GregtechMaterialStack.java b/src/Java/miscutil/xmod/gregtech/api/objects/GregtechMaterialStack.java
index 56410757f6..0c863dfc74 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/objects/GregtechMaterialStack.java
+++ b/src/Java/miscutil/xmod/gregtech/api/objects/GregtechMaterialStack.java
@@ -1,6 +1,6 @@
-package miscutil.core.xmod.gregtech.api.objects;
+package miscutil.xmod.gregtech.api.objects;
 
-import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
+import miscutil.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
 
 public class GregtechMaterialStack implements Cloneable {
     public long mAmount;
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/objects/GregtechRenderedTexture.java b/src/Java/miscutil/xmod/gregtech/api/objects/GregtechRenderedTexture.java
index 0f56400d0c..458f0ddec4 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/objects/GregtechRenderedTexture.java
+++ b/src/Java/miscutil/xmod/gregtech/api/objects/GregtechRenderedTexture.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.api.objects;
+package miscutil.xmod.gregtech.api.objects;
 
 import gregtech.api.enums.Dyes;
 import gregtech.api.interfaces.IColorModulationContainer;
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/recipe/ProcessingSkookumChoocherToolRecipes.java b/src/Java/miscutil/xmod/gregtech/api/recipe/ProcessingSkookumChoocherToolRecipes.java
index 036add9535..1078805254 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/recipe/ProcessingSkookumChoocherToolRecipes.java
+++ b/src/Java/miscutil/xmod/gregtech/api/recipe/ProcessingSkookumChoocherToolRecipes.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.api.recipe;
+package miscutil.xmod.gregtech.api.recipe;
 
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/util/GregtechOreDictUnificator.java b/src/Java/miscutil/xmod/gregtech/api/util/GregtechOreDictUnificator.java
index bdc01ccdf0..1ffc88b4ba 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/util/GregtechOreDictUnificator.java
+++ b/src/Java/miscutil/xmod/gregtech/api/util/GregtechOreDictUnificator.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.api.util;
+package miscutil.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.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 miscutil.xmod.gregtech.api.enums.GregtechOrePrefixes;
+import miscutil.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
+import miscutil.xmod.gregtech.api.objects.GregtechItemData;
+import miscutil.xmod.gregtech.api.objects.GregtechMaterialStack;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.oredict.OreDictionary;
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/util/GregtechRecipe.java b/src/Java/miscutil/xmod/gregtech/api/util/GregtechRecipe.java
index 7f31d30c89..96359550a3 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/util/GregtechRecipe.java
+++ b/src/Java/miscutil/xmod/gregtech/api/util/GregtechRecipe.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.api.util;
+package miscutil.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/core/xmod/gregtech/api/util/GregtechRecipeRegistrator.java b/src/Java/miscutil/xmod/gregtech/api/util/GregtechRecipeRegistrator.java
index 120cef762d..b402fe500f 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/util/GregtechRecipeRegistrator.java
+++ b/src/Java/miscutil/xmod/gregtech/api/util/GregtechRecipeRegistrator.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.api.util;
+package miscutil.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.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 miscutil.xmod.gregtech.api.enums.GregtechOrePrefixes;
+import miscutil.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
+import miscutil.xmod.gregtech.api.objects.GregtechItemData;
+import miscutil.xmod.gregtech.api.objects.GregtechMaterialStack;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
diff --git a/src/Java/miscutil/core/xmod/gregtech/common/Meta_GT_Proxy.java b/src/Java/miscutil/xmod/gregtech/common/Meta_GT_Proxy.java
index 0da4b19ee7..5be3170471 100644
--- a/src/Java/miscutil/core/xmod/gregtech/common/Meta_GT_Proxy.java
+++ b/src/Java/miscutil/xmod/gregtech/common/Meta_GT_Proxy.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.common;
+package miscutil.xmod.gregtech.common;
 
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.ConfigCategories;
@@ -18,12 +18,12 @@ import java.util.Iterator;
 
 import miscutil.core.lib.CORE;
 import miscutil.core.util.Utils;
-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 miscutil.xmod.gregtech.api.enums.GregtechOrePrefixes;
+import miscutil.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
+import miscutil.xmod.gregtech.api.objects.GregtechFluid;
+import miscutil.xmod.gregtech.api.util.GregtechOreDictUnificator;
+import miscutil.xmod.gregtech.api.util.GregtechRecipeRegistrator;
+import miscutil.xmod.gregtech.common.items.MetaGeneratedGregtechItems;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
diff --git a/src/Java/miscutil/core/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java b/src/Java/miscutil/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java
index aa786f44f6..b6a79955a8 100644
--- a/src/Java/miscutil/core/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java
+++ b/src/Java/miscutil/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java
@@ -1,11 +1,11 @@
-package miscutil.core.xmod.gregtech.common.blocks;
+package miscutil.xmod.gregtech.common.blocks;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.objects.GT_CopiedBlockTexture;
 import gregtech.api.util.GT_LanguageManager;
 import gregtech.common.blocks.GT_Material_Casings;
-import miscutil.core.xmod.gregtech.api.enums.GregtechItemList;
-import miscutil.core.xmod.gregtech.common.blocks.textures.CasingTextureHandler;
+import miscutil.xmod.gregtech.api.enums.GregtechItemList;
+import miscutil.xmod.gregtech.common.blocks.textures.CasingTextureHandler;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
diff --git a/src/Java/miscutil/core/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksAbstract.java b/src/Java/miscutil/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksAbstract.java
index 9fb1b832d5..3286fa51c4 100644
--- a/src/Java/miscutil/core/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksAbstract.java
+++ b/src/Java/miscutil/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksAbstract.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.common.blocks;
+package miscutil.xmod.gregtech.common.blocks;
 
 import gregtech.api.GregTech_API;
 import gregtech.api.util.GT_LanguageManager;
diff --git a/src/Java/miscutil/core/xmod/gregtech/common/blocks/GregtechMetaCasingItems.java b/src/Java/miscutil/xmod/gregtech/common/blocks/GregtechMetaCasingItems.java
index 96ef4e2983..a3307e4946 100644
--- a/src/Java/miscutil/core/xmod/gregtech/common/blocks/GregtechMetaCasingItems.java
+++ b/src/Java/miscutil/xmod/gregtech/common/blocks/GregtechMetaCasingItems.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.common.blocks;
+package miscutil.xmod.gregtech.common.blocks;
 
 import gregtech.common.blocks.GT_Item_Casings_Abstract;
 import net.minecraft.block.Block;
diff --git a/src/Java/miscutil/core/xmod/gregtech/common/blocks/GregtechMetaItemCasings1.java b/src/Java/miscutil/xmod/gregtech/common/blocks/GregtechMetaItemCasings1.java
index 17ee8f9853..fbc8d1e06c 100644
--- a/src/Java/miscutil/core/xmod/gregtech/common/blocks/GregtechMetaItemCasings1.java
+++ b/src/Java/miscutil/xmod/gregtech/common/blocks/GregtechMetaItemCasings1.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.common.blocks;
+package miscutil.xmod.gregtech.common.blocks;
 
 import java.util.List;
 
diff --git a/src/Java/miscutil/core/xmod/gregtech/common/blocks/GregtechMetaItemCasingsAbstract.java b/src/Java/miscutil/xmod/gregtech/common/blocks/GregtechMetaItemCasingsAbstract.java
index ad87cd51f7..e2cd31174d 100644
--- a/src/Java/miscutil/core/xmod/gregtech/common/blocks/GregtechMetaItemCasingsAbstract.java
+++ b/src/Java/miscutil/xmod/gregtech/common/blocks/GregtechMetaItemCasingsAbstract.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.common.blocks;
+package miscutil.xmod.gregtech.common.blocks;
 
 import gregtech.api.util.GT_LanguageManager;
 
diff --git a/src/Java/miscutil/core/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java b/src/Java/miscutil/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java
index bd00b3b249..ff6f3ae01a 100644
--- a/src/Java/miscutil/core/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java
+++ b/src/Java/miscutil/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java
@@ -1,11 +1,11 @@
-package miscutil.core.xmod.gregtech.common.blocks.fluid;
+package miscutil.xmod.gregtech.common.blocks.fluid;
 
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.util.GT_OreDictUnificator;
 import miscutil.core.util.Utils;
-import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
-import miscutil.core.xmod.gregtech.common.Meta_GT_Proxy;
+import miscutil.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
+import miscutil.xmod.gregtech.common.Meta_GT_Proxy;
 
 public class GregtechFluidHandler {
 
diff --git a/src/Java/miscutil/core/xmod/gregtech/common/blocks/textures/CasingTextureHandler.java b/src/Java/miscutil/xmod/gregtech/common/blocks/textures/CasingTextureHandler.java
index 6a8dac8c90..0b2ef3f620 100644
--- a/src/Java/miscutil/core/xmod/gregtech/common/blocks/textures/CasingTextureHandler.java
+++ b/src/Java/miscutil/xmod/gregtech/common/blocks/textures/CasingTextureHandler.java
@@ -1,8 +1,8 @@
-package miscutil.core.xmod.gregtech.common.blocks.textures;
+package miscutil.xmod.gregtech.common.blocks.textures;
 
 import gregtech.api.enums.Textures;
 import miscutil.core.lib.CORE;
-import miscutil.core.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks;
+import miscutil.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
 
diff --git a/src/Java/miscutil/core/xmod/gregtech/common/blocks/textures/TexturesGregtech58.java b/src/Java/miscutil/xmod/gregtech/common/blocks/textures/TexturesGregtech58.java
index 38a722a823..112c07fbc4 100644
--- a/src/Java/miscutil/core/xmod/gregtech/common/blocks/textures/TexturesGregtech58.java
+++ b/src/Java/miscutil/xmod/gregtech/common/blocks/textures/TexturesGregtech58.java
@@ -1,10 +1,10 @@
-package miscutil.core.xmod.gregtech.common.blocks.textures;
+package miscutil.xmod.gregtech.common.blocks.textures;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import miscutil.core.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks;
-import miscutil.core.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialCentrifuge;
+import miscutil.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks;
+import miscutil.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialCentrifuge;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
diff --git a/src/Java/miscutil/core/xmod/gregtech/common/blocks/textures/TexturesGregtech59.java b/src/Java/miscutil/xmod/gregtech/common/blocks/textures/TexturesGregtech59.java
index a8b198e6c5..c08edbd489 100644
--- a/src/Java/miscutil/core/xmod/gregtech/common/blocks/textures/TexturesGregtech59.java
+++ b/src/Java/miscutil/xmod/gregtech/common/blocks/textures/TexturesGregtech59.java
@@ -1,10 +1,10 @@
-package miscutil.core.xmod.gregtech.common.blocks.textures;
+package miscutil.xmod.gregtech.common.blocks.textures;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import miscutil.core.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks;
-import miscutil.core.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialCentrifuge;
+import miscutil.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks;
+import miscutil.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialCentrifuge;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
diff --git a/src/Java/miscutil/core/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java b/src/Java/miscutil/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
index aa82c9496d..5cb630f593 100644
--- a/src/Java/miscutil/core/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
+++ b/src/Java/miscutil/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.common.items;
+package miscutil.xmod.gregtech.common.items;
 
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.GT_Values;
@@ -15,10 +15,10 @@ import gregtech.common.covers.GT_Cover_Pump;
 import miscutil.core.lib.CORE;
 import miscutil.core.util.Utils;
 import miscutil.core.util.UtilsText;
-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;
+import miscutil.xmod.gregtech.api.enums.GregtechItemList;
+import miscutil.xmod.gregtech.api.enums.GregtechOrePrefixes;
+import miscutil.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
+import miscutil.xmod.gregtech.api.items.Gregtech_MetaItem_X32;
 import net.minecraft.item.EnumAction;
 
 public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
diff --git a/src/Java/miscutil/core/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java b/src/Java/miscutil/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java
index 9a4c40f809..ad17253421 100644
--- a/src/Java/miscutil/core/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java
+++ b/src/Java/miscutil/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java
@@ -1,11 +1,11 @@
-package miscutil.core.xmod.gregtech.common.items;
+package miscutil.xmod.gregtech.common.items;
 
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.TC_Aspects;
 import gregtech.api.enums.ToolDictNames;
-import miscutil.core.xmod.gregtech.api.enums.GregtechToolDictNames;
-import miscutil.core.xmod.gregtech.api.items.Gregtech_MetaTool;
-import miscutil.core.xmod.gregtech.common.tools.TOOL_Gregtech_Choocher;
+import miscutil.xmod.gregtech.api.enums.GregtechToolDictNames;
+import miscutil.xmod.gregtech.api.items.Gregtech_MetaTool;
+import miscutil.xmod.gregtech.common.tools.TOOL_Gregtech_Choocher;
 
 public class MetaGeneratedGregtechTools extends Gregtech_MetaTool {
     
diff --git a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Solar.java b/src/Java/miscutil/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Solar.java
index 4af96ec97e..8cad8882ef 100644
--- a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Solar.java
+++ b/src/Java/miscutil/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Solar.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.common.tileentities.generators;
+package miscutil.xmod.gregtech.common.tileentities.generators;
 
 import gregtech.api.enums.Dyes;
 import gregtech.api.enums.Textures;
diff --git a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityRocketFuelGenerator.java b/src/Java/miscutil/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityRocketFuelGenerator.java
index 554c59c268..95fc5bef7c 100644
--- a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityRocketFuelGenerator.java
+++ b/src/Java/miscutil/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityRocketFuelGenerator.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.common.tileentities.generators;
+package miscutil.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.core.xmod.gregtech.api.metatileentity.implementations.base.generators.GregtechRocketFuelGeneratorBase;
+import miscutil.xmod.gregtech.api.metatileentity.implementations.base.generators.GregtechRocketFuelGeneratorBase;
 import net.minecraft.item.ItemStack;
 import cpw.mods.fml.common.registry.GameRegistry;
 
diff --git a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySolarGenerator.java b/src/Java/miscutil/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySolarGenerator.java
index 0afb37e507..fa9cbdd055 100644
--- a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySolarGenerator.java
+++ b/src/Java/miscutil/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySolarGenerator.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.common.tileentities.generators;
+package miscutil.xmod.gregtech.common.tileentities.generators;
 
 import static gregtech.api.enums.GT_Values.V;
 import gregtech.api.GregTech_API;
@@ -9,9 +9,9 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.objects.GT_RenderedTexture;
 import miscutil.core.util.Utils;
-import miscutil.core.xmod.gregtech.api.gui.CONTAINER_SolarGenerator;
-import miscutil.core.xmod.gregtech.api.gui.GUI_SolarGenerator;
-import miscutil.core.xmod.gregtech.api.metatileentity.implementations.base.generators.GregtechMetaSolarGenerator;
+import miscutil.xmod.gregtech.api.gui.CONTAINER_SolarGenerator;
+import miscutil.xmod.gregtech.api.gui.GUI_SolarGenerator;
+import miscutil.xmod.gregtech.api.metatileentity.implementations.base.generators.GregtechMetaSolarGenerator;
 import net.minecraft.entity.player.InventoryPlayer;
 
 public class GregtechMetaTileEntitySolarGenerator extends GregtechMetaSolarGenerator {
diff --git a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySuperCondensor.java b/src/Java/miscutil/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySuperCondensor.java
index 9e5db9291d..fd27e13ba5 100644
--- a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySuperCondensor.java
+++ b/src/Java/miscutil/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySuperCondensor.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.common.tileentities.generators;
+package miscutil.xmod.gregtech.common.tileentities.generators;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
@@ -6,7 +6,7 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Recipe;
-import miscutil.core.xmod.gregtech.api.metatileentity.implementations.GregtechMetaSuperConductorNodeBase;
+import miscutil.xmod.gregtech.api.metatileentity.implementations.GregtechMetaSuperConductorNodeBase;
 
 public class GregtechMetaTileEntitySuperCondensor
         extends GregtechMetaSuperConductorNodeBase {
diff --git a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCentrifuge.java b/src/Java/miscutil/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCentrifuge.java
index d085d39a50..9d6fdbf8c9 100644
--- a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCentrifuge.java
+++ b/src/Java/miscutil/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCentrifuge.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.common.tileentities.machines.multi;
+package miscutil.xmod.gregtech.common.tileentities.machines.multi;
 
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.Textures;
@@ -18,8 +18,8 @@ import miscutil.core.block.ModBlocks;
 import miscutil.core.lib.CORE;
 import miscutil.core.lib.CORE.configSwitches;
 import miscutil.core.util.Utils;
-import miscutil.core.xmod.gregtech.api.gui.GUI_MultiMachine;
-import miscutil.core.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
+import miscutil.xmod.gregtech.api.gui.GUI_MultiMachine;
+import miscutil.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.entity.player.InventoryPlayer;
diff --git a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCokeOven.java b/src/Java/miscutil/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCokeOven.java
index d206156da0..12076dc3c2 100644
--- a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCokeOven.java
+++ b/src/Java/miscutil/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCokeOven.java
@@ -1,6 +1,6 @@
-package miscutil.core.xmod.gregtech.common.tileentities.machines.multi;
+package miscutil.xmod.gregtech.common.tileentities.machines.multi;
 
-import static miscutil.core.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks.GTID;
+import static miscutil.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks.GTID;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
@@ -14,9 +14,9 @@ import java.util.Arrays;
 
 import miscutil.core.block.ModBlocks;
 import miscutil.core.lib.CORE;
-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.util.GregtechRecipe;
+import miscutil.xmod.gregtech.api.gui.GUI_MultiMachine;
+import miscutil.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
+import miscutil.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/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialElectrolyzer.java b/src/Java/miscutil/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialElectrolyzer.java
index 1eba8022b7..265d0547f5 100644
--- a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialElectrolyzer.java
+++ b/src/Java/miscutil/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialElectrolyzer.java
@@ -1,6 +1,6 @@
-package miscutil.core.xmod.gregtech.common.tileentities.machines.multi;
+package miscutil.xmod.gregtech.common.tileentities.machines.multi;
 
-import static miscutil.core.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks.GTID;
+import static miscutil.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks.GTID;
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
@@ -17,7 +17,7 @@ import java.util.List;
 
 import miscutil.core.block.ModBlocks;
 import miscutil.core.lib.CORE;
-import miscutil.core.xmod.gregtech.api.gui.GUI_MultiMachine;
+import miscutil.xmod.gregtech.api.gui.GUI_MultiMachine;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
diff --git a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialMacerator.java b/src/Java/miscutil/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialMacerator.java
index 466b9f4685..ddba959930 100644
--- a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialMacerator.java
+++ b/src/Java/miscutil/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialMacerator.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.common.tileentities.machines.multi;
+package miscutil.xmod.gregtech.common.tileentities.machines.multi;
 
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.Textures;
@@ -17,8 +17,8 @@ import java.util.Random;
 import miscutil.core.block.ModBlocks;
 import miscutil.core.lib.CORE;
 import miscutil.core.util.Utils;
-import miscutil.core.xmod.gregtech.api.gui.GUI_MultiMachine;
-import miscutil.core.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
+import miscutil.xmod.gregtech.api.gui.GUI_MultiMachine;
+import miscutil.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
diff --git a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialPlatePress.java b/src/Java/miscutil/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialPlatePress.java
index 2f473d23d0..c79096386d 100644
--- a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialPlatePress.java
+++ b/src/Java/miscutil/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialPlatePress.java
@@ -1,6 +1,6 @@
-package miscutil.core.xmod.gregtech.common.tileentities.machines.multi;
+package miscutil.xmod.gregtech.common.tileentities.machines.multi;
 
-import static miscutil.core.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks.GTID;
+import static miscutil.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks.GTID;
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
@@ -16,7 +16,7 @@ import java.util.Arrays;
 
 import miscutil.core.block.ModBlocks;
 import miscutil.core.lib.CORE;
-import miscutil.core.xmod.gregtech.api.gui.GUI_MultiMachine;
+import miscutil.xmod.gregtech.api.gui.GUI_MultiMachine;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
diff --git a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialSinter.java b/src/Java/miscutil/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialSinter.java
index 165a8e15a0..79a2543659 100644
--- a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialSinter.java
+++ b/src/Java/miscutil/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialSinter.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.common.tileentities.machines.multi;
+package miscutil.xmod.gregtech.common.tileentities.machines.multi;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
@@ -16,7 +16,7 @@ import java.util.ArrayList;
 import miscutil.core.block.ModBlocks;
 import miscutil.core.lib.CORE;
 import miscutil.core.util.Utils;
-import miscutil.core.xmod.gregtech.api.gui.GUI_MultiMachine;
+import miscutil.xmod.gregtech.api.gui.GUI_MultiMachine;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.entity.player.InventoryPlayer;
diff --git a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialWireMill.java b/src/Java/miscutil/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialWireMill.java
index 6151d85d7c..60ad31f1aa 100644
--- a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialWireMill.java
+++ b/src/Java/miscutil/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialWireMill.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.common.tileentities.machines.multi;
+package miscutil.xmod.gregtech.common.tileentities.machines.multi;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
@@ -16,7 +16,7 @@ import java.util.ArrayList;
 import miscutil.core.block.ModBlocks;
 import miscutil.core.lib.CORE;
 import miscutil.core.util.Utils;
-import miscutil.core.xmod.gregtech.api.gui.GUI_MultiMachine;
+import miscutil.xmod.gregtech.api.gui.GUI_MultiMachine;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
diff --git a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIronBlastFurnace.java b/src/Java/miscutil/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIronBlastFurnace.java
index 3f651f9c3a..e88d846e90 100644
--- a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIronBlastFurnace.java
+++ b/src/Java/miscutil/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIronBlastFurnace.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.common.tileentities.machines.multi;
+package miscutil.xmod.gregtech.common.tileentities.machines.multi;
 
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.Materials;
@@ -13,8 +13,8 @@ import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Utility;
 import miscutil.core.block.ModBlocks;
 import miscutil.core.lib.CORE;
-import miscutil.core.xmod.gregtech.api.gui.CONTAINER_IronBlastFurnace;
-import miscutil.core.xmod.gregtech.api.gui.GUI_IronBlastFurnace;
+import miscutil.xmod.gregtech.api.gui.CONTAINER_IronBlastFurnace;
+import miscutil.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/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityMassFabricator.java b/src/Java/miscutil/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityMassFabricator.java
index 692ec16922..36a645b3e3 100644
--- a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityMassFabricator.java
+++ b/src/Java/miscutil/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityMassFabricator.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.common.tileentities.machines.multi;
+package miscutil.xmod.gregtech.common.tileentities.machines.multi;
 
 import gregtech.api.enums.ConfigCategories;
 import gregtech.api.enums.Materials;
@@ -19,8 +19,8 @@ import miscutil.core.block.ModBlocks;
 import miscutil.core.lib.CORE;
 import miscutil.core.util.Utils;
 import miscutil.core.util.item.UtilsItems;
-import miscutil.core.xmod.gregtech.api.gui.GUI_MultiMachine;
-import miscutil.core.xmod.gregtech.api.util.GregtechRecipe;
+import miscutil.xmod.gregtech.api.gui.GUI_MultiMachine;
+import miscutil.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/core/xmod/gregtech/common/tools/TOOL_Gregtech_Base.java b/src/Java/miscutil/xmod/gregtech/common/tools/TOOL_Gregtech_Base.java
index 4d7228c4a5..aae55041c7 100644
--- a/src/Java/miscutil/core/xmod/gregtech/common/tools/TOOL_Gregtech_Base.java
+++ b/src/Java/miscutil/xmod/gregtech/common/tools/TOOL_Gregtech_Base.java
@@ -1,12 +1,12 @@
-package miscutil.core.xmod.gregtech.common.tools;
+package miscutil.xmod.gregtech.common.tools;
 
 import gregtech.api.GregTech_API;
 import gregtech.api.damagesources.GT_DamageSources;
 
 import java.util.List;
 
-import miscutil.core.xmod.gregtech.api.interfaces.internal.Interface_ToolStats;
-import miscutil.core.xmod.gregtech.api.items.Gregtech_MetaTool;
+import miscutil.xmod.gregtech.api.interfaces.internal.Interface_ToolStats;
+import miscutil.xmod.gregtech.api.items.Gregtech_MetaTool;
 import net.minecraft.block.Block;
 import net.minecraft.enchantment.Enchantment;
 import net.minecraft.entity.Entity;
diff --git a/src/Java/miscutil/core/xmod/gregtech/common/tools/TOOL_Gregtech_BaseMultiblockItem.java b/src/Java/miscutil/xmod/gregtech/common/tools/TOOL_Gregtech_BaseMultiblockItem.java
index 421d8d02a8..7ed7bcefd3 100644
--- a/src/Java/miscutil/core/xmod/gregtech/common/tools/TOOL_Gregtech_BaseMultiblockItem.java
+++ b/src/Java/miscutil/xmod/gregtech/common/tools/TOOL_Gregtech_BaseMultiblockItem.java
@@ -1,7 +1,7 @@
-package miscutil.core.xmod.gregtech.common.tools;
+package miscutil.xmod.gregtech.common.tools;
 
 import gregtech.api.interfaces.IIconContainer;
-import miscutil.core.xmod.gregtech.api.items.Gregtech_MetaTool;
+import miscutil.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/core/xmod/gregtech/common/tools/TOOL_Gregtech_Choocher.java b/src/Java/miscutil/xmod/gregtech/common/tools/TOOL_Gregtech_Choocher.java
index f50e91c90e..71bb4768d4 100644
--- a/src/Java/miscutil/core/xmod/gregtech/common/tools/TOOL_Gregtech_Choocher.java
+++ b/src/Java/miscutil/xmod/gregtech/common/tools/TOOL_Gregtech_Choocher.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.common.tools;
+package miscutil.xmod.gregtech.common.tools;
 
 import gregtech.GT_Mod;
 import gregtech.api.GregTech_API;
@@ -10,9 +10,9 @@ import gregtech.api.util.GT_Utility;
 import java.util.Arrays;
 import java.util.List;
 
-import miscutil.core.xmod.gregtech.api.items.Gregtech_MetaTool;
-import miscutil.core.xmod.gregtech.api.items.types.ToolType_HardHammer;
-import miscutil.core.xmod.gregtech.api.items.types.ToolType_Wrench;
+import miscutil.xmod.gregtech.api.items.Gregtech_MetaTool;
+import miscutil.xmod.gregtech.api.items.types.ToolType_HardHammer;
+import miscutil.xmod.gregtech.api.items.types.ToolType_Wrench;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.Entity;
diff --git a/src/Java/miscutil/core/xmod/gregtech/common/tools/TOOL_Gregtech_MaxEfficiencyMultiBlockItem.java b/src/Java/miscutil/xmod/gregtech/common/tools/TOOL_Gregtech_MaxEfficiencyMultiBlockItem.java
index c1c5c92212..aed6c9b4eb 100644
--- a/src/Java/miscutil/core/xmod/gregtech/common/tools/TOOL_Gregtech_MaxEfficiencyMultiBlockItem.java
+++ b/src/Java/miscutil/xmod/gregtech/common/tools/TOOL_Gregtech_MaxEfficiencyMultiBlockItem.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.common.tools;
+package miscutil.xmod.gregtech.common.tools;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
diff --git a/src/Java/miscutil/core/xmod/gregtech/loaders/Processing_Block.java b/src/Java/miscutil/xmod/gregtech/loaders/Processing_Block.java
index 409be09a1f..2440a4d673 100644
--- a/src/Java/miscutil/core/xmod/gregtech/loaders/Processing_Block.java
+++ b/src/Java/miscutil/xmod/gregtech/loaders/Processing_Block.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.loaders;
+package miscutil.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.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 miscutil.xmod.gregtech.api.enums.GregtechOrePrefixes;
+import miscutil.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
+import miscutil.xmod.gregtech.api.interfaces.internal.Interface_OreRecipeRegistrator;
+import miscutil.xmod.gregtech.api.util.GregtechOreDictUnificator;
 import net.minecraft.item.ItemStack;
 
 public class Processing_Block implements Interface_OreRecipeRegistrator {
diff --git a/src/Java/miscutil/core/xmod/gregtech/loaders/Processing_HotIngots.java b/src/Java/miscutil/xmod/gregtech/loaders/Processing_HotIngots.java
index 070ce08ce0..34c9e8258f 100644
--- a/src/Java/miscutil/core/xmod/gregtech/loaders/Processing_HotIngots.java
+++ b/src/Java/miscutil/xmod/gregtech/loaders/Processing_HotIngots.java
@@ -1,13 +1,13 @@
-package miscutil.core.xmod.gregtech.loaders;
+package miscutil.xmod.gregtech.loaders;
 
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Utility;
 import miscutil.core.util.Utils;
-import miscutil.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.xmod.gregtech.api.enums.GregtechOrePrefixes;
+import miscutil.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
+import miscutil.xmod.gregtech.api.interfaces.internal.Interface_OreRecipeRegistrator;
 import net.minecraft.item.ItemStack;
 
 public class Processing_HotIngots implements Interface_OreRecipeRegistrator {
diff --git a/src/Java/miscutil/core/xmod/gregtech/loaders/Processing_Ingot1.java b/src/Java/miscutil/xmod/gregtech/loaders/Processing_Ingot1.java
index cd1db13c57..d8b13e2df0 100644
--- a/src/Java/miscutil/core/xmod/gregtech/loaders/Processing_Ingot1.java
+++ b/src/Java/miscutil/xmod/gregtech/loaders/Processing_Ingot1.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.loaders;
+package miscutil.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.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 miscutil.xmod.gregtech.api.enums.GregtechOrePrefixes;
+import miscutil.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
+import miscutil.xmod.gregtech.api.interfaces.internal.Interface_OreRecipeRegistrator;
+import miscutil.xmod.gregtech.api.util.GregtechRecipeRegistrator;
 import net.minecraft.item.ItemStack;
 
 public class Processing_Ingot1 implements Interface_OreRecipeRegistrator {
diff --git a/src/Java/miscutil/core/xmod/gregtech/loaders/Processing_Plate1.java b/src/Java/miscutil/xmod/gregtech/loaders/Processing_Plate1.java
index a63a938310..c7e17397f8 100644
--- a/src/Java/miscutil/core/xmod/gregtech/loaders/Processing_Plate1.java
+++ b/src/Java/miscutil/xmod/gregtech/loaders/Processing_Plate1.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.loaders;
+package miscutil.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.core.xmod.gregtech.api.enums.GregtechOrePrefixes;
-import miscutil.core.xmod.gregtech.api.interfaces.internal.Interface_OreRecipeRegistrator;
+import miscutil.xmod.gregtech.api.enums.GregtechOrePrefixes;
+import miscutil.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/xmod/gregtech/loaders/Processing_Textures_Items.java b/src/Java/miscutil/xmod/gregtech/loaders/Processing_Textures_Items.java
index 584e7455b8..f19bfccddb 100644
--- a/src/Java/miscutil/core/xmod/gregtech/loaders/Processing_Textures_Items.java
+++ b/src/Java/miscutil/xmod/gregtech/loaders/Processing_Textures_Items.java
@@ -1,6 +1,6 @@
-package miscutil.core.xmod.gregtech.loaders;
+package miscutil.xmod.gregtech.loaders;
 
-import miscutil.core.xmod.gregtech.api.enums.GregtechTextures.ItemIcons.CustomIcon;
+import miscutil.xmod.gregtech.api.enums.GregtechTextures.ItemIcons.CustomIcon;
 
 public class Processing_Textures_Items {
 	
diff --git a/src/Java/miscutil/core/xmod/gregtech/recipes/GregtechRecipeAdder.java b/src/Java/miscutil/xmod/gregtech/recipes/GregtechRecipeAdder.java
index 0e422f32d3..5460689ec8 100644
--- a/src/Java/miscutil/core/xmod/gregtech/recipes/GregtechRecipeAdder.java
+++ b/src/Java/miscutil/xmod/gregtech/recipes/GregtechRecipeAdder.java
@@ -1,11 +1,11 @@
-package miscutil.core.xmod.gregtech.recipes;
+package miscutil.xmod.gregtech.recipes;
 
 import gregtech.api.GregTech_API;
 import miscutil.core.util.Utils;
-import miscutil.core.xmod.gregtech.api.interfaces.internal.IGregtech_RecipeAdder;
-import miscutil.core.xmod.gregtech.api.util.GregtechRecipe;
-import miscutil.core.xmod.gregtech.recipes.machines.RECIPEHANDLER_CokeOven;
-import miscutil.core.xmod.gregtech.recipes.machines.RECIPEHANDLER_MatterFabricator;
+import miscutil.xmod.gregtech.api.interfaces.internal.IGregtech_RecipeAdder;
+import miscutil.xmod.gregtech.api.util.GregtechRecipe;
+import miscutil.xmod.gregtech.recipes.machines.RECIPEHANDLER_CokeOven;
+import miscutil.xmod.gregtech.recipes.machines.RECIPEHANDLER_MatterFabricator;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 
diff --git a/src/Java/miscutil/core/xmod/gregtech/recipes/machines/RECIPEHANDLER_CokeOven.java b/src/Java/miscutil/xmod/gregtech/recipes/machines/RECIPEHANDLER_CokeOven.java
index cbb17b009f..66c761564b 100644
--- a/src/Java/miscutil/core/xmod/gregtech/recipes/machines/RECIPEHANDLER_CokeOven.java
+++ b/src/Java/miscutil/xmod/gregtech/recipes/machines/RECIPEHANDLER_CokeOven.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.recipes.machines;
+package miscutil.xmod.gregtech.recipes.machines;
 
 import miscutil.core.util.Utils;
 import net.minecraft.item.ItemStack;
diff --git a/src/Java/miscutil/core/xmod/gregtech/recipes/machines/RECIPEHANDLER_MatterFabricator.java b/src/Java/miscutil/xmod/gregtech/recipes/machines/RECIPEHANDLER_MatterFabricator.java
index 053f268083..165112451f 100644
--- a/src/Java/miscutil/core/xmod/gregtech/recipes/machines/RECIPEHANDLER_MatterFabricator.java
+++ b/src/Java/miscutil/xmod/gregtech/recipes/machines/RECIPEHANDLER_MatterFabricator.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.gregtech.recipes.machines;
+package miscutil.xmod.gregtech.recipes.machines;
 
 import miscutil.core.util.Utils;
 import net.minecraftforge.fluids.FluidStack;
diff --git a/src/Java/miscutil/core/xmod/growthcraft/HANDLER_GC.java b/src/Java/miscutil/xmod/growthcraft/HANDLER_GC.java
index 78f416e514..6046efa16f 100644
--- a/src/Java/miscutil/core/xmod/growthcraft/HANDLER_GC.java
+++ b/src/Java/miscutil/xmod/growthcraft/HANDLER_GC.java
@@ -1,7 +1,7 @@
-package miscutil.core.xmod.growthcraft;
+package miscutil.xmod.growthcraft;
 
 import miscutil.core.lib.LoadedMods;
-import miscutil.core.xmod.growthcraft.booze.Register_Booze;
+import miscutil.xmod.growthcraft.booze.Register_Booze;
 
 public class HANDLER_GC {
 
diff --git a/src/Java/miscutil/core/xmod/growthcraft/booze/Register_Booze.java b/src/Java/miscutil/xmod/growthcraft/booze/Register_Booze.java
index 7c26d90c31..4dcb11e203 100644
--- a/src/Java/miscutil/core/xmod/growthcraft/booze/Register_Booze.java
+++ b/src/Java/miscutil/xmod/growthcraft/booze/Register_Booze.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.growthcraft.booze;
+package miscutil.xmod.growthcraft.booze;
 
 import growthcraft.api.cellar.Booze;
 import growthcraft.api.cellar.CellarRegistry;
diff --git a/src/Java/miscutil/core/xmod/ic2/HANDLER_IC2.java b/src/Java/miscutil/xmod/ic2/HANDLER_IC2.java
index d4033fbf9b..fd348eef69 100644
--- a/src/Java/miscutil/core/xmod/ic2/HANDLER_IC2.java
+++ b/src/Java/miscutil/xmod/ic2/HANDLER_IC2.java
@@ -1,15 +1,17 @@
-package miscutil.core.xmod.ic2;
+package miscutil.xmod.ic2;
 
+import ic2.core.init.InternalName;
 import miscutil.core.lib.LoadedMods;
-import miscutil.core.xmod.ic2.item.IC2_Items;
-import miscutil.core.xmod.ic2.recipe.RECIPE_IC2;
+import miscutil.xmod.ic2.block.RTGGenerator.BlockRTG;
+import miscutil.xmod.ic2.item.IC2_Items;
+import miscutil.xmod.ic2.recipe.RECIPE_IC2;
 
 public class HANDLER_IC2{
 
 	public static void preInit() {
 		if (LoadedMods.IndustrialCraft2){
 			IC2_Items.register();
-		    //new IC2_BlockKineticGenerator(InternalName.blockKineticGenerator);
+		    new BlockRTG(InternalName.blockGenerator);
 		}		
 	}
 
diff --git a/src/Java/miscutil/xmod/ic2/block/RTGGenerator/BlockRTG.java b/src/Java/miscutil/xmod/ic2/block/RTGGenerator/BlockRTG.java
new file mode 100644
index 0000000000..bda119af5c
--- /dev/null
+++ b/src/Java/miscutil/xmod/ic2/block/RTGGenerator/BlockRTG.java
@@ -0,0 +1,187 @@
+package miscutil.xmod.ic2.block.RTGGenerator;
+
+import ic2.core.IC2;
+import ic2.core.Ic2Items;
+import ic2.core.block.BlockMultiID;
+import ic2.core.block.TileEntityBlock;
+import ic2.core.block.generator.tileentity.TileEntityKineticGenerator;
+import ic2.core.block.generator.tileentity.TileEntityRTGenerator;
+import ic2.core.block.reactor.tileentity.TileEntityNuclearReactorElectric;
+import ic2.core.init.InternalName;
+import ic2.core.item.block.ItemGenerator;
+
+import java.util.Random;
+
+import miscutil.xmod.ic2.block.kieticgenerator.tileentity.TileEntityKineticWindGenerator;
+import miscutil.xmod.ic2.item.IC2_Items;
+import net.minecraft.block.material.Material;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.EnumRarity;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
+
+import org.apache.commons.lang3.mutable.MutableObject;
+
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+public class BlockRTG
+  extends BlockMultiID
+{
+  public BlockRTG(InternalName internalName1)
+  {
+    super(internalName1, Material.iron, ItemGenerator.class);
+    
+    setHardness(3.0F);
+    setStepSound(soundTypeMetal);
+    
+    IC2_Items.blockRTG = new ItemStack(this, 1, 0);
+    IC2_Items.blockKineticGenerator = new ItemStack(this, 1, 1);
+    
+    GameRegistry.registerTileEntity(TileEntityRTG.class, "Radioisotope Thermoelectric Generator Mach II");
+    GameRegistry.registerTileEntity(TileEntityKineticWindGenerator.class, "Kinetic Wind Generator Mach II");
+  }
+  
+  @Override
+public String getTextureFolder(int id)
+  {
+    return "generator";
+  }
+  
+  @Override
+public int damageDropped(int meta)
+  {
+    switch (meta)
+    {
+    case 2: 
+      return 2;
+    }
+    return 0;
+  }
+  
+  @Override
+public Class<? extends TileEntity> getTeClass(int meta, MutableObject<Class<?>[]> ctorArgTypes, MutableObject<Object[]> ctorArgs)
+  {
+    try
+    {
+      switch (meta)
+      {      
+      case 0: 
+        return TileEntityRTGenerator.class;    
+      case 1: 
+        return TileEntityKineticGenerator.class;
+      }
+    }
+    catch (Exception e)
+    {
+      throw new RuntimeException(e);
+    }
+    return null;
+  }
+  
+  /*
+   * 
+   *  {
+      case 0: 
+        return TileEntityGenerator.class;
+      case 1: 
+        return TileEntityGeoGenerator.class;
+      case 2: 
+        return TileEntityWaterGenerator.class;
+      case 3: 
+        return TileEntitySolarGenerator.class;
+      case 4: 
+        return TileEntityWindGenerator.class;
+      case 5: 
+        return TileEntityNuclearReactorElectric.class;
+      case 6: 
+        return TileEntityRTGenerator.class;
+      case 7: 
+        return TileEntitySemifluidGenerator.class;
+      case 8: 
+        return TileEntityStirlingGenerator.class;
+      case 9: 
+        return TileEntityKineticGenerator.class;
+      }
+   * 
+   * (non-Javadoc)
+   * @see net.minecraft.block.Block#randomDisplayTick(net.minecraft.world.World, int, int, int, java.util.Random)
+   */
+  
+  @Override
+public void randomDisplayTick(World world, int x, int y, int z, Random random)
+  {
+    if (!IC2.platform.isRendering()) {
+      return;
+    }
+    int meta = world.getBlockMetadata(x, y, z);
+    if ((meta == 0) && (isActive(world, x, y, z)))
+    {
+      TileEntityBlock te = (TileEntityBlock)getOwnTe(world, x, y, z);
+      if (te == null) {
+        return;
+      }
+      int l = te.getFacing();
+      float f = x + 0.5F;
+      float f1 = y + 0.0F + random.nextFloat() * 6.0F / 16.0F;
+      float f2 = z + 0.5F;
+      float f3 = 0.52F;
+      float f4 = random.nextFloat() * 0.6F - 0.3F;
+      switch (l)
+      {
+      case 4: 
+        world.spawnParticle("smoke", f - f3, f1, f2 + f4, 0.0D, 0.0D, 0.0D);
+        world.spawnParticle("flame", f - f3, f1, f2 + f4, 0.0D, 0.0D, 0.0D);
+        break;
+      case 5: 
+        world.spawnParticle("smoke", f + f3, f1, f2 + f4, 0.0D, 0.0D, 0.0D);
+        world.spawnParticle("flame", f + f3, f1, f2 + f4, 0.0D, 0.0D, 0.0D);
+        break;
+      case 2: 
+        world.spawnParticle("smoke", f + f4, f1, f2 - f3, 0.0D, 0.0D, 0.0D);
+        world.spawnParticle("flame", f + f4, f1, f2 - f3, 0.0D, 0.0D, 0.0D);
+        break;
+      case 3: 
+        world.spawnParticle("smoke", f + f4, f1, f2 + f3, 0.0D, 0.0D, 0.0D);
+        world.spawnParticle("flame", f + f4, f1, f2 + f3, 0.0D, 0.0D, 0.0D);
+      }
+    }
+    else if (meta == 5)
+    {
+      TileEntityNuclearReactorElectric te = (TileEntityNuclearReactorElectric)getOwnTe(world, x, y, z);
+      if (te == null) {
+        return;
+      }
+      int puffs = te.heat / 1000;
+      if (puffs <= 0) {
+        return;
+      }
+      puffs = world.rand.nextInt(puffs);
+      for (int n = 0; n < puffs; n++) {
+        world.spawnParticle("smoke", x + random.nextFloat(), y + 0.95F, z + random.nextFloat(), 0.0D, 0.0D, 0.0D);
+      }
+      puffs -= world.rand.nextInt(4) + 3;
+      for (int n = 0; n < puffs; n++) {
+        world.spawnParticle("flame", x + random.nextFloat(), y + 1.0F, z + random.nextFloat(), 0.0D, 0.0D, 0.0D);
+      }
+    }
+  }
+  
+  @Override
+public boolean onBlockActivated(World world, int i, int j, int k, EntityPlayer entityplayer, int side, float a, float b, float c)
+  {
+    if ((entityplayer.getCurrentEquippedItem() != null) && (entityplayer.getCurrentEquippedItem().isItemEqual(Ic2Items.reactorChamber))) {
+      return false;
+    }
+    return super.onBlockActivated(world, i, j, k, entityplayer, side, a, b, c);
+  }
+  
+  @Override
+@SideOnly(Side.CLIENT)
+  public EnumRarity getRarity(ItemStack stack)
+  {
+    return stack.getItemDamage() == 5 ? EnumRarity.uncommon : EnumRarity.common;
+  }
+}
diff --git a/src/Java/miscutil/xmod/ic2/block/RTGGenerator/TileEntityRTG.java b/src/Java/miscutil/xmod/ic2/block/RTGGenerator/TileEntityRTG.java
new file mode 100644
index 0000000000..f3b7949db2
--- /dev/null
+++ b/src/Java/miscutil/xmod/ic2/block/RTGGenerator/TileEntityRTG.java
@@ -0,0 +1,94 @@
+package miscutil.xmod.ic2.block.RTGGenerator;
+
+import ic2.core.ContainerBase;
+import ic2.core.block.generator.tileentity.TileEntityBaseGenerator;
+import ic2.core.block.invslot.InvSlot;
+import miscutil.xmod.ic2.block.RTGGenerator.gui.CONTAINER_RadioThermalGenerator;
+import miscutil.xmod.ic2.block.RTGGenerator.gui.GUI_RadioThermalGenerator;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.entity.player.EntityPlayer;
+
+public class TileEntityRTG
+extends TileEntityBaseGenerator
+{
+	public final InvSlot fuelSlot;
+
+	public TileEntityRTG()
+	{
+		super(Math.round(16.0F * efficiency), 1, 20000);
+
+		this.fuelSlot = this.invSlots.get(0);
+	}
+
+	@Override
+	public int gaugeFuelScaled(int i)
+	{
+		return i;
+	}
+
+	@Override
+	public boolean gainEnergy()
+	{
+		int counter = 0;
+		for (int i = 0; i < this.fuelSlot.size(); i++) {
+			if (this.fuelSlot.get(i) != null) {
+				counter++;
+			}
+		}
+		if (counter == 0) {
+			return false;
+		}
+		this.storage += (int)(Math.pow(2.0D, counter - 1) * efficiency);
+		return true;
+	}
+
+	@Override
+	public boolean gainFuel()
+	{
+		return false;
+	}
+
+	@Override
+	public boolean needsFuel()
+	{
+		return true;
+	}
+
+	@Override
+	public String getInventoryName()
+	{
+		return "RTGenerator";
+	}
+
+
+	public Object getGui(EntityPlayer player, int data)
+	{
+		return new GUI_RadioThermalGenerator(this, player);
+	}
+
+
+	public Object getGuiContainer(EntityPlayer player, int data)
+	{
+		return new CONTAINER_RadioThermalGenerator(this, player);
+	}
+
+	@Override
+	public boolean delayActiveUpdate()
+	{
+		return true;
+	}
+
+	private static final float efficiency = 100;
+
+	@Override
+	public GuiScreen getGui(EntityPlayer arg0, boolean arg1) {
+		getGui(arg0, 1);
+		return null;
+	}
+
+	@Override
+	public ContainerBase<?> getGuiContainer(EntityPlayer arg0) {
+		getGuiContainer(arg0, 1);
+		return null;
+	}
+}
diff --git a/src/Java/miscutil/xmod/ic2/block/RTGGenerator/gui/CONTAINER_RadioThermalGenerator.java b/src/Java/miscutil/xmod/ic2/block/RTGGenerator/gui/CONTAINER_RadioThermalGenerator.java
new file mode 100644
index 0000000000..b70bb6bd8d
--- /dev/null
+++ b/src/Java/miscutil/xmod/ic2/block/RTGGenerator/gui/CONTAINER_RadioThermalGenerator.java
@@ -0,0 +1,98 @@
+package miscutil.xmod.ic2.block.RTGGenerator.gui;
+
+import miscutil.core.lib.CORE;
+import miscutil.core.slots.SlotRTG;
+import miscutil.xmod.ic2.block.RTGGenerator.TileEntityRTG;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
+import forestry.api.apiculture.IHiveFrame;
+import forestry.core.gui.tooltips.ToolTip;
+
+public class CONTAINER_RadioThermalGenerator extends Container
+{
+	private TileEntityRTG te;
+
+	public static final int INPUT_1 = 0;
+	private final ResourceLocation beeFrameIcon = new ResourceLocation(CORE.MODID, "textures/items/machine_Charger.png");
+	public ToolTip newTip = new ToolTip();
+	public final SlotRTG rtgSlot;
+
+	private int slotID = 0;
+
+	public CONTAINER_RadioThermalGenerator(TileEntityRTG te, EntityPlayer player)
+	{
+		this.te = te;
+		this.rtgSlot = new SlotRTG(te, slotID++, 80, 35);
+
+		//Fuel Slot A
+		rtgSlot.setBackgroundIconTexture(beeFrameIcon);
+		
+		addSlotToContainer(rtgSlot);
+
+		//Inventory
+		for (int i = 0; i < 3; i++)
+		{
+			for (int j = 0; j < 9; j++)
+			{
+				addSlotToContainer(new Slot(player.inventory, j + i * 9 + 9, 8 + j * 18, 84 + i * 18));
+			}
+		}
+		// Hotbar
+		for (int i = 0; i < 9; i++)
+		{
+			addSlotToContainer(new Slot(player.inventory, i, 8 + i * 18, 142));
+		}
+	}
+
+	@Override
+	public ItemStack transferStackInSlot(EntityPlayer player, int slotRaw)
+	{
+		ItemStack stack = null;
+		Slot slot = (Slot)inventorySlots.get(slotRaw);
+
+		if (slot != null && slot.getHasStack())
+		{
+			ItemStack stackInSlot = slot.getStack();
+			stack = stackInSlot.copy();
+			
+			
+			//If your inventory only stores certain instances of Items,
+			//you can implement shift-clicking to your inventory like this:
+			// Check that the item is the right type
+			if (!(stack.getItem() instanceof IHiveFrame)){
+			return null;
+			}
+
+			if (slotRaw < 1)
+			{
+				if (!mergeItemStack(stackInSlot, 3 * 9, inventorySlots.size(), true))
+				{
+					return null;
+				}
+			}
+			else if (!mergeItemStack(stackInSlot, 0, 3 * 9, false))
+			{
+				return null;
+			}
+
+			if (stackInSlot.stackSize == 0)
+			{
+				slot.putStack((ItemStack)null);
+			}
+			else
+			{
+				slot.onSlotChanged();
+			}
+		}
+		return stack;
+	}
+
+	@Override
+	public boolean canInteractWith(EntityPlayer player)
+	{
+		return te.isUseableByPlayer(player);
+	}
+}
\ No newline at end of file
diff --git a/src/Java/miscutil/xmod/ic2/block/RTGGenerator/gui/GUI_RadioThermalGenerator.java b/src/Java/miscutil/xmod/ic2/block/RTGGenerator/gui/GUI_RadioThermalGenerator.java
new file mode 100644
index 0000000000..4c9442d56d
--- /dev/null
+++ b/src/Java/miscutil/xmod/ic2/block/RTGGenerator/gui/GUI_RadioThermalGenerator.java
@@ -0,0 +1,49 @@
+package miscutil.xmod.ic2.block.RTGGenerator.gui;
+
+import miscutil.core.lib.CORE;
+import miscutil.xmod.ic2.block.RTGGenerator.TileEntityRTG;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.util.ResourceLocation;
+
+import org.lwjgl.opengl.GL11;
+
+public class GUI_RadioThermalGenerator extends GuiContainer
+{
+    private ResourceLocation texture = new ResourceLocation(CORE.MODID, "textures/gui/machine_Charger.png");
+ 
+    private InventoryPlayer inventory;
+    private TileEntityRTG te;
+ 
+    public GUI_RadioThermalGenerator(TileEntityRTG te, EntityPlayer player)
+    {
+        super(new CONTAINER_RadioThermalGenerator(te, player));
+        inventory = player.inventory;
+        this.te = te;
+    }
+ 
+    @Override
+    protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3)
+    {
+        Minecraft.getMinecraft().renderEngine.bindTexture(texture);
+ 
+        GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+ 
+        int x = (width - xSize) / 2;
+        int y = (height - ySize) / 2;
+ 
+        drawTexturedModalRect(x, y, 0, 0, xSize, ySize);
+    }
+ 
+    @Override
+    protected void drawGuiContainerForegroundLayer(int par1, int par2)
+    {
+        fontRendererObj.drawString(I18n.format("Alveary Frame Housing"), (xSize / 2) - (fontRendererObj.getStringWidth(I18n.format("Alveary Frame Housing")) / 2), 6, 4210752, false);
+        fontRendererObj.drawString(I18n.format(inventory.getInventoryName()), 8, ySize - 96 + 2, 4210752);
+        //fontRendererObj.drawString(I18n.format("Charge:"+te.getCharge()+"~"), 8, ySize - 96 + 2, 4210752);
+        //fontRendererObj.drawString(I18n.format("Progress:"+te.getProgress()+"ticks"), 80, ySize - 96 + 2, 4210752);
+    }
+}
\ No newline at end of file
diff --git a/src/Java/miscutil/xmod/ic2/block/kieticgenerator/IC2_BlockKineticGenerator.java b/src/Java/miscutil/xmod/ic2/block/kieticgenerator/IC2_BlockKineticGenerator.java
new file mode 100644
index 0000000000..75f4f5f072
--- /dev/null
+++ b/src/Java/miscutil/xmod/ic2/block/kieticgenerator/IC2_BlockKineticGenerator.java
@@ -0,0 +1,76 @@
+package miscutil.xmod.ic2.block.kieticgenerator;
+
+import ic2.core.block.BlockMultiID;
+import ic2.core.block.kineticgenerator.tileentity.TileEntityManualKineticGenerator;
+import ic2.core.block.kineticgenerator.tileentity.TileEntityWindKineticGenerator;
+import ic2.core.init.InternalName;
+import ic2.core.item.block.ItemKineticGenerator;
+import miscutil.core.creative.AddToCreativeTab;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
+
+import org.apache.commons.lang3.mutable.MutableObject;
+
+import cpw.mods.fml.common.registry.GameRegistry;
+
+public class IC2_BlockKineticGenerator
+  extends BlockMultiID
+{
+  public IC2_BlockKineticGenerator(InternalName internalName1)
+  {
+    super(internalName1, Material.iron, ItemKineticGenerator.class);
+    
+    setHardness(3.0F);
+    setStepSound(Block.soundTypeMetal);
+    this.setCreativeTab(AddToCreativeTab.tabMachines);
+    
+    GameRegistry.registerTileEntity(TileEntityWindKineticGenerator.class, "Advanced Kinetic Wind Generator");
+    
+  }
+  
+  @Override
+public String getTextureFolder(int id)
+  {
+    return "kineticgenerator";
+  }
+  
+  @Override
+public int damageDropped(int meta)
+  {
+    return meta;
+  }
+  
+  @Override
+public Class<? extends TileEntity> getTeClass(int meta, MutableObject<Class<?>[]> ctorArgTypes, MutableObject<Object[]> ctorArgs)
+  {
+    try
+    {
+      switch (meta)
+      {
+      case 0: 
+        return TileEntityWindKineticGenerator.class;     
+      }
+    }
+    catch (Exception e)
+    {
+      throw new RuntimeException(e);
+    }
+    return null;
+  }
+  
+  @Override
+public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int side, float a, float b, float c)
+  {
+    if (entityPlayer.isSneaking()) {
+      return false;
+    }
+    TileEntity te = getOwnTe(world, x, y, z);
+    if ((te != null) && ((te instanceof TileEntityManualKineticGenerator))) {
+      return ((TileEntityManualKineticGenerator)te).playerKlicked(entityPlayer);
+    }
+    return super.onBlockActivated(world, x, y, z, entityPlayer, side, a, b, c);
+  }
+}
diff --git a/src/Java/miscutil/xmod/ic2/block/kieticgenerator/IC2_TEComponent.java b/src/Java/miscutil/xmod/ic2/block/kieticgenerator/IC2_TEComponent.java
new file mode 100644
index 0000000000..bd417968d6
--- /dev/null
+++ b/src/Java/miscutil/xmod/ic2/block/kieticgenerator/IC2_TEComponent.java
@@ -0,0 +1,48 @@
+package miscutil.xmod.ic2.block.kieticgenerator;
+
+import ic2.core.block.TileEntityBlock;
+
+import java.io.DataInput;
+import java.io.IOException;
+
+import net.minecraft.block.Block;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+
+public abstract class IC2_TEComponent
+{
+  protected final TileEntityBlock parent;
+  
+  public IC2_TEComponent(TileEntityBlock parent)
+  {
+    this.parent = parent;
+  }
+  
+  public abstract String getDefaultName();
+  
+  public void readFromNbt(NBTTagCompound nbt) {}
+  
+  public NBTTagCompound writeToNbt()
+  {
+    return null;
+  }
+  
+  public void onLoaded() {}
+  
+  public void onUnloaded() {}
+  
+  public void onNeighborUpdate(Block srcBlock) {}
+  
+  public void onContainerUpdate(String name, EntityPlayerMP player) {}
+  
+  public void onNetworkUpdate(DataInput is)
+    throws IOException
+  {}
+  
+  public boolean enableWorldTick()
+  {
+    return false;
+  }
+  
+  public void onWorldTick() {}
+}
diff --git a/src/Java/miscutil/xmod/ic2/block/kieticgenerator/container/ContainerKineticWindgenerator.java b/src/Java/miscutil/xmod/ic2/block/kieticgenerator/container/ContainerKineticWindgenerator.java
new file mode 100644
index 0000000000..c8c6b05c1e
--- /dev/null
+++ b/src/Java/miscutil/xmod/ic2/block/kieticgenerator/container/ContainerKineticWindgenerator.java
@@ -0,0 +1,27 @@
+package miscutil.xmod.ic2.block.kieticgenerator.container;
+
+import ic2.core.ContainerFullInv;
+import ic2.core.block.kineticgenerator.tileentity.TileEntityWindKineticGenerator;
+import ic2.core.slot.SlotInvSlot;
+
+import java.util.List;
+
+import net.minecraft.entity.player.EntityPlayer;
+
+public class ContainerKineticWindgenerator
+  extends ContainerFullInv<TileEntityWindKineticGenerator>
+{
+  public ContainerKineticWindgenerator(EntityPlayer entityPlayer, TileEntityWindKineticGenerator tileEntity1)
+  {
+    super(entityPlayer, tileEntity1, 166);
+    
+    addSlotToContainer(new SlotInvSlot(tileEntity1.rotorSlot, 0, 80, 26));
+  }
+  
+  public List<String> getNetworkedFields()
+  {
+    List<String> ret = super.getNetworkedFields();
+    ret.add("windStrength");
+    return ret;
+  }
+}
diff --git a/src/Java/miscutil/xmod/ic2/block/kieticgenerator/container/IC2_ContainerBase.java b/src/Java/miscutil/xmod/ic2/block/kieticgenerator/container/IC2_ContainerBase.java
new file mode 100644
index 0000000000..6892220b06
--- /dev/null
+++ b/src/Java/miscutil/xmod/ic2/block/kieticgenerator/container/IC2_ContainerBase.java
@@ -0,0 +1,5 @@
+package miscutil.xmod.ic2.block.kieticgenerator.container;
+
+public class IC2_ContainerBase {
+
+}
diff --git a/src/Java/miscutil/xmod/ic2/block/kieticgenerator/gui/GuiKineticWindGenerator.java b/src/Java/miscutil/xmod/ic2/block/kieticgenerator/gui/GuiKineticWindGenerator.java
new file mode 100644
index 0000000000..9b816b7f90
--- /dev/null
+++ b/src/Java/miscutil/xmod/ic2/block/kieticgenerator/gui/GuiKineticWindGenerator.java
@@ -0,0 +1,76 @@
+package miscutil.xmod.ic2.block.kieticgenerator.gui;
+
+import ic2.core.IC2;
+import ic2.core.block.kineticgenerator.container.ContainerWindKineticGenerator;
+import ic2.core.block.kineticgenerator.tileentity.TileEntityWindKineticGenerator;
+import ic2.core.util.GuiTooltiphelper;
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.StatCollector;
+
+import org.lwjgl.opengl.GL11;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+@SideOnly(Side.CLIENT)
+public class GuiKineticWindGenerator
+  extends GuiContainer
+{
+  public ContainerWindKineticGenerator container;
+  public String name;
+  
+  public GuiKineticWindGenerator(ContainerWindKineticGenerator container1)
+  {
+    super(container1);
+    
+    this.container = container1;
+    this.name = StatCollector.translateToLocal("ic2.WindKineticGenerator.gui.name");
+  }
+  
+  protected void drawGuiContainerForegroundLayer(int par1, int par2)
+  {
+    this.fontRendererObj.drawString(this.name, (this.xSize - this.fontRendererObj.getStringWidth(this.name)) / 2, 6, 4210752);
+    if (((TileEntityWindKineticGenerator)this.container.base).checkrotor())
+    {
+      if (!((TileEntityWindKineticGenerator)this.container.base).rotorspace())
+      {
+        this.fontRendererObj.drawString(StatCollector.translateToLocal("ic2.WindKineticGenerator.gui.rotorspace"), 20, 52, 2157374);
+      }
+      else if ((((TileEntityWindKineticGenerator)this.container.base).checkrotor()) && (!((TileEntityWindKineticGenerator)this.container.base).guiisminWindStrength()))
+      {
+        this.fontRendererObj.drawString(StatCollector.translateToLocal("ic2.WindKineticGenerator.gui.windweak1"), 27, 52, 2157374);
+        this.fontRendererObj.drawString(StatCollector.translateToLocal("ic2.WindKineticGenerator.gui.windweak2"), 24, 69, 2157374);
+      }
+      else
+      {
+        this.fontRendererObj.drawString(StatCollector.translateToLocalFormatted("ic2.WindKineticGenerator.gui.output", new Object[] { Integer.valueOf(((TileEntityWindKineticGenerator)this.container.base).getKuOutput()) }), 55, 52, 2157374);
+        this.fontRendererObj.drawString(((TileEntityWindKineticGenerator)this.container.base).getRotorhealth() + " %", 46, 70, 2157374);
+        if (((TileEntityWindKineticGenerator)this.container.base).guiisoverload())
+        {
+          GuiTooltiphelper.drawAreaTooltip(par1 - this.guiLeft, par2 - this.guiTop, StatCollector.translateToLocal("ic2.WindKineticGenerator.error.overload"), 44, 20, 79, 45);
+          GuiTooltiphelper.drawAreaTooltip(par1 - this.guiLeft, par2 - this.guiTop, StatCollector.translateToLocal("ic2.WindKineticGenerator.error.overload2"), 102, 20, 131, 45);
+        }
+      }
+    }
+    else {
+      this.fontRendererObj.drawString(StatCollector.translateToLocal("ic2.WindKineticGenerator.gui.rotormiss"), 27, 52, 2157374);
+    }
+  }
+  
+  protected void drawGuiContainerBackgroundLayer(float f, int x, int y)
+  {
+    GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+    this.mc.getTextureManager().bindTexture(background);
+    int j = (this.width - this.xSize) / 2;
+    int k = (this.height - this.ySize) / 2;
+    drawTexturedModalRect(j, k, 0, 0, this.xSize, this.ySize);
+    if ((((TileEntityWindKineticGenerator)this.container.base).guiisoverload()) && (((TileEntityWindKineticGenerator)this.container.base).checkrotor()))
+    {
+      drawTexturedModalRect(j + 44, k + 20, 176, 0, 30, 26);
+      drawTexturedModalRect(j + 102, k + 20, 176, 0, 30, 26);
+    }
+  }
+  
+  private static final ResourceLocation background = new ResourceLocation(IC2.textureDomain, "textures/gui/GUIWindKineticGenerator.png");
+}
diff --git a/src/Java/miscutil/xmod/ic2/block/kieticgenerator/tileentity/TileEntityKineticWindGenerator.java b/src/Java/miscutil/xmod/ic2/block/kieticgenerator/tileentity/TileEntityKineticWindGenerator.java
new file mode 100644
index 0000000000..076697956d
--- /dev/null
+++ b/src/Java/miscutil/xmod/ic2/block/kieticgenerator/tileentity/TileEntityKineticWindGenerator.java
@@ -0,0 +1,392 @@
+package miscutil.xmod.ic2.block.kieticgenerator.tileentity;
+
+import ic2.api.energy.tile.IKineticSource;
+import ic2.api.item.IKineticWindRotor;
+import ic2.core.ContainerBase;
+import ic2.core.IC2;
+import ic2.core.IHasGui;
+import ic2.core.WorldData;
+import ic2.core.block.invslot.InvSlotConsumableIKineticWindRotor;
+import ic2.core.block.kineticgenerator.container.ContainerWindKineticGenerator;
+import ic2.core.block.kineticgenerator.gui.GuiWindKineticGenerator;
+import ic2.core.block.kineticgenerator.tileentity.TileEntityWindKineticGenerator;
+import ic2.core.network.NetworkManager;
+import ic2.core.util.Util;
+
+import java.util.List;
+import java.util.Vector;
+
+import net.minecraft.block.Block;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.StatCollector;
+import net.minecraft.world.ChunkCache;
+import net.minecraftforge.common.util.ForgeDirection;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+public class TileEntityKineticWindGenerator
+extends TileEntityWindKineticGenerator
+implements IKineticSource, IHasGui
+{
+	public final InvSlotConsumableIKineticWindRotor rotorSlot;
+	private double windStrength;
+	private int obstructedCrossSection;
+	private int crossSection;
+	private int updateTicker;
+	private float rotationSpeed;
+	private static final double efficiencyRollOffExponent = 2.0D;
+	private static final int nominalRotationPeriod = 500;
+
+	public TileEntityKineticWindGenerator()
+	{
+		this.updateTicker = IC2.random.nextInt(getTickRate());
+		this.rotorSlot = new InvSlotConsumableIKineticWindRotor(this, "rotorslot", 0, 1);
+	}
+
+	@Override
+	public void updateEntity()
+	{
+		super.updateEntity();
+
+		assert (IC2.platform.isSimulating());
+		if (this.updateTicker++ % getTickRate() != 0) {
+			return;
+		}
+		boolean needsInvUpdate = false;
+		if (!this.rotorSlot.isEmpty())
+		{
+			if (checkSpace(1, true) == 0)
+			{
+				if (getActive() != true) {
+					setActive(true);
+				}
+				needsInvUpdate = true;
+			}
+			else
+			{
+				if (getActive()) {
+					setActive(false);
+				}
+				needsInvUpdate = true;
+			}
+		}
+		else
+		{
+			if (getActive()) {
+				setActive(false);
+			}
+			needsInvUpdate = true;
+		}
+		if (getActive())
+		{
+			this.crossSection = (getRotorDiameter() / 2 * 2 * 2 + 1);
+
+			this.crossSection *= this.crossSection;
+			this.obstructedCrossSection = checkSpace(getRotorDiameter() * 3, false);
+			if ((this.obstructedCrossSection > 0) && (this.obstructedCrossSection <= (getRotorDiameter() + 1) / 2)) {
+				this.obstructedCrossSection = 0;
+			} else if (this.obstructedCrossSection < 0) {
+				this.obstructedCrossSection = this.crossSection;
+			}
+			this.windStrength = calcWindStrength();
+
+			float speed = (float)Util.limit((this.windStrength - getMinWindStrength()) / getMaxWindStrength(), 0.0D, 2.0D);
+
+
+			setRotationSpeed(speed*2);
+			if (this.windStrength >= getMinWindStrength()) {
+				if (this.windStrength <= getMaxWindStrength()) {
+					this.rotorSlot.damage(1, false);
+				} else {
+					this.rotorSlot.damage(4, false);
+				}
+			}
+		}
+	}
+
+
+
+	@Override
+	public List<String> getNetworkedFields()
+	{
+		List<String> ret = new Vector<String>(1);
+
+		ret.add("rotationSpeed");
+		ret.add("rotorSlot");
+		ret.addAll(super.getNetworkedFields());
+
+		return ret;
+	}
+
+	@Override
+	public ContainerBase<TileEntityWindKineticGenerator> getGuiContainer(EntityPlayer entityPlayer)
+	{
+		return new ContainerWindKineticGenerator(entityPlayer, this);
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public GuiScreen getGui(EntityPlayer entityPlayer, boolean isAdmin)
+	{
+		return new GuiWindKineticGenerator(new ContainerWindKineticGenerator(entityPlayer, this));
+	}
+
+	@Override
+	public boolean facingMatchesDirection(ForgeDirection direction)
+	{
+		return direction.ordinal() == getFacing();
+	}
+
+	@Override
+	public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side)
+	{
+		if ((side == 0) || (side == 1)) {
+			return false;
+		}
+		return getFacing() != side;
+	}
+
+	@Override
+	public void setFacing(short side)
+	{
+		super.setFacing(side);
+	}
+
+	@Override
+	public boolean enableUpdateEntity()
+	{
+		return IC2.platform.isSimulating();
+	}
+
+	@Override
+	public String getRotorhealth()
+	{
+		if (!this.rotorSlot.isEmpty()) {
+			return StatCollector.translateToLocalFormatted("ic2.WindKineticGenerator.gui.rotorhealth", new Object[] { Integer.valueOf((int)(100.0F - this.rotorSlot.get().getItemDamage() / this.rotorSlot.get().getMaxDamage() * 100.0F)) });
+		}
+		return "";
+	}
+
+	@Override
+	public int maxrequestkineticenergyTick(ForgeDirection directionFrom)
+	{
+		return getKuOutput();
+	}
+
+	@Override
+	public int requestkineticenergy(ForgeDirection directionFrom, int requestkineticenergy)
+	{
+		if (facingMatchesDirection(directionFrom.getOpposite())) {
+			return Math.min(requestkineticenergy, getKuOutput());
+		}
+		return 0;
+	}
+
+	@Override
+	public String getInventoryName()
+	{
+		return "Advanced Kinetic Wind Generator";
+	}
+
+	@Override
+	public void onGuiClosed(EntityPlayer entityPlayer) {}
+
+	@Override
+	public boolean shouldRenderInPass(int pass)
+	{
+		return pass == 0;
+	}
+
+	@Override
+	public int checkSpace(int length, boolean onlyrotor)
+	{
+		int box = getRotorDiameter() / 2;
+		int lentemp = 0;
+		if (onlyrotor)
+		{
+			length = 1;
+			lentemp = length + 1;
+		}
+		if (!onlyrotor) {
+			box *= 2;
+		}
+		ForgeDirection fwdDir = ForgeDirection.VALID_DIRECTIONS[getFacing()];
+		ForgeDirection rightDir = fwdDir.getRotation(ForgeDirection.DOWN);
+
+		int xMaxDist = Math.abs(length * fwdDir.offsetX + box * rightDir.offsetX);
+
+		int zMaxDist = Math.abs(length * fwdDir.offsetZ + box * rightDir.offsetZ);
+
+
+		ChunkCache chunkCache = new ChunkCache(this.worldObj, this.xCoord - xMaxDist, this.yCoord - box, this.zCoord - zMaxDist, this.xCoord + xMaxDist, this.yCoord + box, this.zCoord + zMaxDist, 0);
+
+
+
+		int ret = 0;
+		for (int up = -box; up <= box; up++)
+		{
+			int y = this.yCoord + up;
+			for (int right = -box; right <= box; right++)
+			{
+				boolean occupied = false;
+				for (int fwd = lentemp - length; fwd <= length; fwd++)
+				{
+					int x = this.xCoord + fwd * fwdDir.offsetX + right * rightDir.offsetX;
+
+					int z = this.zCoord + fwd * fwdDir.offsetZ + right * rightDir.offsetZ;
+
+
+					assert (Math.abs(x - this.xCoord) <= xMaxDist);
+					assert (Math.abs(z - this.zCoord) <= zMaxDist);
+
+					Block block = chunkCache.getBlock(x, y, z);
+					if (!block.isAir(chunkCache, x, y, z))
+					{
+						occupied = true;
+						if (((up != 0) || (right != 0) || (fwd != 0)) && ((chunkCache.getTileEntity(x, y, z) instanceof TileEntityKineticWindGenerator)) && (!onlyrotor)) {
+							return -1;
+						}
+					}
+				}
+				if (occupied) {
+					ret++;
+				}
+			}
+		}
+		return ret;
+	}
+
+	@Override
+	public boolean checkrotor()
+	{
+		return !this.rotorSlot.isEmpty();
+	}
+
+	@Override
+	public boolean rotorspace()
+	{
+		return checkSpace(1, true) == 0;
+	}
+
+	private void setRotationSpeed(float speed)
+	{
+		if (this.rotationSpeed != speed)
+		{
+			this.rotationSpeed = speed;
+			((NetworkManager)IC2.network.get()).updateTileEntityField(this, "rotationSpeed");
+		}
+	}
+
+	@Override
+	public int getTickRate()
+	{
+		return 32;
+	}
+
+	@Override
+	public double calcWindStrength()
+	{
+		double windStr = WorldData.get(this.worldObj).windSim.getWindAt(this.yCoord);
+
+		windStr *= (1.0D - Math.pow(this.obstructedCrossSection / this.crossSection, 2.0D));
+
+
+		return Math.max(0.0D, windStr);
+	}
+
+	@Override
+	public float getAngle()
+	{
+		if (this.rotationSpeed > 0.0F)
+		{
+			long period = (long) (5.0E+008F / this.rotationSpeed);
+
+
+			return (float)(System.nanoTime() % period) / (float)period * 360.0F;
+		}
+		return 0.0F;
+	}
+
+	@Override
+	public float getefficiency()
+	{
+		ItemStack stack = this.rotorSlot.get();
+		if ((stack != null) && ((stack.getItem() instanceof IKineticWindRotor))) {
+			return (float) (((IKineticWindRotor)stack.getItem()).getEfficiency(stack)*1.5);
+		}
+		return 0.0F;
+	}
+
+	@Override
+	public int getMinWindStrength()
+	{
+		ItemStack stack = this.rotorSlot.get();
+		if ((stack != null) && ((stack.getItem() instanceof IKineticWindRotor))) {
+			return ((IKineticWindRotor)stack.getItem()).getMinWindStrength(stack)/2;
+		}
+		return 0;
+	}
+
+	@Override
+	public int getMaxWindStrength()
+	{
+		ItemStack stack = this.rotorSlot.get();
+		if ((stack != null) && ((stack.getItem() instanceof IKineticWindRotor))) {
+			return ((IKineticWindRotor)stack.getItem()).getMaxWindStrength(stack)*2;
+		}
+		return 0;
+	}
+
+	@Override
+	public int getRotorDiameter()
+	{
+		ItemStack stack = this.rotorSlot.get();
+		if ((stack != null) && ((stack.getItem() instanceof IKineticWindRotor))) {
+			return ((IKineticWindRotor)stack.getItem()).getDiameter(stack)/2;
+		}
+		return 0;
+	}
+
+	@Override
+	public ResourceLocation getRotorRenderTexture()
+	{
+		ItemStack stack = this.rotorSlot.get();
+		if ((stack != null) && ((stack.getItem() instanceof IKineticWindRotor))) {
+			return ((IKineticWindRotor)stack.getItem()).getRotorRenderTexture(stack);
+		}
+		return new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorWoodmodel.png");
+	}
+
+	@Override
+	public boolean guiisoverload()
+	{
+		if (this.windStrength > getMaxWindStrength()) {
+			return true;
+		}
+		return false;
+	}
+
+	@Override
+	public boolean guiisminWindStrength()
+	{
+		return this.windStrength >= getMinWindStrength();
+	}
+
+	@Override
+	public int getKuOutput()
+	{
+		if ((this.windStrength >= getMinWindStrength()) && (getActive())) {
+			return (int)(this.windStrength * 50.0D * getefficiency());
+		}
+		return 0;
+	}
+
+	@Override
+	public int getWindStrength()
+	{
+		return (int)this.windStrength;
+	}
+}
diff --git a/src/Java/miscutil/core/xmod/ic2/item/IC2_ItemGradual.java b/src/Java/miscutil/xmod/ic2/item/IC2_ItemGradual.java
index cf4b23f9eb..66f40576da 100644
--- a/src/Java/miscutil/core/xmod/ic2/item/IC2_ItemGradual.java
+++ b/src/Java/miscutil/xmod/ic2/item/IC2_ItemGradual.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.ic2.item;
+package miscutil.xmod.ic2.item;
 
 import java.util.List;
 
diff --git a/src/Java/miscutil/core/xmod/ic2/item/IC2_ItemGradualInteger.java b/src/Java/miscutil/xmod/ic2/item/IC2_ItemGradualInteger.java
index b39c80e5ed..28fce8fc6e 100644
--- a/src/Java/miscutil/core/xmod/ic2/item/IC2_ItemGradualInteger.java
+++ b/src/Java/miscutil/xmod/ic2/item/IC2_ItemGradualInteger.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.ic2.item;
+package miscutil.xmod.ic2.item;
 
 import ic2.api.item.ICustomDamageItem;
 import ic2.core.util.StackUtil;
diff --git a/src/Java/miscutil/core/xmod/ic2/item/IC2_ItemIC2.java b/src/Java/miscutil/xmod/ic2/item/IC2_ItemIC2.java
index fa7f73169c..0c6a28a4bc 100644
--- a/src/Java/miscutil/core/xmod/ic2/item/IC2_ItemIC2.java
+++ b/src/Java/miscutil/xmod/ic2/item/IC2_ItemIC2.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.ic2.item;
+package miscutil.xmod.ic2.item;
 
 import miscutil.core.creative.AddToCreativeTab;
 import miscutil.core.lib.CORE;
diff --git a/src/Java/miscutil/core/xmod/ic2/item/IC2_Items.java b/src/Java/miscutil/xmod/ic2/item/IC2_Items.java
index 5aa2b6181b..227c8970b0 100644
--- a/src/Java/miscutil/core/xmod/ic2/item/IC2_Items.java
+++ b/src/Java/miscutil/xmod/ic2/item/IC2_Items.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.ic2.item;
+package miscutil.xmod.ic2.item;
 
 import ic2.core.IC2;
 import ic2.core.init.InternalName;
@@ -24,6 +24,9 @@ public class IC2_Items {
 	public static ItemStack shaft_Material_2; //TungstenSteel
 	public static ItemStack shaft_Material_3; //Vibrant Alloy
 	public static ItemStack shaft_Material_4; //Iridium
+	
+	public static ItemStack blockRTG;
+	public static ItemStack blockKineticGenerator;
 
 	public static void register(){
 
diff --git a/src/Java/miscutil/core/xmod/ic2/item/RotorBase.java b/src/Java/miscutil/xmod/ic2/item/RotorBase.java
index 11817818b4..8ddfff20c9 100644
--- a/src/Java/miscutil/core/xmod/ic2/item/RotorBase.java
+++ b/src/Java/miscutil/xmod/ic2/item/RotorBase.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.ic2.item;
+package miscutil.xmod.ic2.item;
 
 import ic2.api.item.IKineticRotor;
 import ic2.core.block.kineticgenerator.gui.GuiWaterKineticGenerator;
diff --git a/src/Java/miscutil/core/xmod/ic2/item/RotorIridium.java b/src/Java/miscutil/xmod/ic2/item/RotorIridium.java
index ac568d3b9e..a4037410d5 100644
--- a/src/Java/miscutil/core/xmod/ic2/item/RotorIridium.java
+++ b/src/Java/miscutil/xmod/ic2/item/RotorIridium.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.ic2.item;
+package miscutil.xmod.ic2.item;
 
 import ic2.api.item.IKineticRotor;
 import ic2.core.block.kineticgenerator.gui.GuiWaterKineticGenerator;
diff --git a/src/Java/miscutil/core/xmod/ic2/recipe/RECIPE_IC2.java b/src/Java/miscutil/xmod/ic2/recipe/RECIPE_IC2.java
index 5a22a82950..b50ce28480 100644
--- a/src/Java/miscutil/core/xmod/ic2/recipe/RECIPE_IC2.java
+++ b/src/Java/miscutil/xmod/ic2/recipe/RECIPE_IC2.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.ic2.recipe;
+package miscutil.xmod.ic2.recipe;
 
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.ItemList;
@@ -11,8 +11,8 @@ import miscutil.core.lib.LoadedMods;
 import miscutil.core.util.Utils;
 import miscutil.core.util.item.UtilsItems;
 import miscutil.core.util.recipe.UtilsRecipe;
-import miscutil.core.xmod.gregtech.api.enums.GregtechItemList;
-import miscutil.core.xmod.ic2.item.IC2_Items;
+import miscutil.xmod.gregtech.api.enums.GregtechItemList;
+import miscutil.xmod.ic2.item.IC2_Items;
 import net.minecraft.item.ItemStack;
 
 public class RECIPE_IC2 {
diff --git a/src/Java/miscutil/core/xmod/psychedelicraft/HANDLER_Psych.java b/src/Java/miscutil/xmod/psychedelicraft/HANDLER_Psych.java
index 278a572f0f..423d164a3b 100644
--- a/src/Java/miscutil/core/xmod/psychedelicraft/HANDLER_Psych.java
+++ b/src/Java/miscutil/xmod/psychedelicraft/HANDLER_Psych.java
@@ -1,7 +1,7 @@
-package miscutil.core.xmod.psychedelicraft;
+package miscutil.xmod.psychedelicraft;
 
 import miscutil.core.lib.LoadedMods;
-import miscutil.core.xmod.psychedelicraft.fluids.PS_Fluids;
+import miscutil.xmod.psychedelicraft.fluids.PS_Fluids;
 
 
 public class HANDLER_Psych {
diff --git a/src/Java/miscutil/core/xmod/psychedelicraft/fluids/PS_Fluids.java b/src/Java/miscutil/xmod/psychedelicraft/fluids/PS_Fluids.java
index 5bba9d5857..ada7cb21bd 100644
--- a/src/Java/miscutil/core/xmod/psychedelicraft/fluids/PS_Fluids.java
+++ b/src/Java/miscutil/xmod/psychedelicraft/fluids/PS_Fluids.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.psychedelicraft.fluids;
+package miscutil.xmod.psychedelicraft.fluids;
 
 import ivorius.ivtoolkit.gui.IntegerRange;
 import ivorius.psychedelicraft.blocks.TileEntityMashTub;
diff --git a/src/Java/miscutil/core/xmod/thermalfoundation/HANDLER_TF.java b/src/Java/miscutil/xmod/thermalfoundation/HANDLER_TF.java
index a9662a221a..b44d7bf206 100644
--- a/src/Java/miscutil/core/xmod/thermalfoundation/HANDLER_TF.java
+++ b/src/Java/miscutil/xmod/thermalfoundation/HANDLER_TF.java
@@ -1,10 +1,10 @@
-package miscutil.core.xmod.thermalfoundation;
+package miscutil.xmod.thermalfoundation;
 
 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;
+import miscutil.xmod.thermalfoundation.block.TF_Blocks;
+import miscutil.xmod.thermalfoundation.fluid.TF_Fluids;
+import miscutil.xmod.thermalfoundation.item.TF_Items;
+import miscutil.xmod.thermalfoundation.recipe.TF_Gregtech_Recipes;
 
 public class HANDLER_TF{
 
diff --git a/src/Java/miscutil/core/xmod/thermalfoundation/block/TF_Block_Fluid_Cryotheum.java b/src/Java/miscutil/xmod/thermalfoundation/block/TF_Block_Fluid_Cryotheum.java
index 8865da678e..ce33959a1d 100644
--- a/src/Java/miscutil/core/xmod/thermalfoundation/block/TF_Block_Fluid_Cryotheum.java
+++ b/src/Java/miscutil/xmod/thermalfoundation/block/TF_Block_Fluid_Cryotheum.java
@@ -1,9 +1,9 @@
-package miscutil.core.xmod.thermalfoundation.block;
+package miscutil.xmod.thermalfoundation.block;
 
 import java.util.Random;
 
 import miscutil.core.lib.CORE;
-import miscutil.core.xmod.thermalfoundation.fluid.TF_Fluids;
+import miscutil.xmod.thermalfoundation.fluid.TF_Fluids;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.MapColor;
 import net.minecraft.block.material.Material;
diff --git a/src/Java/miscutil/core/xmod/thermalfoundation/block/TF_Block_Fluid_Pyrotheum.java b/src/Java/miscutil/xmod/thermalfoundation/block/TF_Block_Fluid_Pyrotheum.java
index 2b3234f511..d8c2bf6a14 100644
--- a/src/Java/miscutil/core/xmod/thermalfoundation/block/TF_Block_Fluid_Pyrotheum.java
+++ b/src/Java/miscutil/xmod/thermalfoundation/block/TF_Block_Fluid_Pyrotheum.java
@@ -1,9 +1,9 @@
-package miscutil.core.xmod.thermalfoundation.block;
+package miscutil.xmod.thermalfoundation.block;
 
 import java.util.Random;
 
 import miscutil.core.lib.CORE;
-import miscutil.core.xmod.thermalfoundation.fluid.TF_Fluids;
+import miscutil.xmod.thermalfoundation.fluid.TF_Fluids;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.MapColor;
 import net.minecraft.block.material.Material;
diff --git a/src/Java/miscutil/core/xmod/thermalfoundation/block/TF_Blocks.java b/src/Java/miscutil/xmod/thermalfoundation/block/TF_Blocks.java
index 68c893170f..d42508db30 100644
--- a/src/Java/miscutil/core/xmod/thermalfoundation/block/TF_Blocks.java
+++ b/src/Java/miscutil/xmod/thermalfoundation/block/TF_Blocks.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.thermalfoundation.block;
+package miscutil.xmod.thermalfoundation.block;
 
 import cofh.core.fluid.BlockFluidCoFHBase;
 
diff --git a/src/Java/miscutil/core/xmod/thermalfoundation/fluid/TF_Fluids.java b/src/Java/miscutil/xmod/thermalfoundation/fluid/TF_Fluids.java
index 39e05dc8f8..f0b3cff7aa 100644
--- a/src/Java/miscutil/core/xmod/thermalfoundation/fluid/TF_Fluids.java
+++ b/src/Java/miscutil/xmod/thermalfoundation/fluid/TF_Fluids.java
@@ -1,7 +1,7 @@
-package miscutil.core.xmod.thermalfoundation.fluid;
+package miscutil.xmod.thermalfoundation.fluid;
 
 import miscutil.core.util.Utils;
-import miscutil.core.xmod.thermalfoundation.item.TF_Items;
+import miscutil.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/xmod/thermalfoundation/item/TF_Items.java b/src/Java/miscutil/xmod/thermalfoundation/item/TF_Items.java
index 99febd00db..8f99b6efc5 100644
--- a/src/Java/miscutil/core/xmod/thermalfoundation/item/TF_Items.java
+++ b/src/Java/miscutil/xmod/thermalfoundation/item/TF_Items.java
@@ -1,9 +1,9 @@
-package miscutil.core.xmod.thermalfoundation.item;
+package miscutil.xmod.thermalfoundation.item;
 
 import miscutil.core.creative.AddToCreativeTab;
 import miscutil.core.util.item.UtilsItems;
-import miscutil.core.xmod.thermalfoundation.block.TF_Blocks;
-import miscutil.core.xmod.thermalfoundation.fluid.TF_Fluids;
+import miscutil.xmod.thermalfoundation.block.TF_Blocks;
+import miscutil.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/xmod/thermalfoundation/recipe/TF_Gregtech_Recipes.java b/src/Java/miscutil/xmod/thermalfoundation/recipe/TF_Gregtech_Recipes.java
index dc35a59927..a84606576a 100644
--- a/src/Java/miscutil/core/xmod/thermalfoundation/recipe/TF_Gregtech_Recipes.java
+++ b/src/Java/miscutil/xmod/thermalfoundation/recipe/TF_Gregtech_Recipes.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.thermalfoundation.recipe;
+package miscutil.xmod.thermalfoundation.recipe;
 
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.Materials;
@@ -7,7 +7,7 @@ import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_OreDictUnificator;
 import miscutil.core.util.Utils;
 import miscutil.core.util.item.UtilsItems;
-import miscutil.core.xmod.thermalfoundation.item.TF_Items;
+import miscutil.xmod.thermalfoundation.item.TF_Items;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidRegistry;