moved blocks and TEs into 'common' package

40 files changed, 93 insertions, 92 deletions

diff --git a/src/main/java/blocks/BaseGTUpdateableBlock.java b/src/main/java/common/blocks/BaseGTUpdateableBlock.java
index 5b49a1fb25..8ca9a31fc0 100644
--- a/src/main/java/blocks/BaseGTUpdateableBlock.java
+++ b/src/main/java/common/blocks/BaseGTUpdateableBlock.java
@@ -1,4 +1,4 @@
-package blocks;
+package common.blocks;
 
 
 import gregtech.api.GregTech_API;
diff --git a/src/main/java/blocks/Block_ControlRod.java b/src/main/java/common/blocks/Block_ControlRod.java
index a31c6e2981..abb9254f15 100644
--- a/src/main/java/blocks/Block_ControlRod.java
+++ b/src/main/java/common/blocks/Block_ControlRod.java
@@ -1,4 +1,4 @@
-package blocks;
+package common.blocks;
 
 import cpw.mods.fml.common.registry.GameRegistry;
 import kekztech.KekzCore;
diff --git a/src/main/java/blocks/Block_GDCUnit.java b/src/main/java/common/blocks/Block_GDCUnit.java
index 9dbad68d45..ec493eba90 100644
--- a/src/main/java/blocks/Block_GDCUnit.java
+++ b/src/main/java/common/blocks/Block_GDCUnit.java
@@ -1,4 +1,4 @@
-package blocks;

+package common.blocks;

 

 import cpw.mods.fml.common.registry.GameRegistry;

 import kekztech.KekzCore;

diff --git a/src/main/java/blocks/Block_IchorJar.java b/src/main/java/common/blocks/Block_IchorJar.java
index bc046ae3b4..b5660f3d82 100644
--- a/src/main/java/blocks/Block_IchorJar.java
+++ b/src/main/java/common/blocks/Block_IchorJar.java
@@ -1,5 +1,6 @@
-package blocks;
+package common.blocks;
 
