diff --git a/AI/VCAI/VCAI.h b/AI/VCAI/VCAI.h
index b916b43bd..100b0cec6 100644
--- a/AI/VCAI/VCAI.h
+++ b/AI/VCAI/VCAI.h
@@ -14,7 +14,7 @@
 #include "../../lib/CObjectHandler.h"
 #include "../../lib/Connection.h"
 #include "../../lib/CGameState.h"
-#include "../../lib/Mapping/CMap.h"
+#include "../../lib/mapping/CMap.h"
 #include "../../lib/NetPacks.h"
 #include "../../lib/CondSh.h"
 #include "../../lib/CStopWatch.h"
diff --git a/CCallback.cpp b/CCallback.cpp
index 8348ac369..cbe0c8a0e 100644
--- a/CCallback.cpp
+++ b/CCallback.cpp
@@ -7,7 +7,7 @@
 #include "lib/BattleState.h"
 #include "client/CPlayerInterface.h"
 #include "client/Client.h"
-#include "lib/Mapping/CMap.h"
+#include "lib/mapping/CMap.h"
 #include "lib/CBuildingHandler.h"
 #include "lib/CDefObjInfoHandler.h"
 #include "lib/CGeneralTextHandler.h"
diff --git a/Editor/ConfigWindows.cpp b/Editor/ConfigWindows.cpp
index 1ec8bb829..fef03f3ff 100644
--- a/Editor/ConfigWindows.cpp
+++ b/Editor/ConfigWindows.cpp
@@ -1,7 +1,7 @@
 #include "StdInc.h"
 #include "ConfigWindows.h"
 #include "Editor.h"
-#include "../lib/Mapping/CMap.h"
+#include "../lib/mapping/CMap.h"
 
 #include <QTabWidget>
 
diff --git a/Editor/Editor.cpp b/Editor/Editor.cpp
index d190e6f51..be3d7244e 100644
--- a/Editor/Editor.cpp
+++ b/Editor/Editor.cpp
@@ -2,10 +2,10 @@
 #include "Editor.h"
 #include "../lib/VCMI_Lib.h"
 #include "../lib/VCMIDirs.h"
-#include "../lib/Filesystem/CResourceLoader.h"
+#include "../lib/filesystem/CResourceLoader.h"
 #include "../lib/CGeneralTextHandler.h"
-#include "../lib/Mapping/CMap.h"
-#include "../lib/Mapping/CMapService.h"
+#include "../lib/mapping/CMap.h"
+#include "../lib/mapping/CMapService.h"
 
 Editor::Editor(QWidget *parent)
 	: QMainWindow(parent)
diff --git a/client/AdventureMapClasses.cpp b/client/AdventureMapClasses.cpp
index 828e7e173..cd1f7ff41 100644
--- a/client/AdventureMapClasses.cpp
+++ b/client/AdventureMapClasses.cpp
@@ -3,8 +3,8 @@
 
 #include "../CCallback.h"
 #include "../lib/JsonNode.h"
-#include "../lib/Filesystem/CResourceLoader.h"
-#include "../lib/Mapping/CMap.h"
+#include "../lib/filesystem/CResourceLoader.h"
+#include "../lib/mapping/CMap.h"
 #include "../lib/CModHandler.h"
 #include "../lib/CObjectHandler.h"
 #include "../lib/CGameState.h"
diff --git a/client/BattleInterface/CBattleInterface.cpp b/client/BattleInterface/CBattleInterface.cpp
index b6e7ec560..7cf1e353d 100644
--- a/client/BattleInterface/CBattleInterface.cpp
+++ b/client/BattleInterface/CBattleInterface.cpp
@@ -24,7 +24,7 @@
 #include "../CCreatureWindow.h"
 #include "../CVideoHandler.h"
 #include "../../lib/CTownHandler.h"
-#include "../../lib/Mapping/CMap.h"
+#include "../../lib/mapping/CMap.h"
 
 #include "CBattleAnimations.h"
 #include "CBattleInterfaceClasses.h"
diff --git a/client/BattleInterface/CCreatureAnimation.cpp b/client/BattleInterface/CCreatureAnimation.cpp
index 2f69352f4..d9f6a2270 100644
--- a/client/BattleInterface/CCreatureAnimation.cpp
+++ b/client/BattleInterface/CCreatureAnimation.cpp
@@ -1,7 +1,7 @@
 #include "StdInc.h"
 #include "CCreatureAnimation.h"
 
-#include "../../lib/Filesystem/CResourceLoader.h"
+#include "../../lib/filesystem/CResourceLoader.h"
 #include "../../lib/VCMI_Lib.h"
 #include "../../lib/vcmi_endian.h"
 #include "../UIFramework/SDL_Extensions.h"
diff --git a/client/CAdvmapInterface.cpp b/client/CAdvmapInterface.cpp
index 90e0838e3..c6592eceb 100644
--- a/client/CAdvmapInterface.cpp
+++ b/client/CAdvmapInterface.cpp
@@ -19,7 +19,7 @@
 #include "../lib/CHeroHandler.h"
 #include "../lib/CObjectHandler.h"
 #include "../lib/CTownHandler.h"
-#include "../lib/Mapping/CMap.h"
+#include "../lib/mapping/CMap.h"
 #include "../lib/JsonNode.h"
 #include "mapHandler.h"
 #include "CPreGame.h"
diff --git a/client/CAnimation.cpp b/client/CAnimation.cpp
index 55453d357..a2829e9a9 100644
--- a/client/CAnimation.cpp
+++ b/client/CAnimation.cpp
@@ -1,8 +1,8 @@
 #include "StdInc.h"
 #include <SDL_image.h>
 
-#include "../lib/Filesystem/CResourceLoader.h"
-#include "../lib/Filesystem/ISimpleResourceLoader.h"
+#include "../lib/filesystem/CResourceLoader.h"
+#include "../lib/filesystem/ISimpleResourceLoader.h"
 #include "../lib/JsonNode.h"
 
 #include "CBitmapHandler.h"
diff --git a/client/CBitmapHandler.cpp b/client/CBitmapHandler.cpp
index 549afe94b..0960c8816 100644
--- a/client/CBitmapHandler.cpp
+++ b/client/CBitmapHandler.cpp
@@ -1,7 +1,7 @@
 #include "StdInc.h"
 
-#include "../lib/Filesystem/CResourceLoader.h"
-#include "../lib/Filesystem/CFileInfo.h"
+#include "../lib/filesystem/CResourceLoader.h"
+#include "../lib/filesystem/CFileInfo.h"
 #include "SDL.h"
 #include "SDL_image.h"
 #include "CBitmapHandler.h"
diff --git a/client/CDefHandler.cpp b/client/CDefHandler.cpp
index ad7075e7d..553da9b0e 100644
--- a/client/CDefHandler.cpp
+++ b/client/CDefHandler.cpp
@@ -2,7 +2,7 @@
 #include "SDL.h"
 #include "CDefHandler.h"
 
-#include "../lib/Filesystem/CResourceLoader.h"
+#include "../lib/filesystem/CResourceLoader.h"
 #include "../lib/VCMI_Lib.h"
 #include "CBitmapHandler.h"
 
diff --git a/client/CMT.cpp b/client/CMT.cpp
index c15349e98..a2d41ff20 100644
--- a/client/CMT.cpp
+++ b/client/CMT.cpp
@@ -7,7 +7,7 @@
 #include "CGameInfo.h"
 #include "mapHandler.h"
 
