diff --git a/src/main/java/li/cil/oc2/common/CommonSetup.java b/src/main/java/li/cil/oc2/common/CommonSetup.java
index 0cefa94c..d20c35d4 100644
--- a/src/main/java/li/cil/oc2/common/CommonSetup.java
+++ b/src/main/java/li/cil/oc2/common/CommonSetup.java
@@ -1,8 +1,8 @@
 package li.cil.oc2.common;
 
-import li.cil.oc2.common.blobs.BlobStorage;
 import li.cil.oc2.common.network.Network;
-import li.cil.oc2.common.sandbox.Allocator;
+import li.cil.oc2.common.vm.Allocator;
+import li.cil.oc2.serialization.BlobStorage;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
 import net.minecraftforge.fml.event.server.FMLServerAboutToStartEvent;
diff --git a/src/main/java/li/cil/oc2/common/blobs/package-info.java b/src/main/java/li/cil/oc2/common/blobs/package-info.java
deleted file mode 100644
index 071d9475..00000000
--- a/src/main/java/li/cil/oc2/common/blobs/package-info.java
+++ /dev/null
@@ -1,7 +0,0 @@
-@ParametersAreNonnullByDefault
-@MethodsReturnNonnullByDefault
-package li.cil.oc2.common.blobs;
-
-import mcp.MethodsReturnNonnullByDefault;
-
-import javax.annotation.ParametersAreNonnullByDefault;
\ No newline at end of file
diff --git a/src/main/java/li/cil/oc2/common/sandbox/package-info.java b/src/main/java/li/cil/oc2/common/sandbox/package-info.java
deleted file mode 100644
index 293198af..00000000
--- a/src/main/java/li/cil/oc2/common/sandbox/package-info.java
+++ /dev/null
@@ -1,7 +0,0 @@
-@ParametersAreNonnullByDefault
-@MethodsReturnNonnullByDefault
-package li.cil.oc2.common.sandbox;
-
-import mcp.MethodsReturnNonnullByDefault;
-
-import javax.annotation.ParametersAreNonnullByDefault;
\ No newline at end of file
diff --git a/src/main/java/li/cil/oc2/common/tile/ComputerTileEntity.java b/src/main/java/li/cil/oc2/common/tile/ComputerTileEntity.java
index c35cb4a3..a5a3bad3 100644
--- a/src/main/java/li/cil/oc2/common/tile/ComputerTileEntity.java
+++ b/src/main/java/li/cil/oc2/common/tile/ComputerTileEntity.java
@@ -4,11 +4,11 @@ import it.unimi.dsi.fastutil.bytes.ByteArrayFIFOQueue;
 import li.cil.ceres.api.Serialized;
 import li.cil.oc2.OpenComputers;
 import li.cil.oc2.client.gui.terminal.Terminal;
-import li.cil.oc2.common.blobs.BlobStorage;
 import li.cil.oc2.common.network.Network;
 import li.cil.oc2.common.network.TerminalBlockOutputMessage;
-import li.cil.oc2.common.sandbox.Allocator;
+import li.cil.oc2.common.vm.Allocator;
 import li.cil.oc2.common.vm.VirtualMachineRunner;
+import li.cil.oc2.serialization.BlobStorage;
 import li.cil.oc2.serialization.NBTSerialization;
 import li.cil.sedna.api.Sizes;
 import li.cil.sedna.api.device.BlockDevice;
diff --git a/src/main/java/li/cil/oc2/common/sandbox/Allocator.java b/src/main/java/li/cil/oc2/common/vm/Allocator.java
similarity index 98%
rename from src/main/java/li/cil/oc2/common/sandbox/Allocator.java
rename to src/main/java/li/cil/oc2/common/vm/Allocator.java
index 28f9c0fe..b3bc37d3 100644
--- a/src/main/java/li/cil/oc2/common/sandbox/Allocator.java
+++ b/src/main/java/li/cil/oc2/common/vm/Allocator.java
@@ -1,4 +1,4 @@
-package li.cil.oc2.common.sandbox;
+package li.cil.oc2.common.vm;
 
 import li.cil.oc2.Config;
 import org.apache.logging.log4j.LogManager;
diff --git a/src/main/java/li/cil/oc2/common/blobs/BlobStorage.java b/src/main/java/li/cil/oc2/serialization/BlobStorage.java
similarity index 99%
rename from src/main/java/li/cil/oc2/common/blobs/BlobStorage.java
rename to src/main/java/li/cil/oc2/serialization/BlobStorage.java
index 299c2234..e6da3469 100644
--- a/src/main/java/li/cil/oc2/common/blobs/BlobStorage.java
+++ b/src/main/java/li/cil/oc2/serialization/BlobStorage.java
@@ -1,4 +1,4 @@
-package li.cil.oc2.common.blobs;
+package li.cil.oc2.serialization;
 
 import com.google.common.collect.HashMultimap;
 import net.minecraft.server.MinecraftServer;