+import common.tileentities.TE_IchorJar;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -7,7 +8,6 @@ import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import thaumcraft.common.blocks.BlockJar;
-import tileentities.TE_IchorJar;
 
 public class Block_IchorJar extends BlockJar {
 	
diff --git a/src/main/java/blocks/Block_ItemProxyCable.java b/src/main/java/common/blocks/Block_ItemProxyCable.java
index dee566bab7..5dffc4d60d 100644
--- a/src/main/java/blocks/Block_ItemProxyCable.java
+++ b/src/main/java/common/blocks/Block_ItemProxyCable.java
@@ -1,5 +1,6 @@
-package blocks;
+package common.blocks;
 
+import common.tileentities.TE_ItemProxyCable;
 import cpw.mods.fml.common.registry.GameRegistry;
 import itemBlocks.IB_ItemProxyCable;
 import kekztech.KekzCore;
@@ -8,7 +9,6 @@ import net.minecraft.block.material.Material;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
-import tileentities.TE_ItemProxyCable;
 
 public class Block_ItemProxyCable extends BlockContainer {
 	
diff --git a/src/main/java/blocks/Block_ItemProxyEndpoint.java b/src/main/java/common/blocks/Block_ItemProxyEndpoint.java
index 762880c877..91d4ef5d29 100644
--- a/src/main/java/blocks/Block_ItemProxyEndpoint.java
+++ b/src/main/java/common/blocks/Block_ItemProxyEndpoint.java
@@ -1,7 +1,8 @@
-package blocks;
+package common.blocks;
 
 import java.util.UUID;
 
+import common.tileentities.TE_ItemProxyEndpoint;
 import cpw.mods.fml.common.registry.GameRegistry;
 import itemBlocks.IB_ItemProxyEndpoint;
 import items.Item_Configurator;
@@ -14,7 +15,6 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
-import tileentities.TE_ItemProxyEndpoint;
 
 public class Block_ItemProxyEndpoint extends BlockContainer {
 	
diff --git a/src/main/java/blocks/Block_ItemProxySource.java b/src/main/java/common/blocks/Block_ItemProxySource.java
index b2cdd4a656..0158ae57e9 100644
--- a/src/main/java/blocks/Block_ItemProxySource.java
+++ b/src/main/java/common/blocks/Block_ItemProxySource.java
@@ -1,5 +1,6 @@
-package blocks;
+package common.blocks;
 
+import common.tileentities.TE_ItemProxySource;
 import cpw.mods.fml.common.registry.GameRegistry;
 import itemBlocks.IB_ItemProxySource;
 import items.Item_Configurator;
@@ -13,7 +14,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
-import tileentities.TE_ItemProxySource;
 
 public class Block_ItemProxySource extends BlockContainer {
 	
diff --git a/src/main/java/blocks/Block_ItemServerDrive.java b/src/main/java/common/blocks/Block_ItemServerDrive.java
index e2d521424b..e35cc220db 100644
--- a/src/main/java/blocks/Block_ItemServerDrive.java
+++ b/src/main/java/common/blocks/Block_ItemServerDrive.java
@@ -1,4 +1,4 @@
-package blocks;
+package common.blocks;
 
 import cpw.mods.fml.common.registry.GameRegistry;
 import itemBlocks.IB_ItemServerDrive;
diff --git a/src/main/java/blocks/Block_ItemServerIOPort.java b/src/main/java/common/blocks/Block_ItemServerIOPort.java
index e53ebe2859..c7a3f4dce5 100644
--- a/src/main/java/blocks/Block_ItemServerIOPort.java
+++ b/src/main/java/common/blocks/Block_ItemServerIOPort.java
@@ -1,5 +1,6 @@
-package blocks;
+package common.blocks;
 
+import common.tileentities.TE_ItemServerIOPort;
 import cpw.mods.fml.common.registry.GameRegistry;
 import itemBlocks.IB_ItemServerIOPort;
 import kekztech.KekzCore;
@@ -7,7 +8,6 @@ import net.minecraft.block.material.Material;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
-import tileentities.TE_ItemServerIOPort;
 
 public class Block_ItemServerIOPort extends BaseGTUpdateableBlock {
 
diff --git a/src/main/java/blocks/Block_ItemServerRackCasing.java b/src/main/java/common/blocks/Block_ItemServerRackCasing.java
index fe57f2da85..e12262538b 100644
--- a/src/main/java/blocks/Block_ItemServerRackCasing.java
+++ b/src/main/java/common/blocks/Block_ItemServerRackCasing.java
@@ -1,4 +1,4 @@
-package blocks;
+package common.blocks;
 
 import cpw.mods.fml.common.registry.GameRegistry;
 import itemBlocks.IB_ItemServerRackCasing;
diff --git a/src/main/java/blocks/Block_ReactorChamber_OFF.java b/src/main/java/common/blocks/Block_ReactorChamber_OFF.java
index 86b4b63445..ab14e1d56c 100644
--- a/src/main/java/blocks/Block_ReactorChamber_OFF.java
+++ b/src/main/java/common/blocks/Block_ReactorChamber_OFF.java
@@ -1,4 +1,4 @@
-package blocks;
+package common.blocks;
 
 import cpw.mods.fml.common.registry.GameRegistry;
 import kekztech.KekzCore;
diff --git a/src/main/java/blocks/Block_ReactorChamber_ON.java b/src/main/java/common/blocks/Block_ReactorChamber_ON.java
index 621ffb99eb..fa6db02c8e 100644
--- a/src/main/java/blocks/Block_ReactorChamber_ON.java
+++ b/src/main/java/common/blocks/Block_ReactorChamber_ON.java
@@ -1,4 +1,4 @@
-package blocks;
+package common.blocks;
 
 import cpw.mods.fml.common.registry.GameRegistry;
 import kekztech.KekzCore;
diff --git a/src/main/java/blocks/Block_TFFTCasing.java b/src/main/java/common/blocks/Block_TFFTCasing.java
index df6626894d..86d4ed6182 100644
--- a/src/main/java/blocks/Block_TFFTCasing.java
+++ b/src/main/java/common/blocks/Block_TFFTCasing.java
@@ -1,4 +1,4 @@
-package blocks;

+package common.blocks;

 

 import cpw.mods.fml.common.registry.GameRegistry;

 import kekztech.KekzCore;

diff --git a/src/main/java/blocks/Block_TFFTMultiHatch.java b/src/main/java/common/blocks/Block_TFFTMultiHatch.java
index 8b8c195335..c0cfab7777 100644
--- a/src/main/java/blocks/Block_TFFTMultiHatch.java
+++ b/src/main/java/common/blocks/Block_TFFTMultiHatch.java
@@ -1,5 +1,6 @@
-package blocks;
+package common.blocks;
 
+import common.tileentities.TE_TFFTMultiHatch;
 import cpw.mods.fml.common.registry.GameRegistry;
 import gregtech.api.GregTech_API;
 import gregtech.api.util.GT_ModHandler;
@@ -11,7 +12,6 @@ import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
-import tileentities.TE_TFFTMultiHatch;
 
 public class Block_TFFTMultiHatch extends BaseGTUpdateableBlock {
 	
diff --git a/src/main/java/blocks/Block_TFFTStorageFieldBlockT1.java b/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT1.java
index cfb40282fa..3bc390ce91 100644
--- a/src/main/java/blocks/Block_TFFTStorageFieldBlockT1.java
+++ b/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT1.java
@@ -1,4 +1,4 @@
-package blocks;

+package common.blocks;

 

 import cpw.mods.fml.common.registry.GameRegistry;

 import itemBlocks.IB_TFFTStorageFieldBlockT1;

diff --git a/src/main/java/blocks/Block_TFFTStorageFieldBlockT2.java b/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT2.java
index afacd768c3..7ba7f25a88 100644
--- a/src/main/java/blocks/Block_TFFTStorageFieldBlockT2.java
+++ b/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT2.java
@@ -1,4 +1,4 @@
-package blocks;

+package common.blocks;

 

 import cpw.mods.fml.common.registry.GameRegistry;

 import itemBlocks.IB_TFFTStorageFieldBlockT2;

diff --git a/src/main/java/blocks/Block_TFFTStorageFieldBlockT3.java b/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT3.java
index 389bb7a24c..51741dc4fa 100644
--- a/src/main/java/blocks/Block_TFFTStorageFieldBlockT3.java
+++ b/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT3.java
@@ -1,4 +1,4 @@
-package blocks;

+package common.blocks;

 

 import cpw.mods.fml.common.registry.GameRegistry;

 import itemBlocks.IB_TFFTStorageFieldBlockT3;

diff --git a/src/main/java/blocks/Block_TFFTStorageFieldBlockT4.java b/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT4.java
index f328b858a5..9a2bb9e3be 100644
--- a/src/main/java/blocks/Block_TFFTStorageFieldBlockT4.java
+++ b/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT4.java
@@ -1,4 +1,4 @@
-package blocks;

+package common.blocks;

 

 import cpw.mods.fml.common.registry.GameRegistry;

 import itemBlocks.IB_TFFTStorageFieldBlockT4;

diff --git a/src/main/java/blocks/Block_TFFTStorageFieldBlockT5.java b/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT5.java
index fd53051974..437e0454f8 100644
--- a/src/main/java/blocks/Block_TFFTStorageFieldBlockT5.java
+++ b/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT5.java
@@ -1,4 +1,4 @@
-package blocks;
+package common.blocks;
 
 import cpw.mods.fml.common.registry.GameRegistry;
 import itemBlocks.IB_TFFTStorageFieldBlockT5;
diff --git a/src/main/java/blocks/Block_ThaumiumReinforcedJar.java b/src/main/java/common/blocks/Block_ThaumiumReinforcedJar.java
index 29736a14f9..246e3c9b05 100644
--- a/src/main/java/blocks/Block_ThaumiumReinforcedJar.java
+++ b/src/main/java/common/blocks/Block_ThaumiumReinforcedJar.java
@@ -1,7 +1,8 @@
-package blocks;
+package common.blocks;
 
 import java.util.ArrayList;
 
+import common.tileentities.TE_ThaumiumReinforcedJar;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -16,7 +17,6 @@ import thaumcraft.common.blocks.BlockJar;
 import thaumcraft.common.blocks.ItemJarFilled;
 import thaumcraft.common.tiles.TileJarFillable;
 import thaumcraft.common.tiles.TileJarFillableVoid;
-import tileentities.TE_ThaumiumReinforcedJar;
 
 public class Block_ThaumiumReinforcedJar extends BlockJar {
 	
diff --git a/src/main/java/blocks/Block_YSZUnit.java b/src/main/java/common/blocks/Block_YSZUnit.java
index 33ec67c5be..60b5603a3e 100644
--- a/src/main/java/blocks/Block_YSZUnit.java
+++ b/src/main/java/common/blocks/Block_YSZUnit.java
@@ -1,4 +1,4 @@
-package blocks;

+package common.blocks;

 

 import cpw.mods.fml.common.registry.GameRegistry;

 import kekztech.KekzCore;

diff --git a/src/main/java/tileentities/GTMTE_FluidMultiStorage.java b/src/main/java/common/tileentities/GTMTE_FluidMultiStorage.java
index c14b9608c4..d362342366 100644
--- a/src/main/java/tileentities/GTMTE_FluidMultiStorage.java
+++ b/src/main/java/common/tileentities/GTMTE_FluidMultiStorage.java
@@ -1,6 +1,5 @@
-package tileentities;

+package common.tileentities;

 

-import blocks.*;

 import gregtech.api.enums.Textures.BlockIcons;

 import gregtech.api.gui.GT_GUIContainer_MultiMachine;

 import gregtech.api.interfaces.ITexture;

@@ -21,6 +20,8 @@ import net.minecraft.util.EnumChatFormatting;
 import net.minecraftforge.common.util.ForgeDirection;

 import net.minecraftforge.fluids.FluidStack;

 import org.lwjgl.input.Keyboard;

+

+import common.blocks.*;

 import util.MultiBlockTooltipBuilder;

 import util.Vector3i;

 import util.Vector3ic;

diff --git a/src/main/java/tileentities/GTMTE_ItemServer.java b/src/main/java/common/tileentities/GTMTE_ItemServer.java
index f7bb6fe95b..158207fd5c 100644
--- a/src/main/java/tileentities/GTMTE_ItemServer.java
+++ b/src/main/java/common/tileentities/GTMTE_ItemServer.java
@@ -1,13 +1,13 @@
-package tileentities;
+package common.tileentities;
 
 import java.util.ArrayList;
 import java.util.HashSet;
 
 import org.lwjgl.input.Keyboard;
 
-import blocks.Block_ItemServerDrive;
-import blocks.Block_ItemServerIOPort;
-import blocks.Block_ItemServerRackCasing;
+import common.blocks.Block_ItemServerDrive;
+import common.blocks.Block_ItemServerIOPort;
+import common.blocks.Block_ItemServerRackCasing;
 import gregtech.api.enums.Textures.BlockIcons;
 import gregtech.api.gui.GT_GUIContainer_MultiMachine;
 import gregtech.api.interfaces.ITexture;
diff --git a/src/main/java/tileentities/GTMTE_ModularNuclearReactor.java b/src/main/java/common/tileentities/GTMTE_ModularNuclearReactor.java
index 14941e489d..e08c383997 100644
--- a/src/main/java/tileentities/GTMTE_ModularNuclearReactor.java
+++ b/src/main/java/common/tileentities/GTMTE_ModularNuclearReactor.java
@@ -1,11 +1,11 @@
-package tileentities;

+package common.tileentities;

 

 import org.joml.Vector3i;

 import org.lwjgl.input.Keyboard;

 

-import blocks.Block_ControlRod;

-import blocks.Block_ReactorChamber_OFF;

-import blocks.Block_ReactorChamber_ON;

+import common.blocks.Block_ControlRod;

+import common.blocks.Block_ReactorChamber_OFF;

+import common.blocks.Block_ReactorChamber_ON;

 import container.GUIContainer_ModularNuclearReactor;

 import gregtech.api.GregTech_API;

 import gregtech.api.enums.Textures;

diff --git a/src/main/java/tileentities/GTMTE_SOFuelCellMK1.java b/src/main/java/common/tileentities/GTMTE_SOFuelCellMK1.java
index 197799149c..ee8fb9352f 100644
--- a/src/main/java/tileentities/GTMTE_SOFuelCellMK1.java
+++ b/src/main/java/common/tileentities/GTMTE_SOFuelCellMK1.java
@@ -1,4 +1,4 @@
-package tileentities;

+package common.tileentities;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -6,7 +6,7 @@ import java.util.Iterator;
 

 import org.lwjgl.input.Keyboard;

 

-import blocks.Block_YSZUnit;

+import common.blocks.Block_YSZUnit;

 import gregtech.api.GregTech_API;

 import gregtech.api.enums.Materials;

 import gregtech.api.enums.Textures;

diff --git a/src/main/java/tileentities/GTMTE_SOFuelCellMK2.java b/src/main/java/common/tileentities/GTMTE_SOFuelCellMK2.java
index de8b37cb85..b9ca6aa25b 100644
--- a/src/main/java/tileentities/GTMTE_SOFuelCellMK2.java
+++ b/src/main/java/common/tileentities/GTMTE_SOFuelCellMK2.java
@@ -1,4 +1,4 @@
-package tileentities;

+package common.tileentities;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -6,7 +6,7 @@ import java.util.Iterator;
 

 import org.lwjgl.input.Keyboard;

 

-import blocks.Block_GDCUnit;

+import common.blocks.Block_GDCUnit;

 import gregtech.api.GregTech_API;

 import gregtech.api.enums.Materials;

 import gregtech.api.enums.Textures;

diff --git a/src/main/java/tileentities/TE_IchorJar.java b/src/main/java/common/tileentities/TE_IchorJar.java
index cc3063dc5d..1baa06a969 100644
--- a/src/main/java/tileentities/TE_IchorJar.java
+++ b/src/main/java/common/tileentities/TE_IchorJar.java
@@ -1,4 +1,4 @@
-package tileentities;
+package common.tileentities;
 
 import thaumcraft.common.tiles.TileJarFillable;
 
diff --git a/src/main/java/tileentities/TE_ItemProxyCable.java b/src/main/java/common/tileentities/TE_ItemProxyCable.java
index 43ebc07b13..30b3e15c38 100644
--- a/src/main/java/tileentities/TE_ItemProxyCable.java
+++ b/src/main/java/common/tileentities/TE_ItemProxyCable.java
@@ -1,4 +1,4 @@
-package tileentities;
+package common.tileentities;
 
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.util.ForgeDirection;
diff --git a/src/main/java/tileentities/TE_ItemProxyEndpoint.java b/src/main/java/common/tileentities/TE_ItemProxyEndpoint.java
index 1fe32c9687..95bf32c52a 100644
--- a/src/main/java/tileentities/TE_ItemProxyEndpoint.java
+++ b/src/main/java/common/tileentities/TE_ItemProxyEndpoint.java
@@ -1,4 +1,4 @@
-package tileentities;
+package common.tileentities;
 
 import java.util.HashSet;
 import java.util.UUID;
diff --git a/src/main/java/tileentities/TE_ItemProxySource.java b/src/main/java/common/tileentities/TE_ItemProxySource.java
index 15ffba3090..e514afe524 100644
--- a/src/main/java/tileentities/TE_ItemProxySource.java
+++ b/src/main/java/common/tileentities/TE_ItemProxySource.java
@@ -1,4 +1,4 @@
-package tileentities;
+package common.tileentities;
 
 import java.util.UUID;
 
diff --git a/src/main/java/tileentities/TE_ItemServerIOPort.java b/src/main/java/common/tileentities/TE_ItemServerIOPort.java
index a7dc7e14f5..f1a1e62ad6 100644
--- a/src/main/java/tileentities/TE_ItemServerIOPort.java
+++ b/src/main/java/common/tileentities/TE_ItemServerIOPort.java
@@ -1,4 +1,4 @@
-package tileentities;
+package common.tileentities;
 
 import kekztech.MultiItemHandler;
 import net.minecraft.entity.player.EntityPlayer;
diff --git a/src/main/java/tileentities/TE_TFFTMultiHatch.java b/src/main/java/common/tileentities/TE_TFFTMultiHatch.java
index 563d581d72..837898ab61 100644
--- a/src/main/java/tileentities/TE_TFFTMultiHatch.java
+++ b/src/main/java/common/tileentities/TE_TFFTMultiHatch.java
@@ -1,13 +1,13 @@
-package tileentities;
+package common.tileentities;
 
 import java.util.Iterator;
 import java.util.List;
 
-import blocks.Block_TFFTStorageFieldBlockT1;
-import blocks.Block_TFFTStorageFieldBlockT2;
-import blocks.Block_TFFTStorageFieldBlockT3;
-import blocks.Block_TFFTStorageFieldBlockT4;
-import blocks.Block_TFFTStorageFieldBlockT5;
+import common.blocks.Block_TFFTStorageFieldBlockT1;
+import common.blocks.Block_TFFTStorageFieldBlockT2;
+import common.blocks.Block_TFFTStorageFieldBlockT3;
+import common.blocks.Block_TFFTStorageFieldBlockT4;
+import common.blocks.Block_TFFTStorageFieldBlockT5;
 import kekztech.MultiFluidHandler;
 import net.minecraft.block.Block;
 import net.minecraft.nbt.NBTTagCompound;
diff --git a/src/main/java/tileentities/TE_ThaumiumReinforcedJar.java b/src/main/java/common/tileentities/TE_ThaumiumReinforcedJar.java
index 946f861f91..23b19495ae 100644
--- a/src/main/java/tileentities/TE_ThaumiumReinforcedJar.java
+++ b/src/main/java/common/tileentities/TE_ThaumiumReinforcedJar.java
@@ -1,4 +1,4 @@
-package tileentities;
+package common.tileentities;
 
 import thaumcraft.common.tiles.TileJarFillable;
 
diff --git a/src/main/java/itemBlocks/IB_TFFTStorageFieldBlockT1.java b/src/main/java/itemBlocks/IB_TFFTStorageFieldBlockT1.java
index 783db3ec00..1a692cbe3f 100644
--- a/src/main/java/itemBlocks/IB_TFFTStorageFieldBlockT1.java
+++ b/src/main/java/itemBlocks/IB_TFFTStorageFieldBlockT1.java
@@ -2,7 +2,7 @@ package itemBlocks;
 
 import java.util.List;
 
-import blocks.Block_TFFTStorageFieldBlockT1;
+import common.blocks.Block_TFFTStorageFieldBlockT1;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemBlock;
diff --git a/src/main/java/itemBlocks/IB_TFFTStorageFieldBlockT2.java b/src/main/java/itemBlocks/IB_TFFTStorageFieldBlockT2.java
index b9fee22647..0c48262641 100644
--- a/src/main/java/itemBlocks/IB_TFFTStorageFieldBlockT2.java
+++ b/src/main/java/itemBlocks/IB_TFFTStorageFieldBlockT2.java
@@ -2,7 +2,7 @@ package itemBlocks;
 
 import java.util.List;
 
-import blocks.Block_TFFTStorageFieldBlockT2;
+import common.blocks.Block_TFFTStorageFieldBlockT2;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemBlock;
diff --git a/src/main/java/itemBlocks/IB_TFFTStorageFieldBlockT3.java b/src/main/java/itemBlocks/IB_TFFTStorageFieldBlockT3.java
index 889470644d..780fcfb005 100644
--- a/src/main/java/itemBlocks/IB_TFFTStorageFieldBlockT3.java
+++ b/src/main/java/itemBlocks/IB_TFFTStorageFieldBlockT3.java
@@ -2,7 +2,7 @@ package itemBlocks;
 
 import java.util.List;
 
-import blocks.Block_TFFTStorageFieldBlockT3;
+import common.blocks.Block_TFFTStorageFieldBlockT3;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemBlock;
diff --git a/src/main/java/itemBlocks/IB_TFFTStorageFieldBlockT4.java b/src/main/java/itemBlocks/IB_TFFTStorageFieldBlockT4.java
index 960dee7f6b..cbb0e862f4 100644
--- a/src/main/java/itemBlocks/IB_TFFTStorageFieldBlockT4.java
+++ b/src/main/java/itemBlocks/IB_TFFTStorageFieldBlockT4.java
@@ -2,7 +2,7 @@ package itemBlocks;
 
 import java.util.List;
 
-import blocks.Block_TFFTStorageFieldBlockT4;
+import common.blocks.Block_TFFTStorageFieldBlockT4;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemBlock;
diff --git a/src/main/java/itemBlocks/IB_TFFTStorageFieldBlockT5.java b/src/main/java/itemBlocks/IB_TFFTStorageFieldBlockT5.java
index 304f2a221c..6828a2a904 100644
--- a/src/main/java/itemBlocks/IB_TFFTStorageFieldBlockT5.java
+++ b/src/main/java/itemBlocks/IB_TFFTStorageFieldBlockT5.java
@@ -2,7 +2,7 @@ package itemBlocks;
 
 import java.util.List;
 
-import blocks.Block_TFFTStorageFieldBlockT5;
+import common.blocks.Block_TFFTStorageFieldBlockT5;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemBlock;
diff --git a/src/main/java/kekztech/KekzCore.java b/src/main/java/kekztech/KekzCore.java
index 90a3df2960..55291eeadc 100644
--- a/src/main/java/kekztech/KekzCore.java
+++ b/src/main/java/kekztech/KekzCore.java
@@ -1,25 +1,37 @@
 package kekztech;

 

-import blocks.Block_ControlRod;

-import blocks.Block_GDCUnit;

-import blocks.Block_IchorJar;

-import blocks.Block_ItemProxyCable;

-import blocks.Block_ItemProxyEndpoint;

-import blocks.Block_ItemProxySource;

-import blocks.Block_ItemServerDrive;

-import blocks.Block_ItemServerIOPort;

-import blocks.Block_ItemServerRackCasing;

-import blocks.Block_ReactorChamber_OFF;

-import blocks.Block_ReactorChamber_ON;

-import blocks.Block_TFFTCasing;

-import blocks.Block_TFFTMultiHatch;

-import blocks.Block_TFFTStorageFieldBlockT1;

-import blocks.Block_TFFTStorageFieldBlockT2;

-import blocks.Block_TFFTStorageFieldBlockT3;

-import blocks.Block_TFFTStorageFieldBlockT4;

-import blocks.Block_TFFTStorageFieldBlockT5;

-import blocks.Block_ThaumiumReinforcedJar;

-import blocks.Block_YSZUnit;

+import common.blocks.Block_ControlRod;

+import common.blocks.Block_GDCUnit;

+import common.blocks.Block_IchorJar;

+import common.blocks.Block_ItemProxyCable;

+import common.blocks.Block_ItemProxyEndpoint;

+import common.blocks.Block_ItemProxySource;

+import common.blocks.Block_ItemServerDrive;

+import common.blocks.Block_ItemServerIOPort;

+import common.blocks.Block_ItemServerRackCasing;

+import common.blocks.Block_ReactorChamber_OFF;

+import common.blocks.Block_ReactorChamber_ON;

+import common.blocks.Block_TFFTCasing;

+import common.blocks.Block_TFFTMultiHatch;

+import common.blocks.Block_TFFTStorageFieldBlockT1;

+import common.blocks.Block_TFFTStorageFieldBlockT2;

+import common.blocks.Block_TFFTStorageFieldBlockT3;

+import common.blocks.Block_TFFTStorageFieldBlockT4;

+import common.blocks.Block_TFFTStorageFieldBlockT5;

+import common.blocks.Block_ThaumiumReinforcedJar;

+import common.blocks.Block_YSZUnit;

+import common.tileentities.GTMTE_FluidMultiStorage;

+import common.tileentities.GTMTE_ItemServer;

+import common.tileentities.GTMTE_ModularNuclearReactor;

+import common.tileentities.GTMTE_SOFuelCellMK1;

+import common.tileentities.GTMTE_SOFuelCellMK2;

+import common.tileentities.TE_IchorJar;

+import common.tileentities.TE_ItemProxyCable;

+import common.tileentities.TE_ItemProxyEndpoint;

+import common.tileentities.TE_ItemProxySource;

+import common.tileentities.TE_ItemServerIOPort;

+import common.tileentities.TE_TFFTMultiHatch;

+import common.tileentities.TE_ThaumiumReinforcedJar;

 import cpw.mods.fml.common.Loader;

 import cpw.mods.fml.common.Mod;

 import cpw.mods.fml.common.event.FMLInitializationEvent;

@@ -42,18 +54,6 @@ import items.MetaItem_ReactorComponent;
 import net.minecraft.item.ItemStack;

 import net.minecraftforge.fluids.FluidRegistry;

 import render.ConduitRenderer;

-import tileentities.GTMTE_FluidMultiStorage;

-import tileentities.GTMTE_ItemServer;

-import tileentities.GTMTE_ModularNuclearReactor;

-import tileentities.GTMTE_SOFuelCellMK1;

-import tileentities.GTMTE_SOFuelCellMK2;

-import tileentities.TE_IchorJar;

-import tileentities.TE_ItemProxyCable;

-import tileentities.TE_ItemProxyEndpoint;

-import tileentities.TE_ItemProxySource;

-import tileentities.TE_ItemServerIOPort;

-import tileentities.TE_TFFTMultiHatch;

-import tileentities.TE_ThaumiumReinforcedJar;

 import util.Util;

 

 /**

diff --git a/src/main/java/render/ConduitRenderer.java b/src/main/java/render/ConduitRenderer.java
index 241dd18647..c4eefd50a2 100644
--- a/src/main/java/render/ConduitRenderer.java
+++ b/src/main/java/render/ConduitRenderer.java
@@ -1,5 +1,6 @@
 package render;
 
+import common.tileentities.TE_ItemProxyCable;
 import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
 import cpw.mods.fml.client.registry.RenderingRegistry;
 import net.minecraft.block.Block;
@@ -9,7 +10,6 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
 import net.minecraftforge.common.util.ForgeDirection;
-import tileentities.TE_ItemProxyCable;
 
 public class ConduitRenderer implements ISimpleBlockRenderingHandler {