move being related files into being dir.

142 files changed, 356 insertions, 247 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 813e23672..7c90947af 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -558,11 +558,11 @@ SET(SRCS
     test/testmain.h
     actionmanager.cpp
     actionmanager.h
-    actor.cpp
-    actor.h
-    actorsprite.cpp
-    actorsprite.h
-    actorspritelistener.h
+    being/actor.cpp
+    being/actor.h
+    being/actorsprite.cpp
+    being/actorsprite.h
+    being/actorspritelistener.h
     actorspritemanager.cpp
     actorspritemanager.h
     animatedsprite.cpp
@@ -575,9 +575,9 @@ SET(SRCS
     auctionmanager.h
     avatar.cpp
     avatar.h
-    being.cpp
-    being.h
-    beingcacheentry.h
+    being/being.cpp
+    being/being.h
+    being/beingcacheentry.h
     beingequipbackend.cpp
     beingequipbackend.h
     spellmanager.cpp
@@ -590,8 +590,8 @@ SET(SRCS
     commandhandler.h
     commands.cpp
     commands.h
-    compoundsprite.cpp
-    compoundsprite.h
+    being/compoundsprite.cpp
+    being/compoundsprite.h
     configlistener.h
     configuration.cpp
     configuration.h
@@ -653,8 +653,8 @@ SET(SRCS
     input/keyinput.cpp
     input/keyinput.h
     localconsts.h
-    localplayer.cpp
-    localplayer.h
+    being/localplayer.cpp
+    being/localplayer.h
     logger.cpp
     logger.h
     main.cpp
@@ -689,10 +689,10 @@ SET(SRCS
     particle/particleemitterprop.h
     party.cpp
     party.h
-    playerinfo.cpp
-    playerinfo.h
-    playerrelations.cpp
-    playerrelations.h
+    being/playerinfo.cpp
+    being/playerinfo.h
+    being/playerrelations.cpp
+    being/playerrelations.h
     position.cpp
     position.h
     properties.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 252aa05f7..302194821 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -569,11 +569,11 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      test/testmain.h \
 	      actionmanager.cpp \
 	      actionmanager.h \
-	      actor.cpp \
-	      actor.h \
-	      actorsprite.cpp \
-	      actorsprite.h \
-	      actorspritelistener.h \
+	      being/actor.cpp \
+	      being/actor.h \
+	      being/actorsprite.cpp \
+	      being/actorsprite.h \
+	      being/actorspritelistener.h \
 	      actorspritemanager.cpp \
 	      actorspritemanager.h \
 	      animatedsprite.cpp \
@@ -586,9 +586,9 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      auctionmanager.h \
 	      avatar.cpp \
 	      avatar.h \
-	      being.cpp \
-	      being.h \
-	      beingcacheentry.h \
+	      being/being.cpp \
+	      being/being.h \
+	      being/beingcacheentry.h \
 	      beingequipbackend.cpp \
 	      beingequipbackend.h \
 	      spellmanager.cpp \
@@ -601,8 +601,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      commandhandler.h \
 	      commands.cpp \
 	      commands.h \
-	      compoundsprite.cpp \
-	      compoundsprite.h \
+	      being/compoundsprite.cpp \
+	      being/compoundsprite.h \
 	      configlistener.h \
 	      configuration.cpp \
 	      configuration.h \
@@ -664,8 +664,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      input/keyinput.cpp \
 	      input/keyinput.h \
 	      localconsts.h \
-	      localplayer.cpp \
-	      localplayer.h \
+	      being/localplayer.cpp \
+	      being/localplayer.h \
 	      logger.cpp \
 	      logger.h \
 	      main.cpp \
@@ -698,10 +698,10 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      particle/particleemitterprop.h \
 	      party.cpp \
 	      party.h \
-	      playerinfo.cpp \
-	      playerinfo.h \
-	      playerrelations.cpp \
-	      playerrelations.h \
+	      being/playerinfo.cpp \
+	      being/playerinfo.h \
+	      being/playerrelations.cpp \
+	      being/playerrelations.h \
 	      position.cpp \
 	      position.h \
 	      properties.h \
diff --git a/src/actionmanager.cpp b/src/actionmanager.cpp
index 091a68c87..ecc3ddc58 100644
--- a/src/actionmanager.cpp
+++ b/src/actionmanager.cpp
@@ -25,11 +25,12 @@
 #include "emoteshortcut.h"
 #include "game.h"
 #include "itemshortcut.h"
-#include "localplayer.h"
-#include "playerinfo.h"
-#include "playerrelations.h"
 #include "soundmanager.h"
 
+#include "being/localplayer.h"
+#include "being/playerinfo.h"
+#include "being/playerrelations.h"
+
 #include "input/inputevent.h"
 #include "input/inputmanager.h"
 
diff --git a/src/actorspritemanager.cpp b/src/actorspritemanager.cpp
index cd2a62e04..62557d74c 100644
--- a/src/actorspritemanager.cpp
+++ b/src/actorspritemanager.cpp
@@ -24,10 +24,11 @@
 
 #include "client.h"
 #include "configuration.h"
-#include "localplayer.h"
 #include "main.h"
-#include "playerinfo.h"
-#include "playerrelations.h"
+
+#include "being/localplayer.h"
+#include "being/playerinfo.h"
+#include "being/playerrelations.h"
 
 #include "gui/chatwindow.h"
 #include "gui/equipmentwindow.h"
diff --git a/src/actorspritemanager.h b/src/actorspritemanager.h
index 1a599a865..74ddd7a32 100644
--- a/src/actorspritemanager.h
+++ b/src/actorspritemanager.h
@@ -23,9 +23,10 @@
 #ifndef ACTORSPRITEMANAGER_H
 #define ACTORSPRITEMANAGER_H
 
-#include "being.h"
 #include "flooritem.h"
 
+#include "being/being.h"
+
 #include "localconsts.h"
 
 class LocalPlayer;
diff --git a/src/auctionmanager.cpp b/src/auctionmanager.cpp
index e5b253933..c083c9252 100644
--- a/src/auctionmanager.cpp
+++ b/src/auctionmanager.cpp
@@ -23,7 +23,8 @@
 #include "actorspritemanager.h"
 #include "client.h"
 #include "configuration.h"
-#include "localplayer.h"
+
+#include "being/localplayer.h"
 
 #include "net/chathandler.h"
 #include "net/net.h"
diff --git a/src/avatar.cpp b/src/avatar.cpp
index 4fbf4f01f..41de4b3b7 100644
--- a/src/avatar.cpp
+++ b/src/avatar.cpp
@@ -22,7 +22,7 @@
 
 #include "avatar.h"
 
-#include "localplayer.h"
+#include "being/localplayer.h"
 
 #include <sstream>
 
diff --git a/src/actor.cpp b/src/being/actor.cpp
index 0ca168e32..0efed5d18 100644
--- a/src/actor.cpp
+++ b/src/being/actor.cpp
@@ -19,7 +19,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "actor.h"
+#include "being/actor.h"
 
 #include "map.h"
 
diff --git a/src/actor.h b/src/being/actor.h
index 87e35b002..326b9f40c 100644
--- a/src/actor.h
+++ b/src/being/actor.h
@@ -19,8 +19,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef ACTOR_H
-#define ACTOR_H
+#ifndef BEING_ACTOR_H
+#define BEING_ACTOR_H
 
 #include "vector.h"
 
@@ -139,4 +139,4 @@ private:
     Actors::iterator mMapActor;
 };
 
-#endif  // ACTOR_H
+#endif  // BEING_ACTOR_H
diff --git a/src/actorsprite.cpp b/src/being/actorsprite.cpp
index 0b624741a..9c5ff6def 100644
--- a/src/actorsprite.cpp
+++ b/src/being/actorsprite.cpp
@@ -19,18 +19,19 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "actorsprite.h"
+#include "being/actorsprite.h"
 
-#include "actorspritelistener.h"
 #include "client.h"
 #include "configuration.h"
 #include "effectmanager.h"
 #include "imagesprite.h"
-#include "localplayer.h"
 #include "simpleanimation.h"
 #include "soundmanager.h"
 #include "statuseffect.h"
 
+#include "being/actorspritelistener.h"
+#include "being/localplayer.h"
+
 #include "gui/theme.h"
 
 #include "net/net.h"
diff --git a/src/actorsprite.h b/src/being/actorsprite.h
index c8b1e03df..debdc69d1 100644
--- a/src/actorsprite.h
+++ b/src/being/actorsprite.h
@@ -19,14 +19,15 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef ACTORSPRITE_H
-#define ACTORSPRITE_H
+#ifndef BEING_ACTORSPRITE_H
+#define BEING_ACTORSPRITE_H
 
-#include "actor.h"
-#include "compoundsprite.h"
 #include "localconsts.h"
 #include "map.h"
 
+#include "being/actor.h"
+#include "being/compoundsprite.h"
+
 #include "particle/particlecontainer.h"
 
 #include <SDL_types.h>
@@ -243,4 +244,4 @@ private:
     bool mMustResetParticles;
 };
 
-#endif  // ACTORSPRITE_H
+#endif  // BEING_ACTORSPRITE_H
diff --git a/src/actorspritelistener.h b/src/being/actorspritelistener.h
index 6b75f957b..3d5a48443 100644
--- a/src/actorspritelistener.h
+++ b/src/being/actorspritelistener.h
@@ -19,8 +19,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef ACTORSPRITELISTENER_H
-#define ACTORSPRITELISTENER_H
+#ifndef BEING_ACTORSPRITELISTENER_H
+#define BEING_ACTORSPRITELISTENER_H
 
 class ActorSprite;
 
@@ -41,4 +41,4 @@ class ActorSpriteListener
         virtual void actorSpriteDestroyed(const ActorSprite &actorSprite) = 0;
 };
 
-#endif  // ACTORSPRITELISTENER_H
+#endif  // BEING_ACTORSPRITELISTENER_H
diff --git a/src/being.cpp b/src/being/being.cpp
index 535c0c0e3..7dfe9d9b6 100644
--- a/src/being.cpp
+++ b/src/being/being.cpp
@@ -20,21 +20,22 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "being.h"
+#include "being/being.h"
 
 #include "actorspritemanager.h"
 #include "animatedsprite.h"
-#include "beingcacheentry.h"
 #include "beingequipbackend.h"
 #include "client.h"
 #include "effectmanager.h"
 #include "guild.h"
 #include "party.h"
-#include "playerrelations.h"
 #include "soundconsts.h"
 #include "soundmanager.h"
 #include "text.h"
 
+#include "being/beingcacheentry.h"
+#include "being/playerrelations.h"
+
 #include "particle/particle.h"
 
 #include "gui/equipmentwindow.h"
diff --git a/src/being.h b/src/being/being.h
index 46d82c79d..29b735956 100644
--- a/src/being.h
+++ b/src/being/being.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef BEING_H
-#define BEING_H
+#ifndef BEING_BEING_H
+#define BEING_BEING_H
 
 #include "equipment.h"
 
@@ -1060,4 +1060,4 @@ class Being : public ActorSprite, public ConfigListener
 
 extern std::list<BeingCacheEntry*> beingInfoCache;
 
-#endif  // BEING_H
+#endif  // BEING_BEING_H
diff --git a/src/beingcacheentry.h b/src/being/beingcacheentry.h
index d342b1c8d..2890d44a6 100644
--- a/src/beingcacheentry.h
+++ b/src/being/beingcacheentry.h
@@ -18,8 +18,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef BEINGCACHEENTRY_H
-#define BEINGCACHEENTRY_H
+#ifndef BEING_BEINGCACHEENTRY_H
+#define BEING_BEINGCACHEENTRY_H
 
 #include "localconsts.h"
 
@@ -125,4 +125,4 @@ class BeingCacheEntry final
         bool mIsAdvanced;
 };
 
-#endif  // BEINGCACHEENTRY_H
+#endif  // BEING_BEINGCACHEENTRY_H
diff --git a/src/compoundsprite.cpp b/src/being/compoundsprite.cpp
index 9ca7ce8fb..68a0d42e3 100644
--- a/src/compoundsprite.cpp
+++ b/src/being/compoundsprite.cpp
@@ -19,7 +19,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "compoundsprite.h"
+#include "being/compoundsprite.h"
 
 #include "client.h"
 #include "configuration.h"
diff --git a/src/compoundsprite.h b/src/being/compoundsprite.h
index 0c7dc3034..5024f0122 100644
--- a/src/compoundsprite.h
+++ b/src/being/compoundsprite.h
@@ -19,8 +19,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef COMPOUNDSPRITE_H
-#define COMPOUNDSPRITE_H
+#ifndef BEING_COMPOUNDSPRITE_H
+#define BEING_COMPOUNDSPRITE_H
 
 #include "sprite.h"
 
@@ -158,4 +158,4 @@ private:
     bool mDisableBeingCaching;
 };
 