-#include "../lib/Filesystem/CResourceLoader.h"
+#include "../lib/filesystem/CResourceLoader.h"
 #include "CPreGame.h"
 #include "CCastleInterface.h"
 #include "../lib/CConsoleHandler.h"
diff --git a/client/CMusicHandler.cpp b/client/CMusicHandler.cpp
index 8e4a633eb..dc5c10992 100644
--- a/client/CMusicHandler.cpp
+++ b/client/CMusicHandler.cpp
@@ -7,7 +7,7 @@
 #include "../client/CGameInfo.h"
 #include "../lib/JsonNode.h"
 #include "../lib/GameConstants.h"
-#include "../lib/Filesystem/CResourceLoader.h"
+#include "../lib/filesystem/CResourceLoader.h"
 
 /*
  * CMusicHandler.cpp, part of VCMI engine
diff --git a/client/CPlayerInterface.cpp b/client/CPlayerInterface.cpp
index a3f8c0671..4609c891c 100644
--- a/client/CPlayerInterface.cpp
+++ b/client/CPlayerInterface.cpp
@@ -30,7 +30,7 @@
 #include "CMusicHandler.h"
 #include "../lib/CondSh.h"
 #include "../lib/NetPacks.h"
-#include "../lib/Mapping/CMap.h"
+#include "../lib/mapping/CMap.h"
 #include "../lib/VCMIDirs.h"
 #include "mapHandler.h"
 #include "../lib/CStopWatch.h"
diff --git a/client/CPreGame.cpp b/client/CPreGame.cpp
index 000238bf2..49ee0ab06 100644
--- a/client/CPreGame.cpp
+++ b/client/CPreGame.cpp
@@ -1,9 +1,9 @@
 #include "StdInc.h"
 #include "CPreGame.h"
 
-#include "../lib/Filesystem/CResourceLoader.h"
-#include "../lib/Filesystem/CFileInfo.h"
-#include "../lib/Filesystem/CCompressedStream.h"
+#include "../lib/filesystem/CResourceLoader.h"
+#include "../lib/filesystem/CFileInfo.h"
+#include "../lib/filesystem/CCompressedStream.h"
 
 #include "../lib/CStopWatch.h"
 #include "UIFramework/SDL_Extensions.h"
@@ -16,7 +16,7 @@
 #include "../lib/CTownHandler.h"
 #include "../lib/CHeroHandler.h"
 #include "../lib/CObjectHandler.h"
-#include "../lib/Mapping/CCampaignHandler.h"
+#include "../lib/mapping/CCampaignHandler.h"
 #include "../lib/CCreatureHandler.h"
 #include "../lib/JsonNode.h"
 #include "CMusicHandler.h"
@@ -24,7 +24,7 @@
 #include "Graphics.h"
 #include "../lib/Connection.h"
 #include "../lib/VCMIDirs.h"
-#include "../lib/Mapping/CMap.h"
+#include "../lib/mapping/CMap.h"
 #include "GUIClasses.h"
 #include "CPlayerInterface.h"
 #include "../CCallback.h"
@@ -41,7 +41,7 @@
 #include "../lib/GameConstants.h"
 #include "UIFramework/CGuiHandler.h"
 #include "UIFramework/CIntObjectClasses.h"
-#include "../lib/Mapping/CMapService.h"
+#include "../lib/mapping/CMapService.h"
 
 /*
  * CPreGame.cpp, part of VCMI engine
diff --git a/client/CPreGame.h b/client/CPreGame.h
index 22bc30274..f93ec7101 100644
--- a/client/CPreGame.h
+++ b/client/CPreGame.h
@@ -1,12 +1,12 @@
 #pragma once
 
-#include "../lib/Filesystem/CResourceLoader.h"
+#include "../lib/filesystem/CResourceLoader.h"
 #include <SDL.h>
 #include "../lib/StartInfo.h"
 #include "GUIClasses.h"
 #include "FunctionList.h"
-#include "../lib/Mapping/CMapInfo.h"
-#include "../lib/RMG/CMapGenOptions.h"
+#include "../lib/mapping/CMapInfo.h"
+#include "../lib/rmg/CMapGenOptions.h"
 
 /*
  * CPreGame.h, part of VCMI engine
diff --git a/client/CVideoHandler.cpp b/client/CVideoHandler.cpp
index 4282fdabf..13475aa8f 100644
--- a/client/CVideoHandler.cpp
+++ b/client/CVideoHandler.cpp
@@ -5,7 +5,7 @@
 #include "UIFramework/CGuiHandler.h"
 #include "UIFramework/SDL_Extensions.h"
 #include "CPlayerInterface.h"
-#include "../lib/Filesystem/CResourceLoader.h"
+#include "../lib/filesystem/CResourceLoader.h"
 
 extern CGuiHandler GH; //global gui handler
 
diff --git a/client/CVideoHandler.h b/client/CVideoHandler.h
index b934f69f6..76c096dc9 100644
--- a/client/CVideoHandler.h
+++ b/client/CVideoHandler.h
@@ -217,7 +217,7 @@ public:
 
 #ifndef DISABLE_VIDEO
 
-#include "../lib/Filesystem/CInputStream.h"
+#include "../lib/filesystem/CInputStream.h"
 
 #include <SDL.h>
 #include <SDL_video.h>
diff --git a/client/Client.cpp b/client/Client.cpp
index 8edde4755..7190a4a35 100644
--- a/client/Client.cpp
+++ b/client/Client.cpp
@@ -1,7 +1,7 @@
 #include "StdInc.h"
 
 #include "CMusicHandler.h"
-#include "../lib/Mapping/CCampaignHandler.h"
+#include "../lib/mapping/CCampaignHandler.h"
 #include "../CCallback.h"
 #include "../lib/CConsoleHandler.h"
 #include "CGameInfo.h"
@@ -23,7 +23,7 @@
 #include "../lib/NetPacks.h"
 #include "../lib/VCMI_Lib.h"
 #include "../lib/VCMIDirs.h"
-#include "../lib/Mapping/CMap.h"
+#include "../lib/mapping/CMap.h"
 #include "../lib/JsonNode.h"
 #include "mapHandler.h"
 #include "../lib/CConfigHandler.h"
diff --git a/client/GUIClasses.cpp b/client/GUIClasses.cpp
index f4786202c..905329e9a 100644
--- a/client/GUIClasses.cpp
+++ b/client/GUIClasses.cpp
@@ -26,7 +26,7 @@
 #include "../lib/CSpellHandler.h"
 #include "../lib/CTownHandler.h"
 #include "../lib/CondSh.h"
-#include "../lib/Mapping/CMap.h"
+#include "../lib/mapping/CMap.h"
 #include "mapHandler.h"
 #include "../lib/CStopWatch.h"
 #include "../lib/NetPacks.h"
diff --git a/client/Graphics.cpp b/client/Graphics.cpp
index f90312038..dbecfdb7f 100644
--- a/client/Graphics.cpp
+++ b/client/Graphics.cpp
@@ -1,7 +1,7 @@
 #include "StdInc.h"
 #include "Graphics.h"
 
-#include "../lib/Filesystem/CResourceLoader.h"
+#include "../lib/filesystem/CResourceLoader.h"
 #include "CDefHandler.h"
 #include "UIFramework/SDL_Extensions.h"
 #include <SDL_ttf.h>
diff --git a/client/NetPacksClient.cpp b/client/NetPacksClient.cpp
index 15eb0931f..69532f475 100644
--- a/client/NetPacksClient.cpp
+++ b/client/NetPacksClient.cpp
@@ -1,8 +1,8 @@
 #include "StdInc.h"
 #include "../lib/NetPacks.h"
 
-#include "../lib/Filesystem/CResourceLoader.h"
-#include "../lib/Filesystem/CFileInfo.h"
+#include "../lib/filesystem/CResourceLoader.h"
+#include "../lib/filesystem/CFileInfo.h"
 #include "../CCallback.h"
 #include "Client.h"
 #include "CPlayerInterface.h"
@@ -13,7 +13,7 @@
 #include "../lib/CHeroHandler.h"
 #include "../lib/CObjectHandler.h"
 #include "../lib/VCMI_Lib.h"
-#include "../lib/Mapping/CMap.h"
+#include "../lib/mapping/CMap.h"
 #include "../lib/VCMIDirs.h"
 #include "../lib/CSpellHandler.h"
 #include "CSoundBase.h"
@@ -22,7 +22,7 @@
 #include "../lib/CConfigHandler.h"
 #include "UIFramework/SDL_Extensions.h"
 #include "BattleInterface/CBattleInterface.h"
-#include "../lib/Mapping/CCampaignHandler.h"
+#include "../lib/mapping/CCampaignHandler.h"
 #include "../lib/CGameState.h"
 #include "../lib/BattleState.h"
 #include "../lib/GameConstants.h"
diff --git a/client/UIFramework/Fonts.cpp b/client/UIFramework/Fonts.cpp
index 57e203d19..328baa72a 100644
--- a/client/UIFramework/Fonts.cpp
+++ b/client/UIFramework/Fonts.cpp
@@ -6,7 +6,7 @@
 #include "SDL_Pixels.h"
 #include "../../lib/JsonNode.h"
 #include "../../lib/vcmi_endian.h"
-#include "../../lib/Filesystem/CResourceLoader.h"
+#include "../../lib/filesystem/CResourceLoader.h"
 
 /*
  * Fonts.cpp, part of VCMI engine
diff --git a/client/mapHandler.cpp b/client/mapHandler.cpp
index a9a43509f..3398b9e20 100644
--- a/client/mapHandler.cpp
+++ b/client/mapHandler.cpp
@@ -9,7 +9,7 @@
 #include "../lib/CTownHandler.h"
 #include "Graphics.h"
 #include "../lib/CObjectHandler.h"
-#include "../lib/Mapping/CMap.h"
+#include "../lib/mapping/CMap.h"
 #include "CDefHandler.h"
 #include "../lib/CConfigHandler.h"
 #include "../lib/CGeneralTextHandler.h"
diff --git a/lib/BattleState.cpp b/lib/BattleState.cpp
index ee4e0d6ac..5878d037e 100644
--- a/lib/BattleState.cpp
+++ b/lib/BattleState.cpp
@@ -11,7 +11,7 @@
 #include "CTownHandler.h"
 #include "NetPacks.h"
 #include "JsonNode.h"
-#include "Filesystem/CResourceLoader.h"
+#include "filesystem/CResourceLoader.h"
 
 
 /*
diff --git a/lib/CArtHandler.cpp b/lib/CArtHandler.cpp
index 913336f14..e7d288d81 100644
--- a/lib/CArtHandler.cpp
+++ b/lib/CArtHandler.cpp
@@ -1,7 +1,7 @@
 #include "StdInc.h"
 #include "CArtHandler.h"
 
-#include "Filesystem/CResourceLoader.h"
+#include "filesystem/CResourceLoader.h"
 #include "CGeneralTextHandler.h"
 #include <boost/random/linear_congruential.hpp>
 #include "VCMI_Lib.h"
diff --git a/lib/CBonusTypeHandler.cpp b/lib/CBonusTypeHandler.cpp
index b49a4c380..6106377da 100644
--- a/lib/CBonusTypeHandler.cpp
+++ b/lib/CBonusTypeHandler.cpp
@@ -11,8 +11,8 @@
 #include "CBonusTypeHandler.h"
 
 #include "JsonNode.h"
-#include "Filesystem/CResourceLoader.h"
-#include "Filesystem/ISimpleResourceLoader.h"
+#include "filesystem/CResourceLoader.h"
+#include "filesystem/ISimpleResourceLoader.h"
 
 
 #include "VCMI_Lib.h"
diff --git a/lib/CConfigHandler.cpp b/lib/CConfigHandler.cpp
index 02936f044..619d5a00a 100644
--- a/lib/CConfigHandler.cpp
+++ b/lib/CConfigHandler.cpp
@@ -1,7 +1,7 @@
 #include "StdInc.h"
 #include "CConfigHandler.h"
 
-#include "../lib/Filesystem/CResourceLoader.h"
+#include "../lib/filesystem/CResourceLoader.h"
 #include "../lib/GameConstants.h"
 #include "../lib/VCMIDirs.h"
 
diff --git a/lib/CCreatureHandler.cpp b/lib/CCreatureHandler.cpp
index 771bd05bb..3f8b5e0e3 100644
--- a/lib/CCreatureHandler.cpp
+++ b/lib/CCreatureHandler.cpp
@@ -2,7 +2,7 @@
 #include "CCreatureHandler.h"
 
 #include "CGeneralTextHandler.h"
-#include "Filesystem/CResourceLoader.h"
+#include "filesystem/CResourceLoader.h"
 #include "VCMI_Lib.h"
 #include "CGameState.h"
 #include "CTownHandler.h"
diff --git a/lib/CDefObjInfoHandler.cpp b/lib/CDefObjInfoHandler.cpp
index 43a982368..202abf6ee 100644
--- a/lib/CDefObjInfoHandler.cpp
+++ b/lib/CDefObjInfoHandler.cpp
@@ -1,7 +1,7 @@
 #include "StdInc.h"
 #include "CDefObjInfoHandler.h"
 
-#include "Filesystem/CResourceLoader.h"
+#include "filesystem/CResourceLoader.h"
 #include "../client/CGameInfo.h"
 #include "../lib/VCMI_Lib.h"
 #include "GameConstants.h"
diff --git a/lib/CGameState.cpp b/lib/CGameState.cpp
index f74df3542..1b9fba017 100644
--- a/lib/CGameState.cpp
+++ b/lib/CGameState.cpp
@@ -2,7 +2,7 @@
 #include "CGameState.h"
 
 #include <boost/random/linear_congruential.hpp>
-#include "Mapping/CCampaignHandler.h"
+#include "mapping/CCampaignHandler.h"
 #include "CDefObjInfoHandler.h"
 #include "CArtHandler.h"
 #include "CBuildingHandler.h"
@@ -15,18 +15,18 @@
 #include "CModHandler.h"
 #include "VCMI_Lib.h"
 #include "Connection.h"
-#include "Mapping/CMap.h"
-#include "Mapping/CMapService.h"
+#include "mapping/CMap.h"
+#include "mapping/CMapService.h"
 #include "StartInfo.h"
 #include "NetPacks.h"
 #include "RegisterTypes.h"
-#include "Mapping/CMapInfo.h"
+#include "mapping/CMapInfo.h"
 #include "BattleState.h"
 #include "JsonNode.h"
-#include "Filesystem/CResourceLoader.h"
+#include "filesystem/CResourceLoader.h"
 #include "GameConstants.h"
-#include "RMG/CMapGenOptions.h"
-#include "RMG/CMapGenerator.h"
+#include "rmg/CMapGenOptions.h"
+#include "rmg/CMapGenerator.h"
 
 DLL_LINKAGE boost::rand48 ran;
 class CGObjectInstance;
diff --git a/lib/CGameState.h b/lib/CGameState.h
index 892722d16..aff5ab3b3 100644
--- a/lib/CGameState.h
+++ b/lib/CGameState.h
@@ -5,7 +5,7 @@
 //#ifndef _MSC_VER
 #include "CCreatureHandler.h"
 #include "VCMI_Lib.h"
-#include "Mapping/CMap.h"
+#include "mapping/CMap.h"
 //#endif
 
 #include "HeroBonus.h"
diff --git a/lib/CGeneralTextHandler.cpp b/lib/CGeneralTextHandler.cpp
index eeb539933..ff3bed933 100644
--- a/lib/CGeneralTextHandler.cpp
+++ b/lib/CGeneralTextHandler.cpp
@@ -1,8 +1,8 @@
 #include "StdInc.h"
 #include "CGeneralTextHandler.h"
 
-#include "Filesystem/CResourceLoader.h"
-#include "Filesystem/CInputStream.h"
+#include "filesystem/CResourceLoader.h"
+#include "filesystem/CInputStream.h"
 #include "GameConstants.h"
 
 // #include <locale> //needed?
diff --git a/lib/CHeroHandler.cpp b/lib/CHeroHandler.cpp
index 7e17e3528..ba16fb621 100644
--- a/lib/CHeroHandler.cpp
+++ b/lib/CHeroHandler.cpp
@@ -2,7 +2,7 @@
 #include "CHeroHandler.h"
 
 #include "CGeneralTextHandler.h"
-#include "Filesystem/CResourceLoader.h"
+#include "filesystem/CResourceLoader.h"
 #include "VCMI_Lib.h"
 #include "JsonNode.h"
 #include "StringConstants.h"
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 16f07c073..ce3b3484c 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -5,24 +5,24 @@ include_directories(${CMAKE_HOME_DIRECTORY} ${CMAKE_CURRENT_SOURCE_DIRECTORY} ${
 include_directories(${Boost_INCLUDE_DIRS} ${SDL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
 
 set(lib_SRCS
-		Filesystem/CBinaryReader.cpp
-		Filesystem/CFilesystemLoader.cpp
-		Filesystem/CMemoryStream.cpp
-		Filesystem/CFileInfo.cpp
-		Filesystem/CLodArchiveLoader.cpp
-		Filesystem/CResourceLoader.cpp
-		Filesystem/CFileInputStream.cpp
-		Filesystem/CCompressedStream.cpp
+		filesystem/CBinaryReader.cpp
+		filesystem/CFilesystemLoader.cpp
+		filesystem/CMemoryStream.cpp
+		filesystem/CFileInfo.cpp
+		filesystem/CLodArchiveLoader.cpp
+		filesystem/CResourceLoader.cpp
+		filesystem/CFileInputStream.cpp
+		filesystem/CCompressedStream.cpp
 		logging/CBasicLogConfigurator.cpp
 		logging/CLogger.cpp
-		Mapping/CCampaignHandler.cpp
-		Mapping/CMap.cpp
-		Mapping/CMapEditManager.cpp
-		Mapping/CMapInfo.cpp
-		Mapping/CMapService.cpp
-		Mapping/MapFormatH3M.cpp
-		RMG/CMapGenOptions.cpp
-		RMG/CMapGenerator.cpp
+		mapping/CCampaignHandler.cpp
+		mapping/CMap.cpp
+		mapping/CMapEditManager.cpp
+		mapping/CMapInfo.cpp
+		mapping/CMapService.cpp
+		mapping/MapFormatH3M.cpp
+		rmg/CMapGenOptions.cpp
+		rmg/CMapGenerator.cpp
 		BattleAction.cpp
 		BattleHex.cpp
 		BattleState.cpp
@@ -59,16 +59,16 @@ set(lib_SRCS
 )
 
 set(lib_HEADERS
-		Filesystem/CInputStream.h
-		Filesystem/ISimpleResourceLoader.h
+		filesystem/CInputStream.h
+		filesystem/ISimpleResourceLoader.h
 		logging/CBasicLogConfigurator.h
 		logging/CLogger.h
-		Mapping/CCampaignHandler.h
-		Mapping/CMap.h
-		Mapping/CMapEditManager.h
-		Mapping/CMapInfo.h
-		Mapping/CMapService.h
-		Mapping/MapFormatH3M.h
+		mapping/CCampaignHandler.h
+		mapping/CMap.h
+		mapping/CMapEditManager.h
+		mapping/CMapInfo.h
+		mapping/CMapService.h
+		mapping/MapFormatH3M.h
 		AI_Base.h
 		CondSh.h
 		ConstTransitivePtr.h
diff --git a/lib/CModHandler.cpp b/lib/CModHandler.cpp
index 874126f3c..b31afdf11 100644
--- a/lib/CModHandler.cpp
+++ b/lib/CModHandler.cpp
@@ -2,8 +2,8 @@
 #include "CModHandler.h"
 #include "CDefObjInfoHandler.h"
 #include "JsonNode.h"
-#include "Filesystem/CResourceLoader.h"
-#include "Filesystem/ISimpleResourceLoader.h"
+#include "filesystem/CResourceLoader.h"
+#include "filesystem/ISimpleResourceLoader.h"
 
 #include "CCreatureHandler.h"
 #include "CArtHandler.h"
diff --git a/lib/CModHandler.h b/lib/CModHandler.h
index ccc0a3456..e2dd6896d 100644
--- a/lib/CModHandler.h
+++ b/lib/CModHandler.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Filesystem/CResourceLoader.h"
+#include "filesystem/CResourceLoader.h"
 
 #include "VCMI_Lib.h"
 
diff --git a/lib/CObjectHandler.cpp b/lib/CObjectHandler.cpp
index d72d046a9..2e53dd7db 100644
--- a/lib/CObjectHandler.cpp
+++ b/lib/CObjectHandler.cpp
@@ -26,11 +26,11 @@
 #include "CGameState.h"
 #include "NetPacks.h"
 #include "StartInfo.h"
-#include "Mapping/CMap.h"
+#include "mapping/CMap.h"
 #include <SDL_stdinc.h>
 #include "CBuildingHandler.h"
 #include "JsonNode.h"
-#include "Filesystem/CResourceLoader.h"
+#include "filesystem/CResourceLoader.h"
 
 using namespace boost::assign;
 
diff --git a/lib/CSpellHandler.cpp b/lib/CSpellHandler.cpp
index 026b1832d..6d8187a9a 100644
--- a/lib/CSpellHandler.cpp
+++ b/lib/CSpellHandler.cpp
@@ -2,7 +2,7 @@
 #include "CSpellHandler.h"
 
 #include "CGeneralTextHandler.h"
-#include "Filesystem/CResourceLoader.h"
+#include "filesystem/CResourceLoader.h"
 #include "VCMI_Lib.h"
 #include "JsonNode.h"
 #include <cctype>
diff --git a/lib/CTownHandler.cpp b/lib/CTownHandler.cpp
index 105b54a70..f6238a196 100644
--- a/lib/CTownHandler.cpp
+++ b/lib/CTownHandler.cpp
@@ -9,7 +9,7 @@
 #include "CHeroHandler.h"
 #include "CArtHandler.h"
 #include "CSpellHandler.h"
-#include "Filesystem/CResourceLoader.h"
+#include "filesystem/CResourceLoader.h"
 
 /*
  * CTownHandler.cpp, part of VCMI engine
diff --git a/lib/Connection.h b/lib/Connection.h
index f949ced05..c18623909 100644
--- a/lib/Connection.h
+++ b/lib/Connection.h
@@ -24,7 +24,7 @@
 #include "ConstTransitivePtr.h"
 #include "CCreatureSet.h" //for CStackInstance
 #include "CObjectHandler.h" //for CArmedInstance
-#include "Mapping/CCampaignHandler.h" //for CCampaignState
+#include "mapping/CCampaignHandler.h" //for CCampaignState
 
 const ui32 version = 739;
 
diff --git a/lib/IGameCallback.cpp b/lib/IGameCallback.cpp
index a460d33c6..3d0be0981 100644
--- a/lib/IGameCallback.cpp
+++ b/lib/IGameCallback.cpp
@@ -4,7 +4,7 @@
 #include <boost/random/linear_congruential.hpp>
 
 #include "CGameState.h"
-#include "Mapping/CMap.h"
+#include "mapping/CMap.h"
 #include "CObjectHandler.h"
 #include "CHeroHandler.h"
 #include "StartInfo.h"
diff --git a/lib/JsonNode.cpp b/lib/JsonNode.cpp
index c850c2440..f0da0007a 100644
--- a/lib/JsonNode.cpp
+++ b/lib/JsonNode.cpp
@@ -14,7 +14,7 @@
 #include "ScopeGuard.h"
 
 #include "HeroBonus.h"
-#include "Filesystem/CResourceLoader.h"
+#include "filesystem/CResourceLoader.h"
 #include "VCMI_Lib.h" //for identifier resolution
 #include "CModHandler.h"
 
diff --git a/lib/NetPacks.h b/lib/NetPacks.h
index 05577d52c..c070c353b 100644
--- a/lib/NetPacks.h
+++ b/lib/NetPacks.h
@@ -5,7 +5,7 @@
 #include "BattleAction.h"
 #include "HeroBonus.h"
 #include "CCreatureSet.h"
-#include "Mapping/CMapInfo.h"
+#include "mapping/CMapInfo.h"
 #include "StartInfo.h"
 #include "ConstTransitivePtr.h"
 #include "int3.h"
diff --git a/lib/NetPacksLib.cpp b/lib/NetPacksLib.cpp
index 06c775433..894ce1770 100644
--- a/lib/NetPacksLib.cpp
+++ b/lib/NetPacksLib.cpp
@@ -8,7 +8,7 @@
 #include "CObjectHandler.h"
 #include "CModHandler.h"
 #include "VCMI_Lib.h"
-#include "Mapping/CMap.h"
+#include "mapping/CMap.h"
 #include "CSpellHandler.h"
 #include "CCreatureHandler.h"
 #include "CGameState.h"
diff --git a/lib/RegisterTypes.cpp b/lib/RegisterTypes.cpp
index 23c26f493..22fe30716 100644
--- a/lib/RegisterTypes.cpp
+++ b/lib/RegisterTypes.cpp
@@ -2,11 +2,11 @@
 #define DO_NOT_DISABLE_REGISTER_TYPES_INSTANTIATION
 #include "RegisterTypes.h"
 
-#include "Mapping/CMapInfo.h"
+#include "mapping/CMapInfo.h"
 #include "StartInfo.h"
 #include "BattleState.h"
 #include "CGameState.h"
-#include "Mapping/CMap.h"
+#include "mapping/CMap.h"
 #include "CModHandler.h"
 #include "CObjectHandler.h"
 #include "CCreatureHandler.h"
@@ -15,7 +15,7 @@
 #include "CHeroHandler.h"
 #include "CSpellHandler.h"
 #include "CTownHandler.h"
-#include "Mapping/CCampaignHandler.h"
+#include "mapping/CCampaignHandler.h"
 #include "NetPacks.h"
 #include "CDefObjInfoHandler.h"
 
diff --git a/lib/StartInfo.h b/lib/StartInfo.h
index cd80ddeaf..388a6081f 100644
--- a/lib/StartInfo.h
+++ b/lib/StartInfo.h
@@ -12,7 +12,7 @@
  *
  */
 
