diff --git a/mappings/net/minecraft/sortme/EntityPlayerAbstract.mapping b/mappings/net/minecraft/entity/player/EntityPlayerAbstract.mapping
similarity index 82%
rename from mappings/net/minecraft/sortme/EntityPlayerAbstract.mapping
rename to mappings/net/minecraft/entity/player/EntityPlayerAbstract.mapping
index 2c3e75c21e..d3f9579be3 100644
--- a/mappings/net/minecraft/sortme/EntityPlayerAbstract.mapping
+++ b/mappings/net/minecraft/entity/player/EntityPlayerAbstract.mapping
@@ -1,4 +1,4 @@
-CLASS none/aak net/minecraft/sortme/EntityPlayerAbstract
+CLASS none/aak net/minecraft/entity/player/EntityPlayerAbstract
 	FIELD bT gameProfile Lcom/mojang/authlib/GameProfile;
 	FIELD bv container Lnone/abv;
 	METHOD a deserializeEntityTag (Lnone/dt;)V
diff --git a/mappings/net/minecraft/entity/player/EntityPlayerClient.mapping b/mappings/net/minecraft/entity/player/EntityPlayerClient.mapping
new file mode 100644
index 0000000000..49db1d4061
--- /dev/null
+++ b/mappings/net/minecraft/entity/player/EntityPlayerClient.mapping
@@ -0,0 +1,4 @@
+CLASS none/boe net/minecraft/entity/player/EntityPlayerClient
+	FIELD d networkHandler Lnone/bmc;
+	METHOD a onTrackedDataSet (Lnone/kj;)V
+	METHOD m update ()V
diff --git a/mappings/net/minecraft/entity/player/EntityPlayerClientAbstract.mapping b/mappings/net/minecraft/entity/player/EntityPlayerClientAbstract.mapping
new file mode 100644
index 0000000000..a739244113
--- /dev/null
+++ b/mappings/net/minecraft/entity/player/EntityPlayerClientAbstract.mapping
@@ -0,0 +1 @@
+CLASS none/bob net/minecraft/entity/player/EntityPlayerClientAbstract
diff --git a/mappings/none/lw.mapping b/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping
similarity index 52%
rename from mappings/none/lw.mapping
rename to mappings/net/minecraft/entity/player/EntityPlayerServer.mapping
index a4525e3f12..5903c9b7f7 100644
--- a/mappings/none/lw.mapping
+++ b/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping
@@ -1,4 +1,5 @@
-CLASS none/lw
+CLASS none/lw net/minecraft/entity/player/EntityPlayerServer
+	FIELD a networkHandler Lnone/mg;
 	METHOD a deserializeEntityTag (Lnone/dt;)V
 	METHOD b serializeEntityTag (Lnone/dt;)V
 	METHOD m update ()V
diff --git a/mappings/net/minecraft/sortme/PlayerAbilities.mapping b/mappings/net/minecraft/entity/player/PlayerAbilities.mapping
similarity index 86%
rename from mappings/net/minecraft/sortme/PlayerAbilities.mapping
rename to mappings/net/minecraft/entity/player/PlayerAbilities.mapping
index ba83a9f336..053d3a6e80 100644
--- a/mappings/net/minecraft/sortme/PlayerAbilities.mapping
+++ b/mappings/net/minecraft/entity/player/PlayerAbilities.mapping
@@ -1,4 +1,4 @@
-CLASS none/aai net/minecraft/sortme/PlayerAbilities
+CLASS none/aai net/minecraft/entity/player/PlayerAbilities
 	FIELD a invulnerable Z
 	FIELD b flying Z
 	FIELD c allowFlying Z
diff --git a/mappings/none/mg.mapping b/mappings/net/minecraft/network/handler/NetworkHandlerServer.mapping
similarity index 76%
rename from mappings/none/mg.mapping
rename to mappings/net/minecraft/network/handler/NetworkHandlerServer.mapping
index 2a34c8eba7..ee35005152 100644
--- a/mappings/none/mg.mapping
+++ b/mappings/net/minecraft/network/handler/NetworkHandlerServer.mapping
@@ -1,4 +1,4 @@
-CLASS none/mg
+CLASS none/mg net/minecraft/network/handler/NetworkHandlerServer
 	FIELD c LOGGER Lorg/apache/logging/log4j/Logger;
 	FIELD d server Lnet/minecraft/server/MinecraftServer;
 	METHOD <init> (Lnet/minecraft/server/MinecraftServer;Lnone/eq;Lnone/lw;)V
diff --git a/mappings/none/boe.mapping b/mappings/none/boe.mapping
deleted file mode 100644
index f157755737..0000000000
--- a/mappings/none/boe.mapping
+++ /dev/null
@@ -1,3 +0,0 @@
-CLASS none/boe
-	METHOD a onTrackedDataSet (Lnone/kj;)V
-	METHOD m update ()V