-#endif  // COMPOUNDSPRITE_H
+#endif  // BEING_COMPOUNDSPRITE_H
diff --git a/src/localplayer.cpp b/src/being/localplayer.cpp
index 02c1d6ed9..6a0aa1b19 100644
--- a/src/localplayer.cpp
+++ b/src/being/localplayer.cpp
@@ -20,7 +20,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "localplayer.h"
+#include "being/localplayer.h"
 
 #include "actorspritemanager.h"
 #include "client.h"
@@ -31,14 +31,15 @@
 #include "item.h"
 #include "maplayer.h"
 #include "party.h"
-#include "playerinfo.h"
-#include "playerrelations.h"
 #include "simpleanimation.h"
 #include "soundconsts.h"
 #include "soundmanager.h"
 #include "statuseffect.h"
 #include "walklayer.h"
 
+#include "being/playerinfo.h"
+#include "being/playerrelations.h"
+
 #include "particle/particle.h"
 
 #include "input/keyboardconfig.h"
diff --git a/src/localplayer.h b/src/being/localplayer.h
index 0b036d96e..4f57df0d7 100644
--- a/src/localplayer.h
+++ b/src/being/localplayer.h
@@ -20,13 +20,13 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LOCALPLAYER_H
-#define LOCALPLAYER_H
+#ifndef BEING_LOCALPLAYER_H
+#define BEING_LOCALPLAYER_H
 
-#include "actorspritelistener.h"
-#include "being.h"
 #include "depricatedlistener.h"
-#include "localconsts.h"
+
+#include "being/actorspritelistener.h"
+#include "being/being.h"
 
 #include "gui/userpalette.h"
 
@@ -35,6 +35,8 @@
 #include <memory>
 #include <vector>
 
+#include "localconsts.h"
+
 class ChatTab;
 class FloorItem;
 class ImageSet;
@@ -647,4 +649,4 @@ class LocalPlayer final : public Being,
 
 extern LocalPlayer *player_node;
 
-#endif  // LOCALPLAYER_H
+#endif  // BEING_LOCALPLAYER_H
diff --git a/src/playerinfo.cpp b/src/being/playerinfo.cpp
index eb48c4b30..9abd617a5 100644
--- a/src/playerinfo.cpp
+++ b/src/being/playerinfo.cpp
@@ -19,7 +19,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "playerinfo.h"
+#include "being/playerinfo.h"
 
 #include "client.h"
 #include "configuration.h"
diff --git a/src/playerinfo.h b/src/being/playerinfo.h
index 1c6cbc353..37aa9736c 100644
--- a/src/playerinfo.h
+++ b/src/being/playerinfo.h
@@ -19,8 +19,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PLAYERINFO_H
-#define PLAYERINFO_H
+#ifndef BEING_PLAYERINFO_H
+#define BEING_PLAYERINFO_H
 
 #include "equipment.h"
 
@@ -264,4 +264,4 @@ namespace PlayerInfo
 
 }  // namespace PlayerInfo
 
-#endif  // PLAYERINFO_H
+#endif  // BEING_PLAYERINFO_H
diff --git a/src/playerrelations.cpp b/src/being/playerrelations.cpp
index d20153cad..cdd9ca4bc 100644
--- a/src/playerrelations.cpp
+++ b/src/being/playerrelations.cpp
@@ -20,11 +20,12 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "playerrelations.h"
+#include "being/playerrelations.h"
 
 #include "actorspritemanager.h"
 #include "configuration.h"
-#include "localplayer.h"
+
+#include "being/localplayer.h"
 
 #include "render/graphics.h"
 
diff --git a/src/playerrelations.h b/src/being/playerrelations.h
index 68ec1066a..f7e9eba60 100644
--- a/src/playerrelations.h
+++ b/src/being/playerrelations.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PLAYERRELATIONS_H
-#define PLAYERRELATIONS_H
+#ifndef BEING_PLAYERRELATIONS_H
+#define BEING_PLAYERRELATIONS_H
 
 #include "utils/stringvector.h"
 
@@ -282,4 +282,4 @@ extern PlayerRelationsManager player_relations;  // singleton representation
                                                  // of player relations
 
 
-#endif  // PLAYERRELATIONS_H
+#endif  // BEING_PLAYERRELATIONS_H
diff --git a/src/beingequipbackend.cpp b/src/beingequipbackend.cpp
index 392d23e0f..3092cd47e 100644
--- a/src/beingequipbackend.cpp
+++ b/src/beingequipbackend.cpp
@@ -20,7 +20,7 @@
 
 #include "beingequipbackend.h"
 
-#include "being.h"
+#include "being/being.h"
 
 #include "net/inventoryhandler.h"
 #include "net/net.h"
diff --git a/src/client.cpp b/src/client.cpp
index 93f5d9a51..1dcdcfec3 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -37,13 +37,14 @@
 #include "graphicsvertexes.h"
 #include "itemshortcut.h"
 #include "party.h"
-#include "playerrelations.h"
 #include "soundconsts.h"
 #include "soundmanager.h"
 #include "statuseffect.h"
 #include "units.h"
 #include "touchmanager.h"
 
+#include "being/playerrelations.h"
+
 #include "input/inputmanager.h"
 #include "input/joystick.h"
 #include "input/keyboardconfig.h"
diff --git a/src/commands.cpp b/src/commands.cpp
index d16eeccec..ff8df5faa 100644
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -28,10 +28,11 @@
 #include "configuration.h"
 #include "game.h"
 #include "guildmanager.h"
-#include "localplayer.h"
 #include "main.h"
 #include "party.h"
 
+#include "being/localplayer.h"
+
 #include "gui/buydialog.h"
 #include "gui/chatwindow.h"
 #include "gui/helpwindow.h"
diff --git a/src/commands.h b/src/commands.h
index 8308bd5f1..d196b9c51 100644
--- a/src/commands.h
+++ b/src/commands.h
@@ -23,7 +23,7 @@
 #ifndef COMMANDS_H
 #define COMMANDS_H
 
-#include "playerrelations.h"
+#include "being/playerrelations.h"
 
 #include "input/keydata.h"
 
diff --git a/src/defaults.cpp b/src/defaults.cpp
index 4b2b6fa05..23d8995a5 100644
--- a/src/defaults.cpp
+++ b/src/defaults.cpp
@@ -21,10 +21,11 @@
 
 #include "defaults.h"
 
-#include "being.h"
 #include "client.h"
 #include "graphicsmanager.h"
 
+#include "being/being.h"
+
 #include "input/keydata.h"
 
 #include "render/graphics.h"
diff --git a/src/dropshortcut.cpp b/src/dropshortcut.cpp
index 325014823..585add656 100644
--- a/src/dropshortcut.cpp
+++ b/src/dropshortcut.cpp
@@ -26,8 +26,9 @@
 #include "configuration.h"
 #include "inventory.h"
 #include "item.h"
-#include "localplayer.h"
-#include "playerinfo.h"
+
+#include "being/localplayer.h"
+#include "being/playerinfo.h"
 
 #include "gui/widgets/chattab.h"
 