-#include "RMG/CMapGenOptions.h"
+#include "rmg/CMapGenOptions.h"
 
 class CCampaignState;
 
diff --git a/lib/VCMI_Lib.cpp b/lib/VCMI_Lib.cpp
index 00b5e0c80..0bb56e7cb 100644
--- a/lib/VCMI_Lib.cpp
+++ b/lib/VCMI_Lib.cpp
@@ -25,7 +25,7 @@
 #include "IGameEventsReceiver.h"
 #include "CStopWatch.h"
 #include "VCMIDirs.h"
-#include "Filesystem/CResourceLoader.h"
+#include "filesystem/CResourceLoader.h"
 
 
 LibClasses * VLC = NULL;
diff --git a/lib/VCMI_lib.cbp b/lib/VCMI_lib.cbp
index f35fcba69..26704f163 100644
--- a/lib/VCMI_lib.cbp
+++ b/lib/VCMI_lib.cbp
@@ -118,24 +118,24 @@
 		<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="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.cpp" />
 		<Unit filename="GameConstants.h" />
 		<Unit filename="HeroBonus.cpp" />
@@ -147,24 +147,28 @@
 		<Unit filename="Interprocess.h" />
 		<Unit filename="JsonNode.cpp" />
 		<Unit filename="JsonNode.h" />
