From 462ffcf2ab63a44b6cbe26be961ccbad3605517f Mon Sep 17 00:00:00 2001 From: logan Date: Sun, 26 Jan 2025 03:17:09 -0800 Subject: [PATCH] Move files from oc2r -> oc2 --- src/main/java/li/cil/{oc2r => oc2}/api/API.java | 0 src/main/java/li/cil/{oc2r => oc2}/api/README.md | 0 .../api/bus/BlockDeviceBusElement.java | 0 .../li/cil/{oc2r => oc2}/api/bus/DeviceBus.java | 0 .../{oc2r => oc2}/api/bus/DeviceBusController.java | 0 .../cil/{oc2r => oc2}/api/bus/DeviceBusElement.java | 0 .../li/cil/{oc2r => oc2}/api/bus/device/Device.java | 0 .../{oc2r => oc2}/api/bus/device/DeviceType.java | 0 .../{oc2r => oc2}/api/bus/device/DeviceTypes.java | 0 .../{oc2r => oc2}/api/bus/device/ItemDevice.java | 0 .../api/bus/device/data/BlockDeviceData.java | 0 .../{oc2r => oc2}/api/bus/device/data/Firmware.java | 0 .../api/bus/device/data/package-info.java | 0 .../api/bus/device/object/Callback.java | 0 .../api/bus/device/object/Callbacks.java | 0 .../api/bus/device/object/DocumentedDevice.java | 0 .../api/bus/device/object/LifecycleAwareDevice.java | 0 .../api/bus/device/object/NamedDevice.java | 0 .../api/bus/device/object/ObjectDevice.java | 0 .../api/bus/device/object/Parameter.java | 0 .../api/bus/device/object/package-info.java | 0 .../{oc2r => oc2}/api/bus/device/package-info.java | 0 .../bus/device/provider/BlockDeviceProvider.java | 0 .../api/bus/device/provider/BlockDeviceQuery.java | 0 .../api/bus/device/provider/ItemDeviceProvider.java | 0 .../api/bus/device/provider/ItemDeviceQuery.java | 0 .../api/bus/device/provider/package-info.java | 0 .../api/bus/device/rpc/AbstractRPCMethod.java | 0 .../{oc2r => oc2}/api/bus/device/rpc/RPCDevice.java | 0 .../api/bus/device/rpc/RPCInvocation.java | 0 .../{oc2r => oc2}/api/bus/device/rpc/RPCMethod.java | 0 .../api/bus/device/rpc/RPCMethodGroup.java | 0 .../api/bus/device/rpc/RPCParameter.java | 0 .../api/bus/device/rpc/package-info.java | 0 .../api/bus/device/vm/FirmwareLoader.java | 0 .../{oc2r => oc2}/api/bus/device/vm/VMDevice.java | 0 .../api/bus/device/vm/VMDeviceLoadResult.java | 0 .../bus/device/vm/context/InterruptAllocator.java | 0 .../api/bus/device/vm/context/MemoryAllocator.java | 0 .../bus/device/vm/context/MemoryRangeAllocator.java | 0 .../api/bus/device/vm/context/VMContext.java | 0 .../bus/device/vm/context/VMLifecycleEventBus.java | 0 .../api/bus/device/vm/context/package-info.java | 0 .../device/vm/event/VMInitializationException.java | 0 .../bus/device/vm/event/VMInitializingEvent.java | 0 .../bus/device/vm/event/VMResumedRunningEvent.java | 0 .../api/bus/device/vm/event/VMSynchronizeEvent.java | 0 .../api/bus/device/vm/event/package-info.java | 0 .../api/bus/device/vm/package-info.java | 0 .../li/cil/{oc2r => oc2}/api/bus/package-info.java | 0 .../api/capabilities/NetworkInterface.java | 0 .../api/capabilities/RedstoneEmitter.java | 0 .../cil/{oc2r => oc2}/api/capabilities/Robot.java | 0 .../api/capabilities/TerminalUserProvider.java | 0 .../api/capabilities/package-info.java | 0 .../api/imc/RPCMethodParameterTypeAdapter.java | 0 .../li/cil/{oc2r => oc2}/api/imc/package-info.java | 0 .../java/li/cil/{oc2r => oc2}/api/package-info.java | 0 .../cil/{oc2r => oc2}/api/util/Invalidatable.java | 0 .../li/cil/{oc2r => oc2}/api/util/Registries.java | 0 .../{oc2r => oc2}/api/util/RobotOperationSide.java | 0 .../java/li/cil/{oc2r => oc2}/api/util/Side.java | 0 .../li/cil/{oc2r => oc2}/api/util/package-info.java | 0 .../li/cil/{oc2r => oc2}/client/ClientSetup.java | 0 .../client/audio/LoopingBlockEntitySound.java | 0 .../client/audio/LoopingSoundManager.java | 0 .../{oc2r => oc2}/client/audio/package-info.java | 0 .../client/gui/AbstractMachineInventoryScreen.java | 0 .../client/gui/AbstractMachineTerminalScreen.java | 0 .../client/gui/AbstractModContainerScreen.java | 0 .../client/gui/AbstractMonitorDisplayScreen.java | 0 .../client/gui/BusInterfaceScreen.java | 0 .../client/gui/ComputerContainerScreen.java | 0 .../client/gui/ComputerTerminalScreen.java | 0 .../{oc2r => oc2}/client/gui/FileChooserScreen.java | 0 .../{oc2r => oc2}/client/gui/KeyCodeMapping.java | 0 .../{oc2r => oc2}/client/gui/KeyboardScreen.java | 0 .../client/gui/MachineTerminalWidget.java | 0 .../client/gui/MonitorDisplayScreen.java | 0 .../client/gui/MonitorDisplayWidget.java | 0 .../client/gui/NetworkInterfaceCardScreen.java | 0 .../client/gui/NetworkTunnelScreen.java | 0 .../client/gui/RobotContainerScreen.java | 0 .../client/gui/RobotTerminalScreen.java | 0 .../li/cil/{oc2r => oc2}/client/gui/Sprites.java | 0 .../li/cil/{oc2r => oc2}/client/gui/Textures.java | 0 .../cil/{oc2r => oc2}/client/gui/package-info.java | 0 .../client/gui/terminal/TerminalInput.java | 0 .../client/gui/terminal/package-info.java | 0 .../cil/{oc2r => oc2}/client/gui/util/GuiUtils.java | 0 .../{oc2r => oc2}/client/gui/util/package-info.java | 0 .../client/gui/widget/ImageButton.java | 0 .../cil/{oc2r => oc2}/client/gui/widget/Sprite.java | 0 .../{oc2r => oc2}/client/gui/widget/Texture.java | 0 .../client/gui/widget/ToggleImageButton.java | 0 .../client/gui/widget/package-info.java | 0 .../{oc2r => oc2}/client/item/CustomItemColors.java | 0 .../client/item/CustomItemModelProperties.java | 0 .../cil/{oc2r => oc2}/client/item/package-info.java | 0 .../li/cil/{oc2r => oc2}/client/manual/Manuals.java | 0 .../client/manual/ModManualScreenStyle.java | 0 .../{oc2r => oc2}/client/manual/ModManualStyle.java | 0 .../{oc2r => oc2}/client/manual/package-info.java | 0 .../client/model/BusCableBakedModel.java | 0 .../{oc2r => oc2}/client/model/BusCableModel.java | 0 .../client/model/BusCableModelLoader.java | 0 .../{oc2r => oc2}/client/model/package-info.java | 0 .../li/cil/{oc2r => oc2}/client/package-info.java | 0 .../client/renderer/BusInterfaceNameRenderer.java | 0 .../client/renderer/ModRenderType.java | 0 .../{oc2r => oc2}/client/renderer/ModShaders.java | 0 .../client/renderer/MonitorGUIRenderer.java | 0 .../client/renderer/NetworkCableRenderer.java | 0 .../client/renderer/ProjectorDepthRenderer.java | 0 .../renderer/blockentity/ChargerRenderer.java | 0 .../renderer/blockentity/ComputerRenderer.java | 0 .../renderer/blockentity/DiskDriveRenderer.java | 0 .../renderer/blockentity/MonitorRenderer.java | 0 .../renderer/blockentity/ProjectorRenderer.java | 0 .../client/renderer/blockentity/package-info.java | 0 .../client/renderer/color/BusCableBlockColor.java | 0 .../client/renderer/color/package-info.java | 0 .../client/renderer/entity/RobotRenderer.java | 0 .../renderer/entity/RobotWithoutLevelRenderer.java | 0 .../client/renderer/entity/model/RobotModel.java | 0 .../client/renderer/entity/model/package-info.java | 0 .../client/renderer/entity/package-info.java | 0 .../client/renderer/font/MonospaceFontRenderer.java | 0 .../client/renderer/font/package-info.java | 0 .../{oc2r => oc2}/client/renderer/package-info.java | 0 .../li/cil/{oc2r => oc2}/common/CommonSetup.java | 0 .../java/li/cil/{oc2r => oc2}/common/Config.java | 0 .../li/cil/{oc2r => oc2}/common/ConfigManager.java | 0 .../java/li/cil/{oc2r => oc2}/common/Constants.java | 0 src/main/java/li/cil/{oc2r => oc2}/common/Main.java | 0 .../li/cil/{oc2r => oc2}/common/block/Blocks.java | 0 .../{oc2r => oc2}/common/block/BusCableBlock.java | 0 .../{oc2r => oc2}/common/block/ChargerBlock.java | 0 .../{oc2r => oc2}/common/block/ComputerBlock.java | 0 .../common/block/CreativeEnergyBlock.java | 0 .../{oc2r => oc2}/common/block/DiskDriveBlock.java | 0 .../common/block/EnergyConsumingBlock.java | 0 .../common/block/FlashMemoryFlasherBlock.java | 0 .../common/block/ImmutableHorizontalBlock.java | 0 .../{oc2r => oc2}/common/block/KeyboardBlock.java | 0 .../{oc2r => oc2}/common/block/MonitorBlock.java | 0 .../common/block/NetworkConnectorBlock.java | 0 .../{oc2r => oc2}/common/block/NetworkHubBlock.java | 0 .../common/block/NetworkSwitchBlock.java | 0 .../common/block/PciCardCageBlock.java | 0 .../{oc2r => oc2}/common/block/ProjectorBlock.java | 0 .../common/block/RedstoneInterfaceBlock.java | 0 .../cil/{oc2r => oc2}/common/block/VxlanBlock.java | 0 .../{oc2r => oc2}/common/block/package-info.java | 0 .../common/blockentity/BlockEntities.java | 0 .../common/blockentity/BusCableBlockEntity.java | 0 .../common/blockentity/ChargerBlockEntity.java | 0 .../common/blockentity/ComputerBlockEntity.java | 0 .../blockentity/CreativeEnergyBlockEntity.java | 0 .../common/blockentity/DiskDriveBlockEntity.java | 0 .../blockentity/FlashMemoryFlasherBlockEntity.java | 0 .../common/blockentity/KeyboardBlockEntity.java | 0 .../common/blockentity/ModBlockEntity.java | 0 .../common/blockentity/MonitorBlockEntity.java | 0 .../blockentity/NetworkConnectorBlockEntity.java | 0 .../common/blockentity/NetworkHubBlockEntity.java | 0 .../blockentity/NetworkSwitchBlockEntity.java | 0 .../common/blockentity/PciCardCageBlockEntity.java | 0 .../common/blockentity/ProjectorBlockEntity.java | 0 .../blockentity/RedstoneInterfaceBlockEntity.java | 0 .../common/blockentity/TickableBlockEntity.java | 0 .../common/blockentity/VxlanBlockEntity.java | 0 .../common/blockentity/package-info.java | 0 .../common/bus/AbstractBlockDeviceBusElement.java | 0 .../common/bus/AbstractDeviceBusElement.java | 0 .../bus/AbstractGroupingDeviceBusElement.java | 0 .../common/bus/AbstractItemDeviceBusElement.java | 0 .../common/bus/BlockDeviceBusController.java | 0 .../common/bus/CommonDeviceBusController.java | 0 .../common/bus/RPCDeviceBusAdapter.java | 0 .../common/bus/device/BlockDeviceBusElement.java | 0 .../common/bus/device/DeviceGroup.java | 0 .../common/bus/device/DeviceTypes.java | 0 .../bus/device/data/BlockDeviceDataRegistry.java | 0 .../bus/device/data/BuildrootBlockDeviceData.java | 0 .../common/bus/device/data/BuildrootFirmware.java | 0 .../common/bus/device/data/FileSystems.java | 0 .../common/bus/device/data/FirmwareRegistry.java | 0 .../bus/device/data/ResourceBlockDeviceData.java | 0 .../common/bus/device/data/package-info.java | 0 .../common/bus/device/package-info.java | 0 .../bus/device/provider/ProviderRegistry.java | 0 .../common/bus/device/provider/Providers.java | 0 .../block/BlockEntityCapabilityDeviceProvider.java | 0 .../bus/device/provider/block/package-info.java | 0 .../AbstractItemStackCapabilityDeviceProvider.java | 0 .../item/BlockOperationsModuleDeviceProvider.java | 0 .../device/provider/item/CPUItemDeviceProvider.java | 0 .../item/EnergyStorageItemDeviceProvider.java | 0 .../FileImportExportCardItemDeviceProvider.java | 0 .../item/FlashMemoryItemDeviceProvider.java | 0 ...ashMemoryWithExternalDataItemDeviceProvider.java | 0 .../item/FluidHandlerItemDeviceProvider.java | 0 .../provider/item/HardDriveItemDeviceProvider.java | 0 ...HardDriveWithExternalDataItemDeviceProvider.java | 0 .../InventoryOperationsModuleDeviceProvider.java | 0 .../item/ItemHandlerItemDeviceProvider.java | 0 .../item/ItemStackCapabilityDeviceProvider.java | 0 .../provider/item/MemoryItemDeviceProvider.java | 0 .../NetworkInterfaceCardItemDeviceProvider.java | 0 .../item/NetworkTunnelCardItemDeviceProvider.java | 0 .../item/NetworkTunnelModuleItemDeviceProvider.java | 0 .../RedstoneInterfaceCardItemDeviceProvider.java | 0 .../provider/item/SoundCardItemDeviceProvider.java | 0 .../bus/device/provider/item/package-info.java | 0 .../common/bus/device/provider/package-info.java | 0 .../provider/util/AbstractBlockDeviceProvider.java | 0 ...AbstractBlockEntityCapabilityDeviceProvider.java | 0 .../util/AbstractBlockEntityDeviceProvider.java | 0 .../provider/util/AbstractItemDeviceProvider.java | 0 .../bus/device/provider/util/package-info.java | 0 .../common/bus/device/rpc/EnergyStorageDevice.java | 0 .../common/bus/device/rpc/FluidHandlerDevice.java | 0 .../common/bus/device/rpc/ItemHandlerDevice.java | 0 .../common/bus/device/rpc/RPCDeviceList.java | 0 .../bus/device/rpc/RPCItemStackTagFilter.java | 0 .../bus/device/rpc/RPCItemStackTagFilters.java | 0 .../device/rpc/RPCMethodParameterTypeAdapters.java | 0 .../common/bus/device/rpc/TypeNameRPCDevice.java | 0 .../rpc/block/BlockEntityObjectDeviceProvider.java | 0 .../rpc/block/BlockStateObjectDeviceProvider.java | 0 .../rpc/block/EnergyStorageBlockDeviceProvider.java | 0 .../rpc/block/FluidHandlerBlockDeviceProvider.java | 0 .../rpc/block/ItemHandlerBlockDeviceProvider.java | 0 .../common/bus/device/rpc/block/package-info.java | 0 .../bus/device/rpc/item/AbstractItemRPCDevice.java | 0 .../rpc/item/BlockOperationsModuleDevice.java | 0 .../common/bus/device/rpc/item/CPUItemDevice.java | 0 .../rpc/item/FileImportExportCardItemDevice.java | 0 .../rpc/item/InventoryOperationsModuleDevice.java | 0 .../rpc/item/RedstoneInterfaceCardItemDevice.java | 0 .../bus/device/rpc/item/SoundCardItemDevice.java | 0 .../common/bus/device/rpc/item/package-info.java | 0 .../common/bus/device/rpc/package-info.java | 0 .../common/bus/device/util/AbstractDeviceInfo.java | 0 .../common/bus/device/util/BlockDeviceInfo.java | 0 .../common/bus/device/util/DeviceTypeImpl.java | 0 .../common/bus/device/util/Devices.java | 0 .../common/bus/device/util/IdentityProxy.java | 0 .../common/bus/device/util/ItemDeviceInfo.java | 0 .../common/bus/device/util/OptionalAddress.java | 0 .../common/bus/device/util/OptionalInterrupt.java | 0 .../common/bus/device/util/package-info.java | 0 .../bus/device/vm/block/DiskDriveContainer.java | 0 .../common/bus/device/vm/block/DiskDriveDevice.java | 0 .../vm/block/FlashMemoryFlasherContainer.java | 0 .../device/vm/block/FlashMemoryFlasherDevice.java | 0 .../common/bus/device/vm/block/KeyboardDevice.java | 0 .../common/bus/device/vm/block/MonitorDevice.java | 0 .../bus/device/vm/block/PciCardCageDevice.java | 0 .../common/bus/device/vm/block/ProjectorDevice.java | 0 .../common/bus/device/vm/block/package-info.java | 0 .../device/vm/item/AbstractBlockStorageDevice.java | 0 .../vm/item/AbstractNetworkInterfaceDevice.java | 0 .../vm/item/ByteBufferFlashStorageDevice.java | 0 .../device/vm/item/FirmwareFlashStorageDevice.java | 0 .../common/bus/device/vm/item/HardDriveDevice.java | 0 .../vm/item/HardDriveDeviceWithInitialData.java | 0 .../common/bus/device/vm/item/MemoryDevice.java | 0 .../device/vm/item/NetworkInterfaceCardDevice.java | 0 .../bus/device/vm/item/NetworkTunnelDevice.java | 0 .../common/bus/device/vm/item/package-info.java | 0 .../common/bus/device/vm/package-info.java | 0 .../cil/{oc2r => oc2}/common/bus/package-info.java | 0 .../common/capabilities/Capabilities.java | 0 .../common/capabilities/CapabilityRegistry.java | 0 .../common/capabilities/package-info.java | 0 .../common/container/AbstractComputerContainer.java | 0 .../common/container/AbstractContainer.java | 0 .../container/AbstractDeviceItemStackHandler.java | 0 .../common/container/AbstractMachineContainer.java | 0 .../container/AbstractMachineTerminalContainer.java | 0 .../common/container/AbstractMonitorContainer.java | 0 .../common/container/AbstractRobotContainer.java | 0 .../AbstractTypedDeviceItemStackHandler.java | 0 .../container/ComputerInventoryContainer.java | 0 .../common/container/ComputerTerminalContainer.java | 0 .../{oc2r => oc2}/common/container/Containers.java | 0 .../common/container/DeviceTypeSlot.java | 0 .../common/container/DeviceTypeSlotItemHandler.java | 0 .../common/container/FixedSizeItemStackHandler.java | 0 .../common/container/IntPrecisionContainerData.java | 0 .../{oc2r => oc2}/common/container/LockedSlot.java | 0 .../common/container/MonitorDisplayContainer.java | 0 .../common/container/NetworkTunnelContainer.java | 0 .../common/container/RobotInventoryContainer.java | 0 .../{oc2r => oc2}/common/container/RobotSlot.java | 0 .../common/container/RobotTerminalContainer.java | 0 .../common/container/TypedItemStackHandler.java | 0 .../common/container/package-info.java | 0 .../common/energy/EnergyStorageItemStack.java | 0 .../common/energy/FixedEnergyStorage.java | 0 .../{oc2r => oc2}/common/energy/package-info.java | 0 .../cil/{oc2r => oc2}/common/entity/Entities.java | 0 .../li/cil/{oc2r => oc2}/common/entity/Robot.java | 0 .../{oc2r => oc2}/common/entity/package-info.java | 0 .../common/entity/robot/AbstractRobotAction.java | 0 .../entity/robot/AbstractRobotActionType.java | 0 .../common/entity/robot/MovementDirection.java | 0 .../common/entity/robot/RobotActionResult.java | 0 .../common/entity/robot/RobotActions.java | 0 .../common/entity/robot/RobotMovementAction.java | 0 .../entity/robot/RobotMovementActionType.java | 0 .../common/entity/robot/RobotRotationAction.java | 0 .../entity/robot/RobotRotationActionType.java | 0 .../common/entity/robot/RotationDirection.java | 0 .../common/entity/robot/package-info.java | 0 .../cil/{oc2r => oc2}/common/ext/MinecraftExt.java | 0 .../cil/{oc2r => oc2}/common/ext/package-info.java | 0 .../cil/{oc2r => oc2}/common/integration/IMC.java | 0 .../common/integration/Integrations.java | 0 .../{oc2r => oc2}/common/integration/Wrenches.java | 0 .../integration/jei/ExtraGuiAreasJEIPlugin.java | 0 .../common/integration/jei/ExtraItemsJEIPlugin.java | 0 .../common/integration/jei/package-info.java | 0 .../common/integration/package-info.java | 0 .../integration/projectred/BundledCableHandler.java | 0 .../common/integration/util/BundledRedstone.java | 0 .../common/item/AbstractBlockDeviceItem.java | 0 .../common/item/AbstractStorageItem.java | 0 .../common/item/BlockOperationsModule.java | 0 .../cil/{oc2r => oc2}/common/item/BusCableItem.java | 0 .../{oc2r => oc2}/common/item/BusInterfaceItem.java | 0 .../li/cil/{oc2r => oc2}/common/item/CPUItem.java | 0 .../cil/{oc2r => oc2}/common/item/ChargerItem.java | 0 .../{oc2r => oc2}/common/item/FlashMemoryItem.java | 0 .../item/FlashMemoryWithExternalDataItem.java | 0 .../cil/{oc2r => oc2}/common/item/FloppyItem.java | 0 .../{oc2r => oc2}/common/item/HardDriveItem.java | 0 .../common/item/HardDriveWithExternalDataItem.java | 0 .../li/cil/{oc2r => oc2}/common/item/ItemGroup.java | 0 .../common/item/ItemRenameHandler.java | 0 .../li/cil/{oc2r => oc2}/common/item/Items.java | 0 .../cil/{oc2r => oc2}/common/item/ManualItem.java | 0 .../cil/{oc2r => oc2}/common/item/MemoryItem.java | 0 .../cil/{oc2r => oc2}/common/item/ModBlockItem.java | 0 .../li/cil/{oc2r => oc2}/common/item/ModItem.java | 0 .../{oc2r => oc2}/common/item/NetworkCableItem.java | 0 .../common/item/NetworkInterfaceCardItem.java | 0 .../common/item/NetworkTunnelItem.java | 0 .../li/cil/{oc2r => oc2}/common/item/RobotItem.java | 0 .../cil/{oc2r => oc2}/common/item/WrenchItem.java | 0 .../common/item/crafting/RecipeSerializers.java | 0 .../common/item/crafting/WrenchRecipe.java | 0 .../common/item/crafting/package-info.java | 0 .../cil/{oc2r => oc2}/common/item/package-info.java | 0 .../{oc2r => oc2}/common/mixin/FrustumMixin.java | 0 .../common/mixin/LevelRendererMixin.java | 0 .../{oc2r => oc2}/common/mixin/MinecraftMixin.java | 0 .../common/mixin/ServerChunkCacheMixin.java | 0 .../{oc2r => oc2}/common/mixin/package-info.java | 0 .../{oc2r => oc2}/common/network/MessageUtils.java | 0 .../common/network/MonitorLoadBalancer.java | 0 .../cil/{oc2r => oc2}/common/network/Network.java | 0 .../common/network/ProjectorLoadBalancer.java | 0 .../common/network/message/AbstractMessage.java | 0 .../message/AbstractTerminalBlockMessage.java | 0 .../message/AbstractTerminalEntityMessage.java | 0 .../network/message/BusCableFacadeMessage.java | 0 .../network/message/BusInterfaceNameMessage.java | 0 .../message/ClientCanceledImportFileMessage.java | 0 .../network/message/ComputerBootErrorMessage.java | 0 .../network/message/ComputerBusStateMessage.java | 0 .../network/message/ComputerPowerMessage.java | 0 .../network/message/ComputerRunStateMessage.java | 0 .../message/ComputerTerminalInputMessage.java | 0 .../message/ComputerTerminalOutputMessage.java | 0 .../network/message/DiskDriveFloppyMessage.java | 0 .../common/network/message/ExportedFileMessage.java | 0 .../network/message/FirmwareFlasherMessage.java | 0 .../common/network/message/ImportedFileMessage.java | 0 .../network/message/KeyboardInputMessage.java | 0 .../network/message/MonitorFramebufferMessage.java | 0 .../common/network/message/MonitorInputMessage.java | 0 .../common/network/message/MonitorPowerMessage.java | 0 .../message/MonitorPowerMessageForwarded.java | 0 .../message/MonitorRequestFramebufferMessage.java | 0 .../common/network/message/MonitorStateMessage.java | 0 .../common/network/message/MultipartMessage.java | 0 .../message/NetworkConnectorConnectionsMessage.java | 0 .../NetworkInterfaceCardConfigurationMessage.java | 0 .../network/message/NetworkTunnelLinkMessage.java | 0 .../message/OpenComputerInventoryMessage.java | 0 .../message/OpenComputerTerminalMessage.java | 0 .../network/message/OpenRobotInventoryMessage.java | 0 .../network/message/OpenRobotTerminalMessage.java | 0 .../message/ProjectorFramebufferMessage.java | 0 .../message/ProjectorRequestFramebufferMessage.java | 0 .../network/message/ProjectorStateMessage.java | 0 .../network/message/RequestImportedFileMessage.java | 0 .../network/message/RobotBootErrorMessage.java | 0 .../network/message/RobotBusStateMessage.java | 0 .../network/message/RobotInitializationMessage.java | 0 .../message/RobotInitializationRequestMessage.java | 0 .../common/network/message/RobotPowerMessage.java | 0 .../network/message/RobotRunStateMessage.java | 0 .../network/message/RobotTerminalInputMessage.java | 0 .../network/message/RobotTerminalOutputMessage.java | 0 .../message/ServerCanceledImportFileMessage.java | 0 .../common/network/message/package-info.java | 0 .../{oc2r => oc2}/common/network/package-info.java | 0 .../li/cil/{oc2r => oc2}/common/package-info.java | 0 .../common/serialization/BlobStorage.java | 0 .../common/serialization/NBTSerialization.java | 0 .../common/serialization/NBTToJsonConverter.java | 0 .../serialization/ceres/JsonArraySerializer.java | 0 .../ceres/MemoryRangeListSerializer.java | 0 .../serialization/ceres/MemoryRangeSerializer.java | 0 .../common/serialization/ceres/Serializers.java | 0 .../ceres/TextComponentSerializer.java | 0 .../common/serialization/ceres/package-info.java | 0 .../serialization/gson/DirectionJsonSerializer.java | 0 .../gson/EmptyRPCMethodGroupSerializer.java | 0 .../serialization/gson/ItemStackJsonSerializer.java | 0 .../serialization/gson/MessageJsonDeserializer.java | 0 .../gson/MethodInvocationJsonDeserializer.java | 0 .../gson/RPCDeviceWithIdentifierJsonSerializer.java | 0 .../serialization/gson/RPCMethodJsonSerializer.java | 0 .../serialization/gson/SideJsonDeserializer.java | 0 .../gson/UnsignedByteArrayJsonSerializer.java | 0 .../common/serialization/gson/package-info.java | 0 .../common/serialization/package-info.java | 0 .../li/cil/{oc2r => oc2}/common/tags/BlockTags.java | 0 .../li/cil/{oc2r => oc2}/common/tags/ItemTags.java | 0 .../cil/{oc2r => oc2}/common/tags/package-info.java | 0 .../{oc2r => oc2}/common/util/BlockEntityUtils.java | 0 .../{oc2r => oc2}/common/util/BlockLocation.java | 0 .../common/util/ChainableVertexConsumer.java | 0 .../{oc2r => oc2}/common/util/ChunkLocation.java | 0 .../cil/{oc2r => oc2}/common/util/ChunkUtils.java | 0 .../cil/{oc2r => oc2}/common/util/ColorUtils.java | 0 .../li/cil/{oc2r => oc2}/common/util/Event.java | 0 .../{oc2r => oc2}/common/util/FakePlayerUtils.java | 0 .../common/util/HorizontalBlockUtils.java | 0 .../{oc2r => oc2}/common/util/ItemDeviceUtils.java | 0 .../{oc2r => oc2}/common/util/ItemStackUtils.java | 0 .../common/util/LazyOptionalUtils.java | 0 .../cil/{oc2r => oc2}/common/util/LevelUtils.java | 0 .../common/util/LocationSupplierUtils.java | 0 .../li/cil/{oc2r => oc2}/common/util/NBTTagIds.java | 0 .../li/cil/{oc2r => oc2}/common/util/NBTUtils.java | 0 .../common/util/ParameterizedEvent.java | 0 .../{oc2r => oc2}/common/util/RegistryUtils.java | 0 .../{oc2r => oc2}/common/util/RunnableUtils.java | 0 .../{oc2r => oc2}/common/util/ServerScheduler.java | 0 .../cil/{oc2r => oc2}/common/util/SoundEvents.java | 0 .../{oc2r => oc2}/common/util/TerminalUtils.java | 0 .../{oc2r => oc2}/common/util/TextFormatUtils.java | 0 .../common/util/ThrottledSoundEmitter.java | 0 .../li/cil/{oc2r => oc2}/common/util/TickUtils.java | 0 .../cil/{oc2r => oc2}/common/util/TooltipUtils.java | 0 .../{oc2r => oc2}/common/util/TranslationUtils.java | 0 .../li/cil/{oc2r => oc2}/common/util/Vec3Utils.java | 0 .../{oc2r => oc2}/common/util/VoxelShapeUtils.java | 0 .../cil/{oc2r => oc2}/common/util/package-info.java | 0 .../common/vm/AbstractTerminalVMRunner.java | 0 .../common/vm/AbstractVMItemStackHandlers.java | 0 .../common/vm/AbstractVirtualMachine.java | 0 .../li/cil/{oc2r => oc2}/common/vm/Allocator.java | 0 .../common/vm/BaseAddressProvider.java | 0 .../cil/{oc2r => oc2}/common/vm/BuiltinDevices.java | 0 .../common/vm/MinecraftRealTimeCounter.java | 0 .../li/cil/{oc2r => oc2}/common/vm/Terminal.java | 0 .../{oc2r => oc2}/common/vm/VMDeviceBusAdapter.java | 0 .../common/vm/VMItemStackHandlers.java | 0 .../li/cil/{oc2r => oc2}/common/vm/VMRunState.java | 0 .../li/cil/{oc2r => oc2}/common/vm/VMRunner.java | 0 .../cil/{oc2r => oc2}/common/vm/VirtualMachine.java | 0 .../common/vm/context/EventManager.java | 0 .../common/vm/context/InterruptManager.java | 0 .../common/vm/context/InterruptValidator.java | 0 .../common/vm/context/MemoryRangeManager.java | 0 .../vm/context/VMContextManagerCollection.java | 0 .../common/vm/context/global/GlobalEventBus.java | 0 .../vm/context/global/GlobalInterruptAllocator.java | 0 .../context/global/GlobalInterruptController.java | 0 .../vm/context/global/GlobalMemoryAllocator.java | 0 .../common/vm/context/global/GlobalMemoryMap.java | 0 .../context/global/GlobalMemoryRangeAllocator.java | 0 .../common/vm/context/global/GlobalVMContext.java | 0 .../common/vm/context/global/MemoryRangeList.java | 0 .../common/vm/context/global/package-info.java | 0 .../common/vm/context/managed/ManagedEventBus.java | 0 .../context/managed/ManagedInterruptAllocator.java | 0 .../context/managed/ManagedInterruptController.java | 0 .../vm/context/managed/ManagedMemoryAllocator.java | 0 .../common/vm/context/managed/ManagedMemoryMap.java | 0 .../managed/ManagedMemoryRangeAllocator.java | 0 .../common/vm/context/managed/ManagedVMContext.java | 0 .../common/vm/context/managed/package-info.java | 0 .../common/vm/context/package-info.java | 0 .../common/vm/device/PciRootPortDevice.java | 0 .../common/vm/device/SimpleFramebufferDevice.java | 0 .../common/vm/fs/LayeredFileSystem.java | 0 .../{oc2r => oc2}/common/vm/fs/package-info.java | 0 .../cil/{oc2r => oc2}/common/vm/package-info.java | 0 .../common/vm/provider/DeviceTreeProviders.java | 0 .../vm/provider/PciRootPortDeviceProvider.java | 0 .../provider/SimpleFramebufferDeviceProvider.java | 0 .../{oc2r => oc2}/common/vxlan/TunnelManager.java | 0 .../li/cil/{oc2r => oc2}/data/DataGenerators.java | 0 .../{oc2r => oc2}/data/ModBlockStateProvider.java | 0 .../{oc2r => oc2}/data/ModBlockTagsProvider.java | 0 .../{oc2r => oc2}/data/ModItemModelProvider.java | 0 .../cil/{oc2r => oc2}/data/ModItemTagsProvider.java | 0 .../{oc2r => oc2}/data/ModLootTableProvider.java | 0 .../cil/{oc2r => oc2}/data/ModRecipesProvider.java | 0 .../cil/{oc2r => oc2}/data/WrenchRecipeBuilder.java | 0 .../li/cil/{oc2r => oc2}/data/package-info.java | 0 .../jcodec/codecs/common/biari/MConst.java | 0 .../jcodec/codecs/common/biari/MDecoder.java | 0 .../{oc2r => oc2}/jcodec/codecs/h264/H264Const.java | 0 .../jcodec/codecs/h264/H264Decoder.java | 0 .../jcodec/codecs/h264/H264Encoder.java | 0 .../{oc2r => oc2}/jcodec/codecs/h264/H264Utils.java | 0 .../jcodec/codecs/h264/POCManager.java | 0 .../codecs/h264/decode/BlockInterpolator.java | 0 .../jcodec/codecs/h264/decode/CABACContst.java | 0 .../jcodec/codecs/h264/decode/CAVLCReader.java | 0 .../codecs/h264/decode/ChromaPredictionBuilder.java | 0 .../jcodec/codecs/h264/decode/CoeffTransformer.java | 0 .../jcodec/codecs/h264/decode/DeblockerInput.java | 0 .../jcodec/codecs/h264/decode/DecoderState.java | 0 .../jcodec/codecs/h264/decode/FrameReader.java | 0 .../h264/decode/Intra16x16PredictionBuilder.java | 0 .../h264/decode/Intra4x4PredictionBuilder.java | 0 .../h264/decode/Intra8x8PredictionBuilder.java | 0 .../jcodec/codecs/h264/decode/MBlock.java | 0 .../codecs/h264/decode/MBlockDecoderBDirect.java | 0 .../codecs/h264/decode/MBlockDecoderBase.java | 0 .../codecs/h264/decode/MBlockDecoderIPCM.java | 0 .../codecs/h264/decode/MBlockDecoderInter.java | 0 .../codecs/h264/decode/MBlockDecoderInter8x8.java | 0 .../codecs/h264/decode/MBlockDecoderIntra16x16.java | 0 .../codecs/h264/decode/MBlockDecoderIntraNxN.java | 0 .../codecs/h264/decode/MBlockDecoderUtils.java | 0 .../codecs/h264/decode/MBlockSkipDecoder.java | 0 .../jcodec/codecs/h264/decode/PredictionMerger.java | 0 .../jcodec/codecs/h264/decode/RefListManager.java | 0 .../jcodec/codecs/h264/decode/SliceDecoder.java | 0 .../codecs/h264/decode/SliceHeaderReader.java | 0 .../jcodec/codecs/h264/decode/SliceReader.java | 0 .../codecs/h264/decode/aso/FlatMBlockMapper.java | 0 .../codecs/h264/decode/aso/MBToSliceGroupMap.java | 0 .../jcodec/codecs/h264/decode/aso/MapManager.java | 0 .../jcodec/codecs/h264/decode/aso/Mapper.java | 0 .../h264/decode/aso/PrebuiltMBlockMapper.java | 0 .../h264/decode/aso/SliceGroupMapBuilder.java | 0 .../h264/decode/deblock/DeblockingFilter.java | 0 .../jcodec/codecs/h264/encode/CQPRateControl.java | 0 .../jcodec/codecs/h264/encode/EncodedMB.java | 0 .../jcodec/codecs/h264/encode/EncodingContext.java | 0 .../jcodec/codecs/h264/encode/H264EncoderUtils.java | 0 .../codecs/h264/encode/IntraPredEstimator.java | 0 .../jcodec/codecs/h264/encode/MBDeblocker.java | 0 .../jcodec/codecs/h264/encode/MBEncoderHelper.java | 0 .../jcodec/codecs/h264/encode/MBWriterI16x16.java | 0 .../jcodec/codecs/h264/encode/MBWriterINxN.java | 0 .../jcodec/codecs/h264/encode/MBWriterP16x16.java | 0 .../jcodec/codecs/h264/encode/MotionEstimator.java | 0 .../jcodec/codecs/h264/encode/RateControl.java | 0 .../{oc2r => oc2}/jcodec/codecs/h264/io/CABAC.java | 0 .../{oc2r => oc2}/jcodec/codecs/h264/io/CAVLC.java | 0 .../jcodec/codecs/h264/io/model/AspectRatio.java | 0 .../jcodec/codecs/h264/io/model/Frame.java | 0 .../jcodec/codecs/h264/io/model/HRDParameters.java | 0 .../jcodec/codecs/h264/io/model/MBType.java | 0 .../jcodec/codecs/h264/io/model/NALUnit.java | 0 .../jcodec/codecs/h264/io/model/NALUnitType.java | 0 .../codecs/h264/io/model/PictureParameterSet.java | 0 .../codecs/h264/io/model/PredictionWeightTable.java | 0 .../jcodec/codecs/h264/io/model/RefPicMarking.java | 0 .../codecs/h264/io/model/RefPicMarkingIDR.java | 0 .../codecs/h264/io/model/SeqParameterSet.java | 0 .../jcodec/codecs/h264/io/model/SliceHeader.java | 0 .../jcodec/codecs/h264/io/model/SliceType.java | 0 .../jcodec/codecs/h264/io/model/VUIParameters.java | 0 .../jcodec/codecs/h264/io/write/CAVLCWriter.java | 0 .../codecs/h264/io/write/SliceHeaderWriter.java | 0 .../cil/{oc2r => oc2}/jcodec/common/ArrayUtil.java | 0 .../{oc2r => oc2}/jcodec/common/IntArrayList.java | 0 .../{oc2r => oc2}/jcodec/common/IntObjectMap.java | 0 .../{oc2r => oc2}/jcodec/common/VideoDecoder.java | 0 .../{oc2r => oc2}/jcodec/common/VideoEncoder.java | 0 .../{oc2r => oc2}/jcodec/common/io/BitReader.java | 0 .../{oc2r => oc2}/jcodec/common/io/BitWriter.java | 0 .../li/cil/{oc2r => oc2}/jcodec/common/io/VLC.java | 0 .../{oc2r => oc2}/jcodec/common/io/VLCBuilder.java | 0 .../jcodec/common/model/ColorSpace.java | 0 .../{oc2r => oc2}/jcodec/common/model/Picture.java | 0 .../cil/{oc2r => oc2}/jcodec/common/model/Size.java | 0 .../{oc2r => oc2}/jcodec/common/tools/MathUtil.java | 0 .../{oc2r => oc2}/jcodec/scale/RgbToYuv420j.java | 0 .../cil/{oc2r => oc2}/jcodec/scale/Transform.java | 0 .../{oc2r => oc2}/jcodec/scale/Yuv420jToRgb.java | 0 .../assets/{oc2r => oc2}/blockstates/bus_cable.json | 0 .../assets/{oc2r => oc2}/blockstates/charger.json | 0 .../assets/{oc2r => oc2}/blockstates/computer.json | 0 .../{oc2r => oc2}/blockstates/creative_energy.json | 0 .../{oc2r => oc2}/blockstates/disk_drive.json | 0 .../blockstates/flash_memory_flasher.json | 0 .../assets/{oc2r => oc2}/blockstates/keyboard.json | 0 .../assets/{oc2r => oc2}/blockstates/monitor.json | 0 .../blockstates/network_connector.json | 0 .../{oc2r => oc2}/blockstates/network_hub.json | 0 .../{oc2r => oc2}/blockstates/network_switch.json | 0 .../{oc2r => oc2}/blockstates/pci_card_cage.json | 0 .../assets/{oc2r => oc2}/blockstates/projector.json | 0 .../blockstates/redstone_interface.json | 0 .../assets/{oc2r => oc2}/blockstates/vxlan_hub.json | 0 .../assets/{oc2r => oc2}/doc/en_us/basics.md | 0 .../{oc2r => oc2}/doc/en_us/block/bus_cable.md | 0 .../{oc2r => oc2}/doc/en_us/block/bus_interface.md | 0 .../assets/{oc2r => oc2}/doc/en_us/block/charger.md | 0 .../{oc2r => oc2}/doc/en_us/block/computer.md | 0 .../{oc2r => oc2}/doc/en_us/block/disk_drive.md | 0 .../doc/en_us/block/flash_memory_flasher.md | 0 .../assets/{oc2r => oc2}/doc/en_us/block/index.md | 0 .../{oc2r => oc2}/doc/en_us/block/keyboard.md | 0 .../assets/{oc2r => oc2}/doc/en_us/block/monitor.md | 0 .../doc/en_us/block/network_connector.md | 0 .../{oc2r => oc2}/doc/en_us/block/network_hub.md | 0 .../{oc2r => oc2}/doc/en_us/block/projector.md | 0 .../doc/en_us/block/redstone_interface.md | 0 .../{oc2r => oc2}/doc/en_us/getting_started.md | 0 .../assets/{oc2r => oc2}/doc/en_us/index.md | 0 .../doc/en_us/item/block_operations_module.md | 0 .../doc/en_us/item/file_import_export_card.md | 0 .../{oc2r => oc2}/doc/en_us/item/flash_memory.md | 0 .../assets/{oc2r => oc2}/doc/en_us/item/floppy.md | 0 .../{oc2r => oc2}/doc/en_us/item/hard_drive.md | 0 .../assets/{oc2r => oc2}/doc/en_us/item/index.md | 0 .../doc/en_us/item/inventory_operations_module.md | 0 .../assets/{oc2r => oc2}/doc/en_us/item/manual.md | 0 .../assets/{oc2r => oc2}/doc/en_us/item/memory.md | 0 .../{oc2r => oc2}/doc/en_us/item/network_cable.md | 0 .../doc/en_us/item/network_interface_card.md | 0 .../doc/en_us/item/network_tunnel_card.md | 0 .../doc/en_us/item/network_tunnel_module.md | 0 .../doc/en_us/item/redstone_interface_card.md | 0 .../assets/{oc2r => oc2}/doc/en_us/item/robot.md | 0 .../{oc2r => oc2}/doc/en_us/item/sound_card.md | 0 .../assets/{oc2r => oc2}/doc/en_us/item/wrench.md | 0 .../assets/{oc2r => oc2}/doc/en_us/networking.md | 0 .../assets/{oc2r => oc2}/doc/en_us/robotics.md | 0 .../assets/{oc2r => oc2}/doc/en_us/scripting.md | 0 .../doc/img/getting_started_basics.png | Bin .../doc/img/getting_started_energy.png | Bin .../doc/img/getting_started_inventory.png | Bin .../{oc2r => oc2}/doc/img/getting_started_login.png | Bin .../assets/{oc2r => oc2}/doc/img/scripting_lamp.png | Bin .../doc/img/scripting_lua_interactive.png | Bin .../doc/img/scripting_redstone_interface.png | Bin .../assets/{oc2r => oc2}/doc/ru_ru/basics.md | 0 .../{oc2r => oc2}/doc/ru_ru/block/bus_cable.md | 0 .../{oc2r => oc2}/doc/ru_ru/block/bus_interface.md | 0 .../assets/{oc2r => oc2}/doc/ru_ru/block/charger.md | 0 .../{oc2r => oc2}/doc/ru_ru/block/computer.md | 0 .../{oc2r => oc2}/doc/ru_ru/block/disk_drive.md | 0 .../doc/ru_ru/block/flash_memory_flasher.md | 0 .../assets/{oc2r => oc2}/doc/ru_ru/block/index.md | 0 .../{oc2r => oc2}/doc/ru_ru/block/keyboard.md | 0 .../assets/{oc2r => oc2}/doc/ru_ru/block/monitor.md | 0 .../doc/ru_ru/block/network_connector.md | 0 .../{oc2r => oc2}/doc/ru_ru/block/network_hub.md | 0 .../{oc2r => oc2}/doc/ru_ru/block/projector.md | 0 .../doc/ru_ru/block/redstone_interface.md | 0 .../{oc2r => oc2}/doc/ru_ru/getting_started.md | 0 .../assets/{oc2r => oc2}/doc/ru_ru/index.md | 0 .../doc/ru_ru/item/block_operations_module.md | 0 .../doc/ru_ru/item/file_import_export_card.md | 0 .../{oc2r => oc2}/doc/ru_ru/item/flash_memory.md | 0 .../assets/{oc2r => oc2}/doc/ru_ru/item/floppy.md | 0 .../{oc2r => oc2}/doc/ru_ru/item/hard_drive.md | 0 .../assets/{oc2r => oc2}/doc/ru_ru/item/index.md | 0 .../doc/ru_ru/item/inventory_operations_module.md | 0 .../assets/{oc2r => oc2}/doc/ru_ru/item/manual.md | 0 .../assets/{oc2r => oc2}/doc/ru_ru/item/memory.md | 0 .../{oc2r => oc2}/doc/ru_ru/item/network_cable.md | 0 .../doc/ru_ru/item/network_interface_card.md | 0 .../doc/ru_ru/item/network_tunnel_card.md | 0 .../doc/ru_ru/item/network_tunnel_module.md | 0 .../doc/ru_ru/item/redstone_interface_card.md | 0 .../assets/{oc2r => oc2}/doc/ru_ru/item/robot.md | 0 .../{oc2r => oc2}/doc/ru_ru/item/sound_card.md | 0 .../assets/{oc2r => oc2}/doc/ru_ru/item/wrench.md | 0 .../assets/{oc2r => oc2}/doc/ru_ru/networking.md | 0 .../assets/{oc2r => oc2}/doc/ru_ru/robotics.md | 0 .../assets/{oc2r => oc2}/doc/ru_ru/scripting.md | 0 .../assets/{oc2r => oc2}/doc/zh_cn/basics.md | 0 .../{oc2r => oc2}/doc/zh_cn/block/bus_cable.md | 0 .../{oc2r => oc2}/doc/zh_cn/block/bus_interface.md | 0 .../assets/{oc2r => oc2}/doc/zh_cn/block/charger.md | 0 .../{oc2r => oc2}/doc/zh_cn/block/computer.md | 0 .../{oc2r => oc2}/doc/zh_cn/block/disk_drive.md | 0 .../doc/zh_cn/block/flash_memory_flasher.md | 0 .../assets/{oc2r => oc2}/doc/zh_cn/block/index.md | 0 .../{oc2r => oc2}/doc/zh_cn/block/keyboard.md | 0 .../assets/{oc2r => oc2}/doc/zh_cn/block/monitor.md | 0 .../doc/zh_cn/block/network_connector.md | 0 .../{oc2r => oc2}/doc/zh_cn/block/network_hub.md | 0 .../{oc2r => oc2}/doc/zh_cn/block/projector.md | 0 .../doc/zh_cn/block/redstone_interface.md | 0 .../{oc2r => oc2}/doc/zh_cn/getting_started.md | 0 .../assets/{oc2r => oc2}/doc/zh_cn/index.md | 0 .../doc/zh_cn/item/block_operations_module.md | 0 .../doc/zh_cn/item/file_import_export_card.md | 0 .../{oc2r => oc2}/doc/zh_cn/item/flash_memory.md | 0 .../assets/{oc2r => oc2}/doc/zh_cn/item/floppy.md | 0 .../{oc2r => oc2}/doc/zh_cn/item/hard_drive.md | 0 .../assets/{oc2r => oc2}/doc/zh_cn/item/index.md | 0 .../doc/zh_cn/item/inventory_operations_module.md | 0 .../assets/{oc2r => oc2}/doc/zh_cn/item/manual.md | 0 .../assets/{oc2r => oc2}/doc/zh_cn/item/memory.md | 0 .../{oc2r => oc2}/doc/zh_cn/item/network_cable.md | 0 .../doc/zh_cn/item/network_interface_card.md | 0 .../doc/zh_cn/item/network_tunnel_card.md | 0 .../doc/zh_cn/item/network_tunnel_module.md | 0 .../doc/zh_cn/item/redstone_interface_card.md | 0 .../assets/{oc2r => oc2}/doc/zh_cn/item/robot.md | 0 .../{oc2r => oc2}/doc/zh_cn/item/sound_card.md | 0 .../assets/{oc2r => oc2}/doc/zh_cn/item/wrench.md | 0 .../assets/{oc2r => oc2}/doc/zh_cn/networking.md | 0 .../assets/{oc2r => oc2}/doc/zh_cn/robotics.md | 0 .../assets/{oc2r => oc2}/doc/zh_cn/scripting.md | 0 .../resources/assets/{oc2r => oc2}/lang/en_us.json | 0 .../resources/assets/{oc2r => oc2}/lang/ru_ru.json | 0 .../resources/assets/{oc2r => oc2}/lang/zh_cn.json | 0 .../{oc2r => oc2}/models/block/cable_base.json | 0 .../{oc2r => oc2}/models/block/cable_link.json | 0 .../{oc2r => oc2}/models/block/cable_plug.json | 0 .../{oc2r => oc2}/models/block/cable_straight.json | 0 .../{oc2r => oc2}/models/block/cable_support.json | 0 .../assets/{oc2r => oc2}/models/block/charger.json | 0 .../assets/{oc2r => oc2}/models/block/computer.json | 0 .../{oc2r => oc2}/models/block/creative_energy.json | 0 .../{oc2r => oc2}/models/block/disk_drive.json | 0 .../models/block/flash_memory_flasher.json | 0 .../assets/{oc2r => oc2}/models/block/keyboard.json | 0 .../assets/{oc2r => oc2}/models/block/monitor.json | 0 .../assets/{oc2r => oc2}/models/block/monitor.mtl | 0 .../assets/{oc2r => oc2}/models/block/monitor.obj | 0 .../models/block/network_connector.json | 0 .../{oc2r => oc2}/models/block/network_hub.json | 0 .../{oc2r => oc2}/models/block/network_switch.json | 0 .../{oc2r => oc2}/models/block/pci_card_cage.json | 0 .../{oc2r => oc2}/models/block/projector.json | 0 .../models/block/redstone_interface.json | 0 .../{oc2r => oc2}/models/block/vxlan_hub.json | 0 .../models/item/block_operations_module.json | 0 .../assets/{oc2r => oc2}/models/item/bus_cable.json | 0 .../{oc2r => oc2}/models/item/bus_interface.json | 0 .../assets/{oc2r => oc2}/models/item/charger.json | 0 .../{oc2r => oc2}/models/item/circuit_board.json | 0 .../assets/{oc2r => oc2}/models/item/computer.json | 0 .../{oc2r => oc2}/models/item/cpu_tier_1.json | 0 .../{oc2r => oc2}/models/item/cpu_tier_2.json | 0 .../{oc2r => oc2}/models/item/cpu_tier_3.json | 0 .../{oc2r => oc2}/models/item/cpu_tier_4.json | 0 .../{oc2r => oc2}/models/item/creative_energy.json | 0 .../{oc2r => oc2}/models/item/disk_drive.json | 0 .../models/item/file_import_export_card.json | 0 .../{oc2r => oc2}/models/item/flash_memory.json | 0 .../models/item/flash_memory_custom.json | 0 .../models/item/flash_memory_flasher.json | 0 .../assets/{oc2r => oc2}/models/item/floppy.json | 0 .../{oc2r => oc2}/models/item/floppy_modern.json | 0 .../models/item/hard_drive_custom.json | 0 .../models/item/hard_drive_extra_large.json | 0 .../{oc2r => oc2}/models/item/hard_drive_large.json | 0 .../models/item/hard_drive_medium.json | 0 .../{oc2r => oc2}/models/item/hard_drive_small.json | 0 .../models/item/inventory_operations_module.json | 0 .../assets/{oc2r => oc2}/models/item/keyboard.json | 0 .../assets/{oc2r => oc2}/models/item/manual.json | 0 .../models/item/memory_extra_large.json | 0 .../{oc2r => oc2}/models/item/memory_large.json | 0 .../{oc2r => oc2}/models/item/memory_medium.json | 0 .../{oc2r => oc2}/models/item/memory_small.json | 0 .../assets/{oc2r => oc2}/models/item/monitor.json | 0 .../{oc2r => oc2}/models/item/network_cable.json | 0 .../models/item/network_connector.json | 0 .../{oc2r => oc2}/models/item/network_hub.json | 0 .../models/item/network_interface_card.json | 0 .../{oc2r => oc2}/models/item/network_switch.json | 0 .../models/item/network_tunnel_card.json | 0 .../models/item/network_tunnel_module.json | 0 .../{oc2r => oc2}/models/item/pci_card_cage.json | 0 .../assets/{oc2r => oc2}/models/item/projector.json | 0 .../models/item/raw_silicon_wafer.json | 0 .../models/item/redstone_interface.json | 0 .../models/item/redstone_interface_card.json | 0 .../assets/{oc2r => oc2}/models/item/robot.json | 0 .../assets/{oc2r => oc2}/models/item/silicon.json | 0 .../{oc2r => oc2}/models/item/silicon_blend.json | 0 .../{oc2r => oc2}/models/item/silicon_wafer.json | 0 .../{oc2r => oc2}/models/item/sound_card.json | 0 .../{oc2r => oc2}/models/item/transistor.json | 0 .../assets/{oc2r => oc2}/models/item/vxlan_hub.json | 0 .../assets/{oc2r => oc2}/models/item/wrench.json | 0 .../{oc2r => oc2}/shaders/core/projectors.fsh | 0 .../{oc2r => oc2}/shaders/core/projectors.json | 0 .../{oc2r => oc2}/shaders/core/projectors.vsh | 0 src/main/resources/assets/{oc2r => oc2}/sounds.json | 0 .../{oc2r => oc2}/sounds/computer_running.ogg | Bin .../assets/{oc2r => oc2}/sounds/floppy_access1.ogg | Bin .../assets/{oc2r => oc2}/sounds/floppy_access2.ogg | Bin .../assets/{oc2r => oc2}/sounds/floppy_access3.ogg | Bin .../assets/{oc2r => oc2}/sounds/floppy_access4.ogg | Bin .../assets/{oc2r => oc2}/sounds/floppy_access5.ogg | Bin .../assets/{oc2r => oc2}/sounds/floppy_access6.ogg | Bin .../assets/{oc2r => oc2}/sounds/floppy_eject.ogg | Bin .../assets/{oc2r => oc2}/sounds/floppy_insert.ogg | Bin .../assets/{oc2r => oc2}/sounds/hdd_access1.ogg | Bin .../assets/{oc2r => oc2}/sounds/hdd_access2.ogg | Bin .../assets/{oc2r => oc2}/sounds/hdd_access3.ogg | Bin .../assets/{oc2r => oc2}/sounds/hdd_access4.ogg | Bin .../assets/{oc2r => oc2}/sounds/hdd_access5.ogg | Bin .../assets/{oc2r => oc2}/sounds/hdd_access6.ogg | Bin .../assets/{oc2r => oc2}/sounds/hdd_access7.ogg | Bin .../textures/block/cable_base/cable_base_atlas0.png | Bin .../textures/block/cable_link/cable_link_atlas0.png | Bin .../textures/block/cable_plug/cable_plug_atlas0.png | Bin .../block/cable_straight/cable_straight_atlas0.png | Bin .../block/cable_support/cable_support_atlas0.png | Bin .../textures/block/charger/charger_atlas0.png | Bin .../textures/block/charger/charger_atlas1.png | Bin .../textures/block/charger/charger_atlas2.png | Bin .../textures/block/charger/charger_atlas3.png | Bin .../{oc2r => oc2}/textures/block/charger/effect.png | Bin .../textures/block/computer/computer_atlas0.png | Bin .../textures/block/computer/computer_atlas1.png | Bin .../textures/block/computer/computer_atlas2.png | Bin .../textures/block/computer/computer_atlas3.png | Bin .../textures/block/computer/computer_atlas4.png | Bin .../block/computer/computer_overlay_power.png | Bin .../block/computer/computer_overlay_status.png | Bin .../block/computer/computer_overlay_terminal.png | Bin .../textures/block/creative_energy.png | Bin .../textures/block/disk_drive/disk_drive_atlas0.png | Bin .../textures/block/disk_drive/disk_drive_atlas1.png | Bin .../textures/block/disk_drive/disk_drive_atlas2.png | Bin .../textures/block/disk_drive/disk_drive_atlas3.png | Bin .../textures/block/keyboard/keyboard_atlas0.png | Bin .../textures/block/keyboard/keyboard_atlas1.png | Bin .../textures/block/monitor/monitor.png | Bin .../block/monitor/monitor_overlay_power.png | Bin .../network_connector/network_connector_atlas0.png | Bin .../block/network_hub/network_hub_atlas0.png | Bin .../block/network_hub/network_hub_atlas1.png | Bin .../block/network_hub/network_hub_atlas2.png | Bin .../block/network_hub/network_hub_atlas3.png | Bin .../block/network_switch/network_switch_atlas0.png | Bin .../block/network_switch/network_switch_atlas1.png | Bin .../block/network_switch/network_switch_atlas2.png | Bin .../block/network_switch/network_switch_atlas3.png | Bin .../block/pci_card_cage/pci_card_cage_atlas0.png | Bin .../block/pci_card_cage/pci_card_cage_atlas1.png | Bin .../block/pci_card_cage/pci_card_cage_atlas2.png | Bin .../block/pci_card_cage/pci_card_cage_atlas3.png | Bin .../block/pci_card_cage/pci_card_cage_atlas4.png | Bin .../block/pci_card_cage/pci_card_cage_atlas5.png | Bin .../block/pci_card_cage/pci_card_cage_atlas6.png | Bin .../textures/block/projector/projector_atlas0.png | Bin .../textures/block/projector/projector_atlas1.png | Bin .../textures/block/projector/projector_atlas2.png | Bin .../textures/block/projector/projector_atlas3.png | Bin .../textures/block/projector/projector_atlas4.png | Bin .../textures/block/projector/projector_atlas5.png | Bin .../textures/block/projector/projector_atlas6.png | Bin .../redstone_interface_atlas0.png | Bin .../redstone_interface_atlas1.png | Bin .../redstone_interface_atlas2.png | Bin .../redstone_interface_atlas3.png | Bin .../redstone_interface_atlas4.png | Bin .../textures/block/vxlan_hub/vxlan_hub_atlas0.png | Bin .../textures/block/vxlan_hub/vxlan_hub_atlas1.png | Bin .../textures/block/vxlan_hub/vxlan_hub_atlas2.png | Bin .../textures/block/vxlan_hub/vxlan_hub_atlas3.png | Bin .../{oc2r => oc2}/textures/entity/robot/robot.png | Bin .../assets/{oc2r => oc2}/textures/font/OFL.TXT | 0 .../{oc2r => oc2}/textures/font/monospace.png | Bin .../assets/{oc2r => oc2}/textures/font/terminus.png | Bin .../{oc2r => oc2}/textures/gui/manual/home.png | Bin .../{oc2r => oc2}/textures/gui/manual/manual.png | Bin .../textures/gui/manual/scroll_button.png | Bin .../textures/gui/manual/tab_button.png | Bin .../textures/gui/overlay/block_face_disabled.png | Bin .../textures/gui/overlay/block_face_enabled.png | Bin .../textures/gui/overlay/block_face_focused.png | Bin .../textures/gui/overlay/slot_info.png | Bin .../textures/gui/overlay/slot_selection.png | Bin .../textures/gui/overlay/slot_warn.png | Bin .../textures/gui/overlay/terminal_focused.png | Bin .../textures/gui/widget/bus_interface_screen.png | Bin .../textures/gui/widget/cancel_button.png | Bin .../textures/gui/widget/computer_container.png | Bin .../textures/gui/widget/confirm_button.png | Bin .../{oc2r => oc2}/textures/gui/widget/energy.png | Bin .../{oc2r => oc2}/textures/gui/widget/hotbar.png | Bin .../textures/gui/widget/input_button.png | Bin .../textures/gui/widget/inventory_button.png | Bin .../textures/gui/widget/monitor_screen.png | Bin .../textures/gui/widget/monitor_sidebar_1.png | Bin .../gui/widget/network_interface_card_screen.png | Bin .../gui/widget/network_tunnel_link_button.png | Bin .../textures/gui/widget/network_tunnel_screen.png | Bin .../textures/gui/widget/power_button.png | Bin .../textures/gui/widget/robot_container.png | Bin .../{oc2r => oc2}/textures/gui/widget/sidebar_2.png | Bin .../{oc2r => oc2}/textures/gui/widget/sidebar_3.png | Bin .../textures/gui/widget/terminal_screen.png | Bin .../{oc2r => oc2}/textures/item/backlight.png | Bin .../textures/item/block_operations_module.png | Bin .../{oc2r => oc2}/textures/item/card_slot.png | Bin .../{oc2r => oc2}/textures/item/circuit_board.png | Bin .../assets/{oc2r => oc2}/textures/item/cpu_slot.png | Bin .../{oc2r => oc2}/textures/item/cpu_tier_1.png | Bin .../{oc2r => oc2}/textures/item/cpu_tier_2.png | Bin .../{oc2r => oc2}/textures/item/cpu_tier_3.png | Bin .../{oc2r => oc2}/textures/item/cpu_tier_4.png | Bin .../textures/item/file_import_export_card.png | Bin .../item/file_import_export_card.png.mcmeta | 0 .../{oc2r => oc2}/textures/item/flash_memory.png | Bin .../textures/item/flash_memory_slot.png | Bin .../{oc2r => oc2}/textures/item/floppy_base.png | Bin .../{oc2r => oc2}/textures/item/floppy_slot.png | Bin .../{oc2r => oc2}/textures/item/floppy_tint.png | Bin .../textures/item/front_display_glass.png | Bin .../textures/item/hard_disk_platter.png | Bin .../{oc2r => oc2}/textures/item/hard_drive_base.png | Bin .../{oc2r => oc2}/textures/item/hard_drive_slot.png | Bin .../{oc2r => oc2}/textures/item/hard_drive_tint.png | Bin .../textures/item/inventory_operations_module.png | Bin .../{oc2r => oc2}/textures/item/lcd_display.png | Bin .../textures/item/liquid_crystal_layers.png | Bin .../assets/{oc2r => oc2}/textures/item/manual.png | Bin .../textures/item/memory_extra_large.png | Bin .../{oc2r => oc2}/textures/item/memory_large.png | Bin .../{oc2r => oc2}/textures/item/memory_medium.png | Bin .../{oc2r => oc2}/textures/item/memory_slot.png | Bin .../{oc2r => oc2}/textures/item/memory_small.png | Bin .../assets/{oc2r => oc2}/textures/item/motor.png | Bin .../{oc2r => oc2}/textures/item/network_cable.png | Bin .../textures/item/network_interface_card.png | Bin .../textures/item/network_tunnel_card.png | Bin .../textures/item/network_tunnel_module.png | Bin .../textures/item/network_tunnel_slot.png | Bin .../textures/item/polarization_filter.png | Bin .../textures/item/raw_silicon_wafer.png | Bin .../textures/item/redstone_interface_card.png | Bin .../textures/item/robot_module_slot.png | Bin .../assets/{oc2r => oc2}/textures/item/silicon.png | Bin .../{oc2r => oc2}/textures/item/silicon_blend.png | Bin .../{oc2r => oc2}/textures/item/silicon_wafer.png | Bin .../{oc2r => oc2}/textures/item/sound_card.png | Bin .../{oc2r => oc2}/textures/item/transistor.png | Bin .../assets/{oc2r => oc2}/textures/item/wrench.png | Bin .../oc2.common}/block_operations_module.json | 0 .../advancements/recipes/oc2.common}/bus_cable.json | 0 .../recipes/oc2.common}/bus_interface.json | 0 .../advancements/recipes/oc2.common}/charger.json | 0 .../recipes/oc2.common}/circuit_board.json | 0 .../advancements/recipes/oc2.common}/computer.json | 0 .../recipes/oc2.common}/disk_drive.json | 0 .../oc2.common}/file_import_export_card.json | 0 .../recipes/oc2.common}/flash_memory.json | 0 .../recipes/oc2.common}/flash_memory_custom.json | 0 .../advancements/recipes/oc2.common}/floppy.json | 0 .../recipes/oc2.common}/floppy_modern.json | 0 .../recipes/oc2.common}/hard_drive_custom.json | 0 .../recipes/oc2.common}/hard_drive_extra_large.json | 0 .../recipes/oc2.common}/hard_drive_large.json | 0 .../recipes/oc2.common}/hard_drive_medium.json | 0 .../recipes/oc2.common}/hard_drive_small.json | 0 .../oc2.common}/inventory_operations_module.json | 0 .../advancements/recipes/oc2.common}/keyboard.json | 0 .../advancements/recipes/oc2.common}/manual.json | 0 .../recipes/oc2.common}/memory_extra_large.json | 0 .../recipes/oc2.common}/memory_large.json | 0 .../recipes/oc2.common}/memory_medium.json | 0 .../recipes/oc2.common}/memory_small.json | 0 .../recipes/oc2.common}/network_cable.json | 0 .../recipes/oc2.common}/network_connector.json | 0 .../recipes/oc2.common}/network_hub.json | 0 .../recipes/oc2.common}/network_interface_card.json | 0 .../recipes/oc2.common}/network_tunnel_card.json | 0 .../recipes/oc2.common}/network_tunnel_module.json | 0 .../advancements/recipes/oc2.common}/projector.json | 0 .../recipes/oc2.common}/redstone_interface.json | 0 .../oc2.common}/redstone_interface_card.json | 0 .../advancements/recipes/oc2.common}/robot.json | 0 .../recipes/oc2.common}/sound_card.json | 0 .../recipes/oc2.common}/transistor.json | 0 .../advancements/recipes/oc2.common}/wrench.json | 0 .../data/{oc2r => oc2}/file_systems/README.md | 0 .../data/{oc2r => oc2}/file_systems/scripts.json | 0 .../item_tag_filters/minecraft/common.json | 0 .../item_tag_filters/oc2}/hard_drive.json | 0 .../oc2r => oc2/item_tag_filters/oc2}/memory.json | 0 .../{oc2r => oc2}/loot_tables/blocks/charger.json | 0 .../{oc2r => oc2}/loot_tables/blocks/computer.json | 0 .../loot_tables/blocks/disk_drive.json | 0 .../{oc2r => oc2}/loot_tables/blocks/keyboard.json | 0 .../loot_tables/blocks/network_connector.json | 0 .../loot_tables/blocks/network_hub.json | 0 .../{oc2r => oc2}/loot_tables/blocks/projector.json | 0 .../loot_tables/blocks/redstone_interface.json | 0 .../recipes/block_operations_module.json | 0 .../data/{oc2r => oc2}/recipes/bus_cable.json | 0 .../data/{oc2r => oc2}/recipes/bus_interface.json | 0 .../data/{oc2r => oc2}/recipes/charger.json | 0 .../data/{oc2r => oc2}/recipes/circuit_board.json | 0 .../data/{oc2r => oc2}/recipes/computer.json | 0 .../data/{oc2r => oc2}/recipes/cpu_tier_1.json | 0 .../data/{oc2r => oc2}/recipes/cpu_tier_2.json | 0 .../data/{oc2r => oc2}/recipes/cpu_tier_3.json | 0 .../data/{oc2r => oc2}/recipes/cpu_tier_4.json | 0 .../data/{oc2r => oc2}/recipes/disk_drive.json | 0 .../recipes/file_import_export_card.json | 0 .../data/{oc2r => oc2}/recipes/flash_memory.json | 0 .../{oc2r => oc2}/recipes/flash_memory_custom.json | 0 .../{oc2r => oc2}/recipes/flash_memory_flasher.json | 0 .../data/{oc2r => oc2}/recipes/floppy.json | 0 .../data/{oc2r => oc2}/recipes/floppy_modern.json | 0 .../{oc2r => oc2}/recipes/hard_drive_custom.json | 0 .../recipes/hard_drive_extra_large.json | 0 .../{oc2r => oc2}/recipes/hard_drive_large.json | 0 .../{oc2r => oc2}/recipes/hard_drive_medium.json | 0 .../{oc2r => oc2}/recipes/hard_drive_small.json | 0 .../recipes/inventory_operations_module.json | 0 .../data/{oc2r => oc2}/recipes/keyboard.json | 0 .../data/{oc2r => oc2}/recipes/manual.json | 0 .../{oc2r => oc2}/recipes/memory_extra_large.json | 0 .../data/{oc2r => oc2}/recipes/memory_large.json | 0 .../data/{oc2r => oc2}/recipes/memory_medium.json | 0 .../data/{oc2r => oc2}/recipes/memory_small.json | 0 .../data/{oc2r => oc2}/recipes/network_cable.json | 0 .../{oc2r => oc2}/recipes/network_connector.json | 0 .../data/{oc2r => oc2}/recipes/network_hub.json | 0 .../recipes/network_interface_card.json | 0 .../{oc2r => oc2}/recipes/network_tunnel_card.json | 0 .../recipes/network_tunnel_module.json | 0 .../data/{oc2r => oc2}/recipes/projector.json | 0 .../{oc2r => oc2}/recipes/raw_silicon_wafer.json | 0 .../{oc2r => oc2}/recipes/redstone_interface.json | 0 .../recipes/redstone_interface_card.json | 0 .../resources/data/{oc2r => oc2}/recipes/robot.json | 0 .../data/{oc2r => oc2}/recipes/silicon.json | 0 .../data/{oc2r => oc2}/recipes/silicon_blend.json | 0 .../data/{oc2r => oc2}/recipes/silicon_wafer.json | 0 .../data/{oc2r => oc2}/recipes/sound_card.json | 0 .../data/{oc2r => oc2}/recipes/transistor.json | 0 .../data/{oc2r => oc2}/recipes/unflash.json | 0 .../data/{oc2r => oc2}/recipes/wrench.json | 0 .../data/{oc2r => oc2}/tags/blocks/cables.json | 0 .../data/{oc2r => oc2}/tags/blocks/devices.json | 0 .../{oc2r => oc2}/tags/blocks/wrench_breakable.json | 0 .../data/{oc2r => oc2}/tags/items/cables.json | 0 .../tags/items/device_needs_reboot.json | 0 .../data/{oc2r => oc2}/tags/items/devices.json | 0 .../data/{oc2r => oc2}/tags/items/devices/card.json | 0 .../data/{oc2r => oc2}/tags/items/devices/cpu.json | 0 .../tags/items/devices/flash_memory.json | 0 .../{oc2r => oc2}/tags/items/devices/floppy.json | 0 .../tags/items/devices/hard_drive.json | 0 .../{oc2r => oc2}/tags/items/devices/memory.json | 0 .../tags/items/devices/network_tunnel.json | 0 .../tags/items/devices/robot_module.json | 0 .../{oc2r => oc2}/tags/items/tool_materials.json | 0 .../tags/items/tool_materials/diamond.json | 0 .../tags/items/tool_materials/gold.json | 0 .../tags/items/tool_materials/iron.json | 0 .../tags/items/tool_materials/netherite.json | 0 .../tags/items/tool_materials/stone.json | 0 .../tags/items/tool_materials/wood.json | 0 .../data/{oc2r => oc2}/tags/items/wrenches.json | 0 .../resources/{mixins.oc2r.json => mixins.oc2.json} | 0 1088 files changed, 0 insertions(+), 0 deletions(-) rename src/main/java/li/cil/{oc2r => oc2}/api/API.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/api/README.md (100%) rename src/main/java/li/cil/{oc2r => oc2}/api/bus/BlockDeviceBusElement.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/api/bus/DeviceBus.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/api/bus/DeviceBusController.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/api/bus/DeviceBusElement.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/api/bus/device/Device.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/api/bus/device/DeviceType.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/api/bus/device/DeviceTypes.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/api/bus/device/ItemDevice.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/api/bus/device/data/BlockDeviceData.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/api/bus/device/data/Firmware.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/api/bus/device/data/package-info.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/api/bus/device/object/Callback.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/api/bus/device/object/Callbacks.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/api/bus/device/object/DocumentedDevice.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/api/bus/device/object/LifecycleAwareDevice.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/api/bus/device/object/NamedDevice.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/api/bus/device/object/ObjectDevice.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/api/bus/device/object/Parameter.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/api/bus/device/object/package-info.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/api/bus/device/package-info.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/api/bus/device/provider/BlockDeviceProvider.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/api/bus/device/provider/BlockDeviceQuery.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/api/bus/device/provider/ItemDeviceProvider.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/api/bus/device/provider/ItemDeviceQuery.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/api/bus/device/provider/package-info.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/api/bus/device/rpc/AbstractRPCMethod.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/api/bus/device/rpc/RPCDevice.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/api/bus/device/rpc/RPCInvocation.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/api/bus/device/rpc/RPCMethod.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/api/bus/device/rpc/RPCMethodGroup.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/api/bus/device/rpc/RPCParameter.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/api/bus/device/rpc/package-info.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/api/bus/device/vm/FirmwareLoader.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/api/bus/device/vm/VMDevice.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/api/bus/device/vm/VMDeviceLoadResult.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/api/bus/device/vm/context/InterruptAllocator.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/api/bus/device/vm/context/MemoryAllocator.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/api/bus/device/vm/context/MemoryRangeAllocator.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/api/bus/device/vm/context/VMContext.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/api/bus/device/vm/context/VMLifecycleEventBus.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/api/bus/device/vm/context/package-info.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/api/bus/device/vm/event/VMInitializationException.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/api/bus/device/vm/event/VMInitializingEvent.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/api/bus/device/vm/event/VMResumedRunningEvent.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/api/bus/device/vm/event/VMSynchronizeEvent.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/api/bus/device/vm/event/package-info.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/api/bus/device/vm/package-info.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/api/bus/package-info.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/api/capabilities/NetworkInterface.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/api/capabilities/RedstoneEmitter.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/api/capabilities/Robot.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/api/capabilities/TerminalUserProvider.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/api/capabilities/package-info.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/api/imc/RPCMethodParameterTypeAdapter.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/api/imc/package-info.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/api/package-info.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/api/util/Invalidatable.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/api/util/Registries.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/api/util/RobotOperationSide.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/api/util/Side.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/api/util/package-info.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/client/ClientSetup.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/client/audio/LoopingBlockEntitySound.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/client/audio/LoopingSoundManager.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/client/audio/package-info.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/client/gui/AbstractMachineInventoryScreen.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/client/gui/AbstractMachineTerminalScreen.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/client/gui/AbstractModContainerScreen.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/client/gui/AbstractMonitorDisplayScreen.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/client/gui/BusInterfaceScreen.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/client/gui/ComputerContainerScreen.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/client/gui/ComputerTerminalScreen.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/client/gui/FileChooserScreen.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/client/gui/KeyCodeMapping.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/client/gui/KeyboardScreen.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/client/gui/MachineTerminalWidget.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/client/gui/MonitorDisplayScreen.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/client/gui/MonitorDisplayWidget.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/client/gui/NetworkInterfaceCardScreen.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/client/gui/NetworkTunnelScreen.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/client/gui/RobotContainerScreen.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/client/gui/RobotTerminalScreen.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/client/gui/Sprites.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/client/gui/Textures.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/client/gui/package-info.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/client/gui/terminal/TerminalInput.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/client/gui/terminal/package-info.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/client/gui/util/GuiUtils.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/client/gui/util/package-info.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/client/gui/widget/ImageButton.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/client/gui/widget/Sprite.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/client/gui/widget/Texture.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/client/gui/widget/ToggleImageButton.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/client/gui/widget/package-info.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/client/item/CustomItemColors.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/client/item/CustomItemModelProperties.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/client/item/package-info.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/client/manual/Manuals.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/client/manual/ModManualScreenStyle.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/client/manual/ModManualStyle.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/client/manual/package-info.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/client/model/BusCableBakedModel.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/client/model/BusCableModel.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/client/model/BusCableModelLoader.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/client/model/package-info.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/client/package-info.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/client/renderer/BusInterfaceNameRenderer.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/client/renderer/ModRenderType.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/client/renderer/ModShaders.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/client/renderer/MonitorGUIRenderer.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/client/renderer/NetworkCableRenderer.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/client/renderer/ProjectorDepthRenderer.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/client/renderer/blockentity/ChargerRenderer.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/client/renderer/blockentity/ComputerRenderer.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/client/renderer/blockentity/DiskDriveRenderer.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/client/renderer/blockentity/MonitorRenderer.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/client/renderer/blockentity/ProjectorRenderer.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/client/renderer/blockentity/package-info.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/client/renderer/color/BusCableBlockColor.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/client/renderer/color/package-info.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/client/renderer/entity/RobotRenderer.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/client/renderer/entity/RobotWithoutLevelRenderer.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/client/renderer/entity/model/RobotModel.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/client/renderer/entity/model/package-info.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/client/renderer/entity/package-info.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/client/renderer/font/MonospaceFontRenderer.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/client/renderer/font/package-info.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/client/renderer/package-info.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/CommonSetup.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/Config.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/ConfigManager.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/Constants.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/Main.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/block/Blocks.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/block/BusCableBlock.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/block/ChargerBlock.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/block/ComputerBlock.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/block/CreativeEnergyBlock.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/block/DiskDriveBlock.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/block/EnergyConsumingBlock.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/block/FlashMemoryFlasherBlock.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/block/ImmutableHorizontalBlock.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/block/KeyboardBlock.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/block/MonitorBlock.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/block/NetworkConnectorBlock.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/block/NetworkHubBlock.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/block/NetworkSwitchBlock.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/block/PciCardCageBlock.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/block/ProjectorBlock.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/block/RedstoneInterfaceBlock.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/block/VxlanBlock.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/block/package-info.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/blockentity/BlockEntities.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/blockentity/BusCableBlockEntity.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/blockentity/ChargerBlockEntity.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/blockentity/ComputerBlockEntity.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/blockentity/CreativeEnergyBlockEntity.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/blockentity/DiskDriveBlockEntity.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/blockentity/FlashMemoryFlasherBlockEntity.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/blockentity/KeyboardBlockEntity.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/blockentity/ModBlockEntity.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/blockentity/MonitorBlockEntity.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/blockentity/NetworkConnectorBlockEntity.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/blockentity/NetworkHubBlockEntity.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/blockentity/NetworkSwitchBlockEntity.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/blockentity/PciCardCageBlockEntity.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/blockentity/ProjectorBlockEntity.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/blockentity/RedstoneInterfaceBlockEntity.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/blockentity/TickableBlockEntity.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/blockentity/VxlanBlockEntity.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/blockentity/package-info.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/AbstractBlockDeviceBusElement.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/AbstractDeviceBusElement.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/AbstractGroupingDeviceBusElement.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/AbstractItemDeviceBusElement.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/BlockDeviceBusController.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/CommonDeviceBusController.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/RPCDeviceBusAdapter.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/BlockDeviceBusElement.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/DeviceGroup.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/DeviceTypes.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/data/BlockDeviceDataRegistry.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/data/BuildrootBlockDeviceData.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/data/BuildrootFirmware.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/data/FileSystems.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/data/FirmwareRegistry.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/data/ResourceBlockDeviceData.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/data/package-info.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/package-info.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/provider/ProviderRegistry.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/provider/Providers.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/provider/block/BlockEntityCapabilityDeviceProvider.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/provider/block/package-info.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/provider/item/AbstractItemStackCapabilityDeviceProvider.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/provider/item/BlockOperationsModuleDeviceProvider.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/provider/item/CPUItemDeviceProvider.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/provider/item/EnergyStorageItemDeviceProvider.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/provider/item/FileImportExportCardItemDeviceProvider.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/provider/item/FlashMemoryItemDeviceProvider.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/provider/item/FlashMemoryWithExternalDataItemDeviceProvider.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/provider/item/FluidHandlerItemDeviceProvider.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/provider/item/HardDriveItemDeviceProvider.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/provider/item/HardDriveWithExternalDataItemDeviceProvider.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/provider/item/InventoryOperationsModuleDeviceProvider.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/provider/item/ItemHandlerItemDeviceProvider.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/provider/item/ItemStackCapabilityDeviceProvider.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/provider/item/MemoryItemDeviceProvider.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/provider/item/NetworkInterfaceCardItemDeviceProvider.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/provider/item/NetworkTunnelCardItemDeviceProvider.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/provider/item/NetworkTunnelModuleItemDeviceProvider.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/provider/item/RedstoneInterfaceCardItemDeviceProvider.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/provider/item/SoundCardItemDeviceProvider.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/provider/item/package-info.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/provider/package-info.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/provider/util/AbstractBlockDeviceProvider.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/provider/util/AbstractBlockEntityCapabilityDeviceProvider.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/provider/util/AbstractBlockEntityDeviceProvider.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/provider/util/AbstractItemDeviceProvider.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/provider/util/package-info.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/rpc/EnergyStorageDevice.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/rpc/FluidHandlerDevice.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/rpc/ItemHandlerDevice.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/rpc/RPCDeviceList.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/rpc/RPCItemStackTagFilter.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/rpc/RPCItemStackTagFilters.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/rpc/RPCMethodParameterTypeAdapters.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/rpc/TypeNameRPCDevice.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/rpc/block/BlockEntityObjectDeviceProvider.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/rpc/block/BlockStateObjectDeviceProvider.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/rpc/block/EnergyStorageBlockDeviceProvider.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/rpc/block/FluidHandlerBlockDeviceProvider.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/rpc/block/ItemHandlerBlockDeviceProvider.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/rpc/block/package-info.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/rpc/item/AbstractItemRPCDevice.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/rpc/item/BlockOperationsModuleDevice.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/rpc/item/CPUItemDevice.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/rpc/item/FileImportExportCardItemDevice.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/rpc/item/InventoryOperationsModuleDevice.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/rpc/item/RedstoneInterfaceCardItemDevice.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/rpc/item/SoundCardItemDevice.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/rpc/item/package-info.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/rpc/package-info.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/util/AbstractDeviceInfo.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/util/BlockDeviceInfo.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/util/DeviceTypeImpl.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/util/Devices.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/util/IdentityProxy.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/util/ItemDeviceInfo.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/util/OptionalAddress.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/util/OptionalInterrupt.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/util/package-info.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/vm/block/DiskDriveContainer.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/vm/block/DiskDriveDevice.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/vm/block/FlashMemoryFlasherContainer.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/vm/block/FlashMemoryFlasherDevice.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/vm/block/KeyboardDevice.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/vm/block/MonitorDevice.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/vm/block/PciCardCageDevice.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/vm/block/ProjectorDevice.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/vm/block/package-info.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/vm/item/AbstractBlockStorageDevice.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/vm/item/AbstractNetworkInterfaceDevice.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/vm/item/ByteBufferFlashStorageDevice.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/vm/item/FirmwareFlashStorageDevice.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/vm/item/HardDriveDevice.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/vm/item/HardDriveDeviceWithInitialData.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/vm/item/MemoryDevice.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/vm/item/NetworkInterfaceCardDevice.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/vm/item/NetworkTunnelDevice.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/vm/item/package-info.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/device/vm/package-info.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/bus/package-info.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/capabilities/Capabilities.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/capabilities/CapabilityRegistry.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/capabilities/package-info.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/container/AbstractComputerContainer.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/container/AbstractContainer.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/container/AbstractDeviceItemStackHandler.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/container/AbstractMachineContainer.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/container/AbstractMachineTerminalContainer.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/container/AbstractMonitorContainer.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/container/AbstractRobotContainer.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/container/AbstractTypedDeviceItemStackHandler.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/container/ComputerInventoryContainer.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/container/ComputerTerminalContainer.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/container/Containers.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/container/DeviceTypeSlot.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/container/DeviceTypeSlotItemHandler.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/container/FixedSizeItemStackHandler.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/container/IntPrecisionContainerData.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/container/LockedSlot.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/container/MonitorDisplayContainer.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/container/NetworkTunnelContainer.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/container/RobotInventoryContainer.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/container/RobotSlot.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/container/RobotTerminalContainer.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/container/TypedItemStackHandler.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/container/package-info.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/energy/EnergyStorageItemStack.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/energy/FixedEnergyStorage.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/energy/package-info.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/entity/Entities.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/entity/Robot.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/entity/package-info.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/entity/robot/AbstractRobotAction.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/entity/robot/AbstractRobotActionType.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/entity/robot/MovementDirection.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/entity/robot/RobotActionResult.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/entity/robot/RobotActions.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/entity/robot/RobotMovementAction.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/entity/robot/RobotMovementActionType.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/entity/robot/RobotRotationAction.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/entity/robot/RobotRotationActionType.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/entity/robot/RotationDirection.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/entity/robot/package-info.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/ext/MinecraftExt.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/ext/package-info.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/integration/IMC.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/integration/Integrations.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/integration/Wrenches.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/integration/jei/ExtraGuiAreasJEIPlugin.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/integration/jei/ExtraItemsJEIPlugin.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/integration/jei/package-info.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/integration/package-info.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/integration/projectred/BundledCableHandler.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/integration/util/BundledRedstone.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/item/AbstractBlockDeviceItem.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/item/AbstractStorageItem.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/item/BlockOperationsModule.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/item/BusCableItem.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/item/BusInterfaceItem.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/item/CPUItem.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/item/ChargerItem.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/item/FlashMemoryItem.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/item/FlashMemoryWithExternalDataItem.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/item/FloppyItem.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/item/HardDriveItem.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/item/HardDriveWithExternalDataItem.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/item/ItemGroup.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/item/ItemRenameHandler.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/item/Items.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/item/ManualItem.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/item/MemoryItem.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/item/ModBlockItem.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/item/ModItem.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/item/NetworkCableItem.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/item/NetworkInterfaceCardItem.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/item/NetworkTunnelItem.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/item/RobotItem.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/item/WrenchItem.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/item/crafting/RecipeSerializers.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/item/crafting/WrenchRecipe.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/item/crafting/package-info.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/item/package-info.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/mixin/FrustumMixin.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/mixin/LevelRendererMixin.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/mixin/MinecraftMixin.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/mixin/ServerChunkCacheMixin.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/mixin/package-info.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/network/MessageUtils.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/network/MonitorLoadBalancer.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/network/Network.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/network/ProjectorLoadBalancer.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/network/message/AbstractMessage.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/network/message/AbstractTerminalBlockMessage.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/network/message/AbstractTerminalEntityMessage.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/network/message/BusCableFacadeMessage.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/network/message/BusInterfaceNameMessage.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/network/message/ClientCanceledImportFileMessage.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/network/message/ComputerBootErrorMessage.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/network/message/ComputerBusStateMessage.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/network/message/ComputerPowerMessage.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/network/message/ComputerRunStateMessage.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/network/message/ComputerTerminalInputMessage.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/network/message/ComputerTerminalOutputMessage.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/network/message/DiskDriveFloppyMessage.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/network/message/ExportedFileMessage.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/network/message/FirmwareFlasherMessage.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/network/message/ImportedFileMessage.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/network/message/KeyboardInputMessage.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/network/message/MonitorFramebufferMessage.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/network/message/MonitorInputMessage.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/network/message/MonitorPowerMessage.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/network/message/MonitorPowerMessageForwarded.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/network/message/MonitorRequestFramebufferMessage.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/network/message/MonitorStateMessage.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/network/message/MultipartMessage.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/network/message/NetworkConnectorConnectionsMessage.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/network/message/NetworkInterfaceCardConfigurationMessage.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/network/message/NetworkTunnelLinkMessage.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/network/message/OpenComputerInventoryMessage.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/network/message/OpenComputerTerminalMessage.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/network/message/OpenRobotInventoryMessage.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/network/message/OpenRobotTerminalMessage.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/network/message/ProjectorFramebufferMessage.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/network/message/ProjectorRequestFramebufferMessage.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/network/message/ProjectorStateMessage.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/network/message/RequestImportedFileMessage.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/network/message/RobotBootErrorMessage.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/network/message/RobotBusStateMessage.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/network/message/RobotInitializationMessage.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/network/message/RobotInitializationRequestMessage.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/network/message/RobotPowerMessage.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/network/message/RobotRunStateMessage.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/network/message/RobotTerminalInputMessage.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/network/message/RobotTerminalOutputMessage.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/network/message/ServerCanceledImportFileMessage.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/network/message/package-info.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/network/package-info.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/package-info.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/serialization/BlobStorage.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/serialization/NBTSerialization.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/serialization/NBTToJsonConverter.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/serialization/ceres/JsonArraySerializer.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/serialization/ceres/MemoryRangeListSerializer.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/serialization/ceres/MemoryRangeSerializer.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/serialization/ceres/Serializers.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/serialization/ceres/TextComponentSerializer.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/serialization/ceres/package-info.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/serialization/gson/DirectionJsonSerializer.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/serialization/gson/EmptyRPCMethodGroupSerializer.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/serialization/gson/ItemStackJsonSerializer.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/serialization/gson/MessageJsonDeserializer.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/serialization/gson/MethodInvocationJsonDeserializer.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/serialization/gson/RPCDeviceWithIdentifierJsonSerializer.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/serialization/gson/RPCMethodJsonSerializer.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/serialization/gson/SideJsonDeserializer.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/serialization/gson/UnsignedByteArrayJsonSerializer.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/serialization/gson/package-info.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/serialization/package-info.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/tags/BlockTags.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/tags/ItemTags.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/tags/package-info.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/util/BlockEntityUtils.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/util/BlockLocation.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/util/ChainableVertexConsumer.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/util/ChunkLocation.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/util/ChunkUtils.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/util/ColorUtils.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/util/Event.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/util/FakePlayerUtils.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/util/HorizontalBlockUtils.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/util/ItemDeviceUtils.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/util/ItemStackUtils.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/util/LazyOptionalUtils.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/util/LevelUtils.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/util/LocationSupplierUtils.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/util/NBTTagIds.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/util/NBTUtils.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/util/ParameterizedEvent.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/util/RegistryUtils.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/util/RunnableUtils.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/util/ServerScheduler.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/util/SoundEvents.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/util/TerminalUtils.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/util/TextFormatUtils.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/util/ThrottledSoundEmitter.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/util/TickUtils.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/util/TooltipUtils.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/util/TranslationUtils.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/util/Vec3Utils.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/util/VoxelShapeUtils.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/util/package-info.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/vm/AbstractTerminalVMRunner.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/vm/AbstractVMItemStackHandlers.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/vm/AbstractVirtualMachine.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/vm/Allocator.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/vm/BaseAddressProvider.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/vm/BuiltinDevices.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/vm/MinecraftRealTimeCounter.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/vm/Terminal.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/vm/VMDeviceBusAdapter.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/vm/VMItemStackHandlers.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/vm/VMRunState.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/vm/VMRunner.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/vm/VirtualMachine.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/vm/context/EventManager.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/vm/context/InterruptManager.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/vm/context/InterruptValidator.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/vm/context/MemoryRangeManager.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/vm/context/VMContextManagerCollection.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/vm/context/global/GlobalEventBus.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/vm/context/global/GlobalInterruptAllocator.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/vm/context/global/GlobalInterruptController.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/vm/context/global/GlobalMemoryAllocator.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/vm/context/global/GlobalMemoryMap.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/vm/context/global/GlobalMemoryRangeAllocator.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/vm/context/global/GlobalVMContext.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/vm/context/global/MemoryRangeList.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/vm/context/global/package-info.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/vm/context/managed/ManagedEventBus.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/vm/context/managed/ManagedInterruptAllocator.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/vm/context/managed/ManagedInterruptController.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/vm/context/managed/ManagedMemoryAllocator.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/vm/context/managed/ManagedMemoryMap.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/vm/context/managed/ManagedMemoryRangeAllocator.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/vm/context/managed/ManagedVMContext.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/vm/context/managed/package-info.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/vm/context/package-info.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/vm/device/PciRootPortDevice.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/vm/device/SimpleFramebufferDevice.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/vm/fs/LayeredFileSystem.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/vm/fs/package-info.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/vm/package-info.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/vm/provider/DeviceTreeProviders.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/vm/provider/PciRootPortDeviceProvider.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/vm/provider/SimpleFramebufferDeviceProvider.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/common/vxlan/TunnelManager.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/data/DataGenerators.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/data/ModBlockStateProvider.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/data/ModBlockTagsProvider.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/data/ModItemModelProvider.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/data/ModItemTagsProvider.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/data/ModLootTableProvider.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/data/ModRecipesProvider.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/data/WrenchRecipeBuilder.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/data/package-info.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/codecs/common/biari/MConst.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/codecs/common/biari/MDecoder.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/codecs/h264/H264Const.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/codecs/h264/H264Decoder.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/codecs/h264/H264Encoder.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/codecs/h264/H264Utils.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/codecs/h264/POCManager.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/codecs/h264/decode/BlockInterpolator.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/codecs/h264/decode/CABACContst.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/codecs/h264/decode/CAVLCReader.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/codecs/h264/decode/ChromaPredictionBuilder.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/codecs/h264/decode/CoeffTransformer.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/codecs/h264/decode/DeblockerInput.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/codecs/h264/decode/DecoderState.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/codecs/h264/decode/FrameReader.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/codecs/h264/decode/Intra16x16PredictionBuilder.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/codecs/h264/decode/Intra4x4PredictionBuilder.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/codecs/h264/decode/Intra8x8PredictionBuilder.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/codecs/h264/decode/MBlock.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/codecs/h264/decode/MBlockDecoderBDirect.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/codecs/h264/decode/MBlockDecoderBase.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/codecs/h264/decode/MBlockDecoderIPCM.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/codecs/h264/decode/MBlockDecoderInter.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/codecs/h264/decode/MBlockDecoderInter8x8.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/codecs/h264/decode/MBlockDecoderIntra16x16.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/codecs/h264/decode/MBlockDecoderIntraNxN.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/codecs/h264/decode/MBlockDecoderUtils.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/codecs/h264/decode/MBlockSkipDecoder.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/codecs/h264/decode/PredictionMerger.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/codecs/h264/decode/RefListManager.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/codecs/h264/decode/SliceDecoder.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/codecs/h264/decode/SliceHeaderReader.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/codecs/h264/decode/SliceReader.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/codecs/h264/decode/aso/FlatMBlockMapper.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/codecs/h264/decode/aso/MBToSliceGroupMap.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/codecs/h264/decode/aso/MapManager.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/codecs/h264/decode/aso/Mapper.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/codecs/h264/decode/aso/PrebuiltMBlockMapper.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/codecs/h264/decode/aso/SliceGroupMapBuilder.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/codecs/h264/decode/deblock/DeblockingFilter.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/codecs/h264/encode/CQPRateControl.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/codecs/h264/encode/EncodedMB.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/codecs/h264/encode/EncodingContext.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/codecs/h264/encode/H264EncoderUtils.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/codecs/h264/encode/IntraPredEstimator.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/codecs/h264/encode/MBDeblocker.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/codecs/h264/encode/MBEncoderHelper.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/codecs/h264/encode/MBWriterI16x16.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/codecs/h264/encode/MBWriterINxN.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/codecs/h264/encode/MBWriterP16x16.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/codecs/h264/encode/MotionEstimator.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/codecs/h264/encode/RateControl.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/codecs/h264/io/CABAC.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/codecs/h264/io/CAVLC.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/codecs/h264/io/model/AspectRatio.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/codecs/h264/io/model/Frame.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/codecs/h264/io/model/HRDParameters.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/codecs/h264/io/model/MBType.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/codecs/h264/io/model/NALUnit.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/codecs/h264/io/model/NALUnitType.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/codecs/h264/io/model/PictureParameterSet.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/codecs/h264/io/model/PredictionWeightTable.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/codecs/h264/io/model/RefPicMarking.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/codecs/h264/io/model/RefPicMarkingIDR.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/codecs/h264/io/model/SeqParameterSet.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/codecs/h264/io/model/SliceHeader.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/codecs/h264/io/model/SliceType.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/codecs/h264/io/model/VUIParameters.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/codecs/h264/io/write/CAVLCWriter.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/codecs/h264/io/write/SliceHeaderWriter.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/common/ArrayUtil.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/common/IntArrayList.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/common/IntObjectMap.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/common/VideoDecoder.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/common/VideoEncoder.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/common/io/BitReader.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/common/io/BitWriter.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/common/io/VLC.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/common/io/VLCBuilder.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/common/model/ColorSpace.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/common/model/Picture.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/common/model/Size.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/common/tools/MathUtil.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/scale/RgbToYuv420j.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/scale/Transform.java (100%) rename src/main/java/li/cil/{oc2r => oc2}/jcodec/scale/Yuv420jToRgb.java (100%) rename src/main/resources/assets/{oc2r => oc2}/blockstates/bus_cable.json (100%) rename src/main/resources/assets/{oc2r => oc2}/blockstates/charger.json (100%) rename src/main/resources/assets/{oc2r => oc2}/blockstates/computer.json (100%) rename src/main/resources/assets/{oc2r => oc2}/blockstates/creative_energy.json (100%) rename src/main/resources/assets/{oc2r => oc2}/blockstates/disk_drive.json (100%) rename src/main/resources/assets/{oc2r => oc2}/blockstates/flash_memory_flasher.json (100%) rename src/main/resources/assets/{oc2r => oc2}/blockstates/keyboard.json (100%) rename src/main/resources/assets/{oc2r => oc2}/blockstates/monitor.json (100%) rename src/main/resources/assets/{oc2r => oc2}/blockstates/network_connector.json (100%) rename src/main/resources/assets/{oc2r => oc2}/blockstates/network_hub.json (100%) rename src/main/resources/assets/{oc2r => oc2}/blockstates/network_switch.json (100%) rename src/main/resources/assets/{oc2r => oc2}/blockstates/pci_card_cage.json (100%) rename src/main/resources/assets/{oc2r => oc2}/blockstates/projector.json (100%) rename src/main/resources/assets/{oc2r => oc2}/blockstates/redstone_interface.json (100%) rename src/main/resources/assets/{oc2r => oc2}/blockstates/vxlan_hub.json (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/en_us/basics.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/en_us/block/bus_cable.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/en_us/block/bus_interface.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/en_us/block/charger.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/en_us/block/computer.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/en_us/block/disk_drive.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/en_us/block/flash_memory_flasher.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/en_us/block/index.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/en_us/block/keyboard.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/en_us/block/monitor.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/en_us/block/network_connector.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/en_us/block/network_hub.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/en_us/block/projector.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/en_us/block/redstone_interface.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/en_us/getting_started.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/en_us/index.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/en_us/item/block_operations_module.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/en_us/item/file_import_export_card.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/en_us/item/flash_memory.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/en_us/item/floppy.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/en_us/item/hard_drive.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/en_us/item/index.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/en_us/item/inventory_operations_module.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/en_us/item/manual.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/en_us/item/memory.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/en_us/item/network_cable.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/en_us/item/network_interface_card.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/en_us/item/network_tunnel_card.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/en_us/item/network_tunnel_module.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/en_us/item/redstone_interface_card.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/en_us/item/robot.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/en_us/item/sound_card.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/en_us/item/wrench.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/en_us/networking.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/en_us/robotics.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/en_us/scripting.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/img/getting_started_basics.png (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/img/getting_started_energy.png (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/img/getting_started_inventory.png (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/img/getting_started_login.png (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/img/scripting_lamp.png (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/img/scripting_lua_interactive.png (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/img/scripting_redstone_interface.png (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/ru_ru/basics.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/ru_ru/block/bus_cable.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/ru_ru/block/bus_interface.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/ru_ru/block/charger.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/ru_ru/block/computer.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/ru_ru/block/disk_drive.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/ru_ru/block/flash_memory_flasher.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/ru_ru/block/index.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/ru_ru/block/keyboard.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/ru_ru/block/monitor.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/ru_ru/block/network_connector.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/ru_ru/block/network_hub.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/ru_ru/block/projector.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/ru_ru/block/redstone_interface.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/ru_ru/getting_started.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/ru_ru/index.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/ru_ru/item/block_operations_module.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/ru_ru/item/file_import_export_card.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/ru_ru/item/flash_memory.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/ru_ru/item/floppy.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/ru_ru/item/hard_drive.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/ru_ru/item/index.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/ru_ru/item/inventory_operations_module.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/ru_ru/item/manual.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/ru_ru/item/memory.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/ru_ru/item/network_cable.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/ru_ru/item/network_interface_card.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/ru_ru/item/network_tunnel_card.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/ru_ru/item/network_tunnel_module.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/ru_ru/item/redstone_interface_card.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/ru_ru/item/robot.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/ru_ru/item/sound_card.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/ru_ru/item/wrench.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/ru_ru/networking.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/ru_ru/robotics.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/ru_ru/scripting.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/zh_cn/basics.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/zh_cn/block/bus_cable.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/zh_cn/block/bus_interface.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/zh_cn/block/charger.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/zh_cn/block/computer.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/zh_cn/block/disk_drive.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/zh_cn/block/flash_memory_flasher.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/zh_cn/block/index.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/zh_cn/block/keyboard.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/zh_cn/block/monitor.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/zh_cn/block/network_connector.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/zh_cn/block/network_hub.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/zh_cn/block/projector.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/zh_cn/block/redstone_interface.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/zh_cn/getting_started.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/zh_cn/index.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/zh_cn/item/block_operations_module.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/zh_cn/item/file_import_export_card.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/zh_cn/item/flash_memory.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/zh_cn/item/floppy.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/zh_cn/item/hard_drive.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/zh_cn/item/index.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/zh_cn/item/inventory_operations_module.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/zh_cn/item/manual.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/zh_cn/item/memory.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/zh_cn/item/network_cable.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/zh_cn/item/network_interface_card.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/zh_cn/item/network_tunnel_card.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/zh_cn/item/network_tunnel_module.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/zh_cn/item/redstone_interface_card.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/zh_cn/item/robot.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/zh_cn/item/sound_card.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/zh_cn/item/wrench.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/zh_cn/networking.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/zh_cn/robotics.md (100%) rename src/main/resources/assets/{oc2r => oc2}/doc/zh_cn/scripting.md (100%) rename src/main/resources/assets/{oc2r => oc2}/lang/en_us.json (100%) rename src/main/resources/assets/{oc2r => oc2}/lang/ru_ru.json (100%) rename src/main/resources/assets/{oc2r => oc2}/lang/zh_cn.json (100%) rename src/main/resources/assets/{oc2r => oc2}/models/block/cable_base.json (100%) rename src/main/resources/assets/{oc2r => oc2}/models/block/cable_link.json (100%) rename src/main/resources/assets/{oc2r => oc2}/models/block/cable_plug.json (100%) rename src/main/resources/assets/{oc2r => oc2}/models/block/cable_straight.json (100%) rename src/main/resources/assets/{oc2r => oc2}/models/block/cable_support.json (100%) rename src/main/resources/assets/{oc2r => oc2}/models/block/charger.json (100%) rename src/main/resources/assets/{oc2r => oc2}/models/block/computer.json (100%) rename src/main/resources/assets/{oc2r => oc2}/models/block/creative_energy.json (100%) rename src/main/resources/assets/{oc2r => oc2}/models/block/disk_drive.json (100%) rename src/main/resources/assets/{oc2r => oc2}/models/block/flash_memory_flasher.json (100%) rename src/main/resources/assets/{oc2r => oc2}/models/block/keyboard.json (100%) rename src/main/resources/assets/{oc2r => oc2}/models/block/monitor.json (100%) rename src/main/resources/assets/{oc2r => oc2}/models/block/monitor.mtl (100%) rename src/main/resources/assets/{oc2r => oc2}/models/block/monitor.obj (100%) rename src/main/resources/assets/{oc2r => oc2}/models/block/network_connector.json (100%) rename src/main/resources/assets/{oc2r => oc2}/models/block/network_hub.json (100%) rename src/main/resources/assets/{oc2r => oc2}/models/block/network_switch.json (100%) rename src/main/resources/assets/{oc2r => oc2}/models/block/pci_card_cage.json (100%) rename src/main/resources/assets/{oc2r => oc2}/models/block/projector.json (100%) rename src/main/resources/assets/{oc2r => oc2}/models/block/redstone_interface.json (100%) rename src/main/resources/assets/{oc2r => oc2}/models/block/vxlan_hub.json (100%) rename src/main/resources/assets/{oc2r => oc2}/models/item/block_operations_module.json (100%) rename src/main/resources/assets/{oc2r => oc2}/models/item/bus_cable.json (100%) rename src/main/resources/assets/{oc2r => oc2}/models/item/bus_interface.json (100%) rename src/main/resources/assets/{oc2r => oc2}/models/item/charger.json (100%) rename src/main/resources/assets/{oc2r => oc2}/models/item/circuit_board.json (100%) rename src/main/resources/assets/{oc2r => oc2}/models/item/computer.json (100%) rename src/main/resources/assets/{oc2r => oc2}/models/item/cpu_tier_1.json (100%) rename src/main/resources/assets/{oc2r => oc2}/models/item/cpu_tier_2.json (100%) rename src/main/resources/assets/{oc2r => oc2}/models/item/cpu_tier_3.json (100%) rename src/main/resources/assets/{oc2r => oc2}/models/item/cpu_tier_4.json (100%) rename src/main/resources/assets/{oc2r => oc2}/models/item/creative_energy.json (100%) rename src/main/resources/assets/{oc2r => oc2}/models/item/disk_drive.json (100%) rename src/main/resources/assets/{oc2r => oc2}/models/item/file_import_export_card.json (100%) rename src/main/resources/assets/{oc2r => oc2}/models/item/flash_memory.json (100%) rename src/main/resources/assets/{oc2r => oc2}/models/item/flash_memory_custom.json (100%) rename src/main/resources/assets/{oc2r => oc2}/models/item/flash_memory_flasher.json (100%) rename src/main/resources/assets/{oc2r => oc2}/models/item/floppy.json (100%) rename src/main/resources/assets/{oc2r => oc2}/models/item/floppy_modern.json (100%) rename src/main/resources/assets/{oc2r => oc2}/models/item/hard_drive_custom.json (100%) rename src/main/resources/assets/{oc2r => oc2}/models/item/hard_drive_extra_large.json (100%) rename src/main/resources/assets/{oc2r => oc2}/models/item/hard_drive_large.json (100%) rename src/main/resources/assets/{oc2r => oc2}/models/item/hard_drive_medium.json (100%) rename src/main/resources/assets/{oc2r => oc2}/models/item/hard_drive_small.json (100%) rename src/main/resources/assets/{oc2r => oc2}/models/item/inventory_operations_module.json (100%) rename src/main/resources/assets/{oc2r => oc2}/models/item/keyboard.json (100%) rename src/main/resources/assets/{oc2r => oc2}/models/item/manual.json (100%) rename src/main/resources/assets/{oc2r => oc2}/models/item/memory_extra_large.json (100%) rename src/main/resources/assets/{oc2r => oc2}/models/item/memory_large.json (100%) rename src/main/resources/assets/{oc2r => oc2}/models/item/memory_medium.json (100%) rename src/main/resources/assets/{oc2r => oc2}/models/item/memory_small.json (100%) rename src/main/resources/assets/{oc2r => oc2}/models/item/monitor.json (100%) rename src/main/resources/assets/{oc2r => oc2}/models/item/network_cable.json (100%) rename src/main/resources/assets/{oc2r => oc2}/models/item/network_connector.json (100%) rename src/main/resources/assets/{oc2r => oc2}/models/item/network_hub.json (100%) rename src/main/resources/assets/{oc2r => oc2}/models/item/network_interface_card.json (100%) rename src/main/resources/assets/{oc2r => oc2}/models/item/network_switch.json (100%) rename src/main/resources/assets/{oc2r => oc2}/models/item/network_tunnel_card.json (100%) rename src/main/resources/assets/{oc2r => oc2}/models/item/network_tunnel_module.json (100%) rename src/main/resources/assets/{oc2r => oc2}/models/item/pci_card_cage.json (100%) rename src/main/resources/assets/{oc2r => oc2}/models/item/projector.json (100%) rename src/main/resources/assets/{oc2r => oc2}/models/item/raw_silicon_wafer.json (100%) rename src/main/resources/assets/{oc2r => oc2}/models/item/redstone_interface.json (100%) rename src/main/resources/assets/{oc2r => oc2}/models/item/redstone_interface_card.json (100%) rename src/main/resources/assets/{oc2r => oc2}/models/item/robot.json (100%) rename src/main/resources/assets/{oc2r => oc2}/models/item/silicon.json (100%) rename src/main/resources/assets/{oc2r => oc2}/models/item/silicon_blend.json (100%) rename src/main/resources/assets/{oc2r => oc2}/models/item/silicon_wafer.json (100%) rename src/main/resources/assets/{oc2r => oc2}/models/item/sound_card.json (100%) rename src/main/resources/assets/{oc2r => oc2}/models/item/transistor.json (100%) rename src/main/resources/assets/{oc2r => oc2}/models/item/vxlan_hub.json (100%) rename src/main/resources/assets/{oc2r => oc2}/models/item/wrench.json (100%) rename src/main/resources/assets/{oc2r => oc2}/shaders/core/projectors.fsh (100%) rename src/main/resources/assets/{oc2r => oc2}/shaders/core/projectors.json (100%) rename src/main/resources/assets/{oc2r => oc2}/shaders/core/projectors.vsh (100%) rename src/main/resources/assets/{oc2r => oc2}/sounds.json (100%) rename src/main/resources/assets/{oc2r => oc2}/sounds/computer_running.ogg (100%) rename src/main/resources/assets/{oc2r => oc2}/sounds/floppy_access1.ogg (100%) rename src/main/resources/assets/{oc2r => oc2}/sounds/floppy_access2.ogg (100%) rename src/main/resources/assets/{oc2r => oc2}/sounds/floppy_access3.ogg (100%) rename src/main/resources/assets/{oc2r => oc2}/sounds/floppy_access4.ogg (100%) rename src/main/resources/assets/{oc2r => oc2}/sounds/floppy_access5.ogg (100%) rename src/main/resources/assets/{oc2r => oc2}/sounds/floppy_access6.ogg (100%) rename src/main/resources/assets/{oc2r => oc2}/sounds/floppy_eject.ogg (100%) rename src/main/resources/assets/{oc2r => oc2}/sounds/floppy_insert.ogg (100%) rename src/main/resources/assets/{oc2r => oc2}/sounds/hdd_access1.ogg (100%) rename src/main/resources/assets/{oc2r => oc2}/sounds/hdd_access2.ogg (100%) rename src/main/resources/assets/{oc2r => oc2}/sounds/hdd_access3.ogg (100%) rename src/main/resources/assets/{oc2r => oc2}/sounds/hdd_access4.ogg (100%) rename src/main/resources/assets/{oc2r => oc2}/sounds/hdd_access5.ogg (100%) rename src/main/resources/assets/{oc2r => oc2}/sounds/hdd_access6.ogg (100%) rename src/main/resources/assets/{oc2r => oc2}/sounds/hdd_access7.ogg (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/block/cable_base/cable_base_atlas0.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/block/cable_link/cable_link_atlas0.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/block/cable_plug/cable_plug_atlas0.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/block/cable_straight/cable_straight_atlas0.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/block/cable_support/cable_support_atlas0.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/block/charger/charger_atlas0.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/block/charger/charger_atlas1.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/block/charger/charger_atlas2.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/block/charger/charger_atlas3.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/block/charger/effect.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/block/computer/computer_atlas0.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/block/computer/computer_atlas1.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/block/computer/computer_atlas2.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/block/computer/computer_atlas3.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/block/computer/computer_atlas4.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/block/computer/computer_overlay_power.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/block/computer/computer_overlay_status.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/block/computer/computer_overlay_terminal.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/block/creative_energy.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/block/disk_drive/disk_drive_atlas0.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/block/disk_drive/disk_drive_atlas1.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/block/disk_drive/disk_drive_atlas2.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/block/disk_drive/disk_drive_atlas3.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/block/keyboard/keyboard_atlas0.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/block/keyboard/keyboard_atlas1.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/block/monitor/monitor.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/block/monitor/monitor_overlay_power.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/block/network_connector/network_connector_atlas0.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/block/network_hub/network_hub_atlas0.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/block/network_hub/network_hub_atlas1.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/block/network_hub/network_hub_atlas2.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/block/network_hub/network_hub_atlas3.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/block/network_switch/network_switch_atlas0.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/block/network_switch/network_switch_atlas1.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/block/network_switch/network_switch_atlas2.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/block/network_switch/network_switch_atlas3.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/block/pci_card_cage/pci_card_cage_atlas0.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/block/pci_card_cage/pci_card_cage_atlas1.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/block/pci_card_cage/pci_card_cage_atlas2.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/block/pci_card_cage/pci_card_cage_atlas3.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/block/pci_card_cage/pci_card_cage_atlas4.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/block/pci_card_cage/pci_card_cage_atlas5.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/block/pci_card_cage/pci_card_cage_atlas6.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/block/projector/projector_atlas0.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/block/projector/projector_atlas1.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/block/projector/projector_atlas2.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/block/projector/projector_atlas3.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/block/projector/projector_atlas4.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/block/projector/projector_atlas5.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/block/projector/projector_atlas6.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/block/redstone_interface/redstone_interface_atlas0.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/block/redstone_interface/redstone_interface_atlas1.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/block/redstone_interface/redstone_interface_atlas2.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/block/redstone_interface/redstone_interface_atlas3.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/block/redstone_interface/redstone_interface_atlas4.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/block/vxlan_hub/vxlan_hub_atlas0.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/block/vxlan_hub/vxlan_hub_atlas1.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/block/vxlan_hub/vxlan_hub_atlas2.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/block/vxlan_hub/vxlan_hub_atlas3.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/entity/robot/robot.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/font/OFL.TXT (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/font/monospace.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/font/terminus.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/gui/manual/home.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/gui/manual/manual.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/gui/manual/scroll_button.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/gui/manual/tab_button.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/gui/overlay/block_face_disabled.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/gui/overlay/block_face_enabled.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/gui/overlay/block_face_focused.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/gui/overlay/slot_info.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/gui/overlay/slot_selection.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/gui/overlay/slot_warn.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/gui/overlay/terminal_focused.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/gui/widget/bus_interface_screen.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/gui/widget/cancel_button.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/gui/widget/computer_container.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/gui/widget/confirm_button.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/gui/widget/energy.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/gui/widget/hotbar.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/gui/widget/input_button.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/gui/widget/inventory_button.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/gui/widget/monitor_screen.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/gui/widget/monitor_sidebar_1.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/gui/widget/network_interface_card_screen.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/gui/widget/network_tunnel_link_button.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/gui/widget/network_tunnel_screen.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/gui/widget/power_button.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/gui/widget/robot_container.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/gui/widget/sidebar_2.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/gui/widget/sidebar_3.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/gui/widget/terminal_screen.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/item/backlight.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/item/block_operations_module.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/item/card_slot.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/item/circuit_board.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/item/cpu_slot.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/item/cpu_tier_1.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/item/cpu_tier_2.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/item/cpu_tier_3.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/item/cpu_tier_4.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/item/file_import_export_card.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/item/file_import_export_card.png.mcmeta (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/item/flash_memory.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/item/flash_memory_slot.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/item/floppy_base.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/item/floppy_slot.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/item/floppy_tint.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/item/front_display_glass.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/item/hard_disk_platter.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/item/hard_drive_base.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/item/hard_drive_slot.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/item/hard_drive_tint.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/item/inventory_operations_module.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/item/lcd_display.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/item/liquid_crystal_layers.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/item/manual.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/item/memory_extra_large.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/item/memory_large.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/item/memory_medium.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/item/memory_slot.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/item/memory_small.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/item/motor.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/item/network_cable.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/item/network_interface_card.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/item/network_tunnel_card.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/item/network_tunnel_module.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/item/network_tunnel_slot.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/item/polarization_filter.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/item/raw_silicon_wafer.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/item/redstone_interface_card.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/item/robot_module_slot.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/item/silicon.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/item/silicon_blend.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/item/silicon_wafer.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/item/sound_card.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/item/transistor.png (100%) rename src/main/resources/assets/{oc2r => oc2}/textures/item/wrench.png (100%) rename src/main/resources/data/{oc2r/advancements/recipes/oc2r.common => oc2/advancements/recipes/oc2.common}/block_operations_module.json (100%) rename src/main/resources/data/{oc2r/advancements/recipes/oc2r.common => oc2/advancements/recipes/oc2.common}/bus_cable.json (100%) rename src/main/resources/data/{oc2r/advancements/recipes/oc2r.common => oc2/advancements/recipes/oc2.common}/bus_interface.json (100%) rename src/main/resources/data/{oc2r/advancements/recipes/oc2r.common => oc2/advancements/recipes/oc2.common}/charger.json (100%) rename src/main/resources/data/{oc2r/advancements/recipes/oc2r.common => oc2/advancements/recipes/oc2.common}/circuit_board.json (100%) rename src/main/resources/data/{oc2r/advancements/recipes/oc2r.common => oc2/advancements/recipes/oc2.common}/computer.json (100%) rename src/main/resources/data/{oc2r/advancements/recipes/oc2r.common => oc2/advancements/recipes/oc2.common}/disk_drive.json (100%) rename src/main/resources/data/{oc2r/advancements/recipes/oc2r.common => oc2/advancements/recipes/oc2.common}/file_import_export_card.json (100%) rename src/main/resources/data/{oc2r/advancements/recipes/oc2r.common => oc2/advancements/recipes/oc2.common}/flash_memory.json (100%) rename src/main/resources/data/{oc2r/advancements/recipes/oc2r.common => oc2/advancements/recipes/oc2.common}/flash_memory_custom.json (100%) rename src/main/resources/data/{oc2r/advancements/recipes/oc2r.common => oc2/advancements/recipes/oc2.common}/floppy.json (100%) rename src/main/resources/data/{oc2r/advancements/recipes/oc2r.common => oc2/advancements/recipes/oc2.common}/floppy_modern.json (100%) rename src/main/resources/data/{oc2r/advancements/recipes/oc2r.common => oc2/advancements/recipes/oc2.common}/hard_drive_custom.json (100%) rename src/main/resources/data/{oc2r/advancements/recipes/oc2r.common => oc2/advancements/recipes/oc2.common}/hard_drive_extra_large.json (100%) rename src/main/resources/data/{oc2r/advancements/recipes/oc2r.common => oc2/advancements/recipes/oc2.common}/hard_drive_large.json (100%) rename src/main/resources/data/{oc2r/advancements/recipes/oc2r.common => oc2/advancements/recipes/oc2.common}/hard_drive_medium.json (100%) rename src/main/resources/data/{oc2r/advancements/recipes/oc2r.common => oc2/advancements/recipes/oc2.common}/hard_drive_small.json (100%) rename src/main/resources/data/{oc2r/advancements/recipes/oc2r.common => oc2/advancements/recipes/oc2.common}/inventory_operations_module.json (100%) rename src/main/resources/data/{oc2r/advancements/recipes/oc2r.common => oc2/advancements/recipes/oc2.common}/keyboard.json (100%) rename src/main/resources/data/{oc2r/advancements/recipes/oc2r.common => oc2/advancements/recipes/oc2.common}/manual.json (100%) rename src/main/resources/data/{oc2r/advancements/recipes/oc2r.common => oc2/advancements/recipes/oc2.common}/memory_extra_large.json (100%) rename src/main/resources/data/{oc2r/advancements/recipes/oc2r.common => oc2/advancements/recipes/oc2.common}/memory_large.json (100%) rename src/main/resources/data/{oc2r/advancements/recipes/oc2r.common => oc2/advancements/recipes/oc2.common}/memory_medium.json (100%) rename src/main/resources/data/{oc2r/advancements/recipes/oc2r.common => oc2/advancements/recipes/oc2.common}/memory_small.json (100%) rename src/main/resources/data/{oc2r/advancements/recipes/oc2r.common => oc2/advancements/recipes/oc2.common}/network_cable.json (100%) rename src/main/resources/data/{oc2r/advancements/recipes/oc2r.common => oc2/advancements/recipes/oc2.common}/network_connector.json (100%) rename src/main/resources/data/{oc2r/advancements/recipes/oc2r.common => oc2/advancements/recipes/oc2.common}/network_hub.json (100%) rename src/main/resources/data/{oc2r/advancements/recipes/oc2r.common => oc2/advancements/recipes/oc2.common}/network_interface_card.json (100%) rename src/main/resources/data/{oc2r/advancements/recipes/oc2r.common => oc2/advancements/recipes/oc2.common}/network_tunnel_card.json (100%) rename src/main/resources/data/{oc2r/advancements/recipes/oc2r.common => oc2/advancements/recipes/oc2.common}/network_tunnel_module.json (100%) rename src/main/resources/data/{oc2r/advancements/recipes/oc2r.common => oc2/advancements/recipes/oc2.common}/projector.json (100%) rename src/main/resources/data/{oc2r/advancements/recipes/oc2r.common => oc2/advancements/recipes/oc2.common}/redstone_interface.json (100%) rename src/main/resources/data/{oc2r/advancements/recipes/oc2r.common => oc2/advancements/recipes/oc2.common}/redstone_interface_card.json (100%) rename src/main/resources/data/{oc2r/advancements/recipes/oc2r.common => oc2/advancements/recipes/oc2.common}/robot.json (100%) rename src/main/resources/data/{oc2r/advancements/recipes/oc2r.common => oc2/advancements/recipes/oc2.common}/sound_card.json (100%) rename src/main/resources/data/{oc2r/advancements/recipes/oc2r.common => oc2/advancements/recipes/oc2.common}/transistor.json (100%) rename src/main/resources/data/{oc2r/advancements/recipes/oc2r.common => oc2/advancements/recipes/oc2.common}/wrench.json (100%) rename src/main/resources/data/{oc2r => oc2}/file_systems/README.md (100%) rename src/main/resources/data/{oc2r => oc2}/file_systems/scripts.json (100%) rename src/main/resources/data/{oc2r => oc2}/item_tag_filters/minecraft/common.json (100%) rename src/main/resources/data/{oc2r/item_tag_filters/oc2r => oc2/item_tag_filters/oc2}/hard_drive.json (100%) rename src/main/resources/data/{oc2r/item_tag_filters/oc2r => oc2/item_tag_filters/oc2}/memory.json (100%) rename src/main/resources/data/{oc2r => oc2}/loot_tables/blocks/charger.json (100%) rename src/main/resources/data/{oc2r => oc2}/loot_tables/blocks/computer.json (100%) rename src/main/resources/data/{oc2r => oc2}/loot_tables/blocks/disk_drive.json (100%) rename src/main/resources/data/{oc2r => oc2}/loot_tables/blocks/keyboard.json (100%) rename src/main/resources/data/{oc2r => oc2}/loot_tables/blocks/network_connector.json (100%) rename src/main/resources/data/{oc2r => oc2}/loot_tables/blocks/network_hub.json (100%) rename src/main/resources/data/{oc2r => oc2}/loot_tables/blocks/projector.json (100%) rename src/main/resources/data/{oc2r => oc2}/loot_tables/blocks/redstone_interface.json (100%) rename src/main/resources/data/{oc2r => oc2}/recipes/block_operations_module.json (100%) rename src/main/resources/data/{oc2r => oc2}/recipes/bus_cable.json (100%) rename src/main/resources/data/{oc2r => oc2}/recipes/bus_interface.json (100%) rename src/main/resources/data/{oc2r => oc2}/recipes/charger.json (100%) rename src/main/resources/data/{oc2r => oc2}/recipes/circuit_board.json (100%) rename src/main/resources/data/{oc2r => oc2}/recipes/computer.json (100%) rename src/main/resources/data/{oc2r => oc2}/recipes/cpu_tier_1.json (100%) rename src/main/resources/data/{oc2r => oc2}/recipes/cpu_tier_2.json (100%) rename src/main/resources/data/{oc2r => oc2}/recipes/cpu_tier_3.json (100%) rename src/main/resources/data/{oc2r => oc2}/recipes/cpu_tier_4.json (100%) rename src/main/resources/data/{oc2r => oc2}/recipes/disk_drive.json (100%) rename src/main/resources/data/{oc2r => oc2}/recipes/file_import_export_card.json (100%) rename src/main/resources/data/{oc2r => oc2}/recipes/flash_memory.json (100%) rename src/main/resources/data/{oc2r => oc2}/recipes/flash_memory_custom.json (100%) rename src/main/resources/data/{oc2r => oc2}/recipes/flash_memory_flasher.json (100%) rename src/main/resources/data/{oc2r => oc2}/recipes/floppy.json (100%) rename src/main/resources/data/{oc2r => oc2}/recipes/floppy_modern.json (100%) rename src/main/resources/data/{oc2r => oc2}/recipes/hard_drive_custom.json (100%) rename src/main/resources/data/{oc2r => oc2}/recipes/hard_drive_extra_large.json (100%) rename src/main/resources/data/{oc2r => oc2}/recipes/hard_drive_large.json (100%) rename src/main/resources/data/{oc2r => oc2}/recipes/hard_drive_medium.json (100%) rename src/main/resources/data/{oc2r => oc2}/recipes/hard_drive_small.json (100%) rename src/main/resources/data/{oc2r => oc2}/recipes/inventory_operations_module.json (100%) rename src/main/resources/data/{oc2r => oc2}/recipes/keyboard.json (100%) rename src/main/resources/data/{oc2r => oc2}/recipes/manual.json (100%) rename src/main/resources/data/{oc2r => oc2}/recipes/memory_extra_large.json (100%) rename src/main/resources/data/{oc2r => oc2}/recipes/memory_large.json (100%) rename src/main/resources/data/{oc2r => oc2}/recipes/memory_medium.json (100%) rename src/main/resources/data/{oc2r => oc2}/recipes/memory_small.json (100%) rename src/main/resources/data/{oc2r => oc2}/recipes/network_cable.json (100%) rename src/main/resources/data/{oc2r => oc2}/recipes/network_connector.json (100%) rename src/main/resources/data/{oc2r => oc2}/recipes/network_hub.json (100%) rename src/main/resources/data/{oc2r => oc2}/recipes/network_interface_card.json (100%) rename src/main/resources/data/{oc2r => oc2}/recipes/network_tunnel_card.json (100%) rename src/main/resources/data/{oc2r => oc2}/recipes/network_tunnel_module.json (100%) rename src/main/resources/data/{oc2r => oc2}/recipes/projector.json (100%) rename src/main/resources/data/{oc2r => oc2}/recipes/raw_silicon_wafer.json (100%) rename src/main/resources/data/{oc2r => oc2}/recipes/redstone_interface.json (100%) rename src/main/resources/data/{oc2r => oc2}/recipes/redstone_interface_card.json (100%) rename src/main/resources/data/{oc2r => oc2}/recipes/robot.json (100%) rename src/main/resources/data/{oc2r => oc2}/recipes/silicon.json (100%) rename src/main/resources/data/{oc2r => oc2}/recipes/silicon_blend.json (100%) rename src/main/resources/data/{oc2r => oc2}/recipes/silicon_wafer.json (100%) rename src/main/resources/data/{oc2r => oc2}/recipes/sound_card.json (100%) rename src/main/resources/data/{oc2r => oc2}/recipes/transistor.json (100%) rename src/main/resources/data/{oc2r => oc2}/recipes/unflash.json (100%) rename src/main/resources/data/{oc2r => oc2}/recipes/wrench.json (100%) rename src/main/resources/data/{oc2r => oc2}/tags/blocks/cables.json (100%) rename src/main/resources/data/{oc2r => oc2}/tags/blocks/devices.json (100%) rename src/main/resources/data/{oc2r => oc2}/tags/blocks/wrench_breakable.json (100%) rename src/main/resources/data/{oc2r => oc2}/tags/items/cables.json (100%) rename src/main/resources/data/{oc2r => oc2}/tags/items/device_needs_reboot.json (100%) rename src/main/resources/data/{oc2r => oc2}/tags/items/devices.json (100%) rename src/main/resources/data/{oc2r => oc2}/tags/items/devices/card.json (100%) rename src/main/resources/data/{oc2r => oc2}/tags/items/devices/cpu.json (100%) rename src/main/resources/data/{oc2r => oc2}/tags/items/devices/flash_memory.json (100%) rename src/main/resources/data/{oc2r => oc2}/tags/items/devices/floppy.json (100%) rename src/main/resources/data/{oc2r => oc2}/tags/items/devices/hard_drive.json (100%) rename src/main/resources/data/{oc2r => oc2}/tags/items/devices/memory.json (100%) rename src/main/resources/data/{oc2r => oc2}/tags/items/devices/network_tunnel.json (100%) rename src/main/resources/data/{oc2r => oc2}/tags/items/devices/robot_module.json (100%) rename src/main/resources/data/{oc2r => oc2}/tags/items/tool_materials.json (100%) rename src/main/resources/data/{oc2r => oc2}/tags/items/tool_materials/diamond.json (100%) rename src/main/resources/data/{oc2r => oc2}/tags/items/tool_materials/gold.json (100%) rename src/main/resources/data/{oc2r => oc2}/tags/items/tool_materials/iron.json (100%) rename src/main/resources/data/{oc2r => oc2}/tags/items/tool_materials/netherite.json (100%) rename src/main/resources/data/{oc2r => oc2}/tags/items/tool_materials/stone.json (100%) rename src/main/resources/data/{oc2r => oc2}/tags/items/tool_materials/wood.json (100%) rename src/main/resources/data/{oc2r => oc2}/tags/items/wrenches.json (100%) rename src/main/resources/{mixins.oc2r.json => mixins.oc2.json} (100%) diff --git a/src/main/java/li/cil/oc2r/api/API.java b/src/main/java/li/cil/oc2/api/API.java similarity index 100% rename from src/main/java/li/cil/oc2r/api/API.java rename to src/main/java/li/cil/oc2/api/API.java diff --git a/src/main/java/li/cil/oc2r/api/README.md b/src/main/java/li/cil/oc2/api/README.md similarity index 100% rename from src/main/java/li/cil/oc2r/api/README.md rename to src/main/java/li/cil/oc2/api/README.md diff --git a/src/main/java/li/cil/oc2r/api/bus/BlockDeviceBusElement.java b/src/main/java/li/cil/oc2/api/bus/BlockDeviceBusElement.java similarity index 100% rename from src/main/java/li/cil/oc2r/api/bus/BlockDeviceBusElement.java rename to src/main/java/li/cil/oc2/api/bus/BlockDeviceBusElement.java diff --git a/src/main/java/li/cil/oc2r/api/bus/DeviceBus.java b/src/main/java/li/cil/oc2/api/bus/DeviceBus.java similarity index 100% rename from src/main/java/li/cil/oc2r/api/bus/DeviceBus.java rename to src/main/java/li/cil/oc2/api/bus/DeviceBus.java diff --git a/src/main/java/li/cil/oc2r/api/bus/DeviceBusController.java b/src/main/java/li/cil/oc2/api/bus/DeviceBusController.java similarity index 100% rename from src/main/java/li/cil/oc2r/api/bus/DeviceBusController.java rename to src/main/java/li/cil/oc2/api/bus/DeviceBusController.java diff --git a/src/main/java/li/cil/oc2r/api/bus/DeviceBusElement.java b/src/main/java/li/cil/oc2/api/bus/DeviceBusElement.java similarity index 100% rename from src/main/java/li/cil/oc2r/api/bus/DeviceBusElement.java rename to src/main/java/li/cil/oc2/api/bus/DeviceBusElement.java diff --git a/src/main/java/li/cil/oc2r/api/bus/device/Device.java b/src/main/java/li/cil/oc2/api/bus/device/Device.java similarity index 100% rename from src/main/java/li/cil/oc2r/api/bus/device/Device.java rename to src/main/java/li/cil/oc2/api/bus/device/Device.java diff --git a/src/main/java/li/cil/oc2r/api/bus/device/DeviceType.java b/src/main/java/li/cil/oc2/api/bus/device/DeviceType.java similarity index 100% rename from src/main/java/li/cil/oc2r/api/bus/device/DeviceType.java rename to src/main/java/li/cil/oc2/api/bus/device/DeviceType.java diff --git a/src/main/java/li/cil/oc2r/api/bus/device/DeviceTypes.java b/src/main/java/li/cil/oc2/api/bus/device/DeviceTypes.java similarity index 100% rename from src/main/java/li/cil/oc2r/api/bus/device/DeviceTypes.java rename to src/main/java/li/cil/oc2/api/bus/device/DeviceTypes.java diff --git a/src/main/java/li/cil/oc2r/api/bus/device/ItemDevice.java b/src/main/java/li/cil/oc2/api/bus/device/ItemDevice.java similarity index 100% rename from src/main/java/li/cil/oc2r/api/bus/device/ItemDevice.java rename to src/main/java/li/cil/oc2/api/bus/device/ItemDevice.java diff --git a/src/main/java/li/cil/oc2r/api/bus/device/data/BlockDeviceData.java b/src/main/java/li/cil/oc2/api/bus/device/data/BlockDeviceData.java similarity index 100% rename from src/main/java/li/cil/oc2r/api/bus/device/data/BlockDeviceData.java rename to src/main/java/li/cil/oc2/api/bus/device/data/BlockDeviceData.java diff --git a/src/main/java/li/cil/oc2r/api/bus/device/data/Firmware.java b/src/main/java/li/cil/oc2/api/bus/device/data/Firmware.java similarity index 100% rename from src/main/java/li/cil/oc2r/api/bus/device/data/Firmware.java rename to src/main/java/li/cil/oc2/api/bus/device/data/Firmware.java diff --git a/src/main/java/li/cil/oc2r/api/bus/device/data/package-info.java b/src/main/java/li/cil/oc2/api/bus/device/data/package-info.java similarity index 100% rename from src/main/java/li/cil/oc2r/api/bus/device/data/package-info.java rename to src/main/java/li/cil/oc2/api/bus/device/data/package-info.java diff --git a/src/main/java/li/cil/oc2r/api/bus/device/object/Callback.java b/src/main/java/li/cil/oc2/api/bus/device/object/Callback.java similarity index 100% rename from src/main/java/li/cil/oc2r/api/bus/device/object/Callback.java rename to src/main/java/li/cil/oc2/api/bus/device/object/Callback.java diff --git a/src/main/java/li/cil/oc2r/api/bus/device/object/Callbacks.java b/src/main/java/li/cil/oc2/api/bus/device/object/Callbacks.java similarity index 100% rename from src/main/java/li/cil/oc2r/api/bus/device/object/Callbacks.java rename to src/main/java/li/cil/oc2/api/bus/device/object/Callbacks.java diff --git a/src/main/java/li/cil/oc2r/api/bus/device/object/DocumentedDevice.java b/src/main/java/li/cil/oc2/api/bus/device/object/DocumentedDevice.java similarity index 100% rename from src/main/java/li/cil/oc2r/api/bus/device/object/DocumentedDevice.java rename to src/main/java/li/cil/oc2/api/bus/device/object/DocumentedDevice.java diff --git a/src/main/java/li/cil/oc2r/api/bus/device/object/LifecycleAwareDevice.java b/src/main/java/li/cil/oc2/api/bus/device/object/LifecycleAwareDevice.java similarity index 100% rename from src/main/java/li/cil/oc2r/api/bus/device/object/LifecycleAwareDevice.java rename to src/main/java/li/cil/oc2/api/bus/device/object/LifecycleAwareDevice.java diff --git a/src/main/java/li/cil/oc2r/api/bus/device/object/NamedDevice.java b/src/main/java/li/cil/oc2/api/bus/device/object/NamedDevice.java similarity index 100% rename from src/main/java/li/cil/oc2r/api/bus/device/object/NamedDevice.java rename to src/main/java/li/cil/oc2/api/bus/device/object/NamedDevice.java diff --git a/src/main/java/li/cil/oc2r/api/bus/device/object/ObjectDevice.java b/src/main/java/li/cil/oc2/api/bus/device/object/ObjectDevice.java similarity index 100% rename from src/main/java/li/cil/oc2r/api/bus/device/object/ObjectDevice.java rename to src/main/java/li/cil/oc2/api/bus/device/object/ObjectDevice.java diff --git a/src/main/java/li/cil/oc2r/api/bus/device/object/Parameter.java b/src/main/java/li/cil/oc2/api/bus/device/object/Parameter.java similarity index 100% rename from src/main/java/li/cil/oc2r/api/bus/device/object/Parameter.java rename to src/main/java/li/cil/oc2/api/bus/device/object/Parameter.java diff --git a/src/main/java/li/cil/oc2r/api/bus/device/object/package-info.java b/src/main/java/li/cil/oc2/api/bus/device/object/package-info.java similarity index 100% rename from src/main/java/li/cil/oc2r/api/bus/device/object/package-info.java rename to src/main/java/li/cil/oc2/api/bus/device/object/package-info.java diff --git a/src/main/java/li/cil/oc2r/api/bus/device/package-info.java b/src/main/java/li/cil/oc2/api/bus/device/package-info.java similarity index 100% rename from src/main/java/li/cil/oc2r/api/bus/device/package-info.java rename to src/main/java/li/cil/oc2/api/bus/device/package-info.java diff --git a/src/main/java/li/cil/oc2r/api/bus/device/provider/BlockDeviceProvider.java b/src/main/java/li/cil/oc2/api/bus/device/provider/BlockDeviceProvider.java similarity index 100% rename from src/main/java/li/cil/oc2r/api/bus/device/provider/BlockDeviceProvider.java rename to src/main/java/li/cil/oc2/api/bus/device/provider/BlockDeviceProvider.java diff --git a/src/main/java/li/cil/oc2r/api/bus/device/provider/BlockDeviceQuery.java b/src/main/java/li/cil/oc2/api/bus/device/provider/BlockDeviceQuery.java similarity index 100% rename from src/main/java/li/cil/oc2r/api/bus/device/provider/BlockDeviceQuery.java rename to src/main/java/li/cil/oc2/api/bus/device/provider/BlockDeviceQuery.java diff --git a/src/main/java/li/cil/oc2r/api/bus/device/provider/ItemDeviceProvider.java b/src/main/java/li/cil/oc2/api/bus/device/provider/ItemDeviceProvider.java similarity index 100% rename from src/main/java/li/cil/oc2r/api/bus/device/provider/ItemDeviceProvider.java rename to src/main/java/li/cil/oc2/api/bus/device/provider/ItemDeviceProvider.java diff --git a/src/main/java/li/cil/oc2r/api/bus/device/provider/ItemDeviceQuery.java b/src/main/java/li/cil/oc2/api/bus/device/provider/ItemDeviceQuery.java similarity index 100% rename from src/main/java/li/cil/oc2r/api/bus/device/provider/ItemDeviceQuery.java rename to src/main/java/li/cil/oc2/api/bus/device/provider/ItemDeviceQuery.java diff --git a/src/main/java/li/cil/oc2r/api/bus/device/provider/package-info.java b/src/main/java/li/cil/oc2/api/bus/device/provider/package-info.java similarity index 100% rename from src/main/java/li/cil/oc2r/api/bus/device/provider/package-info.java rename to src/main/java/li/cil/oc2/api/bus/device/provider/package-info.java diff --git a/src/main/java/li/cil/oc2r/api/bus/device/rpc/AbstractRPCMethod.java b/src/main/java/li/cil/oc2/api/bus/device/rpc/AbstractRPCMethod.java similarity index 100% rename from src/main/java/li/cil/oc2r/api/bus/device/rpc/AbstractRPCMethod.java rename to src/main/java/li/cil/oc2/api/bus/device/rpc/AbstractRPCMethod.java diff --git a/src/main/java/li/cil/oc2r/api/bus/device/rpc/RPCDevice.java b/src/main/java/li/cil/oc2/api/bus/device/rpc/RPCDevice.java similarity index 100% rename from src/main/java/li/cil/oc2r/api/bus/device/rpc/RPCDevice.java rename to src/main/java/li/cil/oc2/api/bus/device/rpc/RPCDevice.java diff --git a/src/main/java/li/cil/oc2r/api/bus/device/rpc/RPCInvocation.java b/src/main/java/li/cil/oc2/api/bus/device/rpc/RPCInvocation.java similarity index 100% rename from src/main/java/li/cil/oc2r/api/bus/device/rpc/RPCInvocation.java rename to src/main/java/li/cil/oc2/api/bus/device/rpc/RPCInvocation.java diff --git a/src/main/java/li/cil/oc2r/api/bus/device/rpc/RPCMethod.java b/src/main/java/li/cil/oc2/api/bus/device/rpc/RPCMethod.java similarity index 100% rename from src/main/java/li/cil/oc2r/api/bus/device/rpc/RPCMethod.java rename to src/main/java/li/cil/oc2/api/bus/device/rpc/RPCMethod.java diff --git a/src/main/java/li/cil/oc2r/api/bus/device/rpc/RPCMethodGroup.java b/src/main/java/li/cil/oc2/api/bus/device/rpc/RPCMethodGroup.java similarity index 100% rename from src/main/java/li/cil/oc2r/api/bus/device/rpc/RPCMethodGroup.java rename to src/main/java/li/cil/oc2/api/bus/device/rpc/RPCMethodGroup.java diff --git a/src/main/java/li/cil/oc2r/api/bus/device/rpc/RPCParameter.java b/src/main/java/li/cil/oc2/api/bus/device/rpc/RPCParameter.java similarity index 100% rename from src/main/java/li/cil/oc2r/api/bus/device/rpc/RPCParameter.java rename to src/main/java/li/cil/oc2/api/bus/device/rpc/RPCParameter.java diff --git a/src/main/java/li/cil/oc2r/api/bus/device/rpc/package-info.java b/src/main/java/li/cil/oc2/api/bus/device/rpc/package-info.java similarity index 100% rename from src/main/java/li/cil/oc2r/api/bus/device/rpc/package-info.java rename to src/main/java/li/cil/oc2/api/bus/device/rpc/package-info.java diff --git a/src/main/java/li/cil/oc2r/api/bus/device/vm/FirmwareLoader.java b/src/main/java/li/cil/oc2/api/bus/device/vm/FirmwareLoader.java similarity index 100% rename from src/main/java/li/cil/oc2r/api/bus/device/vm/FirmwareLoader.java rename to src/main/java/li/cil/oc2/api/bus/device/vm/FirmwareLoader.java diff --git a/src/main/java/li/cil/oc2r/api/bus/device/vm/VMDevice.java b/src/main/java/li/cil/oc2/api/bus/device/vm/VMDevice.java similarity index 100% rename from src/main/java/li/cil/oc2r/api/bus/device/vm/VMDevice.java rename to src/main/java/li/cil/oc2/api/bus/device/vm/VMDevice.java diff --git a/src/main/java/li/cil/oc2r/api/bus/device/vm/VMDeviceLoadResult.java b/src/main/java/li/cil/oc2/api/bus/device/vm/VMDeviceLoadResult.java similarity index 100% rename from src/main/java/li/cil/oc2r/api/bus/device/vm/VMDeviceLoadResult.java rename to src/main/java/li/cil/oc2/api/bus/device/vm/VMDeviceLoadResult.java diff --git a/src/main/java/li/cil/oc2r/api/bus/device/vm/context/InterruptAllocator.java b/src/main/java/li/cil/oc2/api/bus/device/vm/context/InterruptAllocator.java similarity index 100% rename from src/main/java/li/cil/oc2r/api/bus/device/vm/context/InterruptAllocator.java rename to src/main/java/li/cil/oc2/api/bus/device/vm/context/InterruptAllocator.java diff --git a/src/main/java/li/cil/oc2r/api/bus/device/vm/context/MemoryAllocator.java b/src/main/java/li/cil/oc2/api/bus/device/vm/context/MemoryAllocator.java similarity index 100% rename from src/main/java/li/cil/oc2r/api/bus/device/vm/context/MemoryAllocator.java rename to src/main/java/li/cil/oc2/api/bus/device/vm/context/MemoryAllocator.java diff --git a/src/main/java/li/cil/oc2r/api/bus/device/vm/context/MemoryRangeAllocator.java b/src/main/java/li/cil/oc2/api/bus/device/vm/context/MemoryRangeAllocator.java similarity index 100% rename from src/main/java/li/cil/oc2r/api/bus/device/vm/context/MemoryRangeAllocator.java rename to src/main/java/li/cil/oc2/api/bus/device/vm/context/MemoryRangeAllocator.java diff --git a/src/main/java/li/cil/oc2r/api/bus/device/vm/context/VMContext.java b/src/main/java/li/cil/oc2/api/bus/device/vm/context/VMContext.java similarity index 100% rename from src/main/java/li/cil/oc2r/api/bus/device/vm/context/VMContext.java rename to src/main/java/li/cil/oc2/api/bus/device/vm/context/VMContext.java diff --git a/src/main/java/li/cil/oc2r/api/bus/device/vm/context/VMLifecycleEventBus.java b/src/main/java/li/cil/oc2/api/bus/device/vm/context/VMLifecycleEventBus.java similarity index 100% rename from src/main/java/li/cil/oc2r/api/bus/device/vm/context/VMLifecycleEventBus.java rename to src/main/java/li/cil/oc2/api/bus/device/vm/context/VMLifecycleEventBus.java diff --git a/src/main/java/li/cil/oc2r/api/bus/device/vm/context/package-info.java b/src/main/java/li/cil/oc2/api/bus/device/vm/context/package-info.java similarity index 100% rename from src/main/java/li/cil/oc2r/api/bus/device/vm/context/package-info.java rename to src/main/java/li/cil/oc2/api/bus/device/vm/context/package-info.java diff --git a/src/main/java/li/cil/oc2r/api/bus/device/vm/event/VMInitializationException.java b/src/main/java/li/cil/oc2/api/bus/device/vm/event/VMInitializationException.java similarity index 100% rename from src/main/java/li/cil/oc2r/api/bus/device/vm/event/VMInitializationException.java rename to src/main/java/li/cil/oc2/api/bus/device/vm/event/VMInitializationException.java diff --git a/src/main/java/li/cil/oc2r/api/bus/device/vm/event/VMInitializingEvent.java b/src/main/java/li/cil/oc2/api/bus/device/vm/event/VMInitializingEvent.java similarity index 100% rename from src/main/java/li/cil/oc2r/api/bus/device/vm/event/VMInitializingEvent.java rename to src/main/java/li/cil/oc2/api/bus/device/vm/event/VMInitializingEvent.java diff --git a/src/main/java/li/cil/oc2r/api/bus/device/vm/event/VMResumedRunningEvent.java b/src/main/java/li/cil/oc2/api/bus/device/vm/event/VMResumedRunningEvent.java similarity index 100% rename from src/main/java/li/cil/oc2r/api/bus/device/vm/event/VMResumedRunningEvent.java rename to src/main/java/li/cil/oc2/api/bus/device/vm/event/VMResumedRunningEvent.java diff --git a/src/main/java/li/cil/oc2r/api/bus/device/vm/event/VMSynchronizeEvent.java b/src/main/java/li/cil/oc2/api/bus/device/vm/event/VMSynchronizeEvent.java similarity index 100% rename from src/main/java/li/cil/oc2r/api/bus/device/vm/event/VMSynchronizeEvent.java rename to src/main/java/li/cil/oc2/api/bus/device/vm/event/VMSynchronizeEvent.java diff --git a/src/main/java/li/cil/oc2r/api/bus/device/vm/event/package-info.java b/src/main/java/li/cil/oc2/api/bus/device/vm/event/package-info.java similarity index 100% rename from src/main/java/li/cil/oc2r/api/bus/device/vm/event/package-info.java rename to src/main/java/li/cil/oc2/api/bus/device/vm/event/package-info.java diff --git a/src/main/java/li/cil/oc2r/api/bus/device/vm/package-info.java b/src/main/java/li/cil/oc2/api/bus/device/vm/package-info.java similarity index 100% rename from src/main/java/li/cil/oc2r/api/bus/device/vm/package-info.java rename to src/main/java/li/cil/oc2/api/bus/device/vm/package-info.java diff --git a/src/main/java/li/cil/oc2r/api/bus/package-info.java b/src/main/java/li/cil/oc2/api/bus/package-info.java similarity index 100% rename from src/main/java/li/cil/oc2r/api/bus/package-info.java rename to src/main/java/li/cil/oc2/api/bus/package-info.java diff --git a/src/main/java/li/cil/oc2r/api/capabilities/NetworkInterface.java b/src/main/java/li/cil/oc2/api/capabilities/NetworkInterface.java similarity index 100% rename from src/main/java/li/cil/oc2r/api/capabilities/NetworkInterface.java rename to src/main/java/li/cil/oc2/api/capabilities/NetworkInterface.java diff --git a/src/main/java/li/cil/oc2r/api/capabilities/RedstoneEmitter.java b/src/main/java/li/cil/oc2/api/capabilities/RedstoneEmitter.java similarity index 100% rename from src/main/java/li/cil/oc2r/api/capabilities/RedstoneEmitter.java rename to src/main/java/li/cil/oc2/api/capabilities/RedstoneEmitter.java diff --git a/src/main/java/li/cil/oc2r/api/capabilities/Robot.java b/src/main/java/li/cil/oc2/api/capabilities/Robot.java similarity index 100% rename from src/main/java/li/cil/oc2r/api/capabilities/Robot.java rename to src/main/java/li/cil/oc2/api/capabilities/Robot.java diff --git a/src/main/java/li/cil/oc2r/api/capabilities/TerminalUserProvider.java b/src/main/java/li/cil/oc2/api/capabilities/TerminalUserProvider.java similarity index 100% rename from src/main/java/li/cil/oc2r/api/capabilities/TerminalUserProvider.java rename to src/main/java/li/cil/oc2/api/capabilities/TerminalUserProvider.java diff --git a/src/main/java/li/cil/oc2r/api/capabilities/package-info.java b/src/main/java/li/cil/oc2/api/capabilities/package-info.java similarity index 100% rename from src/main/java/li/cil/oc2r/api/capabilities/package-info.java rename to src/main/java/li/cil/oc2/api/capabilities/package-info.java diff --git a/src/main/java/li/cil/oc2r/api/imc/RPCMethodParameterTypeAdapter.java b/src/main/java/li/cil/oc2/api/imc/RPCMethodParameterTypeAdapter.java similarity index 100% rename from src/main/java/li/cil/oc2r/api/imc/RPCMethodParameterTypeAdapter.java rename to src/main/java/li/cil/oc2/api/imc/RPCMethodParameterTypeAdapter.java diff --git a/src/main/java/li/cil/oc2r/api/imc/package-info.java b/src/main/java/li/cil/oc2/api/imc/package-info.java similarity index 100% rename from src/main/java/li/cil/oc2r/api/imc/package-info.java rename to src/main/java/li/cil/oc2/api/imc/package-info.java diff --git a/src/main/java/li/cil/oc2r/api/package-info.java b/src/main/java/li/cil/oc2/api/package-info.java similarity index 100% rename from src/main/java/li/cil/oc2r/api/package-info.java rename to src/main/java/li/cil/oc2/api/package-info.java diff --git a/src/main/java/li/cil/oc2r/api/util/Invalidatable.java b/src/main/java/li/cil/oc2/api/util/Invalidatable.java similarity index 100% rename from src/main/java/li/cil/oc2r/api/util/Invalidatable.java rename to src/main/java/li/cil/oc2/api/util/Invalidatable.java diff --git a/src/main/java/li/cil/oc2r/api/util/Registries.java b/src/main/java/li/cil/oc2/api/util/Registries.java similarity index 100% rename from src/main/java/li/cil/oc2r/api/util/Registries.java rename to src/main/java/li/cil/oc2/api/util/Registries.java diff --git a/src/main/java/li/cil/oc2r/api/util/RobotOperationSide.java b/src/main/java/li/cil/oc2/api/util/RobotOperationSide.java similarity index 100% rename from src/main/java/li/cil/oc2r/api/util/RobotOperationSide.java rename to src/main/java/li/cil/oc2/api/util/RobotOperationSide.java diff --git a/src/main/java/li/cil/oc2r/api/util/Side.java b/src/main/java/li/cil/oc2/api/util/Side.java similarity index 100% rename from src/main/java/li/cil/oc2r/api/util/Side.java rename to src/main/java/li/cil/oc2/api/util/Side.java diff --git a/src/main/java/li/cil/oc2r/api/util/package-info.java b/src/main/java/li/cil/oc2/api/util/package-info.java similarity index 100% rename from src/main/java/li/cil/oc2r/api/util/package-info.java rename to src/main/java/li/cil/oc2/api/util/package-info.java diff --git a/src/main/java/li/cil/oc2r/client/ClientSetup.java b/src/main/java/li/cil/oc2/client/ClientSetup.java similarity index 100% rename from src/main/java/li/cil/oc2r/client/ClientSetup.java rename to src/main/java/li/cil/oc2/client/ClientSetup.java diff --git a/src/main/java/li/cil/oc2r/client/audio/LoopingBlockEntitySound.java b/src/main/java/li/cil/oc2/client/audio/LoopingBlockEntitySound.java similarity index 100% rename from src/main/java/li/cil/oc2r/client/audio/LoopingBlockEntitySound.java rename to src/main/java/li/cil/oc2/client/audio/LoopingBlockEntitySound.java diff --git a/src/main/java/li/cil/oc2r/client/audio/LoopingSoundManager.java b/src/main/java/li/cil/oc2/client/audio/LoopingSoundManager.java similarity index 100% rename from src/main/java/li/cil/oc2r/client/audio/LoopingSoundManager.java rename to src/main/java/li/cil/oc2/client/audio/LoopingSoundManager.java diff --git a/src/main/java/li/cil/oc2r/client/audio/package-info.java b/src/main/java/li/cil/oc2/client/audio/package-info.java similarity index 100% rename from src/main/java/li/cil/oc2r/client/audio/package-info.java rename to src/main/java/li/cil/oc2/client/audio/package-info.java diff --git a/src/main/java/li/cil/oc2r/client/gui/AbstractMachineInventoryScreen.java b/src/main/java/li/cil/oc2/client/gui/AbstractMachineInventoryScreen.java similarity index 100% rename from src/main/java/li/cil/oc2r/client/gui/AbstractMachineInventoryScreen.java rename to src/main/java/li/cil/oc2/client/gui/AbstractMachineInventoryScreen.java diff --git a/src/main/java/li/cil/oc2r/client/gui/AbstractMachineTerminalScreen.java b/src/main/java/li/cil/oc2/client/gui/AbstractMachineTerminalScreen.java similarity index 100% rename from src/main/java/li/cil/oc2r/client/gui/AbstractMachineTerminalScreen.java rename to src/main/java/li/cil/oc2/client/gui/AbstractMachineTerminalScreen.java diff --git a/src/main/java/li/cil/oc2r/client/gui/AbstractModContainerScreen.java b/src/main/java/li/cil/oc2/client/gui/AbstractModContainerScreen.java similarity index 100% rename from src/main/java/li/cil/oc2r/client/gui/AbstractModContainerScreen.java rename to src/main/java/li/cil/oc2/client/gui/AbstractModContainerScreen.java diff --git a/src/main/java/li/cil/oc2r/client/gui/AbstractMonitorDisplayScreen.java b/src/main/java/li/cil/oc2/client/gui/AbstractMonitorDisplayScreen.java similarity index 100% rename from src/main/java/li/cil/oc2r/client/gui/AbstractMonitorDisplayScreen.java rename to src/main/java/li/cil/oc2/client/gui/AbstractMonitorDisplayScreen.java diff --git a/src/main/java/li/cil/oc2r/client/gui/BusInterfaceScreen.java b/src/main/java/li/cil/oc2/client/gui/BusInterfaceScreen.java similarity index 100% rename from src/main/java/li/cil/oc2r/client/gui/BusInterfaceScreen.java rename to src/main/java/li/cil/oc2/client/gui/BusInterfaceScreen.java diff --git a/src/main/java/li/cil/oc2r/client/gui/ComputerContainerScreen.java b/src/main/java/li/cil/oc2/client/gui/ComputerContainerScreen.java similarity index 100% rename from src/main/java/li/cil/oc2r/client/gui/ComputerContainerScreen.java rename to src/main/java/li/cil/oc2/client/gui/ComputerContainerScreen.java diff --git a/src/main/java/li/cil/oc2r/client/gui/ComputerTerminalScreen.java b/src/main/java/li/cil/oc2/client/gui/ComputerTerminalScreen.java similarity index 100% rename from src/main/java/li/cil/oc2r/client/gui/ComputerTerminalScreen.java rename to src/main/java/li/cil/oc2/client/gui/ComputerTerminalScreen.java diff --git a/src/main/java/li/cil/oc2r/client/gui/FileChooserScreen.java b/src/main/java/li/cil/oc2/client/gui/FileChooserScreen.java similarity index 100% rename from src/main/java/li/cil/oc2r/client/gui/FileChooserScreen.java rename to src/main/java/li/cil/oc2/client/gui/FileChooserScreen.java diff --git a/src/main/java/li/cil/oc2r/client/gui/KeyCodeMapping.java b/src/main/java/li/cil/oc2/client/gui/KeyCodeMapping.java similarity index 100% rename from src/main/java/li/cil/oc2r/client/gui/KeyCodeMapping.java rename to src/main/java/li/cil/oc2/client/gui/KeyCodeMapping.java diff --git a/src/main/java/li/cil/oc2r/client/gui/KeyboardScreen.java b/src/main/java/li/cil/oc2/client/gui/KeyboardScreen.java similarity index 100% rename from src/main/java/li/cil/oc2r/client/gui/KeyboardScreen.java rename to src/main/java/li/cil/oc2/client/gui/KeyboardScreen.java diff --git a/src/main/java/li/cil/oc2r/client/gui/MachineTerminalWidget.java b/src/main/java/li/cil/oc2/client/gui/MachineTerminalWidget.java similarity index 100% rename from src/main/java/li/cil/oc2r/client/gui/MachineTerminalWidget.java rename to src/main/java/li/cil/oc2/client/gui/MachineTerminalWidget.java diff --git a/src/main/java/li/cil/oc2r/client/gui/MonitorDisplayScreen.java b/src/main/java/li/cil/oc2/client/gui/MonitorDisplayScreen.java similarity index 100% rename from src/main/java/li/cil/oc2r/client/gui/MonitorDisplayScreen.java rename to src/main/java/li/cil/oc2/client/gui/MonitorDisplayScreen.java diff --git a/src/main/java/li/cil/oc2r/client/gui/MonitorDisplayWidget.java b/src/main/java/li/cil/oc2/client/gui/MonitorDisplayWidget.java similarity index 100% rename from src/main/java/li/cil/oc2r/client/gui/MonitorDisplayWidget.java rename to src/main/java/li/cil/oc2/client/gui/MonitorDisplayWidget.java diff --git a/src/main/java/li/cil/oc2r/client/gui/NetworkInterfaceCardScreen.java b/src/main/java/li/cil/oc2/client/gui/NetworkInterfaceCardScreen.java similarity index 100% rename from src/main/java/li/cil/oc2r/client/gui/NetworkInterfaceCardScreen.java rename to src/main/java/li/cil/oc2/client/gui/NetworkInterfaceCardScreen.java diff --git a/src/main/java/li/cil/oc2r/client/gui/NetworkTunnelScreen.java b/src/main/java/li/cil/oc2/client/gui/NetworkTunnelScreen.java similarity index 100% rename from src/main/java/li/cil/oc2r/client/gui/NetworkTunnelScreen.java rename to src/main/java/li/cil/oc2/client/gui/NetworkTunnelScreen.java diff --git a/src/main/java/li/cil/oc2r/client/gui/RobotContainerScreen.java b/src/main/java/li/cil/oc2/client/gui/RobotContainerScreen.java similarity index 100% rename from src/main/java/li/cil/oc2r/client/gui/RobotContainerScreen.java rename to src/main/java/li/cil/oc2/client/gui/RobotContainerScreen.java diff --git a/src/main/java/li/cil/oc2r/client/gui/RobotTerminalScreen.java b/src/main/java/li/cil/oc2/client/gui/RobotTerminalScreen.java similarity index 100% rename from src/main/java/li/cil/oc2r/client/gui/RobotTerminalScreen.java rename to src/main/java/li/cil/oc2/client/gui/RobotTerminalScreen.java diff --git a/src/main/java/li/cil/oc2r/client/gui/Sprites.java b/src/main/java/li/cil/oc2/client/gui/Sprites.java similarity index 100% rename from src/main/java/li/cil/oc2r/client/gui/Sprites.java rename to src/main/java/li/cil/oc2/client/gui/Sprites.java diff --git a/src/main/java/li/cil/oc2r/client/gui/Textures.java b/src/main/java/li/cil/oc2/client/gui/Textures.java similarity index 100% rename from src/main/java/li/cil/oc2r/client/gui/Textures.java rename to src/main/java/li/cil/oc2/client/gui/Textures.java diff --git a/src/main/java/li/cil/oc2r/client/gui/package-info.java b/src/main/java/li/cil/oc2/client/gui/package-info.java similarity index 100% rename from src/main/java/li/cil/oc2r/client/gui/package-info.java rename to src/main/java/li/cil/oc2/client/gui/package-info.java diff --git a/src/main/java/li/cil/oc2r/client/gui/terminal/TerminalInput.java b/src/main/java/li/cil/oc2/client/gui/terminal/TerminalInput.java similarity index 100% rename from src/main/java/li/cil/oc2r/client/gui/terminal/TerminalInput.java rename to src/main/java/li/cil/oc2/client/gui/terminal/TerminalInput.java diff --git a/src/main/java/li/cil/oc2r/client/gui/terminal/package-info.java b/src/main/java/li/cil/oc2/client/gui/terminal/package-info.java similarity index 100% rename from src/main/java/li/cil/oc2r/client/gui/terminal/package-info.java rename to src/main/java/li/cil/oc2/client/gui/terminal/package-info.java diff --git a/src/main/java/li/cil/oc2r/client/gui/util/GuiUtils.java b/src/main/java/li/cil/oc2/client/gui/util/GuiUtils.java similarity index 100% rename from src/main/java/li/cil/oc2r/client/gui/util/GuiUtils.java rename to src/main/java/li/cil/oc2/client/gui/util/GuiUtils.java diff --git a/src/main/java/li/cil/oc2r/client/gui/util/package-info.java b/src/main/java/li/cil/oc2/client/gui/util/package-info.java similarity index 100% rename from src/main/java/li/cil/oc2r/client/gui/util/package-info.java rename to src/main/java/li/cil/oc2/client/gui/util/package-info.java diff --git a/src/main/java/li/cil/oc2r/client/gui/widget/ImageButton.java b/src/main/java/li/cil/oc2/client/gui/widget/ImageButton.java similarity index 100% rename from src/main/java/li/cil/oc2r/client/gui/widget/ImageButton.java rename to src/main/java/li/cil/oc2/client/gui/widget/ImageButton.java diff --git a/src/main/java/li/cil/oc2r/client/gui/widget/Sprite.java b/src/main/java/li/cil/oc2/client/gui/widget/Sprite.java similarity index 100% rename from src/main/java/li/cil/oc2r/client/gui/widget/Sprite.java rename to src/main/java/li/cil/oc2/client/gui/widget/Sprite.java diff --git a/src/main/java/li/cil/oc2r/client/gui/widget/Texture.java b/src/main/java/li/cil/oc2/client/gui/widget/Texture.java similarity index 100% rename from src/main/java/li/cil/oc2r/client/gui/widget/Texture.java rename to src/main/java/li/cil/oc2/client/gui/widget/Texture.java diff --git a/src/main/java/li/cil/oc2r/client/gui/widget/ToggleImageButton.java b/src/main/java/li/cil/oc2/client/gui/widget/ToggleImageButton.java similarity index 100% rename from src/main/java/li/cil/oc2r/client/gui/widget/ToggleImageButton.java rename to src/main/java/li/cil/oc2/client/gui/widget/ToggleImageButton.java diff --git a/src/main/java/li/cil/oc2r/client/gui/widget/package-info.java b/src/main/java/li/cil/oc2/client/gui/widget/package-info.java similarity index 100% rename from src/main/java/li/cil/oc2r/client/gui/widget/package-info.java rename to src/main/java/li/cil/oc2/client/gui/widget/package-info.java diff --git a/src/main/java/li/cil/oc2r/client/item/CustomItemColors.java b/src/main/java/li/cil/oc2/client/item/CustomItemColors.java similarity index 100% rename from src/main/java/li/cil/oc2r/client/item/CustomItemColors.java rename to src/main/java/li/cil/oc2/client/item/CustomItemColors.java diff --git a/src/main/java/li/cil/oc2r/client/item/CustomItemModelProperties.java b/src/main/java/li/cil/oc2/client/item/CustomItemModelProperties.java similarity index 100% rename from src/main/java/li/cil/oc2r/client/item/CustomItemModelProperties.java rename to src/main/java/li/cil/oc2/client/item/CustomItemModelProperties.java diff --git a/src/main/java/li/cil/oc2r/client/item/package-info.java b/src/main/java/li/cil/oc2/client/item/package-info.java similarity index 100% rename from src/main/java/li/cil/oc2r/client/item/package-info.java rename to src/main/java/li/cil/oc2/client/item/package-info.java diff --git a/src/main/java/li/cil/oc2r/client/manual/Manuals.java b/src/main/java/li/cil/oc2/client/manual/Manuals.java similarity index 100% rename from src/main/java/li/cil/oc2r/client/manual/Manuals.java rename to src/main/java/li/cil/oc2/client/manual/Manuals.java diff --git a/src/main/java/li/cil/oc2r/client/manual/ModManualScreenStyle.java b/src/main/java/li/cil/oc2/client/manual/ModManualScreenStyle.java similarity index 100% rename from src/main/java/li/cil/oc2r/client/manual/ModManualScreenStyle.java rename to src/main/java/li/cil/oc2/client/manual/ModManualScreenStyle.java diff --git a/src/main/java/li/cil/oc2r/client/manual/ModManualStyle.java b/src/main/java/li/cil/oc2/client/manual/ModManualStyle.java similarity index 100% rename from src/main/java/li/cil/oc2r/client/manual/ModManualStyle.java rename to src/main/java/li/cil/oc2/client/manual/ModManualStyle.java diff --git a/src/main/java/li/cil/oc2r/client/manual/package-info.java b/src/main/java/li/cil/oc2/client/manual/package-info.java similarity index 100% rename from src/main/java/li/cil/oc2r/client/manual/package-info.java rename to src/main/java/li/cil/oc2/client/manual/package-info.java diff --git a/src/main/java/li/cil/oc2r/client/model/BusCableBakedModel.java b/src/main/java/li/cil/oc2/client/model/BusCableBakedModel.java similarity index 100% rename from src/main/java/li/cil/oc2r/client/model/BusCableBakedModel.java rename to src/main/java/li/cil/oc2/client/model/BusCableBakedModel.java diff --git a/src/main/java/li/cil/oc2r/client/model/BusCableModel.java b/src/main/java/li/cil/oc2/client/model/BusCableModel.java similarity index 100% rename from src/main/java/li/cil/oc2r/client/model/BusCableModel.java rename to src/main/java/li/cil/oc2/client/model/BusCableModel.java diff --git a/src/main/java/li/cil/oc2r/client/model/BusCableModelLoader.java b/src/main/java/li/cil/oc2/client/model/BusCableModelLoader.java similarity index 100% rename from src/main/java/li/cil/oc2r/client/model/BusCableModelLoader.java rename to src/main/java/li/cil/oc2/client/model/BusCableModelLoader.java diff --git a/src/main/java/li/cil/oc2r/client/model/package-info.java b/src/main/java/li/cil/oc2/client/model/package-info.java similarity index 100% rename from src/main/java/li/cil/oc2r/client/model/package-info.java rename to src/main/java/li/cil/oc2/client/model/package-info.java diff --git a/src/main/java/li/cil/oc2r/client/package-info.java b/src/main/java/li/cil/oc2/client/package-info.java similarity index 100% rename from src/main/java/li/cil/oc2r/client/package-info.java rename to src/main/java/li/cil/oc2/client/package-info.java diff --git a/src/main/java/li/cil/oc2r/client/renderer/BusInterfaceNameRenderer.java b/src/main/java/li/cil/oc2/client/renderer/BusInterfaceNameRenderer.java similarity index 100% rename from src/main/java/li/cil/oc2r/client/renderer/BusInterfaceNameRenderer.java rename to src/main/java/li/cil/oc2/client/renderer/BusInterfaceNameRenderer.java diff --git a/src/main/java/li/cil/oc2r/client/renderer/ModRenderType.java b/src/main/java/li/cil/oc2/client/renderer/ModRenderType.java similarity index 100% rename from src/main/java/li/cil/oc2r/client/renderer/ModRenderType.java rename to src/main/java/li/cil/oc2/client/renderer/ModRenderType.java diff --git a/src/main/java/li/cil/oc2r/client/renderer/ModShaders.java b/src/main/java/li/cil/oc2/client/renderer/ModShaders.java similarity index 100% rename from src/main/java/li/cil/oc2r/client/renderer/ModShaders.java rename to src/main/java/li/cil/oc2/client/renderer/ModShaders.java diff --git a/src/main/java/li/cil/oc2r/client/renderer/MonitorGUIRenderer.java b/src/main/java/li/cil/oc2/client/renderer/MonitorGUIRenderer.java similarity index 100% rename from src/main/java/li/cil/oc2r/client/renderer/MonitorGUIRenderer.java rename to src/main/java/li/cil/oc2/client/renderer/MonitorGUIRenderer.java diff --git a/src/main/java/li/cil/oc2r/client/renderer/NetworkCableRenderer.java b/src/main/java/li/cil/oc2/client/renderer/NetworkCableRenderer.java similarity index 100% rename from src/main/java/li/cil/oc2r/client/renderer/NetworkCableRenderer.java rename to src/main/java/li/cil/oc2/client/renderer/NetworkCableRenderer.java diff --git a/src/main/java/li/cil/oc2r/client/renderer/ProjectorDepthRenderer.java b/src/main/java/li/cil/oc2/client/renderer/ProjectorDepthRenderer.java similarity index 100% rename from src/main/java/li/cil/oc2r/client/renderer/ProjectorDepthRenderer.java rename to src/main/java/li/cil/oc2/client/renderer/ProjectorDepthRenderer.java diff --git a/src/main/java/li/cil/oc2r/client/renderer/blockentity/ChargerRenderer.java b/src/main/java/li/cil/oc2/client/renderer/blockentity/ChargerRenderer.java similarity index 100% rename from src/main/java/li/cil/oc2r/client/renderer/blockentity/ChargerRenderer.java rename to src/main/java/li/cil/oc2/client/renderer/blockentity/ChargerRenderer.java diff --git a/src/main/java/li/cil/oc2r/client/renderer/blockentity/ComputerRenderer.java b/src/main/java/li/cil/oc2/client/renderer/blockentity/ComputerRenderer.java similarity index 100% rename from src/main/java/li/cil/oc2r/client/renderer/blockentity/ComputerRenderer.java rename to src/main/java/li/cil/oc2/client/renderer/blockentity/ComputerRenderer.java diff --git a/src/main/java/li/cil/oc2r/client/renderer/blockentity/DiskDriveRenderer.java b/src/main/java/li/cil/oc2/client/renderer/blockentity/DiskDriveRenderer.java similarity index 100% rename from src/main/java/li/cil/oc2r/client/renderer/blockentity/DiskDriveRenderer.java rename to src/main/java/li/cil/oc2/client/renderer/blockentity/DiskDriveRenderer.java diff --git a/src/main/java/li/cil/oc2r/client/renderer/blockentity/MonitorRenderer.java b/src/main/java/li/cil/oc2/client/renderer/blockentity/MonitorRenderer.java similarity index 100% rename from src/main/java/li/cil/oc2r/client/renderer/blockentity/MonitorRenderer.java rename to src/main/java/li/cil/oc2/client/renderer/blockentity/MonitorRenderer.java diff --git a/src/main/java/li/cil/oc2r/client/renderer/blockentity/ProjectorRenderer.java b/src/main/java/li/cil/oc2/client/renderer/blockentity/ProjectorRenderer.java similarity index 100% rename from src/main/java/li/cil/oc2r/client/renderer/blockentity/ProjectorRenderer.java rename to src/main/java/li/cil/oc2/client/renderer/blockentity/ProjectorRenderer.java diff --git a/src/main/java/li/cil/oc2r/client/renderer/blockentity/package-info.java b/src/main/java/li/cil/oc2/client/renderer/blockentity/package-info.java similarity index 100% rename from src/main/java/li/cil/oc2r/client/renderer/blockentity/package-info.java rename to src/main/java/li/cil/oc2/client/renderer/blockentity/package-info.java diff --git a/src/main/java/li/cil/oc2r/client/renderer/color/BusCableBlockColor.java b/src/main/java/li/cil/oc2/client/renderer/color/BusCableBlockColor.java similarity index 100% rename from src/main/java/li/cil/oc2r/client/renderer/color/BusCableBlockColor.java rename to src/main/java/li/cil/oc2/client/renderer/color/BusCableBlockColor.java diff --git a/src/main/java/li/cil/oc2r/client/renderer/color/package-info.java b/src/main/java/li/cil/oc2/client/renderer/color/package-info.java similarity index 100% rename from src/main/java/li/cil/oc2r/client/renderer/color/package-info.java rename to src/main/java/li/cil/oc2/client/renderer/color/package-info.java diff --git a/src/main/java/li/cil/oc2r/client/renderer/entity/RobotRenderer.java b/src/main/java/li/cil/oc2/client/renderer/entity/RobotRenderer.java similarity index 100% rename from src/main/java/li/cil/oc2r/client/renderer/entity/RobotRenderer.java rename to src/main/java/li/cil/oc2/client/renderer/entity/RobotRenderer.java diff --git a/src/main/java/li/cil/oc2r/client/renderer/entity/RobotWithoutLevelRenderer.java b/src/main/java/li/cil/oc2/client/renderer/entity/RobotWithoutLevelRenderer.java similarity index 100% rename from src/main/java/li/cil/oc2r/client/renderer/entity/RobotWithoutLevelRenderer.java rename to src/main/java/li/cil/oc2/client/renderer/entity/RobotWithoutLevelRenderer.java diff --git a/src/main/java/li/cil/oc2r/client/renderer/entity/model/RobotModel.java b/src/main/java/li/cil/oc2/client/renderer/entity/model/RobotModel.java similarity index 100% rename from src/main/java/li/cil/oc2r/client/renderer/entity/model/RobotModel.java rename to src/main/java/li/cil/oc2/client/renderer/entity/model/RobotModel.java diff --git a/src/main/java/li/cil/oc2r/client/renderer/entity/model/package-info.java b/src/main/java/li/cil/oc2/client/renderer/entity/model/package-info.java similarity index 100% rename from src/main/java/li/cil/oc2r/client/renderer/entity/model/package-info.java rename to src/main/java/li/cil/oc2/client/renderer/entity/model/package-info.java diff --git a/src/main/java/li/cil/oc2r/client/renderer/entity/package-info.java b/src/main/java/li/cil/oc2/client/renderer/entity/package-info.java similarity index 100% rename from src/main/java/li/cil/oc2r/client/renderer/entity/package-info.java rename to src/main/java/li/cil/oc2/client/renderer/entity/package-info.java diff --git a/src/main/java/li/cil/oc2r/client/renderer/font/MonospaceFontRenderer.java b/src/main/java/li/cil/oc2/client/renderer/font/MonospaceFontRenderer.java similarity index 100% rename from src/main/java/li/cil/oc2r/client/renderer/font/MonospaceFontRenderer.java rename to src/main/java/li/cil/oc2/client/renderer/font/MonospaceFontRenderer.java diff --git a/src/main/java/li/cil/oc2r/client/renderer/font/package-info.java b/src/main/java/li/cil/oc2/client/renderer/font/package-info.java similarity index 100% rename from src/main/java/li/cil/oc2r/client/renderer/font/package-info.java rename to src/main/java/li/cil/oc2/client/renderer/font/package-info.java diff --git a/src/main/java/li/cil/oc2r/client/renderer/package-info.java b/src/main/java/li/cil/oc2/client/renderer/package-info.java similarity index 100% rename from src/main/java/li/cil/oc2r/client/renderer/package-info.java rename to src/main/java/li/cil/oc2/client/renderer/package-info.java diff --git a/src/main/java/li/cil/oc2r/common/CommonSetup.java b/src/main/java/li/cil/oc2/common/CommonSetup.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/CommonSetup.java rename to src/main/java/li/cil/oc2/common/CommonSetup.java diff --git a/src/main/java/li/cil/oc2r/common/Config.java b/src/main/java/li/cil/oc2/common/Config.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/Config.java rename to src/main/java/li/cil/oc2/common/Config.java diff --git a/src/main/java/li/cil/oc2r/common/ConfigManager.java b/src/main/java/li/cil/oc2/common/ConfigManager.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/ConfigManager.java rename to src/main/java/li/cil/oc2/common/ConfigManager.java diff --git a/src/main/java/li/cil/oc2r/common/Constants.java b/src/main/java/li/cil/oc2/common/Constants.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/Constants.java rename to src/main/java/li/cil/oc2/common/Constants.java diff --git a/src/main/java/li/cil/oc2r/common/Main.java b/src/main/java/li/cil/oc2/common/Main.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/Main.java rename to src/main/java/li/cil/oc2/common/Main.java diff --git a/src/main/java/li/cil/oc2r/common/block/Blocks.java b/src/main/java/li/cil/oc2/common/block/Blocks.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/block/Blocks.java rename to src/main/java/li/cil/oc2/common/block/Blocks.java diff --git a/src/main/java/li/cil/oc2r/common/block/BusCableBlock.java b/src/main/java/li/cil/oc2/common/block/BusCableBlock.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/block/BusCableBlock.java rename to src/main/java/li/cil/oc2/common/block/BusCableBlock.java diff --git a/src/main/java/li/cil/oc2r/common/block/ChargerBlock.java b/src/main/java/li/cil/oc2/common/block/ChargerBlock.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/block/ChargerBlock.java rename to src/main/java/li/cil/oc2/common/block/ChargerBlock.java diff --git a/src/main/java/li/cil/oc2r/common/block/ComputerBlock.java b/src/main/java/li/cil/oc2/common/block/ComputerBlock.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/block/ComputerBlock.java rename to src/main/java/li/cil/oc2/common/block/ComputerBlock.java diff --git a/src/main/java/li/cil/oc2r/common/block/CreativeEnergyBlock.java b/src/main/java/li/cil/oc2/common/block/CreativeEnergyBlock.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/block/CreativeEnergyBlock.java rename to src/main/java/li/cil/oc2/common/block/CreativeEnergyBlock.java diff --git a/src/main/java/li/cil/oc2r/common/block/DiskDriveBlock.java b/src/main/java/li/cil/oc2/common/block/DiskDriveBlock.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/block/DiskDriveBlock.java rename to src/main/java/li/cil/oc2/common/block/DiskDriveBlock.java diff --git a/src/main/java/li/cil/oc2r/common/block/EnergyConsumingBlock.java b/src/main/java/li/cil/oc2/common/block/EnergyConsumingBlock.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/block/EnergyConsumingBlock.java rename to src/main/java/li/cil/oc2/common/block/EnergyConsumingBlock.java diff --git a/src/main/java/li/cil/oc2r/common/block/FlashMemoryFlasherBlock.java b/src/main/java/li/cil/oc2/common/block/FlashMemoryFlasherBlock.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/block/FlashMemoryFlasherBlock.java rename to src/main/java/li/cil/oc2/common/block/FlashMemoryFlasherBlock.java diff --git a/src/main/java/li/cil/oc2r/common/block/ImmutableHorizontalBlock.java b/src/main/java/li/cil/oc2/common/block/ImmutableHorizontalBlock.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/block/ImmutableHorizontalBlock.java rename to src/main/java/li/cil/oc2/common/block/ImmutableHorizontalBlock.java diff --git a/src/main/java/li/cil/oc2r/common/block/KeyboardBlock.java b/src/main/java/li/cil/oc2/common/block/KeyboardBlock.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/block/KeyboardBlock.java rename to src/main/java/li/cil/oc2/common/block/KeyboardBlock.java diff --git a/src/main/java/li/cil/oc2r/common/block/MonitorBlock.java b/src/main/java/li/cil/oc2/common/block/MonitorBlock.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/block/MonitorBlock.java rename to src/main/java/li/cil/oc2/common/block/MonitorBlock.java diff --git a/src/main/java/li/cil/oc2r/common/block/NetworkConnectorBlock.java b/src/main/java/li/cil/oc2/common/block/NetworkConnectorBlock.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/block/NetworkConnectorBlock.java rename to src/main/java/li/cil/oc2/common/block/NetworkConnectorBlock.java diff --git a/src/main/java/li/cil/oc2r/common/block/NetworkHubBlock.java b/src/main/java/li/cil/oc2/common/block/NetworkHubBlock.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/block/NetworkHubBlock.java rename to src/main/java/li/cil/oc2/common/block/NetworkHubBlock.java diff --git a/src/main/java/li/cil/oc2r/common/block/NetworkSwitchBlock.java b/src/main/java/li/cil/oc2/common/block/NetworkSwitchBlock.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/block/NetworkSwitchBlock.java rename to src/main/java/li/cil/oc2/common/block/NetworkSwitchBlock.java diff --git a/src/main/java/li/cil/oc2r/common/block/PciCardCageBlock.java b/src/main/java/li/cil/oc2/common/block/PciCardCageBlock.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/block/PciCardCageBlock.java rename to src/main/java/li/cil/oc2/common/block/PciCardCageBlock.java diff --git a/src/main/java/li/cil/oc2r/common/block/ProjectorBlock.java b/src/main/java/li/cil/oc2/common/block/ProjectorBlock.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/block/ProjectorBlock.java rename to src/main/java/li/cil/oc2/common/block/ProjectorBlock.java diff --git a/src/main/java/li/cil/oc2r/common/block/RedstoneInterfaceBlock.java b/src/main/java/li/cil/oc2/common/block/RedstoneInterfaceBlock.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/block/RedstoneInterfaceBlock.java rename to src/main/java/li/cil/oc2/common/block/RedstoneInterfaceBlock.java diff --git a/src/main/java/li/cil/oc2r/common/block/VxlanBlock.java b/src/main/java/li/cil/oc2/common/block/VxlanBlock.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/block/VxlanBlock.java rename to src/main/java/li/cil/oc2/common/block/VxlanBlock.java diff --git a/src/main/java/li/cil/oc2r/common/block/package-info.java b/src/main/java/li/cil/oc2/common/block/package-info.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/block/package-info.java rename to src/main/java/li/cil/oc2/common/block/package-info.java diff --git a/src/main/java/li/cil/oc2r/common/blockentity/BlockEntities.java b/src/main/java/li/cil/oc2/common/blockentity/BlockEntities.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/blockentity/BlockEntities.java rename to src/main/java/li/cil/oc2/common/blockentity/BlockEntities.java diff --git a/src/main/java/li/cil/oc2r/common/blockentity/BusCableBlockEntity.java b/src/main/java/li/cil/oc2/common/blockentity/BusCableBlockEntity.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/blockentity/BusCableBlockEntity.java rename to src/main/java/li/cil/oc2/common/blockentity/BusCableBlockEntity.java diff --git a/src/main/java/li/cil/oc2r/common/blockentity/ChargerBlockEntity.java b/src/main/java/li/cil/oc2/common/blockentity/ChargerBlockEntity.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/blockentity/ChargerBlockEntity.java rename to src/main/java/li/cil/oc2/common/blockentity/ChargerBlockEntity.java diff --git a/src/main/java/li/cil/oc2r/common/blockentity/ComputerBlockEntity.java b/src/main/java/li/cil/oc2/common/blockentity/ComputerBlockEntity.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/blockentity/ComputerBlockEntity.java rename to src/main/java/li/cil/oc2/common/blockentity/ComputerBlockEntity.java diff --git a/src/main/java/li/cil/oc2r/common/blockentity/CreativeEnergyBlockEntity.java b/src/main/java/li/cil/oc2/common/blockentity/CreativeEnergyBlockEntity.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/blockentity/CreativeEnergyBlockEntity.java rename to src/main/java/li/cil/oc2/common/blockentity/CreativeEnergyBlockEntity.java diff --git a/src/main/java/li/cil/oc2r/common/blockentity/DiskDriveBlockEntity.java b/src/main/java/li/cil/oc2/common/blockentity/DiskDriveBlockEntity.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/blockentity/DiskDriveBlockEntity.java rename to src/main/java/li/cil/oc2/common/blockentity/DiskDriveBlockEntity.java diff --git a/src/main/java/li/cil/oc2r/common/blockentity/FlashMemoryFlasherBlockEntity.java b/src/main/java/li/cil/oc2/common/blockentity/FlashMemoryFlasherBlockEntity.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/blockentity/FlashMemoryFlasherBlockEntity.java rename to src/main/java/li/cil/oc2/common/blockentity/FlashMemoryFlasherBlockEntity.java diff --git a/src/main/java/li/cil/oc2r/common/blockentity/KeyboardBlockEntity.java b/src/main/java/li/cil/oc2/common/blockentity/KeyboardBlockEntity.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/blockentity/KeyboardBlockEntity.java rename to src/main/java/li/cil/oc2/common/blockentity/KeyboardBlockEntity.java diff --git a/src/main/java/li/cil/oc2r/common/blockentity/ModBlockEntity.java b/src/main/java/li/cil/oc2/common/blockentity/ModBlockEntity.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/blockentity/ModBlockEntity.java rename to src/main/java/li/cil/oc2/common/blockentity/ModBlockEntity.java diff --git a/src/main/java/li/cil/oc2r/common/blockentity/MonitorBlockEntity.java b/src/main/java/li/cil/oc2/common/blockentity/MonitorBlockEntity.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/blockentity/MonitorBlockEntity.java rename to src/main/java/li/cil/oc2/common/blockentity/MonitorBlockEntity.java diff --git a/src/main/java/li/cil/oc2r/common/blockentity/NetworkConnectorBlockEntity.java b/src/main/java/li/cil/oc2/common/blockentity/NetworkConnectorBlockEntity.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/blockentity/NetworkConnectorBlockEntity.java rename to src/main/java/li/cil/oc2/common/blockentity/NetworkConnectorBlockEntity.java diff --git a/src/main/java/li/cil/oc2r/common/blockentity/NetworkHubBlockEntity.java b/src/main/java/li/cil/oc2/common/blockentity/NetworkHubBlockEntity.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/blockentity/NetworkHubBlockEntity.java rename to src/main/java/li/cil/oc2/common/blockentity/NetworkHubBlockEntity.java diff --git a/src/main/java/li/cil/oc2r/common/blockentity/NetworkSwitchBlockEntity.java b/src/main/java/li/cil/oc2/common/blockentity/NetworkSwitchBlockEntity.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/blockentity/NetworkSwitchBlockEntity.java rename to src/main/java/li/cil/oc2/common/blockentity/NetworkSwitchBlockEntity.java diff --git a/src/main/java/li/cil/oc2r/common/blockentity/PciCardCageBlockEntity.java b/src/main/java/li/cil/oc2/common/blockentity/PciCardCageBlockEntity.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/blockentity/PciCardCageBlockEntity.java rename to src/main/java/li/cil/oc2/common/blockentity/PciCardCageBlockEntity.java diff --git a/src/main/java/li/cil/oc2r/common/blockentity/ProjectorBlockEntity.java b/src/main/java/li/cil/oc2/common/blockentity/ProjectorBlockEntity.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/blockentity/ProjectorBlockEntity.java rename to src/main/java/li/cil/oc2/common/blockentity/ProjectorBlockEntity.java diff --git a/src/main/java/li/cil/oc2r/common/blockentity/RedstoneInterfaceBlockEntity.java b/src/main/java/li/cil/oc2/common/blockentity/RedstoneInterfaceBlockEntity.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/blockentity/RedstoneInterfaceBlockEntity.java rename to src/main/java/li/cil/oc2/common/blockentity/RedstoneInterfaceBlockEntity.java diff --git a/src/main/java/li/cil/oc2r/common/blockentity/TickableBlockEntity.java b/src/main/java/li/cil/oc2/common/blockentity/TickableBlockEntity.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/blockentity/TickableBlockEntity.java rename to src/main/java/li/cil/oc2/common/blockentity/TickableBlockEntity.java diff --git a/src/main/java/li/cil/oc2r/common/blockentity/VxlanBlockEntity.java b/src/main/java/li/cil/oc2/common/blockentity/VxlanBlockEntity.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/blockentity/VxlanBlockEntity.java rename to src/main/java/li/cil/oc2/common/blockentity/VxlanBlockEntity.java diff --git a/src/main/java/li/cil/oc2r/common/blockentity/package-info.java b/src/main/java/li/cil/oc2/common/blockentity/package-info.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/blockentity/package-info.java rename to src/main/java/li/cil/oc2/common/blockentity/package-info.java diff --git a/src/main/java/li/cil/oc2r/common/bus/AbstractBlockDeviceBusElement.java b/src/main/java/li/cil/oc2/common/bus/AbstractBlockDeviceBusElement.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/AbstractBlockDeviceBusElement.java rename to src/main/java/li/cil/oc2/common/bus/AbstractBlockDeviceBusElement.java diff --git a/src/main/java/li/cil/oc2r/common/bus/AbstractDeviceBusElement.java b/src/main/java/li/cil/oc2/common/bus/AbstractDeviceBusElement.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/AbstractDeviceBusElement.java rename to src/main/java/li/cil/oc2/common/bus/AbstractDeviceBusElement.java diff --git a/src/main/java/li/cil/oc2r/common/bus/AbstractGroupingDeviceBusElement.java b/src/main/java/li/cil/oc2/common/bus/AbstractGroupingDeviceBusElement.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/AbstractGroupingDeviceBusElement.java rename to src/main/java/li/cil/oc2/common/bus/AbstractGroupingDeviceBusElement.java diff --git a/src/main/java/li/cil/oc2r/common/bus/AbstractItemDeviceBusElement.java b/src/main/java/li/cil/oc2/common/bus/AbstractItemDeviceBusElement.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/AbstractItemDeviceBusElement.java rename to src/main/java/li/cil/oc2/common/bus/AbstractItemDeviceBusElement.java diff --git a/src/main/java/li/cil/oc2r/common/bus/BlockDeviceBusController.java b/src/main/java/li/cil/oc2/common/bus/BlockDeviceBusController.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/BlockDeviceBusController.java rename to src/main/java/li/cil/oc2/common/bus/BlockDeviceBusController.java diff --git a/src/main/java/li/cil/oc2r/common/bus/CommonDeviceBusController.java b/src/main/java/li/cil/oc2/common/bus/CommonDeviceBusController.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/CommonDeviceBusController.java rename to src/main/java/li/cil/oc2/common/bus/CommonDeviceBusController.java diff --git a/src/main/java/li/cil/oc2r/common/bus/RPCDeviceBusAdapter.java b/src/main/java/li/cil/oc2/common/bus/RPCDeviceBusAdapter.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/RPCDeviceBusAdapter.java rename to src/main/java/li/cil/oc2/common/bus/RPCDeviceBusAdapter.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/BlockDeviceBusElement.java b/src/main/java/li/cil/oc2/common/bus/device/BlockDeviceBusElement.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/BlockDeviceBusElement.java rename to src/main/java/li/cil/oc2/common/bus/device/BlockDeviceBusElement.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/DeviceGroup.java b/src/main/java/li/cil/oc2/common/bus/device/DeviceGroup.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/DeviceGroup.java rename to src/main/java/li/cil/oc2/common/bus/device/DeviceGroup.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/DeviceTypes.java b/src/main/java/li/cil/oc2/common/bus/device/DeviceTypes.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/DeviceTypes.java rename to src/main/java/li/cil/oc2/common/bus/device/DeviceTypes.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/data/BlockDeviceDataRegistry.java b/src/main/java/li/cil/oc2/common/bus/device/data/BlockDeviceDataRegistry.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/data/BlockDeviceDataRegistry.java rename to src/main/java/li/cil/oc2/common/bus/device/data/BlockDeviceDataRegistry.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/data/BuildrootBlockDeviceData.java b/src/main/java/li/cil/oc2/common/bus/device/data/BuildrootBlockDeviceData.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/data/BuildrootBlockDeviceData.java rename to src/main/java/li/cil/oc2/common/bus/device/data/BuildrootBlockDeviceData.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/data/BuildrootFirmware.java b/src/main/java/li/cil/oc2/common/bus/device/data/BuildrootFirmware.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/data/BuildrootFirmware.java rename to src/main/java/li/cil/oc2/common/bus/device/data/BuildrootFirmware.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/data/FileSystems.java b/src/main/java/li/cil/oc2/common/bus/device/data/FileSystems.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/data/FileSystems.java rename to src/main/java/li/cil/oc2/common/bus/device/data/FileSystems.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/data/FirmwareRegistry.java b/src/main/java/li/cil/oc2/common/bus/device/data/FirmwareRegistry.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/data/FirmwareRegistry.java rename to src/main/java/li/cil/oc2/common/bus/device/data/FirmwareRegistry.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/data/ResourceBlockDeviceData.java b/src/main/java/li/cil/oc2/common/bus/device/data/ResourceBlockDeviceData.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/data/ResourceBlockDeviceData.java rename to src/main/java/li/cil/oc2/common/bus/device/data/ResourceBlockDeviceData.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/data/package-info.java b/src/main/java/li/cil/oc2/common/bus/device/data/package-info.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/data/package-info.java rename to src/main/java/li/cil/oc2/common/bus/device/data/package-info.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/package-info.java b/src/main/java/li/cil/oc2/common/bus/device/package-info.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/package-info.java rename to src/main/java/li/cil/oc2/common/bus/device/package-info.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/provider/ProviderRegistry.java b/src/main/java/li/cil/oc2/common/bus/device/provider/ProviderRegistry.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/provider/ProviderRegistry.java rename to src/main/java/li/cil/oc2/common/bus/device/provider/ProviderRegistry.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/provider/Providers.java b/src/main/java/li/cil/oc2/common/bus/device/provider/Providers.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/provider/Providers.java rename to src/main/java/li/cil/oc2/common/bus/device/provider/Providers.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/provider/block/BlockEntityCapabilityDeviceProvider.java b/src/main/java/li/cil/oc2/common/bus/device/provider/block/BlockEntityCapabilityDeviceProvider.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/provider/block/BlockEntityCapabilityDeviceProvider.java rename to src/main/java/li/cil/oc2/common/bus/device/provider/block/BlockEntityCapabilityDeviceProvider.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/provider/block/package-info.java b/src/main/java/li/cil/oc2/common/bus/device/provider/block/package-info.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/provider/block/package-info.java rename to src/main/java/li/cil/oc2/common/bus/device/provider/block/package-info.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/provider/item/AbstractItemStackCapabilityDeviceProvider.java b/src/main/java/li/cil/oc2/common/bus/device/provider/item/AbstractItemStackCapabilityDeviceProvider.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/provider/item/AbstractItemStackCapabilityDeviceProvider.java rename to src/main/java/li/cil/oc2/common/bus/device/provider/item/AbstractItemStackCapabilityDeviceProvider.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/provider/item/BlockOperationsModuleDeviceProvider.java b/src/main/java/li/cil/oc2/common/bus/device/provider/item/BlockOperationsModuleDeviceProvider.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/provider/item/BlockOperationsModuleDeviceProvider.java rename to src/main/java/li/cil/oc2/common/bus/device/provider/item/BlockOperationsModuleDeviceProvider.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/provider/item/CPUItemDeviceProvider.java b/src/main/java/li/cil/oc2/common/bus/device/provider/item/CPUItemDeviceProvider.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/provider/item/CPUItemDeviceProvider.java rename to src/main/java/li/cil/oc2/common/bus/device/provider/item/CPUItemDeviceProvider.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/provider/item/EnergyStorageItemDeviceProvider.java b/src/main/java/li/cil/oc2/common/bus/device/provider/item/EnergyStorageItemDeviceProvider.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/provider/item/EnergyStorageItemDeviceProvider.java rename to src/main/java/li/cil/oc2/common/bus/device/provider/item/EnergyStorageItemDeviceProvider.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/provider/item/FileImportExportCardItemDeviceProvider.java b/src/main/java/li/cil/oc2/common/bus/device/provider/item/FileImportExportCardItemDeviceProvider.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/provider/item/FileImportExportCardItemDeviceProvider.java rename to src/main/java/li/cil/oc2/common/bus/device/provider/item/FileImportExportCardItemDeviceProvider.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/provider/item/FlashMemoryItemDeviceProvider.java b/src/main/java/li/cil/oc2/common/bus/device/provider/item/FlashMemoryItemDeviceProvider.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/provider/item/FlashMemoryItemDeviceProvider.java rename to src/main/java/li/cil/oc2/common/bus/device/provider/item/FlashMemoryItemDeviceProvider.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/provider/item/FlashMemoryWithExternalDataItemDeviceProvider.java b/src/main/java/li/cil/oc2/common/bus/device/provider/item/FlashMemoryWithExternalDataItemDeviceProvider.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/provider/item/FlashMemoryWithExternalDataItemDeviceProvider.java rename to src/main/java/li/cil/oc2/common/bus/device/provider/item/FlashMemoryWithExternalDataItemDeviceProvider.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/provider/item/FluidHandlerItemDeviceProvider.java b/src/main/java/li/cil/oc2/common/bus/device/provider/item/FluidHandlerItemDeviceProvider.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/provider/item/FluidHandlerItemDeviceProvider.java rename to src/main/java/li/cil/oc2/common/bus/device/provider/item/FluidHandlerItemDeviceProvider.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/provider/item/HardDriveItemDeviceProvider.java b/src/main/java/li/cil/oc2/common/bus/device/provider/item/HardDriveItemDeviceProvider.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/provider/item/HardDriveItemDeviceProvider.java rename to src/main/java/li/cil/oc2/common/bus/device/provider/item/HardDriveItemDeviceProvider.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/provider/item/HardDriveWithExternalDataItemDeviceProvider.java b/src/main/java/li/cil/oc2/common/bus/device/provider/item/HardDriveWithExternalDataItemDeviceProvider.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/provider/item/HardDriveWithExternalDataItemDeviceProvider.java rename to src/main/java/li/cil/oc2/common/bus/device/provider/item/HardDriveWithExternalDataItemDeviceProvider.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/provider/item/InventoryOperationsModuleDeviceProvider.java b/src/main/java/li/cil/oc2/common/bus/device/provider/item/InventoryOperationsModuleDeviceProvider.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/provider/item/InventoryOperationsModuleDeviceProvider.java rename to src/main/java/li/cil/oc2/common/bus/device/provider/item/InventoryOperationsModuleDeviceProvider.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/provider/item/ItemHandlerItemDeviceProvider.java b/src/main/java/li/cil/oc2/common/bus/device/provider/item/ItemHandlerItemDeviceProvider.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/provider/item/ItemHandlerItemDeviceProvider.java rename to src/main/java/li/cil/oc2/common/bus/device/provider/item/ItemHandlerItemDeviceProvider.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/provider/item/ItemStackCapabilityDeviceProvider.java b/src/main/java/li/cil/oc2/common/bus/device/provider/item/ItemStackCapabilityDeviceProvider.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/provider/item/ItemStackCapabilityDeviceProvider.java rename to src/main/java/li/cil/oc2/common/bus/device/provider/item/ItemStackCapabilityDeviceProvider.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/provider/item/MemoryItemDeviceProvider.java b/src/main/java/li/cil/oc2/common/bus/device/provider/item/MemoryItemDeviceProvider.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/provider/item/MemoryItemDeviceProvider.java rename to src/main/java/li/cil/oc2/common/bus/device/provider/item/MemoryItemDeviceProvider.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/provider/item/NetworkInterfaceCardItemDeviceProvider.java b/src/main/java/li/cil/oc2/common/bus/device/provider/item/NetworkInterfaceCardItemDeviceProvider.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/provider/item/NetworkInterfaceCardItemDeviceProvider.java rename to src/main/java/li/cil/oc2/common/bus/device/provider/item/NetworkInterfaceCardItemDeviceProvider.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/provider/item/NetworkTunnelCardItemDeviceProvider.java b/src/main/java/li/cil/oc2/common/bus/device/provider/item/NetworkTunnelCardItemDeviceProvider.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/provider/item/NetworkTunnelCardItemDeviceProvider.java rename to src/main/java/li/cil/oc2/common/bus/device/provider/item/NetworkTunnelCardItemDeviceProvider.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/provider/item/NetworkTunnelModuleItemDeviceProvider.java b/src/main/java/li/cil/oc2/common/bus/device/provider/item/NetworkTunnelModuleItemDeviceProvider.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/provider/item/NetworkTunnelModuleItemDeviceProvider.java rename to src/main/java/li/cil/oc2/common/bus/device/provider/item/NetworkTunnelModuleItemDeviceProvider.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/provider/item/RedstoneInterfaceCardItemDeviceProvider.java b/src/main/java/li/cil/oc2/common/bus/device/provider/item/RedstoneInterfaceCardItemDeviceProvider.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/provider/item/RedstoneInterfaceCardItemDeviceProvider.java rename to src/main/java/li/cil/oc2/common/bus/device/provider/item/RedstoneInterfaceCardItemDeviceProvider.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/provider/item/SoundCardItemDeviceProvider.java b/src/main/java/li/cil/oc2/common/bus/device/provider/item/SoundCardItemDeviceProvider.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/provider/item/SoundCardItemDeviceProvider.java rename to src/main/java/li/cil/oc2/common/bus/device/provider/item/SoundCardItemDeviceProvider.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/provider/item/package-info.java b/src/main/java/li/cil/oc2/common/bus/device/provider/item/package-info.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/provider/item/package-info.java rename to src/main/java/li/cil/oc2/common/bus/device/provider/item/package-info.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/provider/package-info.java b/src/main/java/li/cil/oc2/common/bus/device/provider/package-info.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/provider/package-info.java rename to src/main/java/li/cil/oc2/common/bus/device/provider/package-info.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/provider/util/AbstractBlockDeviceProvider.java b/src/main/java/li/cil/oc2/common/bus/device/provider/util/AbstractBlockDeviceProvider.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/provider/util/AbstractBlockDeviceProvider.java rename to src/main/java/li/cil/oc2/common/bus/device/provider/util/AbstractBlockDeviceProvider.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/provider/util/AbstractBlockEntityCapabilityDeviceProvider.java b/src/main/java/li/cil/oc2/common/bus/device/provider/util/AbstractBlockEntityCapabilityDeviceProvider.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/provider/util/AbstractBlockEntityCapabilityDeviceProvider.java rename to src/main/java/li/cil/oc2/common/bus/device/provider/util/AbstractBlockEntityCapabilityDeviceProvider.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/provider/util/AbstractBlockEntityDeviceProvider.java b/src/main/java/li/cil/oc2/common/bus/device/provider/util/AbstractBlockEntityDeviceProvider.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/provider/util/AbstractBlockEntityDeviceProvider.java rename to src/main/java/li/cil/oc2/common/bus/device/provider/util/AbstractBlockEntityDeviceProvider.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/provider/util/AbstractItemDeviceProvider.java b/src/main/java/li/cil/oc2/common/bus/device/provider/util/AbstractItemDeviceProvider.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/provider/util/AbstractItemDeviceProvider.java rename to src/main/java/li/cil/oc2/common/bus/device/provider/util/AbstractItemDeviceProvider.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/provider/util/package-info.java b/src/main/java/li/cil/oc2/common/bus/device/provider/util/package-info.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/provider/util/package-info.java rename to src/main/java/li/cil/oc2/common/bus/device/provider/util/package-info.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/rpc/EnergyStorageDevice.java b/src/main/java/li/cil/oc2/common/bus/device/rpc/EnergyStorageDevice.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/rpc/EnergyStorageDevice.java rename to src/main/java/li/cil/oc2/common/bus/device/rpc/EnergyStorageDevice.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/rpc/FluidHandlerDevice.java b/src/main/java/li/cil/oc2/common/bus/device/rpc/FluidHandlerDevice.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/rpc/FluidHandlerDevice.java rename to src/main/java/li/cil/oc2/common/bus/device/rpc/FluidHandlerDevice.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/rpc/ItemHandlerDevice.java b/src/main/java/li/cil/oc2/common/bus/device/rpc/ItemHandlerDevice.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/rpc/ItemHandlerDevice.java rename to src/main/java/li/cil/oc2/common/bus/device/rpc/ItemHandlerDevice.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/rpc/RPCDeviceList.java b/src/main/java/li/cil/oc2/common/bus/device/rpc/RPCDeviceList.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/rpc/RPCDeviceList.java rename to src/main/java/li/cil/oc2/common/bus/device/rpc/RPCDeviceList.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/rpc/RPCItemStackTagFilter.java b/src/main/java/li/cil/oc2/common/bus/device/rpc/RPCItemStackTagFilter.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/rpc/RPCItemStackTagFilter.java rename to src/main/java/li/cil/oc2/common/bus/device/rpc/RPCItemStackTagFilter.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/rpc/RPCItemStackTagFilters.java b/src/main/java/li/cil/oc2/common/bus/device/rpc/RPCItemStackTagFilters.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/rpc/RPCItemStackTagFilters.java rename to src/main/java/li/cil/oc2/common/bus/device/rpc/RPCItemStackTagFilters.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/rpc/RPCMethodParameterTypeAdapters.java b/src/main/java/li/cil/oc2/common/bus/device/rpc/RPCMethodParameterTypeAdapters.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/rpc/RPCMethodParameterTypeAdapters.java rename to src/main/java/li/cil/oc2/common/bus/device/rpc/RPCMethodParameterTypeAdapters.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/rpc/TypeNameRPCDevice.java b/src/main/java/li/cil/oc2/common/bus/device/rpc/TypeNameRPCDevice.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/rpc/TypeNameRPCDevice.java rename to src/main/java/li/cil/oc2/common/bus/device/rpc/TypeNameRPCDevice.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/rpc/block/BlockEntityObjectDeviceProvider.java b/src/main/java/li/cil/oc2/common/bus/device/rpc/block/BlockEntityObjectDeviceProvider.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/rpc/block/BlockEntityObjectDeviceProvider.java rename to src/main/java/li/cil/oc2/common/bus/device/rpc/block/BlockEntityObjectDeviceProvider.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/rpc/block/BlockStateObjectDeviceProvider.java b/src/main/java/li/cil/oc2/common/bus/device/rpc/block/BlockStateObjectDeviceProvider.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/rpc/block/BlockStateObjectDeviceProvider.java rename to src/main/java/li/cil/oc2/common/bus/device/rpc/block/BlockStateObjectDeviceProvider.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/rpc/block/EnergyStorageBlockDeviceProvider.java b/src/main/java/li/cil/oc2/common/bus/device/rpc/block/EnergyStorageBlockDeviceProvider.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/rpc/block/EnergyStorageBlockDeviceProvider.java rename to src/main/java/li/cil/oc2/common/bus/device/rpc/block/EnergyStorageBlockDeviceProvider.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/rpc/block/FluidHandlerBlockDeviceProvider.java b/src/main/java/li/cil/oc2/common/bus/device/rpc/block/FluidHandlerBlockDeviceProvider.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/rpc/block/FluidHandlerBlockDeviceProvider.java rename to src/main/java/li/cil/oc2/common/bus/device/rpc/block/FluidHandlerBlockDeviceProvider.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/rpc/block/ItemHandlerBlockDeviceProvider.java b/src/main/java/li/cil/oc2/common/bus/device/rpc/block/ItemHandlerBlockDeviceProvider.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/rpc/block/ItemHandlerBlockDeviceProvider.java rename to src/main/java/li/cil/oc2/common/bus/device/rpc/block/ItemHandlerBlockDeviceProvider.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/rpc/block/package-info.java b/src/main/java/li/cil/oc2/common/bus/device/rpc/block/package-info.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/rpc/block/package-info.java rename to src/main/java/li/cil/oc2/common/bus/device/rpc/block/package-info.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/rpc/item/AbstractItemRPCDevice.java b/src/main/java/li/cil/oc2/common/bus/device/rpc/item/AbstractItemRPCDevice.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/rpc/item/AbstractItemRPCDevice.java rename to src/main/java/li/cil/oc2/common/bus/device/rpc/item/AbstractItemRPCDevice.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/rpc/item/BlockOperationsModuleDevice.java b/src/main/java/li/cil/oc2/common/bus/device/rpc/item/BlockOperationsModuleDevice.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/rpc/item/BlockOperationsModuleDevice.java rename to src/main/java/li/cil/oc2/common/bus/device/rpc/item/BlockOperationsModuleDevice.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/rpc/item/CPUItemDevice.java b/src/main/java/li/cil/oc2/common/bus/device/rpc/item/CPUItemDevice.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/rpc/item/CPUItemDevice.java rename to src/main/java/li/cil/oc2/common/bus/device/rpc/item/CPUItemDevice.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/rpc/item/FileImportExportCardItemDevice.java b/src/main/java/li/cil/oc2/common/bus/device/rpc/item/FileImportExportCardItemDevice.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/rpc/item/FileImportExportCardItemDevice.java rename to src/main/java/li/cil/oc2/common/bus/device/rpc/item/FileImportExportCardItemDevice.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/rpc/item/InventoryOperationsModuleDevice.java b/src/main/java/li/cil/oc2/common/bus/device/rpc/item/InventoryOperationsModuleDevice.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/rpc/item/InventoryOperationsModuleDevice.java rename to src/main/java/li/cil/oc2/common/bus/device/rpc/item/InventoryOperationsModuleDevice.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/rpc/item/RedstoneInterfaceCardItemDevice.java b/src/main/java/li/cil/oc2/common/bus/device/rpc/item/RedstoneInterfaceCardItemDevice.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/rpc/item/RedstoneInterfaceCardItemDevice.java rename to src/main/java/li/cil/oc2/common/bus/device/rpc/item/RedstoneInterfaceCardItemDevice.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/rpc/item/SoundCardItemDevice.java b/src/main/java/li/cil/oc2/common/bus/device/rpc/item/SoundCardItemDevice.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/rpc/item/SoundCardItemDevice.java rename to src/main/java/li/cil/oc2/common/bus/device/rpc/item/SoundCardItemDevice.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/rpc/item/package-info.java b/src/main/java/li/cil/oc2/common/bus/device/rpc/item/package-info.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/rpc/item/package-info.java rename to src/main/java/li/cil/oc2/common/bus/device/rpc/item/package-info.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/rpc/package-info.java b/src/main/java/li/cil/oc2/common/bus/device/rpc/package-info.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/rpc/package-info.java rename to src/main/java/li/cil/oc2/common/bus/device/rpc/package-info.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/util/AbstractDeviceInfo.java b/src/main/java/li/cil/oc2/common/bus/device/util/AbstractDeviceInfo.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/util/AbstractDeviceInfo.java rename to src/main/java/li/cil/oc2/common/bus/device/util/AbstractDeviceInfo.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/util/BlockDeviceInfo.java b/src/main/java/li/cil/oc2/common/bus/device/util/BlockDeviceInfo.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/util/BlockDeviceInfo.java rename to src/main/java/li/cil/oc2/common/bus/device/util/BlockDeviceInfo.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/util/DeviceTypeImpl.java b/src/main/java/li/cil/oc2/common/bus/device/util/DeviceTypeImpl.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/util/DeviceTypeImpl.java rename to src/main/java/li/cil/oc2/common/bus/device/util/DeviceTypeImpl.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/util/Devices.java b/src/main/java/li/cil/oc2/common/bus/device/util/Devices.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/util/Devices.java rename to src/main/java/li/cil/oc2/common/bus/device/util/Devices.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/util/IdentityProxy.java b/src/main/java/li/cil/oc2/common/bus/device/util/IdentityProxy.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/util/IdentityProxy.java rename to src/main/java/li/cil/oc2/common/bus/device/util/IdentityProxy.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/util/ItemDeviceInfo.java b/src/main/java/li/cil/oc2/common/bus/device/util/ItemDeviceInfo.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/util/ItemDeviceInfo.java rename to src/main/java/li/cil/oc2/common/bus/device/util/ItemDeviceInfo.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/util/OptionalAddress.java b/src/main/java/li/cil/oc2/common/bus/device/util/OptionalAddress.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/util/OptionalAddress.java rename to src/main/java/li/cil/oc2/common/bus/device/util/OptionalAddress.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/util/OptionalInterrupt.java b/src/main/java/li/cil/oc2/common/bus/device/util/OptionalInterrupt.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/util/OptionalInterrupt.java rename to src/main/java/li/cil/oc2/common/bus/device/util/OptionalInterrupt.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/util/package-info.java b/src/main/java/li/cil/oc2/common/bus/device/util/package-info.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/util/package-info.java rename to src/main/java/li/cil/oc2/common/bus/device/util/package-info.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/vm/block/DiskDriveContainer.java b/src/main/java/li/cil/oc2/common/bus/device/vm/block/DiskDriveContainer.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/vm/block/DiskDriveContainer.java rename to src/main/java/li/cil/oc2/common/bus/device/vm/block/DiskDriveContainer.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/vm/block/DiskDriveDevice.java b/src/main/java/li/cil/oc2/common/bus/device/vm/block/DiskDriveDevice.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/vm/block/DiskDriveDevice.java rename to src/main/java/li/cil/oc2/common/bus/device/vm/block/DiskDriveDevice.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/vm/block/FlashMemoryFlasherContainer.java b/src/main/java/li/cil/oc2/common/bus/device/vm/block/FlashMemoryFlasherContainer.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/vm/block/FlashMemoryFlasherContainer.java rename to src/main/java/li/cil/oc2/common/bus/device/vm/block/FlashMemoryFlasherContainer.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/vm/block/FlashMemoryFlasherDevice.java b/src/main/java/li/cil/oc2/common/bus/device/vm/block/FlashMemoryFlasherDevice.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/vm/block/FlashMemoryFlasherDevice.java rename to src/main/java/li/cil/oc2/common/bus/device/vm/block/FlashMemoryFlasherDevice.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/vm/block/KeyboardDevice.java b/src/main/java/li/cil/oc2/common/bus/device/vm/block/KeyboardDevice.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/vm/block/KeyboardDevice.java rename to src/main/java/li/cil/oc2/common/bus/device/vm/block/KeyboardDevice.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/vm/block/MonitorDevice.java b/src/main/java/li/cil/oc2/common/bus/device/vm/block/MonitorDevice.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/vm/block/MonitorDevice.java rename to src/main/java/li/cil/oc2/common/bus/device/vm/block/MonitorDevice.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/vm/block/PciCardCageDevice.java b/src/main/java/li/cil/oc2/common/bus/device/vm/block/PciCardCageDevice.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/vm/block/PciCardCageDevice.java rename to src/main/java/li/cil/oc2/common/bus/device/vm/block/PciCardCageDevice.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/vm/block/ProjectorDevice.java b/src/main/java/li/cil/oc2/common/bus/device/vm/block/ProjectorDevice.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/vm/block/ProjectorDevice.java rename to src/main/java/li/cil/oc2/common/bus/device/vm/block/ProjectorDevice.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/vm/block/package-info.java b/src/main/java/li/cil/oc2/common/bus/device/vm/block/package-info.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/vm/block/package-info.java rename to src/main/java/li/cil/oc2/common/bus/device/vm/block/package-info.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/vm/item/AbstractBlockStorageDevice.java b/src/main/java/li/cil/oc2/common/bus/device/vm/item/AbstractBlockStorageDevice.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/vm/item/AbstractBlockStorageDevice.java rename to src/main/java/li/cil/oc2/common/bus/device/vm/item/AbstractBlockStorageDevice.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/vm/item/AbstractNetworkInterfaceDevice.java b/src/main/java/li/cil/oc2/common/bus/device/vm/item/AbstractNetworkInterfaceDevice.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/vm/item/AbstractNetworkInterfaceDevice.java rename to src/main/java/li/cil/oc2/common/bus/device/vm/item/AbstractNetworkInterfaceDevice.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/vm/item/ByteBufferFlashStorageDevice.java b/src/main/java/li/cil/oc2/common/bus/device/vm/item/ByteBufferFlashStorageDevice.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/vm/item/ByteBufferFlashStorageDevice.java rename to src/main/java/li/cil/oc2/common/bus/device/vm/item/ByteBufferFlashStorageDevice.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/vm/item/FirmwareFlashStorageDevice.java b/src/main/java/li/cil/oc2/common/bus/device/vm/item/FirmwareFlashStorageDevice.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/vm/item/FirmwareFlashStorageDevice.java rename to src/main/java/li/cil/oc2/common/bus/device/vm/item/FirmwareFlashStorageDevice.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/vm/item/HardDriveDevice.java b/src/main/java/li/cil/oc2/common/bus/device/vm/item/HardDriveDevice.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/vm/item/HardDriveDevice.java rename to src/main/java/li/cil/oc2/common/bus/device/vm/item/HardDriveDevice.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/vm/item/HardDriveDeviceWithInitialData.java b/src/main/java/li/cil/oc2/common/bus/device/vm/item/HardDriveDeviceWithInitialData.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/vm/item/HardDriveDeviceWithInitialData.java rename to src/main/java/li/cil/oc2/common/bus/device/vm/item/HardDriveDeviceWithInitialData.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/vm/item/MemoryDevice.java b/src/main/java/li/cil/oc2/common/bus/device/vm/item/MemoryDevice.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/vm/item/MemoryDevice.java rename to src/main/java/li/cil/oc2/common/bus/device/vm/item/MemoryDevice.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/vm/item/NetworkInterfaceCardDevice.java b/src/main/java/li/cil/oc2/common/bus/device/vm/item/NetworkInterfaceCardDevice.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/vm/item/NetworkInterfaceCardDevice.java rename to src/main/java/li/cil/oc2/common/bus/device/vm/item/NetworkInterfaceCardDevice.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/vm/item/NetworkTunnelDevice.java b/src/main/java/li/cil/oc2/common/bus/device/vm/item/NetworkTunnelDevice.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/vm/item/NetworkTunnelDevice.java rename to src/main/java/li/cil/oc2/common/bus/device/vm/item/NetworkTunnelDevice.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/vm/item/package-info.java b/src/main/java/li/cil/oc2/common/bus/device/vm/item/package-info.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/vm/item/package-info.java rename to src/main/java/li/cil/oc2/common/bus/device/vm/item/package-info.java diff --git a/src/main/java/li/cil/oc2r/common/bus/device/vm/package-info.java b/src/main/java/li/cil/oc2/common/bus/device/vm/package-info.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/device/vm/package-info.java rename to src/main/java/li/cil/oc2/common/bus/device/vm/package-info.java diff --git a/src/main/java/li/cil/oc2r/common/bus/package-info.java b/src/main/java/li/cil/oc2/common/bus/package-info.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/bus/package-info.java rename to src/main/java/li/cil/oc2/common/bus/package-info.java diff --git a/src/main/java/li/cil/oc2r/common/capabilities/Capabilities.java b/src/main/java/li/cil/oc2/common/capabilities/Capabilities.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/capabilities/Capabilities.java rename to src/main/java/li/cil/oc2/common/capabilities/Capabilities.java diff --git a/src/main/java/li/cil/oc2r/common/capabilities/CapabilityRegistry.java b/src/main/java/li/cil/oc2/common/capabilities/CapabilityRegistry.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/capabilities/CapabilityRegistry.java rename to src/main/java/li/cil/oc2/common/capabilities/CapabilityRegistry.java diff --git a/src/main/java/li/cil/oc2r/common/capabilities/package-info.java b/src/main/java/li/cil/oc2/common/capabilities/package-info.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/capabilities/package-info.java rename to src/main/java/li/cil/oc2/common/capabilities/package-info.java diff --git a/src/main/java/li/cil/oc2r/common/container/AbstractComputerContainer.java b/src/main/java/li/cil/oc2/common/container/AbstractComputerContainer.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/container/AbstractComputerContainer.java rename to src/main/java/li/cil/oc2/common/container/AbstractComputerContainer.java diff --git a/src/main/java/li/cil/oc2r/common/container/AbstractContainer.java b/src/main/java/li/cil/oc2/common/container/AbstractContainer.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/container/AbstractContainer.java rename to src/main/java/li/cil/oc2/common/container/AbstractContainer.java diff --git a/src/main/java/li/cil/oc2r/common/container/AbstractDeviceItemStackHandler.java b/src/main/java/li/cil/oc2/common/container/AbstractDeviceItemStackHandler.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/container/AbstractDeviceItemStackHandler.java rename to src/main/java/li/cil/oc2/common/container/AbstractDeviceItemStackHandler.java diff --git a/src/main/java/li/cil/oc2r/common/container/AbstractMachineContainer.java b/src/main/java/li/cil/oc2/common/container/AbstractMachineContainer.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/container/AbstractMachineContainer.java rename to src/main/java/li/cil/oc2/common/container/AbstractMachineContainer.java diff --git a/src/main/java/li/cil/oc2r/common/container/AbstractMachineTerminalContainer.java b/src/main/java/li/cil/oc2/common/container/AbstractMachineTerminalContainer.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/container/AbstractMachineTerminalContainer.java rename to src/main/java/li/cil/oc2/common/container/AbstractMachineTerminalContainer.java diff --git a/src/main/java/li/cil/oc2r/common/container/AbstractMonitorContainer.java b/src/main/java/li/cil/oc2/common/container/AbstractMonitorContainer.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/container/AbstractMonitorContainer.java rename to src/main/java/li/cil/oc2/common/container/AbstractMonitorContainer.java diff --git a/src/main/java/li/cil/oc2r/common/container/AbstractRobotContainer.java b/src/main/java/li/cil/oc2/common/container/AbstractRobotContainer.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/container/AbstractRobotContainer.java rename to src/main/java/li/cil/oc2/common/container/AbstractRobotContainer.java diff --git a/src/main/java/li/cil/oc2r/common/container/AbstractTypedDeviceItemStackHandler.java b/src/main/java/li/cil/oc2/common/container/AbstractTypedDeviceItemStackHandler.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/container/AbstractTypedDeviceItemStackHandler.java rename to src/main/java/li/cil/oc2/common/container/AbstractTypedDeviceItemStackHandler.java diff --git a/src/main/java/li/cil/oc2r/common/container/ComputerInventoryContainer.java b/src/main/java/li/cil/oc2/common/container/ComputerInventoryContainer.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/container/ComputerInventoryContainer.java rename to src/main/java/li/cil/oc2/common/container/ComputerInventoryContainer.java diff --git a/src/main/java/li/cil/oc2r/common/container/ComputerTerminalContainer.java b/src/main/java/li/cil/oc2/common/container/ComputerTerminalContainer.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/container/ComputerTerminalContainer.java rename to src/main/java/li/cil/oc2/common/container/ComputerTerminalContainer.java diff --git a/src/main/java/li/cil/oc2r/common/container/Containers.java b/src/main/java/li/cil/oc2/common/container/Containers.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/container/Containers.java rename to src/main/java/li/cil/oc2/common/container/Containers.java diff --git a/src/main/java/li/cil/oc2r/common/container/DeviceTypeSlot.java b/src/main/java/li/cil/oc2/common/container/DeviceTypeSlot.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/container/DeviceTypeSlot.java rename to src/main/java/li/cil/oc2/common/container/DeviceTypeSlot.java diff --git a/src/main/java/li/cil/oc2r/common/container/DeviceTypeSlotItemHandler.java b/src/main/java/li/cil/oc2/common/container/DeviceTypeSlotItemHandler.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/container/DeviceTypeSlotItemHandler.java rename to src/main/java/li/cil/oc2/common/container/DeviceTypeSlotItemHandler.java diff --git a/src/main/java/li/cil/oc2r/common/container/FixedSizeItemStackHandler.java b/src/main/java/li/cil/oc2/common/container/FixedSizeItemStackHandler.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/container/FixedSizeItemStackHandler.java rename to src/main/java/li/cil/oc2/common/container/FixedSizeItemStackHandler.java diff --git a/src/main/java/li/cil/oc2r/common/container/IntPrecisionContainerData.java b/src/main/java/li/cil/oc2/common/container/IntPrecisionContainerData.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/container/IntPrecisionContainerData.java rename to src/main/java/li/cil/oc2/common/container/IntPrecisionContainerData.java diff --git a/src/main/java/li/cil/oc2r/common/container/LockedSlot.java b/src/main/java/li/cil/oc2/common/container/LockedSlot.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/container/LockedSlot.java rename to src/main/java/li/cil/oc2/common/container/LockedSlot.java diff --git a/src/main/java/li/cil/oc2r/common/container/MonitorDisplayContainer.java b/src/main/java/li/cil/oc2/common/container/MonitorDisplayContainer.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/container/MonitorDisplayContainer.java rename to src/main/java/li/cil/oc2/common/container/MonitorDisplayContainer.java diff --git a/src/main/java/li/cil/oc2r/common/container/NetworkTunnelContainer.java b/src/main/java/li/cil/oc2/common/container/NetworkTunnelContainer.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/container/NetworkTunnelContainer.java rename to src/main/java/li/cil/oc2/common/container/NetworkTunnelContainer.java diff --git a/src/main/java/li/cil/oc2r/common/container/RobotInventoryContainer.java b/src/main/java/li/cil/oc2/common/container/RobotInventoryContainer.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/container/RobotInventoryContainer.java rename to src/main/java/li/cil/oc2/common/container/RobotInventoryContainer.java diff --git a/src/main/java/li/cil/oc2r/common/container/RobotSlot.java b/src/main/java/li/cil/oc2/common/container/RobotSlot.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/container/RobotSlot.java rename to src/main/java/li/cil/oc2/common/container/RobotSlot.java diff --git a/src/main/java/li/cil/oc2r/common/container/RobotTerminalContainer.java b/src/main/java/li/cil/oc2/common/container/RobotTerminalContainer.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/container/RobotTerminalContainer.java rename to src/main/java/li/cil/oc2/common/container/RobotTerminalContainer.java diff --git a/src/main/java/li/cil/oc2r/common/container/TypedItemStackHandler.java b/src/main/java/li/cil/oc2/common/container/TypedItemStackHandler.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/container/TypedItemStackHandler.java rename to src/main/java/li/cil/oc2/common/container/TypedItemStackHandler.java diff --git a/src/main/java/li/cil/oc2r/common/container/package-info.java b/src/main/java/li/cil/oc2/common/container/package-info.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/container/package-info.java rename to src/main/java/li/cil/oc2/common/container/package-info.java diff --git a/src/main/java/li/cil/oc2r/common/energy/EnergyStorageItemStack.java b/src/main/java/li/cil/oc2/common/energy/EnergyStorageItemStack.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/energy/EnergyStorageItemStack.java rename to src/main/java/li/cil/oc2/common/energy/EnergyStorageItemStack.java diff --git a/src/main/java/li/cil/oc2r/common/energy/FixedEnergyStorage.java b/src/main/java/li/cil/oc2/common/energy/FixedEnergyStorage.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/energy/FixedEnergyStorage.java rename to src/main/java/li/cil/oc2/common/energy/FixedEnergyStorage.java diff --git a/src/main/java/li/cil/oc2r/common/energy/package-info.java b/src/main/java/li/cil/oc2/common/energy/package-info.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/energy/package-info.java rename to src/main/java/li/cil/oc2/common/energy/package-info.java diff --git a/src/main/java/li/cil/oc2r/common/entity/Entities.java b/src/main/java/li/cil/oc2/common/entity/Entities.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/entity/Entities.java rename to src/main/java/li/cil/oc2/common/entity/Entities.java diff --git a/src/main/java/li/cil/oc2r/common/entity/Robot.java b/src/main/java/li/cil/oc2/common/entity/Robot.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/entity/Robot.java rename to src/main/java/li/cil/oc2/common/entity/Robot.java diff --git a/src/main/java/li/cil/oc2r/common/entity/package-info.java b/src/main/java/li/cil/oc2/common/entity/package-info.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/entity/package-info.java rename to src/main/java/li/cil/oc2/common/entity/package-info.java diff --git a/src/main/java/li/cil/oc2r/common/entity/robot/AbstractRobotAction.java b/src/main/java/li/cil/oc2/common/entity/robot/AbstractRobotAction.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/entity/robot/AbstractRobotAction.java rename to src/main/java/li/cil/oc2/common/entity/robot/AbstractRobotAction.java diff --git a/src/main/java/li/cil/oc2r/common/entity/robot/AbstractRobotActionType.java b/src/main/java/li/cil/oc2/common/entity/robot/AbstractRobotActionType.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/entity/robot/AbstractRobotActionType.java rename to src/main/java/li/cil/oc2/common/entity/robot/AbstractRobotActionType.java diff --git a/src/main/java/li/cil/oc2r/common/entity/robot/MovementDirection.java b/src/main/java/li/cil/oc2/common/entity/robot/MovementDirection.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/entity/robot/MovementDirection.java rename to src/main/java/li/cil/oc2/common/entity/robot/MovementDirection.java diff --git a/src/main/java/li/cil/oc2r/common/entity/robot/RobotActionResult.java b/src/main/java/li/cil/oc2/common/entity/robot/RobotActionResult.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/entity/robot/RobotActionResult.java rename to src/main/java/li/cil/oc2/common/entity/robot/RobotActionResult.java diff --git a/src/main/java/li/cil/oc2r/common/entity/robot/RobotActions.java b/src/main/java/li/cil/oc2/common/entity/robot/RobotActions.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/entity/robot/RobotActions.java rename to src/main/java/li/cil/oc2/common/entity/robot/RobotActions.java diff --git a/src/main/java/li/cil/oc2r/common/entity/robot/RobotMovementAction.java b/src/main/java/li/cil/oc2/common/entity/robot/RobotMovementAction.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/entity/robot/RobotMovementAction.java rename to src/main/java/li/cil/oc2/common/entity/robot/RobotMovementAction.java diff --git a/src/main/java/li/cil/oc2r/common/entity/robot/RobotMovementActionType.java b/src/main/java/li/cil/oc2/common/entity/robot/RobotMovementActionType.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/entity/robot/RobotMovementActionType.java rename to src/main/java/li/cil/oc2/common/entity/robot/RobotMovementActionType.java diff --git a/src/main/java/li/cil/oc2r/common/entity/robot/RobotRotationAction.java b/src/main/java/li/cil/oc2/common/entity/robot/RobotRotationAction.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/entity/robot/RobotRotationAction.java rename to src/main/java/li/cil/oc2/common/entity/robot/RobotRotationAction.java diff --git a/src/main/java/li/cil/oc2r/common/entity/robot/RobotRotationActionType.java b/src/main/java/li/cil/oc2/common/entity/robot/RobotRotationActionType.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/entity/robot/RobotRotationActionType.java rename to src/main/java/li/cil/oc2/common/entity/robot/RobotRotationActionType.java diff --git a/src/main/java/li/cil/oc2r/common/entity/robot/RotationDirection.java b/src/main/java/li/cil/oc2/common/entity/robot/RotationDirection.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/entity/robot/RotationDirection.java rename to src/main/java/li/cil/oc2/common/entity/robot/RotationDirection.java diff --git a/src/main/java/li/cil/oc2r/common/entity/robot/package-info.java b/src/main/java/li/cil/oc2/common/entity/robot/package-info.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/entity/robot/package-info.java rename to src/main/java/li/cil/oc2/common/entity/robot/package-info.java diff --git a/src/main/java/li/cil/oc2r/common/ext/MinecraftExt.java b/src/main/java/li/cil/oc2/common/ext/MinecraftExt.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/ext/MinecraftExt.java rename to src/main/java/li/cil/oc2/common/ext/MinecraftExt.java diff --git a/src/main/java/li/cil/oc2r/common/ext/package-info.java b/src/main/java/li/cil/oc2/common/ext/package-info.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/ext/package-info.java rename to src/main/java/li/cil/oc2/common/ext/package-info.java diff --git a/src/main/java/li/cil/oc2r/common/integration/IMC.java b/src/main/java/li/cil/oc2/common/integration/IMC.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/integration/IMC.java rename to src/main/java/li/cil/oc2/common/integration/IMC.java diff --git a/src/main/java/li/cil/oc2r/common/integration/Integrations.java b/src/main/java/li/cil/oc2/common/integration/Integrations.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/integration/Integrations.java rename to src/main/java/li/cil/oc2/common/integration/Integrations.java diff --git a/src/main/java/li/cil/oc2r/common/integration/Wrenches.java b/src/main/java/li/cil/oc2/common/integration/Wrenches.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/integration/Wrenches.java rename to src/main/java/li/cil/oc2/common/integration/Wrenches.java diff --git a/src/main/java/li/cil/oc2r/common/integration/jei/ExtraGuiAreasJEIPlugin.java b/src/main/java/li/cil/oc2/common/integration/jei/ExtraGuiAreasJEIPlugin.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/integration/jei/ExtraGuiAreasJEIPlugin.java rename to src/main/java/li/cil/oc2/common/integration/jei/ExtraGuiAreasJEIPlugin.java diff --git a/src/main/java/li/cil/oc2r/common/integration/jei/ExtraItemsJEIPlugin.java b/src/main/java/li/cil/oc2/common/integration/jei/ExtraItemsJEIPlugin.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/integration/jei/ExtraItemsJEIPlugin.java rename to src/main/java/li/cil/oc2/common/integration/jei/ExtraItemsJEIPlugin.java diff --git a/src/main/java/li/cil/oc2r/common/integration/jei/package-info.java b/src/main/java/li/cil/oc2/common/integration/jei/package-info.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/integration/jei/package-info.java rename to src/main/java/li/cil/oc2/common/integration/jei/package-info.java diff --git a/src/main/java/li/cil/oc2r/common/integration/package-info.java b/src/main/java/li/cil/oc2/common/integration/package-info.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/integration/package-info.java rename to src/main/java/li/cil/oc2/common/integration/package-info.java diff --git a/src/main/java/li/cil/oc2r/common/integration/projectred/BundledCableHandler.java b/src/main/java/li/cil/oc2/common/integration/projectred/BundledCableHandler.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/integration/projectred/BundledCableHandler.java rename to src/main/java/li/cil/oc2/common/integration/projectred/BundledCableHandler.java diff --git a/src/main/java/li/cil/oc2r/common/integration/util/BundledRedstone.java b/src/main/java/li/cil/oc2/common/integration/util/BundledRedstone.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/integration/util/BundledRedstone.java rename to src/main/java/li/cil/oc2/common/integration/util/BundledRedstone.java diff --git a/src/main/java/li/cil/oc2r/common/item/AbstractBlockDeviceItem.java b/src/main/java/li/cil/oc2/common/item/AbstractBlockDeviceItem.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/item/AbstractBlockDeviceItem.java rename to src/main/java/li/cil/oc2/common/item/AbstractBlockDeviceItem.java diff --git a/src/main/java/li/cil/oc2r/common/item/AbstractStorageItem.java b/src/main/java/li/cil/oc2/common/item/AbstractStorageItem.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/item/AbstractStorageItem.java rename to src/main/java/li/cil/oc2/common/item/AbstractStorageItem.java diff --git a/src/main/java/li/cil/oc2r/common/item/BlockOperationsModule.java b/src/main/java/li/cil/oc2/common/item/BlockOperationsModule.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/item/BlockOperationsModule.java rename to src/main/java/li/cil/oc2/common/item/BlockOperationsModule.java diff --git a/src/main/java/li/cil/oc2r/common/item/BusCableItem.java b/src/main/java/li/cil/oc2/common/item/BusCableItem.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/item/BusCableItem.java rename to src/main/java/li/cil/oc2/common/item/BusCableItem.java diff --git a/src/main/java/li/cil/oc2r/common/item/BusInterfaceItem.java b/src/main/java/li/cil/oc2/common/item/BusInterfaceItem.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/item/BusInterfaceItem.java rename to src/main/java/li/cil/oc2/common/item/BusInterfaceItem.java diff --git a/src/main/java/li/cil/oc2r/common/item/CPUItem.java b/src/main/java/li/cil/oc2/common/item/CPUItem.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/item/CPUItem.java rename to src/main/java/li/cil/oc2/common/item/CPUItem.java diff --git a/src/main/java/li/cil/oc2r/common/item/ChargerItem.java b/src/main/java/li/cil/oc2/common/item/ChargerItem.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/item/ChargerItem.java rename to src/main/java/li/cil/oc2/common/item/ChargerItem.java diff --git a/src/main/java/li/cil/oc2r/common/item/FlashMemoryItem.java b/src/main/java/li/cil/oc2/common/item/FlashMemoryItem.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/item/FlashMemoryItem.java rename to src/main/java/li/cil/oc2/common/item/FlashMemoryItem.java diff --git a/src/main/java/li/cil/oc2r/common/item/FlashMemoryWithExternalDataItem.java b/src/main/java/li/cil/oc2/common/item/FlashMemoryWithExternalDataItem.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/item/FlashMemoryWithExternalDataItem.java rename to src/main/java/li/cil/oc2/common/item/FlashMemoryWithExternalDataItem.java diff --git a/src/main/java/li/cil/oc2r/common/item/FloppyItem.java b/src/main/java/li/cil/oc2/common/item/FloppyItem.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/item/FloppyItem.java rename to src/main/java/li/cil/oc2/common/item/FloppyItem.java diff --git a/src/main/java/li/cil/oc2r/common/item/HardDriveItem.java b/src/main/java/li/cil/oc2/common/item/HardDriveItem.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/item/HardDriveItem.java rename to src/main/java/li/cil/oc2/common/item/HardDriveItem.java diff --git a/src/main/java/li/cil/oc2r/common/item/HardDriveWithExternalDataItem.java b/src/main/java/li/cil/oc2/common/item/HardDriveWithExternalDataItem.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/item/HardDriveWithExternalDataItem.java rename to src/main/java/li/cil/oc2/common/item/HardDriveWithExternalDataItem.java diff --git a/src/main/java/li/cil/oc2r/common/item/ItemGroup.java b/src/main/java/li/cil/oc2/common/item/ItemGroup.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/item/ItemGroup.java rename to src/main/java/li/cil/oc2/common/item/ItemGroup.java diff --git a/src/main/java/li/cil/oc2r/common/item/ItemRenameHandler.java b/src/main/java/li/cil/oc2/common/item/ItemRenameHandler.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/item/ItemRenameHandler.java rename to src/main/java/li/cil/oc2/common/item/ItemRenameHandler.java diff --git a/src/main/java/li/cil/oc2r/common/item/Items.java b/src/main/java/li/cil/oc2/common/item/Items.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/item/Items.java rename to src/main/java/li/cil/oc2/common/item/Items.java diff --git a/src/main/java/li/cil/oc2r/common/item/ManualItem.java b/src/main/java/li/cil/oc2/common/item/ManualItem.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/item/ManualItem.java rename to src/main/java/li/cil/oc2/common/item/ManualItem.java diff --git a/src/main/java/li/cil/oc2r/common/item/MemoryItem.java b/src/main/java/li/cil/oc2/common/item/MemoryItem.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/item/MemoryItem.java rename to src/main/java/li/cil/oc2/common/item/MemoryItem.java diff --git a/src/main/java/li/cil/oc2r/common/item/ModBlockItem.java b/src/main/java/li/cil/oc2/common/item/ModBlockItem.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/item/ModBlockItem.java rename to src/main/java/li/cil/oc2/common/item/ModBlockItem.java diff --git a/src/main/java/li/cil/oc2r/common/item/ModItem.java b/src/main/java/li/cil/oc2/common/item/ModItem.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/item/ModItem.java rename to src/main/java/li/cil/oc2/common/item/ModItem.java diff --git a/src/main/java/li/cil/oc2r/common/item/NetworkCableItem.java b/src/main/java/li/cil/oc2/common/item/NetworkCableItem.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/item/NetworkCableItem.java rename to src/main/java/li/cil/oc2/common/item/NetworkCableItem.java diff --git a/src/main/java/li/cil/oc2r/common/item/NetworkInterfaceCardItem.java b/src/main/java/li/cil/oc2/common/item/NetworkInterfaceCardItem.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/item/NetworkInterfaceCardItem.java rename to src/main/java/li/cil/oc2/common/item/NetworkInterfaceCardItem.java diff --git a/src/main/java/li/cil/oc2r/common/item/NetworkTunnelItem.java b/src/main/java/li/cil/oc2/common/item/NetworkTunnelItem.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/item/NetworkTunnelItem.java rename to src/main/java/li/cil/oc2/common/item/NetworkTunnelItem.java diff --git a/src/main/java/li/cil/oc2r/common/item/RobotItem.java b/src/main/java/li/cil/oc2/common/item/RobotItem.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/item/RobotItem.java rename to src/main/java/li/cil/oc2/common/item/RobotItem.java diff --git a/src/main/java/li/cil/oc2r/common/item/WrenchItem.java b/src/main/java/li/cil/oc2/common/item/WrenchItem.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/item/WrenchItem.java rename to src/main/java/li/cil/oc2/common/item/WrenchItem.java diff --git a/src/main/java/li/cil/oc2r/common/item/crafting/RecipeSerializers.java b/src/main/java/li/cil/oc2/common/item/crafting/RecipeSerializers.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/item/crafting/RecipeSerializers.java rename to src/main/java/li/cil/oc2/common/item/crafting/RecipeSerializers.java diff --git a/src/main/java/li/cil/oc2r/common/item/crafting/WrenchRecipe.java b/src/main/java/li/cil/oc2/common/item/crafting/WrenchRecipe.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/item/crafting/WrenchRecipe.java rename to src/main/java/li/cil/oc2/common/item/crafting/WrenchRecipe.java diff --git a/src/main/java/li/cil/oc2r/common/item/crafting/package-info.java b/src/main/java/li/cil/oc2/common/item/crafting/package-info.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/item/crafting/package-info.java rename to src/main/java/li/cil/oc2/common/item/crafting/package-info.java diff --git a/src/main/java/li/cil/oc2r/common/item/package-info.java b/src/main/java/li/cil/oc2/common/item/package-info.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/item/package-info.java rename to src/main/java/li/cil/oc2/common/item/package-info.java diff --git a/src/main/java/li/cil/oc2r/common/mixin/FrustumMixin.java b/src/main/java/li/cil/oc2/common/mixin/FrustumMixin.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/mixin/FrustumMixin.java rename to src/main/java/li/cil/oc2/common/mixin/FrustumMixin.java diff --git a/src/main/java/li/cil/oc2r/common/mixin/LevelRendererMixin.java b/src/main/java/li/cil/oc2/common/mixin/LevelRendererMixin.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/mixin/LevelRendererMixin.java rename to src/main/java/li/cil/oc2/common/mixin/LevelRendererMixin.java diff --git a/src/main/java/li/cil/oc2r/common/mixin/MinecraftMixin.java b/src/main/java/li/cil/oc2/common/mixin/MinecraftMixin.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/mixin/MinecraftMixin.java rename to src/main/java/li/cil/oc2/common/mixin/MinecraftMixin.java diff --git a/src/main/java/li/cil/oc2r/common/mixin/ServerChunkCacheMixin.java b/src/main/java/li/cil/oc2/common/mixin/ServerChunkCacheMixin.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/mixin/ServerChunkCacheMixin.java rename to src/main/java/li/cil/oc2/common/mixin/ServerChunkCacheMixin.java diff --git a/src/main/java/li/cil/oc2r/common/mixin/package-info.java b/src/main/java/li/cil/oc2/common/mixin/package-info.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/mixin/package-info.java rename to src/main/java/li/cil/oc2/common/mixin/package-info.java diff --git a/src/main/java/li/cil/oc2r/common/network/MessageUtils.java b/src/main/java/li/cil/oc2/common/network/MessageUtils.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/network/MessageUtils.java rename to src/main/java/li/cil/oc2/common/network/MessageUtils.java diff --git a/src/main/java/li/cil/oc2r/common/network/MonitorLoadBalancer.java b/src/main/java/li/cil/oc2/common/network/MonitorLoadBalancer.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/network/MonitorLoadBalancer.java rename to src/main/java/li/cil/oc2/common/network/MonitorLoadBalancer.java diff --git a/src/main/java/li/cil/oc2r/common/network/Network.java b/src/main/java/li/cil/oc2/common/network/Network.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/network/Network.java rename to src/main/java/li/cil/oc2/common/network/Network.java diff --git a/src/main/java/li/cil/oc2r/common/network/ProjectorLoadBalancer.java b/src/main/java/li/cil/oc2/common/network/ProjectorLoadBalancer.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/network/ProjectorLoadBalancer.java rename to src/main/java/li/cil/oc2/common/network/ProjectorLoadBalancer.java diff --git a/src/main/java/li/cil/oc2r/common/network/message/AbstractMessage.java b/src/main/java/li/cil/oc2/common/network/message/AbstractMessage.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/network/message/AbstractMessage.java rename to src/main/java/li/cil/oc2/common/network/message/AbstractMessage.java diff --git a/src/main/java/li/cil/oc2r/common/network/message/AbstractTerminalBlockMessage.java b/src/main/java/li/cil/oc2/common/network/message/AbstractTerminalBlockMessage.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/network/message/AbstractTerminalBlockMessage.java rename to src/main/java/li/cil/oc2/common/network/message/AbstractTerminalBlockMessage.java diff --git a/src/main/java/li/cil/oc2r/common/network/message/AbstractTerminalEntityMessage.java b/src/main/java/li/cil/oc2/common/network/message/AbstractTerminalEntityMessage.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/network/message/AbstractTerminalEntityMessage.java rename to src/main/java/li/cil/oc2/common/network/message/AbstractTerminalEntityMessage.java diff --git a/src/main/java/li/cil/oc2r/common/network/message/BusCableFacadeMessage.java b/src/main/java/li/cil/oc2/common/network/message/BusCableFacadeMessage.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/network/message/BusCableFacadeMessage.java rename to src/main/java/li/cil/oc2/common/network/message/BusCableFacadeMessage.java diff --git a/src/main/java/li/cil/oc2r/common/network/message/BusInterfaceNameMessage.java b/src/main/java/li/cil/oc2/common/network/message/BusInterfaceNameMessage.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/network/message/BusInterfaceNameMessage.java rename to src/main/java/li/cil/oc2/common/network/message/BusInterfaceNameMessage.java diff --git a/src/main/java/li/cil/oc2r/common/network/message/ClientCanceledImportFileMessage.java b/src/main/java/li/cil/oc2/common/network/message/ClientCanceledImportFileMessage.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/network/message/ClientCanceledImportFileMessage.java rename to src/main/java/li/cil/oc2/common/network/message/ClientCanceledImportFileMessage.java diff --git a/src/main/java/li/cil/oc2r/common/network/message/ComputerBootErrorMessage.java b/src/main/java/li/cil/oc2/common/network/message/ComputerBootErrorMessage.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/network/message/ComputerBootErrorMessage.java rename to src/main/java/li/cil/oc2/common/network/message/ComputerBootErrorMessage.java diff --git a/src/main/java/li/cil/oc2r/common/network/message/ComputerBusStateMessage.java b/src/main/java/li/cil/oc2/common/network/message/ComputerBusStateMessage.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/network/message/ComputerBusStateMessage.java rename to src/main/java/li/cil/oc2/common/network/message/ComputerBusStateMessage.java diff --git a/src/main/java/li/cil/oc2r/common/network/message/ComputerPowerMessage.java b/src/main/java/li/cil/oc2/common/network/message/ComputerPowerMessage.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/network/message/ComputerPowerMessage.java rename to src/main/java/li/cil/oc2/common/network/message/ComputerPowerMessage.java diff --git a/src/main/java/li/cil/oc2r/common/network/message/ComputerRunStateMessage.java b/src/main/java/li/cil/oc2/common/network/message/ComputerRunStateMessage.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/network/message/ComputerRunStateMessage.java rename to src/main/java/li/cil/oc2/common/network/message/ComputerRunStateMessage.java diff --git a/src/main/java/li/cil/oc2r/common/network/message/ComputerTerminalInputMessage.java b/src/main/java/li/cil/oc2/common/network/message/ComputerTerminalInputMessage.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/network/message/ComputerTerminalInputMessage.java rename to src/main/java/li/cil/oc2/common/network/message/ComputerTerminalInputMessage.java diff --git a/src/main/java/li/cil/oc2r/common/network/message/ComputerTerminalOutputMessage.java b/src/main/java/li/cil/oc2/common/network/message/ComputerTerminalOutputMessage.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/network/message/ComputerTerminalOutputMessage.java rename to src/main/java/li/cil/oc2/common/network/message/ComputerTerminalOutputMessage.java diff --git a/src/main/java/li/cil/oc2r/common/network/message/DiskDriveFloppyMessage.java b/src/main/java/li/cil/oc2/common/network/message/DiskDriveFloppyMessage.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/network/message/DiskDriveFloppyMessage.java rename to src/main/java/li/cil/oc2/common/network/message/DiskDriveFloppyMessage.java diff --git a/src/main/java/li/cil/oc2r/common/network/message/ExportedFileMessage.java b/src/main/java/li/cil/oc2/common/network/message/ExportedFileMessage.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/network/message/ExportedFileMessage.java rename to src/main/java/li/cil/oc2/common/network/message/ExportedFileMessage.java diff --git a/src/main/java/li/cil/oc2r/common/network/message/FirmwareFlasherMessage.java b/src/main/java/li/cil/oc2/common/network/message/FirmwareFlasherMessage.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/network/message/FirmwareFlasherMessage.java rename to src/main/java/li/cil/oc2/common/network/message/FirmwareFlasherMessage.java diff --git a/src/main/java/li/cil/oc2r/common/network/message/ImportedFileMessage.java b/src/main/java/li/cil/oc2/common/network/message/ImportedFileMessage.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/network/message/ImportedFileMessage.java rename to src/main/java/li/cil/oc2/common/network/message/ImportedFileMessage.java diff --git a/src/main/java/li/cil/oc2r/common/network/message/KeyboardInputMessage.java b/src/main/java/li/cil/oc2/common/network/message/KeyboardInputMessage.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/network/message/KeyboardInputMessage.java rename to src/main/java/li/cil/oc2/common/network/message/KeyboardInputMessage.java diff --git a/src/main/java/li/cil/oc2r/common/network/message/MonitorFramebufferMessage.java b/src/main/java/li/cil/oc2/common/network/message/MonitorFramebufferMessage.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/network/message/MonitorFramebufferMessage.java rename to src/main/java/li/cil/oc2/common/network/message/MonitorFramebufferMessage.java diff --git a/src/main/java/li/cil/oc2r/common/network/message/MonitorInputMessage.java b/src/main/java/li/cil/oc2/common/network/message/MonitorInputMessage.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/network/message/MonitorInputMessage.java rename to src/main/java/li/cil/oc2/common/network/message/MonitorInputMessage.java diff --git a/src/main/java/li/cil/oc2r/common/network/message/MonitorPowerMessage.java b/src/main/java/li/cil/oc2/common/network/message/MonitorPowerMessage.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/network/message/MonitorPowerMessage.java rename to src/main/java/li/cil/oc2/common/network/message/MonitorPowerMessage.java diff --git a/src/main/java/li/cil/oc2r/common/network/message/MonitorPowerMessageForwarded.java b/src/main/java/li/cil/oc2/common/network/message/MonitorPowerMessageForwarded.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/network/message/MonitorPowerMessageForwarded.java rename to src/main/java/li/cil/oc2/common/network/message/MonitorPowerMessageForwarded.java diff --git a/src/main/java/li/cil/oc2r/common/network/message/MonitorRequestFramebufferMessage.java b/src/main/java/li/cil/oc2/common/network/message/MonitorRequestFramebufferMessage.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/network/message/MonitorRequestFramebufferMessage.java rename to src/main/java/li/cil/oc2/common/network/message/MonitorRequestFramebufferMessage.java diff --git a/src/main/java/li/cil/oc2r/common/network/message/MonitorStateMessage.java b/src/main/java/li/cil/oc2/common/network/message/MonitorStateMessage.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/network/message/MonitorStateMessage.java rename to src/main/java/li/cil/oc2/common/network/message/MonitorStateMessage.java diff --git a/src/main/java/li/cil/oc2r/common/network/message/MultipartMessage.java b/src/main/java/li/cil/oc2/common/network/message/MultipartMessage.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/network/message/MultipartMessage.java rename to src/main/java/li/cil/oc2/common/network/message/MultipartMessage.java diff --git a/src/main/java/li/cil/oc2r/common/network/message/NetworkConnectorConnectionsMessage.java b/src/main/java/li/cil/oc2/common/network/message/NetworkConnectorConnectionsMessage.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/network/message/NetworkConnectorConnectionsMessage.java rename to src/main/java/li/cil/oc2/common/network/message/NetworkConnectorConnectionsMessage.java diff --git a/src/main/java/li/cil/oc2r/common/network/message/NetworkInterfaceCardConfigurationMessage.java b/src/main/java/li/cil/oc2/common/network/message/NetworkInterfaceCardConfigurationMessage.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/network/message/NetworkInterfaceCardConfigurationMessage.java rename to src/main/java/li/cil/oc2/common/network/message/NetworkInterfaceCardConfigurationMessage.java diff --git a/src/main/java/li/cil/oc2r/common/network/message/NetworkTunnelLinkMessage.java b/src/main/java/li/cil/oc2/common/network/message/NetworkTunnelLinkMessage.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/network/message/NetworkTunnelLinkMessage.java rename to src/main/java/li/cil/oc2/common/network/message/NetworkTunnelLinkMessage.java diff --git a/src/main/java/li/cil/oc2r/common/network/message/OpenComputerInventoryMessage.java b/src/main/java/li/cil/oc2/common/network/message/OpenComputerInventoryMessage.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/network/message/OpenComputerInventoryMessage.java rename to src/main/java/li/cil/oc2/common/network/message/OpenComputerInventoryMessage.java diff --git a/src/main/java/li/cil/oc2r/common/network/message/OpenComputerTerminalMessage.java b/src/main/java/li/cil/oc2/common/network/message/OpenComputerTerminalMessage.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/network/message/OpenComputerTerminalMessage.java rename to src/main/java/li/cil/oc2/common/network/message/OpenComputerTerminalMessage.java diff --git a/src/main/java/li/cil/oc2r/common/network/message/OpenRobotInventoryMessage.java b/src/main/java/li/cil/oc2/common/network/message/OpenRobotInventoryMessage.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/network/message/OpenRobotInventoryMessage.java rename to src/main/java/li/cil/oc2/common/network/message/OpenRobotInventoryMessage.java diff --git a/src/main/java/li/cil/oc2r/common/network/message/OpenRobotTerminalMessage.java b/src/main/java/li/cil/oc2/common/network/message/OpenRobotTerminalMessage.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/network/message/OpenRobotTerminalMessage.java rename to src/main/java/li/cil/oc2/common/network/message/OpenRobotTerminalMessage.java diff --git a/src/main/java/li/cil/oc2r/common/network/message/ProjectorFramebufferMessage.java b/src/main/java/li/cil/oc2/common/network/message/ProjectorFramebufferMessage.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/network/message/ProjectorFramebufferMessage.java rename to src/main/java/li/cil/oc2/common/network/message/ProjectorFramebufferMessage.java diff --git a/src/main/java/li/cil/oc2r/common/network/message/ProjectorRequestFramebufferMessage.java b/src/main/java/li/cil/oc2/common/network/message/ProjectorRequestFramebufferMessage.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/network/message/ProjectorRequestFramebufferMessage.java rename to src/main/java/li/cil/oc2/common/network/message/ProjectorRequestFramebufferMessage.java diff --git a/src/main/java/li/cil/oc2r/common/network/message/ProjectorStateMessage.java b/src/main/java/li/cil/oc2/common/network/message/ProjectorStateMessage.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/network/message/ProjectorStateMessage.java rename to src/main/java/li/cil/oc2/common/network/message/ProjectorStateMessage.java diff --git a/src/main/java/li/cil/oc2r/common/network/message/RequestImportedFileMessage.java b/src/main/java/li/cil/oc2/common/network/message/RequestImportedFileMessage.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/network/message/RequestImportedFileMessage.java rename to src/main/java/li/cil/oc2/common/network/message/RequestImportedFileMessage.java diff --git a/src/main/java/li/cil/oc2r/common/network/message/RobotBootErrorMessage.java b/src/main/java/li/cil/oc2/common/network/message/RobotBootErrorMessage.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/network/message/RobotBootErrorMessage.java rename to src/main/java/li/cil/oc2/common/network/message/RobotBootErrorMessage.java diff --git a/src/main/java/li/cil/oc2r/common/network/message/RobotBusStateMessage.java b/src/main/java/li/cil/oc2/common/network/message/RobotBusStateMessage.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/network/message/RobotBusStateMessage.java rename to src/main/java/li/cil/oc2/common/network/message/RobotBusStateMessage.java diff --git a/src/main/java/li/cil/oc2r/common/network/message/RobotInitializationMessage.java b/src/main/java/li/cil/oc2/common/network/message/RobotInitializationMessage.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/network/message/RobotInitializationMessage.java rename to src/main/java/li/cil/oc2/common/network/message/RobotInitializationMessage.java diff --git a/src/main/java/li/cil/oc2r/common/network/message/RobotInitializationRequestMessage.java b/src/main/java/li/cil/oc2/common/network/message/RobotInitializationRequestMessage.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/network/message/RobotInitializationRequestMessage.java rename to src/main/java/li/cil/oc2/common/network/message/RobotInitializationRequestMessage.java diff --git a/src/main/java/li/cil/oc2r/common/network/message/RobotPowerMessage.java b/src/main/java/li/cil/oc2/common/network/message/RobotPowerMessage.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/network/message/RobotPowerMessage.java rename to src/main/java/li/cil/oc2/common/network/message/RobotPowerMessage.java diff --git a/src/main/java/li/cil/oc2r/common/network/message/RobotRunStateMessage.java b/src/main/java/li/cil/oc2/common/network/message/RobotRunStateMessage.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/network/message/RobotRunStateMessage.java rename to src/main/java/li/cil/oc2/common/network/message/RobotRunStateMessage.java diff --git a/src/main/java/li/cil/oc2r/common/network/message/RobotTerminalInputMessage.java b/src/main/java/li/cil/oc2/common/network/message/RobotTerminalInputMessage.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/network/message/RobotTerminalInputMessage.java rename to src/main/java/li/cil/oc2/common/network/message/RobotTerminalInputMessage.java diff --git a/src/main/java/li/cil/oc2r/common/network/message/RobotTerminalOutputMessage.java b/src/main/java/li/cil/oc2/common/network/message/RobotTerminalOutputMessage.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/network/message/RobotTerminalOutputMessage.java rename to src/main/java/li/cil/oc2/common/network/message/RobotTerminalOutputMessage.java diff --git a/src/main/java/li/cil/oc2r/common/network/message/ServerCanceledImportFileMessage.java b/src/main/java/li/cil/oc2/common/network/message/ServerCanceledImportFileMessage.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/network/message/ServerCanceledImportFileMessage.java rename to src/main/java/li/cil/oc2/common/network/message/ServerCanceledImportFileMessage.java diff --git a/src/main/java/li/cil/oc2r/common/network/message/package-info.java b/src/main/java/li/cil/oc2/common/network/message/package-info.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/network/message/package-info.java rename to src/main/java/li/cil/oc2/common/network/message/package-info.java diff --git a/src/main/java/li/cil/oc2r/common/network/package-info.java b/src/main/java/li/cil/oc2/common/network/package-info.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/network/package-info.java rename to src/main/java/li/cil/oc2/common/network/package-info.java diff --git a/src/main/java/li/cil/oc2r/common/package-info.java b/src/main/java/li/cil/oc2/common/package-info.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/package-info.java rename to src/main/java/li/cil/oc2/common/package-info.java diff --git a/src/main/java/li/cil/oc2r/common/serialization/BlobStorage.java b/src/main/java/li/cil/oc2/common/serialization/BlobStorage.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/serialization/BlobStorage.java rename to src/main/java/li/cil/oc2/common/serialization/BlobStorage.java diff --git a/src/main/java/li/cil/oc2r/common/serialization/NBTSerialization.java b/src/main/java/li/cil/oc2/common/serialization/NBTSerialization.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/serialization/NBTSerialization.java rename to src/main/java/li/cil/oc2/common/serialization/NBTSerialization.java diff --git a/src/main/java/li/cil/oc2r/common/serialization/NBTToJsonConverter.java b/src/main/java/li/cil/oc2/common/serialization/NBTToJsonConverter.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/serialization/NBTToJsonConverter.java rename to src/main/java/li/cil/oc2/common/serialization/NBTToJsonConverter.java diff --git a/src/main/java/li/cil/oc2r/common/serialization/ceres/JsonArraySerializer.java b/src/main/java/li/cil/oc2/common/serialization/ceres/JsonArraySerializer.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/serialization/ceres/JsonArraySerializer.java rename to src/main/java/li/cil/oc2/common/serialization/ceres/JsonArraySerializer.java diff --git a/src/main/java/li/cil/oc2r/common/serialization/ceres/MemoryRangeListSerializer.java b/src/main/java/li/cil/oc2/common/serialization/ceres/MemoryRangeListSerializer.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/serialization/ceres/MemoryRangeListSerializer.java rename to src/main/java/li/cil/oc2/common/serialization/ceres/MemoryRangeListSerializer.java diff --git a/src/main/java/li/cil/oc2r/common/serialization/ceres/MemoryRangeSerializer.java b/src/main/java/li/cil/oc2/common/serialization/ceres/MemoryRangeSerializer.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/serialization/ceres/MemoryRangeSerializer.java rename to src/main/java/li/cil/oc2/common/serialization/ceres/MemoryRangeSerializer.java diff --git a/src/main/java/li/cil/oc2r/common/serialization/ceres/Serializers.java b/src/main/java/li/cil/oc2/common/serialization/ceres/Serializers.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/serialization/ceres/Serializers.java rename to src/main/java/li/cil/oc2/common/serialization/ceres/Serializers.java diff --git a/src/main/java/li/cil/oc2r/common/serialization/ceres/TextComponentSerializer.java b/src/main/java/li/cil/oc2/common/serialization/ceres/TextComponentSerializer.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/serialization/ceres/TextComponentSerializer.java rename to src/main/java/li/cil/oc2/common/serialization/ceres/TextComponentSerializer.java diff --git a/src/main/java/li/cil/oc2r/common/serialization/ceres/package-info.java b/src/main/java/li/cil/oc2/common/serialization/ceres/package-info.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/serialization/ceres/package-info.java rename to src/main/java/li/cil/oc2/common/serialization/ceres/package-info.java diff --git a/src/main/java/li/cil/oc2r/common/serialization/gson/DirectionJsonSerializer.java b/src/main/java/li/cil/oc2/common/serialization/gson/DirectionJsonSerializer.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/serialization/gson/DirectionJsonSerializer.java rename to src/main/java/li/cil/oc2/common/serialization/gson/DirectionJsonSerializer.java diff --git a/src/main/java/li/cil/oc2r/common/serialization/gson/EmptyRPCMethodGroupSerializer.java b/src/main/java/li/cil/oc2/common/serialization/gson/EmptyRPCMethodGroupSerializer.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/serialization/gson/EmptyRPCMethodGroupSerializer.java rename to src/main/java/li/cil/oc2/common/serialization/gson/EmptyRPCMethodGroupSerializer.java diff --git a/src/main/java/li/cil/oc2r/common/serialization/gson/ItemStackJsonSerializer.java b/src/main/java/li/cil/oc2/common/serialization/gson/ItemStackJsonSerializer.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/serialization/gson/ItemStackJsonSerializer.java rename to src/main/java/li/cil/oc2/common/serialization/gson/ItemStackJsonSerializer.java diff --git a/src/main/java/li/cil/oc2r/common/serialization/gson/MessageJsonDeserializer.java b/src/main/java/li/cil/oc2/common/serialization/gson/MessageJsonDeserializer.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/serialization/gson/MessageJsonDeserializer.java rename to src/main/java/li/cil/oc2/common/serialization/gson/MessageJsonDeserializer.java diff --git a/src/main/java/li/cil/oc2r/common/serialization/gson/MethodInvocationJsonDeserializer.java b/src/main/java/li/cil/oc2/common/serialization/gson/MethodInvocationJsonDeserializer.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/serialization/gson/MethodInvocationJsonDeserializer.java rename to src/main/java/li/cil/oc2/common/serialization/gson/MethodInvocationJsonDeserializer.java diff --git a/src/main/java/li/cil/oc2r/common/serialization/gson/RPCDeviceWithIdentifierJsonSerializer.java b/src/main/java/li/cil/oc2/common/serialization/gson/RPCDeviceWithIdentifierJsonSerializer.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/serialization/gson/RPCDeviceWithIdentifierJsonSerializer.java rename to src/main/java/li/cil/oc2/common/serialization/gson/RPCDeviceWithIdentifierJsonSerializer.java diff --git a/src/main/java/li/cil/oc2r/common/serialization/gson/RPCMethodJsonSerializer.java b/src/main/java/li/cil/oc2/common/serialization/gson/RPCMethodJsonSerializer.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/serialization/gson/RPCMethodJsonSerializer.java rename to src/main/java/li/cil/oc2/common/serialization/gson/RPCMethodJsonSerializer.java diff --git a/src/main/java/li/cil/oc2r/common/serialization/gson/SideJsonDeserializer.java b/src/main/java/li/cil/oc2/common/serialization/gson/SideJsonDeserializer.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/serialization/gson/SideJsonDeserializer.java rename to src/main/java/li/cil/oc2/common/serialization/gson/SideJsonDeserializer.java diff --git a/src/main/java/li/cil/oc2r/common/serialization/gson/UnsignedByteArrayJsonSerializer.java b/src/main/java/li/cil/oc2/common/serialization/gson/UnsignedByteArrayJsonSerializer.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/serialization/gson/UnsignedByteArrayJsonSerializer.java rename to src/main/java/li/cil/oc2/common/serialization/gson/UnsignedByteArrayJsonSerializer.java diff --git a/src/main/java/li/cil/oc2r/common/serialization/gson/package-info.java b/src/main/java/li/cil/oc2/common/serialization/gson/package-info.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/serialization/gson/package-info.java rename to src/main/java/li/cil/oc2/common/serialization/gson/package-info.java diff --git a/src/main/java/li/cil/oc2r/common/serialization/package-info.java b/src/main/java/li/cil/oc2/common/serialization/package-info.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/serialization/package-info.java rename to src/main/java/li/cil/oc2/common/serialization/package-info.java diff --git a/src/main/java/li/cil/oc2r/common/tags/BlockTags.java b/src/main/java/li/cil/oc2/common/tags/BlockTags.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/tags/BlockTags.java rename to src/main/java/li/cil/oc2/common/tags/BlockTags.java diff --git a/src/main/java/li/cil/oc2r/common/tags/ItemTags.java b/src/main/java/li/cil/oc2/common/tags/ItemTags.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/tags/ItemTags.java rename to src/main/java/li/cil/oc2/common/tags/ItemTags.java diff --git a/src/main/java/li/cil/oc2r/common/tags/package-info.java b/src/main/java/li/cil/oc2/common/tags/package-info.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/tags/package-info.java rename to src/main/java/li/cil/oc2/common/tags/package-info.java diff --git a/src/main/java/li/cil/oc2r/common/util/BlockEntityUtils.java b/src/main/java/li/cil/oc2/common/util/BlockEntityUtils.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/util/BlockEntityUtils.java rename to src/main/java/li/cil/oc2/common/util/BlockEntityUtils.java diff --git a/src/main/java/li/cil/oc2r/common/util/BlockLocation.java b/src/main/java/li/cil/oc2/common/util/BlockLocation.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/util/BlockLocation.java rename to src/main/java/li/cil/oc2/common/util/BlockLocation.java diff --git a/src/main/java/li/cil/oc2r/common/util/ChainableVertexConsumer.java b/src/main/java/li/cil/oc2/common/util/ChainableVertexConsumer.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/util/ChainableVertexConsumer.java rename to src/main/java/li/cil/oc2/common/util/ChainableVertexConsumer.java diff --git a/src/main/java/li/cil/oc2r/common/util/ChunkLocation.java b/src/main/java/li/cil/oc2/common/util/ChunkLocation.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/util/ChunkLocation.java rename to src/main/java/li/cil/oc2/common/util/ChunkLocation.java diff --git a/src/main/java/li/cil/oc2r/common/util/ChunkUtils.java b/src/main/java/li/cil/oc2/common/util/ChunkUtils.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/util/ChunkUtils.java rename to src/main/java/li/cil/oc2/common/util/ChunkUtils.java diff --git a/src/main/java/li/cil/oc2r/common/util/ColorUtils.java b/src/main/java/li/cil/oc2/common/util/ColorUtils.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/util/ColorUtils.java rename to src/main/java/li/cil/oc2/common/util/ColorUtils.java diff --git a/src/main/java/li/cil/oc2r/common/util/Event.java b/src/main/java/li/cil/oc2/common/util/Event.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/util/Event.java rename to src/main/java/li/cil/oc2/common/util/Event.java diff --git a/src/main/java/li/cil/oc2r/common/util/FakePlayerUtils.java b/src/main/java/li/cil/oc2/common/util/FakePlayerUtils.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/util/FakePlayerUtils.java rename to src/main/java/li/cil/oc2/common/util/FakePlayerUtils.java diff --git a/src/main/java/li/cil/oc2r/common/util/HorizontalBlockUtils.java b/src/main/java/li/cil/oc2/common/util/HorizontalBlockUtils.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/util/HorizontalBlockUtils.java rename to src/main/java/li/cil/oc2/common/util/HorizontalBlockUtils.java diff --git a/src/main/java/li/cil/oc2r/common/util/ItemDeviceUtils.java b/src/main/java/li/cil/oc2/common/util/ItemDeviceUtils.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/util/ItemDeviceUtils.java rename to src/main/java/li/cil/oc2/common/util/ItemDeviceUtils.java diff --git a/src/main/java/li/cil/oc2r/common/util/ItemStackUtils.java b/src/main/java/li/cil/oc2/common/util/ItemStackUtils.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/util/ItemStackUtils.java rename to src/main/java/li/cil/oc2/common/util/ItemStackUtils.java diff --git a/src/main/java/li/cil/oc2r/common/util/LazyOptionalUtils.java b/src/main/java/li/cil/oc2/common/util/LazyOptionalUtils.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/util/LazyOptionalUtils.java rename to src/main/java/li/cil/oc2/common/util/LazyOptionalUtils.java diff --git a/src/main/java/li/cil/oc2r/common/util/LevelUtils.java b/src/main/java/li/cil/oc2/common/util/LevelUtils.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/util/LevelUtils.java rename to src/main/java/li/cil/oc2/common/util/LevelUtils.java diff --git a/src/main/java/li/cil/oc2r/common/util/LocationSupplierUtils.java b/src/main/java/li/cil/oc2/common/util/LocationSupplierUtils.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/util/LocationSupplierUtils.java rename to src/main/java/li/cil/oc2/common/util/LocationSupplierUtils.java diff --git a/src/main/java/li/cil/oc2r/common/util/NBTTagIds.java b/src/main/java/li/cil/oc2/common/util/NBTTagIds.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/util/NBTTagIds.java rename to src/main/java/li/cil/oc2/common/util/NBTTagIds.java diff --git a/src/main/java/li/cil/oc2r/common/util/NBTUtils.java b/src/main/java/li/cil/oc2/common/util/NBTUtils.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/util/NBTUtils.java rename to src/main/java/li/cil/oc2/common/util/NBTUtils.java diff --git a/src/main/java/li/cil/oc2r/common/util/ParameterizedEvent.java b/src/main/java/li/cil/oc2/common/util/ParameterizedEvent.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/util/ParameterizedEvent.java rename to src/main/java/li/cil/oc2/common/util/ParameterizedEvent.java diff --git a/src/main/java/li/cil/oc2r/common/util/RegistryUtils.java b/src/main/java/li/cil/oc2/common/util/RegistryUtils.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/util/RegistryUtils.java rename to src/main/java/li/cil/oc2/common/util/RegistryUtils.java diff --git a/src/main/java/li/cil/oc2r/common/util/RunnableUtils.java b/src/main/java/li/cil/oc2/common/util/RunnableUtils.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/util/RunnableUtils.java rename to src/main/java/li/cil/oc2/common/util/RunnableUtils.java diff --git a/src/main/java/li/cil/oc2r/common/util/ServerScheduler.java b/src/main/java/li/cil/oc2/common/util/ServerScheduler.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/util/ServerScheduler.java rename to src/main/java/li/cil/oc2/common/util/ServerScheduler.java diff --git a/src/main/java/li/cil/oc2r/common/util/SoundEvents.java b/src/main/java/li/cil/oc2/common/util/SoundEvents.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/util/SoundEvents.java rename to src/main/java/li/cil/oc2/common/util/SoundEvents.java diff --git a/src/main/java/li/cil/oc2r/common/util/TerminalUtils.java b/src/main/java/li/cil/oc2/common/util/TerminalUtils.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/util/TerminalUtils.java rename to src/main/java/li/cil/oc2/common/util/TerminalUtils.java diff --git a/src/main/java/li/cil/oc2r/common/util/TextFormatUtils.java b/src/main/java/li/cil/oc2/common/util/TextFormatUtils.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/util/TextFormatUtils.java rename to src/main/java/li/cil/oc2/common/util/TextFormatUtils.java diff --git a/src/main/java/li/cil/oc2r/common/util/ThrottledSoundEmitter.java b/src/main/java/li/cil/oc2/common/util/ThrottledSoundEmitter.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/util/ThrottledSoundEmitter.java rename to src/main/java/li/cil/oc2/common/util/ThrottledSoundEmitter.java diff --git a/src/main/java/li/cil/oc2r/common/util/TickUtils.java b/src/main/java/li/cil/oc2/common/util/TickUtils.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/util/TickUtils.java rename to src/main/java/li/cil/oc2/common/util/TickUtils.java diff --git a/src/main/java/li/cil/oc2r/common/util/TooltipUtils.java b/src/main/java/li/cil/oc2/common/util/TooltipUtils.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/util/TooltipUtils.java rename to src/main/java/li/cil/oc2/common/util/TooltipUtils.java diff --git a/src/main/java/li/cil/oc2r/common/util/TranslationUtils.java b/src/main/java/li/cil/oc2/common/util/TranslationUtils.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/util/TranslationUtils.java rename to src/main/java/li/cil/oc2/common/util/TranslationUtils.java diff --git a/src/main/java/li/cil/oc2r/common/util/Vec3Utils.java b/src/main/java/li/cil/oc2/common/util/Vec3Utils.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/util/Vec3Utils.java rename to src/main/java/li/cil/oc2/common/util/Vec3Utils.java diff --git a/src/main/java/li/cil/oc2r/common/util/VoxelShapeUtils.java b/src/main/java/li/cil/oc2/common/util/VoxelShapeUtils.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/util/VoxelShapeUtils.java rename to src/main/java/li/cil/oc2/common/util/VoxelShapeUtils.java diff --git a/src/main/java/li/cil/oc2r/common/util/package-info.java b/src/main/java/li/cil/oc2/common/util/package-info.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/util/package-info.java rename to src/main/java/li/cil/oc2/common/util/package-info.java diff --git a/src/main/java/li/cil/oc2r/common/vm/AbstractTerminalVMRunner.java b/src/main/java/li/cil/oc2/common/vm/AbstractTerminalVMRunner.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/vm/AbstractTerminalVMRunner.java rename to src/main/java/li/cil/oc2/common/vm/AbstractTerminalVMRunner.java diff --git a/src/main/java/li/cil/oc2r/common/vm/AbstractVMItemStackHandlers.java b/src/main/java/li/cil/oc2/common/vm/AbstractVMItemStackHandlers.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/vm/AbstractVMItemStackHandlers.java rename to src/main/java/li/cil/oc2/common/vm/AbstractVMItemStackHandlers.java diff --git a/src/main/java/li/cil/oc2r/common/vm/AbstractVirtualMachine.java b/src/main/java/li/cil/oc2/common/vm/AbstractVirtualMachine.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/vm/AbstractVirtualMachine.java rename to src/main/java/li/cil/oc2/common/vm/AbstractVirtualMachine.java diff --git a/src/main/java/li/cil/oc2r/common/vm/Allocator.java b/src/main/java/li/cil/oc2/common/vm/Allocator.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/vm/Allocator.java rename to src/main/java/li/cil/oc2/common/vm/Allocator.java diff --git a/src/main/java/li/cil/oc2r/common/vm/BaseAddressProvider.java b/src/main/java/li/cil/oc2/common/vm/BaseAddressProvider.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/vm/BaseAddressProvider.java rename to src/main/java/li/cil/oc2/common/vm/BaseAddressProvider.java diff --git a/src/main/java/li/cil/oc2r/common/vm/BuiltinDevices.java b/src/main/java/li/cil/oc2/common/vm/BuiltinDevices.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/vm/BuiltinDevices.java rename to src/main/java/li/cil/oc2/common/vm/BuiltinDevices.java diff --git a/src/main/java/li/cil/oc2r/common/vm/MinecraftRealTimeCounter.java b/src/main/java/li/cil/oc2/common/vm/MinecraftRealTimeCounter.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/vm/MinecraftRealTimeCounter.java rename to src/main/java/li/cil/oc2/common/vm/MinecraftRealTimeCounter.java diff --git a/src/main/java/li/cil/oc2r/common/vm/Terminal.java b/src/main/java/li/cil/oc2/common/vm/Terminal.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/vm/Terminal.java rename to src/main/java/li/cil/oc2/common/vm/Terminal.java diff --git a/src/main/java/li/cil/oc2r/common/vm/VMDeviceBusAdapter.java b/src/main/java/li/cil/oc2/common/vm/VMDeviceBusAdapter.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/vm/VMDeviceBusAdapter.java rename to src/main/java/li/cil/oc2/common/vm/VMDeviceBusAdapter.java diff --git a/src/main/java/li/cil/oc2r/common/vm/VMItemStackHandlers.java b/src/main/java/li/cil/oc2/common/vm/VMItemStackHandlers.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/vm/VMItemStackHandlers.java rename to src/main/java/li/cil/oc2/common/vm/VMItemStackHandlers.java diff --git a/src/main/java/li/cil/oc2r/common/vm/VMRunState.java b/src/main/java/li/cil/oc2/common/vm/VMRunState.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/vm/VMRunState.java rename to src/main/java/li/cil/oc2/common/vm/VMRunState.java diff --git a/src/main/java/li/cil/oc2r/common/vm/VMRunner.java b/src/main/java/li/cil/oc2/common/vm/VMRunner.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/vm/VMRunner.java rename to src/main/java/li/cil/oc2/common/vm/VMRunner.java diff --git a/src/main/java/li/cil/oc2r/common/vm/VirtualMachine.java b/src/main/java/li/cil/oc2/common/vm/VirtualMachine.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/vm/VirtualMachine.java rename to src/main/java/li/cil/oc2/common/vm/VirtualMachine.java diff --git a/src/main/java/li/cil/oc2r/common/vm/context/EventManager.java b/src/main/java/li/cil/oc2/common/vm/context/EventManager.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/vm/context/EventManager.java rename to src/main/java/li/cil/oc2/common/vm/context/EventManager.java diff --git a/src/main/java/li/cil/oc2r/common/vm/context/InterruptManager.java b/src/main/java/li/cil/oc2/common/vm/context/InterruptManager.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/vm/context/InterruptManager.java rename to src/main/java/li/cil/oc2/common/vm/context/InterruptManager.java diff --git a/src/main/java/li/cil/oc2r/common/vm/context/InterruptValidator.java b/src/main/java/li/cil/oc2/common/vm/context/InterruptValidator.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/vm/context/InterruptValidator.java rename to src/main/java/li/cil/oc2/common/vm/context/InterruptValidator.java diff --git a/src/main/java/li/cil/oc2r/common/vm/context/MemoryRangeManager.java b/src/main/java/li/cil/oc2/common/vm/context/MemoryRangeManager.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/vm/context/MemoryRangeManager.java rename to src/main/java/li/cil/oc2/common/vm/context/MemoryRangeManager.java diff --git a/src/main/java/li/cil/oc2r/common/vm/context/VMContextManagerCollection.java b/src/main/java/li/cil/oc2/common/vm/context/VMContextManagerCollection.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/vm/context/VMContextManagerCollection.java rename to src/main/java/li/cil/oc2/common/vm/context/VMContextManagerCollection.java diff --git a/src/main/java/li/cil/oc2r/common/vm/context/global/GlobalEventBus.java b/src/main/java/li/cil/oc2/common/vm/context/global/GlobalEventBus.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/vm/context/global/GlobalEventBus.java rename to src/main/java/li/cil/oc2/common/vm/context/global/GlobalEventBus.java diff --git a/src/main/java/li/cil/oc2r/common/vm/context/global/GlobalInterruptAllocator.java b/src/main/java/li/cil/oc2/common/vm/context/global/GlobalInterruptAllocator.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/vm/context/global/GlobalInterruptAllocator.java rename to src/main/java/li/cil/oc2/common/vm/context/global/GlobalInterruptAllocator.java diff --git a/src/main/java/li/cil/oc2r/common/vm/context/global/GlobalInterruptController.java b/src/main/java/li/cil/oc2/common/vm/context/global/GlobalInterruptController.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/vm/context/global/GlobalInterruptController.java rename to src/main/java/li/cil/oc2/common/vm/context/global/GlobalInterruptController.java diff --git a/src/main/java/li/cil/oc2r/common/vm/context/global/GlobalMemoryAllocator.java b/src/main/java/li/cil/oc2/common/vm/context/global/GlobalMemoryAllocator.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/vm/context/global/GlobalMemoryAllocator.java rename to src/main/java/li/cil/oc2/common/vm/context/global/GlobalMemoryAllocator.java diff --git a/src/main/java/li/cil/oc2r/common/vm/context/global/GlobalMemoryMap.java b/src/main/java/li/cil/oc2/common/vm/context/global/GlobalMemoryMap.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/vm/context/global/GlobalMemoryMap.java rename to src/main/java/li/cil/oc2/common/vm/context/global/GlobalMemoryMap.java diff --git a/src/main/java/li/cil/oc2r/common/vm/context/global/GlobalMemoryRangeAllocator.java b/src/main/java/li/cil/oc2/common/vm/context/global/GlobalMemoryRangeAllocator.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/vm/context/global/GlobalMemoryRangeAllocator.java rename to src/main/java/li/cil/oc2/common/vm/context/global/GlobalMemoryRangeAllocator.java diff --git a/src/main/java/li/cil/oc2r/common/vm/context/global/GlobalVMContext.java b/src/main/java/li/cil/oc2/common/vm/context/global/GlobalVMContext.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/vm/context/global/GlobalVMContext.java rename to src/main/java/li/cil/oc2/common/vm/context/global/GlobalVMContext.java diff --git a/src/main/java/li/cil/oc2r/common/vm/context/global/MemoryRangeList.java b/src/main/java/li/cil/oc2/common/vm/context/global/MemoryRangeList.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/vm/context/global/MemoryRangeList.java rename to src/main/java/li/cil/oc2/common/vm/context/global/MemoryRangeList.java diff --git a/src/main/java/li/cil/oc2r/common/vm/context/global/package-info.java b/src/main/java/li/cil/oc2/common/vm/context/global/package-info.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/vm/context/global/package-info.java rename to src/main/java/li/cil/oc2/common/vm/context/global/package-info.java diff --git a/src/main/java/li/cil/oc2r/common/vm/context/managed/ManagedEventBus.java b/src/main/java/li/cil/oc2/common/vm/context/managed/ManagedEventBus.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/vm/context/managed/ManagedEventBus.java rename to src/main/java/li/cil/oc2/common/vm/context/managed/ManagedEventBus.java diff --git a/src/main/java/li/cil/oc2r/common/vm/context/managed/ManagedInterruptAllocator.java b/src/main/java/li/cil/oc2/common/vm/context/managed/ManagedInterruptAllocator.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/vm/context/managed/ManagedInterruptAllocator.java rename to src/main/java/li/cil/oc2/common/vm/context/managed/ManagedInterruptAllocator.java diff --git a/src/main/java/li/cil/oc2r/common/vm/context/managed/ManagedInterruptController.java b/src/main/java/li/cil/oc2/common/vm/context/managed/ManagedInterruptController.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/vm/context/managed/ManagedInterruptController.java rename to src/main/java/li/cil/oc2/common/vm/context/managed/ManagedInterruptController.java diff --git a/src/main/java/li/cil/oc2r/common/vm/context/managed/ManagedMemoryAllocator.java b/src/main/java/li/cil/oc2/common/vm/context/managed/ManagedMemoryAllocator.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/vm/context/managed/ManagedMemoryAllocator.java rename to src/main/java/li/cil/oc2/common/vm/context/managed/ManagedMemoryAllocator.java diff --git a/src/main/java/li/cil/oc2r/common/vm/context/managed/ManagedMemoryMap.java b/src/main/java/li/cil/oc2/common/vm/context/managed/ManagedMemoryMap.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/vm/context/managed/ManagedMemoryMap.java rename to src/main/java/li/cil/oc2/common/vm/context/managed/ManagedMemoryMap.java diff --git a/src/main/java/li/cil/oc2r/common/vm/context/managed/ManagedMemoryRangeAllocator.java b/src/main/java/li/cil/oc2/common/vm/context/managed/ManagedMemoryRangeAllocator.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/vm/context/managed/ManagedMemoryRangeAllocator.java rename to src/main/java/li/cil/oc2/common/vm/context/managed/ManagedMemoryRangeAllocator.java diff --git a/src/main/java/li/cil/oc2r/common/vm/context/managed/ManagedVMContext.java b/src/main/java/li/cil/oc2/common/vm/context/managed/ManagedVMContext.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/vm/context/managed/ManagedVMContext.java rename to src/main/java/li/cil/oc2/common/vm/context/managed/ManagedVMContext.java diff --git a/src/main/java/li/cil/oc2r/common/vm/context/managed/package-info.java b/src/main/java/li/cil/oc2/common/vm/context/managed/package-info.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/vm/context/managed/package-info.java rename to src/main/java/li/cil/oc2/common/vm/context/managed/package-info.java diff --git a/src/main/java/li/cil/oc2r/common/vm/context/package-info.java b/src/main/java/li/cil/oc2/common/vm/context/package-info.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/vm/context/package-info.java rename to src/main/java/li/cil/oc2/common/vm/context/package-info.java diff --git a/src/main/java/li/cil/oc2r/common/vm/device/PciRootPortDevice.java b/src/main/java/li/cil/oc2/common/vm/device/PciRootPortDevice.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/vm/device/PciRootPortDevice.java rename to src/main/java/li/cil/oc2/common/vm/device/PciRootPortDevice.java diff --git a/src/main/java/li/cil/oc2r/common/vm/device/SimpleFramebufferDevice.java b/src/main/java/li/cil/oc2/common/vm/device/SimpleFramebufferDevice.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/vm/device/SimpleFramebufferDevice.java rename to src/main/java/li/cil/oc2/common/vm/device/SimpleFramebufferDevice.java diff --git a/src/main/java/li/cil/oc2r/common/vm/fs/LayeredFileSystem.java b/src/main/java/li/cil/oc2/common/vm/fs/LayeredFileSystem.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/vm/fs/LayeredFileSystem.java rename to src/main/java/li/cil/oc2/common/vm/fs/LayeredFileSystem.java diff --git a/src/main/java/li/cil/oc2r/common/vm/fs/package-info.java b/src/main/java/li/cil/oc2/common/vm/fs/package-info.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/vm/fs/package-info.java rename to src/main/java/li/cil/oc2/common/vm/fs/package-info.java diff --git a/src/main/java/li/cil/oc2r/common/vm/package-info.java b/src/main/java/li/cil/oc2/common/vm/package-info.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/vm/package-info.java rename to src/main/java/li/cil/oc2/common/vm/package-info.java diff --git a/src/main/java/li/cil/oc2r/common/vm/provider/DeviceTreeProviders.java b/src/main/java/li/cil/oc2/common/vm/provider/DeviceTreeProviders.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/vm/provider/DeviceTreeProviders.java rename to src/main/java/li/cil/oc2/common/vm/provider/DeviceTreeProviders.java diff --git a/src/main/java/li/cil/oc2r/common/vm/provider/PciRootPortDeviceProvider.java b/src/main/java/li/cil/oc2/common/vm/provider/PciRootPortDeviceProvider.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/vm/provider/PciRootPortDeviceProvider.java rename to src/main/java/li/cil/oc2/common/vm/provider/PciRootPortDeviceProvider.java diff --git a/src/main/java/li/cil/oc2r/common/vm/provider/SimpleFramebufferDeviceProvider.java b/src/main/java/li/cil/oc2/common/vm/provider/SimpleFramebufferDeviceProvider.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/vm/provider/SimpleFramebufferDeviceProvider.java rename to src/main/java/li/cil/oc2/common/vm/provider/SimpleFramebufferDeviceProvider.java diff --git a/src/main/java/li/cil/oc2r/common/vxlan/TunnelManager.java b/src/main/java/li/cil/oc2/common/vxlan/TunnelManager.java similarity index 100% rename from src/main/java/li/cil/oc2r/common/vxlan/TunnelManager.java rename to src/main/java/li/cil/oc2/common/vxlan/TunnelManager.java diff --git a/src/main/java/li/cil/oc2r/data/DataGenerators.java b/src/main/java/li/cil/oc2/data/DataGenerators.java similarity index 100% rename from src/main/java/li/cil/oc2r/data/DataGenerators.java rename to src/main/java/li/cil/oc2/data/DataGenerators.java diff --git a/src/main/java/li/cil/oc2r/data/ModBlockStateProvider.java b/src/main/java/li/cil/oc2/data/ModBlockStateProvider.java similarity index 100% rename from src/main/java/li/cil/oc2r/data/ModBlockStateProvider.java rename to src/main/java/li/cil/oc2/data/ModBlockStateProvider.java diff --git a/src/main/java/li/cil/oc2r/data/ModBlockTagsProvider.java b/src/main/java/li/cil/oc2/data/ModBlockTagsProvider.java similarity index 100% rename from src/main/java/li/cil/oc2r/data/ModBlockTagsProvider.java rename to src/main/java/li/cil/oc2/data/ModBlockTagsProvider.java diff --git a/src/main/java/li/cil/oc2r/data/ModItemModelProvider.java b/src/main/java/li/cil/oc2/data/ModItemModelProvider.java similarity index 100% rename from src/main/java/li/cil/oc2r/data/ModItemModelProvider.java rename to src/main/java/li/cil/oc2/data/ModItemModelProvider.java diff --git a/src/main/java/li/cil/oc2r/data/ModItemTagsProvider.java b/src/main/java/li/cil/oc2/data/ModItemTagsProvider.java similarity index 100% rename from src/main/java/li/cil/oc2r/data/ModItemTagsProvider.java rename to src/main/java/li/cil/oc2/data/ModItemTagsProvider.java diff --git a/src/main/java/li/cil/oc2r/data/ModLootTableProvider.java b/src/main/java/li/cil/oc2/data/ModLootTableProvider.java similarity index 100% rename from src/main/java/li/cil/oc2r/data/ModLootTableProvider.java rename to src/main/java/li/cil/oc2/data/ModLootTableProvider.java diff --git a/src/main/java/li/cil/oc2r/data/ModRecipesProvider.java b/src/main/java/li/cil/oc2/data/ModRecipesProvider.java similarity index 100% rename from src/main/java/li/cil/oc2r/data/ModRecipesProvider.java rename to src/main/java/li/cil/oc2/data/ModRecipesProvider.java diff --git a/src/main/java/li/cil/oc2r/data/WrenchRecipeBuilder.java b/src/main/java/li/cil/oc2/data/WrenchRecipeBuilder.java similarity index 100% rename from src/main/java/li/cil/oc2r/data/WrenchRecipeBuilder.java rename to src/main/java/li/cil/oc2/data/WrenchRecipeBuilder.java diff --git a/src/main/java/li/cil/oc2r/data/package-info.java b/src/main/java/li/cil/oc2/data/package-info.java similarity index 100% rename from src/main/java/li/cil/oc2r/data/package-info.java rename to src/main/java/li/cil/oc2/data/package-info.java diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/common/biari/MConst.java b/src/main/java/li/cil/oc2/jcodec/codecs/common/biari/MConst.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/codecs/common/biari/MConst.java rename to src/main/java/li/cil/oc2/jcodec/codecs/common/biari/MConst.java diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/common/biari/MDecoder.java b/src/main/java/li/cil/oc2/jcodec/codecs/common/biari/MDecoder.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/codecs/common/biari/MDecoder.java rename to src/main/java/li/cil/oc2/jcodec/codecs/common/biari/MDecoder.java diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/H264Const.java b/src/main/java/li/cil/oc2/jcodec/codecs/h264/H264Const.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/codecs/h264/H264Const.java rename to src/main/java/li/cil/oc2/jcodec/codecs/h264/H264Const.java diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/H264Decoder.java b/src/main/java/li/cil/oc2/jcodec/codecs/h264/H264Decoder.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/codecs/h264/H264Decoder.java rename to src/main/java/li/cil/oc2/jcodec/codecs/h264/H264Decoder.java diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/H264Encoder.java b/src/main/java/li/cil/oc2/jcodec/codecs/h264/H264Encoder.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/codecs/h264/H264Encoder.java rename to src/main/java/li/cil/oc2/jcodec/codecs/h264/H264Encoder.java diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/H264Utils.java b/src/main/java/li/cil/oc2/jcodec/codecs/h264/H264Utils.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/codecs/h264/H264Utils.java rename to src/main/java/li/cil/oc2/jcodec/codecs/h264/H264Utils.java diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/POCManager.java b/src/main/java/li/cil/oc2/jcodec/codecs/h264/POCManager.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/codecs/h264/POCManager.java rename to src/main/java/li/cil/oc2/jcodec/codecs/h264/POCManager.java diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/BlockInterpolator.java b/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/BlockInterpolator.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/BlockInterpolator.java rename to src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/BlockInterpolator.java diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/CABACContst.java b/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/CABACContst.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/CABACContst.java rename to src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/CABACContst.java diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/CAVLCReader.java b/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/CAVLCReader.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/CAVLCReader.java rename to src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/CAVLCReader.java diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/ChromaPredictionBuilder.java b/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/ChromaPredictionBuilder.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/ChromaPredictionBuilder.java rename to src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/ChromaPredictionBuilder.java diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/CoeffTransformer.java b/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/CoeffTransformer.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/CoeffTransformer.java rename to src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/CoeffTransformer.java diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/DeblockerInput.java b/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/DeblockerInput.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/DeblockerInput.java rename to src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/DeblockerInput.java diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/DecoderState.java b/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/DecoderState.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/DecoderState.java rename to src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/DecoderState.java diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/FrameReader.java b/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/FrameReader.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/FrameReader.java rename to src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/FrameReader.java diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/Intra16x16PredictionBuilder.java b/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/Intra16x16PredictionBuilder.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/Intra16x16PredictionBuilder.java rename to src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/Intra16x16PredictionBuilder.java diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/Intra4x4PredictionBuilder.java b/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/Intra4x4PredictionBuilder.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/Intra4x4PredictionBuilder.java rename to src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/Intra4x4PredictionBuilder.java diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/Intra8x8PredictionBuilder.java b/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/Intra8x8PredictionBuilder.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/Intra8x8PredictionBuilder.java rename to src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/Intra8x8PredictionBuilder.java diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/MBlock.java b/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/MBlock.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/MBlock.java rename to src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/MBlock.java diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/MBlockDecoderBDirect.java b/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/MBlockDecoderBDirect.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/MBlockDecoderBDirect.java rename to src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/MBlockDecoderBDirect.java diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/MBlockDecoderBase.java b/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/MBlockDecoderBase.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/MBlockDecoderBase.java rename to src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/MBlockDecoderBase.java diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/MBlockDecoderIPCM.java b/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/MBlockDecoderIPCM.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/MBlockDecoderIPCM.java rename to src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/MBlockDecoderIPCM.java diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/MBlockDecoderInter.java b/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/MBlockDecoderInter.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/MBlockDecoderInter.java rename to src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/MBlockDecoderInter.java diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/MBlockDecoderInter8x8.java b/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/MBlockDecoderInter8x8.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/MBlockDecoderInter8x8.java rename to src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/MBlockDecoderInter8x8.java diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/MBlockDecoderIntra16x16.java b/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/MBlockDecoderIntra16x16.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/MBlockDecoderIntra16x16.java rename to src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/MBlockDecoderIntra16x16.java diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/MBlockDecoderIntraNxN.java b/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/MBlockDecoderIntraNxN.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/MBlockDecoderIntraNxN.java rename to src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/MBlockDecoderIntraNxN.java diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/MBlockDecoderUtils.java b/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/MBlockDecoderUtils.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/MBlockDecoderUtils.java rename to src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/MBlockDecoderUtils.java diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/MBlockSkipDecoder.java b/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/MBlockSkipDecoder.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/MBlockSkipDecoder.java rename to src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/MBlockSkipDecoder.java diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/PredictionMerger.java b/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/PredictionMerger.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/PredictionMerger.java rename to src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/PredictionMerger.java diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/RefListManager.java b/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/RefListManager.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/RefListManager.java rename to src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/RefListManager.java diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/SliceDecoder.java b/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/SliceDecoder.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/SliceDecoder.java rename to src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/SliceDecoder.java diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/SliceHeaderReader.java b/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/SliceHeaderReader.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/SliceHeaderReader.java rename to src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/SliceHeaderReader.java diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/SliceReader.java b/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/SliceReader.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/SliceReader.java rename to src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/SliceReader.java diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/aso/FlatMBlockMapper.java b/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/aso/FlatMBlockMapper.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/aso/FlatMBlockMapper.java rename to src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/aso/FlatMBlockMapper.java diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/aso/MBToSliceGroupMap.java b/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/aso/MBToSliceGroupMap.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/aso/MBToSliceGroupMap.java rename to src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/aso/MBToSliceGroupMap.java diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/aso/MapManager.java b/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/aso/MapManager.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/aso/MapManager.java rename to src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/aso/MapManager.java diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/aso/Mapper.java b/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/aso/Mapper.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/aso/Mapper.java rename to src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/aso/Mapper.java diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/aso/PrebuiltMBlockMapper.java b/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/aso/PrebuiltMBlockMapper.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/aso/PrebuiltMBlockMapper.java rename to src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/aso/PrebuiltMBlockMapper.java diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/aso/SliceGroupMapBuilder.java b/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/aso/SliceGroupMapBuilder.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/aso/SliceGroupMapBuilder.java rename to src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/aso/SliceGroupMapBuilder.java diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/deblock/DeblockingFilter.java b/src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/deblock/DeblockingFilter.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/codecs/h264/decode/deblock/DeblockingFilter.java rename to src/main/java/li/cil/oc2/jcodec/codecs/h264/decode/deblock/DeblockingFilter.java diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/CQPRateControl.java b/src/main/java/li/cil/oc2/jcodec/codecs/h264/encode/CQPRateControl.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/CQPRateControl.java rename to src/main/java/li/cil/oc2/jcodec/codecs/h264/encode/CQPRateControl.java diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/EncodedMB.java b/src/main/java/li/cil/oc2/jcodec/codecs/h264/encode/EncodedMB.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/EncodedMB.java rename to src/main/java/li/cil/oc2/jcodec/codecs/h264/encode/EncodedMB.java diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/EncodingContext.java b/src/main/java/li/cil/oc2/jcodec/codecs/h264/encode/EncodingContext.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/EncodingContext.java rename to src/main/java/li/cil/oc2/jcodec/codecs/h264/encode/EncodingContext.java diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/H264EncoderUtils.java b/src/main/java/li/cil/oc2/jcodec/codecs/h264/encode/H264EncoderUtils.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/H264EncoderUtils.java rename to src/main/java/li/cil/oc2/jcodec/codecs/h264/encode/H264EncoderUtils.java diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/IntraPredEstimator.java b/src/main/java/li/cil/oc2/jcodec/codecs/h264/encode/IntraPredEstimator.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/IntraPredEstimator.java rename to src/main/java/li/cil/oc2/jcodec/codecs/h264/encode/IntraPredEstimator.java diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/MBDeblocker.java b/src/main/java/li/cil/oc2/jcodec/codecs/h264/encode/MBDeblocker.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/MBDeblocker.java rename to src/main/java/li/cil/oc2/jcodec/codecs/h264/encode/MBDeblocker.java diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/MBEncoderHelper.java b/src/main/java/li/cil/oc2/jcodec/codecs/h264/encode/MBEncoderHelper.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/MBEncoderHelper.java rename to src/main/java/li/cil/oc2/jcodec/codecs/h264/encode/MBEncoderHelper.java diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/MBWriterI16x16.java b/src/main/java/li/cil/oc2/jcodec/codecs/h264/encode/MBWriterI16x16.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/MBWriterI16x16.java rename to src/main/java/li/cil/oc2/jcodec/codecs/h264/encode/MBWriterI16x16.java diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/MBWriterINxN.java b/src/main/java/li/cil/oc2/jcodec/codecs/h264/encode/MBWriterINxN.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/MBWriterINxN.java rename to src/main/java/li/cil/oc2/jcodec/codecs/h264/encode/MBWriterINxN.java diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/MBWriterP16x16.java b/src/main/java/li/cil/oc2/jcodec/codecs/h264/encode/MBWriterP16x16.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/MBWriterP16x16.java rename to src/main/java/li/cil/oc2/jcodec/codecs/h264/encode/MBWriterP16x16.java diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/MotionEstimator.java b/src/main/java/li/cil/oc2/jcodec/codecs/h264/encode/MotionEstimator.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/MotionEstimator.java rename to src/main/java/li/cil/oc2/jcodec/codecs/h264/encode/MotionEstimator.java diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/RateControl.java b/src/main/java/li/cil/oc2/jcodec/codecs/h264/encode/RateControl.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/codecs/h264/encode/RateControl.java rename to src/main/java/li/cil/oc2/jcodec/codecs/h264/encode/RateControl.java diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/CABAC.java b/src/main/java/li/cil/oc2/jcodec/codecs/h264/io/CABAC.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/CABAC.java rename to src/main/java/li/cil/oc2/jcodec/codecs/h264/io/CABAC.java diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/CAVLC.java b/src/main/java/li/cil/oc2/jcodec/codecs/h264/io/CAVLC.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/CAVLC.java rename to src/main/java/li/cil/oc2/jcodec/codecs/h264/io/CAVLC.java diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/AspectRatio.java b/src/main/java/li/cil/oc2/jcodec/codecs/h264/io/model/AspectRatio.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/AspectRatio.java rename to src/main/java/li/cil/oc2/jcodec/codecs/h264/io/model/AspectRatio.java diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/Frame.java b/src/main/java/li/cil/oc2/jcodec/codecs/h264/io/model/Frame.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/Frame.java rename to src/main/java/li/cil/oc2/jcodec/codecs/h264/io/model/Frame.java diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/HRDParameters.java b/src/main/java/li/cil/oc2/jcodec/codecs/h264/io/model/HRDParameters.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/HRDParameters.java rename to src/main/java/li/cil/oc2/jcodec/codecs/h264/io/model/HRDParameters.java diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/MBType.java b/src/main/java/li/cil/oc2/jcodec/codecs/h264/io/model/MBType.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/MBType.java rename to src/main/java/li/cil/oc2/jcodec/codecs/h264/io/model/MBType.java diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/NALUnit.java b/src/main/java/li/cil/oc2/jcodec/codecs/h264/io/model/NALUnit.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/NALUnit.java rename to src/main/java/li/cil/oc2/jcodec/codecs/h264/io/model/NALUnit.java diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/NALUnitType.java b/src/main/java/li/cil/oc2/jcodec/codecs/h264/io/model/NALUnitType.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/NALUnitType.java rename to src/main/java/li/cil/oc2/jcodec/codecs/h264/io/model/NALUnitType.java diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/PictureParameterSet.java b/src/main/java/li/cil/oc2/jcodec/codecs/h264/io/model/PictureParameterSet.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/PictureParameterSet.java rename to src/main/java/li/cil/oc2/jcodec/codecs/h264/io/model/PictureParameterSet.java diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/PredictionWeightTable.java b/src/main/java/li/cil/oc2/jcodec/codecs/h264/io/model/PredictionWeightTable.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/PredictionWeightTable.java rename to src/main/java/li/cil/oc2/jcodec/codecs/h264/io/model/PredictionWeightTable.java diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/RefPicMarking.java b/src/main/java/li/cil/oc2/jcodec/codecs/h264/io/model/RefPicMarking.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/RefPicMarking.java rename to src/main/java/li/cil/oc2/jcodec/codecs/h264/io/model/RefPicMarking.java diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/RefPicMarkingIDR.java b/src/main/java/li/cil/oc2/jcodec/codecs/h264/io/model/RefPicMarkingIDR.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/RefPicMarkingIDR.java rename to src/main/java/li/cil/oc2/jcodec/codecs/h264/io/model/RefPicMarkingIDR.java diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/SeqParameterSet.java b/src/main/java/li/cil/oc2/jcodec/codecs/h264/io/model/SeqParameterSet.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/SeqParameterSet.java rename to src/main/java/li/cil/oc2/jcodec/codecs/h264/io/model/SeqParameterSet.java diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/SliceHeader.java b/src/main/java/li/cil/oc2/jcodec/codecs/h264/io/model/SliceHeader.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/SliceHeader.java rename to src/main/java/li/cil/oc2/jcodec/codecs/h264/io/model/SliceHeader.java diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/SliceType.java b/src/main/java/li/cil/oc2/jcodec/codecs/h264/io/model/SliceType.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/SliceType.java rename to src/main/java/li/cil/oc2/jcodec/codecs/h264/io/model/SliceType.java diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/VUIParameters.java b/src/main/java/li/cil/oc2/jcodec/codecs/h264/io/model/VUIParameters.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/model/VUIParameters.java rename to src/main/java/li/cil/oc2/jcodec/codecs/h264/io/model/VUIParameters.java diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/write/CAVLCWriter.java b/src/main/java/li/cil/oc2/jcodec/codecs/h264/io/write/CAVLCWriter.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/write/CAVLCWriter.java rename to src/main/java/li/cil/oc2/jcodec/codecs/h264/io/write/CAVLCWriter.java diff --git a/src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/write/SliceHeaderWriter.java b/src/main/java/li/cil/oc2/jcodec/codecs/h264/io/write/SliceHeaderWriter.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/codecs/h264/io/write/SliceHeaderWriter.java rename to src/main/java/li/cil/oc2/jcodec/codecs/h264/io/write/SliceHeaderWriter.java diff --git a/src/main/java/li/cil/oc2r/jcodec/common/ArrayUtil.java b/src/main/java/li/cil/oc2/jcodec/common/ArrayUtil.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/common/ArrayUtil.java rename to src/main/java/li/cil/oc2/jcodec/common/ArrayUtil.java diff --git a/src/main/java/li/cil/oc2r/jcodec/common/IntArrayList.java b/src/main/java/li/cil/oc2/jcodec/common/IntArrayList.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/common/IntArrayList.java rename to src/main/java/li/cil/oc2/jcodec/common/IntArrayList.java diff --git a/src/main/java/li/cil/oc2r/jcodec/common/IntObjectMap.java b/src/main/java/li/cil/oc2/jcodec/common/IntObjectMap.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/common/IntObjectMap.java rename to src/main/java/li/cil/oc2/jcodec/common/IntObjectMap.java diff --git a/src/main/java/li/cil/oc2r/jcodec/common/VideoDecoder.java b/src/main/java/li/cil/oc2/jcodec/common/VideoDecoder.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/common/VideoDecoder.java rename to src/main/java/li/cil/oc2/jcodec/common/VideoDecoder.java diff --git a/src/main/java/li/cil/oc2r/jcodec/common/VideoEncoder.java b/src/main/java/li/cil/oc2/jcodec/common/VideoEncoder.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/common/VideoEncoder.java rename to src/main/java/li/cil/oc2/jcodec/common/VideoEncoder.java diff --git a/src/main/java/li/cil/oc2r/jcodec/common/io/BitReader.java b/src/main/java/li/cil/oc2/jcodec/common/io/BitReader.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/common/io/BitReader.java rename to src/main/java/li/cil/oc2/jcodec/common/io/BitReader.java diff --git a/src/main/java/li/cil/oc2r/jcodec/common/io/BitWriter.java b/src/main/java/li/cil/oc2/jcodec/common/io/BitWriter.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/common/io/BitWriter.java rename to src/main/java/li/cil/oc2/jcodec/common/io/BitWriter.java diff --git a/src/main/java/li/cil/oc2r/jcodec/common/io/VLC.java b/src/main/java/li/cil/oc2/jcodec/common/io/VLC.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/common/io/VLC.java rename to src/main/java/li/cil/oc2/jcodec/common/io/VLC.java diff --git a/src/main/java/li/cil/oc2r/jcodec/common/io/VLCBuilder.java b/src/main/java/li/cil/oc2/jcodec/common/io/VLCBuilder.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/common/io/VLCBuilder.java rename to src/main/java/li/cil/oc2/jcodec/common/io/VLCBuilder.java diff --git a/src/main/java/li/cil/oc2r/jcodec/common/model/ColorSpace.java b/src/main/java/li/cil/oc2/jcodec/common/model/ColorSpace.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/common/model/ColorSpace.java rename to src/main/java/li/cil/oc2/jcodec/common/model/ColorSpace.java diff --git a/src/main/java/li/cil/oc2r/jcodec/common/model/Picture.java b/src/main/java/li/cil/oc2/jcodec/common/model/Picture.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/common/model/Picture.java rename to src/main/java/li/cil/oc2/jcodec/common/model/Picture.java diff --git a/src/main/java/li/cil/oc2r/jcodec/common/model/Size.java b/src/main/java/li/cil/oc2/jcodec/common/model/Size.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/common/model/Size.java rename to src/main/java/li/cil/oc2/jcodec/common/model/Size.java diff --git a/src/main/java/li/cil/oc2r/jcodec/common/tools/MathUtil.java b/src/main/java/li/cil/oc2/jcodec/common/tools/MathUtil.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/common/tools/MathUtil.java rename to src/main/java/li/cil/oc2/jcodec/common/tools/MathUtil.java diff --git a/src/main/java/li/cil/oc2r/jcodec/scale/RgbToYuv420j.java b/src/main/java/li/cil/oc2/jcodec/scale/RgbToYuv420j.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/scale/RgbToYuv420j.java rename to src/main/java/li/cil/oc2/jcodec/scale/RgbToYuv420j.java diff --git a/src/main/java/li/cil/oc2r/jcodec/scale/Transform.java b/src/main/java/li/cil/oc2/jcodec/scale/Transform.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/scale/Transform.java rename to src/main/java/li/cil/oc2/jcodec/scale/Transform.java diff --git a/src/main/java/li/cil/oc2r/jcodec/scale/Yuv420jToRgb.java b/src/main/java/li/cil/oc2/jcodec/scale/Yuv420jToRgb.java similarity index 100% rename from src/main/java/li/cil/oc2r/jcodec/scale/Yuv420jToRgb.java rename to src/main/java/li/cil/oc2/jcodec/scale/Yuv420jToRgb.java diff --git a/src/main/resources/assets/oc2r/blockstates/bus_cable.json b/src/main/resources/assets/oc2/blockstates/bus_cable.json similarity index 100% rename from src/main/resources/assets/oc2r/blockstates/bus_cable.json rename to src/main/resources/assets/oc2/blockstates/bus_cable.json diff --git a/src/main/resources/assets/oc2r/blockstates/charger.json b/src/main/resources/assets/oc2/blockstates/charger.json similarity index 100% rename from src/main/resources/assets/oc2r/blockstates/charger.json rename to src/main/resources/assets/oc2/blockstates/charger.json diff --git a/src/main/resources/assets/oc2r/blockstates/computer.json b/src/main/resources/assets/oc2/blockstates/computer.json similarity index 100% rename from src/main/resources/assets/oc2r/blockstates/computer.json rename to src/main/resources/assets/oc2/blockstates/computer.json diff --git a/src/main/resources/assets/oc2r/blockstates/creative_energy.json b/src/main/resources/assets/oc2/blockstates/creative_energy.json similarity index 100% rename from src/main/resources/assets/oc2r/blockstates/creative_energy.json rename to src/main/resources/assets/oc2/blockstates/creative_energy.json diff --git a/src/main/resources/assets/oc2r/blockstates/disk_drive.json b/src/main/resources/assets/oc2/blockstates/disk_drive.json similarity index 100% rename from src/main/resources/assets/oc2r/blockstates/disk_drive.json rename to src/main/resources/assets/oc2/blockstates/disk_drive.json diff --git a/src/main/resources/assets/oc2r/blockstates/flash_memory_flasher.json b/src/main/resources/assets/oc2/blockstates/flash_memory_flasher.json similarity index 100% rename from src/main/resources/assets/oc2r/blockstates/flash_memory_flasher.json rename to src/main/resources/assets/oc2/blockstates/flash_memory_flasher.json diff --git a/src/main/resources/assets/oc2r/blockstates/keyboard.json b/src/main/resources/assets/oc2/blockstates/keyboard.json similarity index 100% rename from src/main/resources/assets/oc2r/blockstates/keyboard.json rename to src/main/resources/assets/oc2/blockstates/keyboard.json diff --git a/src/main/resources/assets/oc2r/blockstates/monitor.json b/src/main/resources/assets/oc2/blockstates/monitor.json similarity index 100% rename from src/main/resources/assets/oc2r/blockstates/monitor.json rename to src/main/resources/assets/oc2/blockstates/monitor.json diff --git a/src/main/resources/assets/oc2r/blockstates/network_connector.json b/src/main/resources/assets/oc2/blockstates/network_connector.json similarity index 100% rename from src/main/resources/assets/oc2r/blockstates/network_connector.json rename to src/main/resources/assets/oc2/blockstates/network_connector.json diff --git a/src/main/resources/assets/oc2r/blockstates/network_hub.json b/src/main/resources/assets/oc2/blockstates/network_hub.json similarity index 100% rename from src/main/resources/assets/oc2r/blockstates/network_hub.json rename to src/main/resources/assets/oc2/blockstates/network_hub.json diff --git a/src/main/resources/assets/oc2r/blockstates/network_switch.json b/src/main/resources/assets/oc2/blockstates/network_switch.json similarity index 100% rename from src/main/resources/assets/oc2r/blockstates/network_switch.json rename to src/main/resources/assets/oc2/blockstates/network_switch.json diff --git a/src/main/resources/assets/oc2r/blockstates/pci_card_cage.json b/src/main/resources/assets/oc2/blockstates/pci_card_cage.json similarity index 100% rename from src/main/resources/assets/oc2r/blockstates/pci_card_cage.json rename to src/main/resources/assets/oc2/blockstates/pci_card_cage.json diff --git a/src/main/resources/assets/oc2r/blockstates/projector.json b/src/main/resources/assets/oc2/blockstates/projector.json similarity index 100% rename from src/main/resources/assets/oc2r/blockstates/projector.json rename to src/main/resources/assets/oc2/blockstates/projector.json diff --git a/src/main/resources/assets/oc2r/blockstates/redstone_interface.json b/src/main/resources/assets/oc2/blockstates/redstone_interface.json similarity index 100% rename from src/main/resources/assets/oc2r/blockstates/redstone_interface.json rename to src/main/resources/assets/oc2/blockstates/redstone_interface.json diff --git a/src/main/resources/assets/oc2r/blockstates/vxlan_hub.json b/src/main/resources/assets/oc2/blockstates/vxlan_hub.json similarity index 100% rename from src/main/resources/assets/oc2r/blockstates/vxlan_hub.json rename to src/main/resources/assets/oc2/blockstates/vxlan_hub.json diff --git a/src/main/resources/assets/oc2r/doc/en_us/basics.md b/src/main/resources/assets/oc2/doc/en_us/basics.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/en_us/basics.md rename to src/main/resources/assets/oc2/doc/en_us/basics.md diff --git a/src/main/resources/assets/oc2r/doc/en_us/block/bus_cable.md b/src/main/resources/assets/oc2/doc/en_us/block/bus_cable.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/en_us/block/bus_cable.md rename to src/main/resources/assets/oc2/doc/en_us/block/bus_cable.md diff --git a/src/main/resources/assets/oc2r/doc/en_us/block/bus_interface.md b/src/main/resources/assets/oc2/doc/en_us/block/bus_interface.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/en_us/block/bus_interface.md rename to src/main/resources/assets/oc2/doc/en_us/block/bus_interface.md diff --git a/src/main/resources/assets/oc2r/doc/en_us/block/charger.md b/src/main/resources/assets/oc2/doc/en_us/block/charger.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/en_us/block/charger.md rename to src/main/resources/assets/oc2/doc/en_us/block/charger.md diff --git a/src/main/resources/assets/oc2r/doc/en_us/block/computer.md b/src/main/resources/assets/oc2/doc/en_us/block/computer.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/en_us/block/computer.md rename to src/main/resources/assets/oc2/doc/en_us/block/computer.md diff --git a/src/main/resources/assets/oc2r/doc/en_us/block/disk_drive.md b/src/main/resources/assets/oc2/doc/en_us/block/disk_drive.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/en_us/block/disk_drive.md rename to src/main/resources/assets/oc2/doc/en_us/block/disk_drive.md diff --git a/src/main/resources/assets/oc2r/doc/en_us/block/flash_memory_flasher.md b/src/main/resources/assets/oc2/doc/en_us/block/flash_memory_flasher.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/en_us/block/flash_memory_flasher.md rename to src/main/resources/assets/oc2/doc/en_us/block/flash_memory_flasher.md diff --git a/src/main/resources/assets/oc2r/doc/en_us/block/index.md b/src/main/resources/assets/oc2/doc/en_us/block/index.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/en_us/block/index.md rename to src/main/resources/assets/oc2/doc/en_us/block/index.md diff --git a/src/main/resources/assets/oc2r/doc/en_us/block/keyboard.md b/src/main/resources/assets/oc2/doc/en_us/block/keyboard.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/en_us/block/keyboard.md rename to src/main/resources/assets/oc2/doc/en_us/block/keyboard.md diff --git a/src/main/resources/assets/oc2r/doc/en_us/block/monitor.md b/src/main/resources/assets/oc2/doc/en_us/block/monitor.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/en_us/block/monitor.md rename to src/main/resources/assets/oc2/doc/en_us/block/monitor.md diff --git a/src/main/resources/assets/oc2r/doc/en_us/block/network_connector.md b/src/main/resources/assets/oc2/doc/en_us/block/network_connector.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/en_us/block/network_connector.md rename to src/main/resources/assets/oc2/doc/en_us/block/network_connector.md diff --git a/src/main/resources/assets/oc2r/doc/en_us/block/network_hub.md b/src/main/resources/assets/oc2/doc/en_us/block/network_hub.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/en_us/block/network_hub.md rename to src/main/resources/assets/oc2/doc/en_us/block/network_hub.md diff --git a/src/main/resources/assets/oc2r/doc/en_us/block/projector.md b/src/main/resources/assets/oc2/doc/en_us/block/projector.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/en_us/block/projector.md rename to src/main/resources/assets/oc2/doc/en_us/block/projector.md diff --git a/src/main/resources/assets/oc2r/doc/en_us/block/redstone_interface.md b/src/main/resources/assets/oc2/doc/en_us/block/redstone_interface.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/en_us/block/redstone_interface.md rename to src/main/resources/assets/oc2/doc/en_us/block/redstone_interface.md diff --git a/src/main/resources/assets/oc2r/doc/en_us/getting_started.md b/src/main/resources/assets/oc2/doc/en_us/getting_started.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/en_us/getting_started.md rename to src/main/resources/assets/oc2/doc/en_us/getting_started.md diff --git a/src/main/resources/assets/oc2r/doc/en_us/index.md b/src/main/resources/assets/oc2/doc/en_us/index.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/en_us/index.md rename to src/main/resources/assets/oc2/doc/en_us/index.md diff --git a/src/main/resources/assets/oc2r/doc/en_us/item/block_operations_module.md b/src/main/resources/assets/oc2/doc/en_us/item/block_operations_module.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/en_us/item/block_operations_module.md rename to src/main/resources/assets/oc2/doc/en_us/item/block_operations_module.md diff --git a/src/main/resources/assets/oc2r/doc/en_us/item/file_import_export_card.md b/src/main/resources/assets/oc2/doc/en_us/item/file_import_export_card.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/en_us/item/file_import_export_card.md rename to src/main/resources/assets/oc2/doc/en_us/item/file_import_export_card.md diff --git a/src/main/resources/assets/oc2r/doc/en_us/item/flash_memory.md b/src/main/resources/assets/oc2/doc/en_us/item/flash_memory.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/en_us/item/flash_memory.md rename to src/main/resources/assets/oc2/doc/en_us/item/flash_memory.md diff --git a/src/main/resources/assets/oc2r/doc/en_us/item/floppy.md b/src/main/resources/assets/oc2/doc/en_us/item/floppy.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/en_us/item/floppy.md rename to src/main/resources/assets/oc2/doc/en_us/item/floppy.md diff --git a/src/main/resources/assets/oc2r/doc/en_us/item/hard_drive.md b/src/main/resources/assets/oc2/doc/en_us/item/hard_drive.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/en_us/item/hard_drive.md rename to src/main/resources/assets/oc2/doc/en_us/item/hard_drive.md diff --git a/src/main/resources/assets/oc2r/doc/en_us/item/index.md b/src/main/resources/assets/oc2/doc/en_us/item/index.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/en_us/item/index.md rename to src/main/resources/assets/oc2/doc/en_us/item/index.md diff --git a/src/main/resources/assets/oc2r/doc/en_us/item/inventory_operations_module.md b/src/main/resources/assets/oc2/doc/en_us/item/inventory_operations_module.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/en_us/item/inventory_operations_module.md rename to src/main/resources/assets/oc2/doc/en_us/item/inventory_operations_module.md diff --git a/src/main/resources/assets/oc2r/doc/en_us/item/manual.md b/src/main/resources/assets/oc2/doc/en_us/item/manual.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/en_us/item/manual.md rename to src/main/resources/assets/oc2/doc/en_us/item/manual.md diff --git a/src/main/resources/assets/oc2r/doc/en_us/item/memory.md b/src/main/resources/assets/oc2/doc/en_us/item/memory.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/en_us/item/memory.md rename to src/main/resources/assets/oc2/doc/en_us/item/memory.md diff --git a/src/main/resources/assets/oc2r/doc/en_us/item/network_cable.md b/src/main/resources/assets/oc2/doc/en_us/item/network_cable.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/en_us/item/network_cable.md rename to src/main/resources/assets/oc2/doc/en_us/item/network_cable.md diff --git a/src/main/resources/assets/oc2r/doc/en_us/item/network_interface_card.md b/src/main/resources/assets/oc2/doc/en_us/item/network_interface_card.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/en_us/item/network_interface_card.md rename to src/main/resources/assets/oc2/doc/en_us/item/network_interface_card.md diff --git a/src/main/resources/assets/oc2r/doc/en_us/item/network_tunnel_card.md b/src/main/resources/assets/oc2/doc/en_us/item/network_tunnel_card.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/en_us/item/network_tunnel_card.md rename to src/main/resources/assets/oc2/doc/en_us/item/network_tunnel_card.md diff --git a/src/main/resources/assets/oc2r/doc/en_us/item/network_tunnel_module.md b/src/main/resources/assets/oc2/doc/en_us/item/network_tunnel_module.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/en_us/item/network_tunnel_module.md rename to src/main/resources/assets/oc2/doc/en_us/item/network_tunnel_module.md diff --git a/src/main/resources/assets/oc2r/doc/en_us/item/redstone_interface_card.md b/src/main/resources/assets/oc2/doc/en_us/item/redstone_interface_card.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/en_us/item/redstone_interface_card.md rename to src/main/resources/assets/oc2/doc/en_us/item/redstone_interface_card.md diff --git a/src/main/resources/assets/oc2r/doc/en_us/item/robot.md b/src/main/resources/assets/oc2/doc/en_us/item/robot.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/en_us/item/robot.md rename to src/main/resources/assets/oc2/doc/en_us/item/robot.md diff --git a/src/main/resources/assets/oc2r/doc/en_us/item/sound_card.md b/src/main/resources/assets/oc2/doc/en_us/item/sound_card.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/en_us/item/sound_card.md rename to src/main/resources/assets/oc2/doc/en_us/item/sound_card.md diff --git a/src/main/resources/assets/oc2r/doc/en_us/item/wrench.md b/src/main/resources/assets/oc2/doc/en_us/item/wrench.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/en_us/item/wrench.md rename to src/main/resources/assets/oc2/doc/en_us/item/wrench.md diff --git a/src/main/resources/assets/oc2r/doc/en_us/networking.md b/src/main/resources/assets/oc2/doc/en_us/networking.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/en_us/networking.md rename to src/main/resources/assets/oc2/doc/en_us/networking.md diff --git a/src/main/resources/assets/oc2r/doc/en_us/robotics.md b/src/main/resources/assets/oc2/doc/en_us/robotics.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/en_us/robotics.md rename to src/main/resources/assets/oc2/doc/en_us/robotics.md diff --git a/src/main/resources/assets/oc2r/doc/en_us/scripting.md b/src/main/resources/assets/oc2/doc/en_us/scripting.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/en_us/scripting.md rename to src/main/resources/assets/oc2/doc/en_us/scripting.md diff --git a/src/main/resources/assets/oc2r/doc/img/getting_started_basics.png b/src/main/resources/assets/oc2/doc/img/getting_started_basics.png similarity index 100% rename from src/main/resources/assets/oc2r/doc/img/getting_started_basics.png rename to src/main/resources/assets/oc2/doc/img/getting_started_basics.png diff --git a/src/main/resources/assets/oc2r/doc/img/getting_started_energy.png b/src/main/resources/assets/oc2/doc/img/getting_started_energy.png similarity index 100% rename from src/main/resources/assets/oc2r/doc/img/getting_started_energy.png rename to src/main/resources/assets/oc2/doc/img/getting_started_energy.png diff --git a/src/main/resources/assets/oc2r/doc/img/getting_started_inventory.png b/src/main/resources/assets/oc2/doc/img/getting_started_inventory.png similarity index 100% rename from src/main/resources/assets/oc2r/doc/img/getting_started_inventory.png rename to src/main/resources/assets/oc2/doc/img/getting_started_inventory.png diff --git a/src/main/resources/assets/oc2r/doc/img/getting_started_login.png b/src/main/resources/assets/oc2/doc/img/getting_started_login.png similarity index 100% rename from src/main/resources/assets/oc2r/doc/img/getting_started_login.png rename to src/main/resources/assets/oc2/doc/img/getting_started_login.png diff --git a/src/main/resources/assets/oc2r/doc/img/scripting_lamp.png b/src/main/resources/assets/oc2/doc/img/scripting_lamp.png similarity index 100% rename from src/main/resources/assets/oc2r/doc/img/scripting_lamp.png rename to src/main/resources/assets/oc2/doc/img/scripting_lamp.png diff --git a/src/main/resources/assets/oc2r/doc/img/scripting_lua_interactive.png b/src/main/resources/assets/oc2/doc/img/scripting_lua_interactive.png similarity index 100% rename from src/main/resources/assets/oc2r/doc/img/scripting_lua_interactive.png rename to src/main/resources/assets/oc2/doc/img/scripting_lua_interactive.png diff --git a/src/main/resources/assets/oc2r/doc/img/scripting_redstone_interface.png b/src/main/resources/assets/oc2/doc/img/scripting_redstone_interface.png similarity index 100% rename from src/main/resources/assets/oc2r/doc/img/scripting_redstone_interface.png rename to src/main/resources/assets/oc2/doc/img/scripting_redstone_interface.png diff --git a/src/main/resources/assets/oc2r/doc/ru_ru/basics.md b/src/main/resources/assets/oc2/doc/ru_ru/basics.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/ru_ru/basics.md rename to src/main/resources/assets/oc2/doc/ru_ru/basics.md diff --git a/src/main/resources/assets/oc2r/doc/ru_ru/block/bus_cable.md b/src/main/resources/assets/oc2/doc/ru_ru/block/bus_cable.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/ru_ru/block/bus_cable.md rename to src/main/resources/assets/oc2/doc/ru_ru/block/bus_cable.md diff --git a/src/main/resources/assets/oc2r/doc/ru_ru/block/bus_interface.md b/src/main/resources/assets/oc2/doc/ru_ru/block/bus_interface.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/ru_ru/block/bus_interface.md rename to src/main/resources/assets/oc2/doc/ru_ru/block/bus_interface.md diff --git a/src/main/resources/assets/oc2r/doc/ru_ru/block/charger.md b/src/main/resources/assets/oc2/doc/ru_ru/block/charger.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/ru_ru/block/charger.md rename to src/main/resources/assets/oc2/doc/ru_ru/block/charger.md diff --git a/src/main/resources/assets/oc2r/doc/ru_ru/block/computer.md b/src/main/resources/assets/oc2/doc/ru_ru/block/computer.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/ru_ru/block/computer.md rename to src/main/resources/assets/oc2/doc/ru_ru/block/computer.md diff --git a/src/main/resources/assets/oc2r/doc/ru_ru/block/disk_drive.md b/src/main/resources/assets/oc2/doc/ru_ru/block/disk_drive.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/ru_ru/block/disk_drive.md rename to src/main/resources/assets/oc2/doc/ru_ru/block/disk_drive.md diff --git a/src/main/resources/assets/oc2r/doc/ru_ru/block/flash_memory_flasher.md b/src/main/resources/assets/oc2/doc/ru_ru/block/flash_memory_flasher.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/ru_ru/block/flash_memory_flasher.md rename to src/main/resources/assets/oc2/doc/ru_ru/block/flash_memory_flasher.md diff --git a/src/main/resources/assets/oc2r/doc/ru_ru/block/index.md b/src/main/resources/assets/oc2/doc/ru_ru/block/index.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/ru_ru/block/index.md rename to src/main/resources/assets/oc2/doc/ru_ru/block/index.md diff --git a/src/main/resources/assets/oc2r/doc/ru_ru/block/keyboard.md b/src/main/resources/assets/oc2/doc/ru_ru/block/keyboard.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/ru_ru/block/keyboard.md rename to src/main/resources/assets/oc2/doc/ru_ru/block/keyboard.md diff --git a/src/main/resources/assets/oc2r/doc/ru_ru/block/monitor.md b/src/main/resources/assets/oc2/doc/ru_ru/block/monitor.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/ru_ru/block/monitor.md rename to src/main/resources/assets/oc2/doc/ru_ru/block/monitor.md diff --git a/src/main/resources/assets/oc2r/doc/ru_ru/block/network_connector.md b/src/main/resources/assets/oc2/doc/ru_ru/block/network_connector.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/ru_ru/block/network_connector.md rename to src/main/resources/assets/oc2/doc/ru_ru/block/network_connector.md diff --git a/src/main/resources/assets/oc2r/doc/ru_ru/block/network_hub.md b/src/main/resources/assets/oc2/doc/ru_ru/block/network_hub.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/ru_ru/block/network_hub.md rename to src/main/resources/assets/oc2/doc/ru_ru/block/network_hub.md diff --git a/src/main/resources/assets/oc2r/doc/ru_ru/block/projector.md b/src/main/resources/assets/oc2/doc/ru_ru/block/projector.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/ru_ru/block/projector.md rename to src/main/resources/assets/oc2/doc/ru_ru/block/projector.md diff --git a/src/main/resources/assets/oc2r/doc/ru_ru/block/redstone_interface.md b/src/main/resources/assets/oc2/doc/ru_ru/block/redstone_interface.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/ru_ru/block/redstone_interface.md rename to src/main/resources/assets/oc2/doc/ru_ru/block/redstone_interface.md diff --git a/src/main/resources/assets/oc2r/doc/ru_ru/getting_started.md b/src/main/resources/assets/oc2/doc/ru_ru/getting_started.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/ru_ru/getting_started.md rename to src/main/resources/assets/oc2/doc/ru_ru/getting_started.md diff --git a/src/main/resources/assets/oc2r/doc/ru_ru/index.md b/src/main/resources/assets/oc2/doc/ru_ru/index.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/ru_ru/index.md rename to src/main/resources/assets/oc2/doc/ru_ru/index.md diff --git a/src/main/resources/assets/oc2r/doc/ru_ru/item/block_operations_module.md b/src/main/resources/assets/oc2/doc/ru_ru/item/block_operations_module.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/ru_ru/item/block_operations_module.md rename to src/main/resources/assets/oc2/doc/ru_ru/item/block_operations_module.md diff --git a/src/main/resources/assets/oc2r/doc/ru_ru/item/file_import_export_card.md b/src/main/resources/assets/oc2/doc/ru_ru/item/file_import_export_card.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/ru_ru/item/file_import_export_card.md rename to src/main/resources/assets/oc2/doc/ru_ru/item/file_import_export_card.md diff --git a/src/main/resources/assets/oc2r/doc/ru_ru/item/flash_memory.md b/src/main/resources/assets/oc2/doc/ru_ru/item/flash_memory.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/ru_ru/item/flash_memory.md rename to src/main/resources/assets/oc2/doc/ru_ru/item/flash_memory.md diff --git a/src/main/resources/assets/oc2r/doc/ru_ru/item/floppy.md b/src/main/resources/assets/oc2/doc/ru_ru/item/floppy.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/ru_ru/item/floppy.md rename to src/main/resources/assets/oc2/doc/ru_ru/item/floppy.md diff --git a/src/main/resources/assets/oc2r/doc/ru_ru/item/hard_drive.md b/src/main/resources/assets/oc2/doc/ru_ru/item/hard_drive.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/ru_ru/item/hard_drive.md rename to src/main/resources/assets/oc2/doc/ru_ru/item/hard_drive.md diff --git a/src/main/resources/assets/oc2r/doc/ru_ru/item/index.md b/src/main/resources/assets/oc2/doc/ru_ru/item/index.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/ru_ru/item/index.md rename to src/main/resources/assets/oc2/doc/ru_ru/item/index.md diff --git a/src/main/resources/assets/oc2r/doc/ru_ru/item/inventory_operations_module.md b/src/main/resources/assets/oc2/doc/ru_ru/item/inventory_operations_module.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/ru_ru/item/inventory_operations_module.md rename to src/main/resources/assets/oc2/doc/ru_ru/item/inventory_operations_module.md diff --git a/src/main/resources/assets/oc2r/doc/ru_ru/item/manual.md b/src/main/resources/assets/oc2/doc/ru_ru/item/manual.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/ru_ru/item/manual.md rename to src/main/resources/assets/oc2/doc/ru_ru/item/manual.md diff --git a/src/main/resources/assets/oc2r/doc/ru_ru/item/memory.md b/src/main/resources/assets/oc2/doc/ru_ru/item/memory.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/ru_ru/item/memory.md rename to src/main/resources/assets/oc2/doc/ru_ru/item/memory.md diff --git a/src/main/resources/assets/oc2r/doc/ru_ru/item/network_cable.md b/src/main/resources/assets/oc2/doc/ru_ru/item/network_cable.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/ru_ru/item/network_cable.md rename to src/main/resources/assets/oc2/doc/ru_ru/item/network_cable.md diff --git a/src/main/resources/assets/oc2r/doc/ru_ru/item/network_interface_card.md b/src/main/resources/assets/oc2/doc/ru_ru/item/network_interface_card.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/ru_ru/item/network_interface_card.md rename to src/main/resources/assets/oc2/doc/ru_ru/item/network_interface_card.md diff --git a/src/main/resources/assets/oc2r/doc/ru_ru/item/network_tunnel_card.md b/src/main/resources/assets/oc2/doc/ru_ru/item/network_tunnel_card.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/ru_ru/item/network_tunnel_card.md rename to src/main/resources/assets/oc2/doc/ru_ru/item/network_tunnel_card.md diff --git a/src/main/resources/assets/oc2r/doc/ru_ru/item/network_tunnel_module.md b/src/main/resources/assets/oc2/doc/ru_ru/item/network_tunnel_module.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/ru_ru/item/network_tunnel_module.md rename to src/main/resources/assets/oc2/doc/ru_ru/item/network_tunnel_module.md diff --git a/src/main/resources/assets/oc2r/doc/ru_ru/item/redstone_interface_card.md b/src/main/resources/assets/oc2/doc/ru_ru/item/redstone_interface_card.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/ru_ru/item/redstone_interface_card.md rename to src/main/resources/assets/oc2/doc/ru_ru/item/redstone_interface_card.md diff --git a/src/main/resources/assets/oc2r/doc/ru_ru/item/robot.md b/src/main/resources/assets/oc2/doc/ru_ru/item/robot.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/ru_ru/item/robot.md rename to src/main/resources/assets/oc2/doc/ru_ru/item/robot.md diff --git a/src/main/resources/assets/oc2r/doc/ru_ru/item/sound_card.md b/src/main/resources/assets/oc2/doc/ru_ru/item/sound_card.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/ru_ru/item/sound_card.md rename to src/main/resources/assets/oc2/doc/ru_ru/item/sound_card.md diff --git a/src/main/resources/assets/oc2r/doc/ru_ru/item/wrench.md b/src/main/resources/assets/oc2/doc/ru_ru/item/wrench.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/ru_ru/item/wrench.md rename to src/main/resources/assets/oc2/doc/ru_ru/item/wrench.md diff --git a/src/main/resources/assets/oc2r/doc/ru_ru/networking.md b/src/main/resources/assets/oc2/doc/ru_ru/networking.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/ru_ru/networking.md rename to src/main/resources/assets/oc2/doc/ru_ru/networking.md diff --git a/src/main/resources/assets/oc2r/doc/ru_ru/robotics.md b/src/main/resources/assets/oc2/doc/ru_ru/robotics.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/ru_ru/robotics.md rename to src/main/resources/assets/oc2/doc/ru_ru/robotics.md diff --git a/src/main/resources/assets/oc2r/doc/ru_ru/scripting.md b/src/main/resources/assets/oc2/doc/ru_ru/scripting.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/ru_ru/scripting.md rename to src/main/resources/assets/oc2/doc/ru_ru/scripting.md diff --git a/src/main/resources/assets/oc2r/doc/zh_cn/basics.md b/src/main/resources/assets/oc2/doc/zh_cn/basics.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/zh_cn/basics.md rename to src/main/resources/assets/oc2/doc/zh_cn/basics.md diff --git a/src/main/resources/assets/oc2r/doc/zh_cn/block/bus_cable.md b/src/main/resources/assets/oc2/doc/zh_cn/block/bus_cable.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/zh_cn/block/bus_cable.md rename to src/main/resources/assets/oc2/doc/zh_cn/block/bus_cable.md diff --git a/src/main/resources/assets/oc2r/doc/zh_cn/block/bus_interface.md b/src/main/resources/assets/oc2/doc/zh_cn/block/bus_interface.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/zh_cn/block/bus_interface.md rename to src/main/resources/assets/oc2/doc/zh_cn/block/bus_interface.md diff --git a/src/main/resources/assets/oc2r/doc/zh_cn/block/charger.md b/src/main/resources/assets/oc2/doc/zh_cn/block/charger.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/zh_cn/block/charger.md rename to src/main/resources/assets/oc2/doc/zh_cn/block/charger.md diff --git a/src/main/resources/assets/oc2r/doc/zh_cn/block/computer.md b/src/main/resources/assets/oc2/doc/zh_cn/block/computer.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/zh_cn/block/computer.md rename to src/main/resources/assets/oc2/doc/zh_cn/block/computer.md diff --git a/src/main/resources/assets/oc2r/doc/zh_cn/block/disk_drive.md b/src/main/resources/assets/oc2/doc/zh_cn/block/disk_drive.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/zh_cn/block/disk_drive.md rename to src/main/resources/assets/oc2/doc/zh_cn/block/disk_drive.md diff --git a/src/main/resources/assets/oc2r/doc/zh_cn/block/flash_memory_flasher.md b/src/main/resources/assets/oc2/doc/zh_cn/block/flash_memory_flasher.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/zh_cn/block/flash_memory_flasher.md rename to src/main/resources/assets/oc2/doc/zh_cn/block/flash_memory_flasher.md diff --git a/src/main/resources/assets/oc2r/doc/zh_cn/block/index.md b/src/main/resources/assets/oc2/doc/zh_cn/block/index.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/zh_cn/block/index.md rename to src/main/resources/assets/oc2/doc/zh_cn/block/index.md diff --git a/src/main/resources/assets/oc2r/doc/zh_cn/block/keyboard.md b/src/main/resources/assets/oc2/doc/zh_cn/block/keyboard.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/zh_cn/block/keyboard.md rename to src/main/resources/assets/oc2/doc/zh_cn/block/keyboard.md diff --git a/src/main/resources/assets/oc2r/doc/zh_cn/block/monitor.md b/src/main/resources/assets/oc2/doc/zh_cn/block/monitor.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/zh_cn/block/monitor.md rename to src/main/resources/assets/oc2/doc/zh_cn/block/monitor.md diff --git a/src/main/resources/assets/oc2r/doc/zh_cn/block/network_connector.md b/src/main/resources/assets/oc2/doc/zh_cn/block/network_connector.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/zh_cn/block/network_connector.md rename to src/main/resources/assets/oc2/doc/zh_cn/block/network_connector.md diff --git a/src/main/resources/assets/oc2r/doc/zh_cn/block/network_hub.md b/src/main/resources/assets/oc2/doc/zh_cn/block/network_hub.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/zh_cn/block/network_hub.md rename to src/main/resources/assets/oc2/doc/zh_cn/block/network_hub.md diff --git a/src/main/resources/assets/oc2r/doc/zh_cn/block/projector.md b/src/main/resources/assets/oc2/doc/zh_cn/block/projector.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/zh_cn/block/projector.md rename to src/main/resources/assets/oc2/doc/zh_cn/block/projector.md diff --git a/src/main/resources/assets/oc2r/doc/zh_cn/block/redstone_interface.md b/src/main/resources/assets/oc2/doc/zh_cn/block/redstone_interface.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/zh_cn/block/redstone_interface.md rename to src/main/resources/assets/oc2/doc/zh_cn/block/redstone_interface.md diff --git a/src/main/resources/assets/oc2r/doc/zh_cn/getting_started.md b/src/main/resources/assets/oc2/doc/zh_cn/getting_started.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/zh_cn/getting_started.md rename to src/main/resources/assets/oc2/doc/zh_cn/getting_started.md diff --git a/src/main/resources/assets/oc2r/doc/zh_cn/index.md b/src/main/resources/assets/oc2/doc/zh_cn/index.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/zh_cn/index.md rename to src/main/resources/assets/oc2/doc/zh_cn/index.md diff --git a/src/main/resources/assets/oc2r/doc/zh_cn/item/block_operations_module.md b/src/main/resources/assets/oc2/doc/zh_cn/item/block_operations_module.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/zh_cn/item/block_operations_module.md rename to src/main/resources/assets/oc2/doc/zh_cn/item/block_operations_module.md diff --git a/src/main/resources/assets/oc2r/doc/zh_cn/item/file_import_export_card.md b/src/main/resources/assets/oc2/doc/zh_cn/item/file_import_export_card.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/zh_cn/item/file_import_export_card.md rename to src/main/resources/assets/oc2/doc/zh_cn/item/file_import_export_card.md diff --git a/src/main/resources/assets/oc2r/doc/zh_cn/item/flash_memory.md b/src/main/resources/assets/oc2/doc/zh_cn/item/flash_memory.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/zh_cn/item/flash_memory.md rename to src/main/resources/assets/oc2/doc/zh_cn/item/flash_memory.md diff --git a/src/main/resources/assets/oc2r/doc/zh_cn/item/floppy.md b/src/main/resources/assets/oc2/doc/zh_cn/item/floppy.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/zh_cn/item/floppy.md rename to src/main/resources/assets/oc2/doc/zh_cn/item/floppy.md diff --git a/src/main/resources/assets/oc2r/doc/zh_cn/item/hard_drive.md b/src/main/resources/assets/oc2/doc/zh_cn/item/hard_drive.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/zh_cn/item/hard_drive.md rename to src/main/resources/assets/oc2/doc/zh_cn/item/hard_drive.md diff --git a/src/main/resources/assets/oc2r/doc/zh_cn/item/index.md b/src/main/resources/assets/oc2/doc/zh_cn/item/index.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/zh_cn/item/index.md rename to src/main/resources/assets/oc2/doc/zh_cn/item/index.md diff --git a/src/main/resources/assets/oc2r/doc/zh_cn/item/inventory_operations_module.md b/src/main/resources/assets/oc2/doc/zh_cn/item/inventory_operations_module.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/zh_cn/item/inventory_operations_module.md rename to src/main/resources/assets/oc2/doc/zh_cn/item/inventory_operations_module.md diff --git a/src/main/resources/assets/oc2r/doc/zh_cn/item/manual.md b/src/main/resources/assets/oc2/doc/zh_cn/item/manual.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/zh_cn/item/manual.md rename to src/main/resources/assets/oc2/doc/zh_cn/item/manual.md diff --git a/src/main/resources/assets/oc2r/doc/zh_cn/item/memory.md b/src/main/resources/assets/oc2/doc/zh_cn/item/memory.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/zh_cn/item/memory.md rename to src/main/resources/assets/oc2/doc/zh_cn/item/memory.md diff --git a/src/main/resources/assets/oc2r/doc/zh_cn/item/network_cable.md b/src/main/resources/assets/oc2/doc/zh_cn/item/network_cable.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/zh_cn/item/network_cable.md rename to src/main/resources/assets/oc2/doc/zh_cn/item/network_cable.md diff --git a/src/main/resources/assets/oc2r/doc/zh_cn/item/network_interface_card.md b/src/main/resources/assets/oc2/doc/zh_cn/item/network_interface_card.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/zh_cn/item/network_interface_card.md rename to src/main/resources/assets/oc2/doc/zh_cn/item/network_interface_card.md diff --git a/src/main/resources/assets/oc2r/doc/zh_cn/item/network_tunnel_card.md b/src/main/resources/assets/oc2/doc/zh_cn/item/network_tunnel_card.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/zh_cn/item/network_tunnel_card.md rename to src/main/resources/assets/oc2/doc/zh_cn/item/network_tunnel_card.md diff --git a/src/main/resources/assets/oc2r/doc/zh_cn/item/network_tunnel_module.md b/src/main/resources/assets/oc2/doc/zh_cn/item/network_tunnel_module.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/zh_cn/item/network_tunnel_module.md rename to src/main/resources/assets/oc2/doc/zh_cn/item/network_tunnel_module.md diff --git a/src/main/resources/assets/oc2r/doc/zh_cn/item/redstone_interface_card.md b/src/main/resources/assets/oc2/doc/zh_cn/item/redstone_interface_card.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/zh_cn/item/redstone_interface_card.md rename to src/main/resources/assets/oc2/doc/zh_cn/item/redstone_interface_card.md diff --git a/src/main/resources/assets/oc2r/doc/zh_cn/item/robot.md b/src/main/resources/assets/oc2/doc/zh_cn/item/robot.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/zh_cn/item/robot.md rename to src/main/resources/assets/oc2/doc/zh_cn/item/robot.md diff --git a/src/main/resources/assets/oc2r/doc/zh_cn/item/sound_card.md b/src/main/resources/assets/oc2/doc/zh_cn/item/sound_card.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/zh_cn/item/sound_card.md rename to src/main/resources/assets/oc2/doc/zh_cn/item/sound_card.md diff --git a/src/main/resources/assets/oc2r/doc/zh_cn/item/wrench.md b/src/main/resources/assets/oc2/doc/zh_cn/item/wrench.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/zh_cn/item/wrench.md rename to src/main/resources/assets/oc2/doc/zh_cn/item/wrench.md diff --git a/src/main/resources/assets/oc2r/doc/zh_cn/networking.md b/src/main/resources/assets/oc2/doc/zh_cn/networking.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/zh_cn/networking.md rename to src/main/resources/assets/oc2/doc/zh_cn/networking.md diff --git a/src/main/resources/assets/oc2r/doc/zh_cn/robotics.md b/src/main/resources/assets/oc2/doc/zh_cn/robotics.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/zh_cn/robotics.md rename to src/main/resources/assets/oc2/doc/zh_cn/robotics.md diff --git a/src/main/resources/assets/oc2r/doc/zh_cn/scripting.md b/src/main/resources/assets/oc2/doc/zh_cn/scripting.md similarity index 100% rename from src/main/resources/assets/oc2r/doc/zh_cn/scripting.md rename to src/main/resources/assets/oc2/doc/zh_cn/scripting.md diff --git a/src/main/resources/assets/oc2r/lang/en_us.json b/src/main/resources/assets/oc2/lang/en_us.json similarity index 100% rename from src/main/resources/assets/oc2r/lang/en_us.json rename to src/main/resources/assets/oc2/lang/en_us.json diff --git a/src/main/resources/assets/oc2r/lang/ru_ru.json b/src/main/resources/assets/oc2/lang/ru_ru.json similarity index 100% rename from src/main/resources/assets/oc2r/lang/ru_ru.json rename to src/main/resources/assets/oc2/lang/ru_ru.json diff --git a/src/main/resources/assets/oc2r/lang/zh_cn.json b/src/main/resources/assets/oc2/lang/zh_cn.json similarity index 100% rename from src/main/resources/assets/oc2r/lang/zh_cn.json rename to src/main/resources/assets/oc2/lang/zh_cn.json diff --git a/src/main/resources/assets/oc2r/models/block/cable_base.json b/src/main/resources/assets/oc2/models/block/cable_base.json similarity index 100% rename from src/main/resources/assets/oc2r/models/block/cable_base.json rename to src/main/resources/assets/oc2/models/block/cable_base.json diff --git a/src/main/resources/assets/oc2r/models/block/cable_link.json b/src/main/resources/assets/oc2/models/block/cable_link.json similarity index 100% rename from src/main/resources/assets/oc2r/models/block/cable_link.json rename to src/main/resources/assets/oc2/models/block/cable_link.json diff --git a/src/main/resources/assets/oc2r/models/block/cable_plug.json b/src/main/resources/assets/oc2/models/block/cable_plug.json similarity index 100% rename from src/main/resources/assets/oc2r/models/block/cable_plug.json rename to src/main/resources/assets/oc2/models/block/cable_plug.json diff --git a/src/main/resources/assets/oc2r/models/block/cable_straight.json b/src/main/resources/assets/oc2/models/block/cable_straight.json similarity index 100% rename from src/main/resources/assets/oc2r/models/block/cable_straight.json rename to src/main/resources/assets/oc2/models/block/cable_straight.json diff --git a/src/main/resources/assets/oc2r/models/block/cable_support.json b/src/main/resources/assets/oc2/models/block/cable_support.json similarity index 100% rename from src/main/resources/assets/oc2r/models/block/cable_support.json rename to src/main/resources/assets/oc2/models/block/cable_support.json diff --git a/src/main/resources/assets/oc2r/models/block/charger.json b/src/main/resources/assets/oc2/models/block/charger.json similarity index 100% rename from src/main/resources/assets/oc2r/models/block/charger.json rename to src/main/resources/assets/oc2/models/block/charger.json diff --git a/src/main/resources/assets/oc2r/models/block/computer.json b/src/main/resources/assets/oc2/models/block/computer.json similarity index 100% rename from src/main/resources/assets/oc2r/models/block/computer.json rename to src/main/resources/assets/oc2/models/block/computer.json diff --git a/src/main/resources/assets/oc2r/models/block/creative_energy.json b/src/main/resources/assets/oc2/models/block/creative_energy.json similarity index 100% rename from src/main/resources/assets/oc2r/models/block/creative_energy.json rename to src/main/resources/assets/oc2/models/block/creative_energy.json diff --git a/src/main/resources/assets/oc2r/models/block/disk_drive.json b/src/main/resources/assets/oc2/models/block/disk_drive.json similarity index 100% rename from src/main/resources/assets/oc2r/models/block/disk_drive.json rename to src/main/resources/assets/oc2/models/block/disk_drive.json diff --git a/src/main/resources/assets/oc2r/models/block/flash_memory_flasher.json b/src/main/resources/assets/oc2/models/block/flash_memory_flasher.json similarity index 100% rename from src/main/resources/assets/oc2r/models/block/flash_memory_flasher.json rename to src/main/resources/assets/oc2/models/block/flash_memory_flasher.json diff --git a/src/main/resources/assets/oc2r/models/block/keyboard.json b/src/main/resources/assets/oc2/models/block/keyboard.json similarity index 100% rename from src/main/resources/assets/oc2r/models/block/keyboard.json rename to src/main/resources/assets/oc2/models/block/keyboard.json diff --git a/src/main/resources/assets/oc2r/models/block/monitor.json b/src/main/resources/assets/oc2/models/block/monitor.json similarity index 100% rename from src/main/resources/assets/oc2r/models/block/monitor.json rename to src/main/resources/assets/oc2/models/block/monitor.json diff --git a/src/main/resources/assets/oc2r/models/block/monitor.mtl b/src/main/resources/assets/oc2/models/block/monitor.mtl similarity index 100% rename from src/main/resources/assets/oc2r/models/block/monitor.mtl rename to src/main/resources/assets/oc2/models/block/monitor.mtl diff --git a/src/main/resources/assets/oc2r/models/block/monitor.obj b/src/main/resources/assets/oc2/models/block/monitor.obj similarity index 100% rename from src/main/resources/assets/oc2r/models/block/monitor.obj rename to src/main/resources/assets/oc2/models/block/monitor.obj diff --git a/src/main/resources/assets/oc2r/models/block/network_connector.json b/src/main/resources/assets/oc2/models/block/network_connector.json similarity index 100% rename from src/main/resources/assets/oc2r/models/block/network_connector.json rename to src/main/resources/assets/oc2/models/block/network_connector.json diff --git a/src/main/resources/assets/oc2r/models/block/network_hub.json b/src/main/resources/assets/oc2/models/block/network_hub.json similarity index 100% rename from src/main/resources/assets/oc2r/models/block/network_hub.json rename to src/main/resources/assets/oc2/models/block/network_hub.json diff --git a/src/main/resources/assets/oc2r/models/block/network_switch.json b/src/main/resources/assets/oc2/models/block/network_switch.json similarity index 100% rename from src/main/resources/assets/oc2r/models/block/network_switch.json rename to src/main/resources/assets/oc2/models/block/network_switch.json diff --git a/src/main/resources/assets/oc2r/models/block/pci_card_cage.json b/src/main/resources/assets/oc2/models/block/pci_card_cage.json similarity index 100% rename from src/main/resources/assets/oc2r/models/block/pci_card_cage.json rename to src/main/resources/assets/oc2/models/block/pci_card_cage.json diff --git a/src/main/resources/assets/oc2r/models/block/projector.json b/src/main/resources/assets/oc2/models/block/projector.json similarity index 100% rename from src/main/resources/assets/oc2r/models/block/projector.json rename to src/main/resources/assets/oc2/models/block/projector.json diff --git a/src/main/resources/assets/oc2r/models/block/redstone_interface.json b/src/main/resources/assets/oc2/models/block/redstone_interface.json similarity index 100% rename from src/main/resources/assets/oc2r/models/block/redstone_interface.json rename to src/main/resources/assets/oc2/models/block/redstone_interface.json diff --git a/src/main/resources/assets/oc2r/models/block/vxlan_hub.json b/src/main/resources/assets/oc2/models/block/vxlan_hub.json similarity index 100% rename from src/main/resources/assets/oc2r/models/block/vxlan_hub.json rename to src/main/resources/assets/oc2/models/block/vxlan_hub.json diff --git a/src/main/resources/assets/oc2r/models/item/block_operations_module.json b/src/main/resources/assets/oc2/models/item/block_operations_module.json similarity index 100% rename from src/main/resources/assets/oc2r/models/item/block_operations_module.json rename to src/main/resources/assets/oc2/models/item/block_operations_module.json diff --git a/src/main/resources/assets/oc2r/models/item/bus_cable.json b/src/main/resources/assets/oc2/models/item/bus_cable.json similarity index 100% rename from src/main/resources/assets/oc2r/models/item/bus_cable.json rename to src/main/resources/assets/oc2/models/item/bus_cable.json diff --git a/src/main/resources/assets/oc2r/models/item/bus_interface.json b/src/main/resources/assets/oc2/models/item/bus_interface.json similarity index 100% rename from src/main/resources/assets/oc2r/models/item/bus_interface.json rename to src/main/resources/assets/oc2/models/item/bus_interface.json diff --git a/src/main/resources/assets/oc2r/models/item/charger.json b/src/main/resources/assets/oc2/models/item/charger.json similarity index 100% rename from src/main/resources/assets/oc2r/models/item/charger.json rename to src/main/resources/assets/oc2/models/item/charger.json diff --git a/src/main/resources/assets/oc2r/models/item/circuit_board.json b/src/main/resources/assets/oc2/models/item/circuit_board.json similarity index 100% rename from src/main/resources/assets/oc2r/models/item/circuit_board.json rename to src/main/resources/assets/oc2/models/item/circuit_board.json diff --git a/src/main/resources/assets/oc2r/models/item/computer.json b/src/main/resources/assets/oc2/models/item/computer.json similarity index 100% rename from src/main/resources/assets/oc2r/models/item/computer.json rename to src/main/resources/assets/oc2/models/item/computer.json diff --git a/src/main/resources/assets/oc2r/models/item/cpu_tier_1.json b/src/main/resources/assets/oc2/models/item/cpu_tier_1.json similarity index 100% rename from src/main/resources/assets/oc2r/models/item/cpu_tier_1.json rename to src/main/resources/assets/oc2/models/item/cpu_tier_1.json diff --git a/src/main/resources/assets/oc2r/models/item/cpu_tier_2.json b/src/main/resources/assets/oc2/models/item/cpu_tier_2.json similarity index 100% rename from src/main/resources/assets/oc2r/models/item/cpu_tier_2.json rename to src/main/resources/assets/oc2/models/item/cpu_tier_2.json diff --git a/src/main/resources/assets/oc2r/models/item/cpu_tier_3.json b/src/main/resources/assets/oc2/models/item/cpu_tier_3.json similarity index 100% rename from src/main/resources/assets/oc2r/models/item/cpu_tier_3.json rename to src/main/resources/assets/oc2/models/item/cpu_tier_3.json diff --git a/src/main/resources/assets/oc2r/models/item/cpu_tier_4.json b/src/main/resources/assets/oc2/models/item/cpu_tier_4.json similarity index 100% rename from src/main/resources/assets/oc2r/models/item/cpu_tier_4.json rename to src/main/resources/assets/oc2/models/item/cpu_tier_4.json diff --git a/src/main/resources/assets/oc2r/models/item/creative_energy.json b/src/main/resources/assets/oc2/models/item/creative_energy.json similarity index 100% rename from src/main/resources/assets/oc2r/models/item/creative_energy.json rename to src/main/resources/assets/oc2/models/item/creative_energy.json diff --git a/src/main/resources/assets/oc2r/models/item/disk_drive.json b/src/main/resources/assets/oc2/models/item/disk_drive.json similarity index 100% rename from src/main/resources/assets/oc2r/models/item/disk_drive.json rename to src/main/resources/assets/oc2/models/item/disk_drive.json diff --git a/src/main/resources/assets/oc2r/models/item/file_import_export_card.json b/src/main/resources/assets/oc2/models/item/file_import_export_card.json similarity index 100% rename from src/main/resources/assets/oc2r/models/item/file_import_export_card.json rename to src/main/resources/assets/oc2/models/item/file_import_export_card.json diff --git a/src/main/resources/assets/oc2r/models/item/flash_memory.json b/src/main/resources/assets/oc2/models/item/flash_memory.json similarity index 100% rename from src/main/resources/assets/oc2r/models/item/flash_memory.json rename to src/main/resources/assets/oc2/models/item/flash_memory.json diff --git a/src/main/resources/assets/oc2r/models/item/flash_memory_custom.json b/src/main/resources/assets/oc2/models/item/flash_memory_custom.json similarity index 100% rename from src/main/resources/assets/oc2r/models/item/flash_memory_custom.json rename to src/main/resources/assets/oc2/models/item/flash_memory_custom.json diff --git a/src/main/resources/assets/oc2r/models/item/flash_memory_flasher.json b/src/main/resources/assets/oc2/models/item/flash_memory_flasher.json similarity index 100% rename from src/main/resources/assets/oc2r/models/item/flash_memory_flasher.json rename to src/main/resources/assets/oc2/models/item/flash_memory_flasher.json diff --git a/src/main/resources/assets/oc2r/models/item/floppy.json b/src/main/resources/assets/oc2/models/item/floppy.json similarity index 100% rename from src/main/resources/assets/oc2r/models/item/floppy.json rename to src/main/resources/assets/oc2/models/item/floppy.json diff --git a/src/main/resources/assets/oc2r/models/item/floppy_modern.json b/src/main/resources/assets/oc2/models/item/floppy_modern.json similarity index 100% rename from src/main/resources/assets/oc2r/models/item/floppy_modern.json rename to src/main/resources/assets/oc2/models/item/floppy_modern.json diff --git a/src/main/resources/assets/oc2r/models/item/hard_drive_custom.json b/src/main/resources/assets/oc2/models/item/hard_drive_custom.json similarity index 100% rename from src/main/resources/assets/oc2r/models/item/hard_drive_custom.json rename to src/main/resources/assets/oc2/models/item/hard_drive_custom.json diff --git a/src/main/resources/assets/oc2r/models/item/hard_drive_extra_large.json b/src/main/resources/assets/oc2/models/item/hard_drive_extra_large.json similarity index 100% rename from src/main/resources/assets/oc2r/models/item/hard_drive_extra_large.json rename to src/main/resources/assets/oc2/models/item/hard_drive_extra_large.json diff --git a/src/main/resources/assets/oc2r/models/item/hard_drive_large.json b/src/main/resources/assets/oc2/models/item/hard_drive_large.json similarity index 100% rename from src/main/resources/assets/oc2r/models/item/hard_drive_large.json rename to src/main/resources/assets/oc2/models/item/hard_drive_large.json diff --git a/src/main/resources/assets/oc2r/models/item/hard_drive_medium.json b/src/main/resources/assets/oc2/models/item/hard_drive_medium.json similarity index 100% rename from src/main/resources/assets/oc2r/models/item/hard_drive_medium.json rename to src/main/resources/assets/oc2/models/item/hard_drive_medium.json diff --git a/src/main/resources/assets/oc2r/models/item/hard_drive_small.json b/src/main/resources/assets/oc2/models/item/hard_drive_small.json similarity index 100% rename from src/main/resources/assets/oc2r/models/item/hard_drive_small.json rename to src/main/resources/assets/oc2/models/item/hard_drive_small.json diff --git a/src/main/resources/assets/oc2r/models/item/inventory_operations_module.json b/src/main/resources/assets/oc2/models/item/inventory_operations_module.json similarity index 100% rename from src/main/resources/assets/oc2r/models/item/inventory_operations_module.json rename to src/main/resources/assets/oc2/models/item/inventory_operations_module.json diff --git a/src/main/resources/assets/oc2r/models/item/keyboard.json b/src/main/resources/assets/oc2/models/item/keyboard.json similarity index 100% rename from src/main/resources/assets/oc2r/models/item/keyboard.json rename to src/main/resources/assets/oc2/models/item/keyboard.json diff --git a/src/main/resources/assets/oc2r/models/item/manual.json b/src/main/resources/assets/oc2/models/item/manual.json similarity index 100% rename from src/main/resources/assets/oc2r/models/item/manual.json rename to src/main/resources/assets/oc2/models/item/manual.json diff --git a/src/main/resources/assets/oc2r/models/item/memory_extra_large.json b/src/main/resources/assets/oc2/models/item/memory_extra_large.json similarity index 100% rename from src/main/resources/assets/oc2r/models/item/memory_extra_large.json rename to src/main/resources/assets/oc2/models/item/memory_extra_large.json diff --git a/src/main/resources/assets/oc2r/models/item/memory_large.json b/src/main/resources/assets/oc2/models/item/memory_large.json similarity index 100% rename from src/main/resources/assets/oc2r/models/item/memory_large.json rename to src/main/resources/assets/oc2/models/item/memory_large.json diff --git a/src/main/resources/assets/oc2r/models/item/memory_medium.json b/src/main/resources/assets/oc2/models/item/memory_medium.json similarity index 100% rename from src/main/resources/assets/oc2r/models/item/memory_medium.json rename to src/main/resources/assets/oc2/models/item/memory_medium.json diff --git a/src/main/resources/assets/oc2r/models/item/memory_small.json b/src/main/resources/assets/oc2/models/item/memory_small.json similarity index 100% rename from src/main/resources/assets/oc2r/models/item/memory_small.json rename to src/main/resources/assets/oc2/models/item/memory_small.json diff --git a/src/main/resources/assets/oc2r/models/item/monitor.json b/src/main/resources/assets/oc2/models/item/monitor.json similarity index 100% rename from src/main/resources/assets/oc2r/models/item/monitor.json rename to src/main/resources/assets/oc2/models/item/monitor.json diff --git a/src/main/resources/assets/oc2r/models/item/network_cable.json b/src/main/resources/assets/oc2/models/item/network_cable.json similarity index 100% rename from src/main/resources/assets/oc2r/models/item/network_cable.json rename to src/main/resources/assets/oc2/models/item/network_cable.json diff --git a/src/main/resources/assets/oc2r/models/item/network_connector.json b/src/main/resources/assets/oc2/models/item/network_connector.json similarity index 100% rename from src/main/resources/assets/oc2r/models/item/network_connector.json rename to src/main/resources/assets/oc2/models/item/network_connector.json diff --git a/src/main/resources/assets/oc2r/models/item/network_hub.json b/src/main/resources/assets/oc2/models/item/network_hub.json similarity index 100% rename from src/main/resources/assets/oc2r/models/item/network_hub.json rename to src/main/resources/assets/oc2/models/item/network_hub.json diff --git a/src/main/resources/assets/oc2r/models/item/network_interface_card.json b/src/main/resources/assets/oc2/models/item/network_interface_card.json similarity index 100% rename from src/main/resources/assets/oc2r/models/item/network_interface_card.json rename to src/main/resources/assets/oc2/models/item/network_interface_card.json diff --git a/src/main/resources/assets/oc2r/models/item/network_switch.json b/src/main/resources/assets/oc2/models/item/network_switch.json similarity index 100% rename from src/main/resources/assets/oc2r/models/item/network_switch.json rename to src/main/resources/assets/oc2/models/item/network_switch.json diff --git a/src/main/resources/assets/oc2r/models/item/network_tunnel_card.json b/src/main/resources/assets/oc2/models/item/network_tunnel_card.json similarity index 100% rename from src/main/resources/assets/oc2r/models/item/network_tunnel_card.json rename to src/main/resources/assets/oc2/models/item/network_tunnel_card.json diff --git a/src/main/resources/assets/oc2r/models/item/network_tunnel_module.json b/src/main/resources/assets/oc2/models/item/network_tunnel_module.json similarity index 100% rename from src/main/resources/assets/oc2r/models/item/network_tunnel_module.json rename to src/main/resources/assets/oc2/models/item/network_tunnel_module.json diff --git a/src/main/resources/assets/oc2r/models/item/pci_card_cage.json b/src/main/resources/assets/oc2/models/item/pci_card_cage.json similarity index 100% rename from src/main/resources/assets/oc2r/models/item/pci_card_cage.json rename to src/main/resources/assets/oc2/models/item/pci_card_cage.json diff --git a/src/main/resources/assets/oc2r/models/item/projector.json b/src/main/resources/assets/oc2/models/item/projector.json similarity index 100% rename from src/main/resources/assets/oc2r/models/item/projector.json rename to src/main/resources/assets/oc2/models/item/projector.json diff --git a/src/main/resources/assets/oc2r/models/item/raw_silicon_wafer.json b/src/main/resources/assets/oc2/models/item/raw_silicon_wafer.json similarity index 100% rename from src/main/resources/assets/oc2r/models/item/raw_silicon_wafer.json rename to src/main/resources/assets/oc2/models/item/raw_silicon_wafer.json diff --git a/src/main/resources/assets/oc2r/models/item/redstone_interface.json b/src/main/resources/assets/oc2/models/item/redstone_interface.json similarity index 100% rename from src/main/resources/assets/oc2r/models/item/redstone_interface.json rename to src/main/resources/assets/oc2/models/item/redstone_interface.json diff --git a/src/main/resources/assets/oc2r/models/item/redstone_interface_card.json b/src/main/resources/assets/oc2/models/item/redstone_interface_card.json similarity index 100% rename from src/main/resources/assets/oc2r/models/item/redstone_interface_card.json rename to src/main/resources/assets/oc2/models/item/redstone_interface_card.json diff --git a/src/main/resources/assets/oc2r/models/item/robot.json b/src/main/resources/assets/oc2/models/item/robot.json similarity index 100% rename from src/main/resources/assets/oc2r/models/item/robot.json rename to src/main/resources/assets/oc2/models/item/robot.json diff --git a/src/main/resources/assets/oc2r/models/item/silicon.json b/src/main/resources/assets/oc2/models/item/silicon.json similarity index 100% rename from src/main/resources/assets/oc2r/models/item/silicon.json rename to src/main/resources/assets/oc2/models/item/silicon.json diff --git a/src/main/resources/assets/oc2r/models/item/silicon_blend.json b/src/main/resources/assets/oc2/models/item/silicon_blend.json similarity index 100% rename from src/main/resources/assets/oc2r/models/item/silicon_blend.json rename to src/main/resources/assets/oc2/models/item/silicon_blend.json diff --git a/src/main/resources/assets/oc2r/models/item/silicon_wafer.json b/src/main/resources/assets/oc2/models/item/silicon_wafer.json similarity index 100% rename from src/main/resources/assets/oc2r/models/item/silicon_wafer.json rename to src/main/resources/assets/oc2/models/item/silicon_wafer.json diff --git a/src/main/resources/assets/oc2r/models/item/sound_card.json b/src/main/resources/assets/oc2/models/item/sound_card.json similarity index 100% rename from src/main/resources/assets/oc2r/models/item/sound_card.json rename to src/main/resources/assets/oc2/models/item/sound_card.json diff --git a/src/main/resources/assets/oc2r/models/item/transistor.json b/src/main/resources/assets/oc2/models/item/transistor.json similarity index 100% rename from src/main/resources/assets/oc2r/models/item/transistor.json rename to src/main/resources/assets/oc2/models/item/transistor.json diff --git a/src/main/resources/assets/oc2r/models/item/vxlan_hub.json b/src/main/resources/assets/oc2/models/item/vxlan_hub.json similarity index 100% rename from src/main/resources/assets/oc2r/models/item/vxlan_hub.json rename to src/main/resources/assets/oc2/models/item/vxlan_hub.json diff --git a/src/main/resources/assets/oc2r/models/item/wrench.json b/src/main/resources/assets/oc2/models/item/wrench.json similarity index 100% rename from src/main/resources/assets/oc2r/models/item/wrench.json rename to src/main/resources/assets/oc2/models/item/wrench.json diff --git a/src/main/resources/assets/oc2r/shaders/core/projectors.fsh b/src/main/resources/assets/oc2/shaders/core/projectors.fsh similarity index 100% rename from src/main/resources/assets/oc2r/shaders/core/projectors.fsh rename to src/main/resources/assets/oc2/shaders/core/projectors.fsh diff --git a/src/main/resources/assets/oc2r/shaders/core/projectors.json b/src/main/resources/assets/oc2/shaders/core/projectors.json similarity index 100% rename from src/main/resources/assets/oc2r/shaders/core/projectors.json rename to src/main/resources/assets/oc2/shaders/core/projectors.json diff --git a/src/main/resources/assets/oc2r/shaders/core/projectors.vsh b/src/main/resources/assets/oc2/shaders/core/projectors.vsh similarity index 100% rename from src/main/resources/assets/oc2r/shaders/core/projectors.vsh rename to src/main/resources/assets/oc2/shaders/core/projectors.vsh diff --git a/src/main/resources/assets/oc2r/sounds.json b/src/main/resources/assets/oc2/sounds.json similarity index 100% rename from src/main/resources/assets/oc2r/sounds.json rename to src/main/resources/assets/oc2/sounds.json diff --git a/src/main/resources/assets/oc2r/sounds/computer_running.ogg b/src/main/resources/assets/oc2/sounds/computer_running.ogg similarity index 100% rename from src/main/resources/assets/oc2r/sounds/computer_running.ogg rename to src/main/resources/assets/oc2/sounds/computer_running.ogg diff --git a/src/main/resources/assets/oc2r/sounds/floppy_access1.ogg b/src/main/resources/assets/oc2/sounds/floppy_access1.ogg similarity index 100% rename from src/main/resources/assets/oc2r/sounds/floppy_access1.ogg rename to src/main/resources/assets/oc2/sounds/floppy_access1.ogg diff --git a/src/main/resources/assets/oc2r/sounds/floppy_access2.ogg b/src/main/resources/assets/oc2/sounds/floppy_access2.ogg similarity index 100% rename from src/main/resources/assets/oc2r/sounds/floppy_access2.ogg rename to src/main/resources/assets/oc2/sounds/floppy_access2.ogg diff --git a/src/main/resources/assets/oc2r/sounds/floppy_access3.ogg b/src/main/resources/assets/oc2/sounds/floppy_access3.ogg similarity index 100% rename from src/main/resources/assets/oc2r/sounds/floppy_access3.ogg rename to src/main/resources/assets/oc2/sounds/floppy_access3.ogg diff --git a/src/main/resources/assets/oc2r/sounds/floppy_access4.ogg b/src/main/resources/assets/oc2/sounds/floppy_access4.ogg similarity index 100% rename from src/main/resources/assets/oc2r/sounds/floppy_access4.ogg rename to src/main/resources/assets/oc2/sounds/floppy_access4.ogg diff --git a/src/main/resources/assets/oc2r/sounds/floppy_access5.ogg b/src/main/resources/assets/oc2/sounds/floppy_access5.ogg similarity index 100% rename from src/main/resources/assets/oc2r/sounds/floppy_access5.ogg rename to src/main/resources/assets/oc2/sounds/floppy_access5.ogg diff --git a/src/main/resources/assets/oc2r/sounds/floppy_access6.ogg b/src/main/resources/assets/oc2/sounds/floppy_access6.ogg similarity index 100% rename from src/main/resources/assets/oc2r/sounds/floppy_access6.ogg rename to src/main/resources/assets/oc2/sounds/floppy_access6.ogg diff --git a/src/main/resources/assets/oc2r/sounds/floppy_eject.ogg b/src/main/resources/assets/oc2/sounds/floppy_eject.ogg similarity index 100% rename from src/main/resources/assets/oc2r/sounds/floppy_eject.ogg rename to src/main/resources/assets/oc2/sounds/floppy_eject.ogg diff --git a/src/main/resources/assets/oc2r/sounds/floppy_insert.ogg b/src/main/resources/assets/oc2/sounds/floppy_insert.ogg similarity index 100% rename from src/main/resources/assets/oc2r/sounds/floppy_insert.ogg rename to src/main/resources/assets/oc2/sounds/floppy_insert.ogg diff --git a/src/main/resources/assets/oc2r/sounds/hdd_access1.ogg b/src/main/resources/assets/oc2/sounds/hdd_access1.ogg similarity index 100% rename from src/main/resources/assets/oc2r/sounds/hdd_access1.ogg rename to src/main/resources/assets/oc2/sounds/hdd_access1.ogg diff --git a/src/main/resources/assets/oc2r/sounds/hdd_access2.ogg b/src/main/resources/assets/oc2/sounds/hdd_access2.ogg similarity index 100% rename from src/main/resources/assets/oc2r/sounds/hdd_access2.ogg rename to src/main/resources/assets/oc2/sounds/hdd_access2.ogg diff --git a/src/main/resources/assets/oc2r/sounds/hdd_access3.ogg b/src/main/resources/assets/oc2/sounds/hdd_access3.ogg similarity index 100% rename from src/main/resources/assets/oc2r/sounds/hdd_access3.ogg rename to src/main/resources/assets/oc2/sounds/hdd_access3.ogg diff --git a/src/main/resources/assets/oc2r/sounds/hdd_access4.ogg b/src/main/resources/assets/oc2/sounds/hdd_access4.ogg similarity index 100% rename from src/main/resources/assets/oc2r/sounds/hdd_access4.ogg rename to src/main/resources/assets/oc2/sounds/hdd_access4.ogg diff --git a/src/main/resources/assets/oc2r/sounds/hdd_access5.ogg b/src/main/resources/assets/oc2/sounds/hdd_access5.ogg similarity index 100% rename from src/main/resources/assets/oc2r/sounds/hdd_access5.ogg rename to src/main/resources/assets/oc2/sounds/hdd_access5.ogg diff --git a/src/main/resources/assets/oc2r/sounds/hdd_access6.ogg b/src/main/resources/assets/oc2/sounds/hdd_access6.ogg similarity index 100% rename from src/main/resources/assets/oc2r/sounds/hdd_access6.ogg rename to src/main/resources/assets/oc2/sounds/hdd_access6.ogg diff --git a/src/main/resources/assets/oc2r/sounds/hdd_access7.ogg b/src/main/resources/assets/oc2/sounds/hdd_access7.ogg similarity index 100% rename from src/main/resources/assets/oc2r/sounds/hdd_access7.ogg rename to src/main/resources/assets/oc2/sounds/hdd_access7.ogg diff --git a/src/main/resources/assets/oc2r/textures/block/cable_base/cable_base_atlas0.png b/src/main/resources/assets/oc2/textures/block/cable_base/cable_base_atlas0.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/block/cable_base/cable_base_atlas0.png rename to src/main/resources/assets/oc2/textures/block/cable_base/cable_base_atlas0.png diff --git a/src/main/resources/assets/oc2r/textures/block/cable_link/cable_link_atlas0.png b/src/main/resources/assets/oc2/textures/block/cable_link/cable_link_atlas0.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/block/cable_link/cable_link_atlas0.png rename to src/main/resources/assets/oc2/textures/block/cable_link/cable_link_atlas0.png diff --git a/src/main/resources/assets/oc2r/textures/block/cable_plug/cable_plug_atlas0.png b/src/main/resources/assets/oc2/textures/block/cable_plug/cable_plug_atlas0.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/block/cable_plug/cable_plug_atlas0.png rename to src/main/resources/assets/oc2/textures/block/cable_plug/cable_plug_atlas0.png diff --git a/src/main/resources/assets/oc2r/textures/block/cable_straight/cable_straight_atlas0.png b/src/main/resources/assets/oc2/textures/block/cable_straight/cable_straight_atlas0.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/block/cable_straight/cable_straight_atlas0.png rename to src/main/resources/assets/oc2/textures/block/cable_straight/cable_straight_atlas0.png diff --git a/src/main/resources/assets/oc2r/textures/block/cable_support/cable_support_atlas0.png b/src/main/resources/assets/oc2/textures/block/cable_support/cable_support_atlas0.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/block/cable_support/cable_support_atlas0.png rename to src/main/resources/assets/oc2/textures/block/cable_support/cable_support_atlas0.png diff --git a/src/main/resources/assets/oc2r/textures/block/charger/charger_atlas0.png b/src/main/resources/assets/oc2/textures/block/charger/charger_atlas0.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/block/charger/charger_atlas0.png rename to src/main/resources/assets/oc2/textures/block/charger/charger_atlas0.png diff --git a/src/main/resources/assets/oc2r/textures/block/charger/charger_atlas1.png b/src/main/resources/assets/oc2/textures/block/charger/charger_atlas1.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/block/charger/charger_atlas1.png rename to src/main/resources/assets/oc2/textures/block/charger/charger_atlas1.png diff --git a/src/main/resources/assets/oc2r/textures/block/charger/charger_atlas2.png b/src/main/resources/assets/oc2/textures/block/charger/charger_atlas2.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/block/charger/charger_atlas2.png rename to src/main/resources/assets/oc2/textures/block/charger/charger_atlas2.png diff --git a/src/main/resources/assets/oc2r/textures/block/charger/charger_atlas3.png b/src/main/resources/assets/oc2/textures/block/charger/charger_atlas3.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/block/charger/charger_atlas3.png rename to src/main/resources/assets/oc2/textures/block/charger/charger_atlas3.png diff --git a/src/main/resources/assets/oc2r/textures/block/charger/effect.png b/src/main/resources/assets/oc2/textures/block/charger/effect.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/block/charger/effect.png rename to src/main/resources/assets/oc2/textures/block/charger/effect.png diff --git a/src/main/resources/assets/oc2r/textures/block/computer/computer_atlas0.png b/src/main/resources/assets/oc2/textures/block/computer/computer_atlas0.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/block/computer/computer_atlas0.png rename to src/main/resources/assets/oc2/textures/block/computer/computer_atlas0.png diff --git a/src/main/resources/assets/oc2r/textures/block/computer/computer_atlas1.png b/src/main/resources/assets/oc2/textures/block/computer/computer_atlas1.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/block/computer/computer_atlas1.png rename to src/main/resources/assets/oc2/textures/block/computer/computer_atlas1.png diff --git a/src/main/resources/assets/oc2r/textures/block/computer/computer_atlas2.png b/src/main/resources/assets/oc2/textures/block/computer/computer_atlas2.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/block/computer/computer_atlas2.png rename to src/main/resources/assets/oc2/textures/block/computer/computer_atlas2.png diff --git a/src/main/resources/assets/oc2r/textures/block/computer/computer_atlas3.png b/src/main/resources/assets/oc2/textures/block/computer/computer_atlas3.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/block/computer/computer_atlas3.png rename to src/main/resources/assets/oc2/textures/block/computer/computer_atlas3.png diff --git a/src/main/resources/assets/oc2r/textures/block/computer/computer_atlas4.png b/src/main/resources/assets/oc2/textures/block/computer/computer_atlas4.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/block/computer/computer_atlas4.png rename to src/main/resources/assets/oc2/textures/block/computer/computer_atlas4.png diff --git a/src/main/resources/assets/oc2r/textures/block/computer/computer_overlay_power.png b/src/main/resources/assets/oc2/textures/block/computer/computer_overlay_power.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/block/computer/computer_overlay_power.png rename to src/main/resources/assets/oc2/textures/block/computer/computer_overlay_power.png diff --git a/src/main/resources/assets/oc2r/textures/block/computer/computer_overlay_status.png b/src/main/resources/assets/oc2/textures/block/computer/computer_overlay_status.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/block/computer/computer_overlay_status.png rename to src/main/resources/assets/oc2/textures/block/computer/computer_overlay_status.png diff --git a/src/main/resources/assets/oc2r/textures/block/computer/computer_overlay_terminal.png b/src/main/resources/assets/oc2/textures/block/computer/computer_overlay_terminal.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/block/computer/computer_overlay_terminal.png rename to src/main/resources/assets/oc2/textures/block/computer/computer_overlay_terminal.png diff --git a/src/main/resources/assets/oc2r/textures/block/creative_energy.png b/src/main/resources/assets/oc2/textures/block/creative_energy.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/block/creative_energy.png rename to src/main/resources/assets/oc2/textures/block/creative_energy.png diff --git a/src/main/resources/assets/oc2r/textures/block/disk_drive/disk_drive_atlas0.png b/src/main/resources/assets/oc2/textures/block/disk_drive/disk_drive_atlas0.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/block/disk_drive/disk_drive_atlas0.png rename to src/main/resources/assets/oc2/textures/block/disk_drive/disk_drive_atlas0.png diff --git a/src/main/resources/assets/oc2r/textures/block/disk_drive/disk_drive_atlas1.png b/src/main/resources/assets/oc2/textures/block/disk_drive/disk_drive_atlas1.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/block/disk_drive/disk_drive_atlas1.png rename to src/main/resources/assets/oc2/textures/block/disk_drive/disk_drive_atlas1.png diff --git a/src/main/resources/assets/oc2r/textures/block/disk_drive/disk_drive_atlas2.png b/src/main/resources/assets/oc2/textures/block/disk_drive/disk_drive_atlas2.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/block/disk_drive/disk_drive_atlas2.png rename to src/main/resources/assets/oc2/textures/block/disk_drive/disk_drive_atlas2.png diff --git a/src/main/resources/assets/oc2r/textures/block/disk_drive/disk_drive_atlas3.png b/src/main/resources/assets/oc2/textures/block/disk_drive/disk_drive_atlas3.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/block/disk_drive/disk_drive_atlas3.png rename to src/main/resources/assets/oc2/textures/block/disk_drive/disk_drive_atlas3.png diff --git a/src/main/resources/assets/oc2r/textures/block/keyboard/keyboard_atlas0.png b/src/main/resources/assets/oc2/textures/block/keyboard/keyboard_atlas0.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/block/keyboard/keyboard_atlas0.png rename to src/main/resources/assets/oc2/textures/block/keyboard/keyboard_atlas0.png diff --git a/src/main/resources/assets/oc2r/textures/block/keyboard/keyboard_atlas1.png b/src/main/resources/assets/oc2/textures/block/keyboard/keyboard_atlas1.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/block/keyboard/keyboard_atlas1.png rename to src/main/resources/assets/oc2/textures/block/keyboard/keyboard_atlas1.png diff --git a/src/main/resources/assets/oc2r/textures/block/monitor/monitor.png b/src/main/resources/assets/oc2/textures/block/monitor/monitor.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/block/monitor/monitor.png rename to src/main/resources/assets/oc2/textures/block/monitor/monitor.png diff --git a/src/main/resources/assets/oc2r/textures/block/monitor/monitor_overlay_power.png b/src/main/resources/assets/oc2/textures/block/monitor/monitor_overlay_power.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/block/monitor/monitor_overlay_power.png rename to src/main/resources/assets/oc2/textures/block/monitor/monitor_overlay_power.png diff --git a/src/main/resources/assets/oc2r/textures/block/network_connector/network_connector_atlas0.png b/src/main/resources/assets/oc2/textures/block/network_connector/network_connector_atlas0.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/block/network_connector/network_connector_atlas0.png rename to src/main/resources/assets/oc2/textures/block/network_connector/network_connector_atlas0.png diff --git a/src/main/resources/assets/oc2r/textures/block/network_hub/network_hub_atlas0.png b/src/main/resources/assets/oc2/textures/block/network_hub/network_hub_atlas0.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/block/network_hub/network_hub_atlas0.png rename to src/main/resources/assets/oc2/textures/block/network_hub/network_hub_atlas0.png diff --git a/src/main/resources/assets/oc2r/textures/block/network_hub/network_hub_atlas1.png b/src/main/resources/assets/oc2/textures/block/network_hub/network_hub_atlas1.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/block/network_hub/network_hub_atlas1.png rename to src/main/resources/assets/oc2/textures/block/network_hub/network_hub_atlas1.png diff --git a/src/main/resources/assets/oc2r/textures/block/network_hub/network_hub_atlas2.png b/src/main/resources/assets/oc2/textures/block/network_hub/network_hub_atlas2.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/block/network_hub/network_hub_atlas2.png rename to src/main/resources/assets/oc2/textures/block/network_hub/network_hub_atlas2.png diff --git a/src/main/resources/assets/oc2r/textures/block/network_hub/network_hub_atlas3.png b/src/main/resources/assets/oc2/textures/block/network_hub/network_hub_atlas3.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/block/network_hub/network_hub_atlas3.png rename to src/main/resources/assets/oc2/textures/block/network_hub/network_hub_atlas3.png diff --git a/src/main/resources/assets/oc2r/textures/block/network_switch/network_switch_atlas0.png b/src/main/resources/assets/oc2/textures/block/network_switch/network_switch_atlas0.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/block/network_switch/network_switch_atlas0.png rename to src/main/resources/assets/oc2/textures/block/network_switch/network_switch_atlas0.png diff --git a/src/main/resources/assets/oc2r/textures/block/network_switch/network_switch_atlas1.png b/src/main/resources/assets/oc2/textures/block/network_switch/network_switch_atlas1.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/block/network_switch/network_switch_atlas1.png rename to src/main/resources/assets/oc2/textures/block/network_switch/network_switch_atlas1.png diff --git a/src/main/resources/assets/oc2r/textures/block/network_switch/network_switch_atlas2.png b/src/main/resources/assets/oc2/textures/block/network_switch/network_switch_atlas2.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/block/network_switch/network_switch_atlas2.png rename to src/main/resources/assets/oc2/textures/block/network_switch/network_switch_atlas2.png diff --git a/src/main/resources/assets/oc2r/textures/block/network_switch/network_switch_atlas3.png b/src/main/resources/assets/oc2/textures/block/network_switch/network_switch_atlas3.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/block/network_switch/network_switch_atlas3.png rename to src/main/resources/assets/oc2/textures/block/network_switch/network_switch_atlas3.png diff --git a/src/main/resources/assets/oc2r/textures/block/pci_card_cage/pci_card_cage_atlas0.png b/src/main/resources/assets/oc2/textures/block/pci_card_cage/pci_card_cage_atlas0.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/block/pci_card_cage/pci_card_cage_atlas0.png rename to src/main/resources/assets/oc2/textures/block/pci_card_cage/pci_card_cage_atlas0.png diff --git a/src/main/resources/assets/oc2r/textures/block/pci_card_cage/pci_card_cage_atlas1.png b/src/main/resources/assets/oc2/textures/block/pci_card_cage/pci_card_cage_atlas1.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/block/pci_card_cage/pci_card_cage_atlas1.png rename to src/main/resources/assets/oc2/textures/block/pci_card_cage/pci_card_cage_atlas1.png diff --git a/src/main/resources/assets/oc2r/textures/block/pci_card_cage/pci_card_cage_atlas2.png b/src/main/resources/assets/oc2/textures/block/pci_card_cage/pci_card_cage_atlas2.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/block/pci_card_cage/pci_card_cage_atlas2.png rename to src/main/resources/assets/oc2/textures/block/pci_card_cage/pci_card_cage_atlas2.png diff --git a/src/main/resources/assets/oc2r/textures/block/pci_card_cage/pci_card_cage_atlas3.png b/src/main/resources/assets/oc2/textures/block/pci_card_cage/pci_card_cage_atlas3.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/block/pci_card_cage/pci_card_cage_atlas3.png rename to src/main/resources/assets/oc2/textures/block/pci_card_cage/pci_card_cage_atlas3.png diff --git a/src/main/resources/assets/oc2r/textures/block/pci_card_cage/pci_card_cage_atlas4.png b/src/main/resources/assets/oc2/textures/block/pci_card_cage/pci_card_cage_atlas4.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/block/pci_card_cage/pci_card_cage_atlas4.png rename to src/main/resources/assets/oc2/textures/block/pci_card_cage/pci_card_cage_atlas4.png diff --git a/src/main/resources/assets/oc2r/textures/block/pci_card_cage/pci_card_cage_atlas5.png b/src/main/resources/assets/oc2/textures/block/pci_card_cage/pci_card_cage_atlas5.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/block/pci_card_cage/pci_card_cage_atlas5.png rename to src/main/resources/assets/oc2/textures/block/pci_card_cage/pci_card_cage_atlas5.png diff --git a/src/main/resources/assets/oc2r/textures/block/pci_card_cage/pci_card_cage_atlas6.png b/src/main/resources/assets/oc2/textures/block/pci_card_cage/pci_card_cage_atlas6.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/block/pci_card_cage/pci_card_cage_atlas6.png rename to src/main/resources/assets/oc2/textures/block/pci_card_cage/pci_card_cage_atlas6.png diff --git a/src/main/resources/assets/oc2r/textures/block/projector/projector_atlas0.png b/src/main/resources/assets/oc2/textures/block/projector/projector_atlas0.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/block/projector/projector_atlas0.png rename to src/main/resources/assets/oc2/textures/block/projector/projector_atlas0.png diff --git a/src/main/resources/assets/oc2r/textures/block/projector/projector_atlas1.png b/src/main/resources/assets/oc2/textures/block/projector/projector_atlas1.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/block/projector/projector_atlas1.png rename to src/main/resources/assets/oc2/textures/block/projector/projector_atlas1.png diff --git a/src/main/resources/assets/oc2r/textures/block/projector/projector_atlas2.png b/src/main/resources/assets/oc2/textures/block/projector/projector_atlas2.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/block/projector/projector_atlas2.png rename to src/main/resources/assets/oc2/textures/block/projector/projector_atlas2.png diff --git a/src/main/resources/assets/oc2r/textures/block/projector/projector_atlas3.png b/src/main/resources/assets/oc2/textures/block/projector/projector_atlas3.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/block/projector/projector_atlas3.png rename to src/main/resources/assets/oc2/textures/block/projector/projector_atlas3.png diff --git a/src/main/resources/assets/oc2r/textures/block/projector/projector_atlas4.png b/src/main/resources/assets/oc2/textures/block/projector/projector_atlas4.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/block/projector/projector_atlas4.png rename to src/main/resources/assets/oc2/textures/block/projector/projector_atlas4.png diff --git a/src/main/resources/assets/oc2r/textures/block/projector/projector_atlas5.png b/src/main/resources/assets/oc2/textures/block/projector/projector_atlas5.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/block/projector/projector_atlas5.png rename to src/main/resources/assets/oc2/textures/block/projector/projector_atlas5.png diff --git a/src/main/resources/assets/oc2r/textures/block/projector/projector_atlas6.png b/src/main/resources/assets/oc2/textures/block/projector/projector_atlas6.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/block/projector/projector_atlas6.png rename to src/main/resources/assets/oc2/textures/block/projector/projector_atlas6.png diff --git a/src/main/resources/assets/oc2r/textures/block/redstone_interface/redstone_interface_atlas0.png b/src/main/resources/assets/oc2/textures/block/redstone_interface/redstone_interface_atlas0.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/block/redstone_interface/redstone_interface_atlas0.png rename to src/main/resources/assets/oc2/textures/block/redstone_interface/redstone_interface_atlas0.png diff --git a/src/main/resources/assets/oc2r/textures/block/redstone_interface/redstone_interface_atlas1.png b/src/main/resources/assets/oc2/textures/block/redstone_interface/redstone_interface_atlas1.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/block/redstone_interface/redstone_interface_atlas1.png rename to src/main/resources/assets/oc2/textures/block/redstone_interface/redstone_interface_atlas1.png diff --git a/src/main/resources/assets/oc2r/textures/block/redstone_interface/redstone_interface_atlas2.png b/src/main/resources/assets/oc2/textures/block/redstone_interface/redstone_interface_atlas2.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/block/redstone_interface/redstone_interface_atlas2.png rename to src/main/resources/assets/oc2/textures/block/redstone_interface/redstone_interface_atlas2.png diff --git a/src/main/resources/assets/oc2r/textures/block/redstone_interface/redstone_interface_atlas3.png b/src/main/resources/assets/oc2/textures/block/redstone_interface/redstone_interface_atlas3.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/block/redstone_interface/redstone_interface_atlas3.png rename to src/main/resources/assets/oc2/textures/block/redstone_interface/redstone_interface_atlas3.png diff --git a/src/main/resources/assets/oc2r/textures/block/redstone_interface/redstone_interface_atlas4.png b/src/main/resources/assets/oc2/textures/block/redstone_interface/redstone_interface_atlas4.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/block/redstone_interface/redstone_interface_atlas4.png rename to src/main/resources/assets/oc2/textures/block/redstone_interface/redstone_interface_atlas4.png diff --git a/src/main/resources/assets/oc2r/textures/block/vxlan_hub/vxlan_hub_atlas0.png b/src/main/resources/assets/oc2/textures/block/vxlan_hub/vxlan_hub_atlas0.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/block/vxlan_hub/vxlan_hub_atlas0.png rename to src/main/resources/assets/oc2/textures/block/vxlan_hub/vxlan_hub_atlas0.png diff --git a/src/main/resources/assets/oc2r/textures/block/vxlan_hub/vxlan_hub_atlas1.png b/src/main/resources/assets/oc2/textures/block/vxlan_hub/vxlan_hub_atlas1.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/block/vxlan_hub/vxlan_hub_atlas1.png rename to src/main/resources/assets/oc2/textures/block/vxlan_hub/vxlan_hub_atlas1.png diff --git a/src/main/resources/assets/oc2r/textures/block/vxlan_hub/vxlan_hub_atlas2.png b/src/main/resources/assets/oc2/textures/block/vxlan_hub/vxlan_hub_atlas2.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/block/vxlan_hub/vxlan_hub_atlas2.png rename to src/main/resources/assets/oc2/textures/block/vxlan_hub/vxlan_hub_atlas2.png diff --git a/src/main/resources/assets/oc2r/textures/block/vxlan_hub/vxlan_hub_atlas3.png b/src/main/resources/assets/oc2/textures/block/vxlan_hub/vxlan_hub_atlas3.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/block/vxlan_hub/vxlan_hub_atlas3.png rename to src/main/resources/assets/oc2/textures/block/vxlan_hub/vxlan_hub_atlas3.png diff --git a/src/main/resources/assets/oc2r/textures/entity/robot/robot.png b/src/main/resources/assets/oc2/textures/entity/robot/robot.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/entity/robot/robot.png rename to src/main/resources/assets/oc2/textures/entity/robot/robot.png diff --git a/src/main/resources/assets/oc2r/textures/font/OFL.TXT b/src/main/resources/assets/oc2/textures/font/OFL.TXT similarity index 100% rename from src/main/resources/assets/oc2r/textures/font/OFL.TXT rename to src/main/resources/assets/oc2/textures/font/OFL.TXT diff --git a/src/main/resources/assets/oc2r/textures/font/monospace.png b/src/main/resources/assets/oc2/textures/font/monospace.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/font/monospace.png rename to src/main/resources/assets/oc2/textures/font/monospace.png diff --git a/src/main/resources/assets/oc2r/textures/font/terminus.png b/src/main/resources/assets/oc2/textures/font/terminus.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/font/terminus.png rename to src/main/resources/assets/oc2/textures/font/terminus.png diff --git a/src/main/resources/assets/oc2r/textures/gui/manual/home.png b/src/main/resources/assets/oc2/textures/gui/manual/home.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/gui/manual/home.png rename to src/main/resources/assets/oc2/textures/gui/manual/home.png diff --git a/src/main/resources/assets/oc2r/textures/gui/manual/manual.png b/src/main/resources/assets/oc2/textures/gui/manual/manual.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/gui/manual/manual.png rename to src/main/resources/assets/oc2/textures/gui/manual/manual.png diff --git a/src/main/resources/assets/oc2r/textures/gui/manual/scroll_button.png b/src/main/resources/assets/oc2/textures/gui/manual/scroll_button.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/gui/manual/scroll_button.png rename to src/main/resources/assets/oc2/textures/gui/manual/scroll_button.png diff --git a/src/main/resources/assets/oc2r/textures/gui/manual/tab_button.png b/src/main/resources/assets/oc2/textures/gui/manual/tab_button.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/gui/manual/tab_button.png rename to src/main/resources/assets/oc2/textures/gui/manual/tab_button.png diff --git a/src/main/resources/assets/oc2r/textures/gui/overlay/block_face_disabled.png b/src/main/resources/assets/oc2/textures/gui/overlay/block_face_disabled.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/gui/overlay/block_face_disabled.png rename to src/main/resources/assets/oc2/textures/gui/overlay/block_face_disabled.png diff --git a/src/main/resources/assets/oc2r/textures/gui/overlay/block_face_enabled.png b/src/main/resources/assets/oc2/textures/gui/overlay/block_face_enabled.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/gui/overlay/block_face_enabled.png rename to src/main/resources/assets/oc2/textures/gui/overlay/block_face_enabled.png diff --git a/src/main/resources/assets/oc2r/textures/gui/overlay/block_face_focused.png b/src/main/resources/assets/oc2/textures/gui/overlay/block_face_focused.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/gui/overlay/block_face_focused.png rename to src/main/resources/assets/oc2/textures/gui/overlay/block_face_focused.png diff --git a/src/main/resources/assets/oc2r/textures/gui/overlay/slot_info.png b/src/main/resources/assets/oc2/textures/gui/overlay/slot_info.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/gui/overlay/slot_info.png rename to src/main/resources/assets/oc2/textures/gui/overlay/slot_info.png diff --git a/src/main/resources/assets/oc2r/textures/gui/overlay/slot_selection.png b/src/main/resources/assets/oc2/textures/gui/overlay/slot_selection.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/gui/overlay/slot_selection.png rename to src/main/resources/assets/oc2/textures/gui/overlay/slot_selection.png diff --git a/src/main/resources/assets/oc2r/textures/gui/overlay/slot_warn.png b/src/main/resources/assets/oc2/textures/gui/overlay/slot_warn.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/gui/overlay/slot_warn.png rename to src/main/resources/assets/oc2/textures/gui/overlay/slot_warn.png diff --git a/src/main/resources/assets/oc2r/textures/gui/overlay/terminal_focused.png b/src/main/resources/assets/oc2/textures/gui/overlay/terminal_focused.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/gui/overlay/terminal_focused.png rename to src/main/resources/assets/oc2/textures/gui/overlay/terminal_focused.png diff --git a/src/main/resources/assets/oc2r/textures/gui/widget/bus_interface_screen.png b/src/main/resources/assets/oc2/textures/gui/widget/bus_interface_screen.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/gui/widget/bus_interface_screen.png rename to src/main/resources/assets/oc2/textures/gui/widget/bus_interface_screen.png diff --git a/src/main/resources/assets/oc2r/textures/gui/widget/cancel_button.png b/src/main/resources/assets/oc2/textures/gui/widget/cancel_button.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/gui/widget/cancel_button.png rename to src/main/resources/assets/oc2/textures/gui/widget/cancel_button.png diff --git a/src/main/resources/assets/oc2r/textures/gui/widget/computer_container.png b/src/main/resources/assets/oc2/textures/gui/widget/computer_container.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/gui/widget/computer_container.png rename to src/main/resources/assets/oc2/textures/gui/widget/computer_container.png diff --git a/src/main/resources/assets/oc2r/textures/gui/widget/confirm_button.png b/src/main/resources/assets/oc2/textures/gui/widget/confirm_button.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/gui/widget/confirm_button.png rename to src/main/resources/assets/oc2/textures/gui/widget/confirm_button.png diff --git a/src/main/resources/assets/oc2r/textures/gui/widget/energy.png b/src/main/resources/assets/oc2/textures/gui/widget/energy.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/gui/widget/energy.png rename to src/main/resources/assets/oc2/textures/gui/widget/energy.png diff --git a/src/main/resources/assets/oc2r/textures/gui/widget/hotbar.png b/src/main/resources/assets/oc2/textures/gui/widget/hotbar.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/gui/widget/hotbar.png rename to src/main/resources/assets/oc2/textures/gui/widget/hotbar.png diff --git a/src/main/resources/assets/oc2r/textures/gui/widget/input_button.png b/src/main/resources/assets/oc2/textures/gui/widget/input_button.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/gui/widget/input_button.png rename to src/main/resources/assets/oc2/textures/gui/widget/input_button.png diff --git a/src/main/resources/assets/oc2r/textures/gui/widget/inventory_button.png b/src/main/resources/assets/oc2/textures/gui/widget/inventory_button.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/gui/widget/inventory_button.png rename to src/main/resources/assets/oc2/textures/gui/widget/inventory_button.png diff --git a/src/main/resources/assets/oc2r/textures/gui/widget/monitor_screen.png b/src/main/resources/assets/oc2/textures/gui/widget/monitor_screen.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/gui/widget/monitor_screen.png rename to src/main/resources/assets/oc2/textures/gui/widget/monitor_screen.png diff --git a/src/main/resources/assets/oc2r/textures/gui/widget/monitor_sidebar_1.png b/src/main/resources/assets/oc2/textures/gui/widget/monitor_sidebar_1.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/gui/widget/monitor_sidebar_1.png rename to src/main/resources/assets/oc2/textures/gui/widget/monitor_sidebar_1.png diff --git a/src/main/resources/assets/oc2r/textures/gui/widget/network_interface_card_screen.png b/src/main/resources/assets/oc2/textures/gui/widget/network_interface_card_screen.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/gui/widget/network_interface_card_screen.png rename to src/main/resources/assets/oc2/textures/gui/widget/network_interface_card_screen.png diff --git a/src/main/resources/assets/oc2r/textures/gui/widget/network_tunnel_link_button.png b/src/main/resources/assets/oc2/textures/gui/widget/network_tunnel_link_button.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/gui/widget/network_tunnel_link_button.png rename to src/main/resources/assets/oc2/textures/gui/widget/network_tunnel_link_button.png diff --git a/src/main/resources/assets/oc2r/textures/gui/widget/network_tunnel_screen.png b/src/main/resources/assets/oc2/textures/gui/widget/network_tunnel_screen.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/gui/widget/network_tunnel_screen.png rename to src/main/resources/assets/oc2/textures/gui/widget/network_tunnel_screen.png diff --git a/src/main/resources/assets/oc2r/textures/gui/widget/power_button.png b/src/main/resources/assets/oc2/textures/gui/widget/power_button.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/gui/widget/power_button.png rename to src/main/resources/assets/oc2/textures/gui/widget/power_button.png diff --git a/src/main/resources/assets/oc2r/textures/gui/widget/robot_container.png b/src/main/resources/assets/oc2/textures/gui/widget/robot_container.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/gui/widget/robot_container.png rename to src/main/resources/assets/oc2/textures/gui/widget/robot_container.png diff --git a/src/main/resources/assets/oc2r/textures/gui/widget/sidebar_2.png b/src/main/resources/assets/oc2/textures/gui/widget/sidebar_2.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/gui/widget/sidebar_2.png rename to src/main/resources/assets/oc2/textures/gui/widget/sidebar_2.png diff --git a/src/main/resources/assets/oc2r/textures/gui/widget/sidebar_3.png b/src/main/resources/assets/oc2/textures/gui/widget/sidebar_3.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/gui/widget/sidebar_3.png rename to src/main/resources/assets/oc2/textures/gui/widget/sidebar_3.png diff --git a/src/main/resources/assets/oc2r/textures/gui/widget/terminal_screen.png b/src/main/resources/assets/oc2/textures/gui/widget/terminal_screen.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/gui/widget/terminal_screen.png rename to src/main/resources/assets/oc2/textures/gui/widget/terminal_screen.png diff --git a/src/main/resources/assets/oc2r/textures/item/backlight.png b/src/main/resources/assets/oc2/textures/item/backlight.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/item/backlight.png rename to src/main/resources/assets/oc2/textures/item/backlight.png diff --git a/src/main/resources/assets/oc2r/textures/item/block_operations_module.png b/src/main/resources/assets/oc2/textures/item/block_operations_module.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/item/block_operations_module.png rename to src/main/resources/assets/oc2/textures/item/block_operations_module.png diff --git a/src/main/resources/assets/oc2r/textures/item/card_slot.png b/src/main/resources/assets/oc2/textures/item/card_slot.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/item/card_slot.png rename to src/main/resources/assets/oc2/textures/item/card_slot.png diff --git a/src/main/resources/assets/oc2r/textures/item/circuit_board.png b/src/main/resources/assets/oc2/textures/item/circuit_board.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/item/circuit_board.png rename to src/main/resources/assets/oc2/textures/item/circuit_board.png diff --git a/src/main/resources/assets/oc2r/textures/item/cpu_slot.png b/src/main/resources/assets/oc2/textures/item/cpu_slot.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/item/cpu_slot.png rename to src/main/resources/assets/oc2/textures/item/cpu_slot.png diff --git a/src/main/resources/assets/oc2r/textures/item/cpu_tier_1.png b/src/main/resources/assets/oc2/textures/item/cpu_tier_1.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/item/cpu_tier_1.png rename to src/main/resources/assets/oc2/textures/item/cpu_tier_1.png diff --git a/src/main/resources/assets/oc2r/textures/item/cpu_tier_2.png b/src/main/resources/assets/oc2/textures/item/cpu_tier_2.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/item/cpu_tier_2.png rename to src/main/resources/assets/oc2/textures/item/cpu_tier_2.png diff --git a/src/main/resources/assets/oc2r/textures/item/cpu_tier_3.png b/src/main/resources/assets/oc2/textures/item/cpu_tier_3.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/item/cpu_tier_3.png rename to src/main/resources/assets/oc2/textures/item/cpu_tier_3.png diff --git a/src/main/resources/assets/oc2r/textures/item/cpu_tier_4.png b/src/main/resources/assets/oc2/textures/item/cpu_tier_4.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/item/cpu_tier_4.png rename to src/main/resources/assets/oc2/textures/item/cpu_tier_4.png diff --git a/src/main/resources/assets/oc2r/textures/item/file_import_export_card.png b/src/main/resources/assets/oc2/textures/item/file_import_export_card.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/item/file_import_export_card.png rename to src/main/resources/assets/oc2/textures/item/file_import_export_card.png diff --git a/src/main/resources/assets/oc2r/textures/item/file_import_export_card.png.mcmeta b/src/main/resources/assets/oc2/textures/item/file_import_export_card.png.mcmeta similarity index 100% rename from src/main/resources/assets/oc2r/textures/item/file_import_export_card.png.mcmeta rename to src/main/resources/assets/oc2/textures/item/file_import_export_card.png.mcmeta diff --git a/src/main/resources/assets/oc2r/textures/item/flash_memory.png b/src/main/resources/assets/oc2/textures/item/flash_memory.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/item/flash_memory.png rename to src/main/resources/assets/oc2/textures/item/flash_memory.png diff --git a/src/main/resources/assets/oc2r/textures/item/flash_memory_slot.png b/src/main/resources/assets/oc2/textures/item/flash_memory_slot.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/item/flash_memory_slot.png rename to src/main/resources/assets/oc2/textures/item/flash_memory_slot.png diff --git a/src/main/resources/assets/oc2r/textures/item/floppy_base.png b/src/main/resources/assets/oc2/textures/item/floppy_base.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/item/floppy_base.png rename to src/main/resources/assets/oc2/textures/item/floppy_base.png diff --git a/src/main/resources/assets/oc2r/textures/item/floppy_slot.png b/src/main/resources/assets/oc2/textures/item/floppy_slot.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/item/floppy_slot.png rename to src/main/resources/assets/oc2/textures/item/floppy_slot.png diff --git a/src/main/resources/assets/oc2r/textures/item/floppy_tint.png b/src/main/resources/assets/oc2/textures/item/floppy_tint.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/item/floppy_tint.png rename to src/main/resources/assets/oc2/textures/item/floppy_tint.png diff --git a/src/main/resources/assets/oc2r/textures/item/front_display_glass.png b/src/main/resources/assets/oc2/textures/item/front_display_glass.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/item/front_display_glass.png rename to src/main/resources/assets/oc2/textures/item/front_display_glass.png diff --git a/src/main/resources/assets/oc2r/textures/item/hard_disk_platter.png b/src/main/resources/assets/oc2/textures/item/hard_disk_platter.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/item/hard_disk_platter.png rename to src/main/resources/assets/oc2/textures/item/hard_disk_platter.png diff --git a/src/main/resources/assets/oc2r/textures/item/hard_drive_base.png b/src/main/resources/assets/oc2/textures/item/hard_drive_base.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/item/hard_drive_base.png rename to src/main/resources/assets/oc2/textures/item/hard_drive_base.png diff --git a/src/main/resources/assets/oc2r/textures/item/hard_drive_slot.png b/src/main/resources/assets/oc2/textures/item/hard_drive_slot.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/item/hard_drive_slot.png rename to src/main/resources/assets/oc2/textures/item/hard_drive_slot.png diff --git a/src/main/resources/assets/oc2r/textures/item/hard_drive_tint.png b/src/main/resources/assets/oc2/textures/item/hard_drive_tint.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/item/hard_drive_tint.png rename to src/main/resources/assets/oc2/textures/item/hard_drive_tint.png diff --git a/src/main/resources/assets/oc2r/textures/item/inventory_operations_module.png b/src/main/resources/assets/oc2/textures/item/inventory_operations_module.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/item/inventory_operations_module.png rename to src/main/resources/assets/oc2/textures/item/inventory_operations_module.png diff --git a/src/main/resources/assets/oc2r/textures/item/lcd_display.png b/src/main/resources/assets/oc2/textures/item/lcd_display.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/item/lcd_display.png rename to src/main/resources/assets/oc2/textures/item/lcd_display.png diff --git a/src/main/resources/assets/oc2r/textures/item/liquid_crystal_layers.png b/src/main/resources/assets/oc2/textures/item/liquid_crystal_layers.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/item/liquid_crystal_layers.png rename to src/main/resources/assets/oc2/textures/item/liquid_crystal_layers.png diff --git a/src/main/resources/assets/oc2r/textures/item/manual.png b/src/main/resources/assets/oc2/textures/item/manual.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/item/manual.png rename to src/main/resources/assets/oc2/textures/item/manual.png diff --git a/src/main/resources/assets/oc2r/textures/item/memory_extra_large.png b/src/main/resources/assets/oc2/textures/item/memory_extra_large.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/item/memory_extra_large.png rename to src/main/resources/assets/oc2/textures/item/memory_extra_large.png diff --git a/src/main/resources/assets/oc2r/textures/item/memory_large.png b/src/main/resources/assets/oc2/textures/item/memory_large.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/item/memory_large.png rename to src/main/resources/assets/oc2/textures/item/memory_large.png diff --git a/src/main/resources/assets/oc2r/textures/item/memory_medium.png b/src/main/resources/assets/oc2/textures/item/memory_medium.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/item/memory_medium.png rename to src/main/resources/assets/oc2/textures/item/memory_medium.png diff --git a/src/main/resources/assets/oc2r/textures/item/memory_slot.png b/src/main/resources/assets/oc2/textures/item/memory_slot.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/item/memory_slot.png rename to src/main/resources/assets/oc2/textures/item/memory_slot.png diff --git a/src/main/resources/assets/oc2r/textures/item/memory_small.png b/src/main/resources/assets/oc2/textures/item/memory_small.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/item/memory_small.png rename to src/main/resources/assets/oc2/textures/item/memory_small.png diff --git a/src/main/resources/assets/oc2r/textures/item/motor.png b/src/main/resources/assets/oc2/textures/item/motor.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/item/motor.png rename to src/main/resources/assets/oc2/textures/item/motor.png diff --git a/src/main/resources/assets/oc2r/textures/item/network_cable.png b/src/main/resources/assets/oc2/textures/item/network_cable.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/item/network_cable.png rename to src/main/resources/assets/oc2/textures/item/network_cable.png diff --git a/src/main/resources/assets/oc2r/textures/item/network_interface_card.png b/src/main/resources/assets/oc2/textures/item/network_interface_card.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/item/network_interface_card.png rename to src/main/resources/assets/oc2/textures/item/network_interface_card.png diff --git a/src/main/resources/assets/oc2r/textures/item/network_tunnel_card.png b/src/main/resources/assets/oc2/textures/item/network_tunnel_card.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/item/network_tunnel_card.png rename to src/main/resources/assets/oc2/textures/item/network_tunnel_card.png diff --git a/src/main/resources/assets/oc2r/textures/item/network_tunnel_module.png b/src/main/resources/assets/oc2/textures/item/network_tunnel_module.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/item/network_tunnel_module.png rename to src/main/resources/assets/oc2/textures/item/network_tunnel_module.png diff --git a/src/main/resources/assets/oc2r/textures/item/network_tunnel_slot.png b/src/main/resources/assets/oc2/textures/item/network_tunnel_slot.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/item/network_tunnel_slot.png rename to src/main/resources/assets/oc2/textures/item/network_tunnel_slot.png diff --git a/src/main/resources/assets/oc2r/textures/item/polarization_filter.png b/src/main/resources/assets/oc2/textures/item/polarization_filter.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/item/polarization_filter.png rename to src/main/resources/assets/oc2/textures/item/polarization_filter.png diff --git a/src/main/resources/assets/oc2r/textures/item/raw_silicon_wafer.png b/src/main/resources/assets/oc2/textures/item/raw_silicon_wafer.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/item/raw_silicon_wafer.png rename to src/main/resources/assets/oc2/textures/item/raw_silicon_wafer.png diff --git a/src/main/resources/assets/oc2r/textures/item/redstone_interface_card.png b/src/main/resources/assets/oc2/textures/item/redstone_interface_card.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/item/redstone_interface_card.png rename to src/main/resources/assets/oc2/textures/item/redstone_interface_card.png diff --git a/src/main/resources/assets/oc2r/textures/item/robot_module_slot.png b/src/main/resources/assets/oc2/textures/item/robot_module_slot.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/item/robot_module_slot.png rename to src/main/resources/assets/oc2/textures/item/robot_module_slot.png diff --git a/src/main/resources/assets/oc2r/textures/item/silicon.png b/src/main/resources/assets/oc2/textures/item/silicon.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/item/silicon.png rename to src/main/resources/assets/oc2/textures/item/silicon.png diff --git a/src/main/resources/assets/oc2r/textures/item/silicon_blend.png b/src/main/resources/assets/oc2/textures/item/silicon_blend.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/item/silicon_blend.png rename to src/main/resources/assets/oc2/textures/item/silicon_blend.png diff --git a/src/main/resources/assets/oc2r/textures/item/silicon_wafer.png b/src/main/resources/assets/oc2/textures/item/silicon_wafer.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/item/silicon_wafer.png rename to src/main/resources/assets/oc2/textures/item/silicon_wafer.png diff --git a/src/main/resources/assets/oc2r/textures/item/sound_card.png b/src/main/resources/assets/oc2/textures/item/sound_card.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/item/sound_card.png rename to src/main/resources/assets/oc2/textures/item/sound_card.png diff --git a/src/main/resources/assets/oc2r/textures/item/transistor.png b/src/main/resources/assets/oc2/textures/item/transistor.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/item/transistor.png rename to src/main/resources/assets/oc2/textures/item/transistor.png diff --git a/src/main/resources/assets/oc2r/textures/item/wrench.png b/src/main/resources/assets/oc2/textures/item/wrench.png similarity index 100% rename from src/main/resources/assets/oc2r/textures/item/wrench.png rename to src/main/resources/assets/oc2/textures/item/wrench.png diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/block_operations_module.json b/src/main/resources/data/oc2/advancements/recipes/oc2.common/block_operations_module.json similarity index 100% rename from src/main/resources/data/oc2r/advancements/recipes/oc2r.common/block_operations_module.json rename to src/main/resources/data/oc2/advancements/recipes/oc2.common/block_operations_module.json diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/bus_cable.json b/src/main/resources/data/oc2/advancements/recipes/oc2.common/bus_cable.json similarity index 100% rename from src/main/resources/data/oc2r/advancements/recipes/oc2r.common/bus_cable.json rename to src/main/resources/data/oc2/advancements/recipes/oc2.common/bus_cable.json diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/bus_interface.json b/src/main/resources/data/oc2/advancements/recipes/oc2.common/bus_interface.json similarity index 100% rename from src/main/resources/data/oc2r/advancements/recipes/oc2r.common/bus_interface.json rename to src/main/resources/data/oc2/advancements/recipes/oc2.common/bus_interface.json diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/charger.json b/src/main/resources/data/oc2/advancements/recipes/oc2.common/charger.json similarity index 100% rename from src/main/resources/data/oc2r/advancements/recipes/oc2r.common/charger.json rename to src/main/resources/data/oc2/advancements/recipes/oc2.common/charger.json diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/circuit_board.json b/src/main/resources/data/oc2/advancements/recipes/oc2.common/circuit_board.json similarity index 100% rename from src/main/resources/data/oc2r/advancements/recipes/oc2r.common/circuit_board.json rename to src/main/resources/data/oc2/advancements/recipes/oc2.common/circuit_board.json diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/computer.json b/src/main/resources/data/oc2/advancements/recipes/oc2.common/computer.json similarity index 100% rename from src/main/resources/data/oc2r/advancements/recipes/oc2r.common/computer.json rename to src/main/resources/data/oc2/advancements/recipes/oc2.common/computer.json diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/disk_drive.json b/src/main/resources/data/oc2/advancements/recipes/oc2.common/disk_drive.json similarity index 100% rename from src/main/resources/data/oc2r/advancements/recipes/oc2r.common/disk_drive.json rename to src/main/resources/data/oc2/advancements/recipes/oc2.common/disk_drive.json diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/file_import_export_card.json b/src/main/resources/data/oc2/advancements/recipes/oc2.common/file_import_export_card.json similarity index 100% rename from src/main/resources/data/oc2r/advancements/recipes/oc2r.common/file_import_export_card.json rename to src/main/resources/data/oc2/advancements/recipes/oc2.common/file_import_export_card.json diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/flash_memory.json b/src/main/resources/data/oc2/advancements/recipes/oc2.common/flash_memory.json similarity index 100% rename from src/main/resources/data/oc2r/advancements/recipes/oc2r.common/flash_memory.json rename to src/main/resources/data/oc2/advancements/recipes/oc2.common/flash_memory.json diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/flash_memory_custom.json b/src/main/resources/data/oc2/advancements/recipes/oc2.common/flash_memory_custom.json similarity index 100% rename from src/main/resources/data/oc2r/advancements/recipes/oc2r.common/flash_memory_custom.json rename to src/main/resources/data/oc2/advancements/recipes/oc2.common/flash_memory_custom.json diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/floppy.json b/src/main/resources/data/oc2/advancements/recipes/oc2.common/floppy.json similarity index 100% rename from src/main/resources/data/oc2r/advancements/recipes/oc2r.common/floppy.json rename to src/main/resources/data/oc2/advancements/recipes/oc2.common/floppy.json diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/floppy_modern.json b/src/main/resources/data/oc2/advancements/recipes/oc2.common/floppy_modern.json similarity index 100% rename from src/main/resources/data/oc2r/advancements/recipes/oc2r.common/floppy_modern.json rename to src/main/resources/data/oc2/advancements/recipes/oc2.common/floppy_modern.json diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/hard_drive_custom.json b/src/main/resources/data/oc2/advancements/recipes/oc2.common/hard_drive_custom.json similarity index 100% rename from src/main/resources/data/oc2r/advancements/recipes/oc2r.common/hard_drive_custom.json rename to src/main/resources/data/oc2/advancements/recipes/oc2.common/hard_drive_custom.json diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/hard_drive_extra_large.json b/src/main/resources/data/oc2/advancements/recipes/oc2.common/hard_drive_extra_large.json similarity index 100% rename from src/main/resources/data/oc2r/advancements/recipes/oc2r.common/hard_drive_extra_large.json rename to src/main/resources/data/oc2/advancements/recipes/oc2.common/hard_drive_extra_large.json diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/hard_drive_large.json b/src/main/resources/data/oc2/advancements/recipes/oc2.common/hard_drive_large.json similarity index 100% rename from src/main/resources/data/oc2r/advancements/recipes/oc2r.common/hard_drive_large.json rename to src/main/resources/data/oc2/advancements/recipes/oc2.common/hard_drive_large.json diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/hard_drive_medium.json b/src/main/resources/data/oc2/advancements/recipes/oc2.common/hard_drive_medium.json similarity index 100% rename from src/main/resources/data/oc2r/advancements/recipes/oc2r.common/hard_drive_medium.json rename to src/main/resources/data/oc2/advancements/recipes/oc2.common/hard_drive_medium.json diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/hard_drive_small.json b/src/main/resources/data/oc2/advancements/recipes/oc2.common/hard_drive_small.json similarity index 100% rename from src/main/resources/data/oc2r/advancements/recipes/oc2r.common/hard_drive_small.json rename to src/main/resources/data/oc2/advancements/recipes/oc2.common/hard_drive_small.json diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/inventory_operations_module.json b/src/main/resources/data/oc2/advancements/recipes/oc2.common/inventory_operations_module.json similarity index 100% rename from src/main/resources/data/oc2r/advancements/recipes/oc2r.common/inventory_operations_module.json rename to src/main/resources/data/oc2/advancements/recipes/oc2.common/inventory_operations_module.json diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/keyboard.json b/src/main/resources/data/oc2/advancements/recipes/oc2.common/keyboard.json similarity index 100% rename from src/main/resources/data/oc2r/advancements/recipes/oc2r.common/keyboard.json rename to src/main/resources/data/oc2/advancements/recipes/oc2.common/keyboard.json diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/manual.json b/src/main/resources/data/oc2/advancements/recipes/oc2.common/manual.json similarity index 100% rename from src/main/resources/data/oc2r/advancements/recipes/oc2r.common/manual.json rename to src/main/resources/data/oc2/advancements/recipes/oc2.common/manual.json diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/memory_extra_large.json b/src/main/resources/data/oc2/advancements/recipes/oc2.common/memory_extra_large.json similarity index 100% rename from src/main/resources/data/oc2r/advancements/recipes/oc2r.common/memory_extra_large.json rename to src/main/resources/data/oc2/advancements/recipes/oc2.common/memory_extra_large.json diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/memory_large.json b/src/main/resources/data/oc2/advancements/recipes/oc2.common/memory_large.json similarity index 100% rename from src/main/resources/data/oc2r/advancements/recipes/oc2r.common/memory_large.json rename to src/main/resources/data/oc2/advancements/recipes/oc2.common/memory_large.json diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/memory_medium.json b/src/main/resources/data/oc2/advancements/recipes/oc2.common/memory_medium.json similarity index 100% rename from src/main/resources/data/oc2r/advancements/recipes/oc2r.common/memory_medium.json rename to src/main/resources/data/oc2/advancements/recipes/oc2.common/memory_medium.json diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/memory_small.json b/src/main/resources/data/oc2/advancements/recipes/oc2.common/memory_small.json similarity index 100% rename from src/main/resources/data/oc2r/advancements/recipes/oc2r.common/memory_small.json rename to src/main/resources/data/oc2/advancements/recipes/oc2.common/memory_small.json diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/network_cable.json b/src/main/resources/data/oc2/advancements/recipes/oc2.common/network_cable.json similarity index 100% rename from src/main/resources/data/oc2r/advancements/recipes/oc2r.common/network_cable.json rename to src/main/resources/data/oc2/advancements/recipes/oc2.common/network_cable.json diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/network_connector.json b/src/main/resources/data/oc2/advancements/recipes/oc2.common/network_connector.json similarity index 100% rename from src/main/resources/data/oc2r/advancements/recipes/oc2r.common/network_connector.json rename to src/main/resources/data/oc2/advancements/recipes/oc2.common/network_connector.json diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/network_hub.json b/src/main/resources/data/oc2/advancements/recipes/oc2.common/network_hub.json similarity index 100% rename from src/main/resources/data/oc2r/advancements/recipes/oc2r.common/network_hub.json rename to src/main/resources/data/oc2/advancements/recipes/oc2.common/network_hub.json diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/network_interface_card.json b/src/main/resources/data/oc2/advancements/recipes/oc2.common/network_interface_card.json similarity index 100% rename from src/main/resources/data/oc2r/advancements/recipes/oc2r.common/network_interface_card.json rename to src/main/resources/data/oc2/advancements/recipes/oc2.common/network_interface_card.json diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/network_tunnel_card.json b/src/main/resources/data/oc2/advancements/recipes/oc2.common/network_tunnel_card.json similarity index 100% rename from src/main/resources/data/oc2r/advancements/recipes/oc2r.common/network_tunnel_card.json rename to src/main/resources/data/oc2/advancements/recipes/oc2.common/network_tunnel_card.json diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/network_tunnel_module.json b/src/main/resources/data/oc2/advancements/recipes/oc2.common/network_tunnel_module.json similarity index 100% rename from src/main/resources/data/oc2r/advancements/recipes/oc2r.common/network_tunnel_module.json rename to src/main/resources/data/oc2/advancements/recipes/oc2.common/network_tunnel_module.json diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/projector.json b/src/main/resources/data/oc2/advancements/recipes/oc2.common/projector.json similarity index 100% rename from src/main/resources/data/oc2r/advancements/recipes/oc2r.common/projector.json rename to src/main/resources/data/oc2/advancements/recipes/oc2.common/projector.json diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/redstone_interface.json b/src/main/resources/data/oc2/advancements/recipes/oc2.common/redstone_interface.json similarity index 100% rename from src/main/resources/data/oc2r/advancements/recipes/oc2r.common/redstone_interface.json rename to src/main/resources/data/oc2/advancements/recipes/oc2.common/redstone_interface.json diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/redstone_interface_card.json b/src/main/resources/data/oc2/advancements/recipes/oc2.common/redstone_interface_card.json similarity index 100% rename from src/main/resources/data/oc2r/advancements/recipes/oc2r.common/redstone_interface_card.json rename to src/main/resources/data/oc2/advancements/recipes/oc2.common/redstone_interface_card.json diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/robot.json b/src/main/resources/data/oc2/advancements/recipes/oc2.common/robot.json similarity index 100% rename from src/main/resources/data/oc2r/advancements/recipes/oc2r.common/robot.json rename to src/main/resources/data/oc2/advancements/recipes/oc2.common/robot.json diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/sound_card.json b/src/main/resources/data/oc2/advancements/recipes/oc2.common/sound_card.json similarity index 100% rename from src/main/resources/data/oc2r/advancements/recipes/oc2r.common/sound_card.json rename to src/main/resources/data/oc2/advancements/recipes/oc2.common/sound_card.json diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/transistor.json b/src/main/resources/data/oc2/advancements/recipes/oc2.common/transistor.json similarity index 100% rename from src/main/resources/data/oc2r/advancements/recipes/oc2r.common/transistor.json rename to src/main/resources/data/oc2/advancements/recipes/oc2.common/transistor.json diff --git a/src/main/resources/data/oc2r/advancements/recipes/oc2r.common/wrench.json b/src/main/resources/data/oc2/advancements/recipes/oc2.common/wrench.json similarity index 100% rename from src/main/resources/data/oc2r/advancements/recipes/oc2r.common/wrench.json rename to src/main/resources/data/oc2/advancements/recipes/oc2.common/wrench.json diff --git a/src/main/resources/data/oc2r/file_systems/README.md b/src/main/resources/data/oc2/file_systems/README.md similarity index 100% rename from src/main/resources/data/oc2r/file_systems/README.md rename to src/main/resources/data/oc2/file_systems/README.md diff --git a/src/main/resources/data/oc2r/file_systems/scripts.json b/src/main/resources/data/oc2/file_systems/scripts.json similarity index 100% rename from src/main/resources/data/oc2r/file_systems/scripts.json rename to src/main/resources/data/oc2/file_systems/scripts.json diff --git a/src/main/resources/data/oc2r/item_tag_filters/minecraft/common.json b/src/main/resources/data/oc2/item_tag_filters/minecraft/common.json similarity index 100% rename from src/main/resources/data/oc2r/item_tag_filters/minecraft/common.json rename to src/main/resources/data/oc2/item_tag_filters/minecraft/common.json diff --git a/src/main/resources/data/oc2r/item_tag_filters/oc2r/hard_drive.json b/src/main/resources/data/oc2/item_tag_filters/oc2/hard_drive.json similarity index 100% rename from src/main/resources/data/oc2r/item_tag_filters/oc2r/hard_drive.json rename to src/main/resources/data/oc2/item_tag_filters/oc2/hard_drive.json diff --git a/src/main/resources/data/oc2r/item_tag_filters/oc2r/memory.json b/src/main/resources/data/oc2/item_tag_filters/oc2/memory.json similarity index 100% rename from src/main/resources/data/oc2r/item_tag_filters/oc2r/memory.json rename to src/main/resources/data/oc2/item_tag_filters/oc2/memory.json diff --git a/src/main/resources/data/oc2r/loot_tables/blocks/charger.json b/src/main/resources/data/oc2/loot_tables/blocks/charger.json similarity index 100% rename from src/main/resources/data/oc2r/loot_tables/blocks/charger.json rename to src/main/resources/data/oc2/loot_tables/blocks/charger.json diff --git a/src/main/resources/data/oc2r/loot_tables/blocks/computer.json b/src/main/resources/data/oc2/loot_tables/blocks/computer.json similarity index 100% rename from src/main/resources/data/oc2r/loot_tables/blocks/computer.json rename to src/main/resources/data/oc2/loot_tables/blocks/computer.json diff --git a/src/main/resources/data/oc2r/loot_tables/blocks/disk_drive.json b/src/main/resources/data/oc2/loot_tables/blocks/disk_drive.json similarity index 100% rename from src/main/resources/data/oc2r/loot_tables/blocks/disk_drive.json rename to src/main/resources/data/oc2/loot_tables/blocks/disk_drive.json diff --git a/src/main/resources/data/oc2r/loot_tables/blocks/keyboard.json b/src/main/resources/data/oc2/loot_tables/blocks/keyboard.json similarity index 100% rename from src/main/resources/data/oc2r/loot_tables/blocks/keyboard.json rename to src/main/resources/data/oc2/loot_tables/blocks/keyboard.json diff --git a/src/main/resources/data/oc2r/loot_tables/blocks/network_connector.json b/src/main/resources/data/oc2/loot_tables/blocks/network_connector.json similarity index 100% rename from src/main/resources/data/oc2r/loot_tables/blocks/network_connector.json rename to src/main/resources/data/oc2/loot_tables/blocks/network_connector.json diff --git a/src/main/resources/data/oc2r/loot_tables/blocks/network_hub.json b/src/main/resources/data/oc2/loot_tables/blocks/network_hub.json similarity index 100% rename from src/main/resources/data/oc2r/loot_tables/blocks/network_hub.json rename to src/main/resources/data/oc2/loot_tables/blocks/network_hub.json diff --git a/src/main/resources/data/oc2r/loot_tables/blocks/projector.json b/src/main/resources/data/oc2/loot_tables/blocks/projector.json similarity index 100% rename from src/main/resources/data/oc2r/loot_tables/blocks/projector.json rename to src/main/resources/data/oc2/loot_tables/blocks/projector.json diff --git a/src/main/resources/data/oc2r/loot_tables/blocks/redstone_interface.json b/src/main/resources/data/oc2/loot_tables/blocks/redstone_interface.json similarity index 100% rename from src/main/resources/data/oc2r/loot_tables/blocks/redstone_interface.json rename to src/main/resources/data/oc2/loot_tables/blocks/redstone_interface.json diff --git a/src/main/resources/data/oc2r/recipes/block_operations_module.json b/src/main/resources/data/oc2/recipes/block_operations_module.json similarity index 100% rename from src/main/resources/data/oc2r/recipes/block_operations_module.json rename to src/main/resources/data/oc2/recipes/block_operations_module.json diff --git a/src/main/resources/data/oc2r/recipes/bus_cable.json b/src/main/resources/data/oc2/recipes/bus_cable.json similarity index 100% rename from src/main/resources/data/oc2r/recipes/bus_cable.json rename to src/main/resources/data/oc2/recipes/bus_cable.json diff --git a/src/main/resources/data/oc2r/recipes/bus_interface.json b/src/main/resources/data/oc2/recipes/bus_interface.json similarity index 100% rename from src/main/resources/data/oc2r/recipes/bus_interface.json rename to src/main/resources/data/oc2/recipes/bus_interface.json diff --git a/src/main/resources/data/oc2r/recipes/charger.json b/src/main/resources/data/oc2/recipes/charger.json similarity index 100% rename from src/main/resources/data/oc2r/recipes/charger.json rename to src/main/resources/data/oc2/recipes/charger.json diff --git a/src/main/resources/data/oc2r/recipes/circuit_board.json b/src/main/resources/data/oc2/recipes/circuit_board.json similarity index 100% rename from src/main/resources/data/oc2r/recipes/circuit_board.json rename to src/main/resources/data/oc2/recipes/circuit_board.json diff --git a/src/main/resources/data/oc2r/recipes/computer.json b/src/main/resources/data/oc2/recipes/computer.json similarity index 100% rename from src/main/resources/data/oc2r/recipes/computer.json rename to src/main/resources/data/oc2/recipes/computer.json diff --git a/src/main/resources/data/oc2r/recipes/cpu_tier_1.json b/src/main/resources/data/oc2/recipes/cpu_tier_1.json similarity index 100% rename from src/main/resources/data/oc2r/recipes/cpu_tier_1.json rename to src/main/resources/data/oc2/recipes/cpu_tier_1.json diff --git a/src/main/resources/data/oc2r/recipes/cpu_tier_2.json b/src/main/resources/data/oc2/recipes/cpu_tier_2.json similarity index 100% rename from src/main/resources/data/oc2r/recipes/cpu_tier_2.json rename to src/main/resources/data/oc2/recipes/cpu_tier_2.json diff --git a/src/main/resources/data/oc2r/recipes/cpu_tier_3.json b/src/main/resources/data/oc2/recipes/cpu_tier_3.json similarity index 100% rename from src/main/resources/data/oc2r/recipes/cpu_tier_3.json rename to src/main/resources/data/oc2/recipes/cpu_tier_3.json diff --git a/src/main/resources/data/oc2r/recipes/cpu_tier_4.json b/src/main/resources/data/oc2/recipes/cpu_tier_4.json similarity index 100% rename from src/main/resources/data/oc2r/recipes/cpu_tier_4.json rename to src/main/resources/data/oc2/recipes/cpu_tier_4.json diff --git a/src/main/resources/data/oc2r/recipes/disk_drive.json b/src/main/resources/data/oc2/recipes/disk_drive.json similarity index 100% rename from src/main/resources/data/oc2r/recipes/disk_drive.json rename to src/main/resources/data/oc2/recipes/disk_drive.json diff --git a/src/main/resources/data/oc2r/recipes/file_import_export_card.json b/src/main/resources/data/oc2/recipes/file_import_export_card.json similarity index 100% rename from src/main/resources/data/oc2r/recipes/file_import_export_card.json rename to src/main/resources/data/oc2/recipes/file_import_export_card.json diff --git a/src/main/resources/data/oc2r/recipes/flash_memory.json b/src/main/resources/data/oc2/recipes/flash_memory.json similarity index 100% rename from src/main/resources/data/oc2r/recipes/flash_memory.json rename to src/main/resources/data/oc2/recipes/flash_memory.json diff --git a/src/main/resources/data/oc2r/recipes/flash_memory_custom.json b/src/main/resources/data/oc2/recipes/flash_memory_custom.json similarity index 100% rename from src/main/resources/data/oc2r/recipes/flash_memory_custom.json rename to src/main/resources/data/oc2/recipes/flash_memory_custom.json diff --git a/src/main/resources/data/oc2r/recipes/flash_memory_flasher.json b/src/main/resources/data/oc2/recipes/flash_memory_flasher.json similarity index 100% rename from src/main/resources/data/oc2r/recipes/flash_memory_flasher.json rename to src/main/resources/data/oc2/recipes/flash_memory_flasher.json diff --git a/src/main/resources/data/oc2r/recipes/floppy.json b/src/main/resources/data/oc2/recipes/floppy.json similarity index 100% rename from src/main/resources/data/oc2r/recipes/floppy.json rename to src/main/resources/data/oc2/recipes/floppy.json diff --git a/src/main/resources/data/oc2r/recipes/floppy_modern.json b/src/main/resources/data/oc2/recipes/floppy_modern.json similarity index 100% rename from src/main/resources/data/oc2r/recipes/floppy_modern.json rename to src/main/resources/data/oc2/recipes/floppy_modern.json diff --git a/src/main/resources/data/oc2r/recipes/hard_drive_custom.json b/src/main/resources/data/oc2/recipes/hard_drive_custom.json similarity index 100% rename from src/main/resources/data/oc2r/recipes/hard_drive_custom.json rename to src/main/resources/data/oc2/recipes/hard_drive_custom.json diff --git a/src/main/resources/data/oc2r/recipes/hard_drive_extra_large.json b/src/main/resources/data/oc2/recipes/hard_drive_extra_large.json similarity index 100% rename from src/main/resources/data/oc2r/recipes/hard_drive_extra_large.json rename to src/main/resources/data/oc2/recipes/hard_drive_extra_large.json diff --git a/src/main/resources/data/oc2r/recipes/hard_drive_large.json b/src/main/resources/data/oc2/recipes/hard_drive_large.json similarity index 100% rename from src/main/resources/data/oc2r/recipes/hard_drive_large.json rename to src/main/resources/data/oc2/recipes/hard_drive_large.json diff --git a/src/main/resources/data/oc2r/recipes/hard_drive_medium.json b/src/main/resources/data/oc2/recipes/hard_drive_medium.json similarity index 100% rename from src/main/resources/data/oc2r/recipes/hard_drive_medium.json rename to src/main/resources/data/oc2/recipes/hard_drive_medium.json diff --git a/src/main/resources/data/oc2r/recipes/hard_drive_small.json b/src/main/resources/data/oc2/recipes/hard_drive_small.json similarity index 100% rename from src/main/resources/data/oc2r/recipes/hard_drive_small.json rename to src/main/resources/data/oc2/recipes/hard_drive_small.json diff --git a/src/main/resources/data/oc2r/recipes/inventory_operations_module.json b/src/main/resources/data/oc2/recipes/inventory_operations_module.json similarity index 100% rename from src/main/resources/data/oc2r/recipes/inventory_operations_module.json rename to src/main/resources/data/oc2/recipes/inventory_operations_module.json diff --git a/src/main/resources/data/oc2r/recipes/keyboard.json b/src/main/resources/data/oc2/recipes/keyboard.json similarity index 100% rename from src/main/resources/data/oc2r/recipes/keyboard.json rename to src/main/resources/data/oc2/recipes/keyboard.json diff --git a/src/main/resources/data/oc2r/recipes/manual.json b/src/main/resources/data/oc2/recipes/manual.json similarity index 100% rename from src/main/resources/data/oc2r/recipes/manual.json rename to src/main/resources/data/oc2/recipes/manual.json diff --git a/src/main/resources/data/oc2r/recipes/memory_extra_large.json b/src/main/resources/data/oc2/recipes/memory_extra_large.json similarity index 100% rename from src/main/resources/data/oc2r/recipes/memory_extra_large.json rename to src/main/resources/data/oc2/recipes/memory_extra_large.json diff --git a/src/main/resources/data/oc2r/recipes/memory_large.json b/src/main/resources/data/oc2/recipes/memory_large.json similarity index 100% rename from src/main/resources/data/oc2r/recipes/memory_large.json rename to src/main/resources/data/oc2/recipes/memory_large.json diff --git a/src/main/resources/data/oc2r/recipes/memory_medium.json b/src/main/resources/data/oc2/recipes/memory_medium.json similarity index 100% rename from src/main/resources/data/oc2r/recipes/memory_medium.json rename to src/main/resources/data/oc2/recipes/memory_medium.json diff --git a/src/main/resources/data/oc2r/recipes/memory_small.json b/src/main/resources/data/oc2/recipes/memory_small.json similarity index 100% rename from src/main/resources/data/oc2r/recipes/memory_small.json rename to src/main/resources/data/oc2/recipes/memory_small.json diff --git a/src/main/resources/data/oc2r/recipes/network_cable.json b/src/main/resources/data/oc2/recipes/network_cable.json similarity index 100% rename from src/main/resources/data/oc2r/recipes/network_cable.json rename to src/main/resources/data/oc2/recipes/network_cable.json diff --git a/src/main/resources/data/oc2r/recipes/network_connector.json b/src/main/resources/data/oc2/recipes/network_connector.json similarity index 100% rename from src/main/resources/data/oc2r/recipes/network_connector.json rename to src/main/resources/data/oc2/recipes/network_connector.json diff --git a/src/main/resources/data/oc2r/recipes/network_hub.json b/src/main/resources/data/oc2/recipes/network_hub.json similarity index 100% rename from src/main/resources/data/oc2r/recipes/network_hub.json rename to src/main/resources/data/oc2/recipes/network_hub.json diff --git a/src/main/resources/data/oc2r/recipes/network_interface_card.json b/src/main/resources/data/oc2/recipes/network_interface_card.json similarity index 100% rename from src/main/resources/data/oc2r/recipes/network_interface_card.json rename to src/main/resources/data/oc2/recipes/network_interface_card.json diff --git a/src/main/resources/data/oc2r/recipes/network_tunnel_card.json b/src/main/resources/data/oc2/recipes/network_tunnel_card.json similarity index 100% rename from src/main/resources/data/oc2r/recipes/network_tunnel_card.json rename to src/main/resources/data/oc2/recipes/network_tunnel_card.json diff --git a/src/main/resources/data/oc2r/recipes/network_tunnel_module.json b/src/main/resources/data/oc2/recipes/network_tunnel_module.json similarity index 100% rename from src/main/resources/data/oc2r/recipes/network_tunnel_module.json rename to src/main/resources/data/oc2/recipes/network_tunnel_module.json diff --git a/src/main/resources/data/oc2r/recipes/projector.json b/src/main/resources/data/oc2/recipes/projector.json similarity index 100% rename from src/main/resources/data/oc2r/recipes/projector.json rename to src/main/resources/data/oc2/recipes/projector.json diff --git a/src/main/resources/data/oc2r/recipes/raw_silicon_wafer.json b/src/main/resources/data/oc2/recipes/raw_silicon_wafer.json similarity index 100% rename from src/main/resources/data/oc2r/recipes/raw_silicon_wafer.json rename to src/main/resources/data/oc2/recipes/raw_silicon_wafer.json diff --git a/src/main/resources/data/oc2r/recipes/redstone_interface.json b/src/main/resources/data/oc2/recipes/redstone_interface.json similarity index 100% rename from src/main/resources/data/oc2r/recipes/redstone_interface.json rename to src/main/resources/data/oc2/recipes/redstone_interface.json diff --git a/src/main/resources/data/oc2r/recipes/redstone_interface_card.json b/src/main/resources/data/oc2/recipes/redstone_interface_card.json similarity index 100% rename from src/main/resources/data/oc2r/recipes/redstone_interface_card.json rename to src/main/resources/data/oc2/recipes/redstone_interface_card.json diff --git a/src/main/resources/data/oc2r/recipes/robot.json b/src/main/resources/data/oc2/recipes/robot.json similarity index 100% rename from src/main/resources/data/oc2r/recipes/robot.json rename to src/main/resources/data/oc2/recipes/robot.json diff --git a/src/main/resources/data/oc2r/recipes/silicon.json b/src/main/resources/data/oc2/recipes/silicon.json similarity index 100% rename from src/main/resources/data/oc2r/recipes/silicon.json rename to src/main/resources/data/oc2/recipes/silicon.json diff --git a/src/main/resources/data/oc2r/recipes/silicon_blend.json b/src/main/resources/data/oc2/recipes/silicon_blend.json similarity index 100% rename from src/main/resources/data/oc2r/recipes/silicon_blend.json rename to src/main/resources/data/oc2/recipes/silicon_blend.json diff --git a/src/main/resources/data/oc2r/recipes/silicon_wafer.json b/src/main/resources/data/oc2/recipes/silicon_wafer.json similarity index 100% rename from src/main/resources/data/oc2r/recipes/silicon_wafer.json rename to src/main/resources/data/oc2/recipes/silicon_wafer.json diff --git a/src/main/resources/data/oc2r/recipes/sound_card.json b/src/main/resources/data/oc2/recipes/sound_card.json similarity index 100% rename from src/main/resources/data/oc2r/recipes/sound_card.json rename to src/main/resources/data/oc2/recipes/sound_card.json diff --git a/src/main/resources/data/oc2r/recipes/transistor.json b/src/main/resources/data/oc2/recipes/transistor.json similarity index 100% rename from src/main/resources/data/oc2r/recipes/transistor.json rename to src/main/resources/data/oc2/recipes/transistor.json diff --git a/src/main/resources/data/oc2r/recipes/unflash.json b/src/main/resources/data/oc2/recipes/unflash.json similarity index 100% rename from src/main/resources/data/oc2r/recipes/unflash.json rename to src/main/resources/data/oc2/recipes/unflash.json diff --git a/src/main/resources/data/oc2r/recipes/wrench.json b/src/main/resources/data/oc2/recipes/wrench.json similarity index 100% rename from src/main/resources/data/oc2r/recipes/wrench.json rename to src/main/resources/data/oc2/recipes/wrench.json diff --git a/src/main/resources/data/oc2r/tags/blocks/cables.json b/src/main/resources/data/oc2/tags/blocks/cables.json similarity index 100% rename from src/main/resources/data/oc2r/tags/blocks/cables.json rename to src/main/resources/data/oc2/tags/blocks/cables.json diff --git a/src/main/resources/data/oc2r/tags/blocks/devices.json b/src/main/resources/data/oc2/tags/blocks/devices.json similarity index 100% rename from src/main/resources/data/oc2r/tags/blocks/devices.json rename to src/main/resources/data/oc2/tags/blocks/devices.json diff --git a/src/main/resources/data/oc2r/tags/blocks/wrench_breakable.json b/src/main/resources/data/oc2/tags/blocks/wrench_breakable.json similarity index 100% rename from src/main/resources/data/oc2r/tags/blocks/wrench_breakable.json rename to src/main/resources/data/oc2/tags/blocks/wrench_breakable.json diff --git a/src/main/resources/data/oc2r/tags/items/cables.json b/src/main/resources/data/oc2/tags/items/cables.json similarity index 100% rename from src/main/resources/data/oc2r/tags/items/cables.json rename to src/main/resources/data/oc2/tags/items/cables.json diff --git a/src/main/resources/data/oc2r/tags/items/device_needs_reboot.json b/src/main/resources/data/oc2/tags/items/device_needs_reboot.json similarity index 100% rename from src/main/resources/data/oc2r/tags/items/device_needs_reboot.json rename to src/main/resources/data/oc2/tags/items/device_needs_reboot.json diff --git a/src/main/resources/data/oc2r/tags/items/devices.json b/src/main/resources/data/oc2/tags/items/devices.json similarity index 100% rename from src/main/resources/data/oc2r/tags/items/devices.json rename to src/main/resources/data/oc2/tags/items/devices.json diff --git a/src/main/resources/data/oc2r/tags/items/devices/card.json b/src/main/resources/data/oc2/tags/items/devices/card.json similarity index 100% rename from src/main/resources/data/oc2r/tags/items/devices/card.json rename to src/main/resources/data/oc2/tags/items/devices/card.json diff --git a/src/main/resources/data/oc2r/tags/items/devices/cpu.json b/src/main/resources/data/oc2/tags/items/devices/cpu.json similarity index 100% rename from src/main/resources/data/oc2r/tags/items/devices/cpu.json rename to src/main/resources/data/oc2/tags/items/devices/cpu.json diff --git a/src/main/resources/data/oc2r/tags/items/devices/flash_memory.json b/src/main/resources/data/oc2/tags/items/devices/flash_memory.json similarity index 100% rename from src/main/resources/data/oc2r/tags/items/devices/flash_memory.json rename to src/main/resources/data/oc2/tags/items/devices/flash_memory.json diff --git a/src/main/resources/data/oc2r/tags/items/devices/floppy.json b/src/main/resources/data/oc2/tags/items/devices/floppy.json similarity index 100% rename from src/main/resources/data/oc2r/tags/items/devices/floppy.json rename to src/main/resources/data/oc2/tags/items/devices/floppy.json diff --git a/src/main/resources/data/oc2r/tags/items/devices/hard_drive.json b/src/main/resources/data/oc2/tags/items/devices/hard_drive.json similarity index 100% rename from src/main/resources/data/oc2r/tags/items/devices/hard_drive.json rename to src/main/resources/data/oc2/tags/items/devices/hard_drive.json diff --git a/src/main/resources/data/oc2r/tags/items/devices/memory.json b/src/main/resources/data/oc2/tags/items/devices/memory.json similarity index 100% rename from src/main/resources/data/oc2r/tags/items/devices/memory.json rename to src/main/resources/data/oc2/tags/items/devices/memory.json diff --git a/src/main/resources/data/oc2r/tags/items/devices/network_tunnel.json b/src/main/resources/data/oc2/tags/items/devices/network_tunnel.json similarity index 100% rename from src/main/resources/data/oc2r/tags/items/devices/network_tunnel.json rename to src/main/resources/data/oc2/tags/items/devices/network_tunnel.json diff --git a/src/main/resources/data/oc2r/tags/items/devices/robot_module.json b/src/main/resources/data/oc2/tags/items/devices/robot_module.json similarity index 100% rename from src/main/resources/data/oc2r/tags/items/devices/robot_module.json rename to src/main/resources/data/oc2/tags/items/devices/robot_module.json diff --git a/src/main/resources/data/oc2r/tags/items/tool_materials.json b/src/main/resources/data/oc2/tags/items/tool_materials.json similarity index 100% rename from src/main/resources/data/oc2r/tags/items/tool_materials.json rename to src/main/resources/data/oc2/tags/items/tool_materials.json diff --git a/src/main/resources/data/oc2r/tags/items/tool_materials/diamond.json b/src/main/resources/data/oc2/tags/items/tool_materials/diamond.json similarity index 100% rename from src/main/resources/data/oc2r/tags/items/tool_materials/diamond.json rename to src/main/resources/data/oc2/tags/items/tool_materials/diamond.json diff --git a/src/main/resources/data/oc2r/tags/items/tool_materials/gold.json b/src/main/resources/data/oc2/tags/items/tool_materials/gold.json similarity index 100% rename from src/main/resources/data/oc2r/tags/items/tool_materials/gold.json rename to src/main/resources/data/oc2/tags/items/tool_materials/gold.json diff --git a/src/main/resources/data/oc2r/tags/items/tool_materials/iron.json b/src/main/resources/data/oc2/tags/items/tool_materials/iron.json similarity index 100% rename from src/main/resources/data/oc2r/tags/items/tool_materials/iron.json rename to src/main/resources/data/oc2/tags/items/tool_materials/iron.json diff --git a/src/main/resources/data/oc2r/tags/items/tool_materials/netherite.json b/src/main/resources/data/oc2/tags/items/tool_materials/netherite.json similarity index 100% rename from src/main/resources/data/oc2r/tags/items/tool_materials/netherite.json rename to src/main/resources/data/oc2/tags/items/tool_materials/netherite.json diff --git a/src/main/resources/data/oc2r/tags/items/tool_materials/stone.json b/src/main/resources/data/oc2/tags/items/tool_materials/stone.json similarity index 100% rename from src/main/resources/data/oc2r/tags/items/tool_materials/stone.json rename to src/main/resources/data/oc2/tags/items/tool_materials/stone.json diff --git a/src/main/resources/data/oc2r/tags/items/tool_materials/wood.json b/src/main/resources/data/oc2/tags/items/tool_materials/wood.json similarity index 100% rename from src/main/resources/data/oc2r/tags/items/tool_materials/wood.json rename to src/main/resources/data/oc2/tags/items/tool_materials/wood.json diff --git a/src/main/resources/data/oc2r/tags/items/wrenches.json b/src/main/resources/data/oc2/tags/items/wrenches.json similarity index 100% rename from src/main/resources/data/oc2r/tags/items/wrenches.json rename to src/main/resources/data/oc2/tags/items/wrenches.json diff --git a/src/main/resources/mixins.oc2r.json b/src/main/resources/mixins.oc2.json similarity index 100% rename from src/main/resources/mixins.oc2r.json rename to src/main/resources/mixins.oc2.json