diff --git a/src/effectmanager.cpp b/src/effectmanager.cpp
index 9d41ac297..346a51d52 100644
--- a/src/effectmanager.cpp
+++ b/src/effectmanager.cpp
@@ -22,11 +22,12 @@
 
 #include "effectmanager.h"
 
-#include "being.h"
 #include "configuration.h"
 #include "logger.h"
 #include "soundmanager.h"
 
+#include "being/being.h"
+
 #include "particle/particle.h"
 
 #include "debug.h"
diff --git a/src/emoteshortcut.cpp b/src/emoteshortcut.cpp
index 9a908ca1b..8fce70aed 100644
--- a/src/emoteshortcut.cpp
+++ b/src/emoteshortcut.cpp
@@ -22,7 +22,8 @@
 #include "emoteshortcut.h"
 
 #include "configuration.h"
-#include "localplayer.h"
+
+#include "being/localplayer.h"
 
 #include "resources/emotedb.h"
 
diff --git a/src/flooritem.h b/src/flooritem.h
index 86fb1703e..c77ed8ac3 100644
--- a/src/flooritem.h
+++ b/src/flooritem.h
@@ -23,7 +23,7 @@
 #ifndef FLOORITEM_H
 #define FLOORITEM_H
 
-#include "actorsprite.h"
+#include "being/actorsprite.h"
 
 #include "resources/cursor.h"
 
diff --git a/src/game.cpp b/src/game.cpp
index a900eb6ed..03f26c981 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -33,12 +33,13 @@
 #include "emoteshortcut.h"
 #include "guildmanager.h"
 #include "itemshortcut.h"
-#include "localplayer.h"
-#include "playerinfo.h"
 #include "soundmanager.h"
 #include "spellshortcut.h"
 #include "touchmanager.h"
 
+#include "being/localplayer.h"
+#include "being/playerinfo.h"
+
 #include "particle/particle.h"
 
 #include "input/inputmanager.h"
diff --git a/src/gui/beingpopup.cpp b/src/gui/beingpopup.cpp
index e5fda9ecf..2297ec9d9 100644
--- a/src/gui/beingpopup.cpp
+++ b/src/gui/beingpopup.cpp
@@ -21,10 +21,11 @@
 
 #include "gui/beingpopup.h"
 
-#include "being.h"
-#include "playerrelations.h"
 #include "units.h"
 
+#include "being/being.h"
+#include "being/playerrelations.h"
+
 #include "gui/gui.h"
 #include "gui/sdlfont.h"
 
diff --git a/src/gui/botcheckerwindow.cpp b/src/gui/botcheckerwindow.cpp
index a18669da0..b378a22ba 100644
--- a/src/gui/botcheckerwindow.cpp
+++ b/src/gui/botcheckerwindow.cpp
@@ -39,7 +39,8 @@
 
 #include "actorspritemanager.h"
 #include "configuration.h"
-#include "localplayer.h"
+
+#include "being/localplayer.h"
 
 #include "utils/gettext.h"
 
diff --git a/src/gui/charcreatedialog.h b/src/gui/charcreatedialog.h
index 82e7d7261..114481772 100644
--- a/src/gui/charcreatedialog.h
+++ b/src/gui/charcreatedialog.h
@@ -23,7 +23,7 @@
 #ifndef GUI_CHARCREATEDIALOG_H
 #define GUI_CHARCREATEDIALOG_H
 
-#include "being.h"
+#include "being/being.h"
 
 #include "gui/charselectdialog.h"
 
diff --git a/src/gui/charselectdialog.h b/src/gui/charselectdialog.h
index 8078a2d21..2a07da188 100644
--- a/src/gui/charselectdialog.h
+++ b/src/gui/charselectdialog.h
@@ -23,9 +23,10 @@
 #ifndef GUI_CHARSELECTDIALOG_H
 #define GUI_CHARSELECTDIALOG_H
 
-#include "being.h"
 #include "main.h"
 
+#include "being/being.h"
+
 #include "gui/widgets/window.h"
 
 #include "net/charserverhandler.h"
diff --git a/src/gui/chatwindow.cpp b/src/gui/chatwindow.cpp
index 8705af925..1065501b7 100644
--- a/src/gui/chatwindow.cpp
+++ b/src/gui/chatwindow.cpp
@@ -29,12 +29,13 @@
 #include "configuration.h"
 #include "game.h"
 #include "guild.h"
-#include "localplayer.h"
 #include "party.h"
-#include "playerinfo.h"
 #include "spellshortcut.h"
 #include "soundmanager.h"
 
+#include "being/localplayer.h"
+#include "being/playerinfo.h"
+
 #include "input/inputmanager.h"
 #include "input/keyevent.h"
 
diff --git a/src/gui/debugwindow.cpp b/src/gui/debugwindow.cpp
index 2cb633589..0d7dee0c2 100644
--- a/src/gui/debugwindow.cpp
+++ b/src/gui/debugwindow.cpp
@@ -24,9 +24,10 @@
 
 #include "client.h"
 #include "game.h"
-#include "localplayer.h"
 #include "main.h"
 
+#include "being/localplayer.h"
+
 #include "particle/particle.h"
 
 #include "gui/setup.h"
diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp
index 8511c7643..af010a2d6 100644
--- a/src/gui/equipmentwindow.cpp
+++ b/src/gui/equipmentwindow.cpp
@@ -22,11 +22,12 @@
 
 #include "gui/equipmentwindow.h"
 
-#include "being.h"
 #include "graphicsvertexes.h"
 #include "inventory.h"
 #include "item.h"
-#include "localplayer.h"
+
+#include "being/being.h"
+#include "being/localplayer.h"
 
 #include "gui/itempopup.h"
 #include "gui/setup.h"
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index bcd2c5108..29b6c58f3 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -23,9 +23,10 @@
 #include "gui/inventorywindow.h"
 
 #include "configuration.h"
-#include "playerinfo.h"
 #include "units.h"
 
+#include "being/playerinfo.h"
+
 #include "input/inputmanager.h"
 #include "input/keyevent.h"
 
diff --git a/src/gui/killstats.cpp b/src/gui/killstats.cpp
index e1472c822..516d9b449 100644
--- a/src/gui/killstats.cpp
+++ b/src/gui/killstats.cpp
@@ -29,8 +29,9 @@
 
 #include "actorspritemanager.h"
 #include "game.h"
-#include "localplayer.h"
-#include "playerinfo.h"
+
+#include "being/localplayer.h"
+#include "being/playerinfo.h"
 
 #include "utils/gettext.h"
 
diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index cca582099..79daa8bf4 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -25,9 +25,10 @@
 #include "actorspritemanager.h"
 #include "client.h"
 #include "configuration.h"
-#include "localplayer.h"
 #include "party.h"
 
+#include "being/localplayer.h"
+
 #include "gui/setup.h"
 #include "gui/viewport.h"
 #include "gui/textpopup.h"
diff --git a/src/gui/ministatuswindow.cpp b/src/gui/ministatuswindow.cpp
index 2c5e0c23a..43ace566c 100644
--- a/src/gui/ministatuswindow.cpp
+++ b/src/gui/ministatuswindow.cpp
@@ -23,8 +23,9 @@
 #include "gui/ministatuswindow.h"
 
 #include "animatedsprite.h"
-#include "localplayer.h"
-#include "playerinfo.h"
+
+#include "being/localplayer.h"
+#include "being/playerinfo.h"
 
 #include "gui/chatwindow.h"
 #include "gui/gui.h"
diff --git a/src/gui/npcdialog.cpp b/src/gui/npcdialog.cpp
index 22cecebd2..f651d8b8e 100644
--- a/src/gui/npcdialog.cpp
+++ b/src/gui/npcdialog.cpp
@@ -23,7 +23,6 @@
 #include "gui/npcdialog.h"
 
 #include "actorspritemanager.h"
-#include "being.h"
 #include "configuration.h"
 #include "client.h"
 #include "inventory.h"
@@ -31,6 +30,8 @@
 #include "soundconsts.h"
 #include "soundmanager.h"
 
+#include "being/being.h"
+
 #include "gui/gui.h"
 #include "gui/inventorywindow.h"
 #include "gui/sdlfont.h"
diff --git a/src/gui/outfitwindow.cpp b/src/gui/outfitwindow.cpp
index c31f1c980..7ad826307 100644
--- a/src/gui/outfitwindow.cpp
+++ b/src/gui/outfitwindow.cpp
@@ -29,8 +29,9 @@
 #include "game.h"
 #include "inventory.h"
 #include "item.h"
-#include "localplayer.h"
-#include "playerinfo.h"
+
+#include "being/localplayer.h"
+#include "being/playerinfo.h"
 
 #include "input/inputmanager.h"
 #include "input/keyboardconfig.h"
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index 54e6f4154..b579e719b 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -30,13 +30,14 @@
 #include "guildmanager.h"
 #include "item.h"
 #include "itemshortcut.h"
-#include "localplayer.h"
 #include "maplayer.h"
 #include "party.h"
-#include "playerinfo.h"
-#include "playerrelations.h"
 #include "spellmanager.h"
 
+#include "being/localplayer.h"
+#include "being/playerinfo.h"
+#include "being/playerrelations.h"
+
 #include "input/inputmanager.h"
 
 #include "gui/buydialog.h"
diff --git a/src/gui/popupmenu.h b/src/gui/popupmenu.h
index bab29fe7c..3f623280c 100644
--- a/src/gui/popupmenu.h
+++ b/src/gui/popupmenu.h
@@ -26,7 +26,7 @@
 #include "gui/widgets/linkhandler.h"
 #include "gui/widgets/popup.h"
 
-#include "actorsprite.h"
+#include "being/actorsprite.h"
 
 #include <guichan/actionlistener.hpp>
 #include <guichan/listmodel.hpp>
diff --git a/src/gui/questswindow.cpp b/src/gui/questswindow.cpp
index d863e3dbd..896d66af3 100644
--- a/src/gui/questswindow.cpp
+++ b/src/gui/questswindow.cpp
@@ -23,9 +23,10 @@
 #include "actorspritemanager.h"
 #include "configuration.h"
 #include "effectmanager.h"
-#include "localplayer.h"
 #include "soundmanager.h"
 