-		<Unit filename="Mapping/CCampaignHandler.cpp" />
-		<Unit filename="Mapping/CCampaignHandler.h" />
-		<Unit filename="Mapping/CMap.cpp" />
-		<Unit filename="Mapping/CMap.h" />
-		<Unit filename="Mapping/CMapEditManager.cpp" />
-		<Unit filename="Mapping/CMapEditManager.h" />
-		<Unit filename="Mapping/CMapInfo.cpp" />
-		<Unit filename="Mapping/CMapInfo.h" />
-		<Unit filename="Mapping/CMapService.cpp" />
-		<Unit filename="Mapping/CMapService.h" />
-		<Unit filename="Mapping/MapFormatH3M.cpp" />
-		<Unit filename="Mapping/MapFormatH3M.h" />
+		<Unit filename="mapping/CCampaignHandler.cpp" />
+		<Unit filename="mapping/CCampaignHandler.h" />
+		<Unit filename="mapping/CMap.cpp" />
+		<Unit filename="mapping/CMap.h" />
+		<Unit filename="mapping/CMapEditManager.cpp" />
+		<Unit filename="mapping/CMapEditManager.h" />
+		<Unit filename="mapping/CMapInfo.cpp" />
+		<Unit filename="mapping/CMapInfo.h" />
+		<Unit filename="mapping/CMapService.cpp" />
+		<Unit filename="mapping/CMapService.h" />
+		<Unit filename="mapping/MapFormatH3M.cpp" />
+		<Unit filename="mapping/MapFormatH3M.h" />
 		<Unit filename="NetPacks.h" />
 		<Unit filename="NetPacksLib.cpp" />
