diff --git a/src/entity/Human.php b/src/entity/Human.php
index c85e9ee57..c357bf1d8 100644
--- a/src/entity/Human.php
+++ b/src/entity/Human.php
@@ -41,6 +41,7 @@ use pocketmine\nbt\tag\CompoundTag;
 use pocketmine\nbt\tag\IntTag;
 use pocketmine\nbt\tag\ListTag;
 use pocketmine\nbt\tag\StringTag;
+use pocketmine\network\mcpe\convert\SkinAdapterSingleton;
 use pocketmine\network\mcpe\convert\TypeConverter;
 use pocketmine\network\mcpe\protocol\ActorEventPacket;
 use pocketmine\network\mcpe\protocol\AddPlayerPacket;
@@ -50,7 +51,6 @@ use pocketmine\network\mcpe\protocol\PlayerSkinPacket;
 use pocketmine\network\mcpe\protocol\types\entity\EntityMetadataProperties;
 use pocketmine\network\mcpe\protocol\types\entity\StringMetadataProperty;
 use pocketmine\network\mcpe\protocol\types\PlayerListEntry;
-use pocketmine\network\mcpe\protocol\types\SkinAdapterSingleton;
 use pocketmine\player\Player;
 use pocketmine\utils\Limits;
 use pocketmine\utils\UUID;
diff --git a/src/network/mcpe/NetworkSession.php b/src/network/mcpe/NetworkSession.php
index 4b81e1c3a..85863b12f 100644
--- a/src/network/mcpe/NetworkSession.php
+++ b/src/network/mcpe/NetworkSession.php
@@ -37,6 +37,7 @@ use pocketmine\network\BadPacketException;
 use pocketmine\network\mcpe\compression\CompressBatchPromise;
 use pocketmine\network\mcpe\compression\DecompressionException;
 use pocketmine\network\mcpe\compression\Zlib;
+use pocketmine\network\mcpe\convert\SkinAdapterSingleton;
 use pocketmine\network\mcpe\convert\TypeConverter;
 use pocketmine\network\mcpe\encryption\DecryptionException;
 use pocketmine\network\mcpe\encryption\NetworkCipher;
@@ -78,7 +79,6 @@ use pocketmine\network\mcpe\protocol\types\entity\Attribute as NetworkAttribute;
 use pocketmine\network\mcpe\protocol\types\inventory\ContainerIds;
 use pocketmine\network\mcpe\protocol\types\PlayerListEntry;
 use pocketmine\network\mcpe\protocol\types\PlayerPermissions;
-use pocketmine\network\mcpe\protocol\types\SkinAdapterSingleton;
 use pocketmine\network\mcpe\protocol\UpdateAttributesPacket;
 use pocketmine\network\NetworkSessionManager;
 use pocketmine\player\GameMode;
diff --git a/src/network/mcpe/protocol/types/LegacySkinAdapter.php b/src/network/mcpe/convert/LegacySkinAdapter.php
similarity index 93%
rename from src/network/mcpe/protocol/types/LegacySkinAdapter.php
rename to src/network/mcpe/convert/LegacySkinAdapter.php
index 3b81144cd..74f74a0ee 100644
--- a/src/network/mcpe/protocol/types/LegacySkinAdapter.php
+++ b/src/network/mcpe/convert/LegacySkinAdapter.php
@@ -21,10 +21,12 @@
 
 declare(strict_types=1);
 
-namespace pocketmine\network\mcpe\protocol\types;
+namespace pocketmine\network\mcpe\convert;
 
 use pocketmine\entity\Skin;
 
+use pocketmine\network\mcpe\protocol\types\SkinData;
+use pocketmine\network\mcpe\protocol\types\SkinImage;
 use function is_string;
 use function json_decode;
 use function json_encode;
diff --git a/src/network/mcpe/protocol/types/SkinAdapter.php b/src/network/mcpe/convert/SkinAdapter.php
similarity index 92%
rename from src/network/mcpe/protocol/types/SkinAdapter.php
rename to src/network/mcpe/convert/SkinAdapter.php
index 357d7c2ab..54ae833ea 100644
--- a/src/network/mcpe/protocol/types/SkinAdapter.php
+++ b/src/network/mcpe/convert/SkinAdapter.php
@@ -21,9 +21,10 @@
 
 declare(strict_types=1);
 
-namespace pocketmine\network\mcpe\protocol\types;
+namespace pocketmine\network\mcpe\convert;
 
 use pocketmine\entity\Skin;
