diff --git a/src/main/scala/li/cil/oc/client/gui/DynamicGuiContainer.scala b/src/main/scala/li/cil/oc/client/gui/DynamicGuiContainer.scala
index ec9713ffa..3328ce944 100644
--- a/src/main/scala/li/cil/oc/client/gui/DynamicGuiContainer.scala
+++ b/src/main/scala/li/cil/oc/client/gui/DynamicGuiContainer.scala
@@ -1,12 +1,12 @@
 package li.cil.oc.client.gui
 
+import li.cil.oc.Localization
 import li.cil.oc.client.Textures
+import li.cil.oc.common
 import li.cil.oc.common.container.ComponentSlot
 import li.cil.oc.common.container.Player
-import li.cil.oc.util.RenderState
 import li.cil.oc.integration.util.NEI
-import li.cil.oc.Localization
-import li.cil.oc.common
+import li.cil.oc.util.RenderState
 import net.minecraft.client.renderer.Tessellator
 import net.minecraft.client.renderer.texture.TextureMap
 import net.minecraft.inventory.Container
diff --git a/src/main/scala/li/cil/oc/client/gui/TextBuffer.scala b/src/main/scala/li/cil/oc/client/gui/TextBuffer.scala
index 457fff1ca..0552c6edb 100644
--- a/src/main/scala/li/cil/oc/client/gui/TextBuffer.scala
+++ b/src/main/scala/li/cil/oc/client/gui/TextBuffer.scala
@@ -1,11 +1,11 @@
 package li.cil.oc.client.gui
 
 import li.cil.oc.api
-import li.cil.oc.client.renderer.gui.BufferRenderer
 import li.cil.oc.client.KeyBindings
 import li.cil.oc.client.Textures
-import li.cil.oc.util.RenderState
+import li.cil.oc.client.renderer.gui.BufferRenderer
 import li.cil.oc.integration.util.NEI
+import li.cil.oc.util.RenderState
 import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.GuiScreen
 import net.minecraft.client.renderer.Tessellator
diff --git a/src/main/scala/li/cil/oc/client/renderer/tileentity/ScreenRenderer.scala b/src/main/scala/li/cil/oc/client/renderer/tileentity/ScreenRenderer.scala
index 9bcb67622..5d8734b20 100644
--- a/src/main/scala/li/cil/oc/client/renderer/tileentity/ScreenRenderer.scala
+++ b/src/main/scala/li/cil/oc/client/renderer/tileentity/ScreenRenderer.scala
@@ -4,8 +4,8 @@ import li.cil.oc.Settings
 import li.cil.oc.client.Textures
 import li.cil.oc.common.block
 import li.cil.oc.common.tileentity.Screen
-import li.cil.oc.util.RenderState
 import li.cil.oc.integration.util.BuildCraft
+import li.cil.oc.util.RenderState
 import net.minecraft.client.Minecraft
 import net.minecraft.client.renderer.Tessellator
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer
diff --git a/src/main/scala/li/cil/oc/common/EventHandler.scala b/src/main/scala/li/cil/oc/common/EventHandler.scala
index 789df3478..d590677a9 100644
--- a/src/main/scala/li/cil/oc/common/EventHandler.scala
+++ b/src/main/scala/li/cil/oc/common/EventHandler.scala
@@ -12,11 +12,11 @@ import li.cil.oc.client.renderer.PetRenderer
 import li.cil.oc.client.{PacketSender => ClientPacketSender}
 import li.cil.oc.common.tileentity.traits.power
 import li.cil.oc.integration.Mods
+import li.cil.oc.integration.util
 import li.cil.oc.server.{PacketSender => ServerPacketSender}
 import li.cil.oc.util.LuaStateFactory
 import li.cil.oc.util.SideTracker
 import li.cil.oc.util.UpdateCheck
-import li.cil.oc.integration.util
 import net.minecraft.client.Minecraft
 import net.minecraft.entity.player.EntityPlayerMP
 import net.minecraft.item.ItemStack
diff --git a/src/main/scala/li/cil/oc/common/Proxy.scala b/src/main/scala/li/cil/oc/common/Proxy.scala
index 182a741d4..f500e6191 100644
--- a/src/main/scala/li/cil/oc/common/Proxy.scala
+++ b/src/main/scala/li/cil/oc/common/Proxy.scala
@@ -32,6 +32,7 @@ import li.cil.oc.integration.railcraft.ModRailcraft
 import li.cil.oc.integration.thaumcraft.ModThaumcraft
 import li.cil.oc.integration.thermalexpansion.ModThermalExpansion
 import li.cil.oc.integration.tmechworks.ModTMechworks
+import li.cil.oc.integration.util.ComputerCraft
 import li.cil.oc.integration.vanilla.ModVanilla
 import li.cil.oc.server._
 import li.cil.oc.server.machine
@@ -40,7 +41,6 @@ import li.cil.oc.server.machine.luaj.LuaJLuaArchitecture
 import li.cil.oc.server.network.WirelessNetwork
 import li.cil.oc.util.LuaStateFactory
 import li.cil.oc.util.UpdateCheck
-import li.cil.oc.integration.util.ComputerCraft
 import net.minecraft.item.ItemStack
 import net.minecraft.nbt.NBTTagCompound
 import net.minecraftforge.common.ForgeChunkManager