-		<Unit filename="RMG/CMapGenOptions.cpp" />
-		<Unit filename="RMG/CMapGenOptions.h" />
-		<Unit filename="RMG/CMapGenerator.cpp" />
-		<Unit filename="RMG/CMapGenerator.h" />
+		<Unit filename="rmg/CMapGenOptions.cpp" />
+		<Unit filename="rmg/CMapGenOptions.h" />
+		<Unit filename="rmg/CMapGenerator.cpp" />
+		<Unit filename="rmg/CMapGenerator.h" />
+		<Unit filename="logging/CLogger.cpp" />
+		<Unit filename="logging/CLogger.h" />
+		<Unit filename="logging/CBasicLogConfigurator.cpp" />
+		<Unit filename="logging/CBasicLogConfigurator.h" />
 		<Unit filename="RegisterTypes.cpp" />
 		<Unit filename="RegisterTypes.h" />
 		<Unit filename="ResourceSet.cpp" />
diff --git a/lib/VCMI_lib.vcxproj b/lib/VCMI_lib.vcxproj
index fe417009e..e3cd362db 100644
--- a/lib/VCMI_lib.vcxproj
+++ b/lib/VCMI_lib.vcxproj
@@ -186,24 +186,26 @@
     <ClCompile Include="CSpellHandler.cpp" />
     <ClCompile Include="CThreadHelper.cpp" />
     <ClCompile Include="CTownHandler.cpp" />
