diff --git a/src/data/bedrock/blockstate/BlockStateDeserializer.php b/src/data/bedrock/blockstate/convert/BlockStateDeserializer.php
similarity index 99%
rename from src/data/bedrock/blockstate/BlockStateDeserializer.php
rename to src/data/bedrock/blockstate/convert/BlockStateDeserializer.php
index 69972564f..48371902a 100644
--- a/src/data/bedrock/blockstate/BlockStateDeserializer.php
+++ b/src/data/bedrock/blockstate/convert/BlockStateDeserializer.php
@@ -21,7 +21,7 @@
 
 declare(strict_types=1);
 
-namespace pocketmine\data\bedrock\blockstate;
+namespace pocketmine\data\bedrock\blockstate\convert;
 
 use pocketmine\block\Bamboo;
 use pocketmine\block\Block;
@@ -32,9 +32,11 @@ use pocketmine\block\utils\CoralType;
 use pocketmine\block\utils\LeverFacing;
 use pocketmine\block\utils\SlabType;
 use pocketmine\block\VanillaBlocks as Blocks;
-use pocketmine\data\bedrock\blockstate\BlockStateDeserializerHelper as Helper;
+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\BlockStateReader as Reader;
+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\math\Axis;
diff --git a/src/data/bedrock/blockstate/BlockStateDeserializerHelper.php b/src/data/bedrock/blockstate/convert/BlockStateDeserializerHelper.php
similarity index 98%
rename from src/data/bedrock/blockstate/BlockStateDeserializerHelper.php
rename to src/data/bedrock/blockstate/convert/BlockStateDeserializerHelper.php
index 225df7c2b..0453bc396 100644
--- a/src/data/bedrock/blockstate/BlockStateDeserializerHelper.php
+++ b/src/data/bedrock/blockstate/convert/BlockStateDeserializerHelper.php
@@ -21,7 +21,7 @@
 
 declare(strict_types=1);
 
-namespace pocketmine\data\bedrock\blockstate;
+namespace pocketmine\data\bedrock\blockstate\convert;
 
 use pocketmine\block\Block;
 use pocketmine\block\BlockLegacyMetadata;
@@ -47,7 +47,10 @@ 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\MushroomBlockTypeIdMap;
 use pocketmine\math\Axis;
 use pocketmine\math\Facing;
diff --git a/src/data/bedrock/blockstate/BlockStateReader.php b/src/data/bedrock/blockstate/convert/BlockStateReader.php
similarity index 97%
rename from src/data/bedrock/blockstate/BlockStateReader.php
rename to src/data/bedrock/blockstate/convert/BlockStateReader.php
index 992a34b82..10b676565 100644
--- a/src/data/bedrock/blockstate/BlockStateReader.php
+++ b/src/data/bedrock/blockstate/convert/BlockStateReader.php
@@ -21,13 +21,16 @@
 
 declare(strict_types=1);
 
-namespace pocketmine\data\bedrock\blockstate;
+namespace pocketmine\data\bedrock\blockstate\convert;
 
 use pocketmine\block\utils\BellAttachmentType;
 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\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/BlockStateSerializer.php b/src/data/bedrock/blockstate/convert/BlockStateSerializer.php
similarity index 99%
rename from src/data/bedrock/blockstate/BlockStateSerializer.php
rename to src/data/bedrock/blockstate/convert/BlockStateSerializer.php
index 2f2037bc9..c1048803f 100644
--- a/src/data/bedrock/blockstate/BlockStateSerializer.php
+++ b/src/data/bedrock/blockstate/convert/BlockStateSerializer.php
@@ -21,7 +21,7 @@
 
 declare(strict_types=1);
 
-namespace pocketmine\data\bedrock\blockstate;
+namespace pocketmine\data\bedrock\blockstate\convert;
 
 use pocketmine\block\ActivatorRail;
 use pocketmine\block\Anvil;
@@ -137,10 +137,12 @@ use pocketmine\block\WoodenPressurePlate;
 use pocketmine\block\WoodenStairs;
 use pocketmine\block\WoodenTrapdoor;
 use pocketmine\block\Wool;
+use pocketmine\data\bedrock\blockstate\BlockStateData;
 use pocketmine\data\bedrock\blockstate\BlockStateNames as StateNames;