+#include "being/localplayer.h"
+
 #include "gui/gui.h"
 #include "gui/sdlfont.h"
 
diff --git a/src/gui/selldialog.cpp b/src/gui/selldialog.cpp
index f57db6dbd..97b0fbdc1 100644
--- a/src/gui/selldialog.cpp
+++ b/src/gui/selldialog.cpp
@@ -22,10 +22,11 @@
 
 #include "gui/selldialog.h"
 
-#include "playerinfo.h"
 #include "shopitem.h"
 #include "units.h"
 
+#include "being/playerinfo.h"
+
 #include "gui/confirmdialog.h"
 #include "gui/setup.h"
 #include "gui/tradewindow.h"
diff --git a/src/gui/setup_chat.cpp b/src/gui/setup_chat.cpp
index 41000d5dd..91a9dd859 100644
--- a/src/gui/setup_chat.cpp
+++ b/src/gui/setup_chat.cpp
@@ -35,7 +35,8 @@
 #include "gui/widgets/setupitem.h"
 
 #include "configuration.h"
-#include "localplayer.h"
+
+#include "being/localplayer.h"
 
 #include "utils/gettext.h"
 
diff --git a/src/gui/setup_perfomance.cpp b/src/gui/setup_perfomance.cpp
index c58240af9..c53f2a970 100644
--- a/src/gui/setup_perfomance.cpp
+++ b/src/gui/setup_perfomance.cpp
@@ -36,7 +36,8 @@
 #include "gui/widgets/setupitem.h"
 
 #include "configuration.h"
-#include "localplayer.h"
+
+#include "being/localplayer.h"
 
 #include "utils/gettext.h"
 
diff --git a/src/gui/setup_players.cpp b/src/gui/setup_players.cpp
index fb7b9861d..bd2b829fd 100644
--- a/src/gui/setup_players.cpp
+++ b/src/gui/setup_players.cpp
@@ -35,7 +35,8 @@
 #include "gui/widgets/setupitem.h"
 
 #include "configuration.h"
-#include "localplayer.h"
+
+#include "being/localplayer.h"
 
 #include "utils/gettext.h"
 
diff --git a/src/gui/setup_relations.cpp b/src/gui/setup_relations.cpp
index 644817331..af6e0420a 100644
--- a/src/gui/setup_relations.cpp
+++ b/src/gui/setup_relations.cpp
@@ -24,7 +24,8 @@
 
 #include "actorspritemanager.h"
 #include "configuration.h"
-#include "localplayer.h"
+
+#include "being/localplayer.h"
 
 #include "gui/editdialog.h"
 #include "gui/okdialog.h"
diff --git a/src/gui/setup_relations.h b/src/gui/setup_relations.h
index cac44c470..734b06943 100644
--- a/src/gui/setup_relations.h
+++ b/src/gui/setup_relations.h
@@ -23,7 +23,7 @@
 #ifndef GUI_SETUP_RELATIONS_H
 #define GUI_SETUP_RELATIONS_H
 
-#include "playerrelations.h"
+#include "being/playerrelations.h"
 
 #include "gui/widgets/setuptab.h"
 
diff --git a/src/gui/setup_theme.cpp b/src/gui/setup_theme.cpp
index 200b86219..b7cd9bfa1 100644
--- a/src/gui/setup_theme.cpp
+++ b/src/gui/setup_theme.cpp
@@ -35,7 +35,8 @@
 #include "gui/widgets/namesmodel.h"
 
 #include "configuration.h"
-#include "localplayer.h"
+
+#include "being/localplayer.h"
 
 #include "utils/gettext.h"
 
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index 12ae9fe83..594d5ff4d 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -28,7 +28,7 @@
 
 #include "graphicsmanager.h"
 
-#include "localplayer.h"
+#include "being/localplayer.h"
 
 #include "gui/gui.h"
 #include "gui/okdialog.h"
diff --git a/src/gui/setup_video.h b/src/gui/setup_video.h
index 2c0224f06..7974e8e3d 100644
--- a/src/gui/setup_video.h
+++ b/src/gui/setup_video.h
@@ -23,7 +23,7 @@
 #ifndef GUI_SETUP_VIDEO_H
 #define GUI_SETUP_VIDEO_H
 
-#include "being.h"
+#include "being/being.h"
 
 #include "gui/widgets/setuptab.h"
 
diff --git a/src/gui/shopwindow.cpp b/src/gui/shopwindow.cpp
index 04b994b7f..237715141 100644
--- a/src/gui/shopwindow.cpp
+++ b/src/gui/shopwindow.cpp
@@ -45,14 +45,15 @@
 #include "confirmdialog.h"
 #include "inventory.h"
 #include "item.h"
-#include "localplayer.h"
-#include "playerinfo.h"
-#include "playerrelations.h"
 #include "shopitem.h"
 #include "soundconsts.h"
 #include "soundmanager.h"
 #include "units.h"
 
+#include "being/localplayer.h"
+#include "being/playerinfo.h"
+#include "being/playerrelations.h"
+
 #include "net/net.h"
 #include "net/chathandler.h"
 #include "net/npchandler.h"
diff --git a/src/gui/socialwindow.cpp b/src/gui/socialwindow.cpp
index baeaf847f..72bd920d6 100644
--- a/src/gui/socialwindow.cpp
+++ b/src/gui/socialwindow.cpp
@@ -24,10 +24,11 @@
 #include "actorspritemanager.h"
 #include "guild.h"
 #include "guildmanager.h"
-#include "localplayer.h"
 #include "maplayer.h"
 #include "party.h"
-#include "playerrelations.h"
+
+#include "being/localplayer.h"
+#include "being/playerrelations.h"
 
 #include "input/inputmanager.h"
 #include "input/keyboardconfig.h"
diff --git a/src/gui/statuspopup.cpp b/src/gui/statuspopup.cpp
index 3c1479594..2e6569031 100644
--- a/src/gui/statuspopup.cpp
+++ b/src/gui/statuspopup.cpp
@@ -30,9 +30,10 @@
 #include "gui/widgets/layout.h"
 #include "gui/widgets/textbox.h"
 
-#include "localplayer.h"
 #include "units.h"
 
+#include "being/localplayer.h"
+
 #include "input/inputmanager.h"
 #include "input/keyboardconfig.h"
 
diff --git a/src/gui/statuswindow.cpp b/src/gui/statuswindow.cpp
index fe5ec917d..585c950e6 100644
--- a/src/gui/statuswindow.cpp
+++ b/src/gui/statuswindow.cpp
@@ -27,10 +27,11 @@
 #include "equipment.h"
 #include "inventory.h"
 #include "item.h"
-#include "localplayer.h"
-#include "playerinfo.h"
 #include "units.h"
 
+#include "being/localplayer.h"
+#include "being/playerinfo.h"
+
 #include "gui/equipmentwindow.h"
 #include "gui/setup.h"
 #include "gui/viewport.h"
diff --git a/src/gui/textcommandeditor.cpp b/src/gui/textcommandeditor.cpp
index 7ad27c50f..9ba33c830 100644
--- a/src/gui/textcommandeditor.cpp
+++ b/src/gui/textcommandeditor.cpp
@@ -24,10 +24,11 @@
 
 #include "configuration.h"
 #include "item.h"
-#include "localplayer.h"
 #include "main.h"
 #include "spellmanager.h"
 
+#include "being/localplayer.h"
+
 #include "input/keyboardconfig.h"
 
 #include "gui/chatwindow.h"
diff --git a/src/gui/tradewindow.cpp b/src/gui/tradewindow.cpp
index a71b26f60..e60472526 100644
--- a/src/gui/tradewindow.cpp
+++ b/src/gui/tradewindow.cpp
@@ -25,11 +25,12 @@
 #include "configuration.h"
 #include "inventory.h"
 #include "item.h"
-#include "localplayer.h"
-#include "playerinfo.h"
-#include "playerrelations.h"
 #include "units.h"
 
+#include "being/localplayer.h"
+#include "being/playerinfo.h"
+#include "being/playerrelations.h"
+
 #include "gui/gui.h"
 #include "gui/inventorywindow.h"
 #include "gui/itemamountwindow.h"
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index e8ae6bd6c..e210e043b 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -27,11 +27,12 @@
 #include "configuration.h"
 #include "game.h"
 #include "itemshortcut.h"
-#include "localplayer.h"
-#include "playerinfo.h"
 #include "sdlshared.h"
 #include "textmanager.h"
 
+#include "being/localplayer.h"
+#include "being/playerinfo.h"
+
 #include "input/inputmanager.h"
 #include "input/keyboardconfig.h"
 
diff --git a/src/gui/whoisonline.cpp b/src/gui/whoisonline.cpp
index c1ea05881..d045b3876 100644
--- a/src/gui/whoisonline.cpp
+++ b/src/gui/whoisonline.cpp
@@ -36,10 +36,11 @@
 #include "actorspritemanager.h"
 #include "client.h"
 #include "configuration.h"
-#include "localplayer.h"
-#include "playerrelations.h"
 #include "main.h"
 
+#include "being/localplayer.h"
+#include "being/playerrelations.h"
+
 #include "net/download.h"
 #include "net/net.h"
 #include "net/playerhandler.h"
diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp
index 1bb3ca235..aacb3aabe 100644
--- a/src/gui/widgets/avatarlistbox.cpp
+++ b/src/gui/widgets/avatarlistbox.cpp
@@ -24,9 +24,10 @@
 #include "actorspritemanager.h"
 #include "configuration.h"
 #include "guild.h"
-#include "localplayer.h"
 #include "maplayer.h"
 
+#include "being/localplayer.h"
+
 #include "gui/chatwindow.h"
 #include "gui/gui.h"
 #include "gui/sdlfont.h"
diff --git a/src/gui/widgets/battletab.cpp b/src/gui/widgets/battletab.cpp
index 5cc770478..440977c37 100644
--- a/src/gui/widgets/battletab.cpp
+++ b/src/gui/widgets/battletab.cpp
@@ -24,9 +24,10 @@
 
 #include "chatlogger.h"
 #include "configuration.h"