-    <ClCompile Include="Filesystem\CBinaryReader.cpp" />
-    <ClCompile Include="Filesystem\CCompressedStream.cpp" />
-    <ClCompile Include="Filesystem\CFileInfo.cpp" />
-    <ClCompile Include="Filesystem\CFileInputStream.cpp" />
-    <ClCompile Include="Filesystem\CFilesystemLoader.cpp" />
-    <ClCompile Include="Filesystem\CLodArchiveLoader.cpp" />
-    <ClCompile Include="Filesystem\CMemoryStream.cpp" />
-    <ClCompile Include="Filesystem\CResourceLoader.cpp" />
+    <ClCompile Include="filesystem\CBinaryReader.cpp" />
+    <ClCompile Include="filesystem\CCompressedStream.cpp" />
+    <ClCompile Include="filesystem\CFileInfo.cpp" />
+    <ClCompile Include="filesystem\CFileInputStream.cpp" />
+    <ClCompile Include="filesystem\CFilesystemLoader.cpp" />
+    <ClCompile Include="filesystem\CLodArchiveLoader.cpp" />
+    <ClCompile Include="filesystem\CMemoryStream.cpp" />
+    <ClCompile Include="filesystem\CResourceLoader.cpp" />
     <ClCompile Include="GameConstants.cpp" />
-    <ClCompile Include="Mapping\CCampaignHandler.cpp" />
-    <ClCompile Include="Mapping\CMap.cpp" />
-    <ClCompile Include="Mapping\CMapInfo.cpp" />
-    <ClCompile Include="Mapping\CMapService.cpp" />
-    <ClCompile Include="Mapping\CMapEditManager.cpp" />
-    <ClCompile Include="Mapping\MapFormatH3M.cpp" />
+    <ClCompile Include="mapping\CCampaignHandler.cpp" />
+    <ClCompile Include="mapping\CMap.cpp" />
+    <ClCompile Include="mapping\CMapInfo.cpp" />
+    <ClCompile Include="mapping\CMapService.cpp" />
+    <ClCompile Include="mapping\CMapEditManager.cpp" />
+    <ClCompile Include="mapping\MapFormatH3M.cpp" />
     <ClCompile Include="RegisterTypes.cpp" />
-    <ClCompile Include="RMG\CMapGenOptions.cpp" />
-    <ClCompile Include="RMG\CMapGenerator.cpp" />
+    <ClCompile Include="rmg\CMapGenOptions.cpp" />
+    <ClCompile Include="rmg\CMapGenerator.cpp" />
+    <ClCompile Include="logging\CLogger.cpp" />
+    <ClCompile Include="logging\CBasicLogConfigurator.cpp" />
     <ClCompile Include="HeroBonus.cpp" />
     <ClCompile Include="CBattleCallback.cpp" />
     <ClCompile Include="IGameCallback.cpp" />
@@ -253,25 +255,27 @@
     <ClInclude Include="CStopWatch.h" />
     <ClInclude Include="CThreadHelper.h" />
     <ClInclude Include="CTownHandler.h" />
-    <ClInclude Include="Filesystem\CBinaryReader.h" />
-    <ClInclude Include="Filesystem\CCompressedStream.h" />
-    <ClInclude Include="Filesystem\CFileInfo.h" />
-    <ClInclude Include="Filesystem\CFileInputStream.h" />
-    <ClInclude Include="Filesystem\CFilesystemLoader.h" />
-    <ClInclude Include="Filesystem\CInputStream.h" />
-    <ClInclude Include="Filesystem\CLodArchiveLoader.h" />
-    <ClInclude Include="Filesystem\CMemoryStream.h" />
-    <ClInclude Include="Filesystem\CResourceLoader.h" />
-    <ClInclude Include="Filesystem\ISimpleResourceLoader.h" />
+    <ClInclude Include="filesystem\CBinaryReader.h" />
+    <ClInclude Include="filesystem\CCompressedStream.h" />
+    <ClInclude Include="filesystem\CFileInfo.h" />
+    <ClInclude Include="filesystem\CFileInputStream.h" />
+    <ClInclude Include="filesystem\CFilesystemLoader.h" />
+    <ClInclude Include="filesystem\CInputStream.h" />
+    <ClInclude Include="filesystem\CLodArchiveLoader.h" />
+    <ClInclude Include="filesystem\CMemoryStream.h" />
+    <ClInclude Include="filesystem\CResourceLoader.h" />
+    <ClInclude Include="filesystem\ISimpleResourceLoader.h" />
     <ClInclude Include="IBonusTypeHandler.h" />
-    <ClInclude Include="Mapping\CCampaignHandler.h" />
-    <ClInclude Include="Mapping\CMap.h" />
-    <ClInclude Include="Mapping\CMapInfo.h" />
-    <ClInclude Include="Mapping\CMapService.h" />
-    <ClInclude Include="Mapping\CMapEditManager.h" />
-    <ClInclude Include="Mapping\MapFormatH3M.h" />
-    <ClInclude Include="RMG\CMapGenOptions.h" />
-    <ClInclude Include="RMG\CMapGenerator.h" />
+    <ClInclude Include="mapping\CCampaignHandler.h" />
+    <ClInclude Include="mapping\CMap.h" />
+    <ClInclude Include="mapping\CMapInfo.h" />
+    <ClInclude Include="mapping\CMapService.h" />
+    <ClInclude Include="mapping\CMapEditManager.h" />
+    <ClInclude Include="mapping\MapFormatH3M.h" />
+    <ClInclude Include="rmg\CMapGenOptions.h" />
+    <ClInclude Include="rmg\CMapGenerator.h" />
+    <ClCompile Include="logging\CLogger.h" />
+    <ClCompile Include="logging\CBasicLogConfigurator.h" />
     <ClInclude Include="GameConstants.h" />
     <ClInclude Include="HeroBonus.h" />
     <ClInclude Include="CBattleCallback.h" />
