diff --git a/include/eepp/ee.hpp b/include/eepp/ee.hpp
index 34d9f3292..5343ea11f 100644
--- a/include/eepp/ee.hpp
+++ b/include/eepp/ee.hpp
@@ -48,10 +48,6 @@ using namespace EE::Scene;
 using namespace EE::UI;
 using namespace EE::UI::Tools;
 
-// Maps
-#include <eepp/maps.hpp>
-using namespace EE::Maps;
-
 // Physics
 #include <eepp/physics.hpp>
 using namespace EE::Physics;
diff --git a/premake4.lua b/premake4.lua
index ad722be78..e2be9e72a 100644
--- a/premake4.lua
+++ b/premake4.lua
@@ -815,6 +815,11 @@ function set_macos_and_ios_config()
 	end
 end
 
+function eepp_module_maps_add()
+	links { "eepp-maps-static" }
+	includedirs { "src/modules/maps/include/","src/modules/maps/src/" }
+end
+
 function build_eepp( build_name )
 	includedirs { "include", "src", "src/thirdparty", "include/eepp/thirdparty", "src/thirdparty/freetype2/include", "src/thirdparty/zlib", "src/thirdparty/libogg/include", "src/thirdparty/libvorbis/include", "src/thirdparty/mbedtls/include" }
 
@@ -866,9 +871,7 @@ function build_eepp( build_name )
 			"src/eepp/ui/doc/*.cpp",
 			"src/eepp/ui/tools/*.cpp",
 			"src/eepp/physics/*.cpp",
-			"src/eepp/physics/constraints/*.cpp",
-			"src/eepp/maps/*.cpp",
-			"src/eepp/maps/mapeditor/*.cpp"
+			"src/eepp/physics/constraints/*.cpp"
 	}
 
 	check_ssl_support()
@@ -1092,6 +1095,34 @@ solution "eepp"
 
 		build_base_cpp_configuration( "efsw" )
 
+	project "eepp-maps-static"
+		kind "StaticLib"
+		language "C++"
+		set_targetdir("libs/" .. os.get_real() .. "/")
+		includedirs { "include", "src/modules/maps/include/","src/modules/maps/src/" }
+		files { "src/modules/maps/src/**.cpp" }
+
+		if not is_vs() then
+			buildoptions{ "-std=c++17" }
+		else
+			buildoptions{ "/std:c++17" }
+		end
+		build_base_cpp_configuration( "eepp-maps" )
+
+	project "eepp-maps"
+		kind "SharedLib"
+		language "C++"
+		set_targetdir("libs/" .. os.get_real() .. "/")
+		includedirs { "include", "src/modules/maps/include/","src/modules/maps/src/" }
+		files { "src/modules/maps/src/**.cpp" }
+
+		if not is_vs() then
+			buildoptions{ "-std=c++17" }
+		else
+			buildoptions{ "/std:c++17" }
+		end
+		build_base_cpp_configuration( "eepp-maps" )
+
 	project "eterm-static"
 		kind "StaticLib"
 		language "C++"
@@ -1186,6 +1217,7 @@ solution "eepp"
 		set_kind()
 		language "C++"
 		files { "src/tools/mapeditor/*.cpp" }
+		eepp_module_maps_add()
 		build_link_configuration( "eepp-MapEditor", true )
 
 	project "eepp-uieditor"
@@ -1278,6 +1310,7 @@ solution "eepp"
 		set_kind()
 		language "C++"
 		files { "src/tests/test_all/*.cpp" }
+		eepp_module_maps_add()
 		build_link_configuration( "eepp-test", true )
 
 	project "eepp-ui-perf-test"
diff --git a/premake5.lua b/premake5.lua
index 73a77c012..2bb58c510 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -544,6 +544,11 @@ function check_ssl_support()
 	defines { "EE_SSL_SUPPORT" }
 end
 
