diff --git a/src/main/java/com/zorbatron/zbgt/ZBGTCore.java b/src/main/java/com/zorbatron/zbgt/ZBGTCore.java
index df7f8204..14ae44eb 100644
--- a/src/main/java/com/zorbatron/zbgt/ZBGTCore.java
+++ b/src/main/java/com/zorbatron/zbgt/ZBGTCore.java
@@ -14,11 +14,11 @@
 
 import com.zorbatron.zbgt.api.util.ZBGTLog;
 import com.zorbatron.zbgt.common.CommonProxy;
-import com.zorbatron.zbgt.common.ZBGTMetaTileEntities;
 import com.zorbatron.zbgt.common.block.ZBGTMetaBlocks;
 import com.zorbatron.zbgt.common.block.blocks.CoALCasing;
 import com.zorbatron.zbgt.common.block.blocks.PreciseCasing;
 import com.zorbatron.zbgt.common.block.blocks.YOTTankCell;
+import com.zorbatron.zbgt.common.metatileentities.ZBGTMetaTileEntities;
 import com.zorbatron.zbgt.core.sound.ZBGTSoundEvents;
 
 import gregtech.GTInternalTags;
diff --git a/src/main/java/com/zorbatron/zbgt/common/ZBGTMetaTileEntities.java b/src/main/java/com/zorbatron/zbgt/common/metatileentities/ZBGTMetaTileEntities.java
similarity index 99%
rename from src/main/java/com/zorbatron/zbgt/common/ZBGTMetaTileEntities.java
rename to src/main/java/com/zorbatron/zbgt/common/metatileentities/ZBGTMetaTileEntities.java
index b35d47ad..0e706efe 100644
--- a/src/main/java/com/zorbatron/zbgt/common/ZBGTMetaTileEntities.java
+++ b/src/main/java/com/zorbatron/zbgt/common/metatileentities/ZBGTMetaTileEntities.java
@@ -1,4 +1,4 @@
-package com.zorbatron.zbgt.common;
+package com.zorbatron.zbgt.common.metatileentities;
 
 import static com.zorbatron.zbgt.api.util.ZBGTUtility.zbgtId;
 import static gregtech.common.metatileentities.MetaTileEntities.registerMetaTileEntity;
diff --git a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/MetaTileEntityYOTTank.java b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/MetaTileEntityYOTTank.java
index bd19982b..1c2a7ecf 100644
--- a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/MetaTileEntityYOTTank.java
+++ b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/MetaTileEntityYOTTank.java
@@ -31,10 +31,10 @@
 import com.zorbatron.zbgt.ZBGTConfig;
 import com.zorbatron.zbgt.api.ZBGTAPI;
 import com.zorbatron.zbgt.api.render.ZBGTTextures;
-import com.zorbatron.zbgt.common.ZBGTMetaTileEntities;
 import com.zorbatron.zbgt.common.block.ZBGTMetaBlocks;
 import com.zorbatron.zbgt.common.block.blocks.MiscCasing;
 import com.zorbatron.zbgt.common.block.blocks.YOTTankCell;
+import com.zorbatron.zbgt.common.metatileentities.ZBGTMetaTileEntities;
 import com.zorbatron.zbgt.common.metatileentities.multi.multiblockpart.MetaTileEntityYOTTankMEHatch;
 import com.zorbatron.zbgt.core.sound.ZBGTSoundEvents;
 
diff --git a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/mega/MetaTileEntityMegaABS.java b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/mega/MetaTileEntityMegaABS.java
index a362eb6d..67a89a6a 100644
--- a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/mega/MetaTileEntityMegaABS.java
+++ b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/mega/MetaTileEntityMegaABS.java
@@ -23,7 +23,7 @@
 import com.zorbatron.zbgt.api.metatileentity.LaserCapableGCYMRecipeMapMultiblockController;
 import com.zorbatron.zbgt.api.pattern.TraceabilityPredicates;
 import com.zorbatron.zbgt.api.render.ZBGTTextures;
-import com.zorbatron.zbgt.common.ZBGTMetaTileEntities;
+import com.zorbatron.zbgt.common.metatileentities.ZBGTMetaTileEntities;
 
 import gregicality.multiblocks.api.recipes.GCYMRecipeMaps;
 import gregicality.multiblocks.api.render.GCYMTextures;
diff --git a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/mega/MetaTileEntityMegaEBF.java b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/mega/MetaTileEntityMegaEBF.java
index 1bc69b9b..cc983237 100644
--- a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/mega/MetaTileEntityMegaEBF.java
+++ b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/mega/MetaTileEntityMegaEBF.java
@@ -25,7 +25,7 @@
 import com.zorbatron.zbgt.api.metatileentity.LaserCapableGCYMRecipeMapMultiblockController;
 import com.zorbatron.zbgt.api.pattern.TraceabilityPredicates;
 import com.zorbatron.zbgt.api.render.ZBGTTextures;
-import com.zorbatron.zbgt.common.ZBGTMetaTileEntities;
+import com.zorbatron.zbgt.common.metatileentities.ZBGTMetaTileEntities;
 
 import gregicality.multiblocks.common.metatileentities.GCYMMetaTileEntities;
 import gregtech.api.GTValues;