+use pocketmine\network\mcpe\protocol\types\SkinData;
 
 /**
  * Used to convert new skin data to the skin entity or old skin entity to skin data.
diff --git a/src/network/mcpe/protocol/types/SkinAdapterSingleton.php b/src/network/mcpe/convert/SkinAdapterSingleton.php
similarity index 95%
rename from src/network/mcpe/protocol/types/SkinAdapterSingleton.php
rename to src/network/mcpe/convert/SkinAdapterSingleton.php
index b92cdf0df..c49d3a780 100644
--- a/src/network/mcpe/protocol/types/SkinAdapterSingleton.php
+++ b/src/network/mcpe/convert/SkinAdapterSingleton.php
@@ -21,7 +21,7 @@
 
 declare(strict_types=1);
 
-namespace pocketmine\network\mcpe\protocol\types;
+namespace pocketmine\network\mcpe\convert;
 
 /**
  * Accessor for SkinAdapter
diff --git a/src/network/mcpe/handler/InGamePacketHandler.php b/src/network/mcpe/handler/InGamePacketHandler.php
index 692f736e6..235c4c70e 100644
--- a/src/network/mcpe/handler/InGamePacketHandler.php
+++ b/src/network/mcpe/handler/InGamePacketHandler.php
@@ -38,6 +38,7 @@ use pocketmine\math\Vector3;
 use pocketmine\nbt\NbtDataException;
 use pocketmine\nbt\tag\StringTag;
 use pocketmine\network\BadPacketException;
+use pocketmine\network\mcpe\convert\SkinAdapterSingleton;
 use pocketmine\network\mcpe\convert\TypeConverter;
 use pocketmine\network\mcpe\NetworkSession;
 use pocketmine\network\mcpe\protocol\ActorEventPacket;
@@ -83,7 +84,6 @@ use pocketmine\network\mcpe\protocol\types\inventory\NormalTransactionData;
 use pocketmine\network\mcpe\protocol\types\inventory\ReleaseItemTransactionData;
 use pocketmine\network\mcpe\protocol\types\inventory\UseItemOnEntityTransactionData;
 use pocketmine\network\mcpe\protocol\types\inventory\UseItemTransactionData;
-use pocketmine\network\mcpe\protocol\types\SkinAdapterSingleton;
 use pocketmine\network\mcpe\serializer\NetworkNbtSerializer;
 use pocketmine\player\Player;
 use function array_push;
diff --git a/src/network/mcpe/handler/LoginPacketHandler.php b/src/network/mcpe/handler/LoginPacketHandler.php
index 87d720df1..6553293b5 100644
--- a/src/network/mcpe/handler/LoginPacketHandler.php
+++ b/src/network/mcpe/handler/LoginPacketHandler.php
@@ -27,6 +27,7 @@ use Mdanter\Ecc\Crypto\Key\PublicKeyInterface;
 use pocketmine\event\player\PlayerPreLoginEvent;
 use pocketmine\network\BadPacketException;
 use pocketmine\network\mcpe\auth\ProcessLoginTask;
+use pocketmine\network\mcpe\convert\SkinAdapterSingleton;
 use pocketmine\network\mcpe\NetworkSession;
 use pocketmine\network\mcpe\protocol\LoginPacket;
 use pocketmine\network\mcpe\protocol\PlayStatusPacket;
@@ -35,7 +36,6 @@ use pocketmine\network\mcpe\protocol\types\login\ClientDataPersonaPieceTintColor
 use pocketmine\network\mcpe\protocol\types\login\ClientDataPersonaSkinPiece;
 use pocketmine\network\mcpe\protocol\types\PersonaPieceTintColor;
 use pocketmine\network\mcpe\protocol\types\PersonaSkinPiece;
-use pocketmine\network\mcpe\protocol\types\SkinAdapterSingleton;
 use pocketmine\network\mcpe\protocol\types\SkinAnimation;
 use pocketmine\network\mcpe\protocol\types\SkinData;
 use pocketmine\network\mcpe\protocol\types\SkinImage;
diff --git a/src/world/particle/FloatingTextParticle.php b/src/world/particle/FloatingTextParticle.php
index 76d2c3f80..0d5e46786 100644
--- a/src/world/particle/FloatingTextParticle.php
+++ b/src/world/particle/FloatingTextParticle.php
@@ -26,6 +26,7 @@ namespace pocketmine\world\particle;
 use pocketmine\entity\EntityFactory;
 use pocketmine\entity\Skin;
 use pocketmine\math\Vector3;
+use pocketmine\network\mcpe\convert\SkinAdapterSingleton;
 use pocketmine\network\mcpe\protocol\AddPlayerPacket;
 use pocketmine\network\mcpe\protocol\PlayerListPacket;
 use pocketmine\network\mcpe\protocol\RemoveActorPacket;
@@ -35,7 +36,6 @@ use pocketmine\network\mcpe\protocol\types\entity\FloatMetadataProperty;
 use pocketmine\network\mcpe\protocol\types\entity\LongMetadataProperty;
 use pocketmine\network\mcpe\protocol\types\inventory\ItemStack;
 use pocketmine\network\mcpe\protocol\types\PlayerListEntry;
-use pocketmine\network\mcpe\protocol\types\SkinAdapterSingleton;
 use pocketmine\utils\UUID;
 use function str_repeat;