diff --git a/apps/openmw/mwmp/Networking.hpp b/apps/openmw/mwmp/Networking.hpp
index bc2dd9c4c..f9b06794c 100644
--- a/apps/openmw/mwmp/Networking.hpp
+++ b/apps/openmw/mwmp/Networking.hpp
@@ -10,15 +10,15 @@
 #include <string>
 
 #include <components/openmw-mp/NetworkMessages.hpp>
-#include <components/openmw-mp/Packets/PacketPosition.hpp>
-#include <components/openmw-mp/Packets/PacketBaseInfo.hpp>
-#include <components/openmw-mp/Packets/PacketEquipment.hpp>
-#include <components/openmw-mp/Packets/PacketAttack.hpp>
-#include <components/openmw-mp/Packets/PacketDynamicStats.hpp>
-#include <components/openmw-mp/Packets/PacketResurrect.hpp>
-#include <components/openmw-mp/Packets/PacketDie.hpp>
-#include <components/openmw-mp/Packets/PacketCell.hpp>
-#include <components/openmw-mp/Packets/PacketDrawState.hpp>
+#include <components/openmw-mp/Packets/Player/PacketPosition.hpp>
+#include <components/openmw-mp/Packets/Player/PacketBaseInfo.hpp>
+#include <components/openmw-mp/Packets/Player/PacketEquipment.hpp>
+#include <components/openmw-mp/Packets/Player/PacketAttack.hpp>
+#include <components/openmw-mp/Packets/Player/PacketDynamicStats.hpp>
+#include <components/openmw-mp/Packets/Player/PacketResurrect.hpp>
+#include <components/openmw-mp/Packets/Player/PacketDie.hpp>
+#include <components/openmw-mp/Packets/Player/PacketCell.hpp>
+#include <components/openmw-mp/Packets/Player/PacketDrawState.hpp>
 #include <components/openmw-mp/Controllers/PlayerPacketController.hpp>
 
 namespace mwmp
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 61fc1fda7..0260e9cb5 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -148,10 +148,13 @@ add_component_dir (version
 add_component_dir (openmw-mp
         Log
         Controllers/PlayerPacketController
-        Packets/BasePacket Packets/PlayerPacket Packets/PacketBaseInfo Packets/PacketPosition Packets/PacketEquipment
-        Packets/PacketAttack Packets/PacketDynamicStats Packets/PacketCell Packets/PacketDrawState Packets/PacketChatMessage
-        Packets/PacketCharGen Packets/PacketAttribute Packets/PacketSkill Packets/PacketLevel Packets/PacketHandshake
-        Packets/PacketGUIBoxes Packets/PacketClass Packets/PacketTime)
+        Packets/BasePacket Packets/Player/PlayerPacket
+        Packets/Player/PacketBaseInfo Packets/Player/PacketPosition Packets/Player/PacketEquipment
+        Packets/Player/PacketAttack Packets/Player/PacketDynamicStats Packets/Player/PacketCell
+        Packets/Player/PacketDrawState Packets/Player/PacketChatMessage Packets/Player/PacketCharGen
+        Packets/Player/PacketAttribute Packets/Player/PacketSkill Packets/Player/PacketLevel
+        Packets/Player/PacketHandshake Packets/Player/PacketGUIBoxes Packets/Player/PacketClass
+        Packets/Player/PacketTime)
 
 add_component_dir (fallback
     fallback validate
diff --git a/components/openmw-mp/Controllers/PlayerPacketController.cpp b/components/openmw-mp/Controllers/PlayerPacketController.cpp
index 1e283fe65..ed232d985 100644
--- a/components/openmw-mp/Controllers/PlayerPacketController.cpp
+++ b/components/openmw-mp/Controllers/PlayerPacketController.cpp
@@ -2,27 +2,27 @@
 #include <boost/foreach.hpp>
 #include <boost/make_shared.hpp>
 
-#include "../Packets/PacketClass.hpp"
-#include "../Packets/PacketPosition.hpp"
-#include "../Packets/PacketBaseInfo.hpp"
-#include "../Packets/PacketEquipment.hpp"
-#include "../Packets/PacketAttack.hpp"
-#include "../Packets/PacketDynamicStats.hpp"
-#include "../Packets/PacketResurrect.hpp"
-#include "../Packets/PacketDie.hpp"
-#include "../Packets/PacketCell.hpp"
-#include "../Packets/PacketSendMyID.hpp"
-#include "../Packets/PacketDisconnect.hpp"
-#include "../Packets/PacketDrawState.hpp"
-#include "../Packets/PacketChatMessage.hpp"
-#include "../Packets/PacketCharGen.hpp"
-#include "../Packets/PacketAttribute.hpp"
-#include "../Packets/PacketSkill.hpp"
-#include "../Packets/PacketLevel.hpp"
-#include "../Packets/PacketHandshake.hpp"
-#include "../Packets/PacketGUIBoxes.hpp"
-#include "../Packets/PacketTime.hpp"
-#include "../Packets/PacketLoaded.hpp"
+#include "../Packets/Player/PacketClass.hpp"
+#include "../Packets/Player/PacketPosition.hpp"
+#include "../Packets/Player/PacketBaseInfo.hpp"
+#include "../Packets/Player/PacketEquipment.hpp"
+#include "../Packets/Player/PacketAttack.hpp"
+#include "../Packets/Player/PacketDynamicStats.hpp"
+#include "../Packets/Player/PacketResurrect.hpp"
+#include "../Packets/Player/PacketDie.hpp"
+#include "../Packets/Player/PacketCell.hpp"
+#include "../Packets/Player/PacketSendMyID.hpp"
+#include "../Packets/Player/PacketDisconnect.hpp"
+#include "../Packets/Player/PacketDrawState.hpp"
+#include "../Packets/Player/PacketChatMessage.hpp"
+#include "../Packets/Player/PacketCharGen.hpp"
+#include "../Packets/Player/PacketAttribute.hpp"
+#include "../Packets/Player/PacketSkill.hpp"
+#include "../Packets/Player/PacketLevel.hpp"
+#include "../Packets/Player/PacketHandshake.hpp"
+#include "../Packets/Player/PacketGUIBoxes.hpp"
+#include "../Packets/Player/PacketTime.hpp"
+#include "../Packets/Player/PacketLoaded.hpp"
 
 #include "PlayerPacketController.hpp"
 
diff --git a/components/openmw-mp/Controllers/PlayerPacketController.hpp b/components/openmw-mp/Controllers/PlayerPacketController.hpp
index efb104a07..1938edb50 100644
--- a/components/openmw-mp/Controllers/PlayerPacketController.hpp
+++ b/components/openmw-mp/Controllers/PlayerPacketController.hpp
@@ -3,7 +3,7 @@
 
 
 #include <RakPeerInterface.h>
-#include "../Packets/PlayerPacket.hpp"
+#include "../Packets/Player/PlayerPacket.hpp"
 #include <map>
 #include <boost/shared_ptr.hpp>
 
diff --git a/components/openmw-mp/Packets/PacketAttack.cpp b/components/openmw-mp/Packets/Player/PacketAttack.cpp
similarity index 100%
rename from components/openmw-mp/Packets/PacketAttack.cpp
rename to components/openmw-mp/Packets/Player/PacketAttack.cpp
diff --git a/components/openmw-mp/Packets/PacketAttack.hpp b/components/openmw-mp/Packets/Player/PacketAttack.hpp
similarity index 85%
rename from components/openmw-mp/Packets/PacketAttack.hpp
rename to components/openmw-mp/Packets/Player/PacketAttack.hpp
index cbc64bcca..415d5f78a 100644
--- a/components/openmw-mp/Packets/PacketAttack.hpp
+++ b/components/openmw-mp/Packets/Player/PacketAttack.hpp
@@ -6,7 +6,7 @@
 #define OPENMW_PACKETATTACK_HPP
 
 
-#include <components/openmw-mp/Packets/PlayerPacket.hpp>
+#include <components/openmw-mp/Packets/Player/PlayerPacket.hpp>
 
 namespace mwmp
 {
diff --git a/components/openmw-mp/Packets/PacketAttribute.cpp b/components/openmw-mp/Packets/Player/PacketAttribute.cpp
similarity index 100%
rename from components/openmw-mp/Packets/PacketAttribute.cpp
rename to components/openmw-mp/Packets/Player/PacketAttribute.cpp
diff --git a/components/openmw-mp/Packets/PacketAttribute.hpp b/components/openmw-mp/Packets/Player/PacketAttribute.hpp
similarity index 87%
rename from components/openmw-mp/Packets/PacketAttribute.hpp
rename to components/openmw-mp/Packets/Player/PacketAttribute.hpp
index 461587f23..4a60347da 100644
--- a/components/openmw-mp/Packets/PacketAttribute.hpp
+++ b/components/openmw-mp/Packets/Player/PacketAttribute.hpp
@@ -5,7 +5,7 @@
 #ifndef OPENMW_PACKETATTRIBUTE_HPP
 #define OPENMW_PACKETATTRIBUTE_HPP
 
-#include <components/openmw-mp/Packets/PlayerPacket.hpp>
+#include <components/openmw-mp/Packets/Player/PlayerPacket.hpp>
 
 namespace mwmp
 {
diff --git a/components/openmw-mp/Packets/PacketBaseInfo.cpp b/components/openmw-mp/Packets/Player/PacketBaseInfo.cpp
similarity index 100%
rename from components/openmw-mp/Packets/PacketBaseInfo.cpp
rename to components/openmw-mp/Packets/Player/PacketBaseInfo.cpp
diff --git a/components/openmw-mp/Packets/PacketBaseInfo.hpp b/components/openmw-mp/Packets/Player/PacketBaseInfo.hpp
similarity index 85%
rename from components/openmw-mp/Packets/PacketBaseInfo.hpp
rename to components/openmw-mp/Packets/Player/PacketBaseInfo.hpp
index 4b7e33896..91a6bee0f 100644
--- a/components/openmw-mp/Packets/PacketBaseInfo.hpp
+++ b/components/openmw-mp/Packets/Player/PacketBaseInfo.hpp
@@ -5,7 +5,7 @@
 #ifndef OPENMW_PACKETBASEINFO_HPP
 #define OPENMW_PACKETBASEINFO_HPP
 
-#include <components/openmw-mp/Packets/PlayerPacket.hpp>
+#include <components/openmw-mp/Packets/Player/PlayerPacket.hpp>
 
 namespace mwmp
 {
diff --git a/components/openmw-mp/Packets/PacketCell.cpp b/components/openmw-mp/Packets/Player/PacketCell.cpp
similarity index 100%
rename from components/openmw-mp/Packets/PacketCell.cpp
rename to components/openmw-mp/Packets/Player/PacketCell.cpp
diff --git a/components/openmw-mp/Packets/PacketCell.hpp b/components/openmw-mp/Packets/Player/PacketCell.hpp
similarity index 84%
rename from components/openmw-mp/Packets/PacketCell.hpp
rename to components/openmw-mp/Packets/Player/PacketCell.hpp
index 74ca1faab..b130202b4 100644
--- a/components/openmw-mp/Packets/PacketCell.hpp
+++ b/components/openmw-mp/Packets/Player/PacketCell.hpp
@@ -6,7 +6,7 @@
 #define OPENMW_PACKETCELL_HPP
 
 
-#include <components/openmw-mp/Packets/PlayerPacket.hpp>
+#include <components/openmw-mp/Packets/Player/PlayerPacket.hpp>
 
 namespace mwmp
 {
diff --git a/components/openmw-mp/Packets/PacketCharGen.cpp b/components/openmw-mp/Packets/Player/PacketCharGen.cpp
similarity index 100%
rename from components/openmw-mp/Packets/PacketCharGen.cpp
rename to components/openmw-mp/Packets/Player/PacketCharGen.cpp
diff --git a/components/openmw-mp/Packets/PacketCharGen.hpp b/components/openmw-mp/Packets/Player/PacketCharGen.hpp
similarity index 85%
rename from components/openmw-mp/Packets/PacketCharGen.hpp
rename to components/openmw-mp/Packets/Player/PacketCharGen.hpp
index c9d51f9e1..7df1e43ff 100644
--- a/components/openmw-mp/Packets/PacketCharGen.hpp
+++ b/components/openmw-mp/Packets/Player/PacketCharGen.hpp
@@ -6,7 +6,7 @@
 #define OPENMW_PACKETCHARGEN_HPP
 
 
-#include <components/openmw-mp/Packets/PlayerPacket.hpp>
+#include <components/openmw-mp/Packets/Player/PlayerPacket.hpp>
 
 namespace mwmp
 {
diff --git a/components/openmw-mp/Packets/PacketChatMessage.cpp b/components/openmw-mp/Packets/Player/PacketChatMessage.cpp
similarity index 100%
rename from components/openmw-mp/Packets/PacketChatMessage.cpp
rename to components/openmw-mp/Packets/Player/PacketChatMessage.cpp
diff --git a/components/openmw-mp/Packets/PacketChatMessage.hpp b/components/openmw-mp/Packets/Player/PacketChatMessage.hpp
similarity index 86%
rename from components/openmw-mp/Packets/PacketChatMessage.hpp
rename to components/openmw-mp/Packets/Player/PacketChatMessage.hpp
index 0decedd65..c15dc1083 100644
--- a/components/openmw-mp/Packets/PacketChatMessage.hpp
+++ b/components/openmw-mp/Packets/Player/PacketChatMessage.hpp
@@ -5,7 +5,7 @@
 #ifndef OPENMW_PACKETCHATMESSAGE_HPP
 #define OPENMW_PACKETCHATMESSAGE_HPP
 
-#include <components/openmw-mp/Packets/PlayerPacket.hpp>
+#include <components/openmw-mp/Packets/Player/PlayerPacket.hpp>
 
 namespace mwmp
 {
diff --git a/components/openmw-mp/Packets/PacketClass.cpp b/components/openmw-mp/Packets/Player/PacketClass.cpp
similarity index 100%
rename from components/openmw-mp/Packets/PacketClass.cpp
rename to components/openmw-mp/Packets/Player/PacketClass.cpp
diff --git a/components/openmw-mp/Packets/PacketClass.hpp b/components/openmw-mp/Packets/Player/PacketClass.hpp
similarity index 85%
rename from components/openmw-mp/Packets/PacketClass.hpp
rename to components/openmw-mp/Packets/Player/PacketClass.hpp
index 6ae1dea8e..f8ce75dc5 100644
--- a/components/openmw-mp/Packets/PacketClass.hpp
+++ b/components/openmw-mp/Packets/Player/PacketClass.hpp
@@ -6,7 +6,7 @@
 #define OPENMW_PACKETCLASS_HPP
 
 
-#include <components/openmw-mp/Packets/PlayerPacket.hpp>
+#include <components/openmw-mp/Packets/Player/PlayerPacket.hpp>
 
 namespace mwmp
 {
diff --git a/components/openmw-mp/Packets/PacketDie.hpp b/components/openmw-mp/Packets/Player/PacketDie.hpp
similarity index 90%
rename from components/openmw-mp/Packets/PacketDie.hpp
rename to components/openmw-mp/Packets/Player/PacketDie.hpp
index 15622465c..88dbac404 100644
--- a/components/openmw-mp/Packets/PacketDie.hpp
+++ b/components/openmw-mp/Packets/Player/PacketDie.hpp
@@ -6,7 +6,7 @@
 #define OPENMW_PACKETDIE_HPP
 
 
-#include <components/openmw-mp/Packets/PlayerPacket.hpp>
+#include <components/openmw-mp/Packets/Player/PlayerPacket.hpp>
 #include <components/openmw-mp/NetworkMessages.hpp>
 
 namespace mwmp
diff --git a/components/openmw-mp/Packets/PacketDisconnect.hpp b/components/openmw-mp/Packets/Player/PacketDisconnect.hpp
similarity index 87%
rename from components/openmw-mp/Packets/PacketDisconnect.hpp
rename to components/openmw-mp/Packets/Player/PacketDisconnect.hpp
index 154a31f32..39cdbcbc1 100644
--- a/components/openmw-mp/Packets/PacketDisconnect.hpp
+++ b/components/openmw-mp/Packets/Player/PacketDisconnect.hpp
@@ -5,7 +5,7 @@
 #ifndef OPENMW_PACKETDISCONNECT_HPP
 #define OPENMW_PACKETDISCONNECT_HPP
 
-#include <components/openmw-mp/Packets/PlayerPacket.hpp>
+#include <components/openmw-mp/Packets/Player/PlayerPacket.hpp>
 #include <components/openmw-mp/NetworkMessages.hpp>
 
 namespace mwmp
diff --git a/components/openmw-mp/Packets/PacketDrawState.cpp b/components/openmw-mp/Packets/Player/PacketDrawState.cpp
similarity index 100%
rename from components/openmw-mp/Packets/PacketDrawState.cpp
rename to components/openmw-mp/Packets/Player/PacketDrawState.cpp
diff --git a/components/openmw-mp/Packets/PacketDrawState.hpp b/components/openmw-mp/Packets/Player/PacketDrawState.hpp
similarity index 85%
rename from components/openmw-mp/Packets/PacketDrawState.hpp
rename to components/openmw-mp/Packets/Player/PacketDrawState.hpp
index c1fb4b991..7aa20750c 100644
--- a/components/openmw-mp/Packets/PacketDrawState.hpp
+++ b/components/openmw-mp/Packets/Player/PacketDrawState.hpp
@@ -6,7 +6,7 @@
 #define OPENMW_PACKETDRAWSTATE_HPP
 
 
-#include <components/openmw-mp/Packets/PlayerPacket.hpp>
+#include <components/openmw-mp/Packets/Player/PlayerPacket.hpp>
 
 namespace mwmp
 {
diff --git a/components/openmw-mp/Packets/PacketDynamicStats.cpp b/components/openmw-mp/Packets/Player/PacketDynamicStats.cpp
similarity index 100%
rename from components/openmw-mp/Packets/PacketDynamicStats.cpp
rename to components/openmw-mp/Packets/Player/PacketDynamicStats.cpp
diff --git a/components/openmw-mp/Packets/PacketDynamicStats.hpp b/components/openmw-mp/Packets/Player/PacketDynamicStats.hpp
similarity index 86%
rename from components/openmw-mp/Packets/PacketDynamicStats.hpp
rename to components/openmw-mp/Packets/Player/PacketDynamicStats.hpp
index c4c8e8ff2..8c03445bc 100644
--- a/components/openmw-mp/Packets/PacketDynamicStats.hpp
+++ b/components/openmw-mp/Packets/Player/PacketDynamicStats.hpp
@@ -6,7 +6,7 @@
 #define OPENMW_PACKAGEDYNAMICSTATS_HPP
 
 
-#include <components/openmw-mp/Packets/PlayerPacket.hpp>
+#include <components/openmw-mp/Packets/Player/PlayerPacket.hpp>
 
 namespace mwmp
 {
diff --git a/components/openmw-mp/Packets/PacketEquipment.cpp b/components/openmw-mp/Packets/Player/PacketEquipment.cpp
similarity index 100%
rename from components/openmw-mp/Packets/PacketEquipment.cpp
rename to components/openmw-mp/Packets/Player/PacketEquipment.cpp
diff --git a/components/openmw-mp/Packets/PacketEquipment.hpp b/components/openmw-mp/Packets/Player/PacketEquipment.hpp
similarity index 85%
rename from components/openmw-mp/Packets/PacketEquipment.hpp
rename to components/openmw-mp/Packets/Player/PacketEquipment.hpp
index 5b677f555..d0134a577 100644
--- a/components/openmw-mp/Packets/PacketEquipment.hpp
+++ b/components/openmw-mp/Packets/Player/PacketEquipment.hpp
@@ -5,7 +5,7 @@
 #ifndef OPENMW_PACKETEQUIPMENT_HPP
 #define OPENMW_PACKETEQUIPMENT_HPP
 
-#include <components/openmw-mp/Packets/PlayerPacket.hpp>
+#include <components/openmw-mp/Packets/Player/PlayerPacket.hpp>
 
 namespace mwmp
 {
diff --git a/components/openmw-mp/Packets/PacketGUIBoxes.cpp b/components/openmw-mp/Packets/Player/PacketGUIBoxes.cpp
similarity index 100%
rename from components/openmw-mp/Packets/PacketGUIBoxes.cpp
rename to components/openmw-mp/Packets/Player/PacketGUIBoxes.cpp
diff --git a/components/openmw-mp/Packets/PacketGUIBoxes.hpp b/components/openmw-mp/Packets/Player/PacketGUIBoxes.hpp
similarity index 85%
rename from components/openmw-mp/Packets/PacketGUIBoxes.hpp
rename to components/openmw-mp/Packets/Player/PacketGUIBoxes.hpp
index ace0bf771..8d71257f9 100644
--- a/components/openmw-mp/Packets/PacketGUIBoxes.hpp
+++ b/components/openmw-mp/Packets/Player/PacketGUIBoxes.hpp
@@ -6,7 +6,7 @@
 #define OPENMW_PACKETGUIBOXES_HPP
 
 
-#include <components/openmw-mp/Packets/PlayerPacket.hpp>
+#include <components/openmw-mp/Packets/Player/PlayerPacket.hpp>
 
 namespace mwmp
 {
diff --git a/components/openmw-mp/Packets/PacketHandshake.cpp b/components/openmw-mp/Packets/Player/PacketHandshake.cpp
similarity index 100%
rename from components/openmw-mp/Packets/PacketHandshake.cpp
rename to components/openmw-mp/Packets/Player/PacketHandshake.cpp
diff --git a/components/openmw-mp/Packets/PacketHandshake.hpp b/components/openmw-mp/Packets/Player/PacketHandshake.hpp
similarity index 85%
rename from components/openmw-mp/Packets/PacketHandshake.hpp
rename to components/openmw-mp/Packets/Player/PacketHandshake.hpp
index b5846d433..539be878b 100644
--- a/components/openmw-mp/Packets/PacketHandshake.hpp
+++ b/components/openmw-mp/Packets/Player/PacketHandshake.hpp
@@ -5,7 +5,7 @@
 #ifndef OPENMW_PACKETHANDSHAKE_HPP
 #define OPENMW_PACKETHANDSHAKE_HPP
 
-#include <components/openmw-mp/Packets/PlayerPacket.hpp>
+#include <components/openmw-mp/Packets/Player/PlayerPacket.hpp>
 
 namespace mwmp
 {
diff --git a/components/openmw-mp/Packets/PacketLevel.cpp b/components/openmw-mp/Packets/Player/PacketLevel.cpp
similarity index 100%
rename from components/openmw-mp/Packets/PacketLevel.cpp
rename to components/openmw-mp/Packets/Player/PacketLevel.cpp
diff --git a/components/openmw-mp/Packets/PacketLevel.hpp b/components/openmw-mp/Packets/Player/PacketLevel.hpp
similarity index 85%
rename from components/openmw-mp/Packets/PacketLevel.hpp
rename to components/openmw-mp/Packets/Player/PacketLevel.hpp
index aa61dcc10..8537e954d 100644
--- a/components/openmw-mp/Packets/PacketLevel.hpp
+++ b/components/openmw-mp/Packets/Player/PacketLevel.hpp
@@ -5,7 +5,7 @@
 #ifndef OPENMW_PACKETLEVEL_HPP
 #define OPENMW_PACKETLEVEL_HPP
 
-#include <components/openmw-mp/Packets/PlayerPacket.hpp>
+#include <components/openmw-mp/Packets/Player/PlayerPacket.hpp>
 
 namespace mwmp
 {
diff --git a/components/openmw-mp/Packets/PacketLoaded.hpp b/components/openmw-mp/Packets/Player/PacketLoaded.hpp
similarity index 84%
rename from components/openmw-mp/Packets/PacketLoaded.hpp
rename to components/openmw-mp/Packets/Player/PacketLoaded.hpp
index 35565150d..8f58a4938 100644
--- a/components/openmw-mp/Packets/PacketLoaded.hpp
+++ b/components/openmw-mp/Packets/Player/PacketLoaded.hpp
@@ -5,7 +5,7 @@
 #ifndef OPENMW_PACKETLOADED_HPP
 #define OPENMW_PACKETLOADED_HPP
 
-#include <components/openmw-mp/Packets/PlayerPacket.hpp>
+#include <components/openmw-mp/Packets/Player/PlayerPacket.hpp>
 
 namespace mwmp
 {
diff --git a/components/openmw-mp/Packets/PacketPosition.cpp b/components/openmw-mp/Packets/Player/PacketPosition.cpp
similarity index 100%
rename from components/openmw-mp/Packets/PacketPosition.cpp
rename to components/openmw-mp/Packets/Player/PacketPosition.cpp
diff --git a/components/openmw-mp/Packets/PacketPosition.hpp b/components/openmw-mp/Packets/Player/PacketPosition.hpp
similarity index 85%
rename from components/openmw-mp/Packets/PacketPosition.hpp
rename to components/openmw-mp/Packets/Player/PacketPosition.hpp
index d15baa946..33c60a6a8 100644
--- a/components/openmw-mp/Packets/PacketPosition.hpp
+++ b/components/openmw-mp/Packets/Player/PacketPosition.hpp
@@ -5,7 +5,7 @@
 #ifndef OPENMW_PACKETPOSITION_HPP
 #define OPENMW_PACKETPOSITION_HPP
 
-#include <components/openmw-mp/Packets/PlayerPacket.hpp>
+#include <components/openmw-mp/Packets/Player/PlayerPacket.hpp>
 
 namespace mwmp
 {
diff --git a/components/openmw-mp/Packets/PacketResurrect.hpp b/components/openmw-mp/Packets/Player/PacketResurrect.hpp
similarity index 90%
rename from components/openmw-mp/Packets/PacketResurrect.hpp
rename to components/openmw-mp/Packets/Player/PacketResurrect.hpp
index 4588fbbfd..f24d81d62 100644
--- a/components/openmw-mp/Packets/PacketResurrect.hpp
+++ b/components/openmw-mp/Packets/Player/PacketResurrect.hpp
@@ -6,7 +6,7 @@
 #define OPENMW_PACKETRESURRECT_HPP
 
 
-#include <components/openmw-mp/Packets/PlayerPacket.hpp>
+#include <components/openmw-mp/Packets/Player/PlayerPacket.hpp>
 #include <components/openmw-mp/NetworkMessages.hpp>
 
 namespace mwmp
diff --git a/components/openmw-mp/Packets/PacketSendMyID.hpp b/components/openmw-mp/Packets/Player/PacketSendMyID.hpp
similarity index 86%
rename from components/openmw-mp/Packets/PacketSendMyID.hpp
rename to components/openmw-mp/Packets/Player/PacketSendMyID.hpp
index 32ddbe8c9..5e6fa802c 100644
--- a/components/openmw-mp/Packets/PacketSendMyID.hpp
+++ b/components/openmw-mp/Packets/Player/PacketSendMyID.hpp
@@ -5,7 +5,7 @@
 #ifndef OPENMW_PACKETSENDMYID_HPP
 #define OPENMW_PACKETSENDMYID_HPP
 
-#include <components/openmw-mp/Packets/PlayerPacket.hpp>
+#include <components/openmw-mp/Packets/Player/PlayerPacket.hpp>
 #include <components/openmw-mp/NetworkMessages.hpp>
 
 namespace mwmp
diff --git a/components/openmw-mp/Packets/PacketSkill.cpp b/components/openmw-mp/Packets/Player/PacketSkill.cpp
similarity index 100%
rename from components/openmw-mp/Packets/PacketSkill.cpp
rename to components/openmw-mp/Packets/Player/PacketSkill.cpp
diff --git a/components/openmw-mp/Packets/PacketSkill.hpp b/components/openmw-mp/Packets/Player/PacketSkill.hpp
similarity index 87%
rename from components/openmw-mp/Packets/PacketSkill.hpp
rename to components/openmw-mp/Packets/Player/PacketSkill.hpp
index 3f58db341..d7af6c56b 100644
--- a/components/openmw-mp/Packets/PacketSkill.hpp
+++ b/components/openmw-mp/Packets/Player/PacketSkill.hpp
@@ -6,7 +6,7 @@
 #define OPENMW_PACKETSKILL_HPP
 
 
-#include <components/openmw-mp/Packets/PlayerPacket.hpp>
+#include <components/openmw-mp/Packets/Player/PlayerPacket.hpp>
 
 namespace mwmp
 {
diff --git a/components/openmw-mp/Packets/PacketTime.cpp b/components/openmw-mp/Packets/Player/PacketTime.cpp
similarity index 100%
rename from components/openmw-mp/Packets/PacketTime.cpp
rename to components/openmw-mp/Packets/Player/PacketTime.cpp
diff --git a/components/openmw-mp/Packets/PacketTime.hpp b/components/openmw-mp/Packets/Player/PacketTime.hpp
similarity index 84%
rename from components/openmw-mp/Packets/PacketTime.hpp
rename to components/openmw-mp/Packets/Player/PacketTime.hpp
index bb7521ff8..69efa442b 100644
--- a/components/openmw-mp/Packets/PacketTime.hpp
+++ b/components/openmw-mp/Packets/Player/PacketTime.hpp
@@ -6,7 +6,7 @@
 #define OPENMW_TIMEPACKET_HPP
 
 
-#include <components/openmw-mp/Packets/PlayerPacket.hpp>
+#include <components/openmw-mp/Packets/Player/PlayerPacket.hpp>
 
 namespace mwmp
 {
diff --git a/components/openmw-mp/Packets/PlayerPacket.cpp b/components/openmw-mp/Packets/Player/PlayerPacket.cpp
similarity index 100%
rename from components/openmw-mp/Packets/PlayerPacket.cpp
rename to components/openmw-mp/Packets/Player/PlayerPacket.cpp
diff --git a/components/openmw-mp/Packets/PlayerPacket.hpp b/components/openmw-mp/Packets/Player/PlayerPacket.hpp
similarity index 95%
rename from components/openmw-mp/Packets/PlayerPacket.hpp
rename to components/openmw-mp/Packets/Player/PlayerPacket.hpp
index 9281baf87..54c085db9 100644
--- a/components/openmw-mp/Packets/PlayerPacket.hpp
+++ b/components/openmw-mp/Packets/Player/PlayerPacket.hpp
@@ -7,7 +7,7 @@
 #include <PacketPriority.h>
 #include <components/openmw-mp/Base/BasePlayer.hpp>
 
-#include "BasePacket.hpp"
+#include <components/openmw-mp/Packets/BasePacket.hpp>
 
 
 namespace mwmp