diff --git a/src/main/java/li/cil/oc2/client/gui/TerminalScreen.java b/src/main/java/li/cil/oc2/client/gui/TerminalScreen.java
index 5e30600e..e6eae153 100644
--- a/src/main/java/li/cil/oc2/client/gui/TerminalScreen.java
+++ b/src/main/java/li/cil/oc2/client/gui/TerminalScreen.java
@@ -2,11 +2,11 @@ package li.cil.oc2.client.gui;
 
 import com.mojang.blaze3d.matrix.MatrixStack;
 import com.mojang.blaze3d.systems.RenderSystem;
-import li.cil.oc2.Constants;
 import li.cil.oc2.api.API;
 import li.cil.oc2.client.gui.terminal.TerminalInput;
 import li.cil.oc2.client.gui.widget.Sprite;
 import li.cil.oc2.client.gui.widget.ToggleImageButton;
+import li.cil.oc2.common.Constants;
 import li.cil.oc2.common.network.Network;
 import li.cil.oc2.common.network.message.ComputerPowerMessage;
 import li.cil.oc2.common.network.message.TerminalBlockInputMessage;
diff --git a/src/main/java/li/cil/oc2/Config.java b/src/main/java/li/cil/oc2/common/Config.java
similarity index 91%
rename from src/main/java/li/cil/oc2/Config.java
rename to src/main/java/li/cil/oc2/common/Config.java
index ae4366e9..1c4ff161 100644
--- a/src/main/java/li/cil/oc2/Config.java
+++ b/src/main/java/li/cil/oc2/common/Config.java
@@ -1,4 +1,4 @@
-package li.cil.oc2;
+package li.cil.oc2.common;
 
 public final class Config {
     public static long maxAllocatedData = 512 * Constants.MEGABYTE;
diff --git a/src/main/java/li/cil/oc2/Constants.java b/src/main/java/li/cil/oc2/common/Constants.java
similarity index 98%
rename from src/main/java/li/cil/oc2/Constants.java
rename to src/main/java/li/cil/oc2/common/Constants.java
index 888053e7..64834830 100644
--- a/src/main/java/li/cil/oc2/Constants.java
+++ b/src/main/java/li/cil/oc2/common/Constants.java
@@ -1,4 +1,4 @@
-package li.cil.oc2;
+package li.cil.oc2.common;
 
 public final class Constants {
     public static final int KILOBYTE = 1024;
diff --git a/src/main/java/li/cil/oc2/OpenComputers.java b/src/main/java/li/cil/oc2/common/OpenComputers.java
similarity index 98%
rename from src/main/java/li/cil/oc2/OpenComputers.java
rename to src/main/java/li/cil/oc2/common/OpenComputers.java
index a5175e40..2b77d72c 100644
--- a/src/main/java/li/cil/oc2/OpenComputers.java
+++ b/src/main/java/li/cil/oc2/common/OpenComputers.java
@@ -1,4 +1,4 @@
-package li.cil.oc2;
+package li.cil.oc2.common;
 
 import li.cil.ceres.Ceres;
 import li.cil.oc2.api.API;
diff --git a/src/main/java/li/cil/oc2/common/block/Blocks.java b/src/main/java/li/cil/oc2/common/block/Blocks.java
index 0d95f8c3..d2a9f470 100644
--- a/src/main/java/li/cil/oc2/common/block/Blocks.java
+++ b/src/main/java/li/cil/oc2/common/block/Blocks.java
@@ -1,7 +1,7 @@
 package li.cil.oc2.common.block;
 
-import li.cil.oc2.Constants;
 import li.cil.oc2.api.API;
+import li.cil.oc2.common.Constants;
 import net.minecraft.block.Block;
 import net.minecraftforge.fml.RegistryObject;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
diff --git a/src/main/java/li/cil/oc2/common/bus/RPCAdapter.java b/src/main/java/li/cil/oc2/common/bus/RPCAdapter.java
index 6a9d290d..f18eead6 100644
--- a/src/main/java/li/cil/oc2/common/bus/RPCAdapter.java
+++ b/src/main/java/li/cil/oc2/common/bus/RPCAdapter.java
@@ -3,12 +3,12 @@ package li.cil.oc2.common.bus;
 import com.google.gson.Gson;
 import com.google.gson.JsonArray;
 import li.cil.ceres.api.Serialized;
-import li.cil.oc2.Constants;
 import li.cil.oc2.api.bus.DeviceBusController;
 import li.cil.oc2.api.bus.device.Device;
 import li.cil.oc2.api.bus.device.rpc.RPCDevice;
 import li.cil.oc2.api.bus.device.rpc.RPCMethod;
 import li.cil.oc2.api.bus.device.rpc.RPCParameter;
+import li.cil.oc2.common.Constants;
 import li.cil.oc2.common.bus.device.rpc.RPCDeviceList;
 import li.cil.oc2.common.bus.device.rpc.RPCMethodParameterTypeAdapters;
 import li.cil.oc2.common.serialization.serializers.MessageJsonDeserializer;
diff --git a/src/main/java/li/cil/oc2/common/bus/device/item/MemoryDevice.java b/src/main/java/li/cil/oc2/common/bus/device/item/MemoryDevice.java
index 800cbaba..6e635ed9 100644
--- a/src/main/java/li/cil/oc2/common/bus/device/item/MemoryDevice.java
+++ b/src/main/java/li/cil/oc2/common/bus/device/item/MemoryDevice.java
@@ -1,8 +1,8 @@
 package li.cil.oc2.common.bus.device.item;
 
-import li.cil.oc2.Config;
 import li.cil.oc2.api.bus.device.ItemDevice;
 import li.cil.oc2.api.bus.device.vm.*;
+import li.cil.oc2.common.Config;
 import li.cil.oc2.common.bus.device.util.IdentityProxy;
 import li.cil.oc2.common.item.MemoryItem;
 import li.cil.oc2.common.serialization.BlobStorage;
diff --git a/src/main/java/li/cil/oc2/common/bus/device/provider/item/FlashMemoryItemDeviceProvider.java b/src/main/java/li/cil/oc2/common/bus/device/provider/item/FlashMemoryItemDeviceProvider.java
index ab90a89a..61b1fb86 100644
--- a/src/main/java/li/cil/oc2/common/bus/device/provider/item/FlashMemoryItemDeviceProvider.java
+++ b/src/main/java/li/cil/oc2/common/bus/device/provider/item/FlashMemoryItemDeviceProvider.java
@@ -1,11 +1,11 @@
 package li.cil.oc2.common.bus.device.provider.item;
 
-import li.cil.oc2.Config;
 import li.cil.oc2.api.bus.device.DeviceType;
 import li.cil.oc2.api.bus.device.DeviceTypes;
 import li.cil.oc2.api.bus.device.ItemDevice;
 import li.cil.oc2.api.bus.device.data.Firmware;
 import li.cil.oc2.api.bus.device.provider.ItemDeviceQuery;
+import li.cil.oc2.common.Config;
 import li.cil.oc2.common.bus.device.item.ByteBufferFlashMemoryVMDevice;
 import li.cil.oc2.common.bus.device.item.FirmwareFlashMemoryVMDevice;
 import li.cil.oc2.common.bus.device.provider.util.AbstractItemDeviceProvider;
diff --git a/src/main/java/li/cil/oc2/common/bus/device/provider/item/HardDriveItemDeviceProvider.java b/src/main/java/li/cil/oc2/common/bus/device/provider/item/HardDriveItemDeviceProvider.java
index a266a47e..550357f9 100644
--- a/src/main/java/li/cil/oc2/common/bus/device/provider/item/HardDriveItemDeviceProvider.java
+++ b/src/main/java/li/cil/oc2/common/bus/device/provider/item/HardDriveItemDeviceProvider.java
@@ -1,11 +1,11 @@
 package li.cil.oc2.common.bus.device.provider.item;
 
-import li.cil.oc2.Config;
 import li.cil.oc2.api.bus.device.DeviceType;
 import li.cil.oc2.api.bus.device.DeviceTypes;
 import li.cil.oc2.api.bus.device.ItemDevice;
 import li.cil.oc2.api.bus.device.data.BaseBlockDevice;
 import li.cil.oc2.api.bus.device.provider.ItemDeviceQuery;
+import li.cil.oc2.common.Config;
 import li.cil.oc2.common.bus.device.item.HardDriveVMDevice;
 import li.cil.oc2.common.bus.device.item.SparseHardDriveVMDevice;
 import li.cil.oc2.common.bus.device.provider.util.AbstractItemDeviceProvider;
diff --git a/src/main/java/li/cil/oc2/common/container/Containers.java b/src/main/java/li/cil/oc2/common/container/Containers.java
index 383ae459..264ef6e3 100644
--- a/src/main/java/li/cil/oc2/common/container/Containers.java
+++ b/src/main/java/li/cil/oc2/common/container/Containers.java
@@ -1,7 +1,7 @@
 package li.cil.oc2.common.container;
 
-import li.cil.oc2.Constants;
 import li.cil.oc2.api.API;
+import li.cil.oc2.common.Constants;
 import net.minecraft.inventory.container.ContainerType;
 import net.minecraftforge.common.extensions.IForgeContainerType;
 import net.minecraftforge.fml.RegistryObject;
diff --git a/src/main/java/li/cil/oc2/common/item/FlashMemoryItem.java b/src/main/java/li/cil/oc2/common/item/FlashMemoryItem.java
index 48f48e7c..2fc6939b 100644
--- a/src/main/java/li/cil/oc2/common/item/FlashMemoryItem.java
+++ b/src/main/java/li/cil/oc2/common/item/FlashMemoryItem.java
@@ -1,8 +1,8 @@
 package li.cil.oc2.common.item;
 
-import li.cil.oc2.Constants;
 import li.cil.oc2.api.API;
 import li.cil.oc2.api.bus.device.data.Firmware;
+import li.cil.oc2.common.Constants;
 import li.cil.oc2.common.bus.device.data.Firmwares;
 import li.cil.oc2.common.bus.device.item.ByteBufferFlashMemoryVMDevice;
 import li.cil.oc2.common.util.ItemStackUtils;
diff --git a/src/main/java/li/cil/oc2/common/item/HardDriveItem.java b/src/main/java/li/cil/oc2/common/item/HardDriveItem.java
index 13761cad..db0d83cf 100644
--- a/src/main/java/li/cil/oc2/common/item/HardDriveItem.java
+++ b/src/main/java/li/cil/oc2/common/item/HardDriveItem.java
@@ -1,7 +1,7 @@
 package li.cil.oc2.common.item;
 
-import li.cil.oc2.Constants;
 import li.cil.oc2.api.bus.device.data.BaseBlockDevice;
+import li.cil.oc2.common.Constants;
 import li.cil.oc2.common.bus.device.data.BaseBlockDevices;
 import li.cil.oc2.common.util.ItemStackUtils;
 import li.cil.oc2.common.util.NBTTagIds;
diff --git a/src/main/java/li/cil/oc2/common/item/ItemGroup.java b/src/main/java/li/cil/oc2/common/item/ItemGroup.java
index 7bfca721..a0f6e5c1 100644
--- a/src/main/java/li/cil/oc2/common/item/ItemGroup.java
+++ b/src/main/java/li/cil/oc2/common/item/ItemGroup.java
@@ -1,7 +1,7 @@
 package li.cil.oc2.common.item;
 
-import li.cil.oc2.Constants;
 import li.cil.oc2.api.API;
+import li.cil.oc2.common.Constants;
 import li.cil.oc2.common.bus.device.data.BaseBlockDevices;
 import li.cil.oc2.common.bus.device.data.Firmwares;
 import net.minecraft.item.ItemStack;
diff --git a/src/main/java/li/cil/oc2/common/item/Items.java b/src/main/java/li/cil/oc2/common/item/Items.java
index 71bd13b7..6275da18 100644
--- a/src/main/java/li/cil/oc2/common/item/Items.java
+++ b/src/main/java/li/cil/oc2/common/item/Items.java
@@ -1,7 +1,7 @@
 package li.cil.oc2.common.item;
 
-import li.cil.oc2.Constants;
 import li.cil.oc2.api.API;
+import li.cil.oc2.common.Constants;
 import li.cil.oc2.common.block.Blocks;
 import net.minecraft.block.Block;
 import net.minecraft.item.BlockItem;
diff --git a/src/main/java/li/cil/oc2/common/item/MemoryItem.java b/src/main/java/li/cil/oc2/common/item/MemoryItem.java
index a229542e..fd4a080d 100644
--- a/src/main/java/li/cil/oc2/common/item/MemoryItem.java
+++ b/src/main/java/li/cil/oc2/common/item/MemoryItem.java
@@ -1,6 +1,6 @@
 package li.cil.oc2.common.item;
 
-import li.cil.oc2.Constants;
+import li.cil.oc2.common.Constants;
 
 public final class MemoryItem extends AbstractStorageItem {
     private static final int DEFAULT_CAPACITY = 2 * Constants.MEGABYTE;
diff --git a/src/main/java/li/cil/oc2/common/serialization/BlobStorage.java b/src/main/java/li/cil/oc2/common/serialization/BlobStorage.java
index a8c9a1d1..bb98a18f 100644
--- a/src/main/java/li/cil/oc2/common/serialization/BlobStorage.java
+++ b/src/main/java/li/cil/oc2/common/serialization/BlobStorage.java
@@ -1,7 +1,7 @@
 package li.cil.oc2.common.serialization;
 
 import com.google.common.collect.HashMultimap;
-import li.cil.oc2.Constants;
+import li.cil.oc2.common.Constants;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.storage.FolderName;
 import org.apache.logging.log4j.LogManager;
diff --git a/src/main/java/li/cil/oc2/common/tileentity/ComputerTileEntity.java b/src/main/java/li/cil/oc2/common/tileentity/ComputerTileEntity.java
index 356bfb09..790eca81 100644
--- a/src/main/java/li/cil/oc2/common/tileentity/ComputerTileEntity.java
+++ b/src/main/java/li/cil/oc2/common/tileentity/ComputerTileEntity.java
@@ -2,7 +2,7 @@ package li.cil.oc2.common.tileentity;
 
 import it.unimi.dsi.fastutil.bytes.ByteArrayFIFOQueue;
 import li.cil.ceres.api.Serialized;
-import li.cil.oc2.Constants;
+import li.cil.oc2.common.Constants;
 import li.cil.oc2.api.bus.DeviceBusController;
 import li.cil.oc2.api.bus.DeviceBusElement;
 import li.cil.oc2.api.bus.device.Device;
diff --git a/src/main/java/li/cil/oc2/common/tileentity/TileEntities.java b/src/main/java/li/cil/oc2/common/tileentity/TileEntities.java
index 1f56d9cb..166aba00 100644
--- a/src/main/java/li/cil/oc2/common/tileentity/TileEntities.java
+++ b/src/main/java/li/cil/oc2/common/tileentity/TileEntities.java
@@ -1,6 +1,6 @@
 package li.cil.oc2.common.tileentity;
 
-import li.cil.oc2.Constants;
+import li.cil.oc2.common.Constants;
 import li.cil.oc2.api.API;
 import li.cil.oc2.common.block.Blocks;
 import net.minecraft.block.Block;
diff --git a/src/main/java/li/cil/oc2/common/util/TooltipUtils.java b/src/main/java/li/cil/oc2/common/util/TooltipUtils.java
index 60068ca7..ea7dab4a 100644
--- a/src/main/java/li/cil/oc2/common/util/TooltipUtils.java
+++ b/src/main/java/li/cil/oc2/common/util/TooltipUtils.java
@@ -13,8 +13,8 @@ import net.minecraft.util.text.TextFormatting;
 import java.util.ArrayList;
 import java.util.List;
 
-import static li.cil.oc2.Constants.BLOCK_ENTITY_INVENTORY_TAG_NAME;
-import static li.cil.oc2.Constants.BLOCK_ENTITY_TAG_NAME_IN_ITEM;
+import static li.cil.oc2.common.Constants.BLOCK_ENTITY_INVENTORY_TAG_NAME;
+import static li.cil.oc2.common.Constants.BLOCK_ENTITY_TAG_NAME_IN_ITEM;
 
 public final class TooltipUtils {
     private static final ThreadLocal<List<ItemStack>> ITEM_STACKS = ThreadLocal.withInitial(ArrayList::new);
diff --git a/src/main/java/li/cil/oc2/common/vm/Allocator.java b/src/main/java/li/cil/oc2/common/vm/Allocator.java
index 75643698..72101ffd 100644
--- a/src/main/java/li/cil/oc2/common/vm/Allocator.java
+++ b/src/main/java/li/cil/oc2/common/vm/Allocator.java
@@ -1,6 +1,6 @@
 package li.cil.oc2.common.vm;
 
-import li.cil.oc2.Config;
+import li.cil.oc2.common.Config;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
diff --git a/src/main/java/li/cil/oc2/data/ItemModels.java b/src/main/java/li/cil/oc2/data/ItemModels.java
index cf35117e..4e803756 100644
--- a/src/main/java/li/cil/oc2/data/ItemModels.java
+++ b/src/main/java/li/cil/oc2/data/ItemModels.java
@@ -1,6 +1,6 @@
 package li.cil.oc2.data;
 
-import li.cil.oc2.Constants;
+import li.cil.oc2.common.Constants;
 import li.cil.oc2.api.API;
 import li.cil.oc2.common.item.HardDriveItem;
 import li.cil.oc2.common.item.Items;
diff --git a/src/main/java/li/cil/oc2/data/LootTables.java b/src/main/java/li/cil/oc2/data/LootTables.java
index 5d4d0bee..e9aecb68 100644
--- a/src/main/java/li/cil/oc2/data/LootTables.java
+++ b/src/main/java/li/cil/oc2/data/LootTables.java
@@ -21,8 +21,8 @@ import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 
 import static java.util.Objects.requireNonNull;
-import static li.cil.oc2.Constants.BLOCK_ENTITY_INVENTORY_TAG_NAME;
-import static li.cil.oc2.Constants.BLOCK_ENTITY_TAG_NAME_IN_ITEM;
+import static li.cil.oc2.common.Constants.BLOCK_ENTITY_INVENTORY_TAG_NAME;
+import static li.cil.oc2.common.Constants.BLOCK_ENTITY_TAG_NAME_IN_ITEM;
 
 public final class LootTables extends LootTableProvider {
     public LootTables(final DataGenerator generator) {
diff --git a/src/main/java/li/cil/oc2/package-info.java b/src/main/java/li/cil/oc2/package-info.java
deleted file mode 100644
index b8a53c2b..00000000
--- a/src/main/java/li/cil/oc2/package-info.java
+++ /dev/null
@@ -1,7 +0,0 @@
-@ParametersAreNonnullByDefault
-@MethodsReturnNonnullByDefault
-package li.cil.oc2;
-
-import mcp.MethodsReturnNonnullByDefault;
-
-import javax.annotation.ParametersAreNonnullByDefault;
\ No newline at end of file