@@ -292,4 +296,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/lib/Filesystem/CBinaryReader.cpp b/lib/filesystem/CBinaryReader.cpp
similarity index 100%
rename from lib/Filesystem/CBinaryReader.cpp
rename to lib/filesystem/CBinaryReader.cpp
diff --git a/lib/Filesystem/CBinaryReader.h b/lib/filesystem/CBinaryReader.h
similarity index 100%
rename from lib/Filesystem/CBinaryReader.h
rename to lib/filesystem/CBinaryReader.h
diff --git a/lib/Filesystem/CCompressedStream.cpp b/lib/filesystem/CCompressedStream.cpp
similarity index 100%
rename from lib/Filesystem/CCompressedStream.cpp
rename to lib/filesystem/CCompressedStream.cpp
diff --git a/lib/Filesystem/CCompressedStream.h b/lib/filesystem/CCompressedStream.h
similarity index 100%
rename from lib/Filesystem/CCompressedStream.h
rename to lib/filesystem/CCompressedStream.h
diff --git a/lib/Filesystem/CFileInfo.cpp b/lib/filesystem/CFileInfo.cpp
similarity index 100%
rename from lib/Filesystem/CFileInfo.cpp
rename to lib/filesystem/CFileInfo.cpp
diff --git a/lib/Filesystem/CFileInfo.h b/lib/filesystem/CFileInfo.h
similarity index 100%
rename from lib/Filesystem/CFileInfo.h
rename to lib/filesystem/CFileInfo.h
diff --git a/lib/Filesystem/CFileInputStream.cpp b/lib/filesystem/CFileInputStream.cpp
similarity index 100%
rename from lib/Filesystem/CFileInputStream.cpp
rename to lib/filesystem/CFileInputStream.cpp
diff --git a/lib/Filesystem/CFileInputStream.h b/lib/filesystem/CFileInputStream.h
similarity index 100%
rename from lib/Filesystem/CFileInputStream.h
rename to lib/filesystem/CFileInputStream.h
diff --git a/lib/Filesystem/CFilesystemLoader.cpp b/lib/filesystem/CFilesystemLoader.cpp
similarity index 100%
rename from lib/Filesystem/CFilesystemLoader.cpp
rename to lib/filesystem/CFilesystemLoader.cpp
diff --git a/lib/Filesystem/CFilesystemLoader.h b/lib/filesystem/CFilesystemLoader.h
similarity index 100%
rename from lib/Filesystem/CFilesystemLoader.h
rename to lib/filesystem/CFilesystemLoader.h
diff --git a/lib/Filesystem/CInputStream.h b/lib/filesystem/CInputStream.h
similarity index 100%
rename from lib/Filesystem/CInputStream.h
rename to lib/filesystem/CInputStream.h
diff --git a/lib/Filesystem/CLodArchiveLoader.cpp b/lib/filesystem/CLodArchiveLoader.cpp
similarity index 100%
rename from lib/Filesystem/CLodArchiveLoader.cpp
rename to lib/filesystem/CLodArchiveLoader.cpp
diff --git a/lib/Filesystem/CLodArchiveLoader.h b/lib/filesystem/CLodArchiveLoader.h
similarity index 100%
rename from lib/Filesystem/CLodArchiveLoader.h
rename to lib/filesystem/CLodArchiveLoader.h
diff --git a/lib/Filesystem/CMemoryStream.cpp b/lib/filesystem/CMemoryStream.cpp
similarity index 100%
rename from lib/Filesystem/CMemoryStream.cpp
rename to lib/filesystem/CMemoryStream.cpp
diff --git a/lib/Filesystem/CMemoryStream.h b/lib/filesystem/CMemoryStream.h
similarity index 100%
rename from lib/Filesystem/CMemoryStream.h
rename to lib/filesystem/CMemoryStream.h
diff --git a/lib/Filesystem/CResourceLoader.cpp b/lib/filesystem/CResourceLoader.cpp
similarity index 100%
rename from lib/Filesystem/CResourceLoader.cpp
rename to lib/filesystem/CResourceLoader.cpp
diff --git a/lib/Filesystem/CResourceLoader.h b/lib/filesystem/CResourceLoader.h
similarity index 100%
rename from lib/Filesystem/CResourceLoader.h
rename to lib/filesystem/CResourceLoader.h
diff --git a/lib/Filesystem/ISimpleResourceLoader.h b/lib/filesystem/ISimpleResourceLoader.h
similarity index 100%
rename from lib/Filesystem/ISimpleResourceLoader.h
rename to lib/filesystem/ISimpleResourceLoader.h
diff --git a/lib/Mapping/CCampaignHandler.cpp b/lib/mapping/CCampaignHandler.cpp
similarity index 95%
rename from lib/Mapping/CCampaignHandler.cpp
rename to lib/mapping/CCampaignHandler.cpp
index cac5ed01c..c2c9d5efc 100644
--- a/lib/Mapping/CCampaignHandler.cpp
+++ b/lib/mapping/CCampaignHandler.cpp
@@ -1,8 +1,8 @@
 #include "StdInc.h"
 #include "CCampaignHandler.h"
 
-#include "../Filesystem/CResourceLoader.h"
-#include "../Filesystem/CCompressedStream.h"
+#include "../filesystem/CResourceLoader.h"
+#include "../filesystem/CCompressedStream.h"
 #include "../VCMI_Lib.h"
 #include "../vcmi_endian.h"
 #include "../CGeneralTextHandler.h"
diff --git a/lib/Mapping/CCampaignHandler.h b/lib/mapping/CCampaignHandler.h
similarity index 100%
rename from lib/Mapping/CCampaignHandler.h
rename to lib/mapping/CCampaignHandler.h
diff --git a/lib/Mapping/CMap.cpp b/lib/mapping/CMap.cpp
similarity index 100%
rename from lib/Mapping/CMap.cpp
rename to lib/mapping/CMap.cpp
diff --git a/lib/Mapping/CMap.h b/lib/mapping/CMap.h
similarity index 100%
rename from lib/Mapping/CMap.h
rename to lib/mapping/CMap.h
diff --git a/lib/Mapping/CMapEditManager.cpp b/lib/mapping/CMapEditManager.cpp
similarity index 99%
rename from lib/Mapping/CMapEditManager.cpp
rename to lib/mapping/CMapEditManager.cpp
index 357f2e05d..a748a2254 100644
--- a/lib/Mapping/CMapEditManager.cpp
+++ b/lib/mapping/CMapEditManager.cpp
@@ -2,7 +2,7 @@
 #include "CMapEditManager.h"
 
 #include "../JsonNode.h"
-#include "../Filesystem/CResourceLoader.h"
+#include "../filesystem/CResourceLoader.h"
 #include "../CDefObjInfoHandler.h"
 
 const std::string TerrainViewPattern::FLIP_MODE_SAME_IMAGE = "sameImage";
diff --git a/lib/Mapping/CMapEditManager.h b/lib/mapping/CMapEditManager.h
similarity index 100%
rename from lib/Mapping/CMapEditManager.h
rename to lib/mapping/CMapEditManager.h
diff --git a/lib/Mapping/CMapInfo.cpp b/lib/mapping/CMapInfo.cpp
similarity index 100%
rename from lib/Mapping/CMapInfo.cpp
rename to lib/mapping/CMapInfo.cpp
diff --git a/lib/Mapping/CMapInfo.h b/lib/mapping/CMapInfo.h
similarity index 100%
rename from lib/Mapping/CMapInfo.h
rename to lib/mapping/CMapInfo.h
diff --git a/lib/Mapping/CMapService.cpp b/lib/mapping/CMapService.cpp
similarity index 91%
rename from lib/Mapping/CMapService.cpp
rename to lib/mapping/CMapService.cpp
index 163d21e65..c1d5e945b 100644
--- a/lib/Mapping/CMapService.cpp
+++ b/lib/mapping/CMapService.cpp
@@ -1,10 +1,10 @@
 #include "StdInc.h"
 #include "CMapService.h"
 