diff --git a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/mega/MetaTileEntityMegaOCU.java b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/mega/MetaTileEntityMegaOCU.java
index f9bc2483..3a9e4c38 100644
--- a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/mega/MetaTileEntityMegaOCU.java
+++ b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/mega/MetaTileEntityMegaOCU.java
@@ -22,7 +22,7 @@
 import com.zorbatron.zbgt.api.metatileentity.LaserCapableGCYMRecipeMapMultiblockController;
 import com.zorbatron.zbgt.api.pattern.TraceabilityPredicates;
 import com.zorbatron.zbgt.api.render.ZBGTTextures;
-import com.zorbatron.zbgt.common.ZBGTMetaTileEntities;
+import com.zorbatron.zbgt.common.metatileentities.ZBGTMetaTileEntities;
 
 import gregicality.multiblocks.api.capability.impl.GCYMMultiblockRecipeLogic;
 import gregicality.multiblocks.common.metatileentities.GCYMMetaTileEntities;
diff --git a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/mega/MetaTileEntityPreciseAssembler.java b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/mega/MetaTileEntityPreciseAssembler.java
index 6ac2ed15..31261838 100644
--- a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/mega/MetaTileEntityPreciseAssembler.java
+++ b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/mega/MetaTileEntityPreciseAssembler.java
@@ -30,9 +30,9 @@
 import com.zorbatron.zbgt.api.recipes.ZBGTRecipeMaps;
 import com.zorbatron.zbgt.api.recipes.properties.PreciseAssemblerProperty;
 import com.zorbatron.zbgt.api.render.ZBGTTextures;
-import com.zorbatron.zbgt.common.ZBGTMetaTileEntities;
 import com.zorbatron.zbgt.common.block.ZBGTMetaBlocks;
 import com.zorbatron.zbgt.common.block.blocks.PreciseCasing;
+import com.zorbatron.zbgt.common.metatileentities.ZBGTMetaTileEntities;
 
 import gregtech.api.GTValues;
 import gregtech.api.capability.impl.MultiblockRecipeLogic;
diff --git a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/quad/MetaTileEntityQueebf.java b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/quad/MetaTileEntityQueebf.java
index 4e7bf4d9..9cc89cce 100644
--- a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/quad/MetaTileEntityQueebf.java
+++ b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/quad/MetaTileEntityQueebf.java
@@ -23,7 +23,7 @@
 import org.jetbrains.annotations.Nullable;
 
 import com.zorbatron.zbgt.api.pattern.TraceabilityPredicates;
-import com.zorbatron.zbgt.common.ZBGTMetaTileEntities;
+import com.zorbatron.zbgt.common.metatileentities.ZBGTMetaTileEntities;
 
 import gregtech.api.GTValues;
 import gregtech.api.GregTechAPI;
diff --git a/src/main/java/com/zorbatron/zbgt/recipe/AE2Recipes.java b/src/main/java/com/zorbatron/zbgt/recipe/AE2Recipes.java
index 0c23a61c..6c6eabca 100644
--- a/src/main/java/com/zorbatron/zbgt/recipe/AE2Recipes.java
+++ b/src/main/java/com/zorbatron/zbgt/recipe/AE2Recipes.java
@@ -7,7 +7,7 @@
 
 import net.minecraft.item.ItemStack;
 
-import com.zorbatron.zbgt.common.ZBGTMetaTileEntities;
+import com.zorbatron.zbgt.common.metatileentities.ZBGTMetaTileEntities;
 
 import appeng.api.AEApi;
 import appeng.api.definitions.IMaterials;
diff --git a/src/main/java/com/zorbatron/zbgt/recipe/MultiblockPartRecipes.java b/src/main/java/com/zorbatron/zbgt/recipe/MultiblockPartRecipes.java
index 6748daf6..9c6b2545 100644
--- a/src/main/java/com/zorbatron/zbgt/recipe/MultiblockPartRecipes.java
+++ b/src/main/java/com/zorbatron/zbgt/recipe/MultiblockPartRecipes.java
@@ -5,7 +5,7 @@
 
 import com.zorbatron.zbgt.ZBGTConfig;
 import com.zorbatron.zbgt.api.recipes.ZBGTRecipeMaps;
-import com.zorbatron.zbgt.common.ZBGTMetaTileEntities;
+import com.zorbatron.zbgt.common.metatileentities.ZBGTMetaTileEntities;
 import com.zorbatron.zbgt.recipe.helpers.RecipeAssists;
 
 import gregicality.multiblocks.api.unification.GCYMMaterials;
diff --git a/src/main/java/com/zorbatron/zbgt/recipe/MultiblockRecipes.java b/src/main/java/com/zorbatron/zbgt/recipe/MultiblockRecipes.java
index 87cbf03d..e15011e1 100644
--- a/src/main/java/com/zorbatron/zbgt/recipe/MultiblockRecipes.java
+++ b/src/main/java/com/zorbatron/zbgt/recipe/MultiblockRecipes.java
@@ -10,11 +10,11 @@
 
 import net.minecraft.init.Items;
 
-import com.zorbatron.zbgt.common.ZBGTMetaTileEntities;
 import com.zorbatron.zbgt.common.block.ZBGTMetaBlocks;
 import com.zorbatron.zbgt.common.block.blocks.CoALCasing;
 import com.zorbatron.zbgt.common.block.blocks.MiscCasing;
 import com.zorbatron.zbgt.common.items.ZBGTMetaItems;
+import com.zorbatron.zbgt.common.metatileentities.ZBGTMetaTileEntities;
 
 import gregicality.multiblocks.api.unification.GCYMMaterials;
 import gregicality.multiblocks.common.block.GCYMMetaBlocks;