diff --git a/apps/openmw-mp/ProcessorInitializer.cpp b/apps/openmw-mp/ProcessorInitializer.cpp
index 305c6c997..38be0531e 100644
--- a/apps/openmw-mp/ProcessorInitializer.cpp
+++ b/apps/openmw-mp/ProcessorInitializer.cpp
@@ -5,25 +5,25 @@
 #include "ProcessorInitializer.hpp"
 
 #include "PlayerProcessor.hpp"
-#include "processors/ProcessorPlayerPos.hpp"
-#include "processors/ProcessorPlayerCellChange.hpp"
-#include "processors/ProcessorPlayerCellState.hpp"
-#include "processors/ProcessorPlayerAttribute.hpp"
-#include "processors/ProcessorPlayerSkill.hpp"
-#include "processors/ProcessorLevel.hpp"
-#include "processors/ProcessorPlayerEquipment.hpp"
-#include "processors/ProcessorPlayerInventory.hpp"
-#include "processors/ProcessorPlayerSpellbook.hpp"
-#include "processors/ProcessorPlayerJournal.hpp"
-#include "processors/ProcessorPlayerAttack.hpp"
-#include "processors/ProcessorPlayerDynamicStats.hpp"
-#include "processors/ProcessorPlayerDeath.hpp"
-#include "processors/ProcessorPlayerResurrect.hpp"
-#include "processors/ProcessorPlayerDrawState.hpp"
-#include "processors/ProcessorChatMsg.hpp"
-#include "processors/ProcessorPlayerCharGen.hpp"
-#include "processors/ProcessorGUIMessageBox.hpp"
-#include "processors/ProcessorPlayerCharClass.hpp"
+#include "processors/player/ProcessorPlayerPos.hpp"
+#include "processors/player/ProcessorPlayerCellChange.hpp"
+#include "processors/player/ProcessorPlayerCellState.hpp"
+#include "processors/player/ProcessorPlayerAttribute.hpp"
+#include "processors/player/ProcessorPlayerSkill.hpp"
+#include "processors/player/ProcessorLevel.hpp"
+#include "processors/player/ProcessorPlayerEquipment.hpp"
+#include "processors/player/ProcessorPlayerInventory.hpp"
+#include "processors/player/ProcessorPlayerSpellbook.hpp"
+#include "processors/player/ProcessorPlayerJournal.hpp"
+#include "processors/player/ProcessorPlayerAttack.hpp"
+#include "processors/player/ProcessorPlayerDynamicStats.hpp"
+#include "processors/player/ProcessorPlayerDeath.hpp"
+#include "processors/player/ProcessorPlayerResurrect.hpp"
+#include "processors/player/ProcessorPlayerDrawState.hpp"
+#include "processors/player/ProcessorChatMsg.hpp"
+#include "processors/player/ProcessorPlayerCharGen.hpp"
+#include "processors/player/ProcessorGUIMessageBox.hpp"
+#include "processors/player/ProcessorPlayerCharClass.hpp"
 
 
 using namespace mwmp;
diff --git a/apps/openmw-mp/processors/ProcessorChatMsg.hpp b/apps/openmw-mp/processors/player/ProcessorChatMsg.hpp
similarity index 96%
rename from apps/openmw-mp/processors/ProcessorChatMsg.hpp
rename to apps/openmw-mp/processors/player/ProcessorChatMsg.hpp
index 4200cfee3..3526e9b01 100644
--- a/apps/openmw-mp/processors/ProcessorChatMsg.hpp
+++ b/apps/openmw-mp/processors/player/ProcessorChatMsg.hpp
@@ -6,7 +6,7 @@
 #define OPENMW_PROCESSORPLAYERCHATMSG_HPP
 
 
