diff --git a/Applications/DataExplorer/DataExplorer.cmake b/Applications/DataExplorer/DataExplorer.cmake
index 32c30d3cf0d0b690c0c1e757e36eff4c073f1324..e67925f37bc30495f26245a795161e82aeac6416 100644
--- a/Applications/DataExplorer/DataExplorer.cmake
+++ b/Applications/DataExplorer/DataExplorer.cmake
@@ -53,12 +53,6 @@ target_link_libraries(DataExplorer
     ${VTK_LIBRARIES}
 )
 
-
-if(OGS_USE_NETCDF)
-    add_subdirectory(NetCdfDialog)
-    target_link_libraries(DataExplorer NetCdfDialogLib)
-endif()
-
 if(NOT APPLE AND OGS_USE_CONAN)
     if(UNIX)
         target_link_libraries(DataExplorer Qt5::X11Extras)
diff --git a/Applications/DataExplorer/NetCdfDialog/CMakeLists.txt b/Applications/DataExplorer/NetCdfDialog/CMakeLists.txt
deleted file mode 100644
index 79faf9ddb48ce57bbd89b3b1ea58e74bd0339e70..0000000000000000000000000000000000000000
--- a/Applications/DataExplorer/NetCdfDialog/CMakeLists.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-ogs_add_library(NetCdfDialogLib NetCdfConfigureDialog.cpp NetCdfConfigureDialog.h)
-target_link_libraries(NetCdfDialogLib
-                      PUBLIC Qt5::Widgets
-                             ${NETCDF_LIBRARIES_CXX}
-                             ${NETCDF_LIBRARIES_C}
-                             ${HDF5_HL_LIBRARIES}
-                             ${HDF5_LIBRARIES}
-                      PRIVATE MathLib)
-if(OGS_USE_CONAN AND MSVC)
-    target_link_libraries(NetCdfDialogLib PUBLIC ${CONAN_LIBS})
-endif()
-set_property(TARGET NetCdfDialogLib PROPERTY FOLDER "DataExplorer")
-
-# Workaround for system installed VTK (tested on arch)
-if(NOT OGS_USE_CONAN)
-    target_include_directories(NetCdfDialogLib SYSTEM
-                               PUBLIC ${NETCDF_INCLUDES_C}
-                               PUBLIC ${NETCDF_INCLUDES_CXX})
-endif()
-
-add_autogen_include(NetCdfDialogLib)
diff --git a/Applications/DataExplorer/VtkVis/CMakeLists.txt b/Applications/DataExplorer/VtkVis/CMakeLists.txt
index 35580d426424094c010f787c2bd06e7c5039c647..2f11fdbc06032e4d120420f0a80329eeddd899df 100644
--- a/Applications/DataExplorer/VtkVis/CMakeLists.txt
+++ b/Applications/DataExplorer/VtkVis/CMakeLists.txt
@@ -98,12 +98,21 @@ set(HEADERS
     VtkVisPointSetItem.h
     VtkVisTabWidget.h)
 
+set(UIS
+    MeshFromRaster.ui VisPrefs.ui VisualizationWidgetBase.ui
+    VtkAddFilterDialogBase.ui VtkVisTabWidgetBase.ui)
+
+if(OGS_USE_NETCDF)
+    set(SOURCES ${SOURCES} NetCdfConfigureDialog.h NetCdfConfigureDialog.cpp)
+    set(UIS ${UIS} NetCdfConfigure.ui)
+endif()
+
 # Visual Studio folder
 source_group("Filter Header Files" REGULAR_EXPRESSION "[.]*Filter.h")
 source_group("Filter Source Files" REGULAR_EXPRESSION "[.]*Filter.cpp")
 source_group("Source Header Files" REGULAR_EXPRESSION "[.]*Source.h")
 source_group("Source Source Files" REGULAR_EXPRESSION "[.]*Source.cpp")
-file(GLOB_RECURSE UIS CONFIGURE_DEPENDS *.ui)
+
 source_group("UI Files" FILES ${UIS})
 
 set(SOURCE_DIR_REL ${CMAKE_CURRENT_SOURCE_DIR}/../../..)
@@ -123,7 +132,7 @@ ogs_add_library(VtkVis ${SOURCES} ${HEADERS} ${UIS})
 
 if(GEOTIFF_FOUND)
     include_directories(${GEOTIFF_INCLUDE_DIRS})
