diff --git a/Applications/ApplicationsLib/CMakeLists.txt b/Applications/ApplicationsLib/CMakeLists.txt
index dabcefc541e5bc8ce67ff371e53bdb8fab64aa44..8ba2d863897854de0f68fe85313814a91fcdc697 100644
--- a/Applications/ApplicationsLib/CMakeLists.txt
+++ b/Applications/ApplicationsLib/CMakeLists.txt
@@ -16,12 +16,14 @@ target_link_libraries(
             ProcessLib
             spdlog::spdlog
             $<$<BOOL:${OGS_USE_PYTHON}>:pybind11::pybind11>
+            $<$<BOOL:${OGS_USE_PETSC}>:petsc>
 )
 
-target_compile_definitions(
-    ApplicationsLib PUBLIC $<$<BOOL:${USE_LIS}>:USE_LIS>
-                           $<$<BOOL:${OGS_USE_PETSC}>:USE_PETSC>
-)
+if(OGS_USE_LIS)
+    target_include_directories(ApplicationsLib PUBLIC ${LIS_INCLUDE_DIR})
+endif()
+
+target_compile_definitions(ApplicationsLib PUBLIC $<$<BOOL:${USE_LIS}>:USE_LIS>)
 
 # Set cpp definitions if the cmake option is enabled for the given process.
 foreach(process ${_processes_list})
diff --git a/Applications/CLI/CMakeLists.txt b/Applications/CLI/CMakeLists.txt
index cfd5b09be80480d394bc2f9c2ead789cfa9cebcb..0bbbf41a4ed883532193bc6c7312a1d8ce0b362d 100644
--- a/Applications/CLI/CMakeLists.txt
+++ b/Applications/CLI/CMakeLists.txt
@@ -61,13 +61,11 @@ target_link_libraries(
             $<$<TARGET_EXISTS:ogs_embedded_python>:ogs_embedded_python>
             $<$<TARGET_EXISTS:MPI::MPI_CXX>:MPI::MPI_CXX>
             $<$<TARGET_EXISTS:InSituLib>:InSituLib>
+            $<$<TARGET_EXISTS:petsc>:petsc>
             tclap
 )
 
-target_compile_definitions(
-    ogs PRIVATE $<$<BOOL:${USE_INSITU}>:USE_INSITU>
-                $<$<BOOL:${OGS_USE_PETSC}>:USE_PETSC>
-)
+target_compile_definitions(ogs PRIVATE $<$<BOOL:${USE_INSITU}>:USE_INSITU>)
 
 # ---- Tests ----
 add_test(NAME ogs_no_args COMMAND ogs)
diff --git a/Applications/DataExplorer/Base/OGSError.cpp b/Applications/DataExplorer/Base/OGSError.cpp
index c5f9f7df6671cfca4187bb220b6b9ef798ef6e76..53554ae854d298eee680dab4debbb98acd0bee20 100644
--- a/Applications/DataExplorer/Base/OGSError.cpp
+++ b/Applications/DataExplorer/Base/OGSError.cpp
@@ -11,7 +11,7 @@
  *              http://www.opengeosys.org/project/license
  *
  */
-#include "OGSError.h"
+#include "Base/OGSError.h"
 
 #include <QMessageBox>
 #include <QString>
diff --git a/Applications/DataExplorer/Base/TreeItem.cpp b/Applications/DataExplorer/Base/TreeItem.cpp
index 98dc4c9cd89ceb11ce9833203a8fd2341705959d..c94c77033f71bf9f1f0e0ed7b04a9a14369c5b6a 100644
--- a/Applications/DataExplorer/Base/TreeItem.cpp
+++ b/Applications/DataExplorer/Base/TreeItem.cpp
@@ -12,7 +12,7 @@
  *
  */
 
-#include "TreeItem.h"
+#include "Base/TreeItem.h"
 
 #include <utility>
 
diff --git a/Applications/DataExplorer/Base/TreeModel.cpp b/Applications/DataExplorer/Base/TreeModel.cpp
index e5920eaddd4e48e61ef43a2bbd44416b80a20e60..def69470a513a72bef2d8bb3787d9c6bca6fea6a 100644
--- a/Applications/DataExplorer/Base/TreeModel.cpp
+++ b/Applications/DataExplorer/Base/TreeModel.cpp
@@ -12,13 +12,13 @@
  *
  */
 
-#include "TreeModel.h"
+#include "Base/TreeModel.h"
 
 #include <QModelIndex>
 #include <QStringList>
 #include <QVariant>
 
-#include "TreeItem.h"
+#include "Base/TreeItem.h"
 
 /**
  * A model for the QTreeView implementing the tree as a double-linked list.
diff --git a/Applications/DataExplorer/Base/TreeModelIterator.cpp b/Applications/DataExplorer/Base/TreeModelIterator.cpp
index dc8d2041399de3d63af204305ee24c98a0461452..7ceabc2605303dea0446003ffe527d2170372e01 100644
--- a/Applications/DataExplorer/Base/TreeModelIterator.cpp
+++ b/Applications/DataExplorer/Base/TreeModelIterator.cpp
@@ -15,8 +15,8 @@
 // ** INCLUDES **
 #include "TreeModelIterator.h"
 
-#include "TreeItem.h"
-#include "TreeModel.h"
+#include "Base/TreeItem.h"
+#include "Base/TreeModel.h"
 
 TreeModelIterator::TreeModelIterator(TreeModel* model)
     : _current(nullptr), _model(model)
diff --git a/Applications/DataExplorer/DataExplorer.cmake b/Applications/DataExplorer/DataExplorer.cmake
index be9561a9ebe6f5808d5da00be12dcf94c0d42ccf..f8435ffc88cb55452b9e577ccbf3390a6c712682 100644
--- a/Applications/DataExplorer/DataExplorer.cmake
+++ b/Applications/DataExplorer/DataExplorer.cmake
@@ -4,13 +4,6 @@ set(SOURCES mainwindow.cpp mainwindow.h
 )
 
 set(SOURCE_DIR_REL ${CMAKE_CURRENT_SOURCE_DIR}/../..)
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}/Base
-    ${CMAKE_CURRENT_SOURCE_DIR}/DataView
-    ${CMAKE_CURRENT_SOURCE_DIR}/DataView/StratView
-    ${CMAKE_CURRENT_SOURCE_DIR}/DataView/DiagramView
-    ${CMAKE_CURRENT_SOURCE_DIR}/VtkVis
-)
 
 # Put moc files in a project folder
 source_group("Moc Files" REGULAR_EXPRESSION "moc_.*")
diff --git a/Applications/DataExplorer/DataView/AddLayerToMeshDialog.cpp b/Applications/DataExplorer/DataView/AddLayerToMeshDialog.cpp
index 26cca07ed144ad95102a68bd0af8db930cad5f6a..d52dd20ee17afbe9dc89163e698056da03778dab 100644
--- a/Applications/DataExplorer/DataView/AddLayerToMeshDialog.cpp
+++ b/Applications/DataExplorer/DataView/AddLayerToMeshDialog.cpp
@@ -14,8 +14,8 @@
 
 #include "AddLayerToMeshDialog.h"
 
-#include "OGSError.h"
-#include "StrictDoubleValidator.h"
+#include "Base/OGSError.h"
+#include "Base/StrictDoubleValidator.h"
 
 AddLayerToMeshDialog::AddLayerToMeshDialog(QDialog* parent) : QDialog(parent)
 {
diff --git a/Applications/DataExplorer/DataView/BaseItem.h b/Applications/DataExplorer/DataView/BaseItem.h
index 3dfdac84a25b085dd66f102d703d22d61f7d19c7..252e2bc5b43581cca84ffbedf3b6fa701b94c494 100644
--- a/Applications/DataExplorer/DataView/BaseItem.h
+++ b/Applications/DataExplorer/DataView/BaseItem.h
@@ -13,7 +13,7 @@
  */
 #pragma once
 
-#include "VtkStationSource.h"
+#include "VtkVis/VtkStationSource.h"
 #include <QModelIndex>
 #include <vtkPolyDataAlgorithm.h>
 
diff --git a/Applications/DataExplorer/DataView/CMakeLists.txt b/Applications/DataExplorer/DataView/CMakeLists.txt
index 4b92840af318a47b42d78c4c04a49880a720c61e..e874467d194a3b1128c4571ddbd3562bbd469642 100644
--- a/Applications/DataExplorer/DataView/CMakeLists.txt
+++ b/Applications/DataExplorer/DataView/CMakeLists.txt
@@ -113,26 +113,13 @@ source_group("UI Files" FILES ${UIS})
 
 set(SOURCE_DIR_REL ${CMAKE_CURRENT_SOURCE_DIR}/../../..)
 set(GUI_SOURCE_DIR_REL ${CMAKE_CURRENT_SOURCE_DIR}/..)
-include_directories(
-    ${SOURCE_DIR_REL}/Applications/FileIO
-    ${SOURCE_DIR_REL}/BaseLib
-    ${SOURCE_DIR_REL}/MathLib
-    ${SOURCE_DIR_REL}/GeoLib
-    ${SOURCE_DIR_REL}/MeshGeoToolsLib
-    ${SOURCE_DIR_REL}/MeshLib
-    ${GUI_SOURCE_DIR_REL}/Base
-    ${GUI_SOURCE_DIR_REL}/VtkVis
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/DiagramView
-    ${CMAKE_CURRENT_SOURCE_DIR}/StratView
-)
 
 if(GEOTIFF_FOUND)
     include_directories(${GEOTIFF_INCLUDE_DIRS})
 endif() # GEOTIFF_FOUND
 
 ogs_add_library(QtDataView ${SOURCES} ${HEADERS} ${UIS})
