diff --git a/Base/CMakeLists.txt b/Gui/Base/CMakeLists.txt
similarity index 100%
rename from Base/CMakeLists.txt
rename to Gui/Base/CMakeLists.txt
diff --git a/Base/CheckboxDelegate.cpp b/Gui/Base/CheckboxDelegate.cpp
similarity index 100%
rename from Base/CheckboxDelegate.cpp
rename to Gui/Base/CheckboxDelegate.cpp
diff --git a/Base/CheckboxDelegate.h b/Gui/Base/CheckboxDelegate.h
similarity index 100%
rename from Base/CheckboxDelegate.h
rename to Gui/Base/CheckboxDelegate.h
diff --git a/Base/ColorPickerPushButton.cpp b/Gui/Base/ColorPickerPushButton.cpp
similarity index 100%
rename from Base/ColorPickerPushButton.cpp
rename to Gui/Base/ColorPickerPushButton.cpp
diff --git a/Base/ColorPickerPushButton.h b/Gui/Base/ColorPickerPushButton.h
similarity index 100%
rename from Base/ColorPickerPushButton.h
rename to Gui/Base/ColorPickerPushButton.h
diff --git a/Base/OGSError.cpp b/Gui/Base/OGSError.cpp
similarity index 100%
rename from Base/OGSError.cpp
rename to Gui/Base/OGSError.cpp
diff --git a/Base/OGSError.h b/Gui/Base/OGSError.h
similarity index 100%
rename from Base/OGSError.h
rename to Gui/Base/OGSError.h
diff --git a/Base/QNonScalableGraphicsTextItem.cpp b/Gui/Base/QNonScalableGraphicsTextItem.cpp
similarity index 100%
rename from Base/QNonScalableGraphicsTextItem.cpp
rename to Gui/Base/QNonScalableGraphicsTextItem.cpp
diff --git a/Base/QNonScalableGraphicsTextItem.h b/Gui/Base/QNonScalableGraphicsTextItem.h
similarity index 100%
rename from Base/QNonScalableGraphicsTextItem.h
rename to Gui/Base/QNonScalableGraphicsTextItem.h
diff --git a/Base/QValueTooltipSlider.cpp b/Gui/Base/QValueTooltipSlider.cpp
similarity index 100%
rename from Base/QValueTooltipSlider.cpp
rename to Gui/Base/QValueTooltipSlider.cpp
diff --git a/Base/QValueTooltipSlider.h b/Gui/Base/QValueTooltipSlider.h
similarity index 100%
rename from Base/QValueTooltipSlider.h
rename to Gui/Base/QValueTooltipSlider.h
diff --git a/Base/RecentFiles.cpp b/Gui/Base/RecentFiles.cpp
similarity index 100%
rename from Base/RecentFiles.cpp
rename to Gui/Base/RecentFiles.cpp
diff --git a/Base/RecentFiles.h b/Gui/Base/RecentFiles.h
similarity index 100%
rename from Base/RecentFiles.h
rename to Gui/Base/RecentFiles.h
diff --git a/Base/StrictDoubleValidator.h b/Gui/Base/StrictDoubleValidator.h
similarity index 100%
rename from Base/StrictDoubleValidator.h
rename to Gui/Base/StrictDoubleValidator.h
diff --git a/Base/StrictIntValidator.h b/Gui/Base/StrictIntValidator.h
similarity index 100%
rename from Base/StrictIntValidator.h
rename to Gui/Base/StrictIntValidator.h
diff --git a/Base/TreeItem.cpp b/Gui/Base/TreeItem.cpp
similarity index 100%
rename from Base/TreeItem.cpp
rename to Gui/Base/TreeItem.cpp
diff --git a/Base/TreeItem.h b/Gui/Base/TreeItem.h
similarity index 100%
rename from Base/TreeItem.h
rename to Gui/Base/TreeItem.h
diff --git a/Base/TreeModel.cpp b/Gui/Base/TreeModel.cpp
similarity index 100%
rename from Base/TreeModel.cpp
rename to Gui/Base/TreeModel.cpp
diff --git a/Base/TreeModel.h b/Gui/Base/TreeModel.h
similarity index 100%
rename from Base/TreeModel.h
rename to Gui/Base/TreeModel.h
diff --git a/Base/TreeModelIterator.cpp b/Gui/Base/TreeModelIterator.cpp
similarity index 100%
rename from Base/TreeModelIterator.cpp
rename to Gui/Base/TreeModelIterator.cpp
diff --git a/Base/TreeModelIterator.h b/Gui/Base/TreeModelIterator.h
similarity index 100%
rename from Base/TreeModelIterator.h
rename to Gui/Base/TreeModelIterator.h
diff --git a/Base/modeltest.cpp b/Gui/Base/modeltest.cpp
similarity index 100%
rename from Base/modeltest.cpp
rename to Gui/Base/modeltest.cpp
diff --git a/Base/modeltest.h b/Gui/Base/modeltest.h
similarity index 100%
rename from Base/modeltest.h
rename to Gui/Base/modeltest.h
diff --git a/CMakeLists.txt b/Gui/CMakeLists.txt
similarity index 100%
rename from CMakeLists.txt
rename to Gui/CMakeLists.txt
diff --git a/DataExplorer.cmake b/Gui/DataExplorer.cmake
similarity index 100%
rename from DataExplorer.cmake
rename to Gui/DataExplorer.cmake
diff --git a/DataView/BaseItem.h b/Gui/DataView/BaseItem.h
similarity index 100%
rename from DataView/BaseItem.h
rename to Gui/DataView/BaseItem.h
diff --git a/DataView/CMakeLists.txt b/Gui/DataView/CMakeLists.txt
similarity index 100%
rename from DataView/CMakeLists.txt
rename to Gui/DataView/CMakeLists.txt
diff --git a/DataView/ColorTableModel.cpp b/Gui/DataView/ColorTableModel.cpp
similarity index 100%
rename from DataView/ColorTableModel.cpp
rename to Gui/DataView/ColorTableModel.cpp
diff --git a/DataView/ColorTableModel.h b/Gui/DataView/ColorTableModel.h
similarity index 100%
rename from DataView/ColorTableModel.h
rename to Gui/DataView/ColorTableModel.h
diff --git a/DataView/ColorTableView.cpp b/Gui/DataView/ColorTableView.cpp
similarity index 100%
rename from DataView/ColorTableView.cpp
rename to Gui/DataView/ColorTableView.cpp
diff --git a/DataView/ColorTableView.h b/Gui/DataView/ColorTableView.h
similarity index 100%
rename from DataView/ColorTableView.h
rename to Gui/DataView/ColorTableView.h
diff --git a/DataView/CondFromRaster.ui b/Gui/DataView/CondFromRaster.ui
similarity index 100%
rename from DataView/CondFromRaster.ui
rename to Gui/DataView/CondFromRaster.ui
diff --git a/DataView/CondFromRasterDialog.cpp b/Gui/DataView/CondFromRasterDialog.cpp
similarity index 100%
rename from DataView/CondFromRasterDialog.cpp
rename to Gui/DataView/CondFromRasterDialog.cpp
diff --git a/DataView/CondFromRasterDialog.h b/Gui/DataView/CondFromRasterDialog.h
similarity index 100%
rename from DataView/CondFromRasterDialog.h
rename to Gui/DataView/CondFromRasterDialog.h
diff --git a/DataView/CondItem.h b/Gui/DataView/CondItem.h
similarity index 100%
rename from DataView/CondItem.h
rename to Gui/DataView/CondItem.h
diff --git a/DataView/CondObjectListItem.h b/Gui/DataView/CondObjectListItem.h
similarity index 100%
rename from DataView/CondObjectListItem.h
rename to Gui/DataView/CondObjectListItem.h
diff --git a/DataView/ConditionWriter.ui b/Gui/DataView/ConditionWriter.ui
similarity index 100%
rename from DataView/ConditionWriter.ui
rename to Gui/DataView/ConditionWriter.ui
diff --git a/DataView/ConditionWriterDialog.cpp b/Gui/DataView/ConditionWriterDialog.cpp
similarity index 100%
rename from DataView/ConditionWriterDialog.cpp
rename to Gui/DataView/ConditionWriterDialog.cpp
diff --git a/DataView/ConditionWriterDialog.h b/Gui/DataView/ConditionWriterDialog.h
similarity index 100%
rename from DataView/ConditionWriterDialog.h
rename to Gui/DataView/ConditionWriterDialog.h
diff --git a/DataView/DBConnection.ui b/Gui/DataView/DBConnection.ui
similarity index 100%
rename from DataView/DBConnection.ui
rename to Gui/DataView/DBConnection.ui
diff --git a/DataView/DBConnectionDialog.cpp b/Gui/DataView/DBConnectionDialog.cpp
similarity index 100%
rename from DataView/DBConnectionDialog.cpp
rename to Gui/DataView/DBConnectionDialog.cpp
diff --git a/DataView/DBConnectionDialog.h b/Gui/DataView/DBConnectionDialog.h
similarity index 100%
rename from DataView/DBConnectionDialog.h
rename to Gui/DataView/DBConnectionDialog.h
diff --git a/DataView/DataView.cpp b/Gui/DataView/DataView.cpp
similarity index 100%
rename from DataView/DataView.cpp
rename to Gui/DataView/DataView.cpp
diff --git a/DataView/DataView.h b/Gui/DataView/DataView.h
similarity index 100%
rename from DataView/DataView.h
rename to Gui/DataView/DataView.h
diff --git a/DataView/DatabaseConnection.cpp b/Gui/DataView/DatabaseConnection.cpp
similarity index 100%
rename from DataView/DatabaseConnection.cpp
rename to Gui/DataView/DatabaseConnection.cpp
diff --git a/DataView/DatabaseConnection.h b/Gui/DataView/DatabaseConnection.h
similarity index 100%
rename from DataView/DatabaseConnection.h
rename to Gui/DataView/DatabaseConnection.h
diff --git a/DataView/DatabaseResultView.ui b/Gui/DataView/DatabaseResultView.ui
similarity index 100%
rename from DataView/DatabaseResultView.ui
rename to Gui/DataView/DatabaseResultView.ui
diff --git a/DataView/DiagramView/CMakeLists.txt b/Gui/DataView/DiagramView/CMakeLists.txt
similarity index 100%
rename from DataView/DiagramView/CMakeLists.txt
rename to Gui/DataView/DiagramView/CMakeLists.txt
diff --git a/DataView/DiagramView/DetailWindow.cpp b/Gui/DataView/DiagramView/DetailWindow.cpp
similarity index 100%
rename from DataView/DiagramView/DetailWindow.cpp
rename to Gui/DataView/DiagramView/DetailWindow.cpp
diff --git a/DataView/DiagramView/DetailWindow.h b/Gui/DataView/DiagramView/DetailWindow.h
similarity index 100%
rename from DataView/DiagramView/DetailWindow.h
rename to Gui/DataView/DiagramView/DetailWindow.h
diff --git a/DataView/DiagramView/DetailWindow.ui b/Gui/DataView/DiagramView/DetailWindow.ui
similarity index 100%
rename from DataView/DiagramView/DetailWindow.ui
rename to Gui/DataView/DiagramView/DetailWindow.ui
diff --git a/DataView/DiagramView/DiagramList.cpp b/Gui/DataView/DiagramView/DiagramList.cpp
similarity index 100%
rename from DataView/DiagramView/DiagramList.cpp
rename to Gui/DataView/DiagramView/DiagramList.cpp
diff --git a/DataView/DiagramView/DiagramList.h b/Gui/DataView/DiagramView/DiagramList.h
similarity index 100%
rename from DataView/DiagramView/DiagramList.h
rename to Gui/DataView/DiagramView/DiagramList.h
diff --git a/DataView/DiagramView/DiagramPrefs.ui b/Gui/DataView/DiagramView/DiagramPrefs.ui
similarity index 100%
rename from DataView/DiagramView/DiagramPrefs.ui
rename to Gui/DataView/DiagramView/DiagramPrefs.ui
diff --git a/DataView/DiagramView/DiagramPrefsDialog.cpp b/Gui/DataView/DiagramView/DiagramPrefsDialog.cpp
similarity index 100%
rename from DataView/DiagramView/DiagramPrefsDialog.cpp
rename to Gui/DataView/DiagramView/DiagramPrefsDialog.cpp
diff --git a/DataView/DiagramView/DiagramPrefsDialog.h b/Gui/DataView/DiagramView/DiagramPrefsDialog.h
similarity index 100%
rename from DataView/DiagramView/DiagramPrefsDialog.h
rename to Gui/DataView/DiagramView/DiagramPrefsDialog.h
diff --git a/DataView/DiagramView/DiagramScene.cpp b/Gui/DataView/DiagramView/DiagramScene.cpp
similarity index 100%
rename from DataView/DiagramView/DiagramScene.cpp
rename to Gui/DataView/DiagramView/DiagramScene.cpp
diff --git a/DataView/DiagramView/DiagramScene.h b/Gui/DataView/DiagramView/DiagramScene.h
similarity index 100%
rename from DataView/DiagramView/DiagramScene.h
rename to Gui/DataView/DiagramView/DiagramScene.h
diff --git a/DataView/DiagramView/DiagramView.cpp b/Gui/DataView/DiagramView/DiagramView.cpp
similarity index 100%
rename from DataView/DiagramView/DiagramView.cpp
rename to Gui/DataView/DiagramView/DiagramView.cpp
diff --git a/DataView/DiagramView/DiagramView.h b/Gui/DataView/DiagramView/DiagramView.h
similarity index 100%
rename from DataView/DiagramView/DiagramView.h
rename to Gui/DataView/DiagramView/DiagramView.h
diff --git a/DataView/DiagramView/QArrow.cpp b/Gui/DataView/DiagramView/QArrow.cpp
similarity index 100%
rename from DataView/DiagramView/QArrow.cpp
rename to Gui/DataView/DiagramView/QArrow.cpp
diff --git a/DataView/DiagramView/QArrow.h b/Gui/DataView/DiagramView/QArrow.h
similarity index 100%
rename from DataView/DiagramView/QArrow.h
rename to Gui/DataView/DiagramView/QArrow.h
diff --git a/DataView/DiagramView/QGraphicsGrid.cpp b/Gui/DataView/DiagramView/QGraphicsGrid.cpp
similarity index 100%
rename from DataView/DiagramView/QGraphicsGrid.cpp
rename to Gui/DataView/DiagramView/QGraphicsGrid.cpp
diff --git a/DataView/DiagramView/QGraphicsGrid.h b/Gui/DataView/DiagramView/QGraphicsGrid.h
similarity index 100%
rename from DataView/DiagramView/QGraphicsGrid.h
rename to Gui/DataView/DiagramView/QGraphicsGrid.h
diff --git a/DataView/DirectConditionGenerator.cpp b/Gui/DataView/DirectConditionGenerator.cpp
similarity index 100%
rename from DataView/DirectConditionGenerator.cpp
rename to Gui/DataView/DirectConditionGenerator.cpp
diff --git a/DataView/DirectConditionGenerator.h b/Gui/DataView/DirectConditionGenerator.h
similarity index 100%
rename from DataView/DirectConditionGenerator.h
rename to Gui/DataView/DirectConditionGenerator.h
diff --git a/DataView/ElementTreeModel.cpp b/Gui/DataView/ElementTreeModel.cpp
similarity index 100%
rename from DataView/ElementTreeModel.cpp
rename to Gui/DataView/ElementTreeModel.cpp
diff --git a/DataView/ElementTreeModel.h b/Gui/DataView/ElementTreeModel.h
similarity index 100%
rename from DataView/ElementTreeModel.h
rename to Gui/DataView/ElementTreeModel.h
diff --git a/DataView/FEMConditionSetup.ui b/Gui/DataView/FEMConditionSetup.ui
similarity index 100%
rename from DataView/FEMConditionSetup.ui
rename to Gui/DataView/FEMConditionSetup.ui
diff --git a/DataView/FEMConditionSetupDialog.cpp b/Gui/DataView/FEMConditionSetupDialog.cpp
similarity index 100%
rename from DataView/FEMConditionSetupDialog.cpp
rename to Gui/DataView/FEMConditionSetupDialog.cpp
diff --git a/DataView/FEMConditionSetupDialog.h b/Gui/DataView/FEMConditionSetupDialog.h
similarity index 100%
rename from DataView/FEMConditionSetupDialog.h
rename to Gui/DataView/FEMConditionSetupDialog.h
diff --git a/DataView/GEOModels.cpp b/Gui/DataView/GEOModels.cpp
similarity index 100%
rename from DataView/GEOModels.cpp
rename to Gui/DataView/GEOModels.cpp
diff --git a/DataView/GEOModels.h b/Gui/DataView/GEOModels.h
similarity index 100%
rename from DataView/GEOModels.h
rename to Gui/DataView/GEOModels.h
diff --git a/DataView/GMSHPrefs.ui b/Gui/DataView/GMSHPrefs.ui
similarity index 100%
rename from DataView/GMSHPrefs.ui
rename to Gui/DataView/GMSHPrefs.ui
diff --git a/DataView/GMSHPrefsDialog.cpp b/Gui/DataView/GMSHPrefsDialog.cpp
similarity index 100%
rename from DataView/GMSHPrefsDialog.cpp
rename to Gui/DataView/GMSHPrefsDialog.cpp
diff --git a/DataView/GMSHPrefsDialog.h b/Gui/DataView/GMSHPrefsDialog.h
similarity index 100%
rename from DataView/GMSHPrefsDialog.h
rename to Gui/DataView/GMSHPrefsDialog.h
diff --git a/DataView/GeoObjectListItem.h b/Gui/DataView/GeoObjectListItem.h
similarity index 100%
rename from DataView/GeoObjectListItem.h
rename to Gui/DataView/GeoObjectListItem.h
diff --git a/DataView/GeoTabWidget.cpp b/Gui/DataView/GeoTabWidget.cpp
similarity index 100%
rename from DataView/GeoTabWidget.cpp
rename to Gui/DataView/GeoTabWidget.cpp
diff --git a/DataView/GeoTabWidget.h b/Gui/DataView/GeoTabWidget.h
similarity index 100%
rename from DataView/GeoTabWidget.h
rename to Gui/DataView/GeoTabWidget.h
diff --git a/DataView/GeoTabWidgetBase.ui b/Gui/DataView/GeoTabWidgetBase.ui
similarity index 100%
rename from DataView/GeoTabWidgetBase.ui
rename to Gui/DataView/GeoTabWidgetBase.ui
diff --git a/DataView/GeoTreeItem.h b/Gui/DataView/GeoTreeItem.h
similarity index 100%
rename from DataView/GeoTreeItem.h
rename to Gui/DataView/GeoTreeItem.h
diff --git a/DataView/GeoTreeModel.cpp b/Gui/DataView/GeoTreeModel.cpp
similarity index 100%
rename from DataView/GeoTreeModel.cpp
rename to Gui/DataView/GeoTreeModel.cpp
diff --git a/DataView/GeoTreeModel.h b/Gui/DataView/GeoTreeModel.h
similarity index 100%
rename from DataView/GeoTreeModel.h
rename to Gui/DataView/GeoTreeModel.h
diff --git a/DataView/GeoTreeView.cpp b/Gui/DataView/GeoTreeView.cpp
similarity index 100%
rename from DataView/GeoTreeView.cpp
rename to Gui/DataView/GeoTreeView.cpp
diff --git a/DataView/GeoTreeView.h b/Gui/DataView/GeoTreeView.h
similarity index 100%
rename from DataView/GeoTreeView.h
rename to Gui/DataView/GeoTreeView.h
diff --git a/DataView/LineEdit.ui b/Gui/DataView/LineEdit.ui
similarity index 100%
rename from DataView/LineEdit.ui
rename to Gui/DataView/LineEdit.ui
diff --git a/DataView/LineEditDialog.cpp b/Gui/DataView/LineEditDialog.cpp
similarity index 100%
rename from DataView/LineEditDialog.cpp
rename to Gui/DataView/LineEditDialog.cpp
diff --git a/DataView/LineEditDialog.h b/Gui/DataView/LineEditDialog.h
similarity index 100%
rename from DataView/LineEditDialog.h
rename to Gui/DataView/LineEditDialog.h
diff --git a/DataView/LinearEdit.ui b/Gui/DataView/LinearEdit.ui
similarity index 100%
rename from DataView/LinearEdit.ui
rename to Gui/DataView/LinearEdit.ui
diff --git a/DataView/LinearEditDialog.cpp b/Gui/DataView/LinearEditDialog.cpp
similarity index 100%
rename from DataView/LinearEditDialog.cpp
rename to Gui/DataView/LinearEditDialog.cpp
diff --git a/DataView/LinearEditDialog.h b/Gui/DataView/LinearEditDialog.h
similarity index 100%
rename from DataView/LinearEditDialog.h
rename to Gui/DataView/LinearEditDialog.h
diff --git a/DataView/ListPropertiesDialog.cpp b/Gui/DataView/ListPropertiesDialog.cpp
similarity index 100%
rename from DataView/ListPropertiesDialog.cpp
rename to Gui/DataView/ListPropertiesDialog.cpp
diff --git a/DataView/ListPropertiesDialog.h b/Gui/DataView/ListPropertiesDialog.h
similarity index 100%
rename from DataView/ListPropertiesDialog.h
rename to Gui/DataView/ListPropertiesDialog.h
diff --git a/DataView/ModelTreeItem.cpp b/Gui/DataView/ModelTreeItem.cpp
similarity index 100%
rename from DataView/ModelTreeItem.cpp
rename to Gui/DataView/ModelTreeItem.cpp
diff --git a/DataView/ModelTreeItem.h b/Gui/DataView/ModelTreeItem.h
similarity index 100%
rename from DataView/ModelTreeItem.h
rename to Gui/DataView/ModelTreeItem.h
diff --git a/DataView/ModellingTabWidget.cpp b/Gui/DataView/ModellingTabWidget.cpp
similarity index 100%
rename from DataView/ModellingTabWidget.cpp
rename to Gui/DataView/ModellingTabWidget.cpp
diff --git a/DataView/ModellingTabWidget.h b/Gui/DataView/ModellingTabWidget.h
similarity index 100%
rename from DataView/ModellingTabWidget.h
rename to Gui/DataView/ModellingTabWidget.h
diff --git a/DataView/ModellingTabWidgetBase.ui b/Gui/DataView/ModellingTabWidgetBase.ui
similarity index 100%
rename from DataView/ModellingTabWidgetBase.ui
rename to Gui/DataView/ModellingTabWidgetBase.ui
diff --git a/DataView/MshEdit.ui b/Gui/DataView/MshEdit.ui
similarity index 100%
rename from DataView/MshEdit.ui
rename to Gui/DataView/MshEdit.ui
diff --git a/DataView/MshEditDialog.cpp b/Gui/DataView/MshEditDialog.cpp
similarity index 100%
rename from DataView/MshEditDialog.cpp
rename to Gui/DataView/MshEditDialog.cpp
diff --git a/DataView/MshEditDialog.h b/Gui/DataView/MshEditDialog.h
similarity index 100%
rename from DataView/MshEditDialog.h
rename to Gui/DataView/MshEditDialog.h
diff --git a/DataView/MshItem.cpp b/Gui/DataView/MshItem.cpp
similarity index 100%
rename from DataView/MshItem.cpp
rename to Gui/DataView/MshItem.cpp
diff --git a/DataView/MshItem.h b/Gui/DataView/MshItem.h
similarity index 100%
rename from DataView/MshItem.h
rename to Gui/DataView/MshItem.h
diff --git a/DataView/MshLayerMapper.cpp b/Gui/DataView/MshLayerMapper.cpp
similarity index 100%
rename from DataView/MshLayerMapper.cpp
rename to Gui/DataView/MshLayerMapper.cpp
diff --git a/DataView/MshLayerMapper.h b/Gui/DataView/MshLayerMapper.h
similarity index 100%
rename from DataView/MshLayerMapper.h
rename to Gui/DataView/MshLayerMapper.h
diff --git a/DataView/MshModel.cpp b/Gui/DataView/MshModel.cpp
similarity index 100%
rename from DataView/MshModel.cpp
rename to Gui/DataView/MshModel.cpp
diff --git a/DataView/MshModel.h b/Gui/DataView/MshModel.h
similarity index 100%
rename from DataView/MshModel.h
rename to Gui/DataView/MshModel.h
diff --git a/DataView/MshQualitySelection.ui b/Gui/DataView/MshQualitySelection.ui
similarity index 100%
rename from DataView/MshQualitySelection.ui
rename to Gui/DataView/MshQualitySelection.ui
diff --git a/DataView/MshQualitySelectionDialog.cpp b/Gui/DataView/MshQualitySelectionDialog.cpp
similarity index 100%
rename from DataView/MshQualitySelectionDialog.cpp
rename to Gui/DataView/MshQualitySelectionDialog.cpp
diff --git a/DataView/MshQualitySelectionDialog.h b/Gui/DataView/MshQualitySelectionDialog.h
similarity index 100%
rename from DataView/MshQualitySelectionDialog.h
rename to Gui/DataView/MshQualitySelectionDialog.h
diff --git a/DataView/MshTabWidget.cpp b/Gui/DataView/MshTabWidget.cpp
similarity index 100%
rename from DataView/MshTabWidget.cpp
rename to Gui/DataView/MshTabWidget.cpp
diff --git a/DataView/MshTabWidget.h b/Gui/DataView/MshTabWidget.h
similarity index 100%
rename from DataView/MshTabWidget.h
rename to Gui/DataView/MshTabWidget.h
diff --git a/DataView/MshTabWidgetBase.ui b/Gui/DataView/MshTabWidgetBase.ui
similarity index 100%
rename from DataView/MshTabWidgetBase.ui
rename to Gui/DataView/MshTabWidgetBase.ui
diff --git a/DataView/NetCdfConfigure.ui b/Gui/DataView/NetCdfConfigure.ui
similarity index 100%
rename from DataView/NetCdfConfigure.ui
rename to Gui/DataView/NetCdfConfigure.ui
diff --git a/DataView/NetCdfConfigureDialog.cpp b/Gui/DataView/NetCdfConfigureDialog.cpp
similarity index 100%
rename from DataView/NetCdfConfigureDialog.cpp
rename to Gui/DataView/NetCdfConfigureDialog.cpp
diff --git a/DataView/NetCdfConfigureDialog.h b/Gui/DataView/NetCdfConfigureDialog.h
similarity index 100%
rename from DataView/NetCdfConfigureDialog.h
rename to Gui/DataView/NetCdfConfigureDialog.h
diff --git a/DataView/NewProcess.ui b/Gui/DataView/NewProcess.ui
similarity index 100%
rename from DataView/NewProcess.ui
rename to Gui/DataView/NewProcess.ui
diff --git a/DataView/NewProcessDialog.cpp b/Gui/DataView/NewProcessDialog.cpp
similarity index 100%
rename from DataView/NewProcessDialog.cpp
rename to Gui/DataView/NewProcessDialog.cpp
diff --git a/DataView/NewProcessDialog.h b/Gui/DataView/NewProcessDialog.h
similarity index 100%
rename from DataView/NewProcessDialog.h
rename to Gui/DataView/NewProcessDialog.h
diff --git a/DataView/ProcessItem.h b/Gui/DataView/ProcessItem.h
similarity index 100%
rename from DataView/ProcessItem.h
rename to Gui/DataView/ProcessItem.h
diff --git a/DataView/ProcessModel.cpp b/Gui/DataView/ProcessModel.cpp
similarity index 100%
rename from DataView/ProcessModel.cpp
rename to Gui/DataView/ProcessModel.cpp
diff --git a/DataView/ProcessModel.h b/Gui/DataView/ProcessModel.h
similarity index 100%
rename from DataView/ProcessModel.h
rename to Gui/DataView/ProcessModel.h
diff --git a/DataView/ProcessView.cpp b/Gui/DataView/ProcessView.cpp
similarity index 100%
rename from DataView/ProcessView.cpp
rename to Gui/DataView/ProcessView.cpp
diff --git a/DataView/ProcessView.h b/Gui/DataView/ProcessView.h
similarity index 100%
rename from DataView/ProcessView.h
rename to Gui/DataView/ProcessView.h
diff --git a/DataView/QueryResultsDialog.cpp b/Gui/DataView/QueryResultsDialog.cpp
similarity index 100%
rename from DataView/QueryResultsDialog.cpp
rename to Gui/DataView/QueryResultsDialog.cpp
diff --git a/DataView/QueryResultsDialog.h b/Gui/DataView/QueryResultsDialog.h
similarity index 100%
rename from DataView/QueryResultsDialog.h
rename to Gui/DataView/QueryResultsDialog.h
diff --git a/DataView/SHPImportDialog.cpp b/Gui/DataView/SHPImportDialog.cpp
similarity index 100%
rename from DataView/SHPImportDialog.cpp
rename to Gui/DataView/SHPImportDialog.cpp
diff --git a/DataView/SHPImportDialog.h b/Gui/DataView/SHPImportDialog.h
similarity index 100%
rename from DataView/SHPImportDialog.h
rename to Gui/DataView/SHPImportDialog.h
diff --git a/DataView/SelectMeshDialog.cpp b/Gui/DataView/SelectMeshDialog.cpp
similarity index 100%
rename from DataView/SelectMeshDialog.cpp
rename to Gui/DataView/SelectMeshDialog.cpp
diff --git a/DataView/SelectMeshDialog.h b/Gui/DataView/SelectMeshDialog.h
similarity index 100%
rename from DataView/SelectMeshDialog.h
rename to Gui/DataView/SelectMeshDialog.h
diff --git a/DataView/SetNameDialog.cpp b/Gui/DataView/SetNameDialog.cpp
similarity index 100%
rename from DataView/SetNameDialog.cpp
rename to Gui/DataView/SetNameDialog.cpp
diff --git a/DataView/SetNameDialog.h b/Gui/DataView/SetNameDialog.h
similarity index 100%
rename from DataView/SetNameDialog.h
rename to Gui/DataView/SetNameDialog.h
diff --git a/DataView/StationTabWidget.cpp b/Gui/DataView/StationTabWidget.cpp
similarity index 100%
rename from DataView/StationTabWidget.cpp
rename to Gui/DataView/StationTabWidget.cpp
diff --git a/DataView/StationTabWidget.h b/Gui/DataView/StationTabWidget.h
similarity index 100%
rename from DataView/StationTabWidget.h
rename to Gui/DataView/StationTabWidget.h
diff --git a/DataView/StationTabWidgetBase.ui b/Gui/DataView/StationTabWidgetBase.ui
similarity index 100%
rename from DataView/StationTabWidgetBase.ui
rename to Gui/DataView/StationTabWidgetBase.ui
diff --git a/DataView/StationTreeModel.cpp b/Gui/DataView/StationTreeModel.cpp
similarity index 100%
rename from DataView/StationTreeModel.cpp
rename to Gui/DataView/StationTreeModel.cpp
diff --git a/DataView/StationTreeModel.h b/Gui/DataView/StationTreeModel.h
similarity index 100%
rename from DataView/StationTreeModel.h
rename to Gui/DataView/StationTreeModel.h
diff --git a/DataView/StationTreeView.cpp b/Gui/DataView/StationTreeView.cpp
similarity index 100%
rename from DataView/StationTreeView.cpp
rename to Gui/DataView/StationTreeView.cpp
diff --git a/DataView/StationTreeView.h b/Gui/DataView/StationTreeView.h
similarity index 100%
rename from DataView/StationTreeView.h
rename to Gui/DataView/StationTreeView.h
diff --git a/DataView/StratView/CMakeLists.txt b/Gui/DataView/StratView/CMakeLists.txt
similarity index 100%
rename from DataView/StratView/CMakeLists.txt
rename to Gui/DataView/StratView/CMakeLists.txt
diff --git a/DataView/StratView/StratBar.cpp b/Gui/DataView/StratView/StratBar.cpp
similarity index 100%
rename from DataView/StratView/StratBar.cpp
rename to Gui/DataView/StratView/StratBar.cpp
diff --git a/DataView/StratView/StratBar.h b/Gui/DataView/StratView/StratBar.h
similarity index 100%
rename from DataView/StratView/StratBar.h
rename to Gui/DataView/StratView/StratBar.h
diff --git a/DataView/StratView/StratScene.cpp b/Gui/DataView/StratView/StratScene.cpp
similarity index 100%
rename from DataView/StratView/StratScene.cpp
rename to Gui/DataView/StratView/StratScene.cpp
diff --git a/DataView/StratView/StratScene.h b/Gui/DataView/StratView/StratScene.h
similarity index 100%
rename from DataView/StratView/StratScene.h
rename to Gui/DataView/StratView/StratScene.h
diff --git a/DataView/StratView/StratView.cpp b/Gui/DataView/StratView/StratView.cpp
similarity index 100%
rename from DataView/StratView/StratView.cpp
rename to Gui/DataView/StratView/StratView.cpp
diff --git a/DataView/StratView/StratView.h b/Gui/DataView/StratView/StratView.h
similarity index 100%
rename from DataView/StratView/StratView.h
rename to Gui/DataView/StratView/StratView.h
diff --git a/DataView/StratView/StratWindow.cpp b/Gui/DataView/StratView/StratWindow.cpp
similarity index 100%
rename from DataView/StratView/StratWindow.cpp
rename to Gui/DataView/StratView/StratWindow.cpp
diff --git a/DataView/StratView/StratWindow.h b/Gui/DataView/StratView/StratWindow.h
similarity index 100%
rename from DataView/StratView/StratWindow.h
rename to Gui/DataView/StratView/StratWindow.h
diff --git a/DataView/StratView/StratWindow.ui b/Gui/DataView/StratView/StratWindow.ui
similarity index 100%
rename from DataView/StratView/StratWindow.ui
rename to Gui/DataView/StratView/StratWindow.ui
diff --git a/DataView/ncvalues.h b/Gui/DataView/ncvalues.h
similarity index 100%
rename from DataView/ncvalues.h
rename to Gui/DataView/ncvalues.h
diff --git a/OpenSG/CMakeLists.txt b/Gui/OpenSG/CMakeLists.txt
similarity index 100%
rename from OpenSG/CMakeLists.txt
rename to Gui/OpenSG/CMakeLists.txt
diff --git a/OpenSG/vtkOsgConverter.cpp b/Gui/OpenSG/vtkOsgConverter.cpp
similarity index 100%
rename from OpenSG/vtkOsgConverter.cpp
rename to Gui/OpenSG/vtkOsgConverter.cpp
diff --git a/OpenSG/vtkOsgConverter.h b/Gui/OpenSG/vtkOsgConverter.h
similarity index 100%
rename from OpenSG/vtkOsgConverter.h
rename to Gui/OpenSG/vtkOsgConverter.h
diff --git a/Vrpn/CMakeLists.txt b/Gui/Vrpn/CMakeLists.txt
similarity index 100%
rename from Vrpn/CMakeLists.txt
rename to Gui/Vrpn/CMakeLists.txt
diff --git a/Vrpn/QSpaceNavigatorClient.cpp b/Gui/Vrpn/QSpaceNavigatorClient.cpp
similarity index 100%
rename from Vrpn/QSpaceNavigatorClient.cpp
rename to Gui/Vrpn/QSpaceNavigatorClient.cpp
diff --git a/Vrpn/QSpaceNavigatorClient.h b/Gui/Vrpn/QSpaceNavigatorClient.h
similarity index 100%
rename from Vrpn/QSpaceNavigatorClient.h
rename to Gui/Vrpn/QSpaceNavigatorClient.h
diff --git a/Vrpn/QVrpnArtTrackingClient.cpp b/Gui/Vrpn/QVrpnArtTrackingClient.cpp
similarity index 100%
rename from Vrpn/QVrpnArtTrackingClient.cpp
rename to Gui/Vrpn/QVrpnArtTrackingClient.cpp
diff --git a/Vrpn/QVrpnArtTrackingClient.h b/Gui/Vrpn/QVrpnArtTrackingClient.h
similarity index 100%
rename from Vrpn/QVrpnArtTrackingClient.h
rename to Gui/Vrpn/QVrpnArtTrackingClient.h
diff --git a/Vrpn/SpaceNavigatorClient.cpp b/Gui/Vrpn/SpaceNavigatorClient.cpp
similarity index 100%
rename from Vrpn/SpaceNavigatorClient.cpp
rename to Gui/Vrpn/SpaceNavigatorClient.cpp
diff --git a/Vrpn/SpaceNavigatorClient.h b/Gui/Vrpn/SpaceNavigatorClient.h
similarity index 100%
rename from Vrpn/SpaceNavigatorClient.h
rename to Gui/Vrpn/SpaceNavigatorClient.h
diff --git a/Vrpn/TrackingSettingsWidget.cpp b/Gui/Vrpn/TrackingSettingsWidget.cpp
similarity index 100%
rename from Vrpn/TrackingSettingsWidget.cpp
rename to Gui/Vrpn/TrackingSettingsWidget.cpp
diff --git a/Vrpn/TrackingSettingsWidget.h b/Gui/Vrpn/TrackingSettingsWidget.h
similarity index 100%
rename from Vrpn/TrackingSettingsWidget.h
rename to Gui/Vrpn/TrackingSettingsWidget.h
diff --git a/Vrpn/TrackingSettingsWidgetBase.ui b/Gui/Vrpn/TrackingSettingsWidgetBase.ui
similarity index 100%
rename from Vrpn/TrackingSettingsWidgetBase.ui
rename to Gui/Vrpn/TrackingSettingsWidgetBase.ui
diff --git a/Vrpn/VrpnArtTrackingClient.cpp b/Gui/Vrpn/VrpnArtTrackingClient.cpp
similarity index 100%
rename from Vrpn/VrpnArtTrackingClient.cpp
rename to Gui/Vrpn/VrpnArtTrackingClient.cpp
diff --git a/Vrpn/VrpnArtTrackingClient.h b/Gui/Vrpn/VrpnArtTrackingClient.h
similarity index 100%
rename from Vrpn/VrpnArtTrackingClient.h
rename to Gui/Vrpn/VrpnArtTrackingClient.h
diff --git a/Vrpn/VrpnClient.cpp b/Gui/Vrpn/VrpnClient.cpp
similarity index 100%
rename from Vrpn/VrpnClient.cpp
rename to Gui/Vrpn/VrpnClient.cpp
diff --git a/Vrpn/VrpnClient.h b/Gui/Vrpn/VrpnClient.h
similarity index 100%
rename from Vrpn/VrpnClient.h
rename to Gui/Vrpn/VrpnClient.h
diff --git a/VtkAct/CMakeLists.txt b/Gui/VtkAct/CMakeLists.txt
similarity index 100%
rename from VtkAct/CMakeLists.txt
rename to Gui/VtkAct/CMakeLists.txt
diff --git a/VtkAct/VtkCustomInteractorStyle.cpp b/Gui/VtkAct/VtkCustomInteractorStyle.cpp
similarity index 100%
rename from VtkAct/VtkCustomInteractorStyle.cpp
rename to Gui/VtkAct/VtkCustomInteractorStyle.cpp
diff --git a/VtkAct/VtkCustomInteractorStyle.h b/Gui/VtkAct/VtkCustomInteractorStyle.h
similarity index 100%
rename from VtkAct/VtkCustomInteractorStyle.h
rename to Gui/VtkAct/VtkCustomInteractorStyle.h
diff --git a/VtkAct/VtkPickCallback.cpp b/Gui/VtkAct/VtkPickCallback.cpp
similarity index 100%
rename from VtkAct/VtkPickCallback.cpp
rename to Gui/VtkAct/VtkPickCallback.cpp
diff --git a/VtkAct/VtkPickCallback.h b/Gui/VtkAct/VtkPickCallback.h
similarity index 100%
rename from VtkAct/VtkPickCallback.h
rename to Gui/VtkAct/VtkPickCallback.h
diff --git a/VtkVis/CMakeLists.txt b/Gui/VtkVis/CMakeLists.txt
similarity index 100%
rename from VtkVis/CMakeLists.txt
rename to Gui/VtkVis/CMakeLists.txt
diff --git a/VtkVis/MeshFromRaster.ui b/Gui/VtkVis/MeshFromRaster.ui
similarity index 100%
rename from VtkVis/MeshFromRaster.ui
rename to Gui/VtkVis/MeshFromRaster.ui
diff --git a/VtkVis/MeshFromRasterDialog.cpp b/Gui/VtkVis/MeshFromRasterDialog.cpp
similarity index 100%
rename from VtkVis/MeshFromRasterDialog.cpp
rename to Gui/VtkVis/MeshFromRasterDialog.cpp
diff --git a/VtkVis/MeshFromRasterDialog.h b/Gui/VtkVis/MeshFromRasterDialog.h
similarity index 100%
rename from VtkVis/MeshFromRasterDialog.h
rename to Gui/VtkVis/MeshFromRasterDialog.h
diff --git a/VtkVis/OGSFilterInfo.h b/Gui/VtkVis/OGSFilterInfo.h
similarity index 100%
rename from VtkVis/OGSFilterInfo.h
rename to Gui/VtkVis/OGSFilterInfo.h
diff --git a/VtkVis/QVtkDataSetMapper.cpp b/Gui/VtkVis/QVtkDataSetMapper.cpp
similarity index 100%
rename from VtkVis/QVtkDataSetMapper.cpp
rename to Gui/VtkVis/QVtkDataSetMapper.cpp
diff --git a/VtkVis/QVtkDataSetMapper.h b/Gui/VtkVis/QVtkDataSetMapper.h
similarity index 100%
rename from VtkVis/QVtkDataSetMapper.h
rename to Gui/VtkVis/QVtkDataSetMapper.h
diff --git a/VtkVis/VisPrefs.ui b/Gui/VtkVis/VisPrefs.ui
similarity index 100%
rename from VtkVis/VisPrefs.ui
rename to Gui/VtkVis/VisPrefs.ui
diff --git a/VtkVis/VisPrefsDialog.cpp b/Gui/VtkVis/VisPrefsDialog.cpp
similarity index 100%
rename from VtkVis/VisPrefsDialog.cpp
rename to Gui/VtkVis/VisPrefsDialog.cpp
diff --git a/VtkVis/VisPrefsDialog.h b/Gui/VtkVis/VisPrefsDialog.h
similarity index 100%
rename from VtkVis/VisPrefsDialog.h
rename to Gui/VtkVis/VisPrefsDialog.h
diff --git a/VtkVis/VisualizationWidget.cpp b/Gui/VtkVis/VisualizationWidget.cpp
similarity index 100%
rename from VtkVis/VisualizationWidget.cpp
rename to Gui/VtkVis/VisualizationWidget.cpp
diff --git a/VtkVis/VisualizationWidget.h b/Gui/VtkVis/VisualizationWidget.h
similarity index 100%
rename from VtkVis/VisualizationWidget.h
rename to Gui/VtkVis/VisualizationWidget.h
diff --git a/VtkVis/VisualizationWidgetBase.ui b/Gui/VtkVis/VisualizationWidgetBase.ui
similarity index 100%
rename from VtkVis/VisualizationWidgetBase.ui
rename to Gui/VtkVis/VisualizationWidgetBase.ui
diff --git a/VtkVis/VtkAddFilterDialog.cpp b/Gui/VtkVis/VtkAddFilterDialog.cpp
similarity index 100%
rename from VtkVis/VtkAddFilterDialog.cpp
rename to Gui/VtkVis/VtkAddFilterDialog.cpp
diff --git a/VtkVis/VtkAddFilterDialog.h b/Gui/VtkVis/VtkAddFilterDialog.h
similarity index 100%
rename from VtkVis/VtkAddFilterDialog.h
rename to Gui/VtkVis/VtkAddFilterDialog.h
diff --git a/VtkVis/VtkAddFilterDialogBase.ui b/Gui/VtkVis/VtkAddFilterDialogBase.ui
similarity index 100%
rename from VtkVis/VtkAddFilterDialogBase.ui
rename to Gui/VtkVis/VtkAddFilterDialogBase.ui
diff --git a/VtkVis/VtkAlgorithmProperties.cpp b/Gui/VtkVis/VtkAlgorithmProperties.cpp
similarity index 100%
rename from VtkVis/VtkAlgorithmProperties.cpp
rename to Gui/VtkVis/VtkAlgorithmProperties.cpp
diff --git a/VtkVis/VtkAlgorithmProperties.h b/Gui/VtkVis/VtkAlgorithmProperties.h
similarity index 100%
rename from VtkVis/VtkAlgorithmProperties.h
rename to Gui/VtkVis/VtkAlgorithmProperties.h
diff --git a/VtkVis/VtkAlgorithmPropertyCheckbox.cpp b/Gui/VtkVis/VtkAlgorithmPropertyCheckbox.cpp
similarity index 100%
rename from VtkVis/VtkAlgorithmPropertyCheckbox.cpp
rename to Gui/VtkVis/VtkAlgorithmPropertyCheckbox.cpp
diff --git a/VtkVis/VtkAlgorithmPropertyCheckbox.h b/Gui/VtkVis/VtkAlgorithmPropertyCheckbox.h
similarity index 100%
rename from VtkVis/VtkAlgorithmPropertyCheckbox.h
rename to Gui/VtkVis/VtkAlgorithmPropertyCheckbox.h
diff --git a/VtkVis/VtkAlgorithmPropertyLineEdit.cpp b/Gui/VtkVis/VtkAlgorithmPropertyLineEdit.cpp
similarity index 100%
rename from VtkVis/VtkAlgorithmPropertyLineEdit.cpp
rename to Gui/VtkVis/VtkAlgorithmPropertyLineEdit.cpp
diff --git a/VtkVis/VtkAlgorithmPropertyLineEdit.h b/Gui/VtkVis/VtkAlgorithmPropertyLineEdit.h
similarity index 100%
rename from VtkVis/VtkAlgorithmPropertyLineEdit.h
rename to Gui/VtkVis/VtkAlgorithmPropertyLineEdit.h
diff --git a/VtkVis/VtkAlgorithmPropertyVectorEdit.cpp b/Gui/VtkVis/VtkAlgorithmPropertyVectorEdit.cpp
similarity index 100%
rename from VtkVis/VtkAlgorithmPropertyVectorEdit.cpp
rename to Gui/VtkVis/VtkAlgorithmPropertyVectorEdit.cpp
diff --git a/VtkVis/VtkAlgorithmPropertyVectorEdit.h b/Gui/VtkVis/VtkAlgorithmPropertyVectorEdit.h
similarity index 100%
rename from VtkVis/VtkAlgorithmPropertyVectorEdit.h
rename to Gui/VtkVis/VtkAlgorithmPropertyVectorEdit.h
diff --git a/VtkVis/VtkBGImageSource.cpp b/Gui/VtkVis/VtkBGImageSource.cpp
similarity index 100%
rename from VtkVis/VtkBGImageSource.cpp
rename to Gui/VtkVis/VtkBGImageSource.cpp
diff --git a/VtkVis/VtkBGImageSource.h b/Gui/VtkVis/VtkBGImageSource.h
similarity index 100%
rename from VtkVis/VtkBGImageSource.h
rename to Gui/VtkVis/VtkBGImageSource.h
diff --git a/VtkVis/VtkColorByHeightFilter.cpp b/Gui/VtkVis/VtkColorByHeightFilter.cpp
similarity index 100%
rename from VtkVis/VtkColorByHeightFilter.cpp
rename to Gui/VtkVis/VtkColorByHeightFilter.cpp
diff --git a/VtkVis/VtkColorByHeightFilter.h b/Gui/VtkVis/VtkColorByHeightFilter.h
similarity index 100%
rename from VtkVis/VtkColorByHeightFilter.h
rename to Gui/VtkVis/VtkColorByHeightFilter.h
diff --git a/VtkVis/VtkColorLookupTable.cpp b/Gui/VtkVis/VtkColorLookupTable.cpp
similarity index 100%
rename from VtkVis/VtkColorLookupTable.cpp
rename to Gui/VtkVis/VtkColorLookupTable.cpp
diff --git a/VtkVis/VtkColorLookupTable.h b/Gui/VtkVis/VtkColorLookupTable.h
similarity index 100%
rename from VtkVis/VtkColorLookupTable.h
rename to Gui/VtkVis/VtkColorLookupTable.h
diff --git a/VtkVis/VtkCompositeColorByHeightFilter.cpp b/Gui/VtkVis/VtkCompositeColorByHeightFilter.cpp
similarity index 100%
rename from VtkVis/VtkCompositeColorByHeightFilter.cpp
rename to Gui/VtkVis/VtkCompositeColorByHeightFilter.cpp
diff --git a/VtkVis/VtkCompositeColorByHeightFilter.h b/Gui/VtkVis/VtkCompositeColorByHeightFilter.h
similarity index 100%
rename from VtkVis/VtkCompositeColorByHeightFilter.h
rename to Gui/VtkVis/VtkCompositeColorByHeightFilter.h
diff --git a/VtkVis/VtkCompositeColormapToImageFilter.cpp b/Gui/VtkVis/VtkCompositeColormapToImageFilter.cpp
similarity index 100%
rename from VtkVis/VtkCompositeColormapToImageFilter.cpp
rename to Gui/VtkVis/VtkCompositeColormapToImageFilter.cpp
diff --git a/VtkVis/VtkCompositeColormapToImageFilter.h b/Gui/VtkVis/VtkCompositeColormapToImageFilter.h
similarity index 100%
rename from VtkVis/VtkCompositeColormapToImageFilter.h
rename to Gui/VtkVis/VtkCompositeColormapToImageFilter.h
diff --git a/VtkVis/VtkCompositeContourFilter.cpp b/Gui/VtkVis/VtkCompositeContourFilter.cpp
similarity index 100%
rename from VtkVis/VtkCompositeContourFilter.cpp
rename to Gui/VtkVis/VtkCompositeContourFilter.cpp
diff --git a/VtkVis/VtkCompositeContourFilter.h b/Gui/VtkVis/VtkCompositeContourFilter.h
similarity index 100%
rename from VtkVis/VtkCompositeContourFilter.h
rename to Gui/VtkVis/VtkCompositeContourFilter.h
diff --git a/VtkVis/VtkCompositeFilter.cpp b/Gui/VtkVis/VtkCompositeFilter.cpp
similarity index 100%
rename from VtkVis/VtkCompositeFilter.cpp
rename to Gui/VtkVis/VtkCompositeFilter.cpp
diff --git a/VtkVis/VtkCompositeFilter.h b/Gui/VtkVis/VtkCompositeFilter.h
similarity index 100%
rename from VtkVis/VtkCompositeFilter.h
rename to Gui/VtkVis/VtkCompositeFilter.h
diff --git a/VtkVis/VtkCompositeGeoObjectFilter.cpp b/Gui/VtkVis/VtkCompositeGeoObjectFilter.cpp
similarity index 100%
rename from VtkVis/VtkCompositeGeoObjectFilter.cpp
rename to Gui/VtkVis/VtkCompositeGeoObjectFilter.cpp
diff --git a/VtkVis/VtkCompositeGeoObjectFilter.h b/Gui/VtkVis/VtkCompositeGeoObjectFilter.h
similarity index 100%
rename from VtkVis/VtkCompositeGeoObjectFilter.h
rename to Gui/VtkVis/VtkCompositeGeoObjectFilter.h
diff --git a/VtkVis/VtkCompositeImageToCylindersFilter.cpp b/Gui/VtkVis/VtkCompositeImageToCylindersFilter.cpp
similarity index 100%
rename from VtkVis/VtkCompositeImageToCylindersFilter.cpp
rename to Gui/VtkVis/VtkCompositeImageToCylindersFilter.cpp
diff --git a/VtkVis/VtkCompositeImageToCylindersFilter.h b/Gui/VtkVis/VtkCompositeImageToCylindersFilter.h
similarity index 100%
rename from VtkVis/VtkCompositeImageToCylindersFilter.h
rename to Gui/VtkVis/VtkCompositeImageToCylindersFilter.h
diff --git a/VtkVis/VtkCompositeLineToTubeFilter.cpp b/Gui/VtkVis/VtkCompositeLineToTubeFilter.cpp
similarity index 100%
rename from VtkVis/VtkCompositeLineToTubeFilter.cpp
rename to Gui/VtkVis/VtkCompositeLineToTubeFilter.cpp
diff --git a/VtkVis/VtkCompositeLineToTubeFilter.h b/Gui/VtkVis/VtkCompositeLineToTubeFilter.h
similarity index 100%
rename from VtkVis/VtkCompositeLineToTubeFilter.h
rename to Gui/VtkVis/VtkCompositeLineToTubeFilter.h
diff --git a/VtkVis/VtkCompositePointToGlyphFilter.cpp b/Gui/VtkVis/VtkCompositePointToGlyphFilter.cpp
similarity index 100%
rename from VtkVis/VtkCompositePointToGlyphFilter.cpp
rename to Gui/VtkVis/VtkCompositePointToGlyphFilter.cpp
diff --git a/VtkVis/VtkCompositePointToGlyphFilter.h b/Gui/VtkVis/VtkCompositePointToGlyphFilter.h
similarity index 100%
rename from VtkVis/VtkCompositePointToGlyphFilter.h
rename to Gui/VtkVis/VtkCompositePointToGlyphFilter.h
diff --git a/VtkVis/VtkCompositeSelectionFilter.cpp b/Gui/VtkVis/VtkCompositeSelectionFilter.cpp
similarity index 100%
rename from VtkVis/VtkCompositeSelectionFilter.cpp
rename to Gui/VtkVis/VtkCompositeSelectionFilter.cpp
diff --git a/VtkVis/VtkCompositeSelectionFilter.h b/Gui/VtkVis/VtkCompositeSelectionFilter.h
similarity index 100%
rename from VtkVis/VtkCompositeSelectionFilter.h
rename to Gui/VtkVis/VtkCompositeSelectionFilter.h
diff --git a/VtkVis/VtkCompositeTextureOnSurfaceFilter.cpp b/Gui/VtkVis/VtkCompositeTextureOnSurfaceFilter.cpp
similarity index 100%
rename from VtkVis/VtkCompositeTextureOnSurfaceFilter.cpp
rename to Gui/VtkVis/VtkCompositeTextureOnSurfaceFilter.cpp
diff --git a/VtkVis/VtkCompositeTextureOnSurfaceFilter.h b/Gui/VtkVis/VtkCompositeTextureOnSurfaceFilter.h
similarity index 100%
rename from VtkVis/VtkCompositeTextureOnSurfaceFilter.h
rename to Gui/VtkVis/VtkCompositeTextureOnSurfaceFilter.h
diff --git a/VtkVis/VtkCompositeThresholdFilter.cpp b/Gui/VtkVis/VtkCompositeThresholdFilter.cpp
similarity index 100%
rename from VtkVis/VtkCompositeThresholdFilter.cpp
rename to Gui/VtkVis/VtkCompositeThresholdFilter.cpp
diff --git a/VtkVis/VtkCompositeThresholdFilter.h b/Gui/VtkVis/VtkCompositeThresholdFilter.h
similarity index 100%
rename from VtkVis/VtkCompositeThresholdFilter.h
rename to Gui/VtkVis/VtkCompositeThresholdFilter.h
diff --git a/VtkVis/VtkConditionSource.cpp b/Gui/VtkVis/VtkConditionSource.cpp
similarity index 100%
rename from VtkVis/VtkConditionSource.cpp
rename to Gui/VtkVis/VtkConditionSource.cpp
diff --git a/VtkVis/VtkConditionSource.h b/Gui/VtkVis/VtkConditionSource.h
similarity index 100%
rename from VtkVis/VtkConditionSource.h
rename to Gui/VtkVis/VtkConditionSource.h
diff --git a/VtkVis/VtkFilterFactory.cpp b/Gui/VtkVis/VtkFilterFactory.cpp
similarity index 100%
rename from VtkVis/VtkFilterFactory.cpp
rename to Gui/VtkVis/VtkFilterFactory.cpp
diff --git a/VtkVis/VtkFilterFactory.h b/Gui/VtkVis/VtkFilterFactory.h
similarity index 100%
rename from VtkVis/VtkFilterFactory.h
rename to Gui/VtkVis/VtkFilterFactory.h
diff --git a/VtkVis/VtkGeoImageSource.cpp b/Gui/VtkVis/VtkGeoImageSource.cpp
similarity index 100%
rename from VtkVis/VtkGeoImageSource.cpp
rename to Gui/VtkVis/VtkGeoImageSource.cpp
diff --git a/VtkVis/VtkGeoImageSource.h b/Gui/VtkVis/VtkGeoImageSource.h
similarity index 100%
rename from VtkVis/VtkGeoImageSource.h
rename to Gui/VtkVis/VtkGeoImageSource.h
diff --git a/VtkVis/VtkImageDataToLinePolyDataFilter.cpp b/Gui/VtkVis/VtkImageDataToLinePolyDataFilter.cpp
similarity index 100%
rename from VtkVis/VtkImageDataToLinePolyDataFilter.cpp
rename to Gui/VtkVis/VtkImageDataToLinePolyDataFilter.cpp
diff --git a/VtkVis/VtkImageDataToLinePolyDataFilter.h b/Gui/VtkVis/VtkImageDataToLinePolyDataFilter.h
similarity index 100%
rename from VtkVis/VtkImageDataToLinePolyDataFilter.h
rename to Gui/VtkVis/VtkImageDataToLinePolyDataFilter.h
diff --git a/VtkVis/VtkMeshConverter.cpp b/Gui/VtkVis/VtkMeshConverter.cpp
similarity index 100%
rename from VtkVis/VtkMeshConverter.cpp
rename to Gui/VtkVis/VtkMeshConverter.cpp
diff --git a/VtkVis/VtkMeshConverter.h b/Gui/VtkVis/VtkMeshConverter.h
similarity index 100%
rename from VtkVis/VtkMeshConverter.h
rename to Gui/VtkVis/VtkMeshConverter.h
diff --git a/VtkVis/VtkMeshSource.cpp b/Gui/VtkVis/VtkMeshSource.cpp
similarity index 100%
rename from VtkVis/VtkMeshSource.cpp
rename to Gui/VtkVis/VtkMeshSource.cpp
diff --git a/VtkVis/VtkMeshSource.h b/Gui/VtkVis/VtkMeshSource.h
similarity index 100%
rename from VtkVis/VtkMeshSource.h
rename to Gui/VtkVis/VtkMeshSource.h
diff --git a/VtkVis/VtkPointsSource.cpp b/Gui/VtkVis/VtkPointsSource.cpp
similarity index 100%
rename from VtkVis/VtkPointsSource.cpp
rename to Gui/VtkVis/VtkPointsSource.cpp
diff --git a/VtkVis/VtkPointsSource.h b/Gui/VtkVis/VtkPointsSource.h
similarity index 100%
rename from VtkVis/VtkPointsSource.h
rename to Gui/VtkVis/VtkPointsSource.h
diff --git a/VtkVis/VtkPolylinesSource.cpp b/Gui/VtkVis/VtkPolylinesSource.cpp
similarity index 100%
rename from VtkVis/VtkPolylinesSource.cpp
rename to Gui/VtkVis/VtkPolylinesSource.cpp
diff --git a/VtkVis/VtkPolylinesSource.h b/Gui/VtkVis/VtkPolylinesSource.h
similarity index 100%
rename from VtkVis/VtkPolylinesSource.h
rename to Gui/VtkVis/VtkPolylinesSource.h
diff --git a/VtkVis/VtkRaster.cpp b/Gui/VtkVis/VtkRaster.cpp
similarity index 100%
rename from VtkVis/VtkRaster.cpp
rename to Gui/VtkVis/VtkRaster.cpp
diff --git a/VtkVis/VtkRaster.h b/Gui/VtkVis/VtkRaster.h
similarity index 100%
rename from VtkVis/VtkRaster.h
rename to Gui/VtkVis/VtkRaster.h
diff --git a/VtkVis/VtkSelectionFilter.cpp b/Gui/VtkVis/VtkSelectionFilter.cpp
similarity index 100%
rename from VtkVis/VtkSelectionFilter.cpp
rename to Gui/VtkVis/VtkSelectionFilter.cpp
diff --git a/VtkVis/VtkSelectionFilter.h b/Gui/VtkVis/VtkSelectionFilter.h
similarity index 100%
rename from VtkVis/VtkSelectionFilter.h
rename to Gui/VtkVis/VtkSelectionFilter.h
diff --git a/VtkVis/VtkStationSource.cpp b/Gui/VtkVis/VtkStationSource.cpp
similarity index 100%
rename from VtkVis/VtkStationSource.cpp
rename to Gui/VtkVis/VtkStationSource.cpp
diff --git a/VtkVis/VtkStationSource.h b/Gui/VtkVis/VtkStationSource.h
similarity index 100%
rename from VtkVis/VtkStationSource.h
rename to Gui/VtkVis/VtkStationSource.h
diff --git a/VtkVis/VtkSurfacesSource.cpp b/Gui/VtkVis/VtkSurfacesSource.cpp
similarity index 100%
rename from VtkVis/VtkSurfacesSource.cpp
rename to Gui/VtkVis/VtkSurfacesSource.cpp
diff --git a/VtkVis/VtkSurfacesSource.h b/Gui/VtkVis/VtkSurfacesSource.h
similarity index 100%
rename from VtkVis/VtkSurfacesSource.h
rename to Gui/VtkVis/VtkSurfacesSource.h
diff --git a/VtkVis/VtkTextureOnSurfaceFilter.cpp b/Gui/VtkVis/VtkTextureOnSurfaceFilter.cpp
similarity index 100%
rename from VtkVis/VtkTextureOnSurfaceFilter.cpp
rename to Gui/VtkVis/VtkTextureOnSurfaceFilter.cpp
diff --git a/VtkVis/VtkTextureOnSurfaceFilter.h b/Gui/VtkVis/VtkTextureOnSurfaceFilter.h
similarity index 100%
rename from VtkVis/VtkTextureOnSurfaceFilter.h
rename to Gui/VtkVis/VtkTextureOnSurfaceFilter.h
diff --git a/VtkVis/VtkTrackedCamera.cpp b/Gui/VtkVis/VtkTrackedCamera.cpp
similarity index 100%
rename from VtkVis/VtkTrackedCamera.cpp
rename to Gui/VtkVis/VtkTrackedCamera.cpp
diff --git a/VtkVis/VtkTrackedCamera.h b/Gui/VtkVis/VtkTrackedCamera.h
similarity index 100%
rename from VtkVis/VtkTrackedCamera.h
rename to Gui/VtkVis/VtkTrackedCamera.h
diff --git a/VtkVis/VtkVisHelper.cpp b/Gui/VtkVis/VtkVisHelper.cpp
similarity index 100%
rename from VtkVis/VtkVisHelper.cpp
rename to Gui/VtkVis/VtkVisHelper.cpp
diff --git a/VtkVis/VtkVisHelper.h b/Gui/VtkVis/VtkVisHelper.h
similarity index 100%
rename from VtkVis/VtkVisHelper.h
rename to Gui/VtkVis/VtkVisHelper.h
diff --git a/VtkVis/VtkVisImageItem.cpp b/Gui/VtkVis/VtkVisImageItem.cpp
similarity index 100%
rename from VtkVis/VtkVisImageItem.cpp
rename to Gui/VtkVis/VtkVisImageItem.cpp
diff --git a/VtkVis/VtkVisImageItem.h b/Gui/VtkVis/VtkVisImageItem.h
similarity index 100%
rename from VtkVis/VtkVisImageItem.h
rename to Gui/VtkVis/VtkVisImageItem.h
diff --git a/VtkVis/VtkVisPipeline.cpp b/Gui/VtkVis/VtkVisPipeline.cpp
similarity index 100%
rename from VtkVis/VtkVisPipeline.cpp
rename to Gui/VtkVis/VtkVisPipeline.cpp
diff --git a/VtkVis/VtkVisPipeline.h b/Gui/VtkVis/VtkVisPipeline.h
similarity index 100%
rename from VtkVis/VtkVisPipeline.h
rename to Gui/VtkVis/VtkVisPipeline.h
diff --git a/VtkVis/VtkVisPipelineItem.cpp b/Gui/VtkVis/VtkVisPipelineItem.cpp
similarity index 100%
rename from VtkVis/VtkVisPipelineItem.cpp
rename to Gui/VtkVis/VtkVisPipelineItem.cpp
diff --git a/VtkVis/VtkVisPipelineItem.h b/Gui/VtkVis/VtkVisPipelineItem.h
similarity index 100%
rename from VtkVis/VtkVisPipelineItem.h
rename to Gui/VtkVis/VtkVisPipelineItem.h
diff --git a/VtkVis/VtkVisPipelineView.cpp b/Gui/VtkVis/VtkVisPipelineView.cpp
similarity index 100%
rename from VtkVis/VtkVisPipelineView.cpp
rename to Gui/VtkVis/VtkVisPipelineView.cpp
diff --git a/VtkVis/VtkVisPipelineView.h b/Gui/VtkVis/VtkVisPipelineView.h
similarity index 100%
rename from VtkVis/VtkVisPipelineView.h
rename to Gui/VtkVis/VtkVisPipelineView.h
diff --git a/VtkVis/VtkVisPointSetItem.cpp b/Gui/VtkVis/VtkVisPointSetItem.cpp
similarity index 100%
rename from VtkVis/VtkVisPointSetItem.cpp
rename to Gui/VtkVis/VtkVisPointSetItem.cpp
diff --git a/VtkVis/VtkVisPointSetItem.h b/Gui/VtkVis/VtkVisPointSetItem.h
similarity index 100%
rename from VtkVis/VtkVisPointSetItem.h
rename to Gui/VtkVis/VtkVisPointSetItem.h
diff --git a/VtkVis/VtkVisTabWidget.cpp b/Gui/VtkVis/VtkVisTabWidget.cpp
similarity index 100%
rename from VtkVis/VtkVisTabWidget.cpp
rename to Gui/VtkVis/VtkVisTabWidget.cpp
diff --git a/VtkVis/VtkVisTabWidget.h b/Gui/VtkVis/VtkVisTabWidget.h
similarity index 100%
rename from VtkVis/VtkVisTabWidget.h
rename to Gui/VtkVis/VtkVisTabWidget.h
diff --git a/VtkVis/VtkVisTabWidgetBase.ui b/Gui/VtkVis/VtkVisTabWidgetBase.ui
similarity index 100%
rename from VtkVis/VtkVisTabWidgetBase.ui
rename to Gui/VtkVis/VtkVisTabWidgetBase.ui
diff --git a/main.cpp b/Gui/main.cpp
similarity index 100%
rename from main.cpp
rename to Gui/main.cpp
diff --git a/mainwindow.cpp b/Gui/mainwindow.cpp
similarity index 100%
rename from mainwindow.cpp
rename to Gui/mainwindow.cpp
diff --git a/mainwindow.h b/Gui/mainwindow.h
similarity index 100%
rename from mainwindow.h
rename to Gui/mainwindow.h
diff --git a/mainwindow.ui b/Gui/mainwindow.ui
similarity index 100%
rename from mainwindow.ui
rename to Gui/mainwindow.ui