43 files changed, 141 insertions, 106 deletions

diff --git a/src/main/java/com/github/technus/tectech/TecTech.java b/src/main/java/com/github/technus/tectech/TecTech.java
index 5104cbc055..c4d9cc3a86 100644
--- a/src/main/java/com/github/technus/tectech/TecTech.java
+++ b/src/main/java/com/github/technus/tectech/TecTech.java
@@ -2,9 +2,12 @@ package com.github.technus.tectech;
 
 import com.github.technus.tectech.auxiliary.Reference;
 import com.github.technus.tectech.auxiliary.TecTechConfig;
-import com.github.technus.tectech.things.block.QuantumGlass;
-import com.github.technus.tectech.things.casing.GT_Container_CasingsTT;
-import com.github.technus.tectech.things.machineTT;
+import com.github.technus.tectech.loader.GT_CustomLoader;
+import com.github.technus.tectech.thing.CustomItemList;
+import com.github.technus.tectech.thing.block.QuantumGlass;
+import com.github.technus.tectech.thing.casing.GT_Container_CasingsTT;
+import com.github.technus.tectech.thing.item.debug_container_EM;
+import com.github.technus.tectech.thing.machineTT;
 import com.github.technus.tectech.proxy.CommonProxy;
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.Mod;
@@ -81,6 +84,9 @@ public class TecTech {
 
     @EventHandler
     public void PostLoad(FMLPostInitializationEvent PostEvent) {
+        QuantumGlass.run();
+        debug_container_EM.run();
+
         GTCustomLoader = new GT_CustomLoader();
         GTCustomLoader.run();
         GTCustomLoader.run2();
@@ -89,13 +95,7 @@ public class TecTech {
             @SideOnly(Side.CLIENT)
             @Override
             public Item getTabIconItem() {
-                return CustomItemList.eM_TimeSpaceWarp.getItem();
-            }
-
-            @SideOnly(Side.CLIENT)
-            @Override
-            public ItemStack getIconItemStack() {
-                return CustomItemList.eM_TimeSpaceWarp.getWithDamage(1, 8);
+                return debug_container_EM.INSTANCE;
             }
 
             @Override
@@ -115,6 +115,7 @@ public class TecTech {
     public void RegisterThingsInTabs() {
         QuantumGlass.INSTANCE.setCreativeTab(mainTab);//TODO? COPY PASTE GT CLASSES TO ADD MY THINGS TO CREATIVE TAB
         GT_Container_CasingsTT.sBlockCasingsTT.setCreativeTab(mainTab);
+        debug_container_EM.INSTANCE.setCreativeTab(mainTab);
     }
 
     /**
diff --git a/src/main/java/com/github/technus/tectech/GT_CustomLoader.java b/src/main/java/com/github/technus/tectech/loader/GT_CustomLoader.java
index 196b97c074..2e9bb371af 100644
--- a/src/main/java/com/github/technus/tectech/GT_CustomLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/GT_CustomLoader.java
@@ -1,6 +1,7 @@
-package com.github.technus.tectech;
+package com.github.technus.tectech.loader;
 
-import com.github.technus.tectech.things.casing.GT_Loader_CasingsTT;
+import com.github.technus.tectech.TecTech;
+import com.github.technus.tectech.thing.casing.GT_Loader_CasingsTT;
 
 public class GT_CustomLoader {
     private GT_Loader_Machines ElementalLoader;
diff --git a/src/main/java/com/github/technus/tectech/GT_Loader_Machines.java b/src/main/java/com/github/technus/tectech/loader/GT_Loader_Machines.java
index 1364498063..28ea0e22d4 100644
--- a/src/main/java/com/github/technus/tectech/GT_Loader_Machines.java
+++ b/src/main/java/com/github/technus/tectech/loader/GT_Loader_Machines.java
@@ -1,4 +1,9 @@
-package com.github.technus.tectech;
+package com.github.technus.tectech.loader;
+
+import com.github.technus.tectech.thing.CustomItemList;
+import com.github.technus.tectech.thing.metaTileEntity.hatch.*;
+import com.github.technus.tectech.thing.metaTileEntity.multi.*;
+import com.github.technus.tectech.thing.metaTileEntity.pipe.GT_MetaTileEntity_Pipe_EM;
 
 /**
  * Created by danie_000 on 16.11.2016.
diff --git a/src/main/java/com/github/technus/tectech/GT_Loader_Recipes.java b/src/main/java/com/github/technus/tectech/loader/GT_Loader_Recipes.java
index fc957224dc..a4885f5401 100644
--- a/src/main/java/com/github/technus/tectech/GT_Loader_Recipes.java
+++ b/src/main/java/com/github/technus/tectech/loader/GT_Loader_Recipes.java
@@ -1,8 +1,8 @@
-package com.github.technus.tectech;
+package com.github.technus.tectech.loader;
 
 import com.github.technus.tectech.elementalMatter.classes.cElementalPrimitive;
 import com.github.technus.tectech.elementalMatter.definitions.*;
-import com.github.technus.tectech.things.metaTileEntity.multi.GT_MetaTileEntity_EM_quantifier;
+import com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_quantifier;
 
 /**
  * Created by danie_000 on 16.11.2016.
diff --git a/src/main/java/com/github/technus/tectech/proxy/ClientProxy.java b/src/main/java/com/github/technus/tectech/proxy/ClientProxy.java
index 3bee3cdd77..67ed5e81ef 100644
--- a/src/main/java/com/github/technus/tectech/proxy/ClientProxy.java
+++ b/src/main/java/com/github/technus/tectech/proxy/ClientProxy.java
@@ -1,7 +1,7 @@
 package com.github.technus.tectech.proxy;
 
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.things.block.QuantumGlassRender;
+import com.github.technus.tectech.thing.block.QuantumGlassRender;
 import cpw.mods.fml.client.FMLClientHandler;
 import cpw.mods.fml.client.registry.RenderingRegistry;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
diff --git a/src/main/java/com/github/technus/tectech/CustomItemList.java b/src/main/java/com/github/technus/tectech/thing/CustomItemList.java
index 5b3c2fd350..ece34583f7 100644
--- a/src/main/java/com/github/technus/tectech/CustomItemList.java
+++ b/src/main/java/com/github/technus/tectech/thing/CustomItemList.java
@@ -1,4 +1,4 @@
-package com.github.technus.tectech;
+package com.github.technus.tectech.thing;
 
 import gregtech.api.interfaces.IItemContainer;
 import gregtech.api.util.GT_ModHandler;
diff --git a/src/main/java/com/github/technus/tectech/things/block/QuantumGlass.java b/src/main/java/com/github/technus/tectech/thing/block/QuantumGlass.java
index 676538d72f..3035641675 100644
--- a/src/main/java/com/github/technus/tectech/things/block/QuantumGlass.java
+++ b/src/main/java/com/github/technus/tectech/thing/block/QuantumGlass.java
@@ -1,4 +1,4 @@
-package com.github.technus.tectech.things.block;
+package com.github.technus.tectech.thing.block;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -16,7 +16,7 @@ import static com.github.technus.tectech.auxiliary.Reference.MODID;
  */
 public final class QuantumGlass extends BlockBase {
     public static IIcon stuff;
-    public static QuantumGlass INSTANCE = new QuantumGlass();
+    public static QuantumGlass INSTANCE;
 
     public QuantumGlass() {
         super(Material.iron);
@@ -80,4 +80,8 @@ public final class QuantumGlass extends BlockBase {
         super.registerBlockIcons(p_149651_1_);
         stuff = this.blockIcon;
     }
+
+    public static void run(){
+        INSTANCE=new QuantumGlass();
+    }
 }
diff --git a/src/main/java/com/github/technus/tectech/things/block/QuantumGlassRender.java b/src/main/java/com/github/technus/tectech/thing/block/QuantumGlassRender.java
index 37eb98236f..cf0a152ab4 100644
--- a/src/main/java/com/github/technus/tectech/things/block/QuantumGlassRender.java
+++ b/src/main/java/com/github/technus/tectech/thing/block/QuantumGlassRender.java
@@ -1,4 +1,4 @@
-package com.github.technus.tectech.things.block;
+package com.github.technus.tectech.thing.block;
 
 import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
 import net.minecraft.block.Block;
diff --git a/src/main/java/com/github/technus/tectech/things/casing/GT_Block_CasingsTT.java b/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsTT.java
index 51ccb9fc7f..ffd798f487 100644
--- a/src/main/java/com/github/technus/tectech/things/casing/GT_Block_CasingsTT.java
+++ b/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsTT.java
@@ -1,6 +1,6 @@
-package com.github.technus.tectech.things.casing;
+package com.github.technus.tectech.thing.casing;
 
-import com.github.technus.tectech.CustomItemList;
+import com.github.technus.tectech.thing.CustomItemList;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.Textures;
diff --git a/src/main/java/com/github/technus/tectech/things/casing/GT_Container_CasingsTT.java b/src/main/java/com/github/technus/tectech/thing/casing/GT_Container_CasingsTT.java
index b3cf5ee3e6..7e7360de18 100644
--- a/src/main/java/com/github/technus/tectech/things/casing/GT_Container_CasingsTT.java
+++ b/src/main/java/com/github/technus/tectech/thing/casing/GT_Container_CasingsTT.java
@@ -1,4 +1,4 @@
-package com.github.technus.tectech.things.casing;
+package com.github.technus.tectech.thing.casing;
 
 import net.minecraft.block.Block;
 
diff --git a/src/main/java/com/github/technus/tectech/things/casing/GT_Item_CasingsTT.java b/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_CasingsTT.java
index 199b899d78..e8e8fc8f17 100644
--- a/src/main/java/com/github/technus/tectech/things/casing/GT_Item_CasingsTT.java
+++ b/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_CasingsTT.java
@@ -1,4 +1,4 @@
-package com.github.technus.tectech.things.casing;
+package com.github.technus.tectech.thing.casing;
 
 import gregtech.common.blocks.GT_Item_Casings_Abstract;
 import net.minecraft.block.Block;
diff --git a/src/main/java/com/github/technus/tectech/things/casing/GT_Loader_CasingsTT.java b/src/main/java/com/github/technus/tectech/thing/casing/GT_Loader_CasingsTT.java
index a611dbd708..2e7ef20b27 100644
--- a/src/main/java/com/github/technus/tectech/things/casing/GT_Loader_CasingsTT.java
+++ b/src/main/java/com/github/technus/tectech/thing/casing/GT_Loader_CasingsTT.java
@@ -1,4 +1,4 @@
-package com.github.technus.tectech.things.casing;
+package com.github.technus.tectech.thing.casing;
 
 /**
  * Created by danie_000 on 03.10.2016.
diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/classes/Behaviour_elementalMatterContainer.java b/src/main/java/com/github/technus/tectech/thing/item/debug_container_EM.java
index 4136d78339..d6e3a475b5 100644
--- a/src/main/java/com/github/technus/tectech/elementalMatter/classes/Behaviour_elementalMatterContainer.java
+++ b/src/main/java/com/github/technus/tectech/thing/item/debug_container_EM.java
@@ -1,17 +1,15 @@
-package com.github.technus.tectech.elementalMatter.classes;
-
+package com.github.technus.tectech.thing.item;
 
 import com.github.technus.tectech.TecTech;
+import com.github.technus.tectech.elementalMatter.classes.cElementalInstanceStackTree;
+import com.github.technus.tectech.elementalMatter.classes.tElementalException;
 import com.github.technus.tectech.elementalMatter.commonValues;
 import com.github.technus.tectech.elementalMatter.interfaces.iElementalInstanceContainer;
-import gregtech.api.interfaces.IItemBehaviour;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.items.GT_MetaBase_Item;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.common.items.behaviors.Behaviour_None;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
@@ -20,15 +18,23 @@ import net.minecraft.world.World;
 import java.util.Collections;
 import java.util.List;
 
+import static com.github.technus.tectech.auxiliary.Reference.MODID;
+
 /**
- * Created by danie_000 on 11.12.2016.
- * used in custom GT build! debug purposes
+ * Created by Tec on 15.03.2017.
  */
-public final class Behaviour_elementalMatterContainer extends Behaviour_None {
-    public static final IItemBehaviour<GT_MetaBase_Item> INSTANCE = new Behaviour_elementalMatterContainer();
-    private final String mTooltip = GT_LanguageManager.addStringLocalization("gt.behaviour.emc", "Container for elemental matter");
+public class debug_container_EM extends Item {
+    public static debug_container_EM INSTANCE;
+
+    debug_container_EM(){
+        super();
+        setMaxStackSize(1);
+        setUnlocalizedName("em.debugContainer");
+        setTextureName(MODID + ":debugContainer");
+    }
 
-    public boolean onItemUseFirst(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, int aSide, float hitX, float hitY, float hitZ) {
+    @Override
+    public boolean onItemUseFirst(ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, int aSide, float hitX, float hitY, float hitZ) {
         NBTTagCompound tNBT = aStack.getTagCompound();
         TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
         if (aPlayer instanceof EntityPlayerMP) {
@@ -60,9 +66,10 @@ public final class Behaviour_elementalMatterContainer extends Behaviour_None {
         return aPlayer instanceof EntityPlayerMP;
     }
 
-    public List<String> getAdditionalToolTips(GT_MetaBase_Item aItem, List<String> aList, ItemStack aStack) {
+    @Override
+    public void addInformation(ItemStack aStack, EntityPlayer ep, List aList, boolean boo) {
         aList.add(commonValues.tecMark);
-        aList.add(mTooltip);
+        aList.add("Container for elemental matter");
         try {
             NBTTagCompound tNBT = aStack.getTagCompound();
             if (tNBT.hasKey("info")) {
@@ -72,6 +79,9 @@ public final class Behaviour_elementalMatterContainer extends Behaviour_None {
         } catch (Exception e) {
             aList.add("---Unexpected Termination---");
         }
-        return aList;
+    }
+
+    public static void run(){
+        INSTANCE=new debug_container_EM();
     }
 }
diff --git a/src/main/java/com/github/technus/tectech/things/machineTT.java b/src/main/java/com/github/technus/tectech/thing/machineTT.java
index 942502ad13..1aebfe84e3 100644
--- a/src/main/java/com/github/technus/tectech/things/machineTT.java
+++ b/src/main/java/com/github/technus/tectech/thing/machineTT.java
@@ -1,4 +1,4 @@
-package com.github.technus.tectech.things;
+package com.github.technus.tectech.thing;
 
 /**
  * Created by Tec on 15.03.2017.
diff --git a/src/main/java/com/github/technus/tectech/things/metaTileEntity/GT_MetaTileEntity_Hatch_ElementalContainer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/GT_MetaTileEntity_Hatch_ElementalContainer.java
index 68baa20cd4..b02545327d 100644
--- a/src/main/java/com/github/technus/tectech/things/metaTileEntity/GT_MetaTileEntity_Hatch_ElementalContainer.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/GT_MetaTileEntity_Hatch_ElementalContainer.java
@@ -1,13 +1,13 @@
-package com.github.technus.tectech.things.metaTileEntity;
+package com.github.technus.tectech.thing.metaTileEntity;
 
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.things.machineTT;
+import com.github.technus.tectech.thing.machineTT;
 import com.github.technus.tectech.elementalMatter.classes.cElementalInstanceStackTree;
 import com.github.technus.tectech.elementalMatter.classes.tElementalException;
 import com.github.technus.tectech.elementalMatter.commonValues;
-import com.github.technus.tectech.elementalMatter.interfaces.iConnectsToEMpipe;
+import com.github.technus.tectech.thing.metaTileEntity.pipe.iConnectsToEMpipe;
 import com.github.technus.tectech.elementalMatter.interfaces.iElementalInstanceContainer;
-import com.github.technus.tectech.things.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_MufflerElemental;
+import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_MufflerElemental;
 import gregtech.api.enums.Dyes;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
@@ -35,8 +35,8 @@ public abstract class GT_MetaTileEntity_Hatch_ElementalContainer extends GT_Meta
 
     protected cElementalInstanceStackTree content = new cElementalInstanceStackTree();
     //float lifeTimeMult=1f;
-    int postEnergize = 0;
-    float overflowMatter = 0f;
+    public int postEnergize = 0;
+    public float overflowMatter = 0f;
     public short id = -1;
     private byte deathDelay = 2;
 
diff --git a/src/main/java/com/github/technus/tectech/things/metaTileEntity/GT_MetaTileEntity_MultiblockBase_EM.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/GT_MetaTileEntity_MultiblockBase_EM.java
index 352e55718f..f58adf41ee 100644
--- a/src/main/java/com/github/technus/tectech/things/metaTileEntity/GT_MetaTileEntity_MultiblockBase_EM.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/GT_MetaTileEntity_MultiblockBase_EM.java
@@ -1,15 +1,15 @@
-package com.github.technus.tectech.things.metaTileEntity;
+package com.github.technus.tectech.thing.metaTileEntity;
 
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.things.machineTT;
+import com.github.technus.tectech.thing.machineTT;
 import com.github.technus.tectech.elementalMatter.classes.cElementalDefinitionStack;
 import com.github.technus.tectech.elementalMatter.classes.cElementalInstanceStack;
 import com.github.technus.tectech.elementalMatter.classes.cElementalInstanceStackTree;
 import com.github.technus.tectech.elementalMatter.classes.tElementalException;
 import com.github.technus.tectech.elementalMatter.commonValues;
-import com.github.technus.tectech.things.metaTileEntity.hatch.*;
-import com.github.technus.tectech.things.metaTileEntity.multi.gui.GT_Container_MultiMachineEM;
-import com.github.technus.tectech.things.metaTileEntity.multi.gui.GT_GUIContainer_MultiMachineEM;
+import com.github.technus.tectech.thing.metaTileEntity.hatch.*;
+import com.github.technus.tectech.thing.metaTileEntity.multi.gui.GT_Container_MultiMachineEM;
+import com.github.technus.tectech.thing.metaTileEntity.multi.gui.GT_GUIContainer_MultiMachineEM;
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
@@ -43,8 +43,8 @@ import static gregtech.api.enums.GT_Values.VN;
 public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEntity_MultiBlockBase implements machineTT {
     protected cElementalInstanceStackTree[] outputEM = new cElementalInstanceStackTree[0];
 
-    final static ItemStack[] nothingI = new ItemStack[0];
-    final static FluidStack[] nothingF = new FluidStack[0];
+    public final static ItemStack[] nothingI = new ItemStack[0];
+    public final static FluidStack[] nothingF = new FluidStack[0];
 
     private static Textures.BlockIcons.CustomIcon ScreenOFF;
     private static Textures.BlockIcons.CustomIcon ScreenON;
diff --git a/src/main/java/com/github/technus/tectech/things/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoMulti.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoMulti.java
index 2ea5a0288d..7cd12cc63f 100644
--- a/src/main/java/com/github/technus/tectech/things/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoMulti.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoMulti.java
@@ -1,6 +1,6 @@
-package com.github.technus.tectech.things.metaTileEntity.hatch;
+package com.github.technus.tectech.thing.metaTileEntity.hatch;
 
-import com.github.technus.tectech.things.machineTT;
+import com.github.technus.tectech.thing.machineTT;
 import com.github.technus.tectech.elementalMatter.commonValues;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
diff --git a/src/main/java/com/github/technus/tectech/things/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java
index 9405b888df..c86bfa71a4 100644
--- a/src/main/java/com/github/technus/tectech/things/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java
@@ -1,6 +1,6 @@
-package com.github.technus.tectech.things.metaTileEntity.hatch;
+package com.github.technus.tectech.thing.metaTileEntity.hatch;
 
-import com.github.technus.tectech.things.machineTT;
+import com.github.technus.tectech.thing.machineTT;
 import com.github.technus.tectech.elementalMatter.commonValues;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
diff --git a/src/main/java/com/github/technus/tectech/things/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_InputElemental.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_InputElemental.java
index 7d99da18af..3508c0e0f0 100644
--- a/src/main/java/com/github/technus/tectech/things/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_InputElemental.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_InputElemental.java
@@ -1,9 +1,9 @@
-package com.github.technus.tectech.things.metaTileEntity.hatch;
+package com.github.technus.tectech.thing.metaTileEntity.hatch;
 
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import com.github.technus.tectech.things.metaTileEntity.GT_MetaTileEntity_Hatch_ElementalContainer;
+import com.github.technus.tectech.thing.metaTileEntity.GT_MetaTileEntity_Hatch_ElementalContainer;
 
 /**
  * Created by danie_000 on 27.10.2016.
diff --git a/src/main/java/com/github/technus/tectech/things/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_MufflerElemental.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_MufflerElemental.java
index c0be04c717..f10a6bf97e 100644
--- a/src/main/java/com/github/technus/tectech/things/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_MufflerElemental.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_MufflerElemental.java
@@ -1,7 +1,7 @@
-package com.github.technus.tectech.things.metaTileEntity.hatch;
+package com.github.technus.tectech.thing.metaTileEntity.hatch;
 
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.things.machineTT;
+import com.github.technus.tectech.thing.machineTT;
 import com.github.technus.tectech.elementalMatter.commonValues;
 import gregtech.api.enums.Dyes;
 import gregtech.api.enums.Textures;
diff --git a/src/main/java/com/github/technus/tectech/things/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputElemental.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputElemental.java
index 2fde75c76a..c8e65b6451 100644
--- a/src/main/java/com/github/technus/tectech/things/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputElemental.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputElemental.java
@@ -1,5 +1,7 @@
-package com.github.technus.tectech.things.metaTileEntity.hatch;
+package com.github.technus.tectech.thing.metaTileEntity.hatch;
 
+import com.github.technus.tectech.thing.metaTileEntity.GT_MetaTileEntity_Hatch_ElementalContainer;
+import com.github.technus.tectech.thing.metaTileEntity.pipe.GT_MetaTileEntity_Pipe_EM;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
diff --git a/src/main/java/com/github/technus/tectech/things/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Param.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Param.java
index 9d24109e04..51f82eb866 100644
--- a/src/main/java/com/github/technus/tectech/things/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Param.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Param.java
@@ -1,9 +1,9 @@
-package com.github.technus.tectech.things.metaTileEntity.hatch;
+package com.github.technus.tectech.thing.metaTileEntity.hatch;
 
-import com.github.technus.tectech.things.machineTT;
+import com.github.technus.tectech.thing.machineTT;
 import com.github.technus.tectech.elementalMatter.commonValues;
-import com.github.technus.tectech.things.metaTileEntity.hatch.gui.GT_Container_Param;
-import com.github.technus.tectech.things.metaTileEntity.hatch.gui.GT_GUIContainer_Param;
+import com.github.technus.tectech.thing.metaTileEntity.hatch.gui.GT_Container_Param;
+import com.github.technus.tectech.thing.metaTileEntity.hatch.gui.GT_GUIContainer_Param;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
diff --git a/src/main/java/com/github/technus/tectech/things/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Uncertainty.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Uncertainty.java
index b2ff50ed37..38d4529847 100644
--- a/src/main/java/com/github/technus/tectech/things/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Uncertainty.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Uncertainty.java
@@ -1,11 +1,11 @@
-package com.github.technus.tectech.things.metaTileEntity.hatch;
+package com.github.technus.tectech.thing.metaTileEntity.hatch;
 
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.things.machineTT;
+import com.github.technus.tectech.thing.machineTT;
 import com.github.technus.tectech.elementalMatter.commonValues;
-import com.github.technus.tectech.things.metaTileEntity.hatch.gui.GT_Container_Uncertainty;
-import com.github.technus.tectech.things.metaTileEntity.hatch.gui.GT_GUIContainer_Uncertainty;
-import com.github.technus.tectech.things.metaTileEntity.hatch.gui.GT_GUIContainer_UncertaintyAdv;
+import com.github.technus.tectech.thing.metaTileEntity.hatch.gui.GT_Container_Uncertainty;
+import com.github.technus.tectech.thing.metaTileEntity.hatch.gui.GT_GUIContainer_Uncertainty;
+import com.github.technus.tectech.thing.metaTileEntity.hatch.gui.GT_GUIContainer_UncertaintyAdv;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
diff --git a/src/main/java/com/github/technus/tectech/things/metaTileEntity/hatch/gui/GT_Container_Param.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_Container_Param.java
index a5d22870a6..c384552c25 100644
--- a/src/main/java/com/github/technus/tectech/things/metaTileEntity/hatch/gui/GT_Container_Param.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_Container_Param.java
@@ -1,6 +1,6 @@
-package com.github.technus.tectech.things.metaTileEntity.hatch.gui;
+package com.github.technus.tectech.thing.metaTileEntity.hatch.gui;
 
-import com.github.technus.tectech.things.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_Param;
+import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_Param;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.gui.GT_ContainerMetaTile_Machine;
diff --git a/src/main/java/com/github/technus/tectech/things/metaTileEntity/hatch/gui/GT_Container_Uncertainty.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_Container_Uncertainty.java
index fc940d168e..68b4f9268b 100644
--- a/src/main/java/com/github/technus/tectech/things/metaTileEntity/hatch/gui/GT_Container_Uncertainty.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_Container_Uncertainty.java
@@ -1,6 +1,6 @@
-package com.github.technus.tectech.things.metaTileEntity.hatch.gui;
+package com.github.technus.tectech.thing.metaTileEntity.hatch.gui;
 
-import com.github.technus.tectech.things.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_Uncertainty;
+import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_Uncertainty;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.gui.GT_ContainerMetaTile_Machine;
diff --git a/src/main/java/com/github/technus/tectech/things/metaTileEntity/hatch/gui/GT_GUIContainer_Param.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_GUIContainer_Param.java
index 4564266040..877b91f09c 100644
--- a/src/main/java/com/github/technus/tectech/things/metaTileEntity/hatch/gui/GT_GUIContainer_Param.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_GUIContainer_Param.java
@@ -1,4 +1,4 @@
-package com.github.technus.tectech.things.metaTileEntity.hatch.gui;
+package com.github.technus.tectech.thing.metaTileEntity.hatch.gui;
 
 import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
diff --git a/src/main/java/com/github/technus/tectech/things/metaTileEntity/hatch/gui/GT_GUIContainer_Uncertainty.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_GUIContainer_Uncertainty.java
index 834ba9c6da..e2af74aa9f 100644
--- a/src/main/java/com/github/technus/tectech/things/metaTileEntity/hatch/gui/GT_GUIContainer_Uncertainty.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_GUIContainer_Uncertainty.java
@@ -1,4 +1,4 @@
-package com.github.technus.tectech.things.metaTileEntity.hatch.gui;
+package com.github.technus.tectech.thing.metaTileEntity.hatch.gui;
 
 import com.github.technus.tectech.TecTech;
 import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
diff --git a/src/main/java/com/github/technus/tectech/things/metaTileEntity/hatch/gui/GT_GUIContainer_UncertaintyAdv.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_GUIContainer_UncertaintyAdv.java
index 241630ddd4..0c2daaab2e 100644
--- a/src/main/java/com/github/technus/tectech/things/metaTileEntity/hatch/gui/GT_GUIContainer_UncertaintyAdv.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_GUIContainer_UncertaintyAdv.java
@@ -1,4 +1,4 @@
-package com.github.technus.tectech.things.metaTileEntity.hatch.gui;
+package com.github.technus.tectech.thing.metaTileEntity.hatch.gui;
 
 import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
diff --git a/src/main/java/com/github/technus/tectech/things/metaTileEntity/multi/GT_MetaTileEntity_EM_bhg.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_bhg.java
index e9742363f1..5b26c90766 100644
--- a/src/main/java/com/github/technus/tectech/things/metaTileEntity/multi/GT_MetaTileEntity_EM_bhg.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_bhg.java
@@ -1,8 +1,9 @@
-package com.github.technus.tectech.things.metaTileEntity.multi;
+package com.github.technus.tectech.thing.metaTileEntity.multi;
 
-import com.github.technus.tectech.things.block.QuantumGlass;
-import com.github.technus.tectech.things.casing.GT_Container_CasingsTT;
+import com.github.technus.tectech.thing.block.QuantumGlass;
+import com.github.technus.tectech.thing.casing.GT_Container_CasingsTT;
 import com.github.technus.tectech.elementalMatter.commonValues;
+import com.github.technus.tectech.thing.metaTileEntity.GT_MetaTileEntity_MultiblockBase_EM;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
diff --git a/src/main/java/com/github/technus/tectech/things/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java
index f6ab3bd375..ca83d78e39 100644
--- a/src/main/java/com/github/technus/tectech/things/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java
@@ -1,6 +1,7 @@
-package com.github.technus.tectech.things.metaTileEntity.multi;
+package com.github.technus.tectech.thing.metaTileEntity.multi;
 
 import com.github.technus.tectech.elementalMatter.commonValues;
+import com.github.technus.tectech.thing.metaTileEntity.GT_MetaTileEntity_MultiblockBase_EM;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
diff --git a/src/main/java/com/github/technus/tectech/things/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java
index 71fa9a0600..224cd38926 100644
--- a/src/main/java/com/github/technus/tectech/things/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java
@@ -1,6 +1,7 @@
-package com.github.technus.tectech.things.metaTileEntity.multi;
+package com.github.technus.tectech.thing.metaTileEntity.multi;
 
 import com.github.technus.tectech.elementalMatter.commonValues;
+import com.github.technus.tectech.thing.metaTileEntity.GT_MetaTileEntity_MultiblockBase_EM;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import net.minecraft.block.Block;
diff --git a/src/main/java/com/github/technus/tectech/things/metaTileEntity/multi/GT_MetaTileEntity_EM_crafter.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_crafter.java
index e19291f538..52774a7d29 100644
--- a/src/main/java/com/github/technus/tectech/things/metaTileEntity/multi/GT_MetaTileEntity_EM_crafter.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_crafter.java
@@ -1,6 +1,7 @@
-package com.github.technus.tectech.things.metaTileEntity.multi;
+package com.github.technus.tectech.thing.metaTileEntity.multi;
 
 import com.github.technus.tectech.elementalMatter.commonValues;
+import com.github.technus.tectech.thing.metaTileEntity.GT_MetaTileEntity_MultiblockBase_EM;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import net.minecraft.block.Block;
diff --git a/src/main/java/com/github/technus/tectech/things/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantifier.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantifier.java
index e94673e5c7..1cfeedf07d 100644
--- a/src/main/java/com/github/technus/tectech/things/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantifier.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantifier.java
@@ -1,8 +1,9 @@
-package com.github.technus.tectech.things.metaTileEntity.multi;
+package com.github.technus.tectech.thing.metaTileEntity.multi;
 
-import com.github.technus.tectech.things.block.QuantumGlass;
-import com.github.technus.tectech.things.casing.GT_Container_CasingsTT;
+import com.github.technus.tectech.thing.block.QuantumGlass;
+import com.github.technus.tectech.thing.casing.GT_Container_CasingsTT;
 import com.github.technus.tectech.elementalMatter.commonValues;
+import com.github.technus.tectech.thing.metaTileEntity.GT_MetaTileEntity_MultiblockBase_EM;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import net.minecraft.item.ItemStack;
diff --git a/src/main/java/com/github/technus/tectech/things/metaTileEntity/multi/GT_MetaTileEntity_EM_junction.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_junction.java
index 4d1524aed5..19e4d0d081 100644
--- a/src/main/java/com/github/technus/tectech/things/metaTileEntity/multi/GT_MetaTileEntity_EM_junction.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_junction.java
@@ -1,8 +1,11 @@
-package com.github.technus.tectech.things.metaTileEntity.multi;
+package com.github.technus.tectech.thing.metaTileEntity.multi;
 
-import com.github.technus.tectech.things.block.QuantumGlass;
-import com.github.technus.tectech.things.casing.GT_Container_CasingsTT;
+import com.github.technus.tectech.thing.block.QuantumGlass;
+import com.github.technus.tectech.thing.casing.GT_Container_CasingsTT;
 import com.github.technus.tectech.elementalMatter.commonValues;
+import com.github.technus.tectech.thing.metaTileEntity.GT_MetaTileEntity_MultiblockBase_EM;
+import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_InputElemental;
+import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_OutputElemental;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import net.minecraft.item.ItemStack;
diff --git a/src/main/java/com/github/technus/tectech/things/metaTileEntity/multi/GT_MetaTileEntity_EM_machine.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_machine.java
index 9a25c057f1..d20cdfc671 100644
--- a/src/main/java/com/github/technus/tectech/things/metaTileEntity/multi/GT_MetaTileEntity_EM_machine.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_machine.java
@@ -1,6 +1,7 @@
-package com.github.technus.tectech.things.metaTileEntity.multi;
+package com.github.technus.tectech.thing.metaTileEntity.multi;
 
 import com.github.technus.tectech.elementalMatter.commonValues;
+import com.github.technus.tectech.thing.metaTileEntity.GT_MetaTileEntity_MultiblockBase_EM;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import net.minecraft.block.Block;
diff --git a/src/main/java/com/github/technus/tectech/things/metaTileEntity/multi/GT_MetaTileEntity_EM_quantifier.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantifier.java
index 719bb221ec..d0d7294f98 100644
--- a/src/main/java/com/github/technus/tectech/things/metaTileEntity/multi/GT_MetaTileEntity_EM_quantifier.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantifier.java
@@ -1,8 +1,8 @@
-package com.github.technus.tectech.things.metaTileEntity.multi;
+package com.github.technus.tectech.thing.metaTileEntity.multi;
 
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.things.block.QuantumGlass;
-import com.github.technus.tectech.things.casing.GT_Container_CasingsTT;
+import com.github.technus.tectech.thing.block.QuantumGlass;
+import com.github.technus.tectech.thing.casing.GT_Container_CasingsTT;
 import com.github.technus.tectech.elementalMatter.classes.cElementalDefinitionStack;
 import com.github.technus.tectech.elementalMatter.classes.cElementalInstanceStack;
 import com.github.technus.tectech.elementalMatter.classes.cElementalInstanceStackTree;
@@ -11,6 +11,7 @@ import com.github.technus.tectech.elementalMatter.commonValues;
 import com.github.technus.tectech.elementalMatter.definitions.dAtomDefinition;
 import com.github.technus.tectech.elementalMatter.definitions.dHadronDefinition;
 import com.github.technus.tectech.elementalMatter.definitions.eLeptonDefinition;
+import com.github.technus.tectech.thing.metaTileEntity.GT_MetaTileEntity_MultiblockBase_EM;
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
diff --git a/src/main/java/com/github/technus/tectech/things/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java
index 7de3f1db0b..e20ff2d0bf 100644
--- a/src/main/java/com/github/technus/tectech/things/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java
@@ -1,6 +1,7 @@
-package com.github.technus.tectech.things.metaTileEntity.multi;
+package com.github.technus.tectech.thing.metaTileEntity.multi;
 
 import com.github.technus.tectech.elementalMatter.commonValues;
+import com.github.technus.tectech.thing.metaTileEntity.GT_MetaTileEntity_MultiblockBase_EM;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import net.minecraft.block.Block;
diff --git a/src/main/java/com/github/technus/tectech/things/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java
index 2886e782e2..5d9b8ddc77 100644
--- a/src/main/java/com/github/technus/tectech/things/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java
@@ -1,13 +1,14 @@
-package com.github.technus.tectech.things.metaTileEntity.multi;
+package com.github.technus.tectech.thing.metaTileEntity.multi;
 
 import com.github.technus.tectech.elementalMatter.commonValues;
+import com.github.technus.tectech.thing.metaTileEntity.GT_MetaTileEntity_MultiblockBase_EM;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import static com.github.technus.tectech.things.casing.GT_Container_CasingsTT.sBlockCasingsTT;
+import static com.github.technus.tectech.thing.casing.GT_Container_CasingsTT.sBlockCasingsTT;
 import static com.github.technus.tectech.elementalMatter.commonValues.multiCheckAt;
 
 /**
diff --git a/src/main/java/com/github/technus/tectech/things/metaTileEntity/multi/GT_MetaTileEntity_EM_wormhole.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_wormhole.java
index e5e5db4caf..843e8edbfc 100644
--- a/src/main/java/com/github/technus/tectech/things/metaTileEntity/multi/GT_MetaTileEntity_EM_wormhole.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_wormhole.java
@@ -1,6 +1,7 @@
-package com.github.technus.tectech.things.metaTileEntity.multi;
+package com.github.technus.tectech.thing.metaTileEntity.multi;
 
 import com.github.technus.tectech.elementalMatter.commonValues;
+import com.github.technus.tectech.thing.metaTileEntity.GT_MetaTileEntity_MultiblockBase_EM;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
diff --git a/src/main/java/com/github/technus/tectech/things/metaTileEntity/multi/gui/GT_Container_MultiMachineEM.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/gui/GT_Container_MultiMachineEM.java
index 3b4ec72338..3b3245e3a3 100644
--- a/src/main/java/com/github/technus/tectech/things/metaTileEntity/multi/gui/GT_Container_MultiMachineEM.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/gui/GT_Container_MultiMachineEM.java
@@ -1,6 +1,6 @@
-package com.github.technus.tectech.things.metaTileEntity.multi.gui;
+package com.github.technus.tectech.thing.metaTileEntity.multi.gui;
 
-import com.github.technus.tectech.things.metaTileEntity.GT_MetaTileEntity_MultiblockBase_EM;
+import com.github.technus.tectech.thing.metaTileEntity.GT_MetaTileEntity_MultiblockBase_EM;
 import gregtech.api.gui.GT_ContainerMetaTile_Machine;
 import gregtech.api.gui.GT_Slot_Holo;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
diff --git a/src/main/java/com/github/technus/tectech/things/metaTileEntity/multi/gui/GT_GUIContainer_MultiMachineEM.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/gui/GT_GUIContainer_MultiMachineEM.java
index b246239cc1..2e2377e8e9 100644
--- a/src/main/java/com/github/technus/tectech/things/metaTileEntity/multi/gui/GT_GUIContainer_MultiMachineEM.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/gui/GT_GUIContainer_MultiMachineEM.java
@@ -1,4 +1,4 @@
-package com.github.technus.tectech.things.metaTileEntity.multi.gui;
+package com.github.technus.tectech.thing.metaTileEntity.multi.gui;
 
 import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
diff --git a/src/main/java/com/github/technus/tectech/things/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_EM.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_EM.java
index 05cd562460..1e006f2041 100644
--- a/src/main/java/com/github/technus/tectech/things/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_EM.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_EM.java
@@ -1,8 +1,7 @@
-package com.github.technus.tectech.things.metaTileEntity.pipe;
+package com.github.technus.tectech.thing.metaTileEntity.pipe;
 
-import com.github.technus.tectech.things.machineTT;
+import com.github.technus.tectech.thing.machineTT;
 import com.github.technus.tectech.elementalMatter.commonValues;
-import com.github.technus.tectech.elementalMatter.interfaces.iConnectsToEMpipe;
 import gregtech.api.enums.Dyes;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/interfaces/iConnectsToEMpipe.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/iConnectsToEMpipe.java
index 9d9d0ebea9..d8fd912455 100644
--- a/src/main/java/com/github/technus/tectech/elementalMatter/interfaces/iConnectsToEMpipe.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/iConnectsToEMpipe.java
@@ -1,4 +1,4 @@
-package com.github.technus.tectech.elementalMatter.interfaces;
+package com.github.technus.tectech.thing.metaTileEntity.pipe;
 
 /**
  * Created by Tec on 26.02.2017.