-
+target_include_directories(QtDataView PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 target_link_libraries(
     QtDataView
     PUBLIC GeoLib MeshGeoToolsLib MeshLib QtBase VtkVis
diff --git a/Applications/DataExplorer/DataView/CondFromRasterDialog.cpp b/Applications/DataExplorer/DataView/CondFromRasterDialog.cpp
index 570764d7918f2d634bd700dcb7a0c9077777c4d5..cea1a912493a62ed4f17c0fd072b65867ebbe084 100644
--- a/Applications/DataExplorer/DataView/CondFromRasterDialog.cpp
+++ b/Applications/DataExplorer/DataView/CondFromRasterDialog.cpp
@@ -19,9 +19,9 @@
 #include <utility>
 
 #include "DirectConditionGenerator.h"
-#include "Mesh.h"
-#include "OGSError.h"
-#include "StrictDoubleValidator.h"
+#include "MeshLib/Mesh.h"
+#include "Base/OGSError.h"
+#include "Base/StrictDoubleValidator.h"
 
 CondFromRasterDialog::CondFromRasterDialog(std::vector<MeshLib::Mesh*> msh_vec,
                                            QDialog* parent)
diff --git a/Applications/DataExplorer/DataView/CondItem.h b/Applications/DataExplorer/DataView/CondItem.h
index 404cf809da463b0ffc73fd5251f4a2ee3cf9fe5f..9e97f63c3fa6a478b6ec5c4e479b59df70e022b2 100644
--- a/Applications/DataExplorer/DataView/CondItem.h
+++ b/Applications/DataExplorer/DataView/CondItem.h
@@ -13,7 +13,7 @@
 #include <memory>
 
 #include "Applications/DataHolderLib/FemCondition.h"
-#include "TreeItem.h"
+#include "Base/TreeItem.h"
 
 #include <QList>
 #include <QVariant>
diff --git a/Applications/DataExplorer/DataView/CreateStructuredGridDialog.cpp b/Applications/DataExplorer/DataView/CreateStructuredGridDialog.cpp
index f9a64d936ac7fbd6dd65787325dbcf8fc1e32c88..5af2b181c251c10cf5ca32c6db462895bf2fdbba 100644
--- a/Applications/DataExplorer/DataView/CreateStructuredGridDialog.cpp
+++ b/Applications/DataExplorer/DataView/CreateStructuredGridDialog.cpp
@@ -18,8 +18,8 @@
 
 #include "GeoLib/Point.h"
 #include "MeshLib/MeshGenerators/MeshGenerator.h"
-#include "OGSError.h"
-#include "StrictDoubleValidator.h"
+#include "Base/OGSError.h"
+#include "Base/StrictDoubleValidator.h"
 
 CreateStructuredGridDialog::CreateStructuredGridDialog(QDialog* parent)
     : QDialog(parent)
diff --git a/Applications/DataExplorer/DataView/DataExplorerSettingsDialog.cpp b/Applications/DataExplorer/DataView/DataExplorerSettingsDialog.cpp
index 1f3c082a88a425dc593f98000df9ddde64608671..227bb9f6d60fa8fb056a6f02ba833d3c2f9f834e 100644
--- a/Applications/DataExplorer/DataView/DataExplorerSettingsDialog.cpp
+++ b/Applications/DataExplorer/DataView/DataExplorerSettingsDialog.cpp
@@ -17,7 +17,7 @@
 #include <QFileDialog>
 #include <QSettings>
 
-#include "OGSError.h"
+#include "Base/OGSError.h"
 
 DataExplorerSettingsDialog::DataExplorerSettingsDialog(QDialog* parent)
     : QDialog(parent)
diff --git a/Applications/DataExplorer/DataView/DiagramView/CMakeLists.txt b/Applications/DataExplorer/DataView/DiagramView/CMakeLists.txt
index 00f0cb959c4bc70934b36d321b91c7f6f8d4fa35..c39c4c5c99aa168856fd7373a458819182171bf9 100644
--- a/Applications/DataExplorer/DataView/DiagramView/CMakeLists.txt
+++ b/Applications/DataExplorer/DataView/DiagramView/CMakeLists.txt
@@ -21,17 +21,11 @@ set(HEADERS
 
 set(SOURCE_DIR_REL ${CMAKE_CURRENT_SOURCE_DIR}/../../../..)
 set(GUI_SOURCE_DIR_REL ${CMAKE_CURRENT_SOURCE_DIR}/../..)
-include_directories(
-    ${SOURCE_DIR_REL}/BaseLib ${SOURCE_DIR_REL}/GeoLib
-    ${SOURCE_DIR_REL}/MathLib ${CMAKE_CURRENT_SOURCE_DIR}
-    ${GUI_SOURCE_DIR_REL}/Base ${GUI_SOURCE_DIR_REL}/DataView
-)
-
 file(GLOB_RECURSE UIS CONFIGURE_DEPENDS *.ui)
 source_group("UI Files" FILES ${UIS})
 
 ogs_add_library(QtDiagramView ${SOURCES} ${HEADERS} ${UIS})
-
+target_include_directories(QtDiagramView PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 target_link_libraries(
     QtDiagramView PRIVATE BaseLib GeoLib QtBase DataHolderLib Qt5::Gui
                           spdlog::spdlog
diff --git a/Applications/DataExplorer/DataView/DiagramView/DiagramList.cpp b/Applications/DataExplorer/DataView/DiagramView/DiagramList.cpp
index bba60cb056eb5082bc65288ee24b636c27c9abff..ad2d6979ed84c74de7e8e568bdc50f12e7a16c8a 100644
--- a/Applications/DataExplorer/DataView/DiagramView/DiagramList.cpp
+++ b/Applications/DataExplorer/DataView/DiagramView/DiagramList.cpp
@@ -19,10 +19,10 @@
 #include <limits>
 
 #include "BaseLib/Logging.h"
-#include "DateTools.h"
+#include "BaseLib/DateTools.h"
 #include "GetDateTime.h"
-#include "SensorData.h"
-#include "StringTools.h"
+#include "GeoLib/SensorData.h"
+#include "BaseLib/StringTools.h"
 
 DiagramList::DiagramList() : _xLabel(""), _yLabel(""), _xUnit(""), _yUnit("") {}
 
diff --git a/Applications/DataExplorer/DataView/DiagramView/DiagramPrefsDialog.cpp b/Applications/DataExplorer/DataView/DiagramView/DiagramPrefsDialog.cpp
index f70458f486d4790344fdeb736c87794220d0426c..bde98035ed4af1bfefdad761a2fd777aad1d9cd7 100644
--- a/Applications/DataExplorer/DataView/DiagramView/DiagramPrefsDialog.cpp
+++ b/Applications/DataExplorer/DataView/DiagramView/DiagramPrefsDialog.cpp
@@ -21,8 +21,8 @@
 #include "DetailWindow.h"
 #include "DiagramList.h"
 #include "GetDateTime.h"
-#include "OGSError.h"
-#include "Station.h"
+#include "Base/OGSError.h"
+#include "GeoLib/Station.h"
 
 DiagramPrefsDialog::DiagramPrefsDialog(const GeoLib::Station* stn,
                                        const QString& listName,
diff --git a/Applications/DataExplorer/DataView/DiagramView/DiagramScene.h b/Applications/DataExplorer/DataView/DiagramView/DiagramScene.h
index 00453e0b502c552ab20dc52a8a5988d95ee0c47f..9a7d9a98271a96347429d9a706a4a45a32137ac1 100644
--- a/Applications/DataExplorer/DataView/DiagramView/DiagramScene.h
+++ b/Applications/DataExplorer/DataView/DiagramView/DiagramScene.h
@@ -17,7 +17,7 @@
 #include "DiagramList.h"
 #include "QArrow.h"
 #include "QGraphicsGrid.h"
-#include "QNonScalableGraphicsTextItem.h"
+#include "Base/QNonScalableGraphicsTextItem.h"
 #include <QGraphicsScene>
 
 class QDateTime;
diff --git a/Applications/DataExplorer/DataView/DirectConditionGenerator.cpp b/Applications/DataExplorer/DataView/DirectConditionGenerator.cpp
index 9dd6725b95acb94de40643c2afca980c1838d89b..a2a966f543bc7768ddf9e9222eedb31a0f2f5f8f 100644
--- a/Applications/DataExplorer/DataView/DirectConditionGenerator.cpp
+++ b/Applications/DataExplorer/DataView/DirectConditionGenerator.cpp
@@ -21,10 +21,10 @@
 
 #include "Applications/FileIO/AsciiRasterInterface.h"
 #include "BaseLib/Logging.h"
-#include "Mesh.h"
+#include "MeshLib/Mesh.h"
 #include "MeshLib/Node.h"
-#include "MeshSurfaceExtraction.h"
-#include "Raster.h"
+#include "MeshLib/MeshSurfaceExtraction.h"
+#include "GeoLib/Raster.h"
 
 const std::vector<std::pair<std::size_t, double>>&
 DirectConditionGenerator::directToSurfaceNodes(const MeshLib::Mesh& mesh,
diff --git a/Applications/DataExplorer/DataView/ElementTreeModel.cpp b/Applications/DataExplorer/DataView/ElementTreeModel.cpp
index 493ef0be3e6ae07208bcf409f29684c4947cf6fb..82c499c843799895dc8850261f498a54d9616ed7 100644
--- a/Applications/DataExplorer/DataView/ElementTreeModel.cpp
+++ b/Applications/DataExplorer/DataView/ElementTreeModel.cpp
@@ -20,7 +20,7 @@
 #include "MeshLib/MeshInformation.h"
 #include "MeshLib/Node.h"
 #include "MeshLib/Vtk/VtkMappedMeshSource.h"
-#include "TreeItem.h"
+#include "Base/TreeItem.h"
 
 namespace
 {
diff --git a/Applications/DataExplorer/DataView/ElementTreeModel.h b/Applications/DataExplorer/DataView/ElementTreeModel.h
index c7603323b66b9ebd918e7f331b656868087b6177..796077b7bc844313838abb8e6a5d23edbb80d317 100644
--- a/Applications/DataExplorer/DataView/ElementTreeModel.h
+++ b/Applications/DataExplorer/DataView/ElementTreeModel.h
@@ -15,7 +15,7 @@
 #pragma once
 
 #include <array>
-#include "TreeModel.h"
+#include "Base/TreeModel.h"
 
 class vtkUnstructuredGridAlgorithm;
 
diff --git a/Applications/DataExplorer/DataView/ElementTreeView.cpp b/Applications/DataExplorer/DataView/ElementTreeView.cpp
index 2770f4a930b41aa0a75adab75d5c35687d3679d3..e736b795516a4e253ee8bedc59da988c21ecd054 100644
--- a/Applications/DataExplorer/DataView/ElementTreeView.cpp
+++ b/Applications/DataExplorer/DataView/ElementTreeView.cpp
@@ -18,7 +18,7 @@
 #include <QModelIndex>
 
 #include "ElementTreeModel.h"
-#include "TreeItem.h"
+#include "Base/TreeItem.h"
 
 ElementTreeView::ElementTreeView(QWidget* parent) : QTreeView(parent) {}
 
diff --git a/Applications/DataExplorer/DataView/FemConditionModel.cpp b/Applications/DataExplorer/DataView/FemConditionModel.cpp
index 4a6f1ff26afadf89e6eaea42c097e186415e78d7..e4aa812d4d536ea1d537fa2057798f5f83618f99 100644
--- a/Applications/DataExplorer/DataView/FemConditionModel.cpp
+++ b/Applications/DataExplorer/DataView/FemConditionModel.cpp
@@ -12,7 +12,7 @@
 
 #include "Applications/DataHolderLib/BoundaryCondition.h"
 #include "Applications/DataHolderLib/SourceTerm.h"
-#include "TreeItem.h"
+#include "Base/TreeItem.h"
 
 /**
  * Constructor.
diff --git a/Applications/DataExplorer/DataView/GEOModels.cpp b/Applications/DataExplorer/DataView/GEOModels.cpp
index c0753f3087662f8a33ce60d65b68dcb8857ce8a4..9b9b7e961aac4cafd3d14809381b4d4b57a4c1ff 100644
--- a/Applications/DataExplorer/DataView/GEOModels.cpp
+++ b/Applications/DataExplorer/DataView/GEOModels.cpp
@@ -19,7 +19,7 @@
 #include "BaseLib/Logging.h"
 #include "GeoLib/Triangle.h"
 #include "GeoTreeModel.h"
-#include "OGSError.h"
+#include "Base/OGSError.h"
 #include "StationTreeModel.h"
 
 GEOModels::GEOModels(GeoLib::GEOObjects& geo_objects, QObject* parent /*= 0*/)
diff --git a/Applications/DataExplorer/DataView/GMSHPrefsDialog.cpp b/Applications/DataExplorer/DataView/GMSHPrefsDialog.cpp
index e8cf72ff6f888d0ed4997fd627d064e4ff9e97a6..64c58ae183d44e0881ca867f37e9da5195a7aa6e 100644
--- a/Applications/DataExplorer/DataView/GMSHPrefsDialog.cpp
+++ b/Applications/DataExplorer/DataView/GMSHPrefsDialog.cpp
@@ -13,17 +13,17 @@
  */
 
 // Base
-#include "StringTools.h"
+#include "BaseLib/StringTools.h"
 
 // Qt/Base
 #include <QStringList>
 #include <QStringListModel>
 
-#include "GEOObjects.h"
+#include "GeoLib/GEOObjects.h"
 #include "GMSHPrefsDialog.h"
-#include "OGSError.h"
-#include "StrictDoubleValidator.h"
-#include "StrictIntValidator.h"
+#include "Base/OGSError.h"
+#include "Base/StrictDoubleValidator.h"
+#include "Base/StrictIntValidator.h"
 
 GMSHPrefsDialog::GMSHPrefsDialog(GeoLib::GEOObjects const& geoObjects,
                                  QDialog* parent)
diff --git a/Applications/DataExplorer/DataView/GeoObjectListItem.h b/Applications/DataExplorer/DataView/GeoObjectListItem.h
index 88983a85c280e8ea10926e2007be6c9c89f6173e..fbe0494da0ec321bb7feaba4e01ee04e5b51fdec 100644
--- a/Applications/DataExplorer/DataView/GeoObjectListItem.h
+++ b/Applications/DataExplorer/DataView/GeoObjectListItem.h
@@ -14,13 +14,13 @@
  */
 #pragma once
 
-#include "TreeItem.h"
+#include "Base/TreeItem.h"
 
-#include "GeoType.h"
+#include "GeoLib/GeoType.h"
 
-#include "VtkPointsSource.h"
-#include "VtkPolylinesSource.h"
-#include "VtkSurfacesSource.h"
+#include "VtkVis/VtkPointsSource.h"
+#include "VtkVis/VtkPolylinesSource.h"
+#include "VtkVis/VtkSurfacesSource.h"
 #include <QModelIndex>
 #include <vtkPolyDataAlgorithm.h>
 
diff --git a/Applications/DataExplorer/DataView/GeoOnMeshMappingDialog.cpp b/Applications/DataExplorer/DataView/GeoOnMeshMappingDialog.cpp
index 7d08d2af184f2ac9208472ddf87e35b33d4c47cb..47fdcf4bdbc0803ef3e87f5bd23eb4dbe9ef58fc 100644
--- a/Applications/DataExplorer/DataView/GeoOnMeshMappingDialog.cpp
+++ b/Applications/DataExplorer/DataView/GeoOnMeshMappingDialog.cpp
@@ -14,8 +14,8 @@
 
 #include "GeoOnMeshMappingDialog.h"
 
-#include "Mesh.h"
-#include "OGSError.h"
+#include "MeshLib/Mesh.h"
+#include "Base/OGSError.h"
 
 GeoOnMeshMappingDialog::GeoOnMeshMappingDialog(
     std::vector<std::unique_ptr<MeshLib::Mesh>> const& mesh_vec,
diff --git a/Applications/DataExplorer/DataView/GeoTreeItem.h b/Applications/DataExplorer/DataView/GeoTreeItem.h
index ad2acec59ba010f722f04d582be91f77ea67cb06..e6970acc31b587dbdd38470cb01127d75aedb578 100644
--- a/Applications/DataExplorer/DataView/GeoTreeItem.h
+++ b/Applications/DataExplorer/DataView/GeoTreeItem.h
@@ -14,9 +14,9 @@
 
 #pragma once
 
-#include "TreeItem.h"
+#include "Base/TreeItem.h"
 
-#include "GeoObject.h"
+#include "GeoLib/GeoObject.h"
 
 /**
  * \brief A TreeItem containing an additional GeoObject
diff --git a/Applications/DataExplorer/DataView/GeoTreeModel.cpp b/Applications/DataExplorer/DataView/GeoTreeModel.cpp
index 5df9e13f42e5f477f65073ec0b7205b7a849574b..c372295b59d13576e340bd653d563e7b13524b3e 100644
--- a/Applications/DataExplorer/DataView/GeoTreeModel.cpp
+++ b/Applications/DataExplorer/DataView/GeoTreeModel.cpp
@@ -18,7 +18,7 @@
 #include "GeoLib/Triangle.h"
 #include "GeoObjectListItem.h"
 #include "GeoTreeItem.h"
-#include "OGSError.h"
+#include "Base/OGSError.h"
 
 /**
  * Constructor.
diff --git a/Applications/DataExplorer/DataView/GeoTreeModel.h b/Applications/DataExplorer/DataView/GeoTreeModel.h
index b6bd8d6895d63e0977e1410539781c3fbc298b73..b649a5958233a996d61fe02ce661ca95be85cfcd 100644
--- a/Applications/DataExplorer/DataView/GeoTreeModel.h
+++ b/Applications/DataExplorer/DataView/GeoTreeModel.h
@@ -21,7 +21,7 @@
 #include "GeoLib/PointVec.h"
 #include "GeoLib/PolylineVec.h"
 #include "GeoLib/SurfaceVec.h"
-#include "TreeModel.h"
+#include "Base/TreeModel.h"
 
 namespace GeoLib
 {
diff --git a/Applications/DataExplorer/DataView/GeoTreeView.cpp b/Applications/DataExplorer/DataView/GeoTreeView.cpp
index dc1416b9084a3f30088eb0d1f7b572b53e54c4ed..baff5ddb425b9d3a4609b866ea5e58d329a15562 100644
--- a/Applications/DataExplorer/DataView/GeoTreeView.cpp
+++ b/Applications/DataExplorer/DataView/GeoTreeView.cpp
@@ -21,9 +21,9 @@
 #include "GeoObjectListItem.h"
 #include "GeoTreeItem.h"
 #include "GeoTreeModel.h"
-#include "ImportFileTypes.h"
-#include "LastSavedFileDirectory.h"
-#include "OGSError.h"
+#include "Base/ImportFileTypes.h"
+#include "Base/LastSavedFileDirectory.h"
+#include "Base/OGSError.h"
 
 GeoTreeView::GeoTreeView(QWidget* parent) : QTreeView(parent) {}
 
diff --git a/Applications/DataExplorer/DataView/LineEditDialog.cpp b/Applications/DataExplorer/DataView/LineEditDialog.cpp
index c85293d57caecd87927f0483e7475b85b930dcba..ea39fbf280719405a2880d8f85e11701c187ea81 100644
--- a/Applications/DataExplorer/DataView/LineEditDialog.cpp
+++ b/Applications/DataExplorer/DataView/LineEditDialog.cpp
@@ -17,7 +17,7 @@
 #include <QStringList>
 #include <QStringListModel>
 
-#include "OGSError.h"
+#include "Base/OGSError.h"
 
 LineEditDialog::LineEditDialog(const GeoLib::PolylineVec& ply_vec,
                                QDialog* parent)
diff --git a/Applications/DataExplorer/DataView/LinearEditDialog.h b/Applications/DataExplorer/DataView/LinearEditDialog.h
index e874e9dc08d9229f8bb09eaf5af9bd67581ff3d3..a74d9a489657adf2b2a6a7ea1d0a765471971dc9 100644
--- a/Applications/DataExplorer/DataView/LinearEditDialog.h
+++ b/Applications/DataExplorer/DataView/LinearEditDialog.h
@@ -17,7 +17,7 @@
 #include "ui_LinearEdit.h"
 #include <QDialog>
 
-#include "Polyline.h"
+#include "GeoLib/Polyline.h"
 
 /**
  * \brief A dialog window for creating linear boundary conditions on polylines
diff --git a/Applications/DataExplorer/DataView/MergeGeometriesDialog.cpp b/Applications/DataExplorer/DataView/MergeGeometriesDialog.cpp
index b3b678aa3c8f317670f8db61890aed4945686bea..12d1f60293befbf4242cee3c3675203ce016eff5 100644
--- a/Applications/DataExplorer/DataView/MergeGeometriesDialog.cpp
+++ b/Applications/DataExplorer/DataView/MergeGeometriesDialog.cpp
@@ -17,8 +17,8 @@
 #include <QStringList>
 #include <QStringListModel>
 
-#include "GEOObjects.h"
-#include "OGSError.h"
+#include "GeoLib/GEOObjects.h"
+#include "Base/OGSError.h"
 
 MergeGeometriesDialog::MergeGeometriesDialog(GeoLib::GEOObjects& geoObjects,
                                              QDialog* parent)
diff --git a/Applications/DataExplorer/DataView/MeshAnalysisDialog.cpp b/Applications/DataExplorer/DataView/MeshAnalysisDialog.cpp
index b3ff0a1b0444719a4bf900640080b37f946f058b..170ec23766aa586fef0c05f4661dbdf1e5f2c18d 100644
--- a/Applications/DataExplorer/DataView/MeshAnalysisDialog.cpp
+++ b/Applications/DataExplorer/DataView/MeshAnalysisDialog.cpp
@@ -14,11 +14,11 @@
 
 #include "MeshAnalysisDialog.h"
 
-#include "Mesh.h"
-#include "MeshEditing/MeshRevision.h"
-#include "MeshQuality/MeshValidation.h"
-#include "MeshSearch/NodeSearch.h"
-#include "StrictDoubleValidator.h"
+#include "MeshLib/Mesh.h"
+#include "MeshLib/MeshEditing/MeshRevision.h"
+#include "MeshLib/MeshQuality/MeshValidation.h"
+#include "MeshLib/MeshSearch/NodeSearch.h"
+#include "Base/StrictDoubleValidator.h"
 
 MeshAnalysisDialog::MeshAnalysisDialog(
     std::vector<std::unique_ptr<MeshLib::Mesh>> const& mesh_vec,
diff --git a/Applications/DataExplorer/DataView/MeshElementRemovalDialog.cpp b/Applications/DataExplorer/DataView/MeshElementRemovalDialog.cpp
index f4c84ffa0373a938c56dcefd326ebaa454614f12..e4538238281ac71e7b83b1ef67ae5e2919dce46d 100644
--- a/Applications/DataExplorer/DataView/MeshElementRemovalDialog.cpp
+++ b/Applications/DataExplorer/DataView/MeshElementRemovalDialog.cpp
@@ -20,7 +20,7 @@
 
 #include "Applications/DataExplorer/Base/OGSError.h"
 #include "Applications/DataHolderLib/Project.h"
-#include "Elements/Element.h"
+#include "MeshLib/Elements/Element.h"
 #include "GeoLib/AABB.h"
 #include "MeshLib/Mesh.h"
 #include "MeshLib/MeshEditing/RemoveMeshComponents.h"
diff --git a/Applications/DataExplorer/DataView/MeshItem.h b/Applications/DataExplorer/DataView/MeshItem.h
index 744ab7a374a787a025930a7cd5d267ce72df2a19..ecab4b31716d87a7ba1c0ff0c27e8a2b86fbb0ca 100644
--- a/Applications/DataExplorer/DataView/MeshItem.h
+++ b/Applications/DataExplorer/DataView/MeshItem.h
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include "TreeItem.h"
+#include "Base/TreeItem.h"
 
 #include "MeshLib/Vtk/VtkMappedMeshSource.h"
 
diff --git a/Applications/DataExplorer/DataView/MeshLayerEditDialog.cpp b/Applications/DataExplorer/DataView/MeshLayerEditDialog.cpp
index 9ba27b04474b79e7ab604b6ea757446b54be3e67..025cda9d5dd374f533c33d572844110446e4797f 100644
--- a/Applications/DataExplorer/DataView/MeshLayerEditDialog.cpp
+++ b/Applications/DataExplorer/DataView/MeshLayerEditDialog.cpp
@@ -30,11 +30,11 @@
 
 #include "Applications/FileIO/AsciiRasterInterface.h"
 #include "BaseLib/Logging.h"
-#include "Mesh.h"
-#include "MeshGenerators/LayeredVolume.h"
-#include "OGSError.h"
-#include "StringTools.h"
-#include "TetGenInterface.h"
+#include "MeshLib/Mesh.h"
+#include "MeshLib/MeshGenerators/LayeredVolume.h"
+#include "Base/OGSError.h"
+#include "BaseLib/StringTools.h"
+#include "Applications/FileIO/TetGenInterface.h"
 
 MeshLayerEditDialog::MeshLayerEditDialog(const MeshLib::Mesh* mesh,
                                          QDialog* parent)
diff --git a/Applications/DataExplorer/DataView/MeshLayerEditDialog.h b/Applications/DataExplorer/DataView/MeshLayerEditDialog.h
index 0a75ec6e44e5c837eff2c1b3c9c757e196e0a1bb..3fa81100edc003411bdec2e55a22b63454764a14 100644
--- a/Applications/DataExplorer/DataView/MeshLayerEditDialog.h
+++ b/Applications/DataExplorer/DataView/MeshLayerEditDialog.h
@@ -18,7 +18,7 @@
 #include <QDialog>
 #include <QLineEdit>
 
-#include "MeshGenerators/MeshLayerMapper.h"
+#include "MeshLib/MeshGenerators/MeshLayerMapper.h"
 
 class QPushButton;
 class QCheckBox;
diff --git a/Applications/DataExplorer/DataView/MeshMapping2DDialog.cpp b/Applications/DataExplorer/DataView/MeshMapping2DDialog.cpp
index a588d33d3fa5e62e3955dd8f71ef1822fc796109..01d0240f4f3f2768019b7fabb70dbceb56aea3eb 100644
--- a/Applications/DataExplorer/DataView/MeshMapping2DDialog.cpp
+++ b/Applications/DataExplorer/DataView/MeshMapping2DDialog.cpp
@@ -12,8 +12,8 @@
 #include <QFileDialog>
 #include <QSettings>
 
-#include "OGSError.h"
-#include "StrictDoubleValidator.h"
+#include "Base/OGSError.h"
+#include "Base/StrictDoubleValidator.h"
 
 MeshMapping2DDialog::MeshMapping2DDialog(QDialog* parent) : QDialog(parent)
 {
diff --git a/Applications/DataExplorer/DataView/MeshModel.cpp b/Applications/DataExplorer/DataView/MeshModel.cpp
index 4ad7156620c05b4a2d2df3d6cd21da675062a91d..4803a6d507ed20f94162e3ea2f915a0275ce0d59 100644
--- a/Applications/DataExplorer/DataView/MeshModel.cpp
+++ b/Applications/DataExplorer/DataView/MeshModel.cpp
@@ -22,10 +22,10 @@
 #include "Applications/DataHolderLib/Project.h"
 #include "BaseLib/Logging.h"
 #include "BaseLib/StringTools.h"
-#include "Elements/Element.h"
+#include "MeshLib/Elements/Element.h"
 #include "MeshItem.h"
 #include "MeshLib/Node.h"
-#include "TreeItem.h"
+#include "Base/TreeItem.h"
 
 const QVariant MeshModel::element_str = "Element";
 const std::map<MeshLib::MeshElemType, QVariant> MeshModel::elem_type_map =
diff --git a/Applications/DataExplorer/DataView/MeshModel.h b/Applications/DataExplorer/DataView/MeshModel.h
index 916c4af7361582b5d8b55c9972c3c050665a24a2..509fa18ebc558becdd1a1d55e135e887f1853a21 100644
--- a/Applications/DataExplorer/DataView/MeshModel.h
+++ b/Applications/DataExplorer/DataView/MeshModel.h
@@ -18,7 +18,7 @@
 
 #include "MeshLib/MeshEnums.h"
 
-#include "TreeModel.h"
+#include "Base/TreeModel.h"
 
 namespace DataHolderLib
 {
diff --git a/Applications/DataExplorer/DataView/MeshQualitySelectionDialog.cpp b/Applications/DataExplorer/DataView/MeshQualitySelectionDialog.cpp
index 2d085f672a9d8465b34148a31d70ad25d6ae16ed..d07a7dddf33fc73801d1f9e13afd3bcff2aface5 100644
--- a/Applications/DataExplorer/DataView/MeshQualitySelectionDialog.cpp
+++ b/Applications/DataExplorer/DataView/MeshQualitySelectionDialog.cpp
@@ -18,7 +18,7 @@
 #include <QFileInfo>
 #include <QSettings>
 
-#include "OGSError.h"
+#include "Base/OGSError.h"
 
 /// Constructor
 MeshQualitySelectionDialog::MeshQualitySelectionDialog(QDialog* parent)
diff --git a/Applications/DataExplorer/DataView/MeshValueEditDialog.cpp b/Applications/DataExplorer/DataView/MeshValueEditDialog.cpp
index 7e66bc4e0c1151c45d06e4e6c7640cc9d0a81e7c..0104d2c8e4492c7f032f165b4d298d0138fe0ea6 100644
--- a/Applications/DataExplorer/DataView/MeshValueEditDialog.cpp
+++ b/Applications/DataExplorer/DataView/MeshValueEditDialog.cpp
@@ -14,8 +14,8 @@
 
 #include "MeshValueEditDialog.h"
 
-#include "MeshEditing/ElementValueModification.h"
-#include "OGSError.h"
+#include "MeshLib/MeshEditing/ElementValueModification.h"
+#include "Base/OGSError.h"
 
 MeshValueEditDialog::MeshValueEditDialog(MeshLib::Mesh* mesh, QDialog* parent)
     : QDialog(parent), _mesh(mesh)
diff --git a/Applications/DataExplorer/DataView/MeshView.cpp b/Applications/DataExplorer/DataView/MeshView.cpp
index d41989066bcb44c510c978da82687e2418d3cbc7..6516bfe73649b33860bdaa24bd8b4bc0e28cedbd 100644
--- a/Applications/DataExplorer/DataView/MeshView.cpp
+++ b/Applications/DataExplorer/DataView/MeshView.cpp
@@ -24,8 +24,8 @@
 
 #include "AddLayerToMeshDialog.h"
 #include "Applications/FileIO/AsciiRasterInterface.h"
-#include "ImportFileTypes.h"
-#include "LastSavedFileDirectory.h"
+#include "Base/ImportFileTypes.h"
+#include "Base/LastSavedFileDirectory.h"
 #include "MeshItem.h"
 #include "MeshLayerEditDialog.h"
 #include "MeshLib/Mesh.h"
@@ -36,12 +36,12 @@
 #include "MeshMapping2DDialog.h"
 #include "MeshModel.h"
 #include "MeshValueEditDialog.h"
-#include "OGSError.h"
+#include "Base/OGSError.h"
 #include "RasterDataToMeshDialog.h"
-#include "SHPInterface.h"
+#include "Applications/FileIO/SHPInterface.h"
 #include "SaveMeshDialog.h"
 #include "SurfaceExtractionDialog.h"
-#include "TetGenInterface.h"
+#include "Applications/FileIO/TetGenInterface.h"
 
 MeshView::MeshView(QWidget* parent /*= 0*/) : QTreeView(parent)
 {
diff --git a/Applications/DataExplorer/DataView/ModelTreeItem.h b/Applications/DataExplorer/DataView/ModelTreeItem.h
index e2854f7b79bc35ff63e849e74013f01a9694bb43..7ef4a0aeb6c3548b801e7e3be9531d107dac271e 100644
--- a/Applications/DataExplorer/DataView/ModelTreeItem.h
+++ b/Applications/DataExplorer/DataView/ModelTreeItem.h
@@ -17,7 +17,7 @@
 #include "GeoLib/Station.h"
 
 #include "BaseItem.h"
-#include "TreeItem.h"
+#include "Base/TreeItem.h"
 
 /**
  * \brief A TreeItem containing some additional information used in the StationModel.
diff --git a/Applications/DataExplorer/DataView/ProcessModel.cpp b/Applications/DataExplorer/DataView/ProcessModel.cpp
index 3c263976faf85fdf9ebf4fb120f16495b35d3ea6..854e731e28437e182fb14261df36f65d799fd23d 100644
--- a/Applications/DataExplorer/DataView/ProcessModel.cpp
+++ b/Applications/DataExplorer/DataView/ProcessModel.cpp
@@ -18,7 +18,7 @@
 #include "CondItem.h"
 #include "GeoLib/GEOObjects.h"
 #include "GeoLib/GeoObject.h"
-#include "GeoType.h"
+#include "GeoLib/GeoType.h"
 #include "ProcessVarItem.h"
 
 ProcessModel::ProcessModel(DataHolderLib::Project& project, QObject* parent)
diff --git a/Applications/DataExplorer/DataView/ProcessModel.h b/Applications/DataExplorer/DataView/ProcessModel.h
index 6a4a61cc74d51b11efe43ef3bc3db772dd226d36..adbee93aabcd128d8cb2ff1ed41deb4b451a50b3 100644
--- a/Applications/DataExplorer/DataView/ProcessModel.h
+++ b/Applications/DataExplorer/DataView/ProcessModel.h
@@ -15,7 +15,7 @@
 #pragma once
 
 #include "Applications/DataHolderLib/Project.h"
-#include "TreeModel.h"
+#include "Base/TreeModel.h"
 
 class FEMCondition;
 class ProcessVarItem;
diff --git a/Applications/DataExplorer/DataView/ProcessVarItem.h b/Applications/DataExplorer/DataView/ProcessVarItem.h
index 6d646ef292c8922dee324824470a06599cf85ab5..c94f3d74b0436f4b5ecbd3592725049ab2771973 100644
--- a/Applications/DataExplorer/DataView/ProcessVarItem.h
+++ b/Applications/DataExplorer/DataView/ProcessVarItem.h
@@ -10,7 +10,7 @@
 
 #pragma once
 
-#include "TreeItem.h"
+#include "Base/TreeItem.h"
 
 /**
  * \brief A TreeItem representing process variable information.
diff --git a/Applications/DataExplorer/DataView/RasterDataToMeshDialog.cpp b/Applications/DataExplorer/DataView/RasterDataToMeshDialog.cpp
index d132b3e7fa14680dc0e9d1e558c082d467f1456c..49b0294f7a2ea6021e8fceca61f126edf7f6e6c6 100644
--- a/Applications/DataExplorer/DataView/RasterDataToMeshDialog.cpp
+++ b/Applications/DataExplorer/DataView/RasterDataToMeshDialog.cpp
@@ -13,8 +13,8 @@
 #include <QFileDialog>
 #include <QSettings>
 
-#include "OGSError.h"
-#include "StrictDoubleValidator.h"
+#include "Base/OGSError.h"
+#include "Base/StrictDoubleValidator.h"
 
 RasterDataToMeshDialog::RasterDataToMeshDialog(std::string const& mesh_name,
                                                QDialog* parent)
diff --git a/Applications/DataExplorer/DataView/SHPImportDialog.cpp b/Applications/DataExplorer/DataView/SHPImportDialog.cpp
index 076496baf6ef93679cf0ac8adf5c1e04ef325038..cbe5f1d30c92aec604f6a8cf2ff65d84ce3e903c 100644
--- a/Applications/DataExplorer/DataView/SHPImportDialog.cpp
+++ b/Applications/DataExplorer/DataView/SHPImportDialog.cpp
@@ -22,8 +22,8 @@
 #include <QVBoxLayout>
 
 #include "GeoLib/GEOObjects.h"
-#include "OGSError.h"
-#include "SHPInterface.h"
+#include "Base/OGSError.h"
+#include "Applications/FileIO/SHPInterface.h"
 
 SHPImportDialog::SHPImportDialog(std::string filename,
                                  GeoLib::GEOObjects& geo_objects,
diff --git a/Applications/DataExplorer/DataView/SaveMeshDialog.cpp b/Applications/DataExplorer/DataView/SaveMeshDialog.cpp
index ed699c3e74dfe7137ce2db7c698d7e439664129f..61968b92cba2ce4bd1028d615d9f34e9ce9347e2 100644
--- a/Applications/DataExplorer/DataView/SaveMeshDialog.cpp
+++ b/Applications/DataExplorer/DataView/SaveMeshDialog.cpp
@@ -17,11 +17,11 @@
 #include <QFileDialog>
 #include <QSettings>
 
-#include "LastSavedFileDirectory.h"
+#include "Base/LastSavedFileDirectory.h"
 #include "MeshLib/IO/Legacy/MeshIO.h"
 #include "MeshLib/IO/VtkIO/VtuInterface.h"
 #include "MeshLib/Mesh.h"
-#include "OGSError.h"
+#include "Base/OGSError.h"
 
 SaveMeshDialog::SaveMeshDialog(MeshLib::Mesh const& mesh, QDialog* parent)
     : QDialog(parent), _mesh(mesh)
diff --git a/Applications/DataExplorer/DataView/SelectMeshDialog.cpp b/Applications/DataExplorer/DataView/SelectMeshDialog.cpp
index 4f80705dc777e40ad4902cd06ccd65d6e6d9fb97..dffb56c97fdc1c803e1777f14ba19930cbb0f7f6 100644
--- a/Applications/DataExplorer/DataView/SelectMeshDialog.cpp
+++ b/Applications/DataExplorer/DataView/SelectMeshDialog.cpp
@@ -19,7 +19,7 @@
 #include <QLabel>
 #include <QVBoxLayout>
 
-#include "GeoObject.h"
+#include "GeoLib/GeoObject.h"
 
 SelectMeshDialog::SelectMeshDialog(const GeoLib::GeoObject* geo_object,
                                    const std::list<std::string>& msh_names,
diff --git a/Applications/DataExplorer/DataView/StationTreeModel.cpp b/Applications/DataExplorer/DataView/StationTreeModel.cpp
index dfc2255dbf7b7dea9fe838da49d47911e17baabd..bf71b81d4be5e81ca9ff0470788db1cd2ef3cd84 100644
--- a/Applications/DataExplorer/DataView/StationTreeModel.cpp
+++ b/Applications/DataExplorer/DataView/StationTreeModel.cpp
@@ -17,8 +17,8 @@
 #include <QDebug>
 
 #include "BaseItem.h"
-#include "OGSError.h"
-#include "Station.h"
+#include "Base/OGSError.h"
+#include "GeoLib/Station.h"
 
 /**
  * Constructor.
diff --git a/Applications/DataExplorer/DataView/StationTreeModel.h b/Applications/DataExplorer/DataView/StationTreeModel.h
index 9c5e4e432ee5ac4db4a2db21e6c251348e99b252..cd5b59f4008587fefe787d9b3028b291c021463b 100644
--- a/Applications/DataExplorer/DataView/StationTreeModel.h
+++ b/Applications/DataExplorer/DataView/StationTreeModel.h
@@ -20,7 +20,7 @@
 #include "GeoLib/Point.h"
 
 #include "ModelTreeItem.h"
-#include "TreeModel.h"
+#include "Base/TreeModel.h"
 
 namespace GeoLib
 {
diff --git a/Applications/DataExplorer/DataView/StationTreeView.cpp b/Applications/DataExplorer/DataView/StationTreeView.cpp
index 67751b585cf2edbd3c8099a303d82b15eb6c4e6d..7b61fc1ad4b16b5d711b197c7f96c7d9680d2605 100644
--- a/Applications/DataExplorer/DataView/StationTreeView.cpp
+++ b/Applications/DataExplorer/DataView/StationTreeView.cpp
@@ -17,15 +17,15 @@
 #include <QFileDialog>
 #include <QMenu>
 
-#include "DiagramPrefsDialog.h"
-#include "GMSInterface.h"
-#include "ImportFileTypes.h"
-#include "LastSavedFileDirectory.h"
+#include "DiagramView/DiagramPrefsDialog.h"
+#include "Applications/FileIO/GMSInterface.h"
+#include "Base/ImportFileTypes.h"
+#include "Base/LastSavedFileDirectory.h"
 #include "ModelTreeItem.h"
-#include "OGSError.h"
-#include "Station.h"
+#include "Base/OGSError.h"
+#include "GeoLib/Station.h"
 #include "StationTreeModel.h"
-#include "StratWindow.h"
+#include "DataView/StratView/StratWindow.h"
 
 StationTreeView::StationTreeView(QWidget* parent) : QTreeView(parent)
 {
diff --git a/Applications/DataExplorer/DataView/StratView/CMakeLists.txt b/Applications/DataExplorer/DataView/StratView/CMakeLists.txt
index e7543b2cefb9187df8f48e6109372851bd85c15c..842082f6d9a92a3c4db74edf18d06c8a6af7c060 100644
--- a/Applications/DataExplorer/DataView/StratView/CMakeLists.txt
+++ b/Applications/DataExplorer/DataView/StratView/CMakeLists.txt
@@ -4,17 +4,11 @@ set(HEADERS StratBar.h StratScene.h StratView.h StratWindow.h)
 
 set(SOURCE_DIR_REL ${CMAKE_CURRENT_SOURCE_DIR}/../../../..)
 set(GUI_SOURCE_DIR_REL ${CMAKE_CURRENT_SOURCE_DIR}/../..)
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR} ${SOURCE_DIR_REL}/BaseLib
-    ${SOURCE_DIR_REL}/GeoLib ${SOURCE_DIR_REL}/MathLib
-    ${GUI_SOURCE_DIR_REL}/Base
-)
-
 file(GLOB_RECURSE UI_FILES CONFIGURE_DEPENDS *.ui)
 source_group("UI Files" FILES ${UI_FILES})
 
 ogs_add_library(QtStratView ${SOURCES} ${HEADERS} ${UIS})
-
+target_include_directories(QtStratView PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 target_link_libraries(
     QtStratView PRIVATE BaseLib GeoLib DataHolderLib QtBase Qt5::Gui
 )
diff --git a/Applications/DataExplorer/DataView/StratView/StratBar.h b/Applications/DataExplorer/DataView/StratView/StratBar.h
index 6c3e3d30a0c3e830b8770f286ba9297cd2f0ef04..54bc7b47a565a64aa42c28825613f8c8d533593f 100644
--- a/Applications/DataExplorer/DataView/StratView/StratBar.h
+++ b/Applications/DataExplorer/DataView/StratView/StratBar.h
@@ -18,7 +18,7 @@
 
 #include <QGraphicsItem>
 
-#include "StationBorehole.h"
+#include "GeoLib/StationBorehole.h"
 #include "Applications/DataHolderLib/Color.h"
 
 /**
diff --git a/Applications/DataExplorer/DataView/StratView/StratScene.cpp b/Applications/DataExplorer/DataView/StratView/StratScene.cpp
index 37e14d18c2356a2bff6c415959ac58b69c8bccbd..e730d3a1c861a8e57b39812ac29402d2ce622fc5 100644
--- a/Applications/DataExplorer/DataView/StratView/StratScene.cpp
+++ b/Applications/DataExplorer/DataView/StratView/StratScene.cpp
@@ -19,8 +19,8 @@
 #include <QGraphicsTextItem>
 #include <limits>
 
-#include "DateTools.h"
-#include "QNonScalableGraphicsTextItem.h"
+#include "BaseLib/DateTools.h"
+#include "Base/QNonScalableGraphicsTextItem.h"
 #include "StratBar.h"
 
 StratScene::StratScene(GeoLib::StationBorehole* station,
diff --git a/Applications/DataExplorer/DataView/StratView/StratScene.h b/Applications/DataExplorer/DataView/StratView/StratScene.h
index 6005c01967c6074155d84d1820bb89c1eb1a586f..236c3dff404b5cb0c1e130fb9d17c4e27e9247be 100644
--- a/Applications/DataExplorer/DataView/StratView/StratScene.h
+++ b/Applications/DataExplorer/DataView/StratView/StratScene.h
@@ -16,7 +16,7 @@
 
 #include <QGraphicsScene>
 
-#include "StationBorehole.h"
+#include "GeoLib/StationBorehole.h"
 #include "Applications/DataHolderLib/Color.h"
 
 class StratBar;
diff --git a/Applications/DataExplorer/DataView/StratView/StratView.cpp b/Applications/DataExplorer/DataView/StratView/StratView.cpp
index ebbb08d696cb244ec927ea1333282f47846b782f..268d9458078da1fd759ef21345a823f4cfcd52ce 100644
--- a/Applications/DataExplorer/DataView/StratView/StratView.cpp
+++ b/Applications/DataExplorer/DataView/StratView/StratView.cpp
@@ -16,7 +16,7 @@
 
 #include <math.h>
 
-#include "Station.h"
+#include "GeoLib/Station.h"
 
 StratView::~StratView()
 {
diff --git a/Applications/DataExplorer/DataView/StratView/StratWindow.cpp b/Applications/DataExplorer/DataView/StratView/StratWindow.cpp
index 2fe2c92187b3744ec88442fa466919639a593209..a1352ddfedcb96041cefb0f8540299a0f22bbb5b 100644
--- a/Applications/DataExplorer/DataView/StratView/StratWindow.cpp
+++ b/Applications/DataExplorer/DataView/StratView/StratWindow.cpp
@@ -12,9 +12,9 @@
  *
  */
 
-#include "StratWindow.h"
+#include "DataView/StratView/StratWindow.h"
 
-#include "Station.h"
+#include "GeoLib/Station.h"
 
 StratWindow::StratWindow(
     GeoLib::StationBorehole* station,
diff --git a/Applications/DataExplorer/DataView/StratView/StratWindow.ui b/Applications/DataExplorer/DataView/StratView/StratWindow.ui
index f6719ed02d10b36614ffa183524a81f9ff880101..bbdb860eaa11005d1bd5832251ccb4338b1e59c3 100644
--- a/Applications/DataExplorer/DataView/StratView/StratWindow.ui
+++ b/Applications/DataExplorer/DataView/StratView/StratWindow.ui
@@ -49,7 +49,7 @@
   <customwidget>
    <class>StratView</class>
    <extends>QGraphicsView</extends>
-   <header location="global">StratView.h</header>
+   <header location="global">DataView/StratView/StratView.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/Applications/DataExplorer/VtkVis/CMakeLists.txt b/Applications/DataExplorer/VtkVis/CMakeLists.txt
index e233a2e7e1d2c142d07ad1b1d9f91dfec33fa684..2a5b6774077eeba6d4d90a126f30c71c7d4bcba3 100644
--- a/Applications/DataExplorer/VtkVis/CMakeLists.txt
+++ b/Applications/DataExplorer/VtkVis/CMakeLists.txt
@@ -150,21 +150,9 @@ source_group("UI Files" FILES ${UIS})
 
 set(SOURCE_DIR_REL ${CMAKE_CURRENT_SOURCE_DIR}/../../..)
 set(GUI_SOURCE_DIR_REL ${CMAKE_CURRENT_SOURCE_DIR}/..)
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${SOURCE_DIR_REL}/Applications/FileIO
-    ${SOURCE_DIR_REL}/BaseLib
-    ${SOURCE_DIR_REL}/GeoLib
-    ${SOURCE_DIR_REL}/MathLib
-    ${SOURCE_DIR_REL}/MeshLib
-    ${GUI_SOURCE_DIR_REL}/Base
-    ${GUI_SOURCE_DIR_REL}/DataView
-    ${GUI_SOURCE_DIR_REL}/VtkModules/Qt
-)
 
 ogs_add_library(VtkVis ${SOURCES} ${HEADERS} ${UIS})
-
+target_include_directories(VtkVis PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 if(GEOTIFF_FOUND)
     target_compile_definitions(VtkVis PRIVATE GEOTIFF_FOUND)
     include_directories(${GEOTIFF_INCLUDE_DIRS})
diff --git a/Applications/DataExplorer/VtkVis/MeshFromRasterDialog.cpp b/Applications/DataExplorer/VtkVis/MeshFromRasterDialog.cpp
index f8550a499e9f49bd7c84d3a110cc2d18ee642ac3..11c04b0f9b73b76683e733822d99ff9a0a4dc3fe 100644
--- a/Applications/DataExplorer/VtkVis/MeshFromRasterDialog.cpp
+++ b/Applications/DataExplorer/VtkVis/MeshFromRasterDialog.cpp
@@ -14,8 +14,8 @@
 
 #include "MeshFromRasterDialog.h"
 
-#include "MeshGenerators/VtkMeshConverter.h"
-#include "OGSError.h"
+#include "MeshLib/MeshGenerators/VtkMeshConverter.h"
+#include "Base/OGSError.h"
 
 MeshFromRasterDialog::MeshFromRasterDialog(QDialog* parent)
     : QDialog(parent), _mesh_name("mesh"), _array_name("MaterialIDs")
diff --git a/Applications/DataExplorer/VtkVis/VisPrefs.ui b/Applications/DataExplorer/VtkVis/VisPrefs.ui
index 5541ada8b3c86daea93bf909cef8b50cb4d90579..4b5d402681581e0b985a9871d8c88ee056fc596f 100644
--- a/Applications/DataExplorer/VtkVis/VisPrefs.ui
+++ b/Applications/DataExplorer/VtkVis/VisPrefs.ui
@@ -154,7 +154,7 @@
   <customwidget>
    <class>ColorPickerPushButton</class>
    <extends>QPushButton</extends>
-   <header>ColorPickerPushButton.h</header>
+   <header>Base/ColorPickerPushButton.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/Applications/DataExplorer/VtkVis/VisualizationWidget.cpp b/Applications/DataExplorer/VtkVis/VisualizationWidget.cpp
index 30a542e139ed1cf47a9eec08957bc5fb752a5e53..c9ba487f87ad5abaf9de69645391f2b375aa6fdf 100644
--- a/Applications/DataExplorer/VtkVis/VisualizationWidget.cpp
+++ b/Applications/DataExplorer/VtkVis/VisualizationWidget.cpp
@@ -41,7 +41,7 @@
 #include <QString>
 #include <cmath>
 
-#include "Point.h"
+#include "GeoLib/Point.h"
 #include "VtkCustomInteractorStyle.h"
 #include "VtkPickCallback.h"
 
diff --git a/Applications/DataExplorer/VtkVis/VtkAlgorithmProperties.cpp b/Applications/DataExplorer/VtkVis/VtkAlgorithmProperties.cpp
index 913745a747fdee077be7f33c96c514bc4a91d9f2..8518b3914f1dc03267e85fdc543576e3710e3dad 100644
--- a/Applications/DataExplorer/VtkVis/VtkAlgorithmProperties.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkAlgorithmProperties.cpp
@@ -21,7 +21,7 @@
 #include "Applications/DataHolderLib/ColorLookupTable.h"
 #include "BaseLib/Logging.h"
 #include "VtkColorLookupTable.h"
-#include "XmlIO/Qt/XmlLutReader.h"
+#include "Applications/FileIO/XmlIO/Qt/XmlLutReader.h"
 
 VtkAlgorithmProperties::VtkAlgorithmProperties(QObject* parent /*= nullptr*/)
     : QObject(parent)
diff --git a/Applications/DataExplorer/VtkVis/VtkCompositeColormapToImageFilter.cpp b/Applications/DataExplorer/VtkVis/VtkCompositeColormapToImageFilter.cpp
index 1298484a2066810a57a6b8f05fdfe192adf43a21..3f7f1cac643e74999f72aabc3024e2ace2913c35 100644
--- a/Applications/DataExplorer/VtkVis/VtkCompositeColormapToImageFilter.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkCompositeColormapToImageFilter.cpp
@@ -25,7 +25,7 @@
 #include <QSettings>
 
 #include "VtkColorLookupTable.h"
-#include "XmlIO/Qt/XmlLutReader.h"
+#include "Applications/FileIO/XmlIO/Qt/XmlLutReader.h"
 
 VtkCompositeColormapToImageFilter::VtkCompositeColormapToImageFilter(
     vtkAlgorithm* inputAlgorithm)
diff --git a/Applications/DataExplorer/VtkVis/VtkCompositeGeoObjectFilter.h b/Applications/DataExplorer/VtkVis/VtkCompositeGeoObjectFilter.h
index e516e3d96b3d41765fb8bcc6197def02dc13883a..485d5e61bde9d2491a1a6f3d65a1b7a88423fb42 100644
--- a/Applications/DataExplorer/VtkVis/VtkCompositeGeoObjectFilter.h
+++ b/Applications/DataExplorer/VtkVis/VtkCompositeGeoObjectFilter.h
@@ -15,7 +15,7 @@
 #pragma once
 
 #include "VtkCompositeFilter.h"
-#include "GeoType.h"
+#include "GeoLib/GeoType.h"
 
 class vtkThreshold;
 
diff --git a/Applications/DataExplorer/VtkVis/VtkCompositeNodeSelectionFilter.h b/Applications/DataExplorer/VtkVis/VtkCompositeNodeSelectionFilter.h
index 095b862684a800640b3acee1cb16621342821664..46e80092edac569cb726b2d705c69528f52e450c 100644
--- a/Applications/DataExplorer/VtkVis/VtkCompositeNodeSelectionFilter.h
+++ b/Applications/DataExplorer/VtkVis/VtkCompositeNodeSelectionFilter.h
@@ -15,7 +15,7 @@
 #pragma once
 
 #include "VtkCompositeFilter.h"
-#include "Point.h"
+#include "GeoLib/Point.h"
 
 #include <vector>
 
diff --git a/Applications/DataExplorer/VtkVis/VtkPointsSource.h b/Applications/DataExplorer/VtkVis/VtkPointsSource.h
index 670e8cc240f2c889de4861591dce344d45b62eb5..2683f8aaec7e50bcb9281655938119aca632a7ff 100644
--- a/Applications/DataExplorer/VtkVis/VtkPointsSource.h
+++ b/Applications/DataExplorer/VtkVis/VtkPointsSource.h
@@ -18,8 +18,7 @@
 #include "VtkAlgorithmProperties.h"
 #include <vtkPolyDataAlgorithm.h>
 
-// GeoLib
-#include "Point.h"
+#include "GeoLib/Point.h"
 
 /**
  * \brief VtkPointsSource is a VTK source object for the visualization
diff --git a/Applications/DataExplorer/VtkVis/VtkPolylinesSource.cpp b/Applications/DataExplorer/VtkVis/VtkPolylinesSource.cpp
index 03278132371e0983c7c1f6f70368904937ed8620..56b226e8799e33a181dc77c2c79291b9700cfe2f 100644
--- a/Applications/DataExplorer/VtkVis/VtkPolylinesSource.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkPolylinesSource.cpp
@@ -29,7 +29,7 @@
 
 #include "Applications/DataHolderLib/Color.h"
 #include "BaseLib/Logging.h"
-#include "Polyline.h"
+#include "GeoLib/Polyline.h"
 
 vtkStandardNewMacro(VtkPolylinesSource);
 
diff --git a/Applications/DataExplorer/VtkVis/VtkStationSource.cpp b/Applications/DataExplorer/VtkVis/VtkStationSource.cpp
index 33857343a2b0e3aca88626dafcdcbbaabdeed8c4..639b0ee861ac630a2d90217aa51c264375cbb39b 100644
--- a/Applications/DataExplorer/VtkVis/VtkStationSource.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkStationSource.cpp
@@ -29,7 +29,7 @@
 #include <vtkStreamingDemandDrivenPipeline.h>
 
 #include "BaseLib/Logging.h"
-#include "StationBorehole.h"
+#include "GeoLib/StationBorehole.h"
 #include "vtkObjectFactory.h"
 
 vtkStandardNewMacro(VtkStationSource);
diff --git a/Applications/DataExplorer/VtkVis/VtkSurfacesSource.h b/Applications/DataExplorer/VtkVis/VtkSurfacesSource.h
index f948eff3cfd918d964d9987550ea9ddd13acd475..c0e208ce8882092599d347883081c49a5c588f31 100644
--- a/Applications/DataExplorer/VtkVis/VtkSurfacesSource.h
+++ b/Applications/DataExplorer/VtkVis/VtkSurfacesSource.h
@@ -18,7 +18,7 @@
 #include "VtkAlgorithmProperties.h"
 #include <vtkPolyDataAlgorithm.h>
 
-#include "Surface.h"
+#include "GeoLib/Surface.h"
 
 /**
  * \brief VTK source object for the visualisation of surfaces.
diff --git a/Applications/DataExplorer/VtkVis/VtkTextureOnSurfaceFilter.cpp b/Applications/DataExplorer/VtkVis/VtkTextureOnSurfaceFilter.cpp
index 319494010d97fd19e75adf1a9a6014234c3f1748..5c8b82d1ab5ca6314ce3816e8444a9449fc056ee 100644
--- a/Applications/DataExplorer/VtkVis/VtkTextureOnSurfaceFilter.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkTextureOnSurfaceFilter.cpp
@@ -29,7 +29,7 @@
 #include <vtkTexture.h>
 
 #include "BaseLib/Logging.h"
-#include "MathTools.h"
+#include "MathLib/MathTools.h"
 #include "VtkVisHelper.h"
 
 vtkStandardNewMacro(VtkTextureOnSurfaceFilter);
diff --git a/Applications/DataExplorer/VtkVis/VtkVisPipeline.cpp b/Applications/DataExplorer/VtkVis/VtkVisPipeline.cpp
index adc45ead081c5983fec135be5d41e5639e6cbd13..b9b251d84130bc070f361fc3476f026db5332f34 100644
--- a/Applications/DataExplorer/VtkVis/VtkVisPipeline.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkVisPipeline.cpp
@@ -44,14 +44,14 @@
 #include <QString>
 
 #include "BaseLib/Logging.h"
-#include "GeoTreeModel.h"
+#include "DataView/GeoTreeModel.h"
 #include "MathLib/InterpolationAlgorithms/LinearIntervalInterpolation.h"
-#include "MeshItem.h"
+#include "DataView/MeshItem.h"
 #include "MeshLib/Mesh.h"
 #include "MeshLib/Vtk/VtkMappedMeshSource.h"
-#include "MeshModel.h"
-#include "StationTreeModel.h"
-#include "TreeModel.h"
+#include "DataView/MeshModel.h"
+#include "DataView/StationTreeModel.h"
+#include "Base/TreeModel.h"
 #include "VtkAlgorithmProperties.h"
 #include "VtkCompositeElementSelectionFilter.h"
 #include "VtkCompositeGeoObjectFilter.h"
diff --git a/Applications/DataExplorer/VtkVis/VtkVisPipeline.h b/Applications/DataExplorer/VtkVis/VtkVisPipeline.h
index 6b614dcb5e84740878b95297476c2e5e06daa369..cdb387f8d404c208a8f43ea60e558d3b63da7f57 100644
--- a/Applications/DataExplorer/VtkVis/VtkVisPipeline.h
+++ b/Applications/DataExplorer/VtkVis/VtkVisPipeline.h
@@ -21,7 +21,7 @@
 #include "GeoLib/GeoType.h"
 #include "GeoLib/Point.h"
 #include "MeshLib/MeshEnums.h"
-#include "TreeModel.h"
+#include "Base/TreeModel.h"
 
 class vtkAlgorithm;
 class vtkDataSet;
diff --git a/Applications/DataExplorer/VtkVis/VtkVisPipelineItem.cpp b/Applications/DataExplorer/VtkVis/VtkVisPipelineItem.cpp
index 5989710ba9b00dce52da55cd2488967fc274f883..45058bc6cd68a6077344e53676dff53107db5f82 100644
--- a/Applications/DataExplorer/VtkVis/VtkVisPipelineItem.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkVisPipelineItem.cpp
@@ -30,7 +30,7 @@
 
 #include <QMessageBox>
 
-#include "FileTools.h"
+#include "BaseLib/FileTools.h"
 #include "QVtkDataSetMapper.h"
 #include "VtkAlgorithmProperties.h"
 #include "VtkCompositeFilter.h"
diff --git a/Applications/DataExplorer/VtkVis/VtkVisPipelineItem.h b/Applications/DataExplorer/VtkVis/VtkVisPipelineItem.h
index 4a0c4024e3876620a6335f0ceca248cb5452b9cc..2d13126936247369e4362ee1f6f5afeea1979f63 100644
--- a/Applications/DataExplorer/VtkVis/VtkVisPipelineItem.h
+++ b/Applications/DataExplorer/VtkVis/VtkVisPipelineItem.h
@@ -19,7 +19,7 @@
 #include <QString>
 #include <QVariant>
 
-#include "TreeItem.h"
+#include "Base/TreeItem.h"
 
 class QStringList;
 class vtkAlgorithm;
diff --git a/Applications/DataExplorer/VtkVis/VtkVisPipelineView.cpp b/Applications/DataExplorer/VtkVis/VtkVisPipelineView.cpp
index ba59fee94b5c454db4e532f60490276211ace5f2..ee79cce90bcfdf02c47b3f1102b45e32411aa81d 100644
--- a/Applications/DataExplorer/VtkVis/VtkVisPipelineView.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkVisPipelineView.cpp
@@ -26,11 +26,11 @@
 #include <QMessageBox>
 #include <QSettings>
 
-#include "CheckboxDelegate.h"
-#include "Mesh.h"
-#include "MeshGenerators/RasterToMesh.h"
-#include "MeshGenerators/VtkMeshConverter.h"
-#include "OGSError.h"
+#include "Base/CheckboxDelegate.h"
+#include "MeshLib/Mesh.h"
+#include "MeshLib/MeshGenerators/RasterToMesh.h"
+#include "MeshLib/MeshGenerators/VtkMeshConverter.h"
+#include "Base/OGSError.h"
 #include "VtkVisPipeline.h"
 #include "VtkVisPipelineItem.h"
 #include "VtkVisPointSetItem.h"
diff --git a/Applications/DataExplorer/VtkVis/VtkVisTabWidgetBase.ui b/Applications/DataExplorer/VtkVis/VtkVisTabWidgetBase.ui
index 7c19716465c043917cc4e04f9650ad3c2c9ebd3b..cd3382e354b7d48d89a710646046844ac368f379 100644
--- a/Applications/DataExplorer/VtkVis/VtkVisTabWidgetBase.ui
+++ b/Applications/DataExplorer/VtkVis/VtkVisTabWidgetBase.ui
@@ -407,7 +407,7 @@
   <customwidget>
    <class>ColorPickerPushButton</class>
    <extends>QPushButton</extends>
-   <header>ColorPickerPushButton.h</header>
+   <header>Base/ColorPickerPushButton.h</header>
   </customwidget>
   <customwidget>
    <class>VtkVisPipelineView</class>
@@ -417,7 +417,7 @@
   <customwidget>
    <class>QValueTooltipSlider</class>
    <extends>QSlider</extends>
-   <header>QValueTooltipSlider.h</header>
+   <header>Base/QValueTooltipSlider.h</header>
   </customwidget>
  </customwidgets>
  <resources>
diff --git a/Applications/DataExplorer/mainwindow.cpp b/Applications/DataExplorer/mainwindow.cpp
index 6c148d1dd0298130e25c657c28b148e87c6cf49c..4568081509aeddea4a46c2db9757c5d1e853bcac 100644
--- a/Applications/DataExplorer/mainwindow.cpp
+++ b/Applications/DataExplorer/mainwindow.cpp
@@ -67,33 +67,33 @@
 #include "MeshLib/convertMeshToGeo.h"
 
 // Dialogs
-#include "CreateStructuredGridDialog.h"
-#include "DataExplorerSettingsDialog.h"
-#include "DiagramPrefsDialog.h"
-#include "GMSHPrefsDialog.h"
-#include "GeoOnMeshMappingDialog.h"
-#include "LicenseDialog.h"
-#include "LineEditDialog.h"
-#include "MergeGeometriesDialog.h"
-#include "MeshAnalysisDialog.h"
-#include "MeshElementRemovalDialog.h"
-#include "MeshQualitySelectionDialog.h"
+#include "DataView/CreateStructuredGridDialog.h"
+#include "DataView/DataExplorerSettingsDialog.h"
+#include "DataView/DiagramView/DiagramPrefsDialog.h"
+#include "DataView/GMSHPrefsDialog.h"
+#include "DataView/GeoOnMeshMappingDialog.h"
+#include "DataView/LicenseDialog.h"
+#include "DataView/LineEditDialog.h"
+#include "DataView/MergeGeometriesDialog.h"
+#include "DataView/MeshAnalysisDialog.h"
+#include "DataView/MeshElementRemovalDialog.h"
+#include "DataView/MeshQualitySelectionDialog.h"
 #ifdef OGS_USE_NETCDF
-#include "NetCdfConfigureDialog.h"
+#include "VtkVis/NetCdfConfigureDialog.h"
 #endif  // OGS_USE_NETCDF
-#include "GeoTreeModel.h"
-#include "LastSavedFileDirectory.h"
-#include "OGSError.h"
-#include "RecentFiles.h"
-#include "SHPImportDialog.h"
-#include "SetNameDialog.h"
-#include "StationTreeModel.h"
-#include "TreeModelIterator.h"
-#include "VtkAddFilterDialog.h"
-#include "VtkBGImageSource.h"
-#include "VtkGeoImageSource.h"
-#include "VtkRaster.h"
-#include "VtkVisPipelineItem.h"
+#include "DataView/GeoTreeModel.h"
+#include "Base/LastSavedFileDirectory.h"
+#include "Base/OGSError.h"
+#include "Base/RecentFiles.h"
+#include "DataView/SHPImportDialog.h"
+#include "DataView/SetNameDialog.h"
+#include "DataView/StationTreeModel.h"
+#include "Base/TreeModelIterator.h"
+#include "VtkVis/VtkAddFilterDialog.h"
+#include "VtkVis/VtkBGImageSource.h"
+#include "VtkVis/VtkGeoImageSource.h"
+#include "VtkVis/VtkRaster.h"
+#include "VtkVis/VtkVisPipelineItem.h"
 
 using namespace FileIO;
 
diff --git a/Applications/DataExplorer/mainwindow.h b/Applications/DataExplorer/mainwindow.h
index 903cbcadec53ffad5bab2329de7a3cad7280959a..a29df0f40243cc18b740b75ec7a3fdfd26ddbde3 100644
--- a/Applications/DataExplorer/mainwindow.h
+++ b/Applications/DataExplorer/mainwindow.h
@@ -14,16 +14,16 @@
 
 #include "Applications/DataHolderLib/Project.h"
 
-#include "ImportFileTypes.h"
+#include "Base/ImportFileTypes.h"
 #include "ui_mainwindow.h"
 
-#include "ElementTreeModel.h"
-#include "FemConditionModel.h"
-#include "GEOModels.h"
-#include "MeshModel.h"
-#include "ProcessModel.h"
-#include "VisPrefsDialog.h"
-#include "VtkVisPipeline.h"
+#include "DataView/ElementTreeModel.h"
+#include "DataView/FemConditionModel.h"
+#include "DataView/GEOModels.h"
+#include "DataView/MeshModel.h"
+#include "DataView/ProcessModel.h"
+#include "VtkVis/VisPrefsDialog.h"
+#include "VtkVis/VtkVisPipeline.h"
 
 class TreeModel;
 
diff --git a/Applications/FileIO/GocadIO/CMakeLists.txt b/Applications/FileIO/GocadIO/CMakeLists.txt
deleted file mode 100644
index 82f8dd1bce426741eba253a52eccec1f4156c4d9..0000000000000000000000000000000000000000
--- a/Applications/FileIO/GocadIO/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-include_directories(
-    ${CMAKE_SOURCE_DIR}/BaseLib ${CMAKE_SOURCE_DIR}/FileIO
-    ${CMAKE_SOURCE_DIR}/GeoLib ${CMAKE_SOURCE_DIR}/MeshLib
-)
diff --git a/Applications/Utils/FileConverter/NetCdfConverter.cpp b/Applications/Utils/FileConverter/NetCdfConverter.cpp
index b199acb1e34500b2cb9d29d1e8062b613ad3bf05..b5626adc44b76d1bbb587db9add9fad0c2e23bd4 100644
--- a/Applications/Utils/FileConverter/NetCdfConverter.cpp
+++ b/Applications/Utils/FileConverter/NetCdfConverter.cpp
@@ -434,7 +434,7 @@ static std::vector<std::size_t> getLength(NcVar const& var,
     return length;
 }
 
-static std::vector<double> getData(NcFile const& dataset, NcVar const& var,
+static std::vector<double> getData(NcVar const& var,
                                    std::size_t const total_length,
                                    std::size_t const time_step,
                                    std::vector<std::size_t> const& length)
@@ -562,8 +562,7 @@ static bool convert(NcFile const& dataset, NcVar const& var,
                 ? std::string(" time step " + std::to_string(i))
                 : "";
         std::cout << "Converting" << step_str << "...\n";
-        std::vector<double> data_vec =
-            getData(dataset, var, array_length, i, length);
+        std::vector<double> data_vec = getData(var, array_length, i, length);
 
         // reverse lines in vertical direction if file has its origin in the
         // northwest corner
diff --git a/Applications/Utils/MeshGeoTools/VerticalSliceFromLayers.cpp b/Applications/Utils/MeshGeoTools/VerticalSliceFromLayers.cpp
index 6d6a07f80b5ab4f30cbad3a7ef6c2d6a3a989d50..42f91b768881c1c2a47958d81c31784bb9f33634 100644
--- a/Applications/Utils/MeshGeoTools/VerticalSliceFromLayers.cpp
+++ b/Applications/Utils/MeshGeoTools/VerticalSliceFromLayers.cpp
@@ -166,7 +166,6 @@ void mergeGeometries(GeoLib::GEOObjects& geo,
         lines->push_back(line);
     }
 
-    std::size_t const n_lines = lines->size();
     geo.addPointVec(std::move(points), merged_geo_name);
     geo.addPolylineVec(std::move(lines), merged_geo_name);
 }
@@ -229,8 +228,7 @@ MeshLib::Mesh* generateMesh(GeoLib::GEOObjects& geo,
         geo, true, FileIO::GMSH::MeshDensityAlgorithm::FixedMeshDensity, res, 0,
         0, gmsh_geo, false, false);
     gmsh_io.writePhysicalGroups(true);
-    bool const success =
-        BaseLib::IO::writeStringToFile(gmsh_io.writeToString(), gmsh_geo_name);
+    BaseLib::IO::writeStringToFile(gmsh_io.writeToString(), gmsh_geo_name);
 
     std::string const gmsh_mesh_name = output_name + ".msh";
     std::string gmsh_command = "gmsh -2 -algo meshadapt " + gmsh_geo_name;
diff --git a/Applications/Utils/SWMMConverter/CMakeLists.txt b/Applications/Utils/SWMMConverter/CMakeLists.txt
index 9603ac9db5c161acc73977ba98bde54a2711e773..3aca6eb85d37a98c5eb0a2fb9be4ea3a7b64fc82 100644
--- a/Applications/Utils/SWMMConverter/CMakeLists.txt
+++ b/Applications/Utils/SWMMConverter/CMakeLists.txt
@@ -8,5 +8,4 @@ target_link_libraries(
     SwmmInterface
     tclap
 )
-include_directories(${PROJECT_SOURCE_DIR}/Applications/FileIO)
 install(TARGETS SWMMConverter RUNTIME DESTINATION bin)
diff --git a/BaseLib/CMakeLists.txt b/BaseLib/CMakeLists.txt
index 77d904ff5ebc578db6db12a629734959e947622b..be3eab56e93221baca3c909dcb9bffbe3896a08d 100644
--- a/BaseLib/CMakeLists.txt
+++ b/BaseLib/CMakeLists.txt
@@ -16,10 +16,10 @@ target_link_libraries(
            $<$<BOOL:${MSVC}>:WinMM> # needed for timeGetTime
            $<$<BOOL:${OGS_BUILD_GUI}>:Qt5::Xml>
            $<$<BOOL:${OGS_BUILD_GUI}>:Qt5::XmlPatterns>
+           $<$<BOOL:${OGS_USE_PETSC}>:petsc>
     PRIVATE xmlpatch
 )
 
 target_compile_definitions(
     BaseLib PUBLIC $<$<BOOL:${OGS_FATAL_ABORT}>:OGS_FATAL_ABORT>
-    PRIVATE $<$<BOOL:${OGS_USE_PETSC}>:USE_PETSC>
 )
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 227945e2e9721c698c3d4f577dc0b6931d468bcd..1a10760fb25858afa4fbbc412c6b31dac04a2a4a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -186,40 +186,12 @@ option(OGS_USE_MFRONT
        "Enable solid material models by MFront (https://tfel.sourceforge.net)"
        OFF
 )
-# ---- Definitions ----
-if(OGS_USE_LIS)
-    include_directories(SYSTEM ${LIS_INCLUDE_DIR})
-endif()
-
-if(OGS_USE_MKL)
-    include_directories(SYSTEM ${MKL_INCLUDE_DIR})
-endif()
-
-# Eigen
-if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-    add_definitions(-DEIGEN_INITIALIZE_MATRICES_BY_NAN)
-endif()
-if(EIGEN_NO_DEBUG)
-    add_definitions(-DEIGEN_NO_DEBUG)
-endif()
-if(EIGEN_DONT_VECTORIZE)
-    add_definitions(-DEIGEN_DONT_VECTORIZE)
-endif()
-if(OGS_EIGEN_DYNAMIC_SHAPE_MATRICES_INTERNAL)
-    add_definitions(-DOGS_EIGEN_DYNAMIC_SHAPE_MATRICES)
-endif()
-if(OGS_USE_EIGEN_UNSUPPORTED)
-    add_definitions(-DUSE_EIGEN_UNSUPPORTED)
-endif()
-if(OGS_EIGEN_INITIALIZE_MATRICES_BY_NAN)
-    add_definitions(-DEIGEN_INITIALIZE_MATRICES_BY_NAN)
-endif()
 
 # Packaging
 include(scripts/cmake/packaging/Pack.cmake)
 
 # ---- Subdirectories ----
-
+include_directories(${PROJECT_SOURCE_DIR})
 # xdmfdiff
 if(OGS_USE_XDMF AND OGS_BUILD_TESTING)
     add_subdirectory(Tests/xdmfdiff)
diff --git a/InfoLib/CMakeLists.txt b/InfoLib/CMakeLists.txt
index c969ed7358d5c4a5a0815b8b78c95ced28a66535..4d1d1f6a86bbbcac617a31ba78d6a3f08849b3b9 100644
--- a/InfoLib/CMakeLists.txt
+++ b/InfoLib/CMakeLists.txt
@@ -7,6 +7,4 @@ foreach(lib Git CMake Test)
     ogs_add_library(
         ${lib}InfoLib ${CMAKE_CURRENT_BINARY_DIR}/${lib}Info.cpp ${lib}Info.h
     )
-
-    target_include_directories(${lib}InfoLib PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
 endforeach(lib)
diff --git a/MathLib/CMakeLists.txt b/MathLib/CMakeLists.txt
index bcfdca3cfc83e077ac69010928cff8a9f9750974..4f52278230d7a474e5289e4a2f5b3185c955375f 100644
--- a/MathLib/CMakeLists.txt
+++ b/MathLib/CMakeLists.txt
@@ -22,10 +22,6 @@ endif()
 
 # Create the library
 ogs_add_library(MathLib ${SOURCES})
-target_include_directories(
-    MathLib PUBLIC ${CMAKE_CURRENT_BINARY_DIR}
-                   $<$<BOOL:${OGS_USE_PETSC}>:${PETSC_INCLUDE_DIRS}>
-)
 
 set_target_properties(MathLib PROPERTIES LINKER_LANGUAGE CXX)
 
@@ -36,20 +32,29 @@ target_link_libraries(
            $<$<TARGET_EXISTS:LAPACK::LAPACK>:LAPACK::LAPACK>
            $<$<BOOL:${OGS_USE_LIS}>:${LIS_LIBRARIES}>
            $<$<BOOL:${OGS_USE_CVODE}>:CVODE::CVODE>
+           $<$<BOOL:${OGS_USE_PETSC}>:petsc>
            Eigen3::Eigen
     PRIVATE spdlog::spdlog
 )
 
-if(OGS_USE_PETSC)
-    target_link_libraries(MathLib PUBLIC ${PETSC_LIBRARIES})
+if(OGS_USE_LIS)
+    target_include_directories(MathLib PUBLIC ${LIS_INCLUDE_DIR})
 endif()
 if(OGS_USE_MKL)
+    target_include_directories(MathLib PRIVATE ${MKL_INCLUDE_DIR})
     target_link_libraries(MathLib PUBLIC ${MKL_LIBRARIES})
 endif()
 
 target_compile_definitions(
     MathLib
-    PUBLIC $<$<BOOL:${USE_LIS}>:USE_LIS> $<$<BOOL:${OGS_USE_PETSC}>:USE_PETSC>
-           $<$<BOOL:${OGS_USE_CVODE}>:CVODE_FOUND>
+    PUBLIC
+        $<$<BOOL:${USE_LIS}>:USE_LIS>
+        $<$<BOOL:${OGS_USE_CVODE}>:CVODE_FOUND>
+        $<$<BOOL:${EIGEN_NO_DEBUG}>:EIGEN_NO_DEBUG>
+        $<$<BOOL:${EIGEN_DONT_VECTORIZE}>:EIGEN_DONT_VECTORIZE>
+        $<$<BOOL:${OGS_EIGEN_DYNAMIC_SHAPE_MATRICES_INTERNAL}>:OGS_EIGEN_DYNAMIC_SHAPE_MATRICES>
+        $<$<BOOL:${OGS_USE_EIGEN_UNSUPPORTED}>:USE_EIGEN_UNSUPPORTED>
+        $<$<BOOL:${OGS_EIGEN_INITIALIZE_MATRICES_BY_NAN}>:EIGEN_INITIALIZE_MATRICES_BY_NAN>
+        $<$<CONFIG:Debug>:EIGEN_INITIALIZE_MATRICES_BY_NAN>
     PRIVATE $<$<BOOL:${OGS_USE_MKL}>:USE_MKL>
 )
diff --git a/MeshLib/CMakeLists.txt b/MeshLib/CMakeLists.txt
index 04c4e50e1c3a7f63e816364e43b90c86daae4591..e88a2e9cfc44fc4b8f7e98d008207cb342bcb5a5 100644
--- a/MeshLib/CMakeLists.txt
+++ b/MeshLib/CMakeLists.txt
@@ -41,6 +41,7 @@ target_link_libraries(
            ${VTK_LIBRARIES}
            $<$<TARGET_EXISTS:OgsXdmf>:OgsXdmf>
            $<$<TARGET_EXISTS:MPI::MPI_CXX>:MPI::MPI_CXX>
+           $<$<TARGET_EXISTS:petsc>:petsc>
     PRIVATE spdlog::spdlog
 )
 
@@ -49,7 +50,6 @@ target_include_directories(MeshLib PUBLIC ${VTK_INCLUDE_DIRS})
 target_compile_definitions(
     MeshLib
     PUBLIC
-        $<$<BOOL:${OGS_USE_PETSC}>:USE_PETSC>
         $<$<AND:$<BOOL:$ENV{VTK_USE_64BIT_IDS}>,$<NOT:$<BOOL:VTK_ADDED>>>:VTK_USE_64BIT_IDS>
     PRIVATE $<$<BOOL:${OGS_USE_XDMF}>:OGS_USE_XDMF>
 )
diff --git a/NumLib/CMakeLists.txt b/NumLib/CMakeLists.txt
index 0e3586107755bef08b6de12691477974ed77c7c7..6fd30aa6110a1e49bd2f69a6b7d6f078049d88db 100644
--- a/NumLib/CMakeLists.txt
+++ b/NumLib/CMakeLists.txt
@@ -15,13 +15,9 @@ append_source_files(SOURCES Extrapolation)
 
 # Create the library
 ogs_add_library(NumLib ${SOURCES})
-target_include_directories(NumLib PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
-if(OGS_USE_PETSC)
-    target_compile_definitions(NumLib PUBLIC USE_PETSC)
-endif()
 set_target_properties(NumLib PROPERTIES LINKER_LANGUAGE CXX)
 
 target_link_libraries(
-    NumLib PUBLIC BaseLib GeoLib MathLib MeshLib PRIVATE MeshGeoToolsLib
-                                                         spdlog::spdlog
+    NumLib PUBLIC BaseLib GeoLib MathLib MeshLib $<$<TARGET_EXISTS:petsc>:petsc>
+    PRIVATE MeshGeoToolsLib spdlog::spdlog
 )
diff --git a/ProcessLib/CMakeLists.txt b/ProcessLib/CMakeLists.txt
index aec3f549ad967e498caeeb0115e3cef11e39750c..e9d496842f9affba359948c2197ea0c85176721c 100644
--- a/ProcessLib/CMakeLists.txt
+++ b/ProcessLib/CMakeLists.txt
@@ -33,6 +33,7 @@ target_link_libraries(
         NumLib
         $<$<TARGET_EXISTS:ProcessLibBoundaryConditionPython>:ProcessLibBoundaryConditionPython>
         $<$<TARGET_EXISTS:ProcessLibSourceTermPython>:ProcessLibSourceTermPython>
+        $<$<TARGET_EXISTS:petsc>:petsc>
         nlohmann_json
     PRIVATE ParameterLib GitInfoLib spdlog::spdlog
             $<$<TARGET_EXISTS:InSituLib>:InSituLib>
@@ -40,8 +41,7 @@ target_link_libraries(
 
 target_compile_definitions(
     ProcessLib
-    PUBLIC $<$<BOOL:${OGS_USE_PETSC}>:USE_PETSC>
-           $<$<BOOL:${OGS_USE_XDMF}>:OGS_USE_XDMF>
+    PUBLIC $<$<BOOL:${OGS_USE_XDMF}>:OGS_USE_XDMF>
            # Enabled elements
            OGS_MAX_ELEMENT_DIM=${OGS_MAX_ELEMENT_DIM}
            OGS_MAX_ELEMENT_ORDER=${OGS_MAX_ELEMENT_ORDER}
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index d9b3e85e6d1501144c14fe3e2ec32dd7a9a5d25f..308443f97056f2cfe7aa5bc791403fd6d5ba445d 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -80,12 +80,9 @@ target_link_libraries(
             $<$<TARGET_EXISTS:MPI::MPI_CXX>:MPI::MPI_CXX>
             $<$<TARGET_EXISTS:SwmmInterface>:SwmmInterface>
             $<$<TARGET_EXISTS:InSituLib>:InSituLib>
+            $<$<TARGET_EXISTS:petsc>:petsc>
 )
 
-if(OGS_USE_PETSC)
-    target_link_libraries(testrunner PRIVATE ${PETSC_LIBRARIES})
-endif()
-
 if(OGS_BUILD_GUI)
     target_compile_definitions(testrunner PUBLIC OGS_BUILD_GUI)
     target_link_libraries(
diff --git a/scripts/cmake/Find.cmake b/scripts/cmake/Find.cmake
index c9cbd7f54ed3f3af5d2b6fd497da14c471d758f0..faac5224537537f452df9509c46b017b6ea35110 100644
--- a/scripts/cmake/Find.cmake
+++ b/scripts/cmake/Find.cmake
@@ -133,7 +133,10 @@ if(OGS_USE_PETSC)
 
     find_package(PETSc ${ogs.minimum_version.petsc} REQUIRED)
 
-    include_directories(SYSTEM ${PETSC_INCLUDES})
+    add_library(petsc SHARED IMPORTED)
+    target_include_directories(petsc INTERFACE ${PETSC_INCLUDES})
+    set_target_properties(petsc PROPERTIES IMPORTED_LOCATION ${PETSC_LIBRARIES})
+    target_compile_definitions(petsc INTERFACE USE_PETSC)
 endif()
 
 # Check MPI package
diff --git a/scripts/cmake/ProjectSetup.cmake b/scripts/cmake/ProjectSetup.cmake
index 3cc5260cbe1177e4954a1053c95e166bed7b616f..06d3bdc273e552ff58af3c1a9c5327586891c65d 100644
--- a/scripts/cmake/ProjectSetup.cmake
+++ b/scripts/cmake/ProjectSetup.cmake
@@ -30,8 +30,6 @@ set(Data_BINARY_DIR ${PROJECT_BINARY_DIR}/Tests/Data CACHE INTERNAL "")
 # Enable Visual Studio project folder grouping
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-
 # RPATH setup
 if(APPLE)
     set(BASEPOINT @loader_path)