diff --git a/Applications/DataExplorer/DataView/CMakeLists.txt b/Applications/DataExplorer/DataView/CMakeLists.txt
index 42ae72959334ebe37b938ecb901fb53ae4ea8808..1fbd3a7557a203d13822c8cbf4dd22c92e06774d 100644
--- a/Applications/DataExplorer/DataView/CMakeLists.txt
+++ b/Applications/DataExplorer/DataView/CMakeLists.txt
@@ -7,7 +7,6 @@ set( SOURCES
 	DirectConditionGenerator.cpp
 	ElementTreeModel.cpp
 	ElementTreeView.cpp
-	GeoMapper.cpp
 	GEOModels.cpp
 	GeoOnMeshMappingDialog.cpp
 	GeoTabWidget.cpp
@@ -86,7 +85,6 @@ set( HEADERS
 	CondItem.h
 	DirectConditionGenerator.h
 	CondObjectListItem.h
-	GeoMapper.h
 	GeoObjectListItem.h
 	GeoTreeItem.h
 	ModelTreeItem.h
@@ -146,6 +144,7 @@ include_directories(
 	${SOURCE_DIR_REL}/BaseLib
 	${SOURCE_DIR_REL}/MathLib
 	${SOURCE_DIR_REL}/GeoLib
+	${SOURCE_DIR_REL}/MeshGeoToolsLib
 	${SOURCE_DIR_REL}/MeshLib
 	${SOURCE_DIR_REL}/FileIO
 	${CMAKE_CURRENT_SOURCE_DIR}
diff --git a/Applications/DataExplorer/DataView/GeoOnMeshMappingDialog.h b/Applications/DataExplorer/DataView/GeoOnMeshMappingDialog.h
index 2b7a3bb17a3634ed37c02aff96e604ce9e62d329..1a066fd998ffbbee5ef8f814f9aff2dde57cc556 100644
--- a/Applications/DataExplorer/DataView/GeoOnMeshMappingDialog.h
+++ b/Applications/DataExplorer/DataView/GeoOnMeshMappingDialog.h
@@ -18,7 +18,7 @@
 #include "ui_GeoOnMeshMapping.h"
 #include <QDialog>
 
-#include "GeoMapper.h"
+#include "MeshGeoToolsLib/GeoMapper.h"
 
 namespace MeshLib {
 	class Mesh;
diff --git a/Applications/DataExplorer/mainwindow.cpp b/Applications/DataExplorer/mainwindow.cpp
index 0d40e6d45d027163f50674aed550b24e6495a11d..c35891dae4e996fac0ca1428037e8de6e0820c13 100644
--- a/Applications/DataExplorer/mainwindow.cpp
+++ b/Applications/DataExplorer/mainwindow.cpp
@@ -50,7 +50,7 @@
 
 #include "SHPImportDialog.h"
 
-#include "GeoMapper.h"
+#include "MeshGeoToolsLib/GeoMapper.h"
 #include "OGSError.h"
 #include "VtkRaster.h"
 #include "RecentFiles.h"
diff --git a/Applications/DataExplorer/DataView/GeoMapper.cpp b/MeshGeoToolsLib/GeoMapper.cpp
similarity index 97%
rename from Applications/DataExplorer/DataView/GeoMapper.cpp
rename to MeshGeoToolsLib/GeoMapper.cpp
index 0cdabd1fc80ea77d628c65b7e1436befb14db598..88145eb52da3c6bf399b40fdc0e3f272c87e55f0 100644
--- a/Applications/DataExplorer/DataView/GeoMapper.cpp
+++ b/MeshGeoToolsLib/GeoMapper.cpp
@@ -20,18 +20,18 @@
 #include <numeric>
 
 #include "FileIO/AsciiRasterInterface.h"
+#include "FileIO/readMeshFromFile.h"
 
-#include "AABB.h"
-#include "Mesh.h"
-#include "Elements/Element.h"
-#include "MeshLib/Node.h"
-#include "MeshSurfaceExtraction.h"
-#include "AnalyticalGeometry.h"
-#include "PointWithID.h"
-#include "Raster.h"
-#include "readMeshFromFile.h"
-#include "StationBorehole.h"
+#include "GeoLib/AABB.h"
+#include "GeoLib/AnalyticalGeometry.h"
+#include "GeoLib/PointWithID.h"
+#include "GeoLib/Raster.h"
+#include "GeoLib/StationBorehole.h"
 
+#include "MeshLib/Mesh.h"
+#include "MeshLib/Elements/Element.h"
+#include "MeshLib/Node.h"
+#include "MeshLib/MeshSurfaceExtraction.h"
 
 GeoMapper::GeoMapper(GeoLib::GEOObjects &geo_objects, const std::string &geo_name)
 	: _geo_objects(geo_objects), _geo_name(const_cast<std::string&>(geo_name)), _mesh(nullptr), _grid(nullptr), _raster(nullptr)
diff --git a/Applications/DataExplorer/DataView/GeoMapper.h b/MeshGeoToolsLib/GeoMapper.h
similarity index 100%
rename from Applications/DataExplorer/DataView/GeoMapper.h
rename to MeshGeoToolsLib/GeoMapper.h