-#include "localplayer.h"
 #include "main.h"
 
+#include "being/localplayer.h"
+
 #include "net/net.h"
 
 #include "resources/iteminfo.h"
diff --git a/src/gui/widgets/chattab.cpp b/src/gui/widgets/chattab.cpp
index 1cb2e9d82..fba603ee6 100644
--- a/src/gui/widgets/chattab.cpp
+++ b/src/gui/widgets/chattab.cpp
@@ -27,10 +27,11 @@
 #include "client.h"
 #include "commandhandler.h"
 #include "configuration.h"
-#include "localplayer.h"
 #include "soundconsts.h"
 #include "soundmanager.h"
 
+#include "being/localplayer.h"
+
 #include "gui/helpwindow.h"
 
 #include "gui/widgets/scrollarea.h"
diff --git a/src/gui/widgets/dropshortcutcontainer.cpp b/src/gui/widgets/dropshortcutcontainer.cpp
index 96d068ade..89fcf1ecd 100644
--- a/src/gui/widgets/dropshortcutcontainer.cpp
+++ b/src/gui/widgets/dropshortcutcontainer.cpp
@@ -25,8 +25,9 @@
 #include "client.h"
 #include "dragdrop.h"
 #include "dropshortcut.h"
-#include "localplayer.h"
-#include "playerinfo.h"
+
+#include "being/localplayer.h"
+#include "being/playerinfo.h"
 
 #include "input/keyboardconfig.h"
 
diff --git a/src/gui/widgets/emoteshortcutcontainer.cpp b/src/gui/widgets/emoteshortcutcontainer.cpp
index d72f5379d..0bdb0aa31 100644
--- a/src/gui/widgets/emoteshortcutcontainer.cpp
+++ b/src/gui/widgets/emoteshortcutcontainer.cpp
@@ -28,7 +28,8 @@
 #include "inventory.h"
 #include "item.h"
 #include "itemshortcut.h"
-#include "localplayer.h"
+
+#include "being/localplayer.h"
 
 #include "input/inputmanager.h"
 #include "input/keyboardconfig.h"
diff --git a/src/gui/widgets/gmtab.cpp b/src/gui/widgets/gmtab.cpp
index 854a67692..ee9d7caa1 100644
--- a/src/gui/widgets/gmtab.cpp
+++ b/src/gui/widgets/gmtab.cpp
@@ -22,7 +22,8 @@
 
 #include "chatlogger.h"
 #include "commands.h"
-#include "localplayer.h"
+
+#include "being/localplayer.h"
 
 #include "net/chathandler.h"
 #include "net/net.h"
diff --git a/src/gui/widgets/guildchattab.cpp b/src/gui/widgets/guildchattab.cpp
index 3e09156fd..6394ac3ad 100644
--- a/src/gui/widgets/guildchattab.cpp
+++ b/src/gui/widgets/guildchattab.cpp
@@ -26,10 +26,11 @@
 #include "configuration.h"
 #include "guild.h"
 #include "guildmanager.h"
-#include "localplayer.h"
 #include "soundconsts.h"
 #include "soundmanager.h"
 
+#include "being/localplayer.h"
+
 #include "resources/iteminfo.h"
 #include "resources/itemdb.h"
 
diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp
index f3fb21336..99aedabcd 100644
--- a/src/gui/widgets/itemcontainer.cpp
+++ b/src/gui/widgets/itemcontainer.cpp
@@ -27,7 +27,8 @@
 #include "inventory.h"
 #include "item.h"
 #include "itemshortcut.h"
-#include "playerinfo.h"
+
+#include "being/playerinfo.h"
 
 #include "gui/chatwindow.h"
 #include "gui/gui.h"
diff --git a/src/gui/widgets/itemshortcutcontainer.cpp b/src/gui/widgets/itemshortcutcontainer.cpp
index 40eaefcf9..0466706df 100644
--- a/src/gui/widgets/itemshortcutcontainer.cpp
+++ b/src/gui/widgets/itemshortcutcontainer.cpp
@@ -29,8 +29,9 @@
 #include "item.h"
 #include "itemshortcut.h"
 #include "spellshortcut.h"
-#include "localplayer.h"
-#include "playerinfo.h"
+
+#include "being/localplayer.h"
+#include "being/playerinfo.h"
 
 #include "input/inputmanager.h"
 #include "input/keyboardconfig.h"
diff --git a/src/gui/widgets/playerbox.cpp b/src/gui/widgets/playerbox.cpp
index 6a5c815d4..31ee7c123 100644
--- a/src/gui/widgets/playerbox.cpp
+++ b/src/gui/widgets/playerbox.cpp
@@ -23,10 +23,11 @@
 #include "gui/widgets/playerbox.h"
 
 #include "animatedsprite.h"
-#include "being.h"
 #include "client.h"
 #include "configuration.h"
 
+#include "being/being.h"
+
 #include "resources/image.h"
 
 #include "utils/dtor.h"
diff --git a/src/gui/widgets/shoplistbox.cpp b/src/gui/widgets/shoplistbox.cpp
index b7e0ad120..2a98b4441 100644
--- a/src/gui/widgets/shoplistbox.cpp
+++ b/src/gui/widgets/shoplistbox.cpp
@@ -24,9 +24,10 @@
 
 #include "client.h"
 #include "configuration.h"
-#include "playerinfo.h"
 #include "shopitem.h"
 
+#include "being/playerinfo.h"
+
 #include "gui/itempopup.h"
 #include "gui/viewport.h"
 
diff --git a/src/gui/widgets/skillinfo.cpp b/src/gui/widgets/skillinfo.cpp
index 809e34b0d..2f0dcb5b5 100644
--- a/src/gui/widgets/skillinfo.cpp
+++ b/src/gui/widgets/skillinfo.cpp
@@ -22,7 +22,7 @@
 
 #include "gui/widgets/skillinfo.h"
 
-#include "playerinfo.h"
+#include "being/playerinfo.h"
 
 #include "gui/widgets/skillmodel.h"
 
diff --git a/src/gui/widgets/skillmodel.cpp b/src/gui/widgets/skillmodel.cpp
index 1792c41fd..c4a298640 100644
--- a/src/gui/widgets/skillmodel.cpp
+++ b/src/gui/widgets/skillmodel.cpp
@@ -25,8 +25,9 @@
 #include "configuration.h"
 #include "effectmanager.h"
 #include "itemshortcut.h"
-#include "localplayer.h"
-#include "playerinfo.h"
+
+#include "being/localplayer.h"
+#include "being/playerinfo.h"
 
 #include "gui/setup.h"
 #include "gui/shortcutwindow.h"
diff --git a/src/gui/widgets/skillmodel.h b/src/gui/widgets/skillmodel.h
index da5779672..8e6debb7e 100644
--- a/src/gui/widgets/skillmodel.h
+++ b/src/gui/widgets/skillmodel.h
@@ -26,8 +26,9 @@
 #include "configuration.h"
 #include "effectmanager.h"
 #include "itemshortcut.h"
-#include "localplayer.h"
-#include "playerinfo.h"
+
+#include "being/localplayer.h"
+#include "being/playerinfo.h"
 
 #include "gui/setup.h"
 #include "gui/shortcutwindow.h"
diff --git a/src/gui/widgets/spellshortcutcontainer.cpp b/src/gui/widgets/spellshortcutcontainer.cpp
index 0ffb25b1d..433001f3b 100644
--- a/src/gui/widgets/spellshortcutcontainer.cpp
+++ b/src/gui/widgets/spellshortcutcontainer.cpp
@@ -25,9 +25,10 @@
 #include "client.h"
 #include "dragdrop.h"
 #include "itemshortcut.h"
-#include "localplayer.h"
 #include "spellshortcut.h"
 
+#include "being/localplayer.h"
+
 #include "input/keyboardconfig.h"
 
 #include "gui/inventorywindow.h"
diff --git a/src/gui/widgets/tradetab.cpp b/src/gui/widgets/tradetab.cpp
index e2ef34536..61becb7da 100644
--- a/src/gui/widgets/tradetab.cpp
+++ b/src/gui/widgets/tradetab.cpp
@@ -23,7 +23,8 @@
 #include "gui/widgets/tradetab.h"
 
 #include "chatlogger.h"
-#include "localplayer.h"
+
+#include "being/localplayer.h"
 
 #include "net/net.h"
 
diff --git a/src/gui/widgets/whispertab.cpp b/src/gui/widgets/whispertab.cpp
index dbca226a8..b836ee729 100644
--- a/src/gui/widgets/whispertab.cpp
+++ b/src/gui/widgets/whispertab.cpp
@@ -24,7 +24,8 @@
 
 #include "chatlogger.h"
 #include "commands.h"
-#include "localplayer.h"
+
+#include "being/localplayer.h"
 
 #include "net/chathandler.h"
 #include "net/net.h"
diff --git a/src/guildmanager.cpp b/src/guildmanager.cpp
index 57c687e12..5d83a9fd7 100644
--- a/src/guildmanager.cpp
+++ b/src/guildmanager.cpp
@@ -24,9 +24,10 @@
 #include "client.h"
 #include "configuration.h"
 #include "guild.h"
-#include "localplayer.h"
 #include "notifymanager.h"
 
+#include "being/localplayer.h"
+
 #include "gui/socialwindow.h"
 
 #include "gui/widgets/guildchattab.h"
diff --git a/src/input/inputmanager.cpp b/src/input/inputmanager.cpp
index 561437124..66bd67efb 100644
--- a/src/input/inputmanager.cpp
+++ b/src/input/inputmanager.cpp
@@ -23,9 +23,10 @@
 #include "client.h"
 #include "configuration.h"
 #include "game.h"
-#include "localplayer.h"
 #include "touchmanager.h"
 
+#include "being/localplayer.h"
+
 #include "input/joystick.h"
 #include "input/keyboardconfig.h"
 #include "input/keyboarddata.h"