@@ -98,22 +98,22 @@ class Proxy {
     OpenComputers.channel.register(server.PacketHandler)
 
     OpenComputers.log.info("Initializing OpenComputers drivers.")
-    Mods.integrate(new ModAppEng)
-    Mods.integrate(new ModBuildCraft)
-    Mods.integrate(new ModCoFHEnergy)
-    Mods.integrate(new ModCoFHTileEntity)
-    Mods.integrate(new ModCoFHTransport)
-    Mods.integrate(new ModEnderIO)
-    Mods.integrate(new ModEnderStorage)
-    Mods.integrate(new ModForestry)
-    Mods.integrate(new ModGregtech)
-    Mods.integrate(new ModIndustrialCraft2)
-    Mods.integrate(new ModMystcraft)
+    Mods.integrate(ModAppEng)
+    Mods.integrate(ModBuildCraft)
+    Mods.integrate(ModCoFHEnergy)
+    Mods.integrate(ModCoFHTileEntity)
+    Mods.integrate(ModCoFHTransport)
+    Mods.integrate(ModEnderIO)
+    Mods.integrate(ModEnderStorage)
+    Mods.integrate(ModForestry)
+    Mods.integrate(ModGregtech)
+    Mods.integrate(ModIndustrialCraft2)
+    Mods.integrate(ModMystcraft)
     Mods.integrate(ModOpenComputers)
-    Mods.integrate(new ModRailcraft)
-    Mods.integrate(new ModThaumcraft)
-    Mods.integrate(new ModThermalExpansion)
-    Mods.integrate(new ModTMechworks)
+    Mods.integrate(ModRailcraft)
+    Mods.integrate(ModThaumcraft)
+    Mods.integrate(ModThermalExpansion)
+    Mods.integrate(ModTMechworks)
     Mods.integrate(ModVanilla)
 
     // Register the general IPeripheral driver last, if at all, to avoid it
diff --git a/src/main/scala/li/cil/oc/common/block/Case.scala b/src/main/scala/li/cil/oc/common/block/Case.scala
index 934e6484c..46c997cdc 100644
--- a/src/main/scala/li/cil/oc/common/block/Case.scala
+++ b/src/main/scala/li/cil/oc/common/block/Case.scala
@@ -4,13 +4,13 @@ import java.util
 
 import cpw.mods.fml.relauncher.Side
 import cpw.mods.fml.relauncher.SideOnly
+import li.cil.oc.OpenComputers
+import li.cil.oc.Settings
 import li.cil.oc.common.GuiType
 import li.cil.oc.common.tileentity
 import li.cil.oc.integration.util.BuildCraft
 import li.cil.oc.util.Color
 import li.cil.oc.util.Tooltip
-import li.cil.oc.OpenComputers
-import li.cil.oc.Settings
 import net.minecraft.client.renderer.texture.IIconRegister
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.EnumRarity
diff --git a/src/main/scala/li/cil/oc/common/block/Charger.scala b/src/main/scala/li/cil/oc/common/block/Charger.scala
index 8fce8f1dc..ecabf258a 100644
--- a/src/main/scala/li/cil/oc/common/block/Charger.scala
+++ b/src/main/scala/li/cil/oc/common/block/Charger.scala
@@ -5,8 +5,8 @@ import li.cil.oc.Settings
 import li.cil.oc.client.Textures
 import li.cil.oc.common.GuiType
 import li.cil.oc.common.tileentity
-import li.cil.oc.server.PacketSender
 import li.cil.oc.integration.util.BuildCraft
+import li.cil.oc.server.PacketSender
 import net.minecraft.block.Block
 import net.minecraft.client.renderer.texture.IIconRegister
 import net.minecraft.entity.player.EntityPlayer
diff --git a/src/main/scala/li/cil/oc/common/block/PowerConverter.scala b/src/main/scala/li/cil/oc/common/block/PowerConverter.scala
index 7daef5553..23d6fc34b 100644
--- a/src/main/scala/li/cil/oc/common/block/PowerConverter.scala
+++ b/src/main/scala/li/cil/oc/common/block/PowerConverter.scala
@@ -6,8 +6,8 @@ import java.util
 import li.cil.oc.Settings
 import li.cil.oc.common.tileentity
 import li.cil.oc.integration.Mods
-import li.cil.oc.util.Tooltip
 import li.cil.oc.integration.util.NEI
+import li.cil.oc.util.Tooltip
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.ItemStack
 import net.minecraft.world.World
diff --git a/src/main/scala/li/cil/oc/common/block/RobotProxy.scala b/src/main/scala/li/cil/oc/common/block/RobotProxy.scala
index e8b0497b8..d42f185fe 100644
--- a/src/main/scala/li/cil/oc/common/block/RobotProxy.scala
+++ b/src/main/scala/li/cil/oc/common/block/RobotProxy.scala
@@ -10,11 +10,11 @@ import li.cil.oc.api
 import li.cil.oc.client.KeyBindings
 import li.cil.oc.common.GuiType
 import li.cil.oc.common.tileentity
+import li.cil.oc.integration.util.NEI
 import li.cil.oc.server.PacketSender
 import li.cil.oc.server.component.robot
 import li.cil.oc.util.ItemUtils
 import li.cil.oc.util.Tooltip
-import li.cil.oc.integration.util.NEI
 import net.minecraft.client.renderer.texture.IIconRegister
 import net.minecraft.entity.Entity
 import net.minecraft.entity.EntityLivingBase
diff --git a/src/main/scala/li/cil/oc/common/block/Screen.scala b/src/main/scala/li/cil/oc/common/block/Screen.scala
index 7e5ee801f..5650aff83 100644
--- a/src/main/scala/li/cil/oc/common/block/Screen.scala
+++ b/src/main/scala/li/cil/oc/common/block/Screen.scala
@@ -8,10 +8,10 @@ import li.cil.oc.OpenComputers
 import li.cil.oc.Settings
 import li.cil.oc.common.GuiType
 import li.cil.oc.common.tileentity
+import li.cil.oc.integration.util.BuildCraft
 import li.cil.oc.util.Color
 import li.cil.oc.util.PackedColor
 import li.cil.oc.util.Tooltip
-import li.cil.oc.integration.util.BuildCraft
 import net.minecraft.client.renderer.texture.IIconRegister
 import net.minecraft.entity.Entity
 import net.minecraft.entity.EntityLivingBase
diff --git a/src/main/scala/li/cil/oc/common/item/RedstoneCard.scala b/src/main/scala/li/cil/oc/common/item/RedstoneCard.scala
index d331e9d61..848362350 100644
--- a/src/main/scala/li/cil/oc/common/item/RedstoneCard.scala
+++ b/src/main/scala/li/cil/oc/common/item/RedstoneCard.scala
@@ -4,9 +4,9 @@ import java.util
 
 import li.cil.oc.common.Tier
 import li.cil.oc.integration.Mods
-import li.cil.oc.util.Tooltip
 import li.cil.oc.integration.util.BundledRedstone
 import li.cil.oc.integration.util.WirelessRedstone
+import li.cil.oc.util.Tooltip
 import net.minecraft.item.ItemStack
 
 class RedstoneCard(val parent: Delegator, val tier: Int) extends Delegate with ItemTier {
diff --git a/src/main/scala/li/cil/oc/common/recipe/Recipes.scala b/src/main/scala/li/cil/oc/common/recipe/Recipes.scala
index 4001b43bf..e16781491 100644
--- a/src/main/scala/li/cil/oc/common/recipe/Recipes.scala
+++ b/src/main/scala/li/cil/oc/common/recipe/Recipes.scala
@@ -9,9 +9,9 @@ import cpw.mods.fml.common.registry.GameRegistry
 import li.cil.oc._
 import li.cil.oc.common.block.SimpleBlock
 import li.cil.oc.common.init.Items
-import li.cil.oc.util.Color
 import li.cil.oc.integration.util.GregTech
 import li.cil.oc.integration.util.NEI
+import li.cil.oc.util.Color
 import net.minecraft.block.Block
 import net.minecraft.item.Item
 import net.minecraft.item.ItemBlock
diff --git a/src/main/scala/li/cil/oc/common/tileentity/Redstone.scala b/src/main/scala/li/cil/oc/common/tileentity/Redstone.scala
index e007ff34f..8dda0180d 100644
--- a/src/main/scala/li/cil/oc/common/tileentity/Redstone.scala
+++ b/src/main/scala/li/cil/oc/common/tileentity/Redstone.scala
@@ -4,9 +4,9 @@ import li.cil.oc.Settings
 import li.cil.oc.api.network.Visibility
 import li.cil.oc.common.tileentity.traits.BundledRedstoneAware
 import li.cil.oc.common.tileentity.traits.Environment
+import li.cil.oc.integration.util.BundledRedstone
 import li.cil.oc.server.component
 import li.cil.oc.util.ExtendedNBT._
-import li.cil.oc.integration.util.BundledRedstone
 import net.minecraft.nbt.NBTTagCompound
 import net.minecraftforge.common.util.ForgeDirection
 
diff --git a/src/main/scala/li/cil/oc/common/tileentity/traits/AbstractBusAware.scala b/src/main/scala/li/cil/oc/common/tileentity/traits/AbstractBusAware.scala
index b215732a9..68f10d3da 100644
--- a/src/main/scala/li/cil/oc/common/tileentity/traits/AbstractBusAware.scala
+++ b/src/main/scala/li/cil/oc/common/tileentity/traits/AbstractBusAware.scala
@@ -6,9 +6,9 @@ import cpw.mods.fml.relauncher.SideOnly
 import li.cil.oc.api.network
 import li.cil.oc.api.network.ManagedEnvironment
 import li.cil.oc.integration.Mods
+import li.cil.oc.integration.util.StargateTech2
 import li.cil.oc.server.component
 import li.cil.oc.server.{PacketSender => ServerPacketSender}
-import li.cil.oc.integration.util.StargateTech2
 import net.minecraft.nbt.NBTTagCompound
 import stargatetech2.api.StargateTechAPI
 import stargatetech2.api.bus.IBusDevice
diff --git a/src/main/scala/li/cil/oc/common/tileentity/traits/BundledRedstoneAware.scala b/src/main/scala/li/cil/oc/common/tileentity/traits/BundledRedstoneAware.scala
index 6ab3bf8af..a4328c248 100644
--- a/src/main/scala/li/cil/oc/common/tileentity/traits/BundledRedstoneAware.scala
+++ b/src/main/scala/li/cil/oc/common/tileentity/traits/BundledRedstoneAware.scala
@@ -3,8 +3,8 @@ package li.cil.oc.common.tileentity.traits
 import cpw.mods.fml.common.Optional
 import li.cil.oc.Settings
 import li.cil.oc.integration.Mods
-import li.cil.oc.util.ExtendedNBT._
 import li.cil.oc.integration.util.ProjectRed
+import li.cil.oc.util.ExtendedNBT._
 import mods.immibis.redlogic.api.wiring.IBundledEmitter
 import mods.immibis.redlogic.api.wiring.IBundledUpdatable
 import mods.immibis.redlogic.api.wiring.IInsulatedRedstoneWire
diff --git a/src/main/scala/li/cil/oc/integration/Mods.scala b/src/main/scala/li/cil/oc/integration/Mods.scala
index eb1979958..0467197dd 100644
--- a/src/main/scala/li/cil/oc/integration/Mods.scala
+++ b/src/main/scala/li/cil/oc/integration/Mods.scala
@@ -71,13 +71,12 @@ object Mods {
 
   def integrate(mod: IMod) {
     val isBlacklisted = Settings.get.modBlacklist.contains(mod.getMod.id)
-    val alwaysEnabled = mod.getMod == null || mod == Mods.Minecraft
+    val alwaysEnabled = mod.getMod == null || mod.getMod == Mods.Minecraft
     if (!isBlacklisted && (alwaysEnabled || mod.getMod.isAvailable) && handlers.add(mod)) {
-      OpenComputers.log.info(String.format("Initializing converters and drivers for '%s'.", mod.getMod.id))
+      li.cil.oc.OpenComputers.log.info(String.format("Initializing converters and drivers for '%s'.", mod.getMod.id))
       try mod.initialize() catch {
-        case e: Throwable => {
-          OpenComputers.log.warn(String.format("Error initializing handler for '%s'", mod.getMod.id), e)
-        }
+        case e: Throwable =>
+          li.cil.oc.OpenComputers.log.warn(String.format("Error initializing handler for '%s'", mod.getMod.id), e)
       }
     }
   }
diff --git a/src/main/scala/li/cil/oc/integration/appeng/ModAppEng.java b/src/main/scala/li/cil/oc/integration/appeng/ModAppEng.java
deleted file mode 100644
index 14dd54f7f..000000000
--- a/src/main/scala/li/cil/oc/integration/appeng/ModAppEng.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package li.cil.oc.integration.appeng;
-
-import li.cil.oc.api.Driver;
-import li.cil.oc.integration.IMod;
-import li.cil.oc.integration.util.Mods;
-
-public class ModAppEng implements IMod {
-    @Override
-    public Mods.Mod getMod() {
-        return Mods.AppliedEnergistics2();
-    }
-
-    @Override
-    public void initialize() {
-        Driver.add(new DriverGridNode());
-        Driver.add(new DriverCellContainer());
-
-        Driver.add(new ConverterCellInventory());
-    }
-}
diff --git a/src/main/scala/li/cil/oc/integration/appeng/ModAppEng.scala b/src/main/scala/li/cil/oc/integration/appeng/ModAppEng.scala
new file mode 100644
index 000000000..1c329d001
--- /dev/null
+++ b/src/main/scala/li/cil/oc/integration/appeng/ModAppEng.scala
@@ -0,0 +1,15 @@
+package li.cil.oc.integration.appeng
+
+import li.cil.oc.api.Driver
+import li.cil.oc.integration.IMod
+import li.cil.oc.integration.Mods
+
+object ModAppEng extends IMod {
+  override def getMod = Mods.AppliedEnergistics2
+
+  override def initialize() {
+    Driver.add(new DriverGridNode)
+    Driver.add(new DriverCellContainer)
+    Driver.add(new ConverterCellInventory)
+  }
+}
\ No newline at end of file
diff --git a/src/main/scala/li/cil/oc/integration/buildcraft/ModBuildCraft.java b/src/main/scala/li/cil/oc/integration/buildcraft/ModBuildCraft.java
deleted file mode 100644
index ea24a908d..000000000
--- a/src/main/scala/li/cil/oc/integration/buildcraft/ModBuildCraft.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package li.cil.oc.integration.buildcraft;
-
-import li.cil.oc.api.Driver;
-import li.cil.oc.integration.IMod;
-import li.cil.oc.integration.Mods;
-
-public final class ModBuildCraft implements IMod {
-    @Override
-    public Mods.Mod getMod() {
-        return Mods.BuildCraft();
-    }
-
-    @Override
-    public void initialize() {
-        Driver.add(new DriverPipeTE());
-        Driver.add(new DriverPowerReceptor());
-        Driver.add(new DriverMachine());
-    }
-}
diff --git a/src/main/scala/li/cil/oc/integration/buildcraft/ModBuildCraft.scala b/src/main/scala/li/cil/oc/integration/buildcraft/ModBuildCraft.scala
new file mode 100644
index 000000000..672d6860a
--- /dev/null
+++ b/src/main/scala/li/cil/oc/integration/buildcraft/ModBuildCraft.scala
@@ -0,0 +1,15 @@
+package li.cil.oc.integration.buildcraft
+
+import li.cil.oc.api.Driver
+import li.cil.oc.integration.IMod
+import li.cil.oc.integration.Mods
+
+object ModBuildCraft extends IMod {
+  override def getMod = Mods.BuildCraft
+
+  override def initialize() {
+    Driver.add(new DriverPipeTE)
+    Driver.add(new DriverPowerReceptor)
+    Driver.add(new DriverMachine)
+  }
+}
\ No newline at end of file
diff --git a/src/main/scala/li/cil/oc/integration/cofh/energy/ModCoFHEnergy.java b/src/main/scala/li/cil/oc/integration/cofh/energy/ModCoFHEnergy.java
deleted file mode 100644
index 4c9c762bb..000000000
--- a/src/main/scala/li/cil/oc/integration/cofh/energy/ModCoFHEnergy.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package li.cil.oc.integration.cofh.energy;
-
-import li.cil.oc.api.Driver;
-import li.cil.oc.integration.IMod;
-import li.cil.oc.integration.Mods;
-
-public final class ModCoFHEnergy implements IMod {
-    @Override
-    public Mods.Mod getMod() {
-        return Mods.CoFHEnergy();
-    }
-
-    @Override
-    public void initialize() {
-        Driver.add(new DriverEnergyHandler());
-
-        Driver.add(new ConverterEnergyContainerItem());
-    }
-}
diff --git a/src/main/scala/li/cil/oc/integration/cofh/energy/ModCoFHEnergy.scala b/src/main/scala/li/cil/oc/integration/cofh/energy/ModCoFHEnergy.scala
new file mode 100644
index 000000000..9eb647059
--- /dev/null
+++ b/src/main/scala/li/cil/oc/integration/cofh/energy/ModCoFHEnergy.scala
@@ -0,0 +1,14 @@
+package li.cil.oc.integration.cofh.energy
+
+import li.cil.oc.api.Driver
+import li.cil.oc.integration.IMod
+import li.cil.oc.integration.Mods
+
+object ModCoFHEnergy extends IMod {
+  override def getMod = Mods.CoFHEnergy
+
+  override def initialize() {
+    Driver.add(new DriverEnergyHandler)
+    Driver.add(new ConverterEnergyContainerItem)
+  }
+}
\ No newline at end of file
diff --git a/src/main/scala/li/cil/oc/integration/cofh/tileentity/ModCoFHTileEntity.java b/src/main/scala/li/cil/oc/integration/cofh/tileentity/ModCoFHTileEntity.java
deleted file mode 100644
index d29caef42..000000000
--- a/src/main/scala/li/cil/oc/integration/cofh/tileentity/ModCoFHTileEntity.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package li.cil.oc.integration.cofh.tileentity;
-
-import li.cil.oc.api.Driver;
-import li.cil.oc.integration.IMod;
-import li.cil.oc.integration.Mods;
-
-public final class ModCoFHTileEntity implements IMod {
-    @Override
-    public Mods.Mod getMod() {
-        return Mods.CoFHTileEntity();
-    }
-
-    @Override
-    public void initialize() {
-        Driver.add(new DriverEnergyInfo());
-        Driver.add(new DriverRedstoneControl());
-        Driver.add(new DriverSecureTile());
-    }
-}
diff --git a/src/main/scala/li/cil/oc/integration/cofh/tileentity/ModCoFHTileEntity.scala b/src/main/scala/li/cil/oc/integration/cofh/tileentity/ModCoFHTileEntity.scala
new file mode 100644
index 000000000..ba007cde0
--- /dev/null
+++ b/src/main/scala/li/cil/oc/integration/cofh/tileentity/ModCoFHTileEntity.scala
@@ -0,0 +1,15 @@
+package li.cil.oc.integration.cofh.tileentity
+
+import li.cil.oc.api.Driver
+import li.cil.oc.integration.IMod
+import li.cil.oc.integration.Mods
+
+object ModCoFHTileEntity extends IMod {
+  override def getMod = Mods.CoFHTileEntity
+
+  override def initialize() {
+    Driver.add(new DriverEnergyInfo)
+    Driver.add(new DriverRedstoneControl)
+    Driver.add(new DriverSecureTile)
+  }
+}
\ No newline at end of file
diff --git a/src/main/scala/li/cil/oc/integration/cofh/transport/ModCoFHTransport.java b/src/main/scala/li/cil/oc/integration/cofh/transport/ModCoFHTransport.java
deleted file mode 100644
index 7bdffbe3d..000000000
--- a/src/main/scala/li/cil/oc/integration/cofh/transport/ModCoFHTransport.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package li.cil.oc.integration.cofh.transport;
-
-import li.cil.oc.api.Driver;
-import li.cil.oc.integration.IMod;
-import li.cil.oc.integration.Mods;
-
-public final class ModCoFHTransport implements IMod {
-    @Override
-    public Mods.Mod getMod() {
-        return Mods.CoFHTransport();
-    }
-
-    @Override
-    public void initialize() {
-        Driver.add(new DriverEnderEnergy());
-        Driver.add(new DriverEnderFluid());
-        Driver.add(new DriverEnderItem());
-    }
-}
diff --git a/src/main/scala/li/cil/oc/integration/cofh/transport/ModCoFHTransport.scala b/src/main/scala/li/cil/oc/integration/cofh/transport/ModCoFHTransport.scala
new file mode 100644
index 000000000..e09eaf993
--- /dev/null
+++ b/src/main/scala/li/cil/oc/integration/cofh/transport/ModCoFHTransport.scala
@@ -0,0 +1,15 @@
+package li.cil.oc.integration.cofh.transport
+
+import li.cil.oc.api.Driver
+import li.cil.oc.integration.IMod
+import li.cil.oc.integration.Mods
+
+object ModCoFHTransport extends IMod {
+  override def getMod = Mods.CoFHTransport
+
+  override def initialize() {
+    Driver.add(new DriverEnderEnergy)
+    Driver.add(new DriverEnderFluid)
+    Driver.add(new DriverEnderItem)
+  }
+}
\ No newline at end of file
diff --git a/src/main/scala/li/cil/oc/integration/computercraft/ModComputerCraft.scala b/src/main/scala/li/cil/oc/integration/computercraft/ModComputerCraft.scala
index 23710ee9d..46835bd06 100644
--- a/src/main/scala/li/cil/oc/integration/computercraft/ModComputerCraft.scala
+++ b/src/main/scala/li/cil/oc/integration/computercraft/ModComputerCraft.scala
@@ -5,9 +5,9 @@ import li.cil.oc.integration.IMod
 import li.cil.oc.integration.Mods
 
 object ModComputerCraft extends IMod {
-  def getMod = Mods.ComputerCraft
+  override def getMod = Mods.ComputerCraft
 
-  def initialize() {
+  override def initialize() {
     Driver.add(DriverComputerCraftMedia)
 
     try {
diff --git a/src/main/scala/li/cil/oc/integration/enderio/ModEnderIO.java b/src/main/scala/li/cil/oc/integration/enderio/ModEnderIO.java
deleted file mode 100644
index 1d61fc641..000000000
--- a/src/main/scala/li/cil/oc/integration/enderio/ModEnderIO.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package li.cil.oc.integration.enderio;
-
-import li.cil.oc.api.Driver;
-import li.cil.oc.integration.IMod;
-import li.cil.oc.integration.Mods;
-
-public final class ModEnderIO implements IMod {
-    @Override
-    public Mods.Mod getMod() {
-        return Mods.EnderIO();
-    }
-
-    @Override
-    public void initialize() {
-        Driver.add(new DriverCapacitor());
-    }
-}
diff --git a/src/main/scala/li/cil/oc/integration/enderio/ModEnderIO.scala b/src/main/scala/li/cil/oc/integration/enderio/ModEnderIO.scala
new file mode 100644
index 000000000..229ddc27c
--- /dev/null
+++ b/src/main/scala/li/cil/oc/integration/enderio/ModEnderIO.scala
@@ -0,0 +1,13 @@
+package li.cil.oc.integration.enderio
+
+import li.cil.oc.api.Driver
+import li.cil.oc.integration.IMod
+import li.cil.oc.integration.Mods
+
+object ModEnderIO extends IMod {
+  override def getMod = Mods.EnderIO
+
+  override def initialize() {
+    Driver.add(new DriverCapacitor)
+  }
+}
\ No newline at end of file
diff --git a/src/main/scala/li/cil/oc/integration/enderstorage/ModEnderStorage.java b/src/main/scala/li/cil/oc/integration/enderstorage/ModEnderStorage.java
deleted file mode 100644
index 281f0debf..000000000
--- a/src/main/scala/li/cil/oc/integration/enderstorage/ModEnderStorage.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package li.cil.oc.integration.enderstorage;
-
-import li.cil.oc.api.Driver;
-import li.cil.oc.integration.IMod;
-import li.cil.oc.integration.Mods;
-
-public final class ModEnderStorage implements IMod {
-    @Override
-    public Mods.Mod getMod() {
-        return Mods.EnderStorage();
-    }
-
-    @Override
-    public void initialize() {
-        Driver.add(new DriverFrequencyOwner());
-    }
-}
diff --git a/src/main/scala/li/cil/oc/integration/enderstorage/ModEnderStorage.scala b/src/main/scala/li/cil/oc/integration/enderstorage/ModEnderStorage.scala
new file mode 100644
index 000000000..59cd2b9ad
--- /dev/null
+++ b/src/main/scala/li/cil/oc/integration/enderstorage/ModEnderStorage.scala
@@ -0,0 +1,13 @@
+package li.cil.oc.integration.enderstorage
+
+import li.cil.oc.api.Driver
+import li.cil.oc.integration.IMod
+import li.cil.oc.integration.Mods
+
+object ModEnderStorage extends IMod {
+  override def getMod = Mods.EnderStorage
+
+  override def initialize() {
+    Driver.add(new DriverFrequencyOwner)
+  }
+}
\ No newline at end of file
diff --git a/src/main/scala/li/cil/oc/integration/forestry/ModForestry.java b/src/main/scala/li/cil/oc/integration/forestry/ModForestry.java
deleted file mode 100644
index 42ab160bb..000000000
--- a/src/main/scala/li/cil/oc/integration/forestry/ModForestry.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package li.cil.oc.integration.forestry;
-
-import li.cil.oc.api.Driver;
-import li.cil.oc.integration.IMod;
-import li.cil.oc.integration.Mods;
-
-public class ModForestry implements IMod {
-    @Override
-    public Mods.Mod getMod() {
-        return Mods.Forestry();
-    }
-
-    @Override
-    public void initialize() {
-        Driver.add(new ConverterIAlleles());
-        Driver.add(new ConverterIIndividual());
-        Driver.add(new DriverBeeHouse());
-    }
-}
diff --git a/src/main/scala/li/cil/oc/integration/forestry/ModForestry.scala b/src/main/scala/li/cil/oc/integration/forestry/ModForestry.scala
new file mode 100644
index 000000000..3c976292d
--- /dev/null
+++ b/src/main/scala/li/cil/oc/integration/forestry/ModForestry.scala
@@ -0,0 +1,15 @@
+package li.cil.oc.integration.forestry
+
+import li.cil.oc.api.Driver
+import li.cil.oc.integration.IMod
+import li.cil.oc.integration.Mods
+
+object ModForestry extends IMod {
+  override def getMod = Mods.Forestry
+
+  override def initialize() {
+    Driver.add(new ConverterIAlleles)
+    Driver.add(new ConverterIIndividual)
+    Driver.add(new DriverBeeHouse)
+  }
+}
\ No newline at end of file
diff --git a/src/main/scala/li/cil/oc/integration/gregtech/ModGregtech.java b/src/main/scala/li/cil/oc/integration/gregtech/ModGregtech.java
deleted file mode 100644
index 0df02e5f1..000000000
--- a/src/main/scala/li/cil/oc/integration/gregtech/ModGregtech.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package li.cil.oc.integration.gregtech;
-
-import li.cil.oc.api.Driver;
-import li.cil.oc.integration.IMod;
-import li.cil.oc.integration.Mods;
-
-public final class ModGregtech implements IMod {
-    @Override
-    public Mods.Mod getMod() {
-        return Mods.GregTech();
-    }
-
-    @Override
-    public void initialize() {
-        Driver.add(new DriverEnergyContainer());
-    }
-}
diff --git a/src/main/scala/li/cil/oc/integration/gregtech/ModGregtech.scala b/src/main/scala/li/cil/oc/integration/gregtech/ModGregtech.scala
new file mode 100644
index 000000000..1eca24c0a
--- /dev/null
+++ b/src/main/scala/li/cil/oc/integration/gregtech/ModGregtech.scala
@@ -0,0 +1,13 @@
+package li.cil.oc.integration.gregtech
+
+import li.cil.oc.api.Driver
+import li.cil.oc.integration.IMod
+import li.cil.oc.integration.Mods
+
+object ModGregtech extends IMod {
+  override def getMod = Mods.GregTech
+
+  override def initialize() {
+    Driver.add(new DriverEnergyContainer)
+  }
+}
\ No newline at end of file
diff --git a/src/main/scala/li/cil/oc/integration/ic2/ModIndustrialCraft2.java b/src/main/scala/li/cil/oc/integration/ic2/ModIndustrialCraft2.java
deleted file mode 100644
index 89d68ff9f..000000000
--- a/src/main/scala/li/cil/oc/integration/ic2/ModIndustrialCraft2.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package li.cil.oc.integration.ic2;
-
-import li.cil.oc.api.Driver;
-import li.cil.oc.integration.IMod;
-import li.cil.oc.integration.Mods;
-
-public final class ModIndustrialCraft2 implements IMod {
-    @Override
-    public Mods.Mod getMod() {
-        return Mods.IndustrialCraft2();
-    }
-
-    @Override
-    public void initialize() {
-        Driver.add(new DriverEnergyConductor());
-        Driver.add(new DriverEnergySink());
-        Driver.add(new DriverEnergySource());
-        Driver.add(new DriverEnergyStorage());
-        Driver.add(new DriverMassFab());
-        Driver.add(new DriverReactor());
-        Driver.add(new DriverReactorChamber());
-
-        Driver.add(new ConverterElectricItem());
-    }
-}
diff --git a/src/main/scala/li/cil/oc/integration/ic2/ModIndustrialCraft2.scala b/src/main/scala/li/cil/oc/integration/ic2/ModIndustrialCraft2.scala
new file mode 100644
index 000000000..1435cb065
--- /dev/null
+++ b/src/main/scala/li/cil/oc/integration/ic2/ModIndustrialCraft2.scala
@@ -0,0 +1,20 @@
+package li.cil.oc.integration.ic2
+
+import li.cil.oc.api.Driver
+import li.cil.oc.integration.IMod
+import li.cil.oc.integration.Mods
+
+object ModIndustrialCraft2 extends IMod {
+  override def getMod = Mods.IndustrialCraft2
+
+  override def initialize() {
+    Driver.add(new DriverEnergyConductor)
+    Driver.add(new DriverEnergySink)
+    Driver.add(new DriverEnergySource)
+    Driver.add(new DriverEnergyStorage)
+    Driver.add(new DriverMassFab)
+    Driver.add(new DriverReactor)
+    Driver.add(new DriverReactorChamber)
+    Driver.add(new ConverterElectricItem)
+  }
+}
\ No newline at end of file
diff --git a/src/main/scala/li/cil/oc/integration/mystcraft/ModMystcraft.java b/src/main/scala/li/cil/oc/integration/mystcraft/ModMystcraft.java
deleted file mode 100644
index 698e329e2..000000000
--- a/src/main/scala/li/cil/oc/integration/mystcraft/ModMystcraft.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package li.cil.oc.integration.mystcraft;
-
-import li.cil.oc.api.Driver;
-import li.cil.oc.integration.IMod;
-import li.cil.oc.integration.Mods;
-
-public class ModMystcraft implements IMod {
-    @Override
-    public Mods.Mod getMod() {
-        return Mods.Mystcraft();
-    }
-
-    @Override
-    public void initialize() {
-        Driver.add(new ConverterAgebook());
-        Driver.add(new ConverterLinkbook());
-        Driver.add(new ConverterPage());
-    }
-}
diff --git a/src/main/scala/li/cil/oc/integration/mystcraft/ModMystcraft.scala b/src/main/scala/li/cil/oc/integration/mystcraft/ModMystcraft.scala
new file mode 100644
index 000000000..fdfb6c427
--- /dev/null
+++ b/src/main/scala/li/cil/oc/integration/mystcraft/ModMystcraft.scala
@@ -0,0 +1,15 @@
+package li.cil.oc.integration.mystcraft
+
+import li.cil.oc.api.Driver
+import li.cil.oc.integration.IMod
+import li.cil.oc.integration.Mods
+
+object ModMystcraft extends IMod {
+  override def getMod = Mods.Mystcraft
+
+  override def initialize() {
+    Driver.add(new ConverterAgebook)
+    Driver.add(new ConverterLinkbook)
+    Driver.add(new ConverterPage)
+  }
+}
\ No newline at end of file
diff --git a/src/main/scala/li/cil/oc/integration/opencomputers/DriverBlockEnvironments.scala b/src/main/scala/li/cil/oc/integration/opencomputers/DriverBlockEnvironments.scala
index 5b60ab8d8..119a496f6 100644
--- a/src/main/scala/li/cil/oc/integration/opencomputers/DriverBlockEnvironments.scala
+++ b/src/main/scala/li/cil/oc/integration/opencomputers/DriverBlockEnvironments.scala
@@ -6,9 +6,9 @@ import li.cil.oc.api.driver.EnvironmentAware
 import li.cil.oc.api.network.Environment
 import li.cil.oc.common
 import li.cil.oc.common.tileentity
+import li.cil.oc.integration.util.BundledRedstone
 import li.cil.oc.server.component
 import li.cil.oc.server.machine.Machine
-import li.cil.oc.integration.util.BundledRedstone
 import net.minecraft.block.Block
 import net.minecraft.item.ItemBlock
 import net.minecraft.item.ItemStack
diff --git a/src/main/scala/li/cil/oc/integration/opencomputers/DriverRedstoneCard.scala b/src/main/scala/li/cil/oc/integration/opencomputers/DriverRedstoneCard.scala
index 8ee6001c0..9091e32ff 100644
--- a/src/main/scala/li/cil/oc/integration/opencomputers/DriverRedstoneCard.scala
+++ b/src/main/scala/li/cil/oc/integration/opencomputers/DriverRedstoneCard.scala
@@ -11,9 +11,9 @@ import li.cil.oc.common.init.Items
 import li.cil.oc.common.item
 import li.cil.oc.common.tileentity.traits.BundledRedstoneAware
 import li.cil.oc.common.tileentity.traits.RedstoneAware
-import li.cil.oc.server.component
 import li.cil.oc.integration.util.BundledRedstone
 import li.cil.oc.integration.util.WirelessRedstone
+import li.cil.oc.server.component
 import net.minecraft.item.ItemStack
 
 object DriverRedstoneCard extends Item with HostAware with EnvironmentAware {
diff --git a/src/main/scala/li/cil/oc/integration/railcraft/ModRailcraft.java b/src/main/scala/li/cil/oc/integration/railcraft/ModRailcraft.java
deleted file mode 100644
index 500165136..000000000
--- a/src/main/scala/li/cil/oc/integration/railcraft/ModRailcraft.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package li.cil.oc.integration.railcraft;
-
-import li.cil.oc.api.Driver;
-import li.cil.oc.integration.IMod;
-import li.cil.oc.integration.Mods;
-
-public final class ModRailcraft implements IMod {
-    @Override
-    public Mods.Mod getMod() {
-        return Mods.Railcraft();
-    }
-
-    @Override
-    public void initialize() {
-        Driver.add(new DriverBoilerFirebox());
-        Driver.add(new DriverSteamTurbine());
-    }
-}
diff --git a/src/main/scala/li/cil/oc/integration/railcraft/ModRailcraft.scala b/src/main/scala/li/cil/oc/integration/railcraft/ModRailcraft.scala
new file mode 100644
index 000000000..3a57ff349
--- /dev/null
+++ b/src/main/scala/li/cil/oc/integration/railcraft/ModRailcraft.scala
@@ -0,0 +1,14 @@
+package li.cil.oc.integration.railcraft
+
+import li.cil.oc.api.Driver
+import li.cil.oc.integration.IMod
+import li.cil.oc.integration.Mods
+
+object ModRailcraft extends IMod {
+  override def getMod = Mods.Railcraft
+
+  override def initialize() {
+    Driver.add(new DriverBoilerFirebox)
+    Driver.add(new DriverSteamTurbine)
+  }
+}
\ No newline at end of file
diff --git a/src/main/scala/li/cil/oc/integration/thaumcraft/ModThaumcraft.java b/src/main/scala/li/cil/oc/integration/thaumcraft/ModThaumcraft.java
deleted file mode 100644
index b4610abf8..000000000
--- a/src/main/scala/li/cil/oc/integration/thaumcraft/ModThaumcraft.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package li.cil.oc.integration.thaumcraft;
-
-import li.cil.oc.api.Driver;
-import li.cil.oc.integration.IMod;
-import li.cil.oc.integration.Mods;
-
-public class ModThaumcraft implements IMod {
-    @Override
-    public Mods.Mod getMod() {
-        return Mods.Thaumcraft();
-    }
-
-    @Override
-    public void initialize() {
-        Driver.add(new DriverAspectContainer());
-
-        Driver.add(new ConverterIAspectContainer());
-    }
-}
diff --git a/src/main/scala/li/cil/oc/integration/thaumcraft/ModThaumcraft.scala b/src/main/scala/li/cil/oc/integration/thaumcraft/ModThaumcraft.scala
new file mode 100644
index 000000000..28bf6d111
--- /dev/null
+++ b/src/main/scala/li/cil/oc/integration/thaumcraft/ModThaumcraft.scala
@@ -0,0 +1,14 @@
+package li.cil.oc.integration.thaumcraft
+
+import li.cil.oc.api.Driver
+import li.cil.oc.integration.IMod
+import li.cil.oc.integration.Mods
+
+object ModThaumcraft extends IMod {
+  override def getMod = Mods.Thaumcraft
+
+  override def initialize() {
+    Driver.add(new DriverAspectContainer)
+    Driver.add(new ConverterIAspectContainer)
+  }
+}
\ No newline at end of file
diff --git a/src/main/scala/li/cil/oc/integration/thermalexpansion/ModThermalExpansion.java b/src/main/scala/li/cil/oc/integration/thermalexpansion/ModThermalExpansion.java
deleted file mode 100644
index e5133b6ec..000000000
--- a/src/main/scala/li/cil/oc/integration/thermalexpansion/ModThermalExpansion.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package li.cil.oc.integration.thermalexpansion;
-
-import li.cil.oc.api.Driver;
-import li.cil.oc.integration.IMod;
-import li.cil.oc.integration.Mods;
-
-public final class ModThermalExpansion implements IMod {
-    @Override
-    public Mods.Mod getMod() {
-        return Mods.ThermalExpansion();
-    }
-
-    @Override
-    public void initialize() {
-        Driver.add(new DriverLamp());
-    }
-}
diff --git a/src/main/scala/li/cil/oc/integration/thermalexpansion/ModThermalExpansion.scala b/src/main/scala/li/cil/oc/integration/thermalexpansion/ModThermalExpansion.scala
new file mode 100644
index 000000000..c227e1781
--- /dev/null
+++ b/src/main/scala/li/cil/oc/integration/thermalexpansion/ModThermalExpansion.scala
@@ -0,0 +1,13 @@
+package li.cil.oc.integration.thermalexpansion
+
+import li.cil.oc.api.Driver
+import li.cil.oc.integration.IMod
+import li.cil.oc.integration.Mods
+
+object ModThermalExpansion extends IMod {
+  override def getMod = Mods.ThermalExpansion
+
+  override def initialize() {
+    Driver.add(new DriverLamp)
+  }
+}
\ No newline at end of file
diff --git a/src/main/scala/li/cil/oc/integration/tmechworks/ModTMechworks.java b/src/main/scala/li/cil/oc/integration/tmechworks/ModTMechworks.java
deleted file mode 100644
index 7968113e7..000000000
--- a/src/main/scala/li/cil/oc/integration/tmechworks/ModTMechworks.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package li.cil.oc.integration.tmechworks;
-
-import li.cil.oc.api.Driver;
-import li.cil.oc.integration.IMod;
-import li.cil.oc.integration.Mods;
-
-public final class ModTMechworks implements IMod {
-    @Override
-    public Mods.Mod getMod() {
-        return Mods.TMechWorks();
-    }
-
-    @Override
-    public void initialize() {
-        Driver.add(new DriverDrawBridge());
-    }
-}
diff --git a/src/main/scala/li/cil/oc/integration/tmechworks/ModTMechworks.scala b/src/main/scala/li/cil/oc/integration/tmechworks/ModTMechworks.scala
new file mode 100644
index 000000000..5f5c79c72
--- /dev/null
+++ b/src/main/scala/li/cil/oc/integration/tmechworks/ModTMechworks.scala
@@ -0,0 +1,13 @@
+package li.cil.oc.integration.tmechworks
+
+import li.cil.oc.api.Driver
+import li.cil.oc.integration.IMod
+import li.cil.oc.integration.Mods
+
+object ModTMechworks extends IMod {
+  override def getMod = Mods.TMechWorks
+
+  override def initialize() {
+    Driver.add(new DriverDrawBridge)
+  }
+}
\ No newline at end of file
diff --git a/src/main/scala/li/cil/oc/server/fs/FileSystem.scala b/src/main/scala/li/cil/oc/server/fs/FileSystem.scala
index a68936806..6a3a34d0f 100644
--- a/src/main/scala/li/cil/oc/server/fs/FileSystem.scala
+++ b/src/main/scala/li/cil/oc/server/fs/FileSystem.scala
@@ -4,15 +4,15 @@ import java.io
 import java.net.URL
 import java.util.UUID
 
+import li.cil.oc.OpenComputers
+import li.cil.oc.Settings
+import li.cil.oc.api
 import li.cil.oc.api.driver.EnvironmentHost
 import li.cil.oc.api.fs.Label
 import li.cil.oc.api.fs.Mode
 import li.cil.oc.integration.Mods
-import li.cil.oc.server.component
 import li.cil.oc.integration.util.ComputerCraft
-import li.cil.oc.OpenComputers
-import li.cil.oc.Settings
-import li.cil.oc.api
+import li.cil.oc.server.component
 import net.minecraft.item.ItemStack
 import net.minecraft.nbt.NBTTagCompound
 import net.minecraftforge.common.DimensionManager