diff --git a/client/CMT.cpp b/client/CMT.cpp
index 11beac7bb..8801bc573 100644
--- a/client/CMT.cpp
+++ b/client/CMT.cpp
@@ -8,13 +8,13 @@
 
 #include "../lib/filesystem/Filesystem.h"
 #include "CPreGame.h"
-#include "CCastleInterface.h"
+#include "windows/CCastleInterface.h"
 #include "../lib/CConsoleHandler.h"
 #include "gui/CCursorHandler.h"
 #include "../lib/CGameState.h"
 #include "../CCallback.h"
 #include "CPlayerInterface.h"
-#include "CAdvmapInterface.h"
+#include "windows/CAdvmapInterface.h"
 #include "../lib/CBuildingHandler.h"
 #include "CVideoHandler.h"
 #include "../lib/CHeroHandler.h"
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 1a31e0b42..09df7f7db 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -14,39 +14,41 @@ set(client_SRCS
 		battle/CBattleInterfaceClasses.cpp
 		battle/CCreatureAnimation.cpp
 
-		gui/CArtifactHolder.cpp
-		gui/CComponent.cpp
-		gui/CGarrisonInt.cpp
+		gui/CCursorHandler.cpp
 		gui/CGuiHandler.cpp
 		gui/CIntObject.cpp
-		gui/CIntObjectClasses.cpp
-		gui/CTradeWindow.cpp
 		gui/Fonts.cpp
 		gui/Geometries.cpp
-		gui/MiscWidgets.cpp
-		gui/CCursorHandler.cpp
 		gui/SDL_Extensions.cpp
 
-		CPreGame.cpp
-		Client.cpp
-		CPlayerInterface.cpp
-		CMT.cpp
-		GUIClasses.cpp
-		AdventureMapClasses.cpp
-		CAdvmapInterface.cpp
-		CAnimation.cpp
+		widgets/AdventureMapClasses.cpp
+		widgets/CAnimation.cpp
+		widgets/CArtifactHolder.cpp
+		widgets/CComponent.cpp
+		widgets/CGarrisonInt.cpp
+		widgets/CIntObjectClasses.cpp
+		widgets/MiscWidgets.cpp
+
+		windows/CAdvmapInterface.cpp
+		windows/CCastleInterface.cpp
+		windows/CCreatureWindow.cpp
+		windows/CHeroWindow.cpp
+		windows/CKingdomInterface.cpp
+		windows/CQuestLog.cpp
+		windows/CSpellWindow.cpp
+		windows/CTradeWindow.cpp
+		windows/GUIClasses.cpp
+
 		CBitmapHandler.cpp
-		CCastleInterface.cpp
-		CCreatureWindow.cpp
 		CDefHandler.cpp
 		CGameInfo.cpp
-		CHeroWindow.cpp
-		CKingdomInterface.cpp
+		Client.cpp
 		CMessage.cpp
+		CMT.cpp
 		CMusicHandler.cpp
-		CSpellWindow.cpp
+		CPlayerInterface.cpp
+		CPreGame.cpp
 		CVideoHandler.cpp
-		CQuestLog.cpp
 		Graphics.cpp
 		mapHandler.cpp
 		NetPacksClient.cpp
diff --git a/client/CMessage.cpp b/client/CMessage.cpp
index 8e9e6c0c3..273860862 100644
--- a/client/CMessage.cpp
+++ b/client/CMessage.cpp
@@ -13,16 +13,16 @@
 
 #include "SDL_ttf.h"
 #include "CDefHandler.h"
-#include "CAnimation.h"
+#include "widgets/CAnimation.h"
 #include "CGameInfo.h"
 #include "gui/SDL_Extensions.h"
 #include "../lib/CGeneralTextHandler.h"
 #include "Graphics.h"
-#include "GUIClasses.h"
+#include "windows/GUIClasses.h"
 #include "../lib/CConfigHandler.h"
 #include "CBitmapHandler.h"
-#include "gui/CIntObjectClasses.h"
-#include "gui/MiscWidgets.h"
+#include "widgets/CIntObjectClasses.h"
+#include "widgets/MiscWidgets.h"
 
 const int BETWEEN_COMPS_ROWS = 10;
 const int BEFORE_COMPONENTS = 30;
diff --git a/client/CPlayerInterface.cpp b/client/CPlayerInterface.cpp
index f9331803e..de43e6b6e 100644
--- a/client/CPlayerInterface.cpp
+++ b/client/CPlayerInterface.cpp
@@ -1,23 +1,23 @@
 #include "StdInc.h"
-#include "CAdvmapInterface.h"
+#include "windows/CAdvmapInterface.h"
 #include "battle/CBattleInterface.h"
 #include "battle/CBattleInterfaceClasses.h"
 #include "../CCallback.h"
-#include "CCastleInterface.h"
+#include "windows/CCastleInterface.h"
 #include "gui/CCursorHandler.h"
-#include "CKingdomInterface.h"
+#include "windows/CKingdomInterface.h"
 #include "CGameInfo.h"
-#include "CHeroWindow.h"
-#include "CCreatureWindow.h"
-#include "CQuestLog.h"
+#include "windows/CHeroWindow.h"
+#include "windows/CCreatureWindow.h"
+#include "windows/CQuestLog.h"
 #include "CMessage.h"
 #include "CPlayerInterface.h"
 #include "gui/SDL_Extensions.h"
-#include "gui/CTradeWindow.h"
+#include "windows/CTradeWindow.h"
 #include "../lib/CConfigHandler.h"
 #include "battle/CCreatureAnimation.h"
 #include "Graphics.h"
-#include "GUIClasses.h"
+#include "windows/GUIClasses.h"
 #include "../lib/CArtHandler.h"
 #include "../lib/CGeneralTextHandler.h"
 #include "../lib/CHeroHandler.h"
@@ -37,7 +37,7 @@
 #include "../lib/CGameState.h"
 #include "../lib/GameConstants.h"
 #include "gui/CGuiHandler.h"
-#include "gui/MiscWidgets.h"
+#include "widgets/MiscWidgets.h"
 #include "../lib/UnlockGuard.h"
 
 #ifdef min
diff --git a/client/CPreGame.cpp b/client/CPreGame.cpp
index 2d7a3fb91..8cd910723 100644
--- a/client/CPreGame.cpp
+++ b/client/CPreGame.cpp
@@ -9,7 +9,7 @@
 #include "gui/SDL_Extensions.h"
 #include "CGameInfo.h"
 #include "gui/CCursorHandler.h"
-#include "CAnimation.h"
+#include "widgets/CAnimation.h"
 #include "CDefHandler.h"
 #include "../lib/CGeneralTextHandler.h"
 #include "../lib/CTownHandler.h"
@@ -23,7 +23,7 @@
 #include "../lib/Connection.h"
 #include "../lib/VCMIDirs.h"
 #include "../lib/mapping/CMap.h"
-#include "GUIClasses.h"
+#include "windows/GUIClasses.h"
 #include "CPlayerInterface.h"
 #include "../CCallback.h"
 #include "CMessage.h"
@@ -38,8 +38,8 @@
 #include "../lib/CConfigHandler.h"
 #include "../lib/GameConstants.h"
 #include "gui/CGuiHandler.h"
-#include "gui/CIntObjectClasses.h"
-#include "gui/MiscWidgets.h"
+#include "widgets/CIntObjectClasses.h"
+#include "widgets/MiscWidgets.h"
 #include "../lib/mapping/CMapService.h"
 #include "../lib/mapping/CMap.h"
 #include "../lib/CRandomGenerator.h"
diff --git a/client/CPreGame.h b/client/CPreGame.h
index 2279c0244..27defe959 100644
--- a/client/CPreGame.h
+++ b/client/CPreGame.h
@@ -5,7 +5,7 @@
 #include "../lib/FunctionList.h"
 #include "../lib/mapping/CMapInfo.h"
 #include "../lib/rmg/CMapGenerator.h"
-#include "gui/CIntObjectClasses.h"
+#include "widgets/CIntObjectClasses.h"
 
 /*
  * CPreGame.h, part of VCMI engine
diff --git a/client/Graphics.cpp b/client/Graphics.cpp
index f068cabfb..0e1286523 100644
--- a/client/Graphics.cpp
+++ b/client/Graphics.cpp
@@ -21,7 +21,7 @@
 #include "../lib/vcmi_endian.h"
 #include "../lib/GameConstants.h"
 #include "../lib/CStopWatch.h"
-#include "CAnimation.h"
+#include "widgets/CAnimation.h"
 #include "../lib/mapObjects/CObjectClassesHandler.h"
 
 using namespace boost::assign;
diff --git a/client/NetPacksClient.cpp b/client/NetPacksClient.cpp
index caeedbd97..0d04a14af 100644
--- a/client/NetPacksClient.cpp
+++ b/client/NetPacksClient.cpp
@@ -17,7 +17,7 @@
 #include "../lib/CSoundBase.h"
 #include "../lib/StartInfo.h"
 #include "mapHandler.h"
-#include "GUIClasses.h"
+#include "windows/GUIClasses.h"
 #include "../lib/CConfigHandler.h"
 #include "gui/SDL_Extensions.h"
 #include "battle/CBattleInterface.h"
@@ -26,8 +26,8 @@
 #include "../lib/BattleState.h"
 #include "../lib/GameConstants.h"
 #include "gui/CGuiHandler.h"
-#include "gui/MiscWidgets.h"
-#include "AdventureMapClasses.h"
+#include "widgets/MiscWidgets.h"
+#include "widgets/AdventureMapClasses.h"
 #include "CMT.h"
 
 //macros to avoid code duplication - calls given method with given arguments if interface for specific player is present
diff --git a/client/battle/CBattleAnimations.h b/client/battle/CBattleAnimations.h
index 482320860..2b9475ed5 100644
--- a/client/battle/CBattleAnimations.h
+++ b/client/battle/CBattleAnimations.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../CAnimation.h"
+#include "../widgets/CAnimation.h"
 #include "../../lib/BattleHex.h"
 
 class CBattleInterface;
diff --git a/client/battle/CBattleInterface.cpp b/client/battle/CBattleInterface.cpp
index 737913ed1..c960a1318 100644
--- a/client/battle/CBattleInterface.cpp
+++ b/client/battle/CBattleInterface.cpp
@@ -1,40 +1,38 @@
 #include "StdInc.h"
 #include "CBattleInterface.h"
 
-#include "../CGameInfo.h"
-#include "../gui/SDL_Extensions.h"
-#include "../CAdvmapInterface.h"
-#include "../CAnimation.h"
-#include "../CBitmapHandler.h"
-#include "../../lib/CHeroHandler.h"
-# include "../CDefHandler.h"
-#include "../../lib/CSpellHandler.h"
-#include "../CMusicHandler.h"
-#include "../CMessage.h"
-#include "../../CCallback.h"
-#include "../../lib/BattleState.h"
-#include "../../lib/CGeneralTextHandler.h"
-#include "CCreatureAnimation.h"
-#include "../Graphics.h"
-#include "../CSpellWindow.h"
-#include "../../lib/CConfigHandler.h"
-#include "../../lib/CondSh.h"
-#include "../../lib/NetPacks.h"
-#include "../CPlayerInterface.h"
-#include "../CCreatureWindow.h"
-#include "../CVideoHandler.h"
-#include "../../lib/CTownHandler.h"
-#include "../../lib/mapping/CMap.h"
-#include "../../lib/CRandomGenerator.h"
-
 #include "CBattleAnimations.h"
 #include "CBattleInterfaceClasses.h"
+#include "CCreatureAnimation.h"
 
+#include "../CBitmapHandler.h"
+#include "../CDefHandler.h"
+#include "../CGameInfo.h"
+#include "../CMessage.h"
+#include "../CMT.h"
+#include "../CMusicHandler.h"
+#include "../CPlayerInterface.h"
+#include "../CVideoHandler.h"
+#include "../Graphics.h"
 #include "../gui/CCursorHandler.h"
 #include "../gui/CGuiHandler.h"
-#include "../CMT.h"
-
+#include "../gui/SDL_Extensions.h"
+#include "../widgets/CAnimation.h"
+#include "../windows/CAdvmapInterface.h"
+#include "../windows/CCreatureWindow.h"
+#include "../windows/CSpellWindow.h"
 
+#include "../../CCallback.h"
+#include "../../lib/BattleState.h"
+#include "../../lib/CConfigHandler.h"
+#include "../../lib/CGeneralTextHandler.h"
+#include "../../lib/CHeroHandler.h"
+#include "../../lib/CondSh.h"
+#include "../../lib/CRandomGenerator.h"
+#include "../../lib/CSpellHandler.h"
+#include "../../lib/CTownHandler.h"
+#include "../../lib/mapping/CMap.h"
+#include "../../lib/NetPacks.h"
 #include "../../lib/UnlockGuard.h"
 
 using namespace boost::assign;
diff --git a/client/battle/CBattleInterface.h b/client/battle/CBattleInterface.h
index 1672180f0..00816138d 100644
--- a/client/battle/CBattleInterface.h
+++ b/client/battle/CBattleInterface.h
@@ -3,8 +3,10 @@
 
 #include "../../lib/CCreatureSet.h"
 #include "../../lib/ConstTransitivePtr.h" //may be reundant
-#include "../CAnimation.h"
 #include "../../lib/GameConstants.h"
+
+#include "../widgets/CAnimation.h"
+
 #include "CBattleAnimations.h"
 
 /*
diff --git a/client/battle/CBattleInterfaceClasses.cpp b/client/battle/CBattleInterfaceClasses.cpp
index cbfa489bc..fe0ccc5eb 100644
--- a/client/battle/CBattleInterfaceClasses.cpp
+++ b/client/battle/CBattleInterfaceClasses.cpp
@@ -1,29 +1,31 @@
 #include "StdInc.h"
 #include "CBattleInterfaceClasses.h"
 
-#include "../gui/SDL_Extensions.h"
 #include "CBattleInterface.h"
-#include "../CGameInfo.h"
-#include "../CDefHandler.h"
-#include "../gui/CCursorHandler.h"
-#include "../CPlayerInterface.h"
-#include "../../CCallback.h"
-#include "../CSpellWindow.h"
-#include "../Graphics.h"
-#include "../../lib/CConfigHandler.h"
-#include "../gui/CGuiHandler.h"
-#include "../gui/CIntObjectClasses.h"
-#include "../../lib/CGeneralTextHandler.h"
-#include "../../lib/NetPacks.h"
-#include "../../lib/CCreatureHandler.h"
-#include "../../lib/BattleState.h"
-#include "../../lib/StartInfo.h"
-#include "../CMusicHandler.h"
-#include "../CVideoHandler.h"
-#include "../../lib/CTownHandler.h"
+
 #include "../CBitmapHandler.h"
-#include "../CCreatureWindow.h"
+#include "../CDefHandler.h"
+#include "../CGameInfo.h"
 #include "../CMessage.h"
+#include "../CMusicHandler.h"
+#include "../CPlayerInterface.h"
+#include "../CVideoHandler.h"
+#include "../Graphics.h"
+#include "../gui/CCursorHandler.h"
+#include "../gui/CGuiHandler.h"
+#include "../gui/SDL_Extensions.h"
+#include "../widgets/CIntObjectClasses.h"
+#include "../windows/CCreatureWindow.h"
+#include "../windows/CSpellWindow.h"
+
+#include "../../CCallback.h"
+#include "../../lib/BattleState.h"
+#include "../../lib/CConfigHandler.h"
+#include "../../lib/CCreatureHandler.h"
+#include "../../lib/CGeneralTextHandler.h"
+#include "../../lib/CTownHandler.h"
+#include "../../lib/NetPacks.h"
+#include "../../lib/StartInfo.h"
 
 /*
  * CBattleInterfaceClasses.cpp, part of VCMI engine
diff --git a/client/battle/CCreatureAnimation.cpp b/client/battle/CCreatureAnimation.cpp
index 155f853a7..5467c40ce 100644
--- a/client/battle/CCreatureAnimation.cpp
+++ b/client/battle/CCreatureAnimation.cpp
@@ -1,16 +1,16 @@
 #include "StdInc.h"
 #include "CCreatureAnimation.h"
 
+#include "../../lib/vcmi_endian.h"
 #include "../../lib/CConfigHandler.h"
 #include "../../lib/CCreatureHandler.h"
-#include "../../lib/vcmi_endian.h"
-#include "../gui/SDL_Extensions.h"
-#include "../gui/SDL_Pixels.h"
-
 #include "../../lib/filesystem/Filesystem.h"
 #include "../../lib/filesystem/CBinaryReader.h"
 #include "../../lib/filesystem/CMemoryStream.h"
 
+#include "../gui/SDL_Extensions.h"
+#include "../gui/SDL_Pixels.h"
+
 /*
  * CCreatureAnimation.cpp, part of VCMI engine
  *
diff --git a/client/battle/CCreatureAnimation.h b/client/battle/CCreatureAnimation.h
index f8fb967f0..6f4153e63 100644
--- a/client/battle/CCreatureAnimation.h
+++ b/client/battle/CCreatureAnimation.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "../../lib/FunctionList.h"
-#include "../CAnimation.h"
+#include "../widgets/CAnimation.h"
 
 /*
  * CCreatureAnimation.h, part of VCMI engine
diff --git a/client/gui/CCursorHandler.cpp b/client/gui/CCursorHandler.cpp
index 5fd52e7df..9f8806239 100644
--- a/client/gui/CCursorHandler.cpp
+++ b/client/gui/CCursorHandler.cpp
@@ -2,10 +2,12 @@
 #include "CCursorHandler.h"
 
 #include <SDL.h>
+
 #include "SDL_Extensions.h"
-#include "../CAnimation.h"
 #include "CGuiHandler.h"
+
 #include "../CMT.h"
+#include "../widgets/CAnimation.h"
 
 /*
  * CCursorHandler.cpp, part of VCMI engine
diff --git a/client/gui/CGuiHandler.cpp b/client/gui/CGuiHandler.cpp
index 2244e6e96..434c9abb6 100644
--- a/client/gui/CGuiHandler.cpp
+++ b/client/gui/CGuiHandler.cpp
@@ -1,10 +1,10 @@
 #include "StdInc.h"
 #include "CGuiHandler.h"
 
-
 #include "CIntObject.h"
-#include "../CGameInfo.h"
 #include "CCursorHandler.h"
+
+#include "../CGameInfo.h"
 #include "../../lib/CThreadHelper.h"
 #include "../../lib/CConfigHandler.h"
 #include "../CMT.h"
diff --git a/client/gui/CIntObject.cpp b/client/gui/CIntObject.cpp
index 3ee42bb60..aeabf3046 100644
--- a/client/gui/CIntObject.cpp
+++ b/client/gui/CIntObject.cpp
@@ -1,5 +1,6 @@
 #include "StdInc.h"
 #include "CIntObject.h"
+
 #include "CGuiHandler.h"
 #include "SDL_Extensions.h"
 #include "../CMessage.h"
diff --git a/client/gui/SDL_Extensions.cpp b/client/gui/SDL_Extensions.cpp
index f84cd07e9..1732d449a 100644
--- a/client/gui/SDL_Extensions.cpp
+++ b/client/gui/SDL_Extensions.cpp
@@ -2,7 +2,6 @@
 #include "SDL_Extensions.h"
 #include "SDL_Pixels.h"
 
-#include <SDL_ttf.h>
 #include "../CGameInfo.h"
 #include "../CMessage.h"
 #include "../CDefHandler.h"
diff --git a/client/AdventureMapClasses.cpp b/client/widgets/AdventureMapClasses.cpp
similarity index 97%
rename from client/AdventureMapClasses.cpp
rename to client/widgets/AdventureMapClasses.cpp
index 98e07980b..3a80c157a 100644
--- a/client/AdventureMapClasses.cpp
+++ b/client/widgets/AdventureMapClasses.cpp
@@ -1,33 +1,37 @@
 #include "StdInc.h"
 #include "AdventureMapClasses.h"
 
-#include "../CCallback.h"
-#include "../lib/JsonNode.h"
-#include "../lib/filesystem/Filesystem.h"
-#include "../lib/mapping/CMap.h"
-#include "../lib/CModHandler.h"
-#include "../lib/mapObjects/CGHeroInstance.h"
-#include "../lib/CGameState.h"
-#include "../lib/CGeneralTextHandler.h"
-#include "../lib/CTownHandler.h"
-#include "../lib/NetPacksBase.h"
-#include "../lib/CHeroHandler.h"
-#include "../lib/StringConstants.h"
-#include "CAdvmapInterface.h"
 #include "CAnimation.h"
-#include "CGameInfo.h"
-#include "CPlayerInterface.h"
-#include "CMusicHandler.h"
-#include "Graphics.h"
-#include "GUIClasses.h"
-#include "StartInfo.h"
-#include "CPreGame.h"
-#include "gui/CGuiHandler.h"
-#include "gui/SDL_Pixels.h"
-#include "gui/MiscWidgets.h"
-#include "battle/CBattleInterface.h"
-#include "battle/CBattleInterfaceClasses.h"
-#include "gui/MiscWidgets.h"
+#include "MiscWidgets.h"
+
+#include "../CGameInfo.h"
+#include "../CMusicHandler.h"
+#include "../CPlayerInterface.h"
+#include "../CPreGame.h"
+#include "../Graphics.h"
+
+#include "../gui/CGuiHandler.h"
+#include "../gui/SDL_Pixels.h"
+
+#include "../windows/CAdvmapInterface.h"
+#include "../windows/GUIClasses.h"
+
+#include "../battle/CBattleInterfaceClasses.h"
+#include "../battle/CBattleInterface.h"
+
+#include "../../CCallback.h"
+#include "../../lib/StartInfo.h"
+#include "../../lib/CGameState.h"
+#include "../../lib/CGeneralTextHandler.h"
+#include "../../lib/CHeroHandler.h"
+#include "../../lib/CModHandler.h"
+#include "../../lib/CTownHandler.h"
+#include "../../lib/filesystem/Filesystem.h"
+#include "../../lib/JsonNode.h"
+#include "../../lib/mapObjects/CGHeroInstance.h"
+#include "../../lib/mapping/CMap.h"
+#include "../../lib/NetPacksBase.h"
+#include "../../lib/StringConstants.h"
 
 /*
  * CAdventureMapClasses.h, part of VCMI engine
diff --git a/client/AdventureMapClasses.h b/client/widgets/AdventureMapClasses.h
similarity index 99%
rename from client/AdventureMapClasses.h
rename to client/widgets/AdventureMapClasses.h
index bd5552d0e..0730a8c5f 100644
--- a/client/AdventureMapClasses.h
+++ b/client/widgets/AdventureMapClasses.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "gui/CIntObjectClasses.h"
+#include "CIntObjectClasses.h"
 
 class CArmedInstance;
 class CShowableAnim;
diff --git a/client/CAnimation.cpp b/client/widgets/CAnimation.cpp
similarity index 95%
rename from client/CAnimation.cpp
rename to client/widgets/CAnimation.cpp
index 74ce7e13e..71f56564c 100644
--- a/client/CAnimation.cpp
+++ b/client/widgets/CAnimation.cpp
@@ -1,17 +1,18 @@
 #include "StdInc.h"
+#include "CAnimation.h"
+
 #include <SDL_image.h>
 
+#include "../CBitmapHandler.h"
+#include "../Graphics.h"
+#include "../gui/SDL_Extensions.h"
+#include "../gui/SDL_Pixels.h"
+
 #include "../lib/filesystem/Filesystem.h"
 #include "../lib/filesystem/ISimpleResourceLoader.h"
 #include "../lib/JsonNode.h"
 #include "../lib/CRandomGenerator.h"
 
-#include "CBitmapHandler.h"
-#include "Graphics.h"
-#include "CAnimation.h"
-#include "gui/SDL_Extensions.h"
-#include "gui/SDL_Pixels.h"
-
 /*
  * CAnimation.cpp, part of VCMI engine
  *
diff --git a/client/CAnimation.h b/client/widgets/CAnimation.h
similarity index 95%
rename from client/CAnimation.h
rename to client/widgets/CAnimation.h
index 1f3e10dc8..b1bbdd8a5 100644
--- a/client/CAnimation.h
+++ b/client/widgets/CAnimation.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../lib/vcmi_endian.h"
-#include "gui/CIntObject.h"
+#include "../../lib/vcmi_endian.h"
+#include "../gui/CIntObject.h"
 
 /*
  * CAnimation.h, part of VCMI engine
diff --git a/client/gui/CArtifactHolder.cpp b/client/widgets/CArtifactHolder.cpp
similarity index 99%
rename from client/gui/CArtifactHolder.cpp
rename to client/widgets/CArtifactHolder.cpp
index e00d7639a..1e5f51b3d 100644
--- a/client/gui/CArtifactHolder.cpp
+++ b/client/widgets/CArtifactHolder.cpp
@@ -1,15 +1,15 @@
 #include "StdInc.h"
 #include "CArtifactHolder.h"
 
-#include "CGuiHandler.h"
-#include "CCursorHandler.h"
+#include "../gui/CGuiHandler.h"
+#include "../gui/CCursorHandler.h"
 
-#include "../CAnimation.h"
-#include "../CHeroWindow.h"
-#include "../CSpellWindow.h"
+#include "CAnimation.h"
+#include "../windows/CHeroWindow.h"
+#include "../windows/CSpellWindow.h"
+#include "../windows/GUIClasses.h"
 #include "../CPlayerInterface.h"
 #include "../CGameInfo.h"
-#include "../GUIClasses.h" // FIXME: kill this include
 
 #include "../../CCallback.h"
 
diff --git a/client/gui/CArtifactHolder.h b/client/widgets/CArtifactHolder.h
similarity index 98%
rename from client/gui/CArtifactHolder.h
rename to client/widgets/CArtifactHolder.h
index 64980fa17..70e9cfe14 100644
--- a/client/gui/CArtifactHolder.h
+++ b/client/widgets/CArtifactHolder.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include "CComponent.h"
-#include "gui/CIntObject.h"
-#include "../lib/NetPacksBase.h"
+#include "../gui/CIntObject.h"
+#include "../../lib/NetPacksBase.h"
 
 /*
  * CArtifactHolder.h, part of VCMI engine
diff --git a/client/gui/CComponent.cpp b/client/widgets/CComponent.cpp
similarity index 98%
rename from client/gui/CComponent.cpp
rename to client/widgets/CComponent.cpp
index 539a3dbc8..a1d63089c 100644
--- a/client/gui/CComponent.cpp
+++ b/client/widgets/CComponent.cpp
@@ -1,13 +1,13 @@
 #include "StdInc.h"
 #include "CComponent.h"
 
-#include "CGuiHandler.h"
-#include "CCursorHandler.h"
+#include "../gui/CGuiHandler.h"
+#include "../gui/CCursorHandler.h"
 
-#include "../CAnimation.h"
+#include "CAnimation.h"
 #include "../CMessage.h"
 #include "../CGameInfo.h"
-#include "../CAdvmapInterface.h"
+#include "../windows/CAdvmapInterface.h"
 
 #include "../../lib/CArtHandler.h"
 #include "../../lib/CTownHandler.h"
diff --git a/client/gui/CComponent.h b/client/widgets/CComponent.h
similarity index 98%
rename from client/gui/CComponent.h
rename to client/widgets/CComponent.h
index 872924bf8..ad93f6406 100644
--- a/client/gui/CComponent.h
+++ b/client/widgets/CComponent.h
@@ -1,8 +1,7 @@
 #pragma once
 
 #include "../../lib/NetPacksBase.h"
-#include "gui/CIntObject.h"
-#include "gui/CIntObjectClasses.h"
+#include "CIntObjectClasses.h"
 
 /*
  * CComponent.h, part of VCMI engine
diff --git a/client/gui/CGarrisonInt.cpp b/client/widgets/CGarrisonInt.cpp
similarity index 99%
rename from client/gui/CGarrisonInt.cpp
rename to client/widgets/CGarrisonInt.cpp
index 6feded7a0..744bf842a 100644
--- a/client/gui/CGarrisonInt.cpp
+++ b/client/widgets/CGarrisonInt.cpp
@@ -1,13 +1,13 @@
 #include "StdInc.h"
 #include "CGarrisonInt.h"
 
-#include "CGuiHandler.h"
+#include "../gui/CGuiHandler.h"
 
-#include "../CAnimation.h"
-#include "../CCreatureWindow.h"
+#include "CAnimation.h"
 #include "../CGameInfo.h"
 #include "../CPlayerInterface.h"
-#include "../GUIClasses.h"
+#include "../windows/CCreatureWindow.h"
+#include "../windows/GUIClasses.h"
 
 #include "../../CCallback.h"
 
diff --git a/client/gui/CGarrisonInt.h b/client/widgets/CGarrisonInt.h
similarity index 99%
rename from client/gui/CGarrisonInt.h
rename to client/widgets/CGarrisonInt.h
index f4f604824..67bd67b16 100644
--- a/client/gui/CGarrisonInt.h
+++ b/client/widgets/CGarrisonInt.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "CIntObject.h"
 #include "CIntObjectClasses.h"
 
 /*
diff --git a/client/gui/CIntObjectClasses.cpp b/client/widgets/CIntObjectClasses.cpp
similarity index 95%
rename from client/gui/CIntObjectClasses.cpp
rename to client/widgets/CIntObjectClasses.cpp
index badd03f14..7da93c760 100644
--- a/client/gui/CIntObjectClasses.cpp
+++ b/client/widgets/CIntObjectClasses.cpp
@@ -1,23 +1,24 @@
 #include "StdInc.h"
 #include "CIntObjectClasses.h"
 
-#include "SDL_Pixels.h"
-#include "SDL_Extensions.h"
-#include "CGuiHandler.h"
-#include "CCursorHandler.h"
+#include "CAnimation.h"
 #include "MiscWidgets.h"
 
+#include "../gui/SDL_Pixels.h"
+#include "../gui/SDL_Extensions.h"
+#include "../gui/CGuiHandler.h"
+#include "../gui/CCursorHandler.h"
+
 #include "../battle/CBattleInterface.h"
 #include "../battle/CBattleInterfaceClasses.h"
 
 #include "../CBitmapHandler.h"
 #include "../Graphics.h"
-#include "../CAnimation.h"
 #include "../CGameInfo.h"
 #include "../CPlayerInterface.h"
 #include "../CMessage.h"
 #include "../CMusicHandler.h"
-#include "../CAdvmapInterface.h"
+#include "../windows/CAdvmapInterface.h"
 
 #include "../../CCallback.h"
 
diff --git a/client/gui/CIntObjectClasses.h b/client/widgets/CIntObjectClasses.h
similarity index 96%
rename from client/gui/CIntObjectClasses.h
rename to client/widgets/CIntObjectClasses.h
index 6c35385a2..1c38e1ade 100644
--- a/client/gui/CIntObjectClasses.h
+++ b/client/widgets/CIntObjectClasses.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "CIntObject.h"
-#include "SDL_Extensions.h"
+#include "../gui/CIntObject.h"
+#include "../gui/SDL_Extensions.h"
 #include "../../lib/FunctionList.h"
 
 struct SDL_Surface;
diff --git a/client/gui/MiscWidgets.cpp b/client/widgets/MiscWidgets.cpp
similarity index 99%
rename from client/gui/MiscWidgets.cpp
rename to client/widgets/MiscWidgets.cpp
index fe75010b2..4dbca8afe 100644
--- a/client/gui/MiscWidgets.cpp
+++ b/client/widgets/MiscWidgets.cpp
@@ -1,15 +1,15 @@
 #include "StdInc.h"
 #include "MiscWidgets.h"
 
-#include "CGuiHandler.h"
-#include "CCursorHandler.h"
+#include "../gui/CGuiHandler.h"
+#include "../gui/CCursorHandler.h"
 
 #include "../CBitmapHandler.h"
 #include "../CPlayerInterface.h"
 #include "../CMessage.h"
 #include "../CGameInfo.h"
-#include "../CAdvmapInterface.h"
-#include "../CCastleInterface.h"
+#include "../windows/CAdvmapInterface.h"
+#include "../windows/CCastleInterface.h"
 
 #include "../../CCallback.h"
 
diff --git a/client/gui/MiscWidgets.h b/client/widgets/MiscWidgets.h
similarity index 100%
rename from client/gui/MiscWidgets.h
rename to client/widgets/MiscWidgets.h
diff --git a/client/CAdvmapInterface.cpp b/client/windows/CAdvmapInterface.cpp
similarity index 94%
rename from client/CAdvmapInterface.cpp
rename to client/windows/CAdvmapInterface.cpp
index 9de1dd0c6..0545f61bc 100644
--- a/client/CAdvmapInterface.cpp
+++ b/client/windows/CAdvmapInterface.cpp
@@ -1,39 +1,43 @@
 #include "StdInc.h"
 #include "CAdvmapInterface.h"
 
-#include "../CCallback.h"
 #include "CCastleInterface.h"
-#include "gui/CCursorHandler.h"
-#include "CGameInfo.h"
 #include "CHeroWindow.h"
 #include "CKingdomInterface.h"
-#include "CMessage.h"
-#include "CPlayerInterface.h"
-#include "gui/SDL_Extensions.h"
-#include "CBitmapHandler.h"
-#include "../lib/CConfigHandler.h"
 #include "CSpellWindow.h"
-#include "Graphics.h"
 #include "GUIClasses.h"
-#include "CDefHandler.h"
-#include "../lib/CGeneralTextHandler.h"
-#include "../lib/CHeroHandler.h"
-#include "../lib/mapObjects/CGHeroInstance.h"
-#include "../lib/CTownHandler.h"
-#include "../lib/mapping/CMap.h"
-#include "../lib/JsonNode.h"
-#include "mapHandler.h"
-#include "CPreGame.h"
-#include "../lib/VCMI_Lib.h"
-#include "../lib/CSpellHandler.h"
-#include "../lib/CSoundBase.h"
-#include "../lib/CGameState.h"
-#include "CMusicHandler.h"
-#include "gui/CGuiHandler.h"
-#include "gui/CIntObjectClasses.h"
-#include "gui/CTradeWindow.h"
-#include "gui/MiscWidgets.h"
-#include "../lib/UnlockGuard.h"
+#include "CTradeWindow.h"
+
+#include "../CBitmapHandler.h"
+#include "../CDefHandler.h"
+#include "../CGameInfo.h"
+#include "../CMessage.h"
+#include "../CMusicHandler.h"
+#include "../CPlayerInterface.h"
+#include "../CPreGame.h"
+#include "../Graphics.h"
+#include "../mapHandler.h"
+
+#include "../gui/CCursorHandler.h"
+#include "../gui/CGuiHandler.h"
+#include "../gui/SDL_Extensions.h"
+#include "../widgets/CIntObjectClasses.h"
+#include "../widgets/MiscWidgets.h"
+
+#include "../../CCallback.h"
+
+#include "../../lib/CConfigHandler.h"
+#include "../../lib/CGameState.h"
+#include "../../lib/CGeneralTextHandler.h"
+#include "../../lib/CHeroHandler.h"
+#include "../../lib/CSoundBase.h"
+#include "../../lib/CSpellHandler.h"
+#include "../../lib/CTownHandler.h"
+#include "../../lib/JsonNode.h"
+#include "../../lib/mapObjects/CGHeroInstance.h"
+#include "../../lib/mapping/CMap.h"
+#include "../../lib/UnlockGuard.h"
+#include "../../lib/VCMI_Lib.h"
 
 #ifdef _MSC_VER
 #pragma warning (disable : 4355)
diff --git a/client/CAdvmapInterface.h b/client/windows/CAdvmapInterface.h
similarity index 95%
rename from client/CAdvmapInterface.h
rename to client/windows/CAdvmapInterface.h
index 3720f0c4d..a814f736a 100644
--- a/client/CAdvmapInterface.h
+++ b/client/windows/CAdvmapInterface.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "gui/CIntObject.h"
-#include "AdventureMapClasses.h"
+#include "../gui/CIntObject.h"
+#include "../widgets/AdventureMapClasses.h"
 
 class CDefHandler;
 class CCallback;
diff --git a/client/CCastleInterface.cpp b/client/windows/CCastleInterface.cpp
similarity index 95%
rename from client/CCastleInterface.cpp
rename to client/windows/CCastleInterface.cpp
index 845d85ce5..bcb838b24 100644
--- a/client/CCastleInterface.cpp
+++ b/client/windows/CCastleInterface.cpp
@@ -1,33 +1,36 @@
 #include "StdInc.h"
 #include "CCastleInterface.h"
 
-#include "../CCallback.h"
-#include "../lib/CArtHandler.h"
-#include "../lib/CBuildingHandler.h"
-#include "../lib/CCreatureHandler.h"
-#include "../lib/CGeneralTextHandler.h"
-#include "../lib/CModHandler.h"
-#include "../lib/mapObjects/CGHeroInstance.h"
-#include "../lib/CSpellHandler.h"
-#include "../lib/CTownHandler.h"
 #include "CAdvmapInterface.h"
-#include "CAnimation.h"
-#include "CBitmapHandler.h"
-#include "CDefHandler.h"
-#include "CGameInfo.h"
 #include "CHeroWindow.h"
-#include "CMessage.h"
-#include "CMusicHandler.h"
-#include "CPlayerInterface.h"
-#include "Graphics.h"
-#include "gui/SDL_Extensions.h"
-#include "../lib/GameConstants.h"
-#include "gui/CGuiHandler.h"
-#include "gui/CIntObjectClasses.h"
-#include "gui/CTradeWindow.h"
-#include "gui/MiscWidgets.h"
+#include "CTradeWindow.h"
 #include "GUIClasses.h"
 
+#include "../CBitmapHandler.h"
+#include "../CDefHandler.h"
+#include "../CGameInfo.h"
+#include "../CMessage.h"
+#include "../CMusicHandler.h"
+#include "../CPlayerInterface.h"
+#include "../Graphics.h"
+
+#include "../gui/CGuiHandler.h"
+#include "../gui/SDL_Extensions.h"
+#include "../widgets/CAnimation.h"
+#include "../widgets/CIntObjectClasses.h"
+#include "../widgets/MiscWidgets.h"
+
+#include "../../CCallback.h"
+#include "../../lib/CArtHandler.h"
+#include "../../lib/CBuildingHandler.h"
+#include "../../lib/CCreatureHandler.h"
+#include "../../lib/CGeneralTextHandler.h"
+#include "../../lib/CModHandler.h"
+#include "../../lib/CSpellHandler.h"
+#include "../../lib/CTownHandler.h"
+#include "../../lib/GameConstants.h"
+#include "../../lib/mapObjects/CGHeroInstance.h"
+
 using namespace boost::assign;
 
 /*
diff --git a/client/CCastleInterface.h b/client/windows/CCastleInterface.h
similarity index 95%
rename from client/CCastleInterface.h
rename to client/windows/CCastleInterface.h
index 7a9ca0d4f..88a757cb5 100644
--- a/client/CCastleInterface.h
+++ b/client/windows/CCastleInterface.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "CAnimation.h"
-#include "gui/CGarrisonInt.h"
+#include "../widgets/CAnimation.h"
+#include "../widgets/CGarrisonInt.h"
 
 class CAdventureMapButton;
 class CBuilding;
diff --git a/client/CCreatureWindow.cpp b/client/windows/CCreatureWindow.cpp
similarity index 94%
rename from client/CCreatureWindow.cpp
rename to client/windows/CCreatureWindow.cpp
index 2729d4d00..4480b2f25 100644
--- a/client/CCreatureWindow.cpp
+++ b/client/windows/CCreatureWindow.cpp
@@ -1,32 +1,30 @@
 #include "StdInc.h"
 #include "CCreatureWindow.h"
 
-#include "../lib/CCreatureSet.h"
-#include "CGameInfo.h"
-#include "../lib/CGeneralTextHandler.h"
-#include "../lib/BattleState.h"
-#include "../CCallback.h"
+#include "../CBitmapHandler.h"
+#include "../CDefHandler.h"
+#include "../CGameInfo.h"
+#include "../CPlayerInterface.h"
+#include "../Graphics.h"
 
-#include <SDL.h>
-#include "gui/SDL_Extensions.h"
-#include "CBitmapHandler.h"
-#include "CDefHandler.h"
-#include "Graphics.h"
-#include "CPlayerInterface.h"
-#include "../lib/CConfigHandler.h"
-#include "CAnimation.h"
+#include "../gui/SDL_Extensions.h"
+#include "../gui/CGuiHandler.h"
 
-#include "../lib/CGameState.h"
-#include "../lib/BattleState.h"
-#include "../lib/CSpellHandler.h"
-#include "../lib/CArtHandler.h"
-#include "../lib/NetPacksBase.h" //ArtifactLocation
-#include "../lib/CModHandler.h"
-#include "../lib/IBonusTypeHandler.h"
+#include "../widgets/CAnimation.h"
+#include "../widgets/CIntObjectClasses.h"
+#include "../widgets/MiscWidgets.h"
 
-#include "gui/CGuiHandler.h"
-#include "gui/CIntObjectClasses.h"
-#include "gui/MiscWidgets.h"
+#include "../../CCallback.h"
+#include "../../lib/BattleState.h"
+#include "../../lib/CArtHandler.h"
+#include "../../lib/CConfigHandler.h"
+#include "../../lib/CCreatureSet.h"
+#include "../../lib/CGameState.h"
+#include "../../lib/CGeneralTextHandler.h"
+#include "../../lib/CModHandler.h"
+#include "../../lib/CSpellHandler.h"
+#include "../../lib/IBonusTypeHandler.h"
+#include "../../lib/NetPacksBase.h"
 
 using namespace CSDL_Ext;
 
diff --git a/client/CCreatureWindow.h b/client/windows/CCreatureWindow.h
similarity index 95%
rename from client/CCreatureWindow.h
rename to client/windows/CCreatureWindow.h
index 052cf5e4d..c127790ff 100644
--- a/client/CCreatureWindow.h
+++ b/client/windows/CCreatureWindow.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "gui/CIntObject.h"
-#include "../lib/HeroBonus.h"
-#include "gui/CArtifactHolder.h"
+#include "../../lib/HeroBonus.h"
+#include "../gui/CIntObject.h"
+#include "../widgets/CArtifactHolder.h"
 
 /*
  * CCreatureWindow.h, part of VCMI engine
diff --git a/client/CHeroWindow.cpp b/client/windows/CHeroWindow.cpp
similarity index 94%
rename from client/CHeroWindow.cpp
rename to client/windows/CHeroWindow.cpp
index afcc53d44..2be2b8303 100644
--- a/client/CHeroWindow.cpp
+++ b/client/windows/CHeroWindow.cpp
@@ -1,36 +1,35 @@
 #include "StdInc.h"
-
-#include "CAnimation.h"
-#include "CAdvmapInterface.h"
-#include "../CCallback.h"
-#include "CGameInfo.h"
 #include "CHeroWindow.h"
-#include "CMessage.h"
-#include "CKingdomInterface.h"
+
+#include "CAdvmapInterface.h"
 #include "CCreatureWindow.h"
-#include "SDL.h"
-#include "gui/SDL_Extensions.h"
-#include "CBitmapHandler.h"
-#include "Graphics.h"
+#include "CKingdomInterface.h"
 #include "CSpellWindow.h"
-#include "../lib/CConfigHandler.h"
-#include "CPlayerInterface.h"
+#include "GUIClasses.h"
+
+#include "../CBitmapHandler.h"
+#include "../CDefHandler.h"
+#include "../CGameInfo.h"
+#include "../CMessage.h"
+#include "../CMT.h"
+#include "../CPlayerInterface.h"
+#include "../Graphics.h"
+
+#include "../gui/SDL_Extensions.h"
+#include "../gui/CGuiHandler.h"
+#include "../widgets/CAnimation.h"
+#include "../widgets/CIntObjectClasses.h"
+#include "../widgets/MiscWidgets.h"
+
+#include "../../CCallback.h"
 
 #include "../lib/CArtHandler.h"
-#include "CDefHandler.h"
+#include "../lib/CConfigHandler.h"
 #include "../lib/CGeneralTextHandler.h"
 #include "../lib/CHeroHandler.h"
 #include "../lib/mapObjects/CGHeroInstance.h"
 #include "../lib/NetPacksBase.h"
 
-#include "gui/CGuiHandler.h"
-#include "gui/CIntObjectClasses.h"
-#include "gui/MiscWidgets.h"
-#include "GUIClasses.h"
-#include "CMT.h"
-
-#undef min
-
 /*
  * CHeroWindow.cpp, part of VCMI engine
  *
diff --git a/client/CHeroWindow.h b/client/windows/CHeroWindow.h
similarity index 91%
rename from client/CHeroWindow.h
rename to client/windows/CHeroWindow.h
index 51ccb4ec2..295bfc074 100644
--- a/client/CHeroWindow.h
+++ b/client/windows/CHeroWindow.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "../lib/HeroBonus.h"
-#include "gui/CIntObjectClasses.h"
-#include "gui/CArtifactHolder.h"
-#include "gui/CGarrisonInt.h"
+#include "../../lib/HeroBonus.h"
+#include "../widgets/CIntObjectClasses.h"
+#include "../widgets/CArtifactHolder.h"
+#include "../widgets/CGarrisonInt.h"
 
 /*
  * CHeroWindow.h, part of VCMI engine
diff --git a/client/CKingdomInterface.cpp b/client/windows/CKingdomInterface.cpp
similarity index 97%
rename from client/CKingdomInterface.cpp
rename to client/windows/CKingdomInterface.cpp
index 0a27f2af2..e2375f635 100644
--- a/client/CKingdomInterface.cpp
+++ b/client/windows/CKingdomInterface.cpp
@@ -1,23 +1,26 @@
 #include "StdInc.h"
 #include "CKingdomInterface.h"
 
-#include "../CCallback.h"
-#include "../lib/CCreatureHandler.h" //creatures name for objects list
-#include "../lib/CGeneralTextHandler.h"
-#include "../lib/CModHandler.h" //for buildings per turn
-#include "../lib/mapObjects/CGHeroInstance.h"
-#include "../lib/CHeroHandler.h" // only for calculating required xp? worth it?
-#include "../lib/CTownHandler.h"
-#include "CAnimation.h" //CAnimImage
-#include "CAdvmapInterface.h" //CResDataBar
-#include "CCastleInterface.h" //various town-specific classes
-#include "../lib/CConfigHandler.h"
-#include "CGameInfo.h"
-#include "CPlayerInterface.h" //LOCPLINT
-#include "gui/CGuiHandler.h"
-#include "gui/CIntObjectClasses.h"
-#include "gui/MiscWidgets.h"
-#include "CMT.h"
+#include "CAdvmapInterface.h"
+#include "CCastleInterface.h"
+
+#include "../CGameInfo.h"
+#include "../CMT.h"
+#include "../CPlayerInterface.h"
+#include "../gui/CGuiHandler.h"
+#include "../widgets/CAnimation.h"
+#include "../widgets/CIntObjectClasses.h"
+#include "../widgets/MiscWidgets.h"
+
+#include "../../CCallback.h"
+
+#include "../../lib/CConfigHandler.h"
+#include "../../lib/CCreatureHandler.h"
+#include "../../lib/CGeneralTextHandler.h"
+#include "../../lib/CHeroHandler.h"
+#include "../../lib/CModHandler.h"
+#include "../../lib/CTownHandler.h"
+#include "../../lib/mapObjects/CGHeroInstance.h"
 
 /*
  * CKingdomInterface.cpp, part of VCMI engine
diff --git a/client/CKingdomInterface.h b/client/windows/CKingdomInterface.h
similarity index 95%
rename from client/CKingdomInterface.h
rename to client/windows/CKingdomInterface.h
index 2794ec194..dfa7948b4 100644
--- a/client/CKingdomInterface.h
+++ b/client/windows/CKingdomInterface.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "gui/CArtifactHolder.h"
-#include "gui/CGarrisonInt.h"
+#include "../widgets/CArtifactHolder.h"
+#include "../widgets/CGarrisonInt.h"
 
 class CAdventureMapButton;
 class CAnimImage;
diff --git a/client/CQuestLog.cpp b/client/windows/CQuestLog.cpp
similarity index 86%
rename from client/CQuestLog.cpp
rename to client/windows/CQuestLog.cpp
index 7dd795e38..d937ee8e9 100644
--- a/client/CQuestLog.cpp
+++ b/client/windows/CQuestLog.cpp
@@ -1,24 +1,24 @@
 #include "StdInc.h"
 #include "CQuestLog.h"
 
-#include "CGameInfo.h"
-#include "../lib/CGeneralTextHandler.h"
-#include "../CCallback.h"
-
-#include "CBitmapHandler.h"
-#include "CDefHandler.h"
-#include "Graphics.h"
-#include "CPlayerInterface.h"
 #include "CAdvmapInterface.h"
 
-#include "../lib/CGameState.h"
-#include "../lib/CArtHandler.h"
-#include "../lib/NetPacksBase.h"
-#include "../lib/CConfigHandler.h"
+#include "../CBitmapHandler.h"
+#include "../CDefHandler.h"
+#include "../CGameInfo.h"
+#include "../CPlayerInterface.h"
+#include "../Graphics.h"
 
-#include "gui/CGuiHandler.h"
-#include "gui/CIntObjectClasses.h"
-#include "gui/SDL_Extensions.h"
+#include "../gui/CGuiHandler.h"
+#include "../gui/SDL_Extensions.h"
+#include "../widgets/CIntObjectClasses.h"
+
+#include "../../CCallback.h"
+#include "../../lib/CArtHandler.h"
+#include "../../lib/CConfigHandler.h"
+#include "../../lib/CGameState.h"
+#include "../../lib/CGeneralTextHandler.h"
+#include "../../lib/NetPacksBase.h"
 
 /*
  * CQuestLog.cpp, part of VCMI engine
diff --git a/client/CQuestLog.h b/client/windows/CQuestLog.h
similarity index 89%
rename from client/CQuestLog.h
rename to client/windows/CQuestLog.h
index 266d3683e..b8b2f2d6c 100644
--- a/client/CQuestLog.h
+++ b/client/windows/CQuestLog.h
@@ -1,12 +1,8 @@
 #pragma once
 
-#include "gui/CIntObjectClasses.h"
-#include "CAnimation.h"
-#include "AdventureMapClasses.h"
-//#include "CAdvmapInterface.h"
-//
-
-//#include "../lib/CGameState.h"
+#include "../widgets/CIntObjectClasses.h"
+#include "../widgets/CAnimation.h"
+#include "../widgets/AdventureMapClasses.h"
 
 /*
  * CQuestLog.h, part of VCMI engine
diff --git a/client/CSpellWindow.cpp b/client/windows/CSpellWindow.cpp
similarity index 94%
rename from client/CSpellWindow.cpp
rename to client/windows/CSpellWindow.cpp
index 71a5f5874..8622252b4 100644
--- a/client/CSpellWindow.cpp
+++ b/client/windows/CSpellWindow.cpp
@@ -1,28 +1,32 @@
 #include "StdInc.h"
 #include "CSpellWindow.h"
 
-#include "Graphics.h"
-#include "CDefHandler.h"
-#include "../lib/CConfigHandler.h"
-#include "../lib/CSpellHandler.h"
-#include "../lib/CGeneralTextHandler.h"
-#include "CVideoHandler.h"
 #include "CAdvmapInterface.h"
-#include "battle/CBattleInterface.h"
-#include "CGameInfo.h"
-#include "gui/SDL_Extensions.h"
-#include "CMessage.h"
-#include "CPlayerInterface.h"
-#include "../CCallback.h"
-#include "CBitmapHandler.h"
-#include "../lib/CHeroHandler.h"
-#include "../lib/BattleState.h"
-#include "../lib/GameConstants.h"
-#include "gui/CGuiHandler.h"
-#include "gui/MiscWidgets.h"
-#include "CMT.h"
 #include "GUIClasses.h"
 
+#include "../CBitmapHandler.h"
+#include "../CDefHandler.h"
+#include "../CGameInfo.h"
+#include "../CMessage.h"
+#include "../CMT.h"
+#include "../CPlayerInterface.h"
+#include "../CVideoHandler.h"
+#include "../Graphics.h"
+
+#include "../battle/CBattleInterface.h"
+#include "../gui/CGuiHandler.h"
+#include "../gui/SDL_Extensions.h"
+#include "../widgets/MiscWidgets.h"
+
+#include "../../CCallback.h"
+
+#include "../../lib/BattleState.h"
+#include "../../lib/CConfigHandler.h"
+#include "../../lib/CGeneralTextHandler.h"
+#include "../../lib/CHeroHandler.h"
+#include "../../lib/CSpellHandler.h"
+#include "../../lib/GameConstants.h"
+
 /*
  * CSpellWindow.cpp, part of VCMI engine
  *
diff --git a/client/CSpellWindow.h b/client/windows/CSpellWindow.h
similarity index 94%
rename from client/CSpellWindow.h
rename to client/windows/CSpellWindow.h
index fc570c442..12bad4204 100644
--- a/client/CSpellWindow.h
+++ b/client/windows/CSpellWindow.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "gui/CIntObject.h"
-#include "gui/CIntObjectClasses.h"
+#include "../gui/CIntObject.h"
+#include "../widgets/CIntObjectClasses.h"
 
 /*
  * CSpellWindow.h, part of VCMI engine
diff --git a/client/gui/CTradeWindow.cpp b/client/windows/CTradeWindow.cpp
similarity index 99%
rename from client/gui/CTradeWindow.cpp
rename to client/windows/CTradeWindow.cpp
index 46d3fb09f..be292797e 100644
--- a/client/gui/CTradeWindow.cpp
+++ b/client/windows/CTradeWindow.cpp
@@ -1,11 +1,12 @@
 #include "StdInc.h"
 #include "CTradeWindow.h"
 
-#include "CGuiHandler.h"
-#include "CAnimation.h"
-#include "CCursorHandler.h"
+#include "CAdvmapInterface.h"
+
+#include "../gui/CGuiHandler.h"
+#include "../gui/CCursorHandler.h"
+#include "../widgets/CAnimation.h"
 
-#include "../CAdvmapInterface.h"
 #include "../CGameInfo.h"
 #include "../CPlayerInterface.h"
 
diff --git a/client/gui/CTradeWindow.h b/client/windows/CTradeWindow.h
similarity index 98%
rename from client/gui/CTradeWindow.h
rename to client/windows/CTradeWindow.h
index 82ffff9ab..a8cf6bc62 100644
--- a/client/gui/CTradeWindow.h
+++ b/client/windows/CTradeWindow.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "CIntObjectClasses.h"
-#include "CArtifactHolder.h"
+#include "../widgets/CIntObjectClasses.h"
+#include "../widgets/CArtifactHolder.h"
 
 /*
  * CTradeWindow.h, part of VCMI engine
diff --git a/client/GUIClasses.cpp b/client/windows/GUIClasses.cpp
similarity index 96%
rename from client/GUIClasses.cpp
rename to client/windows/GUIClasses.cpp
index 23d06d987..3f8d62fde 100644
--- a/client/GUIClasses.cpp
+++ b/client/windows/GUIClasses.cpp
@@ -1,49 +1,54 @@
 #include "StdInc.h"
 #include "GUIClasses.h"
-#include "gui/SDL_Extensions.h"
 
 #include "CAdvmapInterface.h"
-#include "CBitmapHandler.h"
-#include "CDefHandler.h"
-#include "battle/CBattleInterface.h"
-#include "battle/CBattleInterfaceClasses.h"
-#include "../CCallback.h"
 #include "CCastleInterface.h"
 #include "CCreatureWindow.h"
-#include "gui/CCursorHandler.h"
-#include "CGameInfo.h"
 #include "CHeroWindow.h"
-#include "CMessage.h"
-#include "../lib/CConfigHandler.h"
-#include "battle/CCreatureAnimation.h"
-#include "CPlayerInterface.h"
-#include "Graphics.h"
-#include "CAnimation.h"
+#include "CSpellWindow.h"
+
+#include "../CBitmapHandler.h"
+#include "../CDefHandler.h"
+#include "../CGameInfo.h"
+#include "../CMessage.h"
+#include "../CMusicHandler.h"
+#include "../CPlayerInterface.h"
+#include "../CPreGame.h"
+#include "../CVideoHandler.h"
+#include "../Graphics.h"
+#include "../mapHandler.h"
+
+#include "../battle/CBattleInterfaceClasses.h"
+#include "../battle/CBattleInterface.h"
+#include "../battle/CCreatureAnimation.h"
+
+#include "../gui/CGuiHandler.h"
+#include "../gui/SDL_Extensions.h"
+#include "../gui/CCursorHandler.h"
+
+#include "../widgets/CAnimation.h"
+#include "../widgets/MiscWidgets.h"
+
+#include "../../CCallback.h"
+
+#include "../lib/BattleState.h"
 #include "../lib/CArtHandler.h"
 #include "../lib/CBuildingHandler.h"
+#include "../lib/CConfigHandler.h"
+#include "../lib/CCreatureHandler.h"
+#include "../lib/CGameState.h"
 #include "../lib/CGeneralTextHandler.h"
 #include "../lib/CHeroHandler.h"
 #include "../lib/CModHandler.h"
-#include "../lib/CSpellHandler.h"
-#include "../lib/CTownHandler.h"
 #include "../lib/CondSh.h"
-#include "../lib/mapping/CMap.h"
-#include "mapHandler.h"
+#include "../lib/CSpellHandler.h"
 #include "../lib/CStopWatch.h"
-#include "../lib/NetPacksBase.h"
-#include "CSpellWindow.h"
-#include "CHeroWindow.h"
-#include "CVideoHandler.h"
-#include "../lib/StartInfo.h"
-#include "CPreGame.h"
-#include "../lib/HeroBonus.h"
-#include "../lib/CCreatureHandler.h"
-#include "CMusicHandler.h"
-#include "../lib/BattleState.h"
-#include "../lib/CGameState.h"
+#include "../lib/CTownHandler.h"
 #include "../lib/GameConstants.h"
-#include "gui/CGuiHandler.h"
-#include "gui/MiscWidgets.h"
+#include "../lib/HeroBonus.h"
+#include "../lib/mapping/CMap.h"
+#include "../lib/NetPacksBase.h"
+#include "../lib/StartInfo.h"
 
 /*
  * GUIClasses.cpp, part of VCMI engine
diff --git a/client/GUIClasses.h b/client/windows/GUIClasses.h
similarity index 95%
rename from client/GUIClasses.h
rename to client/windows/GUIClasses.h
index c319af447..a58335b8b 100644
--- a/client/GUIClasses.h
+++ b/client/windows/GUIClasses.h
@@ -3,9 +3,9 @@
 #include "../lib/GameConstants.h"
 #include "../lib/ResourceSet.h"
 #include "../lib/CConfigHandler.h"
-#include "gui/CArtifactHolder.h"
-#include "gui/CGarrisonInt.h"
-#include "CAnimation.h"
+#include "../widgets/CArtifactHolder.h"
+#include "../widgets/CGarrisonInt.h"
+#include "../widgets/CAnimation.h"
 
 /*
  * GUIClasses.h, part of VCMI engine