diff --git a/src/main/java/li/cil/occ/OpenComponents.java b/src/main/java/li/cil/occ/OpenComponents.java
index 67300afb2..b428da368 100644
--- a/src/main/java/li/cil/occ/OpenComponents.java
+++ b/src/main/java/li/cil/occ/OpenComponents.java
@@ -3,7 +3,17 @@ package li.cil.occ;
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import li.cil.occ.handler.*;
+import li.cil.occ.handler.Registry;
+import li.cil.occ.handler.appeng.ModAppEng;
+import li.cil.occ.handler.atomicscience.ModAtomicScience;
+import li.cil.occ.handler.buildcraft.ModBuildCraft;
+import li.cil.occ.handler.computercraft.ModComputerCraft;
+import li.cil.occ.handler.enderstorage.ModEnderStorage;
+import li.cil.occ.handler.ic2.ModIndustrialCraft2;
+import li.cil.occ.handler.mekanism.ModMekanism;
+import li.cil.occ.handler.redstoneinmotion.ModRedstoneInMotion;
+import li.cil.occ.handler.thermalexpansion.ModThermalExpansion;
+import li.cil.occ.handler.vanilla.ModVanilla;
 import net.minecraftforge.common.Configuration;
 
 import java.util.logging.Logger;
@@ -37,19 +47,19 @@ public class OpenComponents {
 
     @Mod.EventHandler
     public void init(final FMLInitializationEvent e) {
-        Registry.add(new HandlerAppEng());
-        Registry.add(new HandlerAtomicScience());
-        Registry.add(new HandlerBuildCraft());
-        Registry.add(new HandlerEnderStorage());
-        Registry.add(new HandlerIndustrialCraft2());
-        Registry.add(new HandlerMekanism());
-        Registry.add(new HandlerRedstoneInMotion());
-        Registry.add(new HandlerThermalExpansion());
-        Registry.add(new HandlerVanilla());
+        Registry.add(new ModAppEng());
+        Registry.add(new ModAtomicScience());
+        Registry.add(new ModBuildCraft());
+        Registry.add(new ModEnderStorage());
+        Registry.add(new ModIndustrialCraft2());
+        Registry.add(new ModMekanism());
+        Registry.add(new ModRedstoneInMotion());
+        Registry.add(new ModThermalExpansion());
+        Registry.add(new ModVanilla());
 
         // Register the general IPeripheral driver last, if at all, to avoid it
         // being used rather than other more concrete implementations, such as
         // is the case in the Redstone in Motion driver (replaces 'move').
-        Registry.add(new HandlerComputerCraft());
+        Registry.add(new ModComputerCraft());
     }
 }
diff --git a/src/main/java/li/cil/occ/handler/IHandler.java b/src/main/java/li/cil/occ/handler/IMod.java
similarity index 87%
rename from src/main/java/li/cil/occ/handler/IHandler.java
rename to src/main/java/li/cil/occ/handler/IMod.java
index bfb01d3c6..39b54e512 100644
--- a/src/main/java/li/cil/occ/handler/IHandler.java
+++ b/src/main/java/li/cil/occ/handler/IMod.java
@@ -4,7 +4,7 @@ import net.minecraft.item.ItemStack;
 
 import java.util.Map;
 
