From 2e58b08975060c97de59d90be0918a4b799484b0 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Tue, 23 Sep 2014 11:12:19 +0200
Subject: [PATCH] Moved Gui to Applications/DataExplorer.

- moved ProjectData.* to Applications/ApplicationsLib
- removed Vrpn folder in DataExplorer
---
 Applications/ApplicationsLib/CMakeLists.txt   |  12 +
 .../{ => ApplicationsLib}/ProjectData.cpp     |   0
 .../{ => ApplicationsLib}/ProjectData.h       |   2 +-
 Applications/CMakeLists.txt                   |  14 +-
 .../DataExplorer}/Base/CMakeLists.txt         |   0
 .../DataExplorer}/Base/CheckboxDelegate.cpp   |   0
 .../DataExplorer}/Base/CheckboxDelegate.h     |   0
 .../Base/ColorPickerPushButton.cpp            |   0
 .../Base/ColorPickerPushButton.h              |   0
 .../Base/LastSavedFileDirectory.h             |   0
 .../DataExplorer}/Base/OGSError.cpp           |   0
 .../DataExplorer}/Base/OGSError.h             |   0
 .../Base/QNonScalableGraphicsTextItem.cpp     |   0
 .../Base/QNonScalableGraphicsTextItem.h       |   0
 .../Base/QValueTooltipSlider.cpp              |   0
 .../DataExplorer}/Base/QValueTooltipSlider.h  |   0
 .../DataExplorer}/Base/RecentFiles.cpp        |   0
 .../DataExplorer}/Base/RecentFiles.h          |   0
 .../Base/StrictDoubleValidator.h              |   0
 .../DataExplorer}/Base/StrictIntValidator.h   |   0
 .../DataExplorer}/Base/TreeItem.cpp           |   0
 .../DataExplorer}/Base/TreeItem.h             |   0
 .../DataExplorer}/Base/TreeModel.cpp          |   0
 .../DataExplorer}/Base/TreeModel.h            |   0
 .../DataExplorer}/Base/TreeModelIterator.cpp  |   0
 .../DataExplorer}/Base/TreeModelIterator.h    |   0
 .../DataExplorer}/Base/modeltest.cpp          |   0
 .../DataExplorer}/Base/modeltest.h            |   0
 .../DataExplorer}/CMakeLists.txt              |   3 -
 .../DataExplorer}/DataExplorer.cmake          |  21 +-
 .../DataExplorer}/DataView/BaseItem.h         |   0
 .../DataExplorer}/DataView/CMakeLists.txt     |  20 +-
 .../DataView/ColorTableModel.cpp              |   0
 .../DataExplorer}/DataView/ColorTableModel.h  |   0
 .../DataExplorer}/DataView/ColorTableView.cpp |   0
 .../DataExplorer}/DataView/ColorTableView.h   |   0
 .../DataExplorer}/DataView/CondFromRaster.ui  |   0
 .../DataView/CondFromRasterDialog.cpp         |   0
 .../DataView/CondFromRasterDialog.h           |   2 +-
 .../DataExplorer}/DataView/CondItem.h         |   0
 .../DataView/CondObjectListItem.h             |   0
 .../DataExplorer}/DataView/ConditionWriter.ui |   0
 .../DataView/DataExplorerSettings.ui          |   0
 .../DataView/DataExplorerSettingsDialog.cpp   |   0
 .../DataView/DataExplorerSettingsDialog.h     |   0
 .../DataView/DiagramView/CMakeLists.txt       |  15 +-
 .../DataView/DiagramView/DetailWindow.cpp     |   0
 .../DataView/DiagramView/DetailWindow.h       |   0
 .../DataView/DiagramView/DetailWindow.ui      |   0
 .../DataView/DiagramView/DiagramList.cpp      |   0
 .../DataView/DiagramView/DiagramList.h        |   0
 .../DataView/DiagramView/DiagramPrefs.ui      |   0
 .../DiagramView/DiagramPrefsDialog.cpp        |   0
 .../DataView/DiagramView/DiagramPrefsDialog.h |   0
 .../DataView/DiagramView/DiagramScene.cpp     |   0
 .../DataView/DiagramView/DiagramScene.h       |   0
 .../DataView/DiagramView/DiagramView.cpp      |   0
 .../DataView/DiagramView/DiagramView.h        |   0
 .../DataView/DiagramView/QArrow.cpp           |   0
 .../DataView/DiagramView/QArrow.h             |   0
 .../DataView/DiagramView/QGraphicsGrid.cpp    |   0
 .../DataView/DiagramView/QGraphicsGrid.h      |   0
 .../DataView/DirectConditionGenerator.cpp     |   0
 .../DataView/DirectConditionGenerator.h       |   0
 .../DataView/ElementTreeModel.cpp             |   0
 .../DataExplorer}/DataView/ElementTreeModel.h |   0
 .../DataView/ElementTreeView.cpp              |   0
 .../DataExplorer}/DataView/ElementTreeView.h  |   0
 .../DataView/FEMConditionSetup.ui             |   0
 .../DataExplorer}/DataView/GEOModels.cpp      |   0
 .../DataExplorer}/DataView/GEOModels.h        |   0
 .../DataExplorer}/DataView/GMSHPrefs.ui       |   0
 .../DataView/GMSHPrefsDialog.cpp              |   0
 .../DataExplorer}/DataView/GMSHPrefsDialog.h  |   0
 .../DataExplorer}/DataView/GeoMapper.cpp      |   0
 .../DataExplorer}/DataView/GeoMapper.h        |   0
 .../DataView/GeoObjectListItem.h              |   0
 .../DataView/GeoOnMeshMapping.ui              |   0
 .../DataView/GeoOnMeshMappingDialog.cpp       |   0
 .../DataView/GeoOnMeshMappingDialog.h         |   0
 .../DataExplorer}/DataView/GeoTabWidget.cpp   |   0
 .../DataExplorer}/DataView/GeoTabWidget.h     |   0
 .../DataView/GeoTabWidgetBase.ui              |   0
 .../DataExplorer}/DataView/GeoTreeItem.h      |   0
 .../DataExplorer}/DataView/GeoTreeModel.cpp   |   0
 .../DataExplorer}/DataView/GeoTreeModel.h     |   0
 .../DataExplorer}/DataView/GeoTreeView.cpp    |   0
 .../DataExplorer}/DataView/GeoTreeView.h      |   0
 .../DataExplorer}/DataView/License.ui         |   0
 .../DataExplorer}/DataView/LicenseDialog.cpp  |   0
 .../DataExplorer}/DataView/LicenseDialog.h    |   0
 .../DataExplorer}/DataView/LineEdit.ui        |   0
 .../DataExplorer}/DataView/LineEditDialog.cpp |   0
 .../DataExplorer}/DataView/LineEditDialog.h   |   0
 .../DataExplorer}/DataView/LinearEdit.ui      |   0
 .../DataView/LinearEditDialog.cpp             |   0
 .../DataExplorer}/DataView/LinearEditDialog.h |   0
 .../DataView/ListPropertiesDialog.cpp         |   0
 .../DataView/ListPropertiesDialog.h           |   0
 .../DataExplorer}/DataView/MergeGeometries.ui |   0
 .../DataView/MergeGeometriesDialog.cpp        |   0
 .../DataView/MergeGeometriesDialog.h          |   0
 .../DataExplorer}/DataView/MeshAnalysis.ui    |   0
 .../DataView/MeshAnalysisDialog.cpp           |   0
 .../DataView/MeshAnalysisDialog.h             |   0
 .../DataView/MeshElementRemoval.ui            |   0
 .../DataView/MeshElementRemovalDialog.cpp     |   0
 .../DataView/MeshElementRemovalDialog.h       |   6 +-
 .../DataExplorer}/DataView/MeshLayerEdit.ui   |   0
 .../DataView/MeshLayerEditDialog.cpp          |   0
 .../DataView/MeshLayerEditDialog.h            |   0
 .../DataExplorer}/DataView/MeshValueEdit.ui   |   0
 .../DataView/MeshValueEditDialog.cpp          |   0
 .../DataView/MeshValueEditDialog.h            |   0
 .../DataExplorer}/DataView/ModelTreeItem.cpp  |   0
 .../DataExplorer}/DataView/ModelTreeItem.h    |   0
 .../DataView/ModellingTabWidget.cpp           |   0
 .../DataView/ModellingTabWidget.h             |   0
 .../DataView/ModellingTabWidgetBase.ui        |   0
 .../DataExplorer}/DataView/MshEdit.ui         |   0
 .../DataExplorer}/DataView/MshEditDialog.cpp  |   0
 .../DataExplorer}/DataView/MshEditDialog.h    |   0
 .../DataExplorer}/DataView/MshItem.cpp        |   0
 .../DataExplorer}/DataView/MshItem.h          |   0
 .../DataExplorer}/DataView/MshModel.cpp       |   0
 .../DataExplorer}/DataView/MshModel.h         |   2 +-
 .../DataView/MshQualitySelection.ui           |   0
 .../DataView/MshQualitySelectionDialog.cpp    |   0
 .../DataView/MshQualitySelectionDialog.h      |   0
 .../DataExplorer}/DataView/MshTabWidget.cpp   |   0
 .../DataExplorer}/DataView/MshTabWidget.h     |   0
 .../DataView/MshTabWidgetBase.ui              |   0
 .../DataExplorer}/DataView/MshView.cpp        |   0
 .../DataExplorer}/DataView/MshView.h          |   0
 .../DataExplorer}/DataView/NetCdfConfigure.ui |   0
 .../DataView/NetCdfConfigureDialog.cpp        |   0
 .../DataView/NetCdfConfigureDialog.h          |   0
 .../DataExplorer}/DataView/NewProcess.ui      |   0
 .../DataView/SHPImportDialog.cpp              |   0
 .../DataExplorer}/DataView/SHPImportDialog.h  |   0
 .../DataView/SelectMeshDialog.cpp             |   0
 .../DataExplorer}/DataView/SelectMeshDialog.h |   0
 .../DataExplorer}/DataView/SetNameDialog.cpp  |   0
 .../DataExplorer}/DataView/SetNameDialog.h    |   0
 .../DataView/StationTabWidget.cpp             |   0
 .../DataExplorer}/DataView/StationTabWidget.h |   0
 .../DataView/StationTabWidgetBase.ui          |   0
 .../DataView/StationTreeModel.cpp             |   0
 .../DataExplorer}/DataView/StationTreeModel.h |   0
 .../DataView/StationTreeView.cpp              |   0
 .../DataExplorer}/DataView/StationTreeView.h  |   0
 .../DataView/StratView/CMakeLists.txt         |  10 +-
 .../DataView/StratView/StratBar.cpp           |   0
 .../DataView/StratView/StratBar.h             |   0
 .../DataView/StratView/StratScene.cpp         |   0
 .../DataView/StratView/StratScene.h           |   0
 .../DataView/StratView/StratView.cpp          |   0
 .../DataView/StratView/StratView.h            |   0
 .../DataView/StratView/StratWindow.cpp        |   0
 .../DataView/StratView/StratWindow.h          |   0
 .../DataView/StratView/StratWindow.ui         |   0
 .../DataExplorer}/Img/delete-icon.png         | Bin
 .../DataExplorer}/Img/icon_glass.png          | Bin
 .../DataExplorer}/Img/icon_glass_active.png   | Bin
 .../DataExplorer}/Img/icon_global.png         | Bin
 .../DataExplorer}/Img/icon_hlight.png         | Bin
 .../DataExplorer}/Img/icon_hlight_active.png  | Bin
 .../DataExplorer}/Img/icon_persp.png          | Bin
 .../DataExplorer}/Img/icon_persp_active.png   | Bin
 .../DataExplorer}/Img/icon_screen.png         | Bin
 .../DataExplorer}/Img/icon_xminus.png         | Bin
 .../DataExplorer}/Img/icon_xplus.png          | Bin
 .../DataExplorer}/Img/icon_yminus.png         | Bin
 .../DataExplorer}/Img/icon_yplus.png          | Bin
 .../DataExplorer}/Img/icon_zminus.png         | Bin
 .../DataExplorer}/Img/icon_zplus.png          | Bin
 .../DataExplorer}/Img/icons.qrc               |   0
 .../DataExplorer}/Img/open-icon.png           | Bin
 .../DataExplorer}/Img/oxygen.icons            |   0
 .../DataExplorer}/Img/refresh-icon.png        | Bin
 .../DataExplorer}/Img/save-icon.png           | Bin
 .../DataExplorer}/VtkAct/CMakeLists.txt       |   0
 .../VtkAct/VtkCustomInteractorStyle.cpp       |   0
 .../VtkAct/VtkCustomInteractorStyle.h         |   0
 .../DataExplorer}/VtkAct/VtkPickCallback.cpp  |   0
 .../DataExplorer}/VtkAct/VtkPickCallback.h    |   0
 .../DataExplorer}/VtkVis/CMakeLists.txt       |  25 +-
 .../DataExplorer}/VtkVis/MeshFromRaster.ui    |   0
 .../VtkVis/MeshFromRasterDialog.cpp           |   0
 .../VtkVis/MeshFromRasterDialog.h             |   0
 .../DataExplorer}/VtkVis/OGSFilterInfo.h      |   0
 .../VtkVis/QVtkDataSetMapper.cpp              |   0
 .../DataExplorer}/VtkVis/QVtkDataSetMapper.h  |   0
 .../DataExplorer}/VtkVis/VisPrefs.ui          |   0
 .../DataExplorer}/VtkVis/VisPrefsDialog.cpp   |   0
 .../DataExplorer}/VtkVis/VisPrefsDialog.h     |   0
 .../VtkVis/VisualizationWidget.cpp            |  50 +--
 .../VtkVis/VisualizationWidget.h              |   6 -
 .../VtkVis/VisualizationWidgetBase.ui         |   0
 .../VtkVis/VtkAddFilterDialog.cpp             |   0
 .../DataExplorer}/VtkVis/VtkAddFilterDialog.h |   0
 .../VtkVis/VtkAddFilterDialogBase.ui          |   0
 .../VtkVis/VtkAlgorithmProperties.cpp         |   0
 .../VtkVis/VtkAlgorithmProperties.h           |   0
 .../VtkVis/VtkAlgorithmPropertyCheckbox.cpp   |   0
 .../VtkVis/VtkAlgorithmPropertyCheckbox.h     |   0
 .../VtkVis/VtkAlgorithmPropertyLineEdit.cpp   |   0
 .../VtkVis/VtkAlgorithmPropertyLineEdit.h     |   0
 .../VtkVis/VtkAlgorithmPropertyVectorEdit.cpp |   0
 .../VtkVis/VtkAlgorithmPropertyVectorEdit.h   |   0
 .../VtkVis/VtkAppendArrayFilter.cpp           |   0
 .../VtkVis/VtkAppendArrayFilter.h             |   0
 .../DataExplorer}/VtkVis/VtkBGImageSource.cpp |   0
 .../DataExplorer}/VtkVis/VtkBGImageSource.h   |   0
 .../VtkVis/VtkColorByHeightFilter.cpp         |   0
 .../VtkVis/VtkColorByHeightFilter.h           |   0
 .../VtkVis/VtkColorLookupTable.cpp            |   0
 .../VtkVis/VtkColorLookupTable.h              |   0
 .../VtkCompositeColorByHeightFilter.cpp       |   0
 .../VtkVis/VtkCompositeColorByHeightFilter.h  |   0
 .../VtkCompositeColormapToImageFilter.cpp     |   0
 .../VtkCompositeColormapToImageFilter.h       |   0
 .../VtkVis/VtkCompositeContourFilter.cpp      |   0
 .../VtkVis/VtkCompositeContourFilter.h        |   0
 .../VtkCompositeElementSelectionFilter.cpp    |   0
 .../VtkCompositeElementSelectionFilter.h      |   0
 .../VtkVis/VtkCompositeFilter.cpp             |   0
 .../DataExplorer}/VtkVis/VtkCompositeFilter.h |   0
 .../VtkVis/VtkCompositeGeoObjectFilter.cpp    |   0
 .../VtkVis/VtkCompositeGeoObjectFilter.h      |   0
 .../VtkCompositeImageToCylindersFilter.cpp    |   0
 .../VtkCompositeImageToCylindersFilter.h      |   0
 .../VtkVis/VtkCompositeLineToTubeFilter.cpp   |   0
 .../VtkVis/VtkCompositeLineToTubeFilter.h     |   0
 .../VtkCompositeNodeSelectionFilter.cpp       |   0
 .../VtkVis/VtkCompositeNodeSelectionFilter.h  |   0
 .../VtkVis/VtkCompositePointToGlyphFilter.cpp |   0
 .../VtkVis/VtkCompositePointToGlyphFilter.h   |   0
 .../VtkCompositeTextureOnSurfaceFilter.cpp    |   0
 .../VtkCompositeTextureOnSurfaceFilter.h      |   0
 .../VtkVis/VtkCompositeThresholdFilter.cpp    |   0
 .../VtkVis/VtkCompositeThresholdFilter.h      |   0
 .../DataExplorer}/VtkVis/VtkFilterFactory.cpp |   0
 .../DataExplorer}/VtkVis/VtkFilterFactory.h   |   0
 .../VtkVis/VtkGeoImageSource.cpp              |   0
 .../DataExplorer}/VtkVis/VtkGeoImageSource.h  |   0
 .../VtkImageDataToLinePolyDataFilter.cpp      |   0
 .../VtkVis/VtkImageDataToLinePolyDataFilter.h |   0
 .../DataExplorer}/VtkVis/VtkMeshConverter.cpp |   0
 .../DataExplorer}/VtkVis/VtkMeshConverter.h   |   0
 .../DataExplorer}/VtkVis/VtkMeshSource.cpp    |   0
 .../DataExplorer}/VtkVis/VtkMeshSource.h      |   0
 .../DataExplorer}/VtkVis/VtkPointsSource.cpp  |   0
 .../DataExplorer}/VtkVis/VtkPointsSource.h    |   0
 .../VtkVis/VtkPolylinesSource.cpp             |   0
 .../DataExplorer}/VtkVis/VtkPolylinesSource.h |   0
 .../DataExplorer}/VtkVis/VtkRaster.cpp        |   0
 .../DataExplorer}/VtkVis/VtkRaster.h          |   0
 .../DataExplorer}/VtkVis/VtkStationSource.cpp |   0
 .../DataExplorer}/VtkVis/VtkStationSource.h   |   0
 .../VtkVis/VtkSurfacesSource.cpp              |   0
 .../DataExplorer}/VtkVis/VtkSurfacesSource.h  |   0
 .../VtkVis/VtkTextureOnSurfaceFilter.cpp      |   0
 .../VtkVis/VtkTextureOnSurfaceFilter.h        |   0
 .../DataExplorer}/VtkVis/VtkVisHelper.cpp     |   0
 .../DataExplorer}/VtkVis/VtkVisHelper.h       |   0
 .../DataExplorer}/VtkVis/VtkVisImageItem.cpp  |   0
 .../DataExplorer}/VtkVis/VtkVisImageItem.h    |   0
 .../DataExplorer}/VtkVis/VtkVisPipeline.cpp   |   3 +-
 .../DataExplorer}/VtkVis/VtkVisPipeline.h     |   0
 .../VtkVis/VtkVisPipelineItem.cpp             |   0
 .../DataExplorer}/VtkVis/VtkVisPipelineItem.h |   0
 .../VtkVis/VtkVisPipelineView.cpp             |   0
 .../DataExplorer}/VtkVis/VtkVisPipelineView.h |   0
 .../VtkVis/VtkVisPointSetItem.cpp             |   0
 .../DataExplorer}/VtkVis/VtkVisPointSetItem.h |   0
 .../DataExplorer}/VtkVis/VtkVisTabWidget.cpp  |   0
 .../DataExplorer}/VtkVis/VtkVisTabWidget.h    |   0
 .../VtkVis/VtkVisTabWidgetBase.ui             |   0
 .../DataExplorer}/data-explorer.sh            |   0
 {Gui => Applications/DataExplorer}/main.cpp   |   0
 .../DataExplorer}/mainwindow.cpp              |  25 --
 .../DataExplorer}/mainwindow.h                |  10 +-
 .../DataExplorer}/mainwindow.ui               |  26 --
 CMakeLists.txt                                |   5 -
 FileIO/XmlIO/Qt/XmlGspInterface.h             |   2 +-
 Gui/Vrpn/CMakeLists.txt                       |  64 ---
 Gui/Vrpn/QSpaceNavigatorClient.cpp            |  64 ---
 Gui/Vrpn/QSpaceNavigatorClient.h              |  78 ----
 Gui/Vrpn/QVrpnArtTrackingClient.cpp           |  87 ----
 Gui/Vrpn/QVrpnArtTrackingClient.h             |  74 ----
 Gui/Vrpn/SpaceNavigatorClient.cpp             | 401 ------------------
 Gui/Vrpn/SpaceNavigatorClient.h               | 180 --------
 Gui/Vrpn/TrackingSettingsWidget.cpp           | 121 ------
 Gui/Vrpn/TrackingSettingsWidget.h             |  48 ---
 Gui/Vrpn/TrackingSettingsWidgetBase.ui        | 271 ------------
 Gui/Vrpn/VrpnArtTrackingClient.cpp            | 260 ------------
 Gui/Vrpn/VrpnArtTrackingClient.h              |  90 ----
 Gui/Vrpn/VrpnClient.cpp                       |  66 ---
 Gui/Vrpn/VrpnClient.h                         |  47 --
 Gui/VtkVis/VtkTrackedCamera.cpp               | 149 -------
 Gui/VtkVis/VtkTrackedCamera.h                 | 106 -----
 Tests/FileIO/TestXmlGmlReader.cpp             |   2 +-
 .../FileConverter/generateBCFromPolyline.cpp  |   2 +-
 Utils/FileConverter/generateBCandGLI.cpp      |   2 +-
 305 files changed, 74 insertions(+), 2297 deletions(-)
 create mode 100644 Applications/ApplicationsLib/CMakeLists.txt
 rename Applications/{ => ApplicationsLib}/ProjectData.cpp (100%)
 rename Applications/{ => ApplicationsLib}/ProjectData.h (99%)
 rename {Gui => Applications/DataExplorer}/Base/CMakeLists.txt (100%)
 rename {Gui => Applications/DataExplorer}/Base/CheckboxDelegate.cpp (100%)
 rename {Gui => Applications/DataExplorer}/Base/CheckboxDelegate.h (100%)
 rename {Gui => Applications/DataExplorer}/Base/ColorPickerPushButton.cpp (100%)
 rename {Gui => Applications/DataExplorer}/Base/ColorPickerPushButton.h (100%)
 rename {Gui => Applications/DataExplorer}/Base/LastSavedFileDirectory.h (100%)
 rename {Gui => Applications/DataExplorer}/Base/OGSError.cpp (100%)
 rename {Gui => Applications/DataExplorer}/Base/OGSError.h (100%)
 rename {Gui => Applications/DataExplorer}/Base/QNonScalableGraphicsTextItem.cpp (100%)
 rename {Gui => Applications/DataExplorer}/Base/QNonScalableGraphicsTextItem.h (100%)
 rename {Gui => Applications/DataExplorer}/Base/QValueTooltipSlider.cpp (100%)
 rename {Gui => Applications/DataExplorer}/Base/QValueTooltipSlider.h (100%)
 rename {Gui => Applications/DataExplorer}/Base/RecentFiles.cpp (100%)
 rename {Gui => Applications/DataExplorer}/Base/RecentFiles.h (100%)
 rename {Gui => Applications/DataExplorer}/Base/StrictDoubleValidator.h (100%)
 rename {Gui => Applications/DataExplorer}/Base/StrictIntValidator.h (100%)
 rename {Gui => Applications/DataExplorer}/Base/TreeItem.cpp (100%)
 rename {Gui => Applications/DataExplorer}/Base/TreeItem.h (100%)
 rename {Gui => Applications/DataExplorer}/Base/TreeModel.cpp (100%)
 rename {Gui => Applications/DataExplorer}/Base/TreeModel.h (100%)
 rename {Gui => Applications/DataExplorer}/Base/TreeModelIterator.cpp (100%)
 rename {Gui => Applications/DataExplorer}/Base/TreeModelIterator.h (100%)
 rename {Gui => Applications/DataExplorer}/Base/modeltest.cpp (100%)
 rename {Gui => Applications/DataExplorer}/Base/modeltest.h (100%)
 rename {Gui => Applications/DataExplorer}/CMakeLists.txt (88%)
 rename {Gui => Applications/DataExplorer}/DataExplorer.cmake (90%)
 rename {Gui => Applications/DataExplorer}/DataView/BaseItem.h (100%)
 rename {Gui => Applications/DataExplorer}/DataView/CMakeLists.txt (91%)
 rename {Gui => Applications/DataExplorer}/DataView/ColorTableModel.cpp (100%)
 rename {Gui => Applications/DataExplorer}/DataView/ColorTableModel.h (100%)
 rename {Gui => Applications/DataExplorer}/DataView/ColorTableView.cpp (100%)
 rename {Gui => Applications/DataExplorer}/DataView/ColorTableView.h (100%)
 rename {Gui => Applications/DataExplorer}/DataView/CondFromRaster.ui (100%)
 rename {Gui => Applications/DataExplorer}/DataView/CondFromRasterDialog.cpp (100%)
 rename {Gui => Applications/DataExplorer}/DataView/CondFromRasterDialog.h (96%)
 rename {Gui => Applications/DataExplorer}/DataView/CondItem.h (100%)
 rename {Gui => Applications/DataExplorer}/DataView/CondObjectListItem.h (100%)
 rename {Gui => Applications/DataExplorer}/DataView/ConditionWriter.ui (100%)
 rename {Gui => Applications/DataExplorer}/DataView/DataExplorerSettings.ui (100%)
 rename {Gui => Applications/DataExplorer}/DataView/DataExplorerSettingsDialog.cpp (100%)
 rename {Gui => Applications/DataExplorer}/DataView/DataExplorerSettingsDialog.h (100%)
 rename {Gui => Applications/DataExplorer}/DataView/DiagramView/CMakeLists.txt (77%)
 rename {Gui => Applications/DataExplorer}/DataView/DiagramView/DetailWindow.cpp (100%)
 rename {Gui => Applications/DataExplorer}/DataView/DiagramView/DetailWindow.h (100%)
 rename {Gui => Applications/DataExplorer}/DataView/DiagramView/DetailWindow.ui (100%)
 rename {Gui => Applications/DataExplorer}/DataView/DiagramView/DiagramList.cpp (100%)
 rename {Gui => Applications/DataExplorer}/DataView/DiagramView/DiagramList.h (100%)
 rename {Gui => Applications/DataExplorer}/DataView/DiagramView/DiagramPrefs.ui (100%)
 rename {Gui => Applications/DataExplorer}/DataView/DiagramView/DiagramPrefsDialog.cpp (100%)
 rename {Gui => Applications/DataExplorer}/DataView/DiagramView/DiagramPrefsDialog.h (100%)
 rename {Gui => Applications/DataExplorer}/DataView/DiagramView/DiagramScene.cpp (100%)
 rename {Gui => Applications/DataExplorer}/DataView/DiagramView/DiagramScene.h (100%)
 rename {Gui => Applications/DataExplorer}/DataView/DiagramView/DiagramView.cpp (100%)
 rename {Gui => Applications/DataExplorer}/DataView/DiagramView/DiagramView.h (100%)
 rename {Gui => Applications/DataExplorer}/DataView/DiagramView/QArrow.cpp (100%)
 rename {Gui => Applications/DataExplorer}/DataView/DiagramView/QArrow.h (100%)
 rename {Gui => Applications/DataExplorer}/DataView/DiagramView/QGraphicsGrid.cpp (100%)
 rename {Gui => Applications/DataExplorer}/DataView/DiagramView/QGraphicsGrid.h (100%)
 rename {Gui => Applications/DataExplorer}/DataView/DirectConditionGenerator.cpp (100%)
 rename {Gui => Applications/DataExplorer}/DataView/DirectConditionGenerator.h (100%)
 rename {Gui => Applications/DataExplorer}/DataView/ElementTreeModel.cpp (100%)
 rename {Gui => Applications/DataExplorer}/DataView/ElementTreeModel.h (100%)
 rename {Gui => Applications/DataExplorer}/DataView/ElementTreeView.cpp (100%)
 rename {Gui => Applications/DataExplorer}/DataView/ElementTreeView.h (100%)
 rename {Gui => Applications/DataExplorer}/DataView/FEMConditionSetup.ui (100%)
 rename {Gui => Applications/DataExplorer}/DataView/GEOModels.cpp (100%)
 rename {Gui => Applications/DataExplorer}/DataView/GEOModels.h (100%)
 rename {Gui => Applications/DataExplorer}/DataView/GMSHPrefs.ui (100%)
 rename {Gui => Applications/DataExplorer}/DataView/GMSHPrefsDialog.cpp (100%)
 rename {Gui => Applications/DataExplorer}/DataView/GMSHPrefsDialog.h (100%)
 rename {Gui => Applications/DataExplorer}/DataView/GeoMapper.cpp (100%)
 rename {Gui => Applications/DataExplorer}/DataView/GeoMapper.h (100%)
 rename {Gui => Applications/DataExplorer}/DataView/GeoObjectListItem.h (100%)
 rename {Gui => Applications/DataExplorer}/DataView/GeoOnMeshMapping.ui (100%)
 rename {Gui => Applications/DataExplorer}/DataView/GeoOnMeshMappingDialog.cpp (100%)
 rename {Gui => Applications/DataExplorer}/DataView/GeoOnMeshMappingDialog.h (100%)
 rename {Gui => Applications/DataExplorer}/DataView/GeoTabWidget.cpp (100%)
 rename {Gui => Applications/DataExplorer}/DataView/GeoTabWidget.h (100%)
 rename {Gui => Applications/DataExplorer}/DataView/GeoTabWidgetBase.ui (100%)
 rename {Gui => Applications/DataExplorer}/DataView/GeoTreeItem.h (100%)
 rename {Gui => Applications/DataExplorer}/DataView/GeoTreeModel.cpp (100%)
 rename {Gui => Applications/DataExplorer}/DataView/GeoTreeModel.h (100%)
 rename {Gui => Applications/DataExplorer}/DataView/GeoTreeView.cpp (100%)
 rename {Gui => Applications/DataExplorer}/DataView/GeoTreeView.h (100%)
 rename {Gui => Applications/DataExplorer}/DataView/License.ui (100%)
 rename {Gui => Applications/DataExplorer}/DataView/LicenseDialog.cpp (100%)
 rename {Gui => Applications/DataExplorer}/DataView/LicenseDialog.h (100%)
 rename {Gui => Applications/DataExplorer}/DataView/LineEdit.ui (100%)
 rename {Gui => Applications/DataExplorer}/DataView/LineEditDialog.cpp (100%)
 rename {Gui => Applications/DataExplorer}/DataView/LineEditDialog.h (100%)
 rename {Gui => Applications/DataExplorer}/DataView/LinearEdit.ui (100%)
 rename {Gui => Applications/DataExplorer}/DataView/LinearEditDialog.cpp (100%)
 rename {Gui => Applications/DataExplorer}/DataView/LinearEditDialog.h (100%)
 rename {Gui => Applications/DataExplorer}/DataView/ListPropertiesDialog.cpp (100%)
 rename {Gui => Applications/DataExplorer}/DataView/ListPropertiesDialog.h (100%)
 rename {Gui => Applications/DataExplorer}/DataView/MergeGeometries.ui (100%)
 rename {Gui => Applications/DataExplorer}/DataView/MergeGeometriesDialog.cpp (100%)
 rename {Gui => Applications/DataExplorer}/DataView/MergeGeometriesDialog.h (100%)
 rename {Gui => Applications/DataExplorer}/DataView/MeshAnalysis.ui (100%)
 rename {Gui => Applications/DataExplorer}/DataView/MeshAnalysisDialog.cpp (100%)
 rename {Gui => Applications/DataExplorer}/DataView/MeshAnalysisDialog.h (100%)
 rename {Gui => Applications/DataExplorer}/DataView/MeshElementRemoval.ui (100%)
 rename {Gui => Applications/DataExplorer}/DataView/MeshElementRemovalDialog.cpp (100%)
 rename {Gui => Applications/DataExplorer}/DataView/MeshElementRemovalDialog.h (95%)
 rename {Gui => Applications/DataExplorer}/DataView/MeshLayerEdit.ui (100%)
 rename {Gui => Applications/DataExplorer}/DataView/MeshLayerEditDialog.cpp (100%)
 rename {Gui => Applications/DataExplorer}/DataView/MeshLayerEditDialog.h (100%)
 rename {Gui => Applications/DataExplorer}/DataView/MeshValueEdit.ui (100%)
 rename {Gui => Applications/DataExplorer}/DataView/MeshValueEditDialog.cpp (100%)
 rename {Gui => Applications/DataExplorer}/DataView/MeshValueEditDialog.h (100%)
 rename {Gui => Applications/DataExplorer}/DataView/ModelTreeItem.cpp (100%)
 rename {Gui => Applications/DataExplorer}/DataView/ModelTreeItem.h (100%)
 rename {Gui => Applications/DataExplorer}/DataView/ModellingTabWidget.cpp (100%)
 rename {Gui => Applications/DataExplorer}/DataView/ModellingTabWidget.h (100%)
 rename {Gui => Applications/DataExplorer}/DataView/ModellingTabWidgetBase.ui (100%)
 rename {Gui => Applications/DataExplorer}/DataView/MshEdit.ui (100%)
 rename {Gui => Applications/DataExplorer}/DataView/MshEditDialog.cpp (100%)
 rename {Gui => Applications/DataExplorer}/DataView/MshEditDialog.h (100%)
 rename {Gui => Applications/DataExplorer}/DataView/MshItem.cpp (100%)
 rename {Gui => Applications/DataExplorer}/DataView/MshItem.h (100%)
 rename {Gui => Applications/DataExplorer}/DataView/MshModel.cpp (100%)
 rename {Gui => Applications/DataExplorer}/DataView/MshModel.h (97%)
 rename {Gui => Applications/DataExplorer}/DataView/MshQualitySelection.ui (100%)
 rename {Gui => Applications/DataExplorer}/DataView/MshQualitySelectionDialog.cpp (100%)
 rename {Gui => Applications/DataExplorer}/DataView/MshQualitySelectionDialog.h (100%)
 rename {Gui => Applications/DataExplorer}/DataView/MshTabWidget.cpp (100%)
 rename {Gui => Applications/DataExplorer}/DataView/MshTabWidget.h (100%)
 rename {Gui => Applications/DataExplorer}/DataView/MshTabWidgetBase.ui (100%)
 rename {Gui => Applications/DataExplorer}/DataView/MshView.cpp (100%)
 rename {Gui => Applications/DataExplorer}/DataView/MshView.h (100%)
 rename {Gui => Applications/DataExplorer}/DataView/NetCdfConfigure.ui (100%)
 rename {Gui => Applications/DataExplorer}/DataView/NetCdfConfigureDialog.cpp (100%)
 rename {Gui => Applications/DataExplorer}/DataView/NetCdfConfigureDialog.h (100%)
 rename {Gui => Applications/DataExplorer}/DataView/NewProcess.ui (100%)
 rename {Gui => Applications/DataExplorer}/DataView/SHPImportDialog.cpp (100%)
 rename {Gui => Applications/DataExplorer}/DataView/SHPImportDialog.h (100%)
 rename {Gui => Applications/DataExplorer}/DataView/SelectMeshDialog.cpp (100%)
 rename {Gui => Applications/DataExplorer}/DataView/SelectMeshDialog.h (100%)
 rename {Gui => Applications/DataExplorer}/DataView/SetNameDialog.cpp (100%)
 rename {Gui => Applications/DataExplorer}/DataView/SetNameDialog.h (100%)
 rename {Gui => Applications/DataExplorer}/DataView/StationTabWidget.cpp (100%)
 rename {Gui => Applications/DataExplorer}/DataView/StationTabWidget.h (100%)
 rename {Gui => Applications/DataExplorer}/DataView/StationTabWidgetBase.ui (100%)
 rename {Gui => Applications/DataExplorer}/DataView/StationTreeModel.cpp (100%)
 rename {Gui => Applications/DataExplorer}/DataView/StationTreeModel.h (100%)
 rename {Gui => Applications/DataExplorer}/DataView/StationTreeView.cpp (100%)
 rename {Gui => Applications/DataExplorer}/DataView/StationTreeView.h (100%)
 rename {Gui => Applications/DataExplorer}/DataView/StratView/CMakeLists.txt (81%)
 rename {Gui => Applications/DataExplorer}/DataView/StratView/StratBar.cpp (100%)
 rename {Gui => Applications/DataExplorer}/DataView/StratView/StratBar.h (100%)
 rename {Gui => Applications/DataExplorer}/DataView/StratView/StratScene.cpp (100%)
 rename {Gui => Applications/DataExplorer}/DataView/StratView/StratScene.h (100%)
 rename {Gui => Applications/DataExplorer}/DataView/StratView/StratView.cpp (100%)
 rename {Gui => Applications/DataExplorer}/DataView/StratView/StratView.h (100%)
 rename {Gui => Applications/DataExplorer}/DataView/StratView/StratWindow.cpp (100%)
 rename {Gui => Applications/DataExplorer}/DataView/StratView/StratWindow.h (100%)
 rename {Gui => Applications/DataExplorer}/DataView/StratView/StratWindow.ui (100%)
 rename {Gui => Applications/DataExplorer}/Img/delete-icon.png (100%)
 rename {Gui => Applications/DataExplorer}/Img/icon_glass.png (100%)
 rename {Gui => Applications/DataExplorer}/Img/icon_glass_active.png (100%)
 rename {Gui => Applications/DataExplorer}/Img/icon_global.png (100%)
 rename {Gui => Applications/DataExplorer}/Img/icon_hlight.png (100%)
 rename {Gui => Applications/DataExplorer}/Img/icon_hlight_active.png (100%)
 rename {Gui => Applications/DataExplorer}/Img/icon_persp.png (100%)
 rename {Gui => Applications/DataExplorer}/Img/icon_persp_active.png (100%)
 rename {Gui => Applications/DataExplorer}/Img/icon_screen.png (100%)
 rename {Gui => Applications/DataExplorer}/Img/icon_xminus.png (100%)
 rename {Gui => Applications/DataExplorer}/Img/icon_xplus.png (100%)
 rename {Gui => Applications/DataExplorer}/Img/icon_yminus.png (100%)
 rename {Gui => Applications/DataExplorer}/Img/icon_yplus.png (100%)
 rename {Gui => Applications/DataExplorer}/Img/icon_zminus.png (100%)
 rename {Gui => Applications/DataExplorer}/Img/icon_zplus.png (100%)
 rename {Gui => Applications/DataExplorer}/Img/icons.qrc (100%)
 rename {Gui => Applications/DataExplorer}/Img/open-icon.png (100%)
 rename {Gui => Applications/DataExplorer}/Img/oxygen.icons (100%)
 rename {Gui => Applications/DataExplorer}/Img/refresh-icon.png (100%)
 rename {Gui => Applications/DataExplorer}/Img/save-icon.png (100%)
 rename {Gui => Applications/DataExplorer}/VtkAct/CMakeLists.txt (100%)
 rename {Gui => Applications/DataExplorer}/VtkAct/VtkCustomInteractorStyle.cpp (100%)
 rename {Gui => Applications/DataExplorer}/VtkAct/VtkCustomInteractorStyle.h (100%)
 rename {Gui => Applications/DataExplorer}/VtkAct/VtkPickCallback.cpp (100%)
 rename {Gui => Applications/DataExplorer}/VtkAct/VtkPickCallback.h (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/CMakeLists.txt (89%)
 rename {Gui => Applications/DataExplorer}/VtkVis/MeshFromRaster.ui (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/MeshFromRasterDialog.cpp (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/MeshFromRasterDialog.h (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/OGSFilterInfo.h (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/QVtkDataSetMapper.cpp (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/QVtkDataSetMapper.h (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VisPrefs.ui (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VisPrefsDialog.cpp (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VisPrefsDialog.h (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VisualizationWidget.cpp (76%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VisualizationWidget.h (95%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VisualizationWidgetBase.ui (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkAddFilterDialog.cpp (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkAddFilterDialog.h (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkAddFilterDialogBase.ui (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkAlgorithmProperties.cpp (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkAlgorithmProperties.h (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkAlgorithmPropertyCheckbox.cpp (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkAlgorithmPropertyCheckbox.h (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkAlgorithmPropertyLineEdit.cpp (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkAlgorithmPropertyLineEdit.h (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkAlgorithmPropertyVectorEdit.cpp (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkAlgorithmPropertyVectorEdit.h (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkAppendArrayFilter.cpp (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkAppendArrayFilter.h (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkBGImageSource.cpp (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkBGImageSource.h (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkColorByHeightFilter.cpp (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkColorByHeightFilter.h (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkColorLookupTable.cpp (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkColorLookupTable.h (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkCompositeColorByHeightFilter.cpp (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkCompositeColorByHeightFilter.h (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkCompositeColormapToImageFilter.cpp (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkCompositeColormapToImageFilter.h (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkCompositeContourFilter.cpp (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkCompositeContourFilter.h (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkCompositeElementSelectionFilter.cpp (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkCompositeElementSelectionFilter.h (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkCompositeFilter.cpp (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkCompositeFilter.h (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkCompositeGeoObjectFilter.cpp (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkCompositeGeoObjectFilter.h (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkCompositeImageToCylindersFilter.cpp (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkCompositeImageToCylindersFilter.h (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkCompositeLineToTubeFilter.cpp (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkCompositeLineToTubeFilter.h (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkCompositeNodeSelectionFilter.cpp (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkCompositeNodeSelectionFilter.h (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkCompositePointToGlyphFilter.cpp (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkCompositePointToGlyphFilter.h (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkCompositeTextureOnSurfaceFilter.cpp (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkCompositeTextureOnSurfaceFilter.h (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkCompositeThresholdFilter.cpp (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkCompositeThresholdFilter.h (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkFilterFactory.cpp (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkFilterFactory.h (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkGeoImageSource.cpp (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkGeoImageSource.h (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkImageDataToLinePolyDataFilter.cpp (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkImageDataToLinePolyDataFilter.h (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkMeshConverter.cpp (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkMeshConverter.h (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkMeshSource.cpp (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkMeshSource.h (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkPointsSource.cpp (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkPointsSource.h (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkPolylinesSource.cpp (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkPolylinesSource.h (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkRaster.cpp (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkRaster.h (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkStationSource.cpp (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkStationSource.h (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkSurfacesSource.cpp (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkSurfacesSource.h (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkTextureOnSurfaceFilter.cpp (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkTextureOnSurfaceFilter.h (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkVisHelper.cpp (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkVisHelper.h (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkVisImageItem.cpp (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkVisImageItem.h (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkVisPipeline.cpp (99%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkVisPipeline.h (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkVisPipelineItem.cpp (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkVisPipelineItem.h (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkVisPipelineView.cpp (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkVisPipelineView.h (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkVisPointSetItem.cpp (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkVisPointSetItem.h (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkVisTabWidget.cpp (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkVisTabWidget.h (100%)
 rename {Gui => Applications/DataExplorer}/VtkVis/VtkVisTabWidgetBase.ui (100%)
 rename {Gui => Applications/DataExplorer}/data-explorer.sh (100%)
 rename {Gui => Applications/DataExplorer}/main.cpp (100%)
 rename {Gui => Applications/DataExplorer}/mainwindow.cpp (98%)
 rename {Gui => Applications/DataExplorer}/mainwindow.h (94%)
 rename {Gui => Applications/DataExplorer}/mainwindow.ui (96%)
 delete mode 100644 Gui/Vrpn/CMakeLists.txt
 delete mode 100644 Gui/Vrpn/QSpaceNavigatorClient.cpp
 delete mode 100644 Gui/Vrpn/QSpaceNavigatorClient.h
 delete mode 100644 Gui/Vrpn/QVrpnArtTrackingClient.cpp
 delete mode 100644 Gui/Vrpn/QVrpnArtTrackingClient.h
 delete mode 100644 Gui/Vrpn/SpaceNavigatorClient.cpp
 delete mode 100644 Gui/Vrpn/SpaceNavigatorClient.h
 delete mode 100644 Gui/Vrpn/TrackingSettingsWidget.cpp
 delete mode 100644 Gui/Vrpn/TrackingSettingsWidget.h
 delete mode 100644 Gui/Vrpn/TrackingSettingsWidgetBase.ui
 delete mode 100644 Gui/Vrpn/VrpnArtTrackingClient.cpp
 delete mode 100644 Gui/Vrpn/VrpnArtTrackingClient.h
 delete mode 100644 Gui/Vrpn/VrpnClient.cpp
 delete mode 100644 Gui/Vrpn/VrpnClient.h
 delete mode 100644 Gui/VtkVis/VtkTrackedCamera.cpp
 delete mode 100644 Gui/VtkVis/VtkTrackedCamera.h

diff --git a/Applications/ApplicationsLib/CMakeLists.txt b/Applications/ApplicationsLib/CMakeLists.txt
new file mode 100644
index 00000000000..25a91adc633
--- /dev/null
+++ b/Applications/ApplicationsLib/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Source files
+SET ( LIB_SOURCES ProjectData.cpp )
+
+# Library
+ADD_LIBRARY (ApplicationsLib STATIC ${LIB_SOURCES})
+
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../DataExplorer/DataView)
+
+TARGET_LINK_LIBRARIES( ApplicationsLib
+	GeoLib
+	ProcessLib
+)
diff --git a/Applications/ProjectData.cpp b/Applications/ApplicationsLib/ProjectData.cpp
similarity index 100%
rename from Applications/ProjectData.cpp
rename to Applications/ApplicationsLib/ProjectData.cpp
diff --git a/Applications/ProjectData.h b/Applications/ApplicationsLib/ProjectData.h
similarity index 99%
rename from Applications/ProjectData.h
rename to Applications/ApplicationsLib/ProjectData.h
index 2f95070d3cc..4ad8486e082 100644
--- a/Applications/ProjectData.h
+++ b/Applications/ApplicationsLib/ProjectData.h
@@ -16,7 +16,7 @@
 #include <boost/property_tree/ptree.hpp>
 
 #ifdef OGS_BUILD_GUI
-#include "Gui/DataView/GEOModels.h"
+#include "GEOModels.h"
 #else
 #include "GeoLib/GEOObjects.h"
 #endif
diff --git a/Applications/CMakeLists.txt b/Applications/CMakeLists.txt
index a8fb8a985d1..783587a50a1 100644
--- a/Applications/CMakeLists.txt
+++ b/Applications/CMakeLists.txt
@@ -1,10 +1,6 @@
-# Source files
-SET ( LIB_SOURCES ProjectData.cpp )
+ADD_SUBDIRECTORY(ApplicationsLib)
 
-# Library
-ADD_LIBRARY (ApplicationsLib STATIC ${LIB_SOURCES})
-
-TARGET_LINK_LIBRARIES( ApplicationsLib
-        GeoLib
-        ProcessLib
-    )
+IF(OGS_BUILD_GUI)
+	ADD_DEFINITIONS(-DOGS_BUILD_GUI)
+	ADD_SUBDIRECTORY(DataExplorer)
+ENDIF() # OGS_BUILD_GUI
diff --git a/Gui/Base/CMakeLists.txt b/Applications/DataExplorer/Base/CMakeLists.txt
similarity index 100%
rename from Gui/Base/CMakeLists.txt
rename to Applications/DataExplorer/Base/CMakeLists.txt
diff --git a/Gui/Base/CheckboxDelegate.cpp b/Applications/DataExplorer/Base/CheckboxDelegate.cpp
similarity index 100%
rename from Gui/Base/CheckboxDelegate.cpp
rename to Applications/DataExplorer/Base/CheckboxDelegate.cpp
diff --git a/Gui/Base/CheckboxDelegate.h b/Applications/DataExplorer/Base/CheckboxDelegate.h
similarity index 100%
rename from Gui/Base/CheckboxDelegate.h
rename to Applications/DataExplorer/Base/CheckboxDelegate.h
diff --git a/Gui/Base/ColorPickerPushButton.cpp b/Applications/DataExplorer/Base/ColorPickerPushButton.cpp
similarity index 100%
rename from Gui/Base/ColorPickerPushButton.cpp
rename to Applications/DataExplorer/Base/ColorPickerPushButton.cpp
diff --git a/Gui/Base/ColorPickerPushButton.h b/Applications/DataExplorer/Base/ColorPickerPushButton.h
similarity index 100%
rename from Gui/Base/ColorPickerPushButton.h
rename to Applications/DataExplorer/Base/ColorPickerPushButton.h
diff --git a/Gui/Base/LastSavedFileDirectory.h b/Applications/DataExplorer/Base/LastSavedFileDirectory.h
similarity index 100%
rename from Gui/Base/LastSavedFileDirectory.h
rename to Applications/DataExplorer/Base/LastSavedFileDirectory.h
diff --git a/Gui/Base/OGSError.cpp b/Applications/DataExplorer/Base/OGSError.cpp
similarity index 100%
rename from Gui/Base/OGSError.cpp
rename to Applications/DataExplorer/Base/OGSError.cpp
diff --git a/Gui/Base/OGSError.h b/Applications/DataExplorer/Base/OGSError.h
similarity index 100%
rename from Gui/Base/OGSError.h
rename to Applications/DataExplorer/Base/OGSError.h
diff --git a/Gui/Base/QNonScalableGraphicsTextItem.cpp b/Applications/DataExplorer/Base/QNonScalableGraphicsTextItem.cpp
similarity index 100%
rename from Gui/Base/QNonScalableGraphicsTextItem.cpp
rename to Applications/DataExplorer/Base/QNonScalableGraphicsTextItem.cpp
diff --git a/Gui/Base/QNonScalableGraphicsTextItem.h b/Applications/DataExplorer/Base/QNonScalableGraphicsTextItem.h
similarity index 100%
rename from Gui/Base/QNonScalableGraphicsTextItem.h
rename to Applications/DataExplorer/Base/QNonScalableGraphicsTextItem.h
diff --git a/Gui/Base/QValueTooltipSlider.cpp b/Applications/DataExplorer/Base/QValueTooltipSlider.cpp
similarity index 100%
rename from Gui/Base/QValueTooltipSlider.cpp
rename to Applications/DataExplorer/Base/QValueTooltipSlider.cpp
diff --git a/Gui/Base/QValueTooltipSlider.h b/Applications/DataExplorer/Base/QValueTooltipSlider.h
similarity index 100%
rename from Gui/Base/QValueTooltipSlider.h
rename to Applications/DataExplorer/Base/QValueTooltipSlider.h
diff --git a/Gui/Base/RecentFiles.cpp b/Applications/DataExplorer/Base/RecentFiles.cpp
similarity index 100%
rename from Gui/Base/RecentFiles.cpp
rename to Applications/DataExplorer/Base/RecentFiles.cpp
diff --git a/Gui/Base/RecentFiles.h b/Applications/DataExplorer/Base/RecentFiles.h
similarity index 100%
rename from Gui/Base/RecentFiles.h
rename to Applications/DataExplorer/Base/RecentFiles.h
diff --git a/Gui/Base/StrictDoubleValidator.h b/Applications/DataExplorer/Base/StrictDoubleValidator.h
similarity index 100%
rename from Gui/Base/StrictDoubleValidator.h
rename to Applications/DataExplorer/Base/StrictDoubleValidator.h
diff --git a/Gui/Base/StrictIntValidator.h b/Applications/DataExplorer/Base/StrictIntValidator.h
similarity index 100%
rename from Gui/Base/StrictIntValidator.h
rename to Applications/DataExplorer/Base/StrictIntValidator.h
diff --git a/Gui/Base/TreeItem.cpp b/Applications/DataExplorer/Base/TreeItem.cpp
similarity index 100%
rename from Gui/Base/TreeItem.cpp
rename to Applications/DataExplorer/Base/TreeItem.cpp
diff --git a/Gui/Base/TreeItem.h b/Applications/DataExplorer/Base/TreeItem.h
similarity index 100%
rename from Gui/Base/TreeItem.h
rename to Applications/DataExplorer/Base/TreeItem.h
diff --git a/Gui/Base/TreeModel.cpp b/Applications/DataExplorer/Base/TreeModel.cpp
similarity index 100%
rename from Gui/Base/TreeModel.cpp
rename to Applications/DataExplorer/Base/TreeModel.cpp
diff --git a/Gui/Base/TreeModel.h b/Applications/DataExplorer/Base/TreeModel.h
similarity index 100%
rename from Gui/Base/TreeModel.h
rename to Applications/DataExplorer/Base/TreeModel.h
diff --git a/Gui/Base/TreeModelIterator.cpp b/Applications/DataExplorer/Base/TreeModelIterator.cpp
similarity index 100%
rename from Gui/Base/TreeModelIterator.cpp
rename to Applications/DataExplorer/Base/TreeModelIterator.cpp
diff --git a/Gui/Base/TreeModelIterator.h b/Applications/DataExplorer/Base/TreeModelIterator.h
similarity index 100%
rename from Gui/Base/TreeModelIterator.h
rename to Applications/DataExplorer/Base/TreeModelIterator.h
diff --git a/Gui/Base/modeltest.cpp b/Applications/DataExplorer/Base/modeltest.cpp
similarity index 100%
rename from Gui/Base/modeltest.cpp
rename to Applications/DataExplorer/Base/modeltest.cpp
diff --git a/Gui/Base/modeltest.h b/Applications/DataExplorer/Base/modeltest.h
similarity index 100%
rename from Gui/Base/modeltest.h
rename to Applications/DataExplorer/Base/modeltest.h
diff --git a/Gui/CMakeLists.txt b/Applications/DataExplorer/CMakeLists.txt
similarity index 88%
rename from Gui/CMakeLists.txt
rename to Applications/DataExplorer/CMakeLists.txt
index f1651bc6ac4..dca80e7a82e 100644
--- a/Gui/CMakeLists.txt
+++ b/Applications/DataExplorer/CMakeLists.txt
@@ -15,7 +15,4 @@ ADD_SUBDIRECTORY( DataView )
 ADD_SUBDIRECTORY( DataView/DiagramView )
 ADD_SUBDIRECTORY( VtkVis )
 ADD_SUBDIRECTORY( VtkAct )
-IF(VRPN_FOUND AND OGS_USE_VRPN)
-	ADD_SUBDIRECTORY( Vrpn )
-ENDIF()
 INCLUDE( DataExplorer.cmake )
diff --git a/Gui/DataExplorer.cmake b/Applications/DataExplorer/DataExplorer.cmake
similarity index 90%
rename from Gui/DataExplorer.cmake
rename to Applications/DataExplorer/DataExplorer.cmake
index 7b90a862478..0eb650222f8 100644
--- a/Gui/DataExplorer.cmake
+++ b/Applications/DataExplorer/DataExplorer.cmake
@@ -29,14 +29,15 @@ QT4_WRAP_CPP( MOC_SOURCES ${MOC_HEADERS} )
 
 # Include the headers which are generated by uic and moc
 # and include additional header
+SET(SOURCE_DIR_REL ${CMAKE_CURRENT_SOURCE_DIR}/../..)
 INCLUDE_DIRECTORIES(
-	${CMAKE_CURRENT_BINARY_DIR}/../BaseLib
-	${CMAKE_CURRENT_SOURCE_DIR}/../BaseLib
-	${CMAKE_CURRENT_SOURCE_DIR}/../MathLib
-	${CMAKE_CURRENT_SOURCE_DIR}/../GeoLib
-	${CMAKE_CURRENT_SOURCE_DIR}/../FileIO
-	${CMAKE_CURRENT_SOURCE_DIR}/../MeshLib
-	${CMAKE_CURRENT_SOURCE_DIR}/../MeshLibGEOTOOLS
+	${SOURCE_DIR_REL}/BaseLib
+	${SOURCE_DIR_REL}/BaseLib
+	${SOURCE_DIR_REL}/MathLib
+	${SOURCE_DIR_REL}/GeoLib
+	${SOURCE_DIR_REL}/FileIO
+	${SOURCE_DIR_REL}/MeshLib
+	${SOURCE_DIR_REL}/MeshLibGEOTOOLS
 	${CMAKE_CURRENT_BINARY_DIR}
 	${CMAKE_CURRENT_BINARY_DIR}/Base
 	${CMAKE_CURRENT_BINARY_DIR}/DataView
@@ -115,12 +116,8 @@ IF(VTKFBXCONVERTER_FOUND)
 	TARGET_LINK_LIBRARIES(ogs-gui ${VTKFBXCONVERTER_LIBRARIES})
 ENDIF()
 
-IF(OGS_USE_VRPN)
-	INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/Vrpn ${CMAKE_CURRENT_BINARY_DIR}/Vrpn )
-	TARGET_LINK_LIBRARIES( ogs-gui ${VRPN_LIBRARIES} OgsVrpn )
-ENDIF()
 
-set_property(TARGET ogs-gui PROPERTY FOLDER "DataExplorer")
+SET_PROPERTY(TARGET ogs-gui PROPERTY FOLDER "DataExplorer")
 
 
 ####################
diff --git a/Gui/DataView/BaseItem.h b/Applications/DataExplorer/DataView/BaseItem.h
similarity index 100%
rename from Gui/DataView/BaseItem.h
rename to Applications/DataExplorer/DataView/BaseItem.h
diff --git a/Gui/DataView/CMakeLists.txt b/Applications/DataExplorer/DataView/CMakeLists.txt
similarity index 91%
rename from Gui/DataView/CMakeLists.txt
rename to Applications/DataExplorer/DataView/CMakeLists.txt
index 3e820c31f00..eb1566eb452 100644
--- a/Gui/DataView/CMakeLists.txt
+++ b/Applications/DataExplorer/DataView/CMakeLists.txt
@@ -129,28 +129,26 @@ qt4_wrap_cpp( MOC_SOURCES ${MOC_HEADERS} )
 
 # 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(
 	${CMAKE_CURRENT_BINARY_DIR}/../Base
 	${CMAKE_CURRENT_BINARY_DIR}
 	${CMAKE_CURRENT_BINARY_DIR}/DiagramView
 	${CMAKE_CURRENT_BINARY_DIR}/StratView
 
-	${CMAKE_CURRENT_SOURCE_DIR}/../../BaseLib
-	${CMAKE_CURRENT_SOURCE_DIR}/../../MathLib
-	${CMAKE_CURRENT_SOURCE_DIR}/../../GeoLib
-	${CMAKE_CURRENT_SOURCE_DIR}/../../MeshLib
-	${CMAKE_CURRENT_SOURCE_DIR}/../../FileIO
+	${SOURCE_DIR_REL}/BaseLib
+	${SOURCE_DIR_REL}/MathLib
+	${SOURCE_DIR_REL}/GeoLib
+	${SOURCE_DIR_REL}/MeshLib
+	${SOURCE_DIR_REL}/FileIO
 	${CMAKE_CURRENT_SOURCE_DIR}
 	${CMAKE_CURRENT_SOURCE_DIR}/DiagramView
 	${CMAKE_CURRENT_SOURCE_DIR}/StratView
-	${CMAKE_CURRENT_SOURCE_DIR}/../Base
-	${CMAKE_CURRENT_SOURCE_DIR}/../VtkVis
+	${GUI_SOURCE_DIR_REL}/Base
+	${GUI_SOURCE_DIR_REL}/VtkVis
 )
 
-IF(VRPN_FOUND)
-	INCLUDE_DIRECTORIES( ../Vrpn ${VRPN_INCLUDE_DIRS} )
-ENDIF()
-
 IF (VTKOSGCONVERTER_FOUND)
 	INCLUDE_DIRECTORIES( ${VTKOSGCONVERTER_INCLUDE_DIRS} )
 ENDIF (VTKOSGCONVERTER_FOUND)
diff --git a/Gui/DataView/ColorTableModel.cpp b/Applications/DataExplorer/DataView/ColorTableModel.cpp
similarity index 100%
rename from Gui/DataView/ColorTableModel.cpp
rename to Applications/DataExplorer/DataView/ColorTableModel.cpp
diff --git a/Gui/DataView/ColorTableModel.h b/Applications/DataExplorer/DataView/ColorTableModel.h
similarity index 100%
rename from Gui/DataView/ColorTableModel.h
rename to Applications/DataExplorer/DataView/ColorTableModel.h
diff --git a/Gui/DataView/ColorTableView.cpp b/Applications/DataExplorer/DataView/ColorTableView.cpp
similarity index 100%
rename from Gui/DataView/ColorTableView.cpp
rename to Applications/DataExplorer/DataView/ColorTableView.cpp
diff --git a/Gui/DataView/ColorTableView.h b/Applications/DataExplorer/DataView/ColorTableView.h
similarity index 100%
rename from Gui/DataView/ColorTableView.h
rename to Applications/DataExplorer/DataView/ColorTableView.h
diff --git a/Gui/DataView/CondFromRaster.ui b/Applications/DataExplorer/DataView/CondFromRaster.ui
similarity index 100%
rename from Gui/DataView/CondFromRaster.ui
rename to Applications/DataExplorer/DataView/CondFromRaster.ui
diff --git a/Gui/DataView/CondFromRasterDialog.cpp b/Applications/DataExplorer/DataView/CondFromRasterDialog.cpp
similarity index 100%
rename from Gui/DataView/CondFromRasterDialog.cpp
rename to Applications/DataExplorer/DataView/CondFromRasterDialog.cpp
diff --git a/Gui/DataView/CondFromRasterDialog.h b/Applications/DataExplorer/DataView/CondFromRasterDialog.h
similarity index 96%
rename from Gui/DataView/CondFromRasterDialog.h
rename to Applications/DataExplorer/DataView/CondFromRasterDialog.h
index 7b12e04e0c6..0c6bbb040ff 100644
--- a/Gui/DataView/CondFromRasterDialog.h
+++ b/Applications/DataExplorer/DataView/CondFromRasterDialog.h
@@ -18,7 +18,7 @@
 #include "ui_CondFromRaster.h"
 #include <QDialog>
 
-#include "Applications/ProjectData.h"
+#include "Applications/ApplicationsLib/ProjectData.h"
 
 namespace MeshLib {
 	class Mesh;
diff --git a/Gui/DataView/CondItem.h b/Applications/DataExplorer/DataView/CondItem.h
similarity index 100%
rename from Gui/DataView/CondItem.h
rename to Applications/DataExplorer/DataView/CondItem.h
diff --git a/Gui/DataView/CondObjectListItem.h b/Applications/DataExplorer/DataView/CondObjectListItem.h
similarity index 100%
rename from Gui/DataView/CondObjectListItem.h
rename to Applications/DataExplorer/DataView/CondObjectListItem.h
diff --git a/Gui/DataView/ConditionWriter.ui b/Applications/DataExplorer/DataView/ConditionWriter.ui
similarity index 100%
rename from Gui/DataView/ConditionWriter.ui
rename to Applications/DataExplorer/DataView/ConditionWriter.ui
diff --git a/Gui/DataView/DataExplorerSettings.ui b/Applications/DataExplorer/DataView/DataExplorerSettings.ui
similarity index 100%
rename from Gui/DataView/DataExplorerSettings.ui
rename to Applications/DataExplorer/DataView/DataExplorerSettings.ui
diff --git a/Gui/DataView/DataExplorerSettingsDialog.cpp b/Applications/DataExplorer/DataView/DataExplorerSettingsDialog.cpp
similarity index 100%
rename from Gui/DataView/DataExplorerSettingsDialog.cpp
rename to Applications/DataExplorer/DataView/DataExplorerSettingsDialog.cpp
diff --git a/Gui/DataView/DataExplorerSettingsDialog.h b/Applications/DataExplorer/DataView/DataExplorerSettingsDialog.h
similarity index 100%
rename from Gui/DataView/DataExplorerSettingsDialog.h
rename to Applications/DataExplorer/DataView/DataExplorerSettingsDialog.h
diff --git a/Gui/DataView/DiagramView/CMakeLists.txt b/Applications/DataExplorer/DataView/DiagramView/CMakeLists.txt
similarity index 77%
rename from Gui/DataView/DiagramView/CMakeLists.txt
rename to Applications/DataExplorer/DataView/DiagramView/CMakeLists.txt
index ee93c5202c6..10bfe2b0fc1 100644
--- a/Gui/DataView/DiagramView/CMakeLists.txt
+++ b/Applications/DataExplorer/DataView/DiagramView/CMakeLists.txt
@@ -38,16 +38,15 @@ QT4_WRAP_CPP( MOC_SOURCES ${MOC_HEADERS} )
 
 # 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(
-	${CMAKE_CURRENT_SOURCE_DIR}/../BaseLib
-	${CMAKE_CURRENT_SOURCE_DIR}/../GeoLib
-	${CMAKE_CURRENT_SOURCE_DIR}/../MathLib
+	${SOURCE_DIR_REL}/BaseLib
+	${SOURCE_DIR_REL}/GeoLib
+	${SOURCE_DIR_REL}/MathLib
 	${CMAKE_CURRENT_SOURCE_DIR}
-	${CMAKE_CURRENT_SOURCE_DIR}/../../Base
-	${CMAKE_CURRENT_SOURCE_DIR}/../../DataView
-	${CMAKE_CURRENT_SOURCE_DIR}/../../../BaseLib
-	${CMAKE_CURRENT_SOURCE_DIR}/../../../GeoLib
-	${CMAKE_CURRENT_SOURCE_DIR}/../../../MathLib
+	${GUI_SOURCE_DIR_REL}/Base
+	${GUI_SOURCE_DIR_REL}/DataView
 	${CMAKE_CURRENT_BINARY_DIR}/../../DataView
 	${CMAKE_CURRENT_BINARY_DIR}
 )
diff --git a/Gui/DataView/DiagramView/DetailWindow.cpp b/Applications/DataExplorer/DataView/DiagramView/DetailWindow.cpp
similarity index 100%
rename from Gui/DataView/DiagramView/DetailWindow.cpp
rename to Applications/DataExplorer/DataView/DiagramView/DetailWindow.cpp
diff --git a/Gui/DataView/DiagramView/DetailWindow.h b/Applications/DataExplorer/DataView/DiagramView/DetailWindow.h
similarity index 100%
rename from Gui/DataView/DiagramView/DetailWindow.h
rename to Applications/DataExplorer/DataView/DiagramView/DetailWindow.h
diff --git a/Gui/DataView/DiagramView/DetailWindow.ui b/Applications/DataExplorer/DataView/DiagramView/DetailWindow.ui
similarity index 100%
rename from Gui/DataView/DiagramView/DetailWindow.ui
rename to Applications/DataExplorer/DataView/DiagramView/DetailWindow.ui
diff --git a/Gui/DataView/DiagramView/DiagramList.cpp b/Applications/DataExplorer/DataView/DiagramView/DiagramList.cpp
similarity index 100%
rename from Gui/DataView/DiagramView/DiagramList.cpp
rename to Applications/DataExplorer/DataView/DiagramView/DiagramList.cpp
diff --git a/Gui/DataView/DiagramView/DiagramList.h b/Applications/DataExplorer/DataView/DiagramView/DiagramList.h
similarity index 100%
rename from Gui/DataView/DiagramView/DiagramList.h
rename to Applications/DataExplorer/DataView/DiagramView/DiagramList.h
diff --git a/Gui/DataView/DiagramView/DiagramPrefs.ui b/Applications/DataExplorer/DataView/DiagramView/DiagramPrefs.ui
similarity index 100%
rename from Gui/DataView/DiagramView/DiagramPrefs.ui
rename to Applications/DataExplorer/DataView/DiagramView/DiagramPrefs.ui
diff --git a/Gui/DataView/DiagramView/DiagramPrefsDialog.cpp b/Applications/DataExplorer/DataView/DiagramView/DiagramPrefsDialog.cpp
similarity index 100%
rename from Gui/DataView/DiagramView/DiagramPrefsDialog.cpp
rename to Applications/DataExplorer/DataView/DiagramView/DiagramPrefsDialog.cpp
diff --git a/Gui/DataView/DiagramView/DiagramPrefsDialog.h b/Applications/DataExplorer/DataView/DiagramView/DiagramPrefsDialog.h
similarity index 100%
rename from Gui/DataView/DiagramView/DiagramPrefsDialog.h
rename to Applications/DataExplorer/DataView/DiagramView/DiagramPrefsDialog.h
diff --git a/Gui/DataView/DiagramView/DiagramScene.cpp b/Applications/DataExplorer/DataView/DiagramView/DiagramScene.cpp
similarity index 100%
rename from Gui/DataView/DiagramView/DiagramScene.cpp
rename to Applications/DataExplorer/DataView/DiagramView/DiagramScene.cpp
diff --git a/Gui/DataView/DiagramView/DiagramScene.h b/Applications/DataExplorer/DataView/DiagramView/DiagramScene.h
similarity index 100%
rename from Gui/DataView/DiagramView/DiagramScene.h
rename to Applications/DataExplorer/DataView/DiagramView/DiagramScene.h
diff --git a/Gui/DataView/DiagramView/DiagramView.cpp b/Applications/DataExplorer/DataView/DiagramView/DiagramView.cpp
similarity index 100%
rename from Gui/DataView/DiagramView/DiagramView.cpp
rename to Applications/DataExplorer/DataView/DiagramView/DiagramView.cpp
diff --git a/Gui/DataView/DiagramView/DiagramView.h b/Applications/DataExplorer/DataView/DiagramView/DiagramView.h
similarity index 100%
rename from Gui/DataView/DiagramView/DiagramView.h
rename to Applications/DataExplorer/DataView/DiagramView/DiagramView.h
diff --git a/Gui/DataView/DiagramView/QArrow.cpp b/Applications/DataExplorer/DataView/DiagramView/QArrow.cpp
similarity index 100%
rename from Gui/DataView/DiagramView/QArrow.cpp
rename to Applications/DataExplorer/DataView/DiagramView/QArrow.cpp
diff --git a/Gui/DataView/DiagramView/QArrow.h b/Applications/DataExplorer/DataView/DiagramView/QArrow.h
similarity index 100%
rename from Gui/DataView/DiagramView/QArrow.h
rename to Applications/DataExplorer/DataView/DiagramView/QArrow.h
diff --git a/Gui/DataView/DiagramView/QGraphicsGrid.cpp b/Applications/DataExplorer/DataView/DiagramView/QGraphicsGrid.cpp
similarity index 100%
rename from Gui/DataView/DiagramView/QGraphicsGrid.cpp
rename to Applications/DataExplorer/DataView/DiagramView/QGraphicsGrid.cpp
diff --git a/Gui/DataView/DiagramView/QGraphicsGrid.h b/Applications/DataExplorer/DataView/DiagramView/QGraphicsGrid.h
similarity index 100%
rename from Gui/DataView/DiagramView/QGraphicsGrid.h
rename to Applications/DataExplorer/DataView/DiagramView/QGraphicsGrid.h
diff --git a/Gui/DataView/DirectConditionGenerator.cpp b/Applications/DataExplorer/DataView/DirectConditionGenerator.cpp
similarity index 100%
rename from Gui/DataView/DirectConditionGenerator.cpp
rename to Applications/DataExplorer/DataView/DirectConditionGenerator.cpp
diff --git a/Gui/DataView/DirectConditionGenerator.h b/Applications/DataExplorer/DataView/DirectConditionGenerator.h
similarity index 100%
rename from Gui/DataView/DirectConditionGenerator.h
rename to Applications/DataExplorer/DataView/DirectConditionGenerator.h
diff --git a/Gui/DataView/ElementTreeModel.cpp b/Applications/DataExplorer/DataView/ElementTreeModel.cpp
similarity index 100%
rename from Gui/DataView/ElementTreeModel.cpp
rename to Applications/DataExplorer/DataView/ElementTreeModel.cpp
diff --git a/Gui/DataView/ElementTreeModel.h b/Applications/DataExplorer/DataView/ElementTreeModel.h
similarity index 100%
rename from Gui/DataView/ElementTreeModel.h
rename to Applications/DataExplorer/DataView/ElementTreeModel.h
diff --git a/Gui/DataView/ElementTreeView.cpp b/Applications/DataExplorer/DataView/ElementTreeView.cpp
similarity index 100%
rename from Gui/DataView/ElementTreeView.cpp
rename to Applications/DataExplorer/DataView/ElementTreeView.cpp
diff --git a/Gui/DataView/ElementTreeView.h b/Applications/DataExplorer/DataView/ElementTreeView.h
similarity index 100%
rename from Gui/DataView/ElementTreeView.h
rename to Applications/DataExplorer/DataView/ElementTreeView.h
diff --git a/Gui/DataView/FEMConditionSetup.ui b/Applications/DataExplorer/DataView/FEMConditionSetup.ui
similarity index 100%
rename from Gui/DataView/FEMConditionSetup.ui
rename to Applications/DataExplorer/DataView/FEMConditionSetup.ui
diff --git a/Gui/DataView/GEOModels.cpp b/Applications/DataExplorer/DataView/GEOModels.cpp
similarity index 100%
rename from Gui/DataView/GEOModels.cpp
rename to Applications/DataExplorer/DataView/GEOModels.cpp
diff --git a/Gui/DataView/GEOModels.h b/Applications/DataExplorer/DataView/GEOModels.h
similarity index 100%
rename from Gui/DataView/GEOModels.h
rename to Applications/DataExplorer/DataView/GEOModels.h
diff --git a/Gui/DataView/GMSHPrefs.ui b/Applications/DataExplorer/DataView/GMSHPrefs.ui
similarity index 100%
rename from Gui/DataView/GMSHPrefs.ui
rename to Applications/DataExplorer/DataView/GMSHPrefs.ui
diff --git a/Gui/DataView/GMSHPrefsDialog.cpp b/Applications/DataExplorer/DataView/GMSHPrefsDialog.cpp
similarity index 100%
rename from Gui/DataView/GMSHPrefsDialog.cpp
rename to Applications/DataExplorer/DataView/GMSHPrefsDialog.cpp
diff --git a/Gui/DataView/GMSHPrefsDialog.h b/Applications/DataExplorer/DataView/GMSHPrefsDialog.h
similarity index 100%
rename from Gui/DataView/GMSHPrefsDialog.h
rename to Applications/DataExplorer/DataView/GMSHPrefsDialog.h
diff --git a/Gui/DataView/GeoMapper.cpp b/Applications/DataExplorer/DataView/GeoMapper.cpp
similarity index 100%
rename from Gui/DataView/GeoMapper.cpp
rename to Applications/DataExplorer/DataView/GeoMapper.cpp
diff --git a/Gui/DataView/GeoMapper.h b/Applications/DataExplorer/DataView/GeoMapper.h
similarity index 100%
rename from Gui/DataView/GeoMapper.h
rename to Applications/DataExplorer/DataView/GeoMapper.h
diff --git a/Gui/DataView/GeoObjectListItem.h b/Applications/DataExplorer/DataView/GeoObjectListItem.h
similarity index 100%
rename from Gui/DataView/GeoObjectListItem.h
rename to Applications/DataExplorer/DataView/GeoObjectListItem.h
diff --git a/Gui/DataView/GeoOnMeshMapping.ui b/Applications/DataExplorer/DataView/GeoOnMeshMapping.ui
similarity index 100%
rename from Gui/DataView/GeoOnMeshMapping.ui
rename to Applications/DataExplorer/DataView/GeoOnMeshMapping.ui
diff --git a/Gui/DataView/GeoOnMeshMappingDialog.cpp b/Applications/DataExplorer/DataView/GeoOnMeshMappingDialog.cpp
similarity index 100%
rename from Gui/DataView/GeoOnMeshMappingDialog.cpp
rename to Applications/DataExplorer/DataView/GeoOnMeshMappingDialog.cpp
diff --git a/Gui/DataView/GeoOnMeshMappingDialog.h b/Applications/DataExplorer/DataView/GeoOnMeshMappingDialog.h
similarity index 100%
rename from Gui/DataView/GeoOnMeshMappingDialog.h
rename to Applications/DataExplorer/DataView/GeoOnMeshMappingDialog.h
diff --git a/Gui/DataView/GeoTabWidget.cpp b/Applications/DataExplorer/DataView/GeoTabWidget.cpp
similarity index 100%
rename from Gui/DataView/GeoTabWidget.cpp
rename to Applications/DataExplorer/DataView/GeoTabWidget.cpp
diff --git a/Gui/DataView/GeoTabWidget.h b/Applications/DataExplorer/DataView/GeoTabWidget.h
similarity index 100%
rename from Gui/DataView/GeoTabWidget.h
rename to Applications/DataExplorer/DataView/GeoTabWidget.h
diff --git a/Gui/DataView/GeoTabWidgetBase.ui b/Applications/DataExplorer/DataView/GeoTabWidgetBase.ui
similarity index 100%
rename from Gui/DataView/GeoTabWidgetBase.ui
rename to Applications/DataExplorer/DataView/GeoTabWidgetBase.ui
diff --git a/Gui/DataView/GeoTreeItem.h b/Applications/DataExplorer/DataView/GeoTreeItem.h
similarity index 100%
rename from Gui/DataView/GeoTreeItem.h
rename to Applications/DataExplorer/DataView/GeoTreeItem.h
diff --git a/Gui/DataView/GeoTreeModel.cpp b/Applications/DataExplorer/DataView/GeoTreeModel.cpp
similarity index 100%
rename from Gui/DataView/GeoTreeModel.cpp
rename to Applications/DataExplorer/DataView/GeoTreeModel.cpp
diff --git a/Gui/DataView/GeoTreeModel.h b/Applications/DataExplorer/DataView/GeoTreeModel.h
similarity index 100%
rename from Gui/DataView/GeoTreeModel.h
rename to Applications/DataExplorer/DataView/GeoTreeModel.h
diff --git a/Gui/DataView/GeoTreeView.cpp b/Applications/DataExplorer/DataView/GeoTreeView.cpp
similarity index 100%
rename from Gui/DataView/GeoTreeView.cpp
rename to Applications/DataExplorer/DataView/GeoTreeView.cpp
diff --git a/Gui/DataView/GeoTreeView.h b/Applications/DataExplorer/DataView/GeoTreeView.h
similarity index 100%
rename from Gui/DataView/GeoTreeView.h
rename to Applications/DataExplorer/DataView/GeoTreeView.h
diff --git a/Gui/DataView/License.ui b/Applications/DataExplorer/DataView/License.ui
similarity index 100%
rename from Gui/DataView/License.ui
rename to Applications/DataExplorer/DataView/License.ui
diff --git a/Gui/DataView/LicenseDialog.cpp b/Applications/DataExplorer/DataView/LicenseDialog.cpp
similarity index 100%
rename from Gui/DataView/LicenseDialog.cpp
rename to Applications/DataExplorer/DataView/LicenseDialog.cpp
diff --git a/Gui/DataView/LicenseDialog.h b/Applications/DataExplorer/DataView/LicenseDialog.h
similarity index 100%
rename from Gui/DataView/LicenseDialog.h
rename to Applications/DataExplorer/DataView/LicenseDialog.h
diff --git a/Gui/DataView/LineEdit.ui b/Applications/DataExplorer/DataView/LineEdit.ui
similarity index 100%
rename from Gui/DataView/LineEdit.ui
rename to Applications/DataExplorer/DataView/LineEdit.ui
diff --git a/Gui/DataView/LineEditDialog.cpp b/Applications/DataExplorer/DataView/LineEditDialog.cpp
similarity index 100%
rename from Gui/DataView/LineEditDialog.cpp
rename to Applications/DataExplorer/DataView/LineEditDialog.cpp
diff --git a/Gui/DataView/LineEditDialog.h b/Applications/DataExplorer/DataView/LineEditDialog.h
similarity index 100%
rename from Gui/DataView/LineEditDialog.h
rename to Applications/DataExplorer/DataView/LineEditDialog.h
diff --git a/Gui/DataView/LinearEdit.ui b/Applications/DataExplorer/DataView/LinearEdit.ui
similarity index 100%
rename from Gui/DataView/LinearEdit.ui
rename to Applications/DataExplorer/DataView/LinearEdit.ui
diff --git a/Gui/DataView/LinearEditDialog.cpp b/Applications/DataExplorer/DataView/LinearEditDialog.cpp
similarity index 100%
rename from Gui/DataView/LinearEditDialog.cpp
rename to Applications/DataExplorer/DataView/LinearEditDialog.cpp
diff --git a/Gui/DataView/LinearEditDialog.h b/Applications/DataExplorer/DataView/LinearEditDialog.h
similarity index 100%
rename from Gui/DataView/LinearEditDialog.h
rename to Applications/DataExplorer/DataView/LinearEditDialog.h
diff --git a/Gui/DataView/ListPropertiesDialog.cpp b/Applications/DataExplorer/DataView/ListPropertiesDialog.cpp
similarity index 100%
rename from Gui/DataView/ListPropertiesDialog.cpp
rename to Applications/DataExplorer/DataView/ListPropertiesDialog.cpp
diff --git a/Gui/DataView/ListPropertiesDialog.h b/Applications/DataExplorer/DataView/ListPropertiesDialog.h
similarity index 100%
rename from Gui/DataView/ListPropertiesDialog.h
rename to Applications/DataExplorer/DataView/ListPropertiesDialog.h
diff --git a/Gui/DataView/MergeGeometries.ui b/Applications/DataExplorer/DataView/MergeGeometries.ui
similarity index 100%
rename from Gui/DataView/MergeGeometries.ui
rename to Applications/DataExplorer/DataView/MergeGeometries.ui
diff --git a/Gui/DataView/MergeGeometriesDialog.cpp b/Applications/DataExplorer/DataView/MergeGeometriesDialog.cpp
similarity index 100%
rename from Gui/DataView/MergeGeometriesDialog.cpp
rename to Applications/DataExplorer/DataView/MergeGeometriesDialog.cpp
diff --git a/Gui/DataView/MergeGeometriesDialog.h b/Applications/DataExplorer/DataView/MergeGeometriesDialog.h
similarity index 100%
rename from Gui/DataView/MergeGeometriesDialog.h
rename to Applications/DataExplorer/DataView/MergeGeometriesDialog.h
diff --git a/Gui/DataView/MeshAnalysis.ui b/Applications/DataExplorer/DataView/MeshAnalysis.ui
similarity index 100%
rename from Gui/DataView/MeshAnalysis.ui
rename to Applications/DataExplorer/DataView/MeshAnalysis.ui
diff --git a/Gui/DataView/MeshAnalysisDialog.cpp b/Applications/DataExplorer/DataView/MeshAnalysisDialog.cpp
similarity index 100%
rename from Gui/DataView/MeshAnalysisDialog.cpp
rename to Applications/DataExplorer/DataView/MeshAnalysisDialog.cpp
diff --git a/Gui/DataView/MeshAnalysisDialog.h b/Applications/DataExplorer/DataView/MeshAnalysisDialog.h
similarity index 100%
rename from Gui/DataView/MeshAnalysisDialog.h
rename to Applications/DataExplorer/DataView/MeshAnalysisDialog.h
diff --git a/Gui/DataView/MeshElementRemoval.ui b/Applications/DataExplorer/DataView/MeshElementRemoval.ui
similarity index 100%
rename from Gui/DataView/MeshElementRemoval.ui
rename to Applications/DataExplorer/DataView/MeshElementRemoval.ui
diff --git a/Gui/DataView/MeshElementRemovalDialog.cpp b/Applications/DataExplorer/DataView/MeshElementRemovalDialog.cpp
similarity index 100%
rename from Gui/DataView/MeshElementRemovalDialog.cpp
rename to Applications/DataExplorer/DataView/MeshElementRemovalDialog.cpp
diff --git a/Gui/DataView/MeshElementRemovalDialog.h b/Applications/DataExplorer/DataView/MeshElementRemovalDialog.h
similarity index 95%
rename from Gui/DataView/MeshElementRemovalDialog.h
rename to Applications/DataExplorer/DataView/MeshElementRemovalDialog.h
index bf0a2c21b91..fb9f0d0a675 100644
--- a/Gui/DataView/MeshElementRemovalDialog.h
+++ b/Applications/DataExplorer/DataView/MeshElementRemovalDialog.h
@@ -18,7 +18,7 @@
 #include "ui_MeshElementRemoval.h"
 #include <QDialog>
 
-#include "Applications/ProjectData.h"
+#include "Applications/ApplicationsLib/ProjectData.h"
 
 class Node;
 
@@ -32,7 +32,7 @@ class MeshElementRemovalDialog : public QDialog, private Ui_MeshElementRemoval
 public:
 	MeshElementRemovalDialog(const ProjectData &project, QDialog* parent = 0);
 	~MeshElementRemovalDialog(void);
-	
+
 private slots:
 	void on_boundingBoxCheckBox_toggled(bool is_checked);
 	void on_elementTypeCheckBox_toggled(bool is_checked);
@@ -44,7 +44,7 @@ private slots:
 private:
 	const ProjectData& _project;
 	unsigned _currentIndex, _aabbIndex, _matIDIndex;
-	
+
 signals:
 	void meshAdded(MeshLib::Mesh* mesh);
 };
diff --git a/Gui/DataView/MeshLayerEdit.ui b/Applications/DataExplorer/DataView/MeshLayerEdit.ui
similarity index 100%
rename from Gui/DataView/MeshLayerEdit.ui
rename to Applications/DataExplorer/DataView/MeshLayerEdit.ui
diff --git a/Gui/DataView/MeshLayerEditDialog.cpp b/Applications/DataExplorer/DataView/MeshLayerEditDialog.cpp
similarity index 100%
rename from Gui/DataView/MeshLayerEditDialog.cpp
rename to Applications/DataExplorer/DataView/MeshLayerEditDialog.cpp
diff --git a/Gui/DataView/MeshLayerEditDialog.h b/Applications/DataExplorer/DataView/MeshLayerEditDialog.h
similarity index 100%
rename from Gui/DataView/MeshLayerEditDialog.h
rename to Applications/DataExplorer/DataView/MeshLayerEditDialog.h
diff --git a/Gui/DataView/MeshValueEdit.ui b/Applications/DataExplorer/DataView/MeshValueEdit.ui
similarity index 100%
rename from Gui/DataView/MeshValueEdit.ui
rename to Applications/DataExplorer/DataView/MeshValueEdit.ui
diff --git a/Gui/DataView/MeshValueEditDialog.cpp b/Applications/DataExplorer/DataView/MeshValueEditDialog.cpp
similarity index 100%
rename from Gui/DataView/MeshValueEditDialog.cpp
rename to Applications/DataExplorer/DataView/MeshValueEditDialog.cpp
diff --git a/Gui/DataView/MeshValueEditDialog.h b/Applications/DataExplorer/DataView/MeshValueEditDialog.h
similarity index 100%
rename from Gui/DataView/MeshValueEditDialog.h
rename to Applications/DataExplorer/DataView/MeshValueEditDialog.h
diff --git a/Gui/DataView/ModelTreeItem.cpp b/Applications/DataExplorer/DataView/ModelTreeItem.cpp
similarity index 100%
rename from Gui/DataView/ModelTreeItem.cpp
rename to Applications/DataExplorer/DataView/ModelTreeItem.cpp
diff --git a/Gui/DataView/ModelTreeItem.h b/Applications/DataExplorer/DataView/ModelTreeItem.h
similarity index 100%
rename from Gui/DataView/ModelTreeItem.h
rename to Applications/DataExplorer/DataView/ModelTreeItem.h
diff --git a/Gui/DataView/ModellingTabWidget.cpp b/Applications/DataExplorer/DataView/ModellingTabWidget.cpp
similarity index 100%
rename from Gui/DataView/ModellingTabWidget.cpp
rename to Applications/DataExplorer/DataView/ModellingTabWidget.cpp
diff --git a/Gui/DataView/ModellingTabWidget.h b/Applications/DataExplorer/DataView/ModellingTabWidget.h
similarity index 100%
rename from Gui/DataView/ModellingTabWidget.h
rename to Applications/DataExplorer/DataView/ModellingTabWidget.h
diff --git a/Gui/DataView/ModellingTabWidgetBase.ui b/Applications/DataExplorer/DataView/ModellingTabWidgetBase.ui
similarity index 100%
rename from Gui/DataView/ModellingTabWidgetBase.ui
rename to Applications/DataExplorer/DataView/ModellingTabWidgetBase.ui
diff --git a/Gui/DataView/MshEdit.ui b/Applications/DataExplorer/DataView/MshEdit.ui
similarity index 100%
rename from Gui/DataView/MshEdit.ui
rename to Applications/DataExplorer/DataView/MshEdit.ui
diff --git a/Gui/DataView/MshEditDialog.cpp b/Applications/DataExplorer/DataView/MshEditDialog.cpp
similarity index 100%
rename from Gui/DataView/MshEditDialog.cpp
rename to Applications/DataExplorer/DataView/MshEditDialog.cpp
diff --git a/Gui/DataView/MshEditDialog.h b/Applications/DataExplorer/DataView/MshEditDialog.h
similarity index 100%
rename from Gui/DataView/MshEditDialog.h
rename to Applications/DataExplorer/DataView/MshEditDialog.h
diff --git a/Gui/DataView/MshItem.cpp b/Applications/DataExplorer/DataView/MshItem.cpp
similarity index 100%
rename from Gui/DataView/MshItem.cpp
rename to Applications/DataExplorer/DataView/MshItem.cpp
diff --git a/Gui/DataView/MshItem.h b/Applications/DataExplorer/DataView/MshItem.h
similarity index 100%
rename from Gui/DataView/MshItem.h
rename to Applications/DataExplorer/DataView/MshItem.h
diff --git a/Gui/DataView/MshModel.cpp b/Applications/DataExplorer/DataView/MshModel.cpp
similarity index 100%
rename from Gui/DataView/MshModel.cpp
rename to Applications/DataExplorer/DataView/MshModel.cpp
diff --git a/Gui/DataView/MshModel.h b/Applications/DataExplorer/DataView/MshModel.h
similarity index 97%
rename from Gui/DataView/MshModel.h
rename to Applications/DataExplorer/DataView/MshModel.h
index d0fcd736078..a37399cd199 100644
--- a/Gui/DataView/MshModel.h
+++ b/Applications/DataExplorer/DataView/MshModel.h
@@ -16,7 +16,7 @@
 #define MSHMODEL_H
 
 // ** INCLUDES **
-#include "Applications/ProjectData.h"
+#include "Applications/ApplicationsLib/ProjectData.h"
 #include "TreeModel.h"
 
 namespace MeshLib {
diff --git a/Gui/DataView/MshQualitySelection.ui b/Applications/DataExplorer/DataView/MshQualitySelection.ui
similarity index 100%
rename from Gui/DataView/MshQualitySelection.ui
rename to Applications/DataExplorer/DataView/MshQualitySelection.ui
diff --git a/Gui/DataView/MshQualitySelectionDialog.cpp b/Applications/DataExplorer/DataView/MshQualitySelectionDialog.cpp
similarity index 100%
rename from Gui/DataView/MshQualitySelectionDialog.cpp
rename to Applications/DataExplorer/DataView/MshQualitySelectionDialog.cpp
diff --git a/Gui/DataView/MshQualitySelectionDialog.h b/Applications/DataExplorer/DataView/MshQualitySelectionDialog.h
similarity index 100%
rename from Gui/DataView/MshQualitySelectionDialog.h
rename to Applications/DataExplorer/DataView/MshQualitySelectionDialog.h
diff --git a/Gui/DataView/MshTabWidget.cpp b/Applications/DataExplorer/DataView/MshTabWidget.cpp
similarity index 100%
rename from Gui/DataView/MshTabWidget.cpp
rename to Applications/DataExplorer/DataView/MshTabWidget.cpp
diff --git a/Gui/DataView/MshTabWidget.h b/Applications/DataExplorer/DataView/MshTabWidget.h
similarity index 100%
rename from Gui/DataView/MshTabWidget.h
rename to Applications/DataExplorer/DataView/MshTabWidget.h
diff --git a/Gui/DataView/MshTabWidgetBase.ui b/Applications/DataExplorer/DataView/MshTabWidgetBase.ui
similarity index 100%
rename from Gui/DataView/MshTabWidgetBase.ui
rename to Applications/DataExplorer/DataView/MshTabWidgetBase.ui
diff --git a/Gui/DataView/MshView.cpp b/Applications/DataExplorer/DataView/MshView.cpp
similarity index 100%
rename from Gui/DataView/MshView.cpp
rename to Applications/DataExplorer/DataView/MshView.cpp
diff --git a/Gui/DataView/MshView.h b/Applications/DataExplorer/DataView/MshView.h
similarity index 100%
rename from Gui/DataView/MshView.h
rename to Applications/DataExplorer/DataView/MshView.h
diff --git a/Gui/DataView/NetCdfConfigure.ui b/Applications/DataExplorer/DataView/NetCdfConfigure.ui
similarity index 100%
rename from Gui/DataView/NetCdfConfigure.ui
rename to Applications/DataExplorer/DataView/NetCdfConfigure.ui
diff --git a/Gui/DataView/NetCdfConfigureDialog.cpp b/Applications/DataExplorer/DataView/NetCdfConfigureDialog.cpp
similarity index 100%
rename from Gui/DataView/NetCdfConfigureDialog.cpp
rename to Applications/DataExplorer/DataView/NetCdfConfigureDialog.cpp
diff --git a/Gui/DataView/NetCdfConfigureDialog.h b/Applications/DataExplorer/DataView/NetCdfConfigureDialog.h
similarity index 100%
rename from Gui/DataView/NetCdfConfigureDialog.h
rename to Applications/DataExplorer/DataView/NetCdfConfigureDialog.h
diff --git a/Gui/DataView/NewProcess.ui b/Applications/DataExplorer/DataView/NewProcess.ui
similarity index 100%
rename from Gui/DataView/NewProcess.ui
rename to Applications/DataExplorer/DataView/NewProcess.ui
diff --git a/Gui/DataView/SHPImportDialog.cpp b/Applications/DataExplorer/DataView/SHPImportDialog.cpp
similarity index 100%
rename from Gui/DataView/SHPImportDialog.cpp
rename to Applications/DataExplorer/DataView/SHPImportDialog.cpp
diff --git a/Gui/DataView/SHPImportDialog.h b/Applications/DataExplorer/DataView/SHPImportDialog.h
similarity index 100%
rename from Gui/DataView/SHPImportDialog.h
rename to Applications/DataExplorer/DataView/SHPImportDialog.h
diff --git a/Gui/DataView/SelectMeshDialog.cpp b/Applications/DataExplorer/DataView/SelectMeshDialog.cpp
similarity index 100%
rename from Gui/DataView/SelectMeshDialog.cpp
rename to Applications/DataExplorer/DataView/SelectMeshDialog.cpp
diff --git a/Gui/DataView/SelectMeshDialog.h b/Applications/DataExplorer/DataView/SelectMeshDialog.h
similarity index 100%
rename from Gui/DataView/SelectMeshDialog.h
rename to Applications/DataExplorer/DataView/SelectMeshDialog.h
diff --git a/Gui/DataView/SetNameDialog.cpp b/Applications/DataExplorer/DataView/SetNameDialog.cpp
similarity index 100%
rename from Gui/DataView/SetNameDialog.cpp
rename to Applications/DataExplorer/DataView/SetNameDialog.cpp
diff --git a/Gui/DataView/SetNameDialog.h b/Applications/DataExplorer/DataView/SetNameDialog.h
similarity index 100%
rename from Gui/DataView/SetNameDialog.h
rename to Applications/DataExplorer/DataView/SetNameDialog.h
diff --git a/Gui/DataView/StationTabWidget.cpp b/Applications/DataExplorer/DataView/StationTabWidget.cpp
similarity index 100%
rename from Gui/DataView/StationTabWidget.cpp
rename to Applications/DataExplorer/DataView/StationTabWidget.cpp
diff --git a/Gui/DataView/StationTabWidget.h b/Applications/DataExplorer/DataView/StationTabWidget.h
similarity index 100%
rename from Gui/DataView/StationTabWidget.h
rename to Applications/DataExplorer/DataView/StationTabWidget.h
diff --git a/Gui/DataView/StationTabWidgetBase.ui b/Applications/DataExplorer/DataView/StationTabWidgetBase.ui
similarity index 100%
rename from Gui/DataView/StationTabWidgetBase.ui
rename to Applications/DataExplorer/DataView/StationTabWidgetBase.ui
diff --git a/Gui/DataView/StationTreeModel.cpp b/Applications/DataExplorer/DataView/StationTreeModel.cpp
similarity index 100%
rename from Gui/DataView/StationTreeModel.cpp
rename to Applications/DataExplorer/DataView/StationTreeModel.cpp
diff --git a/Gui/DataView/StationTreeModel.h b/Applications/DataExplorer/DataView/StationTreeModel.h
similarity index 100%
rename from Gui/DataView/StationTreeModel.h
rename to Applications/DataExplorer/DataView/StationTreeModel.h
diff --git a/Gui/DataView/StationTreeView.cpp b/Applications/DataExplorer/DataView/StationTreeView.cpp
similarity index 100%
rename from Gui/DataView/StationTreeView.cpp
rename to Applications/DataExplorer/DataView/StationTreeView.cpp
diff --git a/Gui/DataView/StationTreeView.h b/Applications/DataExplorer/DataView/StationTreeView.h
similarity index 100%
rename from Gui/DataView/StationTreeView.h
rename to Applications/DataExplorer/DataView/StationTreeView.h
diff --git a/Gui/DataView/StratView/CMakeLists.txt b/Applications/DataExplorer/DataView/StratView/CMakeLists.txt
similarity index 81%
rename from Gui/DataView/StratView/CMakeLists.txt
rename to Applications/DataExplorer/DataView/StratView/CMakeLists.txt
index c6d947f0543..05ef44cec74 100644
--- a/Gui/DataView/StratView/CMakeLists.txt
+++ b/Applications/DataExplorer/DataView/StratView/CMakeLists.txt
@@ -31,13 +31,15 @@ qt4_wrap_cpp( MOC_SOURCES ${MOC_HEADERS} )
 
 # 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(
 	${CMAKE_CURRENT_SOURCE_DIR}
 	${CMAKE_CURRENT_BINARY_DIR}
-	${CMAKE_CURRENT_SOURCE_DIR}/../../../BaseLib
-	${CMAKE_CURRENT_SOURCE_DIR}/../../../GeoLib
-	${CMAKE_CURRENT_SOURCE_DIR}/../../../MathLib
-	${CMAKE_CURRENT_SOURCE_DIR}/../../Base
+	${SOURCE_DIR_REL}/BaseLib
+	${SOURCE_DIR_REL}/GeoLib
+	${SOURCE_DIR_REL}/MathLib
+	${GUI_SOURCE_DIR_REL}/Base
 )
 
 # Put moc files in a project folder
diff --git a/Gui/DataView/StratView/StratBar.cpp b/Applications/DataExplorer/DataView/StratView/StratBar.cpp
similarity index 100%
rename from Gui/DataView/StratView/StratBar.cpp
rename to Applications/DataExplorer/DataView/StratView/StratBar.cpp
diff --git a/Gui/DataView/StratView/StratBar.h b/Applications/DataExplorer/DataView/StratView/StratBar.h
similarity index 100%
rename from Gui/DataView/StratView/StratBar.h
rename to Applications/DataExplorer/DataView/StratView/StratBar.h
diff --git a/Gui/DataView/StratView/StratScene.cpp b/Applications/DataExplorer/DataView/StratView/StratScene.cpp
similarity index 100%
rename from Gui/DataView/StratView/StratScene.cpp
rename to Applications/DataExplorer/DataView/StratView/StratScene.cpp
diff --git a/Gui/DataView/StratView/StratScene.h b/Applications/DataExplorer/DataView/StratView/StratScene.h
similarity index 100%
rename from Gui/DataView/StratView/StratScene.h
rename to Applications/DataExplorer/DataView/StratView/StratScene.h
diff --git a/Gui/DataView/StratView/StratView.cpp b/Applications/DataExplorer/DataView/StratView/StratView.cpp
similarity index 100%
rename from Gui/DataView/StratView/StratView.cpp
rename to Applications/DataExplorer/DataView/StratView/StratView.cpp
diff --git a/Gui/DataView/StratView/StratView.h b/Applications/DataExplorer/DataView/StratView/StratView.h
similarity index 100%
rename from Gui/DataView/StratView/StratView.h
rename to Applications/DataExplorer/DataView/StratView/StratView.h
diff --git a/Gui/DataView/StratView/StratWindow.cpp b/Applications/DataExplorer/DataView/StratView/StratWindow.cpp
similarity index 100%
rename from Gui/DataView/StratView/StratWindow.cpp
rename to Applications/DataExplorer/DataView/StratView/StratWindow.cpp
diff --git a/Gui/DataView/StratView/StratWindow.h b/Applications/DataExplorer/DataView/StratView/StratWindow.h
similarity index 100%
rename from Gui/DataView/StratView/StratWindow.h
rename to Applications/DataExplorer/DataView/StratView/StratWindow.h
diff --git a/Gui/DataView/StratView/StratWindow.ui b/Applications/DataExplorer/DataView/StratView/StratWindow.ui
similarity index 100%
rename from Gui/DataView/StratView/StratWindow.ui
rename to Applications/DataExplorer/DataView/StratView/StratWindow.ui
diff --git a/Gui/Img/delete-icon.png b/Applications/DataExplorer/Img/delete-icon.png
similarity index 100%
rename from Gui/Img/delete-icon.png
rename to Applications/DataExplorer/Img/delete-icon.png
diff --git a/Gui/Img/icon_glass.png b/Applications/DataExplorer/Img/icon_glass.png
similarity index 100%
rename from Gui/Img/icon_glass.png
rename to Applications/DataExplorer/Img/icon_glass.png
diff --git a/Gui/Img/icon_glass_active.png b/Applications/DataExplorer/Img/icon_glass_active.png
similarity index 100%
rename from Gui/Img/icon_glass_active.png
rename to Applications/DataExplorer/Img/icon_glass_active.png
diff --git a/Gui/Img/icon_global.png b/Applications/DataExplorer/Img/icon_global.png
similarity index 100%
rename from Gui/Img/icon_global.png
rename to Applications/DataExplorer/Img/icon_global.png
diff --git a/Gui/Img/icon_hlight.png b/Applications/DataExplorer/Img/icon_hlight.png
similarity index 100%
rename from Gui/Img/icon_hlight.png
rename to Applications/DataExplorer/Img/icon_hlight.png
diff --git a/Gui/Img/icon_hlight_active.png b/Applications/DataExplorer/Img/icon_hlight_active.png
similarity index 100%
rename from Gui/Img/icon_hlight_active.png
rename to Applications/DataExplorer/Img/icon_hlight_active.png
diff --git a/Gui/Img/icon_persp.png b/Applications/DataExplorer/Img/icon_persp.png
similarity index 100%
rename from Gui/Img/icon_persp.png
rename to Applications/DataExplorer/Img/icon_persp.png
diff --git a/Gui/Img/icon_persp_active.png b/Applications/DataExplorer/Img/icon_persp_active.png
similarity index 100%
rename from Gui/Img/icon_persp_active.png
rename to Applications/DataExplorer/Img/icon_persp_active.png
diff --git a/Gui/Img/icon_screen.png b/Applications/DataExplorer/Img/icon_screen.png
similarity index 100%
rename from Gui/Img/icon_screen.png
rename to Applications/DataExplorer/Img/icon_screen.png
diff --git a/Gui/Img/icon_xminus.png b/Applications/DataExplorer/Img/icon_xminus.png
similarity index 100%
rename from Gui/Img/icon_xminus.png
rename to Applications/DataExplorer/Img/icon_xminus.png
diff --git a/Gui/Img/icon_xplus.png b/Applications/DataExplorer/Img/icon_xplus.png
similarity index 100%
rename from Gui/Img/icon_xplus.png
rename to Applications/DataExplorer/Img/icon_xplus.png
diff --git a/Gui/Img/icon_yminus.png b/Applications/DataExplorer/Img/icon_yminus.png
similarity index 100%
rename from Gui/Img/icon_yminus.png
rename to Applications/DataExplorer/Img/icon_yminus.png
diff --git a/Gui/Img/icon_yplus.png b/Applications/DataExplorer/Img/icon_yplus.png
similarity index 100%
rename from Gui/Img/icon_yplus.png
rename to Applications/DataExplorer/Img/icon_yplus.png
diff --git a/Gui/Img/icon_zminus.png b/Applications/DataExplorer/Img/icon_zminus.png
similarity index 100%
rename from Gui/Img/icon_zminus.png
rename to Applications/DataExplorer/Img/icon_zminus.png
diff --git a/Gui/Img/icon_zplus.png b/Applications/DataExplorer/Img/icon_zplus.png
similarity index 100%
rename from Gui/Img/icon_zplus.png
rename to Applications/DataExplorer/Img/icon_zplus.png
diff --git a/Gui/Img/icons.qrc b/Applications/DataExplorer/Img/icons.qrc
similarity index 100%
rename from Gui/Img/icons.qrc
rename to Applications/DataExplorer/Img/icons.qrc
diff --git a/Gui/Img/open-icon.png b/Applications/DataExplorer/Img/open-icon.png
similarity index 100%
rename from Gui/Img/open-icon.png
rename to Applications/DataExplorer/Img/open-icon.png
diff --git a/Gui/Img/oxygen.icons b/Applications/DataExplorer/Img/oxygen.icons
similarity index 100%
rename from Gui/Img/oxygen.icons
rename to Applications/DataExplorer/Img/oxygen.icons
diff --git a/Gui/Img/refresh-icon.png b/Applications/DataExplorer/Img/refresh-icon.png
similarity index 100%
rename from Gui/Img/refresh-icon.png
rename to Applications/DataExplorer/Img/refresh-icon.png
diff --git a/Gui/Img/save-icon.png b/Applications/DataExplorer/Img/save-icon.png
similarity index 100%
rename from Gui/Img/save-icon.png
rename to Applications/DataExplorer/Img/save-icon.png
diff --git a/Gui/VtkAct/CMakeLists.txt b/Applications/DataExplorer/VtkAct/CMakeLists.txt
similarity index 100%
rename from Gui/VtkAct/CMakeLists.txt
rename to Applications/DataExplorer/VtkAct/CMakeLists.txt
diff --git a/Gui/VtkAct/VtkCustomInteractorStyle.cpp b/Applications/DataExplorer/VtkAct/VtkCustomInteractorStyle.cpp
similarity index 100%
rename from Gui/VtkAct/VtkCustomInteractorStyle.cpp
rename to Applications/DataExplorer/VtkAct/VtkCustomInteractorStyle.cpp
diff --git a/Gui/VtkAct/VtkCustomInteractorStyle.h b/Applications/DataExplorer/VtkAct/VtkCustomInteractorStyle.h
similarity index 100%
rename from Gui/VtkAct/VtkCustomInteractorStyle.h
rename to Applications/DataExplorer/VtkAct/VtkCustomInteractorStyle.h
diff --git a/Gui/VtkAct/VtkPickCallback.cpp b/Applications/DataExplorer/VtkAct/VtkPickCallback.cpp
similarity index 100%
rename from Gui/VtkAct/VtkPickCallback.cpp
rename to Applications/DataExplorer/VtkAct/VtkPickCallback.cpp
diff --git a/Gui/VtkAct/VtkPickCallback.h b/Applications/DataExplorer/VtkAct/VtkPickCallback.h
similarity index 100%
rename from Gui/VtkAct/VtkPickCallback.h
rename to Applications/DataExplorer/VtkAct/VtkPickCallback.h
diff --git a/Gui/VtkVis/CMakeLists.txt b/Applications/DataExplorer/VtkVis/CMakeLists.txt
similarity index 89%
rename from Gui/VtkVis/CMakeLists.txt
rename to Applications/DataExplorer/VtkVis/CMakeLists.txt
index df82604fe25..ef0b98b0b86 100644
--- a/Gui/VtkVis/CMakeLists.txt
+++ b/Applications/DataExplorer/VtkVis/CMakeLists.txt
@@ -35,7 +35,6 @@ SET( SOURCES
 	VtkStationSource.cpp
 	VtkSurfacesSource.cpp
 	VtkTextureOnSurfaceFilter.cpp
-	VtkTrackedCamera.cpp
 	VtkVisHelper.cpp
 	VtkVisImageItem.cpp
 	VtkVisPipeline.cpp
@@ -57,7 +56,6 @@ SET( MOC_HEADERS
 	VtkAlgorithmPropertyLineEdit.h
 	VtkAlgorithmPropertyCheckbox.h
 	VtkAlgorithmPropertyVectorEdit.h
-	VtkTrackedCamera.h
 	VtkVisPipeline.h
 	VtkVisPipelineView.h
 	VtkVisTabWidget.h
@@ -125,18 +123,21 @@ QT4_WRAP_UI( UI_HEADERS ${UIS} )
 # Run Qts meta object compiler moc on header files
 QT4_WRAP_CPP( MOC_SOURCES ${MOC_HEADERS} )
 
+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_SOURCE_DIR}/../VtkAct
+	${SOURCE_DIR_REL}/BaseLib
+	${SOURCE_DIR_REL}/GeoLib
+	${SOURCE_DIR_REL}/MathLib
+	${SOURCE_DIR_REL}/FileIO
+	${SOURCE_DIR_REL}/MeshLib
+	${GUI_SOURCE_DIR_REL}/VtkAct
+	${GUI_SOURCE_DIR_REL}/Base
+	${GUI_SOURCE_DIR_REL}/DataView
+
 	${CMAKE_CURRENT_BINARY_DIR}
-	${CMAKE_CURRENT_SOURCE_DIR}/../../BaseLib
 	${CMAKE_CURRENT_BINARY_DIR}/../../BaseLib
-	${CMAKE_CURRENT_SOURCE_DIR}/../../GeoLib
-	${CMAKE_CURRENT_SOURCE_DIR}/../../MathLib
-	${CMAKE_CURRENT_SOURCE_DIR}/../../FileIO
-	${CMAKE_CURRENT_SOURCE_DIR}/../../MeshLib
-	${CMAKE_CURRENT_SOURCE_DIR}/../Base
-	${CMAKE_CURRENT_SOURCE_DIR}/../DataView
 	${CMAKE_CURRENT_BINARY_DIR}/../DataView
 )
 
@@ -162,10 +163,6 @@ TARGET_LINK_LIBRARIES( VtkVis ${QT_LIBRARIES} )
 
 ADD_DEPENDENCIES(VtkVis QtDataView)
 
-IF(OGS_USE_VRPN)
-	INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../Vrpn)
-ENDIF() # OGS_USE_VRPN
-
 IF (VTKOSGCONVERTER_FOUND)
 	USE_OPENSG(VtkVis)
 	INCLUDE_DIRECTORIES( ${VTKOSGCONVERTER_INCLUDE_DIRS} )
diff --git a/Gui/VtkVis/MeshFromRaster.ui b/Applications/DataExplorer/VtkVis/MeshFromRaster.ui
similarity index 100%
rename from Gui/VtkVis/MeshFromRaster.ui
rename to Applications/DataExplorer/VtkVis/MeshFromRaster.ui
diff --git a/Gui/VtkVis/MeshFromRasterDialog.cpp b/Applications/DataExplorer/VtkVis/MeshFromRasterDialog.cpp
similarity index 100%
rename from Gui/VtkVis/MeshFromRasterDialog.cpp
rename to Applications/DataExplorer/VtkVis/MeshFromRasterDialog.cpp
diff --git a/Gui/VtkVis/MeshFromRasterDialog.h b/Applications/DataExplorer/VtkVis/MeshFromRasterDialog.h
similarity index 100%
rename from Gui/VtkVis/MeshFromRasterDialog.h
rename to Applications/DataExplorer/VtkVis/MeshFromRasterDialog.h
diff --git a/Gui/VtkVis/OGSFilterInfo.h b/Applications/DataExplorer/VtkVis/OGSFilterInfo.h
similarity index 100%
rename from Gui/VtkVis/OGSFilterInfo.h
rename to Applications/DataExplorer/VtkVis/OGSFilterInfo.h
diff --git a/Gui/VtkVis/QVtkDataSetMapper.cpp b/Applications/DataExplorer/VtkVis/QVtkDataSetMapper.cpp
similarity index 100%
rename from Gui/VtkVis/QVtkDataSetMapper.cpp
rename to Applications/DataExplorer/VtkVis/QVtkDataSetMapper.cpp
diff --git a/Gui/VtkVis/QVtkDataSetMapper.h b/Applications/DataExplorer/VtkVis/QVtkDataSetMapper.h
similarity index 100%
rename from Gui/VtkVis/QVtkDataSetMapper.h
rename to Applications/DataExplorer/VtkVis/QVtkDataSetMapper.h
diff --git a/Gui/VtkVis/VisPrefs.ui b/Applications/DataExplorer/VtkVis/VisPrefs.ui
similarity index 100%
rename from Gui/VtkVis/VisPrefs.ui
rename to Applications/DataExplorer/VtkVis/VisPrefs.ui
diff --git a/Gui/VtkVis/VisPrefsDialog.cpp b/Applications/DataExplorer/VtkVis/VisPrefsDialog.cpp
similarity index 100%
rename from Gui/VtkVis/VisPrefsDialog.cpp
rename to Applications/DataExplorer/VtkVis/VisPrefsDialog.cpp
diff --git a/Gui/VtkVis/VisPrefsDialog.h b/Applications/DataExplorer/VtkVis/VisPrefsDialog.h
similarity index 100%
rename from Gui/VtkVis/VisPrefsDialog.h
rename to Applications/DataExplorer/VtkVis/VisPrefsDialog.h
diff --git a/Gui/VtkVis/VisualizationWidget.cpp b/Applications/DataExplorer/VtkVis/VisualizationWidget.cpp
similarity index 76%
rename from Gui/VtkVis/VisualizationWidget.cpp
rename to Applications/DataExplorer/VtkVis/VisualizationWidget.cpp
index 2c0db34f58c..f1b89e15b81 100644
--- a/Gui/VtkVis/VisualizationWidget.cpp
+++ b/Applications/DataExplorer/VtkVis/VisualizationWidget.cpp
@@ -19,7 +19,6 @@
 #include "VisualizationWidget.h"
 #include "VtkCustomInteractorStyle.h"
 #include "VtkPickCallback.h"
-#include "VtkTrackedCamera.h"
 
 #include <vtkCamera.h>
 #include <vtkCellPicker.h>
@@ -45,14 +44,6 @@
 #include <QSettings>
 #include <QString>
 
-#ifdef OGS_USE_VRPN
-#include "QSpaceNavigatorClient.h"
-#include "QVrpnArtTrackingClient.h"
-#include "VtkTrackedCamera.h"
-#include <QTimer>
-#include <vtkEventQtSlotConnect.h>
-#endif // OGS_USE_VRPN
-
 VisualizationWidget::VisualizationWidget( QWidget* parent /*= 0*/ )
 	: QWidget(parent)
 {
@@ -75,41 +66,6 @@ VisualizationWidget::VisualizationWidget( QWidget* parent /*= 0*/ )
 
 	QSettings settings;
 
-#ifdef OGS_USE_VRPN
-	VtkTrackedCamera* cam = new VtkTrackedCamera(this);
-	_vtkRender->SetActiveCamera(cam);
-	connect( cam, SIGNAL(viewUpdated()), this, SLOT(updateView()) );
-
-	//QSpaceNavigatorClient* spacenav = QSpaceNavigatorClient::Instance();
-	//spacenav->init("spacenav@localhost", 1000 / 15, SpaceNavigatorClient::Z);
-	//cam->setFocalPoint(0, 5.0, 0.5);
-	//cam->updateView();
-	//spacenav->setTranslationFactor(2.0);
-	//connect( spacenav, SIGNAL(translated(double, double, double)), cam, SLOT(setTrackingData(double, double, double)) );
-	//connect( spacenav, SIGNAL(translated(double, double, double)), cam, SLOT(translate(double, double, double)) );
-
-	QVrpnArtTrackingClient* art = QVrpnArtTrackingClient::Instance(this);
-	if (settings.contains("Tracking/artDeviceName"))
-	{
-		QString deviceName = settings.value("Tracking/artDeviceName").toString();
-		QString deviceNameAt = settings.value("Tracking/artDeviceNameAt").toString();
-		art->StartTracking(QString(deviceName + "@" + deviceNameAt).toStdString().c_str(),
-		                   settings.value("Tracking/artUpdateInterval").toInt());
-	}
-	else
-		art->StartTracking("DTrack@141.65.34.36");
-	connect( art, SIGNAL(positionUpdated(double, double, double)),
-	         cam, SLOT(setTrackingData(double, double, double)) );
-
-	// Connect the vtk event to the qt slot
-	_qtConnect = vtkEventQtSlotConnect::New();
-	_qtConnect->Connect(vtkWidget->GetRenderWindow()->GetInteractor(),
-	                    vtkCommand::EndInteractionEvent,
-	                    cam,
-	                    SLOT(updatedFromOutside()));
-
-#endif // OGS_USE_VRPN
-
 	_vtkRender->SetBackground(0.0,0.0,0.0);
 
 	// Create an orientation marker using vtkAxesActor
@@ -132,18 +88,18 @@ VisualizationWidget::~VisualizationWidget()
 {
 	_interactorStyle->deleteLater();
 	_vtkPickCallback->deleteLater();
-#ifdef OGS_USE_VRPN
-	_qtConnect->Delete();
-#endif     // OGS_USE_VRPN
 }
+
 VtkCustomInteractorStyle* VisualizationWidget::interactorStyle() const
 {
 	return _interactorStyle;
 }
+
 VtkPickCallback* VisualizationWidget::vtkPickCallback() const
 {
 	return _vtkPickCallback;
 }
+
 void VisualizationWidget::updateView()
 {
 	if(vtkWidget->GetRenderWindow()->IsDrawable())
diff --git a/Gui/VtkVis/VisualizationWidget.h b/Applications/DataExplorer/VtkVis/VisualizationWidget.h
similarity index 95%
rename from Gui/VtkVis/VisualizationWidget.h
rename to Applications/DataExplorer/VtkVis/VisualizationWidget.h
index 9d715ba5243..1699ded3993 100644
--- a/Gui/VtkVis/VisualizationWidget.h
+++ b/Applications/DataExplorer/VtkVis/VisualizationWidget.h
@@ -21,9 +21,6 @@
 class vtkRenderer;
 class VtkCustomInteractorStyle;
 class VtkPickCallback;
-#ifdef OGS_USE_VRPN
-class vtkEventQtSlotConnect;
-#endif // OGS_USE_VRPN
 
 /**
  * \brief Widget containing the 3d VTK scene view.
@@ -110,9 +107,6 @@ private:
 	VtkCustomInteractorStyle* _interactorStyle;
 	VtkPickCallback* _vtkPickCallback;
 	bool _isShowAllOnLoad;
-#ifdef OGS_USE_VRPN
-	vtkEventQtSlotConnect* _qtConnect;
-#endif     // OGS_USE_VRPN
 };
 
 #endif // VISUALIZATIONWIDGET_H
diff --git a/Gui/VtkVis/VisualizationWidgetBase.ui b/Applications/DataExplorer/VtkVis/VisualizationWidgetBase.ui
similarity index 100%
rename from Gui/VtkVis/VisualizationWidgetBase.ui
rename to Applications/DataExplorer/VtkVis/VisualizationWidgetBase.ui
diff --git a/Gui/VtkVis/VtkAddFilterDialog.cpp b/Applications/DataExplorer/VtkVis/VtkAddFilterDialog.cpp
similarity index 100%
rename from Gui/VtkVis/VtkAddFilterDialog.cpp
rename to Applications/DataExplorer/VtkVis/VtkAddFilterDialog.cpp
diff --git a/Gui/VtkVis/VtkAddFilterDialog.h b/Applications/DataExplorer/VtkVis/VtkAddFilterDialog.h
similarity index 100%
rename from Gui/VtkVis/VtkAddFilterDialog.h
rename to Applications/DataExplorer/VtkVis/VtkAddFilterDialog.h
diff --git a/Gui/VtkVis/VtkAddFilterDialogBase.ui b/Applications/DataExplorer/VtkVis/VtkAddFilterDialogBase.ui
similarity index 100%
rename from Gui/VtkVis/VtkAddFilterDialogBase.ui
rename to Applications/DataExplorer/VtkVis/VtkAddFilterDialogBase.ui
diff --git a/Gui/VtkVis/VtkAlgorithmProperties.cpp b/Applications/DataExplorer/VtkVis/VtkAlgorithmProperties.cpp
similarity index 100%
rename from Gui/VtkVis/VtkAlgorithmProperties.cpp
rename to Applications/DataExplorer/VtkVis/VtkAlgorithmProperties.cpp
diff --git a/Gui/VtkVis/VtkAlgorithmProperties.h b/Applications/DataExplorer/VtkVis/VtkAlgorithmProperties.h
similarity index 100%
rename from Gui/VtkVis/VtkAlgorithmProperties.h
rename to Applications/DataExplorer/VtkVis/VtkAlgorithmProperties.h
diff --git a/Gui/VtkVis/VtkAlgorithmPropertyCheckbox.cpp b/Applications/DataExplorer/VtkVis/VtkAlgorithmPropertyCheckbox.cpp
similarity index 100%
rename from Gui/VtkVis/VtkAlgorithmPropertyCheckbox.cpp
rename to Applications/DataExplorer/VtkVis/VtkAlgorithmPropertyCheckbox.cpp
diff --git a/Gui/VtkVis/VtkAlgorithmPropertyCheckbox.h b/Applications/DataExplorer/VtkVis/VtkAlgorithmPropertyCheckbox.h
similarity index 100%
rename from Gui/VtkVis/VtkAlgorithmPropertyCheckbox.h
rename to Applications/DataExplorer/VtkVis/VtkAlgorithmPropertyCheckbox.h
diff --git a/Gui/VtkVis/VtkAlgorithmPropertyLineEdit.cpp b/Applications/DataExplorer/VtkVis/VtkAlgorithmPropertyLineEdit.cpp
similarity index 100%
rename from Gui/VtkVis/VtkAlgorithmPropertyLineEdit.cpp
rename to Applications/DataExplorer/VtkVis/VtkAlgorithmPropertyLineEdit.cpp
diff --git a/Gui/VtkVis/VtkAlgorithmPropertyLineEdit.h b/Applications/DataExplorer/VtkVis/VtkAlgorithmPropertyLineEdit.h
similarity index 100%
rename from Gui/VtkVis/VtkAlgorithmPropertyLineEdit.h
rename to Applications/DataExplorer/VtkVis/VtkAlgorithmPropertyLineEdit.h
diff --git a/Gui/VtkVis/VtkAlgorithmPropertyVectorEdit.cpp b/Applications/DataExplorer/VtkVis/VtkAlgorithmPropertyVectorEdit.cpp
similarity index 100%
rename from Gui/VtkVis/VtkAlgorithmPropertyVectorEdit.cpp
rename to Applications/DataExplorer/VtkVis/VtkAlgorithmPropertyVectorEdit.cpp
diff --git a/Gui/VtkVis/VtkAlgorithmPropertyVectorEdit.h b/Applications/DataExplorer/VtkVis/VtkAlgorithmPropertyVectorEdit.h
similarity index 100%
rename from Gui/VtkVis/VtkAlgorithmPropertyVectorEdit.h
rename to Applications/DataExplorer/VtkVis/VtkAlgorithmPropertyVectorEdit.h
diff --git a/Gui/VtkVis/VtkAppendArrayFilter.cpp b/Applications/DataExplorer/VtkVis/VtkAppendArrayFilter.cpp
similarity index 100%
rename from Gui/VtkVis/VtkAppendArrayFilter.cpp
rename to Applications/DataExplorer/VtkVis/VtkAppendArrayFilter.cpp
diff --git a/Gui/VtkVis/VtkAppendArrayFilter.h b/Applications/DataExplorer/VtkVis/VtkAppendArrayFilter.h
similarity index 100%
rename from Gui/VtkVis/VtkAppendArrayFilter.h
rename to Applications/DataExplorer/VtkVis/VtkAppendArrayFilter.h
diff --git a/Gui/VtkVis/VtkBGImageSource.cpp b/Applications/DataExplorer/VtkVis/VtkBGImageSource.cpp
similarity index 100%
rename from Gui/VtkVis/VtkBGImageSource.cpp
rename to Applications/DataExplorer/VtkVis/VtkBGImageSource.cpp
diff --git a/Gui/VtkVis/VtkBGImageSource.h b/Applications/DataExplorer/VtkVis/VtkBGImageSource.h
similarity index 100%
rename from Gui/VtkVis/VtkBGImageSource.h
rename to Applications/DataExplorer/VtkVis/VtkBGImageSource.h
diff --git a/Gui/VtkVis/VtkColorByHeightFilter.cpp b/Applications/DataExplorer/VtkVis/VtkColorByHeightFilter.cpp
similarity index 100%
rename from Gui/VtkVis/VtkColorByHeightFilter.cpp
rename to Applications/DataExplorer/VtkVis/VtkColorByHeightFilter.cpp
diff --git a/Gui/VtkVis/VtkColorByHeightFilter.h b/Applications/DataExplorer/VtkVis/VtkColorByHeightFilter.h
similarity index 100%
rename from Gui/VtkVis/VtkColorByHeightFilter.h
rename to Applications/DataExplorer/VtkVis/VtkColorByHeightFilter.h
diff --git a/Gui/VtkVis/VtkColorLookupTable.cpp b/Applications/DataExplorer/VtkVis/VtkColorLookupTable.cpp
similarity index 100%
rename from Gui/VtkVis/VtkColorLookupTable.cpp
rename to Applications/DataExplorer/VtkVis/VtkColorLookupTable.cpp
diff --git a/Gui/VtkVis/VtkColorLookupTable.h b/Applications/DataExplorer/VtkVis/VtkColorLookupTable.h
similarity index 100%
rename from Gui/VtkVis/VtkColorLookupTable.h
rename to Applications/DataExplorer/VtkVis/VtkColorLookupTable.h
diff --git a/Gui/VtkVis/VtkCompositeColorByHeightFilter.cpp b/Applications/DataExplorer/VtkVis/VtkCompositeColorByHeightFilter.cpp
similarity index 100%
rename from Gui/VtkVis/VtkCompositeColorByHeightFilter.cpp
rename to Applications/DataExplorer/VtkVis/VtkCompositeColorByHeightFilter.cpp
diff --git a/Gui/VtkVis/VtkCompositeColorByHeightFilter.h b/Applications/DataExplorer/VtkVis/VtkCompositeColorByHeightFilter.h
similarity index 100%
rename from Gui/VtkVis/VtkCompositeColorByHeightFilter.h
rename to Applications/DataExplorer/VtkVis/VtkCompositeColorByHeightFilter.h
diff --git a/Gui/VtkVis/VtkCompositeColormapToImageFilter.cpp b/Applications/DataExplorer/VtkVis/VtkCompositeColormapToImageFilter.cpp
similarity index 100%
rename from Gui/VtkVis/VtkCompositeColormapToImageFilter.cpp
rename to Applications/DataExplorer/VtkVis/VtkCompositeColormapToImageFilter.cpp
diff --git a/Gui/VtkVis/VtkCompositeColormapToImageFilter.h b/Applications/DataExplorer/VtkVis/VtkCompositeColormapToImageFilter.h
similarity index 100%
rename from Gui/VtkVis/VtkCompositeColormapToImageFilter.h
rename to Applications/DataExplorer/VtkVis/VtkCompositeColormapToImageFilter.h
diff --git a/Gui/VtkVis/VtkCompositeContourFilter.cpp b/Applications/DataExplorer/VtkVis/VtkCompositeContourFilter.cpp
similarity index 100%
rename from Gui/VtkVis/VtkCompositeContourFilter.cpp
rename to Applications/DataExplorer/VtkVis/VtkCompositeContourFilter.cpp
diff --git a/Gui/VtkVis/VtkCompositeContourFilter.h b/Applications/DataExplorer/VtkVis/VtkCompositeContourFilter.h
similarity index 100%
rename from Gui/VtkVis/VtkCompositeContourFilter.h
rename to Applications/DataExplorer/VtkVis/VtkCompositeContourFilter.h
diff --git a/Gui/VtkVis/VtkCompositeElementSelectionFilter.cpp b/Applications/DataExplorer/VtkVis/VtkCompositeElementSelectionFilter.cpp
similarity index 100%
rename from Gui/VtkVis/VtkCompositeElementSelectionFilter.cpp
rename to Applications/DataExplorer/VtkVis/VtkCompositeElementSelectionFilter.cpp
diff --git a/Gui/VtkVis/VtkCompositeElementSelectionFilter.h b/Applications/DataExplorer/VtkVis/VtkCompositeElementSelectionFilter.h
similarity index 100%
rename from Gui/VtkVis/VtkCompositeElementSelectionFilter.h
rename to Applications/DataExplorer/VtkVis/VtkCompositeElementSelectionFilter.h
diff --git a/Gui/VtkVis/VtkCompositeFilter.cpp b/Applications/DataExplorer/VtkVis/VtkCompositeFilter.cpp
similarity index 100%
rename from Gui/VtkVis/VtkCompositeFilter.cpp
rename to Applications/DataExplorer/VtkVis/VtkCompositeFilter.cpp
diff --git a/Gui/VtkVis/VtkCompositeFilter.h b/Applications/DataExplorer/VtkVis/VtkCompositeFilter.h
similarity index 100%
rename from Gui/VtkVis/VtkCompositeFilter.h
rename to Applications/DataExplorer/VtkVis/VtkCompositeFilter.h
diff --git a/Gui/VtkVis/VtkCompositeGeoObjectFilter.cpp b/Applications/DataExplorer/VtkVis/VtkCompositeGeoObjectFilter.cpp
similarity index 100%
rename from Gui/VtkVis/VtkCompositeGeoObjectFilter.cpp
rename to Applications/DataExplorer/VtkVis/VtkCompositeGeoObjectFilter.cpp
diff --git a/Gui/VtkVis/VtkCompositeGeoObjectFilter.h b/Applications/DataExplorer/VtkVis/VtkCompositeGeoObjectFilter.h
similarity index 100%
rename from Gui/VtkVis/VtkCompositeGeoObjectFilter.h
rename to Applications/DataExplorer/VtkVis/VtkCompositeGeoObjectFilter.h
diff --git a/Gui/VtkVis/VtkCompositeImageToCylindersFilter.cpp b/Applications/DataExplorer/VtkVis/VtkCompositeImageToCylindersFilter.cpp
similarity index 100%
rename from Gui/VtkVis/VtkCompositeImageToCylindersFilter.cpp
rename to Applications/DataExplorer/VtkVis/VtkCompositeImageToCylindersFilter.cpp
diff --git a/Gui/VtkVis/VtkCompositeImageToCylindersFilter.h b/Applications/DataExplorer/VtkVis/VtkCompositeImageToCylindersFilter.h
similarity index 100%
rename from Gui/VtkVis/VtkCompositeImageToCylindersFilter.h
rename to Applications/DataExplorer/VtkVis/VtkCompositeImageToCylindersFilter.h
diff --git a/Gui/VtkVis/VtkCompositeLineToTubeFilter.cpp b/Applications/DataExplorer/VtkVis/VtkCompositeLineToTubeFilter.cpp
similarity index 100%
rename from Gui/VtkVis/VtkCompositeLineToTubeFilter.cpp
rename to Applications/DataExplorer/VtkVis/VtkCompositeLineToTubeFilter.cpp
diff --git a/Gui/VtkVis/VtkCompositeLineToTubeFilter.h b/Applications/DataExplorer/VtkVis/VtkCompositeLineToTubeFilter.h
similarity index 100%
rename from Gui/VtkVis/VtkCompositeLineToTubeFilter.h
rename to Applications/DataExplorer/VtkVis/VtkCompositeLineToTubeFilter.h
diff --git a/Gui/VtkVis/VtkCompositeNodeSelectionFilter.cpp b/Applications/DataExplorer/VtkVis/VtkCompositeNodeSelectionFilter.cpp
similarity index 100%
rename from Gui/VtkVis/VtkCompositeNodeSelectionFilter.cpp
rename to Applications/DataExplorer/VtkVis/VtkCompositeNodeSelectionFilter.cpp
diff --git a/Gui/VtkVis/VtkCompositeNodeSelectionFilter.h b/Applications/DataExplorer/VtkVis/VtkCompositeNodeSelectionFilter.h
similarity index 100%
rename from Gui/VtkVis/VtkCompositeNodeSelectionFilter.h
rename to Applications/DataExplorer/VtkVis/VtkCompositeNodeSelectionFilter.h
diff --git a/Gui/VtkVis/VtkCompositePointToGlyphFilter.cpp b/Applications/DataExplorer/VtkVis/VtkCompositePointToGlyphFilter.cpp
similarity index 100%
rename from Gui/VtkVis/VtkCompositePointToGlyphFilter.cpp
rename to Applications/DataExplorer/VtkVis/VtkCompositePointToGlyphFilter.cpp
diff --git a/Gui/VtkVis/VtkCompositePointToGlyphFilter.h b/Applications/DataExplorer/VtkVis/VtkCompositePointToGlyphFilter.h
similarity index 100%
rename from Gui/VtkVis/VtkCompositePointToGlyphFilter.h
rename to Applications/DataExplorer/VtkVis/VtkCompositePointToGlyphFilter.h
diff --git a/Gui/VtkVis/VtkCompositeTextureOnSurfaceFilter.cpp b/Applications/DataExplorer/VtkVis/VtkCompositeTextureOnSurfaceFilter.cpp
similarity index 100%
rename from Gui/VtkVis/VtkCompositeTextureOnSurfaceFilter.cpp
rename to Applications/DataExplorer/VtkVis/VtkCompositeTextureOnSurfaceFilter.cpp
diff --git a/Gui/VtkVis/VtkCompositeTextureOnSurfaceFilter.h b/Applications/DataExplorer/VtkVis/VtkCompositeTextureOnSurfaceFilter.h
similarity index 100%
rename from Gui/VtkVis/VtkCompositeTextureOnSurfaceFilter.h
rename to Applications/DataExplorer/VtkVis/VtkCompositeTextureOnSurfaceFilter.h
diff --git a/Gui/VtkVis/VtkCompositeThresholdFilter.cpp b/Applications/DataExplorer/VtkVis/VtkCompositeThresholdFilter.cpp
similarity index 100%
rename from Gui/VtkVis/VtkCompositeThresholdFilter.cpp
rename to Applications/DataExplorer/VtkVis/VtkCompositeThresholdFilter.cpp
diff --git a/Gui/VtkVis/VtkCompositeThresholdFilter.h b/Applications/DataExplorer/VtkVis/VtkCompositeThresholdFilter.h
similarity index 100%
rename from Gui/VtkVis/VtkCompositeThresholdFilter.h
rename to Applications/DataExplorer/VtkVis/VtkCompositeThresholdFilter.h
diff --git a/Gui/VtkVis/VtkFilterFactory.cpp b/Applications/DataExplorer/VtkVis/VtkFilterFactory.cpp
similarity index 100%
rename from Gui/VtkVis/VtkFilterFactory.cpp
rename to Applications/DataExplorer/VtkVis/VtkFilterFactory.cpp
diff --git a/Gui/VtkVis/VtkFilterFactory.h b/Applications/DataExplorer/VtkVis/VtkFilterFactory.h
similarity index 100%
rename from Gui/VtkVis/VtkFilterFactory.h
rename to Applications/DataExplorer/VtkVis/VtkFilterFactory.h
diff --git a/Gui/VtkVis/VtkGeoImageSource.cpp b/Applications/DataExplorer/VtkVis/VtkGeoImageSource.cpp
similarity index 100%
rename from Gui/VtkVis/VtkGeoImageSource.cpp
rename to Applications/DataExplorer/VtkVis/VtkGeoImageSource.cpp
diff --git a/Gui/VtkVis/VtkGeoImageSource.h b/Applications/DataExplorer/VtkVis/VtkGeoImageSource.h
similarity index 100%
rename from Gui/VtkVis/VtkGeoImageSource.h
rename to Applications/DataExplorer/VtkVis/VtkGeoImageSource.h
diff --git a/Gui/VtkVis/VtkImageDataToLinePolyDataFilter.cpp b/Applications/DataExplorer/VtkVis/VtkImageDataToLinePolyDataFilter.cpp
similarity index 100%
rename from Gui/VtkVis/VtkImageDataToLinePolyDataFilter.cpp
rename to Applications/DataExplorer/VtkVis/VtkImageDataToLinePolyDataFilter.cpp
diff --git a/Gui/VtkVis/VtkImageDataToLinePolyDataFilter.h b/Applications/DataExplorer/VtkVis/VtkImageDataToLinePolyDataFilter.h
similarity index 100%
rename from Gui/VtkVis/VtkImageDataToLinePolyDataFilter.h
rename to Applications/DataExplorer/VtkVis/VtkImageDataToLinePolyDataFilter.h
diff --git a/Gui/VtkVis/VtkMeshConverter.cpp b/Applications/DataExplorer/VtkVis/VtkMeshConverter.cpp
similarity index 100%
rename from Gui/VtkVis/VtkMeshConverter.cpp
rename to Applications/DataExplorer/VtkVis/VtkMeshConverter.cpp
diff --git a/Gui/VtkVis/VtkMeshConverter.h b/Applications/DataExplorer/VtkVis/VtkMeshConverter.h
similarity index 100%
rename from Gui/VtkVis/VtkMeshConverter.h
rename to Applications/DataExplorer/VtkVis/VtkMeshConverter.h
diff --git a/Gui/VtkVis/VtkMeshSource.cpp b/Applications/DataExplorer/VtkVis/VtkMeshSource.cpp
similarity index 100%
rename from Gui/VtkVis/VtkMeshSource.cpp
rename to Applications/DataExplorer/VtkVis/VtkMeshSource.cpp
diff --git a/Gui/VtkVis/VtkMeshSource.h b/Applications/DataExplorer/VtkVis/VtkMeshSource.h
similarity index 100%
rename from Gui/VtkVis/VtkMeshSource.h
rename to Applications/DataExplorer/VtkVis/VtkMeshSource.h
diff --git a/Gui/VtkVis/VtkPointsSource.cpp b/Applications/DataExplorer/VtkVis/VtkPointsSource.cpp
similarity index 100%
rename from Gui/VtkVis/VtkPointsSource.cpp
rename to Applications/DataExplorer/VtkVis/VtkPointsSource.cpp
diff --git a/Gui/VtkVis/VtkPointsSource.h b/Applications/DataExplorer/VtkVis/VtkPointsSource.h
similarity index 100%
rename from Gui/VtkVis/VtkPointsSource.h
rename to Applications/DataExplorer/VtkVis/VtkPointsSource.h
diff --git a/Gui/VtkVis/VtkPolylinesSource.cpp b/Applications/DataExplorer/VtkVis/VtkPolylinesSource.cpp
similarity index 100%
rename from Gui/VtkVis/VtkPolylinesSource.cpp
rename to Applications/DataExplorer/VtkVis/VtkPolylinesSource.cpp
diff --git a/Gui/VtkVis/VtkPolylinesSource.h b/Applications/DataExplorer/VtkVis/VtkPolylinesSource.h
similarity index 100%
rename from Gui/VtkVis/VtkPolylinesSource.h
rename to Applications/DataExplorer/VtkVis/VtkPolylinesSource.h
diff --git a/Gui/VtkVis/VtkRaster.cpp b/Applications/DataExplorer/VtkVis/VtkRaster.cpp
similarity index 100%
rename from Gui/VtkVis/VtkRaster.cpp
rename to Applications/DataExplorer/VtkVis/VtkRaster.cpp
diff --git a/Gui/VtkVis/VtkRaster.h b/Applications/DataExplorer/VtkVis/VtkRaster.h
similarity index 100%
rename from Gui/VtkVis/VtkRaster.h
rename to Applications/DataExplorer/VtkVis/VtkRaster.h
diff --git a/Gui/VtkVis/VtkStationSource.cpp b/Applications/DataExplorer/VtkVis/VtkStationSource.cpp
similarity index 100%
rename from Gui/VtkVis/VtkStationSource.cpp
rename to Applications/DataExplorer/VtkVis/VtkStationSource.cpp
diff --git a/Gui/VtkVis/VtkStationSource.h b/Applications/DataExplorer/VtkVis/VtkStationSource.h
similarity index 100%
rename from Gui/VtkVis/VtkStationSource.h
rename to Applications/DataExplorer/VtkVis/VtkStationSource.h
diff --git a/Gui/VtkVis/VtkSurfacesSource.cpp b/Applications/DataExplorer/VtkVis/VtkSurfacesSource.cpp
similarity index 100%
rename from Gui/VtkVis/VtkSurfacesSource.cpp
rename to Applications/DataExplorer/VtkVis/VtkSurfacesSource.cpp
diff --git a/Gui/VtkVis/VtkSurfacesSource.h b/Applications/DataExplorer/VtkVis/VtkSurfacesSource.h
similarity index 100%
rename from Gui/VtkVis/VtkSurfacesSource.h
rename to Applications/DataExplorer/VtkVis/VtkSurfacesSource.h
diff --git a/Gui/VtkVis/VtkTextureOnSurfaceFilter.cpp b/Applications/DataExplorer/VtkVis/VtkTextureOnSurfaceFilter.cpp
similarity index 100%
rename from Gui/VtkVis/VtkTextureOnSurfaceFilter.cpp
rename to Applications/DataExplorer/VtkVis/VtkTextureOnSurfaceFilter.cpp
diff --git a/Gui/VtkVis/VtkTextureOnSurfaceFilter.h b/Applications/DataExplorer/VtkVis/VtkTextureOnSurfaceFilter.h
similarity index 100%
rename from Gui/VtkVis/VtkTextureOnSurfaceFilter.h
rename to Applications/DataExplorer/VtkVis/VtkTextureOnSurfaceFilter.h
diff --git a/Gui/VtkVis/VtkVisHelper.cpp b/Applications/DataExplorer/VtkVis/VtkVisHelper.cpp
similarity index 100%
rename from Gui/VtkVis/VtkVisHelper.cpp
rename to Applications/DataExplorer/VtkVis/VtkVisHelper.cpp
diff --git a/Gui/VtkVis/VtkVisHelper.h b/Applications/DataExplorer/VtkVis/VtkVisHelper.h
similarity index 100%
rename from Gui/VtkVis/VtkVisHelper.h
rename to Applications/DataExplorer/VtkVis/VtkVisHelper.h
diff --git a/Gui/VtkVis/VtkVisImageItem.cpp b/Applications/DataExplorer/VtkVis/VtkVisImageItem.cpp
similarity index 100%
rename from Gui/VtkVis/VtkVisImageItem.cpp
rename to Applications/DataExplorer/VtkVis/VtkVisImageItem.cpp
diff --git a/Gui/VtkVis/VtkVisImageItem.h b/Applications/DataExplorer/VtkVis/VtkVisImageItem.h
similarity index 100%
rename from Gui/VtkVis/VtkVisImageItem.h
rename to Applications/DataExplorer/VtkVis/VtkVisImageItem.h
diff --git a/Gui/VtkVis/VtkVisPipeline.cpp b/Applications/DataExplorer/VtkVis/VtkVisPipeline.cpp
similarity index 99%
rename from Gui/VtkVis/VtkVisPipeline.cpp
rename to Applications/DataExplorer/VtkVis/VtkVisPipeline.cpp
index 8326c171b2e..d1243579b86 100644
--- a/Gui/VtkVis/VtkVisPipeline.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkVisPipeline.cpp
@@ -38,7 +38,6 @@
 #include "VtkCompositeGeoObjectFilter.h"
 #include "VtkFilterFactory.h"
 #include "VtkMeshSource.h"
-#include "VtkTrackedCamera.h"
 #include "VtkVisImageItem.h"
 #include "VtkVisPipelineItem.h"
 #include "VtkVisPointSetItem.h"
@@ -328,7 +327,7 @@ QModelIndex VtkVisPipeline::addPipelineItem( vtkAlgorithm* source, QModelIndex p
 		if (old_reader)
 			fi.setFile(QString(old_reader->GetFileName()));
 		else if (new_reader)
-			fi.setFile(QString(new_reader->GetFileName()));		
+			fi.setFile(QString(new_reader->GetFileName()));
 		else if (image_reader)
 			fi.setFile(QString(image_reader->GetFileName()));
 		else if (props)
diff --git a/Gui/VtkVis/VtkVisPipeline.h b/Applications/DataExplorer/VtkVis/VtkVisPipeline.h
similarity index 100%
rename from Gui/VtkVis/VtkVisPipeline.h
rename to Applications/DataExplorer/VtkVis/VtkVisPipeline.h
diff --git a/Gui/VtkVis/VtkVisPipelineItem.cpp b/Applications/DataExplorer/VtkVis/VtkVisPipelineItem.cpp
similarity index 100%
rename from Gui/VtkVis/VtkVisPipelineItem.cpp
rename to Applications/DataExplorer/VtkVis/VtkVisPipelineItem.cpp
diff --git a/Gui/VtkVis/VtkVisPipelineItem.h b/Applications/DataExplorer/VtkVis/VtkVisPipelineItem.h
similarity index 100%
rename from Gui/VtkVis/VtkVisPipelineItem.h
rename to Applications/DataExplorer/VtkVis/VtkVisPipelineItem.h
diff --git a/Gui/VtkVis/VtkVisPipelineView.cpp b/Applications/DataExplorer/VtkVis/VtkVisPipelineView.cpp
similarity index 100%
rename from Gui/VtkVis/VtkVisPipelineView.cpp
rename to Applications/DataExplorer/VtkVis/VtkVisPipelineView.cpp
diff --git a/Gui/VtkVis/VtkVisPipelineView.h b/Applications/DataExplorer/VtkVis/VtkVisPipelineView.h
similarity index 100%
rename from Gui/VtkVis/VtkVisPipelineView.h
rename to Applications/DataExplorer/VtkVis/VtkVisPipelineView.h
diff --git a/Gui/VtkVis/VtkVisPointSetItem.cpp b/Applications/DataExplorer/VtkVis/VtkVisPointSetItem.cpp
similarity index 100%
rename from Gui/VtkVis/VtkVisPointSetItem.cpp
rename to Applications/DataExplorer/VtkVis/VtkVisPointSetItem.cpp
diff --git a/Gui/VtkVis/VtkVisPointSetItem.h b/Applications/DataExplorer/VtkVis/VtkVisPointSetItem.h
similarity index 100%
rename from Gui/VtkVis/VtkVisPointSetItem.h
rename to Applications/DataExplorer/VtkVis/VtkVisPointSetItem.h
diff --git a/Gui/VtkVis/VtkVisTabWidget.cpp b/Applications/DataExplorer/VtkVis/VtkVisTabWidget.cpp
similarity index 100%
rename from Gui/VtkVis/VtkVisTabWidget.cpp
rename to Applications/DataExplorer/VtkVis/VtkVisTabWidget.cpp
diff --git a/Gui/VtkVis/VtkVisTabWidget.h b/Applications/DataExplorer/VtkVis/VtkVisTabWidget.h
similarity index 100%
rename from Gui/VtkVis/VtkVisTabWidget.h
rename to Applications/DataExplorer/VtkVis/VtkVisTabWidget.h
diff --git a/Gui/VtkVis/VtkVisTabWidgetBase.ui b/Applications/DataExplorer/VtkVis/VtkVisTabWidgetBase.ui
similarity index 100%
rename from Gui/VtkVis/VtkVisTabWidgetBase.ui
rename to Applications/DataExplorer/VtkVis/VtkVisTabWidgetBase.ui
diff --git a/Gui/data-explorer.sh b/Applications/DataExplorer/data-explorer.sh
similarity index 100%
rename from Gui/data-explorer.sh
rename to Applications/DataExplorer/data-explorer.sh
diff --git a/Gui/main.cpp b/Applications/DataExplorer/main.cpp
similarity index 100%
rename from Gui/main.cpp
rename to Applications/DataExplorer/main.cpp
diff --git a/Gui/mainwindow.cpp b/Applications/DataExplorer/mainwindow.cpp
similarity index 98%
rename from Gui/mainwindow.cpp
rename to Applications/DataExplorer/mainwindow.cpp
index 4e14dacfc53..28c14ea7cec 100644
--- a/Gui/mainwindow.cpp
+++ b/Applications/DataExplorer/mainwindow.cpp
@@ -102,11 +102,6 @@
 #include <OpenSG/OSGSceneFileHandler.h>
 #endif
 
-#ifdef OGS_USE_VRPN
-#include "TrackingSettingsWidget.h"
-#include "VtkTrackedCamera.h"
-#endif // OGS_USE_VRPN
-
 #include "BaseLib/BuildInfo.h"
 
 using namespace FileIO;
@@ -333,12 +328,6 @@ MainWindow::MainWindow(QWidget* parent /* = 0*/)
 	        SLOT(createPresentationMenu()));
 	menuWindows->insertMenu(showVisDockAction, presentationMenu);
 
-#ifdef OGS_USE_VRPN
-	VtkTrackedCamera* cam = static_cast<VtkTrackedCamera*>
-	                        (visualizationWidget->renderer()->GetActiveCamera());
-	_trackingSettingsWidget = new TrackingSettingsWidget(cam, visualizationWidget, Qt::Window);
-#endif     // OGS_USE_VRPN
-
 	// connects for station model
 	connect(stationTabWidget->treeView,
 	        SIGNAL(propertiesDialogRequested(std::string)), this,
@@ -354,10 +343,6 @@ MainWindow::~MainWindow()
 	delete _vtkVisPipeline;
 	delete _meshModels;
 	delete _processModel;
-
-#ifdef OGS_USE_VRPN
-	delete _trackingSettingsWidget;
-#endif // OGS_USE_VRPN
 }
 
 void MainWindow::closeEvent(QCloseEvent* event)
@@ -1109,16 +1094,6 @@ void MainWindow::FEMTestStart()
 {
 }
 
-void MainWindow::showTrackingSettingsDialog()
-{
-#ifdef OGS_USE_VRPN
-	_trackingSettingsWidget->show();
-#else // OGS_USE_VRPN
-	QMessageBox::warning(this, "Functionality not implemented",
-	                     "Sorry but this progam was not compiled with VRPN support.");
-#endif // OGS_USE_VRPN
-}
-
 void MainWindow::ShowWindow()
 {
 	this->show();
diff --git a/Gui/mainwindow.h b/Applications/DataExplorer/mainwindow.h
similarity index 94%
rename from Gui/mainwindow.h
rename to Applications/DataExplorer/mainwindow.h
index 2a5af6d66dc..0d5704832d3 100644
--- a/Gui/mainwindow.h
+++ b/Applications/DataExplorer/mainwindow.h
@@ -15,7 +15,7 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
-#include "Applications/ProjectData.h"
+#include "Applications/ApplicationsLib/ProjectData.h"
 #include "ImportFileTypes.h"
 #include "ui_mainwindow.h"
 
@@ -29,10 +29,6 @@ class VisPrefsDialog;
 
 class QSignalMapper;
 
-#ifdef OGS_USE_VRPN
-class TrackingSettingsWidget;
-#endif // OGS_USE_VRPN
-
 /**
  * Main program window for the graphical user interface of OpenGeoSys.
  */
@@ -98,7 +94,6 @@ protected slots:
 	void showMshQualitySelectionDialog(VtkMeshSource* mshSource);
 	void showPropertiesDialog(std::string const& name);
 	void showVisalizationPrefsDialog();
-	void showTrackingSettingsDialog();
 	void updateDataViews();
 	void writeGeometryToFile(QString listName, QString fileName);
 	void writeStationListToFile(QString listName, QString fileName);
@@ -133,9 +128,6 @@ private:
 	QMenu* _import_files_menu;
 	QSignalMapper* _signal_mapper;
 
-#ifdef OGS_USE_VRPN
-	TrackingSettingsWidget* _trackingSettingsWidget;
-#endif     // OGS_USE_VRPN
 	VisPrefsDialog* _visPrefsDialog;
 
 signals:
diff --git a/Gui/mainwindow.ui b/Applications/DataExplorer/mainwindow.ui
similarity index 96%
rename from Gui/mainwindow.ui
rename to Applications/DataExplorer/mainwindow.ui
index d9f8650719c..a68296411a9 100644
--- a/Gui/mainwindow.ui
+++ b/Applications/DataExplorer/mainwindow.ui
@@ -119,7 +119,6 @@
     </property>
     <addaction name="actionData_Explorer_Settings"/>
     <addaction name="action_VisualisationSettings"/>
-    <addaction name="action_TrackingSettings"/>
    </widget>
    <widget class="QMenu" name="menuTools">
     <property name="title">
@@ -369,14 +368,6 @@
     <string>Export to OpenSG binary format</string>
    </property>
   </action>
-  <action name="action_TrackingSettings">
-   <property name="text">
-    <string>Tracking Settings...</string>
-   </property>
-   <property name="toolTip">
-    <string>Sets settings for head-tracking.</string>
-   </property>
-  </action>
   <action name="actionMesh_Generation">
    <property name="text">
     <string>Mesh Generation...</string>
@@ -536,22 +527,6 @@
     </hint>
    </hints>
   </connection>
-  <connection>
-   <sender>action_TrackingSettings</sender>
-   <signal>triggered()</signal>
-   <receiver>MainWindowClass</receiver>
-   <slot>showTrackingSettingsDialog()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>-1</x>
-     <y>-1</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>399</x>
-     <y>300</y>
-    </hint>
-   </hints>
-  </connection>
   <connection>
    <sender>actionMesh_Generation</sender>
    <signal>triggered()</signal>
@@ -718,7 +693,6 @@
   <slot>import()</slot>
   <slot>save()</slot>
   <slot>showVisalizationPrefsDialog()</slot>
-  <slot>showTrackingSettingsDialog()</slot>
   <slot>showGMSHPrefsDialog()</slot>
   <slot>FEMTestStart()</slot>
   <slot>showDiagramPrefsDialog()</slot>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7dc08995b68..fcb39262a26 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -130,11 +130,6 @@ IF(OGS_USE_EIGEN)
 	ENDIF()
 ENDIF()
 
-IF(OGS_BUILD_GUI)
-	ADD_DEFINITIONS(-DOGS_BUILD_GUI)
-	ADD_SUBDIRECTORY(Gui)
-ENDIF() # OGS_BUILD_GUI
-
 ADD_SUBDIRECTORY( Applications )
 ADD_SUBDIRECTORY( AssemblerLib )
 ADD_SUBDIRECTORY( BaseLib )
diff --git a/FileIO/XmlIO/Qt/XmlGspInterface.h b/FileIO/XmlIO/Qt/XmlGspInterface.h
index efbb415d0b7..acd0d98a86e 100644
--- a/FileIO/XmlIO/Qt/XmlGspInterface.h
+++ b/FileIO/XmlIO/Qt/XmlGspInterface.h
@@ -18,7 +18,7 @@
 #include "../XMLInterface.h"
 #include "XMLQtInterface.h"
 
-#include "Applications/ProjectData.h"
+#include "Applications/ApplicationsLib/ProjectData.h"
 
 namespace FileIO
 {
diff --git a/Gui/Vrpn/CMakeLists.txt b/Gui/Vrpn/CMakeLists.txt
deleted file mode 100644
index 7ade7c22c81..00000000000
--- a/Gui/Vrpn/CMakeLists.txt
+++ /dev/null
@@ -1,64 +0,0 @@
-# 24/08/2010 LB Initial implementation
-# CMake file for OgsVrpn
-
-### Source files ###
-SET( SOURCES
-	VrpnClient.cpp
-	SpaceNavigatorClient.cpp
-	QSpaceNavigatorClient.cpp
-	VrpnArtTrackingClient.cpp
-	QVrpnArtTrackingClient.cpp
-	TrackingSettingsWidget.cpp
-)
-
-### Moc header files ###
-SET( MOC_HEADERS
-	VrpnClient.h
-	QSpaceNavigatorClient.h
-	QVrpnArtTrackingClient.h
-	TrackingSettingsWidget.h
-)
-
-### UI files ###
-SET( UIS
-	TrackingSettingsWidgetBase.ui
-)
-
-### Header files ###
-SET( HEADERS
-	SpaceNavigatorClient.h
-	VrpnArtTrackingClient.h
-)
-
-### Qt precompiler ###
-QT4_WRAP_UI( UI_HEADERS ${UIS} )
-Qt4_WRAP_CPP( MOC_SOURCES ${MOC_HEADERS} )
-
-### Include directories ###
-INCLUDE_DIRECTORIES(
-	${CMAKE_CURRENT_SOURCE_DIR}
-	${CMAKE_CURRENT_BINARY_DIR}
-	${CMAKE_CURRENT_SOURCE_DIR}/../VtkVis
-	${CMAKE_CURRENT_BINARY_DIR}/../VtkVis
-	${VRPN_INCLUDE_DIRS}
-)
-
-# 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( OgsVrpn STATIC
-	${SOURCES}
-	${HEADERS}
-	${MOC_HEADERS}
-	${MOC_SOURCES}
-	${UIS}
-)
-
-### Link other libraries ###
-#TARGET_LINK_LIBRARIES( OgsVrpn
-#	${QT_LIBRARIES}
-#)
-
-SET_PROPERTY(TARGET OgsVrpn PROPERTY FOLDER "DataExplorer")
\ No newline at end of file
diff --git a/Gui/Vrpn/QSpaceNavigatorClient.cpp b/Gui/Vrpn/QSpaceNavigatorClient.cpp
deleted file mode 100644
index 383d810e34f..00000000000
--- a/Gui/Vrpn/QSpaceNavigatorClient.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
- * \file
- * \author Lars Bilke
- * \date 2010-08-31
- *
- * \copyright
- * Copyright (c) 2012-2014, OpenGeoSys Community (http://www.opengeosys.org)
- *            Distributed under a Modified BSD License.
- *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.net/LICENSE.txt
- *
- */
-
-// ** INCLUDES **
-#include "QSpaceNavigatorClient.h"
-
-QSpaceNavigatorClient* QSpaceNavigatorClient::_singleton = 0;
-
-QSpaceNavigatorClient::QSpaceNavigatorClient(QObject* parent /*= NULL*/)
-	: QObject(parent), SpaceNavigatorClient()
-{
-	//SpaceNavigatorClient::Instance();
-	_time.start();
-	_timer = new QTimer(this);
-	connect( _timer, SIGNAL(timeout()), this, SLOT(update()) );
-}
-
-QSpaceNavigatorClient::~QSpaceNavigatorClient()
-{
-}
-
-QSpaceNavigatorClient* QSpaceNavigatorClient::Instance(QObject* parent /*= NULL*/)
-{
-	if(_singleton == 0)
-		_singleton = new QSpaceNavigatorClient(parent);
-	return _singleton;
-}
-
-void QSpaceNavigatorClient::init(const char* deviceName,
-                                 int updateInterval /*= 100*/, SpaceNavigatorAxes axis /*= Y*/)
-{
-	SpaceNavigatorClient::init(deviceName, axis);
-	if (updateInterval > 0)
-		_timer->start(updateInterval);
-}
-
-void QSpaceNavigatorClient::update()
-{
-	SpaceNavigatorClient::update();
-	if (_unconsumedData)
-	{
-		_unconsumedData = false;
-		double x, y, z, rx, ry, rz;
-		getTranslation(x, y, z);
-		getRotation(rx, ry, rz);
-		//emit updated(x, y, z, rx, ry, rz);
-		emit translated(x, y, z);
-	}
-}
-
-int QSpaceNavigatorClient::getFrameTime()
-{
-	return _time.restart();
-}
\ No newline at end of file
diff --git a/Gui/Vrpn/QSpaceNavigatorClient.h b/Gui/Vrpn/QSpaceNavigatorClient.h
deleted file mode 100644
index a111b109b02..00000000000
--- a/Gui/Vrpn/QSpaceNavigatorClient.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/**
- * \file
- * \author Lars Bilke
- * \date 2010-08-31
- *
- * \copyright
- * Copyright (c) 2012-2014, OpenGeoSys Community (http://www.opengeosys.org)
- *            Distributed under a Modified BSD License.
- *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.net/LICENSE.txt
- *
- */
-
-#ifndef QSPACENAVIGATORCLIENT_H
-#define QSPACENAVIGATORCLIENT_H
-
-#include "SpaceNavigatorClient.h"
-#include <QObject>
-#include <QTime>
-#include <QTimer>
-
-/// @brief Is a qt specific implementation of SpaceNavigatorClient.
-class QSpaceNavigatorClient : public QObject, public SpaceNavigatorClient
-{
-	Q_OBJECT
-
-public:
-	/// @brief Returns the singleton of this class
-	static QSpaceNavigatorClient* Instance(QObject* parent = NULL);
-
-	/// @brief Initializes the SpaceNavigator.
-	/// Connects with the server and registers the callback handlers.
-	/// It is possible to specify the z-axis as the up-axis.
-	/// Default the y-axis is the up-axis.
-	/// @param deviceName Example: "SpaceNav@viswork01.intern.ufz.de"
-	/// @param updateInterval The update interval in ms. If 0 then you have to
-	/// manually call update().
-	/// @param axis The up axis.
-	void init(const char* deviceName, int updateInterval = 100, SpaceNavigatorAxes axis = Y);
-
-public slots:
-	/// @brief Calls the SpaceNavigatorClient::update() method and emits updated()
-	/// and translated() signals if there is new data.
-	/// Is called automatically if an updateInterval was given in init().
-	void update();
-
-protected:
-	/// @brief The constructor is protected because of the singleton
-	/// design pattern.
-	QSpaceNavigatorClient(QObject* parent = NULL);
-
-	/// @brief Destructor.
-	virtual ~QSpaceNavigatorClient();
-
-	/// @brief Returns the elapsed time since the last function call in ms.
-	int getFrameTime();
-
-private:
-	/// Used in getFrameTime() to compute the elapsed time since last call.
-	QTime _time;
-
-	/// Calls update(), see init().
-	QTimer* _timer;
-
-	/// @brief This one points to the class itself.
-	/// You can use only one QSpaceNavigatorClient because it´s static.
-	/// This is needed for the callback methods which only
-	/// can access static members.
-	static QSpaceNavigatorClient* _singleton;
-
-signals:
-	void updated(double x, double y, double z, double rx, double ry, double rz);
-
-	/// Is emitted when there is new translation data.
-	void translated(double x, double y, double z);
-};
-
-#endif // QSPACENAVIGATORCLIENT_H
diff --git a/Gui/Vrpn/QVrpnArtTrackingClient.cpp b/Gui/Vrpn/QVrpnArtTrackingClient.cpp
deleted file mode 100644
index d1cf92cd388..00000000000
--- a/Gui/Vrpn/QVrpnArtTrackingClient.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-/**
- * \file
- * \author Lars Bilke
- * \date 2010-08-31
- *
- * \copyright
- * Copyright (c) 2012-2014, OpenGeoSys Community (http://www.opengeosys.org)
- *            Distributed under a Modified BSD License.
- *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.net/LICENSE.txt
- *
- */
-
-// ** INCLUDES **
-#include "QVrpnArtTrackingClient.h"
-
-// ThirdParty/logog
-#include "logog/include/logog.hpp"
-
-#include <QSettings>
-#include <QString>
-#include <QStringList>
-
-QVrpnArtTrackingClient* QVrpnArtTrackingClient::_singleton = 0;
-
-QVrpnArtTrackingClient::QVrpnArtTrackingClient(QObject* parent /*= NULL*/)
-	: QObject(parent), VrpnArtTrackingClient(), _updateInterval(0)
-{
-	//SpaceNavigatorClient::Instance();
-	_timer = new QTimer(this);
-	connect( _timer, SIGNAL(timeout()), this, SLOT(MainLoop()) );
-}
-
-QVrpnArtTrackingClient::~QVrpnArtTrackingClient()
-{
-	QStringList list = _deviceName.split("@");
-
-	QSettings settings;
-	settings.beginGroup("Tracking");
-	settings.setValue("artDeviceName", list.at(0));
-	settings.setValue("artDeviceNameAt", list.at(1));
-	settings.setValue("artUpdateInterval", _updateInterval);
-	settings.endGroup();
-
-	delete _timer;
-}
-
-QVrpnArtTrackingClient* QVrpnArtTrackingClient::Instance(QObject* parent /*= NULL*/)
-{
-	if(_singleton == 0)
-		_singleton = new QVrpnArtTrackingClient(parent);
-	return _singleton;
-}
-
-void QVrpnArtTrackingClient::StartTracking(const char* deviceName,
-                                           int updateInterval /*= 100*/)
-{
-	_deviceName = QString(deviceName);
-	_updateInterval = updateInterval;
-	VrpnArtTrackingClient::StartTracking(deviceName);
-	INFO("Tracking started.");
-	if (updateInterval > 0)
-		_timer->start(updateInterval);
-}
-
-void QVrpnArtTrackingClient::MainLoop()
-{
-	VrpnArtTrackingClient::MainLoop();
-
-	double x, y, z;
-	VrpnArtTrackingClient::GetBodyTranslation(x, y, z);
-	//std::cout << "Body: " << x << " " << y << " " << z << std::endl;
-	//std::cout << "Body: " << m_dBodyTranslation[0] << " " << m_dBodyTranslation[1] << " " << m_dBodyTranslation[2] << std::endl;
-	emit positionUpdated(x, z, y);
-
-	/*
-	   if (_unconsumedData)
-	   {
-	    _unconsumedData = false;
-	    double x, y, z, rx, ry, rz;
-	    getTranslation(x, y, z);
-	    getRotation(rx, ry, rz);
-	    //emit updated(x, y, z, rx, ry, rz);
-	    emit translated(x, y, z);
-	   }
-	 */
-}
diff --git a/Gui/Vrpn/QVrpnArtTrackingClient.h b/Gui/Vrpn/QVrpnArtTrackingClient.h
deleted file mode 100644
index c09e5943777..00000000000
--- a/Gui/Vrpn/QVrpnArtTrackingClient.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/**
- * \file
- * \author Lars Bilke
- * \date 2010-08-31
- *
- * \copyright
- * Copyright (c) 2012-2014, OpenGeoSys Community (http://www.opengeosys.org)
- *            Distributed under a Modified BSD License.
- *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.net/LICENSE.txt
- *
- */
-
-#ifndef QVRPNARTTRACKINGCLIENT_H
-#define QVRPNARTTRACKINGCLIENT_H
-
-#include "VrpnArtTrackingClient.h"
-#include <QObject>
-
-#include <QTimer>
-
-class QString;
-
-class QVrpnArtTrackingClient : public QObject, public VrpnArtTrackingClient
-{
-	Q_OBJECT
-
-public:
-	/// @brief Returns the singleton of this class
-	static QVrpnArtTrackingClient* Instance(QObject* parent = NULL);
-
-	/// @brief Initializes and starts the tracking.
-	/// @param deviceName The name of the vrpn device @ vrpn server host name
-	/// e.g. DTrack@visserv3.intern.ufz.de
-	/// @param updateInterval The update interval in ms. If 0 then you have to
-	/// manually call MainLoop().
-	void StartTracking(const char* deviceName, int updateInterval = 100);
-
-	/// @brief Returns the device name.
-	QString deviceName() const { return _deviceName; }
-
-	/// @ Returns the update interval.
-	int updateInterval() const { return _updateInterval; }
-
-public slots:
-	/// @brief Calls the vrpn mainloop functions. Must be called once per frame.
-	/// Is called automatically if an updateInterval was given in init().
-	void MainLoop();
-
-protected:
-	QVrpnArtTrackingClient(QObject* parent = NULL);
-	virtual ~QVrpnArtTrackingClient();
-
-private:
-	/// Calls MainLoop(), see init().
-	QTimer* _timer;
-
-	/// The device name, e.g. DTrack@141.65.34.36
-	QString _deviceName;
-
-	/// The update interval
-	int _updateInterval;
-
-	/// @brief This one points to the class itself.
-	/// You can use only one QVrpnArtTrackingClient because it´s static.
-	/// This is needed for the callback methods which only
-	/// can access static members.
-	static QVrpnArtTrackingClient* _singleton;
-
-signals:
-	void positionUpdated(double x, double y, double z);
-};
-
-#endif // QVRPNARTTRACKINGCLIENT_H
diff --git a/Gui/Vrpn/SpaceNavigatorClient.cpp b/Gui/Vrpn/SpaceNavigatorClient.cpp
deleted file mode 100644
index c4e3e85448b..00000000000
--- a/Gui/Vrpn/SpaceNavigatorClient.cpp
+++ /dev/null
@@ -1,401 +0,0 @@
-// SpaceNavigatorClient.cpp
-//
-//
-// Author: Lars Bilke
-
-// ** INCLUDES **
-#include "SpaceNavigatorClient.h"
-
-// ThirdParty/logog
-#include "logog/include/logog.hpp"
-
-SpaceNavigatorClient* SpaceNavigatorClient::_spacenavigator = 0;
-
-SpaceNavigatorClient::SpaceNavigatorClient()
-{
-	_button = NULL;
-	_analog = NULL;
-	_unconsumedData = false;
-	_frameRotationFactor = 0.0;
-	_frameTranslationFactor = 0.0;
-	_upAxis = Y;
-
-	// set all fields to start values
-	_spacenavigator = this;
-	for(int i = 0; i < 8; i++)
-		buttons[0] = false;
-	_defaultButtonBehaviour = true;
-	x = y = z = rx = ry = rz = 0.0;
-	_translationFactor = _rotationFactor = 1.0;
-
-	_dominating = false;
-	_invertAxes[0] = _invertAxes[2] = _invertAxes[3] = _invertAxes[5] = 1.0;
-	_invertAxes[1] = _invertAxes[4] = -1.0;
-
-	_mode = TRANSROT;
-}
-
-SpaceNavigatorClient::~SpaceNavigatorClient()
-{
-	// clean up
-	if(_button)
-	{
-		_button->unregister_change_handler(
-		        NULL,
-		        (vrpn_BUTTONCHANGEHANDLER) SpaceNavigatorClient
-		        ::_handleButtons);
-		delete _button;
-		_button = NULL;
-	}
-	if(_analog)
-	{
-		_analog->unregister_change_handler(
-		        NULL,
-		        (vrpn_ANALOGCHANGEHANDLER) SpaceNavigatorClient
-		        ::_handleAnalogs);
-		delete _analog;
-		_analog = NULL;
-	}
-}
-
-void SpaceNavigatorClient::init( const char* deviceName, SpaceNavigatorAxes axis /*= Y*/ )
-{
-	// Create new button_remote object that connects to the corresponding server object
-	// at the specified computer and register the callback function
-	if(_button)
-	{
-		_button->unregister_change_handler(
-		        NULL,
-		        (vrpn_BUTTONCHANGEHANDLER) SpaceNavigatorClient
-		        ::_handleButtons);
-		delete _button;
-	}
-	_button = new vrpn_Button_Remote(deviceName);
-	_button->register_change_handler(
-	        NULL,
-	        (vrpn_BUTTONCHANGEHANDLER) SpaceNavigatorClient::
-	        _handleButtons);
-
-	// Create new analog_remote object that connects to the corresponding server object
-	// at the specified computer and register the callback function
-	if(_analog)
-	{
-		_analog->unregister_change_handler(
-		        NULL,
-		        (vrpn_ANALOGCHANGEHANDLER) SpaceNavigatorClient
-		        ::_handleAnalogs);
-		delete _analog;
-	}
-	_analog = new vrpn_Analog_Remote(deviceName);
-	_analog->register_change_handler(
-	        NULL,
-	        (vrpn_ANALOGCHANGEHANDLER) SpaceNavigatorClient::
-	        _handleAnalogs);
-
-	// set up axis
-	if(axis == Z)
-		_upAxis = axis;
-	else
-		_upAxis = Y;
-}
-
-void SpaceNavigatorClient::getTranslation(double& retx, double& rety, double& retz) const
-{
-	retx = x * _frameTranslationFactor;
-	rety = y * _frameTranslationFactor;
-	retz = z * _frameTranslationFactor;
-}
-
-void SpaceNavigatorClient::getRotation(double& retx, double& rety, double& retz) const
-{
-	retx = rx * _frameTranslationFactor;
-	rety = ry * _frameTranslationFactor;
-	retz = rz * _frameTranslationFactor;
-}
-
-void SpaceNavigatorClient::update()
-{
-	double frameTime = getFrameTime(); // in ms
-	_frameTranslationFactor =  _translationFactor * (frameTime / 1000.0);
-	_frameRotationFactor = _rotationFactor * (frameTime / 800.0);
-
-	// process messages from server
-	this->_button->mainloop();
-	this->_analog->mainloop();
-}
-
-void SpaceNavigatorClient::setTranslationFactor(double factor)
-{
-	_translationFactor = factor;
-}
-
-void SpaceNavigatorClient::setRotationFactor(double factor)
-{
-	_rotationFactor = factor;
-}
-
-bool SpaceNavigatorClient::getZUpAxis()
-{
-	if (_upAxis == Z)
-		return true;
-	else
-		return false;
-}
-
-void SpaceNavigatorClient::setZUpAxis( bool zUp )
-{
-	if (zUp)
-		_upAxis = Z;
-	else
-		_upAxis = Y;
-}
-void SpaceNavigatorClient::setDomination(bool dominating)
-{
-	this->_dominating = dominating;
-
-#ifdef SPACENAVIGATOR_DEBUG_OUTPUT
-	DBUG("SpaceNavigator: Axis domination mode: ");
-	if(dominating)
-		DBUG("ON");
-	else
-		DBUG("OFF");
-#endif     // SPACENAVIGATOR_DEBUG_OUTPUT
-}
-
-void SpaceNavigatorClient::switchDomination()
-{
-	this->_dominating = !this->_dominating;
-
-#ifdef SPACENAVIGATOR_DEBUG_OUTPUT
-	DBUG("SpaceNavigator: Axis domination mode: ";
-	if(_dominating)
-		DBUG("ON");
-	else
-		DBUG("OFF");
-#endif     // SPACENAVIGATOR_DEBUG_OUTPUT
-}
-
-void SpaceNavigatorClient::setMode(SpaceNavigatorClient::SpaceNavigatorMode mode)
-{
-	this->_mode = mode;
-
-#ifdef SPACENAVIGATOR_DEBUG_OUTPUT
-	DBUG("SpaceNavigator: Transformation mode: ");
-	if(mode == TRANSROT)
-		DBUG("TRANSLATION and ROTATION");
-	else if(mode == TRANS)
-		DBUG("TRANSLATION only");
-	else if(mode == ROT)
-		DBUG("ROTATION only");
-#endif     // SPACENAVIGATOR_DEBUG_OUTPUT
-}
-
-void SpaceNavigatorClient::switchMode()
-{
-	this->_mode = (SpaceNavigatorClient::SpaceNavigatorMode)((this->_mode + 1) % 3);
-
-#ifdef SPACENAVIGATOR_DEBUG_OUTPUT
-	DBUG("SpaceNavigator: Transformation mode: ");
-	if(_mode == TRANSROT)
-		DBUG("TRANSLATION and ROTATION");
-	else if(_mode == TRANS)
-		DBUG("TRANSLATION only");
-	else if(_mode == ROT)
-		DBUG("ROTATION only");
-#endif     // SPACENAVIGATOR_DEBUG_OUTPUT
-}
-
-void SpaceNavigatorClient::setDefaultButtonBehaviour(bool enable)
-{
-	_defaultButtonBehaviour = enable;
-}
-
-void SpaceNavigatorClient::invertAxis(SpaceNavigatorAxes axisToInvert)
-{
-	if(axisToInvert < 7 && axisToInvert > 0)
-	{
-		if(_invertAxes[axisToInvert - 1] == 1.0)
-			_invertAxes[axisToInvert - 1] = -1.0;
-		else
-			_invertAxes[axisToInvert - 1] = 1.0;
-	}
-}
-
-void VRPN_CALLBACK SpaceNavigatorClient::_handleButtons(void*, vrpn_BUTTONCB buttonData)
-{
-	// read button data
-	_spacenavigator->buttons[buttonData.button] = buttonData.state ? true : false;
-
-	if(_spacenavigator->_defaultButtonBehaviour)
-	{
-		if(_spacenavigator->buttons[0])
-			_spacenavigator->switchMode();
-
-		if(_spacenavigator->buttons[1])
-			_spacenavigator->switchDomination();
-	}
-
-	_spacenavigator->_unconsumedData = true;
-}
-
-void VRPN_CALLBACK SpaceNavigatorClient::_handleAnalogs(void*, vrpn_ANALOGCB analogData)
-{
-	// read data from the analog axes
-	// range [0, 1]
-	// set some values to 0 due to mode
-
-	// normal mode (translation and rotation)
-	if(_spacenavigator->_mode == TRANSROT)
-	{
-		if(_spacenavigator->_dominating)
-		{
-			double max = analogData.channel[0];
-			int index = 0;
-			for(int i = 1; i < 6; i++)
-				if(abs(analogData.channel[i]) > abs(max))
-				{
-					index = i;
-					max = analogData.channel[i];
-				}
-			_spacenavigator->x = _spacenavigator->y = _spacenavigator->z =
-			                                                  _spacenavigator->rx =
-			                                                          _spacenavigator->
-			                                                          ry = _spacenavigator->rz = 0;
-			switch(index)
-			{
-			case 0: _spacenavigator->x = max  * _spacenavigator->_invertAxes[0];
-				break;
-			case 2: _spacenavigator->y = max  * _spacenavigator->_invertAxes[1];
-				break;
-			case 1: _spacenavigator->z = max  * _spacenavigator->_invertAxes[2];
-				break;
-			case 3: _spacenavigator->rx = max  * _spacenavigator->_invertAxes[3];
-				break;
-			case 5: _spacenavigator->ry = max  * _spacenavigator->_invertAxes[4];
-				break;
-			case 4: _spacenavigator->rz = max  * _spacenavigator->_invertAxes[5];
-				break;
-			}
-		}
-		else
-		{
-			_spacenavigator->x = analogData.channel[0] *
-			                     _spacenavigator->_invertAxes[0];
-			_spacenavigator->y = analogData.channel[2] *
-			                     _spacenavigator->_invertAxes[1];
-			_spacenavigator->z = analogData.channel[1] *
-			                     _spacenavigator->_invertAxes[2];
-			_spacenavigator->rx = analogData.channel[3] *
-			                      _spacenavigator->_invertAxes[3];
-			_spacenavigator->ry = analogData.channel[5] *
-			                      _spacenavigator->_invertAxes[4];
-			_spacenavigator->rz = analogData.channel[4] *
-			                      _spacenavigator->_invertAxes[5];
-		}
-	}
-
-	// translation only mode
-	else if(_spacenavigator->_mode == TRANS)
-	{
-		if(_spacenavigator->_dominating)
-		{
-			double max = analogData.channel[0];
-			int index = 0;
-			for(int i = 1; i < 3; i++)
-				if(abs(analogData.channel[i]) > abs(max))
-				{
-					index = i;
-					max = analogData.channel[i];
-				}
-			_spacenavigator->x = _spacenavigator->y = _spacenavigator->z =
-			                                                  _spacenavigator->rx =
-			                                                          _spacenavigator->
-			                                                          ry = _spacenavigator->rz = 0;
-			switch(index)
-			{
-			case 0: _spacenavigator->x = max  * _spacenavigator->_invertAxes[0];
-				break;
-			case 2: _spacenavigator->y = max  * _spacenavigator->_invertAxes[1];
-				break;
-			case 1: _spacenavigator->z = max  * _spacenavigator->_invertAxes[2];
-				break;
-			}
-		}
-		else
-		{
-			_spacenavigator->x = analogData.channel[0] *
-			                     _spacenavigator->_invertAxes[0];
-			_spacenavigator->y = analogData.channel[2] *
-			                     _spacenavigator->_invertAxes[1];
-			_spacenavigator->z = analogData.channel[1] *
-			                     _spacenavigator->_invertAxes[2];
-			_spacenavigator->rx = _spacenavigator->ry = _spacenavigator->rz = 0;
-		}
-	}
-
-	// rotation only mode
-	else if(_spacenavigator->_mode == ROT)
-	{
-		if(_spacenavigator->_dominating)
-		{
-			double max = analogData.channel[3];
-			int index = 3;
-			for(int i = 4; i < 6; i++)
-				if(abs(analogData.channel[i]) > abs(max))
-				{
-					index = i;
-					max = analogData.channel[i];
-				}
-			_spacenavigator->x = _spacenavigator->y = _spacenavigator->z =
-			                                                  _spacenavigator->rx =
-			                                                          _spacenavigator->
-			                                                          ry = _spacenavigator->rz = 0;
-			switch(index)
-			{
-			case 3: _spacenavigator->rx = max  * _spacenavigator->_invertAxes[3];
-				break;
-			case 5: _spacenavigator->ry = max  * _spacenavigator->_invertAxes[4];
-				break;
-			case 4: _spacenavigator->rz = max  * _spacenavigator->_invertAxes[5];
-				break;
-			}
-		}
-		else
-		{
-			_spacenavigator->rx = analogData.channel[3] *
-			                      _spacenavigator->_invertAxes[3];
-			_spacenavigator->ry = analogData.channel[5] *
-			                      _spacenavigator->_invertAxes[4];
-			_spacenavigator->rz = analogData.channel[4] *
-			                      _spacenavigator->_invertAxes[5];
-			_spacenavigator->x = _spacenavigator->y = _spacenavigator->z = 0;
-		}
-	}
-
-	// swap axes if the z-axis is the up axis
-	if(_spacenavigator->_upAxis == Z)
-	{
-		double temp = _spacenavigator->y;
-		_spacenavigator->y = _spacenavigator->z;
-		_spacenavigator->z = temp;
-
-		temp = _spacenavigator->ry;
-		_spacenavigator->ry = _spacenavigator->rz;
-		_spacenavigator->rz = temp;
-	}
-
-	_spacenavigator->_unconsumedData = true;
-
-#ifdef SPACENAVIGATOR_DEBUG_OUTPUT
-	DBUG("Translation: { %f, %f, %f }", _spacenavigator->x, _spacenavigator->y, _spacenavigator->z);
-	DBUG("Rotation: { %f, %f, %f }", _spacenavigator->rx, _spacenavigator->ry, _spacenavigator->rz);
-#endif     // SPACENAVIGATOR_DEBUG_OUTPUT
-}
-
-SpaceNavigatorClient* SpaceNavigatorClient::Instance()
-{
-	if(_spacenavigator == 0)
-		_spacenavigator = new SpaceNavigatorClient();
-
-	return _spacenavigator;
-}
diff --git a/Gui/Vrpn/SpaceNavigatorClient.h b/Gui/Vrpn/SpaceNavigatorClient.h
deleted file mode 100644
index f6f1115e970..00000000000
--- a/Gui/Vrpn/SpaceNavigatorClient.h
+++ /dev/null
@@ -1,180 +0,0 @@
-// SpaceNavigatorClient.h
-//
-//
-// Author: Lars Bilke
-
-#ifndef SPACENAVIGATORCLIENT_H
-#define SPACENAVIGATORCLIENT_H
-
-// comment this out to suppress debug outputs on the console
-//#define SPACENAVIGATOR_DEBUG_OUTPUT
-
-// ** INCLUDES **
-#include <vrpn_Analog.h>
-#include <vrpn_Button.h>
-
-// ** SpaceNavigatorClient - CLASS **
-// This implements the singleton design pattern.
-// ******************************
-class SpaceNavigatorClient
-{
-public:
-	// ** ENUMS **
-
-	/// @brief Navigation modes: translation and rotation or translation
-	/// or rotation only.
-	enum SpaceNavigatorMode
-	{
-		TRANSROT = 0,
-		TRANS,
-		ROT
-	};
-
-	/// @brief SpaceNavigator axes.
-	enum SpaceNavigatorAxes
-	{
-		X = 1,
-		Y,
-		Z,
-		rX,
-		rY,
-		rZ
-	};
-
-	// ** Public member fields **
-
-	/// @brief State of the up to eight buttons.
-	bool buttons[8];
-
-	// ** Public member functions **
-
-	/// @brief Returns the singleton of the SpaceNavigator.
-	static SpaceNavigatorClient* Instance();
-
-	/// @brief Initializes the SpaceNavigator.
-	/// Connects with the server and registers the callback handlers.
-	/// @param deviceName Example: "SpaceNav@viswork01.intern.ufz.de"
-	/// @param axis The up axis.
-	/// It is possible to specify the z-axis as the up-axis.
-	/// Default the y-axis is the up-axis.
-	void init(const char* deviceName, SpaceNavigatorAxes axis = Y);
-
-	/// @brief Returns the translation values.
-	void getTranslation(double& retx, double& rety, double& retz) const;
-
-	/// @brief Returns the rotation values
-	void getRotation(double& retx, double& rety, double& retz) const;
-
-	/// @brief Updates the translation and rotation values.
-	/// Must be called once per frame before getTranslation/Rotation.
-	void update();
-
-	/// @brief Sets the translation scaling factor.
-	void setTranslationFactor(double factor);
-
-	/// @brief Sets the rotation scaling factor.
-	void setRotationFactor(double factor);
-
-	/// @brief Returns true if Z is the up axis.
-	bool getZUpAxis();
-
-	/// @brief Sets if Z is the up axis.
-	void setZUpAxis(bool zUp);
-
-	/// @brief Enables / disables the axis-domination mode.
-	/// Only the axis with the highest value is used.
-	void setDomination(bool dominating);
-
-	/// @brief Switches axis-domination mode.
-	void switchDomination();
-
-	/// @brief Switch navigation mode. See SpaceNavigatorMode.
-	void setMode(SpaceNavigatorClient::SpaceNavigatorMode mode);
-
-	/// @brief Switch through navigation modes.
-	void switchMode();
-
-	/// @brief Sets the default button behavior.
-	/// on:	left button  --> switch mode
-	///		right button --> switch domination
-	/// off: no button behavior
-	void setDefaultButtonBehaviour(bool enable);
-
-	/// @brief Inverts the specified axis of type SpaceNavigatorAxes
-	void invertAxis(SpaceNavigatorAxes axisToInvert);
-
-protected:
-	// ** Protected member functions **
-
-	/// @brief The constructor is protected because of the singleton
-	/// design pattern.
-	SpaceNavigatorClient();
-
-	/// @brief Destructor
-	virtual ~SpaceNavigatorClient();
-
-	/// @brief Returns the elapsed time since the last function call in ms.
-	/// This must be implemented in a subclass.
-	virtual int getFrameTime() { return 1; }
-
-	/// @brief Does all the event processing.
-	/// This function should be run one time per Frame
-	/// e.g. in the glut display function.
-	// void mainloop();
-
-	/// @brief Actual values of the rotation
-	double rx, ry, rz;
-
-	/// @brief Actual values of the translation
-	double x, y, z;
-
-	/// @brief This one points to the class itself.
-	/// You can use only one SpaceNavigatorClient because it´s static.
-	/// This is needed for the callback methods which only
-	/// can access static members.
-	static SpaceNavigatorClient* _spacenavigator;
-
-	/// @brief Is set to true if a vrpn callback was called.
-	bool _unconsumedData;
-
-private:
-	// ** Private member fields **
-	vrpn_Button_Remote* _button;
-	vrpn_Analog_Remote* _analog;
-
-	// is domination mode active?
-	bool _dominating;
-
-	// mode: 0 - translation and rotation
-	SpaceNavigatorMode _mode;
-
-	// default button behavior?
-	bool _defaultButtonBehaviour;
-
-	// which axis should be inverted?
-	double _invertAxes[6];
-
-	// ** Private member functions **
-
-	/// @brief Callbacks which are called whenever a button is pressed
-	/// or the SpaceNavigator is moved.
-	/// Callbacks as class members have to be static.
-	static void VRPN_CALLBACK _handleButtons(void*, vrpn_BUTTONCB buttonData);
-	static void VRPN_CALLBACK _handleAnalogs(void*, vrpn_ANALOGCB analogData);
-
-	// which is the up-axis (y - normal, z - from the gis world)
-	SpaceNavigatorAxes _upAxis;
-
-	// The translation factor.
-	double _translationFactor;
-
-	// The rotation factor.
-	double _rotationFactor;
-
-	// The translation factor for this frame.
-	double _frameTranslationFactor;
-
-	// The rotation factor for this frame.
-	double _frameRotationFactor;
-};
-#endif // SPACENAVIGATORCLIENT_H
diff --git a/Gui/Vrpn/TrackingSettingsWidget.cpp b/Gui/Vrpn/TrackingSettingsWidget.cpp
deleted file mode 100644
index d14814db247..00000000000
--- a/Gui/Vrpn/TrackingSettingsWidget.cpp
+++ /dev/null
@@ -1,121 +0,0 @@
-/**
- * \file
- * \author Lars Bilke
- * \date 2010-08-31
- *
- * \copyright
- * Copyright (c) 2012-2014, OpenGeoSys Community (http://www.opengeosys.org)
- *            Distributed under a Modified BSD License.
- *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.net/LICENSE.txt
- *
- */
-
-// ** INCLUDES **
-#include "QSpaceNavigatorClient.h"
-#include "QVrpnArtTrackingClient.h"
-#include "TrackingSettingsWidget.h"
-#include "VtkTrackedCamera.h"
-
-#include <QCompleter>
-#include <QDoubleValidator>
-#include <QLineEdit>
-#include <QStringList>
-
-TrackingSettingsWidget::TrackingSettingsWidget(VtkTrackedCamera* cam,
-                                               QWidget* parent /*= 0*/, Qt::WindowFlags f /*= 0*/)
-	: QWidget(parent, f), _cam(cam)
-{
-	setupUi(this);
-
-	QStringList deviceNameAtSuggestionList;
-	deviceNameAtSuggestionList << "141.65.34.36" << "visserv3.intern.ufz.de" << "localhost";
-	QCompleter* deviceNameAtCompleter = new QCompleter(deviceNameAtSuggestionList, this);
-	deviceNameAtCompleter->setCaseSensitivity(Qt::CaseInsensitive);
-	deviceNameAtLineEdit->setCompleter(deviceNameAtCompleter);
-
-	offsetXLineEdit->setValidator(new QDoubleValidator(offsetXLineEdit));
-	offsetYLineEdit->setValidator(new QDoubleValidator(offsetYLineEdit));
-	offsetZLineEdit->setValidator(new QDoubleValidator(offsetZLineEdit));
-	realToVirtualScaleLineEdit->setValidator(new QDoubleValidator(realToVirtualScaleLineEdit));
-	aspectRatioLineEdit->setValidator(new QDoubleValidator(aspectRatioLineEdit));
-	screenHeightLineEdit->setValidator(new QDoubleValidator(0.1, 10.0, 2, screenHeightLineEdit));
-	nearClipPlaneLineEdit->setValidator(new QDoubleValidator(nearClipPlaneLineEdit));
-	farClipPlaneLineEdit->setValidator(new QDoubleValidator(farClipPlaneLineEdit));
-
-	QVrpnArtTrackingClient* art = QVrpnArtTrackingClient::Instance();
-	QStringList list = art->deviceName().split("@");
-	deviceNameLineEdit->setText(list.at(0));
-	deviceNameAtLineEdit->setText(list.at(1));
-	updateIntervalSpinBox->setValue(art->updateInterval());
-	offsetXLineEdit->setText(QString::number(_cam->trackingOffsetX()));
-	offsetYLineEdit->setText(QString::number(_cam->trackingOffsetY()));
-	offsetZLineEdit->setText(QString::number(_cam->trackingOffsetZ()));
-	realToVirtualScaleLineEdit->setText(QString::number(_cam->realToVirtualScale()));
-	aspectRatioLineEdit->setText(QString::number(_cam->screenAspectRatio()));
-	screenHeightLineEdit->setText(QString::number(_cam->screenHeight()));
-}
-
-TrackingSettingsWidget::~TrackingSettingsWidget()
-{
-}
-
-void TrackingSettingsWidget::on_offsetXLineEdit_textChanged(QString text)
-{
-	double value = text.toDouble();
-	_cam->setTrackingOffsetX(value);
-}
-
-void TrackingSettingsWidget::on_offsetYLineEdit_textChanged(QString text)
-{
-	double value = text.toDouble();
-	_cam->setTrackingOffsetY(value);
-}
-void TrackingSettingsWidget::on_offsetZLineEdit_textChanged(QString text)
-{
-	double value = text.toDouble();
-	_cam->setTrackingOffsetZ(value);
-}
-
-void TrackingSettingsWidget::on_realToVirtualScaleLineEdit_textChanged(QString text)
-{
-	double value = text.toDouble();
-	_cam->setRealToVirtualScale(value);
-}
-
-void TrackingSettingsWidget::on_aspectRatioLineEdit_textChanged(QString text)
-{
-	double value = text.toDouble();
-	_cam->setScreenAspectRatio(value);
-}
-
-void TrackingSettingsWidget::on_screenHeightLineEdit_textChanged(QString text)
-{
-	double value = text.toDouble();
-	_cam->setScreenHeight(value);
-}
-
-void TrackingSettingsWidget::on_applyPushButton_pressed()
-{
-	QVrpnArtTrackingClient* art = QVrpnArtTrackingClient::Instance();
-	art->StopTracking();
-	QString deviceName = deviceNameLineEdit->text() + "@" + deviceNameAtLineEdit->text();
-	art->StartTracking(deviceName.toStdString().c_str(), updateIntervalSpinBox->value());
-	applyPushButton->setEnabled(false);
-}
-
-void TrackingSettingsWidget::on_nearClipPlaneLineEdit_textChanged( QString text )
-{
-	double value = text.toDouble();
-	double dnear,dfar;
-	_cam->GetClippingRange(dnear, dfar);
-	_cam->SetClippingRange(value, dfar);
-}
-
-void TrackingSettingsWidget::on_farClipPlaneLineEdit_textChanged( QString text )
-{
-	double value = text.toDouble();
-	double dnear, dfar;
-	_cam->GetClippingRange(dnear, dfar);
-	_cam->SetClippingRange(dnear, value);
-}
diff --git a/Gui/Vrpn/TrackingSettingsWidget.h b/Gui/Vrpn/TrackingSettingsWidget.h
deleted file mode 100644
index 6194324e094..00000000000
--- a/Gui/Vrpn/TrackingSettingsWidget.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * \file
- * \author Lars Bilke
- * \date 2010-08-31
- *
- * \copyright
- * Copyright (c) 2012-2014, OpenGeoSys Community (http://www.opengeosys.org)
- *            Distributed under a Modified BSD License.
- *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.net/LICENSE.txt
- *
- */
-
-#ifndef TRACKINGSETTINGSWIDGET_H
-#define TRACKINGSETTINGSWIDGET_H
-
-#include "ui_TrackingSettingsWidgetBase.h"
-
-class VtkTrackedCamera;
-class QSpaceNavigatorClient;
-class QVrpnArtTrackingClient;
-
-// TODO Add QSettings stuff
-class TrackingSettingsWidget : public QWidget, public Ui_TrackingSettingsWidgetBase
-{
-	Q_OBJECT
-
-public:
-	TrackingSettingsWidget(VtkTrackedCamera* cam, QWidget* parent = 0, Qt::WindowFlags f = 0);
-	virtual ~TrackingSettingsWidget();
-
-protected slots:
-	void on_deviceNameLineEdit_textChanged() { applyPushButton->setEnabled(true); }
-	void on_deviceNameAtLineEdit_textChanged() { applyPushButton->setEnabled(true); }
-	void on_applyPushButton_pressed();
-	void on_offsetXLineEdit_textChanged(QString text);
-	void on_offsetYLineEdit_textChanged(QString text);
-	void on_offsetZLineEdit_textChanged(QString text);
-	void on_realToVirtualScaleLineEdit_textChanged(QString text);
-	void on_aspectRatioLineEdit_textChanged(QString text);
-	void on_screenHeightLineEdit_textChanged(QString text);
-	void on_nearClipPlaneLineEdit_textChanged(QString text);
-	void on_farClipPlaneLineEdit_textChanged(QString text);
-private:
-	VtkTrackedCamera*  _cam;
-};
-
-#endif // TRACKINGSETTINGSWIDGET_H
diff --git a/Gui/Vrpn/TrackingSettingsWidgetBase.ui b/Gui/Vrpn/TrackingSettingsWidgetBase.ui
deleted file mode 100644
index b0a241fd41e..00000000000
--- a/Gui/Vrpn/TrackingSettingsWidgetBase.ui
+++ /dev/null
@@ -1,271 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <author>Lars Bilke</author>
- <class>TrackingSettingsWidgetBase</class>
- <widget class="QWidget" name="TrackingSettingsWidgetBase">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>400</width>
-    <height>308</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Tracking Settings</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="QTabWidget" name="tabWidget">
-     <property name="currentIndex">
-      <number>0</number>
-     </property>
-     <widget class="QWidget" name="artTrackTab">
-      <attribute name="title">
-       <string>ART Tracking</string>
-      </attribute>
-      <layout class="QGridLayout" name="gridLayout">
-       <item row="0" column="0">
-        <widget class="QLabel" name="label">
-         <property name="text">
-          <string>Device Name:</string>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="1">
-        <widget class="QLineEdit" name="deviceNameLineEdit">
-         <property name="text">
-          <string>DTrack</string>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="2">
-        <widget class="QLabel" name="label_2">
-         <property name="text">
-          <string>@</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignCenter</set>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="3">
-        <widget class="QLineEdit" name="deviceNameAtLineEdit">
-         <property name="text">
-          <string>141.65.34.36</string>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="0">
-        <widget class="QLabel" name="label_3">
-         <property name="text">
-          <string>Update Interval:</string>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="1" colspan="2">
-        <widget class="QSpinBox" name="updateIntervalSpinBox">
-         <property name="alignment">
-          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-         </property>
-         <property name="maximum">
-          <number>2000</number>
-         </property>
-         <property name="singleStep">
-          <number>25</number>
-         </property>
-         <property name="value">
-          <number>100</number>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="3">
-        <widget class="QLabel" name="label_4">
-         <property name="text">
-          <string>ms</string>
-         </property>
-        </widget>
-       </item>
-       <item row="8" column="3">
-        <widget class="QPushButton" name="applyPushButton">
-         <property name="enabled">
-          <bool>false</bool>
-         </property>
-         <property name="text">
-          <string>Apply</string>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="0">
-        <widget class="QLabel" name="label_5">
-         <property name="text">
-          <string>Tracking Offset:</string>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="1">
-        <widget class="QLineEdit" name="offsetXLineEdit">
-         <property name="text">
-          <string>0.0</string>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="2">
-        <widget class="QLineEdit" name="offsetYLineEdit">
-         <property name="text">
-          <string>0.0</string>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="3">
-        <widget class="QLineEdit" name="offsetZLineEdit">
-         <property name="text">
-          <string>0.0</string>
-         </property>
-        </widget>
-       </item>
-       <item row="3" column="0">
-        <widget class="QLabel" name="label_6">
-         <property name="text">
-          <string>Scale Factor:</string>
-         </property>
-        </widget>
-       </item>
-       <item row="7" column="0">
-        <spacer name="verticalSpacer">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>40</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item row="3" column="1" colspan="2">
-        <widget class="QLineEdit" name="realToVirtualScaleLineEdit">
-         <property name="toolTip">
-          <string>Real to virtual scaling factor</string>
-         </property>
-         <property name="text">
-          <string>1.0</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-         </property>
-        </widget>
-       </item>
-       <item row="3" column="3">
-        <widget class="QPushButton" name="pushButton">
-         <property name="toolTip">
-          <string>Computes the real to virtual scaling factor based on scene boundaries</string>
-         </property>
-         <property name="text">
-          <string>Compute</string>
-         </property>
-        </widget>
-       </item>
-       <item row="4" column="0">
-        <widget class="QLabel" name="label_7">
-         <property name="text">
-          <string>Scr. Aspect Ratio:</string>
-         </property>
-        </widget>
-       </item>
-       <item row="5" column="0">
-        <widget class="QLabel" name="label_8">
-         <property name="text">
-          <string>Screen Height:</string>
-         </property>
-        </widget>
-       </item>
-       <item row="4" column="1" colspan="2">
-        <widget class="QLineEdit" name="aspectRatioLineEdit">
-         <property name="toolTip">
-          <string>Screen width / screen height</string>
-         </property>
-         <property name="text">
-          <string>1.6</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-         </property>
-        </widget>
-       </item>
-       <item row="5" column="1" colspan="2">
-        <widget class="QLineEdit" name="screenHeightLineEdit">
-         <property name="text">
-          <string>0.4</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-         </property>
-        </widget>
-       </item>
-       <item row="5" column="3">
-        <widget class="QLabel" name="label_9">
-         <property name="text">
-          <string>m</string>
-         </property>
-        </widget>
-       </item>
-       <item row="6" column="0">
-        <widget class="QLabel" name="label_10">
-         <property name="text">
-          <string>Clipping Planes:</string>
-         </property>
-        </widget>
-       </item>
-       <item row="6" column="1">
-        <widget class="QLineEdit" name="nearClipPlaneLineEdit">
-         <property name="text">
-          <string>0.1</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-         </property>
-        </widget>
-       </item>
-       <item row="6" column="2">
-        <widget class="QLineEdit" name="farClipPlaneLineEdit">
-         <property name="text">
-          <string>1000.0</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="spacenavTab">
-      <attribute name="title">
-       <string>Space Navigator</string>
-      </attribute>
-     </widget>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
- <designerdata>
-  <property name="gridDeltaX">
-   <number>10</number>
-  </property>
-  <property name="gridDeltaY">
-   <number>10</number>
-  </property>
-  <property name="gridSnapX">
-   <bool>true</bool>
-  </property>
-  <property name="gridSnapY">
-   <bool>true</bool>
-  </property>
-  <property name="gridVisible">
-   <bool>false</bool>
-  </property>
- </designerdata>
-</ui>
diff --git a/Gui/Vrpn/VrpnArtTrackingClient.cpp b/Gui/Vrpn/VrpnArtTrackingClient.cpp
deleted file mode 100644
index afb9a748455..00000000000
--- a/Gui/Vrpn/VrpnArtTrackingClient.cpp
+++ /dev/null
@@ -1,260 +0,0 @@
-#include "VrpnArtTrackingClient.h"
-
-#include <assert.h>
-
-// ThirdParty/logog
-#include "logog/include/logog.hpp"
-
-VrpnArtTrackingClient* VrpnArtTrackingClient::m_pInstance = NULL;
-
-VrpnArtTrackingClient::VrpnArtTrackingClient()
-{
-	int i;
-	for (i = 0; i < 3; i++)
-	{
-		m_dBodyTranslation[i] = 0.0;
-		m_dFlyTranslation[i] = 0.0;
-	}
-	for (i = 0; i < 4; i++)
-	{
-		m_dBodyQuaternion[i] = 0.0;
-		m_dFlyQuaternion[i] = 0.0;
-	}
-
-	for (i = 0; i < 10; i++)
-	{
-		m_dAnalogData[i] = 0.0;
-		m_bButtonData[i] = false;
-	}
-
-	m_pvrpnAnalog = NULL;
-	m_pvrpnTracker = NULL;
-	m_pvrpnButtons = NULL;
-
-	m_bTrackingStarted = false;
-
-	m_pInstance = this;
-}
-
-VrpnArtTrackingClient* VrpnArtTrackingClient::Instance()
-{
-	if (m_pInstance == NULL)
-	{
-		m_pInstance = new VrpnArtTrackingClient();
-		return m_pInstance;
-	}
-	else
-		return m_pInstance;
-}
-
-VrpnArtTrackingClient::~VrpnArtTrackingClient()
-{
-	StopTracking();
-}
-
-void VrpnArtTrackingClient::StartTracking(const char* deviceName)
-{
-	m_pvrpnAnalog = new vrpn_Analog_Remote(deviceName);
-	m_pvrpnTracker = new vrpn_Tracker_Remote(deviceName);
-	m_pvrpnButtons = new vrpn_Button_Remote(deviceName);
-
-	m_pvrpnTracker->register_change_handler(
-	        NULL,
-	        (vrpn_TRACKERCHANGEHANDLER) VrpnArtTrackingClient::
-	        CBHandleTracker);
-	m_pvrpnAnalog->register_change_handler(
-	        NULL,
-	        (vrpn_ANALOGCHANGEHANDLER) VrpnArtTrackingClient::
-	        CBHandleAnalogs);
-	m_pvrpnButtons->register_change_handler(
-	        NULL,
-	        (vrpn_BUTTONCHANGEHANDLER) VrpnArtTrackingClient::
-	        CBHandleButtons);
-
-	m_bTrackingStarted = true;
-}
-
-void VrpnArtTrackingClient::StopTracking()
-{
-	if (m_pvrpnAnalog)
-	{
-		m_pvrpnAnalog->unregister_change_handler(
-		        NULL,
-		        (vrpn_ANALOGCHANGEHANDLER)
-		        VrpnArtTrackingClient::CBHandleAnalogs);
-		delete m_pvrpnAnalog;
-	}
-	if (m_pvrpnTracker)
-	{
-		m_pvrpnTracker->unregister_change_handler(
-		        NULL,
-		        (vrpn_TRACKERCHANGEHANDLER)
-		        VrpnArtTrackingClient::CBHandleTracker);
-		delete m_pvrpnTracker;
-	}
-	if (m_pvrpnButtons)
-	{
-		m_pvrpnButtons->unregister_change_handler(
-		        NULL,
-		        (vrpn_BUTTONCHANGEHANDLER)
-		        VrpnArtTrackingClient::CBHandleButtons);
-		delete m_pvrpnButtons;
-	}
-
-	m_pvrpnAnalog = NULL;
-	m_pvrpnTracker = NULL;
-	m_pvrpnButtons = NULL;
-
-	int i;
-	for (i = 0; i < 3; i++)
-	{
-		m_dBodyTranslation[i] = 0.0;
-		m_dFlyTranslation[i] = 0.0;
-	}
-	for (i = 0; i < 4; i++)
-	{
-		m_dBodyQuaternion[i] = 0.0;
-		m_dFlyQuaternion[i] = 0.0;
-	}
-
-	for (i = 0; i < 10; i++)
-	{
-		m_dAnalogData[i] = 0.0;
-		m_bButtonData[i] = false;
-	}
-
-	m_bTrackingStarted = false;
-}
-
-void VrpnArtTrackingClient::MainLoop()
-{
-	if (m_bTrackingStarted)
-	{
-		//std::cout << "MainLoop" << std::endl;
-		m_pvrpnTracker->mainloop();
-		m_pvrpnAnalog->mainloop();
-		m_pvrpnButtons->mainloop();
-	}
-	else
-		WARN("VrpnArtTrackingClient::MainLoop() has been called but tracking ist not been started!");
-}
-
-void VrpnArtTrackingClient::GetBodyTranslation(double &x, double &y, double &z)
-{
-	x = m_dBodyTranslation[0];
-	y = m_dBodyTranslation[1];
-	z = m_dBodyTranslation[2];
-
-	if (!m_bTrackingStarted)
-		WARN("VrpnArtTrackingClient::GetBodyTranslation() has been called but tracking has not been started!");
-}
-
-void VrpnArtTrackingClient::GetBodyQuaternion(double &v0, double &v1, double &v2, double &v3)
-{
-	v0 = m_dBodyQuaternion[0];
-	v1 = m_dBodyQuaternion[1];
-	v2 = m_dBodyQuaternion[2];
-	v3 = m_dBodyQuaternion[3];
-
-	if (!m_bTrackingStarted)
-		WARN("VrpnArtTrackingClient::GetBodyQuaternion() has been called but tracking has not been started!");
-}
-
-void VrpnArtTrackingClient::GetFlyTranslation(double &x, double &y, double &z)
-{
-	x = m_dFlyTranslation[0];
-	y = m_dFlyTranslation[1];
-	z = m_dFlyTranslation[2];
-
-	if (!m_bTrackingStarted)
-		WARN("VrpnArtTrackingClient::GetFlyTranslation() has been called but tracking has not been started!");
-}
-
-void VrpnArtTrackingClient::GetFlyQuaternion(double &v0, double &v1, double &v2, double &v3)
-{
-	v0 = m_dFlyQuaternion[0];
-	v1 = m_dFlyQuaternion[1];
-	v2 = m_dFlyQuaternion[2];
-	v3 = m_dFlyQuaternion[3];
-
-	if (!m_bTrackingStarted)
-		WARN("VrpnArtTrackingClient::GetFlyQuaternion() has been called but tracking has not been started!");
-}
-
-double VrpnArtTrackingClient::GetAnalogData(int index)
-{
-	if (index < 10)
-		return m_dAnalogData[index];
-	else
-		return 0.0;
-
-	if (!m_bTrackingStarted)
-		WARN("VrpnArtTrackingClient::GetAnalogData() has been called but tracking has not been started!");
-}
-
-bool VrpnArtTrackingClient::GetButtonData(int index)
-{
-	if (index < 10)
-		return m_bButtonData[index];
-	else
-		return false;
-
-	if (!m_bTrackingStarted)
-		WARN("VrpnArtTrackingClient::GetButtonData() has been called but tracking has not been started!");
-}
-
-void VRPN_CALLBACK VrpnArtTrackingClient::CBHandleTracker(void* userdata, const vrpn_TRACKERCB t)
-{
-	(void)userdata;
-
-	VrpnArtTrackingClient* art = m_pInstance;
-	if (art != NULL)
-	{
-		if (t.sensor == 0)
-		{
-			//std::cout << "CBHandleTracker" << std::endl;
-			for (int i = 0; i < 3; i++)
-				art->m_dBodyTranslation[i] = t.pos[i];
-				//std::cout << t.pos[i] << std::endl;
-			for (int i = 0; i < 4; i++)
-				art->m_dBodyQuaternion[i] = t.quat[i];
-				//std::cout << t.quat[i] << std::endl;
-		}
-		else if (t.sensor == 1)
-		{
-			for (int i = 0; i < 3; i++)
-				art->m_dFlyTranslation[i] = t.pos[i];
-			for (int i = 0; i < 4; i++)
-				art->m_dFlyQuaternion[i] = t.quat[i];
-		}
-	}
-}
-
-void VRPN_CALLBACK VrpnArtTrackingClient::CBHandleAnalogs(void*, vrpn_ANALOGCB analogData)
-{
-	//std::cout << "CBHandleAnalogs" << std::endl;
-
-	VrpnArtTrackingClient* art = m_pInstance;
-	if (art != NULL)
-	{
-		int numChannels = analogData.num_channel;
-		if (numChannels > 10)
-			numChannels = 10;
-		for (int i = 0; i < numChannels; i++)
-			art->m_dAnalogData[i] = analogData.channel[i];
-	}
-}
-
-void VRPN_CALLBACK VrpnArtTrackingClient::CBHandleButtons(void* userdata, vrpn_BUTTONCB buttonData)
-{
-	//std::cout << "CBHandleButtons" << std::endl;
-
-	(void)userdata;
-	VrpnArtTrackingClient* art = m_pInstance;
-	if (art != NULL)
-	{
-		int buttonIndex = buttonData.button;
-		if (buttonIndex < 10)
-			art->m_bButtonData[buttonIndex] = buttonData.state ? true : false;
-	}
-}
diff --git a/Gui/Vrpn/VrpnArtTrackingClient.h b/Gui/Vrpn/VrpnArtTrackingClient.h
deleted file mode 100644
index 9cfd40026cd..00000000000
--- a/Gui/Vrpn/VrpnArtTrackingClient.h
+++ /dev/null
@@ -1,90 +0,0 @@
-#ifndef VRPNARTTRACKINGCLIENT_H
-#define VRPNARTTRACKINGCLIENT_H
-
-#include <vrpn_Analog.h>
-#include <vrpn_Button.h>
-#include <vrpn_Tracker.h>
-
-/// @brief Vrpn client fort ART-Tracking system
-class VrpnArtTrackingClient
-{
-public:
-	/// @brief Returns the singleton of this class
-	static VrpnArtTrackingClient* Instance();
-
-	/// @brief Initializes and starts the tracking.
-	/// @param deviceName The name of the vrpn device @ vrpn server host name
-	/// e.g. DTrack@visserv3.intern.ufz.de
-	void    StartTracking(const char* deviceName);
-
-	/// @brief Stops the tracking.
-	void    StopTracking();
-
-	/// @brief Returns true if tracking is started
-	bool    IsStarted() const {return m_bTrackingStarted; }
-
-	/// @brief Calls the vrpn mainloop functions. Must be called once per frame.
-	void    MainLoop();
-
-	/// @brief Returns the bodys (head) position.
-	void    GetBodyTranslation(double &x, double &y, double &z);
-
-	/// @brief Returns the bodys orientation as a quaternion.
-	void    GetBodyQuaternion(double &v0, double &v1, double &v2, double &v3);
-
-	/// @brief Returns the flysticks position.
-	void    GetFlyTranslation(double &x, double &y, double &z);
-
-	/// @brief Returns the flysticks orientation as a quaternion.
-	void    GetFlyQuaternion(double &v0, double &v1, double &v2, double &v3);
-
-	/// @brief Returns the analog value of an axis of the flysticks yellow little joystick.
-	/// @param index The axis.
-	double  GetAnalogData(int index);
-
-	/// @brief Returns if the button with the given index of the flystick is pressed.
-	bool    GetButtonData(int index);
-
-protected:
-
-	/// @brief The constructor is protected because of the singleton
-	/// design pattern.
-	VrpnArtTrackingClient();
-
-	/// @brief Destructor.
-	~VrpnArtTrackingClient();
-
-	/// @brief This one points to the class itself.
-	/// You can use only one VrpnArtTrackingClient because it´s static.
-	/// This is needed for the callback methods which only
-	/// can access static members.
-	static VrpnArtTrackingClient* m_pInstance;
-
-	// Is the tracker initialized ?
-	bool m_bTrackingStarted;
-
-	// Tracking values
-	double m_dBodyQuaternion[4];
-	double m_dBodyTranslation[3];
-
-	// Flystick
-	double m_dFlyQuaternion[4];
-	double m_dFlyTranslation[3];
-
-	// Analogs
-	double m_dAnalogData[10];
-
-	// Buttons
-	bool m_bButtonData[10];
-
-	// VRPN related stuff
-	vrpn_Analog_Remote* m_pvrpnAnalog;
-	vrpn_Tracker_Remote* m_pvrpnTracker;
-	vrpn_Button_Remote* m_pvrpnButtons;
-
-	static void VRPN_CALLBACK CBHandleTracker(void* userdata, const vrpn_TRACKERCB t);
-	static void VRPN_CALLBACK CBHandleAnalogs(void* userdata, vrpn_ANALOGCB analogData);
-	static void VRPN_CALLBACK CBHandleButtons(void* userdata, vrpn_BUTTONCB buttonData);
-};
-
-#endif // VRPNARTTRACKINGCLIENT_H
diff --git a/Gui/Vrpn/VrpnClient.cpp b/Gui/Vrpn/VrpnClient.cpp
deleted file mode 100644
index 25d433cc44c..00000000000
--- a/Gui/Vrpn/VrpnClient.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
- * \file
- * \author Lars Bilke
- * \date 2010-08-31
- *
- * \copyright
- * Copyright (c) 2012-2014, OpenGeoSys Community (http://www.opengeosys.org)
- *            Distributed under a Modified BSD License.
- *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.net/LICENSE.txt
- *
- */
-
-// ** INCLUDES **
-#include "VrpnClient.h"
-
-#include <QTimer>
-#include <vrpn_Analog.h>
-
-void VRPN_CALLBACK handle_analog( void* userData, const vrpn_ANALOGCB a )
-{
-	int i;
-	const char* name = (const char*)userData;
-
-	printf("Analog %s:\n         %5.2f", name, a.channel[0]);
-	for (i = 1; i < a.num_channel; i++)
-		printf(", %5.2f", a.channel[i]);
-	printf(" (%d chans)\n", a.num_channel);
-
-	// if (a.num_channel >= 3)
-	//              emit positionChanged(a.channel[1], a.channel[2], a.channel[3]);
-	//      if (a.num_channel >= 6)
-	//              emit rotationChanged(a.channel[4], a.channel[5], a.channel[6]);
-}
-
-VrpnClient::VrpnClient( QString deviceName, int updateInterval /*= 100*/, QObject* parent /*= NULL*/ )
-	: QObject(parent)
-{
-	// Create vrpn analog device
-	_deviceName = deviceName;
-	_vrpnAnalog = new vrpn_Analog_Remote( deviceName.toStdString().c_str() );
-	_vrpnAnalog->register_change_handler( 0, handle_analog );
-
-	int numChannels = _vrpnAnalog->getNumChannels();
-	_analogData.fill(0.0, numChannels);
-
-	// Call the vrpn mainloop every updateInterval ms
-	QTimer* vrpnTimer = new QTimer(this);
-	connect(vrpnTimer, SIGNAL(timeout()), this, SLOT(update()));
-	vrpnTimer->start(updateInterval);
-}
-VrpnClient::~VrpnClient()
-{
-	_vrpnAnalog->unregister_change_handler( 0, handle_analog );
-	delete _vrpnAnalog;
-}
-
-double VrpnClient::getAnalog(int channel)
-{
-	return _analogData[channel];
-}
-
-void VrpnClient::update()
-{
-	_vrpnAnalog->mainloop();
-}
\ No newline at end of file
diff --git a/Gui/Vrpn/VrpnClient.h b/Gui/Vrpn/VrpnClient.h
deleted file mode 100644
index a516afa6d8f..00000000000
--- a/Gui/Vrpn/VrpnClient.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * \file
- * \author Lars Bilke
- * \date 2010-08-31
- *
- * \copyright
- * Copyright (c) 2012-2014, OpenGeoSys Community (http://www.opengeosys.org)
- *            Distributed under a Modified BSD License.
- *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.net/LICENSE.txt
- *
- */
-
-#ifndef VRPNCLIENT_H
-#define VRPNCLIENT_H
-
-#include <QObject>
-#include <QVector>
-#include <vrpn_Analog.h>
-
-class QString;
-class vrpn_Analog_Remote;
-
-class VrpnClient : public QObject
-{
-	Q_OBJECT
-
-public:
-	VrpnClient(QString deviceName, int updateInterval = 100, QObject* parent = NULL);
-	virtual ~VrpnClient();
-
-	double getAnalog(int channel);
-
-public slots:
-	void update();
-
-protected:
-	QString _deviceName;
-	vrpn_Analog_Remote* _vrpnAnalog;
-	QVector<double> _analogData;
-
-signals:
-	void positionChanged(double x, double y, double z);
-	void rotationChanged(double x, double y, double z);
-};
-
-#endif // VRPNCLIENT_H
diff --git a/Gui/VtkVis/VtkTrackedCamera.cpp b/Gui/VtkVis/VtkTrackedCamera.cpp
deleted file mode 100644
index e6d344f37b7..00000000000
--- a/Gui/VtkVis/VtkTrackedCamera.cpp
+++ /dev/null
@@ -1,149 +0,0 @@
-/**
- * \file
- * \author Lars Bilke
- * \date   2010-08-25
- * \brief  Implementation of the VtkTrackedCamera class.
- *
- * \copyright
- * Copyright (c) 2012-2014, OpenGeoSys Community (http://www.opengeosys.org)
- *            Distributed under a Modified BSD License.
- *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.org/project/license
- *
- */
-
-// ** INCLUDES **
-#include "VtkTrackedCamera.h"
-
-#include <vtkMath.h>
-#include <vtkPerspectiveTransform.h>
-
-#include <QSettings>
-
-VtkTrackedCamera::VtkTrackedCamera(QObject* parent)
-	: QObject(parent), vtkOpenGLCamera()
-{
-	QSettings settings;
-	settings.beginGroup("Tracking");
-	// Read from settings
-	if (settings.contains("artOffsetX"))
-	{
-		_trackedPositionOffset[0] = settings.value("artOffsetX").toDouble();
-		_trackedPositionOffset[1] = settings.value("artOffsetY").toDouble();
-		_trackedPositionOffset[2] = settings.value("artOffsetZ").toDouble();
-		_realToVirtualScale = settings.value("artRealToVirtualScale").toDouble();
-		_screenAspectRatio = settings.value("artAspectRatio").toDouble();
-		_screenHeight = settings.value("artScreenHeight").toDouble();
-	}
-	// Default values
-	else
-	{
-		_trackedPositionOffset[0] = 0;
-		_trackedPositionOffset[1] = 0;
-		_trackedPositionOffset[2] = 0;
-		_realToVirtualScale = 1.0;
-		_screenAspectRatio = 1.6;
-		_screenHeight = 0.4;
-	}
-	settings.endGroup();
-
-	// if z up
-	_trackedPosition[0] = 0;
-	_trackedPosition[1] = 2;
-	_trackedPosition[2] = 0;
-	_focalPoint[0] = 0;
-	_focalPoint[1] = 0;
-	_focalPoint[2] = 0;
-	SetPosition(0,0,0);
-	SetFocalPoint(0,1,0);
-	SetViewUp(0,0,1);
-}
-
-VtkTrackedCamera::~VtkTrackedCamera()
-{
-	QSettings settings;
-	settings.beginGroup("Tracking");
-	settings.setValue("artOffsetX", _trackedPositionOffset[0]);
-	settings.setValue("artOffsetY", _trackedPositionOffset[1]);
-	settings.setValue("artOffsetZ", _trackedPositionOffset[2]);
-	settings.setValue("artRealToVirtualScale", _realToVirtualScale);
-	settings.setValue("artAspectRatio", _screenAspectRatio);
-	settings.setValue("artScreenHeight", _screenHeight);
-	settings.endGroup();
-}
-
-void VtkTrackedCamera::setTrackingData(double x, double y, double z)
-{
-	_trackedPosition[0] = x + _trackedPositionOffset[0];
-	_trackedPosition[1] = y + _trackedPositionOffset[1];
-	_trackedPosition[2] = z + _trackedPositionOffset[2];
-	updateView();
-}
-
-void VtkTrackedCamera::setFocalPoint(double x, double y, double z)
-{
-	_focalPoint[0] = x;
-	_focalPoint[1] = y;
-	_focalPoint[2] = z;
-	updateView();
-}
-
-void VtkTrackedCamera::setTrackingOffset(double x, double y, double z)
-{
-	setTrackingOffsetX(x);
-	setTrackingOffsetY(y);
-	setTrackingOffsetZ(z);
-}
-
-void VtkTrackedCamera::translate(double x, double y, double z)
-{
-	setFocalPoint(_focalPoint[0] + x, _focalPoint[1] + y, _focalPoint[2] + z);
-	updateView();
-}
-
-void VtkTrackedCamera::rotate(double yaw, double elevation, double roll)
-{
-	Q_UNUSED(yaw);
-	Q_UNUSED(elevation);
-	Q_UNUSED(roll);
-}
-
-void VtkTrackedCamera::updateView()
-{
-	double x = _trackedPosition[0] * _realToVirtualScale;
-	double y = _trackedPosition[1] * _realToVirtualScale;
-	double z = _trackedPosition[2] * _realToVirtualScale;
-	double angle = vtkMath::DegreesFromRadians(
-	        2 * atan(0.5 * _screenHeight * _realToVirtualScale / y));
-
-	//double newfocal[3] = {_x + x, _y, _z + z};
-	//double newpos[3] = {_x + x, _y + y, _z + z};
-	//double viewup[3] = {0, 0, 1};
-	SetViewAngle(angle);
-	//SetPosition(newpos);
-	//SetFocalPoint(newfocal);
-	//SetViewUp(viewup);
-	//SetClippingRange(_zNear, _zFar);
-	SetViewShear(x / y, z / y, 1); // see http://www.vtk.org/pipermail/vtkusers/2005-March/078735.html
-
-	emit viewUpdated();
-}
-
-void VtkTrackedCamera::updatedFromOutside()
-{
-	double pos[3], dir[3];
-	GetPosition(pos);
-	GetDirectionOfProjection(dir);
-
-	vtkMath::Normalize(dir);            // Get the view direction
-	dir[0] = dir[0] * _trackedPosition[1]; // Multiplying the view direction
-	dir[1] = dir[1] * _trackedPosition[1]; // with the tracked distance to the
-	dir[2] = dir[2] * _trackedPosition[1]; // display results in the vector
-	_focalPoint[0] = dir[0] + pos[0];   // from the position to the new
-	_focalPoint[1] = dir[1] + pos[1];   // focal point.
-	_focalPoint[2] = dir[2] + pos[2];
-
-	updateView();
-
-	//std::cout << "Camera slot" << std::endl;
-}
diff --git a/Gui/VtkVis/VtkTrackedCamera.h b/Gui/VtkVis/VtkTrackedCamera.h
deleted file mode 100644
index e537c7ffd0d..00000000000
--- a/Gui/VtkVis/VtkTrackedCamera.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/**
- * \file
- * \author Lars Bilke
- * \date   2010-08-25
- * \brief  Definition of the VtkTrackedCamera class.
- *
- * \copyright
- * Copyright (c) 2012-2014, OpenGeoSys Community (http://www.opengeosys.org)
- *            Distributed under a Modified BSD License.
- *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.org/project/license
- *
- */
-
-#ifndef VTKTRACKEDCAMERA_H
-#define VTKTRACKEDCAMERA_H
-
-#include <QObject>
-#include <vtkOpenGLCamera.h>
-
-/// @brief This camera implements view shearing for using with a head tracking
-/// system.
-class VtkTrackedCamera : public QObject, public vtkOpenGLCamera
-{
-	Q_OBJECT
-
-public:
-	/// @brief Constructor.
-	VtkTrackedCamera(QObject* parent);
-
-	/// @brief Destructor
-	virtual ~VtkTrackedCamera();
-
-	/// Sets the scaling from real meters to virtual meters.
-	void setRealToVirtualScale(double scale) { _realToVirtualScale = scale; }
-	double realToVirtualScale () const { return _realToVirtualScale; }
-
-	double trackingOffsetX() const { return _trackedPositionOffset[0]; }
-	double trackingOffsetY() const { return _trackedPositionOffset[1]; }
-	double trackingOffsetZ() const { return _trackedPositionOffset[2]; }
-
-	double screenAspectRatio() const { return _screenAspectRatio; }
-	double screenHeight() const { return _screenHeight; }
-
-public slots:
-	//void setTrackinData(double position[3], double dir[3]);
-	/// @brief Sets the tracked position. The coordinate origin must be the center
-	/// of the projection wall. See also setTrackingOffset().
-	void setTrackingData(double x, double y, double z);
-
-	/// Sets the focal point in world coordinates. This point corresponds to the
-	/// center of the projection wall.
-	void setFocalPoint(double x, double y, double z);
-
-	/// @brief Sets an offset of the tracked position. This must be used to setup
-	/// the origin of the calibrated tracking space.
-	void setTrackingOffset(double x, double y, double z);
-
-	void setTrackingOffsetX(double val) { _trackedPositionOffset[0] = val; }
-	void setTrackingOffsetY(double val) { _trackedPositionOffset[1] = val; }
-	void setTrackingOffsetZ(double val) { _trackedPositionOffset[2] = val; }
-
-	/// Move the camera by the given vector.
-	void translate(double x, double y, double z);
-
-	/// Rotate the camera by the given angles.
-	void rotate(double yaw, double elevation, double roll);
-
-	/// Updates the view.
-	void updateView();
-
-	/// Must be called to update the view after the camera was modified from the
-	/// outside, e.g. from the vtkRenderWindowInteractor.
-	void updatedFromOutside();
-
-	/// @brief Sets the screen properties.
-	/// @param aspectRatio width / height
-	/// @param height The screen height in meter.
-	void setScreenProperties(double aspectRatio, double height)
-	{
-		_screenAspectRatio = aspectRatio;
-		_screenHeight = height;
-	}
-
-	/// @brief Sets the screen aspect ratio (width / height).
-	void setScreenAspectRatio(double ratio) { _screenAspectRatio = ratio;
-		                                  updateView(); }
-
-	/// @brief Sets the screen height in meter.
-	void setScreenHeight(double height) { _screenHeight = height;
-		                              updateView(); }
-
-private:
-	double _focalPoint[3];
-	double _trackedPosition[3];
-	double _trackedPositionOffset[3];
-	double _realToVirtualScale;
-	double _screenAspectRatio;
-	double _screenHeight;
-
-signals:
-	/// Is emitted from updateView().
-	void viewUpdated();
-};
-
-#endif // VTKTRACKEDCAMERA_H
diff --git a/Tests/FileIO/TestXmlGmlReader.cpp b/Tests/FileIO/TestXmlGmlReader.cpp
index 9dfa12496d3..8a8c5db5558 100644
--- a/Tests/FileIO/TestXmlGmlReader.cpp
+++ b/Tests/FileIO/TestXmlGmlReader.cpp
@@ -20,7 +20,7 @@
 // FileIO
 #include "XmlIO/Qt/XmlGmlInterface.h"
 
-#include "Applications/ProjectData.h"
+#include "Applications/ApplicationsLib/ProjectData.h"
 
 // GeoLib
 #include "Polyline.h"
diff --git a/Utils/FileConverter/generateBCFromPolyline.cpp b/Utils/FileConverter/generateBCFromPolyline.cpp
index b4ef4c9d695..51a56351f05 100644
--- a/Utils/FileConverter/generateBCFromPolyline.cpp
+++ b/Utils/FileConverter/generateBCFromPolyline.cpp
@@ -21,7 +21,7 @@
 #include "PolylineVec.h"
 
 // OGS
-#include "Applications/ProjectData.h"
+#include "Applications/ApplicationsLib/ProjectData.h"
 
 // FileIO
 #include "XmlIO/Qt/XmlGmlInterface.h"
diff --git a/Utils/FileConverter/generateBCandGLI.cpp b/Utils/FileConverter/generateBCandGLI.cpp
index 8c266c4027a..e26bd4ac136 100644
--- a/Utils/FileConverter/generateBCandGLI.cpp
+++ b/Utils/FileConverter/generateBCandGLI.cpp
@@ -23,7 +23,7 @@
 #include "GEOObjects.h"
 #include "SurfaceVec.h"
 
-#include "Applications/ProjectData.h"
+#include "Applications/ApplicationsLib/ProjectData.h"
 
 // FileIO
 #include "XmlIO/Qt/XmlGmlInterface.h"
-- 
GitLab