diff --git a/src/inventory.h b/src/inventory.h
index 6f71c6682..f6dd11017 100644
--- a/src/inventory.h
+++ b/src/inventory.h
@@ -23,7 +23,7 @@
 #ifndef INVENTORY_H
 #define INVENTORY_H
 
-#include "being.h"
+#include "being/being.h"
 
 #include <list>
 #include <string>
diff --git a/src/itemshortcut.cpp b/src/itemshortcut.cpp
index 2ba3cbe9a..9332211ce 100644
--- a/src/itemshortcut.cpp
+++ b/src/itemshortcut.cpp
@@ -26,9 +26,10 @@
 #include "inventory.h"
 #include "item.h"
 #include "logger.h"
-#include "playerinfo.h"
 #include "spellmanager.h"
 
+#include "being/playerinfo.h"
+
 #include "gui/skilldialog.h"
 
 #include "net/inventoryhandler.h"
diff --git a/src/map.cpp b/src/map.cpp
index 30508e07a..189981f80 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -24,13 +24,14 @@
 
 #include "client.h"
 #include "configuration.h"
-#include "localplayer.h"
 #include "maplayer.h"
 #include "notifymanager.h"
 #include "simpleanimation.h"
 #include "tileset.h"
 #include "walklayer.h"
 
+#include "being/localplayer.h"
+
 #include "particle/particle.h"
 
 #include "resources/ambientlayer.h"
diff --git a/src/map.h b/src/map.h
index e14b3c18d..2a954b7c4 100644
--- a/src/map.h
+++ b/src/map.h
@@ -23,11 +23,12 @@
 #ifndef MAP_H
 #define MAP_H
 
-#include "actor.h"
 #include "configlistener.h"
 #include "position.h"
 #include "properties.h"
 
+#include "being/actor.h"
+
 #include <string>
 #include <vector>
 
diff --git a/src/maplayer.cpp b/src/maplayer.cpp
index 10aa6b4c9..332bf3547 100644
--- a/src/maplayer.cpp
+++ b/src/maplayer.cpp
@@ -29,7 +29,7 @@
 #include "render/graphics.h"
 #endif
 
-#include "localplayer.h"
+#include "being/localplayer.h"
 
 #include "resources/resourcemanager.h"
 
diff --git a/src/maplayer.h b/src/maplayer.h
index b36ab0cc7..d20531e98 100644
--- a/src/maplayer.h
+++ b/src/maplayer.h
@@ -23,11 +23,12 @@
 #ifndef MAPLAYER_H
 #define MAPLAYER_H
 
-#include "actor.h"
 #include "configlistener.h"
 #include "position.h"
 #include "main.h"
 
+#include "being/actor.h"
+
 #include <string>
 #include <vector>
 
diff --git a/src/net/beinghandler.h b/src/net/beinghandler.h
index 31a31fcc2..cf5b285b1 100644
--- a/src/net/beinghandler.h
+++ b/src/net/beinghandler.h
@@ -22,7 +22,8 @@
 #ifndef NET_BEINGHANDLER_H
 #define NET_BEINGHANDLER_H
 
-#include "being.h"
+#include "being/being.h"
+
 #include "net/messagein.h"
 
 namespace Net
diff --git a/src/net/charserverhandler.h b/src/net/charserverhandler.h
index 2dee5c05e..aa05ba7f5 100644
--- a/src/net/charserverhandler.h
+++ b/src/net/charserverhandler.h
@@ -23,8 +23,8 @@
 #ifndef NET_CHARSERVERHANDLER_H
 #define NET_CHARSERVERHANDLER_H
 
-#include "localplayer.h"
-#include "playerinfo.h"
+#include "being/localplayer.h"
+#include "being/playerinfo.h"
 
 #include <iosfwd>
 #include <string>
diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp
index 3dee60dfa..7c5c2598c 100644
--- a/src/net/ea/beinghandler.cpp
+++ b/src/net/ea/beinghandler.cpp
@@ -26,14 +26,15 @@
 
 #include "actorspritemanager.h"
 #include "client.h"
+#include "configuration.h"
 #include "effectmanager.h"
 #include "game.h"
 #include "guild.h"
 #include "guildmanager.h"
-#include "localplayer.h"
 #include "party.h"
-#include "playerrelations.h"
-#include "configuration.h"
+
+#include "being/localplayer.h"
+#include "being/playerrelations.h"
 
 #include "particle/particle.h"
 
diff --git a/src/net/ea/buysellhandler.cpp b/src/net/ea/buysellhandler.cpp
index 6a68355dd..892422f76 100644
--- a/src/net/ea/buysellhandler.cpp
+++ b/src/net/ea/buysellhandler.cpp
@@ -26,9 +26,10 @@
 #include "client.h"
 #include "configuration.h"
 #include "inventory.h"
-#include "localplayer.h"
 #include "notifymanager.h"
-#include "playerinfo.h"
+
+#include "being/localplayer.h"
+#include "being/playerinfo.h"
 
 #include "gui/buydialog.h"
 #include "gui/buyselldialog.h"
diff --git a/src/net/ea/buysellhandler.h b/src/net/ea/buysellhandler.h
index 8cb4b2951..f46a8dcb4 100644
--- a/src/net/ea/buysellhandler.h
+++ b/src/net/ea/buysellhandler.h
@@ -25,7 +25,7 @@
 
 #include "net/buysellhandler.h"
 
-#include "being.h"
+#include "being/being.h"
 
 #include "net/net.h"
 
diff --git a/src/net/ea/chathandler.cpp b/src/net/ea/chathandler.cpp
index 72a1e49b7..c8259bc91 100644
--- a/src/net/ea/chathandler.cpp
+++ b/src/net/ea/chathandler.cpp
@@ -25,9 +25,10 @@
 #include "actorspritemanager.h"
 #include "configuration.h"
 #include "guildmanager.h"
-#include "localplayer.h"
 #include "notifymanager.h"
-#include "playerrelations.h"
+
+#include "being/localplayer.h"
+#include "being/playerrelations.h"
 
 #include "gui/chatwindow.h"
 #include "gui/shopwindow.h"
diff --git a/src/net/ea/gamehandler.cpp b/src/net/ea/gamehandler.cpp
index df2c4ec47..1909cd6df 100644
--- a/src/net/ea/gamehandler.cpp
+++ b/src/net/ea/gamehandler.cpp
@@ -24,9 +24,10 @@
 
 #include "client.h"
 #include "game.h"
-#include "localplayer.h"
 #include "notifymanager.h"
 
+#include "being/localplayer.h"
+
 #include "gui/okdialog.h"
 
 #include "debug.h"
diff --git a/src/net/ea/gui/guildtab.cpp b/src/net/ea/gui/guildtab.cpp
index 802236212..615d0334b 100644
--- a/src/net/ea/gui/guildtab.cpp
+++ b/src/net/ea/gui/guildtab.cpp
@@ -25,10 +25,11 @@
 #include "chatlogger.h"
 #include "configuration.h"
 #include "guild.h"
-#include "localplayer.h"
 #include "soundconsts.h"
 #include "soundmanager.h"
 
+#include "being/localplayer.h"
+
 #include "net/net.h"
 
 #include "net/ea/guildhandler.h"
diff --git a/src/net/ea/gui/partytab.cpp b/src/net/ea/gui/partytab.cpp
index d21e82d20..c41fad098 100644
--- a/src/net/ea/gui/partytab.cpp
+++ b/src/net/ea/gui/partytab.cpp
@@ -24,11 +24,12 @@
 
 #include "chatlogger.h"
 #include "commandhandler.h"
-#include "localplayer.h"
 #include "party.h"
 #include "soundconsts.h"
 #include "soundmanager.h"
 
+#include "being/localplayer.h"
+
 #include "net/net.h"
 #include "net/partyhandler.h"
 
diff --git a/src/net/ea/guildhandler.cpp b/src/net/ea/guildhandler.cpp
index e19b44592..4dc0f7f6e 100644
--- a/src/net/ea/guildhandler.cpp
+++ b/src/net/ea/guildhandler.cpp
@@ -23,9 +23,10 @@
 
 #include "actorspritemanager.h"
 #include "configuration.h"
-#include "localplayer.h"
 #include "notifymanager.h"
 
+#include "being/localplayer.h"
+
 #include "gui/socialwindow.h"
 
 #include "debug.h"
diff --git a/src/net/ea/inventoryhandler.cpp b/src/net/ea/inventoryhandler.cpp
index 65f0d87a0..d2bcd6a23 100644
--- a/src/net/ea/inventoryhandler.cpp
+++ b/src/net/ea/inventoryhandler.cpp
@@ -22,9 +22,10 @@
 
 #include "net/ea/inventoryhandler.h"
 
-#include "localplayer.h"
 #include "notifymanager.h"
 
+#include "being/localplayer.h"
+
 #include "gui/ministatuswindow.h"
 
 #include "net/ea/eaprotocol.h"
diff --git a/src/net/ea/inventoryhandler.h b/src/net/ea/inventoryhandler.h
index b21ba2fbc..7c3af78ec 100644
--- a/src/net/ea/inventoryhandler.h
+++ b/src/net/ea/inventoryhandler.h
@@ -26,7 +26,8 @@
 #include "equipment.h"
 #include "inventory.h"
 #include "localconsts.h"
-#include "playerinfo.h"
+
+#include "being/playerinfo.h"
 
 #include "gui/inventorywindow.h"
 
diff --git a/src/net/ea/partyhandler.cpp b/src/net/ea/partyhandler.cpp
index 7eee0d4e7..0a87bf370 100644
--- a/src/net/ea/partyhandler.cpp
+++ b/src/net/ea/partyhandler.cpp
@@ -23,9 +23,10 @@
 
 #include "actorspritemanager.h"
 #include "configuration.h"
-#include "localplayer.h"
 #include "notifymanager.h"
 
+#include "being/localplayer.h"
+
 #include "gui/socialwindow.h"
 
 #include "debug.h"
diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp
index 2d477ad4a..5106e0ecc 100644
--- a/src/net/ea/playerhandler.cpp
+++ b/src/net/ea/playerhandler.cpp
@@ -23,11 +23,12 @@
 #include "net/ea/playerhandler.h"
 
 #include "game.h"
