diff --git a/VCMI_client.cbp b/VCMI_client.cbp
deleted file mode 100644
index 2c22af9a7..000000000
--- a/VCMI_client.cbp
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="VCMI_client" />
-		<Option pch_mode="2" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="Debug">
-				<Option output="bin/Debug/VCMI_client" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj/Debug/" />
-				<Option type="1" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-g" />
-				</Compiler>
-				<Linker>
-					<Add directory="bin/Debug" />
-				</Linker>
-			</Target>
-			<Target title="Release">
-				<Option output="bin/Release/VCMI_client" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj/Release/" />
-				<Option type="1" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-fomit-frame-pointer" />
-					<Add option="-O2" />
-				</Compiler>
-				<Linker>
-					<Add option="-s" />
-					<Add directory="bin/Release" />
-				</Linker>
-			</Target>
-		</Build>
-		<Compiler>
-			<Add option="-Wextra" />
-			<Add option="-Wall" />
-			<Add option="-fexceptions" />
-			<Add option="-Wpointer-arith" />
-			<Add option="-Wno-switch" />
-			<Add option="-Wno-sign-compare" />
-			<Add option="-Wno-unused-parameter" />
-			<Add option="-Wno-overloaded-virtual" />
-			<Add option="-fpermissive" />
-			<Add option="-DBOOST_THREAD_USE_LIB" />
-			<Add option="-D_WIN32_WINNT=0x0501" />
-			<Add directory="$(#boost.include)" />
-			<Add directory="$(#sdl.include)" />
-			<Add directory="." />
-			<Add directory="client" />
-			<Add directory="include" />
-		</Compiler>
-		<Linker>
-			<Add option="-lole32" />
-			<Add option="-loleaut32" />
-			<Add option="-lws2_32" />
-			<Add option="-lboost_program_options$(#boost.libsuffix)" />
-			<Add option="-lboost_filesystem$(#boost.libsuffix)" />
-			<Add option="-lboost_system$(#boost.libsuffix)" />
-			<Add option="-lboost_thread$(#boost.libsuffix)" />
-			<Add option="-lboost_chrono$(#boost.libsuffix)" />
-			<Add option="-lSDL" />
-			<Add option="-lSDL_image" />
-			<Add option="-lSDL_mixer" />
-			<Add option="-lSDL_ttf" />
-			<Add option="-lVCMI_lib" />
-			<Add directory="$(#boost.lib)" />
-			<Add directory="$(#sdl.lib)" />
-		</Linker>
-		<Unit filename="CCallback.cpp" />
-		<Unit filename="CCallback.h" />
-		<Unit filename="client/AdventureMapClasses.cpp" />
-		<Unit filename="client/AdventureMapClasses.h" />
-		<Unit filename="client/BattleInterface/CBattleAnimations.cpp" />
-		<Unit filename="client/BattleInterface/CBattleAnimations.h" />
-		<Unit filename="client/BattleInterface/CBattleInterface.cpp" />
-		<Unit filename="client/BattleInterface/CBattleInterface.h" />
-		<Unit filename="client/BattleInterface/CBattleInterfaceClasses.cpp" />
-		<Unit filename="client/BattleInterface/CBattleInterfaceClasses.h" />
-		<Unit filename="client/BattleInterface/CCreatureAnimation.cpp" />
-		<Unit filename="client/BattleInterface/CCreatureAnimation.h" />
-		<Unit filename="client/CAdvmapInterface.cpp" />
-		<Unit filename="client/CAdvmapInterface.h" />
-		<Unit filename="client/CAnimation.cpp" />
-		<Unit filename="client/CAnimation.h" />
-		<Unit filename="client/CBitmapHandler.cpp" />
-		<Unit filename="client/CBitmapHandler.h" />
-		<Unit filename="client/CCastleInterface.cpp" />
-		<Unit filename="client/CCastleInterface.h" />
-		<Unit filename="client/CCreatureWindow.cpp" />
-		<Unit filename="client/CCreatureWindow.h" />
-		<Unit filename="client/CDefHandler.cpp" />
-		<Unit filename="client/CDefHandler.h" />
-		<Unit filename="client/CGameInfo.cpp" />
-		<Unit filename="client/CGameInfo.h" />
-		<Unit filename="client/CHeroWindow.cpp" />
-		<Unit filename="client/CHeroWindow.h" />
-		<Unit filename="client/CKingdomInterface.cpp" />
-		<Unit filename="client/CKingdomInterface.h" />
-		<Unit filename="client/CMT.cpp" />
-		<Unit filename="client/CMessage.cpp" />
-		<Unit filename="client/CMessage.h" />
-		<Unit filename="client/CMusicHandler.cpp" />
-		<Unit filename="client/CMusicHandler.h" />
-		<Unit filename="client/CPlayerInterface.cpp" />
-		<Unit filename="client/CPlayerInterface.h" />
-		<Unit filename="client/CPreGame.cpp" />
-		<Unit filename="client/CPreGame.h" />
-		<Unit filename="client/CQuestLog.cpp" />
-		<Unit filename="client/CQuestLog.h" />
-		<Unit filename="client/CSoundBase.h" />
-		<Unit filename="client/CSpellWindow.cpp" />
-		<Unit filename="client/CSpellWindow.h" />
-		<Unit filename="client/CVideoHandler.cpp" />
-		<Unit filename="client/CVideoHandler.h" />
-		<Unit filename="client/Client.cpp" />
-		<Unit filename="client/Client.h" />
-		<Unit filename="client/FunctionList.h" />
-		<Unit filename="client/GUIClasses.cpp" />
-		<Unit filename="client/GUIClasses.h" />
-		<Unit filename="client/Graphics.cpp" />
-		<Unit filename="client/Graphics.h" />
-		<Unit filename="client/NetPacksClient.cpp" />
-		<Unit filename="client/StdInc.h">
-			<Option compile="1" />
-			<Option weight="0" />
-		</Unit>
-		<Unit filename="client/UIFramework/CCursorHandler.cpp" />
-		<Unit filename="client/UIFramework/CCursorHandler.h" />
-		<Unit filename="client/UIFramework/CGuiHandler.cpp" />
-		<Unit filename="client/UIFramework/CGuiHandler.h" />
-		<Unit filename="client/UIFramework/CIntObject.cpp" />
-		<Unit filename="client/UIFramework/CIntObject.h" />
-		<Unit filename="client/UIFramework/CIntObjectClasses.cpp" />
-		<Unit filename="client/UIFramework/CIntObjectClasses.h" />
-		<Unit filename="client/UIFramework/Fonts.cpp" />
-		<Unit filename="client/UIFramework/Fonts.h" />
-		<Unit filename="client/UIFramework/Geometries.cpp" />
-		<Unit filename="client/UIFramework/Geometries.h" />
-		<Unit filename="client/UIFramework/SDL_Extensions.cpp" />
-		<Unit filename="client/UIFramework/SDL_Extensions.h" />
-		<Unit filename="client/UIFramework/SDL_Pixels.h" />
-		<Unit filename="client/VCMI_client.rc">
-			<Option compilerVar="WINDRES" />
-		</Unit>
-		<Unit filename="client/mapHandler.cpp" />
-		<Unit filename="client/mapHandler.h" />
-		<Unit filename="client/resource.h" />
-		<Extensions>
-			<code_completion />
-			<envvars />
-			<debugger />
-			<lib_finder disable_auto="1" />
-			<DoxyBlocks>
-				<comment_style block="0" line="0" />
-				<doxyfile_project />
-				<doxyfile_build />
-				<doxyfile_warnings />
-				<doxyfile_output />
-				<doxyfile_dot />
-				<general />
-			</DoxyBlocks>
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>
diff --git a/VCMI_lib.cbp b/VCMI_lib.cbp
deleted file mode 100644
index 9e47d6074..000000000
--- a/VCMI_lib.cbp
+++ /dev/null
@@ -1,215 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="VCMI_lib" />
-		<Option execution_dir="D:/projects/vcmi/engine/VCMI_lib/" />
-		<Option pch_mode="2" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="Debug">
-				<Option platforms="Windows;" />
-				<Option output="bin/Debug/VCMI_lib" prefix_auto="0" extension_auto="1" />
-				<Option object_output="obj/Debug/" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Option createStaticLib="1" />
-				<Compiler>
-					<Add option="-O1" />
-					<Add option="-O" />
-				</Compiler>
-			</Target>
-			<Target title="Release">
-				<Option platforms="Windows;" />
-				<Option output="bin/Release/VCMI_lib" prefix_auto="0" extension_auto="1" />
-				<Option object_output="obj/Release/" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Option createStaticLib="1" />
-				<Compiler>
-					<Add option="-fomit-frame-pointer" />
-					<Add option="-O2" />
-				</Compiler>
-				<Linker>
-					<Add option="-s" />
-				</Linker>
-			</Target>
-		</Build>
-		<Compiler>
-			<Add option="-Wextra" />
-			<Add option="-Wall" />
-			<Add option="-fexceptions" />
-			<Add option="-Wpointer-arith" />
-			<Add option="-Wno-switch" />
-			<Add option="-Wno-sign-compare" />
-			<Add option="-Wno-unused-parameter" />
-			<Add option="-Wno-overloaded-virtual" />
-			<Add option="-DVCMI_DLL" />
-			<Add option="-DBOOST_THREAD_USE_LIB" />
-			<Add option="-D_WIN32_WINNT=0x0501" />
-			<Add directory="$(#boost.include)" />
-			<Add directory="$(#sdl.include)" />
-			<Add directory="." />
-			<Add directory="include" />
-			<Add directory="lib" />
-		</Compiler>
-		<Linker>
-			<Add option="-lws2_32" />
-			<Add option="-lzlib" />
-			<Add option="-lboost_filesystem$(#boost.libsuffix)" />
-			<Add option="-lboost_system$(#boost.libsuffix)" />
-			<Add option="-lboost_thread$(#boost.libsuffix)" />
-			<Add option="-lboost_chrono$(#boost.libsuffix)" />
-			<Add directory="$(#boost.lib)" />
-			<Add directory="$(#sdl.lib)" />
-		</Linker>
-		<Unit filename="Global.h" />
-		<Unit filename="config/ERMU_to_picture.json" />
-		<Unit filename="config/artifacts.json" />
-		<Unit filename="config/bankconfig.json" />
-		<Unit filename="config/battleStartpos.json" />
-		<Unit filename="config/battles_graphics.json" />
-		<Unit filename="config/bonusnames.json" />
-		<Unit filename="config/buildings5.json" />
-		<Unit filename="config/campaign_regions.json" />
-		<Unit filename="config/commanders.json" />
-		<Unit filename="config/cr_sounds.json" />
-		<Unit filename="config/creatures.json" />
-		<Unit filename="config/defaultMods.json" />
-		<Unit filename="config/defaultSettings.json" />
-		<Unit filename="config/dwellings.json" />
-		<Unit filename="config/factions/castle.json" />
-		<Unit filename="config/factions/conflux.json" />
-		<Unit filename="config/factions/dungeon.json" />
-		<Unit filename="config/factions/fortress.json" />
-		<Unit filename="config/factions/inferno.json" />
-		<Unit filename="config/factions/necropolis.json" />
-		<Unit filename="config/factions/neutral.json" />
-		<Unit filename="config/factions/rampart.json" />
-		<Unit filename="config/factions/stronghold.json" />
-		<Unit filename="config/factions/tower.json" />
-		<Unit filename="config/filesystem.json" />
-		<Unit filename="config/fonts.json" />
-		<Unit filename="config/gameConfig.json" />
-		<Unit filename="config/heroClasses.json" />
-		<Unit filename="config/heroes.json" />
-		<Unit filename="config/mainmenu.json" />
-		<Unit filename="config/obstacles.json" />
-		<Unit filename="config/resolutions.json" />
-		<Unit filename="config/resources.json" />
-		<Unit filename="config/sp_sounds.json" />
-		<Unit filename="config/spell_info.json" />
-		<Unit filename="config/startres.json" />
-		<Unit filename="config/terrains.json" />
-		<Unit filename="lib/AI_Base.h" />
-		<Unit filename="lib/BattleAction.cpp" />
-		<Unit filename="lib/BattleAction.h" />
-		<Unit filename="lib/BattleHex.cpp" />
-		<Unit filename="lib/BattleHex.h" />
-		<Unit filename="lib/BattleState.cpp" />
-		<Unit filename="lib/BattleState.h" />
-		<Unit filename="lib/CArtHandler.cpp" />
-		<Unit filename="lib/CArtHandler.h" />
-		<Unit filename="lib/CBattleCallback.cpp" />
-		<Unit filename="lib/CBattleCallback.h" />
-		<Unit filename="lib/CBuildingHandler.cpp" />
-		<Unit filename="lib/CBuildingHandler.h" />
-		<Unit filename="lib/CConfigHandler.cpp" />
-		<Unit filename="lib/CConfigHandler.h" />
-		<Unit filename="lib/CConsoleHandler.cpp" />
-		<Unit filename="lib/CConsoleHandler.h" />
-		<Unit filename="lib/CCreatureHandler.cpp" />
-		<Unit filename="lib/CCreatureHandler.h" />
-		<Unit filename="lib/CCreatureSet.cpp" />
-		<Unit filename="lib/CCreatureSet.h" />
-		<Unit filename="lib/CDefObjInfoHandler.cpp" />
-		<Unit filename="lib/CDefObjInfoHandler.h" />
-		<Unit filename="lib/CGameInterface.cpp" />
-		<Unit filename="lib/CGameInterface.h" />
-		<Unit filename="lib/CGameState.cpp" />
-		<Unit filename="lib/CGameState.h" />
-		<Unit filename="lib/CGeneralTextHandler.cpp" />
-		<Unit filename="lib/CGeneralTextHandler.h" />
-		<Unit filename="lib/CHeroHandler.cpp" />
-		<Unit filename="lib/CHeroHandler.h" />
-		<Unit filename="lib/CLogger.cpp" />
-		<Unit filename="lib/CLogger.h" />
-		<Unit filename="lib/CModHandler.cpp" />
-		<Unit filename="lib/CModHandler.h" />
-		<Unit filename="lib/CObjectHandler.cpp" />
-		<Unit filename="lib/CObjectHandler.h" />
-		<Unit filename="lib/CObstacleInstance.cpp" />
-		<Unit filename="lib/CObstacleInstance.h" />
-		<Unit filename="lib/CScriptingModule.h" />
-		<Unit filename="lib/CSpellHandler.cpp" />
-		<Unit filename="lib/CSpellHandler.h" />
-		<Unit filename="lib/CStopWatch.h" />
-		<Unit filename="lib/CThreadHelper.cpp" />
-		<Unit filename="lib/CThreadHelper.h" />
-		<Unit filename="lib/CTownHandler.cpp" />
-		<Unit filename="lib/CTownHandler.h" />
-		<Unit filename="lib/CondSh.h" />
-		<Unit filename="lib/Connection.cpp" />
-		<Unit filename="lib/Connection.h" />
-		<Unit filename="lib/ConstTransitivePtr.h" />
-		<Unit filename="lib/Filesystem/CBinaryReader.cpp" />
-		<Unit filename="lib/Filesystem/CBinaryReader.h" />
-		<Unit filename="lib/Filesystem/CCompressedStream.cpp" />
-		<Unit filename="lib/Filesystem/CCompressedStream.h" />
-		<Unit filename="lib/Filesystem/CFileInfo.cpp" />
-		<Unit filename="lib/Filesystem/CFileInfo.h" />
-		<Unit filename="lib/Filesystem/CFileInputStream.cpp" />
-		<Unit filename="lib/Filesystem/CFileInputStream.h" />
-		<Unit filename="lib/Filesystem/CFilesystemLoader.cpp" />
-		<Unit filename="lib/Filesystem/CFilesystemLoader.h" />
-		<Unit filename="lib/Filesystem/CInputStream.h" />
-		<Unit filename="lib/Filesystem/CLodArchiveLoader.cpp" />
-		<Unit filename="lib/Filesystem/CLodArchiveLoader.h" />
-		<Unit filename="lib/Filesystem/CMemoryStream.cpp" />
-		<Unit filename="lib/Filesystem/CMemoryStream.h" />
-		<Unit filename="lib/Filesystem/CResourceLoader.cpp" />
-		<Unit filename="lib/Filesystem/CResourceLoader.h" />
-		<Unit filename="lib/Filesystem/ISimpleResourceLoader.h" />
-		<Unit filename="lib/GameConstants.h" />
-		<Unit filename="lib/HeroBonus.cpp" />
-		<Unit filename="lib/HeroBonus.h" />
-		<Unit filename="lib/IGameCallback.cpp" />
-		<Unit filename="lib/IGameCallback.h" />
-		<Unit filename="lib/IGameEventsReceiver.h" />
-		<Unit filename="lib/Interprocess.h" />
-		<Unit filename="lib/JsonNode.cpp" />
-		<Unit filename="lib/JsonNode.h" />
-		<Unit filename="lib/Map/CCampaignHandler.cpp" />
-		<Unit filename="lib/Map/CCampaignHandler.h" />
-		<Unit filename="lib/Map/CMap.cpp" />
-		<Unit filename="lib/Map/CMap.h" />
-		<Unit filename="lib/Map/CMapInfo.cpp" />
-		<Unit filename="lib/Map/CMapInfo.h" />
-		<Unit filename="lib/Map/CMapService.cpp" />
-		<Unit filename="lib/Map/CMapService.h" />
-		<Unit filename="lib/NetPacks.h" />
-		<Unit filename="lib/NetPacksLib.cpp" />
-		<Unit filename="lib/RMG/CMapGenOptions.cpp" />
-		<Unit filename="lib/RMG/CMapGenOptions.h" />
-		<Unit filename="lib/RegisterTypes.h" />
-		<Unit filename="lib/ResourceSet.cpp" />
-		<Unit filename="lib/ResourceSet.h" />
-		<Unit filename="lib/StartInfo.h" />
-		<Unit filename="lib/StdInc.h">
-			<Option compile="1" />
-			<Option weight="0" />
-		</Unit>
-		<Unit filename="lib/UnlockGuard.h" />
-		<Unit filename="lib/VCMIDirs.h" />
-		<Unit filename="lib/VCMI_Lib.cpp" />
-		<Unit filename="lib/VCMI_Lib.h" />
-		<Unit filename="lib/int3.h" />
-		<Unit filename="lib/vcmi_endian.h" />
-		<Extensions>
-			<code_completion />
-			<envvars />
-			<debugger />
-			<lib_finder disable_auto="1" />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>
diff --git a/client/VCMI_client.cbp b/client/VCMI_client.cbp
new file mode 100644
index 000000000..9e7da3a57
--- /dev/null
+++ b/client/VCMI_client.cbp
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_project_file>
+	<FileVersion major="1" minor="6" />
+	<Project>
+		<Option title="VCMI_client" />
+		<Option pch_mode="2" />
+		<Option compiler="gcc" />
+		<Build>
+			<Target title="Debug">
+				<Option output="../bin/Debug/VCMI_client" prefix_auto="1" extension_auto="1" />
+				<Option object_output="../obj/Debug/" />
+				<Option type="1" />
+				<Option compiler="gcc" />
+				<Compiler>
+					<Add option="-g" />
+				</Compiler>
+				<Linker>
+					<Add directory="../bin/Debug" />
+				</Linker>
+			</Target>
+			<Target title="Release">
+				<Option output="../bin/Release/VCMI_client" prefix_auto="1" extension_auto="1" />
+				<Option object_output="../obj/Release/" />
+				<Option type="1" />
+				<Option compiler="gcc" />
+				<Compiler>
+					<Add option="-fomit-frame-pointer" />
+					<Add option="-O2" />
+				</Compiler>
+				<Linker>
+					<Add option="-s" />
+					<Add directory="../bin/Release" />
+				</Linker>
+			</Target>
+		</Build>
+		<Compiler>
+			<Add option="-Wextra" />
+			<Add option="-Wall" />
+			<Add option="-fexceptions" />
+			<Add option="-Wpointer-arith" />
+			<Add option="-Wno-switch" />
+			<Add option="-Wno-sign-compare" />
+			<Add option="-Wno-unused-parameter" />
+			<Add option="-Wno-overloaded-virtual" />
+			<Add option="-fpermissive" />
+			<Add option="-DBOOST_THREAD_USE_LIB" />
+			<Add option="-D_WIN32_WINNT=0x0501" />
+			<Add directory="$(#boost.include)" />
+			<Add directory="$(#sdl.include)" />
+			<Add directory="../include" />
+			<Add directory="../client" />
+		</Compiler>
+		<Linker>
+			<Add option="-lole32" />
+			<Add option="-loleaut32" />
+			<Add option="-lws2_32" />
+			<Add option="-lboost_program_options$(#boost.libsuffix)" />
+			<Add option="-lboost_filesystem$(#boost.libsuffix)" />
+			<Add option="-lboost_system$(#boost.libsuffix)" />
+			<Add option="-lboost_thread$(#boost.libsuffix)" />
+			<Add option="-lboost_chrono$(#boost.libsuffix)" />
+			<Add option="-lSDL" />
+			<Add option="-lSDL_image" />
+			<Add option="-lSDL_mixer" />
+			<Add option="-lSDL_ttf" />
+			<Add option="-lVCMI_lib" />
+			<Add directory="$(#boost.lib)" />
+			<Add directory="$(#sdl.lib)" />
+		</Linker>
+		<Unit filename="../CCallback.cpp" />
+		<Unit filename="../CCallback.h" />
+		<Unit filename="AdventureMapClasses.cpp" />
+		<Unit filename="AdventureMapClasses.h" />
+		<Unit filename="BattleInterface/CBattleAnimations.cpp" />
+		<Unit filename="BattleInterface/CBattleAnimations.h" />
+		<Unit filename="BattleInterface/CBattleInterface.cpp" />
+		<Unit filename="BattleInterface/CBattleInterface.h" />
+		<Unit filename="BattleInterface/CBattleInterfaceClasses.cpp" />
+		<Unit filename="BattleInterface/CBattleInterfaceClasses.h" />
+		<Unit filename="BattleInterface/CCreatureAnimation.cpp" />
+		<Unit filename="BattleInterface/CCreatureAnimation.h" />
+		<Unit filename="CAdvmapInterface.cpp" />
+		<Unit filename="CAdvmapInterface.h" />
+		<Unit filename="CAnimation.cpp" />
+		<Unit filename="CAnimation.h" />
+		<Unit filename="CBitmapHandler.cpp" />
+		<Unit filename="CBitmapHandler.h" />
+		<Unit filename="CCastleInterface.cpp" />
+		<Unit filename="CCastleInterface.h" />
+		<Unit filename="CCreatureWindow.cpp" />
+		<Unit filename="CCreatureWindow.h" />
+		<Unit filename="CDefHandler.cpp" />
+		<Unit filename="CDefHandler.h" />
+		<Unit filename="CGameInfo.cpp" />
+		<Unit filename="CGameInfo.h" />
+		<Unit filename="CHeroWindow.cpp" />
+		<Unit filename="CHeroWindow.h" />
+		<Unit filename="CKingdomInterface.cpp" />
+		<Unit filename="CKingdomInterface.h" />
+		<Unit filename="CMT.cpp" />
+		<Unit filename="CMessage.cpp" />
+		<Unit filename="CMessage.h" />
+		<Unit filename="CMusicHandler.cpp" />
+		<Unit filename="CMusicHandler.h" />
+		<Unit filename="CPlayerInterface.cpp" />
+		<Unit filename="CPlayerInterface.h" />
+		<Unit filename="CPreGame.cpp" />
+		<Unit filename="CPreGame.h" />
+		<Unit filename="CQuestLog.cpp" />
+		<Unit filename="CQuestLog.h" />
+		<Unit filename="CSoundBase.h" />
+		<Unit filename="CSpellWindow.cpp" />
+		<Unit filename="CSpellWindow.h" />
+		<Unit filename="CVideoHandler.cpp" />
+		<Unit filename="CVideoHandler.h" />
+		<Unit filename="Client.cpp" />
+		<Unit filename="Client.h" />
+		<Unit filename="FunctionList.h" />
+		<Unit filename="GUIClasses.cpp" />
+		<Unit filename="GUIClasses.h" />
+		<Unit filename="Graphics.cpp" />
+		<Unit filename="Graphics.h" />
+		<Unit filename="NetPacksClient.cpp" />
+		<Unit filename="StdInc.h">
+			<Option compile="1" />
+			<Option weight="0" />
+		</Unit>
+		<Unit filename="UIFramework/CCursorHandler.cpp" />
+		<Unit filename="UIFramework/CCursorHandler.h" />
+		<Unit filename="UIFramework/CGuiHandler.cpp" />
+		<Unit filename="UIFramework/CGuiHandler.h" />
+		<Unit filename="UIFramework/CIntObject.cpp" />
+		<Unit filename="UIFramework/CIntObject.h" />
+		<Unit filename="UIFramework/CIntObjectClasses.cpp" />
+		<Unit filename="UIFramework/CIntObjectClasses.h" />
+		<Unit filename="UIFramework/Fonts.cpp" />
+		<Unit filename="UIFramework/Fonts.h" />
+		<Unit filename="UIFramework/Geometries.cpp" />
+		<Unit filename="UIFramework/Geometries.h" />
+		<Unit filename="UIFramework/SDL_Extensions.cpp" />
+		<Unit filename="UIFramework/SDL_Extensions.h" />
+		<Unit filename="UIFramework/SDL_Pixels.h" />
+		<Unit filename="VCMI_client.rc">
+			<Option compilerVar="WINDRES" />
+		</Unit>
+		<Unit filename="mapHandler.cpp" />
+		<Unit filename="mapHandler.h" />
+		<Unit filename="resource.h" />
+		<Extensions>
+			<code_completion />
+			<envvars />
+			<debugger />
+			<lib_finder disable_auto="1" />
+			<DoxyBlocks>
+				<comment_style block="0" line="0" />
+				<doxyfile_project />
+				<doxyfile_build />
+				<doxyfile_warnings />
+				<doxyfile_output />
+				<doxyfile_dot />
+				<general />
+			</DoxyBlocks>
+		</Extensions>
+	</Project>
+</CodeBlocks_project_file>
diff --git a/lib/VCMI_lib.cbp b/lib/VCMI_lib.cbp
new file mode 100644
index 000000000..18297be0b
--- /dev/null
+++ b/lib/VCMI_lib.cbp
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_project_file>
+	<FileVersion major="1" minor="6" />
+	<Project>
+		<Option title="VCMI_lib" />
+		<Option execution_dir="D:/projects/vcmi/engine/VCMI_lib/" />
+		<Option pch_mode="2" />
+		<Option compiler="gcc" />
+		<Build>
+			<Target title="Debug">
+				<Option platforms="Windows;" />
+				<Option output="../bin/Debug/VCMI_lib" prefix_auto="0" extension_auto="1" />
+				<Option object_output="../obj/Debug/Lib" />
+				<Option type="3" />
+				<Option compiler="gcc" />
+				<Option createStaticLib="1" />
+				<Compiler>
+					<Add option="-O1" />
+					<Add option="-O" />
+				</Compiler>
+			</Target>
+			<Target title="Release">
+				<Option platforms="Windows;" />
+				<Option output="../bin/Release/VCMI_lib" prefix_auto="0" extension_auto="1" />
+				<Option object_output="../obj/Release/Lib" />
+				<Option type="3" />
+				<Option compiler="gcc" />
+				<Option createStaticLib="1" />
+				<Compiler>
+					<Add option="-fomit-frame-pointer" />
+					<Add option="-O2" />
+				</Compiler>
+				<Linker>
+					<Add option="-s" />
+				</Linker>
+			</Target>
+		</Build>
+		<Compiler>
+			<Add option="-Wextra" />
+			<Add option="-Wall" />
+			<Add option="-fexceptions" />
+			<Add option="-Wpointer-arith" />
+			<Add option="-Wno-switch" />
+			<Add option="-Wno-sign-compare" />
+			<Add option="-Wno-unused-parameter" />
+			<Add option="-Wno-overloaded-virtual" />
+			<Add option="-DVCMI_DLL" />
+			<Add option="-DBOOST_THREAD_USE_LIB" />
+			<Add option="-D_WIN32_WINNT=0x0501" />
+			<Add directory="$(#boost.include)" />
+			<Add directory="$(#sdl.include)" />
+			<Add directory="../include" />
+			<Add directory="../lib" />
+		</Compiler>
+		<Linker>
+			<Add option="-lws2_32" />
+			<Add option="-lzlib" />
+			<Add option="-lboost_filesystem$(#boost.libsuffix)" />
+			<Add option="-lboost_system$(#boost.libsuffix)" />
+			<Add option="-lboost_thread$(#boost.libsuffix)" />
+			<Add option="-lboost_chrono$(#boost.libsuffix)" />
+			<Add directory="$(#boost.lib)" />
+			<Add directory="$(#sdl.lib)" />
+		</Linker>
+		<Unit filename="AI_Base.h" />
+		<Unit filename="BattleAction.cpp" />
+		<Unit filename="BattleAction.h" />
+		<Unit filename="BattleHex.cpp" />
+		<Unit filename="BattleHex.h" />
+		<Unit filename="BattleState.cpp" />
+		<Unit filename="BattleState.h" />
+		<Unit filename="CArtHandler.cpp" />
+		<Unit filename="CArtHandler.h" />
+		<Unit filename="CBattleCallback.cpp" />
+		<Unit filename="CBattleCallback.h" />
+		<Unit filename="CBuildingHandler.cpp" />
+		<Unit filename="CBuildingHandler.h" />
+		<Unit filename="CConfigHandler.cpp" />
+		<Unit filename="CConfigHandler.h" />
+		<Unit filename="CConsoleHandler.cpp" />
+		<Unit filename="CConsoleHandler.h" />
+		<Unit filename="CCreatureHandler.cpp" />
+		<Unit filename="CCreatureHandler.h" />
+		<Unit filename="CCreatureSet.cpp" />
+		<Unit filename="CCreatureSet.h" />
+		<Unit filename="CDefObjInfoHandler.cpp" />
+		<Unit filename="CDefObjInfoHandler.h" />
+		<Unit filename="CGameInterface.cpp" />
+		<Unit filename="CGameInterface.h" />
+		<Unit filename="CGameState.cpp" />
+		<Unit filename="CGameState.h" />
+		<Unit filename="CGeneralTextHandler.cpp" />
+		<Unit filename="CGeneralTextHandler.h" />
+		<Unit filename="CHeroHandler.cpp" />
+		<Unit filename="CHeroHandler.h" />
+		<Unit filename="CLogger.cpp" />
+		<Unit filename="CLogger.h" />
+		<Unit filename="CModHandler.cpp" />
+		<Unit filename="CModHandler.h" />
+		<Unit filename="CObjectHandler.cpp" />
+		<Unit filename="CObjectHandler.h" />
+		<Unit filename="CObstacleInstance.cpp" />
+		<Unit filename="CObstacleInstance.h" />
+		<Unit filename="CScriptingModule.h" />
+		<Unit filename="CSpellHandler.cpp" />
+		<Unit filename="CSpellHandler.h" />
+		<Unit filename="CStopWatch.h" />
+		<Unit filename="CThreadHelper.cpp" />
+		<Unit filename="CThreadHelper.h" />
+		<Unit filename="CTownHandler.cpp" />
+		<Unit filename="CTownHandler.h" />
+		<Unit filename="CondSh.h" />
+		<Unit filename="Connection.cpp" />
+		<Unit filename="Connection.h" />
+		<Unit filename="ConstTransitivePtr.h" />
+		<Unit filename="Filesystem/CBinaryReader.cpp" />
+		<Unit filename="Filesystem/CBinaryReader.h" />
+		<Unit filename="Filesystem/CCompressedStream.cpp" />
+		<Unit filename="Filesystem/CCompressedStream.h" />
+		<Unit filename="Filesystem/CFileInfo.cpp" />
+		<Unit filename="Filesystem/CFileInfo.h" />
+		<Unit filename="Filesystem/CFileInputStream.cpp" />
+		<Unit filename="Filesystem/CFileInputStream.h" />
+		<Unit filename="Filesystem/CFilesystemLoader.cpp" />
+		<Unit filename="Filesystem/CFilesystemLoader.h" />
+		<Unit filename="Filesystem/CInputStream.h" />
+		<Unit filename="Filesystem/CLodArchiveLoader.cpp" />
+		<Unit filename="Filesystem/CLodArchiveLoader.h" />
+		<Unit filename="Filesystem/CMemoryStream.cpp" />
+		<Unit filename="Filesystem/CMemoryStream.h" />
+		<Unit filename="Filesystem/CResourceLoader.cpp" />
+		<Unit filename="Filesystem/CResourceLoader.h" />
+		<Unit filename="Filesystem/ISimpleResourceLoader.h" />
+		<Unit filename="GameConstants.h" />
+		<Unit filename="HeroBonus.cpp" />
+		<Unit filename="HeroBonus.h" />
+		<Unit filename="IGameCallback.cpp" />
+		<Unit filename="IGameCallback.h" />
+		<Unit filename="IGameEventsReceiver.h" />
+		<Unit filename="Interprocess.h" />
+		<Unit filename="JsonNode.cpp" />
+		<Unit filename="JsonNode.h" />
+		<Unit filename="Map/CCampaignHandler.cpp" />
+		<Unit filename="Map/CCampaignHandler.h" />
+		<Unit filename="Map/CMap.cpp" />
+		<Unit filename="Map/CMap.h" />
+		<Unit filename="Map/CMapInfo.cpp" />
+		<Unit filename="Map/CMapInfo.h" />
+		<Unit filename="Map/CMapService.cpp" />
+		<Unit filename="Map/CMapService.h" />
+		<Unit filename="NetPacks.h" />
+		<Unit filename="NetPacksLib.cpp" />
+		<Unit filename="RMG/CMapGenOptions.cpp" />
+		<Unit filename="RMG/CMapGenOptions.h" />
+		<Unit filename="RegisterTypes.h" />
+		<Unit filename="ResourceSet.cpp" />
+		<Unit filename="ResourceSet.h" />
+		<Unit filename="StartInfo.h" />
+		<Unit filename="StdInc.h">
+			<Option compile="1" />
+			<Option weight="0" />
+		</Unit>
+		<Unit filename="StringConstants.h" />
+		<Unit filename="UnlockGuard.h" />
+		<Unit filename="VCMIDirs.h" />
+		<Unit filename="VCMI_Lib.cpp" />
+		<Unit filename="VCMI_Lib.h" />
+		<Unit filename="int3.h" />
+		<Unit filename="vcmi_endian.h" />
+		<Extensions>
+			<code_completion />
+			<envvars />
+			<debugger />
+			<lib_finder disable_auto="1" />
+		</Extensions>
+	</Project>
+</CodeBlocks_project_file>
diff --git a/VCMI_server.cbp b/server/VCMI_server.cbp
similarity index 76%
rename from VCMI_server.cbp
rename to server/VCMI_server.cbp
index af03cfb1e..514ea1815 100644
--- a/VCMI_server.cbp
+++ b/server/VCMI_server.cbp
@@ -7,8 +7,8 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug">
-				<Option output="bin/Debug/VCMI_server" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj/Debug/" />
+				<Option output="../bin/Debug/VCMI_server" prefix_auto="1" extension_auto="1" />
+				<Option object_output="../obj/Debug/Server" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Option use_console_runner="0" />
@@ -16,12 +16,12 @@
 					<Add option="-ggdb" />
 				</Compiler>
 				<Linker>
