diff --git a/src/data/bedrock/LegacyBlockIdToStringIdMap.php b/src/data/bedrock/block/upgrade/LegacyBlockIdToStringIdMap.php
similarity index 90%
rename from src/data/bedrock/LegacyBlockIdToStringIdMap.php
rename to src/data/bedrock/block/upgrade/LegacyBlockIdToStringIdMap.php
index 1c7bba7c5..0ced6361f 100644
--- a/src/data/bedrock/LegacyBlockIdToStringIdMap.php
+++ b/src/data/bedrock/block/upgrade/LegacyBlockIdToStringIdMap.php
@@ -21,8 +21,9 @@
 
 declare(strict_types=1);
 
-namespace pocketmine\data\bedrock;
+namespace pocketmine\data\bedrock\block\upgrade;
 
+use pocketmine\data\bedrock\LegacyToStringBidirectionalIdMap;
 use pocketmine\utils\SingletonTrait;
 use Webmozart\PathUtil\Path;
 
diff --git a/src/data/bedrock/block/upgrade/LegacyBlockStateMapper.php b/src/data/bedrock/block/upgrade/LegacyBlockStateMapper.php
index f13bd1426..28b77c563 100644
--- a/src/data/bedrock/block/upgrade/LegacyBlockStateMapper.php
+++ b/src/data/bedrock/block/upgrade/LegacyBlockStateMapper.php
@@ -24,7 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\data\bedrock\block\upgrade;
 
 use pocketmine\data\bedrock\block\BlockStateData;
-use pocketmine\data\bedrock\LegacyBlockIdToStringIdMap;
+use pocketmine\data\bedrock\block\upgrade\LegacyBlockIdToStringIdMap;
 use pocketmine\network\mcpe\protocol\serializer\NetworkNbtSerializer;
 use pocketmine\utils\BinaryStream;
 
diff --git a/src/data/bedrock/BlockItemIdMap.php b/src/data/bedrock/item/BlockItemIdMap.php
similarity index 98%
rename from src/data/bedrock/BlockItemIdMap.php
rename to src/data/bedrock/item/BlockItemIdMap.php
index 4109ec43d..5d1376aef 100644
--- a/src/data/bedrock/BlockItemIdMap.php
+++ b/src/data/bedrock/item/BlockItemIdMap.php
@@ -21,7 +21,7 @@
 
 declare(strict_types=1);
 
-namespace pocketmine\data\bedrock;
+namespace pocketmine\data\bedrock\item;
 
 use pocketmine\utils\AssumptionFailedError;
 use pocketmine\utils\SingletonTrait;
diff --git a/src/data/bedrock/item/ItemSerializer.php b/src/data/bedrock/item/ItemSerializer.php
index e90b8849e..d5b87e110 100644
--- a/src/data/bedrock/item/ItemSerializer.php
+++ b/src/data/bedrock/item/ItemSerializer.php
@@ -27,7 +27,7 @@ use pocketmine\block\Block;
 use pocketmine\block\utils\DyeColor;
 use pocketmine\block\utils\SkullType;
 use pocketmine\block\VanillaBlocks as Blocks;
-use pocketmine\data\bedrock\BlockItemIdMap;
+use pocketmine\data\bedrock\item\BlockItemIdMap;
 use pocketmine\data\bedrock\block\BlockStateSerializeException;
 use pocketmine\data\bedrock\CompoundTypeIds;
 use pocketmine\data\bedrock\DyeColorIdMap;
diff --git a/src/world/format/io/GlobalBlockStateHandlers.php b/src/world/format/io/GlobalBlockStateHandlers.php
index c1bd76d56..3f49336fd 100644
--- a/src/world/format/io/GlobalBlockStateHandlers.php
+++ b/src/world/format/io/GlobalBlockStateHandlers.php
@@ -35,7 +35,7 @@ use pocketmine\data\bedrock\block\upgrade\BlockStateUpgrader;
 use pocketmine\data\bedrock\block\upgrade\BlockStateUpgradeSchemaUtils;
 use pocketmine\data\bedrock\block\upgrade\LegacyBlockStateMapper;
 use pocketmine\data\bedrock\block\UpgradingBlockStateDeserializer;
-use pocketmine\data\bedrock\LegacyBlockIdToStringIdMap;
+use pocketmine\data\bedrock\block\upgrade\LegacyBlockIdToStringIdMap;
 use pocketmine\errorhandler\ErrorToExceptionHandler;
 use pocketmine\nbt\tag\CompoundTag;
 use Webmozart\PathUtil\Path;