diff --git a/mappings/net/minecraft/entity/player/ItemCooldownManagerServer.mapping b/mappings/net/minecraft/server/network/ServerItemCooldownManager.mapping
similarity index 62%
rename from mappings/net/minecraft/entity/player/ItemCooldownManagerServer.mapping
rename to mappings/net/minecraft/server/network/ServerItemCooldownManager.mapping
index cba86537e8..eecffce5f6 100644
--- a/mappings/net/minecraft/entity/player/ItemCooldownManagerServer.mapping
+++ b/mappings/net/minecraft/server/network/ServerItemCooldownManager.mapping
@@ -1,4 +1,4 @@
-CLASS awh net/minecraft/entity/player/ItemCooldownManagerServer
+CLASS awh net/minecraft/server/network/ServerItemCooldownManager
 	FIELD a player Luj;
 	METHOD b onCooldownUpdate (Lavj;I)V
 		ARG 1 item
diff --git a/mappings/net/minecraft/entity/player/PlayerServerEntity.mapping b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping
similarity index 97%
rename from mappings/net/minecraft/entity/player/PlayerServerEntity.mapping
rename to mappings/net/minecraft/server/network/ServerPlayerEntity.mapping
index b12957fef4..e15c9d2359 100644
--- a/mappings/net/minecraft/entity/player/PlayerServerEntity.mapping
+++ b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping
@@ -1,4 +1,4 @@
-CLASS uj net/minecraft/entity/player/PlayerServerEntity
+CLASS uj net/minecraft/server/network/ServerPlayerEntity
 	FIELD a networkHandler Lux;
 	FIELD b server Lnet/minecraft/server/MinecraftServer;
 	FIELD cA enteredNetherPos Lcjy;
diff --git a/mappings/net/minecraft/recipe/book/RecipeBookServer.mapping b/mappings/net/minecraft/server/network/ServerRecipeBook.mapping
similarity index 68%
rename from mappings/net/minecraft/recipe/book/RecipeBookServer.mapping
rename to mappings/net/minecraft/server/network/ServerRecipeBook.mapping
index 31aa4e45c1..a1d52d1673 100644
--- a/mappings/net/minecraft/recipe/book/RecipeBookServer.mapping
+++ b/mappings/net/minecraft/server/network/ServerRecipeBook.mapping
@@ -1,4 +1,4 @@
-CLASS xi net/minecraft/recipe/book/RecipeBookServer
+CLASS xi net/minecraft/server/network/ServerRecipeBook
 	FIELD g LOGGER Lorg/apache/logging/log4j/Logger;
 	FIELD h manager Laxv;
 	METHOD a fromTag (Lhp;)V