-public interface IHandler {
+public interface IMod {
     String getModId();
 
     void initialize();
diff --git a/src/main/java/li/cil/occ/handler/Registry.java b/src/main/java/li/cil/occ/handler/Registry.java
index 405a6b6fa..1232c66c7 100644
--- a/src/main/java/li/cil/occ/handler/Registry.java
+++ b/src/main/java/li/cil/occ/handler/Registry.java
@@ -11,12 +11,12 @@ import java.util.Set;
 import java.util.logging.Level;
 
 public final class Registry {
-    private static final Set<IHandler> handlers = new HashSet<IHandler>();
+    private static final Set<IMod> handlers = new HashSet<IMod>();
 
     private Registry() {
     }
 
-    public static void add(final IHandler mod) {
+    public static void add(final IMod mod) {
         final boolean alwaysEnabled = mod.getModId() == null || mod.getModId().isEmpty();
         if ((alwaysEnabled || Loader.isModLoaded(mod.getModId())) && handlers.add(mod)) {
             OpenComponents.Log.info(String.format("Initializing handler for '%s'.", mod.getModId()));
@@ -33,7 +33,7 @@ public final class Registry {
             return null;
         }
         final Map<String, Object> map = new HashMap<String, Object>();
-        for (IHandler handler : handlers) {
+        for (IMod handler : handlers) {
             handler.populate(map, value);
         }
         return map;
diff --git a/src/main/java/li/cil/occ/handler/appeng/DriverCellProvider.java b/src/main/java/li/cil/occ/handler/appeng/DriverCellProvider.java
index ef064ee01..e70664066 100644
--- a/src/main/java/li/cil/occ/handler/appeng/DriverCellProvider.java
+++ b/src/main/java/li/cil/occ/handler/appeng/DriverCellProvider.java
@@ -9,7 +9,6 @@ import li.cil.oc.api.network.Callback;
 import li.cil.oc.api.network.Context;
 import li.cil.oc.api.network.ManagedEnvironment;
 import li.cil.oc.api.prefab.DriverTileEntity;
-import li.cil.occ.handler.HandlerAppEng;
 import li.cil.occ.handler.ManagedTileEntityEnvironment;
 import li.cil.occ.handler.Registry;
 import net.minecraft.item.ItemStack;
@@ -105,7 +104,7 @@ public final class DriverCellProvider extends DriverTileEntity {
             }
             final ArrayList<Map> list = new ArrayList<Map>();
             for (IAEItemStack stack : cell.getAvailableItems()) {
-                list.add(HandlerAppEng.toMap(stack));
+                list.add(ModAppEng.toMap(stack));
             }
             return list.toArray();
         }
diff --git a/src/main/java/li/cil/occ/handler/HandlerAppEng.java b/src/main/java/li/cil/occ/handler/appeng/ModAppEng.java
similarity index 71%
rename from src/main/java/li/cil/occ/handler/HandlerAppEng.java
rename to src/main/java/li/cil/occ/handler/appeng/ModAppEng.java
index bb669d45d..49813c53a 100644
--- a/src/main/java/li/cil/occ/handler/HandlerAppEng.java
+++ b/src/main/java/li/cil/occ/handler/appeng/ModAppEng.java
@@ -1,16 +1,15 @@
-package li.cil.occ.handler;
+package li.cil.occ.handler.appeng;
 
 
 import appeng.api.IAEItemStack;
 import li.cil.oc.api.Driver;
-import li.cil.occ.handler.appeng.DriverCellProvider;
-import li.cil.occ.handler.appeng.DriverGridTileEntity;
-import li.cil.occ.handler.appeng.DriverTileController;
+import li.cil.occ.handler.IMod;
+import li.cil.occ.handler.Registry;
 import net.minecraft.item.ItemStack;
 
 import java.util.Map;
 
-public final class HandlerAppEng implements IHandler {
+public final class ModAppEng implements IMod {
     @Override
     public String getModId() {
         return "AppliedEnergistics";
@@ -27,7 +26,7 @@ public final class HandlerAppEng implements IHandler {
     public void populate(final Map<String, Object> map, final ItemStack stack) {
     }
 
-    public static Map<String, Object> toMap(final IAEItemStack stack) {
+    static Map<String, Object> toMap(final IAEItemStack stack) {
         // TODO Do we want to add more (isCraftable?) here? If not, inline.
         // (Do we even need the 'requestable'?)
         final Map<String, Object> map = Registry.toMap(stack.getItemStack());
diff --git a/src/main/java/li/cil/occ/handler/HandlerAtomicScience.java b/src/main/java/li/cil/occ/handler/atomicscience/ModAtomicScience.java
similarity index 80%
rename from src/main/java/li/cil/occ/handler/HandlerAtomicScience.java
rename to src/main/java/li/cil/occ/handler/atomicscience/ModAtomicScience.java
index a485f2a47..5e0ad8a09 100644
--- a/src/main/java/li/cil/occ/handler/HandlerAtomicScience.java
+++ b/src/main/java/li/cil/occ/handler/atomicscience/ModAtomicScience.java
@@ -1,13 +1,14 @@
-package li.cil.occ.handler;
+package li.cil.occ.handler.atomicscience;
 
 import li.cil.oc.api.Driver;
+import li.cil.occ.handler.IMod;
 import li.cil.occ.handler.atomicscience.DriverReactor;
 import li.cil.occ.handler.atomicscience.DriverTemperature;
 import net.minecraft.item.ItemStack;
 
 import java.util.Map;
 
-public final class HandlerAtomicScience implements IHandler {
+public final class ModAtomicScience implements IMod {
     @Override
     public String getModId() {
         return "AtomicScience";
diff --git a/src/main/java/li/cil/occ/handler/HandlerBuildCraft.java b/src/main/java/li/cil/occ/handler/buildcraft/ModBuildCraft.java
similarity index 85%
rename from src/main/java/li/cil/occ/handler/HandlerBuildCraft.java
rename to src/main/java/li/cil/occ/handler/buildcraft/ModBuildCraft.java
index 093942e69..b6f1ea060 100644
--- a/src/main/java/li/cil/occ/handler/HandlerBuildCraft.java
+++ b/src/main/java/li/cil/occ/handler/buildcraft/ModBuildCraft.java
@@ -1,6 +1,7 @@
-package li.cil.occ.handler;
+package li.cil.occ.handler.buildcraft;
 
 import li.cil.oc.api.Driver;
+import li.cil.occ.handler.IMod;
 import li.cil.occ.handler.buildcraft.DriverMachine;
 import li.cil.occ.handler.buildcraft.DriverPipe;
 import li.cil.occ.handler.buildcraft.DriverPipeTE;
@@ -9,7 +10,7 @@ import net.minecraft.item.ItemStack;
 
 import java.util.Map;
 
-public final class HandlerBuildCraft implements IHandler {
+public final class ModBuildCraft implements IMod {
     @Override
     public String getModId() {
         return "BuildCraft|Core";
diff --git a/src/main/java/li/cil/occ/handler/HandlerComputerCraft.java b/src/main/java/li/cil/occ/handler/computercraft/ModComputerCraft.java
similarity index 80%
rename from src/main/java/li/cil/occ/handler/HandlerComputerCraft.java
rename to src/main/java/li/cil/occ/handler/computercraft/ModComputerCraft.java
index 3a5988929..19a9db94d 100644
--- a/src/main/java/li/cil/occ/handler/HandlerComputerCraft.java
+++ b/src/main/java/li/cil/occ/handler/computercraft/ModComputerCraft.java
@@ -1,13 +1,14 @@
-package li.cil.occ.handler;
+package li.cil.occ.handler.computercraft;
 
 import li.cil.oc.api.Driver;
 import li.cil.occ.OpenComponents;
+import li.cil.occ.handler.IMod;
 import li.cil.occ.handler.computercraft.DriverPeripheral;
 import net.minecraft.item.ItemStack;
 
 import java.util.Map;
 
-public final class HandlerComputerCraft implements IHandler {
+public final class ModComputerCraft implements IMod {
     @Override
     public String getModId() {
         return "ComputerCraft";
diff --git a/src/main/java/li/cil/occ/handler/HandlerEnderStorage.java b/src/main/java/li/cil/occ/handler/enderstorage/ModEnderStorage.java
similarity index 77%
rename from src/main/java/li/cil/occ/handler/HandlerEnderStorage.java
rename to src/main/java/li/cil/occ/handler/enderstorage/ModEnderStorage.java
index 16c171243..67ba2313e 100644
--- a/src/main/java/li/cil/occ/handler/HandlerEnderStorage.java
+++ b/src/main/java/li/cil/occ/handler/enderstorage/ModEnderStorage.java
@@ -1,12 +1,13 @@
-package li.cil.occ.handler;
+package li.cil.occ.handler.enderstorage;
 
 import li.cil.oc.api.Driver;
+import li.cil.occ.handler.IMod;
 import li.cil.occ.handler.enderstorage.DriverFrequencyOwner;
 import net.minecraft.item.ItemStack;
 
 import java.util.Map;
 
-public final class HandlerEnderStorage implements IHandler {
+public final class ModEnderStorage implements IMod {
     @Override
     public String getModId() {
         return "EnderStorage";
diff --git a/src/main/java/li/cil/occ/handler/HandlerIndustrialCraft2.java b/src/main/java/li/cil/occ/handler/ic2/ModIndustrialCraft2.java
similarity index 91%
rename from src/main/java/li/cil/occ/handler/HandlerIndustrialCraft2.java
rename to src/main/java/li/cil/occ/handler/ic2/ModIndustrialCraft2.java
index 4d296d1e6..f7a07a3f6 100644
--- a/src/main/java/li/cil/occ/handler/HandlerIndustrialCraft2.java
+++ b/src/main/java/li/cil/occ/handler/ic2/ModIndustrialCraft2.java
@@ -1,15 +1,16 @@
-package li.cil.occ.handler;
+package li.cil.occ.handler.ic2;
 
 import ic2.api.item.ElectricItem;
 import ic2.api.item.IElectricItem;
 import li.cil.oc.api.Driver;
+import li.cil.occ.handler.IMod;
 import li.cil.occ.handler.ic2.*;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 
 import java.util.Map;
 
-public final class HandlerIndustrialCraft2 implements IHandler {
+public final class ModIndustrialCraft2 implements IMod {
     @Override
     public String getModId() {
         return "IC2";
diff --git a/src/main/java/li/cil/occ/handler/HandlerMekanism.java b/src/main/java/li/cil/occ/handler/mekanism/ModMekanism.java
similarity index 86%
rename from src/main/java/li/cil/occ/handler/HandlerMekanism.java
rename to src/main/java/li/cil/occ/handler/mekanism/ModMekanism.java
index 24c6358c0..1410184f7 100644
--- a/src/main/java/li/cil/occ/handler/HandlerMekanism.java
+++ b/src/main/java/li/cil/occ/handler/mekanism/ModMekanism.java
@@ -1,12 +1,13 @@
-package li.cil.occ.handler;
+package li.cil.occ.handler.mekanism;
 
 import li.cil.oc.api.Driver;
+import li.cil.occ.handler.IMod;
 import li.cil.occ.handler.mekanism.*;
 import net.minecraft.item.ItemStack;
 
 import java.util.Map;
 
-public final class HandlerMekanism implements IHandler {
+public final class ModMekanism implements IMod {
     @Override
     public String getModId() {
         return "Mekanism";
diff --git a/src/main/java/li/cil/occ/handler/HandlerRedstoneInMotion.java b/src/main/java/li/cil/occ/handler/redstoneinmotion/ModRedstoneInMotion.java
similarity index 77%
rename from src/main/java/li/cil/occ/handler/HandlerRedstoneInMotion.java
rename to src/main/java/li/cil/occ/handler/redstoneinmotion/ModRedstoneInMotion.java
index 9f9046904..8fd0ad57c 100644
--- a/src/main/java/li/cil/occ/handler/HandlerRedstoneInMotion.java
+++ b/src/main/java/li/cil/occ/handler/redstoneinmotion/ModRedstoneInMotion.java
@@ -1,12 +1,13 @@
-package li.cil.occ.handler;
+package li.cil.occ.handler.redstoneinmotion;
 
 import li.cil.oc.api.Driver;
+import li.cil.occ.handler.IMod;
 import li.cil.occ.handler.redstoneinmotion.DriverCarriageController;
 import net.minecraft.item.ItemStack;
 
 import java.util.Map;
 
-public final class HandlerRedstoneInMotion implements IHandler {
+public final class ModRedstoneInMotion implements IMod {
     @Override
     public String getModId() {
         return "JAKJ_RedstoneInMotion";
diff --git a/src/main/java/li/cil/occ/handler/HandlerThermalExpansion.java b/src/main/java/li/cil/occ/handler/thermalexpansion/ModThermalExpansion.java
similarity index 88%
rename from src/main/java/li/cil/occ/handler/HandlerThermalExpansion.java
rename to src/main/java/li/cil/occ/handler/thermalexpansion/ModThermalExpansion.java
index 498d19756..7cfea9a41 100644
--- a/src/main/java/li/cil/occ/handler/HandlerThermalExpansion.java
+++ b/src/main/java/li/cil/occ/handler/thermalexpansion/ModThermalExpansion.java
@@ -1,14 +1,15 @@
-package li.cil.occ.handler;
+package li.cil.occ.handler.thermalexpansion;
 
 import cofh.api.energy.IEnergyContainerItem;
 import li.cil.oc.api.Driver;
+import li.cil.occ.handler.IMod;
 import li.cil.occ.handler.thermalexpansion.*;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 
 import java.util.Map;
 
-public final class HandlerThermalExpansion implements IHandler {
+public final class ModThermalExpansion implements IMod {
     @Override
     public String getModId() {
         return "ThermalExpansion";
diff --git a/src/main/java/li/cil/occ/handler/HandlerVanilla.java b/src/main/java/li/cil/occ/handler/vanilla/ModVanilla.java
similarity index 91%
rename from src/main/java/li/cil/occ/handler/HandlerVanilla.java
rename to src/main/java/li/cil/occ/handler/vanilla/ModVanilla.java
index 232dd0fe6..2d261017c 100644
--- a/src/main/java/li/cil/occ/handler/HandlerVanilla.java
+++ b/src/main/java/li/cil/occ/handler/vanilla/ModVanilla.java
@@ -1,12 +1,13 @@
-package li.cil.occ.handler;
+package li.cil.occ.handler.vanilla;
 
 import li.cil.oc.api.Driver;
+import li.cil.occ.handler.IMod;
 import li.cil.occ.handler.vanilla.*;
 import net.minecraft.item.ItemStack;
 
 import java.util.Map;
 
-public final class HandlerVanilla implements IHandler {
+public final class ModVanilla implements IMod {
     @Override
     public String getModId() {
         return null;