diff --git a/src/Command/AbstractAsyncCommand.php b/src/Command/AbstractBlockingCommand.php
similarity index 55%
rename from src/Command/AbstractAsyncCommand.php
rename to src/Command/AbstractBlockingCommand.php
index 631587b8..2c70aaae 100644
--- a/src/Command/AbstractAsyncCommand.php
+++ b/src/Command/AbstractBlockingCommand.php
@@ -4,11 +4,11 @@
 
 use Spatie\Async\Pool;
 
-abstract class AbstractAsyncCommand extends AbstractCommand
+abstract class AbstractBlockingCommand extends AbstractCommand
 {
     protected Pool $pool;
 
-    public function setPool(Pool $pool): AbstractAsyncCommand
+    public function setPool(Pool $pool): AbstractBlockingCommand
     {
         $this->pool = $pool;
 
diff --git a/src/Command/AbstractAsyncTask.php b/src/Command/AbstractBlockingTask.php
similarity index 94%
rename from src/Command/AbstractAsyncTask.php
rename to src/Command/AbstractBlockingTask.php
index 4b174d7f..9c7aae22 100644
--- a/src/Command/AbstractAsyncTask.php
+++ b/src/Command/AbstractBlockingTask.php
@@ -4,7 +4,7 @@
 
 use Spatie\Async\Task;
 
-abstract class AbstractAsyncTask extends Task
+abstract class AbstractBlockingTask extends Task
 {
     protected array $env;
 
diff --git a/src/Command/AbstractDbAsyncTask.php b/src/Command/AbstractDbBlockingTask.php
similarity index 72%
rename from src/Command/AbstractDbAsyncTask.php
rename to src/Command/AbstractDbBlockingTask.php
index 5282bf14..23c4f82c 100644
--- a/src/Command/AbstractDbAsyncTask.php
+++ b/src/Command/AbstractDbBlockingTask.php
@@ -4,7 +4,7 @@
 
 use ChessServer\Db;
 
-abstract class AbstractDbAsyncTask extends AbstractAsyncTask
+abstract class AbstractDbBlockingTask extends AbstractBlockingTask
 {
     protected Db $db;
 
diff --git a/src/Command/AbstractNonBlockingCommand.php b/src/Command/AbstractNonBlockingCommand.php
new file mode 100644
index 00000000..47d8c907
--- /dev/null
+++ b/src/Command/AbstractNonBlockingCommand.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace ChessServer\Command;
+
+abstract class AbstractNonBlockingCommand extends AbstractCommand
+{
+}
\ No newline at end of file
diff --git a/src/Command/AbstractSyncCommand.php b/src/Command/AbstractSyncCommand.php
deleted file mode 100644
index d0731cf9..00000000
--- a/src/Command/AbstractSyncCommand.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-namespace ChessServer\Command;
-
-abstract class AbstractSyncCommand extends AbstractCommand
-{
-}
diff --git a/src/Command/Auth/Async/TotpRefreshCommand.php b/src/Command/Auth/Blocking/TotpRefreshCommand.php
similarity index 83%
rename from src/Command/Auth/Async/TotpRefreshCommand.php
rename to src/Command/Auth/Blocking/TotpRefreshCommand.php
index 567c28cc..7f2eb6eb 100644
--- a/src/Command/Auth/Async/TotpRefreshCommand.php
+++ b/src/Command/Auth/Blocking/TotpRefreshCommand.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace ChessServer\Command\Auth\Async;
+namespace ChessServer\Command\Auth\Blocking;
 
-use ChessServer\Command\AbstractAsyncCommand;
+use ChessServer\Command\AbstractBlockingCommand;
 use ChessServer\Socket\AbstractSocket;
 
-class TotpRefreshCommand extends AbstractAsyncCommand
+class TotpRefreshCommand extends AbstractBlockingCommand
 {
     public function __construct()
     {
diff --git a/src/Command/Auth/Async/TotpRefreshTask.php b/src/Command/Auth/Blocking/TotpRefreshTask.php
similarity index 87%
rename from src/Command/Auth/Async/TotpRefreshTask.php
rename to src/Command/Auth/Blocking/TotpRefreshTask.php
index fb266238..ce753c51 100644
--- a/src/Command/Auth/Async/TotpRefreshTask.php
+++ b/src/Command/Auth/Blocking/TotpRefreshTask.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace ChessServer\Command\Auth\Async;
+namespace ChessServer\Command\Auth\Blocking;
 
-use ChessServer\Command\AbstractDbAsyncTask;
+use ChessServer\Command\AbstractDbBlockingTask;
 use Firebase\JWT\JWT;
 use Firebase\JWT\Key;
 
-class TotpRefreshTask extends AbstractDbAsyncTask
+class TotpRefreshTask extends AbstractDbBlockingTask
 {
     public function run()
     {
diff --git a/src/Command/Auth/Async/TotpSignInCommand.php b/src/Command/Auth/Blocking/TotpSignInCommand.php
similarity index 83%
rename from src/Command/Auth/Async/TotpSignInCommand.php
rename to src/Command/Auth/Blocking/TotpSignInCommand.php
index 6cabf876..7553dfcd 100644
--- a/src/Command/Auth/Async/TotpSignInCommand.php
+++ b/src/Command/Auth/Blocking/TotpSignInCommand.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace ChessServer\Command\Auth\Async;
+namespace ChessServer\Command\Auth\Blocking;
 
-use ChessServer\Command\AbstractAsyncCommand;
+use ChessServer\Command\AbstractBlockingCommand;
 use ChessServer\Socket\AbstractSocket;
 
-class TotpSignInCommand extends AbstractAsyncCommand
+class TotpSignInCommand extends AbstractBlockingCommand
 {
     public function __construct()
     {
diff --git a/src/Command/Auth/Async/TotpSignInTask.php b/src/Command/Auth/Blocking/TotpSignInTask.php
similarity index 90%
rename from src/Command/Auth/Async/TotpSignInTask.php
rename to src/Command/Auth/Blocking/TotpSignInTask.php
index 9e09f42d..6a01cc74 100644
--- a/src/Command/Auth/Async/TotpSignInTask.php
+++ b/src/Command/Auth/Blocking/TotpSignInTask.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace ChessServer\Command\Auth\Async;
+namespace ChessServer\Command\Auth\Blocking;
 
-use ChessServer\Command\AbstractDbAsyncTask;
+use ChessServer\Command\AbstractDbBlockingTask;
 use Firebase\JWT\JWT;
 use OTPHP\InternalClock;
 use OTPHP\TOTP;
 
-class TotpSignInTask extends AbstractDbAsyncTask
+class TotpSignInTask extends AbstractDbBlockingTask
 {
     public function run()
     {
diff --git a/src/Command/Auth/Async/TotpSignUpCommand.php b/src/Command/Auth/Blocking/TotpSignUpCommand.php
similarity index 80%
rename from src/Command/Auth/Async/TotpSignUpCommand.php
rename to src/Command/Auth/Blocking/TotpSignUpCommand.php
index 93914e6a..e1f1fa05 100644
--- a/src/Command/Auth/Async/TotpSignUpCommand.php
+++ b/src/Command/Auth/Blocking/TotpSignUpCommand.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace ChessServer\Command\Auth\Async;
+namespace ChessServer\Command\Auth\Blocking;
 
-use ChessServer\Command\AbstractAsyncCommand;
+use ChessServer\Command\AbstractBlockingCommand;
 use ChessServer\Socket\AbstractSocket;
 
-class TotpSignUpCommand extends AbstractAsyncCommand
+class TotpSignUpCommand extends AbstractBlockingCommand
 {
     public function __construct()
     {
diff --git a/src/Command/Auth/Async/TotpSignUpTask.php b/src/Command/Auth/Blocking/TotpSignUpTask.php
similarity index 83%
rename from src/Command/Auth/Async/TotpSignUpTask.php
rename to src/Command/Auth/Blocking/TotpSignUpTask.php
index d84aadfb..ad691c66 100644
--- a/src/Command/Auth/Async/TotpSignUpTask.php
+++ b/src/Command/Auth/Blocking/TotpSignUpTask.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace ChessServer\Command\Auth\Async;
+namespace ChessServer\Command\Auth\Blocking;
 
-use ChessServer\Command\AbstractDbAsyncTask;
+use ChessServer\Command\AbstractDbBlockingTask;
 use OTPHP\InternalClock;
 use OTPHP\TOTP;
 
-class TotpSignUpTask extends AbstractDbAsyncTask
+class TotpSignUpTask extends AbstractDbBlockingTask
 {
     public function run()
     {
diff --git a/src/Command/Auth/Cli.php b/src/Command/Auth/Cli.php
index 7f3bca1a..d742f39b 100644
--- a/src/Command/Auth/Cli.php
+++ b/src/Command/Auth/Cli.php
@@ -3,9 +3,9 @@
 namespace ChessServer\Command\Auth;
 
 use ChessServer\Command\AbstractCli;
-use ChessServer\Command\Auth\Async\TotpRefreshCommand;
-use ChessServer\Command\Auth\Async\TotpSignInCommand;
-use ChessServer\Command\Auth\Async\TotpSignUpCommand;
+use ChessServer\Command\Auth\Blocking\TotpRefreshCommand;
+use ChessServer\Command\Auth\Blocking\TotpSignInCommand;
+use ChessServer\Command\Auth\Blocking\TotpSignUpCommand;
 use Spatie\Async\Pool;
 
 class Cli extends AbstractCli
diff --git a/src/Command/Binary/Async/ImageCommand.php b/src/Command/Binary/Blocking/ImageCommand.php
similarity index 84%
rename from src/Command/Binary/Async/ImageCommand.php
rename to src/Command/Binary/Blocking/ImageCommand.php
index 5e81020a..8f3d0cd0 100644
--- a/src/Command/Binary/Async/ImageCommand.php
+++ b/src/Command/Binary/Blocking/ImageCommand.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace ChessServer\Command\Binary\Async;
+namespace ChessServer\Command\Binary\Blocking;
 
-use ChessServer\Command\AbstractAsyncCommand;
+use ChessServer\Command\AbstractBlockingCommand;
 use ChessServer\Socket\AbstractSocket;
 
-class ImageCommand extends AbstractAsyncCommand
+class ImageCommand extends AbstractBlockingCommand
 {
     public function __construct()
     {
diff --git a/src/Command/Binary/Async/ImageTask.php b/src/Command/Binary/Blocking/ImageTask.php
similarity index 83%
rename from src/Command/Binary/Async/ImageTask.php
rename to src/Command/Binary/Blocking/ImageTask.php
index 928639c2..4c680546 100644
--- a/src/Command/Binary/Async/ImageTask.php
+++ b/src/Command/Binary/Blocking/ImageTask.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace ChessServer\Command\Binary\Async;
+namespace ChessServer\Command\Binary\Blocking;
 
 use Chess\Media\BoardToPng;
 use Chess\Variant\Classical\FEN\StrToBoard as ClassicalStrToBoard;
 use Chess\Variant\Classical\PGN\AN\Color;
-use ChessServer\Command\AbstractAsyncTask;
+use ChessServer\Command\AbstractBlockingTask;
 use ChessServer\Socket\AbstractSocket;
 
-class ImageTask extends AbstractAsyncTask
+class ImageTask extends AbstractBlockingTask
 {
     public function run()
     {
diff --git a/src/Command/Binary/Cli.php b/src/Command/Binary/Cli.php
index 789ac81d..362d7175 100644
--- a/src/Command/Binary/Cli.php
+++ b/src/Command/Binary/Cli.php
@@ -3,7 +3,7 @@
 namespace ChessServer\Command\Binary;
 
 use ChessServer\Command\AbstractCli;
-use ChessServer\Command\Binary\Async\ImageCommand;
+use ChessServer\Command\Binary\Blocking\ImageCommand;
 use Spatie\Async\Pool;
 
 class Cli extends AbstractCli
diff --git a/src/Command/Data/Async/AnnotationsGameCommand.php b/src/Command/Data/Blocking/AnnotationsGameCommand.php
similarity index 80%
rename from src/Command/Data/Async/AnnotationsGameCommand.php
rename to src/Command/Data/Blocking/AnnotationsGameCommand.php
index cd276d58..b9c7dcc7 100644
--- a/src/Command/Data/Async/AnnotationsGameCommand.php
+++ b/src/Command/Data/Blocking/AnnotationsGameCommand.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace ChessServer\Command\Data\Async;
+namespace ChessServer\Command\Data\Blocking;
 
-use ChessServer\Command\AbstractAsyncCommand;
+use ChessServer\Command\AbstractBlockingCommand;
 use ChessServer\Socket\AbstractSocket;
 
-class AnnotationsGameCommand extends AbstractAsyncCommand
+class AnnotationsGameCommand extends AbstractBlockingCommand
 {
     public function __construct()
     {
diff --git a/src/Command/Data/Async/AnnotationsGameTask.php b/src/Command/Data/Blocking/AnnotationsGameTask.php
similarity index 52%
rename from src/Command/Data/Async/AnnotationsGameTask.php
rename to src/Command/Data/Blocking/AnnotationsGameTask.php
index 01e76985..c53b9862 100644
--- a/src/Command/Data/Async/AnnotationsGameTask.php
+++ b/src/Command/Data/Blocking/AnnotationsGameTask.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace ChessServer\Command\Data\Async;
+namespace ChessServer\Command\Data\Blocking;
 
-use ChessServer\Command\AbstractDbAsyncTask;
+use ChessServer\Command\AbstractDbBlockingTask;
 
-class AnnotationsGameTask extends AbstractDbAsyncTask
+class AnnotationsGameTask extends AbstractDbBlockingTask
 {
     public function run()
     {
diff --git a/src/Command/Data/Async/AutocompleteBlackCommand.php b/src/Command/Data/Blocking/AutocompleteBlackCommand.php
similarity index 83%
rename from src/Command/Data/Async/AutocompleteBlackCommand.php
rename to src/Command/Data/Blocking/AutocompleteBlackCommand.php
index 8db42d42..b19d644e 100644
--- a/src/Command/Data/Async/AutocompleteBlackCommand.php
+++ b/src/Command/Data/Blocking/AutocompleteBlackCommand.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace ChessServer\Command\Data\Async;
+namespace ChessServer\Command\Data\Blocking;
 
-use ChessServer\Command\AbstractAsyncCommand;
+use ChessServer\Command\AbstractBlockingCommand;
 use ChessServer\Socket\AbstractSocket;
 
-class AutocompleteBlackCommand extends AbstractAsyncCommand
+class AutocompleteBlackCommand extends AbstractBlockingCommand
 {
     public function __construct()
     {
diff --git a/src/Command/Data/Async/AutocompleteBlackTask.php b/src/Command/Data/Blocking/AutocompleteBlackTask.php
similarity index 72%
rename from src/Command/Data/Async/AutocompleteBlackTask.php
rename to src/Command/Data/Blocking/AutocompleteBlackTask.php
index 4de99984..d5ae4e22 100644
--- a/src/Command/Data/Async/AutocompleteBlackTask.php
+++ b/src/Command/Data/Blocking/AutocompleteBlackTask.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace ChessServer\Command\Data\Async;
+namespace ChessServer\Command\Data\Blocking;
 
-use ChessServer\Command\AbstractDbAsyncTask;
+use ChessServer\Command\AbstractDbBlockingTask;
 
-class AutocompleteBlackTask extends AbstractDbAsyncTask
+class AutocompleteBlackTask extends AbstractDbBlockingTask
 {
     public function run()
     {
diff --git a/src/Command/Data/Async/AutocompleteEventCommand.php b/src/Command/Data/Blocking/AutocompleteEventCommand.php
similarity index 83%
rename from src/Command/Data/Async/AutocompleteEventCommand.php
rename to src/Command/Data/Blocking/AutocompleteEventCommand.php
index f6e7e8bb..0e7ea1d7 100644
--- a/src/Command/Data/Async/AutocompleteEventCommand.php
+++ b/src/Command/Data/Blocking/AutocompleteEventCommand.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace ChessServer\Command\Data\Async;
+namespace ChessServer\Command\Data\Blocking;
 
-use ChessServer\Command\AbstractAsyncCommand;
+use ChessServer\Command\AbstractBlockingCommand;
 use ChessServer\Socket\AbstractSocket;
 
-class AutocompleteEventCommand extends AbstractAsyncCommand
+class AutocompleteEventCommand extends AbstractBlockingCommand
 {
     public function __construct()
     {
diff --git a/src/Command/Data/Async/AutocompleteEventTask.php b/src/Command/Data/Blocking/AutocompleteEventTask.php
similarity index 72%
rename from src/Command/Data/Async/AutocompleteEventTask.php
rename to src/Command/Data/Blocking/AutocompleteEventTask.php
index 2700ad34..28482a26 100644
--- a/src/Command/Data/Async/AutocompleteEventTask.php
+++ b/src/Command/Data/Blocking/AutocompleteEventTask.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace ChessServer\Command\Data\Async;
+namespace ChessServer\Command\Data\Blocking;
 
-use ChessServer\Command\AbstractDbAsyncTask;
+use ChessServer\Command\AbstractDbBlockingTask;
 
-class AutocompleteEventTask extends AbstractDbAsyncTask
+class AutocompleteEventTask extends AbstractDbBlockingTask
 {
     public function run()
     {
diff --git a/src/Command/Data/Async/AutocompleteWhiteCommand.php b/src/Command/Data/Blocking/AutocompleteWhiteCommand.php
similarity index 83%
rename from src/Command/Data/Async/AutocompleteWhiteCommand.php
rename to src/Command/Data/Blocking/AutocompleteWhiteCommand.php
index 23969442..57a55191 100644
--- a/src/Command/Data/Async/AutocompleteWhiteCommand.php
+++ b/src/Command/Data/Blocking/AutocompleteWhiteCommand.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace ChessServer\Command\Data\Async;
+namespace ChessServer\Command\Data\Blocking;
 
-use ChessServer\Command\AbstractAsyncCommand;
+use ChessServer\Command\AbstractBlockingCommand;
 use ChessServer\Socket\AbstractSocket;
 
-class AutocompleteWhiteCommand extends AbstractAsyncCommand
+class AutocompleteWhiteCommand extends AbstractBlockingCommand
 {
     public function __construct()
     {
diff --git a/src/Command/Data/Async/AutocompleteWhiteTask.php b/src/Command/Data/Blocking/AutocompleteWhiteTask.php
similarity index 72%
rename from src/Command/Data/Async/AutocompleteWhiteTask.php
rename to src/Command/Data/Blocking/AutocompleteWhiteTask.php
index c080630b..3674a587 100644
--- a/src/Command/Data/Async/AutocompleteWhiteTask.php
+++ b/src/Command/Data/Blocking/AutocompleteWhiteTask.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace ChessServer\Command\Data\Async;
+namespace ChessServer\Command\Data\Blocking;
 
-use ChessServer\Command\AbstractDbAsyncTask;
+use ChessServer\Command\AbstractDbBlockingTask;
 
-class AutocompleteWhiteTask extends AbstractDbAsyncTask
+class AutocompleteWhiteTask extends AbstractDbBlockingTask
 {
     public function run()
     {
diff --git a/src/Command/Data/Async/OpeningCommand.php b/src/Command/Data/Blocking/OpeningCommand.php
similarity index 84%
rename from src/Command/Data/Async/OpeningCommand.php
rename to src/Command/Data/Blocking/OpeningCommand.php
index 7e01624b..01e3fad6 100644
--- a/src/Command/Data/Async/OpeningCommand.php
+++ b/src/Command/Data/Blocking/OpeningCommand.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace ChessServer\Command\Data\Async;
+namespace ChessServer\Command\Data\Blocking;
 
-use ChessServer\Command\AbstractAsyncCommand;
+use ChessServer\Command\AbstractBlockingCommand;
 use ChessServer\Socket\AbstractSocket;
 
-class OpeningCommand extends AbstractAsyncCommand
+class OpeningCommand extends AbstractBlockingCommand
 {
     public function __construct()
     {
diff --git a/src/Command/Data/Async/OpeningTask.php b/src/Command/Data/Blocking/OpeningTask.php
similarity index 89%
rename from src/Command/Data/Async/OpeningTask.php
rename to src/Command/Data/Blocking/OpeningTask.php
index 924643e1..ca4167cc 100644
--- a/src/Command/Data/Async/OpeningTask.php
+++ b/src/Command/Data/Blocking/OpeningTask.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace ChessServer\Command\Data\Async;
+namespace ChessServer\Command\Data\Blocking;
 
-use ChessServer\Command\AbstractDbAsyncTask;
+use ChessServer\Command\AbstractDbBlockingTask;
 
-class OpeningTask extends AbstractDbAsyncTask
+class OpeningTask extends AbstractDbBlockingTask
 {
     const SQL_LIKE = [
 
diff --git a/src/Command/Data/Async/RankingCommand.php b/src/Command/Data/Blocking/RankingCommand.php
similarity index 80%
rename from src/Command/Data/Async/RankingCommand.php
rename to src/Command/Data/Blocking/RankingCommand.php
index d6a28e16..2da14b09 100644
--- a/src/Command/Data/Async/RankingCommand.php
+++ b/src/Command/Data/Blocking/RankingCommand.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace ChessServer\Command\Data\Async;
+namespace ChessServer\Command\Data\Blocking;
 
-use ChessServer\Command\AbstractAsyncCommand;
+use ChessServer\Command\AbstractBlockingCommand;
 use ChessServer\Socket\AbstractSocket;
 
-class RankingCommand extends AbstractAsyncCommand
+class RankingCommand extends AbstractBlockingCommand
 {
     public function __construct()
     {
diff --git a/src/Command/Data/Async/RankingTask.php b/src/Command/Data/Blocking/RankingTask.php
similarity index 61%
rename from src/Command/Data/Async/RankingTask.php
rename to src/Command/Data/Blocking/RankingTask.php
index 2235a799..33881e23 100644
--- a/src/Command/Data/Async/RankingTask.php
+++ b/src/Command/Data/Blocking/RankingTask.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace ChessServer\Command\Data\Async;
+namespace ChessServer\Command\Data\Blocking;
 
-use ChessServer\Command\AbstractDbAsyncTask;
+use ChessServer\Command\AbstractDbBlockingTask;
 
-class RankingTask extends AbstractDbAsyncTask
+class RankingTask extends AbstractDbBlockingTask
 {
     public function run()
     {
diff --git a/src/Command/Data/Async/SearchCommand.php b/src/Command/Data/Blocking/SearchCommand.php
similarity index 84%
rename from src/Command/Data/Async/SearchCommand.php
rename to src/Command/Data/Blocking/SearchCommand.php
index 9ca642d8..e66a5104 100644
--- a/src/Command/Data/Async/SearchCommand.php
+++ b/src/Command/Data/Blocking/SearchCommand.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace ChessServer\Command\Data\Async;
+namespace ChessServer\Command\Data\Blocking;
 
-use ChessServer\Command\AbstractAsyncCommand;
+use ChessServer\Command\AbstractBlockingCommand;
 use ChessServer\Socket\AbstractSocket;
 
-class SearchCommand extends AbstractAsyncCommand
+class SearchCommand extends AbstractBlockingCommand
 {
     public function __construct()
     {
diff --git a/src/Command/Data/Async/SearchTask.php b/src/Command/Data/Blocking/SearchTask.php
similarity index 91%
rename from src/Command/Data/Async/SearchTask.php
rename to src/Command/Data/Blocking/SearchTask.php
index 19714297..8ccc6a99 100644
--- a/src/Command/Data/Async/SearchTask.php
+++ b/src/Command/Data/Blocking/SearchTask.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace ChessServer\Command\Data\Async;
+namespace ChessServer\Command\Data\Blocking;
 
 use Chess\Movetext\SanMovetext;
 use Chess\Variant\Classical\PGN\Move;
-use ChessServer\Command\AbstractDbAsyncTask;
+use ChessServer\Command\AbstractDbBlockingTask;
 
-class SearchTask extends AbstractDbAsyncTask
+class SearchTask extends AbstractDbBlockingTask
 {
     const SQL_LIKE = [
         'Date',
diff --git a/src/Command/Data/Cli.php b/src/Command/Data/Cli.php
index be67c618..efb2453a 100644
--- a/src/Command/Data/Cli.php
+++ b/src/Command/Data/Cli.php
@@ -3,13 +3,13 @@
 namespace ChessServer\Command\Data;
 
 use ChessServer\Command\AbstractCli;
-use ChessServer\Command\Data\Async\AnnotationsGameCommand;
-use ChessServer\Command\Data\Async\AutocompleteBlackCommand;
-use ChessServer\Command\Data\Async\AutocompleteEventCommand;
-use ChessServer\Command\Data\Async\AutocompleteWhiteCommand;
-use ChessServer\Command\Data\Async\OpeningCommand;
-use ChessServer\Command\Data\Async\RankingCommand;
-use ChessServer\Command\Data\Async\SearchCommand;
+use ChessServer\Command\Data\Blocking\AnnotationsGameCommand;
+use ChessServer\Command\Data\Blocking\AutocompleteBlackCommand;
+use ChessServer\Command\Data\Blocking\AutocompleteEventCommand;
+use ChessServer\Command\Data\Blocking\AutocompleteWhiteCommand;
+use ChessServer\Command\Data\Blocking\OpeningCommand;
+use ChessServer\Command\Data\Blocking\RankingCommand;
+use ChessServer\Command\Data\Blocking\SearchCommand;
 use Spatie\Async\Pool;
 
 class Cli extends AbstractCli
diff --git a/src/Command/Game/Async/ExtractCommand.php b/src/Command/Game/Blocking/ExtractCommand.php
similarity index 84%
rename from src/Command/Game/Async/ExtractCommand.php
rename to src/Command/Game/Blocking/ExtractCommand.php
index 16c320bb..9dd8fa56 100644
--- a/src/Command/Game/Async/ExtractCommand.php
+++ b/src/Command/Game/Blocking/ExtractCommand.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace ChessServer\Command\Game\Async;
+namespace ChessServer\Command\Game\Blocking;
 
-use ChessServer\Command\AbstractAsyncCommand;
+use ChessServer\Command\AbstractBlockingCommand;
 use ChessServer\Socket\AbstractSocket;
 
-class ExtractCommand extends AbstractAsyncCommand
+class ExtractCommand extends AbstractBlockingCommand
 {
     public function __construct()
     {
diff --git a/src/Command/Game/Async/ExtractTask.php b/src/Command/Game/Blocking/ExtractTask.php
similarity index 93%
rename from src/Command/Game/Async/ExtractTask.php
rename to src/Command/Game/Blocking/ExtractTask.php
index a4043a83..fbe09948 100644
--- a/src/Command/Game/Async/ExtractTask.php
+++ b/src/Command/Game/Blocking/ExtractTask.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace ChessServer\Command\Game\Async;
+namespace ChessServer\Command\Game\Blocking;
 
 use Chess\FenToBoardFactory;
 use Chess\SanExtractor;
@@ -9,9 +9,9 @@
 use Chess\Variant\CapablancaFischer\Board as CapablancaFischerBoard;
 use Chess\Variant\Chess960\Board as Chess960Board;
 use Chess\Variant\Classical\Board as ClassicalBoard;
-use ChessServer\Command\AbstractAsyncTask;
+use ChessServer\Command\AbstractBlockingTask;
 
-class ExtractTask extends AbstractAsyncTask
+class ExtractTask extends AbstractBlockingTask
 {
     public function run()
     {
diff --git a/src/Command/Game/Async/HeuristicCommand.php b/src/Command/Game/Blocking/HeuristicCommand.php
similarity index 84%
rename from src/Command/Game/Async/HeuristicCommand.php
rename to src/Command/Game/Blocking/HeuristicCommand.php
index 97b85292..b6630a6d 100644
--- a/src/Command/Game/Async/HeuristicCommand.php
+++ b/src/Command/Game/Blocking/HeuristicCommand.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace ChessServer\Command\Game\Async;
+namespace ChessServer\Command\Game\Blocking;
 
-use ChessServer\Command\AbstractAsyncCommand;
+use ChessServer\Command\AbstractBlockingCommand;
 use ChessServer\Socket\AbstractSocket;
 
-class HeuristicCommand extends AbstractAsyncCommand
+class HeuristicCommand extends AbstractBlockingCommand
 {
     public function __construct()
     {
diff --git a/src/Command/Game/Async/HeuristicTask.php b/src/Command/Game/Blocking/HeuristicTask.php
similarity index 92%
rename from src/Command/Game/Async/HeuristicTask.php
rename to src/Command/Game/Blocking/HeuristicTask.php
index 5cb3238d..0fbf16d1 100644
--- a/src/Command/Game/Async/HeuristicTask.php
+++ b/src/Command/Game/Blocking/HeuristicTask.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace ChessServer\Command\Game\Async;
+namespace ChessServer\Command\Game\Blocking;
 
 use Chess\FenToBoardFactory;
 use Chess\SanPlotter;
@@ -9,9 +9,9 @@
 use Chess\Variant\CapablancaFischer\Board as CapablancaFischerBoard;
 use Chess\Variant\Chess960\Board as Chess960Board;
 use Chess\Variant\Classical\Board as ClassicalBoard;
-use ChessServer\Command\AbstractAsyncTask;
+use ChessServer\Command\AbstractBlockingTask;
 
-class HeuristicTask extends AbstractAsyncTask
+class HeuristicTask extends AbstractBlockingTask
 {
     public function run()
     {
diff --git a/src/Command/Game/Async/LeaveCommand.php b/src/Command/Game/Blocking/LeaveCommand.php
similarity index 87%
rename from src/Command/Game/Async/LeaveCommand.php
rename to src/Command/Game/Blocking/LeaveCommand.php
index 90c6dd9c..8848af56 100644
--- a/src/Command/Game/Async/LeaveCommand.php
+++ b/src/Command/Game/Blocking/LeaveCommand.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace ChessServer\Command\Game\Async;
+namespace ChessServer\Command\Game\Blocking;
 
 use Chess\Variant\Classical\PGN\AN\Color;
-use ChessServer\Command\AbstractAsyncCommand;
-use ChessServer\Command\Game\Async\UpdateEloTask;
+use ChessServer\Command\AbstractBlockingCommand;
+use ChessServer\Command\Game\Blocking\UpdateEloTask;
 use ChessServer\Socket\AbstractSocket;
 
-class LeaveCommand extends AbstractAsyncCommand
+class LeaveCommand extends AbstractBlockingCommand
 {
     public function __construct()
     {
diff --git a/src/Command/Game/Async/PlayCommand.php b/src/Command/Game/Blocking/PlayCommand.php
similarity index 90%
rename from src/Command/Game/Async/PlayCommand.php
rename to src/Command/Game/Blocking/PlayCommand.php
index 0b7dd249..e140aef5 100644
--- a/src/Command/Game/Async/PlayCommand.php
+++ b/src/Command/Game/Blocking/PlayCommand.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace ChessServer\Command\Game\Async;
+namespace ChessServer\Command\Game\Blocking;
 
-use ChessServer\Command\AbstractAsyncCommand;
-use ChessServer\Command\Game\Async\UpdateEloTask;
+use ChessServer\Command\AbstractBlockingCommand;
+use ChessServer\Command\Game\Blocking\UpdateEloTask;
 use ChessServer\Command\Game\Mode\PlayMode;
 use ChessServer\Socket\AbstractSocket;
 
-class PlayCommand extends AbstractAsyncCommand
+class PlayCommand extends AbstractBlockingCommand
 {
     public function __construct()
     {
diff --git a/src/Command/Game/Async/PlayLanCommand.php b/src/Command/Game/Blocking/PlayLanCommand.php
similarity index 89%
rename from src/Command/Game/Async/PlayLanCommand.php
rename to src/Command/Game/Blocking/PlayLanCommand.php
index e3cfc505..d12d4bca 100644
--- a/src/Command/Game/Async/PlayLanCommand.php
+++ b/src/Command/Game/Blocking/PlayLanCommand.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace ChessServer\Command\Game\Async;
+namespace ChessServer\Command\Game\Blocking;
 
-use ChessServer\Command\AbstractAsyncCommand;
-use ChessServer\Command\Game\Async\UpdateEloTask;
+use ChessServer\Command\AbstractBlockingCommand;
+use ChessServer\Command\Game\Blocking\UpdateEloTask;
 use ChessServer\Command\Game\Mode\PlayMode;
 use ChessServer\Socket\AbstractSocket;
 
-class PlayLanCommand extends AbstractAsyncCommand
+class PlayLanCommand extends AbstractBlockingCommand
 {
     public function __construct()
     {
diff --git a/src/Command/Game/Async/PlayRavCommand.php b/src/Command/Game/Blocking/PlayRavCommand.php
similarity index 84%
rename from src/Command/Game/Async/PlayRavCommand.php
rename to src/Command/Game/Blocking/PlayRavCommand.php
index 5b874c14..65020d8a 100644
--- a/src/Command/Game/Async/PlayRavCommand.php
+++ b/src/Command/Game/Blocking/PlayRavCommand.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace ChessServer\Command\Game\Async;
+namespace ChessServer\Command\Game\Blocking;
 
-use ChessServer\Command\AbstractAsyncCommand;
+use ChessServer\Command\AbstractBlockingCommand;
 use ChessServer\Socket\AbstractSocket;
 
-class PlayRavCommand extends AbstractAsyncCommand
+class PlayRavCommand extends AbstractBlockingCommand
 {
     public function __construct()
     {
diff --git a/src/Command/Game/Async/PlayRavTask.php b/src/Command/Game/Blocking/PlayRavTask.php
similarity index 91%
rename from src/Command/Game/Async/PlayRavTask.php
rename to src/Command/Game/Blocking/PlayRavTask.php
index 02087702..30435c85 100644
--- a/src/Command/Game/Async/PlayRavTask.php
+++ b/src/Command/Game/Blocking/PlayRavTask.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace ChessServer\Command\Game\Async;
+namespace ChessServer\Command\Game\Blocking;
 
 use Chess\FenToBoardFactory;
 use Chess\Play\RavPlay;
 use Chess\Variant\Chess960\Board as Chess960Board;
 use Chess\Variant\Classical\Board as ClassicalBoard;
-use ChessServer\Command\AbstractAsyncTask;
+use ChessServer\Command\AbstractBlockingTask;
 
-class PlayRavTask extends AbstractAsyncTask
+class PlayRavTask extends AbstractBlockingTask
 {
     public function run()
     {
diff --git a/src/Command/Game/Async/RecognizerCommand.php b/src/Command/Game/Blocking/RecognizerCommand.php
similarity index 84%
rename from src/Command/Game/Async/RecognizerCommand.php
rename to src/Command/Game/Blocking/RecognizerCommand.php
index 1c947f56..078d6ad1 100644
--- a/src/Command/Game/Async/RecognizerCommand.php
+++ b/src/Command/Game/Blocking/RecognizerCommand.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace ChessServer\Command\Game\Async;
+namespace ChessServer\Command\Game\Blocking;
 
-use ChessServer\Command\AbstractAsyncCommand;
+use ChessServer\Command\AbstractBlockingCommand;
 use ChessServer\Socket\AbstractSocket;
 
-class RecognizerCommand extends AbstractAsyncCommand
+class RecognizerCommand extends AbstractBlockingCommand
 {
     public function __construct()
     {
diff --git a/src/Command/Game/Async/RecognizerTask.php b/src/Command/Game/Blocking/RecognizerTask.php
similarity index 70%
rename from src/Command/Game/Async/RecognizerTask.php
rename to src/Command/Game/Blocking/RecognizerTask.php
index aeaf1f04..9e797c3f 100644
--- a/src/Command/Game/Async/RecognizerTask.php
+++ b/src/Command/Game/Blocking/RecognizerTask.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace ChessServer\Command\Game\Async;
+namespace ChessServer\Command\Game\Blocking;
 
 use Chess\Media\ImgToPiecePlacement;
-use ChessServer\Command\AbstractAsyncTask;
+use ChessServer\Command\AbstractBlockingTask;
 
-class RecognizerTask extends AbstractAsyncTask
+class RecognizerTask extends AbstractBlockingTask
 {
     public function run()
     {
diff --git a/src/Command/Game/Async/ResignCommand.php b/src/Command/Game/Blocking/ResignCommand.php
similarity index 86%
rename from src/Command/Game/Async/ResignCommand.php
rename to src/Command/Game/Blocking/ResignCommand.php
index f60d7c0f..64afb0a0 100644
--- a/src/Command/Game/Async/ResignCommand.php
+++ b/src/Command/Game/Blocking/ResignCommand.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace ChessServer\Command\Game\Async;
+namespace ChessServer\Command\Game\Blocking;
 
 use Chess\Variant\Classical\PGN\AN\Color;
-use ChessServer\Command\AbstractAsyncCommand;
-use ChessServer\Command\Game\Async\UpdateEloTask;
+use ChessServer\Command\AbstractBlockingCommand;
+use ChessServer\Command\Game\Blocking\UpdateEloTask;
 use ChessServer\Socket\AbstractSocket;
 
-class ResignCommand extends AbstractAsyncCommand
+class ResignCommand extends AbstractBlockingCommand
 {
     public function __construct()
     {
diff --git a/src/Command/Game/Async/RestartCommand.php b/src/Command/Game/Blocking/RestartCommand.php
similarity index 94%
rename from src/Command/Game/Async/RestartCommand.php
rename to src/Command/Game/Blocking/RestartCommand.php
index 38324a6f..a51eaba2 100644
--- a/src/Command/Game/Async/RestartCommand.php
+++ b/src/Command/Game/Blocking/RestartCommand.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace ChessServer\Command\Game\Async;
+namespace ChessServer\Command\Game\Blocking;
 
 use Chess\FenToBoardFactory;
 use Chess\Variant\CapablancaFischer\Board as CapablancaFischerBoard;
 use Chess\Variant\Chess960\Board as Chess960Board;
 use Chess\Variant\Classical\PGN\AN\Color;
-use ChessServer\Command\AbstractAsyncCommand;
+use ChessServer\Command\AbstractBlockingCommand;
 use ChessServer\Command\Game\Game;
 use ChessServer\Socket\AbstractSocket;
 
-class RestartCommand extends AbstractAsyncCommand
+class RestartCommand extends AbstractBlockingCommand
 {
     public function __construct()
     {
diff --git a/src/Command/Game/Async/RestartTask.php b/src/Command/Game/Blocking/RestartTask.php
similarity index 87%
rename from src/Command/Game/Async/RestartTask.php
rename to src/Command/Game/Blocking/RestartTask.php
index a8ada7c3..c26cc64c 100644
--- a/src/Command/Game/Async/RestartTask.php
+++ b/src/Command/Game/Blocking/RestartTask.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace ChessServer\Command\Game\Async;
+namespace ChessServer\Command\Game\Blocking;
 
 use Chess\Variant\Classical\PGN\AN\Color;
-use ChessServer\Command\AbstractDbAsyncTask;
+use ChessServer\Command\AbstractDbBlockingTask;
 
-class RestartTask extends AbstractDbAsyncTask
+class RestartTask extends AbstractDbBlockingTask
 {
     public function run()
     {
diff --git a/src/Command/Game/Async/StockfishCommand.php b/src/Command/Game/Blocking/StockfishCommand.php
similarity index 89%
rename from src/Command/Game/Async/StockfishCommand.php
rename to src/Command/Game/Blocking/StockfishCommand.php
index a872c5a2..4d1d34cd 100644
--- a/src/Command/Game/Async/StockfishCommand.php
+++ b/src/Command/Game/Blocking/StockfishCommand.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace ChessServer\Command\Game\Async;
+namespace ChessServer\Command\Game\Blocking;
 
-use ChessServer\Command\AbstractAsyncCommand;
+use ChessServer\Command\AbstractBlockingCommand;
 use ChessServer\Socket\AbstractSocket;
 
-class StockfishCommand extends AbstractAsyncCommand
+class StockfishCommand extends AbstractBlockingCommand
 {
     public function __construct()
     {
diff --git a/src/Command/Game/Async/StockfishTask.php b/src/Command/Game/Blocking/StockfishTask.php
similarity index 89%
rename from src/Command/Game/Async/StockfishTask.php
rename to src/Command/Game/Blocking/StockfishTask.php
index 25a07a65..e2c304c9 100644
--- a/src/Command/Game/Async/StockfishTask.php
+++ b/src/Command/Game/Blocking/StockfishTask.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace ChessServer\Command\Game\Async;
+namespace ChessServer\Command\Game\Blocking;
 
 use Chess\Computer\GrandmasterMove;
 use Chess\UciEngine\UciEngine;
 use Chess\UciEngine\Details\Limit;
 use Chess\Variant\Classical\Board;
-use ChessServer\Command\AbstractAsyncTask;
+use ChessServer\Command\AbstractBlockingTask;
 use ChessServer\Socket\AbstractSocket;
 
-class StockfishTask extends AbstractAsyncTask
+class StockfishTask extends AbstractBlockingTask
 {
     private Board $board;
 
diff --git a/src/Command/Game/Async/TutorFenCommand.php b/src/Command/Game/Blocking/TutorFenCommand.php
similarity index 84%
rename from src/Command/Game/Async/TutorFenCommand.php
rename to src/Command/Game/Blocking/TutorFenCommand.php
index 8f3568ff..f63bd652 100644
--- a/src/Command/Game/Async/TutorFenCommand.php
+++ b/src/Command/Game/Blocking/TutorFenCommand.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace ChessServer\Command\Game\Async;
+namespace ChessServer\Command\Game\Blocking;
 
-use ChessServer\Command\AbstractAsyncCommand;
+use ChessServer\Command\AbstractBlockingCommand;
 use ChessServer\Socket\AbstractSocket;
 
-class TutorFenCommand extends AbstractAsyncCommand
+class TutorFenCommand extends AbstractBlockingCommand
 {
     public function __construct()
     {
diff --git a/src/Command/Game/Async/TutorFenTask.php b/src/Command/Game/Blocking/TutorFenTask.php
similarity index 73%
rename from src/Command/Game/Async/TutorFenTask.php
rename to src/Command/Game/Blocking/TutorFenTask.php
index 390d1d73..f115b509 100644
--- a/src/Command/Game/Async/TutorFenTask.php
+++ b/src/Command/Game/Blocking/TutorFenTask.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace ChessServer\Command\Game\Async;
+namespace ChessServer\Command\Game\Blocking;
 
 use Chess\FenToBoardFactory;
 use Chess\Function\CompleteFunction;
 use Chess\Tutor\FenEvaluation;
 use Chess\Variant\Classical\Board;
-use ChessServer\Command\AbstractAsyncTask;
+use ChessServer\Command\AbstractBlockingTask;
 
-class TutorFenTask extends AbstractAsyncTask
+class TutorFenTask extends AbstractBlockingTask
 {
     public function run()
     {
diff --git a/src/Command/Game/Async/UpdateEloTask.php b/src/Command/Game/Blocking/UpdateEloTask.php
similarity index 92%
rename from src/Command/Game/Async/UpdateEloTask.php
rename to src/Command/Game/Blocking/UpdateEloTask.php
index 0d3fb05e..649333ed 100644
--- a/src/Command/Game/Async/UpdateEloTask.php
+++ b/src/Command/Game/Blocking/UpdateEloTask.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace ChessServer\Command\Game\Async;
+namespace ChessServer\Command\Game\Blocking;
 
 use Chess\Elo\Game;
 use Chess\Elo\Player;
 use Chess\Variant\Classical\PGN\AN\Color;
 use Chess\Variant\Classical\PGN\AN\Termination;
-use ChessServer\Command\AbstractDbAsyncTask;
+use ChessServer\Command\AbstractDbBlockingTask;
 
-class UpdateEloTask extends AbstractDbAsyncTask
+class UpdateEloTask extends AbstractDbBlockingTask
 {
     protected function elo(string $result, int $i, int $j): array
     {
diff --git a/src/Command/Game/Cli.php b/src/Command/Game/Cli.php
index 5ff591ce..25a68605 100644
--- a/src/Command/Game/Cli.php
+++ b/src/Command/Game/Cli.php
@@ -3,28 +3,28 @@
 namespace ChessServer\Command\Game;
 
 use ChessServer\Command\AbstractCli;
-use ChessServer\Command\Game\Async\ExtractCommand;
-use ChessServer\Command\Game\Async\HeuristicCommand;
-use ChessServer\Command\Game\Async\LeaveCommand;
-use ChessServer\Command\Game\Async\PlayCommand;
-use ChessServer\Command\Game\Async\PlayLanCommand;
-use ChessServer\Command\Game\Async\PlayRavCommand;
-use ChessServer\Command\Game\Async\RecognizerCommand;
-use ChessServer\Command\Game\Async\ResignCommand;
-use ChessServer\Command\Game\Async\RestartCommand;
-use ChessServer\Command\Game\Async\StockfishCommand;
-use ChessServer\Command\Game\Async\TutorFenCommand;
-use ChessServer\Command\Game\Sync\AcceptPlayRequestCommand;
-use ChessServer\Command\Game\Sync\AsciiCommand;
-use ChessServer\Command\Game\Sync\DrawCommand;
-use ChessServer\Command\Game\Sync\EvalNamesCommand;
-use ChessServer\Command\Game\Sync\LegalCommand;
-use ChessServer\Command\Game\Sync\OnlineGamesCommand;
-use ChessServer\Command\Game\Sync\RandomizerCommand;
-use ChessServer\Command\Game\Sync\RematchCommand;
-use ChessServer\Command\Game\Sync\StartCommand;
-use ChessServer\Command\Game\Sync\TakebackCommand;
-use ChessServer\Command\Game\Sync\UndoCommand;
+use ChessServer\Command\Game\Blocking\ExtractCommand;
+use ChessServer\Command\Game\Blocking\HeuristicCommand;
+use ChessServer\Command\Game\Blocking\LeaveCommand;
+use ChessServer\Command\Game\Blocking\PlayCommand;
+use ChessServer\Command\Game\Blocking\PlayLanCommand;
+use ChessServer\Command\Game\Blocking\PlayRavCommand;
+use ChessServer\Command\Game\Blocking\RecognizerCommand;
+use ChessServer\Command\Game\Blocking\ResignCommand;
+use ChessServer\Command\Game\Blocking\RestartCommand;
+use ChessServer\Command\Game\Blocking\StockfishCommand;
+use ChessServer\Command\Game\Blocking\TutorFenCommand;
+use ChessServer\Command\Game\NonBlocking\AcceptPlayRequestCommand;
+use ChessServer\Command\Game\NonBlocking\AsciiCommand;
+use ChessServer\Command\Game\NonBlocking\DrawCommand;
+use ChessServer\Command\Game\NonBlocking\EvalNamesCommand;
+use ChessServer\Command\Game\NonBlocking\LegalCommand;
+use ChessServer\Command\Game\NonBlocking\OnlineGamesCommand;
+use ChessServer\Command\Game\NonBlocking\RandomizerCommand;
+use ChessServer\Command\Game\NonBlocking\RematchCommand;
+use ChessServer\Command\Game\NonBlocking\StartCommand;
+use ChessServer\Command\Game\NonBlocking\TakebackCommand;
+use ChessServer\Command\Game\NonBlocking\UndoCommand;
 use Spatie\Async\Pool;
 
 class Cli extends AbstractCli
diff --git a/src/Command/Game/Mode/AbstractMode.php b/src/Command/Game/Mode/AbstractMode.php
index 96927fe4..30ee3176 100644
--- a/src/Command/Game/Mode/AbstractMode.php
+++ b/src/Command/Game/Mode/AbstractMode.php
@@ -3,10 +3,10 @@
 namespace ChessServer\Command\Game\Mode;
 
 use ChessServer\Command\Game\Game;
-use ChessServer\Command\Game\Async\PlayCommand;
-use ChessServer\Command\Game\Async\PlayLanCommand;
-use ChessServer\Command\Game\Sync\LegalCommand;
-use ChessServer\Command\Game\Sync\UndoCommand;
+use ChessServer\Command\Game\NonBlocking\PlayCommand;
+use ChessServer\Command\Game\NonBlocking\PlayLanCommand;
+use ChessServer\Command\Game\NonBlocking\LegalCommand;
+use ChessServer\Command\Game\NonBlocking\UndoCommand;
 use Firebase\JWT\JWT;
 use Firebase\JWT\Key;
 
diff --git a/src/Command/Game/Sync/AcceptPlayRequestCommand.php b/src/Command/Game/NonBlocking/AcceptPlayRequestCommand.php
similarity index 93%
rename from src/Command/Game/Sync/AcceptPlayRequestCommand.php
rename to src/Command/Game/NonBlocking/AcceptPlayRequestCommand.php
index d616af93..475f6f35 100644
--- a/src/Command/Game/Sync/AcceptPlayRequestCommand.php
+++ b/src/Command/Game/NonBlocking/AcceptPlayRequestCommand.php
@@ -1,13 +1,14 @@
 <?php
 
-namespace ChessServer\Command\Game\Sync;
+namespace ChessServer\Command\Game\NonBlocking
+;
 
 use Chess\Variant\Classical\PGN\AN\Color;
-use ChessServer\Command\AbstractSyncCommand;
+use ChessServer\Command\AbstractNonBlockingCommand;
 use ChessServer\Command\Game\Mode\PlayMode;
 use ChessServer\Socket\AbstractSocket;
 
-class AcceptPlayRequestCommand extends AbstractSyncCommand
+class AcceptPlayRequestCommand extends AbstractNonBlockingCommand
 {
     public function __construct()
     {
diff --git a/src/Command/Game/Sync/AsciiCommand.php b/src/Command/Game/NonBlocking/AsciiCommand.php
similarity index 79%
rename from src/Command/Game/Sync/AsciiCommand.php
rename to src/Command/Game/NonBlocking/AsciiCommand.php
index fc68adf4..08b4a4ba 100644
--- a/src/Command/Game/Sync/AsciiCommand.php
+++ b/src/Command/Game/NonBlocking/AsciiCommand.php
@@ -1,11 +1,12 @@
 <?php
 
-namespace ChessServer\Command\Game\Sync;
+namespace ChessServer\Command\Game\NonBlocking
+;
 
-use ChessServer\Command\AbstractSyncCommand;
+use ChessServer\Command\AbstractNonBlockingCommand;
 use ChessServer\Socket\AbstractSocket;
 
-class AsciiCommand extends AbstractSyncCommand
+class AsciiCommand extends AbstractNonBlockingCommand
 {
     public function __construct()
     {
diff --git a/src/Command/Game/Sync/DrawCommand.php b/src/Command/Game/NonBlocking/DrawCommand.php
similarity index 89%
rename from src/Command/Game/Sync/DrawCommand.php
rename to src/Command/Game/NonBlocking/DrawCommand.php
index 1f80c826..a50ebc7a 100644
--- a/src/Command/Game/Sync/DrawCommand.php
+++ b/src/Command/Game/NonBlocking/DrawCommand.php
@@ -1,11 +1,12 @@
 <?php
 
-namespace ChessServer\Command\Game\Sync;
+namespace ChessServer\Command\Game\NonBlocking
+;
 
-use ChessServer\Command\AbstractSyncCommand;
+use ChessServer\Command\AbstractNonBlockingCommand;
 use ChessServer\Socket\AbstractSocket;
 
-class DrawCommand extends AbstractSyncCommand
+class DrawCommand extends AbstractNonBlockingCommand
 {
     const ACTION_ACCEPT    = 'accept';
     const ACTION_DECLINE   = 'decline';
diff --git a/src/Command/Game/Sync/EvalNamesCommand.php b/src/Command/Game/NonBlocking/EvalNamesCommand.php
similarity index 77%
rename from src/Command/Game/Sync/EvalNamesCommand.php
rename to src/Command/Game/NonBlocking/EvalNamesCommand.php
index 4c1d1f80..2b0f6957 100644
--- a/src/Command/Game/Sync/EvalNamesCommand.php
+++ b/src/Command/Game/NonBlocking/EvalNamesCommand.php
@@ -1,12 +1,13 @@
 <?php
 
-namespace ChessServer\Command\Game\Sync;
+namespace ChessServer\Command\Game\NonBlocking
+;
 
 use Chess\Function\FastFunction;
-use ChessServer\Command\AbstractSyncCommand;
+use ChessServer\Command\AbstractNonBlockingCommand;
 use ChessServer\Socket\AbstractSocket;
 
-class EvalNamesCommand extends AbstractSyncCommand
+class EvalNamesCommand extends AbstractNonBlockingCommand
 {
     public function __construct()
     {
diff --git a/src/Command/Game/Sync/LegalCommand.php b/src/Command/Game/NonBlocking/LegalCommand.php
similarity index 82%
rename from src/Command/Game/Sync/LegalCommand.php
rename to src/Command/Game/NonBlocking/LegalCommand.php
index a7696cc8..7c85e060 100644
--- a/src/Command/Game/Sync/LegalCommand.php
+++ b/src/Command/Game/NonBlocking/LegalCommand.php
@@ -1,11 +1,12 @@
 <?php
 
-namespace ChessServer\Command\Game\Sync;
+namespace ChessServer\Command\Game\NonBlocking
+;
 
-use ChessServer\Command\AbstractSyncCommand;
+use ChessServer\Command\AbstractNonBlockingCommand;
 use ChessServer\Socket\AbstractSocket;
 
-class LegalCommand extends AbstractSyncCommand
+class LegalCommand extends AbstractNonBlockingCommand
 {
     public function __construct()
     {
diff --git a/src/Command/Game/Sync/OnlineGamesCommand.php b/src/Command/Game/NonBlocking/OnlineGamesCommand.php
similarity index 80%
rename from src/Command/Game/Sync/OnlineGamesCommand.php
rename to src/Command/Game/NonBlocking/OnlineGamesCommand.php
index 6062fc1d..e6ed6c81 100644
--- a/src/Command/Game/Sync/OnlineGamesCommand.php
+++ b/src/Command/Game/NonBlocking/OnlineGamesCommand.php
@@ -1,12 +1,13 @@
 <?php
 
-namespace ChessServer\Command\Game\Sync;
+namespace ChessServer\Command\Game\NonBlocking
+;
 
-use ChessServer\Command\AbstractSyncCommand;
+use ChessServer\Command\AbstractNonBlockingCommand;
 use ChessServer\Command\Game\Mode\PlayMode;
 use ChessServer\Socket\AbstractSocket;
 
-class OnlineGamesCommand extends AbstractSyncCommand
+class OnlineGamesCommand extends AbstractNonBlockingCommand
 {
     public function __construct()
     {
diff --git a/src/Command/Game/Sync/RandomizerCommand.php b/src/Command/Game/NonBlocking/RandomizerCommand.php
similarity index 93%
rename from src/Command/Game/Sync/RandomizerCommand.php
rename to src/Command/Game/NonBlocking/RandomizerCommand.php
index c56aada7..c2e43375 100644
--- a/src/Command/Game/Sync/RandomizerCommand.php
+++ b/src/Command/Game/NonBlocking/RandomizerCommand.php
@@ -1,15 +1,16 @@
 <?php
 
-namespace ChessServer\Command\Game\Sync;
+namespace ChessServer\Command\Game\NonBlocking
+;
 
 use Chess\Randomizer\Randomizer;
 use Chess\Randomizer\Checkmate\TwoBishopsRandomizer;
 use Chess\Randomizer\Endgame\PawnEndgameRandomizer;
 use Chess\Variant\Classical\PGN\AN\Color;
-use ChessServer\Command\AbstractSyncCommand;
+use ChessServer\Command\AbstractNonBlockingCommand;
 use ChessServer\Socket\AbstractSocket;
 
-class RandomizerCommand extends AbstractSyncCommand
+class RandomizerCommand extends AbstractNonBlockingCommand
 {
     const TYPE_P    = 'P';
     const TYPE_Q    = 'Q';
diff --git a/src/Command/Game/Sync/RematchCommand.php b/src/Command/Game/NonBlocking/RematchCommand.php
similarity index 89%
rename from src/Command/Game/Sync/RematchCommand.php
rename to src/Command/Game/NonBlocking/RematchCommand.php
index 4a3f096d..cbb32a49 100644
--- a/src/Command/Game/Sync/RematchCommand.php
+++ b/src/Command/Game/NonBlocking/RematchCommand.php
@@ -1,11 +1,12 @@
 <?php
 
-namespace ChessServer\Command\Game\Sync;
+namespace ChessServer\Command\Game\NonBlocking
+;
 
-use ChessServer\Command\AbstractSyncCommand;
+use ChessServer\Command\AbstractNonBlockingCommand;
 use ChessServer\Socket\AbstractSocket;
 
-class RematchCommand extends AbstractSyncCommand
+class RematchCommand extends AbstractNonBlockingCommand
 {
     const ACTION_ACCEPT    = 'accept';
     const ACTION_DECLINE   = 'decline';
diff --git a/src/Command/Game/Sync/StartCommand.php b/src/Command/Game/NonBlocking/StartCommand.php
similarity index 98%
rename from src/Command/Game/Sync/StartCommand.php
rename to src/Command/Game/NonBlocking/StartCommand.php
index b72a38cd..fc287752 100644
--- a/src/Command/Game/Sync/StartCommand.php
+++ b/src/Command/Game/NonBlocking/StartCommand.php
@@ -1,6 +1,7 @@
 <?php
 
-namespace ChessServer\Command\Game\Sync;
+namespace ChessServer\Command\Game\NonBlocking
+;
 
 use Chess\FenToBoardFactory;
 use Chess\Play\SanPlay;
@@ -14,7 +15,7 @@
 use Chess\Variant\Dunsany\Board as DunsanyBoard;
 use Chess\Variant\Losing\Board as LosingBoard;
 use Chess\Variant\RacingKings\Board as RacingKingsBoard;
-use ChessServer\Command\AbstractSyncCommand;
+use ChessServer\Command\AbstractNonBlockingCommand;
 use ChessServer\Command\Game\Game;
 use ChessServer\Command\Game\Mode\AnalysisMode;
 use ChessServer\Command\Game\Mode\PlayMode;
@@ -22,7 +23,7 @@
 use ChessServer\Socket\AbstractSocket;
 use Firebase\JWT\JWT;
 
-class StartCommand extends AbstractSyncCommand
+class StartCommand extends AbstractNonBlockingCommand
 {
     public function __construct()
     {
diff --git a/src/Command/Game/Sync/TakebackCommand.php b/src/Command/Game/NonBlocking/TakebackCommand.php
similarity index 89%
rename from src/Command/Game/Sync/TakebackCommand.php
rename to src/Command/Game/NonBlocking/TakebackCommand.php
index 46af90e1..6a5f523f 100644
--- a/src/Command/Game/Sync/TakebackCommand.php
+++ b/src/Command/Game/NonBlocking/TakebackCommand.php
@@ -1,11 +1,12 @@
 <?php
 
-namespace ChessServer\Command\Game\Sync;
+namespace ChessServer\Command\Game\NonBlocking
+;
 
-use ChessServer\Command\AbstractSyncCommand;
+use ChessServer\Command\AbstractNonBlockingCommand;
 use ChessServer\Socket\AbstractSocket;
 
-class TakebackCommand extends AbstractSyncCommand
+class TakebackCommand extends AbstractNonBlockingCommand
 {
     const ACTION_ACCEPT    = 'accept';
     const ACTION_DECLINE   = 'decline';
diff --git a/src/Command/Game/Sync/UndoCommand.php b/src/Command/Game/NonBlocking/UndoCommand.php
similarity index 78%
rename from src/Command/Game/Sync/UndoCommand.php
rename to src/Command/Game/NonBlocking/UndoCommand.php
index 03ea8ea1..799e1d1b 100644
--- a/src/Command/Game/Sync/UndoCommand.php
+++ b/src/Command/Game/NonBlocking/UndoCommand.php
@@ -1,11 +1,12 @@
 <?php
 
-namespace ChessServer\Command\Game\Sync;
+namespace ChessServer\Command\Game\NonBlocking
+;
 
-use ChessServer\Command\AbstractSyncCommand;
+use ChessServer\Command\AbstractNonBlockingCommand;
 use ChessServer\Socket\AbstractSocket;
 
-class UndoCommand extends AbstractSyncCommand
+class UndoCommand extends AbstractNonBlockingCommand
 {
     public function __construct()
     {