diff --git a/build.gradle b/build.gradle new file mode 100644 index 000000000..4da106fad --- /dev/null +++ b/build.gradle @@ -0,0 +1,43 @@ +buildscript { + repositories { + mavenCentral() + maven { + name = "forge" + url = "http://files.minecraftforge.net/maven" + } + maven { + name = "sonatype" + url = "https://oss.sonatype.org/content/repositories/snapshots/" + } + } + dependencies { + classpath 'net.minecraftforge.gradle:ForgeGradle:1.1-SNAPSHOT' + } +} + +apply plugin: 'forge' +apply plugin: 'scala' + +version = "2.0.0" +group= "li.cil.oc" // http://maven.apache.org/guides/mini/guide-naming-conventions.html +archivesBaseName = "OpenComputers" + +minecraft { + version = "1.7.2-10.12.0.1024" + assetDir = "eclipse/assets" +} +processResources +{ + // replace stuff in mcmod.info, nothing else + from(sourceSets.main.resources.srcDirs) { + include 'mcmod.info' + + // replace version and mcversion + expand 'version':project.version, 'mcversion':project.minecraft.version + } + + // copy everything else, thats not the mcmod.info + from(sourceSets.main.resources.srcDirs) { + exclude 'mcmod.info' + } +} \ No newline at end of file diff --git a/src/main/optional/buildcraft/api/tools/IToolWrench.java b/src/api/java/buildcraft/api/tools/IToolWrench.java similarity index 100% rename from src/main/optional/buildcraft/api/tools/IToolWrench.java rename to src/api/java/buildcraft/api/tools/IToolWrench.java diff --git a/src/main/optional/dan200/computer/api/ComputerCraftAPI.java b/src/api/java/dan200/computer/api/ComputerCraftAPI.java similarity index 100% rename from src/main/optional/dan200/computer/api/ComputerCraftAPI.java rename to src/api/java/dan200/computer/api/ComputerCraftAPI.java diff --git a/src/main/optional/dan200/computer/api/IComputerAccess.java b/src/api/java/dan200/computer/api/IComputerAccess.java similarity index 100% rename from src/main/optional/dan200/computer/api/IComputerAccess.java rename to src/api/java/dan200/computer/api/IComputerAccess.java diff --git a/src/main/optional/dan200/computer/api/IHostedPeripheral.java b/src/api/java/dan200/computer/api/IHostedPeripheral.java similarity index 100% rename from src/main/optional/dan200/computer/api/IHostedPeripheral.java rename to src/api/java/dan200/computer/api/IHostedPeripheral.java diff --git a/src/main/optional/dan200/computer/api/ILuaContext.java b/src/api/java/dan200/computer/api/ILuaContext.java similarity index 100% rename from src/main/optional/dan200/computer/api/ILuaContext.java rename to src/api/java/dan200/computer/api/ILuaContext.java diff --git a/src/main/optional/dan200/computer/api/ILuaObject.java b/src/api/java/dan200/computer/api/ILuaObject.java similarity index 100% rename from src/main/optional/dan200/computer/api/ILuaObject.java rename to src/api/java/dan200/computer/api/ILuaObject.java diff --git a/src/main/optional/dan200/computer/api/IMedia.java b/src/api/java/dan200/computer/api/IMedia.java similarity index 100% rename from src/main/optional/dan200/computer/api/IMedia.java rename to src/api/java/dan200/computer/api/IMedia.java diff --git a/src/main/optional/dan200/computer/api/IMount.java b/src/api/java/dan200/computer/api/IMount.java similarity index 100% rename from src/main/optional/dan200/computer/api/IMount.java rename to src/api/java/dan200/computer/api/IMount.java diff --git a/src/main/optional/dan200/computer/api/IPeripheral.java b/src/api/java/dan200/computer/api/IPeripheral.java similarity index 100% rename from src/main/optional/dan200/computer/api/IPeripheral.java rename to src/api/java/dan200/computer/api/IPeripheral.java diff --git a/src/main/optional/dan200/computer/api/IPeripheralHandler.java b/src/api/java/dan200/computer/api/IPeripheralHandler.java similarity index 100% rename from src/main/optional/dan200/computer/api/IPeripheralHandler.java rename to src/api/java/dan200/computer/api/IPeripheralHandler.java diff --git a/src/main/optional/dan200/computer/api/IWritableMount.java b/src/api/java/dan200/computer/api/IWritableMount.java similarity index 100% rename from src/main/optional/dan200/computer/api/IWritableMount.java rename to src/api/java/dan200/computer/api/IWritableMount.java diff --git a/src/main/optional/dan200/turtle/api/ITurtleAccess.java b/src/api/java/dan200/turtle/api/ITurtleAccess.java similarity index 100% rename from src/main/optional/dan200/turtle/api/ITurtleAccess.java rename to src/api/java/dan200/turtle/api/ITurtleAccess.java diff --git a/src/main/optional/dan200/turtle/api/ITurtleCommandHandler.java b/src/api/java/dan200/turtle/api/ITurtleCommandHandler.java similarity index 100% rename from src/main/optional/dan200/turtle/api/ITurtleCommandHandler.java rename to src/api/java/dan200/turtle/api/ITurtleCommandHandler.java diff --git a/src/main/optional/dan200/turtle/api/ITurtleUpgrade.java b/src/api/java/dan200/turtle/api/ITurtleUpgrade.java similarity index 100% rename from src/main/optional/dan200/turtle/api/ITurtleUpgrade.java rename to src/api/java/dan200/turtle/api/ITurtleUpgrade.java diff --git a/src/main/optional/dan200/turtle/api/TurtleAPI.java b/src/api/java/dan200/turtle/api/TurtleAPI.java similarity index 100% rename from src/main/optional/dan200/turtle/api/TurtleAPI.java rename to src/api/java/dan200/turtle/api/TurtleAPI.java diff --git a/src/main/optional/dan200/turtle/api/TurtleSide.java b/src/api/java/dan200/turtle/api/TurtleSide.java similarity index 100% rename from src/main/optional/dan200/turtle/api/TurtleSide.java rename to src/api/java/dan200/turtle/api/TurtleSide.java diff --git a/src/main/optional/dan200/turtle/api/TurtleUpgradeType.java b/src/api/java/dan200/turtle/api/TurtleUpgradeType.java similarity index 100% rename from src/main/optional/dan200/turtle/api/TurtleUpgradeType.java rename to src/api/java/dan200/turtle/api/TurtleUpgradeType.java diff --git a/src/main/optional/dan200/turtle/api/TurtleVerb.java b/src/api/java/dan200/turtle/api/TurtleVerb.java similarity index 100% rename from src/main/optional/dan200/turtle/api/TurtleVerb.java rename to src/api/java/dan200/turtle/api/TurtleVerb.java diff --git a/src/main/optional/mods/immibis/redlogic/api/wiring/IBundledEmitter.java b/src/api/java/mods/immibis/redlogic/api/wiring/IBundledEmitter.java similarity index 100% rename from src/main/optional/mods/immibis/redlogic/api/wiring/IBundledEmitter.java rename to src/api/java/mods/immibis/redlogic/api/wiring/IBundledEmitter.java diff --git a/src/main/optional/mods/immibis/redlogic/api/wiring/IBundledUpdatable.java b/src/api/java/mods/immibis/redlogic/api/wiring/IBundledUpdatable.java similarity index 100% rename from src/main/optional/mods/immibis/redlogic/api/wiring/IBundledUpdatable.java rename to src/api/java/mods/immibis/redlogic/api/wiring/IBundledUpdatable.java diff --git a/src/main/optional/mods/immibis/redlogic/api/wiring/IConnectable.java b/src/api/java/mods/immibis/redlogic/api/wiring/IConnectable.java similarity index 100% rename from src/main/optional/mods/immibis/redlogic/api/wiring/IConnectable.java rename to src/api/java/mods/immibis/redlogic/api/wiring/IConnectable.java diff --git a/src/main/optional/mods/immibis/redlogic/api/wiring/IInsulatedRedstoneWire.java b/src/api/java/mods/immibis/redlogic/api/wiring/IInsulatedRedstoneWire.java similarity index 100% rename from src/main/optional/mods/immibis/redlogic/api/wiring/IInsulatedRedstoneWire.java rename to src/api/java/mods/immibis/redlogic/api/wiring/IInsulatedRedstoneWire.java diff --git a/src/main/optional/mods/immibis/redlogic/api/wiring/IRedstoneEmitter.java b/src/api/java/mods/immibis/redlogic/api/wiring/IRedstoneEmitter.java similarity index 100% rename from src/main/optional/mods/immibis/redlogic/api/wiring/IRedstoneEmitter.java rename to src/api/java/mods/immibis/redlogic/api/wiring/IRedstoneEmitter.java diff --git a/src/main/optional/mods/immibis/redlogic/api/wiring/IRedstoneUpdatable.java b/src/api/java/mods/immibis/redlogic/api/wiring/IRedstoneUpdatable.java similarity index 100% rename from src/main/optional/mods/immibis/redlogic/api/wiring/IRedstoneUpdatable.java rename to src/api/java/mods/immibis/redlogic/api/wiring/IRedstoneUpdatable.java diff --git a/src/main/optional/mods/immibis/redlogic/api/wiring/IRedstoneWire.java b/src/api/java/mods/immibis/redlogic/api/wiring/IRedstoneWire.java similarity index 100% rename from src/main/optional/mods/immibis/redlogic/api/wiring/IRedstoneWire.java rename to src/api/java/mods/immibis/redlogic/api/wiring/IRedstoneWire.java diff --git a/src/main/optional/mods/immibis/redlogic/api/wiring/IWire.java b/src/api/java/mods/immibis/redlogic/api/wiring/IWire.java similarity index 100% rename from src/main/optional/mods/immibis/redlogic/api/wiring/IWire.java rename to src/api/java/mods/immibis/redlogic/api/wiring/IWire.java diff --git a/src/main/optional/mrtjp/projectred/api/IBundledEmitter.java b/src/api/java/mrtjp/projectred/api/IBundledEmitter.java similarity index 100% rename from src/main/optional/mrtjp/projectred/api/IBundledEmitter.java rename to src/api/java/mrtjp/projectred/api/IBundledEmitter.java diff --git a/src/main/optional/mrtjp/projectred/api/IBundledTile.java b/src/api/java/mrtjp/projectred/api/IBundledTile.java similarity index 100% rename from src/main/optional/mrtjp/projectred/api/IBundledTile.java rename to src/api/java/mrtjp/projectred/api/IBundledTile.java diff --git a/src/main/optional/mrtjp/projectred/api/IConnectable.java b/src/api/java/mrtjp/projectred/api/IConnectable.java similarity index 100% rename from src/main/optional/mrtjp/projectred/api/IConnectable.java rename to src/api/java/mrtjp/projectred/api/IConnectable.java diff --git a/src/main/optional/mrtjp/projectred/api/IScrewdriver.java b/src/api/java/mrtjp/projectred/api/IScrewdriver.java similarity index 100% rename from src/main/optional/mrtjp/projectred/api/IScrewdriver.java rename to src/api/java/mrtjp/projectred/api/IScrewdriver.java diff --git a/src/main/optional/mrtjp/projectred/api/ISpecialLinkState.java b/src/api/java/mrtjp/projectred/api/ISpecialLinkState.java similarity index 100% rename from src/main/optional/mrtjp/projectred/api/ISpecialLinkState.java rename to src/api/java/mrtjp/projectred/api/ISpecialLinkState.java diff --git a/src/main/optional/mrtjp/projectred/api/ITransmissionAPI.java b/src/api/java/mrtjp/projectred/api/ITransmissionAPI.java similarity index 100% rename from src/main/optional/mrtjp/projectred/api/ITransmissionAPI.java rename to src/api/java/mrtjp/projectred/api/ITransmissionAPI.java diff --git a/src/main/optional/mrtjp/projectred/api/ITransportationAPI.java b/src/api/java/mrtjp/projectred/api/ITransportationAPI.java similarity index 100% rename from src/main/optional/mrtjp/projectred/api/ITransportationAPI.java rename to src/api/java/mrtjp/projectred/api/ITransportationAPI.java diff --git a/src/main/optional/mrtjp/projectred/api/ProjectRedAPI.java b/src/api/java/mrtjp/projectred/api/ProjectRedAPI.java similarity index 100% rename from src/main/optional/mrtjp/projectred/api/ProjectRedAPI.java rename to src/api/java/mrtjp/projectred/api/ProjectRedAPI.java diff --git a/src/main/optional/powercrystals/minefactoryreloaded/api/rednet/IConnectableRedNet.java b/src/api/java/powercrystals/minefactoryreloaded/api/rednet/IConnectableRedNet.java similarity index 100% rename from src/main/optional/powercrystals/minefactoryreloaded/api/rednet/IConnectableRedNet.java rename to src/api/java/powercrystals/minefactoryreloaded/api/rednet/IConnectableRedNet.java diff --git a/src/main/optional/powercrystals/minefactoryreloaded/api/rednet/IRedNetNetworkContainer.java b/src/api/java/powercrystals/minefactoryreloaded/api/rednet/IRedNetNetworkContainer.java similarity index 100% rename from src/main/optional/powercrystals/minefactoryreloaded/api/rednet/IRedNetNetworkContainer.java rename to src/api/java/powercrystals/minefactoryreloaded/api/rednet/IRedNetNetworkContainer.java diff --git a/src/main/optional/powercrystals/minefactoryreloaded/api/rednet/RedNetConnectionType.java b/src/api/java/powercrystals/minefactoryreloaded/api/rednet/RedNetConnectionType.java similarity index 100% rename from src/main/optional/powercrystals/minefactoryreloaded/api/rednet/RedNetConnectionType.java rename to src/api/java/powercrystals/minefactoryreloaded/api/rednet/RedNetConnectionType.java diff --git a/src/main/optional/stargatetech2/api/IFactory.java b/src/api/java/stargatetech2/api/IFactory.java similarity index 100% rename from src/main/optional/stargatetech2/api/IFactory.java rename to src/api/java/stargatetech2/api/IFactory.java diff --git a/src/main/optional/stargatetech2/api/IStargateTechAPI.java b/src/api/java/stargatetech2/api/IStargateTechAPI.java similarity index 100% rename from src/main/optional/stargatetech2/api/IStargateTechAPI.java rename to src/api/java/stargatetech2/api/IStargateTechAPI.java diff --git a/src/main/optional/stargatetech2/api/ITabletAccess.java b/src/api/java/stargatetech2/api/ITabletAccess.java similarity index 100% rename from src/main/optional/stargatetech2/api/ITabletAccess.java rename to src/api/java/stargatetech2/api/ITabletAccess.java diff --git a/src/main/optional/stargatetech2/api/StargateTechAPI.java b/src/api/java/stargatetech2/api/StargateTechAPI.java similarity index 100% rename from src/main/optional/stargatetech2/api/StargateTechAPI.java rename to src/api/java/stargatetech2/api/StargateTechAPI.java diff --git a/src/main/optional/stargatetech2/api/bus/BusEvent.java b/src/api/java/stargatetech2/api/bus/BusEvent.java similarity index 100% rename from src/main/optional/stargatetech2/api/bus/BusEvent.java rename to src/api/java/stargatetech2/api/bus/BusEvent.java diff --git a/src/main/optional/stargatetech2/api/bus/BusPacket.java b/src/api/java/stargatetech2/api/bus/BusPacket.java similarity index 100% rename from src/main/optional/stargatetech2/api/bus/BusPacket.java rename to src/api/java/stargatetech2/api/bus/BusPacket.java diff --git a/src/main/optional/stargatetech2/api/bus/BusPacketLIP.java b/src/api/java/stargatetech2/api/bus/BusPacketLIP.java similarity index 100% rename from src/main/optional/stargatetech2/api/bus/BusPacketLIP.java rename to src/api/java/stargatetech2/api/bus/BusPacketLIP.java diff --git a/src/main/optional/stargatetech2/api/bus/BusProtocols.java b/src/api/java/stargatetech2/api/bus/BusProtocols.java similarity index 100% rename from src/main/optional/stargatetech2/api/bus/BusProtocols.java rename to src/api/java/stargatetech2/api/bus/BusProtocols.java diff --git a/src/main/optional/stargatetech2/api/bus/IBusDevice.java b/src/api/java/stargatetech2/api/bus/IBusDevice.java similarity index 100% rename from src/main/optional/stargatetech2/api/bus/IBusDevice.java rename to src/api/java/stargatetech2/api/bus/IBusDevice.java diff --git a/src/main/optional/stargatetech2/api/bus/IBusDriver.java b/src/api/java/stargatetech2/api/bus/IBusDriver.java similarity index 100% rename from src/main/optional/stargatetech2/api/bus/IBusDriver.java rename to src/api/java/stargatetech2/api/bus/IBusDriver.java diff --git a/src/main/optional/stargatetech2/api/bus/IBusInterface.java b/src/api/java/stargatetech2/api/bus/IBusInterface.java similarity index 100% rename from src/main/optional/stargatetech2/api/bus/IBusInterface.java rename to src/api/java/stargatetech2/api/bus/IBusInterface.java diff --git a/src/main/optional/stargatetech2/api/shields/IShieldable.java b/src/api/java/stargatetech2/api/shields/IShieldable.java similarity index 100% rename from src/main/optional/stargatetech2/api/shields/IShieldable.java rename to src/api/java/stargatetech2/api/shields/IShieldable.java diff --git a/src/main/optional/stargatetech2/api/shields/ITileShieldEmitter.java b/src/api/java/stargatetech2/api/shields/ITileShieldEmitter.java similarity index 100% rename from src/main/optional/stargatetech2/api/shields/ITileShieldEmitter.java rename to src/api/java/stargatetech2/api/shields/ITileShieldEmitter.java diff --git a/src/main/optional/stargatetech2/api/shields/ShieldPermissions.java b/src/api/java/stargatetech2/api/shields/ShieldPermissions.java similarity index 100% rename from src/main/optional/stargatetech2/api/shields/ShieldPermissions.java rename to src/api/java/stargatetech2/api/shields/ShieldPermissions.java diff --git a/src/main/optional/stargatetech2/api/stargate/Address.java b/src/api/java/stargatetech2/api/stargate/Address.java similarity index 100% rename from src/main/optional/stargatetech2/api/stargate/Address.java rename to src/api/java/stargatetech2/api/stargate/Address.java diff --git a/src/main/optional/stargatetech2/api/stargate/IStargateNetwork.java b/src/api/java/stargatetech2/api/stargate/IStargateNetwork.java similarity index 100% rename from src/main/optional/stargatetech2/api/stargate/IStargateNetwork.java rename to src/api/java/stargatetech2/api/stargate/IStargateNetwork.java diff --git a/src/main/optional/stargatetech2/api/stargate/ITileStargate.java b/src/api/java/stargatetech2/api/stargate/ITileStargate.java similarity index 100% rename from src/main/optional/stargatetech2/api/stargate/ITileStargate.java rename to src/api/java/stargatetech2/api/stargate/ITileStargate.java diff --git a/src/main/optional/stargatetech2/api/stargate/ITileStargateBase.java b/src/api/java/stargatetech2/api/stargate/ITileStargateBase.java similarity index 100% rename from src/main/optional/stargatetech2/api/stargate/ITileStargateBase.java rename to src/api/java/stargatetech2/api/stargate/ITileStargateBase.java diff --git a/src/main/optional/stargatetech2/api/stargate/Symbol.java b/src/api/java/stargatetech2/api/stargate/Symbol.java similarity index 100% rename from src/main/optional/stargatetech2/api/stargate/Symbol.java rename to src/api/java/stargatetech2/api/stargate/Symbol.java diff --git a/src/main/optional/universalelectricity/api/energy/IEnergyContainer.java b/src/api/java/universalelectricity/api/energy/IEnergyContainer.java similarity index 100% rename from src/main/optional/universalelectricity/api/energy/IEnergyContainer.java rename to src/api/java/universalelectricity/api/energy/IEnergyContainer.java diff --git a/src/main/optional/universalelectricity/api/energy/IEnergyInterface.java b/src/api/java/universalelectricity/api/energy/IEnergyInterface.java similarity index 100% rename from src/main/optional/universalelectricity/api/energy/IEnergyInterface.java rename to src/api/java/universalelectricity/api/energy/IEnergyInterface.java diff --git a/src/main/optional/universalelectricity/api/net/IConnectable.java b/src/api/java/universalelectricity/api/net/IConnectable.java similarity index 100% rename from src/main/optional/universalelectricity/api/net/IConnectable.java rename to src/api/java/universalelectricity/api/net/IConnectable.java diff --git a/src/main/required/com/naef/jnlua/Converter.java b/src/main/java/com/naef/jnlua/Converter.java similarity index 100% rename from src/main/required/com/naef/jnlua/Converter.java rename to src/main/java/com/naef/jnlua/Converter.java diff --git a/src/main/required/com/naef/jnlua/DefaultConverter.java b/src/main/java/com/naef/jnlua/DefaultConverter.java similarity index 100% rename from src/main/required/com/naef/jnlua/DefaultConverter.java rename to src/main/java/com/naef/jnlua/DefaultConverter.java diff --git a/src/main/required/com/naef/jnlua/DefaultJavaReflector.java b/src/main/java/com/naef/jnlua/DefaultJavaReflector.java similarity index 100% rename from src/main/required/com/naef/jnlua/DefaultJavaReflector.java rename to src/main/java/com/naef/jnlua/DefaultJavaReflector.java diff --git a/src/main/required/com/naef/jnlua/JavaFunction.java b/src/main/java/com/naef/jnlua/JavaFunction.java similarity index 100% rename from src/main/required/com/naef/jnlua/JavaFunction.java rename to src/main/java/com/naef/jnlua/JavaFunction.java diff --git a/src/main/required/com/naef/jnlua/JavaModule.java b/src/main/java/com/naef/jnlua/JavaModule.java similarity index 100% rename from src/main/required/com/naef/jnlua/JavaModule.java rename to src/main/java/com/naef/jnlua/JavaModule.java diff --git a/src/main/required/com/naef/jnlua/JavaReflector.java b/src/main/java/com/naef/jnlua/JavaReflector.java similarity index 100% rename from src/main/required/com/naef/jnlua/JavaReflector.java rename to src/main/java/com/naef/jnlua/JavaReflector.java diff --git a/src/main/required/com/naef/jnlua/LuaError.java b/src/main/java/com/naef/jnlua/LuaError.java similarity index 100% rename from src/main/required/com/naef/jnlua/LuaError.java rename to src/main/java/com/naef/jnlua/LuaError.java diff --git a/src/main/required/com/naef/jnlua/LuaException.java b/src/main/java/com/naef/jnlua/LuaException.java similarity index 100% rename from src/main/required/com/naef/jnlua/LuaException.java rename to src/main/java/com/naef/jnlua/LuaException.java diff --git a/src/main/required/com/naef/jnlua/LuaGcMetamethodException.java b/src/main/java/com/naef/jnlua/LuaGcMetamethodException.java similarity index 100% rename from src/main/required/com/naef/jnlua/LuaGcMetamethodException.java rename to src/main/java/com/naef/jnlua/LuaGcMetamethodException.java diff --git a/src/main/required/com/naef/jnlua/LuaMemoryAllocationException.java b/src/main/java/com/naef/jnlua/LuaMemoryAllocationException.java similarity index 100% rename from src/main/required/com/naef/jnlua/LuaMemoryAllocationException.java rename to src/main/java/com/naef/jnlua/LuaMemoryAllocationException.java diff --git a/src/main/required/com/naef/jnlua/LuaMessageHandlerException.java b/src/main/java/com/naef/jnlua/LuaMessageHandlerException.java similarity index 100% rename from src/main/required/com/naef/jnlua/LuaMessageHandlerException.java rename to src/main/java/com/naef/jnlua/LuaMessageHandlerException.java diff --git a/src/main/required/com/naef/jnlua/LuaRuntimeException.java b/src/main/java/com/naef/jnlua/LuaRuntimeException.java similarity index 100% rename from src/main/required/com/naef/jnlua/LuaRuntimeException.java rename to src/main/java/com/naef/jnlua/LuaRuntimeException.java diff --git a/src/main/required/com/naef/jnlua/LuaStackTraceElement.java b/src/main/java/com/naef/jnlua/LuaStackTraceElement.java similarity index 100% rename from src/main/required/com/naef/jnlua/LuaStackTraceElement.java rename to src/main/java/com/naef/jnlua/LuaStackTraceElement.java diff --git a/src/main/required/com/naef/jnlua/LuaState.java b/src/main/java/com/naef/jnlua/LuaState.java similarity index 100% rename from src/main/required/com/naef/jnlua/LuaState.java rename to src/main/java/com/naef/jnlua/LuaState.java diff --git a/src/main/required/com/naef/jnlua/LuaSyntaxException.java b/src/main/java/com/naef/jnlua/LuaSyntaxException.java similarity index 100% rename from src/main/required/com/naef/jnlua/LuaSyntaxException.java rename to src/main/java/com/naef/jnlua/LuaSyntaxException.java diff --git a/src/main/required/com/naef/jnlua/LuaType.java b/src/main/java/com/naef/jnlua/LuaType.java similarity index 100% rename from src/main/required/com/naef/jnlua/LuaType.java rename to src/main/java/com/naef/jnlua/LuaType.java diff --git a/src/main/required/com/naef/jnlua/LuaValueProxy.java b/src/main/java/com/naef/jnlua/LuaValueProxy.java similarity index 100% rename from src/main/required/com/naef/jnlua/LuaValueProxy.java rename to src/main/java/com/naef/jnlua/LuaValueProxy.java diff --git a/src/main/required/com/naef/jnlua/NamedJavaFunction.java b/src/main/java/com/naef/jnlua/NamedJavaFunction.java similarity index 100% rename from src/main/required/com/naef/jnlua/NamedJavaFunction.java rename to src/main/java/com/naef/jnlua/NamedJavaFunction.java diff --git a/src/main/required/com/naef/jnlua/NativeSupport.java b/src/main/java/com/naef/jnlua/NativeSupport.java similarity index 100% rename from src/main/required/com/naef/jnlua/NativeSupport.java rename to src/main/java/com/naef/jnlua/NativeSupport.java diff --git a/src/main/required/com/naef/jnlua/TypedJavaObject.java b/src/main/java/com/naef/jnlua/TypedJavaObject.java similarity index 100% rename from src/main/required/com/naef/jnlua/TypedJavaObject.java rename to src/main/java/com/naef/jnlua/TypedJavaObject.java diff --git a/src/main/required/com/naef/jnlua/package.html b/src/main/java/com/naef/jnlua/package.html similarity index 100% rename from src/main/required/com/naef/jnlua/package.html rename to src/main/java/com/naef/jnlua/package.html diff --git a/src/main/required/com/naef/jnlua/util/AbstractTableList.java b/src/main/java/com/naef/jnlua/util/AbstractTableList.java similarity index 100% rename from src/main/required/com/naef/jnlua/util/AbstractTableList.java rename to src/main/java/com/naef/jnlua/util/AbstractTableList.java diff --git a/src/main/required/com/naef/jnlua/util/AbstractTableMap.java b/src/main/java/com/naef/jnlua/util/AbstractTableMap.java similarity index 100% rename from src/main/required/com/naef/jnlua/util/AbstractTableMap.java rename to src/main/java/com/naef/jnlua/util/AbstractTableMap.java diff --git a/src/main/required/com/naef/jnlua/util/package.html b/src/main/java/com/naef/jnlua/util/package.html similarity index 100% rename from src/main/required/com/naef/jnlua/util/package.html rename to src/main/java/com/naef/jnlua/util/package.html diff --git a/src/main/required/com/typesafe/config/Config.java b/src/main/java/com/typesafe/config/Config.java similarity index 100% rename from src/main/required/com/typesafe/config/Config.java rename to src/main/java/com/typesafe/config/Config.java diff --git a/src/main/required/com/typesafe/config/ConfigException.java b/src/main/java/com/typesafe/config/ConfigException.java similarity index 100% rename from src/main/required/com/typesafe/config/ConfigException.java rename to src/main/java/com/typesafe/config/ConfigException.java diff --git a/src/main/required/com/typesafe/config/ConfigFactory.java b/src/main/java/com/typesafe/config/ConfigFactory.java similarity index 100% rename from src/main/required/com/typesafe/config/ConfigFactory.java rename to src/main/java/com/typesafe/config/ConfigFactory.java diff --git a/src/main/required/com/typesafe/config/ConfigIncludeContext.java b/src/main/java/com/typesafe/config/ConfigIncludeContext.java similarity index 100% rename from src/main/required/com/typesafe/config/ConfigIncludeContext.java rename to src/main/java/com/typesafe/config/ConfigIncludeContext.java diff --git a/src/main/required/com/typesafe/config/ConfigIncluder.java b/src/main/java/com/typesafe/config/ConfigIncluder.java similarity index 100% rename from src/main/required/com/typesafe/config/ConfigIncluder.java rename to src/main/java/com/typesafe/config/ConfigIncluder.java diff --git a/src/main/required/com/typesafe/config/ConfigIncluderClasspath.java b/src/main/java/com/typesafe/config/ConfigIncluderClasspath.java similarity index 100% rename from src/main/required/com/typesafe/config/ConfigIncluderClasspath.java rename to src/main/java/com/typesafe/config/ConfigIncluderClasspath.java diff --git a/src/main/required/com/typesafe/config/ConfigIncluderFile.java b/src/main/java/com/typesafe/config/ConfigIncluderFile.java similarity index 100% rename from src/main/required/com/typesafe/config/ConfigIncluderFile.java rename to src/main/java/com/typesafe/config/ConfigIncluderFile.java diff --git a/src/main/required/com/typesafe/config/ConfigIncluderURL.java b/src/main/java/com/typesafe/config/ConfigIncluderURL.java similarity index 100% rename from src/main/required/com/typesafe/config/ConfigIncluderURL.java rename to src/main/java/com/typesafe/config/ConfigIncluderURL.java diff --git a/src/main/required/com/typesafe/config/ConfigList.java b/src/main/java/com/typesafe/config/ConfigList.java similarity index 100% rename from src/main/required/com/typesafe/config/ConfigList.java rename to src/main/java/com/typesafe/config/ConfigList.java diff --git a/src/main/required/com/typesafe/config/ConfigMergeable.java b/src/main/java/com/typesafe/config/ConfigMergeable.java similarity index 100% rename from src/main/required/com/typesafe/config/ConfigMergeable.java rename to src/main/java/com/typesafe/config/ConfigMergeable.java diff --git a/src/main/required/com/typesafe/config/ConfigObject.java b/src/main/java/com/typesafe/config/ConfigObject.java similarity index 100% rename from src/main/required/com/typesafe/config/ConfigObject.java rename to src/main/java/com/typesafe/config/ConfigObject.java diff --git a/src/main/required/com/typesafe/config/ConfigOrigin.java b/src/main/java/com/typesafe/config/ConfigOrigin.java similarity index 100% rename from src/main/required/com/typesafe/config/ConfigOrigin.java rename to src/main/java/com/typesafe/config/ConfigOrigin.java diff --git a/src/main/required/com/typesafe/config/ConfigParseOptions.java b/src/main/java/com/typesafe/config/ConfigParseOptions.java similarity index 100% rename from src/main/required/com/typesafe/config/ConfigParseOptions.java rename to src/main/java/com/typesafe/config/ConfigParseOptions.java diff --git a/src/main/required/com/typesafe/config/ConfigParseable.java b/src/main/java/com/typesafe/config/ConfigParseable.java similarity index 100% rename from src/main/required/com/typesafe/config/ConfigParseable.java rename to src/main/java/com/typesafe/config/ConfigParseable.java diff --git a/src/main/required/com/typesafe/config/ConfigRenderOptions.java b/src/main/java/com/typesafe/config/ConfigRenderOptions.java similarity index 100% rename from src/main/required/com/typesafe/config/ConfigRenderOptions.java rename to src/main/java/com/typesafe/config/ConfigRenderOptions.java diff --git a/src/main/required/com/typesafe/config/ConfigResolveOptions.java b/src/main/java/com/typesafe/config/ConfigResolveOptions.java similarity index 100% rename from src/main/required/com/typesafe/config/ConfigResolveOptions.java rename to src/main/java/com/typesafe/config/ConfigResolveOptions.java diff --git a/src/main/required/com/typesafe/config/ConfigSyntax.java b/src/main/java/com/typesafe/config/ConfigSyntax.java similarity index 100% rename from src/main/required/com/typesafe/config/ConfigSyntax.java rename to src/main/java/com/typesafe/config/ConfigSyntax.java diff --git a/src/main/required/com/typesafe/config/ConfigUtil.java b/src/main/java/com/typesafe/config/ConfigUtil.java similarity index 100% rename from src/main/required/com/typesafe/config/ConfigUtil.java rename to src/main/java/com/typesafe/config/ConfigUtil.java diff --git a/src/main/required/com/typesafe/config/ConfigValue.java b/src/main/java/com/typesafe/config/ConfigValue.java similarity index 100% rename from src/main/required/com/typesafe/config/ConfigValue.java rename to src/main/java/com/typesafe/config/ConfigValue.java diff --git a/src/main/required/com/typesafe/config/ConfigValueFactory.java b/src/main/java/com/typesafe/config/ConfigValueFactory.java similarity index 100% rename from src/main/required/com/typesafe/config/ConfigValueFactory.java rename to src/main/java/com/typesafe/config/ConfigValueFactory.java diff --git a/src/main/required/com/typesafe/config/ConfigValueType.java b/src/main/java/com/typesafe/config/ConfigValueType.java similarity index 100% rename from src/main/required/com/typesafe/config/ConfigValueType.java rename to src/main/java/com/typesafe/config/ConfigValueType.java diff --git a/src/main/required/com/typesafe/config/impl/AbstractConfigObject.java b/src/main/java/com/typesafe/config/impl/AbstractConfigObject.java similarity index 100% rename from src/main/required/com/typesafe/config/impl/AbstractConfigObject.java rename to src/main/java/com/typesafe/config/impl/AbstractConfigObject.java diff --git a/src/main/required/com/typesafe/config/impl/AbstractConfigValue.java b/src/main/java/com/typesafe/config/impl/AbstractConfigValue.java similarity index 100% rename from src/main/required/com/typesafe/config/impl/AbstractConfigValue.java rename to src/main/java/com/typesafe/config/impl/AbstractConfigValue.java diff --git a/src/main/required/com/typesafe/config/impl/ConfigBoolean.java b/src/main/java/com/typesafe/config/impl/ConfigBoolean.java similarity index 100% rename from src/main/required/com/typesafe/config/impl/ConfigBoolean.java rename to src/main/java/com/typesafe/config/impl/ConfigBoolean.java diff --git a/src/main/required/com/typesafe/config/impl/ConfigConcatenation.java b/src/main/java/com/typesafe/config/impl/ConfigConcatenation.java similarity index 100% rename from src/main/required/com/typesafe/config/impl/ConfigConcatenation.java rename to src/main/java/com/typesafe/config/impl/ConfigConcatenation.java diff --git a/src/main/required/com/typesafe/config/impl/ConfigDelayedMerge.java b/src/main/java/com/typesafe/config/impl/ConfigDelayedMerge.java similarity index 100% rename from src/main/required/com/typesafe/config/impl/ConfigDelayedMerge.java rename to src/main/java/com/typesafe/config/impl/ConfigDelayedMerge.java diff --git a/src/main/required/com/typesafe/config/impl/ConfigDelayedMergeObject.java b/src/main/java/com/typesafe/config/impl/ConfigDelayedMergeObject.java similarity index 100% rename from src/main/required/com/typesafe/config/impl/ConfigDelayedMergeObject.java rename to src/main/java/com/typesafe/config/impl/ConfigDelayedMergeObject.java diff --git a/src/main/required/com/typesafe/config/impl/ConfigDouble.java b/src/main/java/com/typesafe/config/impl/ConfigDouble.java similarity index 100% rename from src/main/required/com/typesafe/config/impl/ConfigDouble.java rename to src/main/java/com/typesafe/config/impl/ConfigDouble.java diff --git a/src/main/required/com/typesafe/config/impl/ConfigImpl.java b/src/main/java/com/typesafe/config/impl/ConfigImpl.java similarity index 100% rename from src/main/required/com/typesafe/config/impl/ConfigImpl.java rename to src/main/java/com/typesafe/config/impl/ConfigImpl.java diff --git a/src/main/required/com/typesafe/config/impl/ConfigImplUtil.java b/src/main/java/com/typesafe/config/impl/ConfigImplUtil.java similarity index 100% rename from src/main/required/com/typesafe/config/impl/ConfigImplUtil.java rename to src/main/java/com/typesafe/config/impl/ConfigImplUtil.java diff --git a/src/main/required/com/typesafe/config/impl/ConfigInt.java b/src/main/java/com/typesafe/config/impl/ConfigInt.java similarity index 100% rename from src/main/required/com/typesafe/config/impl/ConfigInt.java rename to src/main/java/com/typesafe/config/impl/ConfigInt.java diff --git a/src/main/required/com/typesafe/config/impl/ConfigLong.java b/src/main/java/com/typesafe/config/impl/ConfigLong.java similarity index 100% rename from src/main/required/com/typesafe/config/impl/ConfigLong.java rename to src/main/java/com/typesafe/config/impl/ConfigLong.java diff --git a/src/main/required/com/typesafe/config/impl/ConfigNull.java b/src/main/java/com/typesafe/config/impl/ConfigNull.java similarity index 100% rename from src/main/required/com/typesafe/config/impl/ConfigNull.java rename to src/main/java/com/typesafe/config/impl/ConfigNull.java diff --git a/src/main/required/com/typesafe/config/impl/ConfigNumber.java b/src/main/java/com/typesafe/config/impl/ConfigNumber.java similarity index 100% rename from src/main/required/com/typesafe/config/impl/ConfigNumber.java rename to src/main/java/com/typesafe/config/impl/ConfigNumber.java diff --git a/src/main/required/com/typesafe/config/impl/ConfigReference.java b/src/main/java/com/typesafe/config/impl/ConfigReference.java similarity index 100% rename from src/main/required/com/typesafe/config/impl/ConfigReference.java rename to src/main/java/com/typesafe/config/impl/ConfigReference.java diff --git a/src/main/required/com/typesafe/config/impl/ConfigString.java b/src/main/java/com/typesafe/config/impl/ConfigString.java similarity index 100% rename from src/main/required/com/typesafe/config/impl/ConfigString.java rename to src/main/java/com/typesafe/config/impl/ConfigString.java diff --git a/src/main/required/com/typesafe/config/impl/DefaultTransformer.java b/src/main/java/com/typesafe/config/impl/DefaultTransformer.java similarity index 100% rename from src/main/required/com/typesafe/config/impl/DefaultTransformer.java rename to src/main/java/com/typesafe/config/impl/DefaultTransformer.java diff --git a/src/main/required/com/typesafe/config/impl/FromMapMode.java b/src/main/java/com/typesafe/config/impl/FromMapMode.java similarity index 100% rename from src/main/required/com/typesafe/config/impl/FromMapMode.java rename to src/main/java/com/typesafe/config/impl/FromMapMode.java diff --git a/src/main/required/com/typesafe/config/impl/FullIncluder.java b/src/main/java/com/typesafe/config/impl/FullIncluder.java similarity index 100% rename from src/main/required/com/typesafe/config/impl/FullIncluder.java rename to src/main/java/com/typesafe/config/impl/FullIncluder.java diff --git a/src/main/required/com/typesafe/config/impl/MemoKey.java b/src/main/java/com/typesafe/config/impl/MemoKey.java similarity index 100% rename from src/main/required/com/typesafe/config/impl/MemoKey.java rename to src/main/java/com/typesafe/config/impl/MemoKey.java diff --git a/src/main/required/com/typesafe/config/impl/MergeableValue.java b/src/main/java/com/typesafe/config/impl/MergeableValue.java similarity index 100% rename from src/main/required/com/typesafe/config/impl/MergeableValue.java rename to src/main/java/com/typesafe/config/impl/MergeableValue.java diff --git a/src/main/required/com/typesafe/config/impl/OriginType.java b/src/main/java/com/typesafe/config/impl/OriginType.java similarity index 100% rename from src/main/required/com/typesafe/config/impl/OriginType.java rename to src/main/java/com/typesafe/config/impl/OriginType.java diff --git a/src/main/required/com/typesafe/config/impl/Parseable.java b/src/main/java/com/typesafe/config/impl/Parseable.java similarity index 100% rename from src/main/required/com/typesafe/config/impl/Parseable.java rename to src/main/java/com/typesafe/config/impl/Parseable.java diff --git a/src/main/required/com/typesafe/config/impl/Parser.java b/src/main/java/com/typesafe/config/impl/Parser.java similarity index 100% rename from src/main/required/com/typesafe/config/impl/Parser.java rename to src/main/java/com/typesafe/config/impl/Parser.java diff --git a/src/main/required/com/typesafe/config/impl/Path.java b/src/main/java/com/typesafe/config/impl/Path.java similarity index 100% rename from src/main/required/com/typesafe/config/impl/Path.java rename to src/main/java/com/typesafe/config/impl/Path.java diff --git a/src/main/required/com/typesafe/config/impl/PathBuilder.java b/src/main/java/com/typesafe/config/impl/PathBuilder.java similarity index 100% rename from src/main/required/com/typesafe/config/impl/PathBuilder.java rename to src/main/java/com/typesafe/config/impl/PathBuilder.java diff --git a/src/main/required/com/typesafe/config/impl/PropertiesParser.java b/src/main/java/com/typesafe/config/impl/PropertiesParser.java similarity index 100% rename from src/main/required/com/typesafe/config/impl/PropertiesParser.java rename to src/main/java/com/typesafe/config/impl/PropertiesParser.java diff --git a/src/main/required/com/typesafe/config/impl/ReplaceableMergeStack.java b/src/main/java/com/typesafe/config/impl/ReplaceableMergeStack.java similarity index 100% rename from src/main/required/com/typesafe/config/impl/ReplaceableMergeStack.java rename to src/main/java/com/typesafe/config/impl/ReplaceableMergeStack.java diff --git a/src/main/required/com/typesafe/config/impl/ResolveContext.java b/src/main/java/com/typesafe/config/impl/ResolveContext.java similarity index 100% rename from src/main/required/com/typesafe/config/impl/ResolveContext.java rename to src/main/java/com/typesafe/config/impl/ResolveContext.java diff --git a/src/main/required/com/typesafe/config/impl/ResolveMemos.java b/src/main/java/com/typesafe/config/impl/ResolveMemos.java similarity index 100% rename from src/main/required/com/typesafe/config/impl/ResolveMemos.java rename to src/main/java/com/typesafe/config/impl/ResolveMemos.java diff --git a/src/main/required/com/typesafe/config/impl/ResolveReplacer.java b/src/main/java/com/typesafe/config/impl/ResolveReplacer.java similarity index 100% rename from src/main/required/com/typesafe/config/impl/ResolveReplacer.java rename to src/main/java/com/typesafe/config/impl/ResolveReplacer.java diff --git a/src/main/required/com/typesafe/config/impl/ResolveSource.java b/src/main/java/com/typesafe/config/impl/ResolveSource.java similarity index 100% rename from src/main/required/com/typesafe/config/impl/ResolveSource.java rename to src/main/java/com/typesafe/config/impl/ResolveSource.java diff --git a/src/main/required/com/typesafe/config/impl/ResolveStatus.java b/src/main/java/com/typesafe/config/impl/ResolveStatus.java similarity index 100% rename from src/main/required/com/typesafe/config/impl/ResolveStatus.java rename to src/main/java/com/typesafe/config/impl/ResolveStatus.java diff --git a/src/main/required/com/typesafe/config/impl/SerializedConfigValue.java b/src/main/java/com/typesafe/config/impl/SerializedConfigValue.java similarity index 100% rename from src/main/required/com/typesafe/config/impl/SerializedConfigValue.java rename to src/main/java/com/typesafe/config/impl/SerializedConfigValue.java diff --git a/src/main/required/com/typesafe/config/impl/SimpleConfig.java b/src/main/java/com/typesafe/config/impl/SimpleConfig.java similarity index 100% rename from src/main/required/com/typesafe/config/impl/SimpleConfig.java rename to src/main/java/com/typesafe/config/impl/SimpleConfig.java diff --git a/src/main/required/com/typesafe/config/impl/SimpleConfigList.java b/src/main/java/com/typesafe/config/impl/SimpleConfigList.java similarity index 100% rename from src/main/required/com/typesafe/config/impl/SimpleConfigList.java rename to src/main/java/com/typesafe/config/impl/SimpleConfigList.java diff --git a/src/main/required/com/typesafe/config/impl/SimpleConfigObject.java b/src/main/java/com/typesafe/config/impl/SimpleConfigObject.java similarity index 100% rename from src/main/required/com/typesafe/config/impl/SimpleConfigObject.java rename to src/main/java/com/typesafe/config/impl/SimpleConfigObject.java diff --git a/src/main/required/com/typesafe/config/impl/SimpleConfigOrigin.java b/src/main/java/com/typesafe/config/impl/SimpleConfigOrigin.java similarity index 100% rename from src/main/required/com/typesafe/config/impl/SimpleConfigOrigin.java rename to src/main/java/com/typesafe/config/impl/SimpleConfigOrigin.java diff --git a/src/main/required/com/typesafe/config/impl/SimpleIncludeContext.java b/src/main/java/com/typesafe/config/impl/SimpleIncludeContext.java similarity index 100% rename from src/main/required/com/typesafe/config/impl/SimpleIncludeContext.java rename to src/main/java/com/typesafe/config/impl/SimpleIncludeContext.java diff --git a/src/main/required/com/typesafe/config/impl/SimpleIncluder.java b/src/main/java/com/typesafe/config/impl/SimpleIncluder.java similarity index 100% rename from src/main/required/com/typesafe/config/impl/SimpleIncluder.java rename to src/main/java/com/typesafe/config/impl/SimpleIncluder.java diff --git a/src/main/required/com/typesafe/config/impl/SubstitutionExpression.java b/src/main/java/com/typesafe/config/impl/SubstitutionExpression.java similarity index 100% rename from src/main/required/com/typesafe/config/impl/SubstitutionExpression.java rename to src/main/java/com/typesafe/config/impl/SubstitutionExpression.java diff --git a/src/main/required/com/typesafe/config/impl/Token.java b/src/main/java/com/typesafe/config/impl/Token.java similarity index 100% rename from src/main/required/com/typesafe/config/impl/Token.java rename to src/main/java/com/typesafe/config/impl/Token.java diff --git a/src/main/required/com/typesafe/config/impl/TokenType.java b/src/main/java/com/typesafe/config/impl/TokenType.java similarity index 100% rename from src/main/required/com/typesafe/config/impl/TokenType.java rename to src/main/java/com/typesafe/config/impl/TokenType.java diff --git a/src/main/required/com/typesafe/config/impl/Tokenizer.java b/src/main/java/com/typesafe/config/impl/Tokenizer.java similarity index 100% rename from src/main/required/com/typesafe/config/impl/Tokenizer.java rename to src/main/java/com/typesafe/config/impl/Tokenizer.java diff --git a/src/main/required/com/typesafe/config/impl/Tokens.java b/src/main/java/com/typesafe/config/impl/Tokens.java similarity index 100% rename from src/main/required/com/typesafe/config/impl/Tokens.java rename to src/main/java/com/typesafe/config/impl/Tokens.java diff --git a/src/main/required/com/typesafe/config/impl/Unmergeable.java b/src/main/java/com/typesafe/config/impl/Unmergeable.java similarity index 100% rename from src/main/required/com/typesafe/config/impl/Unmergeable.java rename to src/main/java/com/typesafe/config/impl/Unmergeable.java diff --git a/src/main/required/com/typesafe/config/package.html b/src/main/java/com/typesafe/config/package.html similarity index 100% rename from src/main/required/com/typesafe/config/package.html rename to src/main/java/com/typesafe/config/package.html diff --git a/src/main/required/javax/annotation/CheckReturnValue.java b/src/main/java/javax/annotation/CheckReturnValue.java similarity index 100% rename from src/main/required/javax/annotation/CheckReturnValue.java rename to src/main/java/javax/annotation/CheckReturnValue.java diff --git a/src/main/required/javax/annotation/Nonnull.java b/src/main/java/javax/annotation/Nonnull.java similarity index 100% rename from src/main/required/javax/annotation/Nonnull.java rename to src/main/java/javax/annotation/Nonnull.java diff --git a/src/main/required/javax/annotation/Nullable.java b/src/main/java/javax/annotation/Nullable.java similarity index 100% rename from src/main/required/javax/annotation/Nullable.java rename to src/main/java/javax/annotation/Nullable.java diff --git a/src/main/required/javax/annotation/meta/TypeQualifier.java b/src/main/java/javax/annotation/meta/TypeQualifier.java similarity index 100% rename from src/main/required/javax/annotation/meta/TypeQualifier.java rename to src/main/java/javax/annotation/meta/TypeQualifier.java diff --git a/src/main/required/javax/annotation/meta/TypeQualifierValidator.java b/src/main/java/javax/annotation/meta/TypeQualifierValidator.java similarity index 100% rename from src/main/required/javax/annotation/meta/TypeQualifierValidator.java rename to src/main/java/javax/annotation/meta/TypeQualifierValidator.java diff --git a/src/main/required/javax/annotation/meta/When.java b/src/main/java/javax/annotation/meta/When.java similarity index 100% rename from src/main/required/javax/annotation/meta/When.java rename to src/main/java/javax/annotation/meta/When.java diff --git a/src/main/required/org/luaj/vm3/Buffer.java b/src/main/java/org/luaj/vm3/Buffer.java similarity index 100% rename from src/main/required/org/luaj/vm3/Buffer.java rename to src/main/java/org/luaj/vm3/Buffer.java diff --git a/src/main/required/org/luaj/vm3/Globals.java b/src/main/java/org/luaj/vm3/Globals.java similarity index 100% rename from src/main/required/org/luaj/vm3/Globals.java rename to src/main/java/org/luaj/vm3/Globals.java diff --git a/src/main/required/org/luaj/vm3/LoadState.java b/src/main/java/org/luaj/vm3/LoadState.java similarity index 100% rename from src/main/required/org/luaj/vm3/LoadState.java rename to src/main/java/org/luaj/vm3/LoadState.java diff --git a/src/main/required/org/luaj/vm3/LocVars.java b/src/main/java/org/luaj/vm3/LocVars.java similarity index 100% rename from src/main/required/org/luaj/vm3/LocVars.java rename to src/main/java/org/luaj/vm3/LocVars.java diff --git a/src/main/required/org/luaj/vm3/Lua.java b/src/main/java/org/luaj/vm3/Lua.java similarity index 100% rename from src/main/required/org/luaj/vm3/Lua.java rename to src/main/java/org/luaj/vm3/Lua.java diff --git a/src/main/required/org/luaj/vm3/LuaBoolean.java b/src/main/java/org/luaj/vm3/LuaBoolean.java similarity index 100% rename from src/main/required/org/luaj/vm3/LuaBoolean.java rename to src/main/java/org/luaj/vm3/LuaBoolean.java diff --git a/src/main/required/org/luaj/vm3/LuaClosure.java b/src/main/java/org/luaj/vm3/LuaClosure.java similarity index 100% rename from src/main/required/org/luaj/vm3/LuaClosure.java rename to src/main/java/org/luaj/vm3/LuaClosure.java diff --git a/src/main/required/org/luaj/vm3/LuaDouble.java b/src/main/java/org/luaj/vm3/LuaDouble.java similarity index 100% rename from src/main/required/org/luaj/vm3/LuaDouble.java rename to src/main/java/org/luaj/vm3/LuaDouble.java diff --git a/src/main/required/org/luaj/vm3/LuaError.java b/src/main/java/org/luaj/vm3/LuaError.java similarity index 100% rename from src/main/required/org/luaj/vm3/LuaError.java rename to src/main/java/org/luaj/vm3/LuaError.java diff --git a/src/main/required/org/luaj/vm3/LuaFunction.java b/src/main/java/org/luaj/vm3/LuaFunction.java similarity index 100% rename from src/main/required/org/luaj/vm3/LuaFunction.java rename to src/main/java/org/luaj/vm3/LuaFunction.java diff --git a/src/main/required/org/luaj/vm3/LuaInteger.java b/src/main/java/org/luaj/vm3/LuaInteger.java similarity index 100% rename from src/main/required/org/luaj/vm3/LuaInteger.java rename to src/main/java/org/luaj/vm3/LuaInteger.java diff --git a/src/main/required/org/luaj/vm3/LuaNil.java b/src/main/java/org/luaj/vm3/LuaNil.java similarity index 100% rename from src/main/required/org/luaj/vm3/LuaNil.java rename to src/main/java/org/luaj/vm3/LuaNil.java diff --git a/src/main/required/org/luaj/vm3/LuaNumber.java b/src/main/java/org/luaj/vm3/LuaNumber.java similarity index 100% rename from src/main/required/org/luaj/vm3/LuaNumber.java rename to src/main/java/org/luaj/vm3/LuaNumber.java diff --git a/src/main/required/org/luaj/vm3/LuaString.java b/src/main/java/org/luaj/vm3/LuaString.java similarity index 100% rename from src/main/required/org/luaj/vm3/LuaString.java rename to src/main/java/org/luaj/vm3/LuaString.java diff --git a/src/main/required/org/luaj/vm3/LuaTable.java b/src/main/java/org/luaj/vm3/LuaTable.java similarity index 100% rename from src/main/required/org/luaj/vm3/LuaTable.java rename to src/main/java/org/luaj/vm3/LuaTable.java diff --git a/src/main/required/org/luaj/vm3/LuaThread.java b/src/main/java/org/luaj/vm3/LuaThread.java similarity index 100% rename from src/main/required/org/luaj/vm3/LuaThread.java rename to src/main/java/org/luaj/vm3/LuaThread.java diff --git a/src/main/required/org/luaj/vm3/LuaUserdata.java b/src/main/java/org/luaj/vm3/LuaUserdata.java similarity index 100% rename from src/main/required/org/luaj/vm3/LuaUserdata.java rename to src/main/java/org/luaj/vm3/LuaUserdata.java diff --git a/src/main/required/org/luaj/vm3/LuaValue.java b/src/main/java/org/luaj/vm3/LuaValue.java similarity index 100% rename from src/main/required/org/luaj/vm3/LuaValue.java rename to src/main/java/org/luaj/vm3/LuaValue.java diff --git a/src/main/required/org/luaj/vm3/Metatable.java b/src/main/java/org/luaj/vm3/Metatable.java similarity index 100% rename from src/main/required/org/luaj/vm3/Metatable.java rename to src/main/java/org/luaj/vm3/Metatable.java diff --git a/src/main/required/org/luaj/vm3/NonTableMetatable.java b/src/main/java/org/luaj/vm3/NonTableMetatable.java similarity index 100% rename from src/main/required/org/luaj/vm3/NonTableMetatable.java rename to src/main/java/org/luaj/vm3/NonTableMetatable.java diff --git a/src/main/required/org/luaj/vm3/OrphanedThread.java b/src/main/java/org/luaj/vm3/OrphanedThread.java similarity index 100% rename from src/main/required/org/luaj/vm3/OrphanedThread.java rename to src/main/java/org/luaj/vm3/OrphanedThread.java diff --git a/src/main/required/org/luaj/vm3/Print.java b/src/main/java/org/luaj/vm3/Print.java similarity index 100% rename from src/main/required/org/luaj/vm3/Print.java rename to src/main/java/org/luaj/vm3/Print.java diff --git a/src/main/required/org/luaj/vm3/Prototype.java b/src/main/java/org/luaj/vm3/Prototype.java similarity index 100% rename from src/main/required/org/luaj/vm3/Prototype.java rename to src/main/java/org/luaj/vm3/Prototype.java diff --git a/src/main/required/org/luaj/vm3/TailcallVarargs.java b/src/main/java/org/luaj/vm3/TailcallVarargs.java similarity index 100% rename from src/main/required/org/luaj/vm3/TailcallVarargs.java rename to src/main/java/org/luaj/vm3/TailcallVarargs.java diff --git a/src/main/required/org/luaj/vm3/UpValue.java b/src/main/java/org/luaj/vm3/UpValue.java similarity index 100% rename from src/main/required/org/luaj/vm3/UpValue.java rename to src/main/java/org/luaj/vm3/UpValue.java diff --git a/src/main/required/org/luaj/vm3/Upvaldesc.java b/src/main/java/org/luaj/vm3/Upvaldesc.java similarity index 100% rename from src/main/required/org/luaj/vm3/Upvaldesc.java rename to src/main/java/org/luaj/vm3/Upvaldesc.java diff --git a/src/main/required/org/luaj/vm3/Varargs.java b/src/main/java/org/luaj/vm3/Varargs.java similarity index 100% rename from src/main/required/org/luaj/vm3/Varargs.java rename to src/main/java/org/luaj/vm3/Varargs.java diff --git a/src/main/required/org/luaj/vm3/WeakTable.java b/src/main/java/org/luaj/vm3/WeakTable.java similarity index 100% rename from src/main/required/org/luaj/vm3/WeakTable.java rename to src/main/java/org/luaj/vm3/WeakTable.java diff --git a/src/main/required/org/luaj/vm3/ast/Block.java b/src/main/java/org/luaj/vm3/ast/Block.java similarity index 100% rename from src/main/required/org/luaj/vm3/ast/Block.java rename to src/main/java/org/luaj/vm3/ast/Block.java diff --git a/src/main/required/org/luaj/vm3/ast/Chunk.java b/src/main/java/org/luaj/vm3/ast/Chunk.java similarity index 100% rename from src/main/required/org/luaj/vm3/ast/Chunk.java rename to src/main/java/org/luaj/vm3/ast/Chunk.java diff --git a/src/main/required/org/luaj/vm3/ast/Exp.java b/src/main/java/org/luaj/vm3/ast/Exp.java similarity index 100% rename from src/main/required/org/luaj/vm3/ast/Exp.java rename to src/main/java/org/luaj/vm3/ast/Exp.java diff --git a/src/main/required/org/luaj/vm3/ast/FuncArgs.java b/src/main/java/org/luaj/vm3/ast/FuncArgs.java similarity index 100% rename from src/main/required/org/luaj/vm3/ast/FuncArgs.java rename to src/main/java/org/luaj/vm3/ast/FuncArgs.java diff --git a/src/main/required/org/luaj/vm3/ast/FuncBody.java b/src/main/java/org/luaj/vm3/ast/FuncBody.java similarity index 100% rename from src/main/required/org/luaj/vm3/ast/FuncBody.java rename to src/main/java/org/luaj/vm3/ast/FuncBody.java diff --git a/src/main/required/org/luaj/vm3/ast/FuncName.java b/src/main/java/org/luaj/vm3/ast/FuncName.java similarity index 100% rename from src/main/required/org/luaj/vm3/ast/FuncName.java rename to src/main/java/org/luaj/vm3/ast/FuncName.java diff --git a/src/main/required/org/luaj/vm3/ast/Name.java b/src/main/java/org/luaj/vm3/ast/Name.java similarity index 100% rename from src/main/required/org/luaj/vm3/ast/Name.java rename to src/main/java/org/luaj/vm3/ast/Name.java diff --git a/src/main/required/org/luaj/vm3/ast/NameResolver.java b/src/main/java/org/luaj/vm3/ast/NameResolver.java similarity index 100% rename from src/main/required/org/luaj/vm3/ast/NameResolver.java rename to src/main/java/org/luaj/vm3/ast/NameResolver.java diff --git a/src/main/required/org/luaj/vm3/ast/NameScope.java b/src/main/java/org/luaj/vm3/ast/NameScope.java similarity index 100% rename from src/main/required/org/luaj/vm3/ast/NameScope.java rename to src/main/java/org/luaj/vm3/ast/NameScope.java diff --git a/src/main/required/org/luaj/vm3/ast/ParList.java b/src/main/java/org/luaj/vm3/ast/ParList.java similarity index 100% rename from src/main/required/org/luaj/vm3/ast/ParList.java rename to src/main/java/org/luaj/vm3/ast/ParList.java diff --git a/src/main/required/org/luaj/vm3/ast/Stat.java b/src/main/java/org/luaj/vm3/ast/Stat.java similarity index 100% rename from src/main/required/org/luaj/vm3/ast/Stat.java rename to src/main/java/org/luaj/vm3/ast/Stat.java diff --git a/src/main/required/org/luaj/vm3/ast/Str.java b/src/main/java/org/luaj/vm3/ast/Str.java similarity index 100% rename from src/main/required/org/luaj/vm3/ast/Str.java rename to src/main/java/org/luaj/vm3/ast/Str.java diff --git a/src/main/required/org/luaj/vm3/ast/SyntaxElement.java b/src/main/java/org/luaj/vm3/ast/SyntaxElement.java similarity index 100% rename from src/main/required/org/luaj/vm3/ast/SyntaxElement.java rename to src/main/java/org/luaj/vm3/ast/SyntaxElement.java diff --git a/src/main/required/org/luaj/vm3/ast/TableConstructor.java b/src/main/java/org/luaj/vm3/ast/TableConstructor.java similarity index 100% rename from src/main/required/org/luaj/vm3/ast/TableConstructor.java rename to src/main/java/org/luaj/vm3/ast/TableConstructor.java diff --git a/src/main/required/org/luaj/vm3/ast/TableField.java b/src/main/java/org/luaj/vm3/ast/TableField.java similarity index 100% rename from src/main/required/org/luaj/vm3/ast/TableField.java rename to src/main/java/org/luaj/vm3/ast/TableField.java diff --git a/src/main/required/org/luaj/vm3/ast/Variable.java b/src/main/java/org/luaj/vm3/ast/Variable.java similarity index 100% rename from src/main/required/org/luaj/vm3/ast/Variable.java rename to src/main/java/org/luaj/vm3/ast/Variable.java diff --git a/src/main/required/org/luaj/vm3/ast/Visitor.java b/src/main/java/org/luaj/vm3/ast/Visitor.java similarity index 100% rename from src/main/required/org/luaj/vm3/ast/Visitor.java rename to src/main/java/org/luaj/vm3/ast/Visitor.java diff --git a/src/main/required/org/luaj/vm3/compiler/DumpState.java b/src/main/java/org/luaj/vm3/compiler/DumpState.java similarity index 100% rename from src/main/required/org/luaj/vm3/compiler/DumpState.java rename to src/main/java/org/luaj/vm3/compiler/DumpState.java diff --git a/src/main/required/org/luaj/vm3/compiler/FuncState.java b/src/main/java/org/luaj/vm3/compiler/FuncState.java similarity index 100% rename from src/main/required/org/luaj/vm3/compiler/FuncState.java rename to src/main/java/org/luaj/vm3/compiler/FuncState.java diff --git a/src/main/required/org/luaj/vm3/compiler/InstructionPtr.java b/src/main/java/org/luaj/vm3/compiler/InstructionPtr.java similarity index 100% rename from src/main/required/org/luaj/vm3/compiler/InstructionPtr.java rename to src/main/java/org/luaj/vm3/compiler/InstructionPtr.java diff --git a/src/main/required/org/luaj/vm3/compiler/IntPtr.java b/src/main/java/org/luaj/vm3/compiler/IntPtr.java similarity index 100% rename from src/main/required/org/luaj/vm3/compiler/IntPtr.java rename to src/main/java/org/luaj/vm3/compiler/IntPtr.java diff --git a/src/main/required/org/luaj/vm3/compiler/LexState.java b/src/main/java/org/luaj/vm3/compiler/LexState.java similarity index 100% rename from src/main/required/org/luaj/vm3/compiler/LexState.java rename to src/main/java/org/luaj/vm3/compiler/LexState.java diff --git a/src/main/required/org/luaj/vm3/compiler/LuaC.java b/src/main/java/org/luaj/vm3/compiler/LuaC.java similarity index 100% rename from src/main/required/org/luaj/vm3/compiler/LuaC.java rename to src/main/java/org/luaj/vm3/compiler/LuaC.java diff --git a/src/main/required/org/luaj/vm3/lib/BaseLib.java b/src/main/java/org/luaj/vm3/lib/BaseLib.java similarity index 100% rename from src/main/required/org/luaj/vm3/lib/BaseLib.java rename to src/main/java/org/luaj/vm3/lib/BaseLib.java diff --git a/src/main/required/org/luaj/vm3/lib/Bit32Lib.java b/src/main/java/org/luaj/vm3/lib/Bit32Lib.java similarity index 100% rename from src/main/required/org/luaj/vm3/lib/Bit32Lib.java rename to src/main/java/org/luaj/vm3/lib/Bit32Lib.java diff --git a/src/main/required/org/luaj/vm3/lib/CoroutineLib.java b/src/main/java/org/luaj/vm3/lib/CoroutineLib.java similarity index 100% rename from src/main/required/org/luaj/vm3/lib/CoroutineLib.java rename to src/main/java/org/luaj/vm3/lib/CoroutineLib.java diff --git a/src/main/required/org/luaj/vm3/lib/DebugLib.java b/src/main/java/org/luaj/vm3/lib/DebugLib.java similarity index 100% rename from src/main/required/org/luaj/vm3/lib/DebugLib.java rename to src/main/java/org/luaj/vm3/lib/DebugLib.java diff --git a/src/main/required/org/luaj/vm3/lib/IoLib.java b/src/main/java/org/luaj/vm3/lib/IoLib.java similarity index 100% rename from src/main/required/org/luaj/vm3/lib/IoLib.java rename to src/main/java/org/luaj/vm3/lib/IoLib.java diff --git a/src/main/required/org/luaj/vm3/lib/LibFunction.java b/src/main/java/org/luaj/vm3/lib/LibFunction.java similarity index 100% rename from src/main/required/org/luaj/vm3/lib/LibFunction.java rename to src/main/java/org/luaj/vm3/lib/LibFunction.java diff --git a/src/main/required/org/luaj/vm3/lib/MathLib.java b/src/main/java/org/luaj/vm3/lib/MathLib.java similarity index 100% rename from src/main/required/org/luaj/vm3/lib/MathLib.java rename to src/main/java/org/luaj/vm3/lib/MathLib.java diff --git a/src/main/required/org/luaj/vm3/lib/OneArgFunction.java b/src/main/java/org/luaj/vm3/lib/OneArgFunction.java similarity index 100% rename from src/main/required/org/luaj/vm3/lib/OneArgFunction.java rename to src/main/java/org/luaj/vm3/lib/OneArgFunction.java diff --git a/src/main/required/org/luaj/vm3/lib/OsLib.java b/src/main/java/org/luaj/vm3/lib/OsLib.java similarity index 100% rename from src/main/required/org/luaj/vm3/lib/OsLib.java rename to src/main/java/org/luaj/vm3/lib/OsLib.java diff --git a/src/main/required/org/luaj/vm3/lib/PackageLib.java b/src/main/java/org/luaj/vm3/lib/PackageLib.java similarity index 100% rename from src/main/required/org/luaj/vm3/lib/PackageLib.java rename to src/main/java/org/luaj/vm3/lib/PackageLib.java diff --git a/src/main/required/org/luaj/vm3/lib/ResourceFinder.java b/src/main/java/org/luaj/vm3/lib/ResourceFinder.java similarity index 100% rename from src/main/required/org/luaj/vm3/lib/ResourceFinder.java rename to src/main/java/org/luaj/vm3/lib/ResourceFinder.java diff --git a/src/main/required/org/luaj/vm3/lib/StringLib.java b/src/main/java/org/luaj/vm3/lib/StringLib.java similarity index 100% rename from src/main/required/org/luaj/vm3/lib/StringLib.java rename to src/main/java/org/luaj/vm3/lib/StringLib.java diff --git a/src/main/required/org/luaj/vm3/lib/TableLib.java b/src/main/java/org/luaj/vm3/lib/TableLib.java similarity index 100% rename from src/main/required/org/luaj/vm3/lib/TableLib.java rename to src/main/java/org/luaj/vm3/lib/TableLib.java diff --git a/src/main/required/org/luaj/vm3/lib/ThreeArgFunction.java b/src/main/java/org/luaj/vm3/lib/ThreeArgFunction.java similarity index 100% rename from src/main/required/org/luaj/vm3/lib/ThreeArgFunction.java rename to src/main/java/org/luaj/vm3/lib/ThreeArgFunction.java diff --git a/src/main/required/org/luaj/vm3/lib/TwoArgFunction.java b/src/main/java/org/luaj/vm3/lib/TwoArgFunction.java similarity index 100% rename from src/main/required/org/luaj/vm3/lib/TwoArgFunction.java rename to src/main/java/org/luaj/vm3/lib/TwoArgFunction.java diff --git a/src/main/required/org/luaj/vm3/lib/VarArgFunction.java b/src/main/java/org/luaj/vm3/lib/VarArgFunction.java similarity index 100% rename from src/main/required/org/luaj/vm3/lib/VarArgFunction.java rename to src/main/java/org/luaj/vm3/lib/VarArgFunction.java diff --git a/src/main/required/org/luaj/vm3/lib/ZeroArgFunction.java b/src/main/java/org/luaj/vm3/lib/ZeroArgFunction.java similarity index 100% rename from src/main/required/org/luaj/vm3/lib/ZeroArgFunction.java rename to src/main/java/org/luaj/vm3/lib/ZeroArgFunction.java diff --git a/src/main/required/org/luaj/vm3/lib/jse/CoerceJavaToLua.java b/src/main/java/org/luaj/vm3/lib/jse/CoerceJavaToLua.java similarity index 100% rename from src/main/required/org/luaj/vm3/lib/jse/CoerceJavaToLua.java rename to src/main/java/org/luaj/vm3/lib/jse/CoerceJavaToLua.java diff --git a/src/main/required/org/luaj/vm3/lib/jse/CoerceLuaToJava.java b/src/main/java/org/luaj/vm3/lib/jse/CoerceLuaToJava.java similarity index 100% rename from src/main/required/org/luaj/vm3/lib/jse/CoerceLuaToJava.java rename to src/main/java/org/luaj/vm3/lib/jse/CoerceLuaToJava.java diff --git a/src/main/required/org/luaj/vm3/lib/jse/JavaArray.java b/src/main/java/org/luaj/vm3/lib/jse/JavaArray.java similarity index 100% rename from src/main/required/org/luaj/vm3/lib/jse/JavaArray.java rename to src/main/java/org/luaj/vm3/lib/jse/JavaArray.java diff --git a/src/main/required/org/luaj/vm3/lib/jse/JavaClass.java b/src/main/java/org/luaj/vm3/lib/jse/JavaClass.java similarity index 100% rename from src/main/required/org/luaj/vm3/lib/jse/JavaClass.java rename to src/main/java/org/luaj/vm3/lib/jse/JavaClass.java diff --git a/src/main/required/org/luaj/vm3/lib/jse/JavaConstructor.java b/src/main/java/org/luaj/vm3/lib/jse/JavaConstructor.java similarity index 100% rename from src/main/required/org/luaj/vm3/lib/jse/JavaConstructor.java rename to src/main/java/org/luaj/vm3/lib/jse/JavaConstructor.java diff --git a/src/main/required/org/luaj/vm3/lib/jse/JavaInstance.java b/src/main/java/org/luaj/vm3/lib/jse/JavaInstance.java similarity index 100% rename from src/main/required/org/luaj/vm3/lib/jse/JavaInstance.java rename to src/main/java/org/luaj/vm3/lib/jse/JavaInstance.java diff --git a/src/main/required/org/luaj/vm3/lib/jse/JavaMember.java b/src/main/java/org/luaj/vm3/lib/jse/JavaMember.java similarity index 100% rename from src/main/required/org/luaj/vm3/lib/jse/JavaMember.java rename to src/main/java/org/luaj/vm3/lib/jse/JavaMember.java diff --git a/src/main/required/org/luaj/vm3/lib/jse/JavaMethod.java b/src/main/java/org/luaj/vm3/lib/jse/JavaMethod.java similarity index 100% rename from src/main/required/org/luaj/vm3/lib/jse/JavaMethod.java rename to src/main/java/org/luaj/vm3/lib/jse/JavaMethod.java diff --git a/src/main/required/org/luaj/vm3/lib/jse/JseBaseLib.java b/src/main/java/org/luaj/vm3/lib/jse/JseBaseLib.java similarity index 100% rename from src/main/required/org/luaj/vm3/lib/jse/JseBaseLib.java rename to src/main/java/org/luaj/vm3/lib/jse/JseBaseLib.java diff --git a/src/main/required/org/luaj/vm3/lib/jse/JseIoLib.java b/src/main/java/org/luaj/vm3/lib/jse/JseIoLib.java similarity index 100% rename from src/main/required/org/luaj/vm3/lib/jse/JseIoLib.java rename to src/main/java/org/luaj/vm3/lib/jse/JseIoLib.java diff --git a/src/main/required/org/luaj/vm3/lib/jse/JseMathLib.java b/src/main/java/org/luaj/vm3/lib/jse/JseMathLib.java similarity index 100% rename from src/main/required/org/luaj/vm3/lib/jse/JseMathLib.java rename to src/main/java/org/luaj/vm3/lib/jse/JseMathLib.java diff --git a/src/main/required/org/luaj/vm3/lib/jse/JseOsLib.java b/src/main/java/org/luaj/vm3/lib/jse/JseOsLib.java similarity index 100% rename from src/main/required/org/luaj/vm3/lib/jse/JseOsLib.java rename to src/main/java/org/luaj/vm3/lib/jse/JseOsLib.java diff --git a/src/main/required/org/luaj/vm3/lib/jse/JsePlatform.java b/src/main/java/org/luaj/vm3/lib/jse/JsePlatform.java similarity index 100% rename from src/main/required/org/luaj/vm3/lib/jse/JsePlatform.java rename to src/main/java/org/luaj/vm3/lib/jse/JsePlatform.java diff --git a/src/main/required/org/luaj/vm3/lib/jse/JseProcess.java b/src/main/java/org/luaj/vm3/lib/jse/JseProcess.java similarity index 100% rename from src/main/required/org/luaj/vm3/lib/jse/JseProcess.java rename to src/main/java/org/luaj/vm3/lib/jse/JseProcess.java diff --git a/src/main/required/org/luaj/vm3/lib/jse/LuajavaLib.java b/src/main/java/org/luaj/vm3/lib/jse/LuajavaLib.java similarity index 100% rename from src/main/required/org/luaj/vm3/lib/jse/LuajavaLib.java rename to src/main/java/org/luaj/vm3/lib/jse/LuajavaLib.java diff --git a/src/main/required/org/luaj/vm3/parser/LuaParser.java b/src/main/java/org/luaj/vm3/parser/LuaParser.java similarity index 100% rename from src/main/required/org/luaj/vm3/parser/LuaParser.java rename to src/main/java/org/luaj/vm3/parser/LuaParser.java diff --git a/src/main/required/org/luaj/vm3/parser/LuaParserConstants.java b/src/main/java/org/luaj/vm3/parser/LuaParserConstants.java similarity index 100% rename from src/main/required/org/luaj/vm3/parser/LuaParserConstants.java rename to src/main/java/org/luaj/vm3/parser/LuaParserConstants.java diff --git a/src/main/required/org/luaj/vm3/parser/LuaParserTokenManager.java b/src/main/java/org/luaj/vm3/parser/LuaParserTokenManager.java similarity index 100% rename from src/main/required/org/luaj/vm3/parser/LuaParserTokenManager.java rename to src/main/java/org/luaj/vm3/parser/LuaParserTokenManager.java diff --git a/src/main/required/org/luaj/vm3/parser/ParseException.java b/src/main/java/org/luaj/vm3/parser/ParseException.java similarity index 100% rename from src/main/required/org/luaj/vm3/parser/ParseException.java rename to src/main/java/org/luaj/vm3/parser/ParseException.java diff --git a/src/main/required/org/luaj/vm3/parser/SimpleCharStream.java b/src/main/java/org/luaj/vm3/parser/SimpleCharStream.java similarity index 100% rename from src/main/required/org/luaj/vm3/parser/SimpleCharStream.java rename to src/main/java/org/luaj/vm3/parser/SimpleCharStream.java diff --git a/src/main/required/org/luaj/vm3/parser/Token.java b/src/main/java/org/luaj/vm3/parser/Token.java similarity index 100% rename from src/main/required/org/luaj/vm3/parser/Token.java rename to src/main/java/org/luaj/vm3/parser/Token.java diff --git a/src/main/required/org/luaj/vm3/parser/TokenMgrError.java b/src/main/java/org/luaj/vm3/parser/TokenMgrError.java similarity index 100% rename from src/main/required/org/luaj/vm3/parser/TokenMgrError.java rename to src/main/java/org/luaj/vm3/parser/TokenMgrError.java diff --git a/src/main/required/org/luaj/vm3/script/LuaScriptEngine.java b/src/main/java/org/luaj/vm3/script/LuaScriptEngine.java similarity index 100% rename from src/main/required/org/luaj/vm3/script/LuaScriptEngine.java rename to src/main/java/org/luaj/vm3/script/LuaScriptEngine.java diff --git a/src/main/required/org/luaj/vm3/script/LuaScriptEngineFactory.java b/src/main/java/org/luaj/vm3/script/LuaScriptEngineFactory.java similarity index 100% rename from src/main/required/org/luaj/vm3/script/LuaScriptEngineFactory.java rename to src/main/java/org/luaj/vm3/script/LuaScriptEngineFactory.java diff --git a/src/main/required/org/luaj/vm3/script/LuajContext.java b/src/main/java/org/luaj/vm3/script/LuajContext.java similarity index 100% rename from src/main/required/org/luaj/vm3/script/LuajContext.java rename to src/main/java/org/luaj/vm3/script/LuajContext.java diff --git a/src/main/required/universalelectricity/api/UniversalClass.java b/src/main/java/universalelectricity/api/UniversalClass.java similarity index 100% rename from src/main/required/universalelectricity/api/UniversalClass.java rename to src/main/java/universalelectricity/api/UniversalClass.java diff --git a/src/main/java/li/cil/oc/Blocks.scala b/src/main/scala/li/cil/oc/Blocks.scala similarity index 100% rename from src/main/java/li/cil/oc/Blocks.scala rename to src/main/scala/li/cil/oc/Blocks.scala diff --git a/src/main/java/li/cil/oc/CraftingHandler.scala b/src/main/scala/li/cil/oc/CraftingHandler.scala similarity index 100% rename from src/main/java/li/cil/oc/CraftingHandler.scala rename to src/main/scala/li/cil/oc/CraftingHandler.scala diff --git a/src/main/java/li/cil/oc/CreativeTab.scala b/src/main/scala/li/cil/oc/CreativeTab.scala similarity index 100% rename from src/main/java/li/cil/oc/CreativeTab.scala rename to src/main/scala/li/cil/oc/CreativeTab.scala diff --git a/src/main/java/li/cil/oc/Items.scala b/src/main/scala/li/cil/oc/Items.scala similarity index 100% rename from src/main/java/li/cil/oc/Items.scala rename to src/main/scala/li/cil/oc/Items.scala diff --git a/src/main/java/li/cil/oc/OpenComputers.scala b/src/main/scala/li/cil/oc/OpenComputers.scala similarity index 100% rename from src/main/java/li/cil/oc/OpenComputers.scala rename to src/main/scala/li/cil/oc/OpenComputers.scala diff --git a/src/main/java/li/cil/oc/OpenComputersCore.scala b/src/main/scala/li/cil/oc/OpenComputersCore.scala similarity index 100% rename from src/main/java/li/cil/oc/OpenComputersCore.scala rename to src/main/scala/li/cil/oc/OpenComputersCore.scala diff --git a/src/main/java/li/cil/oc/Recipes.scala b/src/main/scala/li/cil/oc/Recipes.scala similarity index 100% rename from src/main/java/li/cil/oc/Recipes.scala rename to src/main/scala/li/cil/oc/Recipes.scala diff --git a/src/main/java/li/cil/oc/Settings.scala b/src/main/scala/li/cil/oc/Settings.scala similarity index 100% rename from src/main/java/li/cil/oc/Settings.scala rename to src/main/scala/li/cil/oc/Settings.scala diff --git a/src/main/java/li/cil/oc/client/GuiHandler.scala b/src/main/scala/li/cil/oc/client/GuiHandler.scala similarity index 100% rename from src/main/java/li/cil/oc/client/GuiHandler.scala rename to src/main/scala/li/cil/oc/client/GuiHandler.scala diff --git a/src/main/java/li/cil/oc/client/PacketHandler.scala b/src/main/scala/li/cil/oc/client/PacketHandler.scala similarity index 100% rename from src/main/java/li/cil/oc/client/PacketHandler.scala rename to src/main/scala/li/cil/oc/client/PacketHandler.scala diff --git a/src/main/java/li/cil/oc/client/PacketSender.scala b/src/main/scala/li/cil/oc/client/PacketSender.scala similarity index 100% rename from src/main/java/li/cil/oc/client/PacketSender.scala rename to src/main/scala/li/cil/oc/client/PacketSender.scala diff --git a/src/main/java/li/cil/oc/client/Proxy.scala b/src/main/scala/li/cil/oc/client/Proxy.scala similarity index 100% rename from src/main/java/li/cil/oc/client/Proxy.scala rename to src/main/scala/li/cil/oc/client/Proxy.scala diff --git a/src/main/java/li/cil/oc/client/Textures.scala b/src/main/scala/li/cil/oc/client/Textures.scala similarity index 100% rename from src/main/java/li/cil/oc/client/Textures.scala rename to src/main/scala/li/cil/oc/client/Textures.scala diff --git a/src/main/java/li/cil/oc/client/gui/Buffer.scala b/src/main/scala/li/cil/oc/client/gui/Buffer.scala similarity index 100% rename from src/main/java/li/cil/oc/client/gui/Buffer.scala rename to src/main/scala/li/cil/oc/client/gui/Buffer.scala diff --git a/src/main/java/li/cil/oc/client/gui/Case.scala b/src/main/scala/li/cil/oc/client/gui/Case.scala similarity index 100% rename from src/main/java/li/cil/oc/client/gui/Case.scala rename to src/main/scala/li/cil/oc/client/gui/Case.scala diff --git a/src/main/java/li/cil/oc/client/gui/DiskDrive.scala b/src/main/scala/li/cil/oc/client/gui/DiskDrive.scala similarity index 100% rename from src/main/java/li/cil/oc/client/gui/DiskDrive.scala rename to src/main/scala/li/cil/oc/client/gui/DiskDrive.scala diff --git a/src/main/java/li/cil/oc/client/gui/DynamicGuiContainer.scala b/src/main/scala/li/cil/oc/client/gui/DynamicGuiContainer.scala similarity index 100% rename from src/main/java/li/cil/oc/client/gui/DynamicGuiContainer.scala rename to src/main/scala/li/cil/oc/client/gui/DynamicGuiContainer.scala diff --git a/src/main/java/li/cil/oc/client/gui/Icons.scala b/src/main/scala/li/cil/oc/client/gui/Icons.scala similarity index 100% rename from src/main/java/li/cil/oc/client/gui/Icons.scala rename to src/main/scala/li/cil/oc/client/gui/Icons.scala diff --git a/src/main/java/li/cil/oc/client/gui/ImageButton.scala b/src/main/scala/li/cil/oc/client/gui/ImageButton.scala similarity index 100% rename from src/main/java/li/cil/oc/client/gui/ImageButton.scala rename to src/main/scala/li/cil/oc/client/gui/ImageButton.scala diff --git a/src/main/java/li/cil/oc/client/gui/Rack.scala b/src/main/scala/li/cil/oc/client/gui/Rack.scala similarity index 100% rename from src/main/java/li/cil/oc/client/gui/Rack.scala rename to src/main/scala/li/cil/oc/client/gui/Rack.scala diff --git a/src/main/java/li/cil/oc/client/gui/Robot.scala b/src/main/scala/li/cil/oc/client/gui/Robot.scala similarity index 100% rename from src/main/java/li/cil/oc/client/gui/Robot.scala rename to src/main/scala/li/cil/oc/client/gui/Robot.scala diff --git a/src/main/java/li/cil/oc/client/gui/Screen.scala b/src/main/scala/li/cil/oc/client/gui/Screen.scala similarity index 100% rename from src/main/java/li/cil/oc/client/gui/Screen.scala rename to src/main/scala/li/cil/oc/client/gui/Screen.scala diff --git a/src/main/java/li/cil/oc/client/gui/Server.scala b/src/main/scala/li/cil/oc/client/gui/Server.scala similarity index 100% rename from src/main/java/li/cil/oc/client/gui/Server.scala rename to src/main/scala/li/cil/oc/client/gui/Server.scala diff --git a/src/main/java/li/cil/oc/client/renderer/MonospaceFontRenderer.scala b/src/main/scala/li/cil/oc/client/renderer/MonospaceFontRenderer.scala similarity index 100% rename from src/main/java/li/cil/oc/client/renderer/MonospaceFontRenderer.scala rename to src/main/scala/li/cil/oc/client/renderer/MonospaceFontRenderer.scala diff --git a/src/main/java/li/cil/oc/client/renderer/WirelessNetworkDebugRenderer.scala b/src/main/scala/li/cil/oc/client/renderer/WirelessNetworkDebugRenderer.scala similarity index 100% rename from src/main/java/li/cil/oc/client/renderer/WirelessNetworkDebugRenderer.scala rename to src/main/scala/li/cil/oc/client/renderer/WirelessNetworkDebugRenderer.scala diff --git a/src/main/java/li/cil/oc/client/renderer/block/BlockRenderer.scala b/src/main/scala/li/cil/oc/client/renderer/block/BlockRenderer.scala similarity index 100% rename from src/main/java/li/cil/oc/client/renderer/block/BlockRenderer.scala rename to src/main/scala/li/cil/oc/client/renderer/block/BlockRenderer.scala diff --git a/src/main/java/li/cil/oc/client/renderer/gui/BufferRenderer.scala b/src/main/scala/li/cil/oc/client/renderer/gui/BufferRenderer.scala similarity index 100% rename from src/main/java/li/cil/oc/client/renderer/gui/BufferRenderer.scala rename to src/main/scala/li/cil/oc/client/renderer/gui/BufferRenderer.scala diff --git a/src/main/java/li/cil/oc/client/renderer/item/UpgradeRenderer.scala b/src/main/scala/li/cil/oc/client/renderer/item/UpgradeRenderer.scala similarity index 100% rename from src/main/java/li/cil/oc/client/renderer/item/UpgradeRenderer.scala rename to src/main/scala/li/cil/oc/client/renderer/item/UpgradeRenderer.scala diff --git a/src/main/java/li/cil/oc/client/renderer/tileentity/CableRenderer.scala b/src/main/scala/li/cil/oc/client/renderer/tileentity/CableRenderer.scala similarity index 100% rename from src/main/java/li/cil/oc/client/renderer/tileentity/CableRenderer.scala rename to src/main/scala/li/cil/oc/client/renderer/tileentity/CableRenderer.scala diff --git a/src/main/java/li/cil/oc/client/renderer/tileentity/CaseRenderer.scala b/src/main/scala/li/cil/oc/client/renderer/tileentity/CaseRenderer.scala similarity index 100% rename from src/main/java/li/cil/oc/client/renderer/tileentity/CaseRenderer.scala rename to src/main/scala/li/cil/oc/client/renderer/tileentity/CaseRenderer.scala diff --git a/src/main/java/li/cil/oc/client/renderer/tileentity/PowerDistributorRenderer.scala b/src/main/scala/li/cil/oc/client/renderer/tileentity/PowerDistributorRenderer.scala similarity index 100% rename from src/main/java/li/cil/oc/client/renderer/tileentity/PowerDistributorRenderer.scala rename to src/main/scala/li/cil/oc/client/renderer/tileentity/PowerDistributorRenderer.scala diff --git a/src/main/java/li/cil/oc/client/renderer/tileentity/RackRenderer.scala b/src/main/scala/li/cil/oc/client/renderer/tileentity/RackRenderer.scala similarity index 100% rename from src/main/java/li/cil/oc/client/renderer/tileentity/RackRenderer.scala rename to src/main/scala/li/cil/oc/client/renderer/tileentity/RackRenderer.scala diff --git a/src/main/java/li/cil/oc/client/renderer/tileentity/RobotRenderer.scala b/src/main/scala/li/cil/oc/client/renderer/tileentity/RobotRenderer.scala similarity index 100% rename from src/main/java/li/cil/oc/client/renderer/tileentity/RobotRenderer.scala rename to src/main/scala/li/cil/oc/client/renderer/tileentity/RobotRenderer.scala diff --git a/src/main/java/li/cil/oc/client/renderer/tileentity/ScreenRenderer.scala b/src/main/scala/li/cil/oc/client/renderer/tileentity/ScreenRenderer.scala similarity index 100% rename from src/main/java/li/cil/oc/client/renderer/tileentity/ScreenRenderer.scala rename to src/main/scala/li/cil/oc/client/renderer/tileentity/ScreenRenderer.scala diff --git a/src/main/java/li/cil/oc/common/ConnectionHandler.scala b/src/main/scala/li/cil/oc/common/ConnectionHandler.scala similarity index 100% rename from src/main/java/li/cil/oc/common/ConnectionHandler.scala rename to src/main/scala/li/cil/oc/common/ConnectionHandler.scala diff --git a/src/main/java/li/cil/oc/common/GuiHandler.scala b/src/main/scala/li/cil/oc/common/GuiHandler.scala similarity index 100% rename from src/main/java/li/cil/oc/common/GuiHandler.scala rename to src/main/scala/li/cil/oc/common/GuiHandler.scala diff --git a/src/main/java/li/cil/oc/common/GuiType.scala b/src/main/scala/li/cil/oc/common/GuiType.scala similarity index 100% rename from src/main/java/li/cil/oc/common/GuiType.scala rename to src/main/scala/li/cil/oc/common/GuiType.scala diff --git a/src/main/java/li/cil/oc/common/PacketBuilder.scala b/src/main/scala/li/cil/oc/common/PacketBuilder.scala similarity index 100% rename from src/main/java/li/cil/oc/common/PacketBuilder.scala rename to src/main/scala/li/cil/oc/common/PacketBuilder.scala diff --git a/src/main/java/li/cil/oc/common/PacketHandler.scala b/src/main/scala/li/cil/oc/common/PacketHandler.scala similarity index 100% rename from src/main/java/li/cil/oc/common/PacketHandler.scala rename to src/main/scala/li/cil/oc/common/PacketHandler.scala diff --git a/src/main/java/li/cil/oc/common/PacketType.scala b/src/main/scala/li/cil/oc/common/PacketType.scala similarity index 100% rename from src/main/java/li/cil/oc/common/PacketType.scala rename to src/main/scala/li/cil/oc/common/PacketType.scala diff --git a/src/main/java/li/cil/oc/common/Proxy.scala b/src/main/scala/li/cil/oc/common/Proxy.scala similarity index 100% rename from src/main/java/li/cil/oc/common/Proxy.scala rename to src/main/scala/li/cil/oc/common/Proxy.scala diff --git a/src/main/java/li/cil/oc/common/asm/ClassTransformer.scala b/src/main/scala/li/cil/oc/common/asm/ClassTransformer.scala similarity index 100% rename from src/main/java/li/cil/oc/common/asm/ClassTransformer.scala rename to src/main/scala/li/cil/oc/common/asm/ClassTransformer.scala diff --git a/src/main/java/li/cil/oc/common/block/Adapter.scala b/src/main/scala/li/cil/oc/common/block/Adapter.scala similarity index 100% rename from src/main/java/li/cil/oc/common/block/Adapter.scala rename to src/main/scala/li/cil/oc/common/block/Adapter.scala diff --git a/src/main/java/li/cil/oc/common/block/Cable.scala b/src/main/scala/li/cil/oc/common/block/Cable.scala similarity index 100% rename from src/main/java/li/cil/oc/common/block/Cable.scala rename to src/main/scala/li/cil/oc/common/block/Cable.scala diff --git a/src/main/java/li/cil/oc/common/block/Capacitor.scala b/src/main/scala/li/cil/oc/common/block/Capacitor.scala similarity index 100% rename from src/main/java/li/cil/oc/common/block/Capacitor.scala rename to src/main/scala/li/cil/oc/common/block/Capacitor.scala diff --git a/src/main/java/li/cil/oc/common/block/Case.scala b/src/main/scala/li/cil/oc/common/block/Case.scala similarity index 100% rename from src/main/java/li/cil/oc/common/block/Case.scala rename to src/main/scala/li/cil/oc/common/block/Case.scala diff --git a/src/main/java/li/cil/oc/common/block/Charger.scala b/src/main/scala/li/cil/oc/common/block/Charger.scala similarity index 100% rename from src/main/java/li/cil/oc/common/block/Charger.scala rename to src/main/scala/li/cil/oc/common/block/Charger.scala diff --git a/src/main/java/li/cil/oc/common/block/Delegate.scala b/src/main/scala/li/cil/oc/common/block/Delegate.scala similarity index 100% rename from src/main/java/li/cil/oc/common/block/Delegate.scala rename to src/main/scala/li/cil/oc/common/block/Delegate.scala diff --git a/src/main/java/li/cil/oc/common/block/Delegator.scala b/src/main/scala/li/cil/oc/common/block/Delegator.scala similarity index 100% rename from src/main/java/li/cil/oc/common/block/Delegator.scala rename to src/main/scala/li/cil/oc/common/block/Delegator.scala diff --git a/src/main/java/li/cil/oc/common/block/DiskDrive.scala b/src/main/scala/li/cil/oc/common/block/DiskDrive.scala similarity index 100% rename from src/main/java/li/cil/oc/common/block/DiskDrive.scala rename to src/main/scala/li/cil/oc/common/block/DiskDrive.scala diff --git a/src/main/java/li/cil/oc/common/block/Item.scala b/src/main/scala/li/cil/oc/common/block/Item.scala similarity index 100% rename from src/main/java/li/cil/oc/common/block/Item.scala rename to src/main/scala/li/cil/oc/common/block/Item.scala diff --git a/src/main/java/li/cil/oc/common/block/Keyboard.scala b/src/main/scala/li/cil/oc/common/block/Keyboard.scala similarity index 100% rename from src/main/java/li/cil/oc/common/block/Keyboard.scala rename to src/main/scala/li/cil/oc/common/block/Keyboard.scala diff --git a/src/main/java/li/cil/oc/common/block/PowerConverter.scala b/src/main/scala/li/cil/oc/common/block/PowerConverter.scala similarity index 100% rename from src/main/java/li/cil/oc/common/block/PowerConverter.scala rename to src/main/scala/li/cil/oc/common/block/PowerConverter.scala diff --git a/src/main/java/li/cil/oc/common/block/PowerDistributor.scala b/src/main/scala/li/cil/oc/common/block/PowerDistributor.scala similarity index 100% rename from src/main/java/li/cil/oc/common/block/PowerDistributor.scala rename to src/main/scala/li/cil/oc/common/block/PowerDistributor.scala diff --git a/src/main/java/li/cil/oc/common/block/Rack.scala b/src/main/scala/li/cil/oc/common/block/Rack.scala similarity index 100% rename from src/main/java/li/cil/oc/common/block/Rack.scala rename to src/main/scala/li/cil/oc/common/block/Rack.scala diff --git a/src/main/java/li/cil/oc/common/block/Redstone.scala b/src/main/scala/li/cil/oc/common/block/Redstone.scala similarity index 100% rename from src/main/java/li/cil/oc/common/block/Redstone.scala rename to src/main/scala/li/cil/oc/common/block/Redstone.scala diff --git a/src/main/java/li/cil/oc/common/block/RedstoneAware.scala b/src/main/scala/li/cil/oc/common/block/RedstoneAware.scala similarity index 100% rename from src/main/java/li/cil/oc/common/block/RedstoneAware.scala rename to src/main/scala/li/cil/oc/common/block/RedstoneAware.scala diff --git a/src/main/java/li/cil/oc/common/block/RobotAfterimage.scala b/src/main/scala/li/cil/oc/common/block/RobotAfterimage.scala similarity index 100% rename from src/main/java/li/cil/oc/common/block/RobotAfterimage.scala rename to src/main/scala/li/cil/oc/common/block/RobotAfterimage.scala diff --git a/src/main/java/li/cil/oc/common/block/RobotProxy.scala b/src/main/scala/li/cil/oc/common/block/RobotProxy.scala similarity index 100% rename from src/main/java/li/cil/oc/common/block/RobotProxy.scala rename to src/main/scala/li/cil/oc/common/block/RobotProxy.scala diff --git a/src/main/java/li/cil/oc/common/block/Router.scala b/src/main/scala/li/cil/oc/common/block/Router.scala similarity index 100% rename from src/main/java/li/cil/oc/common/block/Router.scala rename to src/main/scala/li/cil/oc/common/block/Router.scala diff --git a/src/main/java/li/cil/oc/common/block/Screen.scala b/src/main/scala/li/cil/oc/common/block/Screen.scala similarity index 100% rename from src/main/java/li/cil/oc/common/block/Screen.scala rename to src/main/scala/li/cil/oc/common/block/Screen.scala diff --git a/src/main/java/li/cil/oc/common/component/Buffer.scala b/src/main/scala/li/cil/oc/common/component/Buffer.scala similarity index 100% rename from src/main/java/li/cil/oc/common/component/Buffer.scala rename to src/main/scala/li/cil/oc/common/component/Buffer.scala diff --git a/src/main/java/li/cil/oc/common/component/Terminal.scala b/src/main/scala/li/cil/oc/common/component/Terminal.scala similarity index 100% rename from src/main/java/li/cil/oc/common/component/Terminal.scala rename to src/main/scala/li/cil/oc/common/component/Terminal.scala diff --git a/src/main/java/li/cil/oc/common/container/Case.scala b/src/main/scala/li/cil/oc/common/container/Case.scala similarity index 100% rename from src/main/java/li/cil/oc/common/container/Case.scala rename to src/main/scala/li/cil/oc/common/container/Case.scala diff --git a/src/main/java/li/cil/oc/common/container/ComponentSlot.scala b/src/main/scala/li/cil/oc/common/container/ComponentSlot.scala similarity index 100% rename from src/main/java/li/cil/oc/common/container/ComponentSlot.scala rename to src/main/scala/li/cil/oc/common/container/ComponentSlot.scala diff --git a/src/main/java/li/cil/oc/common/container/DiskDrive.scala b/src/main/scala/li/cil/oc/common/container/DiskDrive.scala similarity index 100% rename from src/main/java/li/cil/oc/common/container/DiskDrive.scala rename to src/main/scala/li/cil/oc/common/container/DiskDrive.scala diff --git a/src/main/java/li/cil/oc/common/container/InternalSlot.scala b/src/main/scala/li/cil/oc/common/container/InternalSlot.scala similarity index 100% rename from src/main/java/li/cil/oc/common/container/InternalSlot.scala rename to src/main/scala/li/cil/oc/common/container/InternalSlot.scala diff --git a/src/main/java/li/cil/oc/common/container/Player.scala b/src/main/scala/li/cil/oc/common/container/Player.scala similarity index 100% rename from src/main/java/li/cil/oc/common/container/Player.scala rename to src/main/scala/li/cil/oc/common/container/Player.scala diff --git a/src/main/java/li/cil/oc/common/container/Rack.scala b/src/main/scala/li/cil/oc/common/container/Rack.scala similarity index 100% rename from src/main/java/li/cil/oc/common/container/Rack.scala rename to src/main/scala/li/cil/oc/common/container/Rack.scala diff --git a/src/main/java/li/cil/oc/common/container/Robot.scala b/src/main/scala/li/cil/oc/common/container/Robot.scala similarity index 100% rename from src/main/java/li/cil/oc/common/container/Robot.scala rename to src/main/scala/li/cil/oc/common/container/Robot.scala diff --git a/src/main/java/li/cil/oc/common/container/Server.scala b/src/main/scala/li/cil/oc/common/container/Server.scala similarity index 100% rename from src/main/java/li/cil/oc/common/container/Server.scala rename to src/main/scala/li/cil/oc/common/container/Server.scala diff --git a/src/main/java/li/cil/oc/common/inventory/ComponentInventory.scala b/src/main/scala/li/cil/oc/common/inventory/ComponentInventory.scala similarity index 100% rename from src/main/java/li/cil/oc/common/inventory/ComponentInventory.scala rename to src/main/scala/li/cil/oc/common/inventory/ComponentInventory.scala diff --git a/src/main/java/li/cil/oc/common/inventory/Inventory.scala b/src/main/scala/li/cil/oc/common/inventory/Inventory.scala similarity index 100% rename from src/main/java/li/cil/oc/common/inventory/Inventory.scala rename to src/main/scala/li/cil/oc/common/inventory/Inventory.scala diff --git a/src/main/java/li/cil/oc/common/inventory/ItemStackInventory.scala b/src/main/scala/li/cil/oc/common/inventory/ItemStackInventory.scala similarity index 100% rename from src/main/java/li/cil/oc/common/inventory/ItemStackInventory.scala rename to src/main/scala/li/cil/oc/common/inventory/ItemStackInventory.scala diff --git a/src/main/java/li/cil/oc/common/inventory/ServerInventory.scala b/src/main/scala/li/cil/oc/common/inventory/ServerInventory.scala similarity index 100% rename from src/main/java/li/cil/oc/common/inventory/ServerInventory.scala rename to src/main/scala/li/cil/oc/common/inventory/ServerInventory.scala diff --git a/src/main/java/li/cil/oc/common/item/AbstractBusCard.scala b/src/main/scala/li/cil/oc/common/item/AbstractBusCard.scala similarity index 100% rename from src/main/java/li/cil/oc/common/item/AbstractBusCard.scala rename to src/main/scala/li/cil/oc/common/item/AbstractBusCard.scala diff --git a/src/main/java/li/cil/oc/common/item/Acid.scala b/src/main/scala/li/cil/oc/common/item/Acid.scala similarity index 100% rename from src/main/java/li/cil/oc/common/item/Acid.scala rename to src/main/scala/li/cil/oc/common/item/Acid.scala diff --git a/src/main/java/li/cil/oc/common/item/Alu.scala b/src/main/scala/li/cil/oc/common/item/Alu.scala similarity index 100% rename from src/main/java/li/cil/oc/common/item/Alu.scala rename to src/main/scala/li/cil/oc/common/item/Alu.scala diff --git a/src/main/java/li/cil/oc/common/item/Analyzer.scala b/src/main/scala/li/cil/oc/common/item/Analyzer.scala similarity index 100% rename from src/main/java/li/cil/oc/common/item/Analyzer.scala rename to src/main/scala/li/cil/oc/common/item/Analyzer.scala diff --git a/src/main/java/li/cil/oc/common/item/ArrowKeys.scala b/src/main/scala/li/cil/oc/common/item/ArrowKeys.scala similarity index 100% rename from src/main/java/li/cil/oc/common/item/ArrowKeys.scala rename to src/main/scala/li/cil/oc/common/item/ArrowKeys.scala diff --git a/src/main/java/li/cil/oc/common/item/ButtonGroup.scala b/src/main/scala/li/cil/oc/common/item/ButtonGroup.scala similarity index 100% rename from src/main/java/li/cil/oc/common/item/ButtonGroup.scala rename to src/main/scala/li/cil/oc/common/item/ButtonGroup.scala diff --git a/src/main/java/li/cil/oc/common/item/CPU.scala b/src/main/scala/li/cil/oc/common/item/CPU.scala similarity index 100% rename from src/main/java/li/cil/oc/common/item/CPU.scala rename to src/main/scala/li/cil/oc/common/item/CPU.scala diff --git a/src/main/java/li/cil/oc/common/item/CardBase.scala b/src/main/scala/li/cil/oc/common/item/CardBase.scala similarity index 100% rename from src/main/java/li/cil/oc/common/item/CardBase.scala rename to src/main/scala/li/cil/oc/common/item/CardBase.scala diff --git a/src/main/java/li/cil/oc/common/item/CircuitBoard.scala b/src/main/scala/li/cil/oc/common/item/CircuitBoard.scala similarity index 100% rename from src/main/java/li/cil/oc/common/item/CircuitBoard.scala rename to src/main/scala/li/cil/oc/common/item/CircuitBoard.scala diff --git a/src/main/java/li/cil/oc/common/item/ControlUnit.scala b/src/main/scala/li/cil/oc/common/item/ControlUnit.scala similarity index 100% rename from src/main/java/li/cil/oc/common/item/ControlUnit.scala rename to src/main/scala/li/cil/oc/common/item/ControlUnit.scala diff --git a/src/main/java/li/cil/oc/common/item/CuttingWire.scala b/src/main/scala/li/cil/oc/common/item/CuttingWire.scala similarity index 100% rename from src/main/java/li/cil/oc/common/item/CuttingWire.scala rename to src/main/scala/li/cil/oc/common/item/CuttingWire.scala diff --git a/src/main/java/li/cil/oc/common/item/Delegate.scala b/src/main/scala/li/cil/oc/common/item/Delegate.scala similarity index 100% rename from src/main/java/li/cil/oc/common/item/Delegate.scala rename to src/main/scala/li/cil/oc/common/item/Delegate.scala diff --git a/src/main/java/li/cil/oc/common/item/Delegator.scala b/src/main/scala/li/cil/oc/common/item/Delegator.scala similarity index 100% rename from src/main/java/li/cil/oc/common/item/Delegator.scala rename to src/main/scala/li/cil/oc/common/item/Delegator.scala diff --git a/src/main/java/li/cil/oc/common/item/Disk.scala b/src/main/scala/li/cil/oc/common/item/Disk.scala similarity index 100% rename from src/main/java/li/cil/oc/common/item/Disk.scala rename to src/main/scala/li/cil/oc/common/item/Disk.scala diff --git a/src/main/java/li/cil/oc/common/item/FloppyDisk.scala b/src/main/scala/li/cil/oc/common/item/FloppyDisk.scala similarity index 100% rename from src/main/java/li/cil/oc/common/item/FloppyDisk.scala rename to src/main/scala/li/cil/oc/common/item/FloppyDisk.scala diff --git a/src/main/java/li/cil/oc/common/item/GraphicsCard.scala b/src/main/scala/li/cil/oc/common/item/GraphicsCard.scala similarity index 100% rename from src/main/java/li/cil/oc/common/item/GraphicsCard.scala rename to src/main/scala/li/cil/oc/common/item/GraphicsCard.scala diff --git a/src/main/java/li/cil/oc/common/item/HardDiskDrive.scala b/src/main/scala/li/cil/oc/common/item/HardDiskDrive.scala similarity index 100% rename from src/main/java/li/cil/oc/common/item/HardDiskDrive.scala rename to src/main/scala/li/cil/oc/common/item/HardDiskDrive.scala diff --git a/src/main/java/li/cil/oc/common/item/InternetCard.scala b/src/main/scala/li/cil/oc/common/item/InternetCard.scala similarity index 100% rename from src/main/java/li/cil/oc/common/item/InternetCard.scala rename to src/main/scala/li/cil/oc/common/item/InternetCard.scala diff --git a/src/main/java/li/cil/oc/common/item/IronNugget.scala b/src/main/scala/li/cil/oc/common/item/IronNugget.scala similarity index 100% rename from src/main/java/li/cil/oc/common/item/IronNugget.scala rename to src/main/scala/li/cil/oc/common/item/IronNugget.scala diff --git a/src/main/java/li/cil/oc/common/item/Memory.scala b/src/main/scala/li/cil/oc/common/item/Memory.scala similarity index 100% rename from src/main/java/li/cil/oc/common/item/Memory.scala rename to src/main/scala/li/cil/oc/common/item/Memory.scala diff --git a/src/main/java/li/cil/oc/common/item/Microchip.scala b/src/main/scala/li/cil/oc/common/item/Microchip.scala similarity index 100% rename from src/main/java/li/cil/oc/common/item/Microchip.scala rename to src/main/scala/li/cil/oc/common/item/Microchip.scala diff --git a/src/main/java/li/cil/oc/common/item/NetworkCard.scala b/src/main/scala/li/cil/oc/common/item/NetworkCard.scala similarity index 100% rename from src/main/java/li/cil/oc/common/item/NetworkCard.scala rename to src/main/scala/li/cil/oc/common/item/NetworkCard.scala diff --git a/src/main/java/li/cil/oc/common/item/Numpad.scala b/src/main/scala/li/cil/oc/common/item/Numpad.scala similarity index 100% rename from src/main/java/li/cil/oc/common/item/Numpad.scala rename to src/main/scala/li/cil/oc/common/item/Numpad.scala diff --git a/src/main/java/li/cil/oc/common/item/PrintedCircuitBoard.scala b/src/main/scala/li/cil/oc/common/item/PrintedCircuitBoard.scala similarity index 100% rename from src/main/java/li/cil/oc/common/item/PrintedCircuitBoard.scala rename to src/main/scala/li/cil/oc/common/item/PrintedCircuitBoard.scala diff --git a/src/main/java/li/cil/oc/common/item/RawCircuitBoard.scala b/src/main/scala/li/cil/oc/common/item/RawCircuitBoard.scala similarity index 100% rename from src/main/java/li/cil/oc/common/item/RawCircuitBoard.scala rename to src/main/scala/li/cil/oc/common/item/RawCircuitBoard.scala diff --git a/src/main/java/li/cil/oc/common/item/RedstoneCard.scala b/src/main/scala/li/cil/oc/common/item/RedstoneCard.scala similarity index 100% rename from src/main/java/li/cil/oc/common/item/RedstoneCard.scala rename to src/main/scala/li/cil/oc/common/item/RedstoneCard.scala diff --git a/src/main/java/li/cil/oc/common/item/Server.scala b/src/main/scala/li/cil/oc/common/item/Server.scala similarity index 100% rename from src/main/java/li/cil/oc/common/item/Server.scala rename to src/main/scala/li/cil/oc/common/item/Server.scala diff --git a/src/main/java/li/cil/oc/common/item/Terminal.scala b/src/main/scala/li/cil/oc/common/item/Terminal.scala similarity index 100% rename from src/main/java/li/cil/oc/common/item/Terminal.scala rename to src/main/scala/li/cil/oc/common/item/Terminal.scala diff --git a/src/main/java/li/cil/oc/common/item/Transistor.scala b/src/main/scala/li/cil/oc/common/item/Transistor.scala similarity index 100% rename from src/main/java/li/cil/oc/common/item/Transistor.scala rename to src/main/scala/li/cil/oc/common/item/Transistor.scala diff --git a/src/main/java/li/cil/oc/common/item/UpgradeCrafting.scala b/src/main/scala/li/cil/oc/common/item/UpgradeCrafting.scala similarity index 100% rename from src/main/java/li/cil/oc/common/item/UpgradeCrafting.scala rename to src/main/scala/li/cil/oc/common/item/UpgradeCrafting.scala diff --git a/src/main/java/li/cil/oc/common/item/UpgradeGenerator.scala b/src/main/scala/li/cil/oc/common/item/UpgradeGenerator.scala similarity index 100% rename from src/main/java/li/cil/oc/common/item/UpgradeGenerator.scala rename to src/main/scala/li/cil/oc/common/item/UpgradeGenerator.scala diff --git a/src/main/java/li/cil/oc/common/item/UpgradeNavigation.scala b/src/main/scala/li/cil/oc/common/item/UpgradeNavigation.scala similarity index 100% rename from src/main/java/li/cil/oc/common/item/UpgradeNavigation.scala rename to src/main/scala/li/cil/oc/common/item/UpgradeNavigation.scala diff --git a/src/main/java/li/cil/oc/common/item/UpgradeSign.scala b/src/main/scala/li/cil/oc/common/item/UpgradeSign.scala similarity index 100% rename from src/main/java/li/cil/oc/common/item/UpgradeSign.scala rename to src/main/scala/li/cil/oc/common/item/UpgradeSign.scala diff --git a/src/main/java/li/cil/oc/common/item/UpgradeSolarGenerator.scala b/src/main/scala/li/cil/oc/common/item/UpgradeSolarGenerator.scala similarity index 100% rename from src/main/java/li/cil/oc/common/item/UpgradeSolarGenerator.scala rename to src/main/scala/li/cil/oc/common/item/UpgradeSolarGenerator.scala diff --git a/src/main/java/li/cil/oc/common/item/WirelessNetworkCard.scala b/src/main/scala/li/cil/oc/common/item/WirelessNetworkCard.scala similarity index 100% rename from src/main/java/li/cil/oc/common/item/WirelessNetworkCard.scala rename to src/main/scala/li/cil/oc/common/item/WirelessNetworkCard.scala diff --git a/src/main/java/li/cil/oc/common/launch/TransformerLoader.scala b/src/main/scala/li/cil/oc/common/launch/TransformerLoader.scala similarity index 100% rename from src/main/java/li/cil/oc/common/launch/TransformerLoader.scala rename to src/main/scala/li/cil/oc/common/launch/TransformerLoader.scala diff --git a/src/main/java/li/cil/oc/common/tileentity/AbstractBusAware.scala b/src/main/scala/li/cil/oc/common/tileentity/AbstractBusAware.scala similarity index 100% rename from src/main/java/li/cil/oc/common/tileentity/AbstractBusAware.scala rename to src/main/scala/li/cil/oc/common/tileentity/AbstractBusAware.scala diff --git a/src/main/java/li/cil/oc/common/tileentity/Adapter.scala b/src/main/scala/li/cil/oc/common/tileentity/Adapter.scala similarity index 100% rename from src/main/java/li/cil/oc/common/tileentity/Adapter.scala rename to src/main/scala/li/cil/oc/common/tileentity/Adapter.scala diff --git a/src/main/java/li/cil/oc/common/tileentity/Buffer.scala b/src/main/scala/li/cil/oc/common/tileentity/Buffer.scala similarity index 100% rename from src/main/java/li/cil/oc/common/tileentity/Buffer.scala rename to src/main/scala/li/cil/oc/common/tileentity/Buffer.scala diff --git a/src/main/java/li/cil/oc/common/tileentity/BundledRedstoneAware.scala b/src/main/scala/li/cil/oc/common/tileentity/BundledRedstoneAware.scala similarity index 100% rename from src/main/java/li/cil/oc/common/tileentity/BundledRedstoneAware.scala rename to src/main/scala/li/cil/oc/common/tileentity/BundledRedstoneAware.scala diff --git a/src/main/java/li/cil/oc/common/tileentity/Cable.scala b/src/main/scala/li/cil/oc/common/tileentity/Cable.scala similarity index 100% rename from src/main/java/li/cil/oc/common/tileentity/Cable.scala rename to src/main/scala/li/cil/oc/common/tileentity/Cable.scala diff --git a/src/main/java/li/cil/oc/common/tileentity/Capacitor.scala b/src/main/scala/li/cil/oc/common/tileentity/Capacitor.scala similarity index 100% rename from src/main/java/li/cil/oc/common/tileentity/Capacitor.scala rename to src/main/scala/li/cil/oc/common/tileentity/Capacitor.scala diff --git a/src/main/java/li/cil/oc/common/tileentity/Case.scala b/src/main/scala/li/cil/oc/common/tileentity/Case.scala similarity index 100% rename from src/main/java/li/cil/oc/common/tileentity/Case.scala rename to src/main/scala/li/cil/oc/common/tileentity/Case.scala diff --git a/src/main/java/li/cil/oc/common/tileentity/Charger.scala b/src/main/scala/li/cil/oc/common/tileentity/Charger.scala similarity index 100% rename from src/main/java/li/cil/oc/common/tileentity/Charger.scala rename to src/main/scala/li/cil/oc/common/tileentity/Charger.scala diff --git a/src/main/java/li/cil/oc/common/tileentity/ComponentInventory.scala b/src/main/scala/li/cil/oc/common/tileentity/ComponentInventory.scala similarity index 100% rename from src/main/java/li/cil/oc/common/tileentity/ComponentInventory.scala rename to src/main/scala/li/cil/oc/common/tileentity/ComponentInventory.scala diff --git a/src/main/java/li/cil/oc/common/tileentity/Computer.scala b/src/main/scala/li/cil/oc/common/tileentity/Computer.scala similarity index 100% rename from src/main/java/li/cil/oc/common/tileentity/Computer.scala rename to src/main/scala/li/cil/oc/common/tileentity/Computer.scala diff --git a/src/main/java/li/cil/oc/common/tileentity/DiskDrive.scala b/src/main/scala/li/cil/oc/common/tileentity/DiskDrive.scala similarity index 100% rename from src/main/java/li/cil/oc/common/tileentity/DiskDrive.scala rename to src/main/scala/li/cil/oc/common/tileentity/DiskDrive.scala diff --git a/src/main/java/li/cil/oc/common/tileentity/Environment.scala b/src/main/scala/li/cil/oc/common/tileentity/Environment.scala similarity index 100% rename from src/main/java/li/cil/oc/common/tileentity/Environment.scala rename to src/main/scala/li/cil/oc/common/tileentity/Environment.scala diff --git a/src/main/java/li/cil/oc/common/tileentity/Hub.scala b/src/main/scala/li/cil/oc/common/tileentity/Hub.scala similarity index 100% rename from src/main/java/li/cil/oc/common/tileentity/Hub.scala rename to src/main/scala/li/cil/oc/common/tileentity/Hub.scala diff --git a/src/main/java/li/cil/oc/common/tileentity/Inventory.scala b/src/main/scala/li/cil/oc/common/tileentity/Inventory.scala similarity index 100% rename from src/main/java/li/cil/oc/common/tileentity/Inventory.scala rename to src/main/scala/li/cil/oc/common/tileentity/Inventory.scala diff --git a/src/main/java/li/cil/oc/common/tileentity/Keyboard.scala b/src/main/scala/li/cil/oc/common/tileentity/Keyboard.scala similarity index 100% rename from src/main/java/li/cil/oc/common/tileentity/Keyboard.scala rename to src/main/scala/li/cil/oc/common/tileentity/Keyboard.scala diff --git a/src/main/java/li/cil/oc/common/tileentity/PassiveNode.scala b/src/main/scala/li/cil/oc/common/tileentity/PassiveNode.scala similarity index 100% rename from src/main/java/li/cil/oc/common/tileentity/PassiveNode.scala rename to src/main/scala/li/cil/oc/common/tileentity/PassiveNode.scala diff --git a/src/main/java/li/cil/oc/common/tileentity/PowerBalancer.scala b/src/main/scala/li/cil/oc/common/tileentity/PowerBalancer.scala similarity index 100% rename from src/main/java/li/cil/oc/common/tileentity/PowerBalancer.scala rename to src/main/scala/li/cil/oc/common/tileentity/PowerBalancer.scala diff --git a/src/main/java/li/cil/oc/common/tileentity/PowerConverter.scala b/src/main/scala/li/cil/oc/common/tileentity/PowerConverter.scala similarity index 100% rename from src/main/java/li/cil/oc/common/tileentity/PowerConverter.scala rename to src/main/scala/li/cil/oc/common/tileentity/PowerConverter.scala diff --git a/src/main/java/li/cil/oc/common/tileentity/PowerDistributor.scala b/src/main/scala/li/cil/oc/common/tileentity/PowerDistributor.scala similarity index 100% rename from src/main/java/li/cil/oc/common/tileentity/PowerDistributor.scala rename to src/main/scala/li/cil/oc/common/tileentity/PowerDistributor.scala diff --git a/src/main/java/li/cil/oc/common/tileentity/PowerInformation.scala b/src/main/scala/li/cil/oc/common/tileentity/PowerInformation.scala similarity index 100% rename from src/main/java/li/cil/oc/common/tileentity/PowerInformation.scala rename to src/main/scala/li/cil/oc/common/tileentity/PowerInformation.scala diff --git a/src/main/java/li/cil/oc/common/tileentity/Rack.scala b/src/main/scala/li/cil/oc/common/tileentity/Rack.scala similarity index 100% rename from src/main/java/li/cil/oc/common/tileentity/Rack.scala rename to src/main/scala/li/cil/oc/common/tileentity/Rack.scala diff --git a/src/main/java/li/cil/oc/common/tileentity/Redstone.scala b/src/main/scala/li/cil/oc/common/tileentity/Redstone.scala similarity index 100% rename from src/main/java/li/cil/oc/common/tileentity/Redstone.scala rename to src/main/scala/li/cil/oc/common/tileentity/Redstone.scala diff --git a/src/main/java/li/cil/oc/common/tileentity/RedstoneAware.scala b/src/main/scala/li/cil/oc/common/tileentity/RedstoneAware.scala similarity index 100% rename from src/main/java/li/cil/oc/common/tileentity/RedstoneAware.scala rename to src/main/scala/li/cil/oc/common/tileentity/RedstoneAware.scala diff --git a/src/main/java/li/cil/oc/common/tileentity/Robot.scala b/src/main/scala/li/cil/oc/common/tileentity/Robot.scala similarity index 100% rename from src/main/java/li/cil/oc/common/tileentity/Robot.scala rename to src/main/scala/li/cil/oc/common/tileentity/Robot.scala diff --git a/src/main/java/li/cil/oc/common/tileentity/RobotProxy.scala b/src/main/scala/li/cil/oc/common/tileentity/RobotProxy.scala similarity index 100% rename from src/main/java/li/cil/oc/common/tileentity/RobotProxy.scala rename to src/main/scala/li/cil/oc/common/tileentity/RobotProxy.scala diff --git a/src/main/java/li/cil/oc/common/tileentity/Rotatable.scala b/src/main/scala/li/cil/oc/common/tileentity/Rotatable.scala similarity index 100% rename from src/main/java/li/cil/oc/common/tileentity/Rotatable.scala rename to src/main/scala/li/cil/oc/common/tileentity/Rotatable.scala diff --git a/src/main/java/li/cil/oc/common/tileentity/RotationAware.scala b/src/main/scala/li/cil/oc/common/tileentity/RotationAware.scala similarity index 100% rename from src/main/java/li/cil/oc/common/tileentity/RotationAware.scala rename to src/main/scala/li/cil/oc/common/tileentity/RotationAware.scala diff --git a/src/main/java/li/cil/oc/common/tileentity/Router.scala b/src/main/scala/li/cil/oc/common/tileentity/Router.scala similarity index 100% rename from src/main/java/li/cil/oc/common/tileentity/Router.scala rename to src/main/scala/li/cil/oc/common/tileentity/Router.scala diff --git a/src/main/java/li/cil/oc/common/tileentity/Screen.scala b/src/main/scala/li/cil/oc/common/tileentity/Screen.scala similarity index 100% rename from src/main/java/li/cil/oc/common/tileentity/Screen.scala rename to src/main/scala/li/cil/oc/common/tileentity/Screen.scala diff --git a/src/main/java/li/cil/oc/common/tileentity/TileEntity.scala b/src/main/scala/li/cil/oc/common/tileentity/TileEntity.scala similarity index 100% rename from src/main/java/li/cil/oc/common/tileentity/TileEntity.scala rename to src/main/scala/li/cil/oc/common/tileentity/TileEntity.scala diff --git a/src/main/java/li/cil/oc/server/GuiHandler.scala b/src/main/scala/li/cil/oc/server/GuiHandler.scala similarity index 100% rename from src/main/java/li/cil/oc/server/GuiHandler.scala rename to src/main/scala/li/cil/oc/server/GuiHandler.scala diff --git a/src/main/java/li/cil/oc/server/PacketHandler.scala b/src/main/scala/li/cil/oc/server/PacketHandler.scala similarity index 100% rename from src/main/java/li/cil/oc/server/PacketHandler.scala rename to src/main/scala/li/cil/oc/server/PacketHandler.scala diff --git a/src/main/java/li/cil/oc/server/PacketSender.scala b/src/main/scala/li/cil/oc/server/PacketSender.scala similarity index 100% rename from src/main/java/li/cil/oc/server/PacketSender.scala rename to src/main/scala/li/cil/oc/server/PacketSender.scala diff --git a/src/main/java/li/cil/oc/server/Proxy.scala b/src/main/scala/li/cil/oc/server/Proxy.scala similarity index 100% rename from src/main/java/li/cil/oc/server/Proxy.scala rename to src/main/scala/li/cil/oc/server/Proxy.scala diff --git a/src/main/java/li/cil/oc/server/component/AbstractBus.scala b/src/main/scala/li/cil/oc/server/component/AbstractBus.scala similarity index 100% rename from src/main/java/li/cil/oc/server/component/AbstractBus.scala rename to src/main/scala/li/cil/oc/server/component/AbstractBus.scala diff --git a/src/main/java/li/cil/oc/server/component/BundledRedstone.scala b/src/main/scala/li/cil/oc/server/component/BundledRedstone.scala similarity index 100% rename from src/main/java/li/cil/oc/server/component/BundledRedstone.scala rename to src/main/scala/li/cil/oc/server/component/BundledRedstone.scala diff --git a/src/main/java/li/cil/oc/server/component/Filesystem.scala b/src/main/scala/li/cil/oc/server/component/Filesystem.scala similarity index 100% rename from src/main/java/li/cil/oc/server/component/Filesystem.scala rename to src/main/scala/li/cil/oc/server/component/Filesystem.scala diff --git a/src/main/java/li/cil/oc/server/component/GraphicsCard.scala b/src/main/scala/li/cil/oc/server/component/GraphicsCard.scala similarity index 100% rename from src/main/java/li/cil/oc/server/component/GraphicsCard.scala rename to src/main/scala/li/cil/oc/server/component/GraphicsCard.scala diff --git a/src/main/java/li/cil/oc/server/component/InternetCard.scala b/src/main/scala/li/cil/oc/server/component/InternetCard.scala similarity index 100% rename from src/main/java/li/cil/oc/server/component/InternetCard.scala rename to src/main/scala/li/cil/oc/server/component/InternetCard.scala diff --git a/src/main/java/li/cil/oc/server/component/Keyboard.scala b/src/main/scala/li/cil/oc/server/component/Keyboard.scala similarity index 100% rename from src/main/java/li/cil/oc/server/component/Keyboard.scala rename to src/main/scala/li/cil/oc/server/component/Keyboard.scala diff --git a/src/main/java/li/cil/oc/server/component/ManagedComponent.scala b/src/main/scala/li/cil/oc/server/component/ManagedComponent.scala similarity index 100% rename from src/main/java/li/cil/oc/server/component/ManagedComponent.scala rename to src/main/scala/li/cil/oc/server/component/ManagedComponent.scala diff --git a/src/main/java/li/cil/oc/server/component/NetworkCard.scala b/src/main/scala/li/cil/oc/server/component/NetworkCard.scala similarity index 100% rename from src/main/java/li/cil/oc/server/component/NetworkCard.scala rename to src/main/scala/li/cil/oc/server/component/NetworkCard.scala diff --git a/src/main/java/li/cil/oc/server/component/Redstone.scala b/src/main/scala/li/cil/oc/server/component/Redstone.scala similarity index 100% rename from src/main/java/li/cil/oc/server/component/Redstone.scala rename to src/main/scala/li/cil/oc/server/component/Redstone.scala diff --git a/src/main/java/li/cil/oc/server/component/Server.scala b/src/main/scala/li/cil/oc/server/component/Server.scala similarity index 100% rename from src/main/java/li/cil/oc/server/component/Server.scala rename to src/main/scala/li/cil/oc/server/component/Server.scala diff --git a/src/main/java/li/cil/oc/server/component/UpgradeCrafting.scala b/src/main/scala/li/cil/oc/server/component/UpgradeCrafting.scala similarity index 100% rename from src/main/java/li/cil/oc/server/component/UpgradeCrafting.scala rename to src/main/scala/li/cil/oc/server/component/UpgradeCrafting.scala diff --git a/src/main/java/li/cil/oc/server/component/UpgradeGenerator.scala b/src/main/scala/li/cil/oc/server/component/UpgradeGenerator.scala similarity index 100% rename from src/main/java/li/cil/oc/server/component/UpgradeGenerator.scala rename to src/main/scala/li/cil/oc/server/component/UpgradeGenerator.scala diff --git a/src/main/java/li/cil/oc/server/component/UpgradeNavigation.scala b/src/main/scala/li/cil/oc/server/component/UpgradeNavigation.scala similarity index 100% rename from src/main/java/li/cil/oc/server/component/UpgradeNavigation.scala rename to src/main/scala/li/cil/oc/server/component/UpgradeNavigation.scala diff --git a/src/main/java/li/cil/oc/server/component/UpgradeSign.scala b/src/main/scala/li/cil/oc/server/component/UpgradeSign.scala similarity index 100% rename from src/main/java/li/cil/oc/server/component/UpgradeSign.scala rename to src/main/scala/li/cil/oc/server/component/UpgradeSign.scala diff --git a/src/main/java/li/cil/oc/server/component/UpgradeSolarGenerator.scala b/src/main/scala/li/cil/oc/server/component/UpgradeSolarGenerator.scala similarity index 100% rename from src/main/java/li/cil/oc/server/component/UpgradeSolarGenerator.scala rename to src/main/scala/li/cil/oc/server/component/UpgradeSolarGenerator.scala diff --git a/src/main/java/li/cil/oc/server/component/WirelessNetworkCard.scala b/src/main/scala/li/cil/oc/server/component/WirelessNetworkCard.scala similarity index 100% rename from src/main/java/li/cil/oc/server/component/WirelessNetworkCard.scala rename to src/main/scala/li/cil/oc/server/component/WirelessNetworkCard.scala diff --git a/src/main/java/li/cil/oc/server/component/machine/Architecture.scala b/src/main/scala/li/cil/oc/server/component/machine/Architecture.scala similarity index 100% rename from src/main/java/li/cil/oc/server/component/machine/Architecture.scala rename to src/main/scala/li/cil/oc/server/component/machine/Architecture.scala diff --git a/src/main/java/li/cil/oc/server/component/machine/ExecutionResult.scala b/src/main/scala/li/cil/oc/server/component/machine/ExecutionResult.scala similarity index 100% rename from src/main/java/li/cil/oc/server/component/machine/ExecutionResult.scala rename to src/main/scala/li/cil/oc/server/component/machine/ExecutionResult.scala diff --git a/src/main/java/li/cil/oc/server/component/machine/LuaJLuaArchitecture.scala b/src/main/scala/li/cil/oc/server/component/machine/LuaJLuaArchitecture.scala similarity index 100% rename from src/main/java/li/cil/oc/server/component/machine/LuaJLuaArchitecture.scala rename to src/main/scala/li/cil/oc/server/component/machine/LuaJLuaArchitecture.scala diff --git a/src/main/java/li/cil/oc/server/component/machine/Machine.scala b/src/main/scala/li/cil/oc/server/component/machine/Machine.scala similarity index 100% rename from src/main/java/li/cil/oc/server/component/machine/Machine.scala rename to src/main/scala/li/cil/oc/server/component/machine/Machine.scala diff --git a/src/main/java/li/cil/oc/server/component/machine/NativeLuaArchitecture.scala b/src/main/scala/li/cil/oc/server/component/machine/NativeLuaArchitecture.scala similarity index 100% rename from src/main/java/li/cil/oc/server/component/machine/NativeLuaArchitecture.scala rename to src/main/scala/li/cil/oc/server/component/machine/NativeLuaArchitecture.scala diff --git a/src/main/java/li/cil/oc/server/component/robot/ActivationType.scala b/src/main/scala/li/cil/oc/server/component/robot/ActivationType.scala similarity index 100% rename from src/main/java/li/cil/oc/server/component/robot/ActivationType.scala rename to src/main/scala/li/cil/oc/server/component/robot/ActivationType.scala diff --git a/src/main/java/li/cil/oc/server/component/robot/Inventory.scala b/src/main/scala/li/cil/oc/server/component/robot/Inventory.scala similarity index 100% rename from src/main/java/li/cil/oc/server/component/robot/Inventory.scala rename to src/main/scala/li/cil/oc/server/component/robot/Inventory.scala diff --git a/src/main/java/li/cil/oc/server/component/robot/Player.scala b/src/main/scala/li/cil/oc/server/component/robot/Player.scala similarity index 100% rename from src/main/java/li/cil/oc/server/component/robot/Player.scala rename to src/main/scala/li/cil/oc/server/component/robot/Player.scala diff --git a/src/main/java/li/cil/oc/server/component/robot/Robot.scala b/src/main/scala/li/cil/oc/server/component/robot/Robot.scala similarity index 100% rename from src/main/java/li/cil/oc/server/component/robot/Robot.scala rename to src/main/scala/li/cil/oc/server/component/robot/Robot.scala diff --git a/src/main/java/li/cil/oc/server/driver/CompoundBlockDriver.scala b/src/main/scala/li/cil/oc/server/driver/CompoundBlockDriver.scala similarity index 100% rename from src/main/java/li/cil/oc/server/driver/CompoundBlockDriver.scala rename to src/main/scala/li/cil/oc/server/driver/CompoundBlockDriver.scala diff --git a/src/main/java/li/cil/oc/server/driver/CompoundBlockEnvironment.scala b/src/main/scala/li/cil/oc/server/driver/CompoundBlockEnvironment.scala similarity index 100% rename from src/main/java/li/cil/oc/server/driver/CompoundBlockEnvironment.scala rename to src/main/scala/li/cil/oc/server/driver/CompoundBlockEnvironment.scala diff --git a/src/main/java/li/cil/oc/server/driver/Registry.scala b/src/main/scala/li/cil/oc/server/driver/Registry.scala similarity index 100% rename from src/main/java/li/cil/oc/server/driver/Registry.scala rename to src/main/scala/li/cil/oc/server/driver/Registry.scala diff --git a/src/main/java/li/cil/oc/server/driver/item/AbstractBusCard.scala b/src/main/scala/li/cil/oc/server/driver/item/AbstractBusCard.scala similarity index 100% rename from src/main/java/li/cil/oc/server/driver/item/AbstractBusCard.scala rename to src/main/scala/li/cil/oc/server/driver/item/AbstractBusCard.scala diff --git a/src/main/java/li/cil/oc/server/driver/item/FileSystem.scala b/src/main/scala/li/cil/oc/server/driver/item/FileSystem.scala similarity index 100% rename from src/main/java/li/cil/oc/server/driver/item/FileSystem.scala rename to src/main/scala/li/cil/oc/server/driver/item/FileSystem.scala diff --git a/src/main/java/li/cil/oc/server/driver/item/GraphicsCard.scala b/src/main/scala/li/cil/oc/server/driver/item/GraphicsCard.scala similarity index 100% rename from src/main/java/li/cil/oc/server/driver/item/GraphicsCard.scala rename to src/main/scala/li/cil/oc/server/driver/item/GraphicsCard.scala diff --git a/src/main/java/li/cil/oc/server/driver/item/InternetCard.scala b/src/main/scala/li/cil/oc/server/driver/item/InternetCard.scala similarity index 100% rename from src/main/java/li/cil/oc/server/driver/item/InternetCard.scala rename to src/main/scala/li/cil/oc/server/driver/item/InternetCard.scala diff --git a/src/main/java/li/cil/oc/server/driver/item/Item.scala b/src/main/scala/li/cil/oc/server/driver/item/Item.scala similarity index 100% rename from src/main/java/li/cil/oc/server/driver/item/Item.scala rename to src/main/scala/li/cil/oc/server/driver/item/Item.scala diff --git a/src/main/java/li/cil/oc/server/driver/item/Memory.scala b/src/main/scala/li/cil/oc/server/driver/item/Memory.scala similarity index 100% rename from src/main/java/li/cil/oc/server/driver/item/Memory.scala rename to src/main/scala/li/cil/oc/server/driver/item/Memory.scala diff --git a/src/main/java/li/cil/oc/server/driver/item/NetworkCard.scala b/src/main/scala/li/cil/oc/server/driver/item/NetworkCard.scala similarity index 100% rename from src/main/java/li/cil/oc/server/driver/item/NetworkCard.scala rename to src/main/scala/li/cil/oc/server/driver/item/NetworkCard.scala diff --git a/src/main/java/li/cil/oc/server/driver/item/Processor.scala b/src/main/scala/li/cil/oc/server/driver/item/Processor.scala similarity index 100% rename from src/main/java/li/cil/oc/server/driver/item/Processor.scala rename to src/main/scala/li/cil/oc/server/driver/item/Processor.scala diff --git a/src/main/java/li/cil/oc/server/driver/item/RedstoneCard.scala b/src/main/scala/li/cil/oc/server/driver/item/RedstoneCard.scala similarity index 100% rename from src/main/java/li/cil/oc/server/driver/item/RedstoneCard.scala rename to src/main/scala/li/cil/oc/server/driver/item/RedstoneCard.scala diff --git a/src/main/java/li/cil/oc/server/driver/item/UpgradeCrafting.scala b/src/main/scala/li/cil/oc/server/driver/item/UpgradeCrafting.scala similarity index 100% rename from src/main/java/li/cil/oc/server/driver/item/UpgradeCrafting.scala rename to src/main/scala/li/cil/oc/server/driver/item/UpgradeCrafting.scala diff --git a/src/main/java/li/cil/oc/server/driver/item/UpgradeGenerator.scala b/src/main/scala/li/cil/oc/server/driver/item/UpgradeGenerator.scala similarity index 100% rename from src/main/java/li/cil/oc/server/driver/item/UpgradeGenerator.scala rename to src/main/scala/li/cil/oc/server/driver/item/UpgradeGenerator.scala diff --git a/src/main/java/li/cil/oc/server/driver/item/UpgradeNavigation.scala b/src/main/scala/li/cil/oc/server/driver/item/UpgradeNavigation.scala similarity index 100% rename from src/main/java/li/cil/oc/server/driver/item/UpgradeNavigation.scala rename to src/main/scala/li/cil/oc/server/driver/item/UpgradeNavigation.scala diff --git a/src/main/java/li/cil/oc/server/driver/item/UpgradeSign.scala b/src/main/scala/li/cil/oc/server/driver/item/UpgradeSign.scala similarity index 100% rename from src/main/java/li/cil/oc/server/driver/item/UpgradeSign.scala rename to src/main/scala/li/cil/oc/server/driver/item/UpgradeSign.scala diff --git a/src/main/java/li/cil/oc/server/driver/item/UpgradeSolarGenerator.scala b/src/main/scala/li/cil/oc/server/driver/item/UpgradeSolarGenerator.scala similarity index 100% rename from src/main/java/li/cil/oc/server/driver/item/UpgradeSolarGenerator.scala rename to src/main/scala/li/cil/oc/server/driver/item/UpgradeSolarGenerator.scala diff --git a/src/main/java/li/cil/oc/server/driver/item/WirelessNetworkCard.scala b/src/main/scala/li/cil/oc/server/driver/item/WirelessNetworkCard.scala similarity index 100% rename from src/main/java/li/cil/oc/server/driver/item/WirelessNetworkCard.scala rename to src/main/scala/li/cil/oc/server/driver/item/WirelessNetworkCard.scala diff --git a/src/main/java/li/cil/oc/server/fs/Buffered.scala b/src/main/scala/li/cil/oc/server/fs/Buffered.scala similarity index 100% rename from src/main/java/li/cil/oc/server/fs/Buffered.scala rename to src/main/scala/li/cil/oc/server/fs/Buffered.scala diff --git a/src/main/java/li/cil/oc/server/fs/Capacity.scala b/src/main/scala/li/cil/oc/server/fs/Capacity.scala similarity index 100% rename from src/main/java/li/cil/oc/server/fs/Capacity.scala rename to src/main/scala/li/cil/oc/server/fs/Capacity.scala diff --git a/src/main/java/li/cil/oc/server/fs/ComputerCraftFileSystem.scala b/src/main/scala/li/cil/oc/server/fs/ComputerCraftFileSystem.scala similarity index 100% rename from src/main/java/li/cil/oc/server/fs/ComputerCraftFileSystem.scala rename to src/main/scala/li/cil/oc/server/fs/ComputerCraftFileSystem.scala diff --git a/src/main/java/li/cil/oc/server/fs/ComputerCraftWritableFileSystem.scala b/src/main/scala/li/cil/oc/server/fs/ComputerCraftWritableFileSystem.scala similarity index 100% rename from src/main/java/li/cil/oc/server/fs/ComputerCraftWritableFileSystem.scala rename to src/main/scala/li/cil/oc/server/fs/ComputerCraftWritableFileSystem.scala diff --git a/src/main/java/li/cil/oc/server/fs/FileInputStreamFileSystem.scala b/src/main/scala/li/cil/oc/server/fs/FileInputStreamFileSystem.scala similarity index 100% rename from src/main/java/li/cil/oc/server/fs/FileInputStreamFileSystem.scala rename to src/main/scala/li/cil/oc/server/fs/FileInputStreamFileSystem.scala diff --git a/src/main/java/li/cil/oc/server/fs/FileOutputStreamFileSystem.scala b/src/main/scala/li/cil/oc/server/fs/FileOutputStreamFileSystem.scala similarity index 100% rename from src/main/java/li/cil/oc/server/fs/FileOutputStreamFileSystem.scala rename to src/main/scala/li/cil/oc/server/fs/FileOutputStreamFileSystem.scala diff --git a/src/main/java/li/cil/oc/server/fs/FileSystem.scala b/src/main/scala/li/cil/oc/server/fs/FileSystem.scala similarity index 100% rename from src/main/java/li/cil/oc/server/fs/FileSystem.scala rename to src/main/scala/li/cil/oc/server/fs/FileSystem.scala diff --git a/src/main/java/li/cil/oc/server/fs/InputStreamFileSystem.scala b/src/main/scala/li/cil/oc/server/fs/InputStreamFileSystem.scala similarity index 100% rename from src/main/java/li/cil/oc/server/fs/InputStreamFileSystem.scala rename to src/main/scala/li/cil/oc/server/fs/InputStreamFileSystem.scala diff --git a/src/main/java/li/cil/oc/server/fs/OutputStreamFileSystem.scala b/src/main/scala/li/cil/oc/server/fs/OutputStreamFileSystem.scala similarity index 100% rename from src/main/java/li/cil/oc/server/fs/OutputStreamFileSystem.scala rename to src/main/scala/li/cil/oc/server/fs/OutputStreamFileSystem.scala diff --git a/src/main/java/li/cil/oc/server/fs/VirtualFileSystem.scala b/src/main/scala/li/cil/oc/server/fs/VirtualFileSystem.scala similarity index 100% rename from src/main/java/li/cil/oc/server/fs/VirtualFileSystem.scala rename to src/main/scala/li/cil/oc/server/fs/VirtualFileSystem.scala diff --git a/src/main/java/li/cil/oc/server/fs/Volatile.scala b/src/main/scala/li/cil/oc/server/fs/Volatile.scala similarity index 100% rename from src/main/java/li/cil/oc/server/fs/Volatile.scala rename to src/main/scala/li/cil/oc/server/fs/Volatile.scala diff --git a/src/main/java/li/cil/oc/server/fs/ZipFileInputStreamFileSystem.scala b/src/main/scala/li/cil/oc/server/fs/ZipFileInputStreamFileSystem.scala similarity index 100% rename from src/main/java/li/cil/oc/server/fs/ZipFileInputStreamFileSystem.scala rename to src/main/scala/li/cil/oc/server/fs/ZipFileInputStreamFileSystem.scala diff --git a/src/main/java/li/cil/oc/server/network/Component.scala b/src/main/scala/li/cil/oc/server/network/Component.scala similarity index 100% rename from src/main/java/li/cil/oc/server/network/Component.scala rename to src/main/scala/li/cil/oc/server/network/Component.scala diff --git a/src/main/java/li/cil/oc/server/network/ComponentConnector.scala b/src/main/scala/li/cil/oc/server/network/ComponentConnector.scala similarity index 100% rename from src/main/java/li/cil/oc/server/network/ComponentConnector.scala rename to src/main/scala/li/cil/oc/server/network/ComponentConnector.scala diff --git a/src/main/java/li/cil/oc/server/network/Connector.scala b/src/main/scala/li/cil/oc/server/network/Connector.scala similarity index 100% rename from src/main/java/li/cil/oc/server/network/Connector.scala rename to src/main/scala/li/cil/oc/server/network/Connector.scala diff --git a/src/main/java/li/cil/oc/server/network/Distributor.scala b/src/main/scala/li/cil/oc/server/network/Distributor.scala similarity index 100% rename from src/main/java/li/cil/oc/server/network/Distributor.scala rename to src/main/scala/li/cil/oc/server/network/Distributor.scala diff --git a/src/main/java/li/cil/oc/server/network/Network.scala b/src/main/scala/li/cil/oc/server/network/Network.scala similarity index 100% rename from src/main/java/li/cil/oc/server/network/Network.scala rename to src/main/scala/li/cil/oc/server/network/Network.scala diff --git a/src/main/java/li/cil/oc/server/network/Node.scala b/src/main/scala/li/cil/oc/server/network/Node.scala similarity index 100% rename from src/main/java/li/cil/oc/server/network/Node.scala rename to src/main/scala/li/cil/oc/server/network/Node.scala diff --git a/src/main/java/li/cil/oc/util/ExtendedLuaState.scala b/src/main/scala/li/cil/oc/util/ExtendedLuaState.scala similarity index 100% rename from src/main/java/li/cil/oc/util/ExtendedLuaState.scala rename to src/main/scala/li/cil/oc/util/ExtendedLuaState.scala diff --git a/src/main/java/li/cil/oc/util/ExtendedNBT.scala b/src/main/scala/li/cil/oc/util/ExtendedNBT.scala similarity index 100% rename from src/main/java/li/cil/oc/util/ExtendedNBT.scala rename to src/main/scala/li/cil/oc/util/ExtendedNBT.scala diff --git a/src/main/java/li/cil/oc/util/GameTimeFormatter.scala b/src/main/scala/li/cil/oc/util/GameTimeFormatter.scala similarity index 100% rename from src/main/java/li/cil/oc/util/GameTimeFormatter.scala rename to src/main/scala/li/cil/oc/util/GameTimeFormatter.scala diff --git a/src/main/java/li/cil/oc/util/ItemCosts.scala b/src/main/scala/li/cil/oc/util/ItemCosts.scala similarity index 100% rename from src/main/java/li/cil/oc/util/ItemCosts.scala rename to src/main/scala/li/cil/oc/util/ItemCosts.scala diff --git a/src/main/java/li/cil/oc/util/LuaStateFactory.scala b/src/main/scala/li/cil/oc/util/LuaStateFactory.scala similarity index 100% rename from src/main/java/li/cil/oc/util/LuaStateFactory.scala rename to src/main/scala/li/cil/oc/util/LuaStateFactory.scala diff --git a/src/main/java/li/cil/oc/util/PackedColor.scala b/src/main/scala/li/cil/oc/util/PackedColor.scala similarity index 100% rename from src/main/java/li/cil/oc/util/PackedColor.scala rename to src/main/scala/li/cil/oc/util/PackedColor.scala diff --git a/src/main/java/li/cil/oc/util/RTree.scala b/src/main/scala/li/cil/oc/util/RTree.scala similarity index 100% rename from src/main/java/li/cil/oc/util/RTree.scala rename to src/main/scala/li/cil/oc/util/RTree.scala diff --git a/src/main/java/li/cil/oc/util/RenderState.scala b/src/main/scala/li/cil/oc/util/RenderState.scala similarity index 100% rename from src/main/java/li/cil/oc/util/RenderState.scala rename to src/main/scala/li/cil/oc/util/RenderState.scala diff --git a/src/main/java/li/cil/oc/util/RotationHelper.scala b/src/main/scala/li/cil/oc/util/RotationHelper.scala similarity index 100% rename from src/main/java/li/cil/oc/util/RotationHelper.scala rename to src/main/scala/li/cil/oc/util/RotationHelper.scala diff --git a/src/main/java/li/cil/oc/util/ScalaClosure.scala b/src/main/scala/li/cil/oc/util/ScalaClosure.scala similarity index 100% rename from src/main/java/li/cil/oc/util/ScalaClosure.scala rename to src/main/scala/li/cil/oc/util/ScalaClosure.scala diff --git a/src/main/java/li/cil/oc/util/TextBuffer.scala b/src/main/scala/li/cil/oc/util/TextBuffer.scala similarity index 100% rename from src/main/java/li/cil/oc/util/TextBuffer.scala rename to src/main/scala/li/cil/oc/util/TextBuffer.scala diff --git a/src/main/java/li/cil/oc/util/ThreadPoolFactory.scala b/src/main/scala/li/cil/oc/util/ThreadPoolFactory.scala similarity index 100% rename from src/main/java/li/cil/oc/util/ThreadPoolFactory.scala rename to src/main/scala/li/cil/oc/util/ThreadPoolFactory.scala diff --git a/src/main/java/li/cil/oc/util/Tooltip.scala b/src/main/scala/li/cil/oc/util/Tooltip.scala similarity index 100% rename from src/main/java/li/cil/oc/util/Tooltip.scala rename to src/main/scala/li/cil/oc/util/Tooltip.scala diff --git a/src/main/java/li/cil/oc/util/WirelessNetwork.scala b/src/main/scala/li/cil/oc/util/WirelessNetwork.scala similarity index 100% rename from src/main/java/li/cil/oc/util/WirelessNetwork.scala rename to src/main/scala/li/cil/oc/util/WirelessNetwork.scala diff --git a/src/main/java/li/cil/oc/util/mods/BuildCraft.scala b/src/main/scala/li/cil/oc/util/mods/BuildCraft.scala similarity index 100% rename from src/main/java/li/cil/oc/util/mods/BuildCraft.scala rename to src/main/scala/li/cil/oc/util/mods/BuildCraft.scala diff --git a/src/main/java/li/cil/oc/util/mods/BundledRedstone.scala b/src/main/scala/li/cil/oc/util/mods/BundledRedstone.scala similarity index 100% rename from src/main/java/li/cil/oc/util/mods/BundledRedstone.scala rename to src/main/scala/li/cil/oc/util/mods/BundledRedstone.scala diff --git a/src/main/java/li/cil/oc/util/mods/ComputerCraft.scala b/src/main/scala/li/cil/oc/util/mods/ComputerCraft.scala similarity index 100% rename from src/main/java/li/cil/oc/util/mods/ComputerCraft.scala rename to src/main/scala/li/cil/oc/util/mods/ComputerCraft.scala diff --git a/src/main/java/li/cil/oc/util/mods/GregTech.scala b/src/main/scala/li/cil/oc/util/mods/GregTech.scala similarity index 100% rename from src/main/java/li/cil/oc/util/mods/GregTech.scala rename to src/main/scala/li/cil/oc/util/mods/GregTech.scala diff --git a/src/main/java/li/cil/oc/util/mods/IndustrialCraft2.scala b/src/main/scala/li/cil/oc/util/mods/IndustrialCraft2.scala similarity index 100% rename from src/main/java/li/cil/oc/util/mods/IndustrialCraft2.scala rename to src/main/scala/li/cil/oc/util/mods/IndustrialCraft2.scala diff --git a/src/main/java/li/cil/oc/util/mods/NEI.scala b/src/main/scala/li/cil/oc/util/mods/NEI.scala similarity index 100% rename from src/main/java/li/cil/oc/util/mods/NEI.scala rename to src/main/scala/li/cil/oc/util/mods/NEI.scala diff --git a/src/main/java/li/cil/oc/util/mods/PortalGun.scala b/src/main/scala/li/cil/oc/util/mods/PortalGun.scala similarity index 100% rename from src/main/java/li/cil/oc/util/mods/PortalGun.scala rename to src/main/scala/li/cil/oc/util/mods/PortalGun.scala diff --git a/src/main/java/li/cil/oc/util/mods/ProjectRed.scala b/src/main/scala/li/cil/oc/util/mods/ProjectRed.scala similarity index 100% rename from src/main/java/li/cil/oc/util/mods/ProjectRed.scala rename to src/main/scala/li/cil/oc/util/mods/ProjectRed.scala diff --git a/src/main/java/li/cil/oc/util/mods/StargateTech2.scala b/src/main/scala/li/cil/oc/util/mods/StargateTech2.scala similarity index 100% rename from src/main/java/li/cil/oc/util/mods/StargateTech2.scala rename to src/main/scala/li/cil/oc/util/mods/StargateTech2.scala