-#include "localplayer.h"
 #include "party.h"
 #include "notifymanager.h"
 #include "units.h"
 
+#include "being/localplayer.h"
+
 #include "gui/ministatuswindow.h"
 #include "gui/okdialog.h"
 #include "gui/npcdialog.h"
diff --git a/src/net/ea/skillhandler.cpp b/src/net/ea/skillhandler.cpp
index 68597dd85..e363385e1 100644
--- a/src/net/ea/skillhandler.cpp
+++ b/src/net/ea/skillhandler.cpp
@@ -23,9 +23,10 @@
 #include "net/ea/skillhandler.h"
 
 #include "logger.h"
-#include "localplayer.h"
 #include "notifymanager.h"
-#include "playerinfo.h"
+
+#include "being/localplayer.h"
+#include "being/playerinfo.h"
 
 #include "gui/skilldialog.h"
 
diff --git a/src/net/ea/token.h b/src/net/ea/token.h
index c358ef8a7..0de35d379 100644
--- a/src/net/ea/token.h
+++ b/src/net/ea/token.h
@@ -20,7 +20,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "being.h"
+#include "being/being.h"
 
 #ifndef NET_EA_TOKEN_H
 #define NET_EA_TOKEN_H
diff --git a/src/net/ea/tradehandler.cpp b/src/net/ea/tradehandler.cpp
index 4fa92e7d8..d22bf71ea 100644
--- a/src/net/ea/tradehandler.cpp
+++ b/src/net/ea/tradehandler.cpp
@@ -26,8 +26,9 @@
 #include "item.h"
 #include "logger.h"
 #include "notifymanager.h"
-#include "playerinfo.h"
-#include "playerrelations.h"
+
+#include "being/playerinfo.h"
+#include "being/playerrelations.h"
 
 #include "gui/confirmdialog.h"
 #include "gui/tradewindow.h"
diff --git a/src/net/eathena/adminhandler.cpp b/src/net/eathena/adminhandler.cpp
index 4661cd5b8..e52945a98 100644
--- a/src/net/eathena/adminhandler.cpp
+++ b/src/net/eathena/adminhandler.cpp
@@ -25,7 +25,8 @@
 #include "actorspritemanager.h"
 #include "game.h"
 #include "notifymanager.h"
-#include "playerrelations.h"
+
+#include "being/playerrelations.h"
 
 #include "net/chathandler.h"
 
diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp
index 68c3f1a02..bc4d6d442 100644
--- a/src/net/eathena/beinghandler.cpp
+++ b/src/net/eathena/beinghandler.cpp
@@ -24,13 +24,14 @@
 
 #include "actorspritemanager.h"
 #include "client.h"
+#include "configuration.h"
 #include "effectmanager.h"
 #include "guild.h"
 #include "guildmanager.h"
-#include "localplayer.h"
 #include "party.h"
-#include "playerrelations.h"
-#include "configuration.h"
+
+#include "being/localplayer.h"
+#include "being/playerrelations.h"
 
 #include "input/keyboardconfig.h"
 
diff --git a/src/net/eathena/buysellhandler.cpp b/src/net/eathena/buysellhandler.cpp
index 0b1c4ad06..8b44ac409 100644
--- a/src/net/eathena/buysellhandler.cpp
+++ b/src/net/eathena/buysellhandler.cpp
@@ -25,9 +25,10 @@
 #include "actorspritemanager.h"
 #include "configuration.h"
 #include "inventory.h"
-#include "localplayer.h"
 #include "notifymanager.h"
-#include "playerinfo.h"
+
+#include "being/localplayer.h"
+#include "being/playerinfo.h"
 
 #include "gui/buydialog.h"
 #include "gui/buyselldialog.h"
diff --git a/src/net/eathena/chathandler.cpp b/src/net/eathena/chathandler.cpp
index eae8e7ffc..ebcc900de 100644
--- a/src/net/eathena/chathandler.cpp
+++ b/src/net/eathena/chathandler.cpp
@@ -25,8 +25,9 @@
 #include "actorspritemanager.h"
 #include "configuration.h"
 #include "game.h"
-#include "localplayer.h"
-#include "playerrelations.h"
+
+#include "being/localplayer.h"
+#include "being/playerrelations.h"
 
 #include "gui/chatwindow.h"
 #include "gui/shopwindow.h"
diff --git a/src/net/eathena/gamehandler.cpp b/src/net/eathena/gamehandler.cpp
index 4b9bcb80f..9f501a4e0 100644
--- a/src/net/eathena/gamehandler.cpp
+++ b/src/net/eathena/gamehandler.cpp
@@ -24,7 +24,8 @@
 
 #include "client.h"
 #include "game.h"
-#include "localplayer.h"
+
+#include "being/localplayer.h"
 
 #include "net/eathena/loginhandler.h"
 #include "net/eathena/network.h"
diff --git a/src/net/eathena/gui/guildtab.cpp b/src/net/eathena/gui/guildtab.cpp
index f946e1f8e..542a9327b 100644
--- a/src/net/eathena/gui/guildtab.cpp
+++ b/src/net/eathena/gui/guildtab.cpp
@@ -24,7 +24,8 @@
 
 #include "chatlogger.h"
 #include "guild.h"
-#include "localplayer.h"
+
+#include "being/localplayer.h"
 
 #include "net/net.h"
 #include "net/guildhandler.h"
diff --git a/src/net/eathena/gui/partytab.cpp b/src/net/eathena/gui/partytab.cpp
index 157869a96..420e19fea 100644
--- a/src/net/eathena/gui/partytab.cpp
+++ b/src/net/eathena/gui/partytab.cpp
@@ -23,9 +23,10 @@
 #include "net/eathena/gui/partytab.h"
 
 #include "chatlogger.h"
-#include "localplayer.h"
 #include "party.h"
 
+#include "being/localplayer.h"
+
 #include "net/net.h"
 #include "net/partyhandler.h"
 
diff --git a/src/net/eathena/guildhandler.cpp b/src/net/eathena/guildhandler.cpp
index 5deb326fa..22d6bc360 100644
--- a/src/net/eathena/guildhandler.cpp
+++ b/src/net/eathena/guildhandler.cpp
@@ -22,8 +22,9 @@
 #include "net/eathena/guildhandler.h"
 
 #include "actorspritemanager.h"
-#include "localplayer.h"
-#include "playerinfo.h"
+
+#include "being/localplayer.h"
+#include "being/playerinfo.h"
 
 #include "net/eathena/messagein.h"
 #include "net/eathena/protocol.h"
diff --git a/src/net/eathena/npchandler.cpp b/src/net/eathena/npchandler.cpp
index 2543c3b41..ea480103e 100644
--- a/src/net/eathena/npchandler.cpp
+++ b/src/net/eathena/npchandler.cpp
@@ -22,7 +22,7 @@
 
 #include "net/eathena/npchandler.h"
 
-#include "localplayer.h"
+#include "being/localplayer.h"
 
 #include "gui/npcdialog.h"
 #include "gui/viewport.h"
diff --git a/src/net/eathena/partyhandler.cpp b/src/net/eathena/partyhandler.cpp
index 26e5ed981..e00fd4119 100644
--- a/src/net/eathena/partyhandler.cpp
+++ b/src/net/eathena/partyhandler.cpp
@@ -22,9 +22,10 @@
 #include "net/eathena/partyhandler.h"
 
 #include "actorspritemanager.h"
-#include "localplayer.h"
 #include "notifymanager.h"
 
+#include "being/localplayer.h"
+
 #include "net/eathena/protocol.h"
 
 #include "net/eathena/gui/partytab.h"
diff --git a/src/net/eathena/tradehandler.cpp b/src/net/eathena/tradehandler.cpp
index df0364af5..3698153da 100644
--- a/src/net/eathena/tradehandler.cpp
+++ b/src/net/eathena/tradehandler.cpp
@@ -23,7 +23,8 @@
 #include "net/eathena/tradehandler.h"
 
 #include "item.h"
-#include "playerinfo.h"
+
+#include "being/playerinfo.h"
 
 #include "net/eathena/protocol.h"
 
diff --git a/src/net/logindata.h b/src/net/logindata.h
index abe6b6ee7..9964c9842 100644
--- a/src/net/logindata.h
+++ b/src/net/logindata.h
@@ -23,7 +23,7 @@
 #ifndef NET_LOGINDATA_H
 #define NET_LOGINDATA_H
 
-#include "being.h"
+#include "being/being.h"
 
 #include <string>
 
diff --git a/src/net/playerhandler.h b/src/net/playerhandler.h
index 7c20224ac..3bb1df208 100644
--- a/src/net/playerhandler.h
+++ b/src/net/playerhandler.h
@@ -23,9 +23,10 @@
 #ifndef NET_PLAYERHANDLER_H
 #define NET_PLAYERHANDLER_H
 
-#include "being.h"
 #include "flooritem.h"
