diff --git a/CCallback.cpp b/CCallback.cpp
index 3bc87b74c..8155d3897 100644
--- a/CCallback.cpp
+++ b/CCallback.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "CCallback.h"
-#include "CGameInfo.h"
-#include "CGameState.h"
-#include "CPlayerInterface.h"
+#include "client/CGameInfo.h"
+#include "lib/CGameState.h"
+#include "client/CPlayerInterface.h"
 #include "client/Client.h"
-#include "map.h"
+#include "lib/map.h"
 #include "hch/CBuildingHandler.h"
 #include "hch/CDefObjInfoHandler.h"
 #include "hch/CHeroHandler.h"
diff --git a/CCallback.h b/CCallback.h
index fda7c1a7c..cb2b63745 100644
--- a/CCallback.h
+++ b/CCallback.h
@@ -9,7 +9,7 @@
 //support of unicode we should use ICU or some boost wraper areound it
 //(boost using this lib during compilation i dont know what for exactly)
 #endif
-#include "CGameState.h"
+#include "lib/CGameState.h"
 
 /*
  * CCallback.h, part of VCMI engine
diff --git a/AdventureMapButton.cpp b/client/AdventureMapButton.cpp
similarity index 94%
rename from AdventureMapButton.cpp
rename to client/AdventureMapButton.cpp
index fba4a0602..275d42a3f 100644
--- a/AdventureMapButton.cpp
+++ b/client/AdventureMapButton.cpp
@@ -1,14 +1,14 @@
 #include "AdventureMapButton.h"
 #include "CAdvmapInterface.h"
 #include "SDL_Extensions.h"
-#include "hch/CDefHandler.h"
+#include "../hch/CDefHandler.h"
 #include "CGameInfo.h"
-#include "hch/CLodHandler.h"
-#include "hch/CGeneralTextHandler.h"
-#include "hch/CTownHandler.h"
-#include "CCallback.h"
-#include "client/CConfigHandler.h"
-#include "client/Graphics.h"
+#include "../hch/CLodHandler.h"
+#include "../hch/CGeneralTextHandler.h"
+#include "../hch/CTownHandler.h"
+#include "../CCallback.h"
+#include "CConfigHandler.h"
+#include "Graphics.h"
 #include "CBattleInterface.h"
 #include "CPlayerInterface.h"
 
diff --git a/AdventureMapButton.h b/client/AdventureMapButton.h
similarity index 96%
rename from AdventureMapButton.h
rename to client/AdventureMapButton.h
index 312c16f95..02147c165 100644
--- a/AdventureMapButton.h
+++ b/client/AdventureMapButton.h
@@ -1,9 +1,9 @@
 #ifndef __ADVENTUREMAPBUTTON_H__
 #define __ADVENTUREMAPBUTTON_H__
 
-#include "client/FunctionList.h"
+#include "FunctionList.h"
 #include <boost/bind.hpp>
-#include "client/GUIBase.h"
+#include "GUIBase.h"
 
 /*
  * AdventureMapButton.h, part of VCMI engine
diff --git a/CAdvmapInterface.cpp b/client/CAdvmapInterface.cpp
similarity index 95%
rename from CAdvmapInterface.cpp
rename to client/CAdvmapInterface.cpp
index 67464ce97..b8991ccd8 100644
--- a/CAdvmapInterface.cpp
+++ b/client/CAdvmapInterface.cpp
@@ -1,24 +1,24 @@
 #include "AdventureMapButton.h"
 #include "CAdvmapInterface.h"
-#include "CCallback.h"
+#include "../CCallback.h"
 #include "CCastleInterface.h"
 #include "CCursorHandler.h"
 #include "CGameInfo.h"
 #include "CHeroWindow.h"
 #include "CMessage.h"
 #include "SDL_Extensions.h"
-#include "client/CBitmapHandler.h"
-#include "client/CConfigHandler.h"
-#include "client/CSpellWindow.h"
-#include "client/Graphics.h"
-#include "hch/CDefHandler.h"
-#include "hch/CGeneralTextHandler.h"
-#include "hch/CHeroHandler.h"
-#include "hch/CObjectHandler.h"
-#include "hch/CTownHandler.h"
-#include "map.h"
-#include "mapHandler.h"
-#include "stdafx.h"
+#include "CBitmapHandler.h"
+#include "CConfigHandler.h"
+#include "CSpellWindow.h"
+#include "Graphics.h"
+#include "../hch/CDefHandler.h"
+#include "../hch/CGeneralTextHandler.h"
+#include "../hch/CHeroHandler.h"
+#include "../hch/CObjectHandler.h"
+#include "../hch/CTownHandler.h"
+#include "../lib/map.h"
+#include "../mapHandler.h"
+#include "../stdafx.h"
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/assign/std/vector.hpp>
diff --git a/CAdvmapInterface.h b/client/CAdvmapInterface.h
similarity index 95%
rename from CAdvmapInterface.h
rename to client/CAdvmapInterface.h
index c71835e78..3ca8718ec 100644
--- a/CAdvmapInterface.h
+++ b/client/CAdvmapInterface.h
@@ -1,11 +1,11 @@
 #ifndef __CADVMAPINTERFACE_H__
 #define __CADVMAPINTERFACE_H__
 #include <typeinfo>
-#include "global.h"
+#include "../global.h"
 #include "SDL.h"
 #include <map>
 #include "AdventureMapButton.h"
-#include "client/GUIClasses.h"
+#include "GUIClasses.h"
 class CDefHandler;
 class CCallback;
 struct CPath;
diff --git a/CBattleInterface.cpp b/client/CBattleInterface.cpp
similarity index 96%
rename from CBattleInterface.cpp
rename to client/CBattleInterface.cpp
index 30fee2b84..5cbf198a2 100644
--- a/CBattleInterface.cpp
+++ b/client/CBattleInterface.cpp
@@ -1,26 +1,26 @@
 #include "CBattleInterface.h"
 #include "CGameInfo.h"
-#include "hch/CLodHandler.h"
+#include "../hch/CLodHandler.h"
 #include "SDL_Extensions.h"
 #include "CAdvmapInterface.h"
 #include "AdventureMapButton.h"
-#include "hch/CObjectHandler.h"
-#include "hch/CHeroHandler.h"
-#include "hch/CDefHandler.h"
-#include "hch/CSpellHandler.h"
+#include "../hch/CObjectHandler.h"
+#include "../hch/CHeroHandler.h"
+#include "../hch/CDefHandler.h"
+#include "../hch/CSpellHandler.h"
 #include "CMessage.h"
 #include "CCursorHandler.h"
-#include "CCallback.h"
-#include "CGameState.h"
-#include "hch/CGeneralTextHandler.h"
-#include "client/CCreatureAnimation.h"
-#include "client/Graphics.h"
-#include "client/CSpellWindow.h"
-#include "client/CConfigHandler.h"
+#include "../CCallback.h"
+#include "../lib/CGameState.h"
+#include "../hch/CGeneralTextHandler.h"
+#include "CCreatureAnimation.h"
+#include "Graphics.h"
+#include "CSpellWindow.h"
+#include "CConfigHandler.h"
 #include <queue>
 #include <sstream>
-#include "lib/CondSh.h"
-#include "lib/NetPacks.h"
+#include "../lib/CondSh.h"
+#include "../lib/NetPacks.h"
 #include "CPlayerInterface.h"
 #include <boost/assign/list_of.hpp>
 #ifndef __GNUC__
diff --git a/CBattleInterface.h b/client/CBattleInterface.h
similarity index 97%
rename from CBattleInterface.h
rename to client/CBattleInterface.h
index ffb17113e..0c3a96c59 100644
--- a/CBattleInterface.h
+++ b/client/CBattleInterface.h
@@ -1,9 +1,9 @@
 #ifndef __CBATTLEINTERFACE_H__
 #define __CBATTLEINTERFACE_H__
 
-#include "global.h"
+#include "../global.h"
 #include <list>
-#include "client/GUIBase.h"
+#include "GUIBase.h"
 
 /*
  * CBattleInterface.h, part of VCMI engine
diff --git a/CCastleInterface.cpp b/client/CCastleInterface.cpp
similarity index 95%
rename from CCastleInterface.cpp
rename to client/CCastleInterface.cpp
index 94703f3ef..bda5b7884 100644
--- a/CCastleInterface.cpp
+++ b/client/CCastleInterface.cpp
@@ -1,22 +1,22 @@
-#include "stdafx.h"
+#include "../stdafx.h"
 #include "CCastleInterface.h"
 #include "AdventureMapButton.h"
 #include "CAdvmapInterface.h"
-#include "CCallback.h"
+#include "../CCallback.h"
 #include "CGameInfo.h"
 #include "CHeroWindow.h"
 #include "CMessage.h"
 #include "SDL_Extensions.h"
-#include "client/CCreatureAnimation.h"
-#include "client/Graphics.h"
-#include "hch/CArtHandler.h"
-#include "hch/CBuildingHandler.h"
-#include "hch/CDefHandler.h"
-#include "hch/CGeneralTextHandler.h"
-#include "hch/CLodHandler.h"
-#include "hch/CObjectHandler.h"
-#include "hch/CSpellHandler.h"
-#include "hch/CTownHandler.h"
+#include "CCreatureAnimation.h"
+#include "Graphics.h"
+#include "../hch/CArtHandler.h"
+#include "../hch/CBuildingHandler.h"
+#include "../hch/CDefHandler.h"
+#include "../hch/CGeneralTextHandler.h"
+#include "../hch/CLodHandler.h"
+#include "../hch/CObjectHandler.h"
+#include "../hch/CSpellHandler.h"
+#include "../hch/CTownHandler.h"
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/assign/std/vector.hpp> 
diff --git a/CCastleInterface.h b/client/CCastleInterface.h
similarity index 95%
rename from CCastleInterface.h
rename to client/CCastleInterface.h
index 391d52e23..cf0d0b4bb 100644
--- a/CCastleInterface.h
+++ b/client/CCastleInterface.h
@@ -3,10 +3,10 @@
 
 
 
-#include "global.h"
+#include "../global.h"
 #include <SDL.h>
-#include "client/GUIBase.h"
-#include "hch/CMusicBase.h"
+#include "GUIBase.h"
+#include "../hch/CMusicBase.h"
 //#include "boost/tuple/tuple.hpp"
 class CGTownInstance;
 class CTownHandler;
diff --git a/CCursorHandler.cpp b/client/CCursorHandler.cpp
similarity index 91%
rename from CCursorHandler.cpp
rename to client/CCursorHandler.cpp
index d8dc7fec6..108134cd2 100644
--- a/CCursorHandler.cpp
+++ b/client/CCursorHandler.cpp
@@ -1,9 +1,9 @@
-#include "stdafx.h"
+#include "../stdafx.h"
 #include "CCursorHandler.h"
 #include "SDL.h"
 #include "SDL_Extensions.h"
 #include "CGameInfo.h"
-#include "hch/CDefHandler.h"
+#include "../hch/CDefHandler.h"
 
 /*
  * CCursorHandler.cpp, part of VCMI engine
diff --git a/CCursorHandler.h b/client/CCursorHandler.h
similarity index 93%
rename from CCursorHandler.h
rename to client/CCursorHandler.h
index f7f24a37e..d4471ea46 100644
--- a/CCursorHandler.h
+++ b/client/CCursorHandler.h
@@ -1,6 +1,6 @@
 #ifndef __CCURSORHANDLER_H__
 #define __CCURSORHANDLER_H__
-#include "global.h"
+#include "../global.h"
 #include <vector>
 struct SDL_Thread;
 class CDefHandler;
diff --git a/CGameInfo.cpp b/client/CGameInfo.cpp
similarity index 86%
rename from CGameInfo.cpp
rename to client/CGameInfo.cpp
index 6fecc67da..270655b9c 100644
--- a/CGameInfo.cpp
+++ b/client/CGameInfo.cpp
@@ -1,6 +1,6 @@
-#include "stdafx.h"
+#include "../stdafx.h"
 #include "CGameInfo.h"
-#include "lib/VCMI_Lib.h"
+#include "../lib/VCMI_Lib.h"
 
 /*
  * CGameInfo.cpp, part of VCMI engine
diff --git a/CGameInfo.h b/client/CGameInfo.h
similarity index 93%
rename from CGameInfo.h
rename to client/CGameInfo.h
index 1bca61c76..b6737098c 100644
--- a/CGameInfo.h
+++ b/client/CGameInfo.h
@@ -1,6 +1,6 @@
 #ifndef __CGAMEINFO_H__
 #define __CGAMEINFO_H__
-#include "global.h"
+#include "../global.h"
 
 #include <vector>
 
diff --git a/CHeroWindow.cpp b/client/CHeroWindow.cpp
similarity index 95%
rename from CHeroWindow.cpp
rename to client/CHeroWindow.cpp
index 1b3f6ce99..6b6a203f7 100644
--- a/CHeroWindow.cpp
+++ b/client/CHeroWindow.cpp
@@ -1,24 +1,24 @@
-#include "stdafx.h"
+#include "../stdafx.h"
 #include "AdventureMapButton.h"
 #include "CAdvmapInterface.h"
-#include "CCallback.h"
+#include "../CCallback.h"
 #include "CCastleInterface.h"
 #include "CGameInfo.h"
 #include "CHeroWindow.h"
 #include "CMessage.h"
 #include "SDL.h"
 #include "SDL_Extensions.h"
-#include "client/CBitmapHandler.h"
-#include "client/Graphics.h"
-#include "client/CSpellWindow.h"
-#include "client/CConfigHandler.h"
-#include "global.h"
-#include "hch/CArtHandler.h"
-#include "hch/CDefHandler.h"
-#include "hch/CGeneralTextHandler.h"
-#include "hch/CHeroHandler.h"
-#include "hch/CLodHandler.h"
-#include "hch/CObjectHandler.h"
+#include "CBitmapHandler.h"
+#include "Graphics.h"
+#include "CSpellWindow.h"
+#include "CConfigHandler.h"
+#include "../global.h"
+#include "../hch/CArtHandler.h"
+#include "../hch/CDefHandler.h"
+#include "../hch/CGeneralTextHandler.h"
+#include "../hch/CHeroHandler.h"
+#include "../hch/CLodHandler.h"
+#include "../hch/CObjectHandler.h"
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/assign/list_of.hpp>
 #include <boost/assign/std/vector.hpp>
diff --git a/CHeroWindow.h b/client/CHeroWindow.h
similarity index 100%
rename from CHeroWindow.h
rename to client/CHeroWindow.h
diff --git a/CMT.cpp b/client/CMT.cpp
similarity index 90%
rename from CMT.cpp
rename to client/CMT.cpp
index 544ccf584..bfba23b2e 100644
--- a/CMT.cpp
+++ b/client/CMT.cpp
@@ -1,46 +1,46 @@
 // CMT.cpp : Defines the entry point for the console application.
 //
-#include "stdafx.h"
+#include "../stdafx.h"
 #include <cmath>
 #include <string>
 #include <vector>
 #include <queue>
 #include <cmath>
 #include <boost/algorithm/string.hpp>
-#include "boost/filesystem/operations.hpp"
+#include <boost/filesystem/operations.hpp>
 #include <boost/thread.hpp>
 #include <SDL_ttf.h>
 #include <SDL_mixer.h>
 #include "SDL_Extensions.h"
 #include "SDL_framerate.h"
 #include "CGameInfo.h"
-#include "mapHandler.h"
-#include "global.h"
+#include "../mapHandler.h"
+#include "../global.h"
 #include "CPreGame.h"
 #include "CCastleInterface.h"
-#include "CConsoleHandler.h"
+#include "../CConsoleHandler.h"
 #include "CCursorHandler.h"
-#include "CGameState.h"
-#include "CCallback.h"
+#include "../lib/CGameState.h"
+#include "../CCallback.h"
 #include "CPlayerInterface.h"
 #include "CAdvmapInterface.h"
-#include "hch/CBuildingHandler.h"
-#include "hch/CVideoHandler.h"
-#include "hch/CHeroHandler.h"
-#include "hch/CCreatureHandler.h"
-#include "hch/CSpellHandler.h"
-#include "hch/CMusicHandler.h"
-#include "hch/CLodHandler.h"
-#include "hch/CDefHandler.h"
-#include "hch/CAmbarCendamo.h"
-#include "hch/CGeneralTextHandler.h"
-#include "client/Graphics.h"
-#include "client/Client.h"
-#include "client/CConfigHandler.h"
-#include "lib/Connection.h"
-#include "lib/VCMI_Lib.h"
+#include "../hch/CBuildingHandler.h"
+#include "../hch/CVideoHandler.h"
+#include "../hch/CHeroHandler.h"
+#include "../hch/CCreatureHandler.h"
+#include "../hch/CSpellHandler.h"
+#include "../hch/CMusicHandler.h"
+#include "../hch/CLodHandler.h"
+#include "../hch/CDefHandler.h"
+#include "../hch/CAmbarCendamo.h"
+#include "../hch/CGeneralTextHandler.h"
+#include "Graphics.h"
+#include "Client.h"
+#include "CConfigHandler.h"
+#include "../lib/Connection.h"
+#include "../lib/VCMI_Lib.h"
 #include <cstdlib>
-#include "lib/NetPacks.h"
+#include "../lib/NetPacks.h"
 
 #if __MINGW32__
 #undef main
diff --git a/CMessage.cpp b/client/CMessage.cpp
similarity index 95%
rename from CMessage.cpp
rename to client/CMessage.cpp
index 63250b872..3dfe0fd95 100644
--- a/CMessage.cpp
+++ b/client/CMessage.cpp
@@ -1,19 +1,19 @@
-#include "stdafx.h"
+#include "../stdafx.h"
 #include "CMessage.h"
 #include "SDL_ttf.h"
-#include "hch/CDefHandler.h"
+#include "../hch/CDefHandler.h"
 #include "CGameInfo.h"
 #include "SDL_Extensions.h"
-#include "hch/CLodHandler.h"
+#include "../hch/CLodHandler.h"
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/replace.hpp>
-#include "hch/CDefHandler.h"
+#include "../hch/CDefHandler.h"
 #include "CGameInfo.h"
 #include "SDL_Extensions.h"
 #include <sstream>
-#include "hch/CGeneralTextHandler.h"
-#include "client/Graphics.h"
-#include "client/GUIClasses.h"
+#include "../hch/CGeneralTextHandler.h"
+#include "Graphics.h"
+#include "GUIClasses.h"
 #include "AdventureMapButton.h"
 
 /*
diff --git a/CMessage.h b/client/CMessage.h
similarity index 96%
rename from CMessage.h
rename to client/CMessage.h
index aadef4118..f0ab94f73 100644
--- a/CMessage.h
+++ b/client/CMessage.h
@@ -1,7 +1,7 @@
 #ifndef __CMESSAGE_H__
 #define __CMESSAGE_H__
 
-#include "global.h"
+#include "../global.h"
 #include <SDL_ttf.h>
 #include <SDL.h>
 
diff --git a/CPlayerInterface.cpp b/client/CPlayerInterface.cpp
similarity index 96%
rename from CPlayerInterface.cpp
rename to client/CPlayerInterface.cpp
index 56dc7ff22..9a649caac 100644
--- a/CPlayerInterface.cpp
+++ b/client/CPlayerInterface.cpp
@@ -1,7 +1,7 @@
-#include "stdafx.h"
+#include "../stdafx.h"
 #include "CAdvmapInterface.h"
 #include "CBattleInterface.h"
-#include "CCallback.h"
+#include "../CCallback.h"
 #include "CCastleInterface.h"
 #include "CCursorHandler.h"
 #include "CGameInfo.h"
@@ -13,22 +13,22 @@
 //#include "SDL_framerate.h"
 
 #include "SDL_framerate.h"
-#include "client/CConfigHandler.h"
-#include "client/CCreatureAnimation.h"
-#include "client/Graphics.h"
-#include "hch/CArtHandler.h"
-#include "hch/CGeneralTextHandler.h"
-#include "hch/CHeroHandler.h"
-#include "hch/CLodHandler.h"
-#include "hch/CObjectHandler.h"
-#include "lib/Connection.h"
-#include "hch/CSpellHandler.h"
-#include "hch/CTownHandler.h"
-#include "lib/CondSh.h"
-#include "lib/NetPacks.h"
-#include "map.h"
-#include "mapHandler.h"
-#include "timeHandler.h"
+#include "CConfigHandler.h"
+#include "CCreatureAnimation.h"
+#include "Graphics.h"
+#include "../hch/CArtHandler.h"
+#include "../hch/CGeneralTextHandler.h"
+#include "../hch/CHeroHandler.h"
+#include "../hch/CLodHandler.h"
+#include "../hch/CObjectHandler.h"
+#include "../lib/Connection.h"
+#include "../hch/CSpellHandler.h"
+#include "../hch/CTownHandler.h"
+#include "../lib/CondSh.h"
+#include "../lib/NetPacks.h"
+#include "../lib/map.h"
+#include "../mapHandler.h"
+#include "../timeHandler.h"
 #include <boost/lexical_cast.hpp>
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/replace.hpp>
diff --git a/CPlayerInterface.h b/client/CPlayerInterface.h
similarity index 97%
rename from CPlayerInterface.h
rename to client/CPlayerInterface.h
index 1345c0daa..5f1d8bc3c 100644
--- a/CPlayerInterface.h
+++ b/client/CPlayerInterface.h
@@ -1,7 +1,7 @@
 #ifndef __CPLAYERINTERFACE_H__
 #define __CPLAYERINTERFACE_H__
-#include "global.h"
-#include "CGameInterface.h"
+#include "../global.h"
+#include "../CGameInterface.h"
 #include "SDL_framerate.h"
 #include <map>
 #include <list>
diff --git a/CPreGame.cpp b/client/CPreGame.cpp
similarity index 96%
rename from CPreGame.cpp
rename to client/CPreGame.cpp
index a8e2ea0e5..53bca4ca6 100644
--- a/CPreGame.cpp
+++ b/client/CPreGame.cpp
@@ -1,28 +1,28 @@
-#include "stdafx.h"
+#include "../stdafx.h"
 #include "CPreGame.h"
-#include "hch/CDefHandler.h"
+#include "../hch/CDefHandler.h"
 #include <ctime>
 #include <SDL.h>
 #include <boost/filesystem.hpp>   // includes all needed Boost.Filesystem declarations
 #include <boost/algorithm/string.hpp>
 //#include "boost/foreach.hpp"
 #include <zlib.h>
-#include "timeHandler.h"
+#include "../timeHandler.h"
 #include <sstream>
 #include "SDL_Extensions.h"
 #include "CGameInfo.h"
-#include "hch/CGeneralTextHandler.h"
+#include "../hch/CGeneralTextHandler.h"
 #include "CCursorHandler.h"
-#include "hch/CLodHandler.h"
-#include "hch/CTownHandler.h"
-#include "hch/CHeroHandler.h"
+#include "../hch/CLodHandler.h"
+#include "../hch/CTownHandler.h"
+#include "../hch/CHeroHandler.h"
 #include <cmath>
-#include "client/Graphics.h"
+#include "Graphics.h"
 #include <boost/thread.hpp>
 #include <boost/bind.hpp>
 #include <cstdlib>
-#include "lib/Connection.h"
-#include "hch/CMusicHandler.h"
+#include "../lib/Connection.h"
+#include "../hch/CMusicHandler.h"
 /*
  * CPreGame.cpp, part of VCMI engine
  *
diff --git a/CPreGame.h b/client/CPreGame.h
similarity index 95%
rename from CPreGame.h
rename to client/CPreGame.h
index f0498c0fe..c5f02d125 100644
--- a/CPreGame.h
+++ b/client/CPreGame.h
@@ -1,11 +1,11 @@
 #ifndef __CPREGAME_H__
 #define __CPREGAME_H__
-#include "global.h"
+#include "../global.h"
 #include <set>
 #include <SDL.h>
-#include "StartInfo.h"
+#include "../StartInfo.h"
 #include "CMessage.h"
-#include "map.h"
+#include "../lib/map.h"
 #include <boost/function.hpp>
 #include <boost/bind.hpp>
 #include <cstdlib>
diff --git a/client/CSpellWindow.cpp b/client/CSpellWindow.cpp
index 3d35bb0f3..fdce2b6fc 100644
--- a/client/CSpellWindow.cpp
+++ b/client/CSpellWindow.cpp
@@ -4,12 +4,12 @@
 #include "../hch/CObjectHandler.h"
 #include "../hch/CSpellHandler.h"
 #include "../hch/CGeneralTextHandler.h"
-#include "../CAdvmapInterface.h"
-#include "../CBattleInterface.h"
-#include "../CGameInfo.h"
-#include "../SDL_Extensions.h"
-#include "../CMessage.h"
-#include "../CPlayerInterface.h"
+#include "CAdvmapInterface.h"
+#include "CBattleInterface.h"
+#include "CGameInfo.h"
+#include "SDL_Extensions.h"
+#include "CMessage.h"
+#include "CPlayerInterface.h"
 #include <boost/bind.hpp>
 #include <sstream>
 
diff --git a/client/Client.cpp b/client/Client.cpp
index 3662dca27..fc7ca06c2 100644
--- a/client/Client.cpp
+++ b/client/Client.cpp
@@ -1,8 +1,8 @@
 #include "../CCallback.h"
 #include "../CConsoleHandler.h"
-#include "../CGameInfo.h"
-#include "../CGameState.h"
-#include "../CPlayerInterface.h"
+#include "CGameInfo.h"
+#include "../lib/CGameState.h"
+#include "CPlayerInterface.h"
 #include "../StartInfo.h"
 #include "../hch/CArtHandler.h"
 #include "../hch/CDefObjInfoHandler.h"
@@ -16,7 +16,7 @@
 #include "../lib/Interprocess.h"
 #include "../lib/NetPacks.h"
 #include "../lib/VCMI_Lib.h"
-#include "../map.h"
+#include "../lib/map.h"
 #include "../mapHandler.h"
 #include "CConfigHandler.h"
 #include "Client.h"
diff --git a/client/GUIBase.cpp b/client/GUIBase.cpp
index 695bbcfaf..279e13ac3 100644
--- a/client/GUIBase.cpp
+++ b/client/GUIBase.cpp
@@ -1,6 +1,6 @@
 #include "GUIBase.h"
-#include "../SDL_extensions.h"
-#include "../CPlayerInterface.h"
+#include "SDL_extensions.h"
+#include "CPlayerInterface.h"
 
 /*
  * GUIBase.cpp, part of VCMI engine
diff --git a/client/GUIClasses.cpp b/client/GUIClasses.cpp
index b27230808..ab5be830d 100644
--- a/client/GUIClasses.cpp
+++ b/client/GUIClasses.cpp
@@ -1,16 +1,16 @@
 #include "GUIClasses.h"
-#include "../SDL_Extensions.h"
+#include "SDL_Extensions.h"
 
 #include "../stdafx.h"
-#include "../CAdvmapInterface.h"
-#include "../CBattleInterface.h"
+#include "CAdvmapInterface.h"
+#include "CBattleInterface.h"
 #include "../CCallback.h"
-#include "../CCastleInterface.h"
-#include "../CCursorHandler.h"
-#include "../CGameInfo.h"
-#include "../CHeroWindow.h"
-#include "../CMessage.h"
-#include "../SDL_framerate.h"
+#include "CCastleInterface.h"
+#include "CCursorHandler.h"
+#include "CGameInfo.h"
+#include "CHeroWindow.h"
+#include "CMessage.h"
+#include "SDL_framerate.h"
 #include "CConfigHandler.h"
 #include "CCreatureAnimation.h"
 #include "Graphics.h"
@@ -22,7 +22,7 @@
 #include "../hch/CSpellHandler.h"
 #include "../hch/CTownHandler.h"
 #include "../lib/CondSh.h"
-#include "../map.h"
+#include "../lib/map.h"
 #include "../mapHandler.h"
 #include "../timeHandler.h"
 #include <boost/lexical_cast.hpp>
diff --git a/client/GUIClasses.h b/client/GUIClasses.h
index 54a404ff0..4d9a8620f 100644
--- a/client/GUIClasses.h
+++ b/client/GUIClasses.h
@@ -2,7 +2,7 @@
 #define __GUICLASSES_H__
 
 #include "../global.h"
-#include "../SDL_framerate.h"
+#include "SDL_framerate.h"
 #include "GUIBase.h"
 #include "FunctionList.h"
 #include <set>
diff --git a/client/NetPacksClient.cpp b/client/NetPacksClient.cpp
index 9a898f16b..41a47257f 100644
--- a/client/NetPacksClient.cpp
+++ b/client/NetPacksClient.cpp
@@ -1,15 +1,15 @@
 #include "../lib/NetPacks.h"
 #include "../CCallback.h"
-#include "../client/Client.h"
-#include "../CPlayerInterface.h"
-#include "../CGameInfo.h"
+#include "Client.h"
+#include "CPlayerInterface.h"
+#include "CGameInfo.h"
 #include "../lib/Connection.h"
 #include "../hch/CGeneralTextHandler.h"
 #include "../hch/CDefObjInfoHandler.h"
 #include "../hch/CHeroHandler.h"
 #include "../hch/CObjectHandler.h"
 #include "../lib/VCMI_Lib.h"
-#include "../map.h"
+#include "../lib/map.h"
 #include "../hch/CSpellHandler.h"
 #include "../hch/CSoundBase.h"
 #include "../mapHandler.h"
diff --git a/SDL_Extensions.cpp b/client/SDL_Extensions.cpp
similarity index 96%
rename from SDL_Extensions.cpp
rename to client/SDL_Extensions.cpp
index 37f84c1a2..b4da43f4b 100644
--- a/SDL_Extensions.cpp
+++ b/client/SDL_Extensions.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "../stdafx.h"
 #include "SDL_Extensions.h"
 #include "SDL_ttf.h"
 #include "CGameInfo.h"
@@ -7,9 +7,9 @@
 #include <algorithm>
 #include "CMessage.h"
 #include <boost/algorithm/string.hpp>
-#include "hch/CDefHandler.h"
+#include "../hch/CDefHandler.h"
 #include <map>
-#include "client/Graphics.h"
+#include "Graphics.h"
 
 /*
  * SDL_Extensions.cpp, part of VCMI engine
diff --git a/SDL_Extensions.h b/client/SDL_Extensions.h
similarity index 98%
rename from SDL_Extensions.h
rename to client/SDL_Extensions.h
index f1ee2830e..bed33bf9f 100644
--- a/SDL_Extensions.h
+++ b/client/SDL_Extensions.h
@@ -3,7 +3,7 @@
 #include "SDL.h"
 #include "SDL_ttf.h"
 #include <string>
-#include "int3.h"
+#include "../int3.h"
 #include <vector>
 
 /*
diff --git a/SDL_framerate.cpp b/client/SDL_framerate.cpp
similarity index 98%
rename from SDL_framerate.cpp
rename to client/SDL_framerate.cpp
index 9cc04b214..5edcf45e0 100644
--- a/SDL_framerate.cpp
+++ b/client/SDL_framerate.cpp
@@ -6,7 +6,7 @@
  LGPL (c) A. Schiffler
  
  */