-#include "../PlayerProcessor.hpp"
+#include "apps/openmw-mp/PlayerProcessor.hpp"
 
 namespace mwmp
 {
diff --git a/apps/openmw-mp/processors/ProcessorGUIMessageBox.hpp b/apps/openmw-mp/processors/player/ProcessorGUIMessageBox.hpp
similarity index 94%
rename from apps/openmw-mp/processors/ProcessorGUIMessageBox.hpp
rename to apps/openmw-mp/processors/player/ProcessorGUIMessageBox.hpp
index 9d97701cc..72ead5631 100644
--- a/apps/openmw-mp/processors/ProcessorGUIMessageBox.hpp
+++ b/apps/openmw-mp/processors/player/ProcessorGUIMessageBox.hpp
@@ -6,7 +6,7 @@
 #define OPENMW_PROCESSORGUIMESSAGEBOX_HPP
 
 
-#include "../PlayerProcessor.hpp"
+#include "apps/openmw-mp/PlayerProcessor.hpp"
 
 namespace mwmp
 {
diff --git a/apps/openmw-mp/processors/ProcessorLevel.hpp b/apps/openmw-mp/processors/player/ProcessorLevel.hpp
similarity index 93%
rename from apps/openmw-mp/processors/ProcessorLevel.hpp
rename to apps/openmw-mp/processors/player/ProcessorLevel.hpp
index 5308c979e..3bc3257ac 100644
--- a/apps/openmw-mp/processors/ProcessorLevel.hpp
+++ b/apps/openmw-mp/processors/player/ProcessorLevel.hpp
@@ -6,7 +6,7 @@
 #define OPENMW_PROCESSORLEVEL_HPP
 
 
-#include "../PlayerProcessor.hpp"
+#include "apps/openmw-mp/PlayerProcessor.hpp"
 
 namespace mwmp
 {
diff --git a/apps/openmw-mp/processors/ProcessorPlayerAttack.hpp b/apps/openmw-mp/processors/player/ProcessorPlayerAttack.hpp
similarity index 97%
rename from apps/openmw-mp/processors/ProcessorPlayerAttack.hpp
rename to apps/openmw-mp/processors/player/ProcessorPlayerAttack.hpp
index 3f0d4c1b9..975a04420 100644
--- a/apps/openmw-mp/processors/ProcessorPlayerAttack.hpp
+++ b/apps/openmw-mp/processors/player/ProcessorPlayerAttack.hpp
@@ -6,7 +6,7 @@
 #define OPENMW_PROCESSORPLAYERATTACK_HPP
 
 
-#include "../PlayerProcessor.hpp"
+#include "apps/openmw-mp/PlayerProcessor.hpp"
 
 namespace mwmp
 {
diff --git a/apps/openmw-mp/processors/ProcessorPlayerAttribute.hpp b/apps/openmw-mp/processors/player/ProcessorPlayerAttribute.hpp
similarity index 94%
rename from apps/openmw-mp/processors/ProcessorPlayerAttribute.hpp
rename to apps/openmw-mp/processors/player/ProcessorPlayerAttribute.hpp
index 78a7182f4..e7ea8c2bc 100644
--- a/apps/openmw-mp/processors/ProcessorPlayerAttribute.hpp
+++ b/apps/openmw-mp/processors/player/ProcessorPlayerAttribute.hpp
@@ -6,7 +6,7 @@
 #define OPENMW_PROCESSORPLAYERATTRIBUTE_HPP
 
 
-#include "../PlayerProcessor.hpp"
+#include "apps/openmw-mp/PlayerProcessor.hpp"
 
 namespace mwmp
 {
diff --git a/apps/openmw-mp/processors/ProcessorPlayerCellChange.hpp b/apps/openmw-mp/processors/player/ProcessorPlayerCellChange.hpp
similarity index 94%
rename from apps/openmw-mp/processors/ProcessorPlayerCellChange.hpp
rename to apps/openmw-mp/processors/player/ProcessorPlayerCellChange.hpp
index 88bddcea0..38bc53a9e 100644
--- a/apps/openmw-mp/processors/ProcessorPlayerCellChange.hpp
+++ b/apps/openmw-mp/processors/player/ProcessorPlayerCellChange.hpp
@@ -5,9 +5,9 @@
 #ifndef OPENMW_PROCESSORPLAYERCELLCHANGE_HPP
 #define OPENMW_PROCESSORPLAYERCELLCHANGE_HPP
 
-#include "../PlayerProcessor.hpp"
-#include "../Networking.hpp"
-#include "../Script/Script.hpp"
+#include "apps/openmw-mp/PlayerProcessor.hpp"
+#include "apps/openmw-mp/Networking.hpp"
+#include "apps/openmw-mp/Script/Script.hpp"
 #include <components/openmw-mp/Controllers/PlayerPacketController.hpp>
 
 namespace mwmp
@@ -24,7 +24,7 @@ namespace mwmp
 
         void Do(PlayerPacket &packet, Player &player) override
         {
-            LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Received ID_PLAYER_CELL_CHANGE from %s", player.npc.mName.c_str());
+            LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Received %s from %s", strPacketID.c_str(), player.npc.mName.c_str());
 
             if (!player.creatureStats.mDead)
             {
diff --git a/apps/openmw-mp/processors/ProcessorPlayerCellState.hpp b/apps/openmw-mp/processors/player/ProcessorPlayerCellState.hpp
similarity index 88%
rename from apps/openmw-mp/processors/ProcessorPlayerCellState.hpp
rename to apps/openmw-mp/processors/player/ProcessorPlayerCellState.hpp
index 56726cc40..02932c9cb 100644
--- a/apps/openmw-mp/processors/ProcessorPlayerCellState.hpp
+++ b/apps/openmw-mp/processors/player/ProcessorPlayerCellState.hpp
@@ -6,9 +6,9 @@
 #define OPENMW_PROCESSORPLAYERCELLSTATE_HPP
 
 
-#include "../PlayerProcessor.hpp"
-#include "../Networking.hpp"
-#include "../Script/Script.hpp"
+#include "apps/openmw-mp/PlayerProcessor.hpp"
+#include "apps/openmw-mp/Networking.hpp"
+#include "apps/openmw-mp/Script/Script.hpp"
 #include <components/openmw-mp/Controllers/PlayerPacketController.hpp>
 
 namespace mwmp
diff --git a/apps/openmw-mp/processors/ProcessorPlayerCharClass.hpp b/apps/openmw-mp/processors/player/ProcessorPlayerCharClass.hpp
similarity index 92%
rename from apps/openmw-mp/processors/ProcessorPlayerCharClass.hpp
rename to apps/openmw-mp/processors/player/ProcessorPlayerCharClass.hpp
index dfd471d0d..400064c24 100644
--- a/apps/openmw-mp/processors/ProcessorPlayerCharClass.hpp
+++ b/apps/openmw-mp/processors/player/ProcessorPlayerCharClass.hpp
@@ -6,7 +6,7 @@
 #define OPENMW_PROCESSORPLAYERCHARCLASS_HPP
 
 
-#include "../PlayerProcessor.hpp"
+#include "apps/openmw-mp/PlayerProcessor.hpp"
 
 namespace mwmp
 {
diff --git a/apps/openmw-mp/processors/ProcessorPlayerCharGen.hpp b/apps/openmw-mp/processors/player/ProcessorPlayerCharGen.hpp
similarity index 94%
rename from apps/openmw-mp/processors/ProcessorPlayerCharGen.hpp
rename to apps/openmw-mp/processors/player/ProcessorPlayerCharGen.hpp
index 466c0be41..71484c68b 100644
--- a/apps/openmw-mp/processors/ProcessorPlayerCharGen.hpp
+++ b/apps/openmw-mp/processors/player/ProcessorPlayerCharGen.hpp
@@ -6,7 +6,7 @@
 #define OPENMW_PROCESSORPLAYERCHARGEN_HPP
 
 
-#include "../PlayerProcessor.hpp"
+#include "apps/openmw-mp/PlayerProcessor.hpp"
 
 namespace mwmp
 {
diff --git a/apps/openmw-mp/processors/ProcessorPlayerDeath.hpp b/apps/openmw-mp/processors/player/ProcessorPlayerDeath.hpp
similarity index 96%
rename from apps/openmw-mp/processors/ProcessorPlayerDeath.hpp
rename to apps/openmw-mp/processors/player/ProcessorPlayerDeath.hpp
index 98632f472..c2053f0a0 100644
--- a/apps/openmw-mp/processors/ProcessorPlayerDeath.hpp
+++ b/apps/openmw-mp/processors/player/ProcessorPlayerDeath.hpp
@@ -6,7 +6,7 @@
 #define OPENMW_PROCESSORPLAYERDEATH_HPP
 
 
-#include "../PlayerProcessor.hpp"
+#include "apps/openmw-mp/PlayerProcessor.hpp"
 #include <chrono>
 
 namespace mwmp
diff --git a/apps/openmw-mp/processors/ProcessorPlayerDrawState.hpp b/apps/openmw-mp/processors/player/ProcessorPlayerDrawState.hpp
similarity index 93%
rename from apps/openmw-mp/processors/ProcessorPlayerDrawState.hpp
rename to apps/openmw-mp/processors/player/ProcessorPlayerDrawState.hpp
index e1a1b47a7..7947f6619 100644
--- a/apps/openmw-mp/processors/ProcessorPlayerDrawState.hpp
+++ b/apps/openmw-mp/processors/player/ProcessorPlayerDrawState.hpp
@@ -6,7 +6,7 @@
 #define OPENMW_PROCESSORPLAYERDRAWSTATE_HPP
 
 
-#include "../PlayerProcessor.hpp"
+#include "apps/openmw-mp/PlayerProcessor.hpp"
 
 namespace mwmp
 {
diff --git a/apps/openmw-mp/processors/ProcessorPlayerDynamicStats.hpp b/apps/openmw-mp/processors/player/ProcessorPlayerDynamicStats.hpp
similarity index 93%
rename from apps/openmw-mp/processors/ProcessorPlayerDynamicStats.hpp
rename to apps/openmw-mp/processors/player/ProcessorPlayerDynamicStats.hpp
index d09831ff3..bef4010d0 100644
--- a/apps/openmw-mp/processors/ProcessorPlayerDynamicStats.hpp
+++ b/apps/openmw-mp/processors/player/ProcessorPlayerDynamicStats.hpp
@@ -6,7 +6,7 @@
 #define OPENMW_PROCESSORPLAYERDYNAMICSTATS_HPP
 
 
-#include "../PlayerProcessor.hpp"
+#include "apps/openmw-mp/PlayerProcessor.hpp"
 
 namespace mwmp
 {
diff --git a/apps/openmw-mp/processors/ProcessorPlayerEquipment.hpp b/apps/openmw-mp/processors/player/ProcessorPlayerEquipment.hpp
similarity index 94%
rename from apps/openmw-mp/processors/ProcessorPlayerEquipment.hpp
rename to apps/openmw-mp/processors/player/ProcessorPlayerEquipment.hpp
index 3aee9c5b9..4d81d5553 100644
--- a/apps/openmw-mp/processors/ProcessorPlayerEquipment.hpp
+++ b/apps/openmw-mp/processors/player/ProcessorPlayerEquipment.hpp
@@ -6,7 +6,7 @@
 #define OPENMW_PROCESSORPLAYEREQUIPMENT_HPP
 
 
-#include "../PlayerProcessor.hpp"
+#include "apps/openmw-mp/PlayerProcessor.hpp"
 
 namespace mwmp
 {
diff --git a/apps/openmw-mp/processors/ProcessorPlayerInventory.hpp b/apps/openmw-mp/processors/player/ProcessorPlayerInventory.hpp
similarity index 93%
rename from apps/openmw-mp/processors/ProcessorPlayerInventory.hpp
rename to apps/openmw-mp/processors/player/ProcessorPlayerInventory.hpp
index 54dc914d3..38adad974 100644
--- a/apps/openmw-mp/processors/ProcessorPlayerInventory.hpp
+++ b/apps/openmw-mp/processors/player/ProcessorPlayerInventory.hpp
@@ -5,7 +5,7 @@
 #ifndef OPENMW_PROCESSORPLAYERINVENTORY_HPP
 #define OPENMW_PROCESSORPLAYERINVENTORY_HPP
 
-#include "../PlayerProcessor.hpp"
+#include "apps/openmw-mp/PlayerProcessor.hpp"
 
 namespace mwmp
 {
diff --git a/apps/openmw-mp/processors/ProcessorPlayerJournal.hpp b/apps/openmw-mp/processors/player/ProcessorPlayerJournal.hpp
similarity index 93%
rename from apps/openmw-mp/processors/ProcessorPlayerJournal.hpp
rename to apps/openmw-mp/processors/player/ProcessorPlayerJournal.hpp
index d4e8db0d9..59c56a05d 100644
--- a/apps/openmw-mp/processors/ProcessorPlayerJournal.hpp
+++ b/apps/openmw-mp/processors/player/ProcessorPlayerJournal.hpp
@@ -6,7 +6,7 @@
 #define OPENMW_PROCESSORPLAYERJOURNAL_HPP
 
 
-#include "../PlayerProcessor.hpp"
+#include "apps/openmw-mp/PlayerProcessor.hpp"
 
 namespace mwmp
 {
diff --git a/apps/openmw-mp/processors/ProcessorPlayerPos.hpp b/apps/openmw-mp/processors/player/ProcessorPlayerPos.hpp
similarity index 94%
rename from apps/openmw-mp/processors/ProcessorPlayerPos.hpp
rename to apps/openmw-mp/processors/player/ProcessorPlayerPos.hpp
index 7a802f5a9..0b92581ef 100644
--- a/apps/openmw-mp/processors/ProcessorPlayerPos.hpp
+++ b/apps/openmw-mp/processors/player/ProcessorPlayerPos.hpp
@@ -5,7 +5,7 @@
 #ifndef OPENMW_PROCESSORPLAYERPOS_HPP
 #define OPENMW_PROCESSORPLAYERPOS_HPP
 
-#include "../PlayerProcessor.hpp"
+#include "apps/openmw-mp/PlayerProcessor.hpp"
 
 namespace mwmp
 {
diff --git a/apps/openmw-mp/processors/ProcessorPlayerResurrect.hpp b/apps/openmw-mp/processors/player/ProcessorPlayerResurrect.hpp
similarity index 94%
rename from apps/openmw-mp/processors/ProcessorPlayerResurrect.hpp
rename to apps/openmw-mp/processors/player/ProcessorPlayerResurrect.hpp
index adda2c4ac..5d6a18e96 100644
--- a/apps/openmw-mp/processors/ProcessorPlayerResurrect.hpp
+++ b/apps/openmw-mp/processors/player/ProcessorPlayerResurrect.hpp
@@ -6,7 +6,7 @@
 #define OPENMW_PROCESSORPLAYERRESURRECT_HPP
 
 
-#include "../PlayerProcessor.hpp"
+#include "apps/openmw-mp/PlayerProcessor.hpp"
 
 namespace mwmp
 {
diff --git a/apps/openmw-mp/processors/ProcessorPlayerSkill.hpp b/apps/openmw-mp/processors/player/ProcessorPlayerSkill.hpp
similarity index 94%
rename from apps/openmw-mp/processors/ProcessorPlayerSkill.hpp
rename to apps/openmw-mp/processors/player/ProcessorPlayerSkill.hpp
index 4882ad82c..77045158e 100644
--- a/apps/openmw-mp/processors/ProcessorPlayerSkill.hpp
+++ b/apps/openmw-mp/processors/player/ProcessorPlayerSkill.hpp
@@ -5,7 +5,7 @@
 #ifndef OPENMW_PROCESSORPLAYERSKILL_HPP
 #define OPENMW_PROCESSORPLAYERSKILL_HPP
 
-#include "../PlayerProcessor.hpp"
+#include "apps/openmw-mp/PlayerProcessor.hpp"
 
 namespace mwmp
 {
diff --git a/apps/openmw-mp/processors/ProcessorPlayerSpellbook.hpp b/apps/openmw-mp/processors/player/ProcessorPlayerSpellbook.hpp
similarity index 93%
rename from apps/openmw-mp/processors/ProcessorPlayerSpellbook.hpp
rename to apps/openmw-mp/processors/player/ProcessorPlayerSpellbook.hpp
index 77e63f485..0869b3ca9 100644
--- a/apps/openmw-mp/processors/ProcessorPlayerSpellbook.hpp
+++ b/apps/openmw-mp/processors/player/ProcessorPlayerSpellbook.hpp
@@ -5,7 +5,7 @@
 #ifndef OPENMW_PROCESSORPLAYERSPELLBOOK_HPP
 #define OPENMW_PROCESSORPLAYERSPELLBOOK_HPP
 
-#include "../PlayerProcessor.hpp"
+#include "apps/openmw-mp/PlayerProcessor.hpp"
 
 namespace mwmp
 {