-    target_link_libraries(VtkVis INTERFACE ${GEOTIFF_LIBRARIES})
+    target_link_libraries(VtkVis PUBLIC ${GEOTIFF_LIBRARIES})
 endif() # GEOTIFF_FOUND
 
 target_link_libraries(VtkVis
@@ -136,7 +145,20 @@ target_link_libraries(VtkVis
                       PRIVATE MathLib ApplicationsFileIO Qt5::Gui logog)
 
 if(OGS_USE_NETCDF)
-    target_link_libraries(VtkVis PRIVATE NetCdfDialogLib)
+    target_link_libraries(VtkVis
+                          PUBLIC ${NETCDF_LIBRARIES_CXX}
+                                 ${NETCDF_LIBRARIES_C}
+                                 ${HDF5_HL_LIBRARIES}
+                                 ${HDF5_LIBRARIES})
+    if(OGS_USE_CONAN AND MSVC)
+        target_link_libraries(VtkVis PUBLIC ${CONAN_LIBS})
+    endif()
+    # Workaround for system installed VTK (tested on arch)
+    if(NOT OGS_USE_CONAN)
+        target_include_directories(VtkVis SYSTEM
+                                   PUBLIC ${NETCDF_INCLUDES_C}
+                                   PUBLIC ${NETCDF_INCLUDES_CXX})
+    endif()
 endif()
 
 set_property(TARGET VtkVis PROPERTY FOLDER "DataExplorer")
diff --git a/Applications/DataExplorer/NetCdfDialog/NetCdfConfigure.ui b/Applications/DataExplorer/VtkVis/NetCdfConfigure.ui
similarity index 100%
rename from Applications/DataExplorer/NetCdfDialog/NetCdfConfigure.ui
rename to Applications/DataExplorer/VtkVis/NetCdfConfigure.ui
diff --git a/Applications/DataExplorer/NetCdfDialog/NetCdfConfigureDialog.cpp b/Applications/DataExplorer/VtkVis/NetCdfConfigureDialog.cpp
similarity index 100%
rename from Applications/DataExplorer/NetCdfDialog/NetCdfConfigureDialog.cpp
rename to Applications/DataExplorer/VtkVis/NetCdfConfigureDialog.cpp
diff --git a/Applications/DataExplorer/NetCdfDialog/NetCdfConfigureDialog.h b/Applications/DataExplorer/VtkVis/NetCdfConfigureDialog.h
similarity index 100%
rename from Applications/DataExplorer/NetCdfDialog/NetCdfConfigureDialog.h
rename to Applications/DataExplorer/VtkVis/NetCdfConfigureDialog.h
diff --git a/Applications/DataExplorer/VtkVis/VtkCompositeTextureOnSurfaceFilter.cpp b/Applications/DataExplorer/VtkVis/VtkCompositeTextureOnSurfaceFilter.cpp
index 506ad3f1097e3d098df95088818ef50c303c543f..5076fc6b71dba9f2465a1cbc6bd1ca33fd1ded63 100644
--- a/Applications/DataExplorer/VtkVis/VtkCompositeTextureOnSurfaceFilter.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkCompositeTextureOnSurfaceFilter.cpp
@@ -24,7 +24,7 @@
 #include "VtkGeoImageSource.h"
 #include "VtkRaster.h"
 #ifdef OGS_USE_NETCDF
-#include "NetCdfDialog/NetCdfConfigureDialog.h"
+#include "NetCdfConfigureDialog.h"
 #endif  // OGS_USE_NETCDF
 
 #include <QFileDialog>
diff --git a/Applications/DataExplorer/mainwindow.cpp b/Applications/DataExplorer/mainwindow.cpp
index ece68b07f8d1d1f91c322629dbe404b67c15db69..73b630a784b49e4e16de63ed46cd166e37d16be6 100644
--- a/Applications/DataExplorer/mainwindow.cpp
+++ b/Applications/DataExplorer/mainwindow.cpp
@@ -77,7 +77,7 @@
 #include "MeshElementRemovalDialog.h"
 #include "MeshQualitySelectionDialog.h"
 #ifdef OGS_USE_NETCDF
-#include "NetCdfDialog/NetCdfConfigureDialog.h"
+#include "NetCdfConfigureDialog.h"
 #endif  // OGS_USE_NETCDF
 #include "SHPImportDialog.h"
 #include "SetNameDialog.h"