diff --git a/GUI/coregui/DataLoaders/AbstractDataLoader.cpp b/GUI/DataLoaders/AbstractDataLoader.cpp
similarity index 100%
rename from GUI/coregui/DataLoaders/AbstractDataLoader.cpp
rename to GUI/DataLoaders/AbstractDataLoader.cpp
diff --git a/GUI/coregui/DataLoaders/AbstractDataLoader.h b/GUI/DataLoaders/AbstractDataLoader.h
similarity index 100%
rename from GUI/coregui/DataLoaders/AbstractDataLoader.h
rename to GUI/DataLoaders/AbstractDataLoader.h
diff --git a/GUI/coregui/DataLoaders/AbstractDataLoader1D.h b/GUI/DataLoaders/AbstractDataLoader1D.h
similarity index 100%
rename from GUI/coregui/DataLoaders/AbstractDataLoader1D.h
rename to GUI/DataLoaders/AbstractDataLoader1D.h
diff --git a/GUI/coregui/DataLoaders/AbstractDataLoaderResultModel.cpp b/GUI/DataLoaders/AbstractDataLoaderResultModel.cpp
similarity index 100%
rename from GUI/coregui/DataLoaders/AbstractDataLoaderResultModel.cpp
rename to GUI/DataLoaders/AbstractDataLoaderResultModel.cpp
diff --git a/GUI/coregui/DataLoaders/AbstractDataLoaderResultModel.h b/GUI/DataLoaders/AbstractDataLoaderResultModel.h
similarity index 100%
rename from GUI/coregui/DataLoaders/AbstractDataLoaderResultModel.h
rename to GUI/DataLoaders/AbstractDataLoaderResultModel.h
diff --git a/GUI/coregui/DataLoaders/AutomaticDataLoader1D.cpp b/GUI/DataLoaders/AutomaticDataLoader1D.cpp
similarity index 100%
rename from GUI/coregui/DataLoaders/AutomaticDataLoader1D.cpp
rename to GUI/DataLoaders/AutomaticDataLoader1D.cpp
diff --git a/GUI/coregui/DataLoaders/AutomaticDataLoader1D.h b/GUI/DataLoaders/AutomaticDataLoader1D.h
similarity index 100%
rename from GUI/coregui/DataLoaders/AutomaticDataLoader1D.h
rename to GUI/DataLoaders/AutomaticDataLoader1D.h
diff --git a/GUI/coregui/DataLoaders/AutomaticDataLoader1DResultModel.cpp b/GUI/DataLoaders/AutomaticDataLoader1DResultModel.cpp
similarity index 100%
rename from GUI/coregui/DataLoaders/AutomaticDataLoader1DResultModel.cpp
rename to GUI/DataLoaders/AutomaticDataLoader1DResultModel.cpp
diff --git a/GUI/coregui/DataLoaders/AutomaticDataLoader1DResultModel.h b/GUI/DataLoaders/AutomaticDataLoader1DResultModel.h
similarity index 100%
rename from GUI/coregui/DataLoaders/AutomaticDataLoader1DResultModel.h
rename to GUI/DataLoaders/AutomaticDataLoader1DResultModel.h
diff --git a/GUI/coregui/DataLoaders/DataLoaders1D.cpp b/GUI/DataLoaders/DataLoaders1D.cpp
similarity index 100%
rename from GUI/coregui/DataLoaders/DataLoaders1D.cpp
rename to GUI/DataLoaders/DataLoaders1D.cpp
diff --git a/GUI/coregui/DataLoaders/DataLoaders1D.h b/GUI/DataLoaders/DataLoaders1D.h
similarity index 100%
rename from GUI/coregui/DataLoaders/DataLoaders1D.h
rename to GUI/DataLoaders/DataLoaders1D.h
diff --git a/GUI/coregui/DataLoaders/QREDataLoader.cpp b/GUI/DataLoaders/QREDataLoader.cpp
similarity index 100%
rename from GUI/coregui/DataLoaders/QREDataLoader.cpp
rename to GUI/DataLoaders/QREDataLoader.cpp
diff --git a/GUI/coregui/DataLoaders/QREDataLoader.h b/GUI/DataLoaders/QREDataLoader.h
similarity index 100%
rename from GUI/coregui/DataLoaders/QREDataLoader.h
rename to GUI/DataLoaders/QREDataLoader.h
diff --git a/GUI/coregui/DataLoaders/QREDataLoaderProperties.cpp b/GUI/DataLoaders/QREDataLoaderProperties.cpp
similarity index 100%
rename from GUI/coregui/DataLoaders/QREDataLoaderProperties.cpp
rename to GUI/DataLoaders/QREDataLoaderProperties.cpp
diff --git a/GUI/coregui/DataLoaders/QREDataLoaderProperties.h b/GUI/DataLoaders/QREDataLoaderProperties.h
similarity index 100%
rename from GUI/coregui/DataLoaders/QREDataLoaderProperties.h
rename to GUI/DataLoaders/QREDataLoaderProperties.h
diff --git a/GUI/coregui/DataLoaders/QREDataLoaderProperties.ui b/GUI/DataLoaders/QREDataLoaderProperties.ui
similarity index 100%
rename from GUI/coregui/DataLoaders/QREDataLoaderProperties.ui
rename to GUI/DataLoaders/QREDataLoaderProperties.ui
diff --git a/GUI/coregui/DataLoaders/QREDataLoaderResultModel.cpp b/GUI/DataLoaders/QREDataLoaderResultModel.cpp
similarity index 100%
rename from GUI/coregui/DataLoaders/QREDataLoaderResultModel.cpp
rename to GUI/DataLoaders/QREDataLoaderResultModel.cpp
diff --git a/GUI/coregui/DataLoaders/QREDataLoaderResultModel.h b/GUI/DataLoaders/QREDataLoaderResultModel.h
similarity index 100%
rename from GUI/coregui/DataLoaders/QREDataLoaderResultModel.h
rename to GUI/DataLoaders/QREDataLoaderResultModel.h
diff --git a/GUI/coregui/DataLoaders/UserDefinedDataLoader1D.cpp b/GUI/DataLoaders/UserDefinedDataLoader1D.cpp
similarity index 100%
rename from GUI/coregui/DataLoaders/UserDefinedDataLoader1D.cpp
rename to GUI/DataLoaders/UserDefinedDataLoader1D.cpp
diff --git a/GUI/coregui/DataLoaders/UserDefinedDataLoader1D.h b/GUI/DataLoaders/UserDefinedDataLoader1D.h
similarity index 100%
rename from GUI/coregui/DataLoaders/UserDefinedDataLoader1D.h
rename to GUI/DataLoaders/UserDefinedDataLoader1D.h
diff --git a/GUI/coregui/Models/ApplicationModels.cpp b/GUI/Models/ApplicationModels.cpp
similarity index 100%
rename from GUI/coregui/Models/ApplicationModels.cpp
rename to GUI/Models/ApplicationModels.cpp
diff --git a/GUI/coregui/Models/ApplicationModels.h b/GUI/Models/ApplicationModels.h
similarity index 100%
rename from GUI/coregui/Models/ApplicationModels.h
rename to GUI/Models/ApplicationModels.h
diff --git a/GUI/coregui/Models/AxesItems.cpp b/GUI/Models/AxesItems.cpp
similarity index 100%
rename from GUI/coregui/Models/AxesItems.cpp
rename to GUI/Models/AxesItems.cpp
diff --git a/GUI/coregui/Models/AxesItems.h b/GUI/Models/AxesItems.h
similarity index 100%
rename from GUI/coregui/Models/AxesItems.h
rename to GUI/Models/AxesItems.h
diff --git a/GUI/coregui/Models/BackgroundItems.cpp b/GUI/Models/BackgroundItems.cpp
similarity index 100%
rename from GUI/coregui/Models/BackgroundItems.cpp
rename to GUI/Models/BackgroundItems.cpp
diff --git a/GUI/coregui/Models/BackgroundItems.h b/GUI/Models/BackgroundItems.h
similarity index 100%
rename from GUI/coregui/Models/BackgroundItems.h
rename to GUI/Models/BackgroundItems.h
diff --git a/GUI/coregui/Models/BeamAngleItems.cpp b/GUI/Models/BeamAngleItems.cpp
similarity index 100%
rename from GUI/coregui/Models/BeamAngleItems.cpp
rename to GUI/Models/BeamAngleItems.cpp
diff --git a/GUI/coregui/Models/BeamAngleItems.h b/GUI/Models/BeamAngleItems.h
similarity index 100%
rename from GUI/coregui/Models/BeamAngleItems.h
rename to GUI/Models/BeamAngleItems.h
diff --git a/GUI/coregui/Models/BeamDistributionItem.cpp b/GUI/Models/BeamDistributionItem.cpp
similarity index 100%
rename from GUI/coregui/Models/BeamDistributionItem.cpp
rename to GUI/Models/BeamDistributionItem.cpp
diff --git a/GUI/coregui/Models/BeamDistributionItem.h b/GUI/Models/BeamDistributionItem.h
similarity index 100%
rename from GUI/coregui/Models/BeamDistributionItem.h
rename to GUI/Models/BeamDistributionItem.h
diff --git a/GUI/coregui/Models/BeamItems.cpp b/GUI/Models/BeamItems.cpp
similarity index 100%
rename from GUI/coregui/Models/BeamItems.cpp
rename to GUI/Models/BeamItems.cpp
diff --git a/GUI/coregui/Models/BeamItems.h b/GUI/Models/BeamItems.h
similarity index 100%
rename from GUI/coregui/Models/BeamItems.h
rename to GUI/Models/BeamItems.h
diff --git a/GUI/coregui/Models/BeamWavelengthItem.cpp b/GUI/Models/BeamWavelengthItem.cpp
similarity index 100%
rename from GUI/coregui/Models/BeamWavelengthItem.cpp
rename to GUI/Models/BeamWavelengthItem.cpp
diff --git a/GUI/coregui/Models/BeamWavelengthItem.h b/GUI/Models/BeamWavelengthItem.h
similarity index 100%
rename from GUI/coregui/Models/BeamWavelengthItem.h
rename to GUI/Models/BeamWavelengthItem.h
diff --git a/GUI/coregui/Models/ComboProperty.cpp b/GUI/Models/ComboProperty.cpp
similarity index 100%
rename from GUI/coregui/Models/ComboProperty.cpp
rename to GUI/Models/ComboProperty.cpp
diff --git a/GUI/coregui/Models/ComboProperty.h b/GUI/Models/ComboProperty.h
similarity index 100%
rename from GUI/coregui/Models/ComboProperty.h
rename to GUI/Models/ComboProperty.h
diff --git a/GUI/coregui/Models/ComponentProxyModel.cpp b/GUI/Models/ComponentProxyModel.cpp
similarity index 100%
rename from GUI/coregui/Models/ComponentProxyModel.cpp
rename to GUI/Models/ComponentProxyModel.cpp
diff --git a/GUI/coregui/Models/ComponentProxyModel.h b/GUI/Models/ComponentProxyModel.h
similarity index 100%
rename from GUI/coregui/Models/ComponentProxyModel.h
rename to GUI/Models/ComponentProxyModel.h
diff --git a/GUI/coregui/Models/ComponentProxyStrategy.cpp b/GUI/Models/ComponentProxyStrategy.cpp
similarity index 100%
rename from GUI/coregui/Models/ComponentProxyStrategy.cpp
rename to GUI/Models/ComponentProxyStrategy.cpp
diff --git a/GUI/coregui/Models/ComponentProxyStrategy.h b/GUI/Models/ComponentProxyStrategy.h
similarity index 100%
rename from GUI/coregui/Models/ComponentProxyStrategy.h
rename to GUI/Models/ComponentProxyStrategy.h
diff --git a/GUI/coregui/Models/Data1DViewItem.cpp b/GUI/Models/Data1DViewItem.cpp
similarity index 100%
rename from GUI/coregui/Models/Data1DViewItem.cpp
rename to GUI/Models/Data1DViewItem.cpp
diff --git a/GUI/coregui/Models/Data1DViewItem.h b/GUI/Models/Data1DViewItem.h
similarity index 100%
rename from GUI/coregui/Models/Data1DViewItem.h
rename to GUI/Models/Data1DViewItem.h
diff --git a/GUI/coregui/Models/DataItem.cpp b/GUI/Models/DataItem.cpp
similarity index 100%
rename from GUI/coregui/Models/DataItem.cpp
rename to GUI/Models/DataItem.cpp
diff --git a/GUI/coregui/Models/DataItem.h b/GUI/Models/DataItem.h
similarity index 100%
rename from GUI/coregui/Models/DataItem.h
rename to GUI/Models/DataItem.h
diff --git a/GUI/coregui/Models/DataItemUtils.cpp b/GUI/Models/DataItemUtils.cpp
similarity index 100%
rename from GUI/coregui/Models/DataItemUtils.cpp
rename to GUI/Models/DataItemUtils.cpp
diff --git a/GUI/coregui/Models/DataItemUtils.h b/GUI/Models/DataItemUtils.h
similarity index 100%
rename from GUI/coregui/Models/DataItemUtils.h
rename to GUI/Models/DataItemUtils.h
diff --git a/GUI/coregui/Models/DataProperties.cpp b/GUI/Models/DataProperties.cpp
similarity index 100%
rename from GUI/coregui/Models/DataProperties.cpp
rename to GUI/Models/DataProperties.cpp
diff --git a/GUI/coregui/Models/DataProperties.h b/GUI/Models/DataProperties.h
similarity index 100%
rename from GUI/coregui/Models/DataProperties.h
rename to GUI/Models/DataProperties.h
diff --git a/GUI/coregui/Models/DataPropertyContainer.cpp b/GUI/Models/DataPropertyContainer.cpp
similarity index 100%
rename from GUI/coregui/Models/DataPropertyContainer.cpp
rename to GUI/Models/DataPropertyContainer.cpp
diff --git a/GUI/coregui/Models/DataPropertyContainer.h b/GUI/Models/DataPropertyContainer.h
similarity index 100%
rename from GUI/coregui/Models/DataPropertyContainer.h
rename to GUI/Models/DataPropertyContainer.h
diff --git a/GUI/coregui/Models/DataViewUtils.cpp b/GUI/Models/DataViewUtils.cpp
similarity index 100%
rename from GUI/coregui/Models/DataViewUtils.cpp
rename to GUI/Models/DataViewUtils.cpp
diff --git a/GUI/coregui/Models/DataViewUtils.h b/GUI/Models/DataViewUtils.h
similarity index 100%
rename from GUI/coregui/Models/DataViewUtils.h
rename to GUI/Models/DataViewUtils.h
diff --git a/GUI/coregui/Models/DetectorItems.cpp b/GUI/Models/DetectorItems.cpp
similarity index 100%
rename from GUI/coregui/Models/DetectorItems.cpp
rename to GUI/Models/DetectorItems.cpp
diff --git a/GUI/coregui/Models/DetectorItems.h b/GUI/Models/DetectorItems.h
similarity index 100%
rename from GUI/coregui/Models/DetectorItems.h
rename to GUI/Models/DetectorItems.h
diff --git a/GUI/coregui/Models/DistributionItems.cpp b/GUI/Models/DistributionItems.cpp
similarity index 100%
rename from GUI/coregui/Models/DistributionItems.cpp
rename to GUI/Models/DistributionItems.cpp
diff --git a/GUI/coregui/Models/DistributionItems.h b/GUI/Models/DistributionItems.h
similarity index 100%
rename from GUI/coregui/Models/DistributionItems.h
rename to GUI/Models/DistributionItems.h
diff --git a/GUI/coregui/Models/DocumentModel.cpp b/GUI/Models/DocumentModel.cpp
similarity index 100%
rename from GUI/coregui/Models/DocumentModel.cpp
rename to GUI/Models/DocumentModel.cpp
diff --git a/GUI/coregui/Models/DocumentModel.h b/GUI/Models/DocumentModel.h
similarity index 100%
rename from GUI/coregui/Models/DocumentModel.h
rename to GUI/Models/DocumentModel.h
diff --git a/GUI/coregui/Models/DomainObjectBuilder.cpp b/GUI/Models/DomainObjectBuilder.cpp
similarity index 100%
rename from GUI/coregui/Models/DomainObjectBuilder.cpp
rename to GUI/Models/DomainObjectBuilder.cpp
diff --git a/GUI/coregui/Models/DomainObjectBuilder.h b/GUI/Models/DomainObjectBuilder.h
similarity index 100%
rename from GUI/coregui/Models/DomainObjectBuilder.h
rename to GUI/Models/DomainObjectBuilder.h
diff --git a/GUI/coregui/Models/DomainSimulationBuilder.cpp b/GUI/Models/DomainSimulationBuilder.cpp
similarity index 100%
rename from GUI/coregui/Models/DomainSimulationBuilder.cpp
rename to GUI/Models/DomainSimulationBuilder.cpp
diff --git a/GUI/coregui/Models/DomainSimulationBuilder.h b/GUI/Models/DomainSimulationBuilder.h
similarity index 100%
rename from GUI/coregui/Models/DomainSimulationBuilder.h
rename to GUI/Models/DomainSimulationBuilder.h
diff --git a/GUI/coregui/Models/FTDecayFunctionItems.cpp b/GUI/Models/FTDecayFunctionItems.cpp
similarity index 100%
rename from GUI/coregui/Models/FTDecayFunctionItems.cpp
rename to GUI/Models/FTDecayFunctionItems.cpp
diff --git a/GUI/coregui/Models/FTDecayFunctionItems.h b/GUI/Models/FTDecayFunctionItems.h
similarity index 100%
rename from GUI/coregui/Models/FTDecayFunctionItems.h
rename to GUI/Models/FTDecayFunctionItems.h
diff --git a/GUI/coregui/Models/FTDistributionItems.cpp b/GUI/Models/FTDistributionItems.cpp
similarity index 100%
rename from GUI/coregui/Models/FTDistributionItems.cpp
rename to GUI/Models/FTDistributionItems.cpp
diff --git a/GUI/coregui/Models/FTDistributionItems.h b/GUI/Models/FTDistributionItems.h
similarity index 100%
rename from GUI/coregui/Models/FTDistributionItems.h
rename to GUI/Models/FTDistributionItems.h
diff --git a/GUI/coregui/Models/FilterPropertyProxy.cpp b/GUI/Models/FilterPropertyProxy.cpp
similarity index 100%
rename from GUI/coregui/Models/FilterPropertyProxy.cpp
rename to GUI/Models/FilterPropertyProxy.cpp
diff --git a/GUI/coregui/Models/FilterPropertyProxy.h b/GUI/Models/FilterPropertyProxy.h
similarity index 100%
rename from GUI/coregui/Models/FilterPropertyProxy.h
rename to GUI/Models/FilterPropertyProxy.h
diff --git a/GUI/coregui/Models/FitParameterHelper.cpp b/GUI/Models/FitParameterHelper.cpp
similarity index 100%
rename from GUI/coregui/Models/FitParameterHelper.cpp
rename to GUI/Models/FitParameterHelper.cpp
diff --git a/GUI/coregui/Models/FitParameterHelper.h b/GUI/Models/FitParameterHelper.h
similarity index 100%
rename from GUI/coregui/Models/FitParameterHelper.h
rename to GUI/Models/FitParameterHelper.h
diff --git a/GUI/coregui/Models/FitParameterItems.cpp b/GUI/Models/FitParameterItems.cpp
similarity index 100%
rename from GUI/coregui/Models/FitParameterItems.cpp
rename to GUI/Models/FitParameterItems.cpp
diff --git a/GUI/coregui/Models/FitParameterItems.h b/GUI/Models/FitParameterItems.h
similarity index 100%
rename from GUI/coregui/Models/FitParameterItems.h
rename to GUI/Models/FitParameterItems.h
diff --git a/GUI/coregui/Models/FitParameterProxyModel.cpp b/GUI/Models/FitParameterProxyModel.cpp
similarity index 100%
rename from GUI/coregui/Models/FitParameterProxyModel.cpp
rename to GUI/Models/FitParameterProxyModel.cpp
diff --git a/GUI/coregui/Models/FitParameterProxyModel.h b/GUI/Models/FitParameterProxyModel.h
similarity index 100%
rename from GUI/coregui/Models/FitParameterProxyModel.h
rename to GUI/Models/FitParameterProxyModel.h
diff --git a/GUI/coregui/Models/FitSuiteItem.cpp b/GUI/Models/FitSuiteItem.cpp
similarity index 100%
rename from GUI/coregui/Models/FitSuiteItem.cpp
rename to GUI/Models/FitSuiteItem.cpp
diff --git a/GUI/coregui/Models/FitSuiteItem.h b/GUI/Models/FitSuiteItem.h
similarity index 100%
rename from GUI/coregui/Models/FitSuiteItem.h
rename to GUI/Models/FitSuiteItem.h
diff --git a/GUI/coregui/Models/FootprintItems.cpp b/GUI/Models/FootprintItems.cpp
similarity index 100%
rename from GUI/coregui/Models/FootprintItems.cpp
rename to GUI/Models/FootprintItems.cpp
diff --git a/GUI/coregui/Models/FootprintItems.h b/GUI/Models/FootprintItems.h
similarity index 100%
rename from GUI/coregui/Models/FootprintItems.h
rename to GUI/Models/FootprintItems.h
diff --git a/GUI/coregui/Models/FormFactorItems.cpp b/GUI/Models/FormFactorItems.cpp
similarity index 100%
rename from GUI/coregui/Models/FormFactorItems.cpp
rename to GUI/Models/FormFactorItems.cpp
diff --git a/GUI/coregui/Models/FormFactorItems.h b/GUI/Models/FormFactorItems.h
similarity index 100%
rename from GUI/coregui/Models/FormFactorItems.h
rename to GUI/Models/FormFactorItems.h
diff --git a/GUI/coregui/Models/GUIDomainSampleVisitor.cpp b/GUI/Models/GUIDomainSampleVisitor.cpp
similarity index 100%
rename from GUI/coregui/Models/GUIDomainSampleVisitor.cpp
rename to GUI/Models/GUIDomainSampleVisitor.cpp
diff --git a/GUI/coregui/Models/GUIDomainSampleVisitor.h b/GUI/Models/GUIDomainSampleVisitor.h
similarity index 100%
rename from GUI/coregui/Models/GUIDomainSampleVisitor.h
rename to GUI/Models/GUIDomainSampleVisitor.h
diff --git a/GUI/coregui/Models/GUIExamplesFactory.cpp b/GUI/Models/GUIExamplesFactory.cpp
similarity index 100%
rename from GUI/coregui/Models/GUIExamplesFactory.cpp
rename to GUI/Models/GUIExamplesFactory.cpp
diff --git a/GUI/coregui/Models/GUIExamplesFactory.h b/GUI/Models/GUIExamplesFactory.h
similarity index 100%
rename from GUI/coregui/Models/GUIExamplesFactory.h
rename to GUI/Models/GUIExamplesFactory.h
diff --git a/GUI/coregui/Models/GUIObjectBuilder.cpp b/GUI/Models/GUIObjectBuilder.cpp
similarity index 100%
rename from GUI/coregui/Models/GUIObjectBuilder.cpp
rename to GUI/Models/GUIObjectBuilder.cpp
diff --git a/GUI/coregui/Models/GUIObjectBuilder.h b/GUI/Models/GUIObjectBuilder.h
similarity index 100%
rename from GUI/coregui/Models/GUIObjectBuilder.h
rename to GUI/Models/GUIObjectBuilder.h
diff --git a/GUI/coregui/Models/GroupInfo.cpp b/GUI/Models/GroupInfo.cpp
similarity index 100%
rename from GUI/coregui/Models/GroupInfo.cpp
rename to GUI/Models/GroupInfo.cpp
diff --git a/GUI/coregui/Models/GroupInfo.h b/GUI/Models/GroupInfo.h
similarity index 100%
rename from GUI/coregui/Models/GroupInfo.h
rename to GUI/Models/GroupInfo.h
diff --git a/GUI/coregui/Models/GroupInfoCatalog.cpp b/GUI/Models/GroupInfoCatalog.cpp
similarity index 100%
rename from GUI/coregui/Models/GroupInfoCatalog.cpp
rename to GUI/Models/GroupInfoCatalog.cpp
diff --git a/GUI/coregui/Models/GroupInfoCatalog.h b/GUI/Models/GroupInfoCatalog.h
similarity index 100%
rename from GUI/coregui/Models/GroupInfoCatalog.h
rename to GUI/Models/GroupInfoCatalog.h
diff --git a/GUI/coregui/Models/GroupItem.cpp b/GUI/Models/GroupItem.cpp
similarity index 100%
rename from GUI/coregui/Models/GroupItem.cpp
rename to GUI/Models/GroupItem.cpp
diff --git a/GUI/coregui/Models/GroupItem.h b/GUI/Models/GroupItem.h
similarity index 100%
rename from GUI/coregui/Models/GroupItem.h
rename to GUI/Models/GroupItem.h
diff --git a/GUI/coregui/Models/GroupItemController.cpp b/GUI/Models/GroupItemController.cpp
similarity index 100%
rename from GUI/coregui/Models/GroupItemController.cpp
rename to GUI/Models/GroupItemController.cpp
diff --git a/GUI/coregui/Models/GroupItemController.h b/GUI/Models/GroupItemController.h
similarity index 100%
rename from GUI/coregui/Models/GroupItemController.h
rename to GUI/Models/GroupItemController.h
diff --git a/GUI/coregui/Models/InstrumentItems.cpp b/GUI/Models/InstrumentItems.cpp
similarity index 100%
rename from GUI/coregui/Models/InstrumentItems.cpp
rename to GUI/Models/InstrumentItems.cpp
diff --git a/GUI/coregui/Models/InstrumentItems.h b/GUI/Models/InstrumentItems.h
similarity index 100%
rename from GUI/coregui/Models/InstrumentItems.h
rename to GUI/Models/InstrumentItems.h
diff --git a/GUI/coregui/Models/InstrumentModel.cpp b/GUI/Models/InstrumentModel.cpp
similarity index 100%
rename from GUI/coregui/Models/InstrumentModel.cpp
rename to GUI/Models/InstrumentModel.cpp
diff --git a/GUI/coregui/Models/InstrumentModel.h b/GUI/Models/InstrumentModel.h
similarity index 100%
rename from GUI/coregui/Models/InstrumentModel.h
rename to GUI/Models/InstrumentModel.h
diff --git a/GUI/coregui/Models/IntensityDataItem.cpp b/GUI/Models/IntensityDataItem.cpp
similarity index 100%
rename from GUI/coregui/Models/IntensityDataItem.cpp
rename to GUI/Models/IntensityDataItem.cpp
diff --git a/GUI/coregui/Models/IntensityDataItem.h b/GUI/Models/IntensityDataItem.h
similarity index 100%
rename from GUI/coregui/Models/IntensityDataItem.h
rename to GUI/Models/IntensityDataItem.h
diff --git a/GUI/coregui/Models/InterferenceFunctionItems.cpp b/GUI/Models/InterferenceFunctionItems.cpp
similarity index 100%
rename from GUI/coregui/Models/InterferenceFunctionItems.cpp
rename to GUI/Models/InterferenceFunctionItems.cpp
diff --git a/GUI/coregui/Models/InterferenceFunctionItems.h b/GUI/Models/InterferenceFunctionItems.h
similarity index 100%
rename from GUI/coregui/Models/InterferenceFunctionItems.h
rename to GUI/Models/InterferenceFunctionItems.h
diff --git a/GUI/coregui/Models/ItemCatalog.cpp b/GUI/Models/ItemCatalog.cpp
similarity index 100%
rename from GUI/coregui/Models/ItemCatalog.cpp
rename to GUI/Models/ItemCatalog.cpp
diff --git a/GUI/coregui/Models/ItemCatalog.h b/GUI/Models/ItemCatalog.h
similarity index 100%
rename from GUI/coregui/Models/ItemCatalog.h
rename to GUI/Models/ItemCatalog.h
diff --git a/GUI/coregui/Models/ItemFactory.cpp b/GUI/Models/ItemFactory.cpp
similarity index 100%
rename from GUI/coregui/Models/ItemFactory.cpp
rename to GUI/Models/ItemFactory.cpp
diff --git a/GUI/coregui/Models/ItemFactory.h b/GUI/Models/ItemFactory.h
similarity index 100%
rename from GUI/coregui/Models/ItemFactory.h
rename to GUI/Models/ItemFactory.h
diff --git a/GUI/coregui/Models/ItemFileNameUtils.cpp b/GUI/Models/ItemFileNameUtils.cpp
similarity index 100%
rename from GUI/coregui/Models/ItemFileNameUtils.cpp
rename to GUI/Models/ItemFileNameUtils.cpp
diff --git a/GUI/coregui/Models/ItemFileNameUtils.h b/GUI/Models/ItemFileNameUtils.h
similarity index 100%
rename from GUI/coregui/Models/ItemFileNameUtils.h
rename to GUI/Models/ItemFileNameUtils.h
diff --git a/GUI/coregui/Models/JobItem.cpp b/GUI/Models/JobItem.cpp
similarity index 100%
rename from GUI/coregui/Models/JobItem.cpp
rename to GUI/Models/JobItem.cpp
diff --git a/GUI/coregui/Models/JobItem.h b/GUI/Models/JobItem.h
similarity index 100%
rename from GUI/coregui/Models/JobItem.h
rename to GUI/Models/JobItem.h
diff --git a/GUI/coregui/Models/JobItemUtils.cpp b/GUI/Models/JobItemUtils.cpp
similarity index 100%
rename from GUI/coregui/Models/JobItemUtils.cpp
rename to GUI/Models/JobItemUtils.cpp
diff --git a/GUI/coregui/Models/JobItemUtils.h b/GUI/Models/JobItemUtils.h
similarity index 100%
rename from GUI/coregui/Models/JobItemUtils.h
rename to GUI/Models/JobItemUtils.h
diff --git a/GUI/coregui/Models/JobModel.cpp b/GUI/Models/JobModel.cpp
similarity index 100%
rename from GUI/coregui/Models/JobModel.cpp
rename to GUI/Models/JobModel.cpp
diff --git a/GUI/coregui/Models/JobModel.h b/GUI/Models/JobModel.h
similarity index 100%
rename from GUI/coregui/Models/JobModel.h
rename to GUI/Models/JobModel.h
diff --git a/GUI/coregui/Models/JobModelFunctions.cpp b/GUI/Models/JobModelFunctions.cpp
similarity index 100%
rename from GUI/coregui/Models/JobModelFunctions.cpp
rename to GUI/Models/JobModelFunctions.cpp
diff --git a/GUI/coregui/Models/JobModelFunctions.h b/GUI/Models/JobModelFunctions.h
similarity index 100%
rename from GUI/coregui/Models/JobModelFunctions.h
rename to GUI/Models/JobModelFunctions.h
diff --git a/GUI/coregui/Models/JobQueueData.cpp b/GUI/Models/JobQueueData.cpp
similarity index 100%
rename from GUI/coregui/Models/JobQueueData.cpp
rename to GUI/Models/JobQueueData.cpp
diff --git a/GUI/coregui/Models/JobQueueData.h b/GUI/Models/JobQueueData.h
similarity index 100%
rename from GUI/coregui/Models/JobQueueData.h
rename to GUI/Models/JobQueueData.h
diff --git a/GUI/coregui/Models/JobWorker.cpp b/GUI/Models/JobWorker.cpp
similarity index 100%
rename from GUI/coregui/Models/JobWorker.cpp
rename to GUI/Models/JobWorker.cpp
diff --git a/GUI/coregui/Models/JobWorker.h b/GUI/Models/JobWorker.h
similarity index 100%
rename from GUI/coregui/Models/JobWorker.h
rename to GUI/Models/JobWorker.h
diff --git a/GUI/coregui/Models/Lattice2DItems.cpp b/GUI/Models/Lattice2DItems.cpp
similarity index 100%
rename from GUI/coregui/Models/Lattice2DItems.cpp
rename to GUI/Models/Lattice2DItems.cpp
diff --git a/GUI/coregui/Models/Lattice2DItems.h b/GUI/Models/Lattice2DItems.h
similarity index 100%
rename from GUI/coregui/Models/Lattice2DItems.h
rename to GUI/Models/Lattice2DItems.h
diff --git a/GUI/coregui/Models/LayerItem.cpp b/GUI/Models/LayerItem.cpp
similarity index 100%
rename from GUI/coregui/Models/LayerItem.cpp
rename to GUI/Models/LayerItem.cpp
diff --git a/GUI/coregui/Models/LayerItem.h b/GUI/Models/LayerItem.h
similarity index 100%
rename from GUI/coregui/Models/LayerItem.h
rename to GUI/Models/LayerItem.h
diff --git a/GUI/coregui/Models/LayerRoughnessItems.cpp b/GUI/Models/LayerRoughnessItems.cpp
similarity index 100%
rename from GUI/coregui/Models/LayerRoughnessItems.cpp
rename to GUI/Models/LayerRoughnessItems.cpp
diff --git a/GUI/coregui/Models/LayerRoughnessItems.h b/GUI/Models/LayerRoughnessItems.h
similarity index 100%
rename from GUI/coregui/Models/LayerRoughnessItems.h
rename to GUI/Models/LayerRoughnessItems.h
diff --git a/GUI/coregui/Models/MaskItems.cpp b/GUI/Models/MaskItems.cpp
similarity index 100%
rename from GUI/coregui/Models/MaskItems.cpp
rename to GUI/Models/MaskItems.cpp
diff --git a/GUI/coregui/Models/MaskItems.h b/GUI/Models/MaskItems.h
similarity index 100%
rename from GUI/coregui/Models/MaskItems.h
rename to GUI/Models/MaskItems.h
diff --git a/GUI/coregui/Models/MaterialDataItems.cpp b/GUI/Models/MaterialDataItems.cpp
similarity index 100%
rename from GUI/coregui/Models/MaterialDataItems.cpp
rename to GUI/Models/MaterialDataItems.cpp
diff --git a/GUI/coregui/Models/MaterialDataItems.h b/GUI/Models/MaterialDataItems.h
similarity index 100%
rename from GUI/coregui/Models/MaterialDataItems.h
rename to GUI/Models/MaterialDataItems.h
diff --git a/GUI/coregui/Models/MaterialItem.cpp b/GUI/Models/MaterialItem.cpp
similarity index 100%
rename from GUI/coregui/Models/MaterialItem.cpp
rename to GUI/Models/MaterialItem.cpp
diff --git a/GUI/coregui/Models/MaterialItem.h b/GUI/Models/MaterialItem.h
similarity index 100%
rename from GUI/coregui/Models/MaterialItem.h
rename to GUI/Models/MaterialItem.h
diff --git a/GUI/coregui/Models/MaterialItemContainer.cpp b/GUI/Models/MaterialItemContainer.cpp
similarity index 100%
rename from GUI/coregui/Models/MaterialItemContainer.cpp
rename to GUI/Models/MaterialItemContainer.cpp
diff --git a/GUI/coregui/Models/MaterialItemContainer.h b/GUI/Models/MaterialItemContainer.h
similarity index 100%
rename from GUI/coregui/Models/MaterialItemContainer.h
rename to GUI/Models/MaterialItemContainer.h
diff --git a/GUI/coregui/Models/MaterialModel.cpp b/GUI/Models/MaterialModel.cpp
similarity index 100%
rename from GUI/coregui/Models/MaterialModel.cpp
rename to GUI/Models/MaterialModel.cpp
diff --git a/GUI/coregui/Models/MaterialModel.h b/GUI/Models/MaterialModel.h
similarity index 100%
rename from GUI/coregui/Models/MaterialModel.h
rename to GUI/Models/MaterialModel.h
diff --git a/GUI/coregui/Models/MaterialPropertyController.cpp b/GUI/Models/MaterialPropertyController.cpp
similarity index 100%
rename from GUI/coregui/Models/MaterialPropertyController.cpp
rename to GUI/Models/MaterialPropertyController.cpp
diff --git a/GUI/coregui/Models/MaterialPropertyController.h b/GUI/Models/MaterialPropertyController.h
similarity index 100%
rename from GUI/coregui/Models/MaterialPropertyController.h
rename to GUI/Models/MaterialPropertyController.h
diff --git a/GUI/coregui/Models/MesoCrystalItem.cpp b/GUI/Models/MesoCrystalItem.cpp
similarity index 100%
rename from GUI/coregui/Models/MesoCrystalItem.cpp
rename to GUI/Models/MesoCrystalItem.cpp
diff --git a/GUI/coregui/Models/MesoCrystalItem.h b/GUI/Models/MesoCrystalItem.h
similarity index 100%
rename from GUI/coregui/Models/MesoCrystalItem.h
rename to GUI/Models/MesoCrystalItem.h
diff --git a/GUI/coregui/Models/MinimizerItem.cpp b/GUI/Models/MinimizerItem.cpp
similarity index 100%
rename from GUI/coregui/Models/MinimizerItem.cpp
rename to GUI/Models/MinimizerItem.cpp
diff --git a/GUI/coregui/Models/MinimizerItem.h b/GUI/Models/MinimizerItem.h
similarity index 100%
rename from GUI/coregui/Models/MinimizerItem.h
rename to GUI/Models/MinimizerItem.h
diff --git a/GUI/coregui/Models/MinimizerItemCatalog.cpp b/GUI/Models/MinimizerItemCatalog.cpp
similarity index 100%
rename from GUI/coregui/Models/MinimizerItemCatalog.cpp
rename to GUI/Models/MinimizerItemCatalog.cpp
diff --git a/GUI/coregui/Models/MinimizerItemCatalog.h b/GUI/Models/MinimizerItemCatalog.h
similarity index 100%
rename from GUI/coregui/Models/MinimizerItemCatalog.h
rename to GUI/Models/MinimizerItemCatalog.h
diff --git a/GUI/coregui/Models/ModelMapper.cpp b/GUI/Models/ModelMapper.cpp
similarity index 100%
rename from GUI/coregui/Models/ModelMapper.cpp
rename to GUI/Models/ModelMapper.cpp
diff --git a/GUI/coregui/Models/ModelMapper.h b/GUI/Models/ModelMapper.h
similarity index 100%
rename from GUI/coregui/Models/ModelMapper.h
rename to GUI/Models/ModelMapper.h
diff --git a/GUI/coregui/Models/ModelPath.cpp b/GUI/Models/ModelPath.cpp
similarity index 100%
rename from GUI/coregui/Models/ModelPath.cpp
rename to GUI/Models/ModelPath.cpp
diff --git a/GUI/coregui/Models/ModelPath.h b/GUI/Models/ModelPath.h
similarity index 100%
rename from GUI/coregui/Models/ModelPath.h
rename to GUI/Models/ModelPath.h
diff --git a/GUI/coregui/Models/ModelUtils.cpp b/GUI/Models/ModelUtils.cpp
similarity index 100%
rename from GUI/coregui/Models/ModelUtils.cpp
rename to GUI/Models/ModelUtils.cpp
diff --git a/GUI/coregui/Models/ModelUtils.h b/GUI/Models/ModelUtils.h
similarity index 100%
rename from GUI/coregui/Models/ModelUtils.h
rename to GUI/Models/ModelUtils.h
diff --git a/GUI/coregui/Models/MultiLayerItem.cpp b/GUI/Models/MultiLayerItem.cpp
similarity index 100%
rename from GUI/coregui/Models/MultiLayerItem.cpp
rename to GUI/Models/MultiLayerItem.cpp
diff --git a/GUI/coregui/Models/MultiLayerItem.h b/GUI/Models/MultiLayerItem.h
similarity index 100%
rename from GUI/coregui/Models/MultiLayerItem.h
rename to GUI/Models/MultiLayerItem.h
diff --git a/GUI/coregui/Models/ParameterTreeItems.cpp b/GUI/Models/ParameterTreeItems.cpp
similarity index 100%
rename from GUI/coregui/Models/ParameterTreeItems.cpp
rename to GUI/Models/ParameterTreeItems.cpp
diff --git a/GUI/coregui/Models/ParameterTreeItems.h b/GUI/Models/ParameterTreeItems.h
similarity index 100%
rename from GUI/coregui/Models/ParameterTreeItems.h
rename to GUI/Models/ParameterTreeItems.h
diff --git a/GUI/coregui/Models/ParameterTreeUtils.cpp b/GUI/Models/ParameterTreeUtils.cpp
similarity index 100%
rename from GUI/coregui/Models/ParameterTreeUtils.cpp
rename to GUI/Models/ParameterTreeUtils.cpp
diff --git a/GUI/coregui/Models/ParameterTreeUtils.h b/GUI/Models/ParameterTreeUtils.h
similarity index 100%
rename from GUI/coregui/Models/ParameterTreeUtils.h
rename to GUI/Models/ParameterTreeUtils.h
diff --git a/GUI/coregui/Models/ParameterTuningModel.cpp b/GUI/Models/ParameterTuningModel.cpp
similarity index 100%
rename from GUI/coregui/Models/ParameterTuningModel.cpp
rename to GUI/Models/ParameterTuningModel.cpp
diff --git a/GUI/coregui/Models/ParameterTuningModel.h b/GUI/Models/ParameterTuningModel.h
similarity index 100%
rename from GUI/coregui/Models/ParameterTuningModel.h
rename to GUI/Models/ParameterTuningModel.h
diff --git a/GUI/coregui/Models/ParticleCompositionItem.cpp b/GUI/Models/ParticleCompositionItem.cpp
similarity index 100%
rename from GUI/coregui/Models/ParticleCompositionItem.cpp
rename to GUI/Models/ParticleCompositionItem.cpp
diff --git a/GUI/coregui/Models/ParticleCompositionItem.h b/GUI/Models/ParticleCompositionItem.h
similarity index 100%
rename from GUI/coregui/Models/ParticleCompositionItem.h
rename to GUI/Models/ParticleCompositionItem.h
diff --git a/GUI/coregui/Models/ParticleCoreShellItem.cpp b/GUI/Models/ParticleCoreShellItem.cpp
similarity index 100%
rename from GUI/coregui/Models/ParticleCoreShellItem.cpp
rename to GUI/Models/ParticleCoreShellItem.cpp
diff --git a/GUI/coregui/Models/ParticleCoreShellItem.h b/GUI/Models/ParticleCoreShellItem.h
similarity index 100%
rename from GUI/coregui/Models/ParticleCoreShellItem.h
rename to GUI/Models/ParticleCoreShellItem.h
diff --git a/GUI/coregui/Models/ParticleItem.cpp b/GUI/Models/ParticleItem.cpp
similarity index 100%
rename from GUI/coregui/Models/ParticleItem.cpp
rename to GUI/Models/ParticleItem.cpp
diff --git a/GUI/coregui/Models/ParticleItem.h b/GUI/Models/ParticleItem.h
similarity index 100%
rename from GUI/coregui/Models/ParticleItem.h
rename to GUI/Models/ParticleItem.h
diff --git a/GUI/coregui/Models/ParticleLayoutItem.cpp b/GUI/Models/ParticleLayoutItem.cpp
similarity index 100%
rename from GUI/coregui/Models/ParticleLayoutItem.cpp
rename to GUI/Models/ParticleLayoutItem.cpp
diff --git a/GUI/coregui/Models/ParticleLayoutItem.h b/GUI/Models/ParticleLayoutItem.h
similarity index 100%
rename from GUI/coregui/Models/ParticleLayoutItem.h
rename to GUI/Models/ParticleLayoutItem.h
diff --git a/GUI/coregui/Models/PointwiseAxisItem.cpp b/GUI/Models/PointwiseAxisItem.cpp
similarity index 100%
rename from GUI/coregui/Models/PointwiseAxisItem.cpp
rename to GUI/Models/PointwiseAxisItem.cpp
diff --git a/GUI/coregui/Models/PointwiseAxisItem.h b/GUI/Models/PointwiseAxisItem.h
similarity index 100%
rename from GUI/coregui/Models/PointwiseAxisItem.h
rename to GUI/Models/PointwiseAxisItem.h
diff --git a/GUI/coregui/Models/ProjectionItems.cpp b/GUI/Models/ProjectionItems.cpp
similarity index 100%
rename from GUI/coregui/Models/ProjectionItems.cpp
rename to GUI/Models/ProjectionItems.cpp
diff --git a/GUI/coregui/Models/ProjectionItems.h b/GUI/Models/ProjectionItems.h
similarity index 100%
rename from GUI/coregui/Models/ProjectionItems.h
rename to GUI/Models/ProjectionItems.h
diff --git a/GUI/coregui/Models/PropertyItem.cpp b/GUI/Models/PropertyItem.cpp
similarity index 100%
rename from GUI/coregui/Models/PropertyItem.cpp
rename to GUI/Models/PropertyItem.cpp
diff --git a/GUI/coregui/Models/PropertyItem.h b/GUI/Models/PropertyItem.h
similarity index 100%
rename from GUI/coregui/Models/PropertyItem.h
rename to GUI/Models/PropertyItem.h
diff --git a/GUI/coregui/Models/ProxyModelStrategy.cpp b/GUI/Models/ProxyModelStrategy.cpp
similarity index 100%
rename from GUI/coregui/Models/ProxyModelStrategy.cpp
rename to GUI/Models/ProxyModelStrategy.cpp
diff --git a/GUI/coregui/Models/ProxyModelStrategy.h b/GUI/Models/ProxyModelStrategy.h
similarity index 100%
rename from GUI/coregui/Models/ProxyModelStrategy.h
rename to GUI/Models/ProxyModelStrategy.h
diff --git a/GUI/coregui/Models/RealDataItem.cpp b/GUI/Models/RealDataItem.cpp
similarity index 100%
rename from GUI/coregui/Models/RealDataItem.cpp
rename to GUI/Models/RealDataItem.cpp
diff --git a/GUI/coregui/Models/RealDataItem.h b/GUI/Models/RealDataItem.h
similarity index 100%
rename from GUI/coregui/Models/RealDataItem.h
rename to GUI/Models/RealDataItem.h
diff --git a/GUI/coregui/Models/RealDataModel.cpp b/GUI/Models/RealDataModel.cpp
similarity index 100%
rename from GUI/coregui/Models/RealDataModel.cpp
rename to GUI/Models/RealDataModel.cpp
diff --git a/GUI/coregui/Models/RealDataModel.h b/GUI/Models/RealDataModel.h
similarity index 100%
rename from GUI/coregui/Models/RealDataModel.h
rename to GUI/Models/RealDataModel.h
diff --git a/GUI/coregui/Models/RealLimitsItems.cpp b/GUI/Models/RealLimitsItems.cpp
similarity index 100%
rename from GUI/coregui/Models/RealLimitsItems.cpp
rename to GUI/Models/RealLimitsItems.cpp
diff --git a/GUI/coregui/Models/RealLimitsItems.h b/GUI/Models/RealLimitsItems.h
similarity index 100%
rename from GUI/coregui/Models/RealLimitsItems.h
rename to GUI/Models/RealLimitsItems.h
diff --git a/GUI/coregui/Models/RectangularDetectorItem.cpp b/GUI/Models/RectangularDetectorItem.cpp
similarity index 100%
rename from GUI/coregui/Models/RectangularDetectorItem.cpp
rename to GUI/Models/RectangularDetectorItem.cpp
diff --git a/GUI/coregui/Models/RectangularDetectorItem.h b/GUI/Models/RectangularDetectorItem.h
similarity index 100%
rename from GUI/coregui/Models/RectangularDetectorItem.h
rename to GUI/Models/RectangularDetectorItem.h
diff --git a/GUI/coregui/Models/ResolutionFunctionItems.cpp b/GUI/Models/ResolutionFunctionItems.cpp
similarity index 100%
rename from GUI/coregui/Models/ResolutionFunctionItems.cpp
rename to GUI/Models/ResolutionFunctionItems.cpp
diff --git a/GUI/coregui/Models/ResolutionFunctionItems.h b/GUI/Models/ResolutionFunctionItems.h
similarity index 100%
rename from GUI/coregui/Models/ResolutionFunctionItems.h
rename to GUI/Models/ResolutionFunctionItems.h
diff --git a/GUI/coregui/Models/RotationItems.cpp b/GUI/Models/RotationItems.cpp
similarity index 100%
rename from GUI/coregui/Models/RotationItems.cpp
rename to GUI/Models/RotationItems.cpp
diff --git a/GUI/coregui/Models/RotationItems.h b/GUI/Models/RotationItems.h
similarity index 100%
rename from GUI/coregui/Models/RotationItems.h
rename to GUI/Models/RotationItems.h
diff --git a/GUI/coregui/Models/SampleModel.cpp b/GUI/Models/SampleModel.cpp
similarity index 100%
rename from GUI/coregui/Models/SampleModel.cpp
rename to GUI/Models/SampleModel.cpp
diff --git a/GUI/coregui/Models/SampleModel.h b/GUI/Models/SampleModel.h
similarity index 100%
rename from GUI/coregui/Models/SampleModel.h
rename to GUI/Models/SampleModel.h
diff --git a/GUI/coregui/Models/SampleValidator.cpp b/GUI/Models/SampleValidator.cpp
similarity index 100%
rename from GUI/coregui/Models/SampleValidator.cpp
rename to GUI/Models/SampleValidator.cpp
diff --git a/GUI/coregui/Models/SampleValidator.h b/GUI/Models/SampleValidator.h
similarity index 100%
rename from GUI/coregui/Models/SampleValidator.h
rename to GUI/Models/SampleValidator.h
diff --git a/GUI/coregui/Models/SessionDecorationModel.cpp b/GUI/Models/SessionDecorationModel.cpp
similarity index 100%
rename from GUI/coregui/Models/SessionDecorationModel.cpp
rename to GUI/Models/SessionDecorationModel.cpp
diff --git a/GUI/coregui/Models/SessionDecorationModel.h b/GUI/Models/SessionDecorationModel.h
similarity index 100%
rename from GUI/coregui/Models/SessionDecorationModel.h
rename to GUI/Models/SessionDecorationModel.h
diff --git a/GUI/coregui/Models/SessionFlags.h b/GUI/Models/SessionFlags.h
similarity index 100%
rename from GUI/coregui/Models/SessionFlags.h
rename to GUI/Models/SessionFlags.h
diff --git a/GUI/coregui/Models/SessionGraphicsItem.cpp b/GUI/Models/SessionGraphicsItem.cpp
similarity index 100%
rename from GUI/coregui/Models/SessionGraphicsItem.cpp
rename to GUI/Models/SessionGraphicsItem.cpp
diff --git a/GUI/coregui/Models/SessionGraphicsItem.h b/GUI/Models/SessionGraphicsItem.h
similarity index 100%
rename from GUI/coregui/Models/SessionGraphicsItem.h
rename to GUI/Models/SessionGraphicsItem.h
diff --git a/GUI/coregui/Models/SessionItem.cpp b/GUI/Models/SessionItem.cpp
similarity index 100%
rename from GUI/coregui/Models/SessionItem.cpp
rename to GUI/Models/SessionItem.cpp
diff --git a/GUI/coregui/Models/SessionItem.h b/GUI/Models/SessionItem.h
similarity index 100%
rename from GUI/coregui/Models/SessionItem.h
rename to GUI/Models/SessionItem.h
diff --git a/GUI/coregui/Models/SessionItemData.cpp b/GUI/Models/SessionItemData.cpp
similarity index 100%
rename from GUI/coregui/Models/SessionItemData.cpp
rename to GUI/Models/SessionItemData.cpp
diff --git a/GUI/coregui/Models/SessionItemData.h b/GUI/Models/SessionItemData.h
similarity index 100%
rename from GUI/coregui/Models/SessionItemData.h
rename to GUI/Models/SessionItemData.h
diff --git a/GUI/coregui/Models/SessionItemTags.cpp b/GUI/Models/SessionItemTags.cpp
similarity index 100%
rename from GUI/coregui/Models/SessionItemTags.cpp
rename to GUI/Models/SessionItemTags.cpp
diff --git a/GUI/coregui/Models/SessionItemTags.h b/GUI/Models/SessionItemTags.h
similarity index 100%
rename from GUI/coregui/Models/SessionItemTags.h
rename to GUI/Models/SessionItemTags.h
diff --git a/GUI/coregui/Models/SessionItemUtils.cpp b/GUI/Models/SessionItemUtils.cpp
similarity index 100%
rename from GUI/coregui/Models/SessionItemUtils.cpp
rename to GUI/Models/SessionItemUtils.cpp
diff --git a/GUI/coregui/Models/SessionItemUtils.h b/GUI/Models/SessionItemUtils.h
similarity index 100%
rename from GUI/coregui/Models/SessionItemUtils.h
rename to GUI/Models/SessionItemUtils.h
diff --git a/GUI/coregui/Models/SessionModel.cpp b/GUI/Models/SessionModel.cpp
similarity index 100%
rename from GUI/coregui/Models/SessionModel.cpp
rename to GUI/Models/SessionModel.cpp
diff --git a/GUI/coregui/Models/SessionModel.h b/GUI/Models/SessionModel.h
similarity index 100%
rename from GUI/coregui/Models/SessionModel.h
rename to GUI/Models/SessionModel.h
diff --git a/GUI/coregui/Models/SessionModelDelegate.cpp b/GUI/Models/SessionModelDelegate.cpp
similarity index 100%
rename from GUI/coregui/Models/SessionModelDelegate.cpp
rename to GUI/Models/SessionModelDelegate.cpp
diff --git a/GUI/coregui/Models/SessionModelDelegate.h b/GUI/Models/SessionModelDelegate.h
similarity index 100%
rename from GUI/coregui/Models/SessionModelDelegate.h
rename to GUI/Models/SessionModelDelegate.h
diff --git a/GUI/coregui/Models/SessionXML.cpp b/GUI/Models/SessionXML.cpp
similarity index 100%
rename from GUI/coregui/Models/SessionXML.cpp
rename to GUI/Models/SessionXML.cpp
diff --git a/GUI/coregui/Models/SessionXML.h b/GUI/Models/SessionXML.h
similarity index 100%
rename from GUI/coregui/Models/SessionXML.h
rename to GUI/Models/SessionXML.h
diff --git a/GUI/coregui/Models/SimulationOptionsItem.cpp b/GUI/Models/SimulationOptionsItem.cpp
similarity index 100%
rename from GUI/coregui/Models/SimulationOptionsItem.cpp
rename to GUI/Models/SimulationOptionsItem.cpp
diff --git a/GUI/coregui/Models/SimulationOptionsItem.h b/GUI/Models/SimulationOptionsItem.h
similarity index 100%
rename from GUI/coregui/Models/SimulationOptionsItem.h
rename to GUI/Models/SimulationOptionsItem.h
diff --git a/GUI/coregui/Models/SpecularBeamInclinationItem.cpp b/GUI/Models/SpecularBeamInclinationItem.cpp
similarity index 100%
rename from GUI/coregui/Models/SpecularBeamInclinationItem.cpp
rename to GUI/Models/SpecularBeamInclinationItem.cpp
diff --git a/GUI/coregui/Models/SpecularBeamInclinationItem.h b/GUI/Models/SpecularBeamInclinationItem.h
similarity index 100%
rename from GUI/coregui/Models/SpecularBeamInclinationItem.h
rename to GUI/Models/SpecularBeamInclinationItem.h
diff --git a/GUI/coregui/Models/SpecularDataItem.cpp b/GUI/Models/SpecularDataItem.cpp
similarity index 100%
rename from GUI/coregui/Models/SpecularDataItem.cpp
rename to GUI/Models/SpecularDataItem.cpp
diff --git a/GUI/coregui/Models/SpecularDataItem.h b/GUI/Models/SpecularDataItem.h
similarity index 100%
rename from GUI/coregui/Models/SpecularDataItem.h
rename to GUI/Models/SpecularDataItem.h
diff --git a/GUI/coregui/Models/SphericalDetectorItem.cpp b/GUI/Models/SphericalDetectorItem.cpp
similarity index 100%
rename from GUI/coregui/Models/SphericalDetectorItem.cpp
rename to GUI/Models/SphericalDetectorItem.cpp
diff --git a/GUI/coregui/Models/SphericalDetectorItem.h b/GUI/Models/SphericalDetectorItem.h
similarity index 100%
rename from GUI/coregui/Models/SphericalDetectorItem.h
rename to GUI/Models/SphericalDetectorItem.h
diff --git a/GUI/coregui/Models/TransformFromDomain.cpp b/GUI/Models/TransformFromDomain.cpp
similarity index 100%
rename from GUI/coregui/Models/TransformFromDomain.cpp
rename to GUI/Models/TransformFromDomain.cpp
diff --git a/GUI/coregui/Models/TransformFromDomain.h b/GUI/Models/TransformFromDomain.h
similarity index 100%
rename from GUI/coregui/Models/TransformFromDomain.h
rename to GUI/Models/TransformFromDomain.h
diff --git a/GUI/coregui/Models/TransformToDomain.cpp b/GUI/Models/TransformToDomain.cpp
similarity index 100%
rename from GUI/coregui/Models/TransformToDomain.cpp
rename to GUI/Models/TransformToDomain.cpp
diff --git a/GUI/coregui/Models/TransformToDomain.h b/GUI/Models/TransformToDomain.h
similarity index 100%
rename from GUI/coregui/Models/TransformToDomain.h
rename to GUI/Models/TransformToDomain.h
diff --git a/GUI/coregui/Models/TransformationItem.cpp b/GUI/Models/TransformationItem.cpp
similarity index 100%
rename from GUI/coregui/Models/TransformationItem.cpp
rename to GUI/Models/TransformationItem.cpp
diff --git a/GUI/coregui/Models/TransformationItem.h b/GUI/Models/TransformationItem.h
similarity index 100%
rename from GUI/coregui/Models/TransformationItem.h
rename to GUI/Models/TransformationItem.h
diff --git a/GUI/coregui/Models/VectorItem.cpp b/GUI/Models/VectorItem.cpp
similarity index 100%
rename from GUI/coregui/Models/VectorItem.cpp
rename to GUI/Models/VectorItem.cpp
diff --git a/GUI/coregui/Models/VectorItem.h b/GUI/Models/VectorItem.h
similarity index 100%
rename from GUI/coregui/Models/VectorItem.h
rename to GUI/Models/VectorItem.h
diff --git a/GUI/coregui/Views/AccordionWidget/AccordionWidget.cpp b/GUI/Views/AccordionWidget/AccordionWidget.cpp
similarity index 100%
rename from GUI/coregui/Views/AccordionWidget/AccordionWidget.cpp
rename to GUI/Views/AccordionWidget/AccordionWidget.cpp
diff --git a/GUI/coregui/Views/AccordionWidget/AccordionWidget.h b/GUI/Views/AccordionWidget/AccordionWidget.h
similarity index 100%
rename from GUI/coregui/Views/AccordionWidget/AccordionWidget.h
rename to GUI/Views/AccordionWidget/AccordionWidget.h
diff --git a/GUI/coregui/Views/AccordionWidget/ClickableFrame.cpp b/GUI/Views/AccordionWidget/ClickableFrame.cpp
similarity index 100%
rename from GUI/coregui/Views/AccordionWidget/ClickableFrame.cpp
rename to GUI/Views/AccordionWidget/ClickableFrame.cpp
diff --git a/GUI/coregui/Views/AccordionWidget/ClickableFrame.h b/GUI/Views/AccordionWidget/ClickableFrame.h
similarity index 100%
rename from GUI/coregui/Views/AccordionWidget/ClickableFrame.h
rename to GUI/Views/AccordionWidget/ClickableFrame.h
diff --git a/GUI/coregui/Views/AccordionWidget/ContentPane.cpp b/GUI/Views/AccordionWidget/ContentPane.cpp
similarity index 100%
rename from GUI/coregui/Views/AccordionWidget/ContentPane.cpp
rename to GUI/Views/AccordionWidget/ContentPane.cpp
diff --git a/GUI/coregui/Views/AccordionWidget/ContentPane.h b/GUI/Views/AccordionWidget/ContentPane.h
similarity index 100%
rename from GUI/coregui/Views/AccordionWidget/ContentPane.h
rename to GUI/Views/AccordionWidget/ContentPane.h
diff --git a/GUI/coregui/Views/AccordionWidget/accordionwidgeticons.qrc b/GUI/Views/AccordionWidget/accordionwidgeticons.qrc
similarity index 100%
rename from GUI/coregui/Views/AccordionWidget/accordionwidgeticons.qrc
rename to GUI/Views/AccordionWidget/accordionwidgeticons.qrc
diff --git a/GUI/coregui/Views/AccordionWidget/caret-bottom.png b/GUI/Views/AccordionWidget/caret-bottom.png
similarity index 100%
rename from GUI/coregui/Views/AccordionWidget/caret-bottom.png
rename to GUI/Views/AccordionWidget/caret-bottom.png
diff --git a/GUI/coregui/Views/AccordionWidget/caret-right.png b/GUI/Views/AccordionWidget/caret-right.png
similarity index 100%
rename from GUI/coregui/Views/AccordionWidget/caret-right.png
rename to GUI/Views/AccordionWidget/caret-right.png
diff --git a/GUI/coregui/Views/CommonWidgets/AdjustingScrollArea.cpp b/GUI/Views/CommonWidgets/AdjustingScrollArea.cpp
similarity index 100%
rename from GUI/coregui/Views/CommonWidgets/AdjustingScrollArea.cpp
rename to GUI/Views/CommonWidgets/AdjustingScrollArea.cpp
diff --git a/GUI/coregui/Views/CommonWidgets/AdjustingScrollArea.h b/GUI/Views/CommonWidgets/AdjustingScrollArea.h
similarity index 100%
rename from GUI/coregui/Views/CommonWidgets/AdjustingScrollArea.h
rename to GUI/Views/CommonWidgets/AdjustingScrollArea.h
diff --git a/GUI/coregui/Views/CommonWidgets/ColumnResizer.cpp b/GUI/Views/CommonWidgets/ColumnResizer.cpp
similarity index 100%
rename from GUI/coregui/Views/CommonWidgets/ColumnResizer.cpp
rename to GUI/Views/CommonWidgets/ColumnResizer.cpp
diff --git a/GUI/coregui/Views/CommonWidgets/ColumnResizer.h b/GUI/Views/CommonWidgets/ColumnResizer.h
similarity index 100%
rename from GUI/coregui/Views/CommonWidgets/ColumnResizer.h
rename to GUI/Views/CommonWidgets/ColumnResizer.h
diff --git a/GUI/coregui/Views/CommonWidgets/DockWidgetInfo.cpp b/GUI/Views/CommonWidgets/DockWidgetInfo.cpp
similarity index 100%
rename from GUI/coregui/Views/CommonWidgets/DockWidgetInfo.cpp
rename to GUI/Views/CommonWidgets/DockWidgetInfo.cpp
diff --git a/GUI/coregui/Views/CommonWidgets/DockWidgetInfo.h b/GUI/Views/CommonWidgets/DockWidgetInfo.h
similarity index 100%
rename from GUI/coregui/Views/CommonWidgets/DockWidgetInfo.h
rename to GUI/Views/CommonWidgets/DockWidgetInfo.h
diff --git a/GUI/coregui/Views/CommonWidgets/DocksController.cpp b/GUI/Views/CommonWidgets/DocksController.cpp
similarity index 100%
rename from GUI/coregui/Views/CommonWidgets/DocksController.cpp
rename to GUI/Views/CommonWidgets/DocksController.cpp
diff --git a/GUI/coregui/Views/CommonWidgets/DocksController.h b/GUI/Views/CommonWidgets/DocksController.h
similarity index 100%
rename from GUI/coregui/Views/CommonWidgets/DocksController.h
rename to GUI/Views/CommonWidgets/DocksController.h
diff --git a/GUI/coregui/Views/CommonWidgets/InfoPanel.cpp b/GUI/Views/CommonWidgets/InfoPanel.cpp
similarity index 100%
rename from GUI/coregui/Views/CommonWidgets/InfoPanel.cpp
rename to GUI/Views/CommonWidgets/InfoPanel.cpp
diff --git a/GUI/coregui/Views/CommonWidgets/InfoPanel.h b/GUI/Views/CommonWidgets/InfoPanel.h
similarity index 100%
rename from GUI/coregui/Views/CommonWidgets/InfoPanel.h
rename to GUI/Views/CommonWidgets/InfoPanel.h
diff --git a/GUI/coregui/Views/CommonWidgets/InfoPanelToolBar.cpp b/GUI/Views/CommonWidgets/InfoPanelToolBar.cpp
similarity index 100%
rename from GUI/coregui/Views/CommonWidgets/InfoPanelToolBar.cpp
rename to GUI/Views/CommonWidgets/InfoPanelToolBar.cpp
diff --git a/GUI/coregui/Views/CommonWidgets/InfoPanelToolBar.h b/GUI/Views/CommonWidgets/InfoPanelToolBar.h
similarity index 100%
rename from GUI/coregui/Views/CommonWidgets/InfoPanelToolBar.h
rename to GUI/Views/CommonWidgets/InfoPanelToolBar.h
diff --git a/GUI/coregui/Views/CommonWidgets/ItemComboToolBar.cpp b/GUI/Views/CommonWidgets/ItemComboToolBar.cpp
similarity index 100%
rename from GUI/coregui/Views/CommonWidgets/ItemComboToolBar.cpp
rename to GUI/Views/CommonWidgets/ItemComboToolBar.cpp
diff --git a/GUI/coregui/Views/CommonWidgets/ItemComboToolBar.h b/GUI/Views/CommonWidgets/ItemComboToolBar.h
similarity index 100%
rename from GUI/coregui/Views/CommonWidgets/ItemComboToolBar.h
rename to GUI/Views/CommonWidgets/ItemComboToolBar.h
diff --git a/GUI/coregui/Views/CommonWidgets/ItemComboWidget.cpp b/GUI/Views/CommonWidgets/ItemComboWidget.cpp
similarity index 100%
rename from GUI/coregui/Views/CommonWidgets/ItemComboWidget.cpp
rename to GUI/Views/CommonWidgets/ItemComboWidget.cpp
diff --git a/GUI/coregui/Views/CommonWidgets/ItemComboWidget.h b/GUI/Views/CommonWidgets/ItemComboWidget.h
similarity index 100%
rename from GUI/coregui/Views/CommonWidgets/ItemComboWidget.h
rename to GUI/Views/CommonWidgets/ItemComboWidget.h
diff --git a/GUI/coregui/Views/CommonWidgets/ItemSelectorWidget.cpp b/GUI/Views/CommonWidgets/ItemSelectorWidget.cpp
similarity index 100%
rename from GUI/coregui/Views/CommonWidgets/ItemSelectorWidget.cpp
rename to GUI/Views/CommonWidgets/ItemSelectorWidget.cpp
diff --git a/GUI/coregui/Views/CommonWidgets/ItemSelectorWidget.h b/GUI/Views/CommonWidgets/ItemSelectorWidget.h
similarity index 100%
rename from GUI/coregui/Views/CommonWidgets/ItemSelectorWidget.h
rename to GUI/Views/CommonWidgets/ItemSelectorWidget.h
diff --git a/GUI/coregui/Views/CommonWidgets/ItemStackPresenter.h b/GUI/Views/CommonWidgets/ItemStackPresenter.h
similarity index 100%
rename from GUI/coregui/Views/CommonWidgets/ItemStackPresenter.h
rename to GUI/Views/CommonWidgets/ItemStackPresenter.h
diff --git a/GUI/coregui/Views/CommonWidgets/ItemStackWidget.cpp b/GUI/Views/CommonWidgets/ItemStackWidget.cpp
similarity index 100%
rename from GUI/coregui/Views/CommonWidgets/ItemStackWidget.cpp
rename to GUI/Views/CommonWidgets/ItemStackWidget.cpp
diff --git a/GUI/coregui/Views/CommonWidgets/ItemStackWidget.h b/GUI/Views/CommonWidgets/ItemStackWidget.h
similarity index 100%
rename from GUI/coregui/Views/CommonWidgets/ItemStackWidget.h
rename to GUI/Views/CommonWidgets/ItemStackWidget.h
diff --git a/GUI/coregui/Views/CommonWidgets/ModelTreeView.cpp b/GUI/Views/CommonWidgets/ModelTreeView.cpp
similarity index 100%
rename from GUI/coregui/Views/CommonWidgets/ModelTreeView.cpp
rename to GUI/Views/CommonWidgets/ModelTreeView.cpp
diff --git a/GUI/coregui/Views/CommonWidgets/ModelTreeView.h b/GUI/Views/CommonWidgets/ModelTreeView.h
similarity index 100%
rename from GUI/coregui/Views/CommonWidgets/ModelTreeView.h
rename to GUI/Views/CommonWidgets/ModelTreeView.h
diff --git a/GUI/coregui/Views/CommonWidgets/SessionItemController.cpp b/GUI/Views/CommonWidgets/SessionItemController.cpp
similarity index 100%
rename from GUI/coregui/Views/CommonWidgets/SessionItemController.cpp
rename to GUI/Views/CommonWidgets/SessionItemController.cpp
diff --git a/GUI/coregui/Views/CommonWidgets/SessionItemController.h b/GUI/Views/CommonWidgets/SessionItemController.h
similarity index 100%
rename from GUI/coregui/Views/CommonWidgets/SessionItemController.h
rename to GUI/Views/CommonWidgets/SessionItemController.h
diff --git a/GUI/coregui/Views/CommonWidgets/SessionItemWidget.cpp b/GUI/Views/CommonWidgets/SessionItemWidget.cpp
similarity index 100%
rename from GUI/coregui/Views/CommonWidgets/SessionItemWidget.cpp
rename to GUI/Views/CommonWidgets/SessionItemWidget.cpp
diff --git a/GUI/coregui/Views/CommonWidgets/SessionItemWidget.h b/GUI/Views/CommonWidgets/SessionItemWidget.h
similarity index 100%
rename from GUI/coregui/Views/CommonWidgets/SessionItemWidget.h
rename to GUI/Views/CommonWidgets/SessionItemWidget.h
diff --git a/GUI/coregui/Views/CommonWidgets/StatusLabel.cpp b/GUI/Views/CommonWidgets/StatusLabel.cpp
similarity index 100%
rename from GUI/coregui/Views/CommonWidgets/StatusLabel.cpp
rename to GUI/Views/CommonWidgets/StatusLabel.cpp
diff --git a/GUI/coregui/Views/CommonWidgets/StatusLabel.h b/GUI/Views/CommonWidgets/StatusLabel.h
similarity index 100%
rename from GUI/coregui/Views/CommonWidgets/StatusLabel.h
rename to GUI/Views/CommonWidgets/StatusLabel.h
diff --git a/GUI/coregui/Views/CommonWidgets/UpdateTimer.cpp b/GUI/Views/CommonWidgets/UpdateTimer.cpp
similarity index 100%
rename from GUI/coregui/Views/CommonWidgets/UpdateTimer.cpp
rename to GUI/Views/CommonWidgets/UpdateTimer.cpp
diff --git a/GUI/coregui/Views/CommonWidgets/UpdateTimer.h b/GUI/Views/CommonWidgets/UpdateTimer.h
similarity index 100%
rename from GUI/coregui/Views/CommonWidgets/UpdateTimer.h
rename to GUI/Views/CommonWidgets/UpdateTimer.h
diff --git a/GUI/coregui/Views/CommonWidgets/detailsbutton.cpp b/GUI/Views/CommonWidgets/detailsbutton.cpp
similarity index 100%
rename from GUI/coregui/Views/CommonWidgets/detailsbutton.cpp
rename to GUI/Views/CommonWidgets/detailsbutton.cpp
diff --git a/GUI/coregui/Views/CommonWidgets/detailsbutton.h b/GUI/Views/CommonWidgets/detailsbutton.h
similarity index 100%
rename from GUI/coregui/Views/CommonWidgets/detailsbutton.h
rename to GUI/Views/CommonWidgets/detailsbutton.h
diff --git a/GUI/coregui/Views/CommonWidgets/detailswidget.cpp b/GUI/Views/CommonWidgets/detailswidget.cpp
similarity index 100%
rename from GUI/coregui/Views/CommonWidgets/detailswidget.cpp
rename to GUI/Views/CommonWidgets/detailswidget.cpp
diff --git a/GUI/coregui/Views/CommonWidgets/detailswidget.h b/GUI/Views/CommonWidgets/detailswidget.h
similarity index 100%
rename from GUI/coregui/Views/CommonWidgets/detailswidget.h
rename to GUI/Views/CommonWidgets/detailswidget.h
diff --git a/GUI/coregui/Views/FitWidgets/FitActivityPanel.cpp b/GUI/Views/FitWidgets/FitActivityPanel.cpp
similarity index 100%
rename from GUI/coregui/Views/FitWidgets/FitActivityPanel.cpp
rename to GUI/Views/FitWidgets/FitActivityPanel.cpp
diff --git a/GUI/coregui/Views/FitWidgets/FitActivityPanel.h b/GUI/Views/FitWidgets/FitActivityPanel.h
similarity index 100%
rename from GUI/coregui/Views/FitWidgets/FitActivityPanel.h
rename to GUI/Views/FitWidgets/FitActivityPanel.h
diff --git a/GUI/coregui/Views/FitWidgets/FitComparisonController.cpp b/GUI/Views/FitWidgets/FitComparisonController.cpp
similarity index 100%
rename from GUI/coregui/Views/FitWidgets/FitComparisonController.cpp
rename to GUI/Views/FitWidgets/FitComparisonController.cpp
diff --git a/GUI/coregui/Views/FitWidgets/FitComparisonController.h b/GUI/Views/FitWidgets/FitComparisonController.h
similarity index 100%
rename from GUI/coregui/Views/FitWidgets/FitComparisonController.h
rename to GUI/Views/FitWidgets/FitComparisonController.h
diff --git a/GUI/coregui/Views/FitWidgets/FitComparisonViewController.cpp b/GUI/Views/FitWidgets/FitComparisonViewController.cpp
similarity index 100%
rename from GUI/coregui/Views/FitWidgets/FitComparisonViewController.cpp
rename to GUI/Views/FitWidgets/FitComparisonViewController.cpp
diff --git a/GUI/coregui/Views/FitWidgets/FitComparisonViewController.h b/GUI/Views/FitWidgets/FitComparisonViewController.h
similarity index 100%
rename from GUI/coregui/Views/FitWidgets/FitComparisonViewController.h
rename to GUI/Views/FitWidgets/FitComparisonViewController.h
diff --git a/GUI/coregui/Views/FitWidgets/FitComparisonWidget.cpp b/GUI/Views/FitWidgets/FitComparisonWidget.cpp
similarity index 100%
rename from GUI/coregui/Views/FitWidgets/FitComparisonWidget.cpp
rename to GUI/Views/FitWidgets/FitComparisonWidget.cpp
diff --git a/GUI/coregui/Views/FitWidgets/FitComparisonWidget.h b/GUI/Views/FitWidgets/FitComparisonWidget.h
similarity index 100%
rename from GUI/coregui/Views/FitWidgets/FitComparisonWidget.h
rename to GUI/Views/FitWidgets/FitComparisonWidget.h
diff --git a/GUI/coregui/Views/FitWidgets/FitComparisonWidget1D.cpp b/GUI/Views/FitWidgets/FitComparisonWidget1D.cpp
similarity index 100%
rename from GUI/coregui/Views/FitWidgets/FitComparisonWidget1D.cpp
rename to GUI/Views/FitWidgets/FitComparisonWidget1D.cpp
diff --git a/GUI/coregui/Views/FitWidgets/FitComparisonWidget1D.h b/GUI/Views/FitWidgets/FitComparisonWidget1D.h
similarity index 100%
rename from GUI/coregui/Views/FitWidgets/FitComparisonWidget1D.h
rename to GUI/Views/FitWidgets/FitComparisonWidget1D.h
diff --git a/GUI/coregui/Views/FitWidgets/FitFlowWidget.cpp b/GUI/Views/FitWidgets/FitFlowWidget.cpp
similarity index 100%
rename from GUI/coregui/Views/FitWidgets/FitFlowWidget.cpp
rename to GUI/Views/FitWidgets/FitFlowWidget.cpp
diff --git a/GUI/coregui/Views/FitWidgets/FitFlowWidget.h b/GUI/Views/FitWidgets/FitFlowWidget.h
similarity index 100%
rename from GUI/coregui/Views/FitWidgets/FitFlowWidget.h
rename to GUI/Views/FitWidgets/FitFlowWidget.h
diff --git a/GUI/coregui/Views/FitWidgets/FitLog.cpp b/GUI/Views/FitWidgets/FitLog.cpp
similarity index 100%
rename from GUI/coregui/Views/FitWidgets/FitLog.cpp
rename to GUI/Views/FitWidgets/FitLog.cpp
diff --git a/GUI/coregui/Views/FitWidgets/FitLog.h b/GUI/Views/FitWidgets/FitLog.h
similarity index 100%
rename from GUI/coregui/Views/FitWidgets/FitLog.h
rename to GUI/Views/FitWidgets/FitLog.h
diff --git a/GUI/coregui/Views/FitWidgets/FitLogFlags.cpp b/GUI/Views/FitWidgets/FitLogFlags.cpp
similarity index 100%
rename from GUI/coregui/Views/FitWidgets/FitLogFlags.cpp
rename to GUI/Views/FitWidgets/FitLogFlags.cpp
diff --git a/GUI/coregui/Views/FitWidgets/FitLogFlags.h b/GUI/Views/FitWidgets/FitLogFlags.h
similarity index 100%
rename from GUI/coregui/Views/FitWidgets/FitLogFlags.h
rename to GUI/Views/FitWidgets/FitLogFlags.h
diff --git a/GUI/coregui/Views/FitWidgets/FitObjectiveBuilder.cpp b/GUI/Views/FitWidgets/FitObjectiveBuilder.cpp
similarity index 100%
rename from GUI/coregui/Views/FitWidgets/FitObjectiveBuilder.cpp
rename to GUI/Views/FitWidgets/FitObjectiveBuilder.cpp
diff --git a/GUI/coregui/Views/FitWidgets/FitObjectiveBuilder.h b/GUI/Views/FitWidgets/FitObjectiveBuilder.h
similarity index 100%
rename from GUI/coregui/Views/FitWidgets/FitObjectiveBuilder.h
rename to GUI/Views/FitWidgets/FitObjectiveBuilder.h
diff --git a/GUI/coregui/Views/FitWidgets/FitParameterWidget.cpp b/GUI/Views/FitWidgets/FitParameterWidget.cpp
similarity index 100%
rename from GUI/coregui/Views/FitWidgets/FitParameterWidget.cpp
rename to GUI/Views/FitWidgets/FitParameterWidget.cpp
diff --git a/GUI/coregui/Views/FitWidgets/FitParameterWidget.h b/GUI/Views/FitWidgets/FitParameterWidget.h
similarity index 100%
rename from GUI/coregui/Views/FitWidgets/FitParameterWidget.h
rename to GUI/Views/FitWidgets/FitParameterWidget.h
diff --git a/GUI/coregui/Views/FitWidgets/FitProgressInfo.cpp b/GUI/Views/FitWidgets/FitProgressInfo.cpp
similarity index 100%
rename from GUI/coregui/Views/FitWidgets/FitProgressInfo.cpp
rename to GUI/Views/FitWidgets/FitProgressInfo.cpp
diff --git a/GUI/coregui/Views/FitWidgets/FitProgressInfo.h b/GUI/Views/FitWidgets/FitProgressInfo.h
similarity index 100%
rename from GUI/coregui/Views/FitWidgets/FitProgressInfo.h
rename to GUI/Views/FitWidgets/FitProgressInfo.h
diff --git a/GUI/coregui/Views/FitWidgets/FitResultsWidget.cpp b/GUI/Views/FitWidgets/FitResultsWidget.cpp
similarity index 100%
rename from GUI/coregui/Views/FitWidgets/FitResultsWidget.cpp
rename to GUI/Views/FitWidgets/FitResultsWidget.cpp
diff --git a/GUI/coregui/Views/FitWidgets/FitResultsWidget.h b/GUI/Views/FitWidgets/FitResultsWidget.h
similarity index 100%
rename from GUI/coregui/Views/FitWidgets/FitResultsWidget.h
rename to GUI/Views/FitWidgets/FitResultsWidget.h
diff --git a/GUI/coregui/Views/FitWidgets/FitSessionController.cpp b/GUI/Views/FitWidgets/FitSessionController.cpp
similarity index 100%
rename from GUI/coregui/Views/FitWidgets/FitSessionController.cpp
rename to GUI/Views/FitWidgets/FitSessionController.cpp
diff --git a/GUI/coregui/Views/FitWidgets/FitSessionController.h b/GUI/Views/FitWidgets/FitSessionController.h
similarity index 100%
rename from GUI/coregui/Views/FitWidgets/FitSessionController.h
rename to GUI/Views/FitWidgets/FitSessionController.h
diff --git a/GUI/coregui/Views/FitWidgets/FitSessionManager.cpp b/GUI/Views/FitWidgets/FitSessionManager.cpp
similarity index 100%
rename from GUI/coregui/Views/FitWidgets/FitSessionManager.cpp
rename to GUI/Views/FitWidgets/FitSessionManager.cpp
diff --git a/GUI/coregui/Views/FitWidgets/FitSessionManager.h b/GUI/Views/FitWidgets/FitSessionManager.h
similarity index 100%
rename from GUI/coregui/Views/FitWidgets/FitSessionManager.h
rename to GUI/Views/FitWidgets/FitSessionManager.h
diff --git a/GUI/coregui/Views/FitWidgets/FitSessionWidget.cpp b/GUI/Views/FitWidgets/FitSessionWidget.cpp
similarity index 100%
rename from GUI/coregui/Views/FitWidgets/FitSessionWidget.cpp
rename to GUI/Views/FitWidgets/FitSessionWidget.cpp
diff --git a/GUI/coregui/Views/FitWidgets/FitSessionWidget.h b/GUI/Views/FitWidgets/FitSessionWidget.h
similarity index 100%
rename from GUI/coregui/Views/FitWidgets/FitSessionWidget.h
rename to GUI/Views/FitWidgets/FitSessionWidget.h
diff --git a/GUI/coregui/Views/FitWidgets/FitWorker.cpp b/GUI/Views/FitWidgets/FitWorker.cpp
similarity index 100%
rename from GUI/coregui/Views/FitWidgets/FitWorker.cpp
rename to GUI/Views/FitWidgets/FitWorker.cpp
diff --git a/GUI/coregui/Views/FitWidgets/FitWorker.h b/GUI/Views/FitWidgets/FitWorker.h
similarity index 100%
rename from GUI/coregui/Views/FitWidgets/FitWorker.h
rename to GUI/Views/FitWidgets/FitWorker.h
diff --git a/GUI/coregui/Views/FitWidgets/FitWorkerLauncher.cpp b/GUI/Views/FitWidgets/FitWorkerLauncher.cpp
similarity index 100%
rename from GUI/coregui/Views/FitWidgets/FitWorkerLauncher.cpp
rename to GUI/Views/FitWidgets/FitWorkerLauncher.cpp
diff --git a/GUI/coregui/Views/FitWidgets/FitWorkerLauncher.h b/GUI/Views/FitWidgets/FitWorkerLauncher.h
similarity index 100%
rename from GUI/coregui/Views/FitWidgets/FitWorkerLauncher.h
rename to GUI/Views/FitWidgets/FitWorkerLauncher.h
diff --git a/GUI/coregui/Views/FitWidgets/GUIFitObserver.cpp b/GUI/Views/FitWidgets/GUIFitObserver.cpp
similarity index 100%
rename from GUI/coregui/Views/FitWidgets/GUIFitObserver.cpp
rename to GUI/Views/FitWidgets/GUIFitObserver.cpp
diff --git a/GUI/coregui/Views/FitWidgets/GUIFitObserver.h b/GUI/Views/FitWidgets/GUIFitObserver.h
similarity index 100%
rename from GUI/coregui/Views/FitWidgets/GUIFitObserver.h
rename to GUI/Views/FitWidgets/GUIFitObserver.h
diff --git a/GUI/coregui/Views/FitWidgets/HistogramPlot.cpp b/GUI/Views/FitWidgets/HistogramPlot.cpp
similarity index 100%
rename from GUI/coregui/Views/FitWidgets/HistogramPlot.cpp
rename to GUI/Views/FitWidgets/HistogramPlot.cpp
diff --git a/GUI/coregui/Views/FitWidgets/HistogramPlot.h b/GUI/Views/FitWidgets/HistogramPlot.h
similarity index 100%
rename from GUI/coregui/Views/FitWidgets/HistogramPlot.h
rename to GUI/Views/FitWidgets/HistogramPlot.h
diff --git a/GUI/coregui/Views/FitWidgets/MinimizerSettingsWidget.cpp b/GUI/Views/FitWidgets/MinimizerSettingsWidget.cpp
similarity index 100%
rename from GUI/coregui/Views/FitWidgets/MinimizerSettingsWidget.cpp
rename to GUI/Views/FitWidgets/MinimizerSettingsWidget.cpp
diff --git a/GUI/coregui/Views/FitWidgets/MinimizerSettingsWidget.h b/GUI/Views/FitWidgets/MinimizerSettingsWidget.h
similarity index 100%
rename from GUI/coregui/Views/FitWidgets/MinimizerSettingsWidget.h
rename to GUI/Views/FitWidgets/MinimizerSettingsWidget.h
diff --git a/GUI/coregui/Views/FitWidgets/RunFitControlWidget.cpp b/GUI/Views/FitWidgets/RunFitControlWidget.cpp
similarity index 100%
rename from GUI/coregui/Views/FitWidgets/RunFitControlWidget.cpp
rename to GUI/Views/FitWidgets/RunFitControlWidget.cpp
diff --git a/GUI/coregui/Views/FitWidgets/RunFitControlWidget.h b/GUI/Views/FitWidgets/RunFitControlWidget.h
similarity index 100%
rename from GUI/coregui/Views/FitWidgets/RunFitControlWidget.h
rename to GUI/Views/FitWidgets/RunFitControlWidget.h
diff --git a/GUI/coregui/Views/FitWidgets/plot_constants.h b/GUI/Views/FitWidgets/plot_constants.h
similarity index 100%
rename from GUI/coregui/Views/FitWidgets/plot_constants.h
rename to GUI/Views/FitWidgets/plot_constants.h
diff --git a/GUI/coregui/Views/ImportDataView.cpp b/GUI/Views/ImportDataView.cpp
similarity index 100%
rename from GUI/coregui/Views/ImportDataView.cpp
rename to GUI/Views/ImportDataView.cpp
diff --git a/GUI/coregui/Views/ImportDataView.h b/GUI/Views/ImportDataView.h
similarity index 100%
rename from GUI/coregui/Views/ImportDataView.h
rename to GUI/Views/ImportDataView.h
diff --git a/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvDataColumn.cpp b/GUI/Views/ImportDataWidgets/CsvImportAssistant/CsvDataColumn.cpp
similarity index 100%
rename from GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvDataColumn.cpp
rename to GUI/Views/ImportDataWidgets/CsvImportAssistant/CsvDataColumn.cpp
diff --git a/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvDataColumn.h b/GUI/Views/ImportDataWidgets/CsvImportAssistant/CsvDataColumn.h
similarity index 100%
rename from GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvDataColumn.h
rename to GUI/Views/ImportDataWidgets/CsvImportAssistant/CsvDataColumn.h
diff --git a/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvImportAssistant.cpp b/GUI/Views/ImportDataWidgets/CsvImportAssistant/CsvImportAssistant.cpp
similarity index 100%
rename from GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvImportAssistant.cpp
rename to GUI/Views/ImportDataWidgets/CsvImportAssistant/CsvImportAssistant.cpp
diff --git a/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvImportAssistant.h b/GUI/Views/ImportDataWidgets/CsvImportAssistant/CsvImportAssistant.h
similarity index 100%
rename from GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvImportAssistant.h
rename to GUI/Views/ImportDataWidgets/CsvImportAssistant/CsvImportAssistant.h
diff --git a/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvImportTable.cpp b/GUI/Views/ImportDataWidgets/CsvImportAssistant/CsvImportTable.cpp
similarity index 100%
rename from GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvImportTable.cpp
rename to GUI/Views/ImportDataWidgets/CsvImportAssistant/CsvImportTable.cpp
diff --git a/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvImportTable.h b/GUI/Views/ImportDataWidgets/CsvImportAssistant/CsvImportTable.h
similarity index 100%
rename from GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvImportTable.h
rename to GUI/Views/ImportDataWidgets/CsvImportAssistant/CsvImportTable.h
diff --git a/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvNamespace.cpp b/GUI/Views/ImportDataWidgets/CsvImportAssistant/CsvNamespace.cpp
similarity index 100%
rename from GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvNamespace.cpp
rename to GUI/Views/ImportDataWidgets/CsvImportAssistant/CsvNamespace.cpp
diff --git a/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvNamespace.h b/GUI/Views/ImportDataWidgets/CsvImportAssistant/CsvNamespace.h
similarity index 100%
rename from GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvNamespace.h
rename to GUI/Views/ImportDataWidgets/CsvImportAssistant/CsvNamespace.h
diff --git a/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvReader.cpp b/GUI/Views/ImportDataWidgets/CsvImportAssistant/CsvReader.cpp
similarity index 100%
rename from GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvReader.cpp
rename to GUI/Views/ImportDataWidgets/CsvImportAssistant/CsvReader.cpp
diff --git a/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvReader.h b/GUI/Views/ImportDataWidgets/CsvImportAssistant/CsvReader.h
similarity index 100%
rename from GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvReader.h
rename to GUI/Views/ImportDataWidgets/CsvImportAssistant/CsvReader.h
diff --git a/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/DataSelector.cpp b/GUI/Views/ImportDataWidgets/CsvImportAssistant/DataSelector.cpp
similarity index 100%
rename from GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/DataSelector.cpp
rename to GUI/Views/ImportDataWidgets/CsvImportAssistant/DataSelector.cpp
diff --git a/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/DataSelector.h b/GUI/Views/ImportDataWidgets/CsvImportAssistant/DataSelector.h
similarity index 100%
rename from GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/DataSelector.h
rename to GUI/Views/ImportDataWidgets/CsvImportAssistant/DataSelector.h
diff --git a/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/TableContextMenu.cpp b/GUI/Views/ImportDataWidgets/CsvImportAssistant/TableContextMenu.cpp
similarity index 100%
rename from GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/TableContextMenu.cpp
rename to GUI/Views/ImportDataWidgets/CsvImportAssistant/TableContextMenu.cpp
diff --git a/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/TableContextMenu.h b/GUI/Views/ImportDataWidgets/CsvImportAssistant/TableContextMenu.h
similarity index 100%
rename from GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/TableContextMenu.h
rename to GUI/Views/ImportDataWidgets/CsvImportAssistant/TableContextMenu.h
diff --git a/GUI/coregui/Views/ImportDataWidgets/ImportDataUtils.cpp b/GUI/Views/ImportDataWidgets/ImportDataUtils.cpp
similarity index 100%
rename from GUI/coregui/Views/ImportDataWidgets/ImportDataUtils.cpp
rename to GUI/Views/ImportDataWidgets/ImportDataUtils.cpp
diff --git a/GUI/coregui/Views/ImportDataWidgets/ImportDataUtils.h b/GUI/Views/ImportDataWidgets/ImportDataUtils.h
similarity index 100%
rename from GUI/coregui/Views/ImportDataWidgets/ImportDataUtils.h
rename to GUI/Views/ImportDataWidgets/ImportDataUtils.h
diff --git a/GUI/coregui/Views/ImportDataWidgets/LinkInstrumentManager.cpp b/GUI/Views/ImportDataWidgets/LinkInstrumentManager.cpp
similarity index 100%
rename from GUI/coregui/Views/ImportDataWidgets/LinkInstrumentManager.cpp
rename to GUI/Views/ImportDataWidgets/LinkInstrumentManager.cpp
diff --git a/GUI/coregui/Views/ImportDataWidgets/LinkInstrumentManager.h b/GUI/Views/ImportDataWidgets/LinkInstrumentManager.h
similarity index 100%
rename from GUI/coregui/Views/ImportDataWidgets/LinkInstrumentManager.h
rename to GUI/Views/ImportDataWidgets/LinkInstrumentManager.h
diff --git a/GUI/coregui/Views/ImportDataWidgets/RealDataMaskWidget.cpp b/GUI/Views/ImportDataWidgets/RealDataMaskWidget.cpp
similarity index 100%
rename from GUI/coregui/Views/ImportDataWidgets/RealDataMaskWidget.cpp
rename to GUI/Views/ImportDataWidgets/RealDataMaskWidget.cpp
diff --git a/GUI/coregui/Views/ImportDataWidgets/RealDataMaskWidget.h b/GUI/Views/ImportDataWidgets/RealDataMaskWidget.h
similarity index 100%
rename from GUI/coregui/Views/ImportDataWidgets/RealDataMaskWidget.h
rename to GUI/Views/ImportDataWidgets/RealDataMaskWidget.h
diff --git a/GUI/coregui/Views/ImportDataWidgets/RealDataPresenter.cpp b/GUI/Views/ImportDataWidgets/RealDataPresenter.cpp
similarity index 100%
rename from GUI/coregui/Views/ImportDataWidgets/RealDataPresenter.cpp
rename to GUI/Views/ImportDataWidgets/RealDataPresenter.cpp
diff --git a/GUI/coregui/Views/ImportDataWidgets/RealDataPresenter.h b/GUI/Views/ImportDataWidgets/RealDataPresenter.h
similarity index 100%
rename from GUI/coregui/Views/ImportDataWidgets/RealDataPresenter.h
rename to GUI/Views/ImportDataWidgets/RealDataPresenter.h
diff --git a/GUI/coregui/Views/ImportDataWidgets/RealDataPropertiesWidget.cpp b/GUI/Views/ImportDataWidgets/RealDataPropertiesWidget.cpp
similarity index 100%
rename from GUI/coregui/Views/ImportDataWidgets/RealDataPropertiesWidget.cpp
rename to GUI/Views/ImportDataWidgets/RealDataPropertiesWidget.cpp
diff --git a/GUI/coregui/Views/ImportDataWidgets/RealDataPropertiesWidget.h b/GUI/Views/ImportDataWidgets/RealDataPropertiesWidget.h
similarity index 100%
rename from GUI/coregui/Views/ImportDataWidgets/RealDataPropertiesWidget.h
rename to GUI/Views/ImportDataWidgets/RealDataPropertiesWidget.h
diff --git a/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorWidget.cpp b/GUI/Views/ImportDataWidgets/RealDataSelectorWidget.cpp
similarity index 100%
rename from GUI/coregui/Views/ImportDataWidgets/RealDataSelectorWidget.cpp
rename to GUI/Views/ImportDataWidgets/RealDataSelectorWidget.cpp
diff --git a/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorWidget.h b/GUI/Views/ImportDataWidgets/RealDataSelectorWidget.h
similarity index 100%
rename from GUI/coregui/Views/ImportDataWidgets/RealDataSelectorWidget.h
rename to GUI/Views/ImportDataWidgets/RealDataSelectorWidget.h
diff --git a/GUI/coregui/Views/ImportDataWidgets/RealDataTreeModel.cpp b/GUI/Views/ImportDataWidgets/RealDataTreeModel.cpp
similarity index 100%
rename from GUI/coregui/Views/ImportDataWidgets/RealDataTreeModel.cpp
rename to GUI/Views/ImportDataWidgets/RealDataTreeModel.cpp
diff --git a/GUI/coregui/Views/ImportDataWidgets/RealDataTreeModel.h b/GUI/Views/ImportDataWidgets/RealDataTreeModel.h
similarity index 100%
rename from GUI/coregui/Views/ImportDataWidgets/RealDataTreeModel.h
rename to GUI/Views/ImportDataWidgets/RealDataTreeModel.h
diff --git a/GUI/coregui/Views/InfoWidgets/ComboSelectorDialog.cpp b/GUI/Views/InfoWidgets/ComboSelectorDialog.cpp
similarity index 100%
rename from GUI/coregui/Views/InfoWidgets/ComboSelectorDialog.cpp
rename to GUI/Views/InfoWidgets/ComboSelectorDialog.cpp
diff --git a/GUI/coregui/Views/InfoWidgets/ComboSelectorDialog.h b/GUI/Views/InfoWidgets/ComboSelectorDialog.h
similarity index 100%
rename from GUI/coregui/Views/InfoWidgets/ComboSelectorDialog.h
rename to GUI/Views/InfoWidgets/ComboSelectorDialog.h
diff --git a/GUI/coregui/Views/InfoWidgets/DetailedMessageBox.cpp b/GUI/Views/InfoWidgets/DetailedMessageBox.cpp
similarity index 100%
rename from GUI/coregui/Views/InfoWidgets/DetailedMessageBox.cpp
rename to GUI/Views/InfoWidgets/DetailedMessageBox.cpp
diff --git a/GUI/coregui/Views/InfoWidgets/DetailedMessageBox.h b/GUI/Views/InfoWidgets/DetailedMessageBox.h
similarity index 100%
rename from GUI/coregui/Views/InfoWidgets/DetailedMessageBox.h
rename to GUI/Views/InfoWidgets/DetailedMessageBox.h
diff --git a/GUI/coregui/Views/InfoWidgets/DistributionDialog.cpp b/GUI/Views/InfoWidgets/DistributionDialog.cpp
similarity index 100%
rename from GUI/coregui/Views/InfoWidgets/DistributionDialog.cpp
rename to GUI/Views/InfoWidgets/DistributionDialog.cpp
diff --git a/GUI/coregui/Views/InfoWidgets/DistributionDialog.h b/GUI/Views/InfoWidgets/DistributionDialog.h
similarity index 100%
rename from GUI/coregui/Views/InfoWidgets/DistributionDialog.h
rename to GUI/Views/InfoWidgets/DistributionDialog.h
diff --git a/GUI/coregui/Views/InfoWidgets/DistributionEditor.cpp b/GUI/Views/InfoWidgets/DistributionEditor.cpp
similarity index 100%
rename from GUI/coregui/Views/InfoWidgets/DistributionEditor.cpp
rename to GUI/Views/InfoWidgets/DistributionEditor.cpp
diff --git a/GUI/coregui/Views/InfoWidgets/DistributionEditor.h b/GUI/Views/InfoWidgets/DistributionEditor.h
similarity index 100%
rename from GUI/coregui/Views/InfoWidgets/DistributionEditor.h
rename to GUI/Views/InfoWidgets/DistributionEditor.h
diff --git a/GUI/coregui/Views/InfoWidgets/DistributionWidget.cpp b/GUI/Views/InfoWidgets/DistributionWidget.cpp
similarity index 100%
rename from GUI/coregui/Views/InfoWidgets/DistributionWidget.cpp
rename to GUI/Views/InfoWidgets/DistributionWidget.cpp
diff --git a/GUI/coregui/Views/InfoWidgets/DistributionWidget.h b/GUI/Views/InfoWidgets/DistributionWidget.h
similarity index 100%
rename from GUI/coregui/Views/InfoWidgets/DistributionWidget.h
rename to GUI/Views/InfoWidgets/DistributionWidget.h
diff --git a/GUI/coregui/Views/InfoWidgets/GroupInfoBox.cpp b/GUI/Views/InfoWidgets/GroupInfoBox.cpp
similarity index 100%
rename from GUI/coregui/Views/InfoWidgets/GroupInfoBox.cpp
rename to GUI/Views/InfoWidgets/GroupInfoBox.cpp
diff --git a/GUI/coregui/Views/InfoWidgets/GroupInfoBox.h b/GUI/Views/InfoWidgets/GroupInfoBox.h
similarity index 100%
rename from GUI/coregui/Views/InfoWidgets/GroupInfoBox.h
rename to GUI/Views/InfoWidgets/GroupInfoBox.h
diff --git a/GUI/coregui/Views/InfoWidgets/OverlayLabelController.cpp b/GUI/Views/InfoWidgets/OverlayLabelController.cpp
similarity index 100%
rename from GUI/coregui/Views/InfoWidgets/OverlayLabelController.cpp
rename to GUI/Views/InfoWidgets/OverlayLabelController.cpp
diff --git a/GUI/coregui/Views/InfoWidgets/OverlayLabelController.h b/GUI/Views/InfoWidgets/OverlayLabelController.h
similarity index 100%
rename from GUI/coregui/Views/InfoWidgets/OverlayLabelController.h
rename to GUI/Views/InfoWidgets/OverlayLabelController.h
diff --git a/GUI/coregui/Views/InfoWidgets/OverlayLabelWidget.cpp b/GUI/Views/InfoWidgets/OverlayLabelWidget.cpp
similarity index 100%
rename from GUI/coregui/Views/InfoWidgets/OverlayLabelWidget.cpp
rename to GUI/Views/InfoWidgets/OverlayLabelWidget.cpp
diff --git a/GUI/coregui/Views/InfoWidgets/OverlayLabelWidget.h b/GUI/Views/InfoWidgets/OverlayLabelWidget.h
similarity index 100%
rename from GUI/coregui/Views/InfoWidgets/OverlayLabelWidget.h
rename to GUI/Views/InfoWidgets/OverlayLabelWidget.h
diff --git a/GUI/coregui/Views/InfoWidgets/ProjectLoadWarningDialog.cpp b/GUI/Views/InfoWidgets/ProjectLoadWarningDialog.cpp
similarity index 100%
rename from GUI/coregui/Views/InfoWidgets/ProjectLoadWarningDialog.cpp
rename to GUI/Views/InfoWidgets/ProjectLoadWarningDialog.cpp
diff --git a/GUI/coregui/Views/InfoWidgets/ProjectLoadWarningDialog.h b/GUI/Views/InfoWidgets/ProjectLoadWarningDialog.h
similarity index 100%
rename from GUI/coregui/Views/InfoWidgets/ProjectLoadWarningDialog.h
rename to GUI/Views/InfoWidgets/ProjectLoadWarningDialog.h
diff --git a/GUI/coregui/Views/InfoWidgets/PySampleWidget.cpp b/GUI/Views/InfoWidgets/PySampleWidget.cpp
similarity index 100%
rename from GUI/coregui/Views/InfoWidgets/PySampleWidget.cpp
rename to GUI/Views/InfoWidgets/PySampleWidget.cpp
diff --git a/GUI/coregui/Views/InfoWidgets/PySampleWidget.h b/GUI/Views/InfoWidgets/PySampleWidget.h
similarity index 100%
rename from GUI/coregui/Views/InfoWidgets/PySampleWidget.h
rename to GUI/Views/InfoWidgets/PySampleWidget.h
diff --git a/GUI/coregui/Views/InfoWidgets/PythonSyntaxHighlighter.cpp b/GUI/Views/InfoWidgets/PythonSyntaxHighlighter.cpp
similarity index 100%
rename from GUI/coregui/Views/InfoWidgets/PythonSyntaxHighlighter.cpp
rename to GUI/Views/InfoWidgets/PythonSyntaxHighlighter.cpp
diff --git a/GUI/coregui/Views/InfoWidgets/PythonSyntaxHighlighter.h b/GUI/Views/InfoWidgets/PythonSyntaxHighlighter.h
similarity index 100%
rename from GUI/coregui/Views/InfoWidgets/PythonSyntaxHighlighter.h
rename to GUI/Views/InfoWidgets/PythonSyntaxHighlighter.h
diff --git a/GUI/coregui/Views/InfoWidgets/WarningSign.cpp b/GUI/Views/InfoWidgets/WarningSign.cpp
similarity index 100%
rename from GUI/coregui/Views/InfoWidgets/WarningSign.cpp
rename to GUI/Views/InfoWidgets/WarningSign.cpp
diff --git a/GUI/coregui/Views/InfoWidgets/WarningSign.h b/GUI/Views/InfoWidgets/WarningSign.h
similarity index 100%
rename from GUI/coregui/Views/InfoWidgets/WarningSign.h
rename to GUI/Views/InfoWidgets/WarningSign.h
diff --git a/GUI/coregui/Views/InfoWidgets/WarningSignWidget.cpp b/GUI/Views/InfoWidgets/WarningSignWidget.cpp
similarity index 100%
rename from GUI/coregui/Views/InfoWidgets/WarningSignWidget.cpp
rename to GUI/Views/InfoWidgets/WarningSignWidget.cpp
diff --git a/GUI/coregui/Views/InfoWidgets/WarningSignWidget.h b/GUI/Views/InfoWidgets/WarningSignWidget.h
similarity index 100%
rename from GUI/coregui/Views/InfoWidgets/WarningSignWidget.h
rename to GUI/Views/InfoWidgets/WarningSignWidget.h
diff --git a/GUI/coregui/Views/InstrumentView.cpp b/GUI/Views/InstrumentView.cpp
similarity index 100%
rename from GUI/coregui/Views/InstrumentView.cpp
rename to GUI/Views/InstrumentView.cpp
diff --git a/GUI/coregui/Views/InstrumentView.h b/GUI/Views/InstrumentView.h
similarity index 100%
rename from GUI/coregui/Views/InstrumentView.h
rename to GUI/Views/InstrumentView.h
diff --git a/GUI/coregui/Views/InstrumentWidgets/DepthProbeInstrumentEditor.cpp b/GUI/Views/InstrumentWidgets/DepthProbeInstrumentEditor.cpp
similarity index 100%
rename from GUI/coregui/Views/InstrumentWidgets/DepthProbeInstrumentEditor.cpp
rename to GUI/Views/InstrumentWidgets/DepthProbeInstrumentEditor.cpp
diff --git a/GUI/coregui/Views/InstrumentWidgets/DepthProbeInstrumentEditor.h b/GUI/Views/InstrumentWidgets/DepthProbeInstrumentEditor.h
similarity index 100%
rename from GUI/coregui/Views/InstrumentWidgets/DepthProbeInstrumentEditor.h
rename to GUI/Views/InstrumentWidgets/DepthProbeInstrumentEditor.h
diff --git a/GUI/coregui/Views/InstrumentWidgets/DetectorMaskDelegate.cpp b/GUI/Views/InstrumentWidgets/DetectorMaskDelegate.cpp
similarity index 100%
rename from GUI/coregui/Views/InstrumentWidgets/DetectorMaskDelegate.cpp
rename to GUI/Views/InstrumentWidgets/DetectorMaskDelegate.cpp
diff --git a/GUI/coregui/Views/InstrumentWidgets/DetectorMaskDelegate.h b/GUI/Views/InstrumentWidgets/DetectorMaskDelegate.h
similarity index 100%
rename from GUI/coregui/Views/InstrumentWidgets/DetectorMaskDelegate.h
rename to GUI/Views/InstrumentWidgets/DetectorMaskDelegate.h
diff --git a/GUI/coregui/Views/InstrumentWidgets/DetectorPresenter.cpp b/GUI/Views/InstrumentWidgets/DetectorPresenter.cpp
similarity index 100%
rename from GUI/coregui/Views/InstrumentWidgets/DetectorPresenter.cpp
rename to GUI/Views/InstrumentWidgets/DetectorPresenter.cpp
diff --git a/GUI/coregui/Views/InstrumentWidgets/DetectorPresenter.h b/GUI/Views/InstrumentWidgets/DetectorPresenter.h
similarity index 100%
rename from GUI/coregui/Views/InstrumentWidgets/DetectorPresenter.h
rename to GUI/Views/InstrumentWidgets/DetectorPresenter.h
diff --git a/GUI/coregui/Views/InstrumentWidgets/EnvironmentEditor.cpp b/GUI/Views/InstrumentWidgets/EnvironmentEditor.cpp
similarity index 100%
rename from GUI/coregui/Views/InstrumentWidgets/EnvironmentEditor.cpp
rename to GUI/Views/InstrumentWidgets/EnvironmentEditor.cpp
diff --git a/GUI/coregui/Views/InstrumentWidgets/EnvironmentEditor.h b/GUI/Views/InstrumentWidgets/EnvironmentEditor.h
similarity index 100%
rename from GUI/coregui/Views/InstrumentWidgets/EnvironmentEditor.h
rename to GUI/Views/InstrumentWidgets/EnvironmentEditor.h
diff --git a/GUI/coregui/Views/InstrumentWidgets/ExtendedDetectorDialog.cpp b/GUI/Views/InstrumentWidgets/ExtendedDetectorDialog.cpp
similarity index 100%
rename from GUI/coregui/Views/InstrumentWidgets/ExtendedDetectorDialog.cpp
rename to GUI/Views/InstrumentWidgets/ExtendedDetectorDialog.cpp
diff --git a/GUI/coregui/Views/InstrumentWidgets/ExtendedDetectorDialog.h b/GUI/Views/InstrumentWidgets/ExtendedDetectorDialog.h
similarity index 100%
rename from GUI/coregui/Views/InstrumentWidgets/ExtendedDetectorDialog.h
rename to GUI/Views/InstrumentWidgets/ExtendedDetectorDialog.h
diff --git a/GUI/coregui/Views/InstrumentWidgets/GISASBeamEditor.cpp b/GUI/Views/InstrumentWidgets/GISASBeamEditor.cpp
similarity index 100%
rename from GUI/coregui/Views/InstrumentWidgets/GISASBeamEditor.cpp
rename to GUI/Views/InstrumentWidgets/GISASBeamEditor.cpp
diff --git a/GUI/coregui/Views/InstrumentWidgets/GISASBeamEditor.h b/GUI/Views/InstrumentWidgets/GISASBeamEditor.h
similarity index 100%
rename from GUI/coregui/Views/InstrumentWidgets/GISASBeamEditor.h
rename to GUI/Views/InstrumentWidgets/GISASBeamEditor.h
diff --git a/GUI/coregui/Views/InstrumentWidgets/GISASDetectorEditor.cpp b/GUI/Views/InstrumentWidgets/GISASDetectorEditor.cpp
similarity index 100%
rename from GUI/coregui/Views/InstrumentWidgets/GISASDetectorEditor.cpp
rename to GUI/Views/InstrumentWidgets/GISASDetectorEditor.cpp
diff --git a/GUI/coregui/Views/InstrumentWidgets/GISASDetectorEditor.h b/GUI/Views/InstrumentWidgets/GISASDetectorEditor.h
similarity index 100%
rename from GUI/coregui/Views/InstrumentWidgets/GISASDetectorEditor.h
rename to GUI/Views/InstrumentWidgets/GISASDetectorEditor.h
diff --git a/GUI/coregui/Views/InstrumentWidgets/GISASInstrumentEditor.cpp b/GUI/Views/InstrumentWidgets/GISASInstrumentEditor.cpp
similarity index 100%
rename from GUI/coregui/Views/InstrumentWidgets/GISASInstrumentEditor.cpp
rename to GUI/Views/InstrumentWidgets/GISASInstrumentEditor.cpp
diff --git a/GUI/coregui/Views/InstrumentWidgets/GISASInstrumentEditor.h b/GUI/Views/InstrumentWidgets/GISASInstrumentEditor.h
similarity index 100%
rename from GUI/coregui/Views/InstrumentWidgets/GISASInstrumentEditor.h
rename to GUI/Views/InstrumentWidgets/GISASInstrumentEditor.h
diff --git a/GUI/coregui/Views/InstrumentWidgets/InstrumentEditorWidget.cpp b/GUI/Views/InstrumentWidgets/InstrumentEditorWidget.cpp
similarity index 100%
rename from GUI/coregui/Views/InstrumentWidgets/InstrumentEditorWidget.cpp
rename to GUI/Views/InstrumentWidgets/InstrumentEditorWidget.cpp
diff --git a/GUI/coregui/Views/InstrumentWidgets/InstrumentEditorWidget.h b/GUI/Views/InstrumentWidgets/InstrumentEditorWidget.h
similarity index 100%
rename from GUI/coregui/Views/InstrumentWidgets/InstrumentEditorWidget.h
rename to GUI/Views/InstrumentWidgets/InstrumentEditorWidget.h
diff --git a/GUI/coregui/Views/InstrumentWidgets/InstrumentPresenter.cpp b/GUI/Views/InstrumentWidgets/InstrumentPresenter.cpp
similarity index 100%
rename from GUI/coregui/Views/InstrumentWidgets/InstrumentPresenter.cpp
rename to GUI/Views/InstrumentWidgets/InstrumentPresenter.cpp
diff --git a/GUI/coregui/Views/InstrumentWidgets/InstrumentPresenter.h b/GUI/Views/InstrumentWidgets/InstrumentPresenter.h
similarity index 100%
rename from GUI/coregui/Views/InstrumentWidgets/InstrumentPresenter.h
rename to GUI/Views/InstrumentWidgets/InstrumentPresenter.h
diff --git a/GUI/coregui/Views/InstrumentWidgets/InstrumentSelectorWidget.cpp b/GUI/Views/InstrumentWidgets/InstrumentSelectorWidget.cpp
similarity index 100%
rename from GUI/coregui/Views/InstrumentWidgets/InstrumentSelectorWidget.cpp
rename to GUI/Views/InstrumentWidgets/InstrumentSelectorWidget.cpp
diff --git a/GUI/coregui/Views/InstrumentWidgets/InstrumentSelectorWidget.h b/GUI/Views/InstrumentWidgets/InstrumentSelectorWidget.h
similarity index 100%
rename from GUI/coregui/Views/InstrumentWidgets/InstrumentSelectorWidget.h
rename to GUI/Views/InstrumentWidgets/InstrumentSelectorWidget.h
diff --git a/GUI/coregui/Views/InstrumentWidgets/InstrumentViewActions.cpp b/GUI/Views/InstrumentWidgets/InstrumentViewActions.cpp
similarity index 100%
rename from GUI/coregui/Views/InstrumentWidgets/InstrumentViewActions.cpp
rename to GUI/Views/InstrumentWidgets/InstrumentViewActions.cpp
diff --git a/GUI/coregui/Views/InstrumentWidgets/InstrumentViewActions.h b/GUI/Views/InstrumentWidgets/InstrumentViewActions.h
similarity index 100%
rename from GUI/coregui/Views/InstrumentWidgets/InstrumentViewActions.h
rename to GUI/Views/InstrumentWidgets/InstrumentViewActions.h
diff --git a/GUI/coregui/Views/InstrumentWidgets/InstrumentViewToolBar.cpp b/GUI/Views/InstrumentWidgets/InstrumentViewToolBar.cpp
similarity index 100%
rename from GUI/coregui/Views/InstrumentWidgets/InstrumentViewToolBar.cpp
rename to GUI/Views/InstrumentWidgets/InstrumentViewToolBar.cpp
diff --git a/GUI/coregui/Views/InstrumentWidgets/InstrumentViewToolBar.h b/GUI/Views/InstrumentWidgets/InstrumentViewToolBar.h
similarity index 100%
rename from GUI/coregui/Views/InstrumentWidgets/InstrumentViewToolBar.h
rename to GUI/Views/InstrumentWidgets/InstrumentViewToolBar.h
diff --git a/GUI/coregui/Views/InstrumentWidgets/OffSpecularBeamEditor.cpp b/GUI/Views/InstrumentWidgets/OffSpecularBeamEditor.cpp
similarity index 100%
rename from GUI/coregui/Views/InstrumentWidgets/OffSpecularBeamEditor.cpp
rename to GUI/Views/InstrumentWidgets/OffSpecularBeamEditor.cpp
diff --git a/GUI/coregui/Views/InstrumentWidgets/OffSpecularBeamEditor.h b/GUI/Views/InstrumentWidgets/OffSpecularBeamEditor.h
similarity index 100%
rename from GUI/coregui/Views/InstrumentWidgets/OffSpecularBeamEditor.h
rename to GUI/Views/InstrumentWidgets/OffSpecularBeamEditor.h
diff --git a/GUI/coregui/Views/InstrumentWidgets/OffSpecularInstrumentEditor.cpp b/GUI/Views/InstrumentWidgets/OffSpecularInstrumentEditor.cpp
similarity index 100%
rename from GUI/coregui/Views/InstrumentWidgets/OffSpecularInstrumentEditor.cpp
rename to GUI/Views/InstrumentWidgets/OffSpecularInstrumentEditor.cpp
diff --git a/GUI/coregui/Views/InstrumentWidgets/OffSpecularInstrumentEditor.h b/GUI/Views/InstrumentWidgets/OffSpecularInstrumentEditor.h
similarity index 100%
rename from GUI/coregui/Views/InstrumentWidgets/OffSpecularInstrumentEditor.h
rename to GUI/Views/InstrumentWidgets/OffSpecularInstrumentEditor.h
diff --git a/GUI/coregui/Views/InstrumentWidgets/PolarizationAnalysisEditor.cpp b/GUI/Views/InstrumentWidgets/PolarizationAnalysisEditor.cpp
similarity index 100%
rename from GUI/coregui/Views/InstrumentWidgets/PolarizationAnalysisEditor.cpp
rename to GUI/Views/InstrumentWidgets/PolarizationAnalysisEditor.cpp
diff --git a/GUI/coregui/Views/InstrumentWidgets/PolarizationAnalysisEditor.h b/GUI/Views/InstrumentWidgets/PolarizationAnalysisEditor.h
similarity index 100%
rename from GUI/coregui/Views/InstrumentWidgets/PolarizationAnalysisEditor.h
rename to GUI/Views/InstrumentWidgets/PolarizationAnalysisEditor.h
diff --git a/GUI/coregui/Views/InstrumentWidgets/RectangularDetectorEditor.cpp b/GUI/Views/InstrumentWidgets/RectangularDetectorEditor.cpp
similarity index 100%
rename from GUI/coregui/Views/InstrumentWidgets/RectangularDetectorEditor.cpp
rename to GUI/Views/InstrumentWidgets/RectangularDetectorEditor.cpp
diff --git a/GUI/coregui/Views/InstrumentWidgets/RectangularDetectorEditor.h b/GUI/Views/InstrumentWidgets/RectangularDetectorEditor.h
similarity index 100%
rename from GUI/coregui/Views/InstrumentWidgets/RectangularDetectorEditor.h
rename to GUI/Views/InstrumentWidgets/RectangularDetectorEditor.h
diff --git a/GUI/coregui/Views/InstrumentWidgets/SpecularBeamEditor.cpp b/GUI/Views/InstrumentWidgets/SpecularBeamEditor.cpp
similarity index 100%
rename from GUI/coregui/Views/InstrumentWidgets/SpecularBeamEditor.cpp
rename to GUI/Views/InstrumentWidgets/SpecularBeamEditor.cpp
diff --git a/GUI/coregui/Views/InstrumentWidgets/SpecularBeamEditor.h b/GUI/Views/InstrumentWidgets/SpecularBeamEditor.h
similarity index 100%
rename from GUI/coregui/Views/InstrumentWidgets/SpecularBeamEditor.h
rename to GUI/Views/InstrumentWidgets/SpecularBeamEditor.h
diff --git a/GUI/coregui/Views/InstrumentWidgets/SpecularInstrumentEditor.cpp b/GUI/Views/InstrumentWidgets/SpecularInstrumentEditor.cpp
similarity index 100%
rename from GUI/coregui/Views/InstrumentWidgets/SpecularInstrumentEditor.cpp
rename to GUI/Views/InstrumentWidgets/SpecularInstrumentEditor.cpp
diff --git a/GUI/coregui/Views/InstrumentWidgets/SpecularInstrumentEditor.h b/GUI/Views/InstrumentWidgets/SpecularInstrumentEditor.h
similarity index 100%
rename from GUI/coregui/Views/InstrumentWidgets/SpecularInstrumentEditor.h
rename to GUI/Views/InstrumentWidgets/SpecularInstrumentEditor.h
diff --git a/GUI/coregui/Views/InstrumentWidgets/SphericalDetectorEditor.cpp b/GUI/Views/InstrumentWidgets/SphericalDetectorEditor.cpp
similarity index 100%
rename from GUI/coregui/Views/InstrumentWidgets/SphericalDetectorEditor.cpp
rename to GUI/Views/InstrumentWidgets/SphericalDetectorEditor.cpp
diff --git a/GUI/coregui/Views/InstrumentWidgets/SphericalDetectorEditor.h b/GUI/Views/InstrumentWidgets/SphericalDetectorEditor.h
similarity index 100%
rename from GUI/coregui/Views/InstrumentWidgets/SphericalDetectorEditor.h
rename to GUI/Views/InstrumentWidgets/SphericalDetectorEditor.h
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ColorMap.cpp b/GUI/Views/IntensityDataWidgets/ColorMap.cpp
similarity index 100%
rename from GUI/coregui/Views/IntensityDataWidgets/ColorMap.cpp
rename to GUI/Views/IntensityDataWidgets/ColorMap.cpp
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ColorMap.h b/GUI/Views/IntensityDataWidgets/ColorMap.h
similarity index 100%
rename from GUI/coregui/Views/IntensityDataWidgets/ColorMap.h
rename to GUI/Views/IntensityDataWidgets/ColorMap.h
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvas.cpp b/GUI/Views/IntensityDataWidgets/ColorMapCanvas.cpp
similarity index 100%
rename from GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvas.cpp
rename to GUI/Views/IntensityDataWidgets/ColorMapCanvas.cpp
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvas.h b/GUI/Views/IntensityDataWidgets/ColorMapCanvas.h
similarity index 100%
rename from GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvas.h
rename to GUI/Views/IntensityDataWidgets/ColorMapCanvas.h
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ColorMapUtils.cpp b/GUI/Views/IntensityDataWidgets/ColorMapUtils.cpp
similarity index 100%
rename from GUI/coregui/Views/IntensityDataWidgets/ColorMapUtils.cpp
rename to GUI/Views/IntensityDataWidgets/ColorMapUtils.cpp
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ColorMapUtils.h b/GUI/Views/IntensityDataWidgets/ColorMapUtils.h
similarity index 100%
rename from GUI/coregui/Views/IntensityDataWidgets/ColorMapUtils.h
rename to GUI/Views/IntensityDataWidgets/ColorMapUtils.h
diff --git a/GUI/coregui/Views/IntensityDataWidgets/FontScalingEvent.cpp b/GUI/Views/IntensityDataWidgets/FontScalingEvent.cpp
similarity index 100%
rename from GUI/coregui/Views/IntensityDataWidgets/FontScalingEvent.cpp
rename to GUI/Views/IntensityDataWidgets/FontScalingEvent.cpp
diff --git a/GUI/coregui/Views/IntensityDataWidgets/FontScalingEvent.h b/GUI/Views/IntensityDataWidgets/FontScalingEvent.h
similarity index 100%
rename from GUI/coregui/Views/IntensityDataWidgets/FontScalingEvent.h
rename to GUI/Views/IntensityDataWidgets/FontScalingEvent.h
diff --git a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataCanvas.cpp b/GUI/Views/IntensityDataWidgets/IntensityDataCanvas.cpp
similarity index 100%
rename from GUI/coregui/Views/IntensityDataWidgets/IntensityDataCanvas.cpp
rename to GUI/Views/IntensityDataWidgets/IntensityDataCanvas.cpp
diff --git a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataCanvas.h b/GUI/Views/IntensityDataWidgets/IntensityDataCanvas.h
similarity index 100%
rename from GUI/coregui/Views/IntensityDataWidgets/IntensityDataCanvas.h
rename to GUI/Views/IntensityDataWidgets/IntensityDataCanvas.h
diff --git a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataFFTPresenter.cpp b/GUI/Views/IntensityDataWidgets/IntensityDataFFTPresenter.cpp
similarity index 100%
rename from GUI/coregui/Views/IntensityDataWidgets/IntensityDataFFTPresenter.cpp
rename to GUI/Views/IntensityDataWidgets/IntensityDataFFTPresenter.cpp
diff --git a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataFFTPresenter.h b/GUI/Views/IntensityDataWidgets/IntensityDataFFTPresenter.h
similarity index 100%
rename from GUI/coregui/Views/IntensityDataWidgets/IntensityDataFFTPresenter.h
rename to GUI/Views/IntensityDataWidgets/IntensityDataFFTPresenter.h
diff --git a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataProjectionsWidget.cpp b/GUI/Views/IntensityDataWidgets/IntensityDataProjectionsWidget.cpp
similarity index 100%
rename from GUI/coregui/Views/IntensityDataWidgets/IntensityDataProjectionsWidget.cpp
rename to GUI/Views/IntensityDataWidgets/IntensityDataProjectionsWidget.cpp
diff --git a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataProjectionsWidget.h b/GUI/Views/IntensityDataWidgets/IntensityDataProjectionsWidget.h
similarity index 100%
rename from GUI/coregui/Views/IntensityDataWidgets/IntensityDataProjectionsWidget.h
rename to GUI/Views/IntensityDataWidgets/IntensityDataProjectionsWidget.h
diff --git a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataPropertyWidget.cpp b/GUI/Views/IntensityDataWidgets/IntensityDataPropertyWidget.cpp
similarity index 100%
rename from GUI/coregui/Views/IntensityDataWidgets/IntensityDataPropertyWidget.cpp
rename to GUI/Views/IntensityDataWidgets/IntensityDataPropertyWidget.cpp
diff --git a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataPropertyWidget.h b/GUI/Views/IntensityDataWidgets/IntensityDataPropertyWidget.h
similarity index 100%
rename from GUI/coregui/Views/IntensityDataWidgets/IntensityDataPropertyWidget.h
rename to GUI/Views/IntensityDataWidgets/IntensityDataPropertyWidget.h
diff --git a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataWidget.cpp b/GUI/Views/IntensityDataWidgets/IntensityDataWidget.cpp
similarity index 100%
rename from GUI/coregui/Views/IntensityDataWidgets/IntensityDataWidget.cpp
rename to GUI/Views/IntensityDataWidgets/IntensityDataWidget.cpp
diff --git a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataWidget.h b/GUI/Views/IntensityDataWidgets/IntensityDataWidget.h
similarity index 100%
rename from GUI/coregui/Views/IntensityDataWidgets/IntensityDataWidget.h
rename to GUI/Views/IntensityDataWidgets/IntensityDataWidget.h
diff --git a/GUI/coregui/Views/IntensityDataWidgets/Plot1D.cpp b/GUI/Views/IntensityDataWidgets/Plot1D.cpp
similarity index 100%
rename from GUI/coregui/Views/IntensityDataWidgets/Plot1D.cpp
rename to GUI/Views/IntensityDataWidgets/Plot1D.cpp
diff --git a/GUI/coregui/Views/IntensityDataWidgets/Plot1D.h b/GUI/Views/IntensityDataWidgets/Plot1D.h
similarity index 100%
rename from GUI/coregui/Views/IntensityDataWidgets/Plot1D.h
rename to GUI/Views/IntensityDataWidgets/Plot1D.h
diff --git a/GUI/coregui/Views/IntensityDataWidgets/PlotEventInfo.cpp b/GUI/Views/IntensityDataWidgets/PlotEventInfo.cpp
similarity index 100%
rename from GUI/coregui/Views/IntensityDataWidgets/PlotEventInfo.cpp
rename to GUI/Views/IntensityDataWidgets/PlotEventInfo.cpp
diff --git a/GUI/coregui/Views/IntensityDataWidgets/PlotEventInfo.h b/GUI/Views/IntensityDataWidgets/PlotEventInfo.h
similarity index 100%
rename from GUI/coregui/Views/IntensityDataWidgets/PlotEventInfo.h
rename to GUI/Views/IntensityDataWidgets/PlotEventInfo.h
diff --git a/GUI/coregui/Views/IntensityDataWidgets/PlotStatusLabel.cpp b/GUI/Views/IntensityDataWidgets/PlotStatusLabel.cpp
similarity index 100%
rename from GUI/coregui/Views/IntensityDataWidgets/PlotStatusLabel.cpp
rename to GUI/Views/IntensityDataWidgets/PlotStatusLabel.cpp
diff --git a/GUI/coregui/Views/IntensityDataWidgets/PlotStatusLabel.h b/GUI/Views/IntensityDataWidgets/PlotStatusLabel.h
similarity index 100%
rename from GUI/coregui/Views/IntensityDataWidgets/PlotStatusLabel.h
rename to GUI/Views/IntensityDataWidgets/PlotStatusLabel.h
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ProjectionsPlot.cpp b/GUI/Views/IntensityDataWidgets/ProjectionsPlot.cpp
similarity index 100%
rename from GUI/coregui/Views/IntensityDataWidgets/ProjectionsPlot.cpp
rename to GUI/Views/IntensityDataWidgets/ProjectionsPlot.cpp
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ProjectionsPlot.h b/GUI/Views/IntensityDataWidgets/ProjectionsPlot.h
similarity index 100%
rename from GUI/coregui/Views/IntensityDataWidgets/ProjectionsPlot.h
rename to GUI/Views/IntensityDataWidgets/ProjectionsPlot.h
diff --git a/GUI/coregui/Views/IntensityDataWidgets/PropertyRepeater.cpp b/GUI/Views/IntensityDataWidgets/PropertyRepeater.cpp
similarity index 100%
rename from GUI/coregui/Views/IntensityDataWidgets/PropertyRepeater.cpp
rename to GUI/Views/IntensityDataWidgets/PropertyRepeater.cpp
diff --git a/GUI/coregui/Views/IntensityDataWidgets/PropertyRepeater.h b/GUI/Views/IntensityDataWidgets/PropertyRepeater.h
similarity index 100%
rename from GUI/coregui/Views/IntensityDataWidgets/PropertyRepeater.h
rename to GUI/Views/IntensityDataWidgets/PropertyRepeater.h
diff --git a/GUI/coregui/Views/IntensityDataWidgets/SavePlotAssistant.cpp b/GUI/Views/IntensityDataWidgets/SavePlotAssistant.cpp
similarity index 100%
rename from GUI/coregui/Views/IntensityDataWidgets/SavePlotAssistant.cpp
rename to GUI/Views/IntensityDataWidgets/SavePlotAssistant.cpp
diff --git a/GUI/coregui/Views/IntensityDataWidgets/SavePlotAssistant.h b/GUI/Views/IntensityDataWidgets/SavePlotAssistant.h
similarity index 100%
rename from GUI/coregui/Views/IntensityDataWidgets/SavePlotAssistant.h
rename to GUI/Views/IntensityDataWidgets/SavePlotAssistant.h
diff --git a/GUI/coregui/Views/IntensityDataWidgets/SaveProjectionsAssistant.cpp b/GUI/Views/IntensityDataWidgets/SaveProjectionsAssistant.cpp
similarity index 100%
rename from GUI/coregui/Views/IntensityDataWidgets/SaveProjectionsAssistant.cpp
rename to GUI/Views/IntensityDataWidgets/SaveProjectionsAssistant.cpp
diff --git a/GUI/coregui/Views/IntensityDataWidgets/SaveProjectionsAssistant.h b/GUI/Views/IntensityDataWidgets/SaveProjectionsAssistant.h
similarity index 100%
rename from GUI/coregui/Views/IntensityDataWidgets/SaveProjectionsAssistant.h
rename to GUI/Views/IntensityDataWidgets/SaveProjectionsAssistant.h
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ScientificPlot.cpp b/GUI/Views/IntensityDataWidgets/ScientificPlot.cpp
similarity index 100%
rename from GUI/coregui/Views/IntensityDataWidgets/ScientificPlot.cpp
rename to GUI/Views/IntensityDataWidgets/ScientificPlot.cpp
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ScientificPlot.h b/GUI/Views/IntensityDataWidgets/ScientificPlot.h
similarity index 100%
rename from GUI/coregui/Views/IntensityDataWidgets/ScientificPlot.h
rename to GUI/Views/IntensityDataWidgets/ScientificPlot.h
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ScientificPlotEvent.cpp b/GUI/Views/IntensityDataWidgets/ScientificPlotEvent.cpp
similarity index 100%
rename from GUI/coregui/Views/IntensityDataWidgets/ScientificPlotEvent.cpp
rename to GUI/Views/IntensityDataWidgets/ScientificPlotEvent.cpp
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ScientificPlotEvent.h b/GUI/Views/IntensityDataWidgets/ScientificPlotEvent.h
similarity index 100%
rename from GUI/coregui/Views/IntensityDataWidgets/ScientificPlotEvent.h
rename to GUI/Views/IntensityDataWidgets/ScientificPlotEvent.h
diff --git a/GUI/coregui/Views/JobView.cpp b/GUI/Views/JobView.cpp
similarity index 100%
rename from GUI/coregui/Views/JobView.cpp
rename to GUI/Views/JobView.cpp
diff --git a/GUI/coregui/Views/JobView.h b/GUI/Views/JobView.h
similarity index 100%
rename from GUI/coregui/Views/JobView.h
rename to GUI/Views/JobView.h
diff --git a/GUI/coregui/Views/JobWidgets/JobListViewDelegate.cpp b/GUI/Views/JobWidgets/JobListViewDelegate.cpp
similarity index 100%
rename from GUI/coregui/Views/JobWidgets/JobListViewDelegate.cpp
rename to GUI/Views/JobWidgets/JobListViewDelegate.cpp
diff --git a/GUI/coregui/Views/JobWidgets/JobListViewDelegate.h b/GUI/Views/JobWidgets/JobListViewDelegate.h
similarity index 100%
rename from GUI/coregui/Views/JobWidgets/JobListViewDelegate.h
rename to GUI/Views/JobWidgets/JobListViewDelegate.h
diff --git a/GUI/coregui/Views/JobWidgets/JobListWidget.cpp b/GUI/Views/JobWidgets/JobListWidget.cpp
similarity index 100%
rename from GUI/coregui/Views/JobWidgets/JobListWidget.cpp
rename to GUI/Views/JobWidgets/JobListWidget.cpp
diff --git a/GUI/coregui/Views/JobWidgets/JobListWidget.h b/GUI/Views/JobWidgets/JobListWidget.h
similarity index 100%
rename from GUI/coregui/Views/JobWidgets/JobListWidget.h
rename to GUI/Views/JobWidgets/JobListWidget.h
diff --git a/GUI/coregui/Views/JobWidgets/JobMessagePanel.cpp b/GUI/Views/JobWidgets/JobMessagePanel.cpp
similarity index 100%
rename from GUI/coregui/Views/JobWidgets/JobMessagePanel.cpp
rename to GUI/Views/JobWidgets/JobMessagePanel.cpp
diff --git a/GUI/coregui/Views/JobWidgets/JobMessagePanel.h b/GUI/Views/JobWidgets/JobMessagePanel.h
similarity index 100%
rename from GUI/coregui/Views/JobWidgets/JobMessagePanel.h
rename to GUI/Views/JobWidgets/JobMessagePanel.h
diff --git a/GUI/coregui/Views/JobWidgets/JobOutputDataWidget.cpp b/GUI/Views/JobWidgets/JobOutputDataWidget.cpp
similarity index 100%
rename from GUI/coregui/Views/JobWidgets/JobOutputDataWidget.cpp
rename to GUI/Views/JobWidgets/JobOutputDataWidget.cpp
diff --git a/GUI/coregui/Views/JobWidgets/JobOutputDataWidget.h b/GUI/Views/JobWidgets/JobOutputDataWidget.h
similarity index 100%
rename from GUI/coregui/Views/JobWidgets/JobOutputDataWidget.h
rename to GUI/Views/JobWidgets/JobOutputDataWidget.h
diff --git a/GUI/coregui/Views/JobWidgets/JobProgressAssistant.cpp b/GUI/Views/JobWidgets/JobProgressAssistant.cpp
similarity index 100%
rename from GUI/coregui/Views/JobWidgets/JobProgressAssistant.cpp
rename to GUI/Views/JobWidgets/JobProgressAssistant.cpp
diff --git a/GUI/coregui/Views/JobWidgets/JobProgressAssistant.h b/GUI/Views/JobWidgets/JobProgressAssistant.h
similarity index 100%
rename from GUI/coregui/Views/JobWidgets/JobProgressAssistant.h
rename to GUI/Views/JobWidgets/JobProgressAssistant.h
diff --git a/GUI/coregui/Views/JobWidgets/JobPropertiesWidget.cpp b/GUI/Views/JobWidgets/JobPropertiesWidget.cpp
similarity index 100%
rename from GUI/coregui/Views/JobWidgets/JobPropertiesWidget.cpp
rename to GUI/Views/JobWidgets/JobPropertiesWidget.cpp
diff --git a/GUI/coregui/Views/JobWidgets/JobPropertiesWidget.h b/GUI/Views/JobWidgets/JobPropertiesWidget.h
similarity index 100%
rename from GUI/coregui/Views/JobWidgets/JobPropertiesWidget.h
rename to GUI/Views/JobWidgets/JobPropertiesWidget.h
diff --git a/GUI/coregui/Views/JobWidgets/JobRealTimeToolBar.cpp b/GUI/Views/JobWidgets/JobRealTimeToolBar.cpp
similarity index 100%
rename from GUI/coregui/Views/JobWidgets/JobRealTimeToolBar.cpp
rename to GUI/Views/JobWidgets/JobRealTimeToolBar.cpp
diff --git a/GUI/coregui/Views/JobWidgets/JobRealTimeToolBar.h b/GUI/Views/JobWidgets/JobRealTimeToolBar.h
similarity index 100%
rename from GUI/coregui/Views/JobWidgets/JobRealTimeToolBar.h
rename to GUI/Views/JobWidgets/JobRealTimeToolBar.h
diff --git a/GUI/coregui/Views/JobWidgets/JobRealTimeWidget.cpp b/GUI/Views/JobWidgets/JobRealTimeWidget.cpp
similarity index 100%
rename from GUI/coregui/Views/JobWidgets/JobRealTimeWidget.cpp
rename to GUI/Views/JobWidgets/JobRealTimeWidget.cpp
diff --git a/GUI/coregui/Views/JobWidgets/JobRealTimeWidget.h b/GUI/Views/JobWidgets/JobRealTimeWidget.h
similarity index 100%
rename from GUI/coregui/Views/JobWidgets/JobRealTimeWidget.h
rename to GUI/Views/JobWidgets/JobRealTimeWidget.h
diff --git a/GUI/coregui/Views/JobWidgets/JobResultsPresenter.cpp b/GUI/Views/JobWidgets/JobResultsPresenter.cpp
similarity index 100%
rename from GUI/coregui/Views/JobWidgets/JobResultsPresenter.cpp
rename to GUI/Views/JobWidgets/JobResultsPresenter.cpp
diff --git a/GUI/coregui/Views/JobWidgets/JobResultsPresenter.h b/GUI/Views/JobWidgets/JobResultsPresenter.h
similarity index 100%
rename from GUI/coregui/Views/JobWidgets/JobResultsPresenter.h
rename to GUI/Views/JobWidgets/JobResultsPresenter.h
diff --git a/GUI/coregui/Views/JobWidgets/JobSelectorActions.cpp b/GUI/Views/JobWidgets/JobSelectorActions.cpp
similarity index 100%
rename from GUI/coregui/Views/JobWidgets/JobSelectorActions.cpp
rename to GUI/Views/JobWidgets/JobSelectorActions.cpp
diff --git a/GUI/coregui/Views/JobWidgets/JobSelectorActions.h b/GUI/Views/JobWidgets/JobSelectorActions.h
similarity index 100%
rename from GUI/coregui/Views/JobWidgets/JobSelectorActions.h
rename to GUI/Views/JobWidgets/JobSelectorActions.h
diff --git a/GUI/coregui/Views/JobWidgets/JobSelectorToolBar.cpp b/GUI/Views/JobWidgets/JobSelectorToolBar.cpp
similarity index 100%
rename from GUI/coregui/Views/JobWidgets/JobSelectorToolBar.cpp
rename to GUI/Views/JobWidgets/JobSelectorToolBar.cpp
diff --git a/GUI/coregui/Views/JobWidgets/JobSelectorToolBar.h b/GUI/Views/JobWidgets/JobSelectorToolBar.h
similarity index 100%
rename from GUI/coregui/Views/JobWidgets/JobSelectorToolBar.h
rename to GUI/Views/JobWidgets/JobSelectorToolBar.h
diff --git a/GUI/coregui/Views/JobWidgets/JobSelectorWidget.cpp b/GUI/Views/JobWidgets/JobSelectorWidget.cpp
similarity index 100%
rename from GUI/coregui/Views/JobWidgets/JobSelectorWidget.cpp
rename to GUI/Views/JobWidgets/JobSelectorWidget.cpp
diff --git a/GUI/coregui/Views/JobWidgets/JobSelectorWidget.h b/GUI/Views/JobWidgets/JobSelectorWidget.h
similarity index 100%
rename from GUI/coregui/Views/JobWidgets/JobSelectorWidget.h
rename to GUI/Views/JobWidgets/JobSelectorWidget.h
diff --git a/GUI/coregui/Views/JobWidgets/JobViewActivities.cpp b/GUI/Views/JobWidgets/JobViewActivities.cpp
similarity index 100%
rename from GUI/coregui/Views/JobWidgets/JobViewActivities.cpp
rename to GUI/Views/JobWidgets/JobViewActivities.cpp
diff --git a/GUI/coregui/Views/JobWidgets/JobViewActivities.h b/GUI/Views/JobWidgets/JobViewActivities.h
similarity index 100%
rename from GUI/coregui/Views/JobWidgets/JobViewActivities.h
rename to GUI/Views/JobWidgets/JobViewActivities.h
diff --git a/GUI/coregui/Views/JobWidgets/JobViewFlags.h b/GUI/Views/JobWidgets/JobViewFlags.h
similarity index 100%
rename from GUI/coregui/Views/JobWidgets/JobViewFlags.h
rename to GUI/Views/JobWidgets/JobViewFlags.h
diff --git a/GUI/coregui/Views/JobWidgets/ParameterTuningDelegate.cpp b/GUI/Views/JobWidgets/ParameterTuningDelegate.cpp
similarity index 100%
rename from GUI/coregui/Views/JobWidgets/ParameterTuningDelegate.cpp
rename to GUI/Views/JobWidgets/ParameterTuningDelegate.cpp
diff --git a/GUI/coregui/Views/JobWidgets/ParameterTuningDelegate.h b/GUI/Views/JobWidgets/ParameterTuningDelegate.h
similarity index 100%
rename from GUI/coregui/Views/JobWidgets/ParameterTuningDelegate.h
rename to GUI/Views/JobWidgets/ParameterTuningDelegate.h
diff --git a/GUI/coregui/Views/JobWidgets/ParameterTuningWidget.cpp b/GUI/Views/JobWidgets/ParameterTuningWidget.cpp
similarity index 100%
rename from GUI/coregui/Views/JobWidgets/ParameterTuningWidget.cpp
rename to GUI/Views/JobWidgets/ParameterTuningWidget.cpp
diff --git a/GUI/coregui/Views/JobWidgets/ParameterTuningWidget.h b/GUI/Views/JobWidgets/ParameterTuningWidget.h
similarity index 100%
rename from GUI/coregui/Views/JobWidgets/ParameterTuningWidget.h
rename to GUI/Views/JobWidgets/ParameterTuningWidget.h
diff --git a/GUI/coregui/Views/JobWidgets/ProjectionsEditor.cpp b/GUI/Views/JobWidgets/ProjectionsEditor.cpp
similarity index 100%
rename from GUI/coregui/Views/JobWidgets/ProjectionsEditor.cpp
rename to GUI/Views/JobWidgets/ProjectionsEditor.cpp
diff --git a/GUI/coregui/Views/JobWidgets/ProjectionsEditor.h b/GUI/Views/JobWidgets/ProjectionsEditor.h
similarity index 100%
rename from GUI/coregui/Views/JobWidgets/ProjectionsEditor.h
rename to GUI/Views/JobWidgets/ProjectionsEditor.h
diff --git a/GUI/coregui/Views/JobWidgets/ProjectionsEditorActions.cpp b/GUI/Views/JobWidgets/ProjectionsEditorActions.cpp
similarity index 100%
rename from GUI/coregui/Views/JobWidgets/ProjectionsEditorActions.cpp
rename to GUI/Views/JobWidgets/ProjectionsEditorActions.cpp
diff --git a/GUI/coregui/Views/JobWidgets/ProjectionsEditorActions.h b/GUI/Views/JobWidgets/ProjectionsEditorActions.h
similarity index 100%
rename from GUI/coregui/Views/JobWidgets/ProjectionsEditorActions.h
rename to GUI/Views/JobWidgets/ProjectionsEditorActions.h
diff --git a/GUI/coregui/Views/JobWidgets/ProjectionsEditorCanvas.cpp b/GUI/Views/JobWidgets/ProjectionsEditorCanvas.cpp
similarity index 100%
rename from GUI/coregui/Views/JobWidgets/ProjectionsEditorCanvas.cpp
rename to GUI/Views/JobWidgets/ProjectionsEditorCanvas.cpp
diff --git a/GUI/coregui/Views/JobWidgets/ProjectionsEditorCanvas.h b/GUI/Views/JobWidgets/ProjectionsEditorCanvas.h
similarity index 100%
rename from GUI/coregui/Views/JobWidgets/ProjectionsEditorCanvas.h
rename to GUI/Views/JobWidgets/ProjectionsEditorCanvas.h
diff --git a/GUI/coregui/Views/JobWidgets/ProjectionsPropertyPanel.cpp b/GUI/Views/JobWidgets/ProjectionsPropertyPanel.cpp
similarity index 100%
rename from GUI/coregui/Views/JobWidgets/ProjectionsPropertyPanel.cpp
rename to GUI/Views/JobWidgets/ProjectionsPropertyPanel.cpp
diff --git a/GUI/coregui/Views/JobWidgets/ProjectionsPropertyPanel.h b/GUI/Views/JobWidgets/ProjectionsPropertyPanel.h
similarity index 100%
rename from GUI/coregui/Views/JobWidgets/ProjectionsPropertyPanel.h
rename to GUI/Views/JobWidgets/ProjectionsPropertyPanel.h
diff --git a/GUI/coregui/Views/JobWidgets/ProjectionsToolBar.cpp b/GUI/Views/JobWidgets/ProjectionsToolBar.cpp
similarity index 100%
rename from GUI/coregui/Views/JobWidgets/ProjectionsToolBar.cpp
rename to GUI/Views/JobWidgets/ProjectionsToolBar.cpp
diff --git a/GUI/coregui/Views/JobWidgets/ProjectionsToolBar.h b/GUI/Views/JobWidgets/ProjectionsToolBar.h
similarity index 100%
rename from GUI/coregui/Views/JobWidgets/ProjectionsToolBar.h
rename to GUI/Views/JobWidgets/ProjectionsToolBar.h
diff --git a/GUI/coregui/Views/JobWidgets/ProjectionsWidget.cpp b/GUI/Views/JobWidgets/ProjectionsWidget.cpp
similarity index 100%
rename from GUI/coregui/Views/JobWidgets/ProjectionsWidget.cpp
rename to GUI/Views/JobWidgets/ProjectionsWidget.cpp
diff --git a/GUI/coregui/Views/JobWidgets/ProjectionsWidget.h b/GUI/Views/JobWidgets/ProjectionsWidget.h
similarity index 100%
rename from GUI/coregui/Views/JobWidgets/ProjectionsWidget.h
rename to GUI/Views/JobWidgets/ProjectionsWidget.h
diff --git a/GUI/coregui/Views/JobWidgets/ScientificSpinBox.cpp b/GUI/Views/JobWidgets/ScientificSpinBox.cpp
similarity index 100%
rename from GUI/coregui/Views/JobWidgets/ScientificSpinBox.cpp
rename to GUI/Views/JobWidgets/ScientificSpinBox.cpp
diff --git a/GUI/coregui/Views/JobWidgets/ScientificSpinBox.h b/GUI/Views/JobWidgets/ScientificSpinBox.h
similarity index 100%
rename from GUI/coregui/Views/JobWidgets/ScientificSpinBox.h
rename to GUI/Views/JobWidgets/ScientificSpinBox.h
diff --git a/GUI/coregui/Views/JobWidgets/SliderSettingsWidget.cpp b/GUI/Views/JobWidgets/SliderSettingsWidget.cpp
similarity index 100%
rename from GUI/coregui/Views/JobWidgets/SliderSettingsWidget.cpp
rename to GUI/Views/JobWidgets/SliderSettingsWidget.cpp
diff --git a/GUI/coregui/Views/JobWidgets/SliderSettingsWidget.h b/GUI/Views/JobWidgets/SliderSettingsWidget.h
similarity index 100%
rename from GUI/coregui/Views/JobWidgets/SliderSettingsWidget.h
rename to GUI/Views/JobWidgets/SliderSettingsWidget.h
diff --git a/GUI/coregui/Views/MaskWidgets/ColorMapSceneAdaptor.cpp b/GUI/Views/MaskWidgets/ColorMapSceneAdaptor.cpp
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/ColorMapSceneAdaptor.cpp
rename to GUI/Views/MaskWidgets/ColorMapSceneAdaptor.cpp
diff --git a/GUI/coregui/Views/MaskWidgets/ColorMapSceneAdaptor.h b/GUI/Views/MaskWidgets/ColorMapSceneAdaptor.h
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/ColorMapSceneAdaptor.h
rename to GUI/Views/MaskWidgets/ColorMapSceneAdaptor.h
diff --git a/GUI/coregui/Views/MaskWidgets/EllipseView.cpp b/GUI/Views/MaskWidgets/EllipseView.cpp
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/EllipseView.cpp
rename to GUI/Views/MaskWidgets/EllipseView.cpp
diff --git a/GUI/coregui/Views/MaskWidgets/EllipseView.h b/GUI/Views/MaskWidgets/EllipseView.h
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/EllipseView.h
rename to GUI/Views/MaskWidgets/EllipseView.h
diff --git a/GUI/coregui/Views/MaskWidgets/ISceneAdaptor.h b/GUI/Views/MaskWidgets/ISceneAdaptor.h
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/ISceneAdaptor.h
rename to GUI/Views/MaskWidgets/ISceneAdaptor.h
diff --git a/GUI/coregui/Views/MaskWidgets/IShape2DView.cpp b/GUI/Views/MaskWidgets/IShape2DView.cpp
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/IShape2DView.cpp
rename to GUI/Views/MaskWidgets/IShape2DView.cpp
diff --git a/GUI/coregui/Views/MaskWidgets/IShape2DView.h b/GUI/Views/MaskWidgets/IShape2DView.h
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/IShape2DView.h
rename to GUI/Views/MaskWidgets/IShape2DView.h
diff --git a/GUI/coregui/Views/MaskWidgets/IntensityDataView.cpp b/GUI/Views/MaskWidgets/IntensityDataView.cpp
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/IntensityDataView.cpp
rename to GUI/Views/MaskWidgets/IntensityDataView.cpp
diff --git a/GUI/coregui/Views/MaskWidgets/IntensityDataView.h b/GUI/Views/MaskWidgets/IntensityDataView.h
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/IntensityDataView.h
rename to GUI/Views/MaskWidgets/IntensityDataView.h
diff --git a/GUI/coregui/Views/MaskWidgets/LineViews.cpp b/GUI/Views/MaskWidgets/LineViews.cpp
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/LineViews.cpp
rename to GUI/Views/MaskWidgets/LineViews.cpp
diff --git a/GUI/coregui/Views/MaskWidgets/LineViews.h b/GUI/Views/MaskWidgets/LineViews.h
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/LineViews.h
rename to GUI/Views/MaskWidgets/LineViews.h
diff --git a/GUI/coregui/Views/MaskWidgets/MaskAllView.cpp b/GUI/Views/MaskWidgets/MaskAllView.cpp
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/MaskAllView.cpp
rename to GUI/Views/MaskWidgets/MaskAllView.cpp
diff --git a/GUI/coregui/Views/MaskWidgets/MaskAllView.h b/GUI/Views/MaskWidgets/MaskAllView.h
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/MaskAllView.h
rename to GUI/Views/MaskWidgets/MaskAllView.h
diff --git a/GUI/coregui/Views/MaskWidgets/MaskContainerView.cpp b/GUI/Views/MaskWidgets/MaskContainerView.cpp
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/MaskContainerView.cpp
rename to GUI/Views/MaskWidgets/MaskContainerView.cpp
diff --git a/GUI/coregui/Views/MaskWidgets/MaskContainerView.h b/GUI/Views/MaskWidgets/MaskContainerView.h
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/MaskContainerView.h
rename to GUI/Views/MaskWidgets/MaskContainerView.h
diff --git a/GUI/coregui/Views/MaskWidgets/MaskDrawingContext.cpp b/GUI/Views/MaskWidgets/MaskDrawingContext.cpp
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/MaskDrawingContext.cpp
rename to GUI/Views/MaskWidgets/MaskDrawingContext.cpp
diff --git a/GUI/coregui/Views/MaskWidgets/MaskDrawingContext.h b/GUI/Views/MaskWidgets/MaskDrawingContext.h
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/MaskDrawingContext.h
rename to GUI/Views/MaskWidgets/MaskDrawingContext.h
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditor.cpp b/GUI/Views/MaskWidgets/MaskEditor.cpp
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/MaskEditor.cpp
rename to GUI/Views/MaskWidgets/MaskEditor.cpp
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditor.h b/GUI/Views/MaskWidgets/MaskEditor.h
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/MaskEditor.h
rename to GUI/Views/MaskWidgets/MaskEditor.h
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditorActions.cpp b/GUI/Views/MaskWidgets/MaskEditorActions.cpp
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/MaskEditorActions.cpp
rename to GUI/Views/MaskWidgets/MaskEditorActions.cpp
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditorActions.h b/GUI/Views/MaskWidgets/MaskEditorActions.h
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/MaskEditorActions.h
rename to GUI/Views/MaskWidgets/MaskEditorActions.h
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditorCanvas.cpp b/GUI/Views/MaskWidgets/MaskEditorCanvas.cpp
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/MaskEditorCanvas.cpp
rename to GUI/Views/MaskWidgets/MaskEditorCanvas.cpp
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditorCanvas.h b/GUI/Views/MaskWidgets/MaskEditorCanvas.h
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/MaskEditorCanvas.h
rename to GUI/Views/MaskWidgets/MaskEditorCanvas.h
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditorFlags.h b/GUI/Views/MaskWidgets/MaskEditorFlags.h
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/MaskEditorFlags.h
rename to GUI/Views/MaskWidgets/MaskEditorFlags.h
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditorHelper.cpp b/GUI/Views/MaskWidgets/MaskEditorHelper.cpp
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/MaskEditorHelper.cpp
rename to GUI/Views/MaskWidgets/MaskEditorHelper.cpp
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditorHelper.h b/GUI/Views/MaskWidgets/MaskEditorHelper.h
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/MaskEditorHelper.h
rename to GUI/Views/MaskWidgets/MaskEditorHelper.h
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditorPropertyPanel.cpp b/GUI/Views/MaskWidgets/MaskEditorPropertyPanel.cpp
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/MaskEditorPropertyPanel.cpp
rename to GUI/Views/MaskWidgets/MaskEditorPropertyPanel.cpp
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditorPropertyPanel.h b/GUI/Views/MaskWidgets/MaskEditorPropertyPanel.h
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/MaskEditorPropertyPanel.h
rename to GUI/Views/MaskWidgets/MaskEditorPropertyPanel.h
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditorToolBar.cpp b/GUI/Views/MaskWidgets/MaskEditorToolBar.cpp
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/MaskEditorToolBar.cpp
rename to GUI/Views/MaskWidgets/MaskEditorToolBar.cpp
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditorToolBar.h b/GUI/Views/MaskWidgets/MaskEditorToolBar.h
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/MaskEditorToolBar.h
rename to GUI/Views/MaskWidgets/MaskEditorToolBar.h
diff --git a/GUI/coregui/Views/MaskWidgets/MaskGraphicsProxy.cpp b/GUI/Views/MaskWidgets/MaskGraphicsProxy.cpp
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/MaskGraphicsProxy.cpp
rename to GUI/Views/MaskWidgets/MaskGraphicsProxy.cpp
diff --git a/GUI/coregui/Views/MaskWidgets/MaskGraphicsProxy.h b/GUI/Views/MaskWidgets/MaskGraphicsProxy.h
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/MaskGraphicsProxy.h
rename to GUI/Views/MaskWidgets/MaskGraphicsProxy.h
diff --git a/GUI/coregui/Views/MaskWidgets/MaskGraphicsScene.cpp b/GUI/Views/MaskWidgets/MaskGraphicsScene.cpp
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/MaskGraphicsScene.cpp
rename to GUI/Views/MaskWidgets/MaskGraphicsScene.cpp
diff --git a/GUI/coregui/Views/MaskWidgets/MaskGraphicsScene.h b/GUI/Views/MaskWidgets/MaskGraphicsScene.h
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/MaskGraphicsScene.h
rename to GUI/Views/MaskWidgets/MaskGraphicsScene.h
diff --git a/GUI/coregui/Views/MaskWidgets/MaskGraphicsView.cpp b/GUI/Views/MaskWidgets/MaskGraphicsView.cpp
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/MaskGraphicsView.cpp
rename to GUI/Views/MaskWidgets/MaskGraphicsView.cpp
diff --git a/GUI/coregui/Views/MaskWidgets/MaskGraphicsView.h b/GUI/Views/MaskWidgets/MaskGraphicsView.h
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/MaskGraphicsView.h
rename to GUI/Views/MaskWidgets/MaskGraphicsView.h
diff --git a/GUI/coregui/Views/MaskWidgets/MaskResultsPresenter.cpp b/GUI/Views/MaskWidgets/MaskResultsPresenter.cpp
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/MaskResultsPresenter.cpp
rename to GUI/Views/MaskWidgets/MaskResultsPresenter.cpp
diff --git a/GUI/coregui/Views/MaskWidgets/MaskResultsPresenter.h b/GUI/Views/MaskWidgets/MaskResultsPresenter.h
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/MaskResultsPresenter.h
rename to GUI/Views/MaskWidgets/MaskResultsPresenter.h
diff --git a/GUI/coregui/Views/MaskWidgets/MaskUnitsConverter.cpp b/GUI/Views/MaskWidgets/MaskUnitsConverter.cpp
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/MaskUnitsConverter.cpp
rename to GUI/Views/MaskWidgets/MaskUnitsConverter.cpp
diff --git a/GUI/coregui/Views/MaskWidgets/MaskUnitsConverter.h b/GUI/Views/MaskWidgets/MaskUnitsConverter.h
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/MaskUnitsConverter.h
rename to GUI/Views/MaskWidgets/MaskUnitsConverter.h
diff --git a/GUI/coregui/Views/MaskWidgets/MaskViewFactory.cpp b/GUI/Views/MaskWidgets/MaskViewFactory.cpp
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/MaskViewFactory.cpp
rename to GUI/Views/MaskWidgets/MaskViewFactory.cpp
diff --git a/GUI/coregui/Views/MaskWidgets/MaskViewFactory.h b/GUI/Views/MaskWidgets/MaskViewFactory.h
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/MaskViewFactory.h
rename to GUI/Views/MaskWidgets/MaskViewFactory.h
diff --git a/GUI/coregui/Views/MaskWidgets/MaskWidgets.qrc b/GUI/Views/MaskWidgets/MaskWidgets.qrc
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/MaskWidgets.qrc
rename to GUI/Views/MaskWidgets/MaskWidgets.qrc
diff --git a/GUI/coregui/Views/MaskWidgets/PolygonPointView.cpp b/GUI/Views/MaskWidgets/PolygonPointView.cpp
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/PolygonPointView.cpp
rename to GUI/Views/MaskWidgets/PolygonPointView.cpp
diff --git a/GUI/coregui/Views/MaskWidgets/PolygonPointView.h b/GUI/Views/MaskWidgets/PolygonPointView.h
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/PolygonPointView.h
rename to GUI/Views/MaskWidgets/PolygonPointView.h
diff --git a/GUI/coregui/Views/MaskWidgets/PolygonView.cpp b/GUI/Views/MaskWidgets/PolygonView.cpp
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/PolygonView.cpp
rename to GUI/Views/MaskWidgets/PolygonView.cpp
diff --git a/GUI/coregui/Views/MaskWidgets/PolygonView.h b/GUI/Views/MaskWidgets/PolygonView.h
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/PolygonView.h
rename to GUI/Views/MaskWidgets/PolygonView.h
diff --git a/GUI/coregui/Views/MaskWidgets/RectangleBaseView.cpp b/GUI/Views/MaskWidgets/RectangleBaseView.cpp
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/RectangleBaseView.cpp
rename to GUI/Views/MaskWidgets/RectangleBaseView.cpp
diff --git a/GUI/coregui/Views/MaskWidgets/RectangleBaseView.h b/GUI/Views/MaskWidgets/RectangleBaseView.h
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/RectangleBaseView.h
rename to GUI/Views/MaskWidgets/RectangleBaseView.h
diff --git a/GUI/coregui/Views/MaskWidgets/RectangleView.cpp b/GUI/Views/MaskWidgets/RectangleView.cpp
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/RectangleView.cpp
rename to GUI/Views/MaskWidgets/RectangleView.cpp
diff --git a/GUI/coregui/Views/MaskWidgets/RectangleView.h b/GUI/Views/MaskWidgets/RectangleView.h
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/RectangleView.h
rename to GUI/Views/MaskWidgets/RectangleView.h
diff --git a/GUI/coregui/Views/MaskWidgets/RegionOfInterestView.cpp b/GUI/Views/MaskWidgets/RegionOfInterestView.cpp
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/RegionOfInterestView.cpp
rename to GUI/Views/MaskWidgets/RegionOfInterestView.cpp
diff --git a/GUI/coregui/Views/MaskWidgets/RegionOfInterestView.h b/GUI/Views/MaskWidgets/RegionOfInterestView.h
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/RegionOfInterestView.h
rename to GUI/Views/MaskWidgets/RegionOfInterestView.h
diff --git a/GUI/coregui/Views/MaskWidgets/SizeHandleElement.cpp b/GUI/Views/MaskWidgets/SizeHandleElement.cpp
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/SizeHandleElement.cpp
rename to GUI/Views/MaskWidgets/SizeHandleElement.cpp
diff --git a/GUI/coregui/Views/MaskWidgets/SizeHandleElement.h b/GUI/Views/MaskWidgets/SizeHandleElement.h
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/SizeHandleElement.h
rename to GUI/Views/MaskWidgets/SizeHandleElement.h
diff --git a/GUI/coregui/Views/MaskWidgets/images/maskeditor_arrow.svg b/GUI/Views/MaskWidgets/images/maskeditor_arrow.svg
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/images/maskeditor_arrow.svg
rename to GUI/Views/MaskWidgets/images/maskeditor_arrow.svg
diff --git a/GUI/coregui/Views/MaskWidgets/images/maskeditor_bringtofront.svg b/GUI/Views/MaskWidgets/images/maskeditor_bringtofront.svg
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/images/maskeditor_bringtofront.svg
rename to GUI/Views/MaskWidgets/images/maskeditor_bringtofront.svg
diff --git a/GUI/coregui/Views/MaskWidgets/images/maskeditor_details.svg b/GUI/Views/MaskWidgets/images/maskeditor_details.svg
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/images/maskeditor_details.svg
rename to GUI/Views/MaskWidgets/images/maskeditor_details.svg
diff --git a/GUI/coregui/Views/MaskWidgets/images/maskeditor_ellipse.svg b/GUI/Views/MaskWidgets/images/maskeditor_ellipse.svg
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/images/maskeditor_ellipse.svg
rename to GUI/Views/MaskWidgets/images/maskeditor_ellipse.svg
diff --git a/GUI/coregui/Views/MaskWidgets/images/maskeditor_hand.svg b/GUI/Views/MaskWidgets/images/maskeditor_hand.svg
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/images/maskeditor_hand.svg
rename to GUI/Views/MaskWidgets/images/maskeditor_hand.svg
diff --git a/GUI/coregui/Views/MaskWidgets/images/maskeditor_horizontalline.svg b/GUI/Views/MaskWidgets/images/maskeditor_horizontalline.svg
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/images/maskeditor_horizontalline.svg
rename to GUI/Views/MaskWidgets/images/maskeditor_horizontalline.svg
diff --git a/GUI/coregui/Views/MaskWidgets/images/maskeditor_lightbulb.svg b/GUI/Views/MaskWidgets/images/maskeditor_lightbulb.svg
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/images/maskeditor_lightbulb.svg
rename to GUI/Views/MaskWidgets/images/maskeditor_lightbulb.svg
diff --git a/GUI/coregui/Views/MaskWidgets/images/maskeditor_maskall.svg b/GUI/Views/MaskWidgets/images/maskeditor_maskall.svg
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/images/maskeditor_maskall.svg
rename to GUI/Views/MaskWidgets/images/maskeditor_maskall.svg
diff --git a/GUI/coregui/Views/MaskWidgets/images/maskeditor_maskfalse.svg b/GUI/Views/MaskWidgets/images/maskeditor_maskfalse.svg
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/images/maskeditor_maskfalse.svg
rename to GUI/Views/MaskWidgets/images/maskeditor_maskfalse.svg
diff --git a/GUI/coregui/Views/MaskWidgets/images/maskeditor_masktrue.svg b/GUI/Views/MaskWidgets/images/maskeditor_masktrue.svg
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/images/maskeditor_masktrue.svg
rename to GUI/Views/MaskWidgets/images/maskeditor_masktrue.svg
diff --git a/GUI/coregui/Views/MaskWidgets/images/maskeditor_polygon.svg b/GUI/Views/MaskWidgets/images/maskeditor_polygon.svg
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/images/maskeditor_polygon.svg
rename to GUI/Views/MaskWidgets/images/maskeditor_polygon.svg
diff --git a/GUI/coregui/Views/MaskWidgets/images/maskeditor_rectangle.svg b/GUI/Views/MaskWidgets/images/maskeditor_rectangle.svg
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/images/maskeditor_rectangle.svg
rename to GUI/Views/MaskWidgets/images/maskeditor_rectangle.svg
diff --git a/GUI/coregui/Views/MaskWidgets/images/maskeditor_refresh.svg b/GUI/Views/MaskWidgets/images/maskeditor_refresh.svg
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/images/maskeditor_refresh.svg
rename to GUI/Views/MaskWidgets/images/maskeditor_refresh.svg
diff --git a/GUI/coregui/Views/MaskWidgets/images/maskeditor_roi.svg b/GUI/Views/MaskWidgets/images/maskeditor_roi.svg
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/images/maskeditor_roi.svg
rename to GUI/Views/MaskWidgets/images/maskeditor_roi.svg
diff --git a/GUI/coregui/Views/MaskWidgets/images/maskeditor_save.svg b/GUI/Views/MaskWidgets/images/maskeditor_save.svg
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/images/maskeditor_save.svg
rename to GUI/Views/MaskWidgets/images/maskeditor_save.svg
diff --git a/GUI/coregui/Views/MaskWidgets/images/maskeditor_sendtoback.svg b/GUI/Views/MaskWidgets/images/maskeditor_sendtoback.svg
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/images/maskeditor_sendtoback.svg
rename to GUI/Views/MaskWidgets/images/maskeditor_sendtoback.svg
diff --git a/GUI/coregui/Views/MaskWidgets/images/maskeditor_toolpanel.svg b/GUI/Views/MaskWidgets/images/maskeditor_toolpanel.svg
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/images/maskeditor_toolpanel.svg
rename to GUI/Views/MaskWidgets/images/maskeditor_toolpanel.svg
diff --git a/GUI/coregui/Views/MaskWidgets/images/maskeditor_verticalline.svg b/GUI/Views/MaskWidgets/images/maskeditor_verticalline.svg
similarity index 100%
rename from GUI/coregui/Views/MaskWidgets/images/maskeditor_verticalline.svg
rename to GUI/Views/MaskWidgets/images/maskeditor_verticalline.svg
diff --git a/GUI/coregui/Views/MaterialEditor/ExternalProperty.cpp b/GUI/Views/MaterialEditor/ExternalProperty.cpp
similarity index 100%
rename from GUI/coregui/Views/MaterialEditor/ExternalProperty.cpp
rename to GUI/Views/MaterialEditor/ExternalProperty.cpp
diff --git a/GUI/coregui/Views/MaterialEditor/ExternalProperty.h b/GUI/Views/MaterialEditor/ExternalProperty.h
similarity index 100%
rename from GUI/coregui/Views/MaterialEditor/ExternalProperty.h
rename to GUI/Views/MaterialEditor/ExternalProperty.h
diff --git a/GUI/coregui/Views/MaterialEditor/MaterialEditor.cpp b/GUI/Views/MaterialEditor/MaterialEditor.cpp
similarity index 100%
rename from GUI/coregui/Views/MaterialEditor/MaterialEditor.cpp
rename to GUI/Views/MaterialEditor/MaterialEditor.cpp
diff --git a/GUI/coregui/Views/MaterialEditor/MaterialEditor.h b/GUI/Views/MaterialEditor/MaterialEditor.h
similarity index 100%
rename from GUI/coregui/Views/MaterialEditor/MaterialEditor.h
rename to GUI/Views/MaterialEditor/MaterialEditor.h
diff --git a/GUI/coregui/Views/MaterialEditor/MaterialEditorDialog.cpp b/GUI/Views/MaterialEditor/MaterialEditorDialog.cpp
similarity index 100%
rename from GUI/coregui/Views/MaterialEditor/MaterialEditorDialog.cpp
rename to GUI/Views/MaterialEditor/MaterialEditorDialog.cpp
diff --git a/GUI/coregui/Views/MaterialEditor/MaterialEditorDialog.h b/GUI/Views/MaterialEditor/MaterialEditorDialog.h
similarity index 100%
rename from GUI/coregui/Views/MaterialEditor/MaterialEditorDialog.h
rename to GUI/Views/MaterialEditor/MaterialEditorDialog.h
diff --git a/GUI/coregui/Views/MaterialEditor/MaterialEditorToolBar.cpp b/GUI/Views/MaterialEditor/MaterialEditorToolBar.cpp
similarity index 100%
rename from GUI/coregui/Views/MaterialEditor/MaterialEditorToolBar.cpp
rename to GUI/Views/MaterialEditor/MaterialEditorToolBar.cpp
diff --git a/GUI/coregui/Views/MaterialEditor/MaterialEditorToolBar.h b/GUI/Views/MaterialEditor/MaterialEditorToolBar.h
similarity index 100%
rename from GUI/coregui/Views/MaterialEditor/MaterialEditorToolBar.h
rename to GUI/Views/MaterialEditor/MaterialEditorToolBar.h
diff --git a/GUI/coregui/Views/MaterialEditor/MaterialItemUtils.cpp b/GUI/Views/MaterialEditor/MaterialItemUtils.cpp
similarity index 100%
rename from GUI/coregui/Views/MaterialEditor/MaterialItemUtils.cpp
rename to GUI/Views/MaterialEditor/MaterialItemUtils.cpp
diff --git a/GUI/coregui/Views/MaterialEditor/MaterialItemUtils.h b/GUI/Views/MaterialEditor/MaterialItemUtils.h
similarity index 100%
rename from GUI/coregui/Views/MaterialEditor/MaterialItemUtils.h
rename to GUI/Views/MaterialEditor/MaterialItemUtils.h
diff --git a/GUI/coregui/Views/PropertyEditor/ComponentEditor.cpp b/GUI/Views/PropertyEditor/ComponentEditor.cpp
similarity index 100%
rename from GUI/coregui/Views/PropertyEditor/ComponentEditor.cpp
rename to GUI/Views/PropertyEditor/ComponentEditor.cpp
diff --git a/GUI/coregui/Views/PropertyEditor/ComponentEditor.h b/GUI/Views/PropertyEditor/ComponentEditor.h
similarity index 100%
rename from GUI/coregui/Views/PropertyEditor/ComponentEditor.h
rename to GUI/Views/PropertyEditor/ComponentEditor.h
diff --git a/GUI/coregui/Views/PropertyEditor/ComponentFlatView.cpp b/GUI/Views/PropertyEditor/ComponentFlatView.cpp
similarity index 100%
rename from GUI/coregui/Views/PropertyEditor/ComponentFlatView.cpp
rename to GUI/Views/PropertyEditor/ComponentFlatView.cpp
diff --git a/GUI/coregui/Views/PropertyEditor/ComponentFlatView.h b/GUI/Views/PropertyEditor/ComponentFlatView.h
similarity index 100%
rename from GUI/coregui/Views/PropertyEditor/ComponentFlatView.h
rename to GUI/Views/PropertyEditor/ComponentFlatView.h
diff --git a/GUI/coregui/Views/PropertyEditor/ComponentTreeActions.cpp b/GUI/Views/PropertyEditor/ComponentTreeActions.cpp
similarity index 100%
rename from GUI/coregui/Views/PropertyEditor/ComponentTreeActions.cpp
rename to GUI/Views/PropertyEditor/ComponentTreeActions.cpp
diff --git a/GUI/coregui/Views/PropertyEditor/ComponentTreeActions.h b/GUI/Views/PropertyEditor/ComponentTreeActions.h
similarity index 100%
rename from GUI/coregui/Views/PropertyEditor/ComponentTreeActions.h
rename to GUI/Views/PropertyEditor/ComponentTreeActions.h
diff --git a/GUI/coregui/Views/PropertyEditor/ComponentTreeView.cpp b/GUI/Views/PropertyEditor/ComponentTreeView.cpp
similarity index 100%
rename from GUI/coregui/Views/PropertyEditor/ComponentTreeView.cpp
rename to GUI/Views/PropertyEditor/ComponentTreeView.cpp
diff --git a/GUI/coregui/Views/PropertyEditor/ComponentTreeView.h b/GUI/Views/PropertyEditor/ComponentTreeView.h
similarity index 100%
rename from GUI/coregui/Views/PropertyEditor/ComponentTreeView.h
rename to GUI/Views/PropertyEditor/ComponentTreeView.h
diff --git a/GUI/coregui/Views/PropertyEditor/ComponentUtils.cpp b/GUI/Views/PropertyEditor/ComponentUtils.cpp
similarity index 100%
rename from GUI/coregui/Views/PropertyEditor/ComponentUtils.cpp
rename to GUI/Views/PropertyEditor/ComponentUtils.cpp
diff --git a/GUI/coregui/Views/PropertyEditor/ComponentUtils.h b/GUI/Views/PropertyEditor/ComponentUtils.h
similarity index 100%
rename from GUI/coregui/Views/PropertyEditor/ComponentUtils.h
rename to GUI/Views/PropertyEditor/ComponentUtils.h
diff --git a/GUI/coregui/Views/PropertyEditor/ComponentView.h b/GUI/Views/PropertyEditor/ComponentView.h
similarity index 100%
rename from GUI/coregui/Views/PropertyEditor/ComponentView.h
rename to GUI/Views/PropertyEditor/ComponentView.h
diff --git a/GUI/coregui/Views/PropertyEditor/CustomEditors.cpp b/GUI/Views/PropertyEditor/CustomEditors.cpp
similarity index 100%
rename from GUI/coregui/Views/PropertyEditor/CustomEditors.cpp
rename to GUI/Views/PropertyEditor/CustomEditors.cpp
diff --git a/GUI/coregui/Views/PropertyEditor/CustomEditors.h b/GUI/Views/PropertyEditor/CustomEditors.h
similarity index 100%
rename from GUI/coregui/Views/PropertyEditor/CustomEditors.h
rename to GUI/Views/PropertyEditor/CustomEditors.h
diff --git a/GUI/coregui/Views/PropertyEditor/MultiComboPropertyEditor.cpp b/GUI/Views/PropertyEditor/MultiComboPropertyEditor.cpp
similarity index 100%
rename from GUI/coregui/Views/PropertyEditor/MultiComboPropertyEditor.cpp
rename to GUI/Views/PropertyEditor/MultiComboPropertyEditor.cpp
diff --git a/GUI/coregui/Views/PropertyEditor/MultiComboPropertyEditor.h b/GUI/Views/PropertyEditor/MultiComboPropertyEditor.h
similarity index 100%
rename from GUI/coregui/Views/PropertyEditor/MultiComboPropertyEditor.h
rename to GUI/Views/PropertyEditor/MultiComboPropertyEditor.h
diff --git a/GUI/coregui/Views/PropertyEditor/PropertyEditorFactory.cpp b/GUI/Views/PropertyEditor/PropertyEditorFactory.cpp
similarity index 100%
rename from GUI/coregui/Views/PropertyEditor/PropertyEditorFactory.cpp
rename to GUI/Views/PropertyEditor/PropertyEditorFactory.cpp
diff --git a/GUI/coregui/Views/PropertyEditor/PropertyEditorFactory.h b/GUI/Views/PropertyEditor/PropertyEditorFactory.h
similarity index 100%
rename from GUI/coregui/Views/PropertyEditor/PropertyEditorFactory.h
rename to GUI/Views/PropertyEditor/PropertyEditorFactory.h
diff --git a/GUI/coregui/Views/PropertyEditor/PropertyWidgetItem.cpp b/GUI/Views/PropertyEditor/PropertyWidgetItem.cpp
similarity index 100%
rename from GUI/coregui/Views/PropertyEditor/PropertyWidgetItem.cpp
rename to GUI/Views/PropertyEditor/PropertyWidgetItem.cpp
diff --git a/GUI/coregui/Views/PropertyEditor/PropertyWidgetItem.h b/GUI/Views/PropertyEditor/PropertyWidgetItem.h
similarity index 100%
rename from GUI/coregui/Views/PropertyEditor/PropertyWidgetItem.h
rename to GUI/Views/PropertyEditor/PropertyWidgetItem.h
diff --git a/GUI/coregui/Views/PropertyEditor/TestComponentView.cpp b/GUI/Views/PropertyEditor/TestComponentView.cpp
similarity index 100%
rename from GUI/coregui/Views/PropertyEditor/TestComponentView.cpp
rename to GUI/Views/PropertyEditor/TestComponentView.cpp
diff --git a/GUI/coregui/Views/PropertyEditor/TestComponentView.h b/GUI/Views/PropertyEditor/TestComponentView.h
similarity index 100%
rename from GUI/coregui/Views/PropertyEditor/TestComponentView.h
rename to GUI/Views/PropertyEditor/TestComponentView.h
diff --git a/GUI/coregui/Views/RealSpaceWidgets/IPositionBuilder.cpp b/GUI/Views/RealSpaceWidgets/IPositionBuilder.cpp
similarity index 100%
rename from GUI/coregui/Views/RealSpaceWidgets/IPositionBuilder.cpp
rename to GUI/Views/RealSpaceWidgets/IPositionBuilder.cpp
diff --git a/GUI/coregui/Views/RealSpaceWidgets/IPositionBuilder.h b/GUI/Views/RealSpaceWidgets/IPositionBuilder.h
similarity index 100%
rename from GUI/coregui/Views/RealSpaceWidgets/IPositionBuilder.h
rename to GUI/Views/RealSpaceWidgets/IPositionBuilder.h
diff --git a/GUI/coregui/Views/RealSpaceWidgets/Particle3DContainer.cpp b/GUI/Views/RealSpaceWidgets/Particle3DContainer.cpp
similarity index 100%
rename from GUI/coregui/Views/RealSpaceWidgets/Particle3DContainer.cpp
rename to GUI/Views/RealSpaceWidgets/Particle3DContainer.cpp
diff --git a/GUI/coregui/Views/RealSpaceWidgets/Particle3DContainer.h b/GUI/Views/RealSpaceWidgets/Particle3DContainer.h
similarity index 100%
rename from GUI/coregui/Views/RealSpaceWidgets/Particle3DContainer.h
rename to GUI/Views/RealSpaceWidgets/Particle3DContainer.h
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpace2DParacrystalUtils.cpp b/GUI/Views/RealSpaceWidgets/RealSpace2DParacrystalUtils.cpp
similarity index 100%
rename from GUI/coregui/Views/RealSpaceWidgets/RealSpace2DParacrystalUtils.cpp
rename to GUI/Views/RealSpaceWidgets/RealSpace2DParacrystalUtils.cpp
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpace2DParacrystalUtils.h b/GUI/Views/RealSpaceWidgets/RealSpace2DParacrystalUtils.h
similarity index 100%
rename from GUI/coregui/Views/RealSpaceWidgets/RealSpace2DParacrystalUtils.h
rename to GUI/Views/RealSpaceWidgets/RealSpace2DParacrystalUtils.h
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceActions.cpp b/GUI/Views/RealSpaceWidgets/RealSpaceActions.cpp
similarity index 100%
rename from GUI/coregui/Views/RealSpaceWidgets/RealSpaceActions.cpp
rename to GUI/Views/RealSpaceWidgets/RealSpaceActions.cpp
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceActions.h b/GUI/Views/RealSpaceWidgets/RealSpaceActions.h
similarity index 100%
rename from GUI/coregui/Views/RealSpaceWidgets/RealSpaceActions.h
rename to GUI/Views/RealSpaceWidgets/RealSpaceActions.h
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilder.cpp b/GUI/Views/RealSpaceWidgets/RealSpaceBuilder.cpp
similarity index 100%
rename from GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilder.cpp
rename to GUI/Views/RealSpaceWidgets/RealSpaceBuilder.cpp
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilder.h b/GUI/Views/RealSpaceWidgets/RealSpaceBuilder.h
similarity index 100%
rename from GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilder.h
rename to GUI/Views/RealSpaceWidgets/RealSpaceBuilder.h
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilderUtils.cpp b/GUI/Views/RealSpaceWidgets/RealSpaceBuilderUtils.cpp
similarity index 100%
rename from GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilderUtils.cpp
rename to GUI/Views/RealSpaceWidgets/RealSpaceBuilderUtils.cpp
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilderUtils.h b/GUI/Views/RealSpaceWidgets/RealSpaceBuilderUtils.h
similarity index 100%
rename from GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilderUtils.h
rename to GUI/Views/RealSpaceWidgets/RealSpaceBuilderUtils.h
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceCanvas.cpp b/GUI/Views/RealSpaceWidgets/RealSpaceCanvas.cpp
similarity index 100%
rename from GUI/coregui/Views/RealSpaceWidgets/RealSpaceCanvas.cpp
rename to GUI/Views/RealSpaceWidgets/RealSpaceCanvas.cpp
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceCanvas.h b/GUI/Views/RealSpaceWidgets/RealSpaceCanvas.h
similarity index 100%
rename from GUI/coregui/Views/RealSpaceWidgets/RealSpaceCanvas.h
rename to GUI/Views/RealSpaceWidgets/RealSpaceCanvas.h
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceMesoCrystalUtils.cpp b/GUI/Views/RealSpaceWidgets/RealSpaceMesoCrystalUtils.cpp
similarity index 100%
rename from GUI/coregui/Views/RealSpaceWidgets/RealSpaceMesoCrystalUtils.cpp
rename to GUI/Views/RealSpaceWidgets/RealSpaceMesoCrystalUtils.cpp
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceMesoCrystalUtils.h b/GUI/Views/RealSpaceWidgets/RealSpaceMesoCrystalUtils.h
similarity index 100%
rename from GUI/coregui/Views/RealSpaceWidgets/RealSpaceMesoCrystalUtils.h
rename to GUI/Views/RealSpaceWidgets/RealSpaceMesoCrystalUtils.h
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceModel.cpp b/GUI/Views/RealSpaceWidgets/RealSpaceModel.cpp
similarity index 100%
rename from GUI/coregui/Views/RealSpaceWidgets/RealSpaceModel.cpp
rename to GUI/Views/RealSpaceWidgets/RealSpaceModel.cpp
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceModel.h b/GUI/Views/RealSpaceWidgets/RealSpaceModel.h
similarity index 100%
rename from GUI/coregui/Views/RealSpaceWidgets/RealSpaceModel.h
rename to GUI/Views/RealSpaceWidgets/RealSpaceModel.h
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpacePositionBuilder.cpp b/GUI/Views/RealSpaceWidgets/RealSpacePositionBuilder.cpp
similarity index 100%
rename from GUI/coregui/Views/RealSpaceWidgets/RealSpacePositionBuilder.cpp
rename to GUI/Views/RealSpaceWidgets/RealSpacePositionBuilder.cpp
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpacePositionBuilder.h b/GUI/Views/RealSpaceWidgets/RealSpacePositionBuilder.h
similarity index 100%
rename from GUI/coregui/Views/RealSpaceWidgets/RealSpacePositionBuilder.h
rename to GUI/Views/RealSpaceWidgets/RealSpacePositionBuilder.h
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceToolBar.cpp b/GUI/Views/RealSpaceWidgets/RealSpaceToolBar.cpp
similarity index 100%
rename from GUI/coregui/Views/RealSpaceWidgets/RealSpaceToolBar.cpp
rename to GUI/Views/RealSpaceWidgets/RealSpaceToolBar.cpp
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceToolBar.h b/GUI/Views/RealSpaceWidgets/RealSpaceToolBar.h
similarity index 100%
rename from GUI/coregui/Views/RealSpaceWidgets/RealSpaceToolBar.h
rename to GUI/Views/RealSpaceWidgets/RealSpaceToolBar.h
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceView.cpp b/GUI/Views/RealSpaceWidgets/RealSpaceView.cpp
similarity index 100%
rename from GUI/coregui/Views/RealSpaceWidgets/RealSpaceView.cpp
rename to GUI/Views/RealSpaceWidgets/RealSpaceView.cpp
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceView.h b/GUI/Views/RealSpaceWidgets/RealSpaceView.h
similarity index 100%
rename from GUI/coregui/Views/RealSpaceWidgets/RealSpaceView.h
rename to GUI/Views/RealSpaceWidgets/RealSpaceView.h
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceWidget.cpp b/GUI/Views/RealSpaceWidgets/RealSpaceWidget.cpp
similarity index 100%
rename from GUI/coregui/Views/RealSpaceWidgets/RealSpaceWidget.cpp
rename to GUI/Views/RealSpaceWidgets/RealSpaceWidget.cpp
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceWidget.h b/GUI/Views/RealSpaceWidgets/RealSpaceWidget.h
similarity index 100%
rename from GUI/coregui/Views/RealSpaceWidgets/RealSpaceWidget.h
rename to GUI/Views/RealSpaceWidgets/RealSpaceWidget.h
diff --git a/GUI/coregui/Views/RealSpaceWidgets/TransformTo3D.cpp b/GUI/Views/RealSpaceWidgets/TransformTo3D.cpp
similarity index 100%
rename from GUI/coregui/Views/RealSpaceWidgets/TransformTo3D.cpp
rename to GUI/Views/RealSpaceWidgets/TransformTo3D.cpp
diff --git a/GUI/coregui/Views/RealSpaceWidgets/TransformTo3D.h b/GUI/Views/RealSpaceWidgets/TransformTo3D.h
similarity index 100%
rename from GUI/coregui/Views/RealSpaceWidgets/TransformTo3D.h
rename to GUI/Views/RealSpaceWidgets/TransformTo3D.h
diff --git a/GUI/coregui/Views/SampleDesigner/ConnectableView.cpp b/GUI/Views/SampleDesigner/ConnectableView.cpp
similarity index 100%
rename from GUI/coregui/Views/SampleDesigner/ConnectableView.cpp
rename to GUI/Views/SampleDesigner/ConnectableView.cpp
diff --git a/GUI/coregui/Views/SampleDesigner/ConnectableView.h b/GUI/Views/SampleDesigner/ConnectableView.h
similarity index 100%
rename from GUI/coregui/Views/SampleDesigner/ConnectableView.h
rename to GUI/Views/SampleDesigner/ConnectableView.h
diff --git a/GUI/coregui/Views/SampleDesigner/DesignerHelper.cpp b/GUI/Views/SampleDesigner/DesignerHelper.cpp
similarity index 100%
rename from GUI/coregui/Views/SampleDesigner/DesignerHelper.cpp
rename to GUI/Views/SampleDesigner/DesignerHelper.cpp
diff --git a/GUI/coregui/Views/SampleDesigner/DesignerHelper.h b/GUI/Views/SampleDesigner/DesignerHelper.h
similarity index 100%
rename from GUI/coregui/Views/SampleDesigner/DesignerHelper.h
rename to GUI/Views/SampleDesigner/DesignerHelper.h
diff --git a/GUI/coregui/Views/SampleDesigner/DesignerMimeData.cpp b/GUI/Views/SampleDesigner/DesignerMimeData.cpp
similarity index 100%
rename from GUI/coregui/Views/SampleDesigner/DesignerMimeData.cpp
rename to GUI/Views/SampleDesigner/DesignerMimeData.cpp
diff --git a/GUI/coregui/Views/SampleDesigner/DesignerMimeData.h b/GUI/Views/SampleDesigner/DesignerMimeData.h
similarity index 100%
rename from GUI/coregui/Views/SampleDesigner/DesignerMimeData.h
rename to GUI/Views/SampleDesigner/DesignerMimeData.h
diff --git a/GUI/coregui/Views/SampleDesigner/DesignerScene.cpp b/GUI/Views/SampleDesigner/DesignerScene.cpp
similarity index 100%
rename from GUI/coregui/Views/SampleDesigner/DesignerScene.cpp
rename to GUI/Views/SampleDesigner/DesignerScene.cpp
diff --git a/GUI/coregui/Views/SampleDesigner/DesignerScene.h b/GUI/Views/SampleDesigner/DesignerScene.h
similarity index 100%
rename from GUI/coregui/Views/SampleDesigner/DesignerScene.h
rename to GUI/Views/SampleDesigner/DesignerScene.h
diff --git a/GUI/coregui/Views/SampleDesigner/DesignerView.cpp b/GUI/Views/SampleDesigner/DesignerView.cpp
similarity index 100%
rename from GUI/coregui/Views/SampleDesigner/DesignerView.cpp
rename to GUI/Views/SampleDesigner/DesignerView.cpp
diff --git a/GUI/coregui/Views/SampleDesigner/DesignerView.h b/GUI/Views/SampleDesigner/DesignerView.h
similarity index 100%
rename from GUI/coregui/Views/SampleDesigner/DesignerView.h
rename to GUI/Views/SampleDesigner/DesignerView.h
diff --git a/GUI/coregui/Views/SampleDesigner/ILayerView.cpp b/GUI/Views/SampleDesigner/ILayerView.cpp
similarity index 100%
rename from GUI/coregui/Views/SampleDesigner/ILayerView.cpp
rename to GUI/Views/SampleDesigner/ILayerView.cpp
diff --git a/GUI/coregui/Views/SampleDesigner/ILayerView.h b/GUI/Views/SampleDesigner/ILayerView.h
similarity index 100%
rename from GUI/coregui/Views/SampleDesigner/ILayerView.h
rename to GUI/Views/SampleDesigner/ILayerView.h
diff --git a/GUI/coregui/Views/SampleDesigner/IView.cpp b/GUI/Views/SampleDesigner/IView.cpp
similarity index 100%
rename from GUI/coregui/Views/SampleDesigner/IView.cpp
rename to GUI/Views/SampleDesigner/IView.cpp
diff --git a/GUI/coregui/Views/SampleDesigner/IView.h b/GUI/Views/SampleDesigner/IView.h
similarity index 100%
rename from GUI/coregui/Views/SampleDesigner/IView.h
rename to GUI/Views/SampleDesigner/IView.h
diff --git a/GUI/coregui/Views/SampleDesigner/InterferenceFunctionViews.cpp b/GUI/Views/SampleDesigner/InterferenceFunctionViews.cpp
similarity index 100%
rename from GUI/coregui/Views/SampleDesigner/InterferenceFunctionViews.cpp
rename to GUI/Views/SampleDesigner/InterferenceFunctionViews.cpp
diff --git a/GUI/coregui/Views/SampleDesigner/InterferenceFunctionViews.h b/GUI/Views/SampleDesigner/InterferenceFunctionViews.h
similarity index 100%
rename from GUI/coregui/Views/SampleDesigner/InterferenceFunctionViews.h
rename to GUI/Views/SampleDesigner/InterferenceFunctionViews.h
diff --git a/GUI/coregui/Views/SampleDesigner/ItemTreeView.cpp b/GUI/Views/SampleDesigner/ItemTreeView.cpp
similarity index 100%
rename from GUI/coregui/Views/SampleDesigner/ItemTreeView.cpp
rename to GUI/Views/SampleDesigner/ItemTreeView.cpp
diff --git a/GUI/coregui/Views/SampleDesigner/ItemTreeView.h b/GUI/Views/SampleDesigner/ItemTreeView.h
similarity index 100%
rename from GUI/coregui/Views/SampleDesigner/ItemTreeView.h
rename to GUI/Views/SampleDesigner/ItemTreeView.h
diff --git a/GUI/coregui/Views/SampleDesigner/LayerView.cpp b/GUI/Views/SampleDesigner/LayerView.cpp
similarity index 100%
rename from GUI/coregui/Views/SampleDesigner/LayerView.cpp
rename to GUI/Views/SampleDesigner/LayerView.cpp
diff --git a/GUI/coregui/Views/SampleDesigner/LayerView.h b/GUI/Views/SampleDesigner/LayerView.h
similarity index 100%
rename from GUI/coregui/Views/SampleDesigner/LayerView.h
rename to GUI/Views/SampleDesigner/LayerView.h
diff --git a/GUI/coregui/Views/SampleDesigner/MesoCrystalView.cpp b/GUI/Views/SampleDesigner/MesoCrystalView.cpp
similarity index 100%
rename from GUI/coregui/Views/SampleDesigner/MesoCrystalView.cpp
rename to GUI/Views/SampleDesigner/MesoCrystalView.cpp
diff --git a/GUI/coregui/Views/SampleDesigner/MesoCrystalView.h b/GUI/Views/SampleDesigner/MesoCrystalView.h
similarity index 100%
rename from GUI/coregui/Views/SampleDesigner/MesoCrystalView.h
rename to GUI/Views/SampleDesigner/MesoCrystalView.h
diff --git a/GUI/coregui/Views/SampleDesigner/MultiLayerView.cpp b/GUI/Views/SampleDesigner/MultiLayerView.cpp
similarity index 100%
rename from GUI/coregui/Views/SampleDesigner/MultiLayerView.cpp
rename to GUI/Views/SampleDesigner/MultiLayerView.cpp
diff --git a/GUI/coregui/Views/SampleDesigner/MultiLayerView.h b/GUI/Views/SampleDesigner/MultiLayerView.h
similarity index 100%
rename from GUI/coregui/Views/SampleDesigner/MultiLayerView.h
rename to GUI/Views/SampleDesigner/MultiLayerView.h
diff --git a/GUI/coregui/Views/SampleDesigner/NodeEditor.cpp b/GUI/Views/SampleDesigner/NodeEditor.cpp
similarity index 100%
rename from GUI/coregui/Views/SampleDesigner/NodeEditor.cpp
rename to GUI/Views/SampleDesigner/NodeEditor.cpp
diff --git a/GUI/coregui/Views/SampleDesigner/NodeEditor.h b/GUI/Views/SampleDesigner/NodeEditor.h
similarity index 100%
rename from GUI/coregui/Views/SampleDesigner/NodeEditor.h
rename to GUI/Views/SampleDesigner/NodeEditor.h
diff --git a/GUI/coregui/Views/SampleDesigner/NodeEditorConnection.cpp b/GUI/Views/SampleDesigner/NodeEditorConnection.cpp
similarity index 100%
rename from GUI/coregui/Views/SampleDesigner/NodeEditorConnection.cpp
rename to GUI/Views/SampleDesigner/NodeEditorConnection.cpp
diff --git a/GUI/coregui/Views/SampleDesigner/NodeEditorConnection.h b/GUI/Views/SampleDesigner/NodeEditorConnection.h
similarity index 100%
rename from GUI/coregui/Views/SampleDesigner/NodeEditorConnection.h
rename to GUI/Views/SampleDesigner/NodeEditorConnection.h
diff --git a/GUI/coregui/Views/SampleDesigner/NodeEditorPort.cpp b/GUI/Views/SampleDesigner/NodeEditorPort.cpp
similarity index 100%
rename from GUI/coregui/Views/SampleDesigner/NodeEditorPort.cpp
rename to GUI/Views/SampleDesigner/NodeEditorPort.cpp
diff --git a/GUI/coregui/Views/SampleDesigner/NodeEditorPort.h b/GUI/Views/SampleDesigner/NodeEditorPort.h
similarity index 100%
rename from GUI/coregui/Views/SampleDesigner/NodeEditorPort.h
rename to GUI/Views/SampleDesigner/NodeEditorPort.h
diff --git a/GUI/coregui/Views/SampleDesigner/ParticleCompositionView.cpp b/GUI/Views/SampleDesigner/ParticleCompositionView.cpp
similarity index 100%
rename from GUI/coregui/Views/SampleDesigner/ParticleCompositionView.cpp
rename to GUI/Views/SampleDesigner/ParticleCompositionView.cpp
diff --git a/GUI/coregui/Views/SampleDesigner/ParticleCompositionView.h b/GUI/Views/SampleDesigner/ParticleCompositionView.h
similarity index 100%
rename from GUI/coregui/Views/SampleDesigner/ParticleCompositionView.h
rename to GUI/Views/SampleDesigner/ParticleCompositionView.h
diff --git a/GUI/coregui/Views/SampleDesigner/ParticleCoreShellView.cpp b/GUI/Views/SampleDesigner/ParticleCoreShellView.cpp
similarity index 100%
rename from GUI/coregui/Views/SampleDesigner/ParticleCoreShellView.cpp
rename to GUI/Views/SampleDesigner/ParticleCoreShellView.cpp
diff --git a/GUI/coregui/Views/SampleDesigner/ParticleCoreShellView.h b/GUI/Views/SampleDesigner/ParticleCoreShellView.h
similarity index 100%
rename from GUI/coregui/Views/SampleDesigner/ParticleCoreShellView.h
rename to GUI/Views/SampleDesigner/ParticleCoreShellView.h
diff --git a/GUI/coregui/Views/SampleDesigner/ParticleLayoutView.cpp b/GUI/Views/SampleDesigner/ParticleLayoutView.cpp
similarity index 100%
rename from GUI/coregui/Views/SampleDesigner/ParticleLayoutView.cpp
rename to GUI/Views/SampleDesigner/ParticleLayoutView.cpp
diff --git a/GUI/coregui/Views/SampleDesigner/ParticleLayoutView.h b/GUI/Views/SampleDesigner/ParticleLayoutView.h
similarity index 100%
rename from GUI/coregui/Views/SampleDesigner/ParticleLayoutView.h
rename to GUI/Views/SampleDesigner/ParticleLayoutView.h
diff --git a/GUI/coregui/Views/SampleDesigner/ParticleView.cpp b/GUI/Views/SampleDesigner/ParticleView.cpp
similarity index 100%
rename from GUI/coregui/Views/SampleDesigner/ParticleView.cpp
rename to GUI/Views/SampleDesigner/ParticleView.cpp
diff --git a/GUI/coregui/Views/SampleDesigner/ParticleView.h b/GUI/Views/SampleDesigner/ParticleView.h
similarity index 100%
rename from GUI/coregui/Views/SampleDesigner/ParticleView.h
rename to GUI/Views/SampleDesigner/ParticleView.h
diff --git a/GUI/coregui/Views/SampleDesigner/RealSpacePanel.cpp b/GUI/Views/SampleDesigner/RealSpacePanel.cpp
similarity index 100%
rename from GUI/coregui/Views/SampleDesigner/RealSpacePanel.cpp
rename to GUI/Views/SampleDesigner/RealSpacePanel.cpp
diff --git a/GUI/coregui/Views/SampleDesigner/RealSpacePanel.h b/GUI/Views/SampleDesigner/RealSpacePanel.h
similarity index 100%
rename from GUI/coregui/Views/SampleDesigner/RealSpacePanel.h
rename to GUI/Views/SampleDesigner/RealSpacePanel.h
diff --git a/GUI/coregui/Views/SampleDesigner/SampleDesigner.cpp b/GUI/Views/SampleDesigner/SampleDesigner.cpp
similarity index 100%
rename from GUI/coregui/Views/SampleDesigner/SampleDesigner.cpp
rename to GUI/Views/SampleDesigner/SampleDesigner.cpp
diff --git a/GUI/coregui/Views/SampleDesigner/SampleDesigner.h b/GUI/Views/SampleDesigner/SampleDesigner.h
similarity index 100%
rename from GUI/coregui/Views/SampleDesigner/SampleDesigner.h
rename to GUI/Views/SampleDesigner/SampleDesigner.h
diff --git a/GUI/coregui/Views/SampleDesigner/SampleDesigner.qrc b/GUI/Views/SampleDesigner/SampleDesigner.qrc
similarity index 100%
rename from GUI/coregui/Views/SampleDesigner/SampleDesigner.qrc
rename to GUI/Views/SampleDesigner/SampleDesigner.qrc
diff --git a/GUI/coregui/Views/SampleDesigner/SamplePropertyWidget.cpp b/GUI/Views/SampleDesigner/SamplePropertyWidget.cpp
similarity index 100%
rename from GUI/coregui/Views/SampleDesigner/SamplePropertyWidget.cpp
rename to GUI/Views/SampleDesigner/SamplePropertyWidget.cpp
diff --git a/GUI/coregui/Views/SampleDesigner/SamplePropertyWidget.h b/GUI/Views/SampleDesigner/SamplePropertyWidget.h
similarity index 100%
rename from GUI/coregui/Views/SampleDesigner/SamplePropertyWidget.h
rename to GUI/Views/SampleDesigner/SamplePropertyWidget.h
diff --git a/GUI/coregui/Views/SampleDesigner/SampleToolBar.cpp b/GUI/Views/SampleDesigner/SampleToolBar.cpp
similarity index 100%
rename from GUI/coregui/Views/SampleDesigner/SampleToolBar.cpp
rename to GUI/Views/SampleDesigner/SampleToolBar.cpp
diff --git a/GUI/coregui/Views/SampleDesigner/SampleToolBar.h b/GUI/Views/SampleDesigner/SampleToolBar.h
similarity index 100%
rename from GUI/coregui/Views/SampleDesigner/SampleToolBar.h
rename to GUI/Views/SampleDesigner/SampleToolBar.h
diff --git a/GUI/coregui/Views/SampleDesigner/SampleTreeWidget.cpp b/GUI/Views/SampleDesigner/SampleTreeWidget.cpp
similarity index 100%
rename from GUI/coregui/Views/SampleDesigner/SampleTreeWidget.cpp
rename to GUI/Views/SampleDesigner/SampleTreeWidget.cpp
diff --git a/GUI/coregui/Views/SampleDesigner/SampleTreeWidget.h b/GUI/Views/SampleDesigner/SampleTreeWidget.h
similarity index 100%
rename from GUI/coregui/Views/SampleDesigner/SampleTreeWidget.h
rename to GUI/Views/SampleDesigner/SampleTreeWidget.h
diff --git a/GUI/coregui/Views/SampleDesigner/SampleViewAligner.cpp b/GUI/Views/SampleDesigner/SampleViewAligner.cpp
similarity index 100%
rename from GUI/coregui/Views/SampleDesigner/SampleViewAligner.cpp
rename to GUI/Views/SampleDesigner/SampleViewAligner.cpp
diff --git a/GUI/coregui/Views/SampleDesigner/SampleViewAligner.h b/GUI/Views/SampleDesigner/SampleViewAligner.h
similarity index 100%
rename from GUI/coregui/Views/SampleDesigner/SampleViewAligner.h
rename to GUI/Views/SampleDesigner/SampleViewAligner.h
diff --git a/GUI/coregui/Views/SampleDesigner/SampleViewFactory.cpp b/GUI/Views/SampleDesigner/SampleViewFactory.cpp
similarity index 100%
rename from GUI/coregui/Views/SampleDesigner/SampleViewFactory.cpp
rename to GUI/Views/SampleDesigner/SampleViewFactory.cpp
diff --git a/GUI/coregui/Views/SampleDesigner/SampleViewFactory.h b/GUI/Views/SampleDesigner/SampleViewFactory.h
similarity index 100%
rename from GUI/coregui/Views/SampleDesigner/SampleViewFactory.h
rename to GUI/Views/SampleDesigner/SampleViewFactory.h
diff --git a/GUI/coregui/Views/SampleDesigner/SampleWidgetBox.cpp b/GUI/Views/SampleDesigner/SampleWidgetBox.cpp
similarity index 100%
rename from GUI/coregui/Views/SampleDesigner/SampleWidgetBox.cpp
rename to GUI/Views/SampleDesigner/SampleWidgetBox.cpp
diff --git a/GUI/coregui/Views/SampleDesigner/SampleWidgetBox.h b/GUI/Views/SampleDesigner/SampleWidgetBox.h
similarity index 100%
rename from GUI/coregui/Views/SampleDesigner/SampleWidgetBox.h
rename to GUI/Views/SampleDesigner/SampleWidgetBox.h
diff --git a/GUI/coregui/Views/SampleDesigner/ScriptPanel.cpp b/GUI/Views/SampleDesigner/ScriptPanel.cpp
similarity index 100%
rename from GUI/coregui/Views/SampleDesigner/ScriptPanel.cpp
rename to GUI/Views/SampleDesigner/ScriptPanel.cpp
diff --git a/GUI/coregui/Views/SampleDesigner/ScriptPanel.h b/GUI/Views/SampleDesigner/ScriptPanel.h
similarity index 100%
rename from GUI/coregui/Views/SampleDesigner/ScriptPanel.h
rename to GUI/Views/SampleDesigner/ScriptPanel.h
diff --git a/GUI/coregui/Views/SampleDesigner/TransformationView.cpp b/GUI/Views/SampleDesigner/TransformationView.cpp
similarity index 100%
rename from GUI/coregui/Views/SampleDesigner/TransformationView.cpp
rename to GUI/Views/SampleDesigner/TransformationView.cpp
diff --git a/GUI/coregui/Views/SampleDesigner/TransformationView.h b/GUI/Views/SampleDesigner/TransformationView.h
similarity index 100%
rename from GUI/coregui/Views/SampleDesigner/TransformationView.h
rename to GUI/Views/SampleDesigner/TransformationView.h
diff --git a/GUI/coregui/Views/SampleDesigner/ViewTypes.h b/GUI/Views/SampleDesigner/ViewTypes.h
similarity index 100%
rename from GUI/coregui/Views/SampleDesigner/ViewTypes.h
rename to GUI/Views/SampleDesigner/ViewTypes.h
diff --git a/GUI/coregui/Views/SampleDesigner/images/alpha-m-box.svg b/GUI/Views/SampleDesigner/images/alpha-m-box.svg
similarity index 100%
rename from GUI/coregui/Views/SampleDesigner/images/alpha-m-box.svg
rename to GUI/Views/SampleDesigner/images/alpha-m-box.svg
diff --git a/GUI/coregui/Views/SampleDesigner/images/arrow-top-left.svg b/GUI/Views/SampleDesigner/images/arrow-top-left.svg
similarity index 100%
rename from GUI/coregui/Views/SampleDesigner/images/arrow-top-left.svg
rename to GUI/Views/SampleDesigner/images/arrow-top-left.svg
diff --git a/GUI/coregui/Views/SampleDesigner/images/camera-metering-center.svg b/GUI/Views/SampleDesigner/images/camera-metering-center.svg
similarity index 100%
rename from GUI/coregui/Views/SampleDesigner/images/camera-metering-center.svg
rename to GUI/Views/SampleDesigner/images/camera-metering-center.svg
diff --git a/GUI/coregui/Views/SampleDesigner/images/delete.svg b/GUI/Views/SampleDesigner/images/delete.svg
similarity index 100%
rename from GUI/coregui/Views/SampleDesigner/images/delete.svg
rename to GUI/Views/SampleDesigner/images/delete.svg
diff --git a/GUI/coregui/Views/SampleDesigner/images/hand-right.svg b/GUI/Views/SampleDesigner/images/hand-right.svg
similarity index 100%
rename from GUI/coregui/Views/SampleDesigner/images/hand-right.svg
rename to GUI/Views/SampleDesigner/images/hand-right.svg
diff --git a/GUI/coregui/Views/SampleDesigner/images/rotate-3d.svg b/GUI/Views/SampleDesigner/images/rotate-3d.svg
similarity index 100%
rename from GUI/coregui/Views/SampleDesigner/images/rotate-3d.svg
rename to GUI/Views/SampleDesigner/images/rotate-3d.svg
diff --git a/GUI/coregui/Views/SampleView.cpp b/GUI/Views/SampleView.cpp
similarity index 100%
rename from GUI/coregui/Views/SampleView.cpp
rename to GUI/Views/SampleView.cpp
diff --git a/GUI/coregui/Views/SampleView.h b/GUI/Views/SampleView.h
similarity index 100%
rename from GUI/coregui/Views/SampleView.h
rename to GUI/Views/SampleView.h
diff --git a/GUI/coregui/Views/SessionModelView.cpp b/GUI/Views/SessionModelView.cpp
similarity index 100%
rename from GUI/coregui/Views/SessionModelView.cpp
rename to GUI/Views/SessionModelView.cpp
diff --git a/GUI/coregui/Views/SessionModelView.h b/GUI/Views/SessionModelView.h
similarity index 100%
rename from GUI/coregui/Views/SessionModelView.h
rename to GUI/Views/SessionModelView.h
diff --git a/GUI/coregui/Views/SimulationView.cpp b/GUI/Views/SimulationView.cpp
similarity index 100%
rename from GUI/coregui/Views/SimulationView.cpp
rename to GUI/Views/SimulationView.cpp
diff --git a/GUI/coregui/Views/SimulationView.h b/GUI/Views/SimulationView.h
similarity index 100%
rename from GUI/coregui/Views/SimulationView.h
rename to GUI/Views/SimulationView.h
diff --git a/GUI/coregui/Views/SimulationWidgets/PythonScriptWidget.cpp b/GUI/Views/SimulationWidgets/PythonScriptWidget.cpp
similarity index 100%
rename from GUI/coregui/Views/SimulationWidgets/PythonScriptWidget.cpp
rename to GUI/Views/SimulationWidgets/PythonScriptWidget.cpp
diff --git a/GUI/coregui/Views/SimulationWidgets/PythonScriptWidget.h b/GUI/Views/SimulationWidgets/PythonScriptWidget.h
similarity index 100%
rename from GUI/coregui/Views/SimulationWidgets/PythonScriptWidget.h
rename to GUI/Views/SimulationWidgets/PythonScriptWidget.h
diff --git a/GUI/coregui/Views/SimulationWidgets/SimulationDataSelectorWidget.cpp b/GUI/Views/SimulationWidgets/SimulationDataSelectorWidget.cpp
similarity index 100%
rename from GUI/coregui/Views/SimulationWidgets/SimulationDataSelectorWidget.cpp
rename to GUI/Views/SimulationWidgets/SimulationDataSelectorWidget.cpp
diff --git a/GUI/coregui/Views/SimulationWidgets/SimulationDataSelectorWidget.h b/GUI/Views/SimulationWidgets/SimulationDataSelectorWidget.h
similarity index 100%
rename from GUI/coregui/Views/SimulationWidgets/SimulationDataSelectorWidget.h
rename to GUI/Views/SimulationWidgets/SimulationDataSelectorWidget.h
diff --git a/GUI/coregui/Views/SimulationWidgets/SimulationOptionsWidget.cpp b/GUI/Views/SimulationWidgets/SimulationOptionsWidget.cpp
similarity index 100%
rename from GUI/coregui/Views/SimulationWidgets/SimulationOptionsWidget.cpp
rename to GUI/Views/SimulationWidgets/SimulationOptionsWidget.cpp
diff --git a/GUI/coregui/Views/SimulationWidgets/SimulationOptionsWidget.h b/GUI/Views/SimulationWidgets/SimulationOptionsWidget.h
similarity index 100%
rename from GUI/coregui/Views/SimulationWidgets/SimulationOptionsWidget.h
rename to GUI/Views/SimulationWidgets/SimulationOptionsWidget.h
diff --git a/GUI/coregui/Views/SimulationWidgets/SimulationSetupAssistant.cpp b/GUI/Views/SimulationWidgets/SimulationSetupAssistant.cpp
similarity index 100%
rename from GUI/coregui/Views/SimulationWidgets/SimulationSetupAssistant.cpp
rename to GUI/Views/SimulationWidgets/SimulationSetupAssistant.cpp
diff --git a/GUI/coregui/Views/SimulationWidgets/SimulationSetupAssistant.h b/GUI/Views/SimulationWidgets/SimulationSetupAssistant.h
similarity index 100%
rename from GUI/coregui/Views/SimulationWidgets/SimulationSetupAssistant.h
rename to GUI/Views/SimulationWidgets/SimulationSetupAssistant.h
diff --git a/GUI/coregui/Views/SimulationWidgets/SimulationSetupWidget.cpp b/GUI/Views/SimulationWidgets/SimulationSetupWidget.cpp
similarity index 100%
rename from GUI/coregui/Views/SimulationWidgets/SimulationSetupWidget.cpp
rename to GUI/Views/SimulationWidgets/SimulationSetupWidget.cpp
diff --git a/GUI/coregui/Views/SimulationWidgets/SimulationSetupWidget.h b/GUI/Views/SimulationWidgets/SimulationSetupWidget.h
similarity index 100%
rename from GUI/coregui/Views/SimulationWidgets/SimulationSetupWidget.h
rename to GUI/Views/SimulationWidgets/SimulationSetupWidget.h
diff --git a/GUI/coregui/Views/SpecularDataWidgets/Plot1DCanvas.cpp b/GUI/Views/SpecularDataWidgets/Plot1DCanvas.cpp
similarity index 100%
rename from GUI/coregui/Views/SpecularDataWidgets/Plot1DCanvas.cpp
rename to GUI/Views/SpecularDataWidgets/Plot1DCanvas.cpp
diff --git a/GUI/coregui/Views/SpecularDataWidgets/Plot1DCanvas.h b/GUI/Views/SpecularDataWidgets/Plot1DCanvas.h
similarity index 100%
rename from GUI/coregui/Views/SpecularDataWidgets/Plot1DCanvas.h
rename to GUI/Views/SpecularDataWidgets/Plot1DCanvas.h
diff --git a/GUI/coregui/Views/SpecularDataWidgets/SpecularDataCanvas.cpp b/GUI/Views/SpecularDataWidgets/SpecularDataCanvas.cpp
similarity index 100%
rename from GUI/coregui/Views/SpecularDataWidgets/SpecularDataCanvas.cpp
rename to GUI/Views/SpecularDataWidgets/SpecularDataCanvas.cpp
diff --git a/GUI/coregui/Views/SpecularDataWidgets/SpecularDataCanvas.h b/GUI/Views/SpecularDataWidgets/SpecularDataCanvas.h
similarity index 100%
rename from GUI/coregui/Views/SpecularDataWidgets/SpecularDataCanvas.h
rename to GUI/Views/SpecularDataWidgets/SpecularDataCanvas.h
diff --git a/GUI/coregui/Views/SpecularDataWidgets/SpecularDataImportWidget.cpp b/GUI/Views/SpecularDataWidgets/SpecularDataImportWidget.cpp
similarity index 100%
rename from GUI/coregui/Views/SpecularDataWidgets/SpecularDataImportWidget.cpp
rename to GUI/Views/SpecularDataWidgets/SpecularDataImportWidget.cpp
diff --git a/GUI/coregui/Views/SpecularDataWidgets/SpecularDataImportWidget.h b/GUI/Views/SpecularDataWidgets/SpecularDataImportWidget.h
similarity index 100%
rename from GUI/coregui/Views/SpecularDataWidgets/SpecularDataImportWidget.h
rename to GUI/Views/SpecularDataWidgets/SpecularDataImportWidget.h
diff --git a/GUI/coregui/Views/SpecularDataWidgets/SpecularDataImportWidget.ui b/GUI/Views/SpecularDataWidgets/SpecularDataImportWidget.ui
similarity index 100%
rename from GUI/coregui/Views/SpecularDataWidgets/SpecularDataImportWidget.ui
rename to GUI/Views/SpecularDataWidgets/SpecularDataImportWidget.ui
diff --git a/GUI/coregui/Views/SpecularDataWidgets/SpecularDataWidget.cpp b/GUI/Views/SpecularDataWidgets/SpecularDataWidget.cpp
similarity index 100%
rename from GUI/coregui/Views/SpecularDataWidgets/SpecularDataWidget.cpp
rename to GUI/Views/SpecularDataWidgets/SpecularDataWidget.cpp
diff --git a/GUI/coregui/Views/SpecularDataWidgets/SpecularDataWidget.h b/GUI/Views/SpecularDataWidgets/SpecularDataWidget.h
similarity index 100%
rename from GUI/coregui/Views/SpecularDataWidgets/SpecularDataWidget.h
rename to GUI/Views/SpecularDataWidgets/SpecularDataWidget.h
diff --git a/GUI/coregui/Views/SpecularDataWidgets/SpecularPlot.cpp b/GUI/Views/SpecularDataWidgets/SpecularPlot.cpp
similarity index 100%
rename from GUI/coregui/Views/SpecularDataWidgets/SpecularPlot.cpp
rename to GUI/Views/SpecularDataWidgets/SpecularPlot.cpp
diff --git a/GUI/coregui/Views/SpecularDataWidgets/SpecularPlot.h b/GUI/Views/SpecularDataWidgets/SpecularPlot.h
similarity index 100%
rename from GUI/coregui/Views/SpecularDataWidgets/SpecularPlot.h
rename to GUI/Views/SpecularDataWidgets/SpecularPlot.h
diff --git a/GUI/coregui/Views/SpecularDataWidgets/SpecularPlotCanvas.cpp b/GUI/Views/SpecularDataWidgets/SpecularPlotCanvas.cpp
similarity index 100%
rename from GUI/coregui/Views/SpecularDataWidgets/SpecularPlotCanvas.cpp
rename to GUI/Views/SpecularDataWidgets/SpecularPlotCanvas.cpp
diff --git a/GUI/coregui/Views/SpecularDataWidgets/SpecularPlotCanvas.h b/GUI/Views/SpecularDataWidgets/SpecularPlotCanvas.h
similarity index 100%
rename from GUI/coregui/Views/SpecularDataWidgets/SpecularPlotCanvas.h
rename to GUI/Views/SpecularDataWidgets/SpecularPlotCanvas.h
diff --git a/GUI/coregui/Views/TestView.cpp b/GUI/Views/TestView.cpp
similarity index 100%
rename from GUI/coregui/Views/TestView.cpp
rename to GUI/Views/TestView.cpp
diff --git a/GUI/coregui/Views/TestView.h b/GUI/Views/TestView.h
similarity index 100%
rename from GUI/coregui/Views/TestView.h
rename to GUI/Views/TestView.h
diff --git a/GUI/coregui/Views/WelcomeView.cpp b/GUI/Views/WelcomeView.cpp
similarity index 100%
rename from GUI/coregui/Views/WelcomeView.cpp
rename to GUI/Views/WelcomeView.cpp
diff --git a/GUI/coregui/Views/WelcomeView.h b/GUI/Views/WelcomeView.h
similarity index 100%
rename from GUI/coregui/Views/WelcomeView.h
rename to GUI/Views/WelcomeView.h
diff --git a/GUI/coregui/Views/widgetbox/deviceprofile_p.h b/GUI/Views/widgetbox/deviceprofile_p.h
similarity index 100%
rename from GUI/coregui/Views/widgetbox/deviceprofile_p.h
rename to GUI/Views/widgetbox/deviceprofile_p.h
diff --git a/GUI/coregui/Views/widgetbox/formwindowbase_p.h b/GUI/Views/widgetbox/formwindowbase_p.h
similarity index 100%
rename from GUI/coregui/Views/widgetbox/formwindowbase_p.h
rename to GUI/Views/widgetbox/formwindowbase_p.h
diff --git a/GUI/coregui/Views/widgetbox/images/Lattice1D.png b/GUI/Views/widgetbox/images/Lattice1D.png
similarity index 100%
rename from GUI/coregui/Views/widgetbox/images/Lattice1D.png
rename to GUI/Views/widgetbox/images/Lattice1D.png
diff --git a/GUI/coregui/Views/widgetbox/images/Lattice2D.png b/GUI/Views/widgetbox/images/Lattice2D.png
similarity index 100%
rename from GUI/coregui/Views/widgetbox/images/Lattice2D.png
rename to GUI/Views/widgetbox/images/Lattice2D.png
diff --git a/GUI/coregui/Views/widgetbox/images/Lattice2DFinite.png b/GUI/Views/widgetbox/images/Lattice2DFinite.png
similarity index 100%
rename from GUI/coregui/Views/widgetbox/images/Lattice2DFinite.png
rename to GUI/Views/widgetbox/images/Lattice2DFinite.png
diff --git a/GUI/coregui/Views/widgetbox/images/Layer.png b/GUI/Views/widgetbox/images/Layer.png
similarity index 100%
rename from GUI/coregui/Views/widgetbox/images/Layer.png
rename to GUI/Views/widgetbox/images/Layer.png
diff --git a/GUI/coregui/Views/widgetbox/images/Mesocrystal_64x64.png b/GUI/Views/widgetbox/images/Mesocrystal_64x64.png
similarity index 100%
rename from GUI/coregui/Views/widgetbox/images/Mesocrystal_64x64.png
rename to GUI/Views/widgetbox/images/Mesocrystal_64x64.png
diff --git a/GUI/coregui/Views/widgetbox/images/MultiLayer.png b/GUI/Views/widgetbox/images/MultiLayer.png
similarity index 100%
rename from GUI/coregui/Views/widgetbox/images/MultiLayer.png
rename to GUI/Views/widgetbox/images/MultiLayer.png
diff --git a/GUI/coregui/Views/widgetbox/images/ParaCrystal1D.png b/GUI/Views/widgetbox/images/ParaCrystal1D.png
similarity index 100%
rename from GUI/coregui/Views/widgetbox/images/ParaCrystal1D.png
rename to GUI/Views/widgetbox/images/ParaCrystal1D.png
diff --git a/GUI/coregui/Views/widgetbox/images/ParaCrystal2D.png b/GUI/Views/widgetbox/images/ParaCrystal2D.png
similarity index 100%
rename from GUI/coregui/Views/widgetbox/images/ParaCrystal2D.png
rename to GUI/Views/widgetbox/images/ParaCrystal2D.png
diff --git a/GUI/coregui/Views/widgetbox/images/ParticleComposition_64x64.png b/GUI/Views/widgetbox/images/ParticleComposition_64x64.png
similarity index 100%
rename from GUI/coregui/Views/widgetbox/images/ParticleComposition_64x64.png
rename to GUI/Views/widgetbox/images/ParticleComposition_64x64.png
diff --git a/GUI/coregui/Views/widgetbox/images/ParticleCoreShell_64x64.png b/GUI/Views/widgetbox/images/ParticleCoreShell_64x64.png
similarity index 100%
rename from GUI/coregui/Views/widgetbox/images/ParticleCoreShell_64x64.png
rename to GUI/Views/widgetbox/images/ParticleCoreShell_64x64.png
diff --git a/GUI/coregui/Views/widgetbox/images/ParticleDistribution_64x64.png b/GUI/Views/widgetbox/images/ParticleDistribution_64x64.png
similarity index 100%
rename from GUI/coregui/Views/widgetbox/images/ParticleDistribution_64x64.png
rename to GUI/Views/widgetbox/images/ParticleDistribution_64x64.png
diff --git a/GUI/coregui/Views/widgetbox/images/ParticleLayout.png b/GUI/Views/widgetbox/images/ParticleLayout.png
similarity index 100%
rename from GUI/coregui/Views/widgetbox/images/ParticleLayout.png
rename to GUI/Views/widgetbox/images/ParticleLayout.png
diff --git a/GUI/coregui/Views/widgetbox/images/Transformation.png b/GUI/Views/widgetbox/images/Transformation.png
similarity index 100%
rename from GUI/coregui/Views/widgetbox/images/Transformation.png
rename to GUI/Views/widgetbox/images/Transformation.png
diff --git a/GUI/coregui/Views/widgetbox/images/ff_AnisoPyramid_64x64.png b/GUI/Views/widgetbox/images/ff_AnisoPyramid_64x64.png
similarity index 100%
rename from GUI/coregui/Views/widgetbox/images/ff_AnisoPyramid_64x64.png
rename to GUI/Views/widgetbox/images/ff_AnisoPyramid_64x64.png
diff --git a/GUI/coregui/Views/widgetbox/images/ff_Box_64x64.png b/GUI/Views/widgetbox/images/ff_Box_64x64.png
similarity index 100%
rename from GUI/coregui/Views/widgetbox/images/ff_Box_64x64.png
rename to GUI/Views/widgetbox/images/ff_Box_64x64.png
diff --git a/GUI/coregui/Views/widgetbox/images/ff_Cone6_64x64.png b/GUI/Views/widgetbox/images/ff_Cone6_64x64.png
similarity index 100%
rename from GUI/coregui/Views/widgetbox/images/ff_Cone6_64x64.png
rename to GUI/Views/widgetbox/images/ff_Cone6_64x64.png
diff --git a/GUI/coregui/Views/widgetbox/images/ff_Cone_64x64.png b/GUI/Views/widgetbox/images/ff_Cone_64x64.png
similarity index 100%
rename from GUI/coregui/Views/widgetbox/images/ff_Cone_64x64.png
rename to GUI/Views/widgetbox/images/ff_Cone_64x64.png
diff --git a/GUI/coregui/Views/widgetbox/images/ff_CosineRipple_64x64.png b/GUI/Views/widgetbox/images/ff_CosineRipple_64x64.png
similarity index 100%
rename from GUI/coregui/Views/widgetbox/images/ff_CosineRipple_64x64.png
rename to GUI/Views/widgetbox/images/ff_CosineRipple_64x64.png
diff --git a/GUI/coregui/Views/widgetbox/images/ff_Cuboctahedron_64x64.png b/GUI/Views/widgetbox/images/ff_Cuboctahedron_64x64.png
similarity index 100%
rename from GUI/coregui/Views/widgetbox/images/ff_Cuboctahedron_64x64.png
rename to GUI/Views/widgetbox/images/ff_Cuboctahedron_64x64.png
diff --git a/GUI/coregui/Views/widgetbox/images/ff_Cylinder_64x64.png b/GUI/Views/widgetbox/images/ff_Cylinder_64x64.png
similarity index 100%
rename from GUI/coregui/Views/widgetbox/images/ff_Cylinder_64x64.png
rename to GUI/Views/widgetbox/images/ff_Cylinder_64x64.png
diff --git a/GUI/coregui/Views/widgetbox/images/ff_Dodecahedron_64x64.png b/GUI/Views/widgetbox/images/ff_Dodecahedron_64x64.png
similarity index 100%
rename from GUI/coregui/Views/widgetbox/images/ff_Dodecahedron_64x64.png
rename to GUI/Views/widgetbox/images/ff_Dodecahedron_64x64.png
diff --git a/GUI/coregui/Views/widgetbox/images/ff_Dot_64x64.png b/GUI/Views/widgetbox/images/ff_Dot_64x64.png
similarity index 100%
rename from GUI/coregui/Views/widgetbox/images/ff_Dot_64x64.png
rename to GUI/Views/widgetbox/images/ff_Dot_64x64.png
diff --git a/GUI/coregui/Views/widgetbox/images/ff_EllipsoidalCylinder_64x64.png b/GUI/Views/widgetbox/images/ff_EllipsoidalCylinder_64x64.png
similarity index 100%
rename from GUI/coregui/Views/widgetbox/images/ff_EllipsoidalCylinder_64x64.png
rename to GUI/Views/widgetbox/images/ff_EllipsoidalCylinder_64x64.png
diff --git a/GUI/coregui/Views/widgetbox/images/ff_FullSphere_64x64.png b/GUI/Views/widgetbox/images/ff_FullSphere_64x64.png
similarity index 100%
rename from GUI/coregui/Views/widgetbox/images/ff_FullSphere_64x64.png
rename to GUI/Views/widgetbox/images/ff_FullSphere_64x64.png
diff --git a/GUI/coregui/Views/widgetbox/images/ff_FullSpheroid_64x64.png b/GUI/Views/widgetbox/images/ff_FullSpheroid_64x64.png
similarity index 100%
rename from GUI/coregui/Views/widgetbox/images/ff_FullSpheroid_64x64.png
rename to GUI/Views/widgetbox/images/ff_FullSpheroid_64x64.png
diff --git a/GUI/coregui/Views/widgetbox/images/ff_HemiEllipsoid_64x64.png b/GUI/Views/widgetbox/images/ff_HemiEllipsoid_64x64.png
similarity index 100%
rename from GUI/coregui/Views/widgetbox/images/ff_HemiEllipsoid_64x64.png
rename to GUI/Views/widgetbox/images/ff_HemiEllipsoid_64x64.png
diff --git a/GUI/coregui/Views/widgetbox/images/ff_Icosahedron_64x64.png b/GUI/Views/widgetbox/images/ff_Icosahedron_64x64.png
similarity index 100%
rename from GUI/coregui/Views/widgetbox/images/ff_Icosahedron_64x64.png
rename to GUI/Views/widgetbox/images/ff_Icosahedron_64x64.png
diff --git a/GUI/coregui/Views/widgetbox/images/ff_Prism3_64x64.png b/GUI/Views/widgetbox/images/ff_Prism3_64x64.png
similarity index 100%
rename from GUI/coregui/Views/widgetbox/images/ff_Prism3_64x64.png
rename to GUI/Views/widgetbox/images/ff_Prism3_64x64.png
diff --git a/GUI/coregui/Views/widgetbox/images/ff_Prism6_64x64.png b/GUI/Views/widgetbox/images/ff_Prism6_64x64.png
similarity index 100%
rename from GUI/coregui/Views/widgetbox/images/ff_Prism6_64x64.png
rename to GUI/Views/widgetbox/images/ff_Prism6_64x64.png
diff --git a/GUI/coregui/Views/widgetbox/images/ff_Pyramid_64x64.png b/GUI/Views/widgetbox/images/ff_Pyramid_64x64.png
similarity index 100%
rename from GUI/coregui/Views/widgetbox/images/ff_Pyramid_64x64.png
rename to GUI/Views/widgetbox/images/ff_Pyramid_64x64.png
diff --git a/GUI/coregui/Views/widgetbox/images/ff_SawtoothRipple_64x64.png b/GUI/Views/widgetbox/images/ff_SawtoothRipple_64x64.png
similarity index 100%
rename from GUI/coregui/Views/widgetbox/images/ff_SawtoothRipple_64x64.png
rename to GUI/Views/widgetbox/images/ff_SawtoothRipple_64x64.png
diff --git a/GUI/coregui/Views/widgetbox/images/ff_Tetrahedron_64x64.png b/GUI/Views/widgetbox/images/ff_Tetrahedron_64x64.png
similarity index 100%
rename from GUI/coregui/Views/widgetbox/images/ff_Tetrahedron_64x64.png
rename to GUI/Views/widgetbox/images/ff_Tetrahedron_64x64.png
diff --git a/GUI/coregui/Views/widgetbox/images/ff_TruncatedCube_64x64.png b/GUI/Views/widgetbox/images/ff_TruncatedCube_64x64.png
similarity index 100%
rename from GUI/coregui/Views/widgetbox/images/ff_TruncatedCube_64x64.png
rename to GUI/Views/widgetbox/images/ff_TruncatedCube_64x64.png
diff --git a/GUI/coregui/Views/widgetbox/images/ff_TruncatedSphere_64x64.png b/GUI/Views/widgetbox/images/ff_TruncatedSphere_64x64.png
similarity index 100%
rename from GUI/coregui/Views/widgetbox/images/ff_TruncatedSphere_64x64.png
rename to GUI/Views/widgetbox/images/ff_TruncatedSphere_64x64.png
diff --git a/GUI/coregui/Views/widgetbox/images/ff_TruncatedSpheroid_64x64.png b/GUI/Views/widgetbox/images/ff_TruncatedSpheroid_64x64.png
similarity index 100%
rename from GUI/coregui/Views/widgetbox/images/ff_TruncatedSpheroid_64x64.png
rename to GUI/Views/widgetbox/images/ff_TruncatedSpheroid_64x64.png
diff --git a/GUI/coregui/Views/widgetbox/images/sample_layers2.png b/GUI/Views/widgetbox/images/sample_layers2.png
similarity index 100%
rename from GUI/coregui/Views/widgetbox/images/sample_layers2.png
rename to GUI/Views/widgetbox/images/sample_layers2.png
diff --git a/GUI/coregui/Views/widgetbox/images/sample_layers3.png b/GUI/Views/widgetbox/images/sample_layers3.png
similarity index 100%
rename from GUI/coregui/Views/widgetbox/images/sample_layers3.png
rename to GUI/Views/widgetbox/images/sample_layers3.png
diff --git a/GUI/coregui/Views/widgetbox/images/toolbar_redo.png b/GUI/Views/widgetbox/images/toolbar_redo.png
similarity index 100%
rename from GUI/coregui/Views/widgetbox/images/toolbar_redo.png
rename to GUI/Views/widgetbox/images/toolbar_redo.png
diff --git a/GUI/coregui/Views/widgetbox/qdesigner_dnditem_p.h b/GUI/Views/widgetbox/qdesigner_dnditem_p.h
similarity index 100%
rename from GUI/coregui/Views/widgetbox/qdesigner_dnditem_p.h
rename to GUI/Views/widgetbox/qdesigner_dnditem_p.h
diff --git a/GUI/coregui/Views/widgetbox/qdesigner_formbuilder_p.h b/GUI/Views/widgetbox/qdesigner_formbuilder_p.h
similarity index 100%
rename from GUI/coregui/Views/widgetbox/qdesigner_formbuilder_p.h
rename to GUI/Views/widgetbox/qdesigner_formbuilder_p.h
diff --git a/GUI/coregui/Views/widgetbox/qdesigner_utils_p.h b/GUI/Views/widgetbox/qdesigner_utils_p.h
similarity index 100%
rename from GUI/coregui/Views/widgetbox/qdesigner_utils_p.h
rename to GUI/Views/widgetbox/qdesigner_utils_p.h
diff --git a/GUI/coregui/Views/widgetbox/qdesigner_widgetbox_p.h b/GUI/Views/widgetbox/qdesigner_widgetbox_p.h
similarity index 100%
rename from GUI/coregui/Views/widgetbox/qdesigner_widgetbox_p.h
rename to GUI/Views/widgetbox/qdesigner_widgetbox_p.h
diff --git a/GUI/coregui/Views/widgetbox/qsimpleresource_p.h b/GUI/Views/widgetbox/qsimpleresource_p.h
similarity index 100%
rename from GUI/coregui/Views/widgetbox/qsimpleresource_p.h
rename to GUI/Views/widgetbox/qsimpleresource_p.h
diff --git a/GUI/coregui/Views/widgetbox/shared_enums_p.h b/GUI/Views/widgetbox/shared_enums_p.h
similarity index 100%
rename from GUI/coregui/Views/widgetbox/shared_enums_p.h
rename to GUI/Views/widgetbox/shared_enums_p.h
diff --git a/GUI/coregui/Views/widgetbox/shared_global_p.h b/GUI/Views/widgetbox/shared_global_p.h
similarity index 100%
rename from GUI/coregui/Views/widgetbox/shared_global_p.h
rename to GUI/Views/widgetbox/shared_global_p.h
diff --git a/GUI/coregui/Views/widgetbox/sheet_delegate_p.h b/GUI/Views/widgetbox/sheet_delegate_p.h
similarity index 100%
rename from GUI/coregui/Views/widgetbox/sheet_delegate_p.h
rename to GUI/Views/widgetbox/sheet_delegate_p.h
diff --git a/GUI/coregui/Views/widgetbox/spacer_widget_p.h b/GUI/Views/widgetbox/spacer_widget_p.h
similarity index 100%
rename from GUI/coregui/Views/widgetbox/spacer_widget_p.h
rename to GUI/Views/widgetbox/spacer_widget_p.h
diff --git a/GUI/coregui/Views/widgetbox/ui4_p.h b/GUI/Views/widgetbox/ui4_p.h
similarity index 100%
rename from GUI/coregui/Views/widgetbox/ui4_p.h
rename to GUI/Views/widgetbox/ui4_p.h
diff --git a/GUI/coregui/Views/widgetbox/widgetbox.cpp b/GUI/Views/widgetbox/widgetbox.cpp
similarity index 100%
rename from GUI/coregui/Views/widgetbox/widgetbox.cpp
rename to GUI/Views/widgetbox/widgetbox.cpp
diff --git a/GUI/coregui/Views/widgetbox/widgetbox.h b/GUI/Views/widgetbox/widgetbox.h
similarity index 100%
rename from GUI/coregui/Views/widgetbox/widgetbox.h
rename to GUI/Views/widgetbox/widgetbox.h
diff --git a/GUI/coregui/Views/widgetbox/widgetbox.qrc b/GUI/Views/widgetbox/widgetbox.qrc
similarity index 100%
rename from GUI/coregui/Views/widgetbox/widgetbox.qrc
rename to GUI/Views/widgetbox/widgetbox.qrc
diff --git a/GUI/coregui/Views/widgetbox/widgetbox.xml b/GUI/Views/widgetbox/widgetbox.xml
similarity index 100%
rename from GUI/coregui/Views/widgetbox/widgetbox.xml
rename to GUI/Views/widgetbox/widgetbox.xml
diff --git a/GUI/coregui/Views/widgetbox/widgetbox_global.h b/GUI/Views/widgetbox/widgetbox_global.h
similarity index 100%
rename from GUI/coregui/Views/widgetbox/widgetbox_global.h
rename to GUI/Views/widgetbox/widgetbox_global.h
diff --git a/GUI/coregui/Views/widgetbox/widgetboxcategorylistview.cpp b/GUI/Views/widgetbox/widgetboxcategorylistview.cpp
similarity index 100%
rename from GUI/coregui/Views/widgetbox/widgetboxcategorylistview.cpp
rename to GUI/Views/widgetbox/widgetboxcategorylistview.cpp
diff --git a/GUI/coregui/Views/widgetbox/widgetboxcategorylistview.h b/GUI/Views/widgetbox/widgetboxcategorylistview.h
similarity index 100%
rename from GUI/coregui/Views/widgetbox/widgetboxcategorylistview.h
rename to GUI/Views/widgetbox/widgetboxcategorylistview.h
diff --git a/GUI/coregui/Views/widgetbox/widgetboxtreewidget.cpp b/GUI/Views/widgetbox/widgetboxtreewidget.cpp
similarity index 100%
rename from GUI/coregui/Views/widgetbox/widgetboxtreewidget.cpp
rename to GUI/Views/widgetbox/widgetboxtreewidget.cpp
diff --git a/GUI/coregui/Views/widgetbox/widgetboxtreewidget.h b/GUI/Views/widgetbox/widgetboxtreewidget.h
similarity index 100%
rename from GUI/coregui/Views/widgetbox/widgetboxtreewidget.h
rename to GUI/Views/widgetbox/widgetboxtreewidget.h
diff --git a/GUI/coregui/coregui.qrc b/GUI/gui.qrc
similarity index 100%
rename from GUI/coregui/coregui.qrc
rename to GUI/gui.qrc
diff --git a/GUI/coregui/images/1D_Error.png b/GUI/images/1D_Error.png
similarity index 100%
rename from GUI/coregui/images/1D_Error.png
rename to GUI/images/1D_Error.png
diff --git a/GUI/coregui/images/1D_OK.png b/GUI/images/1D_OK.png
similarity index 100%
rename from GUI/coregui/images/1D_OK.png
rename to GUI/images/1D_OK.png
diff --git a/GUI/coregui/images/1D_Warning.png b/GUI/images/1D_Warning.png
similarity index 100%
rename from GUI/coregui/images/1D_Warning.png
rename to GUI/images/1D_Warning.png
diff --git a/GUI/coregui/images/2D_OK.png b/GUI/images/2D_OK.png
similarity index 100%
rename from GUI/coregui/images/2D_OK.png
rename to GUI/images/2D_OK.png
diff --git a/GUI/coregui/images/BornAgain.ico b/GUI/images/BornAgain.ico
similarity index 100%
rename from GUI/coregui/images/BornAgain.ico
rename to GUI/images/BornAgain.ico
diff --git a/GUI/coregui/images/BornAgain_48x48.png b/GUI/images/BornAgain_48x48.png
similarity index 100%
rename from GUI/coregui/images/BornAgain_48x48.png
rename to GUI/images/BornAgain_48x48.png
diff --git a/GUI/coregui/images/BornAgain_64x64.png b/GUI/images/BornAgain_64x64.png
similarity index 100%
rename from GUI/coregui/images/BornAgain_64x64.png
rename to GUI/images/BornAgain_64x64.png
diff --git a/GUI/coregui/images/about_icon.awk b/GUI/images/about_icon.awk
similarity index 100%
rename from GUI/coregui/images/about_icon.awk
rename to GUI/images/about_icon.awk
diff --git a/GUI/coregui/images/about_icon.png b/GUI/images/about_icon.png
similarity index 100%
rename from GUI/coregui/images/about_icon.png
rename to GUI/images/about_icon.png
diff --git a/GUI/coregui/images/alpha-f-box.svg b/GUI/images/alpha-f-box.svg
similarity index 100%
rename from GUI/coregui/images/alpha-f-box.svg
rename to GUI/images/alpha-f-box.svg
diff --git a/GUI/coregui/images/camera-metering-center.svg b/GUI/images/camera-metering-center.svg
similarity index 100%
rename from GUI/coregui/images/camera-metering-center.svg
rename to GUI/images/camera-metering-center.svg
diff --git a/GUI/coregui/images/caret-down.svg b/GUI/images/caret-down.svg
similarity index 100%
rename from GUI/coregui/images/caret-down.svg
rename to GUI/images/caret-down.svg
diff --git a/GUI/coregui/images/caret-right.svg b/GUI/images/caret-right.svg
similarity index 100%
rename from GUI/coregui/images/caret-right.svg
rename to GUI/images/caret-right.svg
diff --git a/GUI/coregui/images/collapse_arrow.png b/GUI/images/collapse_arrow.png
similarity index 100%
rename from GUI/coregui/images/collapse_arrow.png
rename to GUI/images/collapse_arrow.png
diff --git a/GUI/coregui/images/content-copy.svg b/GUI/images/content-copy.svg
similarity index 100%
rename from GUI/coregui/images/content-copy.svg
rename to GUI/images/content-copy.svg
diff --git a/GUI/coregui/images/content-save-outline.svg b/GUI/images/content-save-outline.svg
similarity index 100%
rename from GUI/coregui/images/content-save-outline.svg
rename to GUI/images/content-save-outline.svg
diff --git a/GUI/coregui/images/dark-angle-down.svg b/GUI/images/dark-angle-down.svg
similarity index 100%
rename from GUI/coregui/images/dark-angle-down.svg
rename to GUI/images/dark-angle-down.svg
diff --git a/GUI/coregui/images/dark-angle-up.svg b/GUI/images/dark-angle-up.svg
similarity index 100%
rename from GUI/coregui/images/dark-angle-up.svg
rename to GUI/images/dark-angle-up.svg
diff --git a/GUI/coregui/images/dark-close.svg b/GUI/images/dark-close.svg
similarity index 100%
rename from GUI/coregui/images/dark-close.svg
rename to GUI/images/dark-close.svg
diff --git a/GUI/coregui/images/delete.svg b/GUI/images/delete.svg
similarity index 100%
rename from GUI/coregui/images/delete.svg
rename to GUI/images/delete.svg
diff --git a/GUI/coregui/images/depth_instrument.svg b/GUI/images/depth_instrument.svg
similarity index 100%
rename from GUI/coregui/images/depth_instrument.svg
rename to GUI/images/depth_instrument.svg
diff --git a/GUI/coregui/images/depth_instrument_shaded.svg b/GUI/images/depth_instrument_shaded.svg
similarity index 100%
rename from GUI/coregui/images/depth_instrument_shaded.svg
rename to GUI/images/depth_instrument_shaded.svg
diff --git a/GUI/coregui/images/dock-right.svg b/GUI/images/dock-right.svg
similarity index 100%
rename from GUI/coregui/images/dock-right.svg
rename to GUI/images/dock-right.svg
diff --git a/GUI/coregui/images/expand_arrow.png b/GUI/images/expand_arrow.png
similarity index 100%
rename from GUI/coregui/images/expand_arrow.png
rename to GUI/images/expand_arrow.png
diff --git a/GUI/coregui/images/filenew.png b/GUI/images/filenew.png
similarity index 100%
rename from GUI/coregui/images/filenew.png
rename to GUI/images/filenew.png
diff --git a/GUI/coregui/images/gisas_instrument.svg b/GUI/images/gisas_instrument.svg
similarity index 100%
rename from GUI/coregui/images/gisas_instrument.svg
rename to GUI/images/gisas_instrument.svg
diff --git a/GUI/coregui/images/gisas_instrument_shaded.svg b/GUI/images/gisas_instrument_shaded.svg
similarity index 100%
rename from GUI/coregui/images/gisas_instrument_shaded.svg
rename to GUI/images/gisas_instrument_shaded.svg
diff --git a/GUI/coregui/images/hand-right.svg b/GUI/images/hand-right.svg
similarity index 100%
rename from GUI/coregui/images/hand-right.svg
rename to GUI/images/hand-right.svg
diff --git a/GUI/coregui/images/import.svg b/GUI/images/import.svg
similarity index 100%
rename from GUI/coregui/images/import.svg
rename to GUI/images/import.svg
diff --git a/GUI/coregui/images/magnifier.png b/GUI/images/magnifier.png
similarity index 100%
rename from GUI/coregui/images/magnifier.png
rename to GUI/images/magnifier.png
diff --git a/GUI/coregui/images/main_importview.svg b/GUI/images/main_importview.svg
similarity index 100%
rename from GUI/coregui/images/main_importview.svg
rename to GUI/images/main_importview.svg
diff --git a/GUI/coregui/images/main_instrumentview.svg b/GUI/images/main_instrumentview.svg
similarity index 100%
rename from GUI/coregui/images/main_instrumentview.svg
rename to GUI/images/main_instrumentview.svg
diff --git a/GUI/coregui/images/main_jobview.svg b/GUI/images/main_jobview.svg
similarity index 100%
rename from GUI/coregui/images/main_jobview.svg
rename to GUI/images/main_jobview.svg
diff --git a/GUI/coregui/images/main_sampleview.svg b/GUI/images/main_sampleview.svg
similarity index 100%
rename from GUI/coregui/images/main_sampleview.svg
rename to GUI/images/main_sampleview.svg
diff --git a/GUI/coregui/images/main_sessionmodel.svg b/GUI/images/main_sessionmodel.svg
similarity index 100%
rename from GUI/coregui/images/main_sessionmodel.svg
rename to GUI/images/main_sessionmodel.svg
diff --git a/GUI/coregui/images/main_simulationview.svg b/GUI/images/main_simulationview.svg
similarity index 100%
rename from GUI/coregui/images/main_simulationview.svg
rename to GUI/images/main_simulationview.svg
diff --git a/GUI/coregui/images/main_testview.svg b/GUI/images/main_testview.svg
similarity index 100%
rename from GUI/coregui/images/main_testview.svg
rename to GUI/images/main_testview.svg
diff --git a/GUI/coregui/images/main_welcomeview.svg b/GUI/images/main_welcomeview.svg
similarity index 100%
rename from GUI/coregui/images/main_welcomeview.svg
rename to GUI/images/main_welcomeview.svg
diff --git a/GUI/coregui/images/menu-open.svg b/GUI/images/menu-open.svg
similarity index 100%
rename from GUI/coregui/images/menu-open.svg
rename to GUI/images/menu-open.svg
diff --git a/GUI/coregui/images/mode_script.png b/GUI/images/mode_script.png
similarity index 100%
rename from GUI/coregui/images/mode_script.png
rename to GUI/images/mode_script.png
diff --git a/GUI/coregui/images/offspec_instrument.svg b/GUI/images/offspec_instrument.svg
similarity index 100%
rename from GUI/coregui/images/offspec_instrument.svg
rename to GUI/images/offspec_instrument.svg
diff --git a/GUI/coregui/images/offspec_instrument_shaded.svg b/GUI/images/offspec_instrument_shaded.svg
similarity index 100%
rename from GUI/coregui/images/offspec_instrument_shaded.svg
rename to GUI/images/offspec_instrument_shaded.svg
diff --git a/GUI/coregui/images/play.svg b/GUI/images/play.svg
similarity index 100%
rename from GUI/coregui/images/play.svg
rename to GUI/images/play.svg
diff --git a/GUI/coregui/images/reset.png b/GUI/images/reset.png
similarity index 100%
rename from GUI/coregui/images/reset.png
rename to GUI/images/reset.png
diff --git a/GUI/coregui/images/rotate-left.svg b/GUI/images/rotate-left.svg
similarity index 100%
rename from GUI/coregui/images/rotate-left.svg
rename to GUI/images/rotate-left.svg
diff --git a/GUI/coregui/images/shape-square-plus.svg b/GUI/images/shape-square-plus.svg
similarity index 100%
rename from GUI/coregui/images/shape-square-plus.svg
rename to GUI/images/shape-square-plus.svg
diff --git a/GUI/coregui/images/specular_instrument.svg b/GUI/images/specular_instrument.svg
similarity index 100%
rename from GUI/coregui/images/specular_instrument.svg
rename to GUI/images/specular_instrument.svg
diff --git a/GUI/coregui/images/specular_instrument_shaded.svg b/GUI/images/specular_instrument_shaded.svg
similarity index 100%
rename from GUI/coregui/images/specular_instrument_shaded.svg
rename to GUI/images/specular_instrument_shaded.svg
diff --git a/GUI/coregui/images/splashscreen.png b/GUI/images/splashscreen.png
similarity index 100%
rename from GUI/coregui/images/splashscreen.png
rename to GUI/images/splashscreen.png
diff --git a/GUI/coregui/images/statusbar_dockmenu.svg b/GUI/images/statusbar_dockmenu.svg
similarity index 100%
rename from GUI/coregui/images/statusbar_dockmenu.svg
rename to GUI/images/statusbar_dockmenu.svg
diff --git a/GUI/coregui/images/statusbar_joblist.svg b/GUI/images/statusbar_joblist.svg
similarity index 100%
rename from GUI/coregui/images/statusbar_joblist.svg
rename to GUI/images/statusbar_joblist.svg
diff --git a/GUI/coregui/images/toolbar24dark_hambar.svg b/GUI/images/toolbar24dark_hambar.svg
similarity index 100%
rename from GUI/coregui/images/toolbar24dark_hambar.svg
rename to GUI/images/toolbar24dark_hambar.svg
diff --git a/GUI/coregui/images/toolbar_expand_collapse_tree.svg b/GUI/images/toolbar_expand_collapse_tree.svg
similarity index 100%
rename from GUI/coregui/images/toolbar_expand_collapse_tree.svg
rename to GUI/images/toolbar_expand_collapse_tree.svg
diff --git a/GUI/coregui/images/treeview-branch-closed.png b/GUI/images/treeview-branch-closed.png
similarity index 100%
rename from GUI/coregui/images/treeview-branch-closed.png
rename to GUI/images/treeview-branch-closed.png
diff --git a/GUI/coregui/images/treeview-branch-end.png b/GUI/images/treeview-branch-end.png
similarity index 100%
rename from GUI/coregui/images/treeview-branch-end.png
rename to GUI/images/treeview-branch-end.png
diff --git a/GUI/coregui/images/treeview-branch-more.png b/GUI/images/treeview-branch-more.png
similarity index 100%
rename from GUI/coregui/images/treeview-branch-more.png
rename to GUI/images/treeview-branch-more.png
diff --git a/GUI/coregui/images/treeview-branch-open.png b/GUI/images/treeview-branch-open.png
similarity index 100%
rename from GUI/coregui/images/treeview-branch-open.png
rename to GUI/images/treeview-branch-open.png
diff --git a/GUI/coregui/images/treeview-vline.png b/GUI/images/treeview-vline.png
similarity index 100%
rename from GUI/coregui/images/treeview-vline.png
rename to GUI/images/treeview-vline.png
diff --git a/GUI/coregui/images/undo-variant.svg b/GUI/images/undo-variant.svg
similarity index 100%
rename from GUI/coregui/images/undo-variant.svg
rename to GUI/images/undo-variant.svg
diff --git a/GUI/coregui/images/warning@2x.png b/GUI/images/warning@2x.png
similarity index 100%
rename from GUI/coregui/images/warning@2x.png
rename to GUI/images/warning@2x.png
diff --git a/GUI/coregui/images/warning_16x16.png b/GUI/images/warning_16x16.png
similarity index 100%
rename from GUI/coregui/images/warning_16x16.png
rename to GUI/images/warning_16x16.png
diff --git a/GUI/coregui/images/warning_64x64.png b/GUI/images/warning_64x64.png
similarity index 100%
rename from GUI/coregui/images/warning_64x64.png
rename to GUI/images/warning_64x64.png
diff --git a/GUI/coregui/mainwindow/AppSvc.cpp b/GUI/mainwindow/AppSvc.cpp
similarity index 100%
rename from GUI/coregui/mainwindow/AppSvc.cpp
rename to GUI/mainwindow/AppSvc.cpp
diff --git a/GUI/coregui/mainwindow/AppSvc.h b/GUI/mainwindow/AppSvc.h
similarity index 100%
rename from GUI/coregui/mainwindow/AppSvc.h
rename to GUI/mainwindow/AppSvc.h
diff --git a/GUI/coregui/mainwindow/AutosaveController.cpp b/GUI/mainwindow/AutosaveController.cpp
similarity index 100%
rename from GUI/coregui/mainwindow/AutosaveController.cpp
rename to GUI/mainwindow/AutosaveController.cpp
diff --git a/GUI/coregui/mainwindow/AutosaveController.h b/GUI/mainwindow/AutosaveController.h
similarity index 100%
rename from GUI/coregui/mainwindow/AutosaveController.h
rename to GUI/mainwindow/AutosaveController.h
diff --git a/GUI/coregui/mainwindow/ISingleton.h b/GUI/mainwindow/ISingleton.h
similarity index 100%
rename from GUI/coregui/mainwindow/ISingleton.h
rename to GUI/mainwindow/ISingleton.h
diff --git a/GUI/coregui/mainwindow/OutputDataIOHistory.cpp b/GUI/mainwindow/OutputDataIOHistory.cpp
similarity index 100%
rename from GUI/coregui/mainwindow/OutputDataIOHistory.cpp
rename to GUI/mainwindow/OutputDataIOHistory.cpp
diff --git a/GUI/coregui/mainwindow/OutputDataIOHistory.h b/GUI/mainwindow/OutputDataIOHistory.h
similarity index 100%
rename from GUI/coregui/mainwindow/OutputDataIOHistory.h
rename to GUI/mainwindow/OutputDataIOHistory.h
diff --git a/GUI/coregui/mainwindow/OutputDataIOService.cpp b/GUI/mainwindow/OutputDataIOService.cpp
similarity index 100%
rename from GUI/coregui/mainwindow/OutputDataIOService.cpp
rename to GUI/mainwindow/OutputDataIOService.cpp
diff --git a/GUI/coregui/mainwindow/OutputDataIOService.h b/GUI/mainwindow/OutputDataIOService.h
similarity index 100%
rename from GUI/coregui/mainwindow/OutputDataIOService.h
rename to GUI/mainwindow/OutputDataIOService.h
diff --git a/GUI/coregui/mainwindow/ProjectFlags.h b/GUI/mainwindow/ProjectFlags.h
similarity index 100%
rename from GUI/coregui/mainwindow/ProjectFlags.h
rename to GUI/mainwindow/ProjectFlags.h
diff --git a/GUI/coregui/mainwindow/ProjectUtils.cpp b/GUI/mainwindow/ProjectUtils.cpp
similarity index 100%
rename from GUI/coregui/mainwindow/ProjectUtils.cpp
rename to GUI/mainwindow/ProjectUtils.cpp
diff --git a/GUI/coregui/mainwindow/ProjectUtils.h b/GUI/mainwindow/ProjectUtils.h
similarity index 100%
rename from GUI/coregui/mainwindow/ProjectUtils.h
rename to GUI/mainwindow/ProjectUtils.h
diff --git a/GUI/coregui/mainwindow/PyImportAssistant.cpp b/GUI/mainwindow/PyImportAssistant.cpp
similarity index 100%
rename from GUI/coregui/mainwindow/PyImportAssistant.cpp
rename to GUI/mainwindow/PyImportAssistant.cpp
diff --git a/GUI/coregui/mainwindow/PyImportAssistant.h b/GUI/mainwindow/PyImportAssistant.h
similarity index 100%
rename from GUI/coregui/mainwindow/PyImportAssistant.h
rename to GUI/mainwindow/PyImportAssistant.h
diff --git a/GUI/coregui/mainwindow/SaveLoadInterface.cpp b/GUI/mainwindow/SaveLoadInterface.cpp
similarity index 100%
rename from GUI/coregui/mainwindow/SaveLoadInterface.cpp
rename to GUI/mainwindow/SaveLoadInterface.cpp
diff --git a/GUI/coregui/mainwindow/SaveLoadInterface.h b/GUI/mainwindow/SaveLoadInterface.h
similarity index 100%
rename from GUI/coregui/mainwindow/SaveLoadInterface.h
rename to GUI/mainwindow/SaveLoadInterface.h
diff --git a/GUI/coregui/mainwindow/SaveService.cpp b/GUI/mainwindow/SaveService.cpp
similarity index 100%
rename from GUI/coregui/mainwindow/SaveService.cpp
rename to GUI/mainwindow/SaveService.cpp
diff --git a/GUI/coregui/mainwindow/SaveService.h b/GUI/mainwindow/SaveService.h
similarity index 100%
rename from GUI/coregui/mainwindow/SaveService.h
rename to GUI/mainwindow/SaveService.h
diff --git a/GUI/coregui/mainwindow/SaveThread.cpp b/GUI/mainwindow/SaveThread.cpp
similarity index 100%
rename from GUI/coregui/mainwindow/SaveThread.cpp
rename to GUI/mainwindow/SaveThread.cpp
diff --git a/GUI/coregui/mainwindow/SaveThread.h b/GUI/mainwindow/SaveThread.h
similarity index 100%
rename from GUI/coregui/mainwindow/SaveThread.h
rename to GUI/mainwindow/SaveThread.h
diff --git a/GUI/coregui/mainwindow/StyledToolBar.cpp b/GUI/mainwindow/StyledToolBar.cpp
similarity index 100%
rename from GUI/coregui/mainwindow/StyledToolBar.cpp
rename to GUI/mainwindow/StyledToolBar.cpp
diff --git a/GUI/coregui/mainwindow/StyledToolBar.h b/GUI/mainwindow/StyledToolBar.h
similarity index 100%
rename from GUI/coregui/mainwindow/StyledToolBar.h
rename to GUI/mainwindow/StyledToolBar.h
diff --git a/GUI/coregui/mainwindow/aboutapplicationdialog.cpp b/GUI/mainwindow/aboutapplicationdialog.cpp
similarity index 100%
rename from GUI/coregui/mainwindow/aboutapplicationdialog.cpp
rename to GUI/mainwindow/aboutapplicationdialog.cpp
diff --git a/GUI/coregui/mainwindow/aboutapplicationdialog.h b/GUI/mainwindow/aboutapplicationdialog.h
similarity index 100%
rename from GUI/coregui/mainwindow/aboutapplicationdialog.h
rename to GUI/mainwindow/aboutapplicationdialog.h
diff --git a/GUI/coregui/mainwindow/actionmanager.cpp b/GUI/mainwindow/actionmanager.cpp
similarity index 100%
rename from GUI/coregui/mainwindow/actionmanager.cpp
rename to GUI/mainwindow/actionmanager.cpp
diff --git a/GUI/coregui/mainwindow/actionmanager.h b/GUI/mainwindow/actionmanager.h
similarity index 100%
rename from GUI/coregui/mainwindow/actionmanager.h
rename to GUI/mainwindow/actionmanager.h
diff --git a/GUI/coregui/mainwindow/mainwindow.cpp b/GUI/mainwindow/mainwindow.cpp
similarity index 100%
rename from GUI/coregui/mainwindow/mainwindow.cpp
rename to GUI/mainwindow/mainwindow.cpp
diff --git a/GUI/coregui/mainwindow/mainwindow.h b/GUI/mainwindow/mainwindow.h
similarity index 100%
rename from GUI/coregui/mainwindow/mainwindow.h
rename to GUI/mainwindow/mainwindow.h
diff --git a/GUI/coregui/mainwindow/mainwindow_constants.h b/GUI/mainwindow/mainwindow_constants.h
similarity index 100%
rename from GUI/coregui/mainwindow/mainwindow_constants.h
rename to GUI/mainwindow/mainwindow_constants.h
diff --git a/GUI/coregui/mainwindow/newprojectdialog.cpp b/GUI/mainwindow/newprojectdialog.cpp
similarity index 100%
rename from GUI/coregui/mainwindow/newprojectdialog.cpp
rename to GUI/mainwindow/newprojectdialog.cpp
diff --git a/GUI/coregui/mainwindow/newprojectdialog.h b/GUI/mainwindow/newprojectdialog.h
similarity index 100%
rename from GUI/coregui/mainwindow/newprojectdialog.h
rename to GUI/mainwindow/newprojectdialog.h
diff --git a/GUI/coregui/mainwindow/projectdocument.cpp b/GUI/mainwindow/projectdocument.cpp
similarity index 100%
rename from GUI/coregui/mainwindow/projectdocument.cpp
rename to GUI/mainwindow/projectdocument.cpp
diff --git a/GUI/coregui/mainwindow/projectdocument.h b/GUI/mainwindow/projectdocument.h
similarity index 100%
rename from GUI/coregui/mainwindow/projectdocument.h
rename to GUI/mainwindow/projectdocument.h
diff --git a/GUI/coregui/mainwindow/projectmanager.cpp b/GUI/mainwindow/projectmanager.cpp
similarity index 100%
rename from GUI/coregui/mainwindow/projectmanager.cpp
rename to GUI/mainwindow/projectmanager.cpp
diff --git a/GUI/coregui/mainwindow/projectmanager.h b/GUI/mainwindow/projectmanager.h
similarity index 100%
rename from GUI/coregui/mainwindow/projectmanager.h
rename to GUI/mainwindow/projectmanager.h
diff --git a/GUI/coregui/mainwindow/tooltipdatabase.cpp b/GUI/mainwindow/tooltipdatabase.cpp
similarity index 100%
rename from GUI/coregui/mainwindow/tooltipdatabase.cpp
rename to GUI/mainwindow/tooltipdatabase.cpp
diff --git a/GUI/coregui/mainwindow/tooltipdatabase.h b/GUI/mainwindow/tooltipdatabase.h
similarity index 100%
rename from GUI/coregui/mainwindow/tooltipdatabase.h
rename to GUI/mainwindow/tooltipdatabase.h
diff --git a/GUI/coregui/mainwindow/tooltips.xml b/GUI/mainwindow/tooltips.xml
similarity index 100%
rename from GUI/coregui/mainwindow/tooltips.xml
rename to GUI/mainwindow/tooltips.xml
diff --git a/GUI/coregui/utils/CustomEventFilters.cpp b/GUI/utils/CustomEventFilters.cpp
similarity index 100%
rename from GUI/coregui/utils/CustomEventFilters.cpp
rename to GUI/utils/CustomEventFilters.cpp
diff --git a/GUI/coregui/utils/CustomEventFilters.h b/GUI/utils/CustomEventFilters.h
similarity index 100%
rename from GUI/coregui/utils/CustomEventFilters.h
rename to GUI/utils/CustomEventFilters.h
diff --git a/GUI/coregui/utils/DeserializationException.cpp b/GUI/utils/DeserializationException.cpp
similarity index 100%
rename from GUI/coregui/utils/DeserializationException.cpp
rename to GUI/utils/DeserializationException.cpp
diff --git a/GUI/coregui/utils/DeserializationException.h b/GUI/utils/DeserializationException.h
similarity index 100%
rename from GUI/coregui/utils/DeserializationException.h
rename to GUI/utils/DeserializationException.h
diff --git a/GUI/coregui/utils/FancyLabel.cpp b/GUI/utils/FancyLabel.cpp
similarity index 100%
rename from GUI/coregui/utils/FancyLabel.cpp
rename to GUI/utils/FancyLabel.cpp
diff --git a/GUI/coregui/utils/FancyLabel.h b/GUI/utils/FancyLabel.h
similarity index 100%
rename from GUI/coregui/utils/FancyLabel.h
rename to GUI/utils/FancyLabel.h
diff --git a/GUI/coregui/utils/GUIHelpers.cpp b/GUI/utils/GUIHelpers.cpp
similarity index 100%
rename from GUI/coregui/utils/GUIHelpers.cpp
rename to GUI/utils/GUIHelpers.cpp
diff --git a/GUI/coregui/utils/GUIHelpers.h b/GUI/utils/GUIHelpers.h
similarity index 100%
rename from GUI/coregui/utils/GUIHelpers.h
rename to GUI/utils/GUIHelpers.h
diff --git a/GUI/coregui/utils/GUIMessage.cpp b/GUI/utils/GUIMessage.cpp
similarity index 100%
rename from GUI/coregui/utils/GUIMessage.cpp
rename to GUI/utils/GUIMessage.cpp
diff --git a/GUI/coregui/utils/GUIMessage.h b/GUI/utils/GUIMessage.h
similarity index 100%
rename from GUI/coregui/utils/GUIMessage.h
rename to GUI/utils/GUIMessage.h
diff --git a/GUI/coregui/utils/ImportDataInfo.cpp b/GUI/utils/ImportDataInfo.cpp
similarity index 100%
rename from GUI/coregui/utils/ImportDataInfo.cpp
rename to GUI/utils/ImportDataInfo.cpp
diff --git a/GUI/coregui/utils/ImportDataInfo.h b/GUI/utils/ImportDataInfo.h
similarity index 100%
rename from GUI/coregui/utils/ImportDataInfo.h
rename to GUI/utils/ImportDataInfo.h
diff --git a/GUI/coregui/utils/ItemIDFactory.cpp b/GUI/utils/ItemIDFactory.cpp
similarity index 100%
rename from GUI/coregui/utils/ItemIDFactory.cpp
rename to GUI/utils/ItemIDFactory.cpp
diff --git a/GUI/coregui/utils/ItemIDFactory.h b/GUI/utils/ItemIDFactory.h
similarity index 100%
rename from GUI/coregui/utils/ItemIDFactory.h
rename to GUI/utils/ItemIDFactory.h
diff --git a/GUI/coregui/utils/LayoutUtils.cpp b/GUI/utils/LayoutUtils.cpp
similarity index 100%
rename from GUI/coregui/utils/LayoutUtils.cpp
rename to GUI/utils/LayoutUtils.cpp
diff --git a/GUI/coregui/utils/LayoutUtils.h b/GUI/utils/LayoutUtils.h
similarity index 100%
rename from GUI/coregui/utils/LayoutUtils.h
rename to GUI/utils/LayoutUtils.h
diff --git a/GUI/coregui/utils/MessageService.cpp b/GUI/utils/MessageService.cpp
similarity index 100%
rename from GUI/coregui/utils/MessageService.cpp
rename to GUI/utils/MessageService.cpp
diff --git a/GUI/coregui/utils/MessageService.h b/GUI/utils/MessageService.h
similarity index 100%
rename from GUI/coregui/utils/MessageService.h
rename to GUI/utils/MessageService.h
diff --git a/GUI/coregui/utils/StyleUtils.cpp b/GUI/utils/StyleUtils.cpp
similarity index 100%
rename from GUI/coregui/utils/StyleUtils.cpp
rename to GUI/utils/StyleUtils.cpp
diff --git a/GUI/coregui/utils/StyleUtils.h b/GUI/utils/StyleUtils.h
similarity index 100%
rename from GUI/coregui/utils/StyleUtils.h
rename to GUI/utils/StyleUtils.h
diff --git a/GUI/coregui/utils/hostosinfo.h b/GUI/utils/hostosinfo.h
similarity index 100%
rename from GUI/coregui/utils/hostosinfo.h
rename to GUI/utils/hostosinfo.h
diff --git a/GUI/coregui/utils/qstringutils.cpp b/GUI/utils/qstringutils.cpp
similarity index 100%
rename from GUI/coregui/utils/qstringutils.cpp
rename to GUI/utils/qstringutils.cpp
diff --git a/GUI/coregui/utils/qstringutils.h b/GUI/utils/qstringutils.h
similarity index 100%
rename from GUI/coregui/utils/qstringutils.h
rename to GUI/utils/qstringutils.h