-#include "../Filesystem/CResourceLoader.h"
-#include "../Filesystem/CBinaryReader.h"
-#include "../Filesystem/CCompressedStream.h"
-#include "../Filesystem/CMemoryStream.h"
+#include "../filesystem/CResourceLoader.h"
+#include "../filesystem/CBinaryReader.h"
+#include "../filesystem/CCompressedStream.h"
+#include "../filesystem/CMemoryStream.h"
 #include "CMap.h"
 
 #include "MapFormatH3M.h"
diff --git a/lib/Mapping/CMapService.h b/lib/mapping/CMapService.h
similarity index 100%
rename from lib/Mapping/CMapService.h
rename to lib/mapping/CMapService.h
diff --git a/lib/Mapping/MapFormatH3M.cpp b/lib/mapping/MapFormatH3M.cpp
similarity index 95%
rename from lib/Mapping/MapFormatH3M.cpp
rename to lib/mapping/MapFormatH3M.cpp
index 0f07a64e3..0303f4ac3 100644
--- a/lib/Mapping/MapFormatH3M.cpp
+++ b/lib/mapping/MapFormatH3M.cpp
@@ -15,8 +15,8 @@
 
 #include "../CStopWatch.h"
 
-#include "../Filesystem/CResourceLoader.h"
-#include "../Filesystem/CInputStream.h"
+#include "../filesystem/CResourceLoader.h"
+#include "../filesystem/CInputStream.h"
 #include "CMap.h"
 
 #include "../CSpellHandler.h"
diff --git a/lib/Mapping/MapFormatH3M.h b/lib/mapping/MapFormatH3M.h
similarity index 94%
rename from lib/Mapping/MapFormatH3M.h
rename to lib/mapping/MapFormatH3M.h
index 484b07061..346bbce6d 100644
--- a/lib/Mapping/MapFormatH3M.h
+++ b/lib/mapping/MapFormatH3M.h
@@ -17,7 +17,7 @@
 
 #include "../int3.h"
 
-#include "../Filesystem/CBinaryReader.h"
+#include "../filesystem/CBinaryReader.h"
 
 class CGHeroInstance;
 class CArtifactInstance;
diff --git a/lib/RMG/CMapGenOptions.cpp b/lib/rmg/CMapGenOptions.cpp
similarity index 100%
rename from lib/RMG/CMapGenOptions.cpp
rename to lib/rmg/CMapGenOptions.cpp
diff --git a/lib/RMG/CMapGenOptions.h b/lib/rmg/CMapGenOptions.h
similarity index 100%
rename from lib/RMG/CMapGenOptions.h
rename to lib/rmg/CMapGenOptions.h
diff --git a/lib/RMG/CMapGenerator.cpp b/lib/rmg/CMapGenerator.cpp
similarity index 99%
rename from lib/RMG/CMapGenerator.cpp
rename to lib/rmg/CMapGenerator.cpp
index ed59ffb1a..aee5ae43b 100644
--- a/lib/RMG/CMapGenerator.cpp
+++ b/lib/rmg/CMapGenerator.cpp
@@ -1,10 +1,10 @@
 #include "StdInc.h"
 #include "CMapGenerator.h"
 
-#include "../Mapping/CMap.h"
+#include "../mapping/CMap.h"
 #include "../VCMI_Lib.h"
 #include "../CGeneralTextHandler.h"
-#include "../Mapping/CMapEditManager.h"
+#include "../mapping/CMapEditManager.h"
 #include "../CObjectHandler.h"
 #include "../CDefObjInfoHandler.h"
 #include "../GameConstants.h"
diff --git a/lib/RMG/CMapGenerator.h b/lib/rmg/CMapGenerator.h
similarity index 100%
rename from lib/RMG/CMapGenerator.h
rename to lib/rmg/CMapGenerator.h
diff --git a/server/CGameHandler.cpp b/server/CGameHandler.cpp
index a583f49f2..e14fa3bbe 100644
--- a/server/CGameHandler.cpp
+++ b/server/CGameHandler.cpp
@@ -1,9 +1,9 @@
 #include "StdInc.h"
 
-#include "../lib/Filesystem/CResourceLoader.h"
-#include "../lib/Filesystem/CFileInfo.h"
+#include "../lib/filesystem/CResourceLoader.h"
+#include "../lib/filesystem/CFileInfo.h"
 #include "../lib/int3.h"
-#include "../lib/Mapping/CCampaignHandler.h"
+#include "../lib/mapping/CCampaignHandler.h"
 #include "../lib/StartInfo.h"
 #include "../lib/CModHandler.h"
 #include "../lib/CArtHandler.h"
@@ -20,7 +20,7 @@
 #include "../lib/CondSh.h"
 #include "../lib/NetPacks.h"
 #include "../lib/VCMI_Lib.h"
-#include "../lib/Mapping/CMap.h"
+#include "../lib/mapping/CMap.h"
 #include "../lib/VCMIDirs.h"
 #include "../client/CSoundBase.h"
 #include "CGameHandler.h"
diff --git a/server/CVCMIServer.cpp b/server/CVCMIServer.cpp
index 1909c7a0d..1538ef5e8 100644
--- a/server/CVCMIServer.cpp
+++ b/server/CVCMIServer.cpp
@@ -4,8 +4,8 @@
 #include <boost/interprocess/mapped_region.hpp>
 #include <boost/interprocess/shared_memory_object.hpp>
 
-#include "../lib/Filesystem/CResourceLoader.h"
-#include "../lib/Mapping/CCampaignHandler.h"
+#include "../lib/filesystem/CResourceLoader.h"
+#include "../lib/mapping/CCampaignHandler.h"
 #include "../lib/CThreadHelper.h"
 #include "../lib/Connection.h"
 #include "../lib/CModHandler.h"
@@ -20,12 +20,12 @@
 #include "zlib.h"
 #include "CVCMIServer.h"
 #include "../lib/StartInfo.h"
-#include "../lib/Mapping/CMap.h"
+#include "../lib/mapping/CMap.h"
 #include "../lib/Interprocess.h"
 #include "../lib/VCMI_Lib.h"
 #include "../lib/VCMIDirs.h"
 #include "CGameHandler.h"
-#include "../lib/Mapping/CMapInfo.h"
+#include "../lib/mapping/CMapInfo.h"
 #include "../lib/CObjectHandler.h"
 #include "../lib/GameConstants.h"
 
diff --git a/server/NetPacksServer.cpp b/server/NetPacksServer.cpp
index eb61566f8..ca4f4af81 100644
--- a/server/NetPacksServer.cpp
+++ b/server/NetPacksServer.cpp
@@ -4,7 +4,7 @@
 #include "CGameHandler.h"
 #include "../lib/CObjectHandler.h"
 #include "../lib/IGameCallback.h"
-#include "../lib/Mapping/CMap.h"
+#include "../lib/mapping/CMap.h"
 #include "../lib/CGameState.h"
 #include "../lib/BattleState.h"
 #include "../lib/BattleAction.h"