diff --git a/src/pocketmine/PocketMine.php b/src/pocketmine/PocketMine.php
index 54ca6a307..c280019fc 100644
--- a/src/pocketmine/PocketMine.php
+++ b/src/pocketmine/PocketMine.php
@@ -28,6 +28,7 @@ namespace {
 
 namespace pocketmine {
 
+	use pocketmine\thread\ThreadManager;
 	use pocketmine\utils\MainLogger;
 	use pocketmine\utils\Process;
 	use pocketmine\utils\ServerKiller;
diff --git a/src/pocketmine/command/CommandReader.php b/src/pocketmine/command/CommandReader.php
index bed67d6ec..70660c821 100644
--- a/src/pocketmine/command/CommandReader.php
+++ b/src/pocketmine/command/CommandReader.php
@@ -24,7 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\command;
 
 use pocketmine\snooze\SleeperNotifier;
-use pocketmine\Thread;
+use pocketmine\thread\Thread;
 use pocketmine\utils\Utils;
 use function extension_loaded;
 use function fclose;
diff --git a/src/pocketmine/scheduler/AsyncTask.php b/src/pocketmine/scheduler/AsyncTask.php
index a6add8740..d8dd45c5e 100644
--- a/src/pocketmine/scheduler/AsyncTask.php
+++ b/src/pocketmine/scheduler/AsyncTask.php
@@ -33,7 +33,7 @@ use function unserialize;
  *
  * An AsyncTask does not have its own thread. It is queued into an AsyncPool and executed if there is an async worker
  * with no AsyncTask running. Therefore, an AsyncTask SHOULD NOT execute for more than a few seconds. For tasks that
- * run for a long time or infinitely, start another {@link \pocketmine\Thread} instead.
+ * run for a long time or infinitely, start another {@link \pocketmine\thread\Thread} instead.
  *
  * WARNING: Any non-Threaded objects WILL BE SERIALIZED when assigned to members of AsyncTasks or other Threaded object.
  * If later accessed from said Threaded object, you will be operating on a COPY OF THE OBJECT, NOT THE ORIGINAL OBJECT.
diff --git a/src/pocketmine/scheduler/AsyncWorker.php b/src/pocketmine/scheduler/AsyncWorker.php
index 86c2a7693..363398313 100644
--- a/src/pocketmine/scheduler/AsyncWorker.php
+++ b/src/pocketmine/scheduler/AsyncWorker.php
@@ -23,8 +23,8 @@ declare(strict_types=1);
 
 namespace pocketmine\scheduler;
 
+use pocketmine\thread\Worker;
 use pocketmine\utils\MainLogger;
-use pocketmine\Worker;
 use function gc_enable;
 use function ini_set;
 
diff --git a/src/pocketmine/Thread.php b/src/pocketmine/thread/Thread.php
similarity index 98%
rename from src/pocketmine/Thread.php
rename to src/pocketmine/thread/Thread.php
index 350dae2b9..c69b01f11 100644
--- a/src/pocketmine/Thread.php
+++ b/src/pocketmine/thread/Thread.php
@@ -21,8 +21,9 @@
 
 declare(strict_types=1);
 
-namespace pocketmine;
+namespace pocketmine\thread;
 
+use pocketmine\Server;
 use function error_reporting;
 
 /**
diff --git a/src/pocketmine/ThreadManager.php b/src/pocketmine/thread/ThreadManager.php
similarity index 98%
rename from src/pocketmine/ThreadManager.php
rename to src/pocketmine/thread/ThreadManager.php
index 027770920..1387a8494 100644
--- a/src/pocketmine/ThreadManager.php
+++ b/src/pocketmine/thread/ThreadManager.php
@@ -21,7 +21,7 @@
 
 declare(strict_types=1);
 
-namespace pocketmine;
+namespace pocketmine\thread;
 
 use function spl_object_id;
 
diff --git a/src/pocketmine/Worker.php b/src/pocketmine/thread/Worker.php
similarity index 98%
rename from src/pocketmine/Worker.php
rename to src/pocketmine/thread/Worker.php
index 0d67bd9ee..fc48fb212 100644
--- a/src/pocketmine/Worker.php
+++ b/src/pocketmine/thread/Worker.php
@@ -21,8 +21,9 @@
 
 declare(strict_types=1);
 
-namespace pocketmine;
+namespace pocketmine\thread;
 
+use pocketmine\Server;
 use function error_reporting;
 
 /**
diff --git a/src/pocketmine/utils/MainLogger.php b/src/pocketmine/utils/MainLogger.php
index cdadf944e..e98e9a834 100644
--- a/src/pocketmine/utils/MainLogger.php
+++ b/src/pocketmine/utils/MainLogger.php
@@ -24,8 +24,8 @@ declare(strict_types=1);
 namespace pocketmine\utils;
 
 use LogLevel;
-use pocketmine\Thread;
-use pocketmine\Worker;
+use pocketmine\thread\Thread;
+use pocketmine\thread\Worker;
 use function fclose;
 use function fopen;
 use function fwrite;
diff --git a/src/pocketmine/utils/Process.php b/src/pocketmine/utils/Process.php
index 3bca4302a..d34220c2d 100644
--- a/src/pocketmine/utils/Process.php
+++ b/src/pocketmine/utils/Process.php
@@ -23,7 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\utils;
 
-use pocketmine\ThreadManager;
+use pocketmine\thread\ThreadManager;
 use function count;
 use function exec;
 use function fclose;
diff --git a/src/pocketmine/utils/ServerKiller.php b/src/pocketmine/utils/ServerKiller.php
index d49582397..993c41d2b 100644
--- a/src/pocketmine/utils/ServerKiller.php
+++ b/src/pocketmine/utils/ServerKiller.php
@@ -23,7 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\utils;
 
-use pocketmine\Thread;
+use pocketmine\thread\Thread;
 use function getmypid;
 use function time;