diff --git a/Applications/DataExplorer/DataView/CMakeLists.txt b/Applications/DataExplorer/DataView/CMakeLists.txt
index d412c897b89848520a3fccee8f42726e6e919943..4b56787c6bb2f1621a127391cf4c62f6f32ad532 100644
--- a/Applications/DataExplorer/DataView/CMakeLists.txt
+++ b/Applications/DataExplorer/DataView/CMakeLists.txt
@@ -1,4 +1,3 @@
-# Source files
 set(SOURCES
 	AddLayerToMeshDialog.cpp
 	ColorTableModel.cpp
@@ -40,7 +39,6 @@ set(SOURCES
 	SurfaceExtractionDialog.cpp
 )
 
-# Header files
 set(HEADERS
 	AddLayerToMeshDialog.h
 	BaseItem.h
@@ -87,15 +85,14 @@ set(HEADERS
 	SurfaceExtractionDialog.h
 )
 
-# Put filter in a folder
+# Visual Studio folder
 source_group("Dialog Header Files" REGULAR_EXPRESSION "[.]*Dialog.h")
 source_group("Dialog Source Files" REGULAR_EXPRESSION "[.]*Dialog.cpp")
 source_group("Data Model Header Files" REGULAR_EXPRESSION "[.]*Item.h|[.]*Model.h|[.]*View.h")
 source_group("Data Model Source Files" REGULAR_EXPRESSION "[.]*Item.cpp|[.]*Model.cpp|[.]*View.cpp")
+file(GLOB UIS *.ui)
+source_group("UI Files" FILES ${UIS})
 
-
-# Include the headers which are generated by uic and moc
-# and include additional header
 set(SOURCE_DIR_REL ${CMAKE_CURRENT_SOURCE_DIR}/../../..)
 set(GUI_SOURCE_DIR_REL ${CMAKE_CURRENT_SOURCE_DIR}/..)
 include_directories(
@@ -123,18 +120,12 @@ if(GEOTIFF_FOUND)
 	include_directories(${GEOTIFF_INCLUDE_DIRS})
 endif() # GEOTIFF_FOUND
 
-# Put moc files in a project folder
-source_group("UI Files" REGULAR_EXPRESSION "\\w*\\.ui")
-source_group("Moc Files" REGULAR_EXPRESSION "moc_.*")
-
-
-# Create the library
 add_library(QtDataView STATIC
 	${SOURCES}
 	${HEADERS}
+	${UIS}
 )
 
-# Link Qt library
 target_link_libraries(QtDataView PUBLIC Qt4::QtCore Qt4::QtGui)
 target_link_libraries(QtDataView INTERFACE
 	FileIO
diff --git a/Applications/DataExplorer/DataView/DiagramView/CMakeLists.txt b/Applications/DataExplorer/DataView/DiagramView/CMakeLists.txt
index e16b72bf3fd6255cab3670bf6fedf1997e870f89..b2681128ed3d71eb6af2ffd966b5b1f9f0b62288 100644
--- a/Applications/DataExplorer/DataView/DiagramView/CMakeLists.txt
+++ b/Applications/DataExplorer/DataView/DiagramView/CMakeLists.txt
@@ -1,4 +1,3 @@
-# Source files
 set(SOURCES
 	DetailWindow.cpp
 	DiagramList.cpp
@@ -9,7 +8,6 @@ set(SOURCES
 	QGraphicsGrid.cpp
 )
 
-# Header files
 set(HEADERS
 	DiagramList.h
 	QArrow.h
@@ -20,8 +18,6 @@ set(HEADERS
 	DiagramView.h
 )
 
-# Include the headers which are generated by uic and moc
-# and include additional header
 set(SOURCE_DIR_REL ${CMAKE_CURRENT_SOURCE_DIR}/../../../..)
 set(GUI_SOURCE_DIR_REL ${CMAKE_CURRENT_SOURCE_DIR}/../..)
 include_directories(
@@ -34,16 +30,15 @@ include_directories(
 	${CMAKE_CURRENT_BINARY_DIR}
 )
 
-# Put moc files in a project folder
-source_group("Moc Files" REGULAR_EXPRESSION moc_*)
+file(GLOB_RECURSE UIS *.ui)
+source_group("UI Files" FILES ${UIS})
 
-# Create the library
 add_library(QtDiagramView STATIC
 	${SOURCES}
 	${HEADERS}
+	${UIS}
 )
 
-# Link Qt library
 target_link_libraries(QtDiagramView PUBLIC Qt4::QtGui)
 
 set_property(TARGET QtDiagramView PROPERTY FOLDER "DataExplorer")
diff --git a/Applications/DataExplorer/DataView/StratView/CMakeLists.txt b/Applications/DataExplorer/DataView/StratView/CMakeLists.txt
index d2532d341e8d0d1ac87e38756db1355041ce4458..180bae7f16335ba30fd4aacd83c02d1a647d9050 100644
--- a/Applications/DataExplorer/DataView/StratView/CMakeLists.txt
+++ b/Applications/DataExplorer/DataView/StratView/CMakeLists.txt
@@ -1,4 +1,3 @@
-# Source files
 set(SOURCES
 	StratBar.cpp
 	StratScene.cpp
@@ -6,7 +5,6 @@ set(SOURCES
 	StratWindow.cpp
 )
 
-# Header files
 set(HEADERS
 	StratBar.h
 	StratScene.h
@@ -14,8 +12,6 @@ set(HEADERS
 	StratWindow.h
 )
 
-# Include the headers which are generated by uic and moc
-# and include additional header
 set(SOURCE_DIR_REL ${CMAKE_CURRENT_SOURCE_DIR}/../../../..)
 set(GUI_SOURCE_DIR_REL ${CMAKE_CURRENT_SOURCE_DIR}/../..)
 include_directories(
@@ -25,17 +21,15 @@ include_directories(
 	${GUI_SOURCE_DIR_REL}/Base
 )
 
-# Put moc files in a project folder
-source_group("Moc Files" REGULAR_EXPRESSION moc_*)
+file(GLOB_RECURSE UI_FILES *.ui)
+source_group("UI Files" FILES ${UI_FILES})
 
-# Create the library
-#add_executable( StratView
 add_library(QtStratView STATIC
 	${SOURCES}
 	${HEADERS}
+	${UIS}
 )
 
-# Link Qt library
 target_link_libraries(QtStratView PUBLIC Qt4::QtGui)
 
 set_property(TARGET QtStratView PROPERTY FOLDER "DataExplorer")
diff --git a/Applications/DataExplorer/VtkAct/CMakeLists.txt b/Applications/DataExplorer/VtkAct/CMakeLists.txt
index 7ca6a12eae575b74de9dab3e1f12dda7d4f23355..b5fa1c6892b0c880ba258d0fc8b8cc4b4b21f18d 100644
--- a/Applications/DataExplorer/VtkAct/CMakeLists.txt
+++ b/Applications/DataExplorer/VtkAct/CMakeLists.txt
@@ -1,19 +1,13 @@
-# Source files
 set(SOURCES
 	VtkPickCallback.cpp
 	VtkCustomInteractorStyle.cpp
 )
 
-# Headers
 set(HEADERS
 	VtkPickCallback.h
 	VtkCustomInteractorStyle.h
 )
 
-# Put moc files in a project folder
-source_group("Moc Files" REGULAR_EXPRESSION "moc_.*")
-
-
 include_directories(
 	${CMAKE_CURRENT_SOURCE_DIR}/../../BaseLib
 	${CMAKE_CURRENT_SOURCE_DIR}/../../GeoLib
@@ -24,7 +18,6 @@ include_directories(
 	${CMAKE_CURRENT_SOURCE_DIR}/../VtkVis
 )
 
-# Create the library
 add_library( VtkAct STATIC
 	${SOURCES}
 	${HEADERS}
diff --git a/Applications/DataExplorer/VtkVis/CMakeLists.txt b/Applications/DataExplorer/VtkVis/CMakeLists.txt
index 5ac05e61702dae7e308280112b18aea0c915ff88..ffd2acfc56bc23756323ac57e9bdb79d19c8cbf1 100644
--- a/Applications/DataExplorer/VtkVis/CMakeLists.txt
+++ b/Applications/DataExplorer/VtkVis/CMakeLists.txt
@@ -1,4 +1,3 @@
-# Source files
 set(SOURCES
 	MeshFromRasterDialog.cpp
 	QVtkDataSetMapper.cpp
@@ -44,7 +43,6 @@ set(SOURCES
 	VtkVisTabWidget.cpp
 )
 
-# Header files
 set(HEADERS
 	VtkAppendArrayFilter.h
 	VtkBGImageSource.h
@@ -90,17 +88,13 @@ set(HEADERS
 	VtkConsoleOutputWindow.h
 )
 
-# Put moc files in a project folder
-source_group("UI Files" REGULAR_EXPRESSION "\\w*\\.ui")
-source_group("Moc Files" REGULAR_EXPRESSION "moc_.*")
-
-# Put filter in a folder
+# Visual Studio folder
 source_group("Filter Header Files" REGULAR_EXPRESSION "[.]*Filter.h")
 source_group("Filter Source Files" REGULAR_EXPRESSION "[.]*Filter.cpp")
-
-# Put vtk source files in a folder
 source_group("Source Header Files" REGULAR_EXPRESSION "[.]*Source.h")
 source_group("Source Source Files" REGULAR_EXPRESSION "[.]*Source.cpp")
+file(GLOB_RECURSE UIS *.ui)
+source_group("UI Files" FILES ${UIS})
 
 set(SOURCE_DIR_REL ${CMAKE_CURRENT_SOURCE_DIR}/../../..)
 set(GUI_SOURCE_DIR_REL ${CMAKE_CURRENT_SOURCE_DIR}/..)
@@ -118,10 +112,10 @@ include_directories(
 	${CMAKE_CURRENT_BINARY_DIR}/../DataView
 )
 
-# Create the library
 add_library(VtkVis STATIC
 	${SOURCES}
 	${HEADERS}
+	${UIS}
 )
 
 ADD_VTK_DEPENDENCY(VtkVis)
diff --git a/Applications/Utils/OGSFileConverter/CMakeLists.txt b/Applications/Utils/OGSFileConverter/CMakeLists.txt
index d4ea2ca988907f173dfd67e1fdc233c455943be8..0ad4be4c44ea47ecf836e57f9d0273a6dda05b9b 100644
--- a/Applications/Utils/OGSFileConverter/CMakeLists.txt
+++ b/Applications/Utils/OGSFileConverter/CMakeLists.txt
@@ -1,7 +1,5 @@
-# Specify minimum CMake version
 cmake_minimum_required(VERSION 2.8.6)
 
-# Project name
 project(OGSFileConverter)
 
 cmake_policy(SET CMP0020 NEW)
@@ -10,24 +8,13 @@ set(CMAKE_AUTOMOC TRUE)
 set(CMAKE_AUTOUIC TRUE)
 set(CMAKE_AUTORCC TRUE)
 
-# Source files
 set(SOURCES
 	FileListDialog.cpp
 	OGSFileConverter.cpp
 )
 
-# UI files
-set(UIS
-	FileList.ui
-	OGSFileConverter.ui
-)
-
-# Find installed Qt4 libraries and headers
 find_package(Qt4 QUIET REQUIRED)
 
-
-# Include the headers which are generated by uic and moc
-# and include additional header
 include_directories(
 	${CMAKE_BINARY_DIR}/Applications/Utils/OGSFileConverter
 	${CMAKE_SOURCE_DIR}/BaseLib
@@ -39,15 +26,12 @@ include_directories(
 	${CMAKE_SOURCE_DIR}/Applications/DataExplorer/VtkVis
 )
 
-# Put moc files in a project folder
-source_group("UI Files" REGULAR_EXPRESSION "\\w*\\.ui")
-source_group("Moc Files" REGULAR_EXPRESSION "moc_.*")
+file(GLOB_RECURSE UIS *.ui)
+source_group("UI Files" FILES ${UIS})
 
 add_library(OGSFileConverterLib
 	${SOURCES}
 	${HEADERS}
-	${MOC_HEADERS}
-	${MOC_SOURCES}
 	${UIS}
 )
 target_link_libraries(OGSFileConverterLib QtBase)
@@ -57,16 +41,9 @@ add_executable(OGSFileConverter main.cpp)
 target_link_libraries(OGSFileConverter OGSFileConverterLib FileIO QtBase)
 ADD_VTK_DEPENDENCY(OGSFileConverter)
 
-# Adds useful macros and variables
-# this is needed to correctly link the qt and vtk libraries through target_link_libraries
 include(${QT_USE_FILE})
 
-# Set build configuration types
-# "RelWithDebInfo" and "MinSizeRelease" can be added here
 set(CMAKE_CONFIGURATION_TYPES "Release;Debug" CACHE TYPE INTERNAL FORCE)
-
-# Set build directories
-# Binaries are created in /bin and libraries in /lib
 set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)
 set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib)