diff --git a/src/data/bedrock/blockstate/convert/BlockStateDeserializer.php b/src/data/bedrock/blockstate/convert/BlockStateDeserializer.php
index 48371902a..3fb4c476b 100644
--- a/src/data/bedrock/blockstate/convert/BlockStateDeserializer.php
+++ b/src/data/bedrock/blockstate/convert/BlockStateDeserializer.php
@@ -34,11 +34,11 @@ use pocketmine\block\utils\SlabType;
 use pocketmine\block\VanillaBlocks as Blocks;
 use pocketmine\data\bedrock\blockstate\BlockStateData;
 use pocketmine\data\bedrock\blockstate\BlockStateDeserializeException;
-use pocketmine\data\bedrock\blockstate\convert\BlockStateDeserializerHelper as Helper;
 use pocketmine\data\bedrock\blockstate\BlockStateNames as StateNames;
-use pocketmine\data\bedrock\blockstate\convert\BlockStateReader as Reader;
 use pocketmine\data\bedrock\blockstate\BlockStateStringValues as StringValues;
 use pocketmine\data\bedrock\blockstate\BlockTypeNames as Ids;
+use pocketmine\data\bedrock\blockstate\convert\BlockStateDeserializerHelper as Helper;
+use pocketmine\data\bedrock\blockstate\convert\BlockStateReader as Reader;
 use pocketmine\math\Axis;
 use pocketmine\math\Facing;
 use function array_key_exists;
diff --git a/src/data/bedrock/blockstate/convert/BlockStateDeserializerHelper.php b/src/data/bedrock/blockstate/convert/BlockStateDeserializerHelper.php
index 0453bc396..52760d47c 100644
--- a/src/data/bedrock/blockstate/convert/BlockStateDeserializerHelper.php
+++ b/src/data/bedrock/blockstate/convert/BlockStateDeserializerHelper.php
@@ -47,10 +47,9 @@ use pocketmine\block\Wall;
 use pocketmine\block\WallCoralFan;
 use pocketmine\block\WallSign;
 use pocketmine\block\WeightedPressurePlate;
-use pocketmine\data\bedrock\blockstate\BlockStateNames;
-use pocketmine\data\bedrock\blockstate\convert\BlockStateReader;
-use pocketmine\data\bedrock\blockstate\BlockStateStringValues as StringValues;
 use pocketmine\data\bedrock\blockstate\BlockStateDeserializeException;
+use pocketmine\data\bedrock\blockstate\BlockStateNames;
+use pocketmine\data\bedrock\blockstate\BlockStateStringValues as StringValues;
 use pocketmine\data\bedrock\MushroomBlockTypeIdMap;
 use pocketmine\math\Axis;
 use pocketmine\math\Facing;
diff --git a/src/data/bedrock/blockstate/convert/BlockStateReader.php b/src/data/bedrock/blockstate/convert/BlockStateReader.php
index 10b676565..5ced88381 100644
--- a/src/data/bedrock/blockstate/convert/BlockStateReader.php
+++ b/src/data/bedrock/blockstate/convert/BlockStateReader.php
@@ -28,9 +28,9 @@ use pocketmine\block\utils\CoralType;
 use pocketmine\block\utils\DyeColor;
 use pocketmine\block\utils\SlabType;
 use pocketmine\data\bedrock\blockstate\BlockStateData;
+use pocketmine\data\bedrock\blockstate\BlockStateDeserializeException;
 use pocketmine\data\bedrock\blockstate\BlockStateNames;
 use pocketmine\data\bedrock\blockstate\BlockStateStringValues as StringValues;
-use pocketmine\data\bedrock\blockstate\BlockStateDeserializeException;
 use pocketmine\math\Axis;
 use pocketmine\math\Facing;
 use pocketmine\nbt\tag\ByteTag;
diff --git a/src/data/bedrock/blockstate/convert/BlockStateSerializer.php b/src/data/bedrock/blockstate/convert/BlockStateSerializer.php
index c1048803f..31c2b232a 100644
--- a/src/data/bedrock/blockstate/convert/BlockStateSerializer.php
+++ b/src/data/bedrock/blockstate/convert/BlockStateSerializer.php
@@ -140,10 +140,10 @@ use pocketmine\block\Wool;
 use pocketmine\data\bedrock\blockstate\BlockStateData;
 use pocketmine\data\bedrock\blockstate\BlockStateNames as StateNames;
 use pocketmine\data\bedrock\blockstate\BlockStateSerializeException;
-use pocketmine\data\bedrock\blockstate\convert\BlockStateSerializerHelper as Helper;
 use pocketmine\data\bedrock\blockstate\BlockStateStringValues as StringValues;
-use pocketmine\data\bedrock\blockstate\convert\BlockStateWriter as Writer;
 use pocketmine\data\bedrock\blockstate\BlockTypeNames as Ids;
+use pocketmine\data\bedrock\blockstate\convert\BlockStateSerializerHelper as Helper;
+use pocketmine\data\bedrock\blockstate\convert\BlockStateWriter as Writer;
 use pocketmine\math\Axis;
 use pocketmine\math\Facing;
 use pocketmine\utils\AssumptionFailedError;
diff --git a/src/data/bedrock/blockstate/convert/BlockStateSerializerHelper.php b/src/data/bedrock/blockstate/convert/BlockStateSerializerHelper.php
index 27bd2b3f6..91e4cba86 100644
--- a/src/data/bedrock/blockstate/convert/BlockStateSerializerHelper.php
+++ b/src/data/bedrock/blockstate/convert/BlockStateSerializerHelper.php
@@ -49,7 +49,6 @@ use pocketmine\block\WallSign;
 use pocketmine\block\Wood;
 use pocketmine\data\bedrock\blockstate\BlockStateNames;
 use pocketmine\data\bedrock\blockstate\BlockStateStringValues;
-use pocketmine\data\bedrock\blockstate\convert\BlockStateWriter;
 use pocketmine\data\bedrock\blockstate\BlockTypeNames as Ids;
 use pocketmine\data\bedrock\MushroomBlockTypeIdMap;
 use pocketmine\math\Axis;
diff --git a/src/data/bedrock/blockstate/convert/BlockStateWriter.php b/src/data/bedrock/blockstate/convert/BlockStateWriter.php
index c94919413..d05c5f6c4 100644
--- a/src/data/bedrock/blockstate/convert/BlockStateWriter.php
+++ b/src/data/bedrock/blockstate/convert/BlockStateWriter.php
@@ -30,8 +30,8 @@ use pocketmine\block\utils\SlabType;
 use pocketmine\block\utils\TreeType;
 use pocketmine\data\bedrock\blockstate\BlockStateData;
 use pocketmine\data\bedrock\blockstate\BlockStateNames;
-use pocketmine\data\bedrock\blockstate\BlockStateStringValues as StringValues;
 use pocketmine\data\bedrock\blockstate\BlockStateSerializeException;
+use pocketmine\data\bedrock\blockstate\BlockStateStringValues as StringValues;
 use pocketmine\math\Axis;
 use pocketmine\math\Facing;
 use pocketmine\nbt\tag\CompoundTag;
diff --git a/src/network/mcpe/convert/RuntimeBlockMapping.php b/src/network/mcpe/convert/RuntimeBlockMapping.php
index 41a2cd5b7..49a74e480 100644
--- a/src/network/mcpe/convert/RuntimeBlockMapping.php
+++ b/src/network/mcpe/convert/RuntimeBlockMapping.php
@@ -27,8 +27,8 @@ use pocketmine\block\BlockFactory;
 use pocketmine\block\UnknownBlock;
 use pocketmine\data\bedrock\blockstate\BlockStateData;
 use pocketmine\data\bedrock\blockstate\BlockStateSerializeException;
-use pocketmine\data\bedrock\blockstate\BlockStateSerializer;
 use pocketmine\data\bedrock\blockstate\BlockTypeNames;
+use pocketmine\data\bedrock\blockstate\convert\BlockStateSerializer;
 use pocketmine\nbt\tag\CompoundTag;
 use pocketmine\utils\AssumptionFailedError;
 use pocketmine\utils\SingletonTrait;