-					<Add directory="bin/Debug" />
+					<Add directory="../bin/Debug" />
 				</Linker>
 			</Target>
 			<Target title="Release">
-				<Option output="bin/Release/VCMI_server" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj/Release/" />
+				<Option output="../bin/Release/VCMI_server" prefix_auto="1" extension_auto="1" />
+				<Option object_output="../obj/Release/Server" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Compiler>
@@ -30,7 +30,7 @@
 				</Compiler>
 				<Linker>
 					<Add option="-s" />
-					<Add directory="bin/Release" />
+					<Add directory="../bin/Release" />
 				</Linker>
 			</Target>
 		</Build>
@@ -47,8 +47,7 @@
 			<Add option="-DBOOST_THREAD_USE_LIB" />
 			<Add directory="$(#boost.include)" />
 			<Add directory="$(#sdl.include)" />
-			<Add directory="." />
-			<Add directory="include" />
+			<Add directory="../include" />
 		</Compiler>
 		<Linker>
 			<Add option="-lole32" />
@@ -63,12 +62,12 @@
 			<Add option="-lVCMI_lib" />
 			<Add directory="$(#boost.lib)" />
 		</Linker>
-		<Unit filename="server/CGameHandler.cpp" />
-		<Unit filename="server/CGameHandler.h" />
-		<Unit filename="server/CVCMIServer.cpp" />
-		<Unit filename="server/CVCMIServer.h" />
-		<Unit filename="server/NetPacksServer.cpp" />
-		<Unit filename="server/StdInc.h">
+		<Unit filename="CGameHandler.cpp" />
+		<Unit filename="CGameHandler.h" />
+		<Unit filename="CVCMIServer.cpp" />
+		<Unit filename="CVCMIServer.h" />
+		<Unit filename="NetPacksServer.cpp" />
+		<Unit filename="StdInc.h">
 			<Option compile="1" />
 			<Option weight="0" />
 		</Unit>
