diff --git a/src/block/BlockFactory.php b/src/block/BlockFactory.php
index 41396b5f1..871008c7d 100644
--- a/src/block/BlockFactory.php
+++ b/src/block/BlockFactory.php
@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\block\BlockBreakInfo as BreakInfo;
 use pocketmine\block\BlockIdentifier as BID;
-use pocketmine\block\BlockLegacyMetadata as Meta;
 use pocketmine\block\BlockToolType as ToolType;
 use pocketmine\block\BlockTypeIds as Ids;
 use pocketmine\block\tile\Banner as TileBanner;
@@ -54,6 +53,7 @@ use pocketmine\block\tile\Smoker as TileSmoker;
 use pocketmine\block\utils\DyeColor;
 use pocketmine\block\utils\InvalidBlockStateException;
 use pocketmine\block\utils\TreeType;
+use pocketmine\data\bedrock\block\BlockLegacyMetadata as Meta;
 use pocketmine\item\Item;
 use pocketmine\item\ItemIds;
 use pocketmine\item\ToolTier;
diff --git a/src/block/BlockLegacyIdHelper.php b/src/block/BlockLegacyIdHelper.php
index 5b83825b1..de98d2316 100644
--- a/src/block/BlockLegacyIdHelper.php
+++ b/src/block/BlockLegacyIdHelper.php
@@ -28,6 +28,7 @@ use pocketmine\block\BlockTypeIds as Ids;
 use pocketmine\block\tile\Sign as TileSign;
 use pocketmine\block\utils\DyeColor;
 use pocketmine\block\utils\TreeType;
+use pocketmine\data\bedrock\block\BlockLegacyMetadata;
 use pocketmine\item\ItemIds;
 use pocketmine\utils\AssumptionFailedError;
 
diff --git a/src/block/CoralBlock.php b/src/block/CoralBlock.php
index 2075af358..336b171a9 100644
--- a/src/block/CoralBlock.php
+++ b/src/block/CoralBlock.php
@@ -25,6 +25,7 @@ namespace pocketmine\block;
 
 use pocketmine\block\utils\CoralType;
 use pocketmine\block\utils\CoralTypeTrait;
+use pocketmine\data\bedrock\block\BlockLegacyMetadata;
 use pocketmine\data\bedrock\CoralTypeIdMap;
 use pocketmine\item\Item;
 use function mt_rand;
diff --git a/src/block/Dirt.php b/src/block/Dirt.php
index f77baafc2..1a0fcaaeb 100644
--- a/src/block/Dirt.php
+++ b/src/block/Dirt.php
@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
+use pocketmine\data\bedrock\block\BlockLegacyMetadata;
 use pocketmine\data\runtime\block\BlockDataReader;
 use pocketmine\data\runtime\block\BlockDataWriter;
 use pocketmine\item\Hoe;
diff --git a/src/block/Rail.php b/src/block/Rail.php
index 74f388647..a98b51416 100644
--- a/src/block/Rail.php
+++ b/src/block/Rail.php
@@ -25,6 +25,7 @@ namespace pocketmine\block;
 
 use pocketmine\block\utils\InvalidBlockStateException;
 use pocketmine\block\utils\RailConnectionInfo;
+use pocketmine\data\bedrock\block\BlockLegacyMetadata;
 use pocketmine\data\runtime\block\BlockDataReader;
 use pocketmine\data\runtime\block\BlockDataWriter;
 use pocketmine\math\Facing;
diff --git a/src/block/Sponge.php b/src/block/Sponge.php
index c9624cde3..dc5f21d0a 100644
--- a/src/block/Sponge.php
+++ b/src/block/Sponge.php
@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
+use pocketmine\data\bedrock\block\BlockLegacyMetadata;
 use pocketmine\data\runtime\block\BlockDataReader;
 use pocketmine\data\runtime\block\BlockDataWriter;
 
diff --git a/src/block/StraightOnlyRail.php b/src/block/StraightOnlyRail.php
index 93af1c4cc..0d125baa7 100644
--- a/src/block/StraightOnlyRail.php
+++ b/src/block/StraightOnlyRail.php
@@ -25,6 +25,7 @@ namespace pocketmine\block;
 
 use pocketmine\block\utils\InvalidBlockStateException;
 use pocketmine\block\utils\RailConnectionInfo;
+use pocketmine\data\bedrock\block\BlockLegacyMetadata;
 use pocketmine\data\runtime\block\BlockDataReader;
 use pocketmine\data\runtime\block\BlockDataWriter;
 use function array_keys;
diff --git a/src/block/TNT.php b/src/block/TNT.php
index b5f663a72..50803bbc9 100644
--- a/src/block/TNT.php
+++ b/src/block/TNT.php
@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
+use pocketmine\data\bedrock\block\BlockLegacyMetadata;
 use pocketmine\data\runtime\block\BlockDataReader;
 use pocketmine\data\runtime\block\BlockDataWriter;
 use pocketmine\entity\Entity;
diff --git a/src/block/utils/RailConnectionInfo.php b/src/block/utils/RailConnectionInfo.php
index c12c53b31..f343bb726 100644
--- a/src/block/utils/RailConnectionInfo.php
+++ b/src/block/utils/RailConnectionInfo.php
@@ -23,7 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\block\utils;
 