-#include "playerinfo.h"
+
+#include "being/being.h"
+#include "being/playerinfo.h"
 
 namespace Net
 {
diff --git a/src/net/tmwa/adminhandler.cpp b/src/net/tmwa/adminhandler.cpp
index c156b9f51..1c48284b7 100644
--- a/src/net/tmwa/adminhandler.cpp
+++ b/src/net/tmwa/adminhandler.cpp
@@ -25,7 +25,8 @@
 #include "actorspritemanager.h"
 #include "game.h"
 #include "notifymanager.h"
-#include "playerrelations.h"
+
+#include "being/playerrelations.h"
 
 #include "net/chathandler.h"
 
diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp
index dea944932..678be6cc4 100644
--- a/src/net/tmwa/beinghandler.cpp
+++ b/src/net/tmwa/beinghandler.cpp
@@ -24,13 +24,14 @@
 
 #include "actorspritemanager.h"
 #include "client.h"
+#include "configuration.h"
 #include "effectmanager.h"
 #include "guild.h"
 #include "guildmanager.h"
-#include "localplayer.h"
 #include "party.h"
-#include "playerrelations.h"
-#include "configuration.h"
+
+#include "being/localplayer.h"
+#include "being/playerrelations.h"
 
 #include "input/keyboardconfig.h"
 
diff --git a/src/net/tmwa/buysellhandler.cpp b/src/net/tmwa/buysellhandler.cpp
index 8bb426bef..46a95b44d 100644
--- a/src/net/tmwa/buysellhandler.cpp
+++ b/src/net/tmwa/buysellhandler.cpp
@@ -25,9 +25,10 @@
 #include "actorspritemanager.h"
 #include "configuration.h"
 #include "inventory.h"
-#include "localplayer.h"
 #include "notifymanager.h"
-#include "playerinfo.h"
+
+#include "being/localplayer.h"
+#include "being/playerinfo.h"
 
 #include "gui/buydialog.h"
 #include "gui/buyselldialog.h"
diff --git a/src/net/tmwa/chathandler.cpp b/src/net/tmwa/chathandler.cpp
index 8c455a186..aeea1b58e 100644
--- a/src/net/tmwa/chathandler.cpp
+++ b/src/net/tmwa/chathandler.cpp
@@ -25,8 +25,9 @@
 #include "actorspritemanager.h"
 #include "configuration.h"
 #include "game.h"
-#include "localplayer.h"
-#include "playerrelations.h"
+
+#include "being/localplayer.h"
+#include "being/playerrelations.h"
 
 #include "gui/chatwindow.h"
 #include "gui/shopwindow.h"
diff --git a/src/net/tmwa/gamehandler.cpp b/src/net/tmwa/gamehandler.cpp
index b066db36b..57771559d 100644
--- a/src/net/tmwa/gamehandler.cpp
+++ b/src/net/tmwa/gamehandler.cpp
@@ -24,7 +24,8 @@
 
 #include "client.h"
 #include "game.h"
-#include "localplayer.h"
+
+#include "being/localplayer.h"
 
 #include "net/tmwa/loginhandler.h"
 #include "net/tmwa/network.h"
diff --git a/src/net/tmwa/gui/guildtab.cpp b/src/net/tmwa/gui/guildtab.cpp
index 08a42eadc..cc907295f 100644
--- a/src/net/tmwa/gui/guildtab.cpp
+++ b/src/net/tmwa/gui/guildtab.cpp
@@ -24,7 +24,8 @@
 
 #include "chatlogger.h"
 #include "guild.h"
-#include "localplayer.h"
+
+#include "being/localplayer.h"
 
 #include "net/net.h"
 #include "net/guildhandler.h"
diff --git a/src/net/tmwa/gui/partytab.cpp b/src/net/tmwa/gui/partytab.cpp
index 348e5cbfb..e0c28ab4a 100644
--- a/src/net/tmwa/gui/partytab.cpp
+++ b/src/net/tmwa/gui/partytab.cpp
@@ -23,9 +23,10 @@
 #include "net/tmwa/gui/partytab.h"
 
 #include "chatlogger.h"
-#include "localplayer.h"
 #include "party.h"
 
+#include "being/localplayer.h"
+
 #include "net/net.h"
 #include "net/partyhandler.h"
 
diff --git a/src/net/tmwa/guildhandler.cpp b/src/net/tmwa/guildhandler.cpp
index 6761105e1..73b82bfbc 100644
--- a/src/net/tmwa/guildhandler.cpp
+++ b/src/net/tmwa/guildhandler.cpp
@@ -22,8 +22,9 @@
 #include "net/tmwa/guildhandler.h"
 
 #include "actorspritemanager.h"
-#include "localplayer.h"
-#include "playerinfo.h"
+
+#include "being/localplayer.h"
+#include "being/playerinfo.h"
 
 #include "net/tmwa/messagein.h"
 #include "net/tmwa/protocol.h"
diff --git a/src/net/tmwa/npchandler.cpp b/src/net/tmwa/npchandler.cpp
index e22036619..2f4fc2e70 100644
--- a/src/net/tmwa/npchandler.cpp
+++ b/src/net/tmwa/npchandler.cpp
@@ -22,7 +22,7 @@
 
 #include "net/tmwa/npchandler.h"
 
-#include "localplayer.h"
+#include "being/localplayer.h"
 
 #include "gui/npcdialog.h"
 #include "gui/viewport.h"
diff --git a/src/net/tmwa/partyhandler.cpp b/src/net/tmwa/partyhandler.cpp
index 39a580ebf..1b29cde46 100644
--- a/src/net/tmwa/partyhandler.cpp
+++ b/src/net/tmwa/partyhandler.cpp
@@ -22,9 +22,10 @@
 #include "net/tmwa/partyhandler.h"
 
 #include "actorspritemanager.h"
-#include "localplayer.h"
 #include "notifymanager.h"
 
+#include "being/localplayer.h"
+
 #include "net/tmwa/protocol.h"
 
 #include "net/tmwa/gui/partytab.h"
diff --git a/src/net/tmwa/questhandler.cpp b/src/net/tmwa/questhandler.cpp
index 378f53f97..9a5f52330 100644
--- a/src/net/tmwa/questhandler.cpp
+++ b/src/net/tmwa/questhandler.cpp
@@ -20,7 +20,7 @@
 
 #include "net/tmwa/questhandler.h"
 
-#include "localplayer.h"
+#include "being/localplayer.h"
 
 #include "gui/skilldialog.h"
 #include "gui/questswindow.h"
diff --git a/src/net/tmwa/tradehandler.cpp b/src/net/tmwa/tradehandler.cpp
index 33c08382e..3d49a63d0 100644
--- a/src/net/tmwa/tradehandler.cpp
+++ b/src/net/tmwa/tradehandler.cpp
@@ -23,7 +23,8 @@
 #include "net/tmwa/tradehandler.h"
 
 #include "item.h"
-#include "playerinfo.h"
+
+#include "being/playerinfo.h"
 
 #include "net/tmwa/protocol.h"
 
diff --git a/src/net/tradehandler.h b/src/net/tradehandler.h
index f896e190c..801eba9c1 100644
--- a/src/net/tradehandler.h
+++ b/src/net/tradehandler.h
@@ -23,7 +23,7 @@
 #ifndef NET_TRADEHANDLER_H
 #define NET_TRADEHANDLER_H
 
-#include "being.h"
+#include "being/being.h"
 
 #include <iosfwd>
 
diff --git a/src/notifymanager.cpp b/src/notifymanager.cpp
index 483ec921a..6c99532f7 100644
--- a/src/notifymanager.cpp
+++ b/src/notifymanager.cpp
@@ -21,9 +21,10 @@
 #include "notifymanager.h"
 
 #include "guildmanager.h"
-#include "localplayer.h"
 #include "soundmanager.h"
 
+#include "being/localplayer.h"
+
 #include "gui/widgets/chattab.h"
 
 #include "net/guildhandler.h"
diff --git a/src/particle/particle.h b/src/particle/particle.h
index 29cc7c0b4..116dd875a 100644
--- a/src/particle/particle.h
+++ b/src/particle/particle.h
@@ -23,7 +23,8 @@
 #ifndef PARTICLE_PARTICLE_H
 #define PARTICLE_PARTICLE_H
 
-#include "actor.h"
+#include "being/actor.h"
+
 #include "localconsts.h"
 
 #include <list>
diff --git a/src/resources/beinginfo.h b/src/resources/beinginfo.h
index e9f1a6055..a475a573a 100644
--- a/src/resources/beinginfo.h
+++ b/src/resources/beinginfo.h
@@ -23,7 +23,7 @@
 #ifndef RESOURCES_BEINGINFO_H
 #define RESOURCES_BEINGINFO_H
 
-#include "actorsprite.h"
+#include "being/actorsprite.h"
 
 #include "resources/colordb.h"
 #include "resources/cursor.h"
diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h
index a38f32e66..d0b305c49 100644
--- a/src/resources/iteminfo.h
+++ b/src/resources/iteminfo.h
@@ -23,7 +23,7 @@
 #ifndef RESOURCES_ITEMINFO_H
 #define RESOURCES_ITEMINFO_H
 
-#include "being.h"
+#include "being/being.h"
 
 #include "resources/colordb.h"
 
diff --git a/src/soundmanager.cpp b/src/soundmanager.cpp
index 8575edd2b..c7328b78f 100644
--- a/src/soundmanager.cpp
+++ b/src/soundmanager.cpp
@@ -23,7 +23,8 @@
 #include "soundmanager.h"
 
 #include "configuration.h"
-#include "localplayer.h"
+
+#include "being/localplayer.h"
 
 #include "resources/sdlmusic.h"
 #include "resources/resourcemanager.h"
diff --git a/src/spellmanager.cpp b/src/spellmanager.cpp
index 23eb90ad1..b72d8ec40 100644
--- a/src/spellmanager.cpp
+++ b/src/spellmanager.cpp
@@ -23,8 +23,9 @@
 #include "spellmanager.h"
 
 #include "configuration.h"
-#include "localplayer.h"
-#include "playerinfo.h"
+
+#include "being/localplayer.h"
+#include "being/playerinfo.h"
 
 #include "gui/chatwindow.h"
 
diff --git a/src/spellmanager.h b/src/spellmanager.h
index d2320e8a1..db4abff1c 100644
--- a/src/spellmanager.h
+++ b/src/spellmanager.h
@@ -25,9 +25,10 @@
 
 #include <string>
 #include <vector>
+
 #include "textcommand.h"
 
-#include "being.h"
+#include "being/being.h"
 
 const int SPELL_MIN_ID = 100000;
 const unsigned int SPELL_SHORTCUT_ITEMS = 49;
diff --git a/src/spellshortcut.cpp b/src/spellshortcut.cpp
index ffcc4ca49..fa76d2fd1 100644
--- a/src/spellshortcut.cpp
+++ b/src/spellshortcut.cpp
@@ -25,7 +25,8 @@
 #include "configuration.h"
 #include "inventory.h"
 #include "item.h"
-#include "localplayer.h"
+
+#include "being/localplayer.h"
 
 #include "gui/widgets/chattab.h"