diff --git a/Applications/DataExplorer/DataExplorer.cmake b/Applications/DataExplorer/DataExplorer.cmake
index 074582ca08d07acc2bd2172257dffa446ed14860..cbb440bf5ae83ac19a587912fe348e7b233d1405 100644
--- a/Applications/DataExplorer/DataExplorer.cmake
+++ b/Applications/DataExplorer/DataExplorer.cmake
@@ -57,7 +57,6 @@ target_link_libraries(DataExplorer
     ApplicationsFileIO
     DataHolderLib
     FileIO
-    InSituLib
     QtDataView
     QtDiagramView
     QtStratView
diff --git a/Applications/DataExplorer/DataView/ElementTreeModel.cpp b/Applications/DataExplorer/DataView/ElementTreeModel.cpp
index 60eb874656f9529c57209f347c2440f1e17f519b..a0ad41227111fe1d776f71254c3a8d3e87efb6fa 100644
--- a/Applications/DataExplorer/DataView/ElementTreeModel.cpp
+++ b/Applications/DataExplorer/DataView/ElementTreeModel.cpp
@@ -21,7 +21,7 @@
 
 #include "GeoLib/AABB.h"
 
-#include "MeshLib/VtkMappedMeshSource.h"
+#include "MeshLib/vtk/VtkMappedMeshSource.h"
 
 #include "TreeItem.h"
 
diff --git a/Applications/DataExplorer/DataView/MshItem.cpp b/Applications/DataExplorer/DataView/MshItem.cpp
index 26bc8cdf390f995a8c0fe1abc83cace2246b45f8..663662fee77d85d3786f5c16a3053bbe9502ed05 100644
--- a/Applications/DataExplorer/DataView/MshItem.cpp
+++ b/Applications/DataExplorer/DataView/MshItem.cpp
@@ -13,7 +13,7 @@
  */
 
 #include "MshItem.h"
-#include "MeshLib/VtkMappedMeshSource.h"
+#include "MeshLib/Vtk/VtkMappedMeshSource.h"
 
 /**
  * Constructor.
diff --git a/Applications/DataExplorer/DataView/MshItem.h b/Applications/DataExplorer/DataView/MshItem.h
index 7855aa7acdccf1a373fb30f0b5ec85e958e9f336..5ad4f366d3e48409b6d6ac200f7747a05114dac3 100644
--- a/Applications/DataExplorer/DataView/MshItem.h
+++ b/Applications/DataExplorer/DataView/MshItem.h
@@ -17,7 +17,7 @@
 
 #include "TreeItem.h"
 
-#include "MeshLib/VtkMappedMeshSource.h"
+#include "MeshLib/Vtk/VtkMappedMeshSource.h"
 
 namespace MeshLib {
     class Mesh;
diff --git a/Applications/DataExplorer/VtkVis/VtkVisPipeline.cpp b/Applications/DataExplorer/VtkVis/VtkVisPipeline.cpp
index dd763b8ce3be8dbefdf7b951405479508fd61964..799f55cfd9756c8af67709f3a7feeb664b987504 100644
--- a/Applications/DataExplorer/VtkVis/VtkVisPipeline.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkVisPipeline.cpp
@@ -36,7 +36,7 @@
 #include "VtkVisPipelineItem.h"
 #include "VtkVisPointSetItem.h"
 
-#include "MeshLib/VtkMappedMeshSource.h"
+#include "MeshLib/Vtk/VtkMappedMeshSource.h"
 
 #include <vtkAlgorithm.h>
 #include <vtkCamera.h>
diff --git a/Applications/DataExplorer/VtkVis/VtkVisPointSetItem.cpp b/Applications/DataExplorer/VtkVis/VtkVisPointSetItem.cpp
index 5c27699930cb6c021495ca4c1ee4764fcf0d8661..927bc53d48375cfb975a2fd397a317f394d85bfa 100644
--- a/Applications/DataExplorer/VtkVis/VtkVisPointSetItem.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkVisPointSetItem.cpp
@@ -31,7 +31,7 @@
 #include "VtkCompositeFilter.h"
 #include "VtkCompositeContourFilter.h"
 #include "VtkCompositeThresholdFilter.h"
-#include "MeshLib/VtkMappedMeshSource.h"
+#include "MeshLib/Vtk/VtkMappedMeshSource.h"
 
 #include "QVtkDataSetMapper.h"
 #include <vtkActor.h>
diff --git a/Applications/DataExplorer/mainwindow.cpp b/Applications/DataExplorer/mainwindow.cpp
index bf6cfe76826a4398ecb245ebda4b6cf8fae6bd43..ffea4aff4af38b478104b1ac93ae4f6a1fb32639 100644
--- a/Applications/DataExplorer/mainwindow.cpp
+++ b/Applications/DataExplorer/mainwindow.cpp
@@ -57,7 +57,7 @@
 #include "VtkRaster.h"
 #include "VtkVisPipelineItem.h"
 
-#include "MeshLib/VtkMappedMeshSource.h"
+#include "MeshLib/Vtk/VtkMappedMeshSource.h"
 
 // FileIO includes
 #include "GMSInterface.h"