-#include "stdafx.h"
+#include "../stdafx.h"
 #include "SDL_framerate.h"
 
 /* 
diff --git a/SDL_framerate.h b/client/SDL_framerate.h
similarity index 100%
rename from SDL_framerate.h
rename to client/SDL_framerate.h
diff --git a/hch/CAmbarCendamo.h b/hch/CAmbarCendamo.h
index 574e9a012..428268655 100644
--- a/hch/CAmbarCendamo.h
+++ b/hch/CAmbarCendamo.h
@@ -4,7 +4,7 @@
 #include <string>
 #include <vector>
 #include "../global.h"
-#include "../map.h"
+#include "../lib/map.h"
 #include "CCreatureHandler.h"
 
 class DLL_EXPORT CAmbarCendamo 
diff --git a/hch/CObjectHandler.cpp b/hch/CObjectHandler.cpp
index 8c04df17a..cbc63286e 100644
--- a/hch/CObjectHandler.cpp
+++ b/hch/CObjectHandler.cpp
@@ -16,10 +16,10 @@
 #include "CSoundBase.h"
 #include "../lib/VCMI_Lib.h"
 #include "../lib/IGameCallback.h"
-#include "../CGameState.h"
+#include "../lib/CGameState.h"
 #include "../lib/NetPacks.h"
 #include "../StartInfo.h"
-#include "../map.h"
+#include "../lib/map.h"
 
 /*
  * CObjectHandler.cpp, part of VCMI engine
diff --git a/CGameState.cpp b/lib/CGameState.cpp
similarity index 95%
rename from CGameState.cpp
rename to lib/CGameState.cpp
index f4795dc07..ec80a670d 100644
--- a/CGameState.cpp
+++ b/lib/CGameState.cpp
@@ -4,25 +4,25 @@
 #include <fstream>
 #include "CGameState.h"
 #include <boost/random/linear_congruential.hpp>
-#include "hch/CDefObjInfoHandler.h"
-#include "hch/CArtHandler.h"
-#include "hch/CBuildingHandler.h"
-#include "hch/CGeneralTextHandler.h"
-#include "hch/CTownHandler.h"
-#include "hch/CSpellHandler.h"
-#include "hch/CHeroHandler.h"
-#include "hch/CObjectHandler.h"
-#include "hch/CCreatureHandler.h"
-#include "lib/VCMI_Lib.h"
-#include "lib/Connection.h"
+#include "../hch/CDefObjInfoHandler.h"
+#include "../hch/CArtHandler.h"
+#include "../hch/CBuildingHandler.h"
+#include "../hch/CGeneralTextHandler.h"
+#include "../hch/CTownHandler.h"
+#include "../hch/CSpellHandler.h"
+#include "../hch/CHeroHandler.h"
+#include "../hch/CObjectHandler.h"
+#include "../hch/CCreatureHandler.h"
+#include "VCMI_Lib.h"
+#include "Connection.h"
 #include "map.h"
-#include "StartInfo.h"
-#include "lib/NetPacks.h"
+#include "../StartInfo.h"
+#include "NetPacks.h"
 #include <boost/foreach.hpp>
 #include <boost/thread.hpp>
 #include <boost/thread/shared_mutex.hpp>
 
-#include "lib/RegisterTypes.cpp"
+#include "RegisterTypes.cpp"
 boost::rand48 ran;
 
 #ifdef min
diff --git a/CGameState.h b/lib/CGameState.h
similarity index 96%
rename from CGameState.h
rename to lib/CGameState.h
index 671a61bc5..709aeb4e9 100644
--- a/CGameState.h
+++ b/lib/CGameState.h
@@ -1,14 +1,14 @@
 #ifndef __CGAMESTATE_H__
 #define __CGAMESTATE_H__
-#include "global.h"
+#include "../global.h"
 #ifndef _MSC_VER
-#include "hch/CCreatureHandler.h"
-#include "lib/VCMI_Lib.h"
+#include "../hch/CCreatureHandler.h"
+#include "VCMI_Lib.h"
 #include "map.h"
 #endif
 #include <set>
 #include <vector>
-#include "lib/StackFeature.h"
+#include "StackFeature.h"
 #ifdef _WIN32
 #include <tchar.h>
 #else
diff --git a/lib/NetPacks.h b/lib/NetPacks.h
index 85c6fe8ed..2156ab8a4 100644
--- a/lib/NetPacks.h
+++ b/lib/NetPacks.h
@@ -1,7 +1,7 @@
 #ifndef __NETPACKS_H__
 #define __NETPACKS_H__
 #include "../global.h"
-#include "../CGameState.h"
+#include "CGameState.h"
 #include "BattleAction.h"
 #include "HeroBonus.h"
 #include <set>
diff --git a/lib/NetPacksLib.cpp b/lib/NetPacksLib.cpp
index de2fad48c..3a911b6ba 100644
--- a/lib/NetPacksLib.cpp
+++ b/lib/NetPacksLib.cpp
@@ -1,12 +1,12 @@
 #define VCMI_DLL
-#include "../lib/NetPacks.h"
+#include "NetPacks.h"
 #include "../hch/CGeneralTextHandler.h"
 #include "../hch/CDefObjInfoHandler.h"
 #include "../hch/CArtHandler.h"
 #include "../hch/CHeroHandler.h"
 #include "../hch/CObjectHandler.h"
-#include "../lib/VCMI_Lib.h"
-#include "../map.h"
+#include "VCMI_Lib.h"
+#include "map.h"
 #include "../hch/CSpellHandler.h"
 #include <boost/bind.hpp>
 #include <boost/foreach.hpp>
diff --git a/map.cpp b/lib/map.cpp
similarity index 95%
rename from map.cpp
rename to lib/map.cpp
index 3b4c68092..00a0a12f1 100644
--- a/map.cpp
+++ b/lib/map.cpp
@@ -1,9 +1,9 @@
 #define VCMI_DLL
-#include "stdafx.h"
+#include "../stdafx.h"
 #include "map.h"
-#include "hch/CObjectHandler.h"
-#include "hch/CDefObjInfoHandler.h"
-#include "lib/VCMI_Lib.h"
+#include "../hch/CObjectHandler.h"
+#include "../hch/CDefObjInfoHandler.h"
+#include "VCMI_Lib.h"
 #include <zlib.h>
 #include <boost/crc.hpp>
 
diff --git a/map.h b/lib/map.h
similarity index 96%
rename from map.h
rename to lib/map.h
index 6bc77cfc7..1f6a049f2 100644
--- a/map.h
+++ b/lib/map.h
@@ -8,10 +8,10 @@
 #include <map>
 #include <set>
 #include <list>
-#include "global.h"
+#include "../global.h"
 #ifndef _MSC_VER
-#include "hch/CObjectHandler.h"
-#include "hch/CDefObjInfoHandler.h"
+#include "../hch/CObjectHandler.h"
+#include "../hch/CDefObjInfoHandler.h"
 #endif
 
 /*
diff --git a/server/CGameHandler.cpp b/server/CGameHandler.cpp
index e40f957f4..dc2f581a3 100644
--- a/server/CGameHandler.cpp
+++ b/server/CGameHandler.cpp
@@ -6,11 +6,11 @@
 #include "../hch/CObjectHandler.h"
 #include "../hch/CSpellHandler.h"
 #include "../hch/CTownHandler.h"
-#include "../CGameState.h"
+#include "../lib/CGameState.h"
 #include "../lib/CondSh.h"
 #include "../lib/NetPacks.h"
 #include "../lib/VCMI_Lib.h"
-#include "../map.h"
+#include "../lib/map.h"
 #include "CGameHandler.h"
 #include <boost/bind.hpp>
 #include <boost/date_time/posix_time/posix_time_types.hpp> //no i/o just types
diff --git a/server/CGameHandler.h b/server/CGameHandler.h
index 980eb1eef..c93254113 100644
--- a/server/CGameHandler.h
+++ b/server/CGameHandler.h
@@ -4,7 +4,7 @@
 #include "../global.h"
 #include <set>
 #include "../client/FunctionList.h"
-#include "../CGameState.h"
+#include "../lib/CGameState.h"
 #include "../lib/Connection.h"
 #include "../lib/IGameCallback.h"
 #include "../lib/BattleAction.h"
diff --git a/server/CVCMIServer.cpp b/server/CVCMIServer.cpp
index e1ecaf693..52497a741 100644
--- a/server/CVCMIServer.cpp
+++ b/server/CVCMIServer.cpp
@@ -20,7 +20,7 @@
 #include <boost/interprocess/mapped_region.hpp>
 #include <boost/interprocess/shared_memory_object.hpp>
 #include "../StartInfo.h"
-#include "../map.h"
+#include "../lib/map.h"
 #include "../hch/CLodHandler.h" 
 #include "../lib/Interprocess.h"
 #include "../lib/VCMI_Lib.h"