diff --git a/projectfiles/CodeBlocks/wesnoth.cbp b/projectfiles/CodeBlocks/wesnoth.cbp
index 71118c9bfb1d..97f79c10ec9d 100644
--- a/projectfiles/CodeBlocks/wesnoth.cbp
+++ b/projectfiles/CodeBlocks/wesnoth.cbp
@@ -637,8 +637,8 @@
 		<Unit filename="../../src/gui/dialogs/wml_error.hpp" />
 		<Unit filename="../../src/gui/dialogs/wml_message.cpp" />
 		<Unit filename="../../src/gui/dialogs/wml_message.hpp" />
-		<Unit filename="../../src/gui/lib/types/point.cpp" />
-		<Unit filename="../../src/gui/lib/types/point.hpp" />
+		<Unit filename="../../src/gui/core/point.cpp" />
+		<Unit filename="../../src/gui/core/point.hpp" />
 		<Unit filename="../../src/gui/widgets/button.cpp" />
 		<Unit filename="../../src/gui/widgets/button.hpp" />
 		<Unit filename="../../src/gui/widgets/clickable.hpp" />
diff --git a/projectfiles/VC9/wesnoth.vcproj b/projectfiles/VC9/wesnoth.vcproj
index 901cd1c6109e..12c34aa35162 100644
--- a/projectfiles/VC9/wesnoth.vcproj
+++ b/projectfiles/VC9/wesnoth.vcproj
@@ -12115,7 +12115,7 @@
 					Name="Types"
 					>
 					<File
-						RelativePath="..\..\src\gui\lib\types\point.cpp"
+						RelativePath="..\..\src\gui\core\point.cpp"
 						>
 						<FileConfiguration
 							Name="Debug|Win32"
@@ -12167,7 +12167,7 @@
 						</FileConfiguration>
 					</File>
 					<File
-						RelativePath="..\..\src\gui\lib\types\point.hpp"
+						RelativePath="..\..\src\gui\gore\point.hpp"
 						>
 					</File>
 				</Filter>
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index db52a97d1994..3c27a06f4611 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -462,7 +462,7 @@ target_link_libraries(wesnoth-sdl
 # - Public Enumerates
 # - Small structs
 set(wesnoth-gui_types_SRC
-	gui/lib/types/point.cpp
+	gui/core/point.cpp
 )
 
 add_library(wesnoth-gui_types
diff --git a/src/SConscript b/src/SConscript
index 045e3f94ca14..fb02d16f613a 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -18,7 +18,7 @@ libwesnoth_core_sources = Split("""
     config.cpp
     hash.cpp
     log.cpp
-    game_map.cpp
+    map/map.cpp
     map/location.cpp
     md5.cpp
     mt_rng.cpp
@@ -417,7 +417,7 @@ wesnoth_sources = Split("""
     gui/dialogs/unit_recruit.cpp
     gui/dialogs/wml_error.cpp
     gui/dialogs/wml_message.cpp
-    gui/lib/types/point.cpp
+    gui/core/point.cpp
     gui/widgets/button.cpp
     gui/widgets/combobox.cpp
     gui/widgets/container.cpp