+function eepp_module_maps_add()
+	links { "eepp-maps-static" }
+	incdirs { "src/modules/maps/include/","src/modules/maps/src/" }
+end
+
 function build_eepp( build_name )
 	files { "src/eepp/core/*.cpp",
 			"src/eepp/math/*.cpp",
@@ -564,9 +569,7 @@ function build_eepp( build_name )
 			"src/eepp/ui/doc/*.cpp",
 			"src/eepp/ui/tools/*.cpp",
 			"src/eepp/physics/*.cpp",
-			"src/eepp/physics/constraints/*.cpp",
-			"src/eepp/maps/*.cpp",
-			"src/eepp/maps/mapeditor/*.cpp"
+			"src/eepp/physics/constraints/*.cpp"
 	}
 
 	incdirs {	"include",
@@ -831,6 +834,28 @@ workspace "eepp"
 		filter "system:not windows"
 			files { "src/thirdparty/efsw/src/efsw/platform/posix/*.cpp" }
 
+	project "eepp-maps-static"
+		kind "StaticLib"
+		language "C++"
+		cppdialect "C++17"
+		targetdir("libs/" .. os.target() .. "/")
+		incdirs { "include", "src/modules/maps/include/","src/modules/maps/src/" }
+		files { "src/modules/maps/src/**.cpp" }
+		build_base_cpp_configuration( "eepp-maps" )
+		filter "action:not vs*"
+			buildoptions { "-Wall" }
+
+	project "eepp-maps"
+		kind "SharedLib"
+		language "C++"
+		cppdialect "C++17"
+		targetdir("libs/" .. os.target() .. "/")
+		incdirs { "include", "src/modules/maps/include/","src/modules/maps/src/" }
+		files { "src/modules/maps/src/**.cpp" }
+		build_base_cpp_configuration( "eepp-maps" )
+		filter "action:not vs*"
+			buildoptions { "-Wall" }
+
 	project "eterm-static"
 		kind "StaticLib"
 		language "C++"
@@ -923,6 +948,7 @@ workspace "eepp"
 		set_kind()
 		language "C++"
 		files { "src/tools/mapeditor/*.cpp" }
+		eepp_module_maps_add()
 		build_link_configuration( "eepp-MapEditor", true )
 
 	project "eepp-uieditor"
@@ -931,6 +957,7 @@ workspace "eepp"
 		incdirs { "src/thirdparty/efsw/include", "src/thirdparty" }
 		links { "efsw-static", "pugixml-static" }
 		files { "src/tools/uieditor/*.cpp" }
+		eepp_module_maps_add()
 		build_link_configuration( "eepp-UIEditor", true )
 		filter "system:macosx"
 			links { "CoreFoundation.framework", "CoreServices.framework" }
@@ -1002,6 +1029,7 @@ workspace "eepp"
 		set_kind()
 		language "C++"
 		files { "src/tests/test_all/*.cpp" }
+		eepp_module_maps_add()
 		build_link_configuration( "eepp-test", true )
 
 	project "eepp-ui-perf-test"
diff --git a/projects/android-project/app/jni/Android.mk b/projects/android-project/app/jni/Android.mk
index 93c9158f3..a8961f374 100644
--- a/projects/android-project/app/jni/Android.mk
+++ b/projects/android-project/app/jni/Android.mk
@@ -62,7 +62,8 @@ LOCAL_C_INCLUDES		:= $(EEPP_C_INCLUDES)
 CORE_SRCS				:= tools/ecode/*.cpp \
 							tools/ecode/plugins/autocomplete/*.cpp \
 							tools/ecode/plugins/linter/*.cpp \
-							tools/ecode/plugins/formatter/*.cpp
+							tools/ecode/plugins/formatter/*.cpp \
+							tools/ecode/plugins/lsp/*.cpp
 
 LOCAL_SRC_FILES			:= $(SDL_MAIN_PATH) $(foreach F, $(CORE_SRCS), $(addprefix $(dir $(F)),$(notdir $(wildcard $(LOCAL_PATH)/$(F)))))
 
@@ -110,7 +111,7 @@ CORE_SRCS				:= tests/test_all/*.cpp
 
 LOCAL_SRC_FILES			:= $(SDL_MAIN_PATH) $(foreach F, $(CORE_SRCS), $(addprefix $(dir $(F)),$(notdir $(wildcard $(LOCAL_PATH)/$(F)))))
 
-LOCAL_STATIC_LIBRARIES	:= eepp
+LOCAL_STATIC_LIBRARIES	:= eepp-maps eepp
 
 include $(BUILD_SHARED_LIBRARY)
 #************ full_test ************
diff --git a/projects/android-project/app/jni/eepp.mk b/projects/android-project/app/jni/eepp.mk
index ddc795b6c..e9f5994e0 100644
--- a/projects/android-project/app/jni/eepp.mk
+++ b/projects/android-project/app/jni/eepp.mk
@@ -24,7 +24,9 @@ EEPP_C_INCLUDES			:= \
 	$(EEPP_THIRD_PARTY_PATH)/mojoAL \
 	$(EEPP_THIRD_PARTY_PATH)/efsw/include \
 	$(EEPP_BASE_PATH)/modules/eterm/include \
-	$(EEPP_BASE_PATH)/modules/eterm/src
+	$(EEPP_BASE_PATH)/modules/eterm/src \
+	$(EEPP_BASE_PATH)/modules/maps/include \
+	$(EEPP_BASE_PATH)/modules/maps/src
 
 EEPP_C_FLAGS				:= \
 	-Wl,--undefined=Java_org_libsdl_app_SDLActivity_nativeInit \
@@ -89,9 +91,7 @@ CODE_SRCS				:=  \
 	ui/doc/*.cpp \
 	ui/abstract/*.cpp \
 	ui/models/*.cpp \
-	ui/tools/*.cpp \
-	maps/*.cpp \
-	maps/mapeditor/*.cpp
+	ui/tools/*.cpp
 
 LOCAL_C_INCLUDES		:= $(EEPP_C_INCLUDES)
 
@@ -290,6 +290,25 @@ LOCAL_SRC_FILES			:= $(foreach F, $(LIBEFSW_SRCS), $(addprefix $(dir $(F)),$(not
 include $(BUILD_STATIC_LIBRARY)
 #*************** EFSW ***************
 
+#*************** MAPS ***************
+include $(CLEAR_VARS)
+
+LOCAL_PATH				:= $(EEPP_MODULES_PATH)
+
+LOCAL_MODULE			:= eepp-maps
+
+LIBMAPS_SRCS			:=  \
+	maps/src/maps/*.cpp \
+	maps/src/maps/mapeditor/*.cpp
+
+LOCAL_C_INCLUDES		:= $(EEPP_C_INCLUDES) $(EEPP_INC_PATH)
+LOCAL_CFLAGS			:= -Os
+
+LOCAL_SRC_FILES			:= $(foreach F, $(LIBMAPS_SRCS), $(addprefix $(dir $(F)),$(notdir $(wildcard $(LOCAL_PATH)/$(F)))))
+
+include $(BUILD_STATIC_LIBRARY)
+#*************** MAPS ***************
+
 #*************** ETERM ***************
 include $(CLEAR_VARS)
 
diff --git a/projects/linux/ee.creator.user b/projects/linux/ee.creator.user
index e8de7f500..2f30ed6c9 100644
--- a/projects/linux/ee.creator.user
+++ b/projects/linux/ee.creator.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 8.0.2, 2022-11-01T01:40:40. -->
+<!-- Written by QtCreator 8.0.2, 2022-12-03T16:01:31. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -8,7 +8,7 @@
  </data>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>
-  <value type="int">0</value>
+  <value type="qlonglong">0</value>
  </data>
  <data>
   <variable>ProjectExplorer.Project.EditorSettings</variable>
@@ -34,7 +34,7 @@
      <value type="QByteArray" key="CurrentPreferences">NimGlobal</value>
     </valuemap>
    </valuemap>
-   <value type="int" key="EditorConfiguration.CodeStyle.Count">3</value>
+   <value type="qlonglong" key="EditorConfiguration.CodeStyle.Count">3</value>
    <value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value>
    <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value>
    <value type="int" key="EditorConfiguration.IndentSize">4</value>
@@ -107,9 +107,9 @@
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop</value>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop</value>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{388e5431-b31b-42b3-b9ad-9002d279d75d}</value>
-   <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">10</value>
-   <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
-   <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">19</value>
+   <value type="qlonglong" key="ProjectExplorer.Target.ActiveBuildConfiguration">10</value>
+   <value type="qlonglong" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
+   <value type="qlonglong" key="ProjectExplorer.Target.ActiveRunConfiguration">19</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
     <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">../../make/linux</value>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
@@ -119,7 +119,7 @@
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">GenericProjectManager.GenericMakeStep</value>
      </valuemap>
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
@@ -133,7 +133,7 @@
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">clean</value>
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.ProcessStep</value>
      </valuemap>
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
@@ -154,7 +154,7 @@
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">GenericProjectManager.GenericMakeStep</value>
      </valuemap>
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
@@ -168,7 +168,7 @@
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">clean</value>
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.ProcessStep</value>
      </valuemap>
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
@@ -197,7 +197,7 @@
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">GenericProjectManager.GenericMakeStep</value>
      </valuemap>
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
+     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
@@ -210,7 +210,7 @@
       <value type="QString" key="ProjectExplorer.ProcessStep.WorkingDirectory">%{buildDir}</value>
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.ProcessStep</value>
      </valuemap>
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
@@ -238,7 +238,7 @@
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">GenericProjectManager.GenericMakeStep</value>
      </valuemap>
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
+     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
@@ -251,7 +251,7 @@
       <value type="QString" key="ProjectExplorer.ProcessStep.WorkingDirectory">%{buildDir}</value>
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.ProcessStep</value>
      </valuemap>
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
@@ -273,7 +273,7 @@
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">GenericProjectManager.GenericMakeStep</value>
      </valuemap>
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
@@ -286,7 +286,7 @@
       <value type="QString" key="ProjectExplorer.ProcessStep.WorkingDirectory">%{buildDir}</value>
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.ProcessStep</value>
      </valuemap>
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
@@ -308,7 +308,7 @@
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">GenericProjectManager.GenericMakeStep</value>
      </valuemap>
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
@@ -321,7 +321,7 @@
       <value type="QString" key="ProjectExplorer.ProcessStep.WorkingDirectory">%{buildDir}</value>
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.ProcessStep</value>
      </valuemap>
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
@@ -343,7 +343,7 @@
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">GenericProjectManager.GenericMakeStep</value>
      </valuemap>
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
@@ -356,7 +356,7 @@
       <value type="QString" key="ProjectExplorer.ProcessStep.WorkingDirectory">%{buildDir}</value>
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.ProcessStep</value>
      </valuemap>
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
@@ -378,7 +378,7 @@
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">GenericProjectManager.GenericMakeStep</value>
      </valuemap>
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
@@ -391,7 +391,7 @@
       <value type="QString" key="ProjectExplorer.ProcessStep.WorkingDirectory">%{buildDir}</value>
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.ProcessStep</value>
      </valuemap>
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
@@ -413,7 +413,7 @@
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">GenericProjectManager.GenericMakeStep</value>
      </valuemap>
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
@@ -426,7 +426,7 @@
       <value type="QString" key="ProjectExplorer.ProcessStep.WorkingDirectory">%{buildDir}</value>
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.ProcessStep</value>
      </valuemap>
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
@@ -448,7 +448,7 @@
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">GenericProjectManager.GenericMakeStep</value>
      </valuemap>
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
@@ -461,7 +461,7 @@
       <value type="QString" key="ProjectExplorer.ProcessStep.WorkingDirectory">%{buildDir}</value>
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.ProcessStep</value>
      </valuemap>
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
@@ -483,7 +483,7 @@
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">GenericProjectManager.GenericMakeStep</value>
      </valuemap>
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
@@ -496,7 +496,7 @@
       <value type="QString" key="ProjectExplorer.ProcessStep.WorkingDirectory">%{buildDir}</value>
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.ProcessStep</value>
      </valuemap>
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
@@ -518,7 +518,7 @@
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">GenericProjectManager.GenericMakeStep</value>
      </valuemap>
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
@@ -531,7 +531,7 @@
       <value type="QString" key="ProjectExplorer.ProcessStep.WorkingDirectory">%{buildDir}</value>
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.ProcessStep</value>
      </valuemap>
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
@@ -552,7 +552,7 @@
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">GenericProjectManager.GenericMakeStep</value>
      </valuemap>
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
@@ -566,7 +566,7 @@
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">clean</value>
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.ProcessStep</value>
      </valuemap>
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
@@ -595,7 +595,7 @@
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">GenericProjectManager.GenericMakeStep</value>
      </valuemap>
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
+     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
@@ -608,7 +608,7 @@
       <value type="QString" key="ProjectExplorer.ProcessStep.WorkingDirectory">%{buildDir}</value>
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.ProcessStep</value>
      </valuemap>
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
@@ -630,7 +630,7 @@
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">GenericProjectManager.GenericMakeStep</value>
      </valuemap>
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
@@ -643,7 +643,7 @@
       <value type="QString" key="ProjectExplorer.ProcessStep.WorkingDirectory">%{buildDir}</value>
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.ProcessStep</value>
      </valuemap>
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
@@ -664,7 +664,7 @@
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">GenericProjectManager.GenericMakeStep</value>
      </valuemap>
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
@@ -678,7 +678,7 @@
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">clean</value>
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.ProcessStep</value>
      </valuemap>
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
@@ -699,7 +699,7 @@
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">GenericProjectManager.GenericMakeStep</value>
      </valuemap>
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
@@ -713,7 +713,7 @@
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">clean</value>
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.ProcessStep</value>
      </valuemap>
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
@@ -734,7 +734,7 @@
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">GenericProjectManager.GenericMakeStep</value>
      </valuemap>
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
@@ -748,7 +748,7 @@
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">clean</value>
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.ProcessStep</value>
      </valuemap>
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
@@ -770,7 +770,7 @@
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clone of </value>
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">GenericProjectManager.GenericMakeStep</value>
      </valuemap>
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
@@ -784,7 +784,7 @@
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clone of clean</value>
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.ProcessStep</value>
      </valuemap>
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
@@ -806,7 +806,7 @@
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clone of Make</value>
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">GenericProjectManager.GenericMakeStep</value>
      </valuemap>
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
@@ -820,7 +820,7 @@
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clone of clean</value>
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.ProcessStep</value>
      </valuemap>
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
@@ -842,7 +842,7 @@
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clone of </value>
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">GenericProjectManager.GenericMakeStep</value>
      </valuemap>
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
@@ -856,7 +856,7 @@
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clone of clean</value>
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.ProcessStep</value>
      </valuemap>
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
@@ -878,7 +878,7 @@
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clone of Make</value>
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">GenericProjectManager.GenericMakeStep</value>
      </valuemap>
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
@@ -892,7 +892,7 @@
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clone of clean</value>
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.ProcessStep</value>
      </valuemap>
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
@@ -905,10 +905,10 @@
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">release-es</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">GenericProjectManager.GenericBuildConfiguration</value>
    </valuemap>
-   <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">22</value>
+   <value type="qlonglong" key="ProjectExplorer.Target.BuildConfigurationCount">22</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
+     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Deploy</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
@@ -919,7 +919,7 @@
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">No deployment</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value>
    </valuemap>
-   <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
+   <value type="qlonglong" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
     <value type="QString" key="Analyzer.Perf.CallgraphMode">dwarf</value>
     <valuelist type="QVariantList" key="Analyzer.Perf.Events">
@@ -1428,12 +1428,12 @@
     <value type="bool" key="RunConfiguration.UseTerminal">false</value>
     <value type="QString" key="RunConfiguration.WorkingDirectory">%{buildDir}../../../bin/</value>
    </valuemap>
-   <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">21</value>
+   <value type="qlonglong" key="ProjectExplorer.Target.RunConfigurationCount">21</value>
   </valuemap>
  </data>
  <data>
   <variable>ProjectExplorer.Project.TargetCount</variable>
-  <value type="int">1</value>
+  <value type="qlonglong">1</value>
  </data>
  <data>
   <variable>ProjectExplorer.Project.Updater.FileVersion</variable>
diff --git a/projects/linux/ee.files b/projects/linux/ee.files
index c7b854809..18a331b57 100644
--- a/projects/linux/ee.files
+++ b/projects/linux/ee.files
@@ -118,24 +118,24 @@
 ../../include/eepp/graphics/vertexbufferogl.hpp
 ../../include/eepp/graphics/vertexbuffervbo.hpp
 ../../include/eepp/graphics/view.hpp
-../../include/eepp/maps/base.hpp
-../../include/eepp/maps/gameobject.hpp
-../../include/eepp/maps/gameobjectobject.hpp
-../../include/eepp/maps/gameobjectpolygon.hpp
-../../include/eepp/maps/gameobjectpolyline.hpp
-../../include/eepp/maps/gameobjectsprite.hpp
-../../include/eepp/maps/gameobjecttextureregionex.hpp
-../../include/eepp/maps/gameobjecttextureregion.hpp
-../../include/eepp/maps/gameobjectvirtual.hpp
-../../include/eepp/maps.hpp
-../../include/eepp/maps/mapeditor/mapeditor.hpp
-../../include/eepp/maps/maphelper.hpp
-../../include/eepp/maps/maplayer.hpp
-../../include/eepp/maps/maplight.hpp
-../../include/eepp/maps/maplightmanager.hpp
-../../include/eepp/maps/mapobjectlayer.hpp
-../../include/eepp/maps/tilemap.hpp
-../../include/eepp/maps/tilemaplayer.hpp
+../../src/modules/maps/include/eepp/maps/base.hpp
+../../src/modules/maps/include/eepp/maps/gameobject.hpp
+../../src/modules/maps/include/eepp/maps/gameobjectobject.hpp
+../../src/modules/maps/include/eepp/maps/gameobjectpolygon.hpp
+../../src/modules/maps/include/eepp/maps/gameobjectpolyline.hpp
+../../src/modules/maps/include/eepp/maps/gameobjectsprite.hpp
+../../src/modules/maps/include/eepp/maps/gameobjecttextureregionex.hpp
+../../src/modules/maps/include/eepp/maps/gameobjecttextureregion.hpp
+../../src/modules/maps/include/eepp/maps/gameobjectvirtual.hpp
+../../src/modules/maps/include/eepp/maps.hpp
+../../src/modules/maps/include/eepp/maps/mapeditor/mapeditor.hpp
+../../src/modules/maps/include/eepp/maps/maphelper.hpp
+../../src/modules/maps/include/eepp/maps/maplayer.hpp
+../../src/modules/maps/include/eepp/maps/maplight.hpp
+../../src/modules/maps/include/eepp/maps/maplightmanager.hpp
+../../src/modules/maps/include/eepp/maps/mapobjectlayer.hpp
+../../src/modules/maps/include/eepp/maps/tilemap.hpp
+../../src/modules/maps/include/eepp/maps/tilemaplayer.hpp
 ../../include/eepp/math/ease.hpp
 ../../include/eepp/math/easing.hpp
 ../../include/eepp/math.hpp
@@ -618,35 +618,35 @@
 ../../src/eepp/graphics/vertexbuffervbo.cpp
 ../../src/eepp/graphics/view.cpp
 ../../src/eepp/main/eepp_main.cpp
-../../src/eepp/maps/gameobject.cpp
-../../src/eepp/maps/gameobjectobject.cpp
-../../src/eepp/maps/gameobjectpolygon.cpp
-../../src/eepp/maps/gameobjectpolyline.cpp
-../../src/eepp/maps/gameobjectsprite.cpp
-../../src/eepp/maps/gameobjecttextureregion.cpp
-../../src/eepp/maps/gameobjecttextureregionex.cpp
-../../src/eepp/maps/gameobjectvirtual.cpp
-../../src/eepp/maps/mapeditor/mapeditor.cpp
-../../src/eepp/maps/mapeditor/maplayerproperties.cpp
-../../src/eepp/maps/mapeditor/maplayerproperties.hpp
-../../src/eepp/maps/mapeditor/mapobjectproperties.cpp
-../../src/eepp/maps/mapeditor/mapobjectproperties.hpp
-../../src/eepp/maps/mapeditor/tilemapproperties.cpp
-../../src/eepp/maps/mapeditor/tilemapproperties.hpp
-../../src/eepp/maps/mapeditor/uigotypenew.cpp
-../../src/eepp/maps/mapeditor/uigotypenew.hpp
-../../src/eepp/maps/mapeditor/uimap.cpp
-../../src/eepp/maps/mapeditor/uimap.hpp
-../../src/eepp/maps/mapeditor/uimaplayernew.cpp
-../../src/eepp/maps/mapeditor/uimaplayernew.hpp
-../../src/eepp/maps/mapeditor/uimapnew.cpp
-../../src/eepp/maps/mapeditor/uimapnew.hpp
-../../src/eepp/maps/maplayer.cpp
-../../src/eepp/maps/maplight.cpp
-../../src/eepp/maps/maplightmanager.cpp
-../../src/eepp/maps/mapobjectlayer.cpp
-../../src/eepp/maps/tilemap.cpp
-../../src/eepp/maps/tilemaplayer.cpp
+../../src/modules/maps/src/eepp/maps/gameobject.cpp
+../../src/modules/maps/src/eepp/maps/gameobjectobject.cpp
+../../src/modules/maps/src/eepp/maps/gameobjectpolygon.cpp
+../../src/modules/maps/src/eepp/maps/gameobjectpolyline.cpp
+../../src/modules/maps/src/eepp/maps/gameobjectsprite.cpp
+../../src/modules/maps/src/eepp/maps/gameobjecttextureregion.cpp
+../../src/modules/maps/src/eepp/maps/gameobjecttextureregionex.cpp
+../../src/modules/maps/src/eepp/maps/gameobjectvirtual.cpp
+../../src/modules/maps/src/eepp/maps/mapeditor/mapeditor.cpp
+../../src/modules/maps/src/eepp/maps/mapeditor/maplayerproperties.cpp
+../../src/modules/maps/src/eepp/maps/mapeditor/maplayerproperties.hpp
+../../src/modules/maps/src/eepp/maps/mapeditor/mapobjectproperties.cpp
+../../src/modules/maps/src/eepp/maps/mapeditor/mapobjectproperties.hpp
+../../src/modules/maps/src/eepp/maps/mapeditor/tilemapproperties.cpp
+../../src/modules/maps/src/eepp/maps/mapeditor/tilemapproperties.hpp
+../../src/modules/maps/src/eepp/maps/mapeditor/uigotypenew.cpp
+../../src/modules/maps/src/eepp/maps/mapeditor/uigotypenew.hpp
+../../src/modules/maps/src/eepp/maps/mapeditor/uimap.cpp
+../../src/modules/maps/src/eepp/maps/mapeditor/uimap.hpp
+../../src/modules/maps/src/eepp/maps/mapeditor/uimaplayernew.cpp
+../../src/modules/maps/src/eepp/maps/mapeditor/uimaplayernew.hpp
+../../src/modules/maps/src/eepp/maps/mapeditor/uimapnew.cpp
+../../src/modules/maps/src/eepp/maps/mapeditor/uimapnew.hpp
+../../src/modules/maps/src/eepp/maps/maplayer.cpp
+../../src/modules/maps/src/eepp/maps/maplight.cpp
+../../src/modules/maps/src/eepp/maps/maplightmanager.cpp
+../../src/modules/maps/src/eepp/maps/mapobjectlayer.cpp
+../../src/modules/maps/src/eepp/maps/tilemap.cpp
+../../src/modules/maps/src/eepp/maps/tilemaplayer.cpp
 ../../src/eepp/math/easing.cpp
 ../../src/eepp/math/interpolation1d.cpp
 ../../src/eepp/math/interpolation2d.cpp
diff --git a/projects/linux/ee.includes b/projects/linux/ee.includes
index 4a587d98d..abbae5bff 100644
--- a/projects/linux/ee.includes
+++ b/projects/linux/ee.includes
@@ -10,3 +10,5 @@
 /usr/lib64/gcc/x86_64-suse-linux/10/include
 ../../src/modules/eterm/src/
 ../../src/modules/eterm/include/
+../../src/modules/maps/include/
+../../src/modules/maps/src/
diff --git a/projects/macos/ee.files b/projects/macos/ee.files
index c88fac371..18a331b57 100644
--- a/projects/macos/ee.files
+++ b/projects/macos/ee.files
@@ -118,24 +118,24 @@
 ../../include/eepp/graphics/vertexbufferogl.hpp
 ../../include/eepp/graphics/vertexbuffervbo.hpp
 ../../include/eepp/graphics/view.hpp
-../../include/eepp/maps/base.hpp
-../../include/eepp/maps/gameobject.hpp
-../../include/eepp/maps/gameobjectobject.hpp
-../../include/eepp/maps/gameobjectpolygon.hpp
-../../include/eepp/maps/gameobjectpolyline.hpp
-../../include/eepp/maps/gameobjectsprite.hpp
-../../include/eepp/maps/gameobjecttextureregionex.hpp
-../../include/eepp/maps/gameobjecttextureregion.hpp
-../../include/eepp/maps/gameobjectvirtual.hpp
-../../include/eepp/maps.hpp
-../../include/eepp/maps/mapeditor/mapeditor.hpp
-../../include/eepp/maps/maphelper.hpp
-../../include/eepp/maps/maplayer.hpp
-../../include/eepp/maps/maplight.hpp
-../../include/eepp/maps/maplightmanager.hpp
-../../include/eepp/maps/mapobjectlayer.hpp
-../../include/eepp/maps/tilemap.hpp
-../../include/eepp/maps/tilemaplayer.hpp
+../../src/modules/maps/include/eepp/maps/base.hpp
+../../src/modules/maps/include/eepp/maps/gameobject.hpp
+../../src/modules/maps/include/eepp/maps/gameobjectobject.hpp
+../../src/modules/maps/include/eepp/maps/gameobjectpolygon.hpp
+../../src/modules/maps/include/eepp/maps/gameobjectpolyline.hpp
+../../src/modules/maps/include/eepp/maps/gameobjectsprite.hpp
+../../src/modules/maps/include/eepp/maps/gameobjecttextureregionex.hpp
+../../src/modules/maps/include/eepp/maps/gameobjecttextureregion.hpp
+../../src/modules/maps/include/eepp/maps/gameobjectvirtual.hpp
+../../src/modules/maps/include/eepp/maps.hpp
+../../src/modules/maps/include/eepp/maps/mapeditor/mapeditor.hpp
+../../src/modules/maps/include/eepp/maps/maphelper.hpp
+../../src/modules/maps/include/eepp/maps/maplayer.hpp
+../../src/modules/maps/include/eepp/maps/maplight.hpp
+../../src/modules/maps/include/eepp/maps/maplightmanager.hpp
+../../src/modules/maps/include/eepp/maps/mapobjectlayer.hpp
+../../src/modules/maps/include/eepp/maps/tilemap.hpp
+../../src/modules/maps/include/eepp/maps/tilemaplayer.hpp
 ../../include/eepp/math/ease.hpp
 ../../include/eepp/math/easing.hpp
 ../../include/eepp/math.hpp
@@ -618,35 +618,35 @@
 ../../src/eepp/graphics/vertexbuffervbo.cpp
 ../../src/eepp/graphics/view.cpp
 ../../src/eepp/main/eepp_main.cpp
-../../src/eepp/maps/gameobject.cpp
-../../src/eepp/maps/gameobjectobject.cpp
-../../src/eepp/maps/gameobjectpolygon.cpp
-../../src/eepp/maps/gameobjectpolyline.cpp
-../../src/eepp/maps/gameobjectsprite.cpp
-../../src/eepp/maps/gameobjecttextureregion.cpp
-../../src/eepp/maps/gameobjecttextureregionex.cpp
-../../src/eepp/maps/gameobjectvirtual.cpp
-../../src/eepp/maps/mapeditor/mapeditor.cpp
-../../src/eepp/maps/mapeditor/maplayerproperties.cpp
-../../src/eepp/maps/mapeditor/maplayerproperties.hpp
-../../src/eepp/maps/mapeditor/mapobjectproperties.cpp
-../../src/eepp/maps/mapeditor/mapobjectproperties.hpp
-../../src/eepp/maps/mapeditor/tilemapproperties.cpp
-../../src/eepp/maps/mapeditor/tilemapproperties.hpp
-../../src/eepp/maps/mapeditor/uigotypenew.cpp
-../../src/eepp/maps/mapeditor/uigotypenew.hpp
-../../src/eepp/maps/mapeditor/uimap.cpp
-../../src/eepp/maps/mapeditor/uimap.hpp
-../../src/eepp/maps/mapeditor/uimaplayernew.cpp
-../../src/eepp/maps/mapeditor/uimaplayernew.hpp
-../../src/eepp/maps/mapeditor/uimapnew.cpp
-../../src/eepp/maps/mapeditor/uimapnew.hpp
-../../src/eepp/maps/maplayer.cpp
-../../src/eepp/maps/maplight.cpp
-../../src/eepp/maps/maplightmanager.cpp
-../../src/eepp/maps/mapobjectlayer.cpp
-../../src/eepp/maps/tilemap.cpp
-../../src/eepp/maps/tilemaplayer.cpp
+../../src/modules/maps/src/eepp/maps/gameobject.cpp
+../../src/modules/maps/src/eepp/maps/gameobjectobject.cpp
+../../src/modules/maps/src/eepp/maps/gameobjectpolygon.cpp
+../../src/modules/maps/src/eepp/maps/gameobjectpolyline.cpp
+../../src/modules/maps/src/eepp/maps/gameobjectsprite.cpp
+../../src/modules/maps/src/eepp/maps/gameobjecttextureregion.cpp
+../../src/modules/maps/src/eepp/maps/gameobjecttextureregionex.cpp
+../../src/modules/maps/src/eepp/maps/gameobjectvirtual.cpp
+../../src/modules/maps/src/eepp/maps/mapeditor/mapeditor.cpp
+../../src/modules/maps/src/eepp/maps/mapeditor/maplayerproperties.cpp
+../../src/modules/maps/src/eepp/maps/mapeditor/maplayerproperties.hpp
+../../src/modules/maps/src/eepp/maps/mapeditor/mapobjectproperties.cpp
+../../src/modules/maps/src/eepp/maps/mapeditor/mapobjectproperties.hpp
+../../src/modules/maps/src/eepp/maps/mapeditor/tilemapproperties.cpp
+../../src/modules/maps/src/eepp/maps/mapeditor/tilemapproperties.hpp
+../../src/modules/maps/src/eepp/maps/mapeditor/uigotypenew.cpp
+../../src/modules/maps/src/eepp/maps/mapeditor/uigotypenew.hpp
+../../src/modules/maps/src/eepp/maps/mapeditor/uimap.cpp
+../../src/modules/maps/src/eepp/maps/mapeditor/uimap.hpp
+../../src/modules/maps/src/eepp/maps/mapeditor/uimaplayernew.cpp
+../../src/modules/maps/src/eepp/maps/mapeditor/uimaplayernew.hpp
+../../src/modules/maps/src/eepp/maps/mapeditor/uimapnew.cpp
+../../src/modules/maps/src/eepp/maps/mapeditor/uimapnew.hpp
+../../src/modules/maps/src/eepp/maps/maplayer.cpp
+../../src/modules/maps/src/eepp/maps/maplight.cpp
+../../src/modules/maps/src/eepp/maps/maplightmanager.cpp
+../../src/modules/maps/src/eepp/maps/mapobjectlayer.cpp
+../../src/modules/maps/src/eepp/maps/tilemap.cpp
+../../src/modules/maps/src/eepp/maps/tilemaplayer.cpp
 ../../src/eepp/math/easing.cpp
 ../../src/eepp/math/interpolation1d.cpp
 ../../src/eepp/math/interpolation2d.cpp
@@ -1169,7 +1169,6 @@
 ../../src/tools/ecode/plugins/linter/linterplugin.hpp
 ../../src/tools/ecode/plugins/lsp/lspclientplugin.cpp
 ../../src/tools/ecode/plugins/lsp/lspclientplugin.hpp
-../../src/tools/ecode/plugins/lsp/lspclientprotocol.hpp
 ../../src/tools/ecode/plugins/lsp/lspclientserver.cpp
 ../../src/tools/ecode/plugins/lsp/lspclientserver.hpp
 ../../src/tools/ecode/plugins/lsp/lspclientservermanager.cpp
@@ -1177,6 +1176,7 @@
 ../../src/tools/ecode/plugins/lsp/lspdefinition.hpp
 ../../src/tools/ecode/plugins/lsp/lspdocumentclient.cpp
 ../../src/tools/ecode/plugins/lsp/lspdocumentclient.hpp
+../../src/tools/ecode/plugins/lsp/lspprotocol.hpp
 ../../src/tools/ecode/plugins/pluginmanager.cpp
 ../../src/tools/ecode/plugins/pluginmanager.hpp
 ../../src/tools/ecode/projectdirectorytree.cpp
diff --git a/projects/macos/ee.includes b/projects/macos/ee.includes
index 4a587d98d..abbae5bff 100644
--- a/projects/macos/ee.includes
+++ b/projects/macos/ee.includes
@@ -10,3 +10,5 @@
 /usr/lib64/gcc/x86_64-suse-linux/10/include
 ../../src/modules/eterm/src/
 ../../src/modules/eterm/include/
+../../src/modules/maps/include/
+../../src/modules/maps/src/
diff --git a/projects/windows/ee.config b/projects/windows/ee.config
index f5601b61b..9358a2eb0 100644
--- a/projects/windows/ee.config
+++ b/projects/windows/ee.config
@@ -1,4 +1,5 @@
 #define EE_SDL_VERSION_2
+#define EE_X11_PLATFORM
 #define EE_DEBUG
 #define EE_MEMORY_MANAGER
 #define EE_SHADERS_SUPPORTED
diff --git a/projects/windows/ee.files b/projects/windows/ee.files
index 08495769c..18a331b57 100644
--- a/projects/windows/ee.files
+++ b/projects/windows/ee.files
@@ -1,6 +1,7 @@
 ../../README.md
 ../../TODO.md
 ../../bin/assets/colorschemes/colorschemes.conf
+../../bin/assets/colorschemes/terminalcolorschemes.conf
 ../../bin/assets/ee.ini
 ../../bin/assets/plugins/formatters.json
 ../../bin/assets/plugins/linters.json
@@ -9,6 +10,7 @@
 ../../bin/assets/layouts/test.xml
 ../../bin/assets/layouts/test2.xml
 ../../bin/assets/layouts/test_widgets.xml
+../../bin/assets/plugins/lspclient.json
 ../../bin/assets/ui/breeze.css
 ../../bin/assets/ui/uitheme.css
 ../../docs/articles/cssspecification.md
@@ -50,7 +52,6 @@
 ../../include/eepp/graphics/batchrenderer.hpp
 ../../include/eepp/graphics/blendmode.hpp
 ../../include/eepp/graphics/circledrawable.hpp
-../../include/eepp/graphics/console.hpp
 ../../include/eepp/graphics/convexshapedrawable.hpp
 ../../include/eepp/graphics/drawablegroup.hpp
 ../../include/eepp/graphics/drawable.hpp
@@ -117,24 +118,24 @@
 ../../include/eepp/graphics/vertexbufferogl.hpp
 ../../include/eepp/graphics/vertexbuffervbo.hpp
 ../../include/eepp/graphics/view.hpp
-../../include/eepp/maps/base.hpp
-../../include/eepp/maps/gameobject.hpp
-../../include/eepp/maps/gameobjectobject.hpp
-../../include/eepp/maps/gameobjectpolygon.hpp
-../../include/eepp/maps/gameobjectpolyline.hpp
-../../include/eepp/maps/gameobjectsprite.hpp
-../../include/eepp/maps/gameobjecttextureregionex.hpp
-../../include/eepp/maps/gameobjecttextureregion.hpp
-../../include/eepp/maps/gameobjectvirtual.hpp
-../../include/eepp/maps.hpp
-../../include/eepp/maps/mapeditor/mapeditor.hpp
-../../include/eepp/maps/maphelper.hpp
-../../include/eepp/maps/maplayer.hpp
-../../include/eepp/maps/maplight.hpp
-../../include/eepp/maps/maplightmanager.hpp
-../../include/eepp/maps/mapobjectlayer.hpp
-../../include/eepp/maps/tilemap.hpp
-../../include/eepp/maps/tilemaplayer.hpp
+../../src/modules/maps/include/eepp/maps/base.hpp
+../../src/modules/maps/include/eepp/maps/gameobject.hpp
+../../src/modules/maps/include/eepp/maps/gameobjectobject.hpp
+../../src/modules/maps/include/eepp/maps/gameobjectpolygon.hpp
+../../src/modules/maps/include/eepp/maps/gameobjectpolyline.hpp
+../../src/modules/maps/include/eepp/maps/gameobjectsprite.hpp
+../../src/modules/maps/include/eepp/maps/gameobjecttextureregionex.hpp
+../../src/modules/maps/include/eepp/maps/gameobjecttextureregion.hpp
+../../src/modules/maps/include/eepp/maps/gameobjectvirtual.hpp
+../../src/modules/maps/include/eepp/maps.hpp
+../../src/modules/maps/include/eepp/maps/mapeditor/mapeditor.hpp
+../../src/modules/maps/include/eepp/maps/maphelper.hpp
+../../src/modules/maps/include/eepp/maps/maplayer.hpp
+../../src/modules/maps/include/eepp/maps/maplight.hpp
+../../src/modules/maps/include/eepp/maps/maplightmanager.hpp
+../../src/modules/maps/include/eepp/maps/mapobjectlayer.hpp
+../../src/modules/maps/include/eepp/maps/tilemap.hpp
+../../src/modules/maps/include/eepp/maps/tilemaplayer.hpp
 ../../include/eepp/math/ease.hpp
 ../../include/eepp/math/easing.hpp
 ../../include/eepp/math.hpp
@@ -257,6 +258,7 @@
 ../../include/eepp/system/pack.hpp
 ../../include/eepp/system/packmanager.hpp
 ../../include/eepp/system/pak.hpp
+../../include/eepp/system/process.hpp
 ../../include/eepp/system/rc4.hpp
 ../../include/eepp/system/resourceloader.hpp
 ../../include/eepp/system/resourcemanager.hpp
@@ -327,6 +329,7 @@
 ../../include/eepp/ui/css/stylesheetspecification.hpp
 ../../include/eepp/ui/css/stylesheetstyle.hpp
 ../../include/eepp/ui/css/stylesheetvariable.hpp
+../../include/eepp/ui/css/timingfunction.hpp
 ../../include/eepp/ui/css/transitiondefinition.hpp
 ../../include/eepp/ui/doc/syntaxcolorscheme.hpp
 ../../include/eepp/ui/doc/syntaxdefinition.hpp
@@ -340,6 +343,7 @@
 ../../include/eepp/ui/doc/undostack.hpp
 ../../include/eepp/ui/keyboardshortcut.hpp
 ../../include/eepp/ui/marginmove/scale.hpp
+../../include/eepp/ui/models/csspropertiesmodel.hpp
 ../../include/eepp/ui/models/filesystemmodel.hpp
 ../../include/eepp/ui/models/itemlistmodel.hpp
 ../../include/eepp/ui/models/model.hpp
@@ -352,12 +356,17 @@
 ../../include/eepp/ui/tools/textureatlaseditor.hpp
 ../../include/eepp/ui/tools/uicodeeditorsplitter.hpp
 ../../include/eepp/ui/tools/uicolorpicker.hpp
+../../include/eepp/ui/tools/uidocfindreplace.hpp
+../../include/eepp/ui/tools/uiwidgetinspector.hpp
 ../../include/eepp/ui/uiabstractview.hpp
 ../../include/eepp/ui/uibackgrounddrawable.hpp
 ../../include/eepp/ui/uiborderdrawable.hpp
 ../../include/eepp/ui/uicheckbox.hpp
+../../include/eepp/ui/uiclip.hpp
 ../../include/eepp/ui/uicodeeditor.hpp
 ../../include/eepp/ui/uicombobox.hpp
+../../include/eepp/ui/uiconsole.hpp
+../../include/eepp/ui/uidatabind.hpp
 ../../include/eepp/ui/uidropdownlist.hpp
 ../../include/eepp/ui/uieventdispatcher.hpp
 ../../include/eepp/ui/uifiledialog.hpp
@@ -429,6 +438,7 @@
 ../../include/eepp/ui/uiwidgettable.hpp
 ../../include/eepp/ui/uiwidgettablerow.hpp
 ../../include/eepp/ui/uiwindow.hpp
+../../include/eepp/ui/widgetcommandexecuter.hpp
 ../../include/eepp/version.hpp
 ../../include/eepp/window/base.hpp
 ../../include/eepp/window/clipboard.hpp
@@ -441,7 +451,6 @@
 ../../include/eepp/window/inputfinger.hpp
 ../../include/eepp/window/inputhelper.hpp
 ../../include/eepp/window/input.hpp
-../../include/eepp/window/inputtextbuffer.hpp
 ../../include/eepp/window/joycodes.hpp
 ../../include/eepp/window/joystick.hpp
 ../../include/eepp/window/joystickmanager.hpp
@@ -525,7 +534,6 @@
 ../../src/eepp/graphics/batchrenderer.cpp
 ../../src/eepp/graphics/blendmode.cpp
 ../../src/eepp/graphics/circledrawable.cpp
-../../src/eepp/graphics/console.cpp
 ../../src/eepp/graphics/convexshapedrawable.cpp
 ../../src/eepp/graphics/drawable.cpp
 ../../src/eepp/graphics/drawablegroup.cpp
@@ -610,35 +618,35 @@
 ../../src/eepp/graphics/vertexbuffervbo.cpp
 ../../src/eepp/graphics/view.cpp
 ../../src/eepp/main/eepp_main.cpp
-../../src/eepp/maps/gameobject.cpp
-../../src/eepp/maps/gameobjectobject.cpp
-../../src/eepp/maps/gameobjectpolygon.cpp
-../../src/eepp/maps/gameobjectpolyline.cpp
-../../src/eepp/maps/gameobjectsprite.cpp
-../../src/eepp/maps/gameobjecttextureregion.cpp
-../../src/eepp/maps/gameobjecttextureregionex.cpp
-../../src/eepp/maps/gameobjectvirtual.cpp
-../../src/eepp/maps/mapeditor/mapeditor.cpp
-../../src/eepp/maps/mapeditor/maplayerproperties.cpp
-../../src/eepp/maps/mapeditor/maplayerproperties.hpp
-../../src/eepp/maps/mapeditor/mapobjectproperties.cpp
-../../src/eepp/maps/mapeditor/mapobjectproperties.hpp
-../../src/eepp/maps/mapeditor/tilemapproperties.cpp
-../../src/eepp/maps/mapeditor/tilemapproperties.hpp
-../../src/eepp/maps/mapeditor/uigotypenew.cpp
-../../src/eepp/maps/mapeditor/uigotypenew.hpp
-../../src/eepp/maps/mapeditor/uimap.cpp
-../../src/eepp/maps/mapeditor/uimap.hpp
-../../src/eepp/maps/mapeditor/uimaplayernew.cpp
-../../src/eepp/maps/mapeditor/uimaplayernew.hpp
-../../src/eepp/maps/mapeditor/uimapnew.cpp
-../../src/eepp/maps/mapeditor/uimapnew.hpp
-../../src/eepp/maps/maplayer.cpp
-../../src/eepp/maps/maplight.cpp
-../../src/eepp/maps/maplightmanager.cpp
-../../src/eepp/maps/mapobjectlayer.cpp
-../../src/eepp/maps/tilemap.cpp
-../../src/eepp/maps/tilemaplayer.cpp
+../../src/modules/maps/src/eepp/maps/gameobject.cpp
+../../src/modules/maps/src/eepp/maps/gameobjectobject.cpp
+../../src/modules/maps/src/eepp/maps/gameobjectpolygon.cpp
+../../src/modules/maps/src/eepp/maps/gameobjectpolyline.cpp
+../../src/modules/maps/src/eepp/maps/gameobjectsprite.cpp
+../../src/modules/maps/src/eepp/maps/gameobjecttextureregion.cpp
+../../src/modules/maps/src/eepp/maps/gameobjecttextureregionex.cpp
+../../src/modules/maps/src/eepp/maps/gameobjectvirtual.cpp
+../../src/modules/maps/src/eepp/maps/mapeditor/mapeditor.cpp
+../../src/modules/maps/src/eepp/maps/mapeditor/maplayerproperties.cpp
+../../src/modules/maps/src/eepp/maps/mapeditor/maplayerproperties.hpp
+../../src/modules/maps/src/eepp/maps/mapeditor/mapobjectproperties.cpp
+../../src/modules/maps/src/eepp/maps/mapeditor/mapobjectproperties.hpp
+../../src/modules/maps/src/eepp/maps/mapeditor/tilemapproperties.cpp
+../../src/modules/maps/src/eepp/maps/mapeditor/tilemapproperties.hpp
+../../src/modules/maps/src/eepp/maps/mapeditor/uigotypenew.cpp
+../../src/modules/maps/src/eepp/maps/mapeditor/uigotypenew.hpp
+../../src/modules/maps/src/eepp/maps/mapeditor/uimap.cpp
+../../src/modules/maps/src/eepp/maps/mapeditor/uimap.hpp
+../../src/modules/maps/src/eepp/maps/mapeditor/uimaplayernew.cpp
+../../src/modules/maps/src/eepp/maps/mapeditor/uimaplayernew.hpp
+../../src/modules/maps/src/eepp/maps/mapeditor/uimapnew.cpp
+../../src/modules/maps/src/eepp/maps/mapeditor/uimapnew.hpp
+../../src/modules/maps/src/eepp/maps/maplayer.cpp
+../../src/modules/maps/src/eepp/maps/maplight.cpp
+../../src/modules/maps/src/eepp/maps/maplightmanager.cpp
+../../src/modules/maps/src/eepp/maps/mapobjectlayer.cpp
+../../src/modules/maps/src/eepp/maps/tilemap.cpp
+../../src/modules/maps/src/eepp/maps/tilemaplayer.cpp
 ../../src/eepp/math/easing.cpp
 ../../src/eepp/math/interpolation1d.cpp
 ../../src/eepp/math/interpolation2d.cpp
@@ -775,6 +783,7 @@
 ../../src/eepp/system/platform/win/threadimpl.hpp
 ../../src/eepp/system/platform/win/threadlocalimpl.cpp
 ../../src/eepp/system/platform/win/threadlocalimpl.hpp
+../../src/eepp/system/process.cpp
 ../../src/eepp/system/rc4.cpp
 ../../src/eepp/system/resourceloader.cpp
 ../../src/eepp/system/sys.cpp
@@ -811,6 +820,7 @@
 ../../src/eepp/ui/css/stylesheetspecification.cpp
 ../../src/eepp/ui/css/stylesheetstyle.cpp
 ../../src/eepp/ui/css/stylesheetvariable.cpp
+../../src/eepp/ui/css/timingfunction.cpp
 ../../src/eepp/ui/css/transitiondefinition.cpp
 ../../src/eepp/ui/doc/syntaxcolorscheme.cpp
 ../../src/eepp/ui/doc/syntaxdefinition.cpp
@@ -834,12 +844,16 @@
 ../../src/eepp/ui/tools/textureatlastextureregioneditor.hpp
 ../../src/eepp/ui/tools/uicodeeditorsplitter.cpp
 ../../src/eepp/ui/tools/uicolorpicker.cpp
+../../src/eepp/ui/tools/uidocfindreplace.cpp
+../../src/eepp/ui/tools/uiwidgetinspector.cpp
 ../../src/eepp/ui/uiabstractview.cpp
 ../../src/eepp/ui/uibackgrounddrawable.cpp
 ../../src/eepp/ui/uiborderdrawable.cpp
 ../../src/eepp/ui/uicheckbox.cpp
+../../src/eepp/ui/uiclip.cpp
 ../../src/eepp/ui/uicodeeditor.cpp
 ../../src/eepp/ui/uicombobox.cpp
+../../src/eepp/ui/uiconsole.cpp
 ../../src/eepp/ui/uidropdownlist.cpp
 ../../src/eepp/ui/uieventdispatcher.cpp
 ../../src/eepp/ui/uifiledialog.cpp
@@ -906,6 +920,7 @@
 ../../src/eepp/ui/uiwidgettable.cpp
 ../../src/eepp/ui/uiwidgettablerow.cpp
 ../../src/eepp/ui/uiwindow.cpp
+../../src/eepp/ui/widgetcommandexecuter.hpp
 ../../src/eepp/window/backend/allegro5/cbackendal.hpp
 ../../src/eepp/window/backend/allegro5/cclipboardal.cpp
 ../../src/eepp/window/backend/allegro5/cclipboardal.hpp
@@ -984,7 +999,6 @@
 ../../src/eepp/window/input.cpp
 ../../src/eepp/window/inputfinger.cpp
 ../../src/eepp/window/inputhelper.cpp
-../../src/eepp/window/inputtextbuffer.cpp
 ../../src/eepp/window/joystick.cpp
 ../../src/eepp/window/joystickmanager.cpp
 ../../src/eepp/window/keycodes.cpp
@@ -1010,9 +1024,11 @@
 ../../src/modules/eterm/include/eterm/terminal/ipseudoterminal.hpp
 ../../src/modules/eterm/include/eterm/terminal/iterminaldisplay.hpp
 ../../src/modules/eterm/include/eterm/terminal/pseudoterminal.hpp
+../../src/modules/eterm/include/eterm/terminal/terminalcolorscheme.hpp
 ../../src/modules/eterm/include/eterm/terminal/terminaldisplay.hpp
 ../../src/modules/eterm/include/eterm/terminal/terminalemulator.hpp
 ../../src/modules/eterm/include/eterm/terminal/terminaltypes.hpp
+../../src/modules/eterm/include/eterm/ui/uiterminal.hpp
 ../../src/modules/eterm/src/eterm/system/autohandle.cpp
 ../../src/modules/eterm/src/eterm/system/pipe.cpp
 ../../src/modules/eterm/src/eterm/system/process.cpp
@@ -1021,11 +1037,13 @@
 ../../src/modules/eterm/src/eterm/terminal/iterminaldisplay.cpp
 ../../src/modules/eterm/src/eterm/terminal/nonspacing.hpp
 ../../src/modules/eterm/src/eterm/terminal/pseudoterminal.cpp
+../../src/modules/eterm/src/eterm/terminal/terminalcolorscheme.cpp
 ../../src/modules/eterm/src/eterm/terminal/terminaldisplay.cpp
 ../../src/modules/eterm/src/eterm/terminal/terminalemulator.cpp
 ../../src/modules/eterm/src/eterm/terminal/types.hpp
 ../../src/modules/eterm/src/eterm/terminal/wide.hpp
 ../../src/modules/eterm/src/eterm/terminal/windowserrors.hpp
+../../src/modules/eterm/src/eterm/ui/uiterminal.cpp
 ../../src/test/eetest.cpp
 ../../src/tests/test_all/test.cpp
 ../../src/tests/test_all/test.hpp
@@ -1139,6 +1157,8 @@
 ../../src/tools/ecode/globalsearchcontroller.hpp
 ../../src/tools/ecode/ignorematcher.cpp
 ../../src/tools/ecode/ignorematcher.hpp
+../../src/tools/ecode/macos/macos.hpp
+../../src/tools/ecode/macos/macos.m
 ../../src/tools/ecode/plugins/autocomplete/autocompleteplugin.cpp
 ../../src/tools/ecode/plugins/autocomplete/autocompleteplugin.hpp
 ../../src/tools/ecode/plugins/formatter/formatterplugin.cpp
@@ -1147,11 +1167,25 @@
 ../../src/tools/ecode/notificationcenter.hpp
 ../../src/tools/ecode/plugins/linter/linterplugin.cpp
 ../../src/tools/ecode/plugins/linter/linterplugin.hpp
+../../src/tools/ecode/plugins/lsp/lspclientplugin.cpp
+../../src/tools/ecode/plugins/lsp/lspclientplugin.hpp
+../../src/tools/ecode/plugins/lsp/lspclientserver.cpp
+../../src/tools/ecode/plugins/lsp/lspclientserver.hpp
+../../src/tools/ecode/plugins/lsp/lspclientservermanager.cpp
+../../src/tools/ecode/plugins/lsp/lspclientservermanager.hpp
+../../src/tools/ecode/plugins/lsp/lspdefinition.hpp
+../../src/tools/ecode/plugins/lsp/lspdocumentclient.cpp
+../../src/tools/ecode/plugins/lsp/lspdocumentclient.hpp
+../../src/tools/ecode/plugins/lsp/lspprotocol.hpp
+../../src/tools/ecode/plugins/pluginmanager.cpp
+../../src/tools/ecode/plugins/pluginmanager.hpp
 ../../src/tools/ecode/projectdirectorytree.cpp
 ../../src/tools/ecode/projectdirectorytree.hpp
 ../../src/tools/ecode/projectsearch.cpp
 ../../src/tools/ecode/projectsearch.hpp
 ../../src/tools/ecode/scopedop.hpp
+../../src/tools/ecode/terminalmanager.cpp
+../../src/tools/ecode/terminalmanager.hpp
 ../../src/tools/ecode/uicodeeditorsplitter.cpp
 ../../src/tools/ecode/uicodeeditorsplitter.hpp
 ../../src/tools/ecode/uitreeviewglobalsearch.cpp
@@ -1164,3 +1198,4 @@
 ../../src/tools/textureatlaseditor/textureatlaseditor.cpp
 ../../src/tools/texturepacker/texturepacker.cpp
 ../../src/tools/uieditor/uieditor.cpp
+../../src/tools/uieditor/uieditor.hpp
diff --git a/projects/windows/ee.includes b/projects/windows/ee.includes
index 4a587d98d..abbae5bff 100644
--- a/projects/windows/ee.includes
+++ b/projects/windows/ee.includes
@@ -10,3 +10,5 @@
 /usr/lib64/gcc/x86_64-suse-linux/10/include
 ../../src/modules/eterm/src/
 ../../src/modules/eterm/include/
+../../src/modules/maps/include/
+../../src/modules/maps/src/
diff --git a/include/eepp/maps/base.hpp b/src/modules/maps/include/eepp/maps/base.hpp
similarity index 100%
rename from include/eepp/maps/base.hpp
rename to src/modules/maps/include/eepp/maps/base.hpp
diff --git a/include/eepp/maps/gameobject.hpp b/src/modules/maps/include/eepp/maps/gameobject.hpp
similarity index 100%
rename from include/eepp/maps/gameobject.hpp
rename to src/modules/maps/include/eepp/maps/gameobject.hpp
diff --git a/include/eepp/maps/gameobjectobject.hpp b/src/modules/maps/include/eepp/maps/gameobjectobject.hpp
similarity index 100%
rename from include/eepp/maps/gameobjectobject.hpp
rename to src/modules/maps/include/eepp/maps/gameobjectobject.hpp
diff --git a/include/eepp/maps/gameobjectpolygon.hpp b/src/modules/maps/include/eepp/maps/gameobjectpolygon.hpp
similarity index 100%
rename from include/eepp/maps/gameobjectpolygon.hpp
rename to src/modules/maps/include/eepp/maps/gameobjectpolygon.hpp
diff --git a/include/eepp/maps/gameobjectpolyline.hpp b/src/modules/maps/include/eepp/maps/gameobjectpolyline.hpp
similarity index 100%
rename from include/eepp/maps/gameobjectpolyline.hpp
rename to src/modules/maps/include/eepp/maps/gameobjectpolyline.hpp
diff --git a/include/eepp/maps/gameobjectsprite.hpp b/src/modules/maps/include/eepp/maps/gameobjectsprite.hpp
similarity index 100%
rename from include/eepp/maps/gameobjectsprite.hpp
rename to src/modules/maps/include/eepp/maps/gameobjectsprite.hpp
diff --git a/include/eepp/maps/gameobjecttextureregion.hpp b/src/modules/maps/include/eepp/maps/gameobjecttextureregion.hpp
similarity index 100%
rename from include/eepp/maps/gameobjecttextureregion.hpp
rename to src/modules/maps/include/eepp/maps/gameobjecttextureregion.hpp
diff --git a/include/eepp/maps/gameobjecttextureregionex.hpp b/src/modules/maps/include/eepp/maps/gameobjecttextureregionex.hpp
similarity index 100%
rename from include/eepp/maps/gameobjecttextureregionex.hpp
rename to src/modules/maps/include/eepp/maps/gameobjecttextureregionex.hpp
diff --git a/include/eepp/maps/gameobjectvirtual.hpp b/src/modules/maps/include/eepp/maps/gameobjectvirtual.hpp
similarity index 100%
rename from include/eepp/maps/gameobjectvirtual.hpp
rename to src/modules/maps/include/eepp/maps/gameobjectvirtual.hpp
diff --git a/include/eepp/maps/mapeditor/mapeditor.hpp b/src/modules/maps/include/eepp/maps/mapeditor/mapeditor.hpp
similarity index 100%
rename from include/eepp/maps/mapeditor/mapeditor.hpp
rename to src/modules/maps/include/eepp/maps/mapeditor/mapeditor.hpp
diff --git a/include/eepp/maps/maphelper.hpp b/src/modules/maps/include/eepp/maps/maphelper.hpp
similarity index 100%
rename from include/eepp/maps/maphelper.hpp
rename to src/modules/maps/include/eepp/maps/maphelper.hpp
diff --git a/include/eepp/maps/maplayer.hpp b/src/modules/maps/include/eepp/maps/maplayer.hpp
similarity index 100%
rename from include/eepp/maps/maplayer.hpp
rename to src/modules/maps/include/eepp/maps/maplayer.hpp
diff --git a/include/eepp/maps/maplight.hpp b/src/modules/maps/include/eepp/maps/maplight.hpp
similarity index 100%
rename from include/eepp/maps/maplight.hpp
rename to src/modules/maps/include/eepp/maps/maplight.hpp
diff --git a/include/eepp/maps/maplightmanager.hpp b/src/modules/maps/include/eepp/maps/maplightmanager.hpp
similarity index 100%
rename from include/eepp/maps/maplightmanager.hpp
rename to src/modules/maps/include/eepp/maps/maplightmanager.hpp
diff --git a/include/eepp/maps/mapobjectlayer.hpp b/src/modules/maps/include/eepp/maps/mapobjectlayer.hpp
similarity index 100%
rename from include/eepp/maps/mapobjectlayer.hpp
rename to src/modules/maps/include/eepp/maps/mapobjectlayer.hpp
diff --git a/include/eepp/maps.hpp b/src/modules/maps/include/eepp/maps/maps.hpp
similarity index 94%
rename from include/eepp/maps.hpp
rename to src/modules/maps/include/eepp/maps/maps.hpp
index a66e2c34e..e927fc158 100644
--- a/include/eepp/maps.hpp
+++ b/src/modules/maps/include/eepp/maps/maps.hpp
@@ -11,5 +11,6 @@
 #include <eepp/maps/mapobjectlayer.hpp>
 #include <eepp/maps/tilemap.hpp>
 #include <eepp/maps/tilemaplayer.hpp>
+using namespace EE::Maps;
 
 #endif
diff --git a/include/eepp/maps/tilemap.hpp b/src/modules/maps/include/eepp/maps/tilemap.hpp
similarity index 100%
rename from include/eepp/maps/tilemap.hpp
rename to src/modules/maps/include/eepp/maps/tilemap.hpp
diff --git a/include/eepp/maps/tilemaplayer.hpp b/src/modules/maps/include/eepp/maps/tilemaplayer.hpp
similarity index 100%
rename from include/eepp/maps/tilemaplayer.hpp
rename to src/modules/maps/include/eepp/maps/tilemaplayer.hpp
diff --git a/src/eepp/maps/gameobject.cpp b/src/modules/maps/src/eepp/maps/gameobject.cpp
similarity index 100%
rename from src/eepp/maps/gameobject.cpp
rename to src/modules/maps/src/eepp/maps/gameobject.cpp
diff --git a/src/eepp/maps/gameobjectobject.cpp b/src/modules/maps/src/eepp/maps/gameobjectobject.cpp
similarity index 100%
rename from src/eepp/maps/gameobjectobject.cpp
rename to src/modules/maps/src/eepp/maps/gameobjectobject.cpp
diff --git a/src/eepp/maps/gameobjectpolygon.cpp b/src/modules/maps/src/eepp/maps/gameobjectpolygon.cpp
similarity index 100%
rename from src/eepp/maps/gameobjectpolygon.cpp
rename to src/modules/maps/src/eepp/maps/gameobjectpolygon.cpp
diff --git a/src/eepp/maps/gameobjectpolyline.cpp b/src/modules/maps/src/eepp/maps/gameobjectpolyline.cpp
similarity index 100%
rename from src/eepp/maps/gameobjectpolyline.cpp
rename to src/modules/maps/src/eepp/maps/gameobjectpolyline.cpp
diff --git a/src/eepp/maps/gameobjectsprite.cpp b/src/modules/maps/src/eepp/maps/gameobjectsprite.cpp
similarity index 100%
rename from src/eepp/maps/gameobjectsprite.cpp
rename to src/modules/maps/src/eepp/maps/gameobjectsprite.cpp
diff --git a/src/eepp/maps/gameobjecttextureregion.cpp b/src/modules/maps/src/eepp/maps/gameobjecttextureregion.cpp
similarity index 100%
rename from src/eepp/maps/gameobjecttextureregion.cpp
rename to src/modules/maps/src/eepp/maps/gameobjecttextureregion.cpp
diff --git a/src/eepp/maps/gameobjecttextureregionex.cpp b/src/modules/maps/src/eepp/maps/gameobjecttextureregionex.cpp
similarity index 100%
rename from src/eepp/maps/gameobjecttextureregionex.cpp
rename to src/modules/maps/src/eepp/maps/gameobjecttextureregionex.cpp
diff --git a/src/eepp/maps/gameobjectvirtual.cpp b/src/modules/maps/src/eepp/maps/gameobjectvirtual.cpp
similarity index 100%
rename from src/eepp/maps/gameobjectvirtual.cpp
rename to src/modules/maps/src/eepp/maps/gameobjectvirtual.cpp
diff --git a/src/eepp/maps/mapeditor/mapeditor.cpp b/src/modules/maps/src/eepp/maps/mapeditor/mapeditor.cpp
similarity index 100%
rename from src/eepp/maps/mapeditor/mapeditor.cpp
rename to src/modules/maps/src/eepp/maps/mapeditor/mapeditor.cpp
diff --git a/src/eepp/maps/mapeditor/maplayerproperties.cpp b/src/modules/maps/src/eepp/maps/mapeditor/maplayerproperties.cpp
similarity index 100%
rename from src/eepp/maps/mapeditor/maplayerproperties.cpp
rename to src/modules/maps/src/eepp/maps/mapeditor/maplayerproperties.cpp
diff --git a/src/eepp/maps/mapeditor/maplayerproperties.hpp b/src/modules/maps/src/eepp/maps/mapeditor/maplayerproperties.hpp
similarity index 100%
rename from src/eepp/maps/mapeditor/maplayerproperties.hpp
rename to src/modules/maps/src/eepp/maps/mapeditor/maplayerproperties.hpp
diff --git a/src/eepp/maps/mapeditor/mapobjectproperties.cpp b/src/modules/maps/src/eepp/maps/mapeditor/mapobjectproperties.cpp
similarity index 100%
rename from src/eepp/maps/mapeditor/mapobjectproperties.cpp
rename to src/modules/maps/src/eepp/maps/mapeditor/mapobjectproperties.cpp
diff --git a/src/eepp/maps/mapeditor/mapobjectproperties.hpp b/src/modules/maps/src/eepp/maps/mapeditor/mapobjectproperties.hpp
similarity index 100%
rename from src/eepp/maps/mapeditor/mapobjectproperties.hpp
rename to src/modules/maps/src/eepp/maps/mapeditor/mapobjectproperties.hpp
diff --git a/src/eepp/maps/mapeditor/tilemapproperties.cpp b/src/modules/maps/src/eepp/maps/mapeditor/tilemapproperties.cpp
similarity index 100%
rename from src/eepp/maps/mapeditor/tilemapproperties.cpp
rename to src/modules/maps/src/eepp/maps/mapeditor/tilemapproperties.cpp
diff --git a/src/eepp/maps/mapeditor/tilemapproperties.hpp b/src/modules/maps/src/eepp/maps/mapeditor/tilemapproperties.hpp
similarity index 100%
rename from src/eepp/maps/mapeditor/tilemapproperties.hpp
rename to src/modules/maps/src/eepp/maps/mapeditor/tilemapproperties.hpp
diff --git a/src/eepp/maps/mapeditor/uigotypenew.cpp b/src/modules/maps/src/eepp/maps/mapeditor/uigotypenew.cpp
similarity index 100%
rename from src/eepp/maps/mapeditor/uigotypenew.cpp
rename to src/modules/maps/src/eepp/maps/mapeditor/uigotypenew.cpp
diff --git a/src/eepp/maps/mapeditor/uigotypenew.hpp b/src/modules/maps/src/eepp/maps/mapeditor/uigotypenew.hpp
similarity index 100%
rename from src/eepp/maps/mapeditor/uigotypenew.hpp
rename to src/modules/maps/src/eepp/maps/mapeditor/uigotypenew.hpp
diff --git a/src/eepp/maps/mapeditor/uimap.cpp b/src/modules/maps/src/eepp/maps/mapeditor/uimap.cpp
similarity index 100%
rename from src/eepp/maps/mapeditor/uimap.cpp
rename to src/modules/maps/src/eepp/maps/mapeditor/uimap.cpp
diff --git a/src/eepp/maps/mapeditor/uimap.hpp b/src/modules/maps/src/eepp/maps/mapeditor/uimap.hpp
similarity index 100%
rename from src/eepp/maps/mapeditor/uimap.hpp
rename to src/modules/maps/src/eepp/maps/mapeditor/uimap.hpp
diff --git a/src/eepp/maps/mapeditor/uimaplayernew.cpp b/src/modules/maps/src/eepp/maps/mapeditor/uimaplayernew.cpp
similarity index 100%
rename from src/eepp/maps/mapeditor/uimaplayernew.cpp
rename to src/modules/maps/src/eepp/maps/mapeditor/uimaplayernew.cpp
diff --git a/src/eepp/maps/mapeditor/uimaplayernew.hpp b/src/modules/maps/src/eepp/maps/mapeditor/uimaplayernew.hpp
similarity index 100%
rename from src/eepp/maps/mapeditor/uimaplayernew.hpp
rename to src/modules/maps/src/eepp/maps/mapeditor/uimaplayernew.hpp
diff --git a/src/eepp/maps/mapeditor/uimapnew.cpp b/src/modules/maps/src/eepp/maps/mapeditor/uimapnew.cpp
similarity index 100%
rename from src/eepp/maps/mapeditor/uimapnew.cpp
rename to src/modules/maps/src/eepp/maps/mapeditor/uimapnew.cpp
diff --git a/src/eepp/maps/mapeditor/uimapnew.hpp b/src/modules/maps/src/eepp/maps/mapeditor/uimapnew.hpp
similarity index 100%
rename from src/eepp/maps/mapeditor/uimapnew.hpp
rename to src/modules/maps/src/eepp/maps/mapeditor/uimapnew.hpp
diff --git a/src/eepp/maps/maplayer.cpp b/src/modules/maps/src/eepp/maps/maplayer.cpp
similarity index 100%
rename from src/eepp/maps/maplayer.cpp
rename to src/modules/maps/src/eepp/maps/maplayer.cpp
diff --git a/src/eepp/maps/maplight.cpp b/src/modules/maps/src/eepp/maps/maplight.cpp
similarity index 100%
rename from src/eepp/maps/maplight.cpp
rename to src/modules/maps/src/eepp/maps/maplight.cpp
diff --git a/src/eepp/maps/maplightmanager.cpp b/src/modules/maps/src/eepp/maps/maplightmanager.cpp
similarity index 100%
rename from src/eepp/maps/maplightmanager.cpp
rename to src/modules/maps/src/eepp/maps/maplightmanager.cpp
diff --git a/src/eepp/maps/mapobjectlayer.cpp b/src/modules/maps/src/eepp/maps/mapobjectlayer.cpp
similarity index 100%
rename from src/eepp/maps/mapobjectlayer.cpp
rename to src/modules/maps/src/eepp/maps/mapobjectlayer.cpp
diff --git a/src/eepp/maps/tilemap.cpp b/src/modules/maps/src/eepp/maps/tilemap.cpp
similarity index 100%
rename from src/eepp/maps/tilemap.cpp
rename to src/modules/maps/src/eepp/maps/tilemap.cpp
diff --git a/src/eepp/maps/tilemaplayer.cpp b/src/modules/maps/src/eepp/maps/tilemaplayer.cpp
similarity index 100%
rename from src/eepp/maps/tilemaplayer.cpp
rename to src/modules/maps/src/eepp/maps/tilemaplayer.cpp
diff --git a/src/tests/test_all/test.hpp b/src/tests/test_all/test.hpp
index 666ec7121..6aa14d00d 100644
--- a/src/tests/test_all/test.hpp
+++ b/src/tests/test_all/test.hpp
@@ -2,6 +2,7 @@
 #define EE_EETEST_HPP
 
 #include <eepp/ee.hpp>
+#include <eepp/maps/maps.hpp>
 
 namespace Demo_Test {