1 files changed, 34 insertions, 21 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c9f23cc1..d1e690bc 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -301,8 +301,6 @@ SET(SRCS
     gui/textdialog.h
     gui/textpopup.cpp
     gui/textpopup.h
-    gui/theme.cpp
-    gui/theme.h
     gui/trade.cpp
     gui/trade.h
     gui/truetypefont.cpp
@@ -311,8 +309,6 @@ SET(SRCS
     gui/unregisterdialog.h
     gui/updatewindow.cpp
     gui/updatewindow.h
-    gui/userpalette.cpp
-    gui/userpalette.h
     gui/viewport.cpp
     gui/viewport.h
     gui/windowmenu.cpp
@@ -351,6 +347,8 @@ SET(SRCS
     resources/ambientlayer.h
     resources/animation.cpp
     resources/animation.h
+    resources/beinginfo.cpp
+    resources/beinginfo.h
     resources/colordb.cpp
     resources/colordb.h
     resources/dye.cpp
@@ -373,8 +371,6 @@ SET(SRCS
     resources/mapreader.h
     resources/monsterdb.cpp
     resources/monsterdb.h
-    resources/monsterinfo.cpp
-    resources/monsterinfo.h
     resources/music.cpp
     resources/music.h
     resources/npcdb.cpp
@@ -385,8 +381,14 @@ SET(SRCS
     resources/resourcemanager.h
     resources/soundeffect.h
     resources/soundeffect.cpp
+    resources/specialdb.cpp
+    resources/specialdb.h
     resources/spritedef.h
     resources/spritedef.cpp
+    resources/theme.cpp
+    resources/theme.h
+    resources/userpalette.cpp
+    resources/userpalette.h
     resources/wallpaper.cpp
     resources/wallpaper.h
     utils/base64.cpp
@@ -407,6 +409,12 @@ SET(SRCS
     utils/xml.h
     utils/zlib.cpp
     utils/zlib.h
+    actor.cpp
+    actor.h
+    actorsprite.cpp
+    actorsprite.h
+    actorspritemanager.cpp
+    actorspritemanager.h
     animatedsprite.cpp
     animatedsprite.h
     animationparticle.cpp
@@ -415,8 +423,8 @@ SET(SRCS
     avatar.h
     being.cpp
     being.h
-    beingmanager.cpp
-    beingmanager.h
+    chatlog.cpp
+    chatlog.h
     client.cpp
     client.h
     channel.cpp
@@ -425,18 +433,21 @@ SET(SRCS
     channelmanager.h
     commandhandler.cpp
     commandhandler.h
-    configlistener.h
+    compoundsprite.cpp
+    compoundsprite.h
     configuration.cpp
     configuration.h
+    defaults.cpp
+    defaults.h
     effectmanager.cpp
     effectmanager.h
     emoteshortcut.cpp
     emoteshortcut.h
     equipment.h
+    event.cpp
+    event.h
     flooritem.cpp
     flooritem.h
-    flooritemmanager.cpp
-    flooritemmanager.h
     game.cpp
     game.h
     graphics.cpp
@@ -446,6 +457,8 @@ SET(SRCS
     guild.h
     imageparticle.cpp
     imageparticle.h
+    imagesprite.cpp
+    imagesprite.h
     inventory.cpp
     inventory.h
     item.cpp
@@ -456,6 +469,8 @@ SET(SRCS
     joystick.h
     keyboardconfig.cpp
     keyboardconfig.h
+    listener.cpp
+    listener.h
     localplayer.cpp
     localplayer.h
     log.cpp
@@ -464,10 +479,6 @@ SET(SRCS
     main.h
     map.cpp
     map.h
-    monster.cpp
-    monster.h
-    npc.cpp
-    npc.h
     openglgraphics.cpp
     openglgraphics.h
     particle.cpp
@@ -479,8 +490,8 @@ SET(SRCS
     particleemitterprop.h
     party.cpp
     party.h
-    player.cpp
-    player.h
+    playerinfo.cpp
+    playerinfo.h
     playerrelations.cpp
     playerrelations.h
     position.cpp
@@ -507,6 +518,7 @@ SET(SRCS
     tileset.h
     units.cpp
     units.h
+    variabledata.h
     vector.cpp
     vector.h
     )
@@ -563,6 +575,8 @@ SET(SRCS_TMWA
 SET(SRCS_MANA
     net/manaserv/adminhandler.cpp
     net/manaserv/adminhandler.h
+    net/manaserv/attributes.cpp
+    net/manaserv/attributes.h
     net/manaserv/beinghandler.cpp
     net/manaserv/beinghandler.h
     net/manaserv/buysellhandler.cpp
@@ -573,6 +587,7 @@ SET(SRCS_MANA
     net/manaserv/chathandler.h
     net/manaserv/connection.cpp
     net/manaserv/connection.h
+    net/manaserv/defines.h
     net/manaserv/effecthandler.cpp
     net/manaserv/effecthandler.h
     net/manaserv/gamehandler.cpp
@@ -606,15 +621,13 @@ SET(SRCS_MANA
     net/manaserv/protocol.h
     net/manaserv/specialhandler.cpp
     net/manaserv/specialhandler.h
-    net/manaserv/stats.cpp
-    net/manaserv/stats.h
     net/manaserv/tradehandler.cpp
     net/manaserv/tradehandler.h
     )
 
 IF (WIN32)
-    SET(SRCS_MANA
-        ${SRCS_MANA}
+    SET(SRCS
+        ${SRCS}
         utils/specialfolder.cpp
         utils/specialfolder.h
         mana.rc