diff --git a/vcmi.workspace b/vcmi.workspace
index 6fa10f475..17f62bdf4 100644
--- a/vcmi.workspace
+++ b/vcmi.workspace
@@ -1,29 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <CodeBlocks_workspace_file>
 	<Workspace title="vcmi">
-		<Project filename="VCMI_lib.cbp" />
-		<Project filename="VCMI_client.cbp">
-			<Depends filename="VCMI_lib.cbp" />
-		</Project>
-		<Project filename="VCMI_server.cbp">
-			<Depends filename="VCMI_lib.cbp" />
-		</Project>
+		<Project filename="lib/VCMI_lib.cbp" />
+		<Project filename="client/VCMI_client.cbp" />
+		<Project filename="server/VCMI_server.cbp" />
 		<Project filename="AI/FuzzyLite/FuzzyLite.cbp" />
-		<Project filename="AI/EmptyAI/EmptyAI.cbp">
-			<Depends filename="VCMI_lib.cbp" />
-		</Project>
+		<Project filename="AI/EmptyAI/EmptyAI.cbp" />
 		<Project filename="AI/VCAI/VCAI.cbp">
-			<Depends filename="VCMI_lib.cbp" />
 			<Depends filename="AI/FuzzyLite/FuzzyLite.cbp" />
 		</Project>
-		<Project filename="AI/StupidAI/StupidAI.cbp">
-			<Depends filename="VCMI_lib.cbp" />
-		</Project>
-		<Project filename="AI/BattleAI/BattleAI.cbp">
-			<Depends filename="VCMI_lib.cbp" />
-		</Project>
-		<Project filename="Scripting/ERM/ERM.cbp">
-			<Depends filename="VCMI_lib.cbp" />
-		</Project>
+		<Project filename="AI/StupidAI/StupidAI.cbp" />
+		<Project filename="AI/BattleAI/BattleAI.cbp" />
+		<Project filename="Scripting/ERM/ERM.cbp" />
 	</Workspace>
 </CodeBlocks_workspace_file>