-use pocketmine\block\BlockLegacyMetadata;
+use pocketmine\data\bedrock\block\BlockLegacyMetadata;
 use pocketmine\math\Facing;
 
 final class RailConnectionInfo{
diff --git a/src/data/bedrock/CoralTypeIdMap.php b/src/data/bedrock/CoralTypeIdMap.php
index 134c0053b..fd1651206 100644
--- a/src/data/bedrock/CoralTypeIdMap.php
+++ b/src/data/bedrock/CoralTypeIdMap.php
@@ -23,8 +23,8 @@ declare(strict_types=1);
 
 namespace pocketmine\data\bedrock;
 
-use pocketmine\block\BlockLegacyMetadata;
 use pocketmine\block\utils\CoralType;
+use pocketmine\data\bedrock\block\BlockLegacyMetadata;
 use pocketmine\utils\SingletonTrait;
 use function array_key_exists;
 
diff --git a/src/data/bedrock/MushroomBlockTypeIdMap.php b/src/data/bedrock/MushroomBlockTypeIdMap.php
index 1e288cb84..2eec17549 100644
--- a/src/data/bedrock/MushroomBlockTypeIdMap.php
+++ b/src/data/bedrock/MushroomBlockTypeIdMap.php
@@ -23,8 +23,8 @@ declare(strict_types=1);
 
 namespace pocketmine\data\bedrock;
 
-use pocketmine\block\BlockLegacyMetadata as LegacyMeta;
 use pocketmine\block\utils\MushroomBlockType;
+use pocketmine\data\bedrock\block\BlockLegacyMetadata as LegacyMeta;
 use pocketmine\utils\SingletonTrait;
 use function array_key_exists;
 
diff --git a/src/block/BlockLegacyMetadata.php b/src/data/bedrock/block/BlockLegacyMetadata.php
similarity index 99%
rename from src/block/BlockLegacyMetadata.php
rename to src/data/bedrock/block/BlockLegacyMetadata.php
index aa46934e1..a465f1274 100644
--- a/src/block/BlockLegacyMetadata.php
+++ b/src/data/bedrock/block/BlockLegacyMetadata.php
@@ -21,7 +21,7 @@
 
 declare(strict_types=1);
 
-namespace pocketmine\block;
+namespace pocketmine\data\bedrock\block;
 
 /**
  * Constants for legacy metadata for various blocks.
diff --git a/src/data/bedrock/block/convert/BlockObjectToBlockStateSerializer.php b/src/data/bedrock/block/convert/BlockObjectToBlockStateSerializer.php
index ec3f51236..1ed913d2e 100644
--- a/src/data/bedrock/block/convert/BlockObjectToBlockStateSerializer.php
+++ b/src/data/bedrock/block/convert/BlockObjectToBlockStateSerializer.php
@@ -33,7 +33,6 @@ use pocketmine\block\Beetroot;
 use pocketmine\block\Bell;
 use pocketmine\block\Block;
 use pocketmine\block\BlockFactory;
-use pocketmine\block\BlockLegacyMetadata;
 use pocketmine\block\BoneBlock;
 use pocketmine\block\BrewingStand;
 use pocketmine\block\BrownMushroomBlock;
@@ -139,6 +138,7 @@ use pocketmine\block\WoodenPressurePlate;
 use pocketmine\block\WoodenStairs;
 use pocketmine\block\WoodenTrapdoor;
 use pocketmine\block\Wool;
+use pocketmine\data\bedrock\block\BlockLegacyMetadata;
 use pocketmine\data\bedrock\block\BlockStateData;
 use pocketmine\data\bedrock\block\BlockStateNames as StateNames;
 use pocketmine\data\bedrock\block\BlockStateSerializeException;
diff --git a/src/data/bedrock/block/convert/BlockStateDeserializerHelper.php b/src/data/bedrock/block/convert/BlockStateDeserializerHelper.php
index a1c2719fc..cad6bfad8 100644
--- a/src/data/bedrock/block/convert/BlockStateDeserializerHelper.php
+++ b/src/data/bedrock/block/convert/BlockStateDeserializerHelper.php
@@ -24,7 +24,6 @@ declare(strict_types=1);
 namespace pocketmine\data\bedrock\block\convert;
 
 use pocketmine\block\Block;
-use pocketmine\block\BlockLegacyMetadata;
 use pocketmine\block\Button;
 use pocketmine\block\Crops;
 use pocketmine\block\DaylightSensor;
@@ -47,6 +46,7 @@ use pocketmine\block\Wall;
 use pocketmine\block\WallCoralFan;
 use pocketmine\block\WallSign;
 use pocketmine\block\WeightedPressurePlate;
+use pocketmine\data\bedrock\block\BlockLegacyMetadata;
 use pocketmine\data\bedrock\block\BlockStateDeserializeException;
 use pocketmine\data\bedrock\block\BlockStateNames;
 use pocketmine\data\bedrock\block\BlockStateStringValues as StringValues;
diff --git a/src/data/bedrock/block/convert/BlockStateToBlockObjectDeserializer.php b/src/data/bedrock/block/convert/BlockStateToBlockObjectDeserializer.php
index ad0801c11..8002cd31e 100644
--- a/src/data/bedrock/block/convert/BlockStateToBlockObjectDeserializer.php
+++ b/src/data/bedrock/block/convert/BlockStateToBlockObjectDeserializer.php
@@ -25,13 +25,13 @@ namespace pocketmine\data\bedrock\block\convert;
 
 use pocketmine\block\Bamboo;
 use pocketmine\block\Block;
-use pocketmine\block\BlockLegacyMetadata;
 use pocketmine\block\SweetBerryBush;
 use pocketmine\block\utils\BrewingStandSlot;
 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\block\BlockLegacyMetadata;
 use pocketmine\data\bedrock\block\BlockStateData;
 use pocketmine\data\bedrock\block\BlockStateDeserializeException;
 use pocketmine\data\bedrock\block\BlockStateDeserializer;