-use pocketmine\data\bedrock\blockstate\BlockStateSerializerHelper as Helper;
+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\BlockStateWriter as Writer;
+use pocketmine\data\bedrock\blockstate\convert\BlockStateWriter as Writer;
 use pocketmine\data\bedrock\blockstate\BlockTypeNames as Ids;
 use pocketmine\math\Axis;
 use pocketmine\math\Facing;
@@ -873,15 +875,15 @@ final class BlockStateSerializer{
 				->writeInt(StateNames::RAIL_DIRECTION, $block->getShape());
 		});
 		$this->map(Blocks::REDSTONE(), fn() => new Writer(Ids::REDSTONE_BLOCK));
-		$this->map(Blocks::REDSTONE_COMPARATOR(), function(RedstoneComparator $block) : BlockStateWriter{
-			return BlockStateWriter::create($block->isPowered() ? Ids::POWERED_COMPARATOR : Ids::UNPOWERED_COMPARATOR)
+		$this->map(Blocks::REDSTONE_COMPARATOR(), function(RedstoneComparator $block) : Writer{
+			return Writer::create($block->isPowered() ? Ids::POWERED_COMPARATOR : Ids::UNPOWERED_COMPARATOR)
 				->writeBool(StateNames::OUTPUT_LIT_BIT, $block->isPowered())
 				->writeBool(StateNames::OUTPUT_SUBTRACT_BIT, $block->isSubtractMode())
 				->writeLegacyHorizontalFacing($block->getFacing());
 		});
 		$this->map(Blocks::REDSTONE_LAMP(), fn(RedstoneLamp $block) => new Writer($block->isPowered() ? Ids::LIT_REDSTONE_LAMP : Ids::REDSTONE_LAMP));
 		$this->map(Blocks::REDSTONE_ORE(), fn(RedstoneOre $block) => new Writer($block->isLit() ? Ids::LIT_REDSTONE_ORE : Ids::REDSTONE_ORE));
-		$this->map(Blocks::REDSTONE_REPEATER(), function(RedstoneRepeater $block) : BlockStateWriter{
+		$this->map(Blocks::REDSTONE_REPEATER(), function(RedstoneRepeater $block) : Writer{
 			return Writer::create($block->isPowered() ? Ids::POWERED_REPEATER : Ids::UNPOWERED_REPEATER)
 				->writeLegacyHorizontalFacing($block->getFacing())
 				->writeInt(StateNames::REPEATER_DELAY, $block->getDelay() - 1);
diff --git a/src/data/bedrock/blockstate/BlockStateSerializerHelper.php b/src/data/bedrock/blockstate/convert/BlockStateSerializerHelper.php
similarity index 98%
rename from src/data/bedrock/blockstate/BlockStateSerializerHelper.php
rename to src/data/bedrock/blockstate/convert/BlockStateSerializerHelper.php
index 81d6bedbb..27bd2b3f6 100644
--- a/src/data/bedrock/blockstate/BlockStateSerializerHelper.php
+++ b/src/data/bedrock/blockstate/convert/BlockStateSerializerHelper.php
@@ -21,7 +21,7 @@
 
 declare(strict_types=1);
 
-namespace pocketmine\data\bedrock\blockstate;
+namespace pocketmine\data\bedrock\blockstate\convert;
 
 use pocketmine\block\Button;
 use pocketmine\block\ChemistryTable;
@@ -47,6 +47,9 @@ use pocketmine\block\utils\SlabType;
 use pocketmine\block\Wall;
 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/BlockStateWriter.php b/src/data/bedrock/blockstate/convert/BlockStateWriter.php
similarity index 97%
rename from src/data/bedrock/blockstate/BlockStateWriter.php
rename to src/data/bedrock/blockstate/convert/BlockStateWriter.php
index a3db88c33..c94919413 100644
--- a/src/data/bedrock/blockstate/BlockStateWriter.php
+++ b/src/data/bedrock/blockstate/convert/BlockStateWriter.php
@@ -21,14 +21,17 @@
 
 declare(strict_types=1);
 
-namespace pocketmine\data\bedrock\blockstate;
+namespace pocketmine\data\bedrock\blockstate\convert;
 
 use pocketmine\block\utils\BellAttachmentType;
 use pocketmine\block\utils\CoralType;
 use pocketmine\block\utils\DyeColor;
 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\math\Axis;
 use pocketmine\math\Facing;
 use pocketmine\nbt\tag\CompoundTag;