diff --git a/src/minecraft/buildcraft/api/blueprints/BlockSignature.java b/common/buildcraft/api/blueprints/BlockSignature.java similarity index 100% rename from src/minecraft/buildcraft/api/blueprints/BlockSignature.java rename to common/buildcraft/api/blueprints/BlockSignature.java diff --git a/src/minecraft/buildcraft/api/blueprints/BlueprintManager.java b/common/buildcraft/api/blueprints/BlueprintManager.java similarity index 100% rename from src/minecraft/buildcraft/api/blueprints/BlueprintManager.java rename to common/buildcraft/api/blueprints/BlueprintManager.java diff --git a/src/minecraft/buildcraft/api/blueprints/BptBlock.java b/common/buildcraft/api/blueprints/BptBlock.java similarity index 100% rename from src/minecraft/buildcraft/api/blueprints/BptBlock.java rename to common/buildcraft/api/blueprints/BptBlock.java diff --git a/src/minecraft/buildcraft/api/blueprints/BptBlockUtils.java b/common/buildcraft/api/blueprints/BptBlockUtils.java similarity index 100% rename from src/minecraft/buildcraft/api/blueprints/BptBlockUtils.java rename to common/buildcraft/api/blueprints/BptBlockUtils.java diff --git a/src/minecraft/buildcraft/api/blueprints/BptSlotInfo.java b/common/buildcraft/api/blueprints/BptSlotInfo.java similarity index 100% rename from src/minecraft/buildcraft/api/blueprints/BptSlotInfo.java rename to common/buildcraft/api/blueprints/BptSlotInfo.java diff --git a/src/minecraft/buildcraft/api/blueprints/IBptContext.java b/common/buildcraft/api/blueprints/IBptContext.java similarity index 100% rename from src/minecraft/buildcraft/api/blueprints/IBptContext.java rename to common/buildcraft/api/blueprints/IBptContext.java diff --git a/src/minecraft/buildcraft/api/blueprints/ItemSignature.java b/common/buildcraft/api/blueprints/ItemSignature.java similarity index 100% rename from src/minecraft/buildcraft/api/blueprints/ItemSignature.java rename to common/buildcraft/api/blueprints/ItemSignature.java diff --git a/src/minecraft/buildcraft/api/bptblocks/BptBlockBed.java b/common/buildcraft/api/bptblocks/BptBlockBed.java similarity index 100% rename from src/minecraft/buildcraft/api/bptblocks/BptBlockBed.java rename to common/buildcraft/api/bptblocks/BptBlockBed.java diff --git a/src/minecraft/buildcraft/api/bptblocks/BptBlockCustomStack.java b/common/buildcraft/api/bptblocks/BptBlockCustomStack.java similarity index 100% rename from src/minecraft/buildcraft/api/bptblocks/BptBlockCustomStack.java rename to common/buildcraft/api/bptblocks/BptBlockCustomStack.java diff --git a/src/minecraft/buildcraft/api/bptblocks/BptBlockDelegate.java b/common/buildcraft/api/bptblocks/BptBlockDelegate.java similarity index 100% rename from src/minecraft/buildcraft/api/bptblocks/BptBlockDelegate.java rename to common/buildcraft/api/bptblocks/BptBlockDelegate.java diff --git a/src/minecraft/buildcraft/api/bptblocks/BptBlockDirt.java b/common/buildcraft/api/bptblocks/BptBlockDirt.java similarity index 100% rename from src/minecraft/buildcraft/api/bptblocks/BptBlockDirt.java rename to common/buildcraft/api/bptblocks/BptBlockDirt.java diff --git a/src/minecraft/buildcraft/api/bptblocks/BptBlockDoor.java b/common/buildcraft/api/bptblocks/BptBlockDoor.java similarity index 100% rename from src/minecraft/buildcraft/api/bptblocks/BptBlockDoor.java rename to common/buildcraft/api/bptblocks/BptBlockDoor.java diff --git a/src/minecraft/buildcraft/api/bptblocks/BptBlockIgnore.java b/common/buildcraft/api/bptblocks/BptBlockIgnore.java similarity index 100% rename from src/minecraft/buildcraft/api/bptblocks/BptBlockIgnore.java rename to common/buildcraft/api/bptblocks/BptBlockIgnore.java diff --git a/src/minecraft/buildcraft/api/bptblocks/BptBlockIgnoreMeta.java b/common/buildcraft/api/bptblocks/BptBlockIgnoreMeta.java similarity index 100% rename from src/minecraft/buildcraft/api/bptblocks/BptBlockIgnoreMeta.java rename to common/buildcraft/api/bptblocks/BptBlockIgnoreMeta.java diff --git a/src/minecraft/buildcraft/api/bptblocks/BptBlockInventory.java b/common/buildcraft/api/bptblocks/BptBlockInventory.java similarity index 100% rename from src/minecraft/buildcraft/api/bptblocks/BptBlockInventory.java rename to common/buildcraft/api/bptblocks/BptBlockInventory.java diff --git a/src/minecraft/buildcraft/api/bptblocks/BptBlockLever.java b/common/buildcraft/api/bptblocks/BptBlockLever.java similarity index 100% rename from src/minecraft/buildcraft/api/bptblocks/BptBlockLever.java rename to common/buildcraft/api/bptblocks/BptBlockLever.java diff --git a/src/minecraft/buildcraft/api/bptblocks/BptBlockLiquid.java b/common/buildcraft/api/bptblocks/BptBlockLiquid.java similarity index 100% rename from src/minecraft/buildcraft/api/bptblocks/BptBlockLiquid.java rename to common/buildcraft/api/bptblocks/BptBlockLiquid.java diff --git a/src/minecraft/buildcraft/api/bptblocks/BptBlockPiston.java b/common/buildcraft/api/bptblocks/BptBlockPiston.java similarity index 100% rename from src/minecraft/buildcraft/api/bptblocks/BptBlockPiston.java rename to common/buildcraft/api/bptblocks/BptBlockPiston.java diff --git a/src/minecraft/buildcraft/api/bptblocks/BptBlockPumpkin.java b/common/buildcraft/api/bptblocks/BptBlockPumpkin.java similarity index 100% rename from src/minecraft/buildcraft/api/bptblocks/BptBlockPumpkin.java rename to common/buildcraft/api/bptblocks/BptBlockPumpkin.java diff --git a/src/minecraft/buildcraft/api/bptblocks/BptBlockRedstoneRepeater.java b/common/buildcraft/api/bptblocks/BptBlockRedstoneRepeater.java similarity index 100% rename from src/minecraft/buildcraft/api/bptblocks/BptBlockRedstoneRepeater.java rename to common/buildcraft/api/bptblocks/BptBlockRedstoneRepeater.java diff --git a/src/minecraft/buildcraft/api/bptblocks/BptBlockRotateInventory.java b/common/buildcraft/api/bptblocks/BptBlockRotateInventory.java similarity index 100% rename from src/minecraft/buildcraft/api/bptblocks/BptBlockRotateInventory.java rename to common/buildcraft/api/bptblocks/BptBlockRotateInventory.java diff --git a/src/minecraft/buildcraft/api/bptblocks/BptBlockRotateMeta.java b/common/buildcraft/api/bptblocks/BptBlockRotateMeta.java similarity index 100% rename from src/minecraft/buildcraft/api/bptblocks/BptBlockRotateMeta.java rename to common/buildcraft/api/bptblocks/BptBlockRotateMeta.java diff --git a/src/minecraft/buildcraft/api/bptblocks/BptBlockSign.java b/common/buildcraft/api/bptblocks/BptBlockSign.java similarity index 100% rename from src/minecraft/buildcraft/api/bptblocks/BptBlockSign.java rename to common/buildcraft/api/bptblocks/BptBlockSign.java diff --git a/src/minecraft/buildcraft/api/bptblocks/BptBlockStairs.java b/common/buildcraft/api/bptblocks/BptBlockStairs.java similarity index 100% rename from src/minecraft/buildcraft/api/bptblocks/BptBlockStairs.java rename to common/buildcraft/api/bptblocks/BptBlockStairs.java diff --git a/src/minecraft/buildcraft/api/bptblocks/BptBlockWallSide.java b/common/buildcraft/api/bptblocks/BptBlockWallSide.java similarity index 100% rename from src/minecraft/buildcraft/api/bptblocks/BptBlockWallSide.java rename to common/buildcraft/api/bptblocks/BptBlockWallSide.java diff --git a/src/minecraft/buildcraft/api/core/BuildCraftAPI.java b/common/buildcraft/api/core/BuildCraftAPI.java similarity index 100% rename from src/minecraft/buildcraft/api/core/BuildCraftAPI.java rename to common/buildcraft/api/core/BuildCraftAPI.java diff --git a/src/minecraft/buildcraft/api/core/IAreaProvider.java b/common/buildcraft/api/core/IAreaProvider.java similarity index 100% rename from src/minecraft/buildcraft/api/core/IAreaProvider.java rename to common/buildcraft/api/core/IAreaProvider.java diff --git a/src/minecraft/buildcraft/api/core/IBox.java b/common/buildcraft/api/core/IBox.java similarity index 100% rename from src/minecraft/buildcraft/api/core/IBox.java rename to common/buildcraft/api/core/IBox.java diff --git a/src/minecraft/buildcraft/api/core/IIconProvider.java b/common/buildcraft/api/core/IIconProvider.java similarity index 100% rename from src/minecraft/buildcraft/api/core/IIconProvider.java rename to common/buildcraft/api/core/IIconProvider.java diff --git a/src/minecraft/buildcraft/api/core/LaserKind.java b/common/buildcraft/api/core/LaserKind.java similarity index 100% rename from src/minecraft/buildcraft/api/core/LaserKind.java rename to common/buildcraft/api/core/LaserKind.java diff --git a/src/minecraft/buildcraft/api/core/Position.java b/common/buildcraft/api/core/Position.java similarity index 100% rename from src/minecraft/buildcraft/api/core/Position.java rename to common/buildcraft/api/core/Position.java diff --git a/src/minecraft/buildcraft/api/core/SafeTimeTracker.java b/common/buildcraft/api/core/SafeTimeTracker.java similarity index 100% rename from src/minecraft/buildcraft/api/core/SafeTimeTracker.java rename to common/buildcraft/api/core/SafeTimeTracker.java diff --git a/src/minecraft/buildcraft/api/filler/FillerManager.java b/common/buildcraft/api/filler/FillerManager.java similarity index 100% rename from src/minecraft/buildcraft/api/filler/FillerManager.java rename to common/buildcraft/api/filler/FillerManager.java diff --git a/src/minecraft/buildcraft/api/filler/IFillerPattern.java b/common/buildcraft/api/filler/IFillerPattern.java similarity index 100% rename from src/minecraft/buildcraft/api/filler/IFillerPattern.java rename to common/buildcraft/api/filler/IFillerPattern.java diff --git a/src/minecraft/buildcraft/api/filler/IFillerRegistry.java b/common/buildcraft/api/filler/IFillerRegistry.java similarity index 100% rename from src/minecraft/buildcraft/api/filler/IFillerRegistry.java rename to common/buildcraft/api/filler/IFillerRegistry.java diff --git a/src/minecraft/buildcraft/api/fuels/IronEngineCoolant.java b/common/buildcraft/api/fuels/IronEngineCoolant.java similarity index 100% rename from src/minecraft/buildcraft/api/fuels/IronEngineCoolant.java rename to common/buildcraft/api/fuels/IronEngineCoolant.java diff --git a/src/minecraft/buildcraft/api/fuels/IronEngineFuel.java b/common/buildcraft/api/fuels/IronEngineFuel.java similarity index 100% rename from src/minecraft/buildcraft/api/fuels/IronEngineFuel.java rename to common/buildcraft/api/fuels/IronEngineFuel.java diff --git a/src/minecraft/buildcraft/api/gates/ActionManager.java b/common/buildcraft/api/gates/ActionManager.java similarity index 100% rename from src/minecraft/buildcraft/api/gates/ActionManager.java rename to common/buildcraft/api/gates/ActionManager.java diff --git a/src/minecraft/buildcraft/api/gates/IAction.java b/common/buildcraft/api/gates/IAction.java similarity index 100% rename from src/minecraft/buildcraft/api/gates/IAction.java rename to common/buildcraft/api/gates/IAction.java diff --git a/src/minecraft/buildcraft/api/gates/IActionProvider.java b/common/buildcraft/api/gates/IActionProvider.java similarity index 100% rename from src/minecraft/buildcraft/api/gates/IActionProvider.java rename to common/buildcraft/api/gates/IActionProvider.java diff --git a/src/minecraft/buildcraft/api/gates/IActionReceptor.java b/common/buildcraft/api/gates/IActionReceptor.java similarity index 100% rename from src/minecraft/buildcraft/api/gates/IActionReceptor.java rename to common/buildcraft/api/gates/IActionReceptor.java diff --git a/src/minecraft/buildcraft/api/gates/IOverrideDefaultTriggers.java b/common/buildcraft/api/gates/IOverrideDefaultTriggers.java similarity index 100% rename from src/minecraft/buildcraft/api/gates/IOverrideDefaultTriggers.java rename to common/buildcraft/api/gates/IOverrideDefaultTriggers.java diff --git a/src/minecraft/buildcraft/api/gates/ITrigger.java b/common/buildcraft/api/gates/ITrigger.java similarity index 100% rename from src/minecraft/buildcraft/api/gates/ITrigger.java rename to common/buildcraft/api/gates/ITrigger.java diff --git a/src/minecraft/buildcraft/api/gates/ITriggerParameter.java b/common/buildcraft/api/gates/ITriggerParameter.java similarity index 100% rename from src/minecraft/buildcraft/api/gates/ITriggerParameter.java rename to common/buildcraft/api/gates/ITriggerParameter.java diff --git a/src/minecraft/buildcraft/api/gates/ITriggerProvider.java b/common/buildcraft/api/gates/ITriggerProvider.java similarity index 100% rename from src/minecraft/buildcraft/api/gates/ITriggerProvider.java rename to common/buildcraft/api/gates/ITriggerProvider.java diff --git a/src/minecraft/buildcraft/api/gates/TriggerParameter.java b/common/buildcraft/api/gates/TriggerParameter.java similarity index 100% rename from src/minecraft/buildcraft/api/gates/TriggerParameter.java rename to common/buildcraft/api/gates/TriggerParameter.java diff --git a/src/minecraft/buildcraft/api/inventory/ISecuredInventory.java b/common/buildcraft/api/inventory/ISecuredInventory.java similarity index 100% rename from src/minecraft/buildcraft/api/inventory/ISecuredInventory.java rename to common/buildcraft/api/inventory/ISecuredInventory.java diff --git a/src/minecraft/buildcraft/api/inventory/ISelectiveInventory.java b/common/buildcraft/api/inventory/ISelectiveInventory.java similarity index 100% rename from src/minecraft/buildcraft/api/inventory/ISelectiveInventory.java rename to common/buildcraft/api/inventory/ISelectiveInventory.java diff --git a/src/minecraft/buildcraft/api/inventory/ISpecialInventory.java b/common/buildcraft/api/inventory/ISpecialInventory.java similarity index 100% rename from src/minecraft/buildcraft/api/inventory/ISpecialInventory.java rename to common/buildcraft/api/inventory/ISpecialInventory.java diff --git a/src/minecraft/buildcraft/api/power/IPowerProvider.java b/common/buildcraft/api/power/IPowerProvider.java similarity index 100% rename from src/minecraft/buildcraft/api/power/IPowerProvider.java rename to common/buildcraft/api/power/IPowerProvider.java diff --git a/src/minecraft/buildcraft/api/power/IPowerReceptor.java b/common/buildcraft/api/power/IPowerReceptor.java similarity index 100% rename from src/minecraft/buildcraft/api/power/IPowerReceptor.java rename to common/buildcraft/api/power/IPowerReceptor.java diff --git a/src/minecraft/buildcraft/api/power/PowerFramework.java b/common/buildcraft/api/power/PowerFramework.java similarity index 100% rename from src/minecraft/buildcraft/api/power/PowerFramework.java rename to common/buildcraft/api/power/PowerFramework.java diff --git a/src/minecraft/buildcraft/api/power/PowerProvider.java b/common/buildcraft/api/power/PowerProvider.java similarity index 100% rename from src/minecraft/buildcraft/api/power/PowerProvider.java rename to common/buildcraft/api/power/PowerProvider.java diff --git a/src/minecraft/buildcraft/api/recipes/AssemblyRecipe.java b/common/buildcraft/api/recipes/AssemblyRecipe.java similarity index 100% rename from src/minecraft/buildcraft/api/recipes/AssemblyRecipe.java rename to common/buildcraft/api/recipes/AssemblyRecipe.java diff --git a/src/minecraft/buildcraft/api/recipes/RefineryRecipe.java b/common/buildcraft/api/recipes/RefineryRecipe.java similarity index 100% rename from src/minecraft/buildcraft/api/recipes/RefineryRecipe.java rename to common/buildcraft/api/recipes/RefineryRecipe.java diff --git a/src/minecraft/buildcraft/api/tools/IToolPipette.java b/common/buildcraft/api/tools/IToolPipette.java similarity index 100% rename from src/minecraft/buildcraft/api/tools/IToolPipette.java rename to common/buildcraft/api/tools/IToolPipette.java diff --git a/src/minecraft/buildcraft/api/tools/IToolWrench.java b/common/buildcraft/api/tools/IToolWrench.java similarity index 100% rename from src/minecraft/buildcraft/api/tools/IToolWrench.java rename to common/buildcraft/api/tools/IToolWrench.java diff --git a/src/minecraft/buildcraft/api/transport/FacadeManager.java b/common/buildcraft/api/transport/FacadeManager.java similarity index 100% rename from src/minecraft/buildcraft/api/transport/FacadeManager.java rename to common/buildcraft/api/transport/FacadeManager.java diff --git a/src/minecraft/buildcraft/api/transport/IExtractionHandler.java b/common/buildcraft/api/transport/IExtractionHandler.java similarity index 100% rename from src/minecraft/buildcraft/api/transport/IExtractionHandler.java rename to common/buildcraft/api/transport/IExtractionHandler.java diff --git a/src/minecraft/buildcraft/api/transport/IPassiveItemContribution.java b/common/buildcraft/api/transport/IPassiveItemContribution.java similarity index 100% rename from src/minecraft/buildcraft/api/transport/IPassiveItemContribution.java rename to common/buildcraft/api/transport/IPassiveItemContribution.java diff --git a/src/minecraft/buildcraft/api/transport/IPipe.java b/common/buildcraft/api/transport/IPipe.java similarity index 100% rename from src/minecraft/buildcraft/api/transport/IPipe.java rename to common/buildcraft/api/transport/IPipe.java diff --git a/src/minecraft/buildcraft/api/transport/IPipeConnection.java b/common/buildcraft/api/transport/IPipeConnection.java similarity index 100% rename from src/minecraft/buildcraft/api/transport/IPipeConnection.java rename to common/buildcraft/api/transport/IPipeConnection.java diff --git a/src/minecraft/buildcraft/api/transport/IPipeEntry.java b/common/buildcraft/api/transport/IPipeEntry.java similarity index 100% rename from src/minecraft/buildcraft/api/transport/IPipeEntry.java rename to common/buildcraft/api/transport/IPipeEntry.java diff --git a/src/minecraft/buildcraft/api/transport/IPipeTile.java b/common/buildcraft/api/transport/IPipeTile.java similarity index 100% rename from src/minecraft/buildcraft/api/transport/IPipeTile.java rename to common/buildcraft/api/transport/IPipeTile.java diff --git a/src/minecraft/buildcraft/api/transport/IPipedItem.java b/common/buildcraft/api/transport/IPipedItem.java similarity index 100% rename from src/minecraft/buildcraft/api/transport/IPipedItem.java rename to common/buildcraft/api/transport/IPipedItem.java diff --git a/src/minecraft/buildcraft/api/transport/ISolidSideTile.java b/common/buildcraft/api/transport/ISolidSideTile.java similarity index 100% rename from src/minecraft/buildcraft/api/transport/ISolidSideTile.java rename to common/buildcraft/api/transport/ISolidSideTile.java diff --git a/src/minecraft/buildcraft/api/transport/PipeManager.java b/common/buildcraft/api/transport/PipeManager.java similarity index 100% rename from src/minecraft/buildcraft/api/transport/PipeManager.java rename to common/buildcraft/api/transport/PipeManager.java diff --git a/src/minecraft/dan200/computer/api/ComputerCraftAPI.java b/common/dan200/computer/api/ComputerCraftAPI.java similarity index 100% rename from src/minecraft/dan200/computer/api/ComputerCraftAPI.java rename to common/dan200/computer/api/ComputerCraftAPI.java diff --git a/src/minecraft/dan200/computer/api/IComputerAccess.java b/common/dan200/computer/api/IComputerAccess.java similarity index 100% rename from src/minecraft/dan200/computer/api/IComputerAccess.java rename to common/dan200/computer/api/IComputerAccess.java diff --git a/src/minecraft/dan200/computer/api/IHostedPeripheral.java b/common/dan200/computer/api/IHostedPeripheral.java similarity index 100% rename from src/minecraft/dan200/computer/api/IHostedPeripheral.java rename to common/dan200/computer/api/IHostedPeripheral.java diff --git a/src/minecraft/dan200/computer/api/IMedia.java b/common/dan200/computer/api/IMedia.java similarity index 100% rename from src/minecraft/dan200/computer/api/IMedia.java rename to common/dan200/computer/api/IMedia.java diff --git a/src/minecraft/dan200/computer/api/IPeripheral.java b/common/dan200/computer/api/IPeripheral.java similarity index 100% rename from src/minecraft/dan200/computer/api/IPeripheral.java rename to common/dan200/computer/api/IPeripheral.java diff --git a/src/minecraft/dan200/computer/api/IPeripheralHandler.java b/common/dan200/computer/api/IPeripheralHandler.java similarity index 100% rename from src/minecraft/dan200/computer/api/IPeripheralHandler.java rename to common/dan200/computer/api/IPeripheralHandler.java diff --git a/src/minecraft/dan200/turtle/api/ITurtleAccess.java b/common/dan200/turtle/api/ITurtleAccess.java similarity index 100% rename from src/minecraft/dan200/turtle/api/ITurtleAccess.java rename to common/dan200/turtle/api/ITurtleAccess.java diff --git a/src/minecraft/dan200/turtle/api/ITurtleCommandHandler.java b/common/dan200/turtle/api/ITurtleCommandHandler.java similarity index 100% rename from src/minecraft/dan200/turtle/api/ITurtleCommandHandler.java rename to common/dan200/turtle/api/ITurtleCommandHandler.java diff --git a/src/minecraft/dan200/turtle/api/ITurtleUpgrade.java b/common/dan200/turtle/api/ITurtleUpgrade.java similarity index 100% rename from src/minecraft/dan200/turtle/api/ITurtleUpgrade.java rename to common/dan200/turtle/api/ITurtleUpgrade.java diff --git a/src/minecraft/dan200/turtle/api/TurtleAPI.java b/common/dan200/turtle/api/TurtleAPI.java similarity index 100% rename from src/minecraft/dan200/turtle/api/TurtleAPI.java rename to common/dan200/turtle/api/TurtleAPI.java diff --git a/src/minecraft/dan200/turtle/api/TurtleSide.java b/common/dan200/turtle/api/TurtleSide.java similarity index 100% rename from src/minecraft/dan200/turtle/api/TurtleSide.java rename to common/dan200/turtle/api/TurtleSide.java diff --git a/src/minecraft/dan200/turtle/api/TurtleUpgradeType.java b/common/dan200/turtle/api/TurtleUpgradeType.java similarity index 100% rename from src/minecraft/dan200/turtle/api/TurtleUpgradeType.java rename to common/dan200/turtle/api/TurtleUpgradeType.java diff --git a/src/minecraft/dan200/turtle/api/TurtleVerb.java b/common/dan200/turtle/api/TurtleVerb.java similarity index 100% rename from src/minecraft/dan200/turtle/api/TurtleVerb.java rename to common/dan200/turtle/api/TurtleVerb.java diff --git a/src/minecraft/ic2/api/Direction.java b/common/ic2/api/Direction.java similarity index 100% rename from src/minecraft/ic2/api/Direction.java rename to common/ic2/api/Direction.java diff --git a/src/minecraft/ic2/api/crops/BaseSeed.java b/common/ic2/api/crops/BaseSeed.java similarity index 100% rename from src/minecraft/ic2/api/crops/BaseSeed.java rename to common/ic2/api/crops/BaseSeed.java diff --git a/src/minecraft/ic2/api/crops/CropCard.java b/common/ic2/api/crops/CropCard.java similarity index 100% rename from src/minecraft/ic2/api/crops/CropCard.java rename to common/ic2/api/crops/CropCard.java diff --git a/src/minecraft/ic2/api/crops/Crops.java b/common/ic2/api/crops/Crops.java similarity index 100% rename from src/minecraft/ic2/api/crops/Crops.java rename to common/ic2/api/crops/Crops.java diff --git a/src/minecraft/ic2/api/crops/ICropTile.java b/common/ic2/api/crops/ICropTile.java similarity index 100% rename from src/minecraft/ic2/api/crops/ICropTile.java rename to common/ic2/api/crops/ICropTile.java diff --git a/src/minecraft/ic2/api/energy/EnergyNet.java b/common/ic2/api/energy/EnergyNet.java similarity index 100% rename from src/minecraft/ic2/api/energy/EnergyNet.java rename to common/ic2/api/energy/EnergyNet.java diff --git a/src/minecraft/ic2/api/energy/event/EnergyTileEvent.java b/common/ic2/api/energy/event/EnergyTileEvent.java similarity index 100% rename from src/minecraft/ic2/api/energy/event/EnergyTileEvent.java rename to common/ic2/api/energy/event/EnergyTileEvent.java diff --git a/src/minecraft/ic2/api/energy/event/EnergyTileLoadEvent.java b/common/ic2/api/energy/event/EnergyTileLoadEvent.java similarity index 100% rename from src/minecraft/ic2/api/energy/event/EnergyTileLoadEvent.java rename to common/ic2/api/energy/event/EnergyTileLoadEvent.java diff --git a/src/minecraft/ic2/api/energy/event/EnergyTileSourceEvent.java b/common/ic2/api/energy/event/EnergyTileSourceEvent.java similarity index 100% rename from src/minecraft/ic2/api/energy/event/EnergyTileSourceEvent.java rename to common/ic2/api/energy/event/EnergyTileSourceEvent.java diff --git a/src/minecraft/ic2/api/energy/event/EnergyTileUnloadEvent.java b/common/ic2/api/energy/event/EnergyTileUnloadEvent.java similarity index 100% rename from src/minecraft/ic2/api/energy/event/EnergyTileUnloadEvent.java rename to common/ic2/api/energy/event/EnergyTileUnloadEvent.java diff --git a/src/minecraft/ic2/api/energy/tile/IEnergyAcceptor.java b/common/ic2/api/energy/tile/IEnergyAcceptor.java similarity index 100% rename from src/minecraft/ic2/api/energy/tile/IEnergyAcceptor.java rename to common/ic2/api/energy/tile/IEnergyAcceptor.java diff --git a/src/minecraft/ic2/api/energy/tile/IEnergyConductor.java b/common/ic2/api/energy/tile/IEnergyConductor.java similarity index 100% rename from src/minecraft/ic2/api/energy/tile/IEnergyConductor.java rename to common/ic2/api/energy/tile/IEnergyConductor.java diff --git a/src/minecraft/ic2/api/energy/tile/IEnergyEmitter.java b/common/ic2/api/energy/tile/IEnergyEmitter.java similarity index 100% rename from src/minecraft/ic2/api/energy/tile/IEnergyEmitter.java rename to common/ic2/api/energy/tile/IEnergyEmitter.java diff --git a/src/minecraft/ic2/api/energy/tile/IEnergySink.java b/common/ic2/api/energy/tile/IEnergySink.java similarity index 100% rename from src/minecraft/ic2/api/energy/tile/IEnergySink.java rename to common/ic2/api/energy/tile/IEnergySink.java diff --git a/src/minecraft/ic2/api/energy/tile/IEnergySource.java b/common/ic2/api/energy/tile/IEnergySource.java similarity index 100% rename from src/minecraft/ic2/api/energy/tile/IEnergySource.java rename to common/ic2/api/energy/tile/IEnergySource.java diff --git a/src/minecraft/ic2/api/energy/tile/IEnergyTile.java b/common/ic2/api/energy/tile/IEnergyTile.java similarity index 100% rename from src/minecraft/ic2/api/energy/tile/IEnergyTile.java rename to common/ic2/api/energy/tile/IEnergyTile.java diff --git a/src/minecraft/ic2/api/energy/usage.txt b/common/ic2/api/energy/usage.txt similarity index 100% rename from src/minecraft/ic2/api/energy/usage.txt rename to common/ic2/api/energy/usage.txt diff --git a/src/minecraft/ic2/api/event/PaintEvent.java b/common/ic2/api/event/PaintEvent.java similarity index 100% rename from src/minecraft/ic2/api/event/PaintEvent.java rename to common/ic2/api/event/PaintEvent.java diff --git a/src/minecraft/ic2/api/event/RetextureEvent.java b/common/ic2/api/event/RetextureEvent.java similarity index 100% rename from src/minecraft/ic2/api/event/RetextureEvent.java rename to common/ic2/api/event/RetextureEvent.java diff --git a/src/minecraft/ic2/api/info/IEnergyValueProvider.java b/common/ic2/api/info/IEnergyValueProvider.java similarity index 100% rename from src/minecraft/ic2/api/info/IEnergyValueProvider.java rename to common/ic2/api/info/IEnergyValueProvider.java diff --git a/src/minecraft/ic2/api/info/IFuelValueProvider.java b/common/ic2/api/info/IFuelValueProvider.java similarity index 100% rename from src/minecraft/ic2/api/info/IFuelValueProvider.java rename to common/ic2/api/info/IFuelValueProvider.java diff --git a/src/minecraft/ic2/api/info/Info.java b/common/ic2/api/info/Info.java similarity index 100% rename from src/minecraft/ic2/api/info/Info.java rename to common/ic2/api/info/Info.java diff --git a/src/minecraft/ic2/api/item/ElectricItem.java b/common/ic2/api/item/ElectricItem.java similarity index 100% rename from src/minecraft/ic2/api/item/ElectricItem.java rename to common/ic2/api/item/ElectricItem.java diff --git a/src/minecraft/ic2/api/item/IBoxable.java b/common/ic2/api/item/IBoxable.java similarity index 100% rename from src/minecraft/ic2/api/item/IBoxable.java rename to common/ic2/api/item/IBoxable.java diff --git a/src/minecraft/ic2/api/item/ICustomElectricItem.java b/common/ic2/api/item/ICustomElectricItem.java similarity index 100% rename from src/minecraft/ic2/api/item/ICustomElectricItem.java rename to common/ic2/api/item/ICustomElectricItem.java diff --git a/src/minecraft/ic2/api/item/IElectricItem.java b/common/ic2/api/item/IElectricItem.java similarity index 100% rename from src/minecraft/ic2/api/item/IElectricItem.java rename to common/ic2/api/item/IElectricItem.java diff --git a/src/minecraft/ic2/api/item/IElectricItemManager.java b/common/ic2/api/item/IElectricItemManager.java similarity index 100% rename from src/minecraft/ic2/api/item/IElectricItemManager.java rename to common/ic2/api/item/IElectricItemManager.java diff --git a/src/minecraft/ic2/api/item/IMetalArmor.java b/common/ic2/api/item/IMetalArmor.java similarity index 100% rename from src/minecraft/ic2/api/item/IMetalArmor.java rename to common/ic2/api/item/IMetalArmor.java diff --git a/src/minecraft/ic2/api/item/ISpecialElectricItem.java b/common/ic2/api/item/ISpecialElectricItem.java similarity index 100% rename from src/minecraft/ic2/api/item/ISpecialElectricItem.java rename to common/ic2/api/item/ISpecialElectricItem.java diff --git a/src/minecraft/ic2/api/item/ITerraformingBP.java b/common/ic2/api/item/ITerraformingBP.java similarity index 100% rename from src/minecraft/ic2/api/item/ITerraformingBP.java rename to common/ic2/api/item/ITerraformingBP.java diff --git a/src/minecraft/ic2/api/item/ItemWrapper.java b/common/ic2/api/item/ItemWrapper.java similarity index 100% rename from src/minecraft/ic2/api/item/ItemWrapper.java rename to common/ic2/api/item/ItemWrapper.java diff --git a/src/minecraft/ic2/api/item/Items.java b/common/ic2/api/item/Items.java similarity index 100% rename from src/minecraft/ic2/api/item/Items.java rename to common/ic2/api/item/Items.java diff --git a/src/minecraft/ic2/api/network/INetworkClientTileEntityEventListener.java b/common/ic2/api/network/INetworkClientTileEntityEventListener.java similarity index 100% rename from src/minecraft/ic2/api/network/INetworkClientTileEntityEventListener.java rename to common/ic2/api/network/INetworkClientTileEntityEventListener.java diff --git a/src/minecraft/ic2/api/network/INetworkDataProvider.java b/common/ic2/api/network/INetworkDataProvider.java similarity index 100% rename from src/minecraft/ic2/api/network/INetworkDataProvider.java rename to common/ic2/api/network/INetworkDataProvider.java diff --git a/src/minecraft/ic2/api/network/INetworkItemEventListener.java b/common/ic2/api/network/INetworkItemEventListener.java similarity index 100% rename from src/minecraft/ic2/api/network/INetworkItemEventListener.java rename to common/ic2/api/network/INetworkItemEventListener.java diff --git a/src/minecraft/ic2/api/network/INetworkTileEntityEventListener.java b/common/ic2/api/network/INetworkTileEntityEventListener.java similarity index 100% rename from src/minecraft/ic2/api/network/INetworkTileEntityEventListener.java rename to common/ic2/api/network/INetworkTileEntityEventListener.java diff --git a/src/minecraft/ic2/api/network/INetworkUpdateListener.java b/common/ic2/api/network/INetworkUpdateListener.java similarity index 100% rename from src/minecraft/ic2/api/network/INetworkUpdateListener.java rename to common/ic2/api/network/INetworkUpdateListener.java diff --git a/src/minecraft/ic2/api/network/NetworkHelper.java b/common/ic2/api/network/NetworkHelper.java similarity index 100% rename from src/minecraft/ic2/api/network/NetworkHelper.java rename to common/ic2/api/network/NetworkHelper.java diff --git a/src/minecraft/ic2/api/reactor/IC2Reactor.java b/common/ic2/api/reactor/IC2Reactor.java similarity index 100% rename from src/minecraft/ic2/api/reactor/IC2Reactor.java rename to common/ic2/api/reactor/IC2Reactor.java diff --git a/src/minecraft/ic2/api/reactor/IReactor.java b/common/ic2/api/reactor/IReactor.java similarity index 100% rename from src/minecraft/ic2/api/reactor/IReactor.java rename to common/ic2/api/reactor/IReactor.java diff --git a/src/minecraft/ic2/api/reactor/IReactorChamber.java b/common/ic2/api/reactor/IReactorChamber.java similarity index 100% rename from src/minecraft/ic2/api/reactor/IReactorChamber.java rename to common/ic2/api/reactor/IReactorChamber.java diff --git a/src/minecraft/ic2/api/reactor/IReactorComponent.java b/common/ic2/api/reactor/IReactorComponent.java similarity index 100% rename from src/minecraft/ic2/api/reactor/IReactorComponent.java rename to common/ic2/api/reactor/IReactorComponent.java diff --git a/src/minecraft/ic2/api/recipe/ICraftingRecipeManager.java b/common/ic2/api/recipe/ICraftingRecipeManager.java similarity index 100% rename from src/minecraft/ic2/api/recipe/ICraftingRecipeManager.java rename to common/ic2/api/recipe/ICraftingRecipeManager.java diff --git a/src/minecraft/ic2/api/recipe/IListRecipeManager.java b/common/ic2/api/recipe/IListRecipeManager.java similarity index 100% rename from src/minecraft/ic2/api/recipe/IListRecipeManager.java rename to common/ic2/api/recipe/IListRecipeManager.java diff --git a/src/minecraft/ic2/api/recipe/IMachineRecipeManager.java b/common/ic2/api/recipe/IMachineRecipeManager.java similarity index 100% rename from src/minecraft/ic2/api/recipe/IMachineRecipeManager.java rename to common/ic2/api/recipe/IMachineRecipeManager.java diff --git a/src/minecraft/ic2/api/recipe/Recipes.java b/common/ic2/api/recipe/Recipes.java similarity index 100% rename from src/minecraft/ic2/api/recipe/Recipes.java rename to common/ic2/api/recipe/Recipes.java diff --git a/src/minecraft/ic2/api/tile/ExplosionWhitelist.java b/common/ic2/api/tile/ExplosionWhitelist.java similarity index 100% rename from src/minecraft/ic2/api/tile/ExplosionWhitelist.java rename to common/ic2/api/tile/ExplosionWhitelist.java diff --git a/src/minecraft/ic2/api/tile/IEnergyStorage.java b/common/ic2/api/tile/IEnergyStorage.java similarity index 100% rename from src/minecraft/ic2/api/tile/IEnergyStorage.java rename to common/ic2/api/tile/IEnergyStorage.java diff --git a/src/minecraft/ic2/api/tile/IWrenchable.java b/common/ic2/api/tile/IWrenchable.java similarity index 100% rename from src/minecraft/ic2/api/tile/IWrenchable.java rename to common/ic2/api/tile/IWrenchable.java diff --git a/src/minecraft/mekanism/api/EnergizedItemManager.java b/common/mekanism/api/EnergizedItemManager.java similarity index 100% rename from src/minecraft/mekanism/api/EnergizedItemManager.java rename to common/mekanism/api/EnergizedItemManager.java diff --git a/src/minecraft/mekanism/api/EnumColor.java b/common/mekanism/api/EnumColor.java similarity index 100% rename from src/minecraft/mekanism/api/EnumColor.java rename to common/mekanism/api/EnumColor.java diff --git a/src/minecraft/mekanism/api/EnumGas.java b/common/mekanism/api/EnumGas.java similarity index 100% rename from src/minecraft/mekanism/api/EnumGas.java rename to common/mekanism/api/EnumGas.java diff --git a/src/minecraft/mekanism/api/GasNetwork.java b/common/mekanism/api/GasNetwork.java similarity index 100% rename from src/minecraft/mekanism/api/GasNetwork.java rename to common/mekanism/api/GasNetwork.java diff --git a/src/minecraft/mekanism/api/GasTransmission.java b/common/mekanism/api/GasTransmission.java similarity index 100% rename from src/minecraft/mekanism/api/GasTransmission.java rename to common/mekanism/api/GasTransmission.java diff --git a/src/minecraft/mekanism/api/IAccessibleGui.java b/common/mekanism/api/IAccessibleGui.java similarity index 100% rename from src/minecraft/mekanism/api/IAccessibleGui.java rename to common/mekanism/api/IAccessibleGui.java diff --git a/src/minecraft/mekanism/api/ICableOutputter.java b/common/mekanism/api/ICableOutputter.java similarity index 100% rename from src/minecraft/mekanism/api/ICableOutputter.java rename to common/mekanism/api/ICableOutputter.java diff --git a/src/minecraft/mekanism/api/IConfigurable.java b/common/mekanism/api/IConfigurable.java similarity index 100% rename from src/minecraft/mekanism/api/IConfigurable.java rename to common/mekanism/api/IConfigurable.java diff --git a/src/minecraft/mekanism/api/IEnergizedItem.java b/common/mekanism/api/IEnergizedItem.java similarity index 100% rename from src/minecraft/mekanism/api/IEnergizedItem.java rename to common/mekanism/api/IEnergizedItem.java diff --git a/src/minecraft/mekanism/api/IGasAcceptor.java b/common/mekanism/api/IGasAcceptor.java similarity index 100% rename from src/minecraft/mekanism/api/IGasAcceptor.java rename to common/mekanism/api/IGasAcceptor.java diff --git a/src/minecraft/mekanism/api/IGasStorage.java b/common/mekanism/api/IGasStorage.java similarity index 100% rename from src/minecraft/mekanism/api/IGasStorage.java rename to common/mekanism/api/IGasStorage.java diff --git a/src/minecraft/mekanism/api/IPressurizedTube.java b/common/mekanism/api/IPressurizedTube.java similarity index 100% rename from src/minecraft/mekanism/api/IPressurizedTube.java rename to common/mekanism/api/IPressurizedTube.java diff --git a/src/minecraft/mekanism/api/IStorageTank.java b/common/mekanism/api/IStorageTank.java similarity index 100% rename from src/minecraft/mekanism/api/IStorageTank.java rename to common/mekanism/api/IStorageTank.java diff --git a/src/minecraft/mekanism/api/IStrictEnergyAcceptor.java b/common/mekanism/api/IStrictEnergyAcceptor.java similarity index 100% rename from src/minecraft/mekanism/api/IStrictEnergyAcceptor.java rename to common/mekanism/api/IStrictEnergyAcceptor.java diff --git a/src/minecraft/mekanism/api/IStrictEnergyStorage.java b/common/mekanism/api/IStrictEnergyStorage.java similarity index 100% rename from src/minecraft/mekanism/api/IStrictEnergyStorage.java rename to common/mekanism/api/IStrictEnergyStorage.java diff --git a/src/minecraft/mekanism/api/ITubeConnection.java b/common/mekanism/api/ITubeConnection.java similarity index 100% rename from src/minecraft/mekanism/api/ITubeConnection.java rename to common/mekanism/api/ITubeConnection.java diff --git a/src/minecraft/mekanism/api/IUpgradeManagement.java b/common/mekanism/api/IUpgradeManagement.java similarity index 100% rename from src/minecraft/mekanism/api/IUpgradeManagement.java rename to common/mekanism/api/IUpgradeManagement.java diff --git a/src/minecraft/mekanism/api/InfuseObject.java b/common/mekanism/api/InfuseObject.java similarity index 100% rename from src/minecraft/mekanism/api/InfuseObject.java rename to common/mekanism/api/InfuseObject.java diff --git a/src/minecraft/mekanism/api/InfuseRegistry.java b/common/mekanism/api/InfuseRegistry.java similarity index 100% rename from src/minecraft/mekanism/api/InfuseRegistry.java rename to common/mekanism/api/InfuseRegistry.java diff --git a/src/minecraft/mekanism/api/InfuseType.java b/common/mekanism/api/InfuseType.java similarity index 100% rename from src/minecraft/mekanism/api/InfuseType.java rename to common/mekanism/api/InfuseType.java diff --git a/src/minecraft/mekanism/api/InfusionInput.java b/common/mekanism/api/InfusionInput.java similarity index 100% rename from src/minecraft/mekanism/api/InfusionInput.java rename to common/mekanism/api/InfusionInput.java diff --git a/src/minecraft/mekanism/api/InfusionOutput.java b/common/mekanism/api/InfusionOutput.java similarity index 100% rename from src/minecraft/mekanism/api/InfusionOutput.java rename to common/mekanism/api/InfusionOutput.java diff --git a/src/minecraft/mekanism/api/ItemRetriever.java b/common/mekanism/api/ItemRetriever.java similarity index 100% rename from src/minecraft/mekanism/api/ItemRetriever.java rename to common/mekanism/api/ItemRetriever.java diff --git a/src/minecraft/mekanism/api/Object3D.java b/common/mekanism/api/Object3D.java similarity index 100% rename from src/minecraft/mekanism/api/Object3D.java rename to common/mekanism/api/Object3D.java diff --git a/src/minecraft/mekanism/api/RecipeHelper.java b/common/mekanism/api/RecipeHelper.java similarity index 100% rename from src/minecraft/mekanism/api/RecipeHelper.java rename to common/mekanism/api/RecipeHelper.java diff --git a/src/minecraft/mekanism/api/SideData.java b/common/mekanism/api/SideData.java similarity index 100% rename from src/minecraft/mekanism/api/SideData.java rename to common/mekanism/api/SideData.java diff --git a/src/minecraft/mekanism/api/TabProxy.java b/common/mekanism/api/TabProxy.java similarity index 100% rename from src/minecraft/mekanism/api/TabProxy.java rename to common/mekanism/api/TabProxy.java diff --git a/src/minecraft/mekanism/client/BasicRenderingHandler.java b/common/mekanism/client/BasicRenderingHandler.java similarity index 100% rename from src/minecraft/mekanism/client/BasicRenderingHandler.java rename to common/mekanism/client/BasicRenderingHandler.java diff --git a/src/minecraft/mekanism/client/CapeBufferDownload.java b/common/mekanism/client/CapeBufferDownload.java similarity index 100% rename from src/minecraft/mekanism/client/CapeBufferDownload.java rename to common/mekanism/client/CapeBufferDownload.java diff --git a/src/minecraft/mekanism/client/ClientConnectionHandler.java b/common/mekanism/client/ClientConnectionHandler.java similarity index 100% rename from src/minecraft/mekanism/client/ClientConnectionHandler.java rename to common/mekanism/client/ClientConnectionHandler.java diff --git a/src/minecraft/mekanism/client/ClientPlayerTickHandler.java b/common/mekanism/client/ClientPlayerTickHandler.java similarity index 100% rename from src/minecraft/mekanism/client/ClientPlayerTickHandler.java rename to common/mekanism/client/ClientPlayerTickHandler.java diff --git a/src/minecraft/mekanism/client/ClientProxy.java b/common/mekanism/client/ClientProxy.java similarity index 100% rename from src/minecraft/mekanism/client/ClientProxy.java rename to common/mekanism/client/ClientProxy.java diff --git a/src/minecraft/mekanism/client/ClientTickHandler.java b/common/mekanism/client/ClientTickHandler.java similarity index 100% rename from src/minecraft/mekanism/client/ClientTickHandler.java rename to common/mekanism/client/ClientTickHandler.java diff --git a/src/minecraft/mekanism/client/GasClientUpdate.java b/common/mekanism/client/GasClientUpdate.java similarity index 100% rename from src/minecraft/mekanism/client/GasClientUpdate.java rename to common/mekanism/client/GasClientUpdate.java diff --git a/src/minecraft/mekanism/client/GuiAdvancedElectricMachine.java b/common/mekanism/client/GuiAdvancedElectricMachine.java similarity index 100% rename from src/minecraft/mekanism/client/GuiAdvancedElectricMachine.java rename to common/mekanism/client/GuiAdvancedElectricMachine.java diff --git a/src/minecraft/mekanism/client/GuiCombiner.java b/common/mekanism/client/GuiCombiner.java similarity index 100% rename from src/minecraft/mekanism/client/GuiCombiner.java rename to common/mekanism/client/GuiCombiner.java diff --git a/src/minecraft/mekanism/client/GuiControlPanel.java b/common/mekanism/client/GuiControlPanel.java similarity index 100% rename from src/minecraft/mekanism/client/GuiControlPanel.java rename to common/mekanism/client/GuiControlPanel.java diff --git a/src/minecraft/mekanism/client/GuiCredits.java b/common/mekanism/client/GuiCredits.java similarity index 100% rename from src/minecraft/mekanism/client/GuiCredits.java rename to common/mekanism/client/GuiCredits.java diff --git a/src/minecraft/mekanism/client/GuiCrusher.java b/common/mekanism/client/GuiCrusher.java similarity index 100% rename from src/minecraft/mekanism/client/GuiCrusher.java rename to common/mekanism/client/GuiCrusher.java diff --git a/src/minecraft/mekanism/client/GuiDynamicTank.java b/common/mekanism/client/GuiDynamicTank.java similarity index 100% rename from src/minecraft/mekanism/client/GuiDynamicTank.java rename to common/mekanism/client/GuiDynamicTank.java diff --git a/src/minecraft/mekanism/client/GuiElectricChest.java b/common/mekanism/client/GuiElectricChest.java similarity index 100% rename from src/minecraft/mekanism/client/GuiElectricChest.java rename to common/mekanism/client/GuiElectricChest.java diff --git a/src/minecraft/mekanism/client/GuiElectricMachine.java b/common/mekanism/client/GuiElectricMachine.java similarity index 100% rename from src/minecraft/mekanism/client/GuiElectricMachine.java rename to common/mekanism/client/GuiElectricMachine.java diff --git a/src/minecraft/mekanism/client/GuiElectricPump.java b/common/mekanism/client/GuiElectricPump.java similarity index 100% rename from src/minecraft/mekanism/client/GuiElectricPump.java rename to common/mekanism/client/GuiElectricPump.java diff --git a/src/minecraft/mekanism/client/GuiEnergizedSmelter.java b/common/mekanism/client/GuiEnergizedSmelter.java similarity index 100% rename from src/minecraft/mekanism/client/GuiEnergizedSmelter.java rename to common/mekanism/client/GuiEnergizedSmelter.java diff --git a/src/minecraft/mekanism/client/GuiEnergyCube.java b/common/mekanism/client/GuiEnergyCube.java similarity index 100% rename from src/minecraft/mekanism/client/GuiEnergyCube.java rename to common/mekanism/client/GuiEnergyCube.java diff --git a/src/minecraft/mekanism/client/GuiEnrichmentChamber.java b/common/mekanism/client/GuiEnrichmentChamber.java similarity index 100% rename from src/minecraft/mekanism/client/GuiEnrichmentChamber.java rename to common/mekanism/client/GuiEnrichmentChamber.java diff --git a/src/minecraft/mekanism/client/GuiFactory.java b/common/mekanism/client/GuiFactory.java similarity index 100% rename from src/minecraft/mekanism/client/GuiFactory.java rename to common/mekanism/client/GuiFactory.java diff --git a/src/minecraft/mekanism/client/GuiGasTank.java b/common/mekanism/client/GuiGasTank.java similarity index 100% rename from src/minecraft/mekanism/client/GuiGasTank.java rename to common/mekanism/client/GuiGasTank.java diff --git a/src/minecraft/mekanism/client/GuiMetallurgicInfuser.java b/common/mekanism/client/GuiMetallurgicInfuser.java similarity index 100% rename from src/minecraft/mekanism/client/GuiMetallurgicInfuser.java rename to common/mekanism/client/GuiMetallurgicInfuser.java diff --git a/src/minecraft/mekanism/client/GuiOsmiumCompressor.java b/common/mekanism/client/GuiOsmiumCompressor.java similarity index 100% rename from src/minecraft/mekanism/client/GuiOsmiumCompressor.java rename to common/mekanism/client/GuiOsmiumCompressor.java diff --git a/src/minecraft/mekanism/client/GuiPasswordEnter.java b/common/mekanism/client/GuiPasswordEnter.java similarity index 100% rename from src/minecraft/mekanism/client/GuiPasswordEnter.java rename to common/mekanism/client/GuiPasswordEnter.java diff --git a/src/minecraft/mekanism/client/GuiPasswordModify.java b/common/mekanism/client/GuiPasswordModify.java similarity index 100% rename from src/minecraft/mekanism/client/GuiPasswordModify.java rename to common/mekanism/client/GuiPasswordModify.java diff --git a/src/minecraft/mekanism/client/GuiPortableTeleporter.java b/common/mekanism/client/GuiPortableTeleporter.java similarity index 100% rename from src/minecraft/mekanism/client/GuiPortableTeleporter.java rename to common/mekanism/client/GuiPortableTeleporter.java diff --git a/src/minecraft/mekanism/client/GuiPurificationChamber.java b/common/mekanism/client/GuiPurificationChamber.java similarity index 100% rename from src/minecraft/mekanism/client/GuiPurificationChamber.java rename to common/mekanism/client/GuiPurificationChamber.java diff --git a/src/minecraft/mekanism/client/GuiRobitCrafting.java b/common/mekanism/client/GuiRobitCrafting.java similarity index 100% rename from src/minecraft/mekanism/client/GuiRobitCrafting.java rename to common/mekanism/client/GuiRobitCrafting.java diff --git a/src/minecraft/mekanism/client/GuiRobitInventory.java b/common/mekanism/client/GuiRobitInventory.java similarity index 100% rename from src/minecraft/mekanism/client/GuiRobitInventory.java rename to common/mekanism/client/GuiRobitInventory.java diff --git a/src/minecraft/mekanism/client/GuiRobitMain.java b/common/mekanism/client/GuiRobitMain.java similarity index 100% rename from src/minecraft/mekanism/client/GuiRobitMain.java rename to common/mekanism/client/GuiRobitMain.java diff --git a/src/minecraft/mekanism/client/GuiRobitRepair.java b/common/mekanism/client/GuiRobitRepair.java similarity index 100% rename from src/minecraft/mekanism/client/GuiRobitRepair.java rename to common/mekanism/client/GuiRobitRepair.java diff --git a/src/minecraft/mekanism/client/GuiRobitSmelting.java b/common/mekanism/client/GuiRobitSmelting.java similarity index 100% rename from src/minecraft/mekanism/client/GuiRobitSmelting.java rename to common/mekanism/client/GuiRobitSmelting.java diff --git a/src/minecraft/mekanism/client/GuiStopwatch.java b/common/mekanism/client/GuiStopwatch.java similarity index 100% rename from src/minecraft/mekanism/client/GuiStopwatch.java rename to common/mekanism/client/GuiStopwatch.java diff --git a/src/minecraft/mekanism/client/GuiTeleporter.java b/common/mekanism/client/GuiTeleporter.java similarity index 100% rename from src/minecraft/mekanism/client/GuiTeleporter.java rename to common/mekanism/client/GuiTeleporter.java diff --git a/src/minecraft/mekanism/client/GuiTheoreticalElementizer.java b/common/mekanism/client/GuiTheoreticalElementizer.java similarity index 100% rename from src/minecraft/mekanism/client/GuiTheoreticalElementizer.java rename to common/mekanism/client/GuiTheoreticalElementizer.java diff --git a/src/minecraft/mekanism/client/GuiWeatherOrb.java b/common/mekanism/client/GuiWeatherOrb.java similarity index 100% rename from src/minecraft/mekanism/client/GuiWeatherOrb.java rename to common/mekanism/client/GuiWeatherOrb.java diff --git a/src/minecraft/mekanism/client/IHasSound.java b/common/mekanism/client/IHasSound.java similarity index 100% rename from src/minecraft/mekanism/client/IHasSound.java rename to common/mekanism/client/IHasSound.java diff --git a/src/minecraft/mekanism/client/ItemRenderingHandler.java b/common/mekanism/client/ItemRenderingHandler.java similarity index 100% rename from src/minecraft/mekanism/client/ItemRenderingHandler.java rename to common/mekanism/client/ItemRenderingHandler.java diff --git a/src/minecraft/mekanism/client/LiquidClientUpdate.java b/common/mekanism/client/LiquidClientUpdate.java similarity index 100% rename from src/minecraft/mekanism/client/LiquidClientUpdate.java rename to common/mekanism/client/LiquidClientUpdate.java diff --git a/src/minecraft/mekanism/client/MachineRenderingHandler.java b/common/mekanism/client/MachineRenderingHandler.java similarity index 100% rename from src/minecraft/mekanism/client/MachineRenderingHandler.java rename to common/mekanism/client/MachineRenderingHandler.java diff --git a/src/minecraft/mekanism/client/MekanismRenderer.java b/common/mekanism/client/MekanismRenderer.java similarity index 100% rename from src/minecraft/mekanism/client/MekanismRenderer.java rename to common/mekanism/client/MekanismRenderer.java diff --git a/src/minecraft/mekanism/client/ModelChargepad.java b/common/mekanism/client/ModelChargepad.java similarity index 100% rename from src/minecraft/mekanism/client/ModelChargepad.java rename to common/mekanism/client/ModelChargepad.java diff --git a/src/minecraft/mekanism/client/ModelElectricPump.java b/common/mekanism/client/ModelElectricPump.java similarity index 100% rename from src/minecraft/mekanism/client/ModelElectricPump.java rename to common/mekanism/client/ModelElectricPump.java diff --git a/src/minecraft/mekanism/client/ModelMetallurgicInfuser.java b/common/mekanism/client/ModelMetallurgicInfuser.java similarity index 100% rename from src/minecraft/mekanism/client/ModelMetallurgicInfuser.java rename to common/mekanism/client/ModelMetallurgicInfuser.java diff --git a/src/minecraft/mekanism/client/ModelRobit.java b/common/mekanism/client/ModelRobit.java similarity index 100% rename from src/minecraft/mekanism/client/ModelRobit.java rename to common/mekanism/client/ModelRobit.java diff --git a/src/minecraft/mekanism/client/ModelTheoreticalElementizer.java b/common/mekanism/client/ModelTheoreticalElementizer.java similarity index 100% rename from src/minecraft/mekanism/client/ModelTheoreticalElementizer.java rename to common/mekanism/client/ModelTheoreticalElementizer.java diff --git a/src/minecraft/mekanism/client/ModelTransmitter.java b/common/mekanism/client/ModelTransmitter.java similarity index 100% rename from src/minecraft/mekanism/client/ModelTransmitter.java rename to common/mekanism/client/ModelTransmitter.java diff --git a/src/minecraft/mekanism/client/RenderChargepad.java b/common/mekanism/client/RenderChargepad.java similarity index 100% rename from src/minecraft/mekanism/client/RenderChargepad.java rename to common/mekanism/client/RenderChargepad.java diff --git a/src/minecraft/mekanism/client/RenderConfigurableMachine.java b/common/mekanism/client/RenderConfigurableMachine.java similarity index 100% rename from src/minecraft/mekanism/client/RenderConfigurableMachine.java rename to common/mekanism/client/RenderConfigurableMachine.java diff --git a/src/minecraft/mekanism/client/RenderDynamicTank.java b/common/mekanism/client/RenderDynamicTank.java similarity index 100% rename from src/minecraft/mekanism/client/RenderDynamicTank.java rename to common/mekanism/client/RenderDynamicTank.java diff --git a/src/minecraft/mekanism/client/RenderElectricChest.java b/common/mekanism/client/RenderElectricChest.java similarity index 100% rename from src/minecraft/mekanism/client/RenderElectricChest.java rename to common/mekanism/client/RenderElectricChest.java diff --git a/src/minecraft/mekanism/client/RenderElectricPump.java b/common/mekanism/client/RenderElectricPump.java similarity index 100% rename from src/minecraft/mekanism/client/RenderElectricPump.java rename to common/mekanism/client/RenderElectricPump.java diff --git a/src/minecraft/mekanism/client/RenderMechanicalPipe.java b/common/mekanism/client/RenderMechanicalPipe.java similarity index 100% rename from src/minecraft/mekanism/client/RenderMechanicalPipe.java rename to common/mekanism/client/RenderMechanicalPipe.java diff --git a/src/minecraft/mekanism/client/RenderMetallurgicInfuser.java b/common/mekanism/client/RenderMetallurgicInfuser.java similarity index 100% rename from src/minecraft/mekanism/client/RenderMetallurgicInfuser.java rename to common/mekanism/client/RenderMetallurgicInfuser.java diff --git a/src/minecraft/mekanism/client/RenderObsidianTNT.java b/common/mekanism/client/RenderObsidianTNT.java similarity index 100% rename from src/minecraft/mekanism/client/RenderObsidianTNT.java rename to common/mekanism/client/RenderObsidianTNT.java diff --git a/src/minecraft/mekanism/client/RenderPressurizedTube.java b/common/mekanism/client/RenderPressurizedTube.java similarity index 100% rename from src/minecraft/mekanism/client/RenderPressurizedTube.java rename to common/mekanism/client/RenderPressurizedTube.java diff --git a/src/minecraft/mekanism/client/RenderRobit.java b/common/mekanism/client/RenderRobit.java similarity index 100% rename from src/minecraft/mekanism/client/RenderRobit.java rename to common/mekanism/client/RenderRobit.java diff --git a/src/minecraft/mekanism/client/RenderTheoreticalElementizer.java b/common/mekanism/client/RenderTheoreticalElementizer.java similarity index 100% rename from src/minecraft/mekanism/client/RenderTheoreticalElementizer.java rename to common/mekanism/client/RenderTheoreticalElementizer.java diff --git a/src/minecraft/mekanism/client/RenderTickHandler.java b/common/mekanism/client/RenderTickHandler.java similarity index 100% rename from src/minecraft/mekanism/client/RenderTickHandler.java rename to common/mekanism/client/RenderTickHandler.java diff --git a/src/minecraft/mekanism/client/RenderUniversalCable.java b/common/mekanism/client/RenderUniversalCable.java similarity index 100% rename from src/minecraft/mekanism/client/RenderUniversalCable.java rename to common/mekanism/client/RenderUniversalCable.java diff --git a/src/minecraft/mekanism/client/Sound.java b/common/mekanism/client/Sound.java similarity index 100% rename from src/minecraft/mekanism/client/Sound.java rename to common/mekanism/client/Sound.java diff --git a/src/minecraft/mekanism/client/SoundHandler.java b/common/mekanism/client/SoundHandler.java similarity index 100% rename from src/minecraft/mekanism/client/SoundHandler.java rename to common/mekanism/client/SoundHandler.java diff --git a/src/minecraft/mekanism/client/ThreadClientUpdate.java b/common/mekanism/client/ThreadClientUpdate.java similarity index 100% rename from src/minecraft/mekanism/client/ThreadClientUpdate.java rename to common/mekanism/client/ThreadClientUpdate.java diff --git a/src/minecraft/mekanism/client/ThreadTankSparkle.java b/common/mekanism/client/ThreadTankSparkle.java similarity index 100% rename from src/minecraft/mekanism/client/ThreadTankSparkle.java rename to common/mekanism/client/ThreadTankSparkle.java diff --git a/src/minecraft/mekanism/client/TransmitterRenderer.java b/common/mekanism/client/TransmitterRenderer.java similarity index 100% rename from src/minecraft/mekanism/client/TransmitterRenderer.java rename to common/mekanism/client/TransmitterRenderer.java diff --git a/src/minecraft/mekanism/common/BlockBasic.java b/common/mekanism/common/BlockBasic.java similarity index 100% rename from src/minecraft/mekanism/common/BlockBasic.java rename to common/mekanism/common/BlockBasic.java diff --git a/src/minecraft/mekanism/common/BlockBounding.java b/common/mekanism/common/BlockBounding.java similarity index 100% rename from src/minecraft/mekanism/common/BlockBounding.java rename to common/mekanism/common/BlockBounding.java diff --git a/src/minecraft/mekanism/common/BlockEnergyCube.java b/common/mekanism/common/BlockEnergyCube.java similarity index 100% rename from src/minecraft/mekanism/common/BlockEnergyCube.java rename to common/mekanism/common/BlockEnergyCube.java diff --git a/src/minecraft/mekanism/common/BlockGasTank.java b/common/mekanism/common/BlockGasTank.java similarity index 100% rename from src/minecraft/mekanism/common/BlockGasTank.java rename to common/mekanism/common/BlockGasTank.java diff --git a/src/minecraft/mekanism/common/BlockMachine.java b/common/mekanism/common/BlockMachine.java similarity index 100% rename from src/minecraft/mekanism/common/BlockMachine.java rename to common/mekanism/common/BlockMachine.java diff --git a/src/minecraft/mekanism/common/BlockObsidianTNT.java b/common/mekanism/common/BlockObsidianTNT.java similarity index 100% rename from src/minecraft/mekanism/common/BlockObsidianTNT.java rename to common/mekanism/common/BlockObsidianTNT.java diff --git a/src/minecraft/mekanism/common/BlockOre.java b/common/mekanism/common/BlockOre.java similarity index 100% rename from src/minecraft/mekanism/common/BlockOre.java rename to common/mekanism/common/BlockOre.java diff --git a/src/minecraft/mekanism/common/BlockTransmitter.java b/common/mekanism/common/BlockTransmitter.java similarity index 100% rename from src/minecraft/mekanism/common/BlockTransmitter.java rename to common/mekanism/common/BlockTransmitter.java diff --git a/src/minecraft/mekanism/common/CableUtils.java b/common/mekanism/common/CableUtils.java similarity index 100% rename from src/minecraft/mekanism/common/CableUtils.java rename to common/mekanism/common/CableUtils.java diff --git a/src/minecraft/mekanism/common/ChargeUtils.java b/common/mekanism/common/ChargeUtils.java similarity index 100% rename from src/minecraft/mekanism/common/ChargeUtils.java rename to common/mekanism/common/ChargeUtils.java diff --git a/src/minecraft/mekanism/common/CommandMekanism.java b/common/mekanism/common/CommandMekanism.java similarity index 100% rename from src/minecraft/mekanism/common/CommandMekanism.java rename to common/mekanism/common/CommandMekanism.java diff --git a/src/minecraft/mekanism/common/CommonPlayerTickHandler.java b/common/mekanism/common/CommonPlayerTickHandler.java similarity index 100% rename from src/minecraft/mekanism/common/CommonPlayerTickHandler.java rename to common/mekanism/common/CommonPlayerTickHandler.java diff --git a/src/minecraft/mekanism/common/CommonProxy.java b/common/mekanism/common/CommonProxy.java similarity index 100% rename from src/minecraft/mekanism/common/CommonProxy.java rename to common/mekanism/common/CommonProxy.java diff --git a/src/minecraft/mekanism/common/CommonWorldTickHandler.java b/common/mekanism/common/CommonWorldTickHandler.java similarity index 100% rename from src/minecraft/mekanism/common/CommonWorldTickHandler.java rename to common/mekanism/common/CommonWorldTickHandler.java diff --git a/src/minecraft/mekanism/common/ContainerAdvancedElectricMachine.java b/common/mekanism/common/ContainerAdvancedElectricMachine.java similarity index 100% rename from src/minecraft/mekanism/common/ContainerAdvancedElectricMachine.java rename to common/mekanism/common/ContainerAdvancedElectricMachine.java diff --git a/src/minecraft/mekanism/common/ContainerDynamicTank.java b/common/mekanism/common/ContainerDynamicTank.java similarity index 100% rename from src/minecraft/mekanism/common/ContainerDynamicTank.java rename to common/mekanism/common/ContainerDynamicTank.java diff --git a/src/minecraft/mekanism/common/ContainerElectricChest.java b/common/mekanism/common/ContainerElectricChest.java similarity index 100% rename from src/minecraft/mekanism/common/ContainerElectricChest.java rename to common/mekanism/common/ContainerElectricChest.java diff --git a/src/minecraft/mekanism/common/ContainerElectricMachine.java b/common/mekanism/common/ContainerElectricMachine.java similarity index 100% rename from src/minecraft/mekanism/common/ContainerElectricMachine.java rename to common/mekanism/common/ContainerElectricMachine.java diff --git a/src/minecraft/mekanism/common/ContainerElectricPump.java b/common/mekanism/common/ContainerElectricPump.java similarity index 100% rename from src/minecraft/mekanism/common/ContainerElectricPump.java rename to common/mekanism/common/ContainerElectricPump.java diff --git a/src/minecraft/mekanism/common/ContainerEnergyCube.java b/common/mekanism/common/ContainerEnergyCube.java similarity index 100% rename from src/minecraft/mekanism/common/ContainerEnergyCube.java rename to common/mekanism/common/ContainerEnergyCube.java diff --git a/src/minecraft/mekanism/common/ContainerFactory.java b/common/mekanism/common/ContainerFactory.java similarity index 100% rename from src/minecraft/mekanism/common/ContainerFactory.java rename to common/mekanism/common/ContainerFactory.java diff --git a/src/minecraft/mekanism/common/ContainerGasTank.java b/common/mekanism/common/ContainerGasTank.java similarity index 100% rename from src/minecraft/mekanism/common/ContainerGasTank.java rename to common/mekanism/common/ContainerGasTank.java diff --git a/src/minecraft/mekanism/common/ContainerMetallurgicInfuser.java b/common/mekanism/common/ContainerMetallurgicInfuser.java similarity index 100% rename from src/minecraft/mekanism/common/ContainerMetallurgicInfuser.java rename to common/mekanism/common/ContainerMetallurgicInfuser.java diff --git a/src/minecraft/mekanism/common/ContainerRobitCrafting.java b/common/mekanism/common/ContainerRobitCrafting.java similarity index 100% rename from src/minecraft/mekanism/common/ContainerRobitCrafting.java rename to common/mekanism/common/ContainerRobitCrafting.java diff --git a/src/minecraft/mekanism/common/ContainerRobitInventory.java b/common/mekanism/common/ContainerRobitInventory.java similarity index 100% rename from src/minecraft/mekanism/common/ContainerRobitInventory.java rename to common/mekanism/common/ContainerRobitInventory.java diff --git a/src/minecraft/mekanism/common/ContainerRobitMain.java b/common/mekanism/common/ContainerRobitMain.java similarity index 100% rename from src/minecraft/mekanism/common/ContainerRobitMain.java rename to common/mekanism/common/ContainerRobitMain.java diff --git a/src/minecraft/mekanism/common/ContainerRobitRepair.java b/common/mekanism/common/ContainerRobitRepair.java similarity index 100% rename from src/minecraft/mekanism/common/ContainerRobitRepair.java rename to common/mekanism/common/ContainerRobitRepair.java diff --git a/src/minecraft/mekanism/common/ContainerRobitSmelting.java b/common/mekanism/common/ContainerRobitSmelting.java similarity index 100% rename from src/minecraft/mekanism/common/ContainerRobitSmelting.java rename to common/mekanism/common/ContainerRobitSmelting.java diff --git a/src/minecraft/mekanism/common/ContainerTeleporter.java b/common/mekanism/common/ContainerTeleporter.java similarity index 100% rename from src/minecraft/mekanism/common/ContainerTeleporter.java rename to common/mekanism/common/ContainerTeleporter.java diff --git a/src/minecraft/mekanism/common/CoreGuiHandler.java b/common/mekanism/common/CoreGuiHandler.java similarity index 100% rename from src/minecraft/mekanism/common/CoreGuiHandler.java rename to common/mekanism/common/CoreGuiHandler.java diff --git a/src/minecraft/mekanism/common/CreativeTabMekanism.java b/common/mekanism/common/CreativeTabMekanism.java similarity index 100% rename from src/minecraft/mekanism/common/CreativeTabMekanism.java rename to common/mekanism/common/CreativeTabMekanism.java diff --git a/src/minecraft/mekanism/common/DynamicLiquidTank.java b/common/mekanism/common/DynamicLiquidTank.java similarity index 100% rename from src/minecraft/mekanism/common/DynamicLiquidTank.java rename to common/mekanism/common/DynamicLiquidTank.java diff --git a/src/minecraft/mekanism/common/DynamicTankCache.java b/common/mekanism/common/DynamicTankCache.java similarity index 100% rename from src/minecraft/mekanism/common/DynamicTankCache.java rename to common/mekanism/common/DynamicTankCache.java diff --git a/src/minecraft/mekanism/common/EnergyNetwork.java b/common/mekanism/common/EnergyNetwork.java similarity index 100% rename from src/minecraft/mekanism/common/EnergyNetwork.java rename to common/mekanism/common/EnergyNetwork.java diff --git a/src/minecraft/mekanism/common/EntityObsidianTNT.java b/common/mekanism/common/EntityObsidianTNT.java similarity index 100% rename from src/minecraft/mekanism/common/EntityObsidianTNT.java rename to common/mekanism/common/EntityObsidianTNT.java diff --git a/src/minecraft/mekanism/common/EntityRobit.java b/common/mekanism/common/EntityRobit.java similarity index 100% rename from src/minecraft/mekanism/common/EntityRobit.java rename to common/mekanism/common/EntityRobit.java diff --git a/src/minecraft/mekanism/common/IActiveState.java b/common/mekanism/common/IActiveState.java similarity index 100% rename from src/minecraft/mekanism/common/IActiveState.java rename to common/mekanism/common/IActiveState.java diff --git a/src/minecraft/mekanism/common/IBoundingBlock.java b/common/mekanism/common/IBoundingBlock.java similarity index 100% rename from src/minecraft/mekanism/common/IBoundingBlock.java rename to common/mekanism/common/IBoundingBlock.java diff --git a/src/minecraft/mekanism/common/IC2EnergyHandler.java b/common/mekanism/common/IC2EnergyHandler.java similarity index 100% rename from src/minecraft/mekanism/common/IC2EnergyHandler.java rename to common/mekanism/common/IC2EnergyHandler.java diff --git a/src/minecraft/mekanism/common/IElectricChest.java b/common/mekanism/common/IElectricChest.java similarity index 100% rename from src/minecraft/mekanism/common/IElectricChest.java rename to common/mekanism/common/IElectricChest.java diff --git a/src/minecraft/mekanism/common/IElectricMachine.java b/common/mekanism/common/IElectricMachine.java similarity index 100% rename from src/minecraft/mekanism/common/IElectricMachine.java rename to common/mekanism/common/IElectricMachine.java diff --git a/src/minecraft/mekanism/common/IEnergyCube.java b/common/mekanism/common/IEnergyCube.java similarity index 100% rename from src/minecraft/mekanism/common/IEnergyCube.java rename to common/mekanism/common/IEnergyCube.java diff --git a/src/minecraft/mekanism/common/IFactory.java b/common/mekanism/common/IFactory.java similarity index 100% rename from src/minecraft/mekanism/common/IFactory.java rename to common/mekanism/common/IFactory.java diff --git a/src/minecraft/mekanism/common/IMechanicalPipe.java b/common/mekanism/common/IMechanicalPipe.java similarity index 100% rename from src/minecraft/mekanism/common/IMechanicalPipe.java rename to common/mekanism/common/IMechanicalPipe.java diff --git a/src/minecraft/mekanism/common/IModule.java b/common/mekanism/common/IModule.java similarity index 100% rename from src/minecraft/mekanism/common/IModule.java rename to common/mekanism/common/IModule.java diff --git a/src/minecraft/mekanism/common/ISpecialBounds.java b/common/mekanism/common/ISpecialBounds.java similarity index 100% rename from src/minecraft/mekanism/common/ISpecialBounds.java rename to common/mekanism/common/ISpecialBounds.java diff --git a/src/minecraft/mekanism/common/ISustainedInventory.java b/common/mekanism/common/ISustainedInventory.java similarity index 100% rename from src/minecraft/mekanism/common/ISustainedInventory.java rename to common/mekanism/common/ISustainedInventory.java diff --git a/src/minecraft/mekanism/common/ISustainedTank.java b/common/mekanism/common/ISustainedTank.java similarity index 100% rename from src/minecraft/mekanism/common/ISustainedTank.java rename to common/mekanism/common/ISustainedTank.java diff --git a/src/minecraft/mekanism/common/ITileNetwork.java b/common/mekanism/common/ITileNetwork.java similarity index 100% rename from src/minecraft/mekanism/common/ITileNetwork.java rename to common/mekanism/common/ITileNetwork.java diff --git a/src/minecraft/mekanism/common/IUniversalCable.java b/common/mekanism/common/IUniversalCable.java similarity index 100% rename from src/minecraft/mekanism/common/IUniversalCable.java rename to common/mekanism/common/IUniversalCable.java diff --git a/src/minecraft/mekanism/common/InventoryElectricChest.java b/common/mekanism/common/InventoryElectricChest.java similarity index 100% rename from src/minecraft/mekanism/common/InventoryElectricChest.java rename to common/mekanism/common/InventoryElectricChest.java diff --git a/src/minecraft/mekanism/common/ItemAtomicDisassembler.java b/common/mekanism/common/ItemAtomicDisassembler.java similarity index 100% rename from src/minecraft/mekanism/common/ItemAtomicDisassembler.java rename to common/mekanism/common/ItemAtomicDisassembler.java diff --git a/src/minecraft/mekanism/common/ItemBlockBasic.java b/common/mekanism/common/ItemBlockBasic.java similarity index 100% rename from src/minecraft/mekanism/common/ItemBlockBasic.java rename to common/mekanism/common/ItemBlockBasic.java diff --git a/src/minecraft/mekanism/common/ItemBlockEnergyCube.java b/common/mekanism/common/ItemBlockEnergyCube.java similarity index 100% rename from src/minecraft/mekanism/common/ItemBlockEnergyCube.java rename to common/mekanism/common/ItemBlockEnergyCube.java diff --git a/src/minecraft/mekanism/common/ItemBlockMachine.java b/common/mekanism/common/ItemBlockMachine.java similarity index 100% rename from src/minecraft/mekanism/common/ItemBlockMachine.java rename to common/mekanism/common/ItemBlockMachine.java diff --git a/src/minecraft/mekanism/common/ItemBlockOre.java b/common/mekanism/common/ItemBlockOre.java similarity index 100% rename from src/minecraft/mekanism/common/ItemBlockOre.java rename to common/mekanism/common/ItemBlockOre.java diff --git a/src/minecraft/mekanism/common/ItemBlockTransmitter.java b/common/mekanism/common/ItemBlockTransmitter.java similarity index 100% rename from src/minecraft/mekanism/common/ItemBlockTransmitter.java rename to common/mekanism/common/ItemBlockTransmitter.java diff --git a/src/minecraft/mekanism/common/ItemClump.java b/common/mekanism/common/ItemClump.java similarity index 100% rename from src/minecraft/mekanism/common/ItemClump.java rename to common/mekanism/common/ItemClump.java diff --git a/src/minecraft/mekanism/common/ItemConfigurator.java b/common/mekanism/common/ItemConfigurator.java similarity index 100% rename from src/minecraft/mekanism/common/ItemConfigurator.java rename to common/mekanism/common/ItemConfigurator.java diff --git a/src/minecraft/mekanism/common/ItemDirtyDust.java b/common/mekanism/common/ItemDirtyDust.java similarity index 100% rename from src/minecraft/mekanism/common/ItemDirtyDust.java rename to common/mekanism/common/ItemDirtyDust.java diff --git a/src/minecraft/mekanism/common/ItemDust.java b/common/mekanism/common/ItemDust.java similarity index 100% rename from src/minecraft/mekanism/common/ItemDust.java rename to common/mekanism/common/ItemDust.java diff --git a/src/minecraft/mekanism/common/ItemElectricBow.java b/common/mekanism/common/ItemElectricBow.java similarity index 100% rename from src/minecraft/mekanism/common/ItemElectricBow.java rename to common/mekanism/common/ItemElectricBow.java diff --git a/src/minecraft/mekanism/common/ItemEnergized.java b/common/mekanism/common/ItemEnergized.java similarity index 100% rename from src/minecraft/mekanism/common/ItemEnergized.java rename to common/mekanism/common/ItemEnergized.java diff --git a/src/minecraft/mekanism/common/ItemIngot.java b/common/mekanism/common/ItemIngot.java similarity index 100% rename from src/minecraft/mekanism/common/ItemIngot.java rename to common/mekanism/common/ItemIngot.java diff --git a/src/minecraft/mekanism/common/ItemMachineUpgrade.java b/common/mekanism/common/ItemMachineUpgrade.java similarity index 100% rename from src/minecraft/mekanism/common/ItemMachineUpgrade.java rename to common/mekanism/common/ItemMachineUpgrade.java diff --git a/src/minecraft/mekanism/common/ItemMekanism.java b/common/mekanism/common/ItemMekanism.java similarity index 100% rename from src/minecraft/mekanism/common/ItemMekanism.java rename to common/mekanism/common/ItemMekanism.java diff --git a/src/minecraft/mekanism/common/ItemPortableTeleporter.java b/common/mekanism/common/ItemPortableTeleporter.java similarity index 100% rename from src/minecraft/mekanism/common/ItemPortableTeleporter.java rename to common/mekanism/common/ItemPortableTeleporter.java diff --git a/src/minecraft/mekanism/common/ItemRobit.java b/common/mekanism/common/ItemRobit.java similarity index 100% rename from src/minecraft/mekanism/common/ItemRobit.java rename to common/mekanism/common/ItemRobit.java diff --git a/src/minecraft/mekanism/common/ItemStopwatch.java b/common/mekanism/common/ItemStopwatch.java similarity index 100% rename from src/minecraft/mekanism/common/ItemStopwatch.java rename to common/mekanism/common/ItemStopwatch.java diff --git a/src/minecraft/mekanism/common/ItemStorageTank.java b/common/mekanism/common/ItemStorageTank.java similarity index 100% rename from src/minecraft/mekanism/common/ItemStorageTank.java rename to common/mekanism/common/ItemStorageTank.java diff --git a/src/minecraft/mekanism/common/ItemWeatherOrb.java b/common/mekanism/common/ItemWeatherOrb.java similarity index 100% rename from src/minecraft/mekanism/common/ItemWeatherOrb.java rename to common/mekanism/common/ItemWeatherOrb.java diff --git a/src/minecraft/mekanism/common/LinkedPowerProvider.java b/common/mekanism/common/LinkedPowerProvider.java similarity index 100% rename from src/minecraft/mekanism/common/LinkedPowerProvider.java rename to common/mekanism/common/LinkedPowerProvider.java diff --git a/src/minecraft/mekanism/common/LiquidNetwork.java b/common/mekanism/common/LiquidNetwork.java similarity index 100% rename from src/minecraft/mekanism/common/LiquidNetwork.java rename to common/mekanism/common/LiquidNetwork.java diff --git a/src/minecraft/mekanism/common/LiquidSlot.java b/common/mekanism/common/LiquidSlot.java similarity index 100% rename from src/minecraft/mekanism/common/LiquidSlot.java rename to common/mekanism/common/LiquidSlot.java diff --git a/src/minecraft/mekanism/common/Mekanism.java b/common/mekanism/common/Mekanism.java similarity index 100% rename from src/minecraft/mekanism/common/Mekanism.java rename to common/mekanism/common/Mekanism.java diff --git a/src/minecraft/mekanism/common/MekanismHooks.java b/common/mekanism/common/MekanismHooks.java similarity index 100% rename from src/minecraft/mekanism/common/MekanismHooks.java rename to common/mekanism/common/MekanismHooks.java diff --git a/src/minecraft/mekanism/common/MekanismRecipe.java b/common/mekanism/common/MekanismRecipe.java similarity index 100% rename from src/minecraft/mekanism/common/MekanismRecipe.java rename to common/mekanism/common/MekanismRecipe.java diff --git a/src/minecraft/mekanism/common/MekanismUtils.java b/common/mekanism/common/MekanismUtils.java similarity index 100% rename from src/minecraft/mekanism/common/MekanismUtils.java rename to common/mekanism/common/MekanismUtils.java diff --git a/src/minecraft/mekanism/common/OreHandler.java b/common/mekanism/common/OreHandler.java similarity index 100% rename from src/minecraft/mekanism/common/OreHandler.java rename to common/mekanism/common/OreHandler.java diff --git a/src/minecraft/mekanism/common/PacketHandler.java b/common/mekanism/common/PacketHandler.java similarity index 100% rename from src/minecraft/mekanism/common/PacketHandler.java rename to common/mekanism/common/PacketHandler.java diff --git a/src/minecraft/mekanism/common/PipeUtils.java b/common/mekanism/common/PipeUtils.java similarity index 100% rename from src/minecraft/mekanism/common/PipeUtils.java rename to common/mekanism/common/PipeUtils.java diff --git a/src/minecraft/mekanism/common/RecipeHandler.java b/common/mekanism/common/RecipeHandler.java similarity index 100% rename from src/minecraft/mekanism/common/RecipeHandler.java rename to common/mekanism/common/RecipeHandler.java diff --git a/src/minecraft/mekanism/common/RobitAIFollow.java b/common/mekanism/common/RobitAIFollow.java similarity index 100% rename from src/minecraft/mekanism/common/RobitAIFollow.java rename to common/mekanism/common/RobitAIFollow.java diff --git a/src/minecraft/mekanism/common/SlotElectricChest.java b/common/mekanism/common/SlotElectricChest.java similarity index 100% rename from src/minecraft/mekanism/common/SlotElectricChest.java rename to common/mekanism/common/SlotElectricChest.java diff --git a/src/minecraft/mekanism/common/SlotEnergy.java b/common/mekanism/common/SlotEnergy.java similarity index 100% rename from src/minecraft/mekanism/common/SlotEnergy.java rename to common/mekanism/common/SlotEnergy.java diff --git a/src/minecraft/mekanism/common/SlotMachineUpgrade.java b/common/mekanism/common/SlotMachineUpgrade.java similarity index 100% rename from src/minecraft/mekanism/common/SlotMachineUpgrade.java rename to common/mekanism/common/SlotMachineUpgrade.java diff --git a/src/minecraft/mekanism/common/SlotOutput.java b/common/mekanism/common/SlotOutput.java similarity index 100% rename from src/minecraft/mekanism/common/SlotOutput.java rename to common/mekanism/common/SlotOutput.java diff --git a/src/minecraft/mekanism/common/SlotStorageTank.java b/common/mekanism/common/SlotStorageTank.java similarity index 100% rename from src/minecraft/mekanism/common/SlotStorageTank.java rename to common/mekanism/common/SlotStorageTank.java diff --git a/src/minecraft/mekanism/common/SynchronizedTankData.java b/common/mekanism/common/SynchronizedTankData.java similarity index 100% rename from src/minecraft/mekanism/common/SynchronizedTankData.java rename to common/mekanism/common/SynchronizedTankData.java diff --git a/src/minecraft/mekanism/common/TankUpdateProtocol.java b/common/mekanism/common/TankUpdateProtocol.java similarity index 100% rename from src/minecraft/mekanism/common/TankUpdateProtocol.java rename to common/mekanism/common/TankUpdateProtocol.java diff --git a/src/minecraft/mekanism/common/Teleporter.java b/common/mekanism/common/Teleporter.java similarity index 100% rename from src/minecraft/mekanism/common/Teleporter.java rename to common/mekanism/common/Teleporter.java diff --git a/src/minecraft/mekanism/common/ThreadGetData.java b/common/mekanism/common/ThreadGetData.java similarity index 100% rename from src/minecraft/mekanism/common/ThreadGetData.java rename to common/mekanism/common/ThreadGetData.java diff --git a/src/minecraft/mekanism/common/Tier.java b/common/mekanism/common/Tier.java similarity index 100% rename from src/minecraft/mekanism/common/Tier.java rename to common/mekanism/common/Tier.java diff --git a/src/minecraft/mekanism/common/TileEntityAdvancedElectricMachine.java b/common/mekanism/common/TileEntityAdvancedElectricMachine.java similarity index 100% rename from src/minecraft/mekanism/common/TileEntityAdvancedElectricMachine.java rename to common/mekanism/common/TileEntityAdvancedElectricMachine.java diff --git a/src/minecraft/mekanism/common/TileEntityAdvancedFactory.java b/common/mekanism/common/TileEntityAdvancedFactory.java similarity index 100% rename from src/minecraft/mekanism/common/TileEntityAdvancedFactory.java rename to common/mekanism/common/TileEntityAdvancedFactory.java diff --git a/src/minecraft/mekanism/common/TileEntityBasicBlock.java b/common/mekanism/common/TileEntityBasicBlock.java similarity index 100% rename from src/minecraft/mekanism/common/TileEntityBasicBlock.java rename to common/mekanism/common/TileEntityBasicBlock.java diff --git a/src/minecraft/mekanism/common/TileEntityBasicMachine.java b/common/mekanism/common/TileEntityBasicMachine.java similarity index 100% rename from src/minecraft/mekanism/common/TileEntityBasicMachine.java rename to common/mekanism/common/TileEntityBasicMachine.java diff --git a/src/minecraft/mekanism/common/TileEntityBoundingBlock.java b/common/mekanism/common/TileEntityBoundingBlock.java similarity index 100% rename from src/minecraft/mekanism/common/TileEntityBoundingBlock.java rename to common/mekanism/common/TileEntityBoundingBlock.java diff --git a/src/minecraft/mekanism/common/TileEntityChargepad.java b/common/mekanism/common/TileEntityChargepad.java similarity index 100% rename from src/minecraft/mekanism/common/TileEntityChargepad.java rename to common/mekanism/common/TileEntityChargepad.java diff --git a/src/minecraft/mekanism/common/TileEntityCombiner.java b/common/mekanism/common/TileEntityCombiner.java similarity index 100% rename from src/minecraft/mekanism/common/TileEntityCombiner.java rename to common/mekanism/common/TileEntityCombiner.java diff --git a/src/minecraft/mekanism/common/TileEntityContainerBlock.java b/common/mekanism/common/TileEntityContainerBlock.java similarity index 100% rename from src/minecraft/mekanism/common/TileEntityContainerBlock.java rename to common/mekanism/common/TileEntityContainerBlock.java diff --git a/src/minecraft/mekanism/common/TileEntityControlPanel.java b/common/mekanism/common/TileEntityControlPanel.java similarity index 100% rename from src/minecraft/mekanism/common/TileEntityControlPanel.java rename to common/mekanism/common/TileEntityControlPanel.java diff --git a/src/minecraft/mekanism/common/TileEntityCrusher.java b/common/mekanism/common/TileEntityCrusher.java similarity index 100% rename from src/minecraft/mekanism/common/TileEntityCrusher.java rename to common/mekanism/common/TileEntityCrusher.java diff --git a/src/minecraft/mekanism/common/TileEntityDynamicTank.java b/common/mekanism/common/TileEntityDynamicTank.java similarity index 100% rename from src/minecraft/mekanism/common/TileEntityDynamicTank.java rename to common/mekanism/common/TileEntityDynamicTank.java diff --git a/src/minecraft/mekanism/common/TileEntityDynamicValve.java b/common/mekanism/common/TileEntityDynamicValve.java similarity index 100% rename from src/minecraft/mekanism/common/TileEntityDynamicValve.java rename to common/mekanism/common/TileEntityDynamicValve.java diff --git a/src/minecraft/mekanism/common/TileEntityElectricBlock.java b/common/mekanism/common/TileEntityElectricBlock.java similarity index 100% rename from src/minecraft/mekanism/common/TileEntityElectricBlock.java rename to common/mekanism/common/TileEntityElectricBlock.java diff --git a/src/minecraft/mekanism/common/TileEntityElectricChest.java b/common/mekanism/common/TileEntityElectricChest.java similarity index 100% rename from src/minecraft/mekanism/common/TileEntityElectricChest.java rename to common/mekanism/common/TileEntityElectricChest.java diff --git a/src/minecraft/mekanism/common/TileEntityElectricMachine.java b/common/mekanism/common/TileEntityElectricMachine.java similarity index 100% rename from src/minecraft/mekanism/common/TileEntityElectricMachine.java rename to common/mekanism/common/TileEntityElectricMachine.java diff --git a/src/minecraft/mekanism/common/TileEntityElectricPump.java b/common/mekanism/common/TileEntityElectricPump.java similarity index 100% rename from src/minecraft/mekanism/common/TileEntityElectricPump.java rename to common/mekanism/common/TileEntityElectricPump.java diff --git a/src/minecraft/mekanism/common/TileEntityEliteFactory.java b/common/mekanism/common/TileEntityEliteFactory.java similarity index 100% rename from src/minecraft/mekanism/common/TileEntityEliteFactory.java rename to common/mekanism/common/TileEntityEliteFactory.java diff --git a/src/minecraft/mekanism/common/TileEntityEnergizedSmelter.java b/common/mekanism/common/TileEntityEnergizedSmelter.java similarity index 100% rename from src/minecraft/mekanism/common/TileEntityEnergizedSmelter.java rename to common/mekanism/common/TileEntityEnergizedSmelter.java diff --git a/src/minecraft/mekanism/common/TileEntityEnergyCube.java b/common/mekanism/common/TileEntityEnergyCube.java similarity index 100% rename from src/minecraft/mekanism/common/TileEntityEnergyCube.java rename to common/mekanism/common/TileEntityEnergyCube.java diff --git a/src/minecraft/mekanism/common/TileEntityEnrichmentChamber.java b/common/mekanism/common/TileEntityEnrichmentChamber.java similarity index 100% rename from src/minecraft/mekanism/common/TileEntityEnrichmentChamber.java rename to common/mekanism/common/TileEntityEnrichmentChamber.java diff --git a/src/minecraft/mekanism/common/TileEntityFactory.java b/common/mekanism/common/TileEntityFactory.java similarity index 100% rename from src/minecraft/mekanism/common/TileEntityFactory.java rename to common/mekanism/common/TileEntityFactory.java diff --git a/src/minecraft/mekanism/common/TileEntityGasTank.java b/common/mekanism/common/TileEntityGasTank.java similarity index 100% rename from src/minecraft/mekanism/common/TileEntityGasTank.java rename to common/mekanism/common/TileEntityGasTank.java diff --git a/src/minecraft/mekanism/common/TileEntityMechanicalPipe.java b/common/mekanism/common/TileEntityMechanicalPipe.java similarity index 100% rename from src/minecraft/mekanism/common/TileEntityMechanicalPipe.java rename to common/mekanism/common/TileEntityMechanicalPipe.java diff --git a/src/minecraft/mekanism/common/TileEntityMetallurgicInfuser.java b/common/mekanism/common/TileEntityMetallurgicInfuser.java similarity index 100% rename from src/minecraft/mekanism/common/TileEntityMetallurgicInfuser.java rename to common/mekanism/common/TileEntityMetallurgicInfuser.java diff --git a/src/minecraft/mekanism/common/TileEntityOsmiumCompressor.java b/common/mekanism/common/TileEntityOsmiumCompressor.java similarity index 100% rename from src/minecraft/mekanism/common/TileEntityOsmiumCompressor.java rename to common/mekanism/common/TileEntityOsmiumCompressor.java diff --git a/src/minecraft/mekanism/common/TileEntityPressurizedTube.java b/common/mekanism/common/TileEntityPressurizedTube.java similarity index 64% rename from src/minecraft/mekanism/common/TileEntityPressurizedTube.java rename to common/mekanism/common/TileEntityPressurizedTube.java index 28c187d4c..bba9dfe11 100644 --- a/src/minecraft/mekanism/common/TileEntityPressurizedTube.java +++ b/common/mekanism/common/TileEntityPressurizedTube.java @@ -68,35 +68,26 @@ public class TileEntityPressurizedTube extends TileEntity implements IPressurize @Override public void refreshNetwork() { - if (!worldObj.isRemote) - { - if (canTransferGas()) - { - for (ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) - { - TileEntity tileEntity = Object3D.get(this).getFromSide(side).getTileEntity(worldObj); - - if (tileEntity instanceof IPressurizedTube) - { - if (((IPressurizedTube)tileEntity).canTransferGasToTube(this) && this.canTransferGasToTube(tileEntity)) - { - this.getNetwork().merge(((IPressurizedTube)tileEntity).getNetwork()); - } - else - { - ((IPressurizedTube) tileEntity).getNetwork().split(this); - this.getNetwork().split(((IPressurizedTube) tileEntity)); - } - } - } - - this.getNetwork().refresh(); - } - else - { - this.getNetwork().split(this); - } - } + if(!worldObj.isRemote) + { + if(canTransferGas()) + { + for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) + { + TileEntity tileEntity = Object3D.get(this).getFromSide(side).getTileEntity(worldObj); + + if(tileEntity instanceof IPressurizedTube && ((IPressurizedTube)tileEntity).canTransferGas()) + { + getNetwork().merge(((IPressurizedTube)tileEntity).getNetwork()); + } + } + + getNetwork().refresh(); + } + else { + getNetwork().split(this); + } + } } @Override diff --git a/src/minecraft/mekanism/common/TileEntityPurificationChamber.java b/common/mekanism/common/TileEntityPurificationChamber.java similarity index 100% rename from src/minecraft/mekanism/common/TileEntityPurificationChamber.java rename to common/mekanism/common/TileEntityPurificationChamber.java diff --git a/src/minecraft/mekanism/common/TileEntityTeleporter.java b/common/mekanism/common/TileEntityTeleporter.java similarity index 100% rename from src/minecraft/mekanism/common/TileEntityTeleporter.java rename to common/mekanism/common/TileEntityTeleporter.java diff --git a/src/minecraft/mekanism/common/TileEntityTheoreticalElementizer.java b/common/mekanism/common/TileEntityTheoreticalElementizer.java similarity index 100% rename from src/minecraft/mekanism/common/TileEntityTheoreticalElementizer.java rename to common/mekanism/common/TileEntityTheoreticalElementizer.java diff --git a/src/minecraft/mekanism/common/TileEntityUniversalCable.java b/common/mekanism/common/TileEntityUniversalCable.java similarity index 100% rename from src/minecraft/mekanism/common/TileEntityUniversalCable.java rename to common/mekanism/common/TileEntityUniversalCable.java diff --git a/src/minecraft/mekanism/common/Version.java b/common/mekanism/common/Version.java similarity index 100% rename from src/minecraft/mekanism/common/Version.java rename to common/mekanism/common/Version.java diff --git a/src/minecraft/mekanism/common/network/IMekanismPacket.java b/common/mekanism/common/network/IMekanismPacket.java similarity index 100% rename from src/minecraft/mekanism/common/network/IMekanismPacket.java rename to common/mekanism/common/network/IMekanismPacket.java diff --git a/src/minecraft/mekanism/common/network/PacketConfiguratorState.java b/common/mekanism/common/network/PacketConfiguratorState.java similarity index 100% rename from src/minecraft/mekanism/common/network/PacketConfiguratorState.java rename to common/mekanism/common/network/PacketConfiguratorState.java diff --git a/src/minecraft/mekanism/common/network/PacketControlPanel.java b/common/mekanism/common/network/PacketControlPanel.java similarity index 100% rename from src/minecraft/mekanism/common/network/PacketControlPanel.java rename to common/mekanism/common/network/PacketControlPanel.java diff --git a/src/minecraft/mekanism/common/network/PacketDataRequest.java b/common/mekanism/common/network/PacketDataRequest.java similarity index 100% rename from src/minecraft/mekanism/common/network/PacketDataRequest.java rename to common/mekanism/common/network/PacketDataRequest.java diff --git a/src/minecraft/mekanism/common/network/PacketDigitUpdate.java b/common/mekanism/common/network/PacketDigitUpdate.java similarity index 100% rename from src/minecraft/mekanism/common/network/PacketDigitUpdate.java rename to common/mekanism/common/network/PacketDigitUpdate.java diff --git a/src/minecraft/mekanism/common/network/PacketElectricBowState.java b/common/mekanism/common/network/PacketElectricBowState.java similarity index 100% rename from src/minecraft/mekanism/common/network/PacketElectricBowState.java rename to common/mekanism/common/network/PacketElectricBowState.java diff --git a/src/minecraft/mekanism/common/network/PacketElectricChest.java b/common/mekanism/common/network/PacketElectricChest.java similarity index 100% rename from src/minecraft/mekanism/common/network/PacketElectricChest.java rename to common/mekanism/common/network/PacketElectricChest.java diff --git a/src/minecraft/mekanism/common/network/PacketPortableTeleport.java b/common/mekanism/common/network/PacketPortableTeleport.java similarity index 100% rename from src/minecraft/mekanism/common/network/PacketPortableTeleport.java rename to common/mekanism/common/network/PacketPortableTeleport.java diff --git a/src/minecraft/mekanism/common/network/PacketPortalFX.java b/common/mekanism/common/network/PacketPortalFX.java similarity index 100% rename from src/minecraft/mekanism/common/network/PacketPortalFX.java rename to common/mekanism/common/network/PacketPortalFX.java diff --git a/src/minecraft/mekanism/common/network/PacketRobit.java b/common/mekanism/common/network/PacketRobit.java similarity index 100% rename from src/minecraft/mekanism/common/network/PacketRobit.java rename to common/mekanism/common/network/PacketRobit.java diff --git a/src/minecraft/mekanism/common/network/PacketStatusUpdate.java b/common/mekanism/common/network/PacketStatusUpdate.java similarity index 100% rename from src/minecraft/mekanism/common/network/PacketStatusUpdate.java rename to common/mekanism/common/network/PacketStatusUpdate.java diff --git a/src/minecraft/mekanism/common/network/PacketTileEntity.java b/common/mekanism/common/network/PacketTileEntity.java similarity index 100% rename from src/minecraft/mekanism/common/network/PacketTileEntity.java rename to common/mekanism/common/network/PacketTileEntity.java diff --git a/src/minecraft/mekanism/common/network/PacketTime.java b/common/mekanism/common/network/PacketTime.java similarity index 100% rename from src/minecraft/mekanism/common/network/PacketTime.java rename to common/mekanism/common/network/PacketTime.java diff --git a/src/minecraft/mekanism/common/network/PacketTransmitterTransferUpdate.java b/common/mekanism/common/network/PacketTransmitterTransferUpdate.java similarity index 100% rename from src/minecraft/mekanism/common/network/PacketTransmitterTransferUpdate.java rename to common/mekanism/common/network/PacketTransmitterTransferUpdate.java diff --git a/src/minecraft/mekanism/common/network/PacketWeather.java b/common/mekanism/common/network/PacketWeather.java similarity index 100% rename from src/minecraft/mekanism/common/network/PacketWeather.java rename to common/mekanism/common/network/PacketWeather.java diff --git a/src/minecraft/mekanism/generators/client/BlockRenderingHandler.java b/common/mekanism/generators/client/BlockRenderingHandler.java similarity index 100% rename from src/minecraft/mekanism/generators/client/BlockRenderingHandler.java rename to common/mekanism/generators/client/BlockRenderingHandler.java diff --git a/src/minecraft/mekanism/generators/client/GeneratorsClientProxy.java b/common/mekanism/generators/client/GeneratorsClientProxy.java similarity index 100% rename from src/minecraft/mekanism/generators/client/GeneratorsClientProxy.java rename to common/mekanism/generators/client/GeneratorsClientProxy.java diff --git a/src/minecraft/mekanism/generators/client/GuiBioGenerator.java b/common/mekanism/generators/client/GuiBioGenerator.java similarity index 100% rename from src/minecraft/mekanism/generators/client/GuiBioGenerator.java rename to common/mekanism/generators/client/GuiBioGenerator.java diff --git a/src/minecraft/mekanism/generators/client/GuiElectrolyticSeparator.java b/common/mekanism/generators/client/GuiElectrolyticSeparator.java similarity index 100% rename from src/minecraft/mekanism/generators/client/GuiElectrolyticSeparator.java rename to common/mekanism/generators/client/GuiElectrolyticSeparator.java diff --git a/src/minecraft/mekanism/generators/client/GuiHeatGenerator.java b/common/mekanism/generators/client/GuiHeatGenerator.java similarity index 100% rename from src/minecraft/mekanism/generators/client/GuiHeatGenerator.java rename to common/mekanism/generators/client/GuiHeatGenerator.java diff --git a/src/minecraft/mekanism/generators/client/GuiHydrogenGenerator.java b/common/mekanism/generators/client/GuiHydrogenGenerator.java similarity index 100% rename from src/minecraft/mekanism/generators/client/GuiHydrogenGenerator.java rename to common/mekanism/generators/client/GuiHydrogenGenerator.java diff --git a/src/minecraft/mekanism/generators/client/GuiSolarGenerator.java b/common/mekanism/generators/client/GuiSolarGenerator.java similarity index 100% rename from src/minecraft/mekanism/generators/client/GuiSolarGenerator.java rename to common/mekanism/generators/client/GuiSolarGenerator.java diff --git a/src/minecraft/mekanism/generators/client/GuiWindTurbine.java b/common/mekanism/generators/client/GuiWindTurbine.java similarity index 100% rename from src/minecraft/mekanism/generators/client/GuiWindTurbine.java rename to common/mekanism/generators/client/GuiWindTurbine.java diff --git a/src/minecraft/mekanism/generators/client/ModelAdvancedSolarGenerator.java b/common/mekanism/generators/client/ModelAdvancedSolarGenerator.java similarity index 100% rename from src/minecraft/mekanism/generators/client/ModelAdvancedSolarGenerator.java rename to common/mekanism/generators/client/ModelAdvancedSolarGenerator.java diff --git a/src/minecraft/mekanism/generators/client/ModelBioGenerator.java b/common/mekanism/generators/client/ModelBioGenerator.java similarity index 100% rename from src/minecraft/mekanism/generators/client/ModelBioGenerator.java rename to common/mekanism/generators/client/ModelBioGenerator.java diff --git a/src/minecraft/mekanism/generators/client/ModelElectrolyticSeparator.java b/common/mekanism/generators/client/ModelElectrolyticSeparator.java similarity index 100% rename from src/minecraft/mekanism/generators/client/ModelElectrolyticSeparator.java rename to common/mekanism/generators/client/ModelElectrolyticSeparator.java diff --git a/src/minecraft/mekanism/generators/client/ModelHeatGenerator.java b/common/mekanism/generators/client/ModelHeatGenerator.java similarity index 100% rename from src/minecraft/mekanism/generators/client/ModelHeatGenerator.java rename to common/mekanism/generators/client/ModelHeatGenerator.java diff --git a/src/minecraft/mekanism/generators/client/ModelHydrogenGenerator.java b/common/mekanism/generators/client/ModelHydrogenGenerator.java similarity index 100% rename from src/minecraft/mekanism/generators/client/ModelHydrogenGenerator.java rename to common/mekanism/generators/client/ModelHydrogenGenerator.java diff --git a/src/minecraft/mekanism/generators/client/ModelWindTurbine.java b/common/mekanism/generators/client/ModelWindTurbine.java similarity index 100% rename from src/minecraft/mekanism/generators/client/ModelWindTurbine.java rename to common/mekanism/generators/client/ModelWindTurbine.java diff --git a/src/minecraft/mekanism/generators/client/RenderAdvancedSolarGenerator.java b/common/mekanism/generators/client/RenderAdvancedSolarGenerator.java similarity index 100% rename from src/minecraft/mekanism/generators/client/RenderAdvancedSolarGenerator.java rename to common/mekanism/generators/client/RenderAdvancedSolarGenerator.java diff --git a/src/minecraft/mekanism/generators/client/RenderBioGenerator.java b/common/mekanism/generators/client/RenderBioGenerator.java similarity index 100% rename from src/minecraft/mekanism/generators/client/RenderBioGenerator.java rename to common/mekanism/generators/client/RenderBioGenerator.java diff --git a/src/minecraft/mekanism/generators/client/RenderElectrolyticSeparator.java b/common/mekanism/generators/client/RenderElectrolyticSeparator.java similarity index 100% rename from src/minecraft/mekanism/generators/client/RenderElectrolyticSeparator.java rename to common/mekanism/generators/client/RenderElectrolyticSeparator.java diff --git a/src/minecraft/mekanism/generators/client/RenderHeatGenerator.java b/common/mekanism/generators/client/RenderHeatGenerator.java similarity index 100% rename from src/minecraft/mekanism/generators/client/RenderHeatGenerator.java rename to common/mekanism/generators/client/RenderHeatGenerator.java diff --git a/src/minecraft/mekanism/generators/client/RenderHydrogenGenerator.java b/common/mekanism/generators/client/RenderHydrogenGenerator.java similarity index 100% rename from src/minecraft/mekanism/generators/client/RenderHydrogenGenerator.java rename to common/mekanism/generators/client/RenderHydrogenGenerator.java diff --git a/src/minecraft/mekanism/generators/client/RenderWindTurbine.java b/common/mekanism/generators/client/RenderWindTurbine.java similarity index 100% rename from src/minecraft/mekanism/generators/client/RenderWindTurbine.java rename to common/mekanism/generators/client/RenderWindTurbine.java diff --git a/src/minecraft/mekanism/generators/common/BlockGenerator.java b/common/mekanism/generators/common/BlockGenerator.java similarity index 100% rename from src/minecraft/mekanism/generators/common/BlockGenerator.java rename to common/mekanism/generators/common/BlockGenerator.java diff --git a/src/minecraft/mekanism/generators/common/ContainerBioGenerator.java b/common/mekanism/generators/common/ContainerBioGenerator.java similarity index 100% rename from src/minecraft/mekanism/generators/common/ContainerBioGenerator.java rename to common/mekanism/generators/common/ContainerBioGenerator.java diff --git a/src/minecraft/mekanism/generators/common/ContainerElectrolyticSeparator.java b/common/mekanism/generators/common/ContainerElectrolyticSeparator.java similarity index 100% rename from src/minecraft/mekanism/generators/common/ContainerElectrolyticSeparator.java rename to common/mekanism/generators/common/ContainerElectrolyticSeparator.java diff --git a/src/minecraft/mekanism/generators/common/ContainerHeatGenerator.java b/common/mekanism/generators/common/ContainerHeatGenerator.java similarity index 100% rename from src/minecraft/mekanism/generators/common/ContainerHeatGenerator.java rename to common/mekanism/generators/common/ContainerHeatGenerator.java diff --git a/src/minecraft/mekanism/generators/common/ContainerHydrogenGenerator.java b/common/mekanism/generators/common/ContainerHydrogenGenerator.java similarity index 100% rename from src/minecraft/mekanism/generators/common/ContainerHydrogenGenerator.java rename to common/mekanism/generators/common/ContainerHydrogenGenerator.java diff --git a/src/minecraft/mekanism/generators/common/ContainerSolarGenerator.java b/common/mekanism/generators/common/ContainerSolarGenerator.java similarity index 100% rename from src/minecraft/mekanism/generators/common/ContainerSolarGenerator.java rename to common/mekanism/generators/common/ContainerSolarGenerator.java diff --git a/src/minecraft/mekanism/generators/common/ContainerWindTurbine.java b/common/mekanism/generators/common/ContainerWindTurbine.java similarity index 100% rename from src/minecraft/mekanism/generators/common/ContainerWindTurbine.java rename to common/mekanism/generators/common/ContainerWindTurbine.java diff --git a/src/minecraft/mekanism/generators/common/GeneratorsCommonProxy.java b/common/mekanism/generators/common/GeneratorsCommonProxy.java similarity index 100% rename from src/minecraft/mekanism/generators/common/GeneratorsCommonProxy.java rename to common/mekanism/generators/common/GeneratorsCommonProxy.java diff --git a/src/minecraft/mekanism/generators/common/GeneratorsGuiHandler.java b/common/mekanism/generators/common/GeneratorsGuiHandler.java similarity index 100% rename from src/minecraft/mekanism/generators/common/GeneratorsGuiHandler.java rename to common/mekanism/generators/common/GeneratorsGuiHandler.java diff --git a/src/minecraft/mekanism/generators/common/ItemBlockGenerator.java b/common/mekanism/generators/common/ItemBlockGenerator.java similarity index 100% rename from src/minecraft/mekanism/generators/common/ItemBlockGenerator.java rename to common/mekanism/generators/common/ItemBlockGenerator.java diff --git a/src/minecraft/mekanism/generators/common/MekanismGenerators.java b/common/mekanism/generators/common/MekanismGenerators.java similarity index 100% rename from src/minecraft/mekanism/generators/common/MekanismGenerators.java rename to common/mekanism/generators/common/MekanismGenerators.java diff --git a/src/minecraft/mekanism/generators/common/TileEntityAdvancedSolarGenerator.java b/common/mekanism/generators/common/TileEntityAdvancedSolarGenerator.java similarity index 100% rename from src/minecraft/mekanism/generators/common/TileEntityAdvancedSolarGenerator.java rename to common/mekanism/generators/common/TileEntityAdvancedSolarGenerator.java diff --git a/src/minecraft/mekanism/generators/common/TileEntityBioGenerator.java b/common/mekanism/generators/common/TileEntityBioGenerator.java similarity index 100% rename from src/minecraft/mekanism/generators/common/TileEntityBioGenerator.java rename to common/mekanism/generators/common/TileEntityBioGenerator.java diff --git a/src/minecraft/mekanism/generators/common/TileEntityElectrolyticSeparator.java b/common/mekanism/generators/common/TileEntityElectrolyticSeparator.java similarity index 100% rename from src/minecraft/mekanism/generators/common/TileEntityElectrolyticSeparator.java rename to common/mekanism/generators/common/TileEntityElectrolyticSeparator.java diff --git a/src/minecraft/mekanism/generators/common/TileEntityGenerator.java b/common/mekanism/generators/common/TileEntityGenerator.java similarity index 100% rename from src/minecraft/mekanism/generators/common/TileEntityGenerator.java rename to common/mekanism/generators/common/TileEntityGenerator.java diff --git a/src/minecraft/mekanism/generators/common/TileEntityHeatGenerator.java b/common/mekanism/generators/common/TileEntityHeatGenerator.java similarity index 100% rename from src/minecraft/mekanism/generators/common/TileEntityHeatGenerator.java rename to common/mekanism/generators/common/TileEntityHeatGenerator.java diff --git a/src/minecraft/mekanism/generators/common/TileEntityHydrogenGenerator.java b/common/mekanism/generators/common/TileEntityHydrogenGenerator.java similarity index 100% rename from src/minecraft/mekanism/generators/common/TileEntityHydrogenGenerator.java rename to common/mekanism/generators/common/TileEntityHydrogenGenerator.java diff --git a/src/minecraft/mekanism/generators/common/TileEntitySolarGenerator.java b/common/mekanism/generators/common/TileEntitySolarGenerator.java similarity index 100% rename from src/minecraft/mekanism/generators/common/TileEntitySolarGenerator.java rename to common/mekanism/generators/common/TileEntitySolarGenerator.java diff --git a/src/minecraft/mekanism/generators/common/TileEntityWindTurbine.java b/common/mekanism/generators/common/TileEntityWindTurbine.java similarity index 100% rename from src/minecraft/mekanism/generators/common/TileEntityWindTurbine.java rename to common/mekanism/generators/common/TileEntityWindTurbine.java diff --git a/src/minecraft/mekanism/generators/common/network/PacketElectrolyticSeparatorParticle.java b/common/mekanism/generators/common/network/PacketElectrolyticSeparatorParticle.java similarity index 100% rename from src/minecraft/mekanism/generators/common/network/PacketElectrolyticSeparatorParticle.java rename to common/mekanism/generators/common/network/PacketElectrolyticSeparatorParticle.java diff --git a/src/minecraft/mekanism/nei/AdvancedMachineRecipeHandler.java b/common/mekanism/nei/AdvancedMachineRecipeHandler.java similarity index 100% rename from src/minecraft/mekanism/nei/AdvancedMachineRecipeHandler.java rename to common/mekanism/nei/AdvancedMachineRecipeHandler.java diff --git a/src/minecraft/mekanism/nei/CombinerRecipeHandler.java b/common/mekanism/nei/CombinerRecipeHandler.java similarity index 100% rename from src/minecraft/mekanism/nei/CombinerRecipeHandler.java rename to common/mekanism/nei/CombinerRecipeHandler.java diff --git a/src/minecraft/mekanism/nei/CrusherRecipeHandler.java b/common/mekanism/nei/CrusherRecipeHandler.java similarity index 100% rename from src/minecraft/mekanism/nei/CrusherRecipeHandler.java rename to common/mekanism/nei/CrusherRecipeHandler.java diff --git a/src/minecraft/mekanism/nei/EnrichmentChamberRecipeHandler.java b/common/mekanism/nei/EnrichmentChamberRecipeHandler.java similarity index 100% rename from src/minecraft/mekanism/nei/EnrichmentChamberRecipeHandler.java rename to common/mekanism/nei/EnrichmentChamberRecipeHandler.java diff --git a/src/minecraft/mekanism/nei/MachineRecipeHandler.java b/common/mekanism/nei/MachineRecipeHandler.java similarity index 100% rename from src/minecraft/mekanism/nei/MachineRecipeHandler.java rename to common/mekanism/nei/MachineRecipeHandler.java diff --git a/src/minecraft/mekanism/nei/MekanismRecipeHandler.java b/common/mekanism/nei/MekanismRecipeHandler.java similarity index 100% rename from src/minecraft/mekanism/nei/MekanismRecipeHandler.java rename to common/mekanism/nei/MekanismRecipeHandler.java diff --git a/src/minecraft/mekanism/nei/MetallurgicInfuserRecipeHandler.java b/common/mekanism/nei/MetallurgicInfuserRecipeHandler.java similarity index 100% rename from src/minecraft/mekanism/nei/MetallurgicInfuserRecipeHandler.java rename to common/mekanism/nei/MetallurgicInfuserRecipeHandler.java diff --git a/src/minecraft/mekanism/nei/NEIMekanismConfig.java b/common/mekanism/nei/NEIMekanismConfig.java similarity index 100% rename from src/minecraft/mekanism/nei/NEIMekanismConfig.java rename to common/mekanism/nei/NEIMekanismConfig.java diff --git a/src/minecraft/mekanism/nei/OsmiumCompressorRecipeHandler.java b/common/mekanism/nei/OsmiumCompressorRecipeHandler.java similarity index 100% rename from src/minecraft/mekanism/nei/OsmiumCompressorRecipeHandler.java rename to common/mekanism/nei/OsmiumCompressorRecipeHandler.java diff --git a/src/minecraft/mekanism/nei/PurificationChamberRecipeHandler.java b/common/mekanism/nei/PurificationChamberRecipeHandler.java similarity index 100% rename from src/minecraft/mekanism/nei/PurificationChamberRecipeHandler.java rename to common/mekanism/nei/PurificationChamberRecipeHandler.java diff --git a/src/minecraft/mekanism/tools/common/ItemMekanismArmor.java b/common/mekanism/tools/common/ItemMekanismArmor.java similarity index 100% rename from src/minecraft/mekanism/tools/common/ItemMekanismArmor.java rename to common/mekanism/tools/common/ItemMekanismArmor.java diff --git a/src/minecraft/mekanism/tools/common/ItemMekanismAxe.java b/common/mekanism/tools/common/ItemMekanismAxe.java similarity index 100% rename from src/minecraft/mekanism/tools/common/ItemMekanismAxe.java rename to common/mekanism/tools/common/ItemMekanismAxe.java diff --git a/src/minecraft/mekanism/tools/common/ItemMekanismHoe.java b/common/mekanism/tools/common/ItemMekanismHoe.java similarity index 100% rename from src/minecraft/mekanism/tools/common/ItemMekanismHoe.java rename to common/mekanism/tools/common/ItemMekanismHoe.java diff --git a/src/minecraft/mekanism/tools/common/ItemMekanismPaxel.java b/common/mekanism/tools/common/ItemMekanismPaxel.java similarity index 100% rename from src/minecraft/mekanism/tools/common/ItemMekanismPaxel.java rename to common/mekanism/tools/common/ItemMekanismPaxel.java diff --git a/src/minecraft/mekanism/tools/common/ItemMekanismPickaxe.java b/common/mekanism/tools/common/ItemMekanismPickaxe.java similarity index 100% rename from src/minecraft/mekanism/tools/common/ItemMekanismPickaxe.java rename to common/mekanism/tools/common/ItemMekanismPickaxe.java diff --git a/src/minecraft/mekanism/tools/common/ItemMekanismShovel.java b/common/mekanism/tools/common/ItemMekanismShovel.java similarity index 100% rename from src/minecraft/mekanism/tools/common/ItemMekanismShovel.java rename to common/mekanism/tools/common/ItemMekanismShovel.java diff --git a/src/minecraft/mekanism/tools/common/ItemMekanismSword.java b/common/mekanism/tools/common/ItemMekanismSword.java similarity index 100% rename from src/minecraft/mekanism/tools/common/ItemMekanismSword.java rename to common/mekanism/tools/common/ItemMekanismSword.java diff --git a/src/minecraft/mekanism/tools/common/ItemMekanismTool.java b/common/mekanism/tools/common/ItemMekanismTool.java similarity index 100% rename from src/minecraft/mekanism/tools/common/ItemMekanismTool.java rename to common/mekanism/tools/common/ItemMekanismTool.java diff --git a/src/minecraft/mekanism/tools/common/MekanismTools.java b/common/mekanism/tools/common/MekanismTools.java similarity index 100% rename from src/minecraft/mekanism/tools/common/MekanismTools.java rename to common/mekanism/tools/common/MekanismTools.java diff --git a/src/minecraft/micdoodle8/mods/galacticraft/API/IEntityBreathable.java b/common/micdoodle8/mods/galacticraft/API/IEntityBreathable.java similarity index 100% rename from src/minecraft/micdoodle8/mods/galacticraft/API/IEntityBreathable.java rename to common/micdoodle8/mods/galacticraft/API/IEntityBreathable.java diff --git a/src/minecraft/micdoodle8/mods/galacticraft/API/ISolarLevel.java b/common/micdoodle8/mods/galacticraft/API/ISolarLevel.java similarity index 100% rename from src/minecraft/micdoodle8/mods/galacticraft/API/ISolarLevel.java rename to common/micdoodle8/mods/galacticraft/API/ISolarLevel.java diff --git a/src/minecraft/rebelkeithy/mods/metallurgy/api/IMetalSet.java b/common/rebelkeithy/mods/metallurgy/api/IMetalSet.java similarity index 100% rename from src/minecraft/rebelkeithy/mods/metallurgy/api/IMetalSet.java rename to common/rebelkeithy/mods/metallurgy/api/IMetalSet.java diff --git a/src/minecraft/rebelkeithy/mods/metallurgy/api/IOreInfo.java b/common/rebelkeithy/mods/metallurgy/api/IOreInfo.java similarity index 100% rename from src/minecraft/rebelkeithy/mods/metallurgy/api/IOreInfo.java rename to common/rebelkeithy/mods/metallurgy/api/IOreInfo.java diff --git a/src/minecraft/rebelkeithy/mods/metallurgy/api/MetallurgyAPI.java b/common/rebelkeithy/mods/metallurgy/api/MetallurgyAPI.java similarity index 100% rename from src/minecraft/rebelkeithy/mods/metallurgy/api/MetallurgyAPI.java rename to common/rebelkeithy/mods/metallurgy/api/MetallurgyAPI.java diff --git a/src/minecraft/rebelkeithy/mods/metallurgy/api/OreType.java b/common/rebelkeithy/mods/metallurgy/api/OreType.java similarity index 100% rename from src/minecraft/rebelkeithy/mods/metallurgy/api/OreType.java rename to common/rebelkeithy/mods/metallurgy/api/OreType.java diff --git a/src/minecraft/thermalexpansion/api/ThermalExpansionInfo.java b/common/thermalexpansion/api/ThermalExpansionInfo.java similarity index 100% rename from src/minecraft/thermalexpansion/api/ThermalExpansionInfo.java rename to common/thermalexpansion/api/ThermalExpansionInfo.java diff --git a/src/minecraft/thermalexpansion/api/crafting/CraftingHelpers.java b/common/thermalexpansion/api/crafting/CraftingHelpers.java similarity index 100% rename from src/minecraft/thermalexpansion/api/crafting/CraftingHelpers.java rename to common/thermalexpansion/api/crafting/CraftingHelpers.java diff --git a/src/minecraft/thermalexpansion/api/crafting/CraftingManagers.java b/common/thermalexpansion/api/crafting/CraftingManagers.java similarity index 100% rename from src/minecraft/thermalexpansion/api/crafting/CraftingManagers.java rename to common/thermalexpansion/api/crafting/CraftingManagers.java diff --git a/src/minecraft/thermalexpansion/api/crafting/ICrucibleManager.java b/common/thermalexpansion/api/crafting/ICrucibleManager.java similarity index 100% rename from src/minecraft/thermalexpansion/api/crafting/ICrucibleManager.java rename to common/thermalexpansion/api/crafting/ICrucibleManager.java diff --git a/src/minecraft/thermalexpansion/api/crafting/ICrucibleRecipe.java b/common/thermalexpansion/api/crafting/ICrucibleRecipe.java similarity index 100% rename from src/minecraft/thermalexpansion/api/crafting/ICrucibleRecipe.java rename to common/thermalexpansion/api/crafting/ICrucibleRecipe.java diff --git a/src/minecraft/thermalexpansion/api/crafting/IFurnaceManager.java b/common/thermalexpansion/api/crafting/IFurnaceManager.java similarity index 100% rename from src/minecraft/thermalexpansion/api/crafting/IFurnaceManager.java rename to common/thermalexpansion/api/crafting/IFurnaceManager.java diff --git a/src/minecraft/thermalexpansion/api/crafting/IFurnaceRecipe.java b/common/thermalexpansion/api/crafting/IFurnaceRecipe.java similarity index 100% rename from src/minecraft/thermalexpansion/api/crafting/IFurnaceRecipe.java rename to common/thermalexpansion/api/crafting/IFurnaceRecipe.java diff --git a/src/minecraft/thermalexpansion/api/crafting/IPulverizerManager.java b/common/thermalexpansion/api/crafting/IPulverizerManager.java similarity index 100% rename from src/minecraft/thermalexpansion/api/crafting/IPulverizerManager.java rename to common/thermalexpansion/api/crafting/IPulverizerManager.java diff --git a/src/minecraft/thermalexpansion/api/crafting/IPulverizerRecipe.java b/common/thermalexpansion/api/crafting/IPulverizerRecipe.java similarity index 100% rename from src/minecraft/thermalexpansion/api/crafting/IPulverizerRecipe.java rename to common/thermalexpansion/api/crafting/IPulverizerRecipe.java diff --git a/src/minecraft/thermalexpansion/api/crafting/ISawmillManager.java b/common/thermalexpansion/api/crafting/ISawmillManager.java similarity index 100% rename from src/minecraft/thermalexpansion/api/crafting/ISawmillManager.java rename to common/thermalexpansion/api/crafting/ISawmillManager.java diff --git a/src/minecraft/thermalexpansion/api/crafting/ISawmillRecipe.java b/common/thermalexpansion/api/crafting/ISawmillRecipe.java similarity index 100% rename from src/minecraft/thermalexpansion/api/crafting/ISawmillRecipe.java rename to common/thermalexpansion/api/crafting/ISawmillRecipe.java diff --git a/src/minecraft/thermalexpansion/api/crafting/ISmelterManager.java b/common/thermalexpansion/api/crafting/ISmelterManager.java similarity index 100% rename from src/minecraft/thermalexpansion/api/crafting/ISmelterManager.java rename to common/thermalexpansion/api/crafting/ISmelterManager.java diff --git a/src/minecraft/thermalexpansion/api/crafting/ISmelterRecipe.java b/common/thermalexpansion/api/crafting/ISmelterRecipe.java similarity index 100% rename from src/minecraft/thermalexpansion/api/crafting/ISmelterRecipe.java rename to common/thermalexpansion/api/crafting/ISmelterRecipe.java diff --git a/src/minecraft/thermalexpansion/api/crafting/ITransposerManager.java b/common/thermalexpansion/api/crafting/ITransposerManager.java similarity index 100% rename from src/minecraft/thermalexpansion/api/crafting/ITransposerManager.java rename to common/thermalexpansion/api/crafting/ITransposerManager.java diff --git a/src/minecraft/thermalexpansion/api/crafting/ITransposerRecipe.java b/common/thermalexpansion/api/crafting/ITransposerRecipe.java similarity index 100% rename from src/minecraft/thermalexpansion/api/crafting/ITransposerRecipe.java rename to common/thermalexpansion/api/crafting/ITransposerRecipe.java diff --git a/src/minecraft/thermalexpansion/api/item/IChargeableItem.java b/common/thermalexpansion/api/item/IChargeableItem.java similarity index 100% rename from src/minecraft/thermalexpansion/api/item/IChargeableItem.java rename to common/thermalexpansion/api/item/IChargeableItem.java diff --git a/src/minecraft/thermalexpansion/api/item/ItemRegistry.java b/common/thermalexpansion/api/item/ItemRegistry.java similarity index 100% rename from src/minecraft/thermalexpansion/api/item/ItemRegistry.java rename to common/thermalexpansion/api/item/ItemRegistry.java diff --git a/src/minecraft/thermalexpansion/api/tileentity/IAccessControl.java b/common/thermalexpansion/api/tileentity/IAccessControl.java similarity index 100% rename from src/minecraft/thermalexpansion/api/tileentity/IAccessControl.java rename to common/thermalexpansion/api/tileentity/IAccessControl.java diff --git a/src/minecraft/thermalexpansion/api/tileentity/IReconfigurableFacing.java b/common/thermalexpansion/api/tileentity/IReconfigurableFacing.java similarity index 100% rename from src/minecraft/thermalexpansion/api/tileentity/IReconfigurableFacing.java rename to common/thermalexpansion/api/tileentity/IReconfigurableFacing.java diff --git a/src/minecraft/thermalexpansion/api/tileentity/IReconfigurableSides.java b/common/thermalexpansion/api/tileentity/IReconfigurableSides.java similarity index 100% rename from src/minecraft/thermalexpansion/api/tileentity/IReconfigurableSides.java rename to common/thermalexpansion/api/tileentity/IReconfigurableSides.java diff --git a/src/minecraft/thermalexpansion/api/tileentity/IRedstoneControl.java b/common/thermalexpansion/api/tileentity/IRedstoneControl.java similarity index 100% rename from src/minecraft/thermalexpansion/api/tileentity/IRedstoneControl.java rename to common/thermalexpansion/api/tileentity/IRedstoneControl.java diff --git a/src/minecraft/thermalexpansion/api/tileentity/ISidedBlockTexture.java b/common/thermalexpansion/api/tileentity/ISidedBlockTexture.java similarity index 100% rename from src/minecraft/thermalexpansion/api/tileentity/ISidedBlockTexture.java rename to common/thermalexpansion/api/tileentity/ISidedBlockTexture.java diff --git a/src/minecraft/thermalexpansion/api/tileentity/ITesseract.java b/common/thermalexpansion/api/tileentity/ITesseract.java similarity index 100% rename from src/minecraft/thermalexpansion/api/tileentity/ITesseract.java rename to common/thermalexpansion/api/tileentity/ITesseract.java diff --git a/src/minecraft/universalelectricity/core/UniversalElectricity.java b/common/universalelectricity/core/UniversalElectricity.java similarity index 100% rename from src/minecraft/universalelectricity/core/UniversalElectricity.java rename to common/universalelectricity/core/UniversalElectricity.java diff --git a/src/minecraft/universalelectricity/core/block/IConductor.java b/common/universalelectricity/core/block/IConductor.java similarity index 100% rename from src/minecraft/universalelectricity/core/block/IConductor.java rename to common/universalelectricity/core/block/IConductor.java diff --git a/src/minecraft/universalelectricity/core/block/IConnectionProvider.java b/common/universalelectricity/core/block/IConnectionProvider.java similarity index 100% rename from src/minecraft/universalelectricity/core/block/IConnectionProvider.java rename to common/universalelectricity/core/block/IConnectionProvider.java diff --git a/src/minecraft/universalelectricity/core/block/IConnector.java b/common/universalelectricity/core/block/IConnector.java similarity index 100% rename from src/minecraft/universalelectricity/core/block/IConnector.java rename to common/universalelectricity/core/block/IConnector.java diff --git a/src/minecraft/universalelectricity/core/block/IElectricityStorage.java b/common/universalelectricity/core/block/IElectricityStorage.java similarity index 100% rename from src/minecraft/universalelectricity/core/block/IElectricityStorage.java rename to common/universalelectricity/core/block/IElectricityStorage.java diff --git a/src/minecraft/universalelectricity/core/block/INetworkProvider.java b/common/universalelectricity/core/block/INetworkProvider.java similarity index 100% rename from src/minecraft/universalelectricity/core/block/INetworkProvider.java rename to common/universalelectricity/core/block/INetworkProvider.java diff --git a/src/minecraft/universalelectricity/core/block/IVoltage.java b/common/universalelectricity/core/block/IVoltage.java similarity index 100% rename from src/minecraft/universalelectricity/core/block/IVoltage.java rename to common/universalelectricity/core/block/IVoltage.java diff --git a/src/minecraft/universalelectricity/core/electricity/ElectricityDisplay.java b/common/universalelectricity/core/electricity/ElectricityDisplay.java similarity index 100% rename from src/minecraft/universalelectricity/core/electricity/ElectricityDisplay.java rename to common/universalelectricity/core/electricity/ElectricityDisplay.java diff --git a/src/minecraft/universalelectricity/core/electricity/ElectricityNetwork.java b/common/universalelectricity/core/electricity/ElectricityNetwork.java similarity index 100% rename from src/minecraft/universalelectricity/core/electricity/ElectricityNetwork.java rename to common/universalelectricity/core/electricity/ElectricityNetwork.java diff --git a/src/minecraft/universalelectricity/core/electricity/ElectricityNetworkHelper.java b/common/universalelectricity/core/electricity/ElectricityNetworkHelper.java similarity index 100% rename from src/minecraft/universalelectricity/core/electricity/ElectricityNetworkHelper.java rename to common/universalelectricity/core/electricity/ElectricityNetworkHelper.java diff --git a/src/minecraft/universalelectricity/core/electricity/ElectricityPack.java b/common/universalelectricity/core/electricity/ElectricityPack.java similarity index 100% rename from src/minecraft/universalelectricity/core/electricity/ElectricityPack.java rename to common/universalelectricity/core/electricity/ElectricityPack.java diff --git a/src/minecraft/universalelectricity/core/electricity/IConductorRegistry.java b/common/universalelectricity/core/electricity/IConductorRegistry.java similarity index 100% rename from src/minecraft/universalelectricity/core/electricity/IConductorRegistry.java rename to common/universalelectricity/core/electricity/IConductorRegistry.java diff --git a/src/minecraft/universalelectricity/core/electricity/IElectricityNetwork.java b/common/universalelectricity/core/electricity/IElectricityNetwork.java similarity index 100% rename from src/minecraft/universalelectricity/core/electricity/IElectricityNetwork.java rename to common/universalelectricity/core/electricity/IElectricityNetwork.java diff --git a/src/minecraft/universalelectricity/core/item/ElectricItemHelper.java b/common/universalelectricity/core/item/ElectricItemHelper.java similarity index 100% rename from src/minecraft/universalelectricity/core/item/ElectricItemHelper.java rename to common/universalelectricity/core/item/ElectricItemHelper.java diff --git a/src/minecraft/universalelectricity/core/item/IItemElectric.java b/common/universalelectricity/core/item/IItemElectric.java similarity index 100% rename from src/minecraft/universalelectricity/core/item/IItemElectric.java rename to common/universalelectricity/core/item/IItemElectric.java diff --git a/src/minecraft/universalelectricity/core/item/IItemElectricityStorage.java b/common/universalelectricity/core/item/IItemElectricityStorage.java similarity index 100% rename from src/minecraft/universalelectricity/core/item/IItemElectricityStorage.java rename to common/universalelectricity/core/item/IItemElectricityStorage.java diff --git a/src/minecraft/universalelectricity/core/item/IItemVoltage.java b/common/universalelectricity/core/item/IItemVoltage.java similarity index 100% rename from src/minecraft/universalelectricity/core/item/IItemVoltage.java rename to common/universalelectricity/core/item/IItemVoltage.java diff --git a/src/minecraft/universalelectricity/core/item/ItemElectric.java b/common/universalelectricity/core/item/ItemElectric.java similarity index 100% rename from src/minecraft/universalelectricity/core/item/ItemElectric.java rename to common/universalelectricity/core/item/ItemElectric.java diff --git a/src/minecraft/universalelectricity/core/path/IPathCallBack.java b/common/universalelectricity/core/path/IPathCallBack.java similarity index 100% rename from src/minecraft/universalelectricity/core/path/IPathCallBack.java rename to common/universalelectricity/core/path/IPathCallBack.java diff --git a/src/minecraft/universalelectricity/core/path/Pathfinder.java b/common/universalelectricity/core/path/Pathfinder.java similarity index 100% rename from src/minecraft/universalelectricity/core/path/Pathfinder.java rename to common/universalelectricity/core/path/Pathfinder.java diff --git a/src/minecraft/universalelectricity/core/path/PathfinderAStar.java b/common/universalelectricity/core/path/PathfinderAStar.java similarity index 100% rename from src/minecraft/universalelectricity/core/path/PathfinderAStar.java rename to common/universalelectricity/core/path/PathfinderAStar.java diff --git a/src/minecraft/universalelectricity/core/path/PathfinderChecker.java b/common/universalelectricity/core/path/PathfinderChecker.java similarity index 100% rename from src/minecraft/universalelectricity/core/path/PathfinderChecker.java rename to common/universalelectricity/core/path/PathfinderChecker.java diff --git a/src/minecraft/universalelectricity/core/vector/Vector2.java b/common/universalelectricity/core/vector/Vector2.java similarity index 100% rename from src/minecraft/universalelectricity/core/vector/Vector2.java rename to common/universalelectricity/core/vector/Vector2.java diff --git a/src/minecraft/universalelectricity/core/vector/Vector3.java b/common/universalelectricity/core/vector/Vector3.java similarity index 100% rename from src/minecraft/universalelectricity/core/vector/Vector3.java rename to common/universalelectricity/core/vector/Vector3.java diff --git a/src/minecraft/universalelectricity/core/vector/VectorHelper.java b/common/universalelectricity/core/vector/VectorHelper.java similarity index 100% rename from src/minecraft/universalelectricity/core/vector/VectorHelper.java rename to common/universalelectricity/core/vector/VectorHelper.java diff --git a/src/minecraft/universalelectricity/prefab/CustomDamageSource.java b/common/universalelectricity/prefab/CustomDamageSource.java similarity index 100% rename from src/minecraft/universalelectricity/prefab/CustomDamageSource.java rename to common/universalelectricity/prefab/CustomDamageSource.java diff --git a/src/minecraft/universalelectricity/prefab/GuiBase.java b/common/universalelectricity/prefab/GuiBase.java similarity index 100% rename from src/minecraft/universalelectricity/prefab/GuiBase.java rename to common/universalelectricity/prefab/GuiBase.java diff --git a/src/minecraft/universalelectricity/prefab/RecipeHelper.java b/common/universalelectricity/prefab/RecipeHelper.java similarity index 100% rename from src/minecraft/universalelectricity/prefab/RecipeHelper.java rename to common/universalelectricity/prefab/RecipeHelper.java diff --git a/src/minecraft/universalelectricity/prefab/SlotSpecific.java b/common/universalelectricity/prefab/SlotSpecific.java similarity index 100% rename from src/minecraft/universalelectricity/prefab/SlotSpecific.java rename to common/universalelectricity/prefab/SlotSpecific.java diff --git a/src/minecraft/universalelectricity/prefab/TranslationHelper.java b/common/universalelectricity/prefab/TranslationHelper.java similarity index 100% rename from src/minecraft/universalelectricity/prefab/TranslationHelper.java rename to common/universalelectricity/prefab/TranslationHelper.java diff --git a/src/minecraft/universalelectricity/prefab/block/BlockAdvanced.java b/common/universalelectricity/prefab/block/BlockAdvanced.java similarity index 100% rename from src/minecraft/universalelectricity/prefab/block/BlockAdvanced.java rename to common/universalelectricity/prefab/block/BlockAdvanced.java diff --git a/src/minecraft/universalelectricity/prefab/block/BlockConductor.java b/common/universalelectricity/prefab/block/BlockConductor.java similarity index 100% rename from src/minecraft/universalelectricity/prefab/block/BlockConductor.java rename to common/universalelectricity/prefab/block/BlockConductor.java diff --git a/src/minecraft/universalelectricity/prefab/block/BlockRotatable.java b/common/universalelectricity/prefab/block/BlockRotatable.java similarity index 100% rename from src/minecraft/universalelectricity/prefab/block/BlockRotatable.java rename to common/universalelectricity/prefab/block/BlockRotatable.java diff --git a/src/minecraft/universalelectricity/prefab/flag/CommandFlag.java b/common/universalelectricity/prefab/flag/CommandFlag.java similarity index 100% rename from src/minecraft/universalelectricity/prefab/flag/CommandFlag.java rename to common/universalelectricity/prefab/flag/CommandFlag.java diff --git a/src/minecraft/universalelectricity/prefab/flag/Flag.java b/common/universalelectricity/prefab/flag/Flag.java similarity index 100% rename from src/minecraft/universalelectricity/prefab/flag/Flag.java rename to common/universalelectricity/prefab/flag/Flag.java diff --git a/src/minecraft/universalelectricity/prefab/flag/FlagBase.java b/common/universalelectricity/prefab/flag/FlagBase.java similarity index 100% rename from src/minecraft/universalelectricity/prefab/flag/FlagBase.java rename to common/universalelectricity/prefab/flag/FlagBase.java diff --git a/src/minecraft/universalelectricity/prefab/flag/FlagRegion.java b/common/universalelectricity/prefab/flag/FlagRegion.java similarity index 100% rename from src/minecraft/universalelectricity/prefab/flag/FlagRegion.java rename to common/universalelectricity/prefab/flag/FlagRegion.java diff --git a/src/minecraft/universalelectricity/prefab/flag/FlagRegistry.java b/common/universalelectricity/prefab/flag/FlagRegistry.java similarity index 100% rename from src/minecraft/universalelectricity/prefab/flag/FlagRegistry.java rename to common/universalelectricity/prefab/flag/FlagRegistry.java diff --git a/src/minecraft/universalelectricity/prefab/flag/FlagWorld.java b/common/universalelectricity/prefab/flag/FlagWorld.java similarity index 100% rename from src/minecraft/universalelectricity/prefab/flag/FlagWorld.java rename to common/universalelectricity/prefab/flag/FlagWorld.java diff --git a/src/minecraft/universalelectricity/prefab/flag/ModFlag.java b/common/universalelectricity/prefab/flag/ModFlag.java similarity index 100% rename from src/minecraft/universalelectricity/prefab/flag/ModFlag.java rename to common/universalelectricity/prefab/flag/ModFlag.java diff --git a/src/minecraft/universalelectricity/prefab/flag/NBTFileLoader.java b/common/universalelectricity/prefab/flag/NBTFileLoader.java similarity index 100% rename from src/minecraft/universalelectricity/prefab/flag/NBTFileLoader.java rename to common/universalelectricity/prefab/flag/NBTFileLoader.java diff --git a/src/minecraft/universalelectricity/prefab/implement/IDisableable.java b/common/universalelectricity/prefab/implement/IDisableable.java similarity index 100% rename from src/minecraft/universalelectricity/prefab/implement/IDisableable.java rename to common/universalelectricity/prefab/implement/IDisableable.java diff --git a/src/minecraft/universalelectricity/prefab/implement/IRedstoneProvider.java b/common/universalelectricity/prefab/implement/IRedstoneProvider.java similarity index 100% rename from src/minecraft/universalelectricity/prefab/implement/IRedstoneProvider.java rename to common/universalelectricity/prefab/implement/IRedstoneProvider.java diff --git a/src/minecraft/universalelectricity/prefab/implement/IRedstoneReceptor.java b/common/universalelectricity/prefab/implement/IRedstoneReceptor.java similarity index 100% rename from src/minecraft/universalelectricity/prefab/implement/IRedstoneReceptor.java rename to common/universalelectricity/prefab/implement/IRedstoneReceptor.java diff --git a/src/minecraft/universalelectricity/prefab/implement/IRotatable.java b/common/universalelectricity/prefab/implement/IRotatable.java similarity index 100% rename from src/minecraft/universalelectricity/prefab/implement/IRotatable.java rename to common/universalelectricity/prefab/implement/IRotatable.java diff --git a/src/minecraft/universalelectricity/prefab/implement/ITier.java b/common/universalelectricity/prefab/implement/ITier.java similarity index 100% rename from src/minecraft/universalelectricity/prefab/implement/ITier.java rename to common/universalelectricity/prefab/implement/ITier.java diff --git a/src/minecraft/universalelectricity/prefab/implement/IToolConfigurator.java b/common/universalelectricity/prefab/implement/IToolConfigurator.java similarity index 100% rename from src/minecraft/universalelectricity/prefab/implement/IToolConfigurator.java rename to common/universalelectricity/prefab/implement/IToolConfigurator.java diff --git a/src/minecraft/universalelectricity/prefab/multiblock/BlockMulti.java b/common/universalelectricity/prefab/multiblock/BlockMulti.java similarity index 100% rename from src/minecraft/universalelectricity/prefab/multiblock/BlockMulti.java rename to common/universalelectricity/prefab/multiblock/BlockMulti.java diff --git a/src/minecraft/universalelectricity/prefab/multiblock/IBlockActivate.java b/common/universalelectricity/prefab/multiblock/IBlockActivate.java similarity index 100% rename from src/minecraft/universalelectricity/prefab/multiblock/IBlockActivate.java rename to common/universalelectricity/prefab/multiblock/IBlockActivate.java diff --git a/src/minecraft/universalelectricity/prefab/multiblock/IMultiBlock.java b/common/universalelectricity/prefab/multiblock/IMultiBlock.java similarity index 100% rename from src/minecraft/universalelectricity/prefab/multiblock/IMultiBlock.java rename to common/universalelectricity/prefab/multiblock/IMultiBlock.java diff --git a/src/minecraft/universalelectricity/prefab/multiblock/TileEntityMulti.java b/common/universalelectricity/prefab/multiblock/TileEntityMulti.java similarity index 100% rename from src/minecraft/universalelectricity/prefab/multiblock/TileEntityMulti.java rename to common/universalelectricity/prefab/multiblock/TileEntityMulti.java diff --git a/src/minecraft/universalelectricity/prefab/network/IPacketReceiver.java b/common/universalelectricity/prefab/network/IPacketReceiver.java similarity index 100% rename from src/minecraft/universalelectricity/prefab/network/IPacketReceiver.java rename to common/universalelectricity/prefab/network/IPacketReceiver.java diff --git a/src/minecraft/universalelectricity/prefab/network/PacketManager.java b/common/universalelectricity/prefab/network/PacketManager.java similarity index 100% rename from src/minecraft/universalelectricity/prefab/network/PacketManager.java rename to common/universalelectricity/prefab/network/PacketManager.java diff --git a/src/minecraft/universalelectricity/prefab/ore/OreGenBase.java b/common/universalelectricity/prefab/ore/OreGenBase.java similarity index 100% rename from src/minecraft/universalelectricity/prefab/ore/OreGenBase.java rename to common/universalelectricity/prefab/ore/OreGenBase.java diff --git a/src/minecraft/universalelectricity/prefab/ore/OreGenReplace.java b/common/universalelectricity/prefab/ore/OreGenReplace.java similarity index 100% rename from src/minecraft/universalelectricity/prefab/ore/OreGenReplace.java rename to common/universalelectricity/prefab/ore/OreGenReplace.java diff --git a/src/minecraft/universalelectricity/prefab/ore/OreGenReplaceStone.java b/common/universalelectricity/prefab/ore/OreGenReplaceStone.java similarity index 100% rename from src/minecraft/universalelectricity/prefab/ore/OreGenReplaceStone.java rename to common/universalelectricity/prefab/ore/OreGenReplaceStone.java diff --git a/src/minecraft/universalelectricity/prefab/ore/OreGenerator.java b/common/universalelectricity/prefab/ore/OreGenerator.java similarity index 100% rename from src/minecraft/universalelectricity/prefab/ore/OreGenerator.java rename to common/universalelectricity/prefab/ore/OreGenerator.java diff --git a/src/minecraft/universalelectricity/prefab/potion/CustomPotion.java b/common/universalelectricity/prefab/potion/CustomPotion.java similarity index 100% rename from src/minecraft/universalelectricity/prefab/potion/CustomPotion.java rename to common/universalelectricity/prefab/potion/CustomPotion.java diff --git a/src/minecraft/universalelectricity/prefab/potion/CustomPotionEffect.java b/common/universalelectricity/prefab/potion/CustomPotionEffect.java similarity index 100% rename from src/minecraft/universalelectricity/prefab/potion/CustomPotionEffect.java rename to common/universalelectricity/prefab/potion/CustomPotionEffect.java diff --git a/src/minecraft/universalelectricity/prefab/tile/TileEntityAdvanced.java b/common/universalelectricity/prefab/tile/TileEntityAdvanced.java similarity index 100% rename from src/minecraft/universalelectricity/prefab/tile/TileEntityAdvanced.java rename to common/universalelectricity/prefab/tile/TileEntityAdvanced.java diff --git a/src/minecraft/universalelectricity/prefab/tile/TileEntityConductor.java b/common/universalelectricity/prefab/tile/TileEntityConductor.java similarity index 100% rename from src/minecraft/universalelectricity/prefab/tile/TileEntityConductor.java rename to common/universalelectricity/prefab/tile/TileEntityConductor.java diff --git a/src/minecraft/universalelectricity/prefab/tile/TileEntityDisableable.java b/common/universalelectricity/prefab/tile/TileEntityDisableable.java similarity index 100% rename from src/minecraft/universalelectricity/prefab/tile/TileEntityDisableable.java rename to common/universalelectricity/prefab/tile/TileEntityDisableable.java diff --git a/src/minecraft/universalelectricity/prefab/tile/TileEntityElectrical.java b/common/universalelectricity/prefab/tile/TileEntityElectrical.java similarity index 100% rename from src/minecraft/universalelectricity/prefab/tile/TileEntityElectrical.java rename to common/universalelectricity/prefab/tile/TileEntityElectrical.java diff --git a/src/minecraft/universalelectricity/prefab/tile/TileEntityElectricityRunnable.java b/common/universalelectricity/prefab/tile/TileEntityElectricityRunnable.java similarity index 100% rename from src/minecraft/universalelectricity/prefab/tile/TileEntityElectricityRunnable.java rename to common/universalelectricity/prefab/tile/TileEntityElectricityRunnable.java diff --git a/src/minecraft/universalelectricity/prefab/tile/TileEntityElectricityStorage.java b/common/universalelectricity/prefab/tile/TileEntityElectricityStorage.java similarity index 100% rename from src/minecraft/universalelectricity/prefab/tile/TileEntityElectricityStorage.java rename to common/universalelectricity/prefab/tile/TileEntityElectricityStorage.java diff --git a/src/minecraft/universalelectricity/prefab/vector/Region2.java b/common/universalelectricity/prefab/vector/Region2.java similarity index 100% rename from src/minecraft/universalelectricity/prefab/vector/Region2.java rename to common/universalelectricity/prefab/vector/Region2.java diff --git a/src/minecraft/universalelectricity/prefab/vector/Region3.java b/common/universalelectricity/prefab/vector/Region3.java similarity index 100% rename from src/minecraft/universalelectricity/prefab/vector/Region3.java rename to common/universalelectricity/prefab/vector/Region3.java diff --git a/bin/minecraft/armor/bronze_1.png b/resources/armor/bronze_1.png old mode 100755 new mode 100644 similarity index 100% rename from bin/minecraft/armor/bronze_1.png rename to resources/armor/bronze_1.png diff --git a/bin/minecraft/armor/bronze_2.png b/resources/armor/bronze_2.png old mode 100755 new mode 100644 similarity index 100% rename from bin/minecraft/armor/bronze_2.png rename to resources/armor/bronze_2.png diff --git a/bin/minecraft/armor/glowstone_1.png b/resources/armor/glowstone_1.png old mode 100755 new mode 100644 similarity index 100% rename from bin/minecraft/armor/glowstone_1.png rename to resources/armor/glowstone_1.png diff --git a/bin/minecraft/armor/glowstone_2.png b/resources/armor/glowstone_2.png old mode 100755 new mode 100644 similarity index 100% rename from bin/minecraft/armor/glowstone_2.png rename to resources/armor/glowstone_2.png diff --git a/bin/minecraft/armor/lazuli_1.png b/resources/armor/lazuli_1.png old mode 100755 new mode 100644 similarity index 100% rename from bin/minecraft/armor/lazuli_1.png rename to resources/armor/lazuli_1.png diff --git a/bin/minecraft/armor/lazuli_2.png b/resources/armor/lazuli_2.png old mode 100755 new mode 100644 similarity index 100% rename from bin/minecraft/armor/lazuli_2.png rename to resources/armor/lazuli_2.png diff --git a/bin/minecraft/armor/obsidian_1.png b/resources/armor/obsidian_1.png old mode 100755 new mode 100644 similarity index 100% rename from bin/minecraft/armor/obsidian_1.png rename to resources/armor/obsidian_1.png diff --git a/bin/minecraft/armor/obsidian_2.png b/resources/armor/obsidian_2.png old mode 100755 new mode 100644 similarity index 100% rename from bin/minecraft/armor/obsidian_2.png rename to resources/armor/obsidian_2.png diff --git a/bin/minecraft/armor/osmium_1.png b/resources/armor/osmium_1.png old mode 100755 new mode 100644 similarity index 100% rename from bin/minecraft/armor/osmium_1.png rename to resources/armor/osmium_1.png diff --git a/bin/minecraft/armor/osmium_2.png b/resources/armor/osmium_2.png old mode 100755 new mode 100644 similarity index 100% rename from bin/minecraft/armor/osmium_2.png rename to resources/armor/osmium_2.png diff --git a/bin/minecraft/armor/steel_1.png b/resources/armor/steel_1.png old mode 100755 new mode 100644 similarity index 100% rename from bin/minecraft/armor/steel_1.png rename to resources/armor/steel_1.png diff --git a/bin/minecraft/armor/steel_2.png b/resources/armor/steel_2.png old mode 100755 new mode 100644 similarity index 100% rename from bin/minecraft/armor/steel_2.png rename to resources/armor/steel_2.png diff --git a/bin/minecraft/mods/mekanism/gui/GuiBioGenerator.png b/resources/mods/mekanism/gui/GuiBioGenerator.png similarity index 100% rename from bin/minecraft/mods/mekanism/gui/GuiBioGenerator.png rename to resources/mods/mekanism/gui/GuiBioGenerator.png diff --git a/bin/minecraft/mods/mekanism/gui/GuiChamber.png b/resources/mods/mekanism/gui/GuiChamber.png similarity index 100% rename from bin/minecraft/mods/mekanism/gui/GuiChamber.png rename to resources/mods/mekanism/gui/GuiChamber.png diff --git a/bin/minecraft/mods/mekanism/gui/GuiCombiner.png b/resources/mods/mekanism/gui/GuiCombiner.png similarity index 100% rename from bin/minecraft/mods/mekanism/gui/GuiCombiner.png rename to resources/mods/mekanism/gui/GuiCombiner.png diff --git a/bin/minecraft/mods/mekanism/gui/GuiCompressor.png b/resources/mods/mekanism/gui/GuiCompressor.png similarity index 100% rename from bin/minecraft/mods/mekanism/gui/GuiCompressor.png rename to resources/mods/mekanism/gui/GuiCompressor.png diff --git a/bin/minecraft/mods/mekanism/gui/GuiControlPanel.png b/resources/mods/mekanism/gui/GuiControlPanel.png similarity index 100% rename from bin/minecraft/mods/mekanism/gui/GuiControlPanel.png rename to resources/mods/mekanism/gui/GuiControlPanel.png diff --git a/bin/minecraft/mods/mekanism/gui/GuiCrusher.png b/resources/mods/mekanism/gui/GuiCrusher.png similarity index 100% rename from bin/minecraft/mods/mekanism/gui/GuiCrusher.png rename to resources/mods/mekanism/gui/GuiCrusher.png diff --git a/bin/minecraft/mods/mekanism/gui/GuiDynamicTank.png b/resources/mods/mekanism/gui/GuiDynamicTank.png similarity index 100% rename from bin/minecraft/mods/mekanism/gui/GuiDynamicTank.png rename to resources/mods/mekanism/gui/GuiDynamicTank.png diff --git a/bin/minecraft/mods/mekanism/gui/GuiElectricChest.png b/resources/mods/mekanism/gui/GuiElectricChest.png similarity index 100% rename from bin/minecraft/mods/mekanism/gui/GuiElectricChest.png rename to resources/mods/mekanism/gui/GuiElectricChest.png diff --git a/bin/minecraft/mods/mekanism/gui/GuiElectricPump.png b/resources/mods/mekanism/gui/GuiElectricPump.png similarity index 100% rename from bin/minecraft/mods/mekanism/gui/GuiElectricPump.png rename to resources/mods/mekanism/gui/GuiElectricPump.png diff --git a/bin/minecraft/mods/mekanism/gui/GuiElectrolyticSeparator.png b/resources/mods/mekanism/gui/GuiElectrolyticSeparator.png similarity index 100% rename from bin/minecraft/mods/mekanism/gui/GuiElectrolyticSeparator.png rename to resources/mods/mekanism/gui/GuiElectrolyticSeparator.png diff --git a/bin/minecraft/mods/mekanism/gui/GuiElementizer.png b/resources/mods/mekanism/gui/GuiElementizer.png similarity index 100% rename from bin/minecraft/mods/mekanism/gui/GuiElementizer.png rename to resources/mods/mekanism/gui/GuiElementizer.png diff --git a/bin/minecraft/mods/mekanism/gui/GuiEnergizedSmelter.png b/resources/mods/mekanism/gui/GuiEnergizedSmelter.png similarity index 100% rename from bin/minecraft/mods/mekanism/gui/GuiEnergizedSmelter.png rename to resources/mods/mekanism/gui/GuiEnergizedSmelter.png diff --git a/bin/minecraft/mods/mekanism/gui/GuiEnergyCube.png b/resources/mods/mekanism/gui/GuiEnergyCube.png similarity index 100% rename from bin/minecraft/mods/mekanism/gui/GuiEnergyCube.png rename to resources/mods/mekanism/gui/GuiEnergyCube.png diff --git a/bin/minecraft/mods/mekanism/gui/GuiGasTank.png b/resources/mods/mekanism/gui/GuiGasTank.png similarity index 100% rename from bin/minecraft/mods/mekanism/gui/GuiGasTank.png rename to resources/mods/mekanism/gui/GuiGasTank.png diff --git a/bin/minecraft/mods/mekanism/gui/GuiHeatGenerator.png b/resources/mods/mekanism/gui/GuiHeatGenerator.png similarity index 100% rename from bin/minecraft/mods/mekanism/gui/GuiHeatGenerator.png rename to resources/mods/mekanism/gui/GuiHeatGenerator.png diff --git a/bin/minecraft/mods/mekanism/gui/GuiHydrogenGenerator.png b/resources/mods/mekanism/gui/GuiHydrogenGenerator.png similarity index 100% rename from bin/minecraft/mods/mekanism/gui/GuiHydrogenGenerator.png rename to resources/mods/mekanism/gui/GuiHydrogenGenerator.png diff --git a/bin/minecraft/mods/mekanism/gui/GuiMetallurgicInfuser.png b/resources/mods/mekanism/gui/GuiMetallurgicInfuser.png similarity index 100% rename from bin/minecraft/mods/mekanism/gui/GuiMetallurgicInfuser.png rename to resources/mods/mekanism/gui/GuiMetallurgicInfuser.png diff --git a/bin/minecraft/mods/mekanism/gui/GuiPasswordEnter.png b/resources/mods/mekanism/gui/GuiPasswordEnter.png similarity index 100% rename from bin/minecraft/mods/mekanism/gui/GuiPasswordEnter.png rename to resources/mods/mekanism/gui/GuiPasswordEnter.png diff --git a/bin/minecraft/mods/mekanism/gui/GuiPasswordModify.png b/resources/mods/mekanism/gui/GuiPasswordModify.png similarity index 100% rename from bin/minecraft/mods/mekanism/gui/GuiPasswordModify.png rename to resources/mods/mekanism/gui/GuiPasswordModify.png diff --git a/bin/minecraft/mods/mekanism/gui/GuiPortableTeleporter.png b/resources/mods/mekanism/gui/GuiPortableTeleporter.png similarity index 100% rename from bin/minecraft/mods/mekanism/gui/GuiPortableTeleporter.png rename to resources/mods/mekanism/gui/GuiPortableTeleporter.png diff --git a/bin/minecraft/mods/mekanism/gui/GuiPurificationChamber.png b/resources/mods/mekanism/gui/GuiPurificationChamber.png similarity index 100% rename from bin/minecraft/mods/mekanism/gui/GuiPurificationChamber.png rename to resources/mods/mekanism/gui/GuiPurificationChamber.png diff --git a/bin/minecraft/mods/mekanism/gui/GuiRobitCrafting.png b/resources/mods/mekanism/gui/GuiRobitCrafting.png similarity index 100% rename from bin/minecraft/mods/mekanism/gui/GuiRobitCrafting.png rename to resources/mods/mekanism/gui/GuiRobitCrafting.png diff --git a/bin/minecraft/mods/mekanism/gui/GuiRobitInventory.png b/resources/mods/mekanism/gui/GuiRobitInventory.png similarity index 100% rename from bin/minecraft/mods/mekanism/gui/GuiRobitInventory.png rename to resources/mods/mekanism/gui/GuiRobitInventory.png diff --git a/bin/minecraft/mods/mekanism/gui/GuiRobitMain.png b/resources/mods/mekanism/gui/GuiRobitMain.png similarity index 100% rename from bin/minecraft/mods/mekanism/gui/GuiRobitMain.png rename to resources/mods/mekanism/gui/GuiRobitMain.png diff --git a/bin/minecraft/mods/mekanism/gui/GuiRobitRepair.png b/resources/mods/mekanism/gui/GuiRobitRepair.png similarity index 100% rename from bin/minecraft/mods/mekanism/gui/GuiRobitRepair.png rename to resources/mods/mekanism/gui/GuiRobitRepair.png diff --git a/bin/minecraft/mods/mekanism/gui/GuiRobitSmelting.png b/resources/mods/mekanism/gui/GuiRobitSmelting.png similarity index 100% rename from bin/minecraft/mods/mekanism/gui/GuiRobitSmelting.png rename to resources/mods/mekanism/gui/GuiRobitSmelting.png diff --git a/bin/minecraft/mods/mekanism/gui/GuiSolarGenerator.png b/resources/mods/mekanism/gui/GuiSolarGenerator.png similarity index 100% rename from bin/minecraft/mods/mekanism/gui/GuiSolarGenerator.png rename to resources/mods/mekanism/gui/GuiSolarGenerator.png diff --git a/bin/minecraft/mods/mekanism/gui/GuiStopwatch.png b/resources/mods/mekanism/gui/GuiStopwatch.png similarity index 100% rename from bin/minecraft/mods/mekanism/gui/GuiStopwatch.png rename to resources/mods/mekanism/gui/GuiStopwatch.png diff --git a/bin/minecraft/mods/mekanism/gui/GuiTeleporter.png b/resources/mods/mekanism/gui/GuiTeleporter.png similarity index 100% rename from bin/minecraft/mods/mekanism/gui/GuiTeleporter.png rename to resources/mods/mekanism/gui/GuiTeleporter.png diff --git a/bin/minecraft/mods/mekanism/gui/GuiWeatherOrb.png b/resources/mods/mekanism/gui/GuiWeatherOrb.png similarity index 100% rename from bin/minecraft/mods/mekanism/gui/GuiWeatherOrb.png rename to resources/mods/mekanism/gui/GuiWeatherOrb.png diff --git a/bin/minecraft/mods/mekanism/gui/GuiWindTurbine.png b/resources/mods/mekanism/gui/GuiWindTurbine.png similarity index 100% rename from bin/minecraft/mods/mekanism/gui/GuiWindTurbine.png rename to resources/mods/mekanism/gui/GuiWindTurbine.png diff --git a/bin/minecraft/mods/mekanism/gui/factory/GuiAdvancedFactory.png b/resources/mods/mekanism/gui/factory/GuiAdvancedFactory.png similarity index 100% rename from bin/minecraft/mods/mekanism/gui/factory/GuiAdvancedFactory.png rename to resources/mods/mekanism/gui/factory/GuiAdvancedFactory.png diff --git a/bin/minecraft/mods/mekanism/gui/factory/GuiBasicFactory.png b/resources/mods/mekanism/gui/factory/GuiBasicFactory.png similarity index 100% rename from bin/minecraft/mods/mekanism/gui/factory/GuiBasicFactory.png rename to resources/mods/mekanism/gui/factory/GuiBasicFactory.png diff --git a/bin/minecraft/mods/mekanism/gui/factory/GuiEliteFactory.png b/resources/mods/mekanism/gui/factory/GuiEliteFactory.png similarity index 100% rename from bin/minecraft/mods/mekanism/gui/factory/GuiEliteFactory.png rename to resources/mods/mekanism/gui/factory/GuiEliteFactory.png diff --git a/bin/minecraft/mods/mekanism/infuse/Bio.png b/resources/mods/mekanism/infuse/Bio.png similarity index 100% rename from bin/minecraft/mods/mekanism/infuse/Bio.png rename to resources/mods/mekanism/infuse/Bio.png diff --git a/bin/minecraft/mods/mekanism/infuse/Carbon.png b/resources/mods/mekanism/infuse/Carbon.png similarity index 100% rename from bin/minecraft/mods/mekanism/infuse/Carbon.png rename to resources/mods/mekanism/infuse/Carbon.png diff --git a/bin/minecraft/mods/mekanism/infuse/Diamond.png b/resources/mods/mekanism/infuse/Diamond.png similarity index 100% rename from bin/minecraft/mods/mekanism/infuse/Diamond.png rename to resources/mods/mekanism/infuse/Diamond.png diff --git a/bin/minecraft/mods/mekanism/infuse/Infusions.png b/resources/mods/mekanism/infuse/Infusions.png similarity index 100% rename from bin/minecraft/mods/mekanism/infuse/Infusions.png rename to resources/mods/mekanism/infuse/Infusions.png diff --git a/bin/minecraft/mods/mekanism/infuse/Tin.png b/resources/mods/mekanism/infuse/Tin.png similarity index 100% rename from bin/minecraft/mods/mekanism/infuse/Tin.png rename to resources/mods/mekanism/infuse/Tin.png diff --git a/bin/minecraft/mods/mekanism/render/AdvancedSolarGenerator.png b/resources/mods/mekanism/render/AdvancedSolarGenerator.png similarity index 100% rename from bin/minecraft/mods/mekanism/render/AdvancedSolarGenerator.png rename to resources/mods/mekanism/render/AdvancedSolarGenerator.png diff --git a/bin/minecraft/mods/mekanism/render/BioGenerator.png b/resources/mods/mekanism/render/BioGenerator.png similarity index 100% rename from bin/minecraft/mods/mekanism/render/BioGenerator.png rename to resources/mods/mekanism/render/BioGenerator.png diff --git a/bin/minecraft/mods/mekanism/render/Chargepad.png b/resources/mods/mekanism/render/Chargepad.png similarity index 100% rename from bin/minecraft/mods/mekanism/render/Chargepad.png rename to resources/mods/mekanism/render/Chargepad.png diff --git a/bin/minecraft/mods/mekanism/render/ElectricChest.png b/resources/mods/mekanism/render/ElectricChest.png similarity index 100% rename from bin/minecraft/mods/mekanism/render/ElectricChest.png rename to resources/mods/mekanism/render/ElectricChest.png diff --git a/bin/minecraft/mods/mekanism/render/ElectricPump.png b/resources/mods/mekanism/render/ElectricPump.png similarity index 100% rename from bin/minecraft/mods/mekanism/render/ElectricPump.png rename to resources/mods/mekanism/render/ElectricPump.png diff --git a/bin/minecraft/mods/mekanism/render/ElectrolyticSeparatorHydrogen.png b/resources/mods/mekanism/render/ElectrolyticSeparatorHydrogen.png similarity index 100% rename from bin/minecraft/mods/mekanism/render/ElectrolyticSeparatorHydrogen.png rename to resources/mods/mekanism/render/ElectrolyticSeparatorHydrogen.png diff --git a/bin/minecraft/mods/mekanism/render/ElectrolyticSeparatorNone.png b/resources/mods/mekanism/render/ElectrolyticSeparatorNone.png similarity index 100% rename from bin/minecraft/mods/mekanism/render/ElectrolyticSeparatorNone.png rename to resources/mods/mekanism/render/ElectrolyticSeparatorNone.png diff --git a/bin/minecraft/mods/mekanism/render/ElectrolyticSeparatorOxygen.png b/resources/mods/mekanism/render/ElectrolyticSeparatorOxygen.png similarity index 100% rename from bin/minecraft/mods/mekanism/render/ElectrolyticSeparatorOxygen.png rename to resources/mods/mekanism/render/ElectrolyticSeparatorOxygen.png diff --git a/bin/minecraft/mods/mekanism/render/HeatGenerator.png b/resources/mods/mekanism/render/HeatGenerator.png similarity index 100% rename from bin/minecraft/mods/mekanism/render/HeatGenerator.png rename to resources/mods/mekanism/render/HeatGenerator.png diff --git a/bin/minecraft/mods/mekanism/render/HeatGeneratorOn.png b/resources/mods/mekanism/render/HeatGeneratorOn.png similarity index 100% rename from bin/minecraft/mods/mekanism/render/HeatGeneratorOn.png rename to resources/mods/mekanism/render/HeatGeneratorOn.png diff --git a/bin/minecraft/mods/mekanism/render/HydrogenGenerator.png b/resources/mods/mekanism/render/HydrogenGenerator.png similarity index 100% rename from bin/minecraft/mods/mekanism/render/HydrogenGenerator.png rename to resources/mods/mekanism/render/HydrogenGenerator.png diff --git a/bin/minecraft/mods/mekanism/render/MechanicalPipe.png b/resources/mods/mekanism/render/MechanicalPipe.png similarity index 100% rename from bin/minecraft/mods/mekanism/render/MechanicalPipe.png rename to resources/mods/mekanism/render/MechanicalPipe.png diff --git a/bin/minecraft/mods/mekanism/render/MechanicalPipeActive.png b/resources/mods/mekanism/render/MechanicalPipeActive.png similarity index 100% rename from bin/minecraft/mods/mekanism/render/MechanicalPipeActive.png rename to resources/mods/mekanism/render/MechanicalPipeActive.png diff --git a/bin/minecraft/mods/mekanism/render/MetallurgicInfuser.png b/resources/mods/mekanism/render/MetallurgicInfuser.png similarity index 100% rename from bin/minecraft/mods/mekanism/render/MetallurgicInfuser.png rename to resources/mods/mekanism/render/MetallurgicInfuser.png diff --git a/bin/minecraft/mods/mekanism/render/PressurizedTube.png b/resources/mods/mekanism/render/PressurizedTube.png similarity index 100% rename from bin/minecraft/mods/mekanism/render/PressurizedTube.png rename to resources/mods/mekanism/render/PressurizedTube.png diff --git a/bin/minecraft/mods/mekanism/render/Robit.png b/resources/mods/mekanism/render/Robit.png similarity index 100% rename from bin/minecraft/mods/mekanism/render/Robit.png rename to resources/mods/mekanism/render/Robit.png diff --git a/bin/minecraft/mods/mekanism/render/SideConfigOverlay.png b/resources/mods/mekanism/render/SideConfigOverlay.png similarity index 100% rename from bin/minecraft/mods/mekanism/render/SideConfigOverlay.png rename to resources/mods/mekanism/render/SideConfigOverlay.png diff --git a/bin/minecraft/mods/mekanism/render/TheoreticalElementizer.png b/resources/mods/mekanism/render/TheoreticalElementizer.png similarity index 100% rename from bin/minecraft/mods/mekanism/render/TheoreticalElementizer.png rename to resources/mods/mekanism/render/TheoreticalElementizer.png diff --git a/bin/minecraft/mods/mekanism/render/UniversalCable.png b/resources/mods/mekanism/render/UniversalCable.png similarity index 100% rename from bin/minecraft/mods/mekanism/render/UniversalCable.png rename to resources/mods/mekanism/render/UniversalCable.png diff --git a/bin/minecraft/mods/mekanism/render/WindTurbine.png b/resources/mods/mekanism/render/WindTurbine.png similarity index 100% rename from bin/minecraft/mods/mekanism/render/WindTurbine.png rename to resources/mods/mekanism/render/WindTurbine.png diff --git a/bin/minecraft/mods/mekanism/sound/BioGenerator.ogg b/resources/mods/mekanism/sound/BioGenerator.ogg similarity index 100% rename from bin/minecraft/mods/mekanism/sound/BioGenerator.ogg rename to resources/mods/mekanism/sound/BioGenerator.ogg diff --git a/bin/minecraft/mods/mekanism/sound/Chamber.ogg b/resources/mods/mekanism/sound/Chamber.ogg similarity index 100% rename from bin/minecraft/mods/mekanism/sound/Chamber.ogg rename to resources/mods/mekanism/sound/Chamber.ogg diff --git a/bin/minecraft/mods/mekanism/sound/Chargepad.ogg b/resources/mods/mekanism/sound/Chargepad.ogg similarity index 100% rename from bin/minecraft/mods/mekanism/sound/Chargepad.ogg rename to resources/mods/mekanism/sound/Chargepad.ogg diff --git a/bin/minecraft/mods/mekanism/sound/Combiner.ogg b/resources/mods/mekanism/sound/Combiner.ogg similarity index 100% rename from bin/minecraft/mods/mekanism/sound/Combiner.ogg rename to resources/mods/mekanism/sound/Combiner.ogg diff --git a/bin/minecraft/mods/mekanism/sound/Compressor.ogg b/resources/mods/mekanism/sound/Compressor.ogg similarity index 100% rename from bin/minecraft/mods/mekanism/sound/Compressor.ogg rename to resources/mods/mekanism/sound/Compressor.ogg diff --git a/bin/minecraft/mods/mekanism/sound/Crusher.ogg b/resources/mods/mekanism/sound/Crusher.ogg similarity index 100% rename from bin/minecraft/mods/mekanism/sound/Crusher.ogg rename to resources/mods/mekanism/sound/Crusher.ogg diff --git a/bin/minecraft/mods/mekanism/sound/Elementizer.ogg b/resources/mods/mekanism/sound/Elementizer.ogg similarity index 100% rename from bin/minecraft/mods/mekanism/sound/Elementizer.ogg rename to resources/mods/mekanism/sound/Elementizer.ogg diff --git a/bin/minecraft/mods/mekanism/sound/HeatGenerator.ogg b/resources/mods/mekanism/sound/HeatGenerator.ogg similarity index 100% rename from bin/minecraft/mods/mekanism/sound/HeatGenerator.ogg rename to resources/mods/mekanism/sound/HeatGenerator.ogg diff --git a/bin/minecraft/mods/mekanism/sound/HydrogenGenerator.ogg b/resources/mods/mekanism/sound/HydrogenGenerator.ogg similarity index 100% rename from bin/minecraft/mods/mekanism/sound/HydrogenGenerator.ogg rename to resources/mods/mekanism/sound/HydrogenGenerator.ogg diff --git a/bin/minecraft/mods/mekanism/sound/MetallurgicInfuser.ogg b/resources/mods/mekanism/sound/MetallurgicInfuser.ogg similarity index 100% rename from bin/minecraft/mods/mekanism/sound/MetallurgicInfuser.ogg rename to resources/mods/mekanism/sound/MetallurgicInfuser.ogg diff --git a/bin/minecraft/mods/mekanism/sound/PurificationChamber.ogg b/resources/mods/mekanism/sound/PurificationChamber.ogg similarity index 100% rename from bin/minecraft/mods/mekanism/sound/PurificationChamber.ogg rename to resources/mods/mekanism/sound/PurificationChamber.ogg diff --git a/bin/minecraft/mods/mekanism/sound/Smelter.ogg b/resources/mods/mekanism/sound/Smelter.ogg similarity index 100% rename from bin/minecraft/mods/mekanism/sound/Smelter.ogg rename to resources/mods/mekanism/sound/Smelter.ogg diff --git a/bin/minecraft/mods/mekanism/sound/SolarGenerator.ogg b/resources/mods/mekanism/sound/SolarGenerator.ogg similarity index 100% rename from bin/minecraft/mods/mekanism/sound/SolarGenerator.ogg rename to resources/mods/mekanism/sound/SolarGenerator.ogg diff --git a/bin/minecraft/mods/mekanism/sound/WindTurbine.ogg b/resources/mods/mekanism/sound/WindTurbine.ogg similarity index 100% rename from bin/minecraft/mods/mekanism/sound/WindTurbine.ogg rename to resources/mods/mekanism/sound/WindTurbine.ogg diff --git a/bin/minecraft/mods/mekanism/sound/cj/CJ_1.ogg b/resources/mods/mekanism/sound/cj/CJ_1.ogg similarity index 100% rename from bin/minecraft/mods/mekanism/sound/cj/CJ_1.ogg rename to resources/mods/mekanism/sound/cj/CJ_1.ogg diff --git a/bin/minecraft/mods/mekanism/sound/cj/CJ_2.ogg b/resources/mods/mekanism/sound/cj/CJ_2.ogg similarity index 100% rename from bin/minecraft/mods/mekanism/sound/cj/CJ_2.ogg rename to resources/mods/mekanism/sound/cj/CJ_2.ogg diff --git a/bin/minecraft/mods/mekanism/sound/cj/CJ_3.ogg b/resources/mods/mekanism/sound/cj/CJ_3.ogg similarity index 100% rename from bin/minecraft/mods/mekanism/sound/cj/CJ_3.ogg rename to resources/mods/mekanism/sound/cj/CJ_3.ogg diff --git a/bin/minecraft/mods/mekanism/textures/blocks/AdvancedEnergyCubeFront.png b/resources/mods/mekanism/textures/blocks/AdvancedEnergyCubeFront.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/AdvancedEnergyCubeFront.png rename to resources/mods/mekanism/textures/blocks/AdvancedEnergyCubeFront.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/AdvancedEnergyCubeSide.png b/resources/mods/mekanism/textures/blocks/AdvancedEnergyCubeSide.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/AdvancedEnergyCubeSide.png rename to resources/mods/mekanism/textures/blocks/AdvancedEnergyCubeSide.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/AdvancedFactoryFront.png b/resources/mods/mekanism/textures/blocks/AdvancedFactoryFront.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/AdvancedFactoryFront.png rename to resources/mods/mekanism/textures/blocks/AdvancedFactoryFront.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/AdvancedFactorySide.png b/resources/mods/mekanism/textures/blocks/AdvancedFactorySide.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/AdvancedFactorySide.png rename to resources/mods/mekanism/textures/blocks/AdvancedFactorySide.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/AdvancedFactoryTop.png b/resources/mods/mekanism/textures/blocks/AdvancedFactoryTop.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/AdvancedFactoryTop.png rename to resources/mods/mekanism/textures/blocks/AdvancedFactoryTop.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/BasicEnergyCubeFront.png b/resources/mods/mekanism/textures/blocks/BasicEnergyCubeFront.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/BasicEnergyCubeFront.png rename to resources/mods/mekanism/textures/blocks/BasicEnergyCubeFront.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/BasicEnergyCubeSide.png b/resources/mods/mekanism/textures/blocks/BasicEnergyCubeSide.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/BasicEnergyCubeSide.png rename to resources/mods/mekanism/textures/blocks/BasicEnergyCubeSide.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/BasicFactoryFront.png b/resources/mods/mekanism/textures/blocks/BasicFactoryFront.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/BasicFactoryFront.png rename to resources/mods/mekanism/textures/blocks/BasicFactoryFront.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/BasicFactorySide.png b/resources/mods/mekanism/textures/blocks/BasicFactorySide.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/BasicFactorySide.png rename to resources/mods/mekanism/textures/blocks/BasicFactorySide.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/BasicFactoryTop.png b/resources/mods/mekanism/textures/blocks/BasicFactoryTop.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/BasicFactoryTop.png rename to resources/mods/mekanism/textures/blocks/BasicFactoryTop.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/BronzeBlock.png b/resources/mods/mekanism/textures/blocks/BronzeBlock.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/BronzeBlock.png rename to resources/mods/mekanism/textures/blocks/BronzeBlock.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/CoalBlock.png b/resources/mods/mekanism/textures/blocks/CoalBlock.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/CoalBlock.png rename to resources/mods/mekanism/textures/blocks/CoalBlock.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/CombinerFrontOff.png b/resources/mods/mekanism/textures/blocks/CombinerFrontOff.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/CombinerFrontOff.png rename to resources/mods/mekanism/textures/blocks/CombinerFrontOff.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/CombinerFrontOn.png b/resources/mods/mekanism/textures/blocks/CombinerFrontOn.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/CombinerFrontOn.png rename to resources/mods/mekanism/textures/blocks/CombinerFrontOn.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/CombinerFrontOn.txt b/resources/mods/mekanism/textures/blocks/CombinerFrontOn.txt similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/CombinerFrontOn.txt rename to resources/mods/mekanism/textures/blocks/CombinerFrontOn.txt diff --git a/bin/minecraft/mods/mekanism/textures/blocks/CrusherFrontOff.png b/resources/mods/mekanism/textures/blocks/CrusherFrontOff.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/CrusherFrontOff.png rename to resources/mods/mekanism/textures/blocks/CrusherFrontOff.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/CrusherFrontOn.png b/resources/mods/mekanism/textures/blocks/CrusherFrontOn.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/CrusherFrontOn.png rename to resources/mods/mekanism/textures/blocks/CrusherFrontOn.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/CrusherFrontOn.txt b/resources/mods/mekanism/textures/blocks/CrusherFrontOn.txt similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/CrusherFrontOn.txt rename to resources/mods/mekanism/textures/blocks/CrusherFrontOn.txt diff --git a/bin/minecraft/mods/mekanism/textures/blocks/DynamicGlass.png b/resources/mods/mekanism/textures/blocks/DynamicGlass.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/DynamicGlass.png rename to resources/mods/mekanism/textures/blocks/DynamicGlass.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/DynamicTank.png b/resources/mods/mekanism/textures/blocks/DynamicTank.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/DynamicTank.png rename to resources/mods/mekanism/textures/blocks/DynamicTank.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/DynamicValve.png b/resources/mods/mekanism/textures/blocks/DynamicValve.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/DynamicValve.png rename to resources/mods/mekanism/textures/blocks/DynamicValve.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/ElectricPumpFront.png b/resources/mods/mekanism/textures/blocks/ElectricPumpFront.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/ElectricPumpFront.png rename to resources/mods/mekanism/textures/blocks/ElectricPumpFront.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/ElectricPumpSide.png b/resources/mods/mekanism/textures/blocks/ElectricPumpSide.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/ElectricPumpSide.png rename to resources/mods/mekanism/textures/blocks/ElectricPumpSide.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/EliteEnergyCubeFront.png b/resources/mods/mekanism/textures/blocks/EliteEnergyCubeFront.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/EliteEnergyCubeFront.png rename to resources/mods/mekanism/textures/blocks/EliteEnergyCubeFront.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/EliteEnergyCubeSide.png b/resources/mods/mekanism/textures/blocks/EliteEnergyCubeSide.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/EliteEnergyCubeSide.png rename to resources/mods/mekanism/textures/blocks/EliteEnergyCubeSide.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/EliteFactoryFront.png b/resources/mods/mekanism/textures/blocks/EliteFactoryFront.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/EliteFactoryFront.png rename to resources/mods/mekanism/textures/blocks/EliteFactoryFront.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/EliteFactorySide.png b/resources/mods/mekanism/textures/blocks/EliteFactorySide.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/EliteFactorySide.png rename to resources/mods/mekanism/textures/blocks/EliteFactorySide.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/EliteFactoryTop.png b/resources/mods/mekanism/textures/blocks/EliteFactoryTop.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/EliteFactoryTop.png rename to resources/mods/mekanism/textures/blocks/EliteFactoryTop.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/EnergizedSmelterFrontOff.png b/resources/mods/mekanism/textures/blocks/EnergizedSmelterFrontOff.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/EnergizedSmelterFrontOff.png rename to resources/mods/mekanism/textures/blocks/EnergizedSmelterFrontOff.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/EnergizedSmelterFrontOn.png b/resources/mods/mekanism/textures/blocks/EnergizedSmelterFrontOn.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/EnergizedSmelterFrontOn.png rename to resources/mods/mekanism/textures/blocks/EnergizedSmelterFrontOn.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/EnergizedSmelterFrontOn.txt b/resources/mods/mekanism/textures/blocks/EnergizedSmelterFrontOn.txt similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/EnergizedSmelterFrontOn.txt rename to resources/mods/mekanism/textures/blocks/EnergizedSmelterFrontOn.txt diff --git a/bin/minecraft/mods/mekanism/textures/blocks/EnrichmentChamberFrontOff.png b/resources/mods/mekanism/textures/blocks/EnrichmentChamberFrontOff.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/EnrichmentChamberFrontOff.png rename to resources/mods/mekanism/textures/blocks/EnrichmentChamberFrontOff.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/EnrichmentChamberFrontOn.png b/resources/mods/mekanism/textures/blocks/EnrichmentChamberFrontOn.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/EnrichmentChamberFrontOn.png rename to resources/mods/mekanism/textures/blocks/EnrichmentChamberFrontOn.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/GasTankFront.png b/resources/mods/mekanism/textures/blocks/GasTankFront.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/GasTankFront.png rename to resources/mods/mekanism/textures/blocks/GasTankFront.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/GasTankSide.png b/resources/mods/mekanism/textures/blocks/GasTankSide.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/GasTankSide.png rename to resources/mods/mekanism/textures/blocks/GasTankSide.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/GasTankTop.png b/resources/mods/mekanism/textures/blocks/GasTankTop.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/GasTankTop.png rename to resources/mods/mekanism/textures/blocks/GasTankTop.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/MetallurgicInfuserBackOff.png b/resources/mods/mekanism/textures/blocks/MetallurgicInfuserBackOff.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/MetallurgicInfuserBackOff.png rename to resources/mods/mekanism/textures/blocks/MetallurgicInfuserBackOff.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/MetallurgicInfuserBackOn.png b/resources/mods/mekanism/textures/blocks/MetallurgicInfuserBackOn.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/MetallurgicInfuserBackOn.png rename to resources/mods/mekanism/textures/blocks/MetallurgicInfuserBackOn.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/MetallurgicInfuserBackOn.txt b/resources/mods/mekanism/textures/blocks/MetallurgicInfuserBackOn.txt similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/MetallurgicInfuserBackOn.txt rename to resources/mods/mekanism/textures/blocks/MetallurgicInfuserBackOn.txt diff --git a/bin/minecraft/mods/mekanism/textures/blocks/MetallurgicInfuserFrontOff.png b/resources/mods/mekanism/textures/blocks/MetallurgicInfuserFrontOff.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/MetallurgicInfuserFrontOff.png rename to resources/mods/mekanism/textures/blocks/MetallurgicInfuserFrontOff.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/MetallurgicInfuserFrontOn.png b/resources/mods/mekanism/textures/blocks/MetallurgicInfuserFrontOn.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/MetallurgicInfuserFrontOn.png rename to resources/mods/mekanism/textures/blocks/MetallurgicInfuserFrontOn.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/MetallurgicInfuserFrontOn.txt b/resources/mods/mekanism/textures/blocks/MetallurgicInfuserFrontOn.txt similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/MetallurgicInfuserFrontOn.txt rename to resources/mods/mekanism/textures/blocks/MetallurgicInfuserFrontOn.txt diff --git a/bin/minecraft/mods/mekanism/textures/blocks/MetallurgicInfuserSideOff.png b/resources/mods/mekanism/textures/blocks/MetallurgicInfuserSideOff.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/MetallurgicInfuserSideOff.png rename to resources/mods/mekanism/textures/blocks/MetallurgicInfuserSideOff.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/MetallurgicInfuserSideOn.png b/resources/mods/mekanism/textures/blocks/MetallurgicInfuserSideOn.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/MetallurgicInfuserSideOn.png rename to resources/mods/mekanism/textures/blocks/MetallurgicInfuserSideOn.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/MetallurgicInfuserSideOn.txt b/resources/mods/mekanism/textures/blocks/MetallurgicInfuserSideOn.txt similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/MetallurgicInfuserSideOn.txt rename to resources/mods/mekanism/textures/blocks/MetallurgicInfuserSideOn.txt diff --git a/bin/minecraft/mods/mekanism/textures/blocks/MetallurgicInfuserTopOff.png b/resources/mods/mekanism/textures/blocks/MetallurgicInfuserTopOff.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/MetallurgicInfuserTopOff.png rename to resources/mods/mekanism/textures/blocks/MetallurgicInfuserTopOff.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/MetallurgicInfuserTopOn.png b/resources/mods/mekanism/textures/blocks/MetallurgicInfuserTopOn.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/MetallurgicInfuserTopOn.png rename to resources/mods/mekanism/textures/blocks/MetallurgicInfuserTopOn.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/ObsidianTNTBottom.png b/resources/mods/mekanism/textures/blocks/ObsidianTNTBottom.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/ObsidianTNTBottom.png rename to resources/mods/mekanism/textures/blocks/ObsidianTNTBottom.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/ObsidianTNTSide.png b/resources/mods/mekanism/textures/blocks/ObsidianTNTSide.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/ObsidianTNTSide.png rename to resources/mods/mekanism/textures/blocks/ObsidianTNTSide.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/ObsidianTNTTop.png b/resources/mods/mekanism/textures/blocks/ObsidianTNTTop.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/ObsidianTNTTop.png rename to resources/mods/mekanism/textures/blocks/ObsidianTNTTop.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/OsmiumBlock.png b/resources/mods/mekanism/textures/blocks/OsmiumBlock.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/OsmiumBlock.png rename to resources/mods/mekanism/textures/blocks/OsmiumBlock.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/OsmiumCompressorFrontOff.png b/resources/mods/mekanism/textures/blocks/OsmiumCompressorFrontOff.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/OsmiumCompressorFrontOff.png rename to resources/mods/mekanism/textures/blocks/OsmiumCompressorFrontOff.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/OsmiumCompressorFrontOn.png b/resources/mods/mekanism/textures/blocks/OsmiumCompressorFrontOn.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/OsmiumCompressorFrontOn.png rename to resources/mods/mekanism/textures/blocks/OsmiumCompressorFrontOn.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/OsmiumCompressorFrontOn.txt b/resources/mods/mekanism/textures/blocks/OsmiumCompressorFrontOn.txt similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/OsmiumCompressorFrontOn.txt rename to resources/mods/mekanism/textures/blocks/OsmiumCompressorFrontOn.txt diff --git a/bin/minecraft/mods/mekanism/textures/blocks/OsmiumOre.png b/resources/mods/mekanism/textures/blocks/OsmiumOre.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/OsmiumOre.png rename to resources/mods/mekanism/textures/blocks/OsmiumOre.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/OverlayAqua.png b/resources/mods/mekanism/textures/blocks/OverlayAqua.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/OverlayAqua.png rename to resources/mods/mekanism/textures/blocks/OverlayAqua.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/OverlayBlack.png b/resources/mods/mekanism/textures/blocks/OverlayBlack.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/OverlayBlack.png rename to resources/mods/mekanism/textures/blocks/OverlayBlack.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/OverlayBrightGreen.png b/resources/mods/mekanism/textures/blocks/OverlayBrightGreen.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/OverlayBrightGreen.png rename to resources/mods/mekanism/textures/blocks/OverlayBrightGreen.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/OverlayDarkAqua.png b/resources/mods/mekanism/textures/blocks/OverlayDarkAqua.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/OverlayDarkAqua.png rename to resources/mods/mekanism/textures/blocks/OverlayDarkAqua.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/OverlayDarkBlue.png b/resources/mods/mekanism/textures/blocks/OverlayDarkBlue.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/OverlayDarkBlue.png rename to resources/mods/mekanism/textures/blocks/OverlayDarkBlue.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/OverlayDarkGreen.png b/resources/mods/mekanism/textures/blocks/OverlayDarkGreen.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/OverlayDarkGreen.png rename to resources/mods/mekanism/textures/blocks/OverlayDarkGreen.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/OverlayDarkGrey.png b/resources/mods/mekanism/textures/blocks/OverlayDarkGrey.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/OverlayDarkGrey.png rename to resources/mods/mekanism/textures/blocks/OverlayDarkGrey.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/OverlayDarkRed.png b/resources/mods/mekanism/textures/blocks/OverlayDarkRed.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/OverlayDarkRed.png rename to resources/mods/mekanism/textures/blocks/OverlayDarkRed.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/OverlayGrey.png b/resources/mods/mekanism/textures/blocks/OverlayGrey.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/OverlayGrey.png rename to resources/mods/mekanism/textures/blocks/OverlayGrey.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/OverlayIndigo.png b/resources/mods/mekanism/textures/blocks/OverlayIndigo.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/OverlayIndigo.png rename to resources/mods/mekanism/textures/blocks/OverlayIndigo.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/OverlayOrange.png b/resources/mods/mekanism/textures/blocks/OverlayOrange.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/OverlayOrange.png rename to resources/mods/mekanism/textures/blocks/OverlayOrange.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/OverlayPink.png b/resources/mods/mekanism/textures/blocks/OverlayPink.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/OverlayPink.png rename to resources/mods/mekanism/textures/blocks/OverlayPink.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/OverlayPurple.png b/resources/mods/mekanism/textures/blocks/OverlayPurple.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/OverlayPurple.png rename to resources/mods/mekanism/textures/blocks/OverlayPurple.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/OverlayRed.png b/resources/mods/mekanism/textures/blocks/OverlayRed.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/OverlayRed.png rename to resources/mods/mekanism/textures/blocks/OverlayRed.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/OverlayWhite.png b/resources/mods/mekanism/textures/blocks/OverlayWhite.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/OverlayWhite.png rename to resources/mods/mekanism/textures/blocks/OverlayWhite.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/OverlayYellow.png b/resources/mods/mekanism/textures/blocks/OverlayYellow.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/OverlayYellow.png rename to resources/mods/mekanism/textures/blocks/OverlayYellow.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/PurificationChamberFrontOff.png b/resources/mods/mekanism/textures/blocks/PurificationChamberFrontOff.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/PurificationChamberFrontOff.png rename to resources/mods/mekanism/textures/blocks/PurificationChamberFrontOff.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/PurificationChamberFrontOn.png b/resources/mods/mekanism/textures/blocks/PurificationChamberFrontOn.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/PurificationChamberFrontOn.png rename to resources/mods/mekanism/textures/blocks/PurificationChamberFrontOn.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/PurificationChamberFrontOn.txt b/resources/mods/mekanism/textures/blocks/PurificationChamberFrontOn.txt similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/PurificationChamberFrontOn.txt rename to resources/mods/mekanism/textures/blocks/PurificationChamberFrontOn.txt diff --git a/bin/minecraft/mods/mekanism/textures/blocks/RefinedGlowstone.png b/resources/mods/mekanism/textures/blocks/RefinedGlowstone.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/RefinedGlowstone.png rename to resources/mods/mekanism/textures/blocks/RefinedGlowstone.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/RefinedObsidian.png b/resources/mods/mekanism/textures/blocks/RefinedObsidian.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/RefinedObsidian.png rename to resources/mods/mekanism/textures/blocks/RefinedObsidian.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/SolarGeneratorFront.png b/resources/mods/mekanism/textures/blocks/SolarGeneratorFront.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/SolarGeneratorFront.png rename to resources/mods/mekanism/textures/blocks/SolarGeneratorFront.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/SolarGeneratorSide.png b/resources/mods/mekanism/textures/blocks/SolarGeneratorSide.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/SolarGeneratorSide.png rename to resources/mods/mekanism/textures/blocks/SolarGeneratorSide.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/SolarGeneratorTop.png b/resources/mods/mekanism/textures/blocks/SolarGeneratorTop.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/SolarGeneratorTop.png rename to resources/mods/mekanism/textures/blocks/SolarGeneratorTop.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/SteelBlock.png b/resources/mods/mekanism/textures/blocks/SteelBlock.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/SteelBlock.png rename to resources/mods/mekanism/textures/blocks/SteelBlock.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/SteelCasing.png b/resources/mods/mekanism/textures/blocks/SteelCasing.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/SteelCasing.png rename to resources/mods/mekanism/textures/blocks/SteelCasing.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/Teleporter.png b/resources/mods/mekanism/textures/blocks/Teleporter.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/Teleporter.png rename to resources/mods/mekanism/textures/blocks/Teleporter.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/TeleporterFrame.png b/resources/mods/mekanism/textures/blocks/TeleporterFrame.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/TeleporterFrame.png rename to resources/mods/mekanism/textures/blocks/TeleporterFrame.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/UltimateEnergyCubeFront.png b/resources/mods/mekanism/textures/blocks/UltimateEnergyCubeFront.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/UltimateEnergyCubeFront.png rename to resources/mods/mekanism/textures/blocks/UltimateEnergyCubeFront.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/UltimateEnergyCubeSide.png b/resources/mods/mekanism/textures/blocks/UltimateEnergyCubeSide.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/blocks/UltimateEnergyCubeSide.png rename to resources/mods/mekanism/textures/blocks/UltimateEnergyCubeSide.png diff --git a/bin/minecraft/mods/mekanism/textures/items/AtomicCore.png b/resources/mods/mekanism/textures/items/AtomicCore.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/AtomicCore.png rename to resources/mods/mekanism/textures/items/AtomicCore.png diff --git a/bin/minecraft/mods/mekanism/textures/items/AtomicDisassembler.png b/resources/mods/mekanism/textures/items/AtomicDisassembler.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/AtomicDisassembler.png rename to resources/mods/mekanism/textures/items/AtomicDisassembler.png diff --git a/bin/minecraft/mods/mekanism/textures/items/BioFuel.png b/resources/mods/mekanism/textures/items/BioFuel.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/BioFuel.png rename to resources/mods/mekanism/textures/items/BioFuel.png diff --git a/bin/minecraft/mods/mekanism/textures/items/BronzeAxe.png b/resources/mods/mekanism/textures/items/BronzeAxe.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/BronzeAxe.png rename to resources/mods/mekanism/textures/items/BronzeAxe.png diff --git a/bin/minecraft/mods/mekanism/textures/items/BronzeBoots.png b/resources/mods/mekanism/textures/items/BronzeBoots.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/BronzeBoots.png rename to resources/mods/mekanism/textures/items/BronzeBoots.png diff --git a/bin/minecraft/mods/mekanism/textures/items/BronzeChestplate.png b/resources/mods/mekanism/textures/items/BronzeChestplate.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/BronzeChestplate.png rename to resources/mods/mekanism/textures/items/BronzeChestplate.png diff --git a/bin/minecraft/mods/mekanism/textures/items/BronzeHelmet.png b/resources/mods/mekanism/textures/items/BronzeHelmet.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/BronzeHelmet.png rename to resources/mods/mekanism/textures/items/BronzeHelmet.png diff --git a/bin/minecraft/mods/mekanism/textures/items/BronzeHoe.png b/resources/mods/mekanism/textures/items/BronzeHoe.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/BronzeHoe.png rename to resources/mods/mekanism/textures/items/BronzeHoe.png diff --git a/bin/minecraft/mods/mekanism/textures/items/BronzeIngot.png b/resources/mods/mekanism/textures/items/BronzeIngot.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/BronzeIngot.png rename to resources/mods/mekanism/textures/items/BronzeIngot.png diff --git a/bin/minecraft/mods/mekanism/textures/items/BronzeLeggings.png b/resources/mods/mekanism/textures/items/BronzeLeggings.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/BronzeLeggings.png rename to resources/mods/mekanism/textures/items/BronzeLeggings.png diff --git a/bin/minecraft/mods/mekanism/textures/items/BronzePaxel.png b/resources/mods/mekanism/textures/items/BronzePaxel.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/BronzePaxel.png rename to resources/mods/mekanism/textures/items/BronzePaxel.png diff --git a/bin/minecraft/mods/mekanism/textures/items/BronzePickaxe.png b/resources/mods/mekanism/textures/items/BronzePickaxe.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/BronzePickaxe.png rename to resources/mods/mekanism/textures/items/BronzePickaxe.png diff --git a/bin/minecraft/mods/mekanism/textures/items/BronzeShovel.png b/resources/mods/mekanism/textures/items/BronzeShovel.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/BronzeShovel.png rename to resources/mods/mekanism/textures/items/BronzeShovel.png diff --git a/bin/minecraft/mods/mekanism/textures/items/BronzeSword.png b/resources/mods/mekanism/textures/items/BronzeSword.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/BronzeSword.png rename to resources/mods/mekanism/textures/items/BronzeSword.png diff --git a/bin/minecraft/mods/mekanism/textures/items/CompressedCarbon.png b/resources/mods/mekanism/textures/items/CompressedCarbon.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/CompressedCarbon.png rename to resources/mods/mekanism/textures/items/CompressedCarbon.png diff --git a/bin/minecraft/mods/mekanism/textures/items/Configurator.png b/resources/mods/mekanism/textures/items/Configurator.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/Configurator.png rename to resources/mods/mekanism/textures/items/Configurator.png diff --git a/bin/minecraft/mods/mekanism/textures/items/ControlCircuit.png b/resources/mods/mekanism/textures/items/ControlCircuit.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/ControlCircuit.png rename to resources/mods/mekanism/textures/items/ControlCircuit.png diff --git a/bin/minecraft/mods/mekanism/textures/items/CopperClump.png b/resources/mods/mekanism/textures/items/CopperClump.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/CopperClump.png rename to resources/mods/mekanism/textures/items/CopperClump.png diff --git a/bin/minecraft/mods/mekanism/textures/items/CopperDust.png b/resources/mods/mekanism/textures/items/CopperDust.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/CopperDust.png rename to resources/mods/mekanism/textures/items/CopperDust.png diff --git a/bin/minecraft/mods/mekanism/textures/items/DiamondDust.png b/resources/mods/mekanism/textures/items/DiamondDust.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/DiamondDust.png rename to resources/mods/mekanism/textures/items/DiamondDust.png diff --git a/bin/minecraft/mods/mekanism/textures/items/DiamondPaxel.png b/resources/mods/mekanism/textures/items/DiamondPaxel.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/DiamondPaxel.png rename to resources/mods/mekanism/textures/items/DiamondPaxel.png diff --git a/bin/minecraft/mods/mekanism/textures/items/DirtyCopperDust.png b/resources/mods/mekanism/textures/items/DirtyCopperDust.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/DirtyCopperDust.png rename to resources/mods/mekanism/textures/items/DirtyCopperDust.png diff --git a/bin/minecraft/mods/mekanism/textures/items/DirtyGoldDust.png b/resources/mods/mekanism/textures/items/DirtyGoldDust.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/DirtyGoldDust.png rename to resources/mods/mekanism/textures/items/DirtyGoldDust.png diff --git a/bin/minecraft/mods/mekanism/textures/items/DirtyIronDust.png b/resources/mods/mekanism/textures/items/DirtyIronDust.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/DirtyIronDust.png rename to resources/mods/mekanism/textures/items/DirtyIronDust.png diff --git a/bin/minecraft/mods/mekanism/textures/items/DirtyObsidianDust.png b/resources/mods/mekanism/textures/items/DirtyObsidianDust.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/DirtyObsidianDust.png rename to resources/mods/mekanism/textures/items/DirtyObsidianDust.png diff --git a/bin/minecraft/mods/mekanism/textures/items/DirtyOsmiumDust.png b/resources/mods/mekanism/textures/items/DirtyOsmiumDust.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/DirtyOsmiumDust.png rename to resources/mods/mekanism/textures/items/DirtyOsmiumDust.png diff --git a/bin/minecraft/mods/mekanism/textures/items/DirtySilverDust.png b/resources/mods/mekanism/textures/items/DirtySilverDust.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/DirtySilverDust.png rename to resources/mods/mekanism/textures/items/DirtySilverDust.png diff --git a/bin/minecraft/mods/mekanism/textures/items/DirtyTinDust.png b/resources/mods/mekanism/textures/items/DirtyTinDust.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/DirtyTinDust.png rename to resources/mods/mekanism/textures/items/DirtyTinDust.png diff --git a/bin/minecraft/mods/mekanism/textures/items/ElectricBow.png b/resources/mods/mekanism/textures/items/ElectricBow.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/ElectricBow.png rename to resources/mods/mekanism/textures/items/ElectricBow.png diff --git a/bin/minecraft/mods/mekanism/textures/items/ElectrolyticCore.png b/resources/mods/mekanism/textures/items/ElectrolyticCore.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/ElectrolyticCore.png rename to resources/mods/mekanism/textures/items/ElectrolyticCore.png diff --git a/bin/minecraft/mods/mekanism/textures/items/EnergyTablet.png b/resources/mods/mekanism/textures/items/EnergyTablet.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/EnergyTablet.png rename to resources/mods/mekanism/textures/items/EnergyTablet.png diff --git a/bin/minecraft/mods/mekanism/textures/items/EnergyUpgrade.png b/resources/mods/mekanism/textures/items/EnergyUpgrade.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/EnergyUpgrade.png rename to resources/mods/mekanism/textures/items/EnergyUpgrade.png diff --git a/bin/minecraft/mods/mekanism/textures/items/EnrichedAlloy.png b/resources/mods/mekanism/textures/items/EnrichedAlloy.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/EnrichedAlloy.png rename to resources/mods/mekanism/textures/items/EnrichedAlloy.png diff --git a/bin/minecraft/mods/mekanism/textures/items/EnrichedIron.png b/resources/mods/mekanism/textures/items/EnrichedIron.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/EnrichedIron.png rename to resources/mods/mekanism/textures/items/EnrichedIron.png diff --git a/bin/minecraft/mods/mekanism/textures/items/GlowstoneAxe.png b/resources/mods/mekanism/textures/items/GlowstoneAxe.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/GlowstoneAxe.png rename to resources/mods/mekanism/textures/items/GlowstoneAxe.png diff --git a/bin/minecraft/mods/mekanism/textures/items/GlowstoneBoots.png b/resources/mods/mekanism/textures/items/GlowstoneBoots.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/GlowstoneBoots.png rename to resources/mods/mekanism/textures/items/GlowstoneBoots.png diff --git a/bin/minecraft/mods/mekanism/textures/items/GlowstoneChestplate.png b/resources/mods/mekanism/textures/items/GlowstoneChestplate.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/GlowstoneChestplate.png rename to resources/mods/mekanism/textures/items/GlowstoneChestplate.png diff --git a/bin/minecraft/mods/mekanism/textures/items/GlowstoneHelmet.png b/resources/mods/mekanism/textures/items/GlowstoneHelmet.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/GlowstoneHelmet.png rename to resources/mods/mekanism/textures/items/GlowstoneHelmet.png diff --git a/bin/minecraft/mods/mekanism/textures/items/GlowstoneHoe.png b/resources/mods/mekanism/textures/items/GlowstoneHoe.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/GlowstoneHoe.png rename to resources/mods/mekanism/textures/items/GlowstoneHoe.png diff --git a/bin/minecraft/mods/mekanism/textures/items/GlowstoneIngot.png b/resources/mods/mekanism/textures/items/GlowstoneIngot.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/GlowstoneIngot.png rename to resources/mods/mekanism/textures/items/GlowstoneIngot.png diff --git a/bin/minecraft/mods/mekanism/textures/items/GlowstoneLeggings.png b/resources/mods/mekanism/textures/items/GlowstoneLeggings.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/GlowstoneLeggings.png rename to resources/mods/mekanism/textures/items/GlowstoneLeggings.png diff --git a/bin/minecraft/mods/mekanism/textures/items/GlowstonePaxel.png b/resources/mods/mekanism/textures/items/GlowstonePaxel.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/GlowstonePaxel.png rename to resources/mods/mekanism/textures/items/GlowstonePaxel.png diff --git a/bin/minecraft/mods/mekanism/textures/items/GlowstonePickaxe.png b/resources/mods/mekanism/textures/items/GlowstonePickaxe.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/GlowstonePickaxe.png rename to resources/mods/mekanism/textures/items/GlowstonePickaxe.png diff --git a/bin/minecraft/mods/mekanism/textures/items/GlowstoneShovel.png b/resources/mods/mekanism/textures/items/GlowstoneShovel.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/GlowstoneShovel.png rename to resources/mods/mekanism/textures/items/GlowstoneShovel.png diff --git a/bin/minecraft/mods/mekanism/textures/items/GlowstoneSword.png b/resources/mods/mekanism/textures/items/GlowstoneSword.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/GlowstoneSword.png rename to resources/mods/mekanism/textures/items/GlowstoneSword.png diff --git a/bin/minecraft/mods/mekanism/textures/items/GoldClump.png b/resources/mods/mekanism/textures/items/GoldClump.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/GoldClump.png rename to resources/mods/mekanism/textures/items/GoldClump.png diff --git a/bin/minecraft/mods/mekanism/textures/items/GoldDust.png b/resources/mods/mekanism/textures/items/GoldDust.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/GoldDust.png rename to resources/mods/mekanism/textures/items/GoldDust.png diff --git a/bin/minecraft/mods/mekanism/textures/items/GoldPaxel.png b/resources/mods/mekanism/textures/items/GoldPaxel.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/GoldPaxel.png rename to resources/mods/mekanism/textures/items/GoldPaxel.png diff --git a/bin/minecraft/mods/mekanism/textures/items/IronClump.png b/resources/mods/mekanism/textures/items/IronClump.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/IronClump.png rename to resources/mods/mekanism/textures/items/IronClump.png diff --git a/bin/minecraft/mods/mekanism/textures/items/IronDust.png b/resources/mods/mekanism/textures/items/IronDust.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/IronDust.png rename to resources/mods/mekanism/textures/items/IronDust.png diff --git a/bin/minecraft/mods/mekanism/textures/items/IronPaxel.png b/resources/mods/mekanism/textures/items/IronPaxel.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/IronPaxel.png rename to resources/mods/mekanism/textures/items/IronPaxel.png diff --git a/bin/minecraft/mods/mekanism/textures/items/LazuliAxe.png b/resources/mods/mekanism/textures/items/LazuliAxe.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/LazuliAxe.png rename to resources/mods/mekanism/textures/items/LazuliAxe.png diff --git a/bin/minecraft/mods/mekanism/textures/items/LazuliBoots.png b/resources/mods/mekanism/textures/items/LazuliBoots.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/LazuliBoots.png rename to resources/mods/mekanism/textures/items/LazuliBoots.png diff --git a/bin/minecraft/mods/mekanism/textures/items/LazuliChestplate.png b/resources/mods/mekanism/textures/items/LazuliChestplate.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/LazuliChestplate.png rename to resources/mods/mekanism/textures/items/LazuliChestplate.png diff --git a/bin/minecraft/mods/mekanism/textures/items/LazuliHelmet.png b/resources/mods/mekanism/textures/items/LazuliHelmet.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/LazuliHelmet.png rename to resources/mods/mekanism/textures/items/LazuliHelmet.png diff --git a/bin/minecraft/mods/mekanism/textures/items/LazuliHoe.png b/resources/mods/mekanism/textures/items/LazuliHoe.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/LazuliHoe.png rename to resources/mods/mekanism/textures/items/LazuliHoe.png diff --git a/bin/minecraft/mods/mekanism/textures/items/LazuliLeggings.png b/resources/mods/mekanism/textures/items/LazuliLeggings.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/LazuliLeggings.png rename to resources/mods/mekanism/textures/items/LazuliLeggings.png diff --git a/bin/minecraft/mods/mekanism/textures/items/LazuliPaxel.png b/resources/mods/mekanism/textures/items/LazuliPaxel.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/LazuliPaxel.png rename to resources/mods/mekanism/textures/items/LazuliPaxel.png diff --git a/bin/minecraft/mods/mekanism/textures/items/LazuliPickaxe.png b/resources/mods/mekanism/textures/items/LazuliPickaxe.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/LazuliPickaxe.png rename to resources/mods/mekanism/textures/items/LazuliPickaxe.png diff --git a/bin/minecraft/mods/mekanism/textures/items/LazuliShovel.png b/resources/mods/mekanism/textures/items/LazuliShovel.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/LazuliShovel.png rename to resources/mods/mekanism/textures/items/LazuliShovel.png diff --git a/bin/minecraft/mods/mekanism/textures/items/LazuliSword.png b/resources/mods/mekanism/textures/items/LazuliSword.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/LazuliSword.png rename to resources/mods/mekanism/textures/items/LazuliSword.png diff --git a/bin/minecraft/mods/mekanism/textures/items/LiquidEnergy.png b/resources/mods/mekanism/textures/items/LiquidEnergy.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/LiquidEnergy.png rename to resources/mods/mekanism/textures/items/LiquidEnergy.png diff --git a/bin/minecraft/mods/mekanism/textures/items/LiquidEnergy.txt b/resources/mods/mekanism/textures/items/LiquidEnergy.txt similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/LiquidEnergy.txt rename to resources/mods/mekanism/textures/items/LiquidEnergy.txt diff --git a/bin/minecraft/mods/mekanism/textures/items/LiquidHydrogen.png b/resources/mods/mekanism/textures/items/LiquidHydrogen.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/LiquidHydrogen.png rename to resources/mods/mekanism/textures/items/LiquidHydrogen.png diff --git a/bin/minecraft/mods/mekanism/textures/items/LiquidHydrogen.txt b/resources/mods/mekanism/textures/items/LiquidHydrogen.txt similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/LiquidHydrogen.txt rename to resources/mods/mekanism/textures/items/LiquidHydrogen.txt diff --git a/bin/minecraft/mods/mekanism/textures/items/LiquidOxygen.png b/resources/mods/mekanism/textures/items/LiquidOxygen.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/LiquidOxygen.png rename to resources/mods/mekanism/textures/items/LiquidOxygen.png diff --git a/bin/minecraft/mods/mekanism/textures/items/LiquidOxygen.txt b/resources/mods/mekanism/textures/items/LiquidOxygen.txt similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/LiquidOxygen.txt rename to resources/mods/mekanism/textures/items/LiquidOxygen.txt diff --git a/bin/minecraft/mods/mekanism/textures/items/ObsidianAxe.png b/resources/mods/mekanism/textures/items/ObsidianAxe.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/ObsidianAxe.png rename to resources/mods/mekanism/textures/items/ObsidianAxe.png diff --git a/bin/minecraft/mods/mekanism/textures/items/ObsidianBoots.png b/resources/mods/mekanism/textures/items/ObsidianBoots.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/ObsidianBoots.png rename to resources/mods/mekanism/textures/items/ObsidianBoots.png diff --git a/bin/minecraft/mods/mekanism/textures/items/ObsidianChestplate.png b/resources/mods/mekanism/textures/items/ObsidianChestplate.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/ObsidianChestplate.png rename to resources/mods/mekanism/textures/items/ObsidianChestplate.png diff --git a/bin/minecraft/mods/mekanism/textures/items/ObsidianDust.png b/resources/mods/mekanism/textures/items/ObsidianDust.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/ObsidianDust.png rename to resources/mods/mekanism/textures/items/ObsidianDust.png diff --git a/bin/minecraft/mods/mekanism/textures/items/ObsidianHelmet.png b/resources/mods/mekanism/textures/items/ObsidianHelmet.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/ObsidianHelmet.png rename to resources/mods/mekanism/textures/items/ObsidianHelmet.png diff --git a/bin/minecraft/mods/mekanism/textures/items/ObsidianHoe.png b/resources/mods/mekanism/textures/items/ObsidianHoe.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/ObsidianHoe.png rename to resources/mods/mekanism/textures/items/ObsidianHoe.png diff --git a/bin/minecraft/mods/mekanism/textures/items/ObsidianIngot.png b/resources/mods/mekanism/textures/items/ObsidianIngot.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/ObsidianIngot.png rename to resources/mods/mekanism/textures/items/ObsidianIngot.png diff --git a/bin/minecraft/mods/mekanism/textures/items/ObsidianLeggings.png b/resources/mods/mekanism/textures/items/ObsidianLeggings.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/ObsidianLeggings.png rename to resources/mods/mekanism/textures/items/ObsidianLeggings.png diff --git a/bin/minecraft/mods/mekanism/textures/items/ObsidianPaxel.png b/resources/mods/mekanism/textures/items/ObsidianPaxel.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/ObsidianPaxel.png rename to resources/mods/mekanism/textures/items/ObsidianPaxel.png diff --git a/bin/minecraft/mods/mekanism/textures/items/ObsidianPickaxe.png b/resources/mods/mekanism/textures/items/ObsidianPickaxe.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/ObsidianPickaxe.png rename to resources/mods/mekanism/textures/items/ObsidianPickaxe.png diff --git a/bin/minecraft/mods/mekanism/textures/items/ObsidianShovel.png b/resources/mods/mekanism/textures/items/ObsidianShovel.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/ObsidianShovel.png rename to resources/mods/mekanism/textures/items/ObsidianShovel.png diff --git a/bin/minecraft/mods/mekanism/textures/items/ObsidianSword.png b/resources/mods/mekanism/textures/items/ObsidianSword.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/ObsidianSword.png rename to resources/mods/mekanism/textures/items/ObsidianSword.png diff --git a/bin/minecraft/mods/mekanism/textures/items/OsmiumAxe.png b/resources/mods/mekanism/textures/items/OsmiumAxe.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/OsmiumAxe.png rename to resources/mods/mekanism/textures/items/OsmiumAxe.png diff --git a/bin/minecraft/mods/mekanism/textures/items/OsmiumBoots.png b/resources/mods/mekanism/textures/items/OsmiumBoots.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/OsmiumBoots.png rename to resources/mods/mekanism/textures/items/OsmiumBoots.png diff --git a/bin/minecraft/mods/mekanism/textures/items/OsmiumChestplate.png b/resources/mods/mekanism/textures/items/OsmiumChestplate.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/OsmiumChestplate.png rename to resources/mods/mekanism/textures/items/OsmiumChestplate.png diff --git a/bin/minecraft/mods/mekanism/textures/items/OsmiumClump.png b/resources/mods/mekanism/textures/items/OsmiumClump.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/OsmiumClump.png rename to resources/mods/mekanism/textures/items/OsmiumClump.png diff --git a/bin/minecraft/mods/mekanism/textures/items/OsmiumDust.png b/resources/mods/mekanism/textures/items/OsmiumDust.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/OsmiumDust.png rename to resources/mods/mekanism/textures/items/OsmiumDust.png diff --git a/bin/minecraft/mods/mekanism/textures/items/OsmiumHelmet.png b/resources/mods/mekanism/textures/items/OsmiumHelmet.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/OsmiumHelmet.png rename to resources/mods/mekanism/textures/items/OsmiumHelmet.png diff --git a/bin/minecraft/mods/mekanism/textures/items/OsmiumHoe.png b/resources/mods/mekanism/textures/items/OsmiumHoe.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/OsmiumHoe.png rename to resources/mods/mekanism/textures/items/OsmiumHoe.png diff --git a/bin/minecraft/mods/mekanism/textures/items/OsmiumIngot.png b/resources/mods/mekanism/textures/items/OsmiumIngot.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/OsmiumIngot.png rename to resources/mods/mekanism/textures/items/OsmiumIngot.png diff --git a/bin/minecraft/mods/mekanism/textures/items/OsmiumLeggings.png b/resources/mods/mekanism/textures/items/OsmiumLeggings.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/OsmiumLeggings.png rename to resources/mods/mekanism/textures/items/OsmiumLeggings.png diff --git a/bin/minecraft/mods/mekanism/textures/items/OsmiumPaxel.png b/resources/mods/mekanism/textures/items/OsmiumPaxel.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/OsmiumPaxel.png rename to resources/mods/mekanism/textures/items/OsmiumPaxel.png diff --git a/bin/minecraft/mods/mekanism/textures/items/OsmiumPickaxe.png b/resources/mods/mekanism/textures/items/OsmiumPickaxe.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/OsmiumPickaxe.png rename to resources/mods/mekanism/textures/items/OsmiumPickaxe.png diff --git a/bin/minecraft/mods/mekanism/textures/items/OsmiumShovel.png b/resources/mods/mekanism/textures/items/OsmiumShovel.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/OsmiumShovel.png rename to resources/mods/mekanism/textures/items/OsmiumShovel.png diff --git a/bin/minecraft/mods/mekanism/textures/items/OsmiumSword.png b/resources/mods/mekanism/textures/items/OsmiumSword.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/OsmiumSword.png rename to resources/mods/mekanism/textures/items/OsmiumSword.png diff --git a/bin/minecraft/mods/mekanism/textures/items/PortableTeleporter.png b/resources/mods/mekanism/textures/items/PortableTeleporter.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/PortableTeleporter.png rename to resources/mods/mekanism/textures/items/PortableTeleporter.png diff --git a/bin/minecraft/mods/mekanism/textures/items/SilverClump.png b/resources/mods/mekanism/textures/items/SilverClump.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/SilverClump.png rename to resources/mods/mekanism/textures/items/SilverClump.png diff --git a/bin/minecraft/mods/mekanism/textures/items/SilverDust.png b/resources/mods/mekanism/textures/items/SilverDust.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/SilverDust.png rename to resources/mods/mekanism/textures/items/SilverDust.png diff --git a/bin/minecraft/mods/mekanism/textures/items/SolarPanel.png b/resources/mods/mekanism/textures/items/SolarPanel.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/SolarPanel.png rename to resources/mods/mekanism/textures/items/SolarPanel.png diff --git a/bin/minecraft/mods/mekanism/textures/items/SpeedUpgrade.png b/resources/mods/mekanism/textures/items/SpeedUpgrade.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/SpeedUpgrade.png rename to resources/mods/mekanism/textures/items/SpeedUpgrade.png diff --git a/bin/minecraft/mods/mekanism/textures/items/SteelAxe.png b/resources/mods/mekanism/textures/items/SteelAxe.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/SteelAxe.png rename to resources/mods/mekanism/textures/items/SteelAxe.png diff --git a/bin/minecraft/mods/mekanism/textures/items/SteelBoots.png b/resources/mods/mekanism/textures/items/SteelBoots.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/SteelBoots.png rename to resources/mods/mekanism/textures/items/SteelBoots.png diff --git a/bin/minecraft/mods/mekanism/textures/items/SteelChestplate.png b/resources/mods/mekanism/textures/items/SteelChestplate.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/SteelChestplate.png rename to resources/mods/mekanism/textures/items/SteelChestplate.png diff --git a/bin/minecraft/mods/mekanism/textures/items/SteelDust.png b/resources/mods/mekanism/textures/items/SteelDust.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/SteelDust.png rename to resources/mods/mekanism/textures/items/SteelDust.png diff --git a/bin/minecraft/mods/mekanism/textures/items/SteelHelmet.png b/resources/mods/mekanism/textures/items/SteelHelmet.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/SteelHelmet.png rename to resources/mods/mekanism/textures/items/SteelHelmet.png diff --git a/bin/minecraft/mods/mekanism/textures/items/SteelHoe.png b/resources/mods/mekanism/textures/items/SteelHoe.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/SteelHoe.png rename to resources/mods/mekanism/textures/items/SteelHoe.png diff --git a/bin/minecraft/mods/mekanism/textures/items/SteelIngot.png b/resources/mods/mekanism/textures/items/SteelIngot.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/SteelIngot.png rename to resources/mods/mekanism/textures/items/SteelIngot.png diff --git a/bin/minecraft/mods/mekanism/textures/items/SteelLeggings.png b/resources/mods/mekanism/textures/items/SteelLeggings.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/SteelLeggings.png rename to resources/mods/mekanism/textures/items/SteelLeggings.png diff --git a/bin/minecraft/mods/mekanism/textures/items/SteelPaxel.png b/resources/mods/mekanism/textures/items/SteelPaxel.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/SteelPaxel.png rename to resources/mods/mekanism/textures/items/SteelPaxel.png diff --git a/bin/minecraft/mods/mekanism/textures/items/SteelPickaxe.png b/resources/mods/mekanism/textures/items/SteelPickaxe.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/SteelPickaxe.png rename to resources/mods/mekanism/textures/items/SteelPickaxe.png diff --git a/bin/minecraft/mods/mekanism/textures/items/SteelShovel.png b/resources/mods/mekanism/textures/items/SteelShovel.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/SteelShovel.png rename to resources/mods/mekanism/textures/items/SteelShovel.png diff --git a/bin/minecraft/mods/mekanism/textures/items/SteelSword.png b/resources/mods/mekanism/textures/items/SteelSword.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/SteelSword.png rename to resources/mods/mekanism/textures/items/SteelSword.png diff --git a/bin/minecraft/mods/mekanism/textures/items/StonePaxel.png b/resources/mods/mekanism/textures/items/StonePaxel.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/StonePaxel.png rename to resources/mods/mekanism/textures/items/StonePaxel.png diff --git a/bin/minecraft/mods/mekanism/textures/items/Stopwatch.png b/resources/mods/mekanism/textures/items/Stopwatch.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/Stopwatch.png rename to resources/mods/mekanism/textures/items/Stopwatch.png diff --git a/bin/minecraft/mods/mekanism/textures/items/StorageTank.png b/resources/mods/mekanism/textures/items/StorageTank.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/StorageTank.png rename to resources/mods/mekanism/textures/items/StorageTank.png diff --git a/bin/minecraft/mods/mekanism/textures/items/TeleportationCore.png b/resources/mods/mekanism/textures/items/TeleportationCore.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/TeleportationCore.png rename to resources/mods/mekanism/textures/items/TeleportationCore.png diff --git a/bin/minecraft/mods/mekanism/textures/items/TinClump.png b/resources/mods/mekanism/textures/items/TinClump.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/TinClump.png rename to resources/mods/mekanism/textures/items/TinClump.png diff --git a/bin/minecraft/mods/mekanism/textures/items/TinDust.png b/resources/mods/mekanism/textures/items/TinDust.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/TinDust.png rename to resources/mods/mekanism/textures/items/TinDust.png diff --git a/bin/minecraft/mods/mekanism/textures/items/WeatherOrb.png b/resources/mods/mekanism/textures/items/WeatherOrb.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/WeatherOrb.png rename to resources/mods/mekanism/textures/items/WeatherOrb.png diff --git a/bin/minecraft/mods/mekanism/textures/items/WoodPaxel.png b/resources/mods/mekanism/textures/items/WoodPaxel.png similarity index 100% rename from bin/minecraft/mods/mekanism/textures/items/WoodPaxel.png rename to resources/mods/mekanism/textures/items/WoodPaxel.png