diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4436e9580149b1b3313acd227a41bb9af9900274..6e3d1a6a86ada30928a78c5705022d45a680ba81 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -94,7 +94,6 @@ add_library(qgc
 	QGCComboBox.cc
 	QGCDockWidget.cc
 	QGCFileDownload.cc
-	QGCGeo.cc
 	QGCLoggingCategory.cc
 	QGCMapPalette.cc
 	QGCPalette.cc
@@ -105,8 +104,6 @@ add_library(qgc
 	ShapeFileHelper.cc
 	SHPFileHelper.cc
 	TerrainTile.cc
-
-	UTM.cpp
 )
 
 set_source_files_properties(QGCApplication.cc PROPERTIES COMPILE_DEFINITIONS GIT_VERSION="${git_tag}")
@@ -126,6 +123,7 @@ add_subdirectory(FirmwarePlugin)
 add_subdirectory(FlightDisplay)
 add_subdirectory(FlightMap)
 add_subdirectory(FollowMe)
+add_subdirectory(Geo)
 add_subdirectory(GPS)
 add_subdirectory(Joystick)
 add_subdirectory(MissionManager)
@@ -162,6 +160,7 @@ target_link_libraries(qgc
 		FlightDisplay
 		FlightMap
 		FollowMe
+		Geo
 		gps
 		Joystick
 		MissionManager
diff --git a/src/Geo/CMakeLists.txt b/src/Geo/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..b94ed356383d4442b05fe58ec91e10ca338fbe87
--- /dev/null
+++ b/src/Geo/CMakeLists.txt
@@ -0,0 +1,30 @@
+
+add_library(Geo
+	Constants.hpp
+	Math.cpp
+	Math.hpp
+	MGRS.cpp
+	MGRS.hpp
+	PolarStereographic.cpp
+	PolarStereographic.hpp
+	QGCGeo.cc
+	QGCGeo.h
+	TransverseMercator.cpp
+	TransverseMercator.hpp
+	Utility.cpp
+	Utility.h
+	Utility.hpp
+	UTMUPS.cpp
+	UTMUPS.hpp
+)
+
+target_link_libraries(Geo
+	PUBLIC
+		qgc
+)
+
+target_include_directories(Geo
+	PUBLIC
+		${CMAKE_CURRENT_SOURCE_DIR}
+)
+