diff --git a/src/main/java/appeng/integration/BaseModule.java b/src/main/java/appeng/integration/BaseModule.java
deleted file mode 100644
index 3849abe7..00000000
--- a/src/main/java/appeng/integration/BaseModule.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * This file is part of Applied Energistics 2.
- * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved.
- *
- * Applied Energistics 2 is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Applied Energistics 2 is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
- */
-
-package appeng.integration;
-
-
-public abstract class BaseModule implements IIntegrationModule
-{
-	@Override
-	public abstract void init() throws Throwable;
-
-	@Override
-	public abstract void postInit();
-}
diff --git a/src/main/java/appeng/integration/IIntegrationModule.java b/src/main/java/appeng/integration/IIntegrationModule.java
index b320efd9..64a7a8ae 100644
--- a/src/main/java/appeng/integration/IIntegrationModule.java
+++ b/src/main/java/appeng/integration/IIntegrationModule.java
@@ -21,7 +21,6 @@ package appeng.integration;
 
 public interface IIntegrationModule
 {
-
 	void init() throws Throwable;
 
 	void postInit();
diff --git a/src/main/java/appeng/integration/modules/BetterStorage.java b/src/main/java/appeng/integration/modules/BetterStorage.java
index aee11b65..a94401a2 100644
--- a/src/main/java/appeng/integration/modules/BetterStorage.java
+++ b/src/main/java/appeng/integration/modules/BetterStorage.java
@@ -22,8 +22,6 @@ package appeng.integration.modules;
 import net.mcft.copy.betterstorage.api.crate.ICrateStorage;
 import appeng.api.AEApi;
 import appeng.helpers.Reflected;
-import appeng.integration.BaseModule;
-import appeng.api.util.ForgeDirection;
 import appeng.integration.IIntegrationModule;
 import appeng.integration.IntegrationHelper;
 import appeng.integration.abstraction.IBetterStorage;
@@ -32,7 +30,7 @@ import appeng.integration.modules.helpers.BSCrateStorageAdaptor;
 import appeng.util.InventoryAdaptor;
 
 
-public class BetterStorage extends BaseModule implements IIntegrationModule, IBetterStorage
+public class BetterStorage implements IIntegrationModule, IBetterStorage
 {
 	@Reflected
 	public static BetterStorage instance;
diff --git a/src/main/java/appeng/integration/modules/BuildCraftBuilder.java b/src/main/java/appeng/integration/modules/BuildCraftBuilder.java
index 12c2ff49..336f1429 100644
--- a/src/main/java/appeng/integration/modules/BuildCraftBuilder.java
+++ b/src/main/java/appeng/integration/modules/BuildCraftBuilder.java
@@ -37,7 +37,7 @@ import appeng.api.definitions.ITileDefinition;
 import appeng.api.util.IOrientableBlock;
 import appeng.core.AELog;
 import appeng.helpers.Reflected;
-import appeng.integration.BaseModule;
+import appeng.integration.IIntegrationModule;
 import appeng.integration.IntegrationHelper;
 import appeng.integration.modules.BCHelpers.AECableSchematicTile;
 import appeng.integration.modules.BCHelpers.AEGenericSchematicTile;
@@ -52,7 +52,7 @@ import appeng.integration.modules.BCHelpers.AERotatableBlockSchematic;
  * @since rv3 12.06.2015
  */
 @Reflected
-public class BuildCraftBuilder extends BaseModule
+public class BuildCraftBuilder implements IIntegrationModule
 {
 	@Reflected
 	public static BuildCraftBuilder instance;
diff --git a/src/main/java/appeng/integration/modules/BuildCraftCore.java b/src/main/java/appeng/integration/modules/BuildCraftCore.java
index fbd56c52..d1815d4a 100644
--- a/src/main/java/appeng/integration/modules/BuildCraftCore.java
+++ b/src/main/java/appeng/integration/modules/BuildCraftCore.java
@@ -31,13 +31,13 @@ import appeng.api.AEApi;
 import appeng.api.config.TunnelType;
 import appeng.api.features.IP2PTunnelRegistry;
 import appeng.helpers.Reflected;
-import appeng.integration.BaseModule;
+import appeng.integration.IIntegrationModule;
 import appeng.integration.IntegrationHelper;
 import appeng.integration.abstraction.IBuildCraftCore;
 
 
 @Reflected
-public final class BuildCraftCore extends BaseModule implements IBuildCraftCore
+public final class BuildCraftCore implements IBuildCraftCore, IIntegrationModule
 {
 	@Reflected
 	public static BuildCraftCore instance;
diff --git a/src/main/java/appeng/integration/modules/BuildCraftTransport.java b/src/main/java/appeng/integration/modules/BuildCraftTransport.java
index 48dfdead..a0e1078b 100644
--- a/src/main/java/appeng/integration/modules/BuildCraftTransport.java
+++ b/src/main/java/appeng/integration/modules/BuildCraftTransport.java
@@ -46,7 +46,7 @@ import appeng.api.features.IP2PTunnelRegistry;
 import appeng.api.parts.IFacadePart;
 import appeng.facade.FacadePart;
 import appeng.helpers.Reflected;
-import appeng.integration.BaseModule;
+import appeng.integration.IIntegrationModule;
 import appeng.integration.IntegrationHelper;
 import appeng.integration.abstraction.IBuildCraftTransport;
 import appeng.integration.modules.BCHelpers.BCPipeHandler;
@@ -58,7 +58,7 @@ import appeng.integration.modules.BCHelpers.BCPipeHandler;
  * @since rv3 12.06.2015
  */
 @Reflected
-public class BuildCraftTransport extends BaseModule implements IBuildCraftTransport
+public class BuildCraftTransport implements IBuildCraftTransport, IIntegrationModule
 {
 	@Reflected
 	public static BuildCraftTransport instance;
diff --git a/src/main/java/appeng/integration/modules/CLApi.java b/src/main/java/appeng/integration/modules/CLApi.java
index 6036c916..aafb5f28 100644
--- a/src/main/java/appeng/integration/modules/CLApi.java
+++ b/src/main/java/appeng/integration/modules/CLApi.java
@@ -21,12 +21,12 @@ package appeng.integration.modules;
 
 import appeng.api.util.AEColor;
 import appeng.helpers.Reflected;
-import appeng.integration.BaseModule;
+import appeng.integration.IIntegrationModule;
 import appeng.integration.IntegrationHelper;
 import appeng.integration.abstraction.ICLApi;
 
 
-public class CLApi extends BaseModule implements ICLApi
+public class CLApi implements ICLApi, IIntegrationModule
 {
 	@Reflected
 	public static CLApi instance;
diff --git a/src/main/java/appeng/integration/modules/DSU.java b/src/main/java/appeng/integration/modules/DSU.java
index f26b9804..d156fbc5 100644
--- a/src/main/java/appeng/integration/modules/DSU.java
+++ b/src/main/java/appeng/integration/modules/DSU.java
@@ -26,14 +26,14 @@ import powercrystals.minefactoryreloaded.api.IDeepStorageUnit;
 import appeng.api.AEApi;
 import appeng.api.storage.IMEInventory;
 import appeng.helpers.Reflected;
-import appeng.integration.BaseModule;
+import appeng.integration.IIntegrationModule;
 import appeng.integration.IntegrationHelper;
 import appeng.integration.abstraction.IDSU;
 import appeng.integration.modules.helpers.MFRDSUHandler;
 import appeng.integration.modules.helpers.MinefactoryReloadedDeepStorageUnit;
 
 
-public class DSU extends BaseModule implements IDSU
+public class DSU implements IDSU, IIntegrationModule
 {
 	@Reflected
 	public static DSU instance;
diff --git a/src/main/java/appeng/integration/modules/FZ.java b/src/main/java/appeng/integration/modules/FZ.java
index 192d7f0f..cda928ca 100644
--- a/src/main/java/appeng/integration/modules/FZ.java
+++ b/src/main/java/appeng/integration/modules/FZ.java
@@ -29,7 +29,6 @@ import net.minecraft.tileentity.TileEntity;
 import appeng.api.AEApi;
 import appeng.api.storage.IMEInventory;
 import appeng.helpers.Reflected;
-import appeng.integration.BaseModule;
 import appeng.integration.IIntegrationModule;
 import appeng.integration.abstraction.IFZ;
 import appeng.integration.modules.helpers.FactorizationBarrel;
@@ -40,7 +39,7 @@ import appeng.util.Platform;
 /**
  * 100% Hacks.
  */
-public class FZ extends BaseModule implements IFZ, IIntegrationModule
+public class FZ implements IFZ, IIntegrationModule
 {
 	@Reflected
 	public static FZ instance;
diff --git a/src/main/java/appeng/integration/modules/IC2.java b/src/main/java/appeng/integration/modules/IC2.java
index b106b892..843d2eff 100644
--- a/src/main/java/appeng/integration/modules/IC2.java
+++ b/src/main/java/appeng/integration/modules/IC2.java
@@ -32,14 +32,14 @@ import appeng.api.config.TunnelType;
 import appeng.api.features.IP2PTunnelRegistry;
 import appeng.api.parts.IPartHelper;
 import appeng.helpers.Reflected;
-import appeng.integration.BaseModule;
+import appeng.integration.IIntegrationModule;
 import appeng.integration.IntegrationHelper;
 import appeng.integration.IntegrationRegistry;
 import appeng.integration.IntegrationType;
 import appeng.integration.abstraction.IIC2;
 
 
-public class IC2 extends BaseModule implements IIC2
+public class IC2 implements IIC2, IIntegrationModule
 {
 	@Reflected
 	public static IC2 instance;
diff --git a/src/main/java/appeng/integration/modules/ImmibisMicroblocks.java b/src/main/java/appeng/integration/modules/ImmibisMicroblocks.java
index e2bb1bae..ada8d24c 100644
--- a/src/main/java/appeng/integration/modules/ImmibisMicroblocks.java
+++ b/src/main/java/appeng/integration/modules/ImmibisMicroblocks.java
@@ -38,12 +38,12 @@ import appeng.api.parts.IPartHost;
 import appeng.api.parts.IPartItem;
 import appeng.core.AELog;
 import appeng.helpers.Reflected;
-import appeng.integration.BaseModule;
+import appeng.integration.IIntegrationModule;
 import appeng.integration.IntegrationHelper;
 import appeng.integration.abstraction.IImmibisMicroblocks;
 
 
-public class ImmibisMicroblocks extends BaseModule implements IImmibisMicroblocks
+public class ImmibisMicroblocks implements IImmibisMicroblocks, IIntegrationModule
 {
 	@Reflected
 	public static ImmibisMicroblocks instance;
diff --git a/src/main/java/appeng/integration/modules/InvTweaks.java b/src/main/java/appeng/integration/modules/InvTweaks.java
index 760e673e..424a494a 100644
--- a/src/main/java/appeng/integration/modules/InvTweaks.java
+++ b/src/main/java/appeng/integration/modules/InvTweaks.java
@@ -24,12 +24,12 @@ import net.minecraftforge.fml.common.Loader;
 import invtweaks.api.InvTweaksAPI;
 
 import appeng.helpers.Reflected;
-import appeng.integration.BaseModule;
+import appeng.integration.IIntegrationModule;
 import appeng.integration.IntegrationHelper;
 import appeng.integration.abstraction.IInvTweaks;
 
 
-public class InvTweaks extends BaseModule implements IInvTweaks
+public class InvTweaks implements IInvTweaks, IIntegrationModule
 {
 	@Reflected
 	public static InvTweaks instance;
diff --git a/src/main/java/appeng/integration/modules/MFR.java b/src/main/java/appeng/integration/modules/MFR.java
index 68cf94f0..26ab2bbc 100644
--- a/src/main/java/appeng/integration/modules/MFR.java
+++ b/src/main/java/appeng/integration/modules/MFR.java
@@ -20,11 +20,11 @@ package appeng.integration.modules;
 
 
 import appeng.helpers.Reflected;
-import appeng.integration.BaseModule;
+import appeng.integration.IIntegrationModule;
 import appeng.integration.IntegrationHelper;
 
 
-public class MFR extends BaseModule
+public class MFR implements IIntegrationModule
 {
 	@Reflected
 	public static MFR instance;
diff --git a/src/main/java/appeng/integration/modules/Mekanism.java b/src/main/java/appeng/integration/modules/Mekanism.java
index 8c4ae737..129a4837 100644
--- a/src/main/java/appeng/integration/modules/Mekanism.java
+++ b/src/main/java/appeng/integration/modules/Mekanism.java
@@ -25,12 +25,12 @@ import net.minecraft.nbt.NBTTagCompound;
 import cpw.mods.fml.common.event.FMLInterModComms;
 
 import appeng.helpers.Reflected;
-import appeng.integration.BaseModule;
+import appeng.integration.IIntegrationModule;
 import appeng.integration.IntegrationHelper;
 import appeng.integration.abstraction.IMekanism;
 
 
-public final class Mekanism extends BaseModule implements IMekanism
+public final class Mekanism implements IMekanism, IIntegrationModule
 {
 	@Reflected
 	public static Mekanism instance;
diff --git a/src/main/java/appeng/integration/modules/NEI.java b/src/main/java/appeng/integration/modules/NEI.java
index e4c443b3..94c65a4a 100644
--- a/src/main/java/appeng/integration/modules/NEI.java
+++ b/src/main/java/appeng/integration/modules/NEI.java
@@ -41,7 +41,7 @@ import appeng.client.gui.implementations.GuiPatternTerm;
 import appeng.core.AEConfig;
 import appeng.core.features.AEFeature;
 import appeng.helpers.Reflected;
-import appeng.integration.BaseModule;
+import appeng.integration.IIntegrationModule;
 import appeng.integration.IntegrationHelper;
 import appeng.integration.abstraction.INEI;
 import appeng.integration.modules.NEIHelpers.NEIAEShapedRecipeHandler;
@@ -54,7 +54,7 @@ import appeng.integration.modules.NEIHelpers.NEIWorldCraftingHandler;
 import appeng.integration.modules.NEIHelpers.TerminalCraftingSlotFinder;
 
 
-public class NEI extends BaseModule implements INEI, IContainerTooltipHandler
+public class NEI implements INEI, IContainerTooltipHandler, IIntegrationModule
 {
 	@Reflected
 	public static NEI instance;
diff --git a/src/main/java/appeng/integration/modules/OpenComputers.java b/src/main/java/appeng/integration/modules/OpenComputers.java
index 837cb12e..f23e378b 100644
--- a/src/main/java/appeng/integration/modules/OpenComputers.java
+++ b/src/main/java/appeng/integration/modules/OpenComputers.java
@@ -26,13 +26,13 @@ import appeng.api.config.TunnelType;
 import appeng.api.features.IP2PTunnelRegistry;
 import appeng.api.parts.IPartHelper;
 import appeng.helpers.Reflected;
-import appeng.integration.BaseModule;
+import appeng.integration.IIntegrationModule;
 import appeng.integration.IntegrationHelper;
 import appeng.integration.IntegrationRegistry;
 import appeng.integration.IntegrationType;
 
 
-public class OpenComputers extends BaseModule
+public class OpenComputers implements IIntegrationModule
 {
 	@Reflected
 	public static OpenComputers instance;
diff --git a/src/main/java/appeng/integration/modules/PneumaticCraft.java b/src/main/java/appeng/integration/modules/PneumaticCraft.java
index e027ede2..49630930 100644
--- a/src/main/java/appeng/integration/modules/PneumaticCraft.java
+++ b/src/main/java/appeng/integration/modules/PneumaticCraft.java
@@ -30,13 +30,13 @@ import appeng.api.config.TunnelType;
 import appeng.api.features.IP2PTunnelRegistry;
 import appeng.api.parts.IPartHelper;
 import appeng.helpers.Reflected;
-import appeng.integration.BaseModule;
+import appeng.integration.IIntegrationModule;
 import appeng.integration.IntegrationHelper;
 import appeng.integration.IntegrationRegistry;
 import appeng.integration.IntegrationType;
 
 
-public class PneumaticCraft extends BaseModule
+public class PneumaticCraft implements IIntegrationModule
 {
 	@Reflected
 	public static PneumaticCraft instance;
diff --git a/src/main/java/appeng/integration/modules/RC.java b/src/main/java/appeng/integration/modules/RC.java
index e3d8bc37..49dc1f22 100644
--- a/src/main/java/appeng/integration/modules/RC.java
+++ b/src/main/java/appeng/integration/modules/RC.java
@@ -25,12 +25,12 @@ import mods.railcraft.api.crafting.IRockCrusherRecipe;
 import mods.railcraft.api.crafting.RailcraftCraftingManager;
 
 import appeng.helpers.Reflected;
-import appeng.integration.BaseModule;
+import appeng.integration.IIntegrationModule;
 import appeng.integration.IntegrationHelper;
 import appeng.integration.abstraction.IRC;
 
 
-public class RC extends BaseModule implements IRC
+public class RC implements IRC, IIntegrationModule
 {
 	@Reflected
 	public static RC instance;
diff --git a/src/main/java/appeng/integration/modules/RF.java b/src/main/java/appeng/integration/modules/RF.java
index 38e2722c..502de7dd 100644
--- a/src/main/java/appeng/integration/modules/RF.java
+++ b/src/main/java/appeng/integration/modules/RF.java
@@ -27,13 +27,13 @@ import appeng.api.IAppEngApi;
 import appeng.api.config.TunnelType;
 import appeng.api.parts.IPartHelper;
 import appeng.helpers.Reflected;
-import appeng.integration.BaseModule;
+import appeng.integration.IIntegrationModule;
 import appeng.integration.IntegrationHelper;
 import appeng.integration.IntegrationRegistry;
 import appeng.integration.IntegrationType;
 
 
-public final class RF extends BaseModule
+public final class RF implements IIntegrationModule
 {
 	@Reflected
 	public static RF instance;
diff --git a/src/main/java/appeng/integration/modules/RFItem.java b/src/main/java/appeng/integration/modules/RFItem.java
index 0502a423..d2ded2c8 100644
--- a/src/main/java/appeng/integration/modules/RFItem.java
+++ b/src/main/java/appeng/integration/modules/RFItem.java
@@ -20,11 +20,11 @@ package appeng.integration.modules;
 
 
 import appeng.helpers.Reflected;
-import appeng.integration.BaseModule;
+import appeng.integration.IIntegrationModule;
 import appeng.integration.IntegrationHelper;
 
 
-public class RFItem extends BaseModule
+public class RFItem implements IIntegrationModule
 {
 	@Reflected
 	public static RFItem instance;
diff --git a/src/main/java/appeng/integration/modules/RotaryCraft.java b/src/main/java/appeng/integration/modules/RotaryCraft.java
index bae4d705..90cd7f58 100644
--- a/src/main/java/appeng/integration/modules/RotaryCraft.java
+++ b/src/main/java/appeng/integration/modules/RotaryCraft.java
@@ -20,11 +20,11 @@ package appeng.integration.modules;
 
 
 import appeng.helpers.Reflected;
-import appeng.integration.BaseModule;
+import appeng.integration.IIntegrationModule;
 import appeng.integration.IntegrationHelper;
 
 
-public class RotaryCraft extends BaseModule
+public class RotaryCraft implements IIntegrationModule
 {
 	@Reflected
 	public static RotaryCraft instance;
diff --git a/src/main/java/appeng/integration/modules/Waila.java b/src/main/java/appeng/integration/modules/Waila.java
index 953acf16..efdc9c75 100644
--- a/src/main/java/appeng/integration/modules/Waila.java
+++ b/src/main/java/appeng/integration/modules/Waila.java
@@ -24,14 +24,14 @@ import mcp.mobius.waila.api.IWailaDataProvider;
 import mcp.mobius.waila.api.IWailaRegistrar;
 
 import appeng.helpers.Reflected;
-import appeng.integration.BaseModule;
+import appeng.integration.IIntegrationModule;
 import appeng.integration.IntegrationHelper;
 import appeng.integration.modules.waila.PartWailaDataProvider;
 import appeng.integration.modules.waila.TileWailaDataProvider;
 import appeng.tile.AEBaseTile;
 
 
-public class Waila extends BaseModule
+public class Waila implements IIntegrationModule
 {
 	@Reflected
 	public static Waila instance;