diff --git a/projects/core/src/main/java/dan200/computercraft/core/ComputerContext.java b/projects/core/src/main/java/dan200/computercraft/core/ComputerContext.java
index b7fefae86..3a9684b7d 100644
--- a/projects/core/src/main/java/dan200/computercraft/core/ComputerContext.java
+++ b/projects/core/src/main/java/dan200/computercraft/core/ComputerContext.java
@@ -8,8 +8,8 @@ import dan200.computercraft.api.lua.ILuaAPIFactory;
 import dan200.computercraft.core.asm.GenericMethod;
 import dan200.computercraft.core.asm.LuaMethodSupplier;
 import dan200.computercraft.core.asm.PeripheralMethodSupplier;
-import dan200.computercraft.core.computer.ComputerThread;
 import dan200.computercraft.core.computer.GlobalEnvironment;
+import dan200.computercraft.core.computer.computerthread.ComputerThread;
 import dan200.computercraft.core.computer.mainthread.MainThreadScheduler;
 import dan200.computercraft.core.computer.mainthread.NoWorkMainThreadScheduler;
 import dan200.computercraft.core.lua.CobaltLuaMachine;
diff --git a/projects/core/src/main/java/dan200/computercraft/core/computer/ComputerExecutor.java b/projects/core/src/main/java/dan200/computercraft/core/computer/ComputerExecutor.java
index 2ff466c02..be07401a6 100644
--- a/projects/core/src/main/java/dan200/computercraft/core/computer/ComputerExecutor.java
+++ b/projects/core/src/main/java/dan200/computercraft/core/computer/ComputerExecutor.java
@@ -10,6 +10,7 @@ import dan200.computercraft.api.lua.ILuaAPI;
 import dan200.computercraft.core.ComputerContext;
 import dan200.computercraft.core.CoreConfig;
 import dan200.computercraft.core.apis.*;
+import dan200.computercraft.core.computer.computerthread.ComputerThread;
 import dan200.computercraft.core.filesystem.FileSystem;
 import dan200.computercraft.core.filesystem.FileSystemException;
 import dan200.computercraft.core.lua.ILuaMachine;
diff --git a/projects/core/src/main/java/dan200/computercraft/core/computer/TimeoutState.java b/projects/core/src/main/java/dan200/computercraft/core/computer/TimeoutState.java
index b701793ac..c39f23cbd 100644
--- a/projects/core/src/main/java/dan200/computercraft/core/computer/TimeoutState.java
+++ b/projects/core/src/main/java/dan200/computercraft/core/computer/TimeoutState.java
@@ -5,6 +5,7 @@
 package dan200.computercraft.core.computer;
 
 import com.google.errorprone.annotations.concurrent.GuardedBy;
+import dan200.computercraft.core.computer.computerthread.ComputerThread;
 import dan200.computercraft.core.lua.ILuaMachine;
 import dan200.computercraft.core.lua.MachineResult;
 
diff --git a/projects/core/src/main/java/dan200/computercraft/core/computer/ComputerThread.java b/projects/core/src/main/java/dan200/computercraft/core/computer/computerthread/ComputerThread.java
similarity index 99%
rename from projects/core/src/main/java/dan200/computercraft/core/computer/ComputerThread.java
rename to projects/core/src/main/java/dan200/computercraft/core/computer/computerthread/ComputerThread.java
index 110961584..17c0654c3 100644
--- a/projects/core/src/main/java/dan200/computercraft/core/computer/ComputerThread.java
+++ b/projects/core/src/main/java/dan200/computercraft/core/computer/computerthread/ComputerThread.java
@@ -2,12 +2,14 @@
 //
 // SPDX-License-Identifier: MPL-2.0
 
-package dan200.computercraft.core.computer;
+package dan200.computercraft.core.computer.computerthread;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.errorprone.annotations.concurrent.GuardedBy;
 import dan200.computercraft.core.ComputerContext;
 import dan200.computercraft.core.Logging;
+import dan200.computercraft.core.computer.ComputerExecutor;
+import dan200.computercraft.core.computer.TimeoutState;
 import dan200.computercraft.core.util.ThreadUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/projects/core/src/test/java/dan200/computercraft/core/computer/ComputerThreadTest.java b/projects/core/src/test/java/dan200/computercraft/core/computer/computerthread/ComputerThreadTest.java
similarity index 98%
rename from projects/core/src/test/java/dan200/computercraft/core/computer/ComputerThreadTest.java
rename to projects/core/src/test/java/dan200/computercraft/core/computer/computerthread/ComputerThreadTest.java
index 04193853c..c29b130c1 100644
--- a/projects/core/src/test/java/dan200/computercraft/core/computer/ComputerThreadTest.java
+++ b/projects/core/src/test/java/dan200/computercraft/core/computer/computerthread/ComputerThreadTest.java
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: MPL-2.0
 
-package dan200.computercraft.core.computer;
+package dan200.computercraft.core.computer.computerthread;
 
 import dan200.computercraft.core.lua.MachineResult;
 import dan200.computercraft.test.core.ConcurrentHelpers;
diff --git a/projects/web/src/main/java/dan200/computercraft/core/computer/TComputerThread.java b/projects/web/src/main/java/dan200/computercraft/core/computer/computerthread/TComputerThread.java
similarity index 96%
rename from projects/web/src/main/java/dan200/computercraft/core/computer/TComputerThread.java
rename to projects/web/src/main/java/dan200/computercraft/core/computer/computerthread/TComputerThread.java
index 5c6875dd0..52254e603 100644
--- a/projects/web/src/main/java/dan200/computercraft/core/computer/TComputerThread.java
+++ b/projects/web/src/main/java/dan200/computercraft/core/computer/computerthread/TComputerThread.java
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: MPL-2.0
 
-package dan200.computercraft.core.computer;
+package dan200.computercraft.core.computer.computerthread;
 
 import cc.tweaked.web.js.Callbacks;
 import org.teavm.jso.browser.TimerHandler;