From f94fc15eec1483ea2f9849fa7ac853068e9f006a Mon Sep 17 00:00:00 2001
From: Roman Tolchenov <roman.tolchenov@stfc.ac.uk>
Date: Tue, 1 Aug 2017 11:46:03 +0100
Subject: [PATCH] Moved custom interfaces. Refactored muon interface.
---
MantidPlot/CMakeLists.txt | 2 +-
MantidQt/CustomInterfaces/CMakeLists.txt | 31 ----
MantidQt/CustomInterfaces/test/CMakeLists.txt | 37 -----
qt/CMakeLists.txt | 1 +
qt/scientific_interfaces/CMakeLists.txt | 10 ++
.../CreateInterfaceTemplate.py | 0
.../inc}/DynamicPDF/DPDFBackgroundRemover.h | 0
.../inc}/DynamicPDF/DPDFBackgroundRemover.ui | 0
.../inc}/DynamicPDF/DPDFDisplayControl.h | 0
.../inc}/DynamicPDF/DPDFFitControl.h | 0
.../inc}/DynamicPDF/DPDFFitControl.ui | 0
.../inc}/DynamicPDF/DPDFFitOptionsBrowser.h | 0
.../inc}/DynamicPDF/DPDFFourierTransform.h | 0
.../inc}/DynamicPDF/DPDFFourierTransform.ui | 0
.../inc}/DynamicPDF/DPDFInputDataControl.h | 0
.../inc}/DynamicPDF/DisplayCurveFitTest.h | 0
.../inc}/DynamicPDF/DisplayCurveFitTest.ui | 0
.../inc}/DynamicPDF/SliceSelector.h | 0
.../inc}/DynamicPDF/SliceSelector.ui | 0
.../DynamicPDF/src}/DPDFBackgroundRemover.cpp | 0
.../DynamicPDF/src}/DPDFDisplayControl.cpp | 0
.../DynamicPDF/src}/DPDFFitControl.cpp | 0
.../DynamicPDF/src}/DPDFFitOptionsBrowser.cpp | 0
.../DynamicPDF/src}/DPDFFourierTransform.cpp | 0
.../DynamicPDF/src}/DPDFInputDataControl.cpp | 0
.../DynamicPDF/src}/DisplayCurveFitTest.cpp | 0
.../DynamicPDF/src}/SliceSelector.cpp | 0
.../EnggDiffraction/EnggDiffCalibSettings.h | 0
.../EnggDiffFittingPresWorker.h | 0
.../EnggDiffFittingPresenter.h | 0
.../EnggDiffFittingViewQtWidget.h | 0
.../EnggDiffractionPresWorker.h | 0
.../EnggDiffractionPresenter.h | 0
.../EnggDiffraction/EnggDiffractionQtGUI.ui | 0
.../EnggDiffractionQtTabCalib.ui | 0
.../EnggDiffractionQtTabFitting.ui | 0
.../EnggDiffractionQtTabFocus.ui | 0
.../EnggDiffractionQtTabPreproc.ui | 0
.../EnggDiffractionQtTabSettings.ui | 0
.../EnggDiffractionViewQtGUI.h | 0
.../IEnggDiffFittingPresenter.h | 0
.../EnggDiffraction/IEnggDiffFittingView.h | 0
.../IEnggDiffractionCalibration.h | 0
.../EnggDiffraction/IEnggDiffractionParam.h | 0
.../IEnggDiffractionPresenter.h | 0
.../IEnggDiffractionPythonRunner.h | 0
.../IEnggDiffractionSettings.h | 0
.../EnggDiffraction/IEnggDiffractionUserMsg.h | 0
.../EnggDiffraction/IEnggDiffractionView.h | 0
.../src}/EnggDiffFittingPresenter.cpp | 0
.../src}/EnggDiffFittingViewQtWidget.cpp | 0
.../src}/EnggDiffractionPresenter.cpp | 0
.../src}/EnggDiffractionViewQtGUI.cpp | 0
.../General/inc/General}/Background.h | 0
.../General/inc/General}/DataComparison.h | 0
.../General/inc/General}/DataComparison.ui | 0
.../inc/General}/DirectConvertToEnergy.h | 0
.../inc/General}/DirectConvertToEnergy.ui | 0
.../General/inc/General}/DllConfig.h | 0
.../General/inc/General}/Homer.h | 0
.../General/inc/General}/IReflPresenter.h | 0
.../General/inc/General}/IReflSearcher.h | 0
.../General/inc/General}/LatticePresenter.h | 0
.../General/inc/General}/LatticeView.h | 0
.../General/inc/General}/MantidEV.h | 0
.../General/inc/General}/MantidEV.ui | 0
.../General/inc/General}/MantidEVWorker.h | 0
.../General/inc/General}/PrecompiledHeader.h | 0
.../General/inc/General}/ProjectSave.ui | 0
.../General/inc/General}/ReflMainWidget.ui | 0
.../General/inc/General}/ReflOptionsDialog.ui | 0
.../General/inc/General}/ReflWindow.ui | 0
.../General/inc/General}/SampleTransmission.h | 0
.../inc/General}/SampleTransmission.ui | 0
.../General/inc/General}/StepScan.h | 0
.../General/inc/General}/StepScan.ui | 0
.../General/inc/General}/Updateable.h | 0
.../General/inc/General}/UserInputValidator.h | 0
.../General/inc/General}/deltaECalc.h | 0
.../General}/src/DataComparison.cpp | 0
.../General}/src/DirectConvertToEnergy.cpp | 0
.../General}/src/Homer.cpp | 0
.../General}/src/LatticePresenter.cpp | 0
.../General}/src/MantidEV.cpp | 0
.../General}/src/MantidEVWorker.cpp | 0
.../General}/src/SampleTransmission.cpp | 0
.../General}/src/StepScan.cpp | 0
.../General}/src/UserInputValidator.cpp | 0
.../General}/src/background.cpp | 0
.../General}/src/deltaECalc.cpp | 0
.../IReflEventPresenter.h | 0
.../IReflEventTabPresenter.h | 0
.../ISISReflectometryOld}/IReflEventView.h | 0
.../IReflMainWindowPresenter.h | 0
.../IReflMainWindowView.h | 0
.../IReflRunsTabPresenter.h | 0
.../ISISReflectometryOld}/IReflRunsTabView.h | 0
.../IReflSaveTabPresenter.h | 0
.../ISISReflectometryOld}/IReflSaveTabView.h | 0
.../ISISReflectometryOld}/IReflSearcher.h | 0
.../IReflSettingsPresenter.h | 0
.../IReflSettingsTabPresenter.h | 0
.../ISISReflectometryOld}/IReflSettingsView.h | 0
.../ISISReflectometryOld}/MeasurementItem.h | 0
.../QtReflEventTabView.h | 0
.../ISISReflectometryOld}/QtReflEventView.h | 0
.../QtReflMainWindowView.h | 0
.../ISISReflectometryOld}/QtReflRunsTabView.h | 0
.../ISISReflectometryOld}/QtReflSaveTabView.h | 0
.../QtReflSettingsTabView.h | 0
.../QtReflSettingsView.h | 0
.../ReflCatalogSearcher.h | 0
.../ReflDataProcessorMainPresenter.h | 0
.../ReflDataProcessorPresenter.h | 0
.../ReflEventPresenter.h | 0
.../ReflEventTabPresenter.h | 0
.../ReflEventTabWidget.ui | 0
.../ISISReflectometryOld}/ReflEventWidget.ui | 0
...ReflGenericDataProcessorPresenterFactory.h | 0
.../ReflLegacyTransferStrategy.h | 0
.../ReflMainWindowPresenter.h | 0
.../ReflMainWindowWidget.ui | 0
.../ReflMeasureTransferStrategy.h | 0
.../ReflMeasurementItemSource.h | 0
.../ReflNexusMeasurementItemSource.h | 0
.../ReflRunsTabPresenter.h | 0
.../ReflRunsTabWidget.ui | 0
.../ReflSaveTabPresenter.h | 0
.../ReflSaveTabWidget.ui | 0
.../ISISReflectometryOld}/ReflSearchModel.h | 0
.../ReflSettingsPresenter.h | 0
.../ReflSettingsTabPresenter.h | 0
.../ReflSettingsTabWidget.ui | 0
.../ReflSettingsWidget.ui | 0
.../ISISReflectometryOld}/ReflTableSchema.h | 0
.../ReflTransferStrategy.h | 0
.../ISISReflectometryOld}/ReflWindow.ui | 0
.../ISISReflectometryOld}/TransferResults.h | 0
.../src}/MeasurementItem.cpp | 0
.../src}/QtReflEventTabView.cpp | 0
.../src}/QtReflEventView.cpp | 0
.../src}/QtReflMainWindowView.cpp | 0
.../src}/QtReflRunsTabView.cpp | 0
.../src}/QtReflSaveTabView.cpp | 0
.../src}/QtReflSettingsTabView.cpp | 0
.../src}/QtReflSettingsView.cpp | 0
.../src}/ReflCatalogSearcher.cpp | 0
.../src}/ReflDataProcessorPresenter.cpp | 0
.../src}/ReflEventPresenter.cpp | 0
.../src}/ReflEventTabPresenter.cpp | 0
...flGenericDataProcessorPresenterFactory.cpp | 0
.../src}/ReflLegacyTransferStrategy.cpp | 0
.../src}/ReflMainWindowPresenter.cpp | 0
.../src}/ReflMeasureTransferStrategy.cpp | 0
.../src}/ReflNexusMeasurementItemSource.cpp | 0
.../src}/ReflRunsTabPresenter.cpp | 0
.../src}/ReflSaveTabPresenter.cpp | 0
.../src}/ReflSearchModel.cpp | 0
.../src}/ReflSettingsPresenter.cpp | 0
.../src}/ReflSettingsTabPresenter.cpp | 0
.../src}/ReflTableSchema.cpp | 0
.../src}/TransferResults.cpp | 0
.../ISISSANS/inc/ISISSANS}/SANSAddFiles.h | 0
.../SANSBackgroundCorrectionSettings.h | 0
.../SANSBackgroundCorrectionWidget.h | 0
.../SANSBackgroundCorrectionWidget.ui | 0
.../ISISSANS/inc/ISISSANS}/SANSConstants.h | 0
.../ISISSANS/inc/ISISSANS}/SANSDiagnostics.h | 0
.../ISISSANS/inc/ISISSANS}/SANSEventSlicing.h | 0
.../inc/ISISSANS}/SANSEventSlicing.ui | 0
.../ISISSANS/inc/ISISSANS}/SANSPlotSpecial.h | 0
.../ISISSANS/inc/ISISSANS}/SANSPlotSpecial.ui | 0
.../ISISSANS/inc/ISISSANS}/SANSRunWindow.h | 0
.../ISISSANS/inc/ISISSANS}/SANSRunWindow.ui | 0
.../ISISSANS}/src/SANSAddFiles.cpp | 0
.../src/SANSBackgroundCorrectionSettings.cpp | 0
.../src/SANSBackgroundCorrectionWidget.cpp | 0
.../ISISSANS}/src/SANSConstants.cpp | 0
.../ISISSANS}/src/SANSDiagnostics.cpp | 0
.../ISISSANS}/src/SANSEventSlicing.cpp | 0
.../ISISSANS}/src/SANSPlotSpecial.cpp | 0
.../ISISSANS}/src/SANSRunWindow.cpp | 0
.../inc}/Indirect/AbsorptionCorrections.h | 0
.../inc}/Indirect/AbsorptionCorrections.ui | 0
.../inc}/Indirect/ApplyPaalmanPings.h | 0
.../inc}/Indirect/ApplyPaalmanPings.ui | 0
.../inc}/Indirect/CalculatePaalmanPings.h | 0
.../inc}/Indirect/CalculatePaalmanPings.ui | 0
.../inc}/Indirect/ContainerSubtraction.h | 0
.../inc}/Indirect/ContainerSubtraction.ui | 0
.../Indirect/inc}/Indirect/ConvFit.h | 0
.../Indirect/inc}/Indirect/ConvFit.ui | 0
.../Indirect/inc}/Indirect/CorrectionsTab.h | 0
.../Indirect/inc}/Indirect/DensityOfStates.h | 0
.../Indirect/inc}/Indirect/DensityOfStates.ui | 0
.../Indirect/inc}/Indirect/Elwin.h | 0
.../Indirect/inc}/Indirect/Elwin.ui | 0
.../Indirect/inc}/Indirect/ILLCalibration.h | 0
.../Indirect/inc}/Indirect/ILLCalibration.ui | 0
.../inc}/Indirect/ILLEnergyTransfer.h | 0
.../inc}/Indirect/ILLEnergyTransfer.ui | 0
.../Indirect/inc}/Indirect/ISISCalibration.h | 0
.../Indirect/inc}/Indirect/ISISCalibration.ui | 0
.../Indirect/inc}/Indirect/ISISDiagnostics.h | 0
.../Indirect/inc}/Indirect/ISISDiagnostics.ui | 0
.../inc}/Indirect/ISISEnergyTransfer.h | 0
.../inc}/Indirect/ISISEnergyTransfer.ui | 0
.../Indirect/inc}/Indirect/IndirectBayes.h | 0
.../Indirect/inc}/Indirect/IndirectBayes.ui | 0
.../Indirect/inc}/Indirect/IndirectBayesTab.h | 0
.../inc}/Indirect/IndirectCorrections.h | 0
.../inc}/Indirect/IndirectCorrections.ui | 0
.../inc}/Indirect/IndirectDataAnalysis.h | 0
.../inc}/Indirect/IndirectDataAnalysis.ui | 0
.../inc}/Indirect/IndirectDataAnalysisTab.h | 0
.../inc}/Indirect/IndirectDataReduction.h | 0
.../inc}/Indirect/IndirectDataReduction.ui | 0
.../inc}/Indirect/IndirectDataReductionTab.h | 0
.../Indirect/IndirectDiffractionReduction.h | 0
.../Indirect/IndirectDiffractionReduction.ui | 0
.../Indirect/inc}/Indirect/IndirectLoadILL.h | 0
.../Indirect/inc}/Indirect/IndirectLoadILL.ui | 0
.../Indirect/inc}/Indirect/IndirectMolDyn.h | 0
.../Indirect/inc}/Indirect/IndirectMolDyn.ui | 0
.../Indirect/inc}/Indirect/IndirectMoments.h | 0
.../Indirect/inc}/Indirect/IndirectMoments.ui | 0
.../Indirect/inc}/Indirect/IndirectSassena.h | 0
.../Indirect/inc}/Indirect/IndirectSassena.ui | 0
.../inc}/Indirect/IndirectSimulation.h | 0
.../inc}/Indirect/IndirectSimulation.ui | 0
.../inc}/Indirect/IndirectSimulationTab.h | 0
.../Indirect/inc}/Indirect/IndirectSqw.h | 0
.../Indirect/inc}/Indirect/IndirectSqw.ui | 0
.../inc}/Indirect/IndirectSymmetrise.h | 0
.../inc}/Indirect/IndirectSymmetrise.ui | 0
.../Indirect/inc}/Indirect/IndirectTab.h | 0
.../Indirect/inc}/Indirect/IndirectTools.h | 0
.../Indirect/inc}/Indirect/IndirectTools.ui | 0
.../Indirect/inc}/Indirect/IndirectToolsTab.h | 0
.../inc}/Indirect/IndirectTransmission.h | 0
.../inc}/Indirect/IndirectTransmission.ui | 0
.../inc}/Indirect/IndirectTransmissionCalc.h | 0
.../inc}/Indirect/IndirectTransmissionCalc.ui | 0
.../Indirect/inc}/Indirect/Iqt.h | 0
.../Indirect/inc}/Indirect/Iqt.ui | 0
.../Indirect/inc}/Indirect/IqtFit.h | 0
.../Indirect/inc}/Indirect/IqtFit.ui | 0
.../Indirect/inc}/Indirect/JumpFit.h | 0
.../Indirect/inc}/Indirect/JumpFit.ui | 0
.../Indirect/inc}/Indirect/MSDFit.h | 0
.../Indirect/inc}/Indirect/MSDFit.ui | 0
.../Indirect/inc}/Indirect/Quasi.h | 0
.../Indirect/inc}/Indirect/Quasi.ui | 0
.../Indirect/inc}/Indirect/ResNorm.h | 0
.../Indirect/inc}/Indirect/ResNorm.ui | 0
.../Indirect/inc}/Indirect/Stretch.h | 0
.../Indirect/inc}/Indirect/Stretch.ui | 0
.../Indirect/src}/AbsorptionCorrections.cpp | 0
.../Indirect/src}/ApplyPaalmanPings.cpp | 0
.../Indirect/src}/CalculatePaalmanPings.cpp | 0
.../Indirect/src}/ContainerSubtraction.cpp | 0
.../Indirect/src}/ConvFit.cpp | 0
.../Indirect/src}/CorrectionsTab.cpp | 0
.../Indirect/src}/DensityOfStates.cpp | 0
.../Indirect/src}/Elwin.cpp | 0
.../Indirect/src}/ILLCalibration.cpp | 0
.../Indirect/src}/ILLEnergyTransfer.cpp | 0
.../Indirect/src}/ISISCalibration.cpp | 0
.../Indirect/src}/ISISDiagnostics.cpp | 0
.../Indirect/src}/ISISEnergyTransfer.cpp | 0
.../Indirect/src}/IndirectBayes.cpp | 0
.../Indirect/src}/IndirectBayesTab.cpp | 0
.../Indirect/src}/IndirectCorrections.cpp | 0
.../Indirect/src}/IndirectDataAnalysis.cpp | 0
.../Indirect/src}/IndirectDataAnalysisTab.cpp | 0
.../Indirect/src}/IndirectDataReduction.cpp | 0
.../src}/IndirectDataReductionTab.cpp | 0
.../src}/IndirectDiffractionReduction.cpp | 0
.../Indirect/src}/IndirectLoadILL.cpp | 0
.../Indirect/src}/IndirectMolDyn.cpp | 0
.../Indirect/src}/IndirectMoments.cpp | 0
.../Indirect/src}/IndirectSassena.cpp | 0
.../Indirect/src}/IndirectSimulation.cpp | 0
.../Indirect/src}/IndirectSimulationTab.cpp | 0
.../Indirect/src}/IndirectSqw.cpp | 0
.../Indirect/src}/IndirectSymmetrise.cpp | 0
.../Indirect/src}/IndirectTab.cpp | 0
.../Indirect/src}/IndirectTools.cpp | 0
.../Indirect/src}/IndirectToolsTab.cpp | 0
.../Indirect/src}/IndirectTransmission.cpp | 0
.../src}/IndirectTransmissionCalc.cpp | 0
.../Indirect/src}/Iqt.cpp | 0
.../Indirect/src}/IqtFit.cpp | 0
.../Indirect/src}/JumpFit.cpp | 0
.../Indirect/src}/MSDFit.cpp | 0
.../Indirect/src}/Quasi.cpp | 0
.../Indirect/src}/ResNorm.cpp | 0
.../Indirect/src}/Stretch.cpp | 0
.../EditLocalParameterDialog.ui | 0
.../MultiDatasetFit/MDFAddWorkspaceDialog.h | 0
.../MultiDatasetFit/MDFAddWorkspaceDialog.ui | 0
.../inc}/MultiDatasetFit/MDFDataController.h | 0
.../inc}/MultiDatasetFit/MDFDatasetPlotData.h | 0
.../MDFEditLocalParameterDialog.h | 0
.../MultiDatasetFit/MDFFunctionPlotData.h | 0
.../MultiDatasetFit/MDFLocalParameterEditor.h | 0
.../MDFLocalParameterItemDelegate.h | 0
.../inc}/MultiDatasetFit/MDFLogValueFinder.h | 0
.../inc}/MultiDatasetFit/MDFPlotController.h | 0
.../inc}/MultiDatasetFit/MultiDatasetFit.h | 0
.../inc}/MultiDatasetFit/MultiDatasetFit.ui | 0
.../src}/MDFAddWorkspaceDialog.cpp | 0
.../src}/MDFDataController.cpp | 0
.../src}/MDFDatasetPlotData.cpp | 0
.../src}/MDFEditLocalParameterDialog.cpp | 0
.../src}/MDFFunctionPlotData.cpp | 0
.../src}/MDFLocalParameterEditor.cpp | 0
.../src}/MDFLocalParameterItemDelegate.cpp | 0
.../src}/MDFLogValueFinder.cpp | 0
.../src}/MDFPlotController.cpp | 0
.../MultiDatasetFit/src}/MultiDatasetFit.cpp | 0
.../Muon/ALCBaselineModellingModel.cpp | 4 +-
.../Muon/ALCBaselineModellingModel.h | 6 +-
.../Muon/ALCBaselineModellingPresenter.cpp | 4 +-
.../Muon/ALCBaselineModellingPresenter.h | 8 +-
.../Muon/ALCBaselineModellingView.cpp | 6 +-
.../Muon/ALCBaselineModellingView.h | 8 +-
.../Muon/ALCBaselineModellingView.ui | 2 +-
.../Muon/ALCDataLoadingPresenter.cpp | 10 +-
.../Muon/ALCDataLoadingPresenter.h | 6 +-
.../Muon/ALCDataLoadingView.cpp | 8 +-
.../Muon/ALCDataLoadingView.h | 8 +-
.../Muon/ALCDataLoadingView.ui | 4 +-
.../scientific_interfaces}/Muon/ALCHelper.cpp | 2 +-
.../scientific_interfaces}/Muon/ALCHelper.h | 0
.../Muon/ALCInterface.cpp | 18 +--
.../Muon/ALCInterface.h | 6 +-
.../Muon/ALCInterface.ui | 0
.../Muon/ALCLatestFileFinder.cpp | 2 +-
.../Muon/ALCLatestFileFinder.h | 4 +-
.../Muon/ALCPeakFittingModel.cpp | 4 +-
.../Muon/ALCPeakFittingModel.h | 6 +-
.../Muon/ALCPeakFittingPresenter.cpp | 4 +-
.../Muon/ALCPeakFittingPresenter.h | 8 +-
.../Muon/ALCPeakFittingView.cpp | 6 +-
.../Muon/ALCPeakFittingView.h | 8 +-
.../Muon/ALCPeakFittingView.ui | 2 +-
qt/scientific_interfaces/Muon/CMakeLists.txt | 140 ++++++++++++++++++
qt/scientific_interfaces/Muon/DllConfig.h | 39 +++++
.../Muon/IALCBaselineModellingModel.h | 4 +-
.../Muon/IALCBaselineModellingView.h | 4 +-
.../Muon/IALCDataLoadingView.h | 4 +-
.../Muon/IALCPeakFittingModel.h | 4 +-
.../Muon/IALCPeakFittingView.h | 4 +-
.../Muon/IO_MuonGrouping.cpp | 4 +-
.../Muon/IO_MuonGrouping.h | 4 +-
.../Muon/MuonAnalysis.cpp | 26 ++--
.../Muon/MuonAnalysis.h | 12 +-
.../Muon/MuonAnalysis.ui | 8 +-
.../Muon/MuonAnalysisDataLoader.cpp | 4 +-
.../Muon/MuonAnalysisDataLoader.h | 6 +-
.../Muon/MuonAnalysisFitDataPresenter.cpp | 8 +-
.../Muon/MuonAnalysisFitDataPresenter.h | 14 +-
.../Muon/MuonAnalysisFitDataTab.cpp | 6 +-
.../Muon/MuonAnalysisFitDataTab.h | 2 +-
.../Muon/MuonAnalysisFitFunctionPresenter.cpp | 4 +-
.../Muon/MuonAnalysisFitFunctionPresenter.h | 10 +-
.../Muon/MuonAnalysisHelper.cpp | 2 +-
.../Muon/MuonAnalysisHelper.h | 50 +++----
.../Muon/MuonAnalysisOptionTab.cpp | 6 +-
.../Muon/MuonAnalysisOptionTab.h | 2 +-
.../Muon/MuonAnalysisResultTableCreator.cpp | 4 +-
.../Muon/MuonAnalysisResultTableCreator.h | 4 +-
.../Muon/MuonAnalysisResultTableTab.cpp | 14 +-
.../Muon/MuonAnalysisResultTableTab.h | 0
.../Muon/MuonSequentialFitDialog.cpp | 6 +-
.../Muon/MuonSequentialFitDialog.h | 8 +-
.../Muon/MuonSequentialFitDialog.ui | 2 +-
.../Muon/PrecompiledHeader.h | 20 +++
.../icons/CustomInterfacesIcons.qrc | 0
.../icons/export-all-plots.png | Bin
.../icons/export-plot.png | Bin
.../scientific_interfaces}/icons/panning.png | Bin
.../scientific_interfaces}/icons/range.png | Bin
.../scientific_interfaces}/icons/zoom.png | Bin
.../test/ALCBaselineModellingModelTest.h | 0
.../test/ALCBaselineModellingPresenterTest.h | 0
.../test/ALCDataLoadingPresenterTest.h | 0
.../test/ALCLatestFileFinderTest.h | 0
.../test/ALCPeakFittingModelTest.h | 0
.../test/ALCPeakFittingPresenterTest.h | 0
qt/scientific_interfaces/test/CMakeLists.txt | 67 +++++++++
.../test/EnggDiffFittingPresenterTest.h | 0
.../test/EnggDiffFittingViewMock.h | 0
.../test/EnggDiffractionPresenterTest.h | 0
.../test/EnggDiffractionViewMock.h | 0
.../test/IO_MuonGroupingTest.h | 0
.../test/MDFLogValueFinderTest.h | 0
.../test/MeasurementItemTest.h | 0
.../test/MuonAnalysisDataLoaderTest.h | 0
.../test/MuonAnalysisFitDataPresenterTest.h | 0
.../MuonAnalysisFitFunctionPresenterTest.h | 0
.../test/MuonAnalysisHelperTest.h | 0
.../test/MuonAnalysisResultTableCreatorTest.h | 0
.../test/ReflDataProcessorPresenterTest.h | 0
.../test/ReflEventPresenterTest.h | 0
.../test/ReflEventTabPresenterTest.h | 0
.../test/ReflLegacyTransferStrategyTest.h | 0
.../test/ReflMainWindowPresenterTest.h | 0
.../test/ReflMeasureTransferStrategyTest.h | 0
.../test/ReflMockObjects.h | 0
.../test/ReflNexusMeasurementItemSourceTest.h | 0
.../test/ReflRunsTabPresenterTest.h | 0
.../test/ReflSaveTabPresenterTest.h | 0
.../test/ReflSettingsPresenterTest.h | 0
.../test/ReflSettingsTabPresenterTest.h | 0
.../test/UserInputValidatorTest.h | 0
417 files changed, 463 insertions(+), 254 deletions(-)
delete mode 100644 MantidQt/CustomInterfaces/test/CMakeLists.txt
create mode 100644 qt/scientific_interfaces/CMakeLists.txt
rename {MantidQt/CustomInterfaces => qt/scientific_interfaces}/CreateInterfaceTemplate.py (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/DynamicPDF/inc}/DynamicPDF/DPDFBackgroundRemover.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/DynamicPDF/inc}/DynamicPDF/DPDFBackgroundRemover.ui (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/DynamicPDF/inc}/DynamicPDF/DPDFDisplayControl.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/DynamicPDF/inc}/DynamicPDF/DPDFFitControl.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/DynamicPDF/inc}/DynamicPDF/DPDFFitControl.ui (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/DynamicPDF/inc}/DynamicPDF/DPDFFitOptionsBrowser.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/DynamicPDF/inc}/DynamicPDF/DPDFFourierTransform.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/DynamicPDF/inc}/DynamicPDF/DPDFFourierTransform.ui (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/DynamicPDF/inc}/DynamicPDF/DPDFInputDataControl.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/DynamicPDF/inc}/DynamicPDF/DisplayCurveFitTest.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/DynamicPDF/inc}/DynamicPDF/DisplayCurveFitTest.ui (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/DynamicPDF/inc}/DynamicPDF/SliceSelector.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/DynamicPDF/inc}/DynamicPDF/SliceSelector.ui (100%)
rename {MantidQt/CustomInterfaces/src/DynamicPDF => qt/scientific_interfaces/DynamicPDF/src}/DPDFBackgroundRemover.cpp (100%)
rename {MantidQt/CustomInterfaces/src/DynamicPDF => qt/scientific_interfaces/DynamicPDF/src}/DPDFDisplayControl.cpp (100%)
rename {MantidQt/CustomInterfaces/src/DynamicPDF => qt/scientific_interfaces/DynamicPDF/src}/DPDFFitControl.cpp (100%)
rename {MantidQt/CustomInterfaces/src/DynamicPDF => qt/scientific_interfaces/DynamicPDF/src}/DPDFFitOptionsBrowser.cpp (100%)
rename {MantidQt/CustomInterfaces/src/DynamicPDF => qt/scientific_interfaces/DynamicPDF/src}/DPDFFourierTransform.cpp (100%)
rename {MantidQt/CustomInterfaces/src/DynamicPDF => qt/scientific_interfaces/DynamicPDF/src}/DPDFInputDataControl.cpp (100%)
rename {MantidQt/CustomInterfaces/src/DynamicPDF => qt/scientific_interfaces/DynamicPDF/src}/DisplayCurveFitTest.cpp (100%)
rename {MantidQt/CustomInterfaces/src/DynamicPDF => qt/scientific_interfaces/DynamicPDF/src}/SliceSelector.cpp (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/EnggDiffraction/inc}/EnggDiffraction/EnggDiffCalibSettings.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/EnggDiffraction/inc}/EnggDiffraction/EnggDiffFittingPresWorker.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/EnggDiffraction/inc}/EnggDiffraction/EnggDiffFittingPresenter.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/EnggDiffraction/inc}/EnggDiffraction/EnggDiffFittingViewQtWidget.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/EnggDiffraction/inc}/EnggDiffraction/EnggDiffractionPresWorker.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/EnggDiffraction/inc}/EnggDiffraction/EnggDiffractionPresenter.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/EnggDiffraction/inc}/EnggDiffraction/EnggDiffractionQtGUI.ui (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/EnggDiffraction/inc}/EnggDiffraction/EnggDiffractionQtTabCalib.ui (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/EnggDiffraction/inc}/EnggDiffraction/EnggDiffractionQtTabFitting.ui (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/EnggDiffraction/inc}/EnggDiffraction/EnggDiffractionQtTabFocus.ui (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/EnggDiffraction/inc}/EnggDiffraction/EnggDiffractionQtTabPreproc.ui (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/EnggDiffraction/inc}/EnggDiffraction/EnggDiffractionQtTabSettings.ui (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/EnggDiffraction/inc}/EnggDiffraction/EnggDiffractionViewQtGUI.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/EnggDiffraction/inc}/EnggDiffraction/IEnggDiffFittingPresenter.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/EnggDiffraction/inc}/EnggDiffraction/IEnggDiffFittingView.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/EnggDiffraction/inc}/EnggDiffraction/IEnggDiffractionCalibration.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/EnggDiffraction/inc}/EnggDiffraction/IEnggDiffractionParam.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/EnggDiffraction/inc}/EnggDiffraction/IEnggDiffractionPresenter.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/EnggDiffraction/inc}/EnggDiffraction/IEnggDiffractionPythonRunner.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/EnggDiffraction/inc}/EnggDiffraction/IEnggDiffractionSettings.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/EnggDiffraction/inc}/EnggDiffraction/IEnggDiffractionUserMsg.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/EnggDiffraction/inc}/EnggDiffraction/IEnggDiffractionView.h (100%)
rename {MantidQt/CustomInterfaces/src/EnggDiffraction => qt/scientific_interfaces/EnggDiffraction/src}/EnggDiffFittingPresenter.cpp (100%)
rename {MantidQt/CustomInterfaces/src/EnggDiffraction => qt/scientific_interfaces/EnggDiffraction/src}/EnggDiffFittingViewQtWidget.cpp (100%)
rename {MantidQt/CustomInterfaces/src/EnggDiffraction => qt/scientific_interfaces/EnggDiffraction/src}/EnggDiffractionPresenter.cpp (100%)
rename {MantidQt/CustomInterfaces/src/EnggDiffraction => qt/scientific_interfaces/EnggDiffraction/src}/EnggDiffractionViewQtGUI.cpp (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/General/inc/General}/Background.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/General/inc/General}/DataComparison.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/General/inc/General}/DataComparison.ui (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/General/inc/General}/DirectConvertToEnergy.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/General/inc/General}/DirectConvertToEnergy.ui (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/General/inc/General}/DllConfig.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/General/inc/General}/Homer.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/General/inc/General}/IReflPresenter.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/General/inc/General}/IReflSearcher.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/General/inc/General}/LatticePresenter.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/General/inc/General}/LatticeView.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/General/inc/General}/MantidEV.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/General/inc/General}/MantidEV.ui (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/General/inc/General}/MantidEVWorker.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/General/inc/General}/PrecompiledHeader.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/General/inc/General}/ProjectSave.ui (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/General/inc/General}/ReflMainWidget.ui (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/General/inc/General}/ReflOptionsDialog.ui (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/General/inc/General}/ReflWindow.ui (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/General/inc/General}/SampleTransmission.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/General/inc/General}/SampleTransmission.ui (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/General/inc/General}/StepScan.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/General/inc/General}/StepScan.ui (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/General/inc/General}/Updateable.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/General/inc/General}/UserInputValidator.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/General/inc/General}/deltaECalc.h (100%)
rename {MantidQt/CustomInterfaces => qt/scientific_interfaces/General}/src/DataComparison.cpp (100%)
rename {MantidQt/CustomInterfaces => qt/scientific_interfaces/General}/src/DirectConvertToEnergy.cpp (100%)
rename {MantidQt/CustomInterfaces => qt/scientific_interfaces/General}/src/Homer.cpp (100%)
rename {MantidQt/CustomInterfaces => qt/scientific_interfaces/General}/src/LatticePresenter.cpp (100%)
rename {MantidQt/CustomInterfaces => qt/scientific_interfaces/General}/src/MantidEV.cpp (100%)
rename {MantidQt/CustomInterfaces => qt/scientific_interfaces/General}/src/MantidEVWorker.cpp (100%)
rename {MantidQt/CustomInterfaces => qt/scientific_interfaces/General}/src/SampleTransmission.cpp (100%)
rename {MantidQt/CustomInterfaces => qt/scientific_interfaces/General}/src/StepScan.cpp (100%)
rename {MantidQt/CustomInterfaces => qt/scientific_interfaces/General}/src/UserInputValidator.cpp (100%)
rename {MantidQt/CustomInterfaces => qt/scientific_interfaces/General}/src/background.cpp (100%)
rename {MantidQt/CustomInterfaces => qt/scientific_interfaces/General}/src/deltaECalc.cpp (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld}/IReflEventPresenter.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld}/IReflEventTabPresenter.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld}/IReflEventView.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld}/IReflMainWindowPresenter.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld}/IReflMainWindowView.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld}/IReflRunsTabPresenter.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld}/IReflRunsTabView.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld}/IReflSaveTabPresenter.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld}/IReflSaveTabView.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld}/IReflSearcher.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld}/IReflSettingsPresenter.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld}/IReflSettingsTabPresenter.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld}/IReflSettingsView.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld}/MeasurementItem.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld}/QtReflEventTabView.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld}/QtReflEventView.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld}/QtReflMainWindowView.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld}/QtReflRunsTabView.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld}/QtReflSaveTabView.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld}/QtReflSettingsTabView.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld}/QtReflSettingsView.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld}/ReflCatalogSearcher.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld}/ReflDataProcessorMainPresenter.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld}/ReflDataProcessorPresenter.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld}/ReflEventPresenter.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld}/ReflEventTabPresenter.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld}/ReflEventTabWidget.ui (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld}/ReflEventWidget.ui (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld}/ReflGenericDataProcessorPresenterFactory.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld}/ReflLegacyTransferStrategy.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld}/ReflMainWindowPresenter.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld}/ReflMainWindowWidget.ui (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld}/ReflMeasureTransferStrategy.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld}/ReflMeasurementItemSource.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld}/ReflNexusMeasurementItemSource.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld}/ReflRunsTabPresenter.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld}/ReflRunsTabWidget.ui (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld}/ReflSaveTabPresenter.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld}/ReflSaveTabWidget.ui (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld}/ReflSearchModel.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld}/ReflSettingsPresenter.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld}/ReflSettingsTabPresenter.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld}/ReflSettingsTabWidget.ui (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld}/ReflSettingsWidget.ui (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld}/ReflTableSchema.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld}/ReflTransferStrategy.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld}/ReflWindow.ui (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld}/TransferResults.h (100%)
rename {MantidQt/CustomInterfaces/src/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/src}/MeasurementItem.cpp (100%)
rename {MantidQt/CustomInterfaces/src/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/src}/QtReflEventTabView.cpp (100%)
rename {MantidQt/CustomInterfaces/src/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/src}/QtReflEventView.cpp (100%)
rename {MantidQt/CustomInterfaces/src/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/src}/QtReflMainWindowView.cpp (100%)
rename {MantidQt/CustomInterfaces/src/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/src}/QtReflRunsTabView.cpp (100%)
rename {MantidQt/CustomInterfaces/src/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/src}/QtReflSaveTabView.cpp (100%)
rename {MantidQt/CustomInterfaces/src/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/src}/QtReflSettingsTabView.cpp (100%)
rename {MantidQt/CustomInterfaces/src/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/src}/QtReflSettingsView.cpp (100%)
rename {MantidQt/CustomInterfaces/src/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/src}/ReflCatalogSearcher.cpp (100%)
rename {MantidQt/CustomInterfaces/src/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/src}/ReflDataProcessorPresenter.cpp (100%)
rename {MantidQt/CustomInterfaces/src/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/src}/ReflEventPresenter.cpp (100%)
rename {MantidQt/CustomInterfaces/src/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/src}/ReflEventTabPresenter.cpp (100%)
rename {MantidQt/CustomInterfaces/src/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/src}/ReflGenericDataProcessorPresenterFactory.cpp (100%)
rename {MantidQt/CustomInterfaces/src/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/src}/ReflLegacyTransferStrategy.cpp (100%)
rename {MantidQt/CustomInterfaces/src/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/src}/ReflMainWindowPresenter.cpp (100%)
rename {MantidQt/CustomInterfaces/src/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/src}/ReflMeasureTransferStrategy.cpp (100%)
rename {MantidQt/CustomInterfaces/src/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/src}/ReflNexusMeasurementItemSource.cpp (100%)
rename {MantidQt/CustomInterfaces/src/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/src}/ReflRunsTabPresenter.cpp (100%)
rename {MantidQt/CustomInterfaces/src/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/src}/ReflSaveTabPresenter.cpp (100%)
rename {MantidQt/CustomInterfaces/src/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/src}/ReflSearchModel.cpp (100%)
rename {MantidQt/CustomInterfaces/src/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/src}/ReflSettingsPresenter.cpp (100%)
rename {MantidQt/CustomInterfaces/src/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/src}/ReflSettingsTabPresenter.cpp (100%)
rename {MantidQt/CustomInterfaces/src/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/src}/ReflTableSchema.cpp (100%)
rename {MantidQt/CustomInterfaces/src/Reflectometry => qt/scientific_interfaces/ISISReflectometryOld/src}/TransferResults.cpp (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/ISISSANS/inc/ISISSANS}/SANSAddFiles.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/ISISSANS/inc/ISISSANS}/SANSBackgroundCorrectionSettings.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/ISISSANS/inc/ISISSANS}/SANSBackgroundCorrectionWidget.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/ISISSANS/inc/ISISSANS}/SANSBackgroundCorrectionWidget.ui (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/ISISSANS/inc/ISISSANS}/SANSConstants.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/ISISSANS/inc/ISISSANS}/SANSDiagnostics.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/ISISSANS/inc/ISISSANS}/SANSEventSlicing.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/ISISSANS/inc/ISISSANS}/SANSEventSlicing.ui (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/ISISSANS/inc/ISISSANS}/SANSPlotSpecial.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/ISISSANS/inc/ISISSANS}/SANSPlotSpecial.ui (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/ISISSANS/inc/ISISSANS}/SANSRunWindow.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/ISISSANS/inc/ISISSANS}/SANSRunWindow.ui (100%)
rename {MantidQt/CustomInterfaces => qt/scientific_interfaces/ISISSANS}/src/SANSAddFiles.cpp (100%)
rename {MantidQt/CustomInterfaces => qt/scientific_interfaces/ISISSANS}/src/SANSBackgroundCorrectionSettings.cpp (100%)
rename {MantidQt/CustomInterfaces => qt/scientific_interfaces/ISISSANS}/src/SANSBackgroundCorrectionWidget.cpp (100%)
rename {MantidQt/CustomInterfaces => qt/scientific_interfaces/ISISSANS}/src/SANSConstants.cpp (100%)
rename {MantidQt/CustomInterfaces => qt/scientific_interfaces/ISISSANS}/src/SANSDiagnostics.cpp (100%)
rename {MantidQt/CustomInterfaces => qt/scientific_interfaces/ISISSANS}/src/SANSEventSlicing.cpp (100%)
rename {MantidQt/CustomInterfaces => qt/scientific_interfaces/ISISSANS}/src/SANSPlotSpecial.cpp (100%)
rename {MantidQt/CustomInterfaces => qt/scientific_interfaces/ISISSANS}/src/SANSRunWindow.cpp (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/AbsorptionCorrections.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/AbsorptionCorrections.ui (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/ApplyPaalmanPings.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/ApplyPaalmanPings.ui (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/CalculatePaalmanPings.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/CalculatePaalmanPings.ui (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/ContainerSubtraction.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/ContainerSubtraction.ui (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/ConvFit.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/ConvFit.ui (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/CorrectionsTab.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/DensityOfStates.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/DensityOfStates.ui (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/Elwin.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/Elwin.ui (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/ILLCalibration.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/ILLCalibration.ui (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/ILLEnergyTransfer.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/ILLEnergyTransfer.ui (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/ISISCalibration.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/ISISCalibration.ui (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/ISISDiagnostics.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/ISISDiagnostics.ui (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/ISISEnergyTransfer.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/ISISEnergyTransfer.ui (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/IndirectBayes.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/IndirectBayes.ui (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/IndirectBayesTab.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/IndirectCorrections.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/IndirectCorrections.ui (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/IndirectDataAnalysis.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/IndirectDataAnalysis.ui (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/IndirectDataAnalysisTab.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/IndirectDataReduction.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/IndirectDataReduction.ui (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/IndirectDataReductionTab.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/IndirectDiffractionReduction.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/IndirectDiffractionReduction.ui (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/IndirectLoadILL.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/IndirectLoadILL.ui (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/IndirectMolDyn.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/IndirectMolDyn.ui (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/IndirectMoments.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/IndirectMoments.ui (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/IndirectSassena.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/IndirectSassena.ui (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/IndirectSimulation.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/IndirectSimulation.ui (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/IndirectSimulationTab.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/IndirectSqw.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/IndirectSqw.ui (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/IndirectSymmetrise.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/IndirectSymmetrise.ui (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/IndirectTab.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/IndirectTools.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/IndirectTools.ui (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/IndirectToolsTab.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/IndirectTransmission.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/IndirectTransmission.ui (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/IndirectTransmissionCalc.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/IndirectTransmissionCalc.ui (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/Iqt.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/Iqt.ui (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/IqtFit.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/IqtFit.ui (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/JumpFit.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/JumpFit.ui (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/MSDFit.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/MSDFit.ui (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/Quasi.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/Quasi.ui (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/ResNorm.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/ResNorm.ui (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/Stretch.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/Indirect/inc}/Indirect/Stretch.ui (100%)
rename {MantidQt/CustomInterfaces/src/Indirect => qt/scientific_interfaces/Indirect/src}/AbsorptionCorrections.cpp (100%)
rename {MantidQt/CustomInterfaces/src/Indirect => qt/scientific_interfaces/Indirect/src}/ApplyPaalmanPings.cpp (100%)
rename {MantidQt/CustomInterfaces/src/Indirect => qt/scientific_interfaces/Indirect/src}/CalculatePaalmanPings.cpp (100%)
rename {MantidQt/CustomInterfaces/src/Indirect => qt/scientific_interfaces/Indirect/src}/ContainerSubtraction.cpp (100%)
rename {MantidQt/CustomInterfaces/src/Indirect => qt/scientific_interfaces/Indirect/src}/ConvFit.cpp (100%)
rename {MantidQt/CustomInterfaces/src/Indirect => qt/scientific_interfaces/Indirect/src}/CorrectionsTab.cpp (100%)
rename {MantidQt/CustomInterfaces/src/Indirect => qt/scientific_interfaces/Indirect/src}/DensityOfStates.cpp (100%)
rename {MantidQt/CustomInterfaces/src/Indirect => qt/scientific_interfaces/Indirect/src}/Elwin.cpp (100%)
rename {MantidQt/CustomInterfaces/src/Indirect => qt/scientific_interfaces/Indirect/src}/ILLCalibration.cpp (100%)
rename {MantidQt/CustomInterfaces/src/Indirect => qt/scientific_interfaces/Indirect/src}/ILLEnergyTransfer.cpp (100%)
rename {MantidQt/CustomInterfaces/src/Indirect => qt/scientific_interfaces/Indirect/src}/ISISCalibration.cpp (100%)
rename {MantidQt/CustomInterfaces/src/Indirect => qt/scientific_interfaces/Indirect/src}/ISISDiagnostics.cpp (100%)
rename {MantidQt/CustomInterfaces/src/Indirect => qt/scientific_interfaces/Indirect/src}/ISISEnergyTransfer.cpp (100%)
rename {MantidQt/CustomInterfaces/src/Indirect => qt/scientific_interfaces/Indirect/src}/IndirectBayes.cpp (100%)
rename {MantidQt/CustomInterfaces/src/Indirect => qt/scientific_interfaces/Indirect/src}/IndirectBayesTab.cpp (100%)
rename {MantidQt/CustomInterfaces/src/Indirect => qt/scientific_interfaces/Indirect/src}/IndirectCorrections.cpp (100%)
rename {MantidQt/CustomInterfaces/src/Indirect => qt/scientific_interfaces/Indirect/src}/IndirectDataAnalysis.cpp (100%)
rename {MantidQt/CustomInterfaces/src/Indirect => qt/scientific_interfaces/Indirect/src}/IndirectDataAnalysisTab.cpp (100%)
rename {MantidQt/CustomInterfaces/src/Indirect => qt/scientific_interfaces/Indirect/src}/IndirectDataReduction.cpp (100%)
rename {MantidQt/CustomInterfaces/src/Indirect => qt/scientific_interfaces/Indirect/src}/IndirectDataReductionTab.cpp (100%)
rename {MantidQt/CustomInterfaces/src/Indirect => qt/scientific_interfaces/Indirect/src}/IndirectDiffractionReduction.cpp (100%)
rename {MantidQt/CustomInterfaces/src/Indirect => qt/scientific_interfaces/Indirect/src}/IndirectLoadILL.cpp (100%)
rename {MantidQt/CustomInterfaces/src/Indirect => qt/scientific_interfaces/Indirect/src}/IndirectMolDyn.cpp (100%)
rename {MantidQt/CustomInterfaces/src/Indirect => qt/scientific_interfaces/Indirect/src}/IndirectMoments.cpp (100%)
rename {MantidQt/CustomInterfaces/src/Indirect => qt/scientific_interfaces/Indirect/src}/IndirectSassena.cpp (100%)
rename {MantidQt/CustomInterfaces/src/Indirect => qt/scientific_interfaces/Indirect/src}/IndirectSimulation.cpp (100%)
rename {MantidQt/CustomInterfaces/src/Indirect => qt/scientific_interfaces/Indirect/src}/IndirectSimulationTab.cpp (100%)
rename {MantidQt/CustomInterfaces/src/Indirect => qt/scientific_interfaces/Indirect/src}/IndirectSqw.cpp (100%)
rename {MantidQt/CustomInterfaces/src/Indirect => qt/scientific_interfaces/Indirect/src}/IndirectSymmetrise.cpp (100%)
rename {MantidQt/CustomInterfaces/src/Indirect => qt/scientific_interfaces/Indirect/src}/IndirectTab.cpp (100%)
rename {MantidQt/CustomInterfaces/src/Indirect => qt/scientific_interfaces/Indirect/src}/IndirectTools.cpp (100%)
rename {MantidQt/CustomInterfaces/src/Indirect => qt/scientific_interfaces/Indirect/src}/IndirectToolsTab.cpp (100%)
rename {MantidQt/CustomInterfaces/src/Indirect => qt/scientific_interfaces/Indirect/src}/IndirectTransmission.cpp (100%)
rename {MantidQt/CustomInterfaces/src/Indirect => qt/scientific_interfaces/Indirect/src}/IndirectTransmissionCalc.cpp (100%)
rename {MantidQt/CustomInterfaces/src/Indirect => qt/scientific_interfaces/Indirect/src}/Iqt.cpp (100%)
rename {MantidQt/CustomInterfaces/src/Indirect => qt/scientific_interfaces/Indirect/src}/IqtFit.cpp (100%)
rename {MantidQt/CustomInterfaces/src/Indirect => qt/scientific_interfaces/Indirect/src}/JumpFit.cpp (100%)
rename {MantidQt/CustomInterfaces/src/Indirect => qt/scientific_interfaces/Indirect/src}/MSDFit.cpp (100%)
rename {MantidQt/CustomInterfaces/src/Indirect => qt/scientific_interfaces/Indirect/src}/Quasi.cpp (100%)
rename {MantidQt/CustomInterfaces/src/Indirect => qt/scientific_interfaces/Indirect/src}/ResNorm.cpp (100%)
rename {MantidQt/CustomInterfaces/src/Indirect => qt/scientific_interfaces/Indirect/src}/Stretch.cpp (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/MultiDatasetFit/inc}/MultiDatasetFit/EditLocalParameterDialog.ui (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/MultiDatasetFit/inc}/MultiDatasetFit/MDFAddWorkspaceDialog.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/MultiDatasetFit/inc}/MultiDatasetFit/MDFAddWorkspaceDialog.ui (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/MultiDatasetFit/inc}/MultiDatasetFit/MDFDataController.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/MultiDatasetFit/inc}/MultiDatasetFit/MDFDatasetPlotData.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/MultiDatasetFit/inc}/MultiDatasetFit/MDFEditLocalParameterDialog.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/MultiDatasetFit/inc}/MultiDatasetFit/MDFFunctionPlotData.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/MultiDatasetFit/inc}/MultiDatasetFit/MDFLocalParameterEditor.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/MultiDatasetFit/inc}/MultiDatasetFit/MDFLocalParameterItemDelegate.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/MultiDatasetFit/inc}/MultiDatasetFit/MDFLogValueFinder.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/MultiDatasetFit/inc}/MultiDatasetFit/MDFPlotController.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/MultiDatasetFit/inc}/MultiDatasetFit/MultiDatasetFit.h (100%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces/MultiDatasetFit/inc}/MultiDatasetFit/MultiDatasetFit.ui (100%)
rename {MantidQt/CustomInterfaces/src/MultiDatasetFit => qt/scientific_interfaces/MultiDatasetFit/src}/MDFAddWorkspaceDialog.cpp (100%)
rename {MantidQt/CustomInterfaces/src/MultiDatasetFit => qt/scientific_interfaces/MultiDatasetFit/src}/MDFDataController.cpp (100%)
rename {MantidQt/CustomInterfaces/src/MultiDatasetFit => qt/scientific_interfaces/MultiDatasetFit/src}/MDFDatasetPlotData.cpp (100%)
rename {MantidQt/CustomInterfaces/src/MultiDatasetFit => qt/scientific_interfaces/MultiDatasetFit/src}/MDFEditLocalParameterDialog.cpp (100%)
rename {MantidQt/CustomInterfaces/src/MultiDatasetFit => qt/scientific_interfaces/MultiDatasetFit/src}/MDFFunctionPlotData.cpp (100%)
rename {MantidQt/CustomInterfaces/src/MultiDatasetFit => qt/scientific_interfaces/MultiDatasetFit/src}/MDFLocalParameterEditor.cpp (100%)
rename {MantidQt/CustomInterfaces/src/MultiDatasetFit => qt/scientific_interfaces/MultiDatasetFit/src}/MDFLocalParameterItemDelegate.cpp (100%)
rename {MantidQt/CustomInterfaces/src/MultiDatasetFit => qt/scientific_interfaces/MultiDatasetFit/src}/MDFLogValueFinder.cpp (100%)
rename {MantidQt/CustomInterfaces/src/MultiDatasetFit => qt/scientific_interfaces/MultiDatasetFit/src}/MDFPlotController.cpp (100%)
rename {MantidQt/CustomInterfaces/src/MultiDatasetFit => qt/scientific_interfaces/MultiDatasetFit/src}/MultiDatasetFit.cpp (100%)
rename {MantidQt/CustomInterfaces/src => qt/scientific_interfaces}/Muon/ALCBaselineModellingModel.cpp (98%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces}/Muon/ALCBaselineModellingModel.h (95%)
rename {MantidQt/CustomInterfaces/src => qt/scientific_interfaces}/Muon/ALCBaselineModellingPresenter.cpp (97%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces}/Muon/ALCBaselineModellingPresenter.h (90%)
rename {MantidQt/CustomInterfaces/src => qt/scientific_interfaces}/Muon/ALCBaselineModellingView.cpp (98%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces}/Muon/ALCBaselineModellingView.h (94%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces}/Muon/ALCBaselineModellingView.ui (98%)
rename {MantidQt/CustomInterfaces/src => qt/scientific_interfaces}/Muon/ALCDataLoadingPresenter.cpp (97%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces}/Muon/ALCDataLoadingPresenter.h (94%)
rename {MantidQt/CustomInterfaces/src => qt/scientific_interfaces}/Muon/ALCDataLoadingView.cpp (97%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces}/Muon/ALCDataLoadingView.h (94%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces}/Muon/ALCDataLoadingView.ui (99%)
rename {MantidQt/CustomInterfaces/src => qt/scientific_interfaces}/Muon/ALCHelper.cpp (98%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces}/Muon/ALCHelper.h (100%)
rename {MantidQt/CustomInterfaces/src => qt/scientific_interfaces}/Muon/ALCInterface.cpp (94%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces}/Muon/ALCInterface.h (93%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces}/Muon/ALCInterface.ui (100%)
rename {MantidQt/CustomInterfaces/src => qt/scientific_interfaces}/Muon/ALCLatestFileFinder.cpp (97%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces}/Muon/ALCLatestFileFinder.h (94%)
rename {MantidQt/CustomInterfaces/src => qt/scientific_interfaces}/Muon/ALCPeakFittingModel.cpp (94%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces}/Muon/ALCPeakFittingModel.h (94%)
rename {MantidQt/CustomInterfaces/src => qt/scientific_interfaces}/Muon/ALCPeakFittingPresenter.cpp (97%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces}/Muon/ALCPeakFittingPresenter.h (90%)
rename {MantidQt/CustomInterfaces/src => qt/scientific_interfaces}/Muon/ALCPeakFittingView.cpp (96%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces}/Muon/ALCPeakFittingView.h (93%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces}/Muon/ALCPeakFittingView.ui (98%)
create mode 100644 qt/scientific_interfaces/Muon/CMakeLists.txt
create mode 100644 qt/scientific_interfaces/Muon/DllConfig.h
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces}/Muon/IALCBaselineModellingModel.h (95%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces}/Muon/IALCBaselineModellingView.h (97%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces}/Muon/IALCDataLoadingView.h (97%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces}/Muon/IALCPeakFittingModel.h (94%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces}/Muon/IALCPeakFittingView.h (97%)
rename {MantidQt/CustomInterfaces/src => qt/scientific_interfaces}/Muon/IO_MuonGrouping.cpp (98%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces}/Muon/IO_MuonGrouping.h (95%)
rename {MantidQt/CustomInterfaces/src => qt/scientific_interfaces}/Muon/MuonAnalysis.cpp (99%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces}/Muon/MuonAnalysis.h (98%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces}/Muon/MuonAnalysis.ui (99%)
rename {MantidQt/CustomInterfaces/src => qt/scientific_interfaces}/Muon/MuonAnalysisDataLoader.cpp (99%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces}/Muon/MuonAnalysisDataLoader.h (96%)
rename {MantidQt/CustomInterfaces/src => qt/scientific_interfaces}/Muon/MuonAnalysisFitDataPresenter.cpp (99%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces}/Muon/MuonAnalysisFitDataPresenter.h (95%)
rename {MantidQt/CustomInterfaces/src => qt/scientific_interfaces}/Muon/MuonAnalysisFitDataTab.cpp (94%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces}/Muon/MuonAnalysisFitDataTab.h (97%)
rename {MantidQt/CustomInterfaces/src => qt/scientific_interfaces}/Muon/MuonAnalysisFitFunctionPresenter.cpp (98%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces}/Muon/MuonAnalysisFitFunctionPresenter.h (92%)
rename {MantidQt/CustomInterfaces/src => qt/scientific_interfaces}/Muon/MuonAnalysisHelper.cpp (99%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces}/Muon/MuonAnalysisHelper.h (81%)
rename {MantidQt/CustomInterfaces/src => qt/scientific_interfaces}/Muon/MuonAnalysisOptionTab.cpp (98%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces}/Muon/MuonAnalysisOptionTab.h (98%)
rename {MantidQt/CustomInterfaces/src => qt/scientific_interfaces}/Muon/MuonAnalysisResultTableCreator.cpp (99%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces}/Muon/MuonAnalysisResultTableCreator.h (97%)
rename {MantidQt/CustomInterfaces/src => qt/scientific_interfaces}/Muon/MuonAnalysisResultTableTab.cpp (98%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces}/Muon/MuonAnalysisResultTableTab.h (100%)
rename {MantidQt/CustomInterfaces/src => qt/scientific_interfaces}/Muon/MuonSequentialFitDialog.cpp (99%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces}/Muon/MuonSequentialFitDialog.h (94%)
rename {MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces => qt/scientific_interfaces}/Muon/MuonSequentialFitDialog.ui (99%)
create mode 100644 qt/scientific_interfaces/Muon/PrecompiledHeader.h
rename {MantidQt/CustomInterfaces => qt/scientific_interfaces}/icons/CustomInterfacesIcons.qrc (100%)
rename {MantidQt/CustomInterfaces => qt/scientific_interfaces}/icons/export-all-plots.png (100%)
rename {MantidQt/CustomInterfaces => qt/scientific_interfaces}/icons/export-plot.png (100%)
rename {MantidQt/CustomInterfaces => qt/scientific_interfaces}/icons/panning.png (100%)
rename {MantidQt/CustomInterfaces => qt/scientific_interfaces}/icons/range.png (100%)
rename {MantidQt/CustomInterfaces => qt/scientific_interfaces}/icons/zoom.png (100%)
rename {MantidQt/CustomInterfaces => qt/scientific_interfaces}/test/ALCBaselineModellingModelTest.h (100%)
rename {MantidQt/CustomInterfaces => qt/scientific_interfaces}/test/ALCBaselineModellingPresenterTest.h (100%)
rename {MantidQt/CustomInterfaces => qt/scientific_interfaces}/test/ALCDataLoadingPresenterTest.h (100%)
rename {MantidQt/CustomInterfaces => qt/scientific_interfaces}/test/ALCLatestFileFinderTest.h (100%)
rename {MantidQt/CustomInterfaces => qt/scientific_interfaces}/test/ALCPeakFittingModelTest.h (100%)
rename {MantidQt/CustomInterfaces => qt/scientific_interfaces}/test/ALCPeakFittingPresenterTest.h (100%)
create mode 100644 qt/scientific_interfaces/test/CMakeLists.txt
rename {MantidQt/CustomInterfaces => qt/scientific_interfaces}/test/EnggDiffFittingPresenterTest.h (100%)
rename {MantidQt/CustomInterfaces => qt/scientific_interfaces}/test/EnggDiffFittingViewMock.h (100%)
rename {MantidQt/CustomInterfaces => qt/scientific_interfaces}/test/EnggDiffractionPresenterTest.h (100%)
rename {MantidQt/CustomInterfaces => qt/scientific_interfaces}/test/EnggDiffractionViewMock.h (100%)
rename {MantidQt/CustomInterfaces => qt/scientific_interfaces}/test/IO_MuonGroupingTest.h (100%)
rename {MantidQt/CustomInterfaces => qt/scientific_interfaces}/test/MDFLogValueFinderTest.h (100%)
rename {MantidQt/CustomInterfaces => qt/scientific_interfaces}/test/MeasurementItemTest.h (100%)
rename {MantidQt/CustomInterfaces => qt/scientific_interfaces}/test/MuonAnalysisDataLoaderTest.h (100%)
rename {MantidQt/CustomInterfaces => qt/scientific_interfaces}/test/MuonAnalysisFitDataPresenterTest.h (100%)
rename {MantidQt/CustomInterfaces => qt/scientific_interfaces}/test/MuonAnalysisFitFunctionPresenterTest.h (100%)
rename {MantidQt/CustomInterfaces => qt/scientific_interfaces}/test/MuonAnalysisHelperTest.h (100%)
rename {MantidQt/CustomInterfaces => qt/scientific_interfaces}/test/MuonAnalysisResultTableCreatorTest.h (100%)
rename {MantidQt/CustomInterfaces => qt/scientific_interfaces}/test/ReflDataProcessorPresenterTest.h (100%)
rename {MantidQt/CustomInterfaces => qt/scientific_interfaces}/test/ReflEventPresenterTest.h (100%)
rename {MantidQt/CustomInterfaces => qt/scientific_interfaces}/test/ReflEventTabPresenterTest.h (100%)
rename {MantidQt/CustomInterfaces => qt/scientific_interfaces}/test/ReflLegacyTransferStrategyTest.h (100%)
rename {MantidQt/CustomInterfaces => qt/scientific_interfaces}/test/ReflMainWindowPresenterTest.h (100%)
rename {MantidQt/CustomInterfaces => qt/scientific_interfaces}/test/ReflMeasureTransferStrategyTest.h (100%)
rename {MantidQt/CustomInterfaces => qt/scientific_interfaces}/test/ReflMockObjects.h (100%)
rename {MantidQt/CustomInterfaces => qt/scientific_interfaces}/test/ReflNexusMeasurementItemSourceTest.h (100%)
rename {MantidQt/CustomInterfaces => qt/scientific_interfaces}/test/ReflRunsTabPresenterTest.h (100%)
rename {MantidQt/CustomInterfaces => qt/scientific_interfaces}/test/ReflSaveTabPresenterTest.h (100%)
rename {MantidQt/CustomInterfaces => qt/scientific_interfaces}/test/ReflSettingsPresenterTest.h (100%)
rename {MantidQt/CustomInterfaces => qt/scientific_interfaces}/test/ReflSettingsTabPresenterTest.h (100%)
rename {MantidQt/CustomInterfaces => qt/scientific_interfaces}/test/UserInputValidatorTest.h (100%)
diff --git a/MantidPlot/CMakeLists.txt b/MantidPlot/CMakeLists.txt
index e2ca49d3a4f..a0719b2f00e 100644
--- a/MantidPlot/CMakeLists.txt
+++ b/MantidPlot/CMakeLists.txt
@@ -662,7 +662,7 @@ qt4_add_resources ( RES_FILES ${PROJECT_SOURCE_DIR}/images/MantidWidgets.qrc )
qt4_add_resources ( RES_FILES ${PROJECT_SOURCE_DIR}/images//fonts/fonts.qrc )
qt4_add_resources ( RES_FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/icons.qrc )
qt4_add_resources ( RES_FILES ${PROJECT_SOURCE_DIR}/qt/widgets/sliceviewer/icons/SliceViewerIcons.qrc )
-qt4_add_resources ( RES_FILES ${PROJECT_SOURCE_DIR}/MantidQt/CustomInterfaces/icons/CustomInterfacesIcons.qrc )
+qt4_add_resources ( RES_FILES ${PROJECT_SOURCE_DIR}/qt/scientific_interfaces/icons/CustomInterfacesIcons.qrc )
qt4_add_resources ( RES_FILES ${PROJECT_SOURCE_DIR}/qt/paraview_ext/VatesSimpleGui/ViewWidgets/icons/ViewWidgetsIcons.qrc )
###########################################################################
diff --git a/MantidQt/CustomInterfaces/CMakeLists.txt b/MantidQt/CustomInterfaces/CMakeLists.txt
index 55ab9b42e8c..312ef9f0bc5 100644
--- a/MantidQt/CustomInterfaces/CMakeLists.txt
+++ b/MantidQt/CustomInterfaces/CMakeLists.txt
@@ -459,37 +459,6 @@ set ( UI_FILES inc/MantidQtCustomInterfaces/DataComparison.ui
inc/MantidQtCustomInterfaces/StepScan.ui
)
-set ( TEST_FILES
- ALCBaselineModellingModelTest.h
- ALCBaselineModellingPresenterTest.h
- ALCDataLoadingPresenterTest.h
- ALCLatestFileFinderTest.h
- ALCPeakFittingModelTest.h
- ALCPeakFittingPresenterTest.h
- EnggDiffFittingPresenterTest.h
- EnggDiffractionPresenterTest.h
- IO_MuonGroupingTest.h
- MDFLogValueFinderTest.h
- MeasurementItemTest.h
- MuonAnalysisDataLoaderTest.h
- MuonAnalysisFitDataPresenterTest.h
- MuonAnalysisFitFunctionPresenterTest.h
- MuonAnalysisHelperTest.h
- MuonAnalysisResultTableCreatorTest.h
- ReflDataProcessorPresenterTest.h
- ReflEventPresenterTest.h
- ReflEventTabPresenterTest.h
- ReflLegacyTransferStrategyTest.h
- ReflMainWindowPresenterTest.h
- ReflMeasureTransferStrategyTest.h
- ReflNexusMeasurementItemSourceTest.h
- ReflRunsTabPresenterTest.h
- ReflSaveTabPresenterTest.h
- ReflSettingsPresenterTest.h
- ReflSettingsTabPresenterTest.h
- UserInputValidatorTest.h
-)
-
include_directories ( inc )
include_directories ( ../../QtPropertyBrowser/src )
diff --git a/MantidQt/CustomInterfaces/test/CMakeLists.txt b/MantidQt/CustomInterfaces/test/CMakeLists.txt
deleted file mode 100644
index 38d369761c1..00000000000
--- a/MantidQt/CustomInterfaces/test/CMakeLists.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-if ( CXXTEST_FOUND )
- include_directories ( SYSTEM ${CXXTEST_INCLUDE_DIR} ${GMOCK_INCLUDE_DIR} ${GTEST_INCLUDE_DIR} )
-
- include_directories( ../../../Framework/TestHelpers/inc ../../../Framework/DataObjects/inc )
-
- set ( TESTHELPER_SRCS ../../../Framework/TestHelpers/src/ComponentCreationHelper.cpp
- ../../../Framework/TestHelpers/src/InstrumentCreationHelper.cpp
- ../../../Framework/TestHelpers/src/WorkspaceCreationHelper.cpp
- ../../../Framework/TestHelpers/src/ScopedFileHelper.cpp
- ../../../Framework/TestHelpers/src/TearDownWorld.cpp
- )
-
- cxxtest_add_test ( CustomInterfacesTest ${TEST_FILES} ${GMOCK_TEST_FILES} )
- target_link_libraries( CustomInterfacesTest LINK_PRIVATE ${TCMALLOC_LIBRARIES_LINKTIME}
- CustomInterfaces
- MantidWidgets
- API
- DataObjects
- Geometry
- HistogramData
- Kernel
- MantidWidgets
- ${Boost_LIBRARIES}
- ${POCO_LIBRARIES}
- ${QWT_LIBRARIES}
- ${QT_LIBRARIES}
- ${GMOCK_LIBRARIES}
- ${GTEST_LIBRARIES} )
-
- add_dependencies( CustomInterfacesTest MDAlgorithms )
- # Test data
- add_dependencies( CustomInterfacesTest StandardTestData )
- add_dependencies( GUITests CustomInterfacesTest )
- # Add to the 'UnitTests' group in VS
- set_property( TARGET CustomInterfacesTest PROPERTY FOLDER "UnitTests" )
-
-endif ()
diff --git a/qt/CMakeLists.txt b/qt/CMakeLists.txt
index 1eecb4244c5..399234e3112 100644
--- a/qt/CMakeLists.txt
+++ b/qt/CMakeLists.txt
@@ -11,6 +11,7 @@ include_directories ( widgets/common/inc )
include_directories ( ${CMAKE_CURRENT_BINARY_DIR}/widgets/common )
add_subdirectory ( widgets )
add_subdirectory ( python )
+add_subdirectory ( scientific_interfaces )
###########################################################################
# Add a custom target to build all of the MantidQt packages
diff --git a/qt/scientific_interfaces/CMakeLists.txt b/qt/scientific_interfaces/CMakeLists.txt
new file mode 100644
index 00000000000..303bfcdb378
--- /dev/null
+++ b/qt/scientific_interfaces/CMakeLists.txt
@@ -0,0 +1,10 @@
+###########################################################################
+# Now add the packages one-by-one, building up the dependencies as we go
+###########################################################################
+add_subdirectory ( Muon )
+
+###########################################################################
+# Testing
+###########################################################################
+add_subdirectory ( test )
+
diff --git a/MantidQt/CustomInterfaces/CreateInterfaceTemplate.py b/qt/scientific_interfaces/CreateInterfaceTemplate.py
similarity index 100%
rename from MantidQt/CustomInterfaces/CreateInterfaceTemplate.py
rename to qt/scientific_interfaces/CreateInterfaceTemplate.py
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/DynamicPDF/DPDFBackgroundRemover.h b/qt/scientific_interfaces/DynamicPDF/inc/DynamicPDF/DPDFBackgroundRemover.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/DynamicPDF/DPDFBackgroundRemover.h
rename to qt/scientific_interfaces/DynamicPDF/inc/DynamicPDF/DPDFBackgroundRemover.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/DynamicPDF/DPDFBackgroundRemover.ui b/qt/scientific_interfaces/DynamicPDF/inc/DynamicPDF/DPDFBackgroundRemover.ui
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/DynamicPDF/DPDFBackgroundRemover.ui
rename to qt/scientific_interfaces/DynamicPDF/inc/DynamicPDF/DPDFBackgroundRemover.ui
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/DynamicPDF/DPDFDisplayControl.h b/qt/scientific_interfaces/DynamicPDF/inc/DynamicPDF/DPDFDisplayControl.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/DynamicPDF/DPDFDisplayControl.h
rename to qt/scientific_interfaces/DynamicPDF/inc/DynamicPDF/DPDFDisplayControl.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/DynamicPDF/DPDFFitControl.h b/qt/scientific_interfaces/DynamicPDF/inc/DynamicPDF/DPDFFitControl.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/DynamicPDF/DPDFFitControl.h
rename to qt/scientific_interfaces/DynamicPDF/inc/DynamicPDF/DPDFFitControl.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/DynamicPDF/DPDFFitControl.ui b/qt/scientific_interfaces/DynamicPDF/inc/DynamicPDF/DPDFFitControl.ui
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/DynamicPDF/DPDFFitControl.ui
rename to qt/scientific_interfaces/DynamicPDF/inc/DynamicPDF/DPDFFitControl.ui
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/DynamicPDF/DPDFFitOptionsBrowser.h b/qt/scientific_interfaces/DynamicPDF/inc/DynamicPDF/DPDFFitOptionsBrowser.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/DynamicPDF/DPDFFitOptionsBrowser.h
rename to qt/scientific_interfaces/DynamicPDF/inc/DynamicPDF/DPDFFitOptionsBrowser.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/DynamicPDF/DPDFFourierTransform.h b/qt/scientific_interfaces/DynamicPDF/inc/DynamicPDF/DPDFFourierTransform.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/DynamicPDF/DPDFFourierTransform.h
rename to qt/scientific_interfaces/DynamicPDF/inc/DynamicPDF/DPDFFourierTransform.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/DynamicPDF/DPDFFourierTransform.ui b/qt/scientific_interfaces/DynamicPDF/inc/DynamicPDF/DPDFFourierTransform.ui
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/DynamicPDF/DPDFFourierTransform.ui
rename to qt/scientific_interfaces/DynamicPDF/inc/DynamicPDF/DPDFFourierTransform.ui
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/DynamicPDF/DPDFInputDataControl.h b/qt/scientific_interfaces/DynamicPDF/inc/DynamicPDF/DPDFInputDataControl.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/DynamicPDF/DPDFInputDataControl.h
rename to qt/scientific_interfaces/DynamicPDF/inc/DynamicPDF/DPDFInputDataControl.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/DynamicPDF/DisplayCurveFitTest.h b/qt/scientific_interfaces/DynamicPDF/inc/DynamicPDF/DisplayCurveFitTest.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/DynamicPDF/DisplayCurveFitTest.h
rename to qt/scientific_interfaces/DynamicPDF/inc/DynamicPDF/DisplayCurveFitTest.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/DynamicPDF/DisplayCurveFitTest.ui b/qt/scientific_interfaces/DynamicPDF/inc/DynamicPDF/DisplayCurveFitTest.ui
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/DynamicPDF/DisplayCurveFitTest.ui
rename to qt/scientific_interfaces/DynamicPDF/inc/DynamicPDF/DisplayCurveFitTest.ui
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/DynamicPDF/SliceSelector.h b/qt/scientific_interfaces/DynamicPDF/inc/DynamicPDF/SliceSelector.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/DynamicPDF/SliceSelector.h
rename to qt/scientific_interfaces/DynamicPDF/inc/DynamicPDF/SliceSelector.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/DynamicPDF/SliceSelector.ui b/qt/scientific_interfaces/DynamicPDF/inc/DynamicPDF/SliceSelector.ui
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/DynamicPDF/SliceSelector.ui
rename to qt/scientific_interfaces/DynamicPDF/inc/DynamicPDF/SliceSelector.ui
diff --git a/MantidQt/CustomInterfaces/src/DynamicPDF/DPDFBackgroundRemover.cpp b/qt/scientific_interfaces/DynamicPDF/src/DPDFBackgroundRemover.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/DynamicPDF/DPDFBackgroundRemover.cpp
rename to qt/scientific_interfaces/DynamicPDF/src/DPDFBackgroundRemover.cpp
diff --git a/MantidQt/CustomInterfaces/src/DynamicPDF/DPDFDisplayControl.cpp b/qt/scientific_interfaces/DynamicPDF/src/DPDFDisplayControl.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/DynamicPDF/DPDFDisplayControl.cpp
rename to qt/scientific_interfaces/DynamicPDF/src/DPDFDisplayControl.cpp
diff --git a/MantidQt/CustomInterfaces/src/DynamicPDF/DPDFFitControl.cpp b/qt/scientific_interfaces/DynamicPDF/src/DPDFFitControl.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/DynamicPDF/DPDFFitControl.cpp
rename to qt/scientific_interfaces/DynamicPDF/src/DPDFFitControl.cpp
diff --git a/MantidQt/CustomInterfaces/src/DynamicPDF/DPDFFitOptionsBrowser.cpp b/qt/scientific_interfaces/DynamicPDF/src/DPDFFitOptionsBrowser.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/DynamicPDF/DPDFFitOptionsBrowser.cpp
rename to qt/scientific_interfaces/DynamicPDF/src/DPDFFitOptionsBrowser.cpp
diff --git a/MantidQt/CustomInterfaces/src/DynamicPDF/DPDFFourierTransform.cpp b/qt/scientific_interfaces/DynamicPDF/src/DPDFFourierTransform.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/DynamicPDF/DPDFFourierTransform.cpp
rename to qt/scientific_interfaces/DynamicPDF/src/DPDFFourierTransform.cpp
diff --git a/MantidQt/CustomInterfaces/src/DynamicPDF/DPDFInputDataControl.cpp b/qt/scientific_interfaces/DynamicPDF/src/DPDFInputDataControl.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/DynamicPDF/DPDFInputDataControl.cpp
rename to qt/scientific_interfaces/DynamicPDF/src/DPDFInputDataControl.cpp
diff --git a/MantidQt/CustomInterfaces/src/DynamicPDF/DisplayCurveFitTest.cpp b/qt/scientific_interfaces/DynamicPDF/src/DisplayCurveFitTest.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/DynamicPDF/DisplayCurveFitTest.cpp
rename to qt/scientific_interfaces/DynamicPDF/src/DisplayCurveFitTest.cpp
diff --git a/MantidQt/CustomInterfaces/src/DynamicPDF/SliceSelector.cpp b/qt/scientific_interfaces/DynamicPDF/src/SliceSelector.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/DynamicPDF/SliceSelector.cpp
rename to qt/scientific_interfaces/DynamicPDF/src/SliceSelector.cpp
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffCalibSettings.h b/qt/scientific_interfaces/EnggDiffraction/inc/EnggDiffraction/EnggDiffCalibSettings.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffCalibSettings.h
rename to qt/scientific_interfaces/EnggDiffraction/inc/EnggDiffraction/EnggDiffCalibSettings.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffFittingPresWorker.h b/qt/scientific_interfaces/EnggDiffraction/inc/EnggDiffraction/EnggDiffFittingPresWorker.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffFittingPresWorker.h
rename to qt/scientific_interfaces/EnggDiffraction/inc/EnggDiffraction/EnggDiffFittingPresWorker.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffFittingPresenter.h b/qt/scientific_interfaces/EnggDiffraction/inc/EnggDiffraction/EnggDiffFittingPresenter.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffFittingPresenter.h
rename to qt/scientific_interfaces/EnggDiffraction/inc/EnggDiffraction/EnggDiffFittingPresenter.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffFittingViewQtWidget.h b/qt/scientific_interfaces/EnggDiffraction/inc/EnggDiffraction/EnggDiffFittingViewQtWidget.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffFittingViewQtWidget.h
rename to qt/scientific_interfaces/EnggDiffraction/inc/EnggDiffraction/EnggDiffFittingViewQtWidget.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionPresWorker.h b/qt/scientific_interfaces/EnggDiffraction/inc/EnggDiffraction/EnggDiffractionPresWorker.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionPresWorker.h
rename to qt/scientific_interfaces/EnggDiffraction/inc/EnggDiffraction/EnggDiffractionPresWorker.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionPresenter.h b/qt/scientific_interfaces/EnggDiffraction/inc/EnggDiffraction/EnggDiffractionPresenter.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionPresenter.h
rename to qt/scientific_interfaces/EnggDiffraction/inc/EnggDiffraction/EnggDiffractionPresenter.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionQtGUI.ui b/qt/scientific_interfaces/EnggDiffraction/inc/EnggDiffraction/EnggDiffractionQtGUI.ui
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionQtGUI.ui
rename to qt/scientific_interfaces/EnggDiffraction/inc/EnggDiffraction/EnggDiffractionQtGUI.ui
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionQtTabCalib.ui b/qt/scientific_interfaces/EnggDiffraction/inc/EnggDiffraction/EnggDiffractionQtTabCalib.ui
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionQtTabCalib.ui
rename to qt/scientific_interfaces/EnggDiffraction/inc/EnggDiffraction/EnggDiffractionQtTabCalib.ui
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionQtTabFitting.ui b/qt/scientific_interfaces/EnggDiffraction/inc/EnggDiffraction/EnggDiffractionQtTabFitting.ui
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionQtTabFitting.ui
rename to qt/scientific_interfaces/EnggDiffraction/inc/EnggDiffraction/EnggDiffractionQtTabFitting.ui
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionQtTabFocus.ui b/qt/scientific_interfaces/EnggDiffraction/inc/EnggDiffraction/EnggDiffractionQtTabFocus.ui
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionQtTabFocus.ui
rename to qt/scientific_interfaces/EnggDiffraction/inc/EnggDiffraction/EnggDiffractionQtTabFocus.ui
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionQtTabPreproc.ui b/qt/scientific_interfaces/EnggDiffraction/inc/EnggDiffraction/EnggDiffractionQtTabPreproc.ui
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionQtTabPreproc.ui
rename to qt/scientific_interfaces/EnggDiffraction/inc/EnggDiffraction/EnggDiffractionQtTabPreproc.ui
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionQtTabSettings.ui b/qt/scientific_interfaces/EnggDiffraction/inc/EnggDiffraction/EnggDiffractionQtTabSettings.ui
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionQtTabSettings.ui
rename to qt/scientific_interfaces/EnggDiffraction/inc/EnggDiffraction/EnggDiffractionQtTabSettings.ui
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionViewQtGUI.h b/qt/scientific_interfaces/EnggDiffraction/inc/EnggDiffraction/EnggDiffractionViewQtGUI.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionViewQtGUI.h
rename to qt/scientific_interfaces/EnggDiffraction/inc/EnggDiffraction/EnggDiffractionViewQtGUI.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/IEnggDiffFittingPresenter.h b/qt/scientific_interfaces/EnggDiffraction/inc/EnggDiffraction/IEnggDiffFittingPresenter.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/IEnggDiffFittingPresenter.h
rename to qt/scientific_interfaces/EnggDiffraction/inc/EnggDiffraction/IEnggDiffFittingPresenter.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/IEnggDiffFittingView.h b/qt/scientific_interfaces/EnggDiffraction/inc/EnggDiffraction/IEnggDiffFittingView.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/IEnggDiffFittingView.h
rename to qt/scientific_interfaces/EnggDiffraction/inc/EnggDiffraction/IEnggDiffFittingView.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/IEnggDiffractionCalibration.h b/qt/scientific_interfaces/EnggDiffraction/inc/EnggDiffraction/IEnggDiffractionCalibration.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/IEnggDiffractionCalibration.h
rename to qt/scientific_interfaces/EnggDiffraction/inc/EnggDiffraction/IEnggDiffractionCalibration.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/IEnggDiffractionParam.h b/qt/scientific_interfaces/EnggDiffraction/inc/EnggDiffraction/IEnggDiffractionParam.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/IEnggDiffractionParam.h
rename to qt/scientific_interfaces/EnggDiffraction/inc/EnggDiffraction/IEnggDiffractionParam.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/IEnggDiffractionPresenter.h b/qt/scientific_interfaces/EnggDiffraction/inc/EnggDiffraction/IEnggDiffractionPresenter.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/IEnggDiffractionPresenter.h
rename to qt/scientific_interfaces/EnggDiffraction/inc/EnggDiffraction/IEnggDiffractionPresenter.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/IEnggDiffractionPythonRunner.h b/qt/scientific_interfaces/EnggDiffraction/inc/EnggDiffraction/IEnggDiffractionPythonRunner.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/IEnggDiffractionPythonRunner.h
rename to qt/scientific_interfaces/EnggDiffraction/inc/EnggDiffraction/IEnggDiffractionPythonRunner.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/IEnggDiffractionSettings.h b/qt/scientific_interfaces/EnggDiffraction/inc/EnggDiffraction/IEnggDiffractionSettings.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/IEnggDiffractionSettings.h
rename to qt/scientific_interfaces/EnggDiffraction/inc/EnggDiffraction/IEnggDiffractionSettings.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/IEnggDiffractionUserMsg.h b/qt/scientific_interfaces/EnggDiffraction/inc/EnggDiffraction/IEnggDiffractionUserMsg.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/IEnggDiffractionUserMsg.h
rename to qt/scientific_interfaces/EnggDiffraction/inc/EnggDiffraction/IEnggDiffractionUserMsg.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/IEnggDiffractionView.h b/qt/scientific_interfaces/EnggDiffraction/inc/EnggDiffraction/IEnggDiffractionView.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/IEnggDiffractionView.h
rename to qt/scientific_interfaces/EnggDiffraction/inc/EnggDiffraction/IEnggDiffractionView.h
diff --git a/MantidQt/CustomInterfaces/src/EnggDiffraction/EnggDiffFittingPresenter.cpp b/qt/scientific_interfaces/EnggDiffraction/src/EnggDiffFittingPresenter.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/EnggDiffraction/EnggDiffFittingPresenter.cpp
rename to qt/scientific_interfaces/EnggDiffraction/src/EnggDiffFittingPresenter.cpp
diff --git a/MantidQt/CustomInterfaces/src/EnggDiffraction/EnggDiffFittingViewQtWidget.cpp b/qt/scientific_interfaces/EnggDiffraction/src/EnggDiffFittingViewQtWidget.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/EnggDiffraction/EnggDiffFittingViewQtWidget.cpp
rename to qt/scientific_interfaces/EnggDiffraction/src/EnggDiffFittingViewQtWidget.cpp
diff --git a/MantidQt/CustomInterfaces/src/EnggDiffraction/EnggDiffractionPresenter.cpp b/qt/scientific_interfaces/EnggDiffraction/src/EnggDiffractionPresenter.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/EnggDiffraction/EnggDiffractionPresenter.cpp
rename to qt/scientific_interfaces/EnggDiffraction/src/EnggDiffractionPresenter.cpp
diff --git a/MantidQt/CustomInterfaces/src/EnggDiffraction/EnggDiffractionViewQtGUI.cpp b/qt/scientific_interfaces/EnggDiffraction/src/EnggDiffractionViewQtGUI.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/EnggDiffraction/EnggDiffractionViewQtGUI.cpp
rename to qt/scientific_interfaces/EnggDiffraction/src/EnggDiffractionViewQtGUI.cpp
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Background.h b/qt/scientific_interfaces/General/inc/General/Background.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Background.h
rename to qt/scientific_interfaces/General/inc/General/Background.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/DataComparison.h b/qt/scientific_interfaces/General/inc/General/DataComparison.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/DataComparison.h
rename to qt/scientific_interfaces/General/inc/General/DataComparison.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/DataComparison.ui b/qt/scientific_interfaces/General/inc/General/DataComparison.ui
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/DataComparison.ui
rename to qt/scientific_interfaces/General/inc/General/DataComparison.ui
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/DirectConvertToEnergy.h b/qt/scientific_interfaces/General/inc/General/DirectConvertToEnergy.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/DirectConvertToEnergy.h
rename to qt/scientific_interfaces/General/inc/General/DirectConvertToEnergy.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/DirectConvertToEnergy.ui b/qt/scientific_interfaces/General/inc/General/DirectConvertToEnergy.ui
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/DirectConvertToEnergy.ui
rename to qt/scientific_interfaces/General/inc/General/DirectConvertToEnergy.ui
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/DllConfig.h b/qt/scientific_interfaces/General/inc/General/DllConfig.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/DllConfig.h
rename to qt/scientific_interfaces/General/inc/General/DllConfig.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Homer.h b/qt/scientific_interfaces/General/inc/General/Homer.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Homer.h
rename to qt/scientific_interfaces/General/inc/General/Homer.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IReflPresenter.h b/qt/scientific_interfaces/General/inc/General/IReflPresenter.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IReflPresenter.h
rename to qt/scientific_interfaces/General/inc/General/IReflPresenter.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IReflSearcher.h b/qt/scientific_interfaces/General/inc/General/IReflSearcher.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IReflSearcher.h
rename to qt/scientific_interfaces/General/inc/General/IReflSearcher.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/LatticePresenter.h b/qt/scientific_interfaces/General/inc/General/LatticePresenter.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/LatticePresenter.h
rename to qt/scientific_interfaces/General/inc/General/LatticePresenter.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/LatticeView.h b/qt/scientific_interfaces/General/inc/General/LatticeView.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/LatticeView.h
rename to qt/scientific_interfaces/General/inc/General/LatticeView.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/MantidEV.h b/qt/scientific_interfaces/General/inc/General/MantidEV.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/MantidEV.h
rename to qt/scientific_interfaces/General/inc/General/MantidEV.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/MantidEV.ui b/qt/scientific_interfaces/General/inc/General/MantidEV.ui
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/MantidEV.ui
rename to qt/scientific_interfaces/General/inc/General/MantidEV.ui
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/MantidEVWorker.h b/qt/scientific_interfaces/General/inc/General/MantidEVWorker.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/MantidEVWorker.h
rename to qt/scientific_interfaces/General/inc/General/MantidEVWorker.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/PrecompiledHeader.h b/qt/scientific_interfaces/General/inc/General/PrecompiledHeader.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/PrecompiledHeader.h
rename to qt/scientific_interfaces/General/inc/General/PrecompiledHeader.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ProjectSave.ui b/qt/scientific_interfaces/General/inc/General/ProjectSave.ui
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ProjectSave.ui
rename to qt/scientific_interfaces/General/inc/General/ProjectSave.ui
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ReflMainWidget.ui b/qt/scientific_interfaces/General/inc/General/ReflMainWidget.ui
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ReflMainWidget.ui
rename to qt/scientific_interfaces/General/inc/General/ReflMainWidget.ui
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ReflOptionsDialog.ui b/qt/scientific_interfaces/General/inc/General/ReflOptionsDialog.ui
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ReflOptionsDialog.ui
rename to qt/scientific_interfaces/General/inc/General/ReflOptionsDialog.ui
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ReflWindow.ui b/qt/scientific_interfaces/General/inc/General/ReflWindow.ui
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ReflWindow.ui
rename to qt/scientific_interfaces/General/inc/General/ReflWindow.ui
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/SampleTransmission.h b/qt/scientific_interfaces/General/inc/General/SampleTransmission.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/SampleTransmission.h
rename to qt/scientific_interfaces/General/inc/General/SampleTransmission.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/SampleTransmission.ui b/qt/scientific_interfaces/General/inc/General/SampleTransmission.ui
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/SampleTransmission.ui
rename to qt/scientific_interfaces/General/inc/General/SampleTransmission.ui
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/StepScan.h b/qt/scientific_interfaces/General/inc/General/StepScan.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/StepScan.h
rename to qt/scientific_interfaces/General/inc/General/StepScan.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/StepScan.ui b/qt/scientific_interfaces/General/inc/General/StepScan.ui
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/StepScan.ui
rename to qt/scientific_interfaces/General/inc/General/StepScan.ui
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Updateable.h b/qt/scientific_interfaces/General/inc/General/Updateable.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Updateable.h
rename to qt/scientific_interfaces/General/inc/General/Updateable.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/UserInputValidator.h b/qt/scientific_interfaces/General/inc/General/UserInputValidator.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/UserInputValidator.h
rename to qt/scientific_interfaces/General/inc/General/UserInputValidator.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/deltaECalc.h b/qt/scientific_interfaces/General/inc/General/deltaECalc.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/deltaECalc.h
rename to qt/scientific_interfaces/General/inc/General/deltaECalc.h
diff --git a/MantidQt/CustomInterfaces/src/DataComparison.cpp b/qt/scientific_interfaces/General/src/DataComparison.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/DataComparison.cpp
rename to qt/scientific_interfaces/General/src/DataComparison.cpp
diff --git a/MantidQt/CustomInterfaces/src/DirectConvertToEnergy.cpp b/qt/scientific_interfaces/General/src/DirectConvertToEnergy.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/DirectConvertToEnergy.cpp
rename to qt/scientific_interfaces/General/src/DirectConvertToEnergy.cpp
diff --git a/MantidQt/CustomInterfaces/src/Homer.cpp b/qt/scientific_interfaces/General/src/Homer.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/Homer.cpp
rename to qt/scientific_interfaces/General/src/Homer.cpp
diff --git a/MantidQt/CustomInterfaces/src/LatticePresenter.cpp b/qt/scientific_interfaces/General/src/LatticePresenter.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/LatticePresenter.cpp
rename to qt/scientific_interfaces/General/src/LatticePresenter.cpp
diff --git a/MantidQt/CustomInterfaces/src/MantidEV.cpp b/qt/scientific_interfaces/General/src/MantidEV.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/MantidEV.cpp
rename to qt/scientific_interfaces/General/src/MantidEV.cpp
diff --git a/MantidQt/CustomInterfaces/src/MantidEVWorker.cpp b/qt/scientific_interfaces/General/src/MantidEVWorker.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/MantidEVWorker.cpp
rename to qt/scientific_interfaces/General/src/MantidEVWorker.cpp
diff --git a/MantidQt/CustomInterfaces/src/SampleTransmission.cpp b/qt/scientific_interfaces/General/src/SampleTransmission.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/SampleTransmission.cpp
rename to qt/scientific_interfaces/General/src/SampleTransmission.cpp
diff --git a/MantidQt/CustomInterfaces/src/StepScan.cpp b/qt/scientific_interfaces/General/src/StepScan.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/StepScan.cpp
rename to qt/scientific_interfaces/General/src/StepScan.cpp
diff --git a/MantidQt/CustomInterfaces/src/UserInputValidator.cpp b/qt/scientific_interfaces/General/src/UserInputValidator.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/UserInputValidator.cpp
rename to qt/scientific_interfaces/General/src/UserInputValidator.cpp
diff --git a/MantidQt/CustomInterfaces/src/background.cpp b/qt/scientific_interfaces/General/src/background.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/background.cpp
rename to qt/scientific_interfaces/General/src/background.cpp
diff --git a/MantidQt/CustomInterfaces/src/deltaECalc.cpp b/qt/scientific_interfaces/General/src/deltaECalc.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/deltaECalc.cpp
rename to qt/scientific_interfaces/General/src/deltaECalc.cpp
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/IReflEventPresenter.h b/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/IReflEventPresenter.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/IReflEventPresenter.h
rename to qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/IReflEventPresenter.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/IReflEventTabPresenter.h b/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/IReflEventTabPresenter.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/IReflEventTabPresenter.h
rename to qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/IReflEventTabPresenter.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/IReflEventView.h b/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/IReflEventView.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/IReflEventView.h
rename to qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/IReflEventView.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/IReflMainWindowPresenter.h b/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/IReflMainWindowPresenter.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/IReflMainWindowPresenter.h
rename to qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/IReflMainWindowPresenter.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/IReflMainWindowView.h b/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/IReflMainWindowView.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/IReflMainWindowView.h
rename to qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/IReflMainWindowView.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/IReflRunsTabPresenter.h b/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/IReflRunsTabPresenter.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/IReflRunsTabPresenter.h
rename to qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/IReflRunsTabPresenter.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/IReflRunsTabView.h b/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/IReflRunsTabView.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/IReflRunsTabView.h
rename to qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/IReflRunsTabView.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/IReflSaveTabPresenter.h b/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/IReflSaveTabPresenter.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/IReflSaveTabPresenter.h
rename to qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/IReflSaveTabPresenter.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/IReflSaveTabView.h b/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/IReflSaveTabView.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/IReflSaveTabView.h
rename to qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/IReflSaveTabView.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/IReflSearcher.h b/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/IReflSearcher.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/IReflSearcher.h
rename to qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/IReflSearcher.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/IReflSettingsPresenter.h b/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/IReflSettingsPresenter.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/IReflSettingsPresenter.h
rename to qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/IReflSettingsPresenter.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/IReflSettingsTabPresenter.h b/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/IReflSettingsTabPresenter.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/IReflSettingsTabPresenter.h
rename to qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/IReflSettingsTabPresenter.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/IReflSettingsView.h b/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/IReflSettingsView.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/IReflSettingsView.h
rename to qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/IReflSettingsView.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/MeasurementItem.h b/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/MeasurementItem.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/MeasurementItem.h
rename to qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/MeasurementItem.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/QtReflEventTabView.h b/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/QtReflEventTabView.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/QtReflEventTabView.h
rename to qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/QtReflEventTabView.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/QtReflEventView.h b/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/QtReflEventView.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/QtReflEventView.h
rename to qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/QtReflEventView.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/QtReflMainWindowView.h b/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/QtReflMainWindowView.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/QtReflMainWindowView.h
rename to qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/QtReflMainWindowView.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/QtReflRunsTabView.h b/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/QtReflRunsTabView.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/QtReflRunsTabView.h
rename to qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/QtReflRunsTabView.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/QtReflSaveTabView.h b/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/QtReflSaveTabView.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/QtReflSaveTabView.h
rename to qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/QtReflSaveTabView.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/QtReflSettingsTabView.h b/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/QtReflSettingsTabView.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/QtReflSettingsTabView.h
rename to qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/QtReflSettingsTabView.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/QtReflSettingsView.h b/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/QtReflSettingsView.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/QtReflSettingsView.h
rename to qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/QtReflSettingsView.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/ReflCatalogSearcher.h b/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflCatalogSearcher.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/ReflCatalogSearcher.h
rename to qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflCatalogSearcher.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/ReflDataProcessorMainPresenter.h b/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflDataProcessorMainPresenter.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/ReflDataProcessorMainPresenter.h
rename to qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflDataProcessorMainPresenter.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/ReflDataProcessorPresenter.h b/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflDataProcessorPresenter.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/ReflDataProcessorPresenter.h
rename to qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflDataProcessorPresenter.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/ReflEventPresenter.h b/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflEventPresenter.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/ReflEventPresenter.h
rename to qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflEventPresenter.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/ReflEventTabPresenter.h b/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflEventTabPresenter.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/ReflEventTabPresenter.h
rename to qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflEventTabPresenter.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/ReflEventTabWidget.ui b/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflEventTabWidget.ui
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/ReflEventTabWidget.ui
rename to qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflEventTabWidget.ui
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/ReflEventWidget.ui b/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflEventWidget.ui
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/ReflEventWidget.ui
rename to qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflEventWidget.ui
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/ReflGenericDataProcessorPresenterFactory.h b/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflGenericDataProcessorPresenterFactory.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/ReflGenericDataProcessorPresenterFactory.h
rename to qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflGenericDataProcessorPresenterFactory.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/ReflLegacyTransferStrategy.h b/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflLegacyTransferStrategy.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/ReflLegacyTransferStrategy.h
rename to qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflLegacyTransferStrategy.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/ReflMainWindowPresenter.h b/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflMainWindowPresenter.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/ReflMainWindowPresenter.h
rename to qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflMainWindowPresenter.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/ReflMainWindowWidget.ui b/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflMainWindowWidget.ui
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/ReflMainWindowWidget.ui
rename to qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflMainWindowWidget.ui
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/ReflMeasureTransferStrategy.h b/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflMeasureTransferStrategy.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/ReflMeasureTransferStrategy.h
rename to qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflMeasureTransferStrategy.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/ReflMeasurementItemSource.h b/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflMeasurementItemSource.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/ReflMeasurementItemSource.h
rename to qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflMeasurementItemSource.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/ReflNexusMeasurementItemSource.h b/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflNexusMeasurementItemSource.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/ReflNexusMeasurementItemSource.h
rename to qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflNexusMeasurementItemSource.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/ReflRunsTabPresenter.h b/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflRunsTabPresenter.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/ReflRunsTabPresenter.h
rename to qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflRunsTabPresenter.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/ReflRunsTabWidget.ui b/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflRunsTabWidget.ui
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/ReflRunsTabWidget.ui
rename to qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflRunsTabWidget.ui
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/ReflSaveTabPresenter.h b/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflSaveTabPresenter.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/ReflSaveTabPresenter.h
rename to qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflSaveTabPresenter.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/ReflSaveTabWidget.ui b/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflSaveTabWidget.ui
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/ReflSaveTabWidget.ui
rename to qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflSaveTabWidget.ui
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/ReflSearchModel.h b/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflSearchModel.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/ReflSearchModel.h
rename to qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflSearchModel.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/ReflSettingsPresenter.h b/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflSettingsPresenter.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/ReflSettingsPresenter.h
rename to qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflSettingsPresenter.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/ReflSettingsTabPresenter.h b/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflSettingsTabPresenter.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/ReflSettingsTabPresenter.h
rename to qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflSettingsTabPresenter.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/ReflSettingsTabWidget.ui b/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflSettingsTabWidget.ui
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/ReflSettingsTabWidget.ui
rename to qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflSettingsTabWidget.ui
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/ReflSettingsWidget.ui b/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflSettingsWidget.ui
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/ReflSettingsWidget.ui
rename to qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflSettingsWidget.ui
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/ReflTableSchema.h b/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflTableSchema.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/ReflTableSchema.h
rename to qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflTableSchema.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/ReflTransferStrategy.h b/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflTransferStrategy.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/ReflTransferStrategy.h
rename to qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflTransferStrategy.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/ReflWindow.ui b/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflWindow.ui
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/ReflWindow.ui
rename to qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflWindow.ui
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/TransferResults.h b/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/TransferResults.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/TransferResults.h
rename to qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/TransferResults.h
diff --git a/MantidQt/CustomInterfaces/src/Reflectometry/MeasurementItem.cpp b/qt/scientific_interfaces/ISISReflectometryOld/src/MeasurementItem.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/Reflectometry/MeasurementItem.cpp
rename to qt/scientific_interfaces/ISISReflectometryOld/src/MeasurementItem.cpp
diff --git a/MantidQt/CustomInterfaces/src/Reflectometry/QtReflEventTabView.cpp b/qt/scientific_interfaces/ISISReflectometryOld/src/QtReflEventTabView.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/Reflectometry/QtReflEventTabView.cpp
rename to qt/scientific_interfaces/ISISReflectometryOld/src/QtReflEventTabView.cpp
diff --git a/MantidQt/CustomInterfaces/src/Reflectometry/QtReflEventView.cpp b/qt/scientific_interfaces/ISISReflectometryOld/src/QtReflEventView.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/Reflectometry/QtReflEventView.cpp
rename to qt/scientific_interfaces/ISISReflectometryOld/src/QtReflEventView.cpp
diff --git a/MantidQt/CustomInterfaces/src/Reflectometry/QtReflMainWindowView.cpp b/qt/scientific_interfaces/ISISReflectometryOld/src/QtReflMainWindowView.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/Reflectometry/QtReflMainWindowView.cpp
rename to qt/scientific_interfaces/ISISReflectometryOld/src/QtReflMainWindowView.cpp
diff --git a/MantidQt/CustomInterfaces/src/Reflectometry/QtReflRunsTabView.cpp b/qt/scientific_interfaces/ISISReflectometryOld/src/QtReflRunsTabView.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/Reflectometry/QtReflRunsTabView.cpp
rename to qt/scientific_interfaces/ISISReflectometryOld/src/QtReflRunsTabView.cpp
diff --git a/MantidQt/CustomInterfaces/src/Reflectometry/QtReflSaveTabView.cpp b/qt/scientific_interfaces/ISISReflectometryOld/src/QtReflSaveTabView.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/Reflectometry/QtReflSaveTabView.cpp
rename to qt/scientific_interfaces/ISISReflectometryOld/src/QtReflSaveTabView.cpp
diff --git a/MantidQt/CustomInterfaces/src/Reflectometry/QtReflSettingsTabView.cpp b/qt/scientific_interfaces/ISISReflectometryOld/src/QtReflSettingsTabView.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/Reflectometry/QtReflSettingsTabView.cpp
rename to qt/scientific_interfaces/ISISReflectometryOld/src/QtReflSettingsTabView.cpp
diff --git a/MantidQt/CustomInterfaces/src/Reflectometry/QtReflSettingsView.cpp b/qt/scientific_interfaces/ISISReflectometryOld/src/QtReflSettingsView.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/Reflectometry/QtReflSettingsView.cpp
rename to qt/scientific_interfaces/ISISReflectometryOld/src/QtReflSettingsView.cpp
diff --git a/MantidQt/CustomInterfaces/src/Reflectometry/ReflCatalogSearcher.cpp b/qt/scientific_interfaces/ISISReflectometryOld/src/ReflCatalogSearcher.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/Reflectometry/ReflCatalogSearcher.cpp
rename to qt/scientific_interfaces/ISISReflectometryOld/src/ReflCatalogSearcher.cpp
diff --git a/MantidQt/CustomInterfaces/src/Reflectometry/ReflDataProcessorPresenter.cpp b/qt/scientific_interfaces/ISISReflectometryOld/src/ReflDataProcessorPresenter.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/Reflectometry/ReflDataProcessorPresenter.cpp
rename to qt/scientific_interfaces/ISISReflectometryOld/src/ReflDataProcessorPresenter.cpp
diff --git a/MantidQt/CustomInterfaces/src/Reflectometry/ReflEventPresenter.cpp b/qt/scientific_interfaces/ISISReflectometryOld/src/ReflEventPresenter.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/Reflectometry/ReflEventPresenter.cpp
rename to qt/scientific_interfaces/ISISReflectometryOld/src/ReflEventPresenter.cpp
diff --git a/MantidQt/CustomInterfaces/src/Reflectometry/ReflEventTabPresenter.cpp b/qt/scientific_interfaces/ISISReflectometryOld/src/ReflEventTabPresenter.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/Reflectometry/ReflEventTabPresenter.cpp
rename to qt/scientific_interfaces/ISISReflectometryOld/src/ReflEventTabPresenter.cpp
diff --git a/MantidQt/CustomInterfaces/src/Reflectometry/ReflGenericDataProcessorPresenterFactory.cpp b/qt/scientific_interfaces/ISISReflectometryOld/src/ReflGenericDataProcessorPresenterFactory.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/Reflectometry/ReflGenericDataProcessorPresenterFactory.cpp
rename to qt/scientific_interfaces/ISISReflectometryOld/src/ReflGenericDataProcessorPresenterFactory.cpp
diff --git a/MantidQt/CustomInterfaces/src/Reflectometry/ReflLegacyTransferStrategy.cpp b/qt/scientific_interfaces/ISISReflectometryOld/src/ReflLegacyTransferStrategy.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/Reflectometry/ReflLegacyTransferStrategy.cpp
rename to qt/scientific_interfaces/ISISReflectometryOld/src/ReflLegacyTransferStrategy.cpp
diff --git a/MantidQt/CustomInterfaces/src/Reflectometry/ReflMainWindowPresenter.cpp b/qt/scientific_interfaces/ISISReflectometryOld/src/ReflMainWindowPresenter.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/Reflectometry/ReflMainWindowPresenter.cpp
rename to qt/scientific_interfaces/ISISReflectometryOld/src/ReflMainWindowPresenter.cpp
diff --git a/MantidQt/CustomInterfaces/src/Reflectometry/ReflMeasureTransferStrategy.cpp b/qt/scientific_interfaces/ISISReflectometryOld/src/ReflMeasureTransferStrategy.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/Reflectometry/ReflMeasureTransferStrategy.cpp
rename to qt/scientific_interfaces/ISISReflectometryOld/src/ReflMeasureTransferStrategy.cpp
diff --git a/MantidQt/CustomInterfaces/src/Reflectometry/ReflNexusMeasurementItemSource.cpp b/qt/scientific_interfaces/ISISReflectometryOld/src/ReflNexusMeasurementItemSource.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/Reflectometry/ReflNexusMeasurementItemSource.cpp
rename to qt/scientific_interfaces/ISISReflectometryOld/src/ReflNexusMeasurementItemSource.cpp
diff --git a/MantidQt/CustomInterfaces/src/Reflectometry/ReflRunsTabPresenter.cpp b/qt/scientific_interfaces/ISISReflectometryOld/src/ReflRunsTabPresenter.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/Reflectometry/ReflRunsTabPresenter.cpp
rename to qt/scientific_interfaces/ISISReflectometryOld/src/ReflRunsTabPresenter.cpp
diff --git a/MantidQt/CustomInterfaces/src/Reflectometry/ReflSaveTabPresenter.cpp b/qt/scientific_interfaces/ISISReflectometryOld/src/ReflSaveTabPresenter.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/Reflectometry/ReflSaveTabPresenter.cpp
rename to qt/scientific_interfaces/ISISReflectometryOld/src/ReflSaveTabPresenter.cpp
diff --git a/MantidQt/CustomInterfaces/src/Reflectometry/ReflSearchModel.cpp b/qt/scientific_interfaces/ISISReflectometryOld/src/ReflSearchModel.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/Reflectometry/ReflSearchModel.cpp
rename to qt/scientific_interfaces/ISISReflectometryOld/src/ReflSearchModel.cpp
diff --git a/MantidQt/CustomInterfaces/src/Reflectometry/ReflSettingsPresenter.cpp b/qt/scientific_interfaces/ISISReflectometryOld/src/ReflSettingsPresenter.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/Reflectometry/ReflSettingsPresenter.cpp
rename to qt/scientific_interfaces/ISISReflectometryOld/src/ReflSettingsPresenter.cpp
diff --git a/MantidQt/CustomInterfaces/src/Reflectometry/ReflSettingsTabPresenter.cpp b/qt/scientific_interfaces/ISISReflectometryOld/src/ReflSettingsTabPresenter.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/Reflectometry/ReflSettingsTabPresenter.cpp
rename to qt/scientific_interfaces/ISISReflectometryOld/src/ReflSettingsTabPresenter.cpp
diff --git a/MantidQt/CustomInterfaces/src/Reflectometry/ReflTableSchema.cpp b/qt/scientific_interfaces/ISISReflectometryOld/src/ReflTableSchema.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/Reflectometry/ReflTableSchema.cpp
rename to qt/scientific_interfaces/ISISReflectometryOld/src/ReflTableSchema.cpp
diff --git a/MantidQt/CustomInterfaces/src/Reflectometry/TransferResults.cpp b/qt/scientific_interfaces/ISISReflectometryOld/src/TransferResults.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/Reflectometry/TransferResults.cpp
rename to qt/scientific_interfaces/ISISReflectometryOld/src/TransferResults.cpp
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/SANSAddFiles.h b/qt/scientific_interfaces/ISISSANS/inc/ISISSANS/SANSAddFiles.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/SANSAddFiles.h
rename to qt/scientific_interfaces/ISISSANS/inc/ISISSANS/SANSAddFiles.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/SANSBackgroundCorrectionSettings.h b/qt/scientific_interfaces/ISISSANS/inc/ISISSANS/SANSBackgroundCorrectionSettings.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/SANSBackgroundCorrectionSettings.h
rename to qt/scientific_interfaces/ISISSANS/inc/ISISSANS/SANSBackgroundCorrectionSettings.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/SANSBackgroundCorrectionWidget.h b/qt/scientific_interfaces/ISISSANS/inc/ISISSANS/SANSBackgroundCorrectionWidget.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/SANSBackgroundCorrectionWidget.h
rename to qt/scientific_interfaces/ISISSANS/inc/ISISSANS/SANSBackgroundCorrectionWidget.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/SANSBackgroundCorrectionWidget.ui b/qt/scientific_interfaces/ISISSANS/inc/ISISSANS/SANSBackgroundCorrectionWidget.ui
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/SANSBackgroundCorrectionWidget.ui
rename to qt/scientific_interfaces/ISISSANS/inc/ISISSANS/SANSBackgroundCorrectionWidget.ui
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/SANSConstants.h b/qt/scientific_interfaces/ISISSANS/inc/ISISSANS/SANSConstants.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/SANSConstants.h
rename to qt/scientific_interfaces/ISISSANS/inc/ISISSANS/SANSConstants.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/SANSDiagnostics.h b/qt/scientific_interfaces/ISISSANS/inc/ISISSANS/SANSDiagnostics.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/SANSDiagnostics.h
rename to qt/scientific_interfaces/ISISSANS/inc/ISISSANS/SANSDiagnostics.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/SANSEventSlicing.h b/qt/scientific_interfaces/ISISSANS/inc/ISISSANS/SANSEventSlicing.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/SANSEventSlicing.h
rename to qt/scientific_interfaces/ISISSANS/inc/ISISSANS/SANSEventSlicing.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/SANSEventSlicing.ui b/qt/scientific_interfaces/ISISSANS/inc/ISISSANS/SANSEventSlicing.ui
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/SANSEventSlicing.ui
rename to qt/scientific_interfaces/ISISSANS/inc/ISISSANS/SANSEventSlicing.ui
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/SANSPlotSpecial.h b/qt/scientific_interfaces/ISISSANS/inc/ISISSANS/SANSPlotSpecial.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/SANSPlotSpecial.h
rename to qt/scientific_interfaces/ISISSANS/inc/ISISSANS/SANSPlotSpecial.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/SANSPlotSpecial.ui b/qt/scientific_interfaces/ISISSANS/inc/ISISSANS/SANSPlotSpecial.ui
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/SANSPlotSpecial.ui
rename to qt/scientific_interfaces/ISISSANS/inc/ISISSANS/SANSPlotSpecial.ui
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/SANSRunWindow.h b/qt/scientific_interfaces/ISISSANS/inc/ISISSANS/SANSRunWindow.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/SANSRunWindow.h
rename to qt/scientific_interfaces/ISISSANS/inc/ISISSANS/SANSRunWindow.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/SANSRunWindow.ui b/qt/scientific_interfaces/ISISSANS/inc/ISISSANS/SANSRunWindow.ui
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/SANSRunWindow.ui
rename to qt/scientific_interfaces/ISISSANS/inc/ISISSANS/SANSRunWindow.ui
diff --git a/MantidQt/CustomInterfaces/src/SANSAddFiles.cpp b/qt/scientific_interfaces/ISISSANS/src/SANSAddFiles.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/SANSAddFiles.cpp
rename to qt/scientific_interfaces/ISISSANS/src/SANSAddFiles.cpp
diff --git a/MantidQt/CustomInterfaces/src/SANSBackgroundCorrectionSettings.cpp b/qt/scientific_interfaces/ISISSANS/src/SANSBackgroundCorrectionSettings.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/SANSBackgroundCorrectionSettings.cpp
rename to qt/scientific_interfaces/ISISSANS/src/SANSBackgroundCorrectionSettings.cpp
diff --git a/MantidQt/CustomInterfaces/src/SANSBackgroundCorrectionWidget.cpp b/qt/scientific_interfaces/ISISSANS/src/SANSBackgroundCorrectionWidget.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/SANSBackgroundCorrectionWidget.cpp
rename to qt/scientific_interfaces/ISISSANS/src/SANSBackgroundCorrectionWidget.cpp
diff --git a/MantidQt/CustomInterfaces/src/SANSConstants.cpp b/qt/scientific_interfaces/ISISSANS/src/SANSConstants.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/SANSConstants.cpp
rename to qt/scientific_interfaces/ISISSANS/src/SANSConstants.cpp
diff --git a/MantidQt/CustomInterfaces/src/SANSDiagnostics.cpp b/qt/scientific_interfaces/ISISSANS/src/SANSDiagnostics.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/SANSDiagnostics.cpp
rename to qt/scientific_interfaces/ISISSANS/src/SANSDiagnostics.cpp
diff --git a/MantidQt/CustomInterfaces/src/SANSEventSlicing.cpp b/qt/scientific_interfaces/ISISSANS/src/SANSEventSlicing.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/SANSEventSlicing.cpp
rename to qt/scientific_interfaces/ISISSANS/src/SANSEventSlicing.cpp
diff --git a/MantidQt/CustomInterfaces/src/SANSPlotSpecial.cpp b/qt/scientific_interfaces/ISISSANS/src/SANSPlotSpecial.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/SANSPlotSpecial.cpp
rename to qt/scientific_interfaces/ISISSANS/src/SANSPlotSpecial.cpp
diff --git a/MantidQt/CustomInterfaces/src/SANSRunWindow.cpp b/qt/scientific_interfaces/ISISSANS/src/SANSRunWindow.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/SANSRunWindow.cpp
rename to qt/scientific_interfaces/ISISSANS/src/SANSRunWindow.cpp
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/AbsorptionCorrections.h b/qt/scientific_interfaces/Indirect/inc/Indirect/AbsorptionCorrections.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/AbsorptionCorrections.h
rename to qt/scientific_interfaces/Indirect/inc/Indirect/AbsorptionCorrections.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/AbsorptionCorrections.ui b/qt/scientific_interfaces/Indirect/inc/Indirect/AbsorptionCorrections.ui
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/AbsorptionCorrections.ui
rename to qt/scientific_interfaces/Indirect/inc/Indirect/AbsorptionCorrections.ui
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ApplyPaalmanPings.h b/qt/scientific_interfaces/Indirect/inc/Indirect/ApplyPaalmanPings.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ApplyPaalmanPings.h
rename to qt/scientific_interfaces/Indirect/inc/Indirect/ApplyPaalmanPings.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ApplyPaalmanPings.ui b/qt/scientific_interfaces/Indirect/inc/Indirect/ApplyPaalmanPings.ui
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ApplyPaalmanPings.ui
rename to qt/scientific_interfaces/Indirect/inc/Indirect/ApplyPaalmanPings.ui
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/CalculatePaalmanPings.h b/qt/scientific_interfaces/Indirect/inc/Indirect/CalculatePaalmanPings.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/CalculatePaalmanPings.h
rename to qt/scientific_interfaces/Indirect/inc/Indirect/CalculatePaalmanPings.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/CalculatePaalmanPings.ui b/qt/scientific_interfaces/Indirect/inc/Indirect/CalculatePaalmanPings.ui
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/CalculatePaalmanPings.ui
rename to qt/scientific_interfaces/Indirect/inc/Indirect/CalculatePaalmanPings.ui
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ContainerSubtraction.h b/qt/scientific_interfaces/Indirect/inc/Indirect/ContainerSubtraction.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ContainerSubtraction.h
rename to qt/scientific_interfaces/Indirect/inc/Indirect/ContainerSubtraction.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ContainerSubtraction.ui b/qt/scientific_interfaces/Indirect/inc/Indirect/ContainerSubtraction.ui
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ContainerSubtraction.ui
rename to qt/scientific_interfaces/Indirect/inc/Indirect/ContainerSubtraction.ui
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ConvFit.h b/qt/scientific_interfaces/Indirect/inc/Indirect/ConvFit.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ConvFit.h
rename to qt/scientific_interfaces/Indirect/inc/Indirect/ConvFit.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ConvFit.ui b/qt/scientific_interfaces/Indirect/inc/Indirect/ConvFit.ui
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ConvFit.ui
rename to qt/scientific_interfaces/Indirect/inc/Indirect/ConvFit.ui
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/CorrectionsTab.h b/qt/scientific_interfaces/Indirect/inc/Indirect/CorrectionsTab.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/CorrectionsTab.h
rename to qt/scientific_interfaces/Indirect/inc/Indirect/CorrectionsTab.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/DensityOfStates.h b/qt/scientific_interfaces/Indirect/inc/Indirect/DensityOfStates.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/DensityOfStates.h
rename to qt/scientific_interfaces/Indirect/inc/Indirect/DensityOfStates.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/DensityOfStates.ui b/qt/scientific_interfaces/Indirect/inc/Indirect/DensityOfStates.ui
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/DensityOfStates.ui
rename to qt/scientific_interfaces/Indirect/inc/Indirect/DensityOfStates.ui
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/Elwin.h b/qt/scientific_interfaces/Indirect/inc/Indirect/Elwin.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/Elwin.h
rename to qt/scientific_interfaces/Indirect/inc/Indirect/Elwin.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/Elwin.ui b/qt/scientific_interfaces/Indirect/inc/Indirect/Elwin.ui
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/Elwin.ui
rename to qt/scientific_interfaces/Indirect/inc/Indirect/Elwin.ui
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ILLCalibration.h b/qt/scientific_interfaces/Indirect/inc/Indirect/ILLCalibration.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ILLCalibration.h
rename to qt/scientific_interfaces/Indirect/inc/Indirect/ILLCalibration.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ILLCalibration.ui b/qt/scientific_interfaces/Indirect/inc/Indirect/ILLCalibration.ui
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ILLCalibration.ui
rename to qt/scientific_interfaces/Indirect/inc/Indirect/ILLCalibration.ui
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ILLEnergyTransfer.h b/qt/scientific_interfaces/Indirect/inc/Indirect/ILLEnergyTransfer.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ILLEnergyTransfer.h
rename to qt/scientific_interfaces/Indirect/inc/Indirect/ILLEnergyTransfer.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ILLEnergyTransfer.ui b/qt/scientific_interfaces/Indirect/inc/Indirect/ILLEnergyTransfer.ui
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ILLEnergyTransfer.ui
rename to qt/scientific_interfaces/Indirect/inc/Indirect/ILLEnergyTransfer.ui
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ISISCalibration.h b/qt/scientific_interfaces/Indirect/inc/Indirect/ISISCalibration.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ISISCalibration.h
rename to qt/scientific_interfaces/Indirect/inc/Indirect/ISISCalibration.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ISISCalibration.ui b/qt/scientific_interfaces/Indirect/inc/Indirect/ISISCalibration.ui
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ISISCalibration.ui
rename to qt/scientific_interfaces/Indirect/inc/Indirect/ISISCalibration.ui
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ISISDiagnostics.h b/qt/scientific_interfaces/Indirect/inc/Indirect/ISISDiagnostics.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ISISDiagnostics.h
rename to qt/scientific_interfaces/Indirect/inc/Indirect/ISISDiagnostics.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ISISDiagnostics.ui b/qt/scientific_interfaces/Indirect/inc/Indirect/ISISDiagnostics.ui
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ISISDiagnostics.ui
rename to qt/scientific_interfaces/Indirect/inc/Indirect/ISISDiagnostics.ui
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ISISEnergyTransfer.h b/qt/scientific_interfaces/Indirect/inc/Indirect/ISISEnergyTransfer.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ISISEnergyTransfer.h
rename to qt/scientific_interfaces/Indirect/inc/Indirect/ISISEnergyTransfer.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ISISEnergyTransfer.ui b/qt/scientific_interfaces/Indirect/inc/Indirect/ISISEnergyTransfer.ui
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ISISEnergyTransfer.ui
rename to qt/scientific_interfaces/Indirect/inc/Indirect/ISISEnergyTransfer.ui
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectBayes.h b/qt/scientific_interfaces/Indirect/inc/Indirect/IndirectBayes.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectBayes.h
rename to qt/scientific_interfaces/Indirect/inc/Indirect/IndirectBayes.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectBayes.ui b/qt/scientific_interfaces/Indirect/inc/Indirect/IndirectBayes.ui
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectBayes.ui
rename to qt/scientific_interfaces/Indirect/inc/Indirect/IndirectBayes.ui
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectBayesTab.h b/qt/scientific_interfaces/Indirect/inc/Indirect/IndirectBayesTab.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectBayesTab.h
rename to qt/scientific_interfaces/Indirect/inc/Indirect/IndirectBayesTab.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectCorrections.h b/qt/scientific_interfaces/Indirect/inc/Indirect/IndirectCorrections.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectCorrections.h
rename to qt/scientific_interfaces/Indirect/inc/Indirect/IndirectCorrections.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectCorrections.ui b/qt/scientific_interfaces/Indirect/inc/Indirect/IndirectCorrections.ui
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectCorrections.ui
rename to qt/scientific_interfaces/Indirect/inc/Indirect/IndirectCorrections.ui
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectDataAnalysis.h b/qt/scientific_interfaces/Indirect/inc/Indirect/IndirectDataAnalysis.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectDataAnalysis.h
rename to qt/scientific_interfaces/Indirect/inc/Indirect/IndirectDataAnalysis.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectDataAnalysis.ui b/qt/scientific_interfaces/Indirect/inc/Indirect/IndirectDataAnalysis.ui
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectDataAnalysis.ui
rename to qt/scientific_interfaces/Indirect/inc/Indirect/IndirectDataAnalysis.ui
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectDataAnalysisTab.h b/qt/scientific_interfaces/Indirect/inc/Indirect/IndirectDataAnalysisTab.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectDataAnalysisTab.h
rename to qt/scientific_interfaces/Indirect/inc/Indirect/IndirectDataAnalysisTab.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectDataReduction.h b/qt/scientific_interfaces/Indirect/inc/Indirect/IndirectDataReduction.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectDataReduction.h
rename to qt/scientific_interfaces/Indirect/inc/Indirect/IndirectDataReduction.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectDataReduction.ui b/qt/scientific_interfaces/Indirect/inc/Indirect/IndirectDataReduction.ui
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectDataReduction.ui
rename to qt/scientific_interfaces/Indirect/inc/Indirect/IndirectDataReduction.ui
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectDataReductionTab.h b/qt/scientific_interfaces/Indirect/inc/Indirect/IndirectDataReductionTab.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectDataReductionTab.h
rename to qt/scientific_interfaces/Indirect/inc/Indirect/IndirectDataReductionTab.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectDiffractionReduction.h b/qt/scientific_interfaces/Indirect/inc/Indirect/IndirectDiffractionReduction.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectDiffractionReduction.h
rename to qt/scientific_interfaces/Indirect/inc/Indirect/IndirectDiffractionReduction.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectDiffractionReduction.ui b/qt/scientific_interfaces/Indirect/inc/Indirect/IndirectDiffractionReduction.ui
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectDiffractionReduction.ui
rename to qt/scientific_interfaces/Indirect/inc/Indirect/IndirectDiffractionReduction.ui
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectLoadILL.h b/qt/scientific_interfaces/Indirect/inc/Indirect/IndirectLoadILL.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectLoadILL.h
rename to qt/scientific_interfaces/Indirect/inc/Indirect/IndirectLoadILL.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectLoadILL.ui b/qt/scientific_interfaces/Indirect/inc/Indirect/IndirectLoadILL.ui
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectLoadILL.ui
rename to qt/scientific_interfaces/Indirect/inc/Indirect/IndirectLoadILL.ui
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectMolDyn.h b/qt/scientific_interfaces/Indirect/inc/Indirect/IndirectMolDyn.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectMolDyn.h
rename to qt/scientific_interfaces/Indirect/inc/Indirect/IndirectMolDyn.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectMolDyn.ui b/qt/scientific_interfaces/Indirect/inc/Indirect/IndirectMolDyn.ui
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectMolDyn.ui
rename to qt/scientific_interfaces/Indirect/inc/Indirect/IndirectMolDyn.ui
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectMoments.h b/qt/scientific_interfaces/Indirect/inc/Indirect/IndirectMoments.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectMoments.h
rename to qt/scientific_interfaces/Indirect/inc/Indirect/IndirectMoments.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectMoments.ui b/qt/scientific_interfaces/Indirect/inc/Indirect/IndirectMoments.ui
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectMoments.ui
rename to qt/scientific_interfaces/Indirect/inc/Indirect/IndirectMoments.ui
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectSassena.h b/qt/scientific_interfaces/Indirect/inc/Indirect/IndirectSassena.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectSassena.h
rename to qt/scientific_interfaces/Indirect/inc/Indirect/IndirectSassena.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectSassena.ui b/qt/scientific_interfaces/Indirect/inc/Indirect/IndirectSassena.ui
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectSassena.ui
rename to qt/scientific_interfaces/Indirect/inc/Indirect/IndirectSassena.ui
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectSimulation.h b/qt/scientific_interfaces/Indirect/inc/Indirect/IndirectSimulation.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectSimulation.h
rename to qt/scientific_interfaces/Indirect/inc/Indirect/IndirectSimulation.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectSimulation.ui b/qt/scientific_interfaces/Indirect/inc/Indirect/IndirectSimulation.ui
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectSimulation.ui
rename to qt/scientific_interfaces/Indirect/inc/Indirect/IndirectSimulation.ui
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectSimulationTab.h b/qt/scientific_interfaces/Indirect/inc/Indirect/IndirectSimulationTab.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectSimulationTab.h
rename to qt/scientific_interfaces/Indirect/inc/Indirect/IndirectSimulationTab.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectSqw.h b/qt/scientific_interfaces/Indirect/inc/Indirect/IndirectSqw.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectSqw.h
rename to qt/scientific_interfaces/Indirect/inc/Indirect/IndirectSqw.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectSqw.ui b/qt/scientific_interfaces/Indirect/inc/Indirect/IndirectSqw.ui
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectSqw.ui
rename to qt/scientific_interfaces/Indirect/inc/Indirect/IndirectSqw.ui
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectSymmetrise.h b/qt/scientific_interfaces/Indirect/inc/Indirect/IndirectSymmetrise.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectSymmetrise.h
rename to qt/scientific_interfaces/Indirect/inc/Indirect/IndirectSymmetrise.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectSymmetrise.ui b/qt/scientific_interfaces/Indirect/inc/Indirect/IndirectSymmetrise.ui
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectSymmetrise.ui
rename to qt/scientific_interfaces/Indirect/inc/Indirect/IndirectSymmetrise.ui
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectTab.h b/qt/scientific_interfaces/Indirect/inc/Indirect/IndirectTab.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectTab.h
rename to qt/scientific_interfaces/Indirect/inc/Indirect/IndirectTab.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectTools.h b/qt/scientific_interfaces/Indirect/inc/Indirect/IndirectTools.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectTools.h
rename to qt/scientific_interfaces/Indirect/inc/Indirect/IndirectTools.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectTools.ui b/qt/scientific_interfaces/Indirect/inc/Indirect/IndirectTools.ui
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectTools.ui
rename to qt/scientific_interfaces/Indirect/inc/Indirect/IndirectTools.ui
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectToolsTab.h b/qt/scientific_interfaces/Indirect/inc/Indirect/IndirectToolsTab.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectToolsTab.h
rename to qt/scientific_interfaces/Indirect/inc/Indirect/IndirectToolsTab.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectTransmission.h b/qt/scientific_interfaces/Indirect/inc/Indirect/IndirectTransmission.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectTransmission.h
rename to qt/scientific_interfaces/Indirect/inc/Indirect/IndirectTransmission.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectTransmission.ui b/qt/scientific_interfaces/Indirect/inc/Indirect/IndirectTransmission.ui
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectTransmission.ui
rename to qt/scientific_interfaces/Indirect/inc/Indirect/IndirectTransmission.ui
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectTransmissionCalc.h b/qt/scientific_interfaces/Indirect/inc/Indirect/IndirectTransmissionCalc.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectTransmissionCalc.h
rename to qt/scientific_interfaces/Indirect/inc/Indirect/IndirectTransmissionCalc.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectTransmissionCalc.ui b/qt/scientific_interfaces/Indirect/inc/Indirect/IndirectTransmissionCalc.ui
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectTransmissionCalc.ui
rename to qt/scientific_interfaces/Indirect/inc/Indirect/IndirectTransmissionCalc.ui
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/Iqt.h b/qt/scientific_interfaces/Indirect/inc/Indirect/Iqt.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/Iqt.h
rename to qt/scientific_interfaces/Indirect/inc/Indirect/Iqt.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/Iqt.ui b/qt/scientific_interfaces/Indirect/inc/Indirect/Iqt.ui
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/Iqt.ui
rename to qt/scientific_interfaces/Indirect/inc/Indirect/Iqt.ui
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IqtFit.h b/qt/scientific_interfaces/Indirect/inc/Indirect/IqtFit.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IqtFit.h
rename to qt/scientific_interfaces/Indirect/inc/Indirect/IqtFit.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IqtFit.ui b/qt/scientific_interfaces/Indirect/inc/Indirect/IqtFit.ui
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IqtFit.ui
rename to qt/scientific_interfaces/Indirect/inc/Indirect/IqtFit.ui
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/JumpFit.h b/qt/scientific_interfaces/Indirect/inc/Indirect/JumpFit.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/JumpFit.h
rename to qt/scientific_interfaces/Indirect/inc/Indirect/JumpFit.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/JumpFit.ui b/qt/scientific_interfaces/Indirect/inc/Indirect/JumpFit.ui
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/JumpFit.ui
rename to qt/scientific_interfaces/Indirect/inc/Indirect/JumpFit.ui
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/MSDFit.h b/qt/scientific_interfaces/Indirect/inc/Indirect/MSDFit.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/MSDFit.h
rename to qt/scientific_interfaces/Indirect/inc/Indirect/MSDFit.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/MSDFit.ui b/qt/scientific_interfaces/Indirect/inc/Indirect/MSDFit.ui
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/MSDFit.ui
rename to qt/scientific_interfaces/Indirect/inc/Indirect/MSDFit.ui
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/Quasi.h b/qt/scientific_interfaces/Indirect/inc/Indirect/Quasi.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/Quasi.h
rename to qt/scientific_interfaces/Indirect/inc/Indirect/Quasi.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/Quasi.ui b/qt/scientific_interfaces/Indirect/inc/Indirect/Quasi.ui
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/Quasi.ui
rename to qt/scientific_interfaces/Indirect/inc/Indirect/Quasi.ui
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ResNorm.h b/qt/scientific_interfaces/Indirect/inc/Indirect/ResNorm.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ResNorm.h
rename to qt/scientific_interfaces/Indirect/inc/Indirect/ResNorm.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ResNorm.ui b/qt/scientific_interfaces/Indirect/inc/Indirect/ResNorm.ui
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ResNorm.ui
rename to qt/scientific_interfaces/Indirect/inc/Indirect/ResNorm.ui
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/Stretch.h b/qt/scientific_interfaces/Indirect/inc/Indirect/Stretch.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/Stretch.h
rename to qt/scientific_interfaces/Indirect/inc/Indirect/Stretch.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/Stretch.ui b/qt/scientific_interfaces/Indirect/inc/Indirect/Stretch.ui
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/Stretch.ui
rename to qt/scientific_interfaces/Indirect/inc/Indirect/Stretch.ui
diff --git a/MantidQt/CustomInterfaces/src/Indirect/AbsorptionCorrections.cpp b/qt/scientific_interfaces/Indirect/src/AbsorptionCorrections.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/Indirect/AbsorptionCorrections.cpp
rename to qt/scientific_interfaces/Indirect/src/AbsorptionCorrections.cpp
diff --git a/MantidQt/CustomInterfaces/src/Indirect/ApplyPaalmanPings.cpp b/qt/scientific_interfaces/Indirect/src/ApplyPaalmanPings.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/Indirect/ApplyPaalmanPings.cpp
rename to qt/scientific_interfaces/Indirect/src/ApplyPaalmanPings.cpp
diff --git a/MantidQt/CustomInterfaces/src/Indirect/CalculatePaalmanPings.cpp b/qt/scientific_interfaces/Indirect/src/CalculatePaalmanPings.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/Indirect/CalculatePaalmanPings.cpp
rename to qt/scientific_interfaces/Indirect/src/CalculatePaalmanPings.cpp
diff --git a/MantidQt/CustomInterfaces/src/Indirect/ContainerSubtraction.cpp b/qt/scientific_interfaces/Indirect/src/ContainerSubtraction.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/Indirect/ContainerSubtraction.cpp
rename to qt/scientific_interfaces/Indirect/src/ContainerSubtraction.cpp
diff --git a/MantidQt/CustomInterfaces/src/Indirect/ConvFit.cpp b/qt/scientific_interfaces/Indirect/src/ConvFit.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/Indirect/ConvFit.cpp
rename to qt/scientific_interfaces/Indirect/src/ConvFit.cpp
diff --git a/MantidQt/CustomInterfaces/src/Indirect/CorrectionsTab.cpp b/qt/scientific_interfaces/Indirect/src/CorrectionsTab.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/Indirect/CorrectionsTab.cpp
rename to qt/scientific_interfaces/Indirect/src/CorrectionsTab.cpp
diff --git a/MantidQt/CustomInterfaces/src/Indirect/DensityOfStates.cpp b/qt/scientific_interfaces/Indirect/src/DensityOfStates.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/Indirect/DensityOfStates.cpp
rename to qt/scientific_interfaces/Indirect/src/DensityOfStates.cpp
diff --git a/MantidQt/CustomInterfaces/src/Indirect/Elwin.cpp b/qt/scientific_interfaces/Indirect/src/Elwin.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/Indirect/Elwin.cpp
rename to qt/scientific_interfaces/Indirect/src/Elwin.cpp
diff --git a/MantidQt/CustomInterfaces/src/Indirect/ILLCalibration.cpp b/qt/scientific_interfaces/Indirect/src/ILLCalibration.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/Indirect/ILLCalibration.cpp
rename to qt/scientific_interfaces/Indirect/src/ILLCalibration.cpp
diff --git a/MantidQt/CustomInterfaces/src/Indirect/ILLEnergyTransfer.cpp b/qt/scientific_interfaces/Indirect/src/ILLEnergyTransfer.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/Indirect/ILLEnergyTransfer.cpp
rename to qt/scientific_interfaces/Indirect/src/ILLEnergyTransfer.cpp
diff --git a/MantidQt/CustomInterfaces/src/Indirect/ISISCalibration.cpp b/qt/scientific_interfaces/Indirect/src/ISISCalibration.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/Indirect/ISISCalibration.cpp
rename to qt/scientific_interfaces/Indirect/src/ISISCalibration.cpp
diff --git a/MantidQt/CustomInterfaces/src/Indirect/ISISDiagnostics.cpp b/qt/scientific_interfaces/Indirect/src/ISISDiagnostics.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/Indirect/ISISDiagnostics.cpp
rename to qt/scientific_interfaces/Indirect/src/ISISDiagnostics.cpp
diff --git a/MantidQt/CustomInterfaces/src/Indirect/ISISEnergyTransfer.cpp b/qt/scientific_interfaces/Indirect/src/ISISEnergyTransfer.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/Indirect/ISISEnergyTransfer.cpp
rename to qt/scientific_interfaces/Indirect/src/ISISEnergyTransfer.cpp
diff --git a/MantidQt/CustomInterfaces/src/Indirect/IndirectBayes.cpp b/qt/scientific_interfaces/Indirect/src/IndirectBayes.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/Indirect/IndirectBayes.cpp
rename to qt/scientific_interfaces/Indirect/src/IndirectBayes.cpp
diff --git a/MantidQt/CustomInterfaces/src/Indirect/IndirectBayesTab.cpp b/qt/scientific_interfaces/Indirect/src/IndirectBayesTab.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/Indirect/IndirectBayesTab.cpp
rename to qt/scientific_interfaces/Indirect/src/IndirectBayesTab.cpp
diff --git a/MantidQt/CustomInterfaces/src/Indirect/IndirectCorrections.cpp b/qt/scientific_interfaces/Indirect/src/IndirectCorrections.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/Indirect/IndirectCorrections.cpp
rename to qt/scientific_interfaces/Indirect/src/IndirectCorrections.cpp
diff --git a/MantidQt/CustomInterfaces/src/Indirect/IndirectDataAnalysis.cpp b/qt/scientific_interfaces/Indirect/src/IndirectDataAnalysis.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/Indirect/IndirectDataAnalysis.cpp
rename to qt/scientific_interfaces/Indirect/src/IndirectDataAnalysis.cpp
diff --git a/MantidQt/CustomInterfaces/src/Indirect/IndirectDataAnalysisTab.cpp b/qt/scientific_interfaces/Indirect/src/IndirectDataAnalysisTab.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/Indirect/IndirectDataAnalysisTab.cpp
rename to qt/scientific_interfaces/Indirect/src/IndirectDataAnalysisTab.cpp
diff --git a/MantidQt/CustomInterfaces/src/Indirect/IndirectDataReduction.cpp b/qt/scientific_interfaces/Indirect/src/IndirectDataReduction.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/Indirect/IndirectDataReduction.cpp
rename to qt/scientific_interfaces/Indirect/src/IndirectDataReduction.cpp
diff --git a/MantidQt/CustomInterfaces/src/Indirect/IndirectDataReductionTab.cpp b/qt/scientific_interfaces/Indirect/src/IndirectDataReductionTab.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/Indirect/IndirectDataReductionTab.cpp
rename to qt/scientific_interfaces/Indirect/src/IndirectDataReductionTab.cpp
diff --git a/MantidQt/CustomInterfaces/src/Indirect/IndirectDiffractionReduction.cpp b/qt/scientific_interfaces/Indirect/src/IndirectDiffractionReduction.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/Indirect/IndirectDiffractionReduction.cpp
rename to qt/scientific_interfaces/Indirect/src/IndirectDiffractionReduction.cpp
diff --git a/MantidQt/CustomInterfaces/src/Indirect/IndirectLoadILL.cpp b/qt/scientific_interfaces/Indirect/src/IndirectLoadILL.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/Indirect/IndirectLoadILL.cpp
rename to qt/scientific_interfaces/Indirect/src/IndirectLoadILL.cpp
diff --git a/MantidQt/CustomInterfaces/src/Indirect/IndirectMolDyn.cpp b/qt/scientific_interfaces/Indirect/src/IndirectMolDyn.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/Indirect/IndirectMolDyn.cpp
rename to qt/scientific_interfaces/Indirect/src/IndirectMolDyn.cpp
diff --git a/MantidQt/CustomInterfaces/src/Indirect/IndirectMoments.cpp b/qt/scientific_interfaces/Indirect/src/IndirectMoments.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/Indirect/IndirectMoments.cpp
rename to qt/scientific_interfaces/Indirect/src/IndirectMoments.cpp
diff --git a/MantidQt/CustomInterfaces/src/Indirect/IndirectSassena.cpp b/qt/scientific_interfaces/Indirect/src/IndirectSassena.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/Indirect/IndirectSassena.cpp
rename to qt/scientific_interfaces/Indirect/src/IndirectSassena.cpp
diff --git a/MantidQt/CustomInterfaces/src/Indirect/IndirectSimulation.cpp b/qt/scientific_interfaces/Indirect/src/IndirectSimulation.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/Indirect/IndirectSimulation.cpp
rename to qt/scientific_interfaces/Indirect/src/IndirectSimulation.cpp
diff --git a/MantidQt/CustomInterfaces/src/Indirect/IndirectSimulationTab.cpp b/qt/scientific_interfaces/Indirect/src/IndirectSimulationTab.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/Indirect/IndirectSimulationTab.cpp
rename to qt/scientific_interfaces/Indirect/src/IndirectSimulationTab.cpp
diff --git a/MantidQt/CustomInterfaces/src/Indirect/IndirectSqw.cpp b/qt/scientific_interfaces/Indirect/src/IndirectSqw.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/Indirect/IndirectSqw.cpp
rename to qt/scientific_interfaces/Indirect/src/IndirectSqw.cpp
diff --git a/MantidQt/CustomInterfaces/src/Indirect/IndirectSymmetrise.cpp b/qt/scientific_interfaces/Indirect/src/IndirectSymmetrise.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/Indirect/IndirectSymmetrise.cpp
rename to qt/scientific_interfaces/Indirect/src/IndirectSymmetrise.cpp
diff --git a/MantidQt/CustomInterfaces/src/Indirect/IndirectTab.cpp b/qt/scientific_interfaces/Indirect/src/IndirectTab.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/Indirect/IndirectTab.cpp
rename to qt/scientific_interfaces/Indirect/src/IndirectTab.cpp
diff --git a/MantidQt/CustomInterfaces/src/Indirect/IndirectTools.cpp b/qt/scientific_interfaces/Indirect/src/IndirectTools.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/Indirect/IndirectTools.cpp
rename to qt/scientific_interfaces/Indirect/src/IndirectTools.cpp
diff --git a/MantidQt/CustomInterfaces/src/Indirect/IndirectToolsTab.cpp b/qt/scientific_interfaces/Indirect/src/IndirectToolsTab.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/Indirect/IndirectToolsTab.cpp
rename to qt/scientific_interfaces/Indirect/src/IndirectToolsTab.cpp
diff --git a/MantidQt/CustomInterfaces/src/Indirect/IndirectTransmission.cpp b/qt/scientific_interfaces/Indirect/src/IndirectTransmission.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/Indirect/IndirectTransmission.cpp
rename to qt/scientific_interfaces/Indirect/src/IndirectTransmission.cpp
diff --git a/MantidQt/CustomInterfaces/src/Indirect/IndirectTransmissionCalc.cpp b/qt/scientific_interfaces/Indirect/src/IndirectTransmissionCalc.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/Indirect/IndirectTransmissionCalc.cpp
rename to qt/scientific_interfaces/Indirect/src/IndirectTransmissionCalc.cpp
diff --git a/MantidQt/CustomInterfaces/src/Indirect/Iqt.cpp b/qt/scientific_interfaces/Indirect/src/Iqt.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/Indirect/Iqt.cpp
rename to qt/scientific_interfaces/Indirect/src/Iqt.cpp
diff --git a/MantidQt/CustomInterfaces/src/Indirect/IqtFit.cpp b/qt/scientific_interfaces/Indirect/src/IqtFit.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/Indirect/IqtFit.cpp
rename to qt/scientific_interfaces/Indirect/src/IqtFit.cpp
diff --git a/MantidQt/CustomInterfaces/src/Indirect/JumpFit.cpp b/qt/scientific_interfaces/Indirect/src/JumpFit.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/Indirect/JumpFit.cpp
rename to qt/scientific_interfaces/Indirect/src/JumpFit.cpp
diff --git a/MantidQt/CustomInterfaces/src/Indirect/MSDFit.cpp b/qt/scientific_interfaces/Indirect/src/MSDFit.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/Indirect/MSDFit.cpp
rename to qt/scientific_interfaces/Indirect/src/MSDFit.cpp
diff --git a/MantidQt/CustomInterfaces/src/Indirect/Quasi.cpp b/qt/scientific_interfaces/Indirect/src/Quasi.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/Indirect/Quasi.cpp
rename to qt/scientific_interfaces/Indirect/src/Quasi.cpp
diff --git a/MantidQt/CustomInterfaces/src/Indirect/ResNorm.cpp b/qt/scientific_interfaces/Indirect/src/ResNorm.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/Indirect/ResNorm.cpp
rename to qt/scientific_interfaces/Indirect/src/ResNorm.cpp
diff --git a/MantidQt/CustomInterfaces/src/Indirect/Stretch.cpp b/qt/scientific_interfaces/Indirect/src/Stretch.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/Indirect/Stretch.cpp
rename to qt/scientific_interfaces/Indirect/src/Stretch.cpp
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/MultiDatasetFit/EditLocalParameterDialog.ui b/qt/scientific_interfaces/MultiDatasetFit/inc/MultiDatasetFit/EditLocalParameterDialog.ui
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/MultiDatasetFit/EditLocalParameterDialog.ui
rename to qt/scientific_interfaces/MultiDatasetFit/inc/MultiDatasetFit/EditLocalParameterDialog.ui
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/MultiDatasetFit/MDFAddWorkspaceDialog.h b/qt/scientific_interfaces/MultiDatasetFit/inc/MultiDatasetFit/MDFAddWorkspaceDialog.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/MultiDatasetFit/MDFAddWorkspaceDialog.h
rename to qt/scientific_interfaces/MultiDatasetFit/inc/MultiDatasetFit/MDFAddWorkspaceDialog.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/MultiDatasetFit/MDFAddWorkspaceDialog.ui b/qt/scientific_interfaces/MultiDatasetFit/inc/MultiDatasetFit/MDFAddWorkspaceDialog.ui
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/MultiDatasetFit/MDFAddWorkspaceDialog.ui
rename to qt/scientific_interfaces/MultiDatasetFit/inc/MultiDatasetFit/MDFAddWorkspaceDialog.ui
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/MultiDatasetFit/MDFDataController.h b/qt/scientific_interfaces/MultiDatasetFit/inc/MultiDatasetFit/MDFDataController.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/MultiDatasetFit/MDFDataController.h
rename to qt/scientific_interfaces/MultiDatasetFit/inc/MultiDatasetFit/MDFDataController.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/MultiDatasetFit/MDFDatasetPlotData.h b/qt/scientific_interfaces/MultiDatasetFit/inc/MultiDatasetFit/MDFDatasetPlotData.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/MultiDatasetFit/MDFDatasetPlotData.h
rename to qt/scientific_interfaces/MultiDatasetFit/inc/MultiDatasetFit/MDFDatasetPlotData.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/MultiDatasetFit/MDFEditLocalParameterDialog.h b/qt/scientific_interfaces/MultiDatasetFit/inc/MultiDatasetFit/MDFEditLocalParameterDialog.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/MultiDatasetFit/MDFEditLocalParameterDialog.h
rename to qt/scientific_interfaces/MultiDatasetFit/inc/MultiDatasetFit/MDFEditLocalParameterDialog.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/MultiDatasetFit/MDFFunctionPlotData.h b/qt/scientific_interfaces/MultiDatasetFit/inc/MultiDatasetFit/MDFFunctionPlotData.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/MultiDatasetFit/MDFFunctionPlotData.h
rename to qt/scientific_interfaces/MultiDatasetFit/inc/MultiDatasetFit/MDFFunctionPlotData.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/MultiDatasetFit/MDFLocalParameterEditor.h b/qt/scientific_interfaces/MultiDatasetFit/inc/MultiDatasetFit/MDFLocalParameterEditor.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/MultiDatasetFit/MDFLocalParameterEditor.h
rename to qt/scientific_interfaces/MultiDatasetFit/inc/MultiDatasetFit/MDFLocalParameterEditor.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/MultiDatasetFit/MDFLocalParameterItemDelegate.h b/qt/scientific_interfaces/MultiDatasetFit/inc/MultiDatasetFit/MDFLocalParameterItemDelegate.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/MultiDatasetFit/MDFLocalParameterItemDelegate.h
rename to qt/scientific_interfaces/MultiDatasetFit/inc/MultiDatasetFit/MDFLocalParameterItemDelegate.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/MultiDatasetFit/MDFLogValueFinder.h b/qt/scientific_interfaces/MultiDatasetFit/inc/MultiDatasetFit/MDFLogValueFinder.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/MultiDatasetFit/MDFLogValueFinder.h
rename to qt/scientific_interfaces/MultiDatasetFit/inc/MultiDatasetFit/MDFLogValueFinder.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/MultiDatasetFit/MDFPlotController.h b/qt/scientific_interfaces/MultiDatasetFit/inc/MultiDatasetFit/MDFPlotController.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/MultiDatasetFit/MDFPlotController.h
rename to qt/scientific_interfaces/MultiDatasetFit/inc/MultiDatasetFit/MDFPlotController.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/MultiDatasetFit/MultiDatasetFit.h b/qt/scientific_interfaces/MultiDatasetFit/inc/MultiDatasetFit/MultiDatasetFit.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/MultiDatasetFit/MultiDatasetFit.h
rename to qt/scientific_interfaces/MultiDatasetFit/inc/MultiDatasetFit/MultiDatasetFit.h
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/MultiDatasetFit/MultiDatasetFit.ui b/qt/scientific_interfaces/MultiDatasetFit/inc/MultiDatasetFit/MultiDatasetFit.ui
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/MultiDatasetFit/MultiDatasetFit.ui
rename to qt/scientific_interfaces/MultiDatasetFit/inc/MultiDatasetFit/MultiDatasetFit.ui
diff --git a/MantidQt/CustomInterfaces/src/MultiDatasetFit/MDFAddWorkspaceDialog.cpp b/qt/scientific_interfaces/MultiDatasetFit/src/MDFAddWorkspaceDialog.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/MultiDatasetFit/MDFAddWorkspaceDialog.cpp
rename to qt/scientific_interfaces/MultiDatasetFit/src/MDFAddWorkspaceDialog.cpp
diff --git a/MantidQt/CustomInterfaces/src/MultiDatasetFit/MDFDataController.cpp b/qt/scientific_interfaces/MultiDatasetFit/src/MDFDataController.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/MultiDatasetFit/MDFDataController.cpp
rename to qt/scientific_interfaces/MultiDatasetFit/src/MDFDataController.cpp
diff --git a/MantidQt/CustomInterfaces/src/MultiDatasetFit/MDFDatasetPlotData.cpp b/qt/scientific_interfaces/MultiDatasetFit/src/MDFDatasetPlotData.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/MultiDatasetFit/MDFDatasetPlotData.cpp
rename to qt/scientific_interfaces/MultiDatasetFit/src/MDFDatasetPlotData.cpp
diff --git a/MantidQt/CustomInterfaces/src/MultiDatasetFit/MDFEditLocalParameterDialog.cpp b/qt/scientific_interfaces/MultiDatasetFit/src/MDFEditLocalParameterDialog.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/MultiDatasetFit/MDFEditLocalParameterDialog.cpp
rename to qt/scientific_interfaces/MultiDatasetFit/src/MDFEditLocalParameterDialog.cpp
diff --git a/MantidQt/CustomInterfaces/src/MultiDatasetFit/MDFFunctionPlotData.cpp b/qt/scientific_interfaces/MultiDatasetFit/src/MDFFunctionPlotData.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/MultiDatasetFit/MDFFunctionPlotData.cpp
rename to qt/scientific_interfaces/MultiDatasetFit/src/MDFFunctionPlotData.cpp
diff --git a/MantidQt/CustomInterfaces/src/MultiDatasetFit/MDFLocalParameterEditor.cpp b/qt/scientific_interfaces/MultiDatasetFit/src/MDFLocalParameterEditor.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/MultiDatasetFit/MDFLocalParameterEditor.cpp
rename to qt/scientific_interfaces/MultiDatasetFit/src/MDFLocalParameterEditor.cpp
diff --git a/MantidQt/CustomInterfaces/src/MultiDatasetFit/MDFLocalParameterItemDelegate.cpp b/qt/scientific_interfaces/MultiDatasetFit/src/MDFLocalParameterItemDelegate.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/MultiDatasetFit/MDFLocalParameterItemDelegate.cpp
rename to qt/scientific_interfaces/MultiDatasetFit/src/MDFLocalParameterItemDelegate.cpp
diff --git a/MantidQt/CustomInterfaces/src/MultiDatasetFit/MDFLogValueFinder.cpp b/qt/scientific_interfaces/MultiDatasetFit/src/MDFLogValueFinder.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/MultiDatasetFit/MDFLogValueFinder.cpp
rename to qt/scientific_interfaces/MultiDatasetFit/src/MDFLogValueFinder.cpp
diff --git a/MantidQt/CustomInterfaces/src/MultiDatasetFit/MDFPlotController.cpp b/qt/scientific_interfaces/MultiDatasetFit/src/MDFPlotController.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/MultiDatasetFit/MDFPlotController.cpp
rename to qt/scientific_interfaces/MultiDatasetFit/src/MDFPlotController.cpp
diff --git a/MantidQt/CustomInterfaces/src/MultiDatasetFit/MultiDatasetFit.cpp b/qt/scientific_interfaces/MultiDatasetFit/src/MultiDatasetFit.cpp
similarity index 100%
rename from MantidQt/CustomInterfaces/src/MultiDatasetFit/MultiDatasetFit.cpp
rename to qt/scientific_interfaces/MultiDatasetFit/src/MultiDatasetFit.cpp
diff --git a/MantidQt/CustomInterfaces/src/Muon/ALCBaselineModellingModel.cpp b/qt/scientific_interfaces/Muon/ALCBaselineModellingModel.cpp
similarity index 98%
rename from MantidQt/CustomInterfaces/src/Muon/ALCBaselineModellingModel.cpp
rename to qt/scientific_interfaces/Muon/ALCBaselineModellingModel.cpp
index a553f6c6a2d..3b6738563d4 100644
--- a/MantidQt/CustomInterfaces/src/Muon/ALCBaselineModellingModel.cpp
+++ b/qt/scientific_interfaces/Muon/ALCBaselineModellingModel.cpp
@@ -1,6 +1,6 @@
-#include "MantidQtCustomInterfaces/Muon/ALCBaselineModellingModel.h"
+#include "ALCBaselineModellingModel.h"
-#include "MantidQtCustomInterfaces/Muon/ALCHelper.h"
+#include "ALCHelper.h"
#include "MantidAPI/AlgorithmManager.h"
#include "MantidAPI/FunctionFactory.h"
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/ALCBaselineModellingModel.h b/qt/scientific_interfaces/Muon/ALCBaselineModellingModel.h
similarity index 95%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/ALCBaselineModellingModel.h
rename to qt/scientific_interfaces/Muon/ALCBaselineModellingModel.h
index 2262a5302dc..80497c71902 100644
--- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/ALCBaselineModellingModel.h
+++ b/qt/scientific_interfaces/Muon/ALCBaselineModellingModel.h
@@ -2,10 +2,10 @@
#define MANTID_CUSTOMINTERFACES_ALCBASELINEMODELLINGMODEL_H_
#include "MantidKernel/System.h"
-#include "MantidQtCustomInterfaces/DllConfig.h"
+#include "DllConfig.h"
#include "MantidAPI/ITableWorkspace_fwd.h"
-#include "MantidQtCustomInterfaces/Muon/IALCBaselineModellingModel.h"
+#include "IALCBaselineModellingModel.h"
namespace MantidQt {
namespace CustomInterfaces {
@@ -33,7 +33,7 @@ namespace CustomInterfaces {
File change history is stored at: <https://github.com/mantidproject/mantid>
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
-class MANTIDQT_CUSTOMINTERFACES_DLL ALCBaselineModellingModel
+class MANTIDQT_MUONINTERFACE_DLL ALCBaselineModellingModel
: public IALCBaselineModellingModel {
public:
// -- IALCBaselineModellingModel interface
diff --git a/MantidQt/CustomInterfaces/src/Muon/ALCBaselineModellingPresenter.cpp b/qt/scientific_interfaces/Muon/ALCBaselineModellingPresenter.cpp
similarity index 97%
rename from MantidQt/CustomInterfaces/src/Muon/ALCBaselineModellingPresenter.cpp
rename to qt/scientific_interfaces/Muon/ALCBaselineModellingPresenter.cpp
index 7c05381c01c..f8ea5c5fdd2 100644
--- a/MantidQt/CustomInterfaces/src/Muon/ALCBaselineModellingPresenter.cpp
+++ b/qt/scientific_interfaces/Muon/ALCBaselineModellingPresenter.cpp
@@ -1,10 +1,10 @@
-#include "MantidQtCustomInterfaces/Muon/ALCBaselineModellingPresenter.h"
+#include "ALCBaselineModellingPresenter.h"
#include "MantidAPI/AlgorithmManager.h"
#include "MantidAPI/FunctionFactory.h"
#include "MantidAPI/MatrixWorkspace.h"
-#include "MantidQtCustomInterfaces/Muon/ALCHelper.h"
+#include "ALCHelper.h"
using namespace Mantid::API;
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/ALCBaselineModellingPresenter.h b/qt/scientific_interfaces/Muon/ALCBaselineModellingPresenter.h
similarity index 90%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/ALCBaselineModellingPresenter.h
rename to qt/scientific_interfaces/Muon/ALCBaselineModellingPresenter.h
index da2c9afc509..732ceefdfa5 100644
--- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/ALCBaselineModellingPresenter.h
+++ b/qt/scientific_interfaces/Muon/ALCBaselineModellingPresenter.h
@@ -3,9 +3,9 @@
#include "MantidKernel/System.h"
-#include "MantidQtCustomInterfaces/DllConfig.h"
-#include "MantidQtCustomInterfaces/Muon/IALCBaselineModellingView.h"
-#include "MantidQtCustomInterfaces/Muon/IALCBaselineModellingModel.h"
+#include "DllConfig.h"
+#include "IALCBaselineModellingView.h"
+#include "IALCBaselineModellingModel.h"
#include <QObject>
@@ -35,7 +35,7 @@ namespace CustomInterfaces {
File change history is stored at: <https://github.com/mantidproject/mantid>
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
-class MANTIDQT_CUSTOMINTERFACES_DLL ALCBaselineModellingPresenter
+class MANTIDQT_MUONINTERFACE_DLL ALCBaselineModellingPresenter
: public QObject {
Q_OBJECT
diff --git a/MantidQt/CustomInterfaces/src/Muon/ALCBaselineModellingView.cpp b/qt/scientific_interfaces/Muon/ALCBaselineModellingView.cpp
similarity index 98%
rename from MantidQt/CustomInterfaces/src/Muon/ALCBaselineModellingView.cpp
rename to qt/scientific_interfaces/Muon/ALCBaselineModellingView.cpp
index 64d70f9c9bd..b67b1f84a7c 100644
--- a/MantidQt/CustomInterfaces/src/Muon/ALCBaselineModellingView.cpp
+++ b/qt/scientific_interfaces/Muon/ALCBaselineModellingView.cpp
@@ -1,10 +1,10 @@
-#include "MantidQtCustomInterfaces/Muon/ALCBaselineModellingView.h"
+#include "ALCBaselineModellingView.h"
#include "MantidAPI/FunctionFactory.h"
#include "MantidAPI/FunctionDomain1D.h"
#include "MantidAPI/AlgorithmManager.h"
-#include "MantidQtAPI/HelpWindow.h"
-#include "MantidQtMantidWidgets/ErrorCurve.h"
+#include "MantidQtWidgets/Common/HelpWindow.h"
+#include "MantidQtWidgets/Common/ErrorCurve.h"
#include <boost/scoped_array.hpp>
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/ALCBaselineModellingView.h b/qt/scientific_interfaces/Muon/ALCBaselineModellingView.h
similarity index 94%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/ALCBaselineModellingView.h
rename to qt/scientific_interfaces/Muon/ALCBaselineModellingView.h
index dd7e7404d31..7c5772231c1 100644
--- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/ALCBaselineModellingView.h
+++ b/qt/scientific_interfaces/Muon/ALCBaselineModellingView.h
@@ -3,9 +3,9 @@
#include "MantidKernel/System.h"
-#include "MantidQtCustomInterfaces/DllConfig.h"
-#include "MantidQtCustomInterfaces/Muon/IALCBaselineModellingView.h"
-#include "MantidQtMantidWidgets/RangeSelector.h"
+#include "DllConfig.h"
+#include "IALCBaselineModellingView.h"
+#include "MantidQtWidgets/Common/RangeSelector.h"
#include "ui_ALCBaselineModellingView.h"
@@ -45,7 +45,7 @@ namespace CustomInterfaces {
File change history is stored at: <https://github.com/mantidproject/mantid>
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
-class MANTIDQT_CUSTOMINTERFACES_DLL ALCBaselineModellingView
+class MANTIDQT_MUONINTERFACE_DLL ALCBaselineModellingView
: public IALCBaselineModellingView {
Q_OBJECT
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/ALCBaselineModellingView.ui b/qt/scientific_interfaces/Muon/ALCBaselineModellingView.ui
similarity index 98%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/ALCBaselineModellingView.ui
rename to qt/scientific_interfaces/Muon/ALCBaselineModellingView.ui
index cd4faa0b2f6..6cedb77d8a4 100644
--- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/ALCBaselineModellingView.ui
+++ b/qt/scientific_interfaces/Muon/ALCBaselineModellingView.ui
@@ -170,7 +170,7 @@
<customwidget>
<class>MantidQt::MantidWidgets::FunctionBrowser</class>
<extends>QWidget</extends>
- <header>MantidQtMantidWidgets/FunctionBrowser.h</header>
+ <header>MantidQtWidgets/Common/FunctionBrowser.h</header>
<container>1</container>
</customwidget>
</customwidgets>
diff --git a/MantidQt/CustomInterfaces/src/Muon/ALCDataLoadingPresenter.cpp b/qt/scientific_interfaces/Muon/ALCDataLoadingPresenter.cpp
similarity index 97%
rename from MantidQt/CustomInterfaces/src/Muon/ALCDataLoadingPresenter.cpp
rename to qt/scientific_interfaces/Muon/ALCDataLoadingPresenter.cpp
index ebdee1463d6..7107b363c4a 100644
--- a/MantidQt/CustomInterfaces/src/Muon/ALCDataLoadingPresenter.cpp
+++ b/qt/scientific_interfaces/Muon/ALCDataLoadingPresenter.cpp
@@ -1,4 +1,4 @@
-#include "MantidQtCustomInterfaces/Muon/ALCDataLoadingPresenter.h"
+#include "ALCDataLoadingPresenter.h"
#include "MantidAPI/AlgorithmManager.h"
#include "MantidAPI/MatrixWorkspace.h"
@@ -6,10 +6,10 @@
#include "MantidKernel/Strings.h"
#include "MantidGeometry/Instrument.h"
-#include "MantidQtCustomInterfaces/Muon/ALCHelper.h"
-#include "MantidQtCustomInterfaces/Muon/MuonAnalysisHelper.h"
-#include "MantidQtAPI/AlgorithmInputHistory.h"
-#include "MantidQtCustomInterfaces/Muon/ALCLatestFileFinder.h"
+#include "ALCHelper.h"
+#include "MuonAnalysisHelper.h"
+#include "MantidQtWidgets/Common/AlgorithmInputHistory.h"
+#include "ALCLatestFileFinder.h"
#include <Poco/ActiveResult.h>
#include <Poco/Path.h>
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/ALCDataLoadingPresenter.h b/qt/scientific_interfaces/Muon/ALCDataLoadingPresenter.h
similarity index 94%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/ALCDataLoadingPresenter.h
rename to qt/scientific_interfaces/Muon/ALCDataLoadingPresenter.h
index 8e707a61ae1..0d0d3e15ec3 100644
--- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/ALCDataLoadingPresenter.h
+++ b/qt/scientific_interfaces/Muon/ALCDataLoadingPresenter.h
@@ -3,8 +3,8 @@
#include "MantidKernel/System.h"
-#include "MantidQtCustomInterfaces/DllConfig.h"
-#include "MantidQtCustomInterfaces/Muon/IALCDataLoadingView.h"
+#include "DllConfig.h"
+#include "IALCDataLoadingView.h"
#include <QObject>
#include <QFileSystemWatcher>
@@ -37,7 +37,7 @@ namespace CustomInterfaces {
File change history is stored at: <https://github.com/mantidproject/mantid>
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
-class MANTIDQT_CUSTOMINTERFACES_DLL ALCDataLoadingPresenter : public QObject {
+class MANTIDQT_MUONINTERFACE_DLL ALCDataLoadingPresenter : public QObject {
Q_OBJECT
public:
diff --git a/MantidQt/CustomInterfaces/src/Muon/ALCDataLoadingView.cpp b/qt/scientific_interfaces/Muon/ALCDataLoadingView.cpp
similarity index 97%
rename from MantidQt/CustomInterfaces/src/Muon/ALCDataLoadingView.cpp
rename to qt/scientific_interfaces/Muon/ALCDataLoadingView.cpp
index b9f180ec0a6..bfd8d1d5e2b 100644
--- a/MantidQt/CustomInterfaces/src/Muon/ALCDataLoadingView.cpp
+++ b/qt/scientific_interfaces/Muon/ALCDataLoadingView.cpp
@@ -1,8 +1,8 @@
-#include "MantidQtCustomInterfaces/Muon/ALCDataLoadingView.h"
+#include "ALCDataLoadingView.h"
-#include "MantidQtAPI/HelpWindow.h"
-#include "MantidQtMantidWidgets/ErrorCurve.h"
-#include "MantidQtMantidWidgets/LogValueSelector.h"
+#include "MantidQtWidgets/Common/HelpWindow.h"
+#include "MantidQtWidgets/Common/ErrorCurve.h"
+#include "MantidQtWidgets/Common/LogValueSelector.h"
#include <QMessageBox>
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/ALCDataLoadingView.h b/qt/scientific_interfaces/Muon/ALCDataLoadingView.h
similarity index 94%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/ALCDataLoadingView.h
rename to qt/scientific_interfaces/Muon/ALCDataLoadingView.h
index 29bd0c7715d..cc98435de78 100644
--- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/ALCDataLoadingView.h
+++ b/qt/scientific_interfaces/Muon/ALCDataLoadingView.h
@@ -3,9 +3,9 @@
#include "MantidKernel/System.h"
-#include "MantidQtCustomInterfaces/DllConfig.h"
-#include "MantidQtCustomInterfaces/Muon/IALCDataLoadingView.h"
-#include "MantidQtCustomInterfaces/Muon/ALCDataLoadingPresenter.h"
+#include "DllConfig.h"
+#include "IALCDataLoadingView.h"
+#include "ALCDataLoadingPresenter.h"
#include "ui_ALCDataLoadingView.h"
@@ -48,7 +48,7 @@ namespace CustomInterfaces {
/**
*
*/
-class MANTIDQT_CUSTOMINTERFACES_DLL ALCDataLoadingView
+class MANTIDQT_MUONINTERFACE_DLL ALCDataLoadingView
: public IALCDataLoadingView {
public:
ALCDataLoadingView(QWidget *widget);
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/ALCDataLoadingView.ui b/qt/scientific_interfaces/Muon/ALCDataLoadingView.ui
similarity index 99%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/ALCDataLoadingView.ui
rename to qt/scientific_interfaces/Muon/ALCDataLoadingView.ui
index eb60fe4880c..d6892fbb76a 100644
--- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/ALCDataLoadingView.ui
+++ b/qt/scientific_interfaces/Muon/ALCDataLoadingView.ui
@@ -525,12 +525,12 @@
<customwidget>
<class>MantidQt::API::MWRunFiles</class>
<extends>QWidget</extends>
- <header>MantidQtAPI/MWRunFiles.h</header>
+ <header>MantidQtWidgets/Common/MWRunFiles.h</header>
</customwidget>
<customwidget>
<class>MantidQt::MantidWidgets::LogValueSelector</class>
<extends>QWidget</extends>
- <header>MantidQtMantidWidgets/LogValueSelector.h</header>
+ <header>MantidQtWidgets/Common/LogValueSelector.h</header>
<container>1</container>
</customwidget>
</customwidgets>
diff --git a/MantidQt/CustomInterfaces/src/Muon/ALCHelper.cpp b/qt/scientific_interfaces/Muon/ALCHelper.cpp
similarity index 98%
rename from MantidQt/CustomInterfaces/src/Muon/ALCHelper.cpp
rename to qt/scientific_interfaces/Muon/ALCHelper.cpp
index fadb771ac3b..8db1c2dcb26 100644
--- a/MantidQt/CustomInterfaces/src/Muon/ALCHelper.cpp
+++ b/qt/scientific_interfaces/Muon/ALCHelper.cpp
@@ -1,4 +1,4 @@
-#include "MantidQtCustomInterfaces/Muon/ALCHelper.h"
+#include "ALCHelper.h"
#include "MantidAPI/AlgorithmManager.h"
#include "MantidAPI/FunctionDomain1D.h"
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/ALCHelper.h b/qt/scientific_interfaces/Muon/ALCHelper.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/ALCHelper.h
rename to qt/scientific_interfaces/Muon/ALCHelper.h
diff --git a/MantidQt/CustomInterfaces/src/Muon/ALCInterface.cpp b/qt/scientific_interfaces/Muon/ALCInterface.cpp
similarity index 94%
rename from MantidQt/CustomInterfaces/src/Muon/ALCInterface.cpp
rename to qt/scientific_interfaces/Muon/ALCInterface.cpp
index 96b36a097b3..46a1600f707 100644
--- a/MantidQt/CustomInterfaces/src/Muon/ALCInterface.cpp
+++ b/qt/scientific_interfaces/Muon/ALCInterface.cpp
@@ -1,15 +1,15 @@
-#include "MantidQtCustomInterfaces/Muon/ALCInterface.h"
+#include "ALCInterface.h"
-#include "MantidQtCustomInterfaces/Muon/ALCDataLoadingView.h"
-#include "MantidQtCustomInterfaces/Muon/ALCBaselineModellingView.h"
-#include "MantidQtCustomInterfaces/Muon/ALCPeakFittingView.h"
+#include "ALCDataLoadingView.h"
+#include "ALCBaselineModellingView.h"
+#include "ALCPeakFittingView.h"
-#include "MantidQtCustomInterfaces/Muon/ALCDataLoadingPresenter.h"
-#include "MantidQtCustomInterfaces/Muon/ALCBaselineModellingPresenter.h"
-#include "MantidQtCustomInterfaces/Muon/ALCPeakFittingPresenter.h"
+#include "ALCDataLoadingPresenter.h"
+#include "ALCBaselineModellingPresenter.h"
+#include "ALCPeakFittingPresenter.h"
-#include "MantidQtCustomInterfaces/Muon/ALCBaselineModellingModel.h"
-#include "MantidQtCustomInterfaces/Muon/ALCPeakFittingModel.h"
+#include "ALCBaselineModellingModel.h"
+#include "ALCPeakFittingModel.h"
#include "QInputDialog"
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/ALCInterface.h b/qt/scientific_interfaces/Muon/ALCInterface.h
similarity index 93%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/ALCInterface.h
rename to qt/scientific_interfaces/Muon/ALCInterface.h
index 5d46d031f17..835bdac003c 100644
--- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/ALCInterface.h
+++ b/qt/scientific_interfaces/Muon/ALCInterface.h
@@ -3,9 +3,9 @@
#include "MantidKernel/System.h"
-#include "MantidQtCustomInterfaces/DllConfig.h"
+#include "DllConfig.h"
-#include "MantidQtAPI/UserSubWindow.h"
+#include "MantidQtWidgets/Common/UserSubWindow.h"
#include "ui_ALCInterface.h"
@@ -47,7 +47,7 @@ class ALCPeakFittingModel;
File change history is stored at: <https://github.com/mantidproject/mantid>
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
-class MANTIDQT_CUSTOMINTERFACES_DLL ALCInterface : public API::UserSubWindow {
+class MANTIDQT_MUONINTERFACE_DLL ALCInterface : public API::UserSubWindow {
Q_OBJECT
public:
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/ALCInterface.ui b/qt/scientific_interfaces/Muon/ALCInterface.ui
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/ALCInterface.ui
rename to qt/scientific_interfaces/Muon/ALCInterface.ui
diff --git a/MantidQt/CustomInterfaces/src/Muon/ALCLatestFileFinder.cpp b/qt/scientific_interfaces/Muon/ALCLatestFileFinder.cpp
similarity index 97%
rename from MantidQt/CustomInterfaces/src/Muon/ALCLatestFileFinder.cpp
rename to qt/scientific_interfaces/Muon/ALCLatestFileFinder.cpp
index 3c51c2fc185..23d6c2be72b 100644
--- a/MantidQt/CustomInterfaces/src/Muon/ALCLatestFileFinder.cpp
+++ b/qt/scientific_interfaces/Muon/ALCLatestFileFinder.cpp
@@ -1,4 +1,4 @@
-#include "MantidQtCustomInterfaces/Muon/ALCLatestFileFinder.h"
+#include "ALCLatestFileFinder.h"
#include <Poco/DirectoryIterator.h>
#include <Poco/Exception.h>
#include <cctype>
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/ALCLatestFileFinder.h b/qt/scientific_interfaces/Muon/ALCLatestFileFinder.h
similarity index 94%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/ALCLatestFileFinder.h
rename to qt/scientific_interfaces/Muon/ALCLatestFileFinder.h
index d975ac65b84..b98103caf4a 100644
--- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/ALCLatestFileFinder.h
+++ b/qt/scientific_interfaces/Muon/ALCLatestFileFinder.h
@@ -1,7 +1,7 @@
#ifndef MANTID_CUSTOMINTERFACES_ALCLATESTFILEFINDER_H_
#define MANTID_CUSTOMINTERFACES_ALCLATESTFILEFINDER_H_
-#include "MantidQtCustomInterfaces/DllConfig.h"
+#include "DllConfig.h"
#include <string>
namespace MantidQt {
@@ -30,7 +30,7 @@ namespace CustomInterfaces {
File change history is stored at: <https://github.com/mantidproject/mantid>
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
-class MANTIDQT_CUSTOMINTERFACES_DLL ALCLatestFileFinder {
+class MANTIDQT_MUONINTERFACE_DLL ALCLatestFileFinder {
public:
/// Constructor - takes filename of first run
explicit ALCLatestFileFinder(const std::string &firstRunFile)
diff --git a/MantidQt/CustomInterfaces/src/Muon/ALCPeakFittingModel.cpp b/qt/scientific_interfaces/Muon/ALCPeakFittingModel.cpp
similarity index 94%
rename from MantidQt/CustomInterfaces/src/Muon/ALCPeakFittingModel.cpp
rename to qt/scientific_interfaces/Muon/ALCPeakFittingModel.cpp
index 77331b800f9..917f83aebd6 100644
--- a/MantidQt/CustomInterfaces/src/Muon/ALCPeakFittingModel.cpp
+++ b/qt/scientific_interfaces/Muon/ALCPeakFittingModel.cpp
@@ -1,6 +1,6 @@
-#include "MantidQtCustomInterfaces/Muon/ALCPeakFittingModel.h"
+#include "ALCPeakFittingModel.h"
-#include "MantidQtCustomInterfaces/Muon/ALCHelper.h"
+#include "ALCHelper.h"
#include "MantidAPI/AlgorithmManager.h"
#include "MantidAPI/TextAxis.h"
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/ALCPeakFittingModel.h b/qt/scientific_interfaces/Muon/ALCPeakFittingModel.h
similarity index 94%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/ALCPeakFittingModel.h
rename to qt/scientific_interfaces/Muon/ALCPeakFittingModel.h
index 6a44bf0919a..d898cd95a77 100644
--- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/ALCPeakFittingModel.h
+++ b/qt/scientific_interfaces/Muon/ALCPeakFittingModel.h
@@ -3,8 +3,8 @@
#include "MantidKernel/System.h"
-#include "MantidQtCustomInterfaces/DllConfig.h"
-#include "MantidQtCustomInterfaces/Muon/IALCPeakFittingModel.h"
+#include "DllConfig.h"
+#include "IALCPeakFittingModel.h"
#include "MantidAPI/ITableWorkspace_fwd.h"
namespace MantidQt {
@@ -33,7 +33,7 @@ namespace CustomInterfaces {
File change history is stored at: <https://github.com/mantidproject/mantid>
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
-class MANTIDQT_CUSTOMINTERFACES_DLL ALCPeakFittingModel
+class MANTIDQT_MUONINTERFACE_DLL ALCPeakFittingModel
: public IALCPeakFittingModel {
public:
// -- IALCPeakFittingModel interface
diff --git a/MantidQt/CustomInterfaces/src/Muon/ALCPeakFittingPresenter.cpp b/qt/scientific_interfaces/Muon/ALCPeakFittingPresenter.cpp
similarity index 97%
rename from MantidQt/CustomInterfaces/src/Muon/ALCPeakFittingPresenter.cpp
rename to qt/scientific_interfaces/Muon/ALCPeakFittingPresenter.cpp
index f9b6805bcdd..93949f9c000 100644
--- a/MantidQt/CustomInterfaces/src/Muon/ALCPeakFittingPresenter.cpp
+++ b/qt/scientific_interfaces/Muon/ALCPeakFittingPresenter.cpp
@@ -1,10 +1,10 @@
-#include "MantidQtCustomInterfaces/Muon/ALCPeakFittingPresenter.h"
+#include "ALCPeakFittingPresenter.h"
#include "MantidAPI/AlgorithmManager.h"
#include "MantidAPI/FunctionFactory.h"
#include "MantidAPI/MatrixWorkspace.h"
-#include "MantidQtCustomInterfaces/Muon/ALCHelper.h"
+#include "ALCHelper.h"
using namespace Mantid::API;
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/ALCPeakFittingPresenter.h b/qt/scientific_interfaces/Muon/ALCPeakFittingPresenter.h
similarity index 90%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/ALCPeakFittingPresenter.h
rename to qt/scientific_interfaces/Muon/ALCPeakFittingPresenter.h
index 02735d7ec40..5641a2b5c7f 100644
--- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/ALCPeakFittingPresenter.h
+++ b/qt/scientific_interfaces/Muon/ALCPeakFittingPresenter.h
@@ -3,10 +3,10 @@
#include "MantidKernel/System.h"
-#include "MantidQtCustomInterfaces/DllConfig.h"
+#include "DllConfig.h"
-#include "MantidQtCustomInterfaces/Muon/IALCPeakFittingView.h"
-#include "MantidQtCustomInterfaces/Muon/IALCPeakFittingModel.h"
+#include "IALCPeakFittingView.h"
+#include "IALCPeakFittingModel.h"
namespace MantidQt {
namespace CustomInterfaces {
@@ -34,7 +34,7 @@ namespace CustomInterfaces {
File change history is stored at: <https://github.com/mantidproject/mantid>
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
-class MANTIDQT_CUSTOMINTERFACES_DLL ALCPeakFittingPresenter : public QObject {
+class MANTIDQT_MUONINTERFACE_DLL ALCPeakFittingPresenter : public QObject {
Q_OBJECT
public:
diff --git a/MantidQt/CustomInterfaces/src/Muon/ALCPeakFittingView.cpp b/qt/scientific_interfaces/Muon/ALCPeakFittingView.cpp
similarity index 96%
rename from MantidQt/CustomInterfaces/src/Muon/ALCPeakFittingView.cpp
rename to qt/scientific_interfaces/Muon/ALCPeakFittingView.cpp
index 25d2eb4e5b1..e69c1364c08 100644
--- a/MantidQt/CustomInterfaces/src/Muon/ALCPeakFittingView.cpp
+++ b/qt/scientific_interfaces/Muon/ALCPeakFittingView.cpp
@@ -1,7 +1,7 @@
-#include "MantidQtCustomInterfaces/Muon/ALCPeakFittingView.h"
+#include "ALCPeakFittingView.h"
-#include "MantidQtAPI/HelpWindow.h"
-#include "MantidQtMantidWidgets/ErrorCurve.h"
+#include "MantidQtWidgets/Common/HelpWindow.h"
+#include "MantidQtWidgets/Common/ErrorCurve.h"
#include <QMessageBox>
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/ALCPeakFittingView.h b/qt/scientific_interfaces/Muon/ALCPeakFittingView.h
similarity index 93%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/ALCPeakFittingView.h
rename to qt/scientific_interfaces/Muon/ALCPeakFittingView.h
index ed42c3dbf1c..9c1f8b92946 100644
--- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/ALCPeakFittingView.h
+++ b/qt/scientific_interfaces/Muon/ALCPeakFittingView.h
@@ -3,9 +3,9 @@
#include "MantidKernel/System.h"
-#include "MantidQtCustomInterfaces/DllConfig.h"
-#include "MantidQtCustomInterfaces/Muon/IALCPeakFittingView.h"
-#include "MantidQtMantidWidgets/PeakPicker.h"
+#include "DllConfig.h"
+#include "IALCPeakFittingView.h"
+#include "MantidQtWidgets/Common/PeakPicker.h"
#include "ui_ALCPeakFittingView.h"
@@ -45,7 +45,7 @@ namespace CustomInterfaces {
File change history is stored at: <https://github.com/mantidproject/mantid>
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
-class MANTIDQT_CUSTOMINTERFACES_DLL ALCPeakFittingView
+class MANTIDQT_MUONINTERFACE_DLL ALCPeakFittingView
: public IALCPeakFittingView {
public:
ALCPeakFittingView(QWidget *widget);
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/ALCPeakFittingView.ui b/qt/scientific_interfaces/Muon/ALCPeakFittingView.ui
similarity index 98%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/ALCPeakFittingView.ui
rename to qt/scientific_interfaces/Muon/ALCPeakFittingView.ui
index 7802c1b4845..c5d7da4e95e 100644
--- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/ALCPeakFittingView.ui
+++ b/qt/scientific_interfaces/Muon/ALCPeakFittingView.ui
@@ -98,7 +98,7 @@
<customwidget>
<class>MantidQt::MantidWidgets::FunctionBrowser</class>
<extends>QWidget</extends>
- <header>MantidQtMantidWidgets/FunctionBrowser.h</header>
+ <header>MantidQtWidgets/Common/FunctionBrowser.h</header>
<container>1</container>
</customwidget>
</customwidgets>
diff --git a/qt/scientific_interfaces/Muon/CMakeLists.txt b/qt/scientific_interfaces/Muon/CMakeLists.txt
new file mode 100644
index 00000000000..50cfa1cdcc0
--- /dev/null
+++ b/qt/scientific_interfaces/Muon/CMakeLists.txt
@@ -0,0 +1,140 @@
+set ( SRC_FILES
+ ALCBaselineModellingModel.cpp
+ ALCBaselineModellingPresenter.cpp
+ ALCBaselineModellingView.cpp
+ ALCDataLoadingPresenter.cpp
+ ALCDataLoadingView.cpp
+ ALCHelper.cpp
+ ALCInterface.cpp
+ ALCLatestFileFinder.cpp
+ ALCPeakFittingModel.cpp
+ ALCPeakFittingPresenter.cpp
+ ALCPeakFittingView.cpp
+ IO_MuonGrouping.cpp
+ MuonAnalysis.cpp
+ MuonAnalysisDataLoader.cpp
+ MuonAnalysisFitDataPresenter.cpp
+ MuonAnalysisFitDataTab.cpp
+ MuonAnalysisFitFunctionPresenter.cpp
+ MuonAnalysisHelper.cpp
+ MuonAnalysisOptionTab.cpp
+ MuonAnalysisResultTableCreator.cpp
+ MuonAnalysisResultTableTab.cpp
+ MuonSequentialFitDialog.cpp
+)
+
+# Include files aren't required, but this makes them appear in Visual Studio
+# IMPORTANT: Include files are required in the MOC_FILES set. Scroll down to find it.
+set ( INC_FILES
+ ALCBaselineModellingModel.h
+ ALCBaselineModellingPresenter.h
+ ALCBaselineModellingView.h
+ ALCDataLoadingPresenter.h
+ ALCDataLoadingView.h
+ ALCHelper.h
+ ALCInterface.h
+ ALCLatestFileFinder.h
+ ALCPeakFittingModel.h
+ ALCPeakFittingPresenter.h
+ ALCPeakFittingView.h
+ DllConfig.h
+ IALCBaselineModellingModel.h
+ IALCBaselineModellingView.h
+ IALCDataLoadingView.h
+ IALCPeakFittingModel.h
+ IALCPeakFittingView.h
+ IO_MuonGrouping.h
+ MuonAnalysis.h
+ MuonAnalysisDataLoader.h
+ MuonAnalysisFitDataPresenter.h
+ MuonAnalysisFitDataTab.h
+ MuonAnalysisFitFunctionPresenter.h
+ MuonAnalysisHelper.h
+ MuonAnalysisOptionTab.h
+ MuonAnalysisResultTableCreator.h
+ MuonAnalysisResultTableTab.h
+ MuonSequentialFitDialog.h
+)
+
+set ( MOC_FILES
+ ALCBaselineModellingPresenter.h
+ ALCBaselineModellingView.h
+ ALCDataLoadingPresenter.h
+ ALCInterface.h
+ ALCPeakFittingPresenter.h
+ IALCBaselineModellingView.h
+ IALCBaselineModellingModel.h
+ IALCDataLoadingView.h
+ IALCPeakFittingView.h
+ IALCPeakFittingModel.h
+ MuonAnalysis.h
+ MuonAnalysisFitDataPresenter.h
+ MuonAnalysisFitDataTab.h
+ MuonAnalysisFitFunctionPresenter.h
+ MuonAnalysisHelper.h
+ MuonAnalysisOptionTab.h
+ MuonAnalysisResultTableTab.h
+ MuonSequentialFitDialog.h
+)
+
+set ( UI_FILES
+ ALCBaselineModellingView.ui
+ ALCDataLoadingView.ui
+ ALCInterface.ui
+ ALCPeakFittingView.ui
+ MuonAnalysis.ui
+ MuonSequentialFitDialog.ui
+)
+
+include_directories ( ../../qt/widgets/common/inc )
+
+# Ugly hack to get around issue in Boost version 1.48.0
+# in conjunction with Qt 4.7.4 or greater
+set ( qt_version ${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH} )
+if ( ${Boost_VERSION} GREATER 104799 AND ${qt_version} VERSION_GREATER 4.7.3 )
+ set( extra_options "-DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED")
+else ( ${Boost_VERSION} GREATER 104799 AND ${qt_version} VERSION_GREATER 4.7.3 )
+ set ( extra_options "" )
+endif ( ${Boost_VERSION} GREATER 104799 AND ${qt_version} VERSION_GREATER 4.7.3 )
+
+qt4_wrap_cpp ( MOCCED_FILES ${MOC_FILES} OPTIONS ${extra_options} )
+
+qt4_add_resources ( RES_FILES icons/CustomInterfacesIcons.qrc )
+
+set ( ALL_SRC ${SRC_FILES} ${MOCCED_FILES} )#${RES_FILES})
+
+qt4_wrap_ui ( UI_HDRS ${UI_FILES} )
+include_directories ( ${CMAKE_CURRENT_BINARY_DIR} )
+
+# Use a precompiled header where they are supported
+enable_precompiled_headers( PrecompiledHeader.h ALL_SRC )
+add_library ( MantidScientificInterfacesMuon ${ALL_SRC} ${INC_FILES} ${UI_HDRS} )
+
+# Set the name of the generated library
+set_target_properties ( MantidScientificInterfacesMuon PROPERTIES COMPILE_DEFINITIONS IN_MANTIDQT_MUONINTERFACE )
+if ( MSVC_IDE )
+# # Add to the 'MantidQt' group in VS
+ set_property ( TARGET MantidScientificInterfacesMuon PROPERTY FOLDER "ScientificInterfaces" )
+endif()
+
+if (OSX_VERSION VERSION_GREATER 10.8)
+ set_target_properties ( MantidScientificInterfacesMuon PROPERTIES INSTALL_RPATH "@loader_path/../../../Contents/MacOS")
+endif ()
+
+find_Package(Threads)
+
+target_link_libraries ( MantidScientificInterfacesMuon LINK_PRIVATE ${TCMALLOC_LIBRARIES_LINKTIME}
+ qtwidgetscommon
+ ${CORE_MANTIDLIBS}
+ ${QT_LIBRARIES}
+ ${QWT_LIBRARIES}
+ ${POCO_LIBRARIES}
+ ${Boost_LIBRARIES}
+ ${JSONCPP_LIBRARIES}
+ ${CMAKE_THREAD_LIBS_INIT})
+
+###########################################################################
+# Installation settings
+###########################################################################
+
+install ( TARGETS MantidScientificInterfacesMuon ${SYSTEM_PACKAGE_TARGET} DESTINATION ${PLUGINS_DIR}/qtplugins/mantid )
diff --git a/qt/scientific_interfaces/Muon/DllConfig.h b/qt/scientific_interfaces/Muon/DllConfig.h
new file mode 100644
index 00000000000..6d4ec95177e
--- /dev/null
+++ b/qt/scientific_interfaces/Muon/DllConfig.h
@@ -0,0 +1,39 @@
+#ifndef MANTIDQTCUSTOMINTERFACES_DLLCONFIG_H_
+#define MANTIDQTCUSTOMINTERFACES_DLLCONFIG_H_
+
+#include "MantidKernel/System.h"
+
+/*
+ This file contains the DLLExport/DLLImport linkage configuration for the
+ MantidQt CustomInterfaces library
+
+ Copyright © 2013 ISIS Rutherford Appleton Laboratory, NScD Oak Ridge
+ National Laboratory & European Spallation Source
+
+ This file is part of Mantid.
+
+ Mantid is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ Mantid is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ File change history is stored at: <https://github.com/mantidproject/mantid>.
+ Code Documentation is available at: <http://doxygen.mantidproject.org>
+*/
+#ifdef IN_MANTIDQT_MUONINTERFACE
+#define MANTIDQT_MUONINTERFACE_DLL DLLExport
+#define EXTERN_MANTIDQT_MUONINTERFACE
+#else
+#define MANTIDQT_MUONINTERFACE_DLL DLLImport
+#define EXTERN_MANTIDQT_MUONINTERFACE EXTERN_IMPORT
+#endif
+
+#endif // MANTIDQTCUSTOMINTERFACES_DLLCONFIG_H_
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/IALCBaselineModellingModel.h b/qt/scientific_interfaces/Muon/IALCBaselineModellingModel.h
similarity index 95%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/IALCBaselineModellingModel.h
rename to qt/scientific_interfaces/Muon/IALCBaselineModellingModel.h
index 00a515a858e..18f24cd06ea 100644
--- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/IALCBaselineModellingModel.h
+++ b/qt/scientific_interfaces/Muon/IALCBaselineModellingModel.h
@@ -3,7 +3,7 @@
#include "MantidKernel/System.h"
-#include "MantidQtCustomInterfaces/DllConfig.h"
+#include "DllConfig.h"
#include "MantidAPI/MatrixWorkspace_fwd.h"
#include "MantidAPI/IFunction.h"
@@ -36,7 +36,7 @@ namespace CustomInterfaces {
File change history is stored at: <https://github.com/mantidproject/mantid>
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
-class MANTIDQT_CUSTOMINTERFACES_DLL IALCBaselineModellingModel
+class MANTIDQT_MUONINTERFACE_DLL IALCBaselineModellingModel
: public QObject {
Q_OBJECT
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/IALCBaselineModellingView.h b/qt/scientific_interfaces/Muon/IALCBaselineModellingView.h
similarity index 97%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/IALCBaselineModellingView.h
rename to qt/scientific_interfaces/Muon/IALCBaselineModellingView.h
index 51825797310..2a9eb8dbc04 100644
--- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/IALCBaselineModellingView.h
+++ b/qt/scientific_interfaces/Muon/IALCBaselineModellingView.h
@@ -4,7 +4,7 @@
#include "MantidKernel/System.h"
#include "MantidAPI/IFunction.h"
-#include "MantidQtCustomInterfaces/DllConfig.h"
+#include "DllConfig.h"
#include <QObject>
#include "qwt_data.h"
@@ -35,7 +35,7 @@ namespace CustomInterfaces {
File change history is stored at: <https://github.com/mantidproject/mantid>
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
-class MANTIDQT_CUSTOMINTERFACES_DLL IALCBaselineModellingView : public QObject {
+class MANTIDQT_MUONINTERFACE_DLL IALCBaselineModellingView : public QObject {
Q_OBJECT
public:
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/IALCDataLoadingView.h b/qt/scientific_interfaces/Muon/IALCDataLoadingView.h
similarity index 97%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/IALCDataLoadingView.h
rename to qt/scientific_interfaces/Muon/IALCDataLoadingView.h
index aaf702dfb36..787c5924be4 100644
--- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/IALCDataLoadingView.h
+++ b/qt/scientific_interfaces/Muon/IALCDataLoadingView.h
@@ -3,7 +3,7 @@
#include "MantidAPI/MatrixWorkspace_fwd.h"
-#include "MantidQtCustomInterfaces/DllConfig.h"
+#include "DllConfig.h"
#include "MantidKernel/System.h"
#include <QObject>
@@ -35,7 +35,7 @@ namespace CustomInterfaces {
File change history is stored at: <https://github.com/mantidproject/mantid>
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
-class MANTIDQT_CUSTOMINTERFACES_DLL IALCDataLoadingView : public QObject {
+class MANTIDQT_MUONINTERFACE_DLL IALCDataLoadingView : public QObject {
Q_OBJECT
public:
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/IALCPeakFittingModel.h b/qt/scientific_interfaces/Muon/IALCPeakFittingModel.h
similarity index 94%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/IALCPeakFittingModel.h
rename to qt/scientific_interfaces/Muon/IALCPeakFittingModel.h
index bcaacfb66e3..a6f1a666ec2 100644
--- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/IALCPeakFittingModel.h
+++ b/qt/scientific_interfaces/Muon/IALCPeakFittingModel.h
@@ -1,7 +1,7 @@
#ifndef MANTID_CUSTOMINTERFACES_IALCPEAKFITTINGMODEL_H_
#define MANTID_CUSTOMINTERFACES_IALCPEAKFITTINGMODEL_H_
-#include "MantidQtCustomInterfaces/DllConfig.h"
+#include "DllConfig.h"
#include "MantidKernel/System.h"
#include "MantidAPI/IFunction.h"
@@ -35,7 +35,7 @@ namespace CustomInterfaces {
File change history is stored at: <https://github.com/mantidproject/mantid>
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
-class MANTIDQT_CUSTOMINTERFACES_DLL IALCPeakFittingModel : public QObject {
+class MANTIDQT_MUONINTERFACE_DLL IALCPeakFittingModel : public QObject {
Q_OBJECT
public:
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/IALCPeakFittingView.h b/qt/scientific_interfaces/Muon/IALCPeakFittingView.h
similarity index 97%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/IALCPeakFittingView.h
rename to qt/scientific_interfaces/Muon/IALCPeakFittingView.h
index e33857b245a..92ce30fd9dc 100644
--- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/IALCPeakFittingView.h
+++ b/qt/scientific_interfaces/Muon/IALCPeakFittingView.h
@@ -5,7 +5,7 @@
#include "MantidAPI/IPeakFunction.h"
#include "MantidAPI/MatrixWorkspace_fwd.h"
-#include "MantidQtCustomInterfaces/DllConfig.h"
+#include "DllConfig.h"
#include <QObject>
#include <boost/optional.hpp>
@@ -38,7 +38,7 @@ namespace CustomInterfaces {
File change history is stored at: <https://github.com/mantidproject/mantid>
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
-class MANTIDQT_CUSTOMINTERFACES_DLL IALCPeakFittingView : public QObject {
+class MANTIDQT_MUONINTERFACE_DLL IALCPeakFittingView : public QObject {
Q_OBJECT
public:
diff --git a/MantidQt/CustomInterfaces/src/Muon/IO_MuonGrouping.cpp b/qt/scientific_interfaces/Muon/IO_MuonGrouping.cpp
similarity index 98%
rename from MantidQt/CustomInterfaces/src/Muon/IO_MuonGrouping.cpp
rename to qt/scientific_interfaces/Muon/IO_MuonGrouping.cpp
index a4ea9faff8e..b15f8035066 100644
--- a/MantidQt/CustomInterfaces/src/Muon/IO_MuonGrouping.cpp
+++ b/qt/scientific_interfaces/Muon/IO_MuonGrouping.cpp
@@ -1,11 +1,11 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include "MantidQtCustomInterfaces/Muon/IO_MuonGrouping.h"
+#include "IO_MuonGrouping.h"
#include "MantidAPI/MatrixWorkspace.h"
#include "MantidAPI/WorkspaceFactory.h"
-#include "MantidQtAPI/UserSubWindow.h"
+#include "MantidQtWidgets/Common/UserSubWindow.h"
#include <Poco/DOM/Document.h>
#include <Poco/DOM/DOMParser.h>
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/IO_MuonGrouping.h b/qt/scientific_interfaces/Muon/IO_MuonGrouping.h
similarity index 95%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/IO_MuonGrouping.h
rename to qt/scientific_interfaces/Muon/IO_MuonGrouping.h
index 68b752ba74f..30c5acbb259 100644
--- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/IO_MuonGrouping.h
+++ b/qt/scientific_interfaces/Muon/IO_MuonGrouping.h
@@ -6,7 +6,7 @@
//----------------------
#include "ui_MuonAnalysis.h"
#include "MantidAPI/GroupingLoader.h"
-#include "MantidQtCustomInterfaces/DllConfig.h"
+#include "DllConfig.h"
namespace MantidQt {
namespace CustomInterfaces {
@@ -40,7 +40,7 @@ File change history is stored at: <https://github.com/mantidproject/mantid>
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
-class MANTIDQT_CUSTOMINTERFACES_DLL MuonGroupingHelper {
+class MANTIDQT_MUONINTERFACE_DLL MuonGroupingHelper {
public:
/// Constructor
MuonGroupingHelper(Ui::MuonAnalysis &uiForm) : m_uiForm(uiForm){};
diff --git a/MantidQt/CustomInterfaces/src/Muon/MuonAnalysis.cpp b/qt/scientific_interfaces/Muon/MuonAnalysis.cpp
similarity index 99%
rename from MantidQt/CustomInterfaces/src/Muon/MuonAnalysis.cpp
rename to qt/scientific_interfaces/Muon/MuonAnalysis.cpp
index 61bd89b31ef..62c744c50da 100644
--- a/MantidQt/CustomInterfaces/src/Muon/MuonAnalysis.cpp
+++ b/qt/scientific_interfaces/Muon/MuonAnalysis.cpp
@@ -1,4 +1,4 @@
-#include "MantidQtCustomInterfaces/Muon/MuonAnalysis.h"
+#include "MuonAnalysis.h"
#include "MantidAPI/AlgorithmManager.h"
#include "MantidAPI/AnalysisDataService.h"
#include "MantidAPI/FrameworkManager.h"
@@ -18,17 +18,18 @@
#include "MantidKernel/Logger.h"
#include "MantidKernel/Strings.h"
#include "MantidKernel/cow_ptr.h"
-#include "MantidQtAPI/HelpWindow.h"
-#include "MantidQtAPI/ManageUserDirectories.h"
-#include "MantidQtCustomInterfaces/Muon/MuonAnalysisFitDataPresenter.h"
-#include "MantidQtCustomInterfaces/Muon/MuonAnalysisFitDataTab.h"
-#include "MantidQtCustomInterfaces/Muon/MuonAnalysisFitFunctionPresenter.h"
-#include "MantidQtCustomInterfaces/Muon/MuonAnalysisOptionTab.h"
-#include "MantidQtCustomInterfaces/Muon/MuonAnalysisResultTableTab.h"
-#include "MantidQtCustomInterfaces/Muon/MuonSequentialFitDialog.h"
-#include "MantidQtMantidWidgets/MuonFitDataSelector.h"
-#include "MantidQtMantidWidgets/MuonFitPropertyBrowser.h"
-#include "MantidQtMantidWidgets/MuonFunctionBrowser.h"
+#include "MantidQtWidgets/Common/HelpWindow.h"
+#include "MantidQtWidgets/Common/ManageUserDirectories.h"
+#include "MuonAnalysisFitDataPresenter.h"
+#include "MuonAnalysisFitDataTab.h"
+#include "MuonAnalysisFitFunctionPresenter.h"
+#include "MuonAnalysisOptionTab.h"
+#include "MuonAnalysisResultTableTab.h"
+#include "MuonSequentialFitDialog.h"
+#include "MantidQtWidgets/Common/MuonFitDataSelector.h"
+#include "MantidQtWidgets/Common/MuonFitPropertyBrowser.h"
+#include "MantidQtWidgets/Common/MuonFunctionBrowser.h"
+#include "MantidQtWidgets/Common/QtPropertyBrowser/qtpropertybrowser.h"
#include <Poco/File.h>
#include <Poco/Path.h>
@@ -51,7 +52,6 @@
#include <QTextStream>
#include <QTreeWidgetItem>
#include <QVariant>
-#include <QtProperty>
#include <fstream>
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/MuonAnalysis.h b/qt/scientific_interfaces/Muon/MuonAnalysis.h
similarity index 98%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/MuonAnalysis.h
rename to qt/scientific_interfaces/Muon/MuonAnalysis.h
index 792fcd97006..79ba63f9e2c 100644
--- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/MuonAnalysis.h
+++ b/qt/scientific_interfaces/Muon/MuonAnalysis.h
@@ -13,12 +13,12 @@
#include "MantidGeometry/Instrument.h"
-#include "MantidQtAPI/UserSubWindow.h"
-#include "MantidQtMantidWidgets/pythonCalc.h"
-#include "MantidQtMantidWidgets/MWDiag.h"
-#include "MantidQtCustomInterfaces/Muon/IO_MuonGrouping.h"
-#include "MantidQtCustomInterfaces/Muon/MuonAnalysisDataLoader.h"
-#include "MantidQtCustomInterfaces/Muon/MuonAnalysisHelper.h"
+#include "MantidQtWidgets/Common/UserSubWindow.h"
+#include "MantidQtWidgets/Common/pythonCalc.h"
+#include "MantidQtWidgets/Common/MWDiag.h"
+#include "IO_MuonGrouping.h"
+#include "MuonAnalysisDataLoader.h"
+#include "MuonAnalysisHelper.h"
#include <map>
#include <boost/optional/optional.hpp>
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/MuonAnalysis.ui b/qt/scientific_interfaces/Muon/MuonAnalysis.ui
similarity index 99%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/MuonAnalysis.ui
rename to qt/scientific_interfaces/Muon/MuonAnalysis.ui
index 66b372aea07..16e9de61d92 100644
--- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/MuonAnalysis.ui
+++ b/qt/scientific_interfaces/Muon/MuonAnalysis.ui
@@ -2730,23 +2730,23 @@ p, li { white-space: pre-wrap; }
<customwidget>
<class>MantidQt::API::MWRunFiles</class>
<extends>QWidget</extends>
- <header>MantidQtAPI/MWRunFiles.h</header>
+ <header>MantidQtWidgets/Common/MWRunFiles.h</header>
</customwidget>
<customwidget>
<class>MantidQt::MantidWidgets::InstrumentSelector</class>
<extends>QComboBox</extends>
- <header>MantidQtMantidWidgets/InstrumentSelector.h</header>
+ <header>MantidQtWidgets/Common/InstrumentSelector.h</header>
</customwidget>
<customwidget>
<class>MantidQt::MantidWidgets::FitPropertyBrowser</class>
<extends>QDockWidget</extends>
- <header>MantidQtMantidWidgets/FitPropertyBrowser.h</header>
+ <header>MantidQtWidgets/Common/FitPropertyBrowser.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>MantidQt::MantidWidgets::MuonFitPropertyBrowser</class>
<extends>MantidQt::MantidWidgets::FitPropertyBrowser</extends>
- <header>MantidQtMantidWidgets/MuonFitPropertyBrowser.h</header>
+ <header>MantidQtWidgets/Common/MuonFitPropertyBrowser.h</header>
<container>1</container>
</customwidget>
</customwidgets>
diff --git a/MantidQt/CustomInterfaces/src/Muon/MuonAnalysisDataLoader.cpp b/qt/scientific_interfaces/Muon/MuonAnalysisDataLoader.cpp
similarity index 99%
rename from MantidQt/CustomInterfaces/src/Muon/MuonAnalysisDataLoader.cpp
rename to qt/scientific_interfaces/Muon/MuonAnalysisDataLoader.cpp
index 667a4404e4f..d575891ea32 100644
--- a/MantidQt/CustomInterfaces/src/Muon/MuonAnalysisDataLoader.cpp
+++ b/qt/scientific_interfaces/Muon/MuonAnalysisDataLoader.cpp
@@ -1,11 +1,11 @@
-#include "MantidQtCustomInterfaces/Muon/MuonAnalysisDataLoader.h"
+#include "MuonAnalysisDataLoader.h"
#include "MantidAPI/AlgorithmManager.h"
#include "MantidAPI/ITableWorkspace.h"
#include "MantidAPI/MatrixWorkspace.h"
#include "MantidAPI/WorkspaceGroup.h"
#include "MantidGeometry/Instrument.h"
-#include "MantidQtCustomInterfaces/Muon/MuonAnalysisHelper.h"
+#include "MuonAnalysisHelper.h"
using Mantid::API::AlgorithmManager;
using Mantid::API::IAlgorithm_sptr;
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/MuonAnalysisDataLoader.h b/qt/scientific_interfaces/Muon/MuonAnalysisDataLoader.h
similarity index 96%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/MuonAnalysisDataLoader.h
rename to qt/scientific_interfaces/Muon/MuonAnalysisDataLoader.h
index 07e29612cc0..415c5ba0050 100644
--- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/MuonAnalysisDataLoader.h
+++ b/qt/scientific_interfaces/Muon/MuonAnalysisDataLoader.h
@@ -1,8 +1,8 @@
#ifndef MANTIDQT_CUSTOMINTERFACES_MUONANALYSISDATALOADER_H_
#define MANTIDQT_CUSTOMINTERFACES_MUONANALYSISDATALOADER_H_
-#include "MantidQtCustomInterfaces/DllConfig.h"
-#include "MantidQtCustomInterfaces/Muon/MuonAnalysisHelper.h"
+#include "DllConfig.h"
+#include "MuonAnalysisHelper.h"
#include "MantidAPI/IAlgorithm_fwd.h"
#include "MantidAPI/ITableWorkspace_fwd.h"
#include "MantidAPI/GroupingLoader.h"
@@ -67,7 +67,7 @@ struct AnalysisOptions {
File change history is stored at: <https://github.com/mantidproject/mantid>
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
-class MANTIDQT_CUSTOMINTERFACES_DLL MuonAnalysisDataLoader {
+class MANTIDQT_MUONINTERFACE_DLL MuonAnalysisDataLoader {
public:
/// constructor
MuonAnalysisDataLoader(const Muon::DeadTimesType &deadTimesType,
diff --git a/MantidQt/CustomInterfaces/src/Muon/MuonAnalysisFitDataPresenter.cpp b/qt/scientific_interfaces/Muon/MuonAnalysisFitDataPresenter.cpp
similarity index 99%
rename from MantidQt/CustomInterfaces/src/Muon/MuonAnalysisFitDataPresenter.cpp
rename to qt/scientific_interfaces/Muon/MuonAnalysisFitDataPresenter.cpp
index b35a7338e78..ba2be0f1b1f 100644
--- a/MantidQt/CustomInterfaces/src/Muon/MuonAnalysisFitDataPresenter.cpp
+++ b/qt/scientific_interfaces/Muon/MuonAnalysisFitDataPresenter.cpp
@@ -7,10 +7,10 @@
#include "MantidAPI/Workspace_fwd.h"
#include "MantidAPI/WorkspaceFactory.h"
#include "MantidAPI/WorkspaceGroup.h"
-#include "MantidQtCustomInterfaces/Muon/MuonAnalysisFitDataPresenter.h"
-#include "MantidQtCustomInterfaces/Muon/MuonAnalysisHelper.h"
-#include "MantidQtCustomInterfaces/Muon/MuonSequentialFitDialog.h"
-#include "MantidQtMantidWidgets/MuonFitPropertyBrowser.h"
+#include "MuonAnalysisFitDataPresenter.h"
+#include "MuonAnalysisHelper.h"
+#include "MuonSequentialFitDialog.h"
+#include "MantidQtWidgets/Common/MuonFitPropertyBrowser.h"
#include <boost/lexical_cast.hpp>
using MantidQt::MantidWidgets::IMuonFitDataModel;
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/MuonAnalysisFitDataPresenter.h b/qt/scientific_interfaces/Muon/MuonAnalysisFitDataPresenter.h
similarity index 95%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/MuonAnalysisFitDataPresenter.h
rename to qt/scientific_interfaces/Muon/MuonAnalysisFitDataPresenter.h
index 5dc36a42339..c9767eb7eee 100644
--- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/MuonAnalysisFitDataPresenter.h
+++ b/qt/scientific_interfaces/Muon/MuonAnalysisFitDataPresenter.h
@@ -1,12 +1,12 @@
#ifndef MANTID_CUSTOMINTERFACES_MUONANALYSISFITDATAPRESENTER_H_
#define MANTID_CUSTOMINTERFACES_MUONANALYSISFITDATAPRESENTER_H_
-#include "MantidQtCustomInterfaces/DllConfig.h"
-#include "MantidQtCustomInterfaces/Muon/MuonAnalysisDataLoader.h"
-#include "MantidQtCustomInterfaces/Muon/MuonAnalysisHelper.h"
-#include "MantidQtCustomInterfaces/Muon/MuonAnalysisOptionTab.h"
-#include "MantidQtMantidWidgets/IMuonFitDataSelector.h"
-#include "MantidQtMantidWidgets/IWorkspaceFitControl.h"
+#include "DllConfig.h"
+#include "MuonAnalysisDataLoader.h"
+#include "MuonAnalysisHelper.h"
+#include "MuonAnalysisOptionTab.h"
+#include "MantidQtWidgets/Common/IMuonFitDataSelector.h"
+#include "MantidQtWidgets/Common/IWorkspaceFitControl.h"
#include <QObject>
#include <boost/optional/optional.hpp>
@@ -61,7 +61,7 @@ public:
File change history is stored at: <https://github.com/mantidproject/mantid>
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
-class MANTIDQT_CUSTOMINTERFACES_DLL MuonAnalysisFitDataPresenter
+class MANTIDQT_MUONINTERFACE_DLL MuonAnalysisFitDataPresenter
: public QObject {
Q_OBJECT
public:
diff --git a/MantidQt/CustomInterfaces/src/Muon/MuonAnalysisFitDataTab.cpp b/qt/scientific_interfaces/Muon/MuonAnalysisFitDataTab.cpp
similarity index 94%
rename from MantidQt/CustomInterfaces/src/Muon/MuonAnalysisFitDataTab.cpp
rename to qt/scientific_interfaces/Muon/MuonAnalysisFitDataTab.cpp
index 4a5f90b1510..b3fa2bb308b 100644
--- a/MantidQt/CustomInterfaces/src/Muon/MuonAnalysisFitDataTab.cpp
+++ b/qt/scientific_interfaces/Muon/MuonAnalysisFitDataTab.cpp
@@ -1,12 +1,12 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include "MantidQtCustomInterfaces/Muon/MuonAnalysisFitDataTab.h"
+#include "MuonAnalysisFitDataTab.h"
#include "MantidAPI/Algorithm.h"
#include "MantidAPI/AlgorithmManager.h"
-#include "MantidQtAPI/HelpWindow.h"
-#include "MantidQtCustomInterfaces/Muon/MuonAnalysisHelper.h"
+#include "MantidQtWidgets/Common/HelpWindow.h"
+#include "MuonAnalysisHelper.h"
#include <boost/shared_ptr.hpp>
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/MuonAnalysisFitDataTab.h b/qt/scientific_interfaces/Muon/MuonAnalysisFitDataTab.h
similarity index 97%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/MuonAnalysisFitDataTab.h
rename to qt/scientific_interfaces/Muon/MuonAnalysisFitDataTab.h
index d27c6051c11..4d2e039379a 100644
--- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/MuonAnalysisFitDataTab.h
+++ b/qt/scientific_interfaces/Muon/MuonAnalysisFitDataTab.h
@@ -5,7 +5,7 @@
// Includes
//----------------------
#include "ui_MuonAnalysis.h"
-#include "MantidQtAPI/UserSubWindow.h"
+#include "MantidQtWidgets/Common/UserSubWindow.h"
#include "MantidAPI/AnalysisDataService.h"
#include "MantidAPI/MatrixWorkspace_fwd.h"
diff --git a/MantidQt/CustomInterfaces/src/Muon/MuonAnalysisFitFunctionPresenter.cpp b/qt/scientific_interfaces/Muon/MuonAnalysisFitFunctionPresenter.cpp
similarity index 98%
rename from MantidQt/CustomInterfaces/src/Muon/MuonAnalysisFitFunctionPresenter.cpp
rename to qt/scientific_interfaces/Muon/MuonAnalysisFitFunctionPresenter.cpp
index be8e4834773..8933f212c05 100644
--- a/MantidQt/CustomInterfaces/src/Muon/MuonAnalysisFitFunctionPresenter.cpp
+++ b/qt/scientific_interfaces/Muon/MuonAnalysisFitFunctionPresenter.cpp
@@ -1,5 +1,5 @@
-#include "MantidQtCustomInterfaces/Muon/MuonAnalysisFitFunctionPresenter.h"
-#include "MantidQtCustomInterfaces/MultiDatasetFit/MDFEditLocalParameterDialog.h"
+#include "MuonAnalysisFitFunctionPresenter.h"
+#include "MultiDatasetFit/MDFEditLocalParameterDialog.h"
#include "MantidAPI/IFunction.h"
using MantidQt::CustomInterfaces::MDF::EditLocalParameterDialog;
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/MuonAnalysisFitFunctionPresenter.h b/qt/scientific_interfaces/Muon/MuonAnalysisFitFunctionPresenter.h
similarity index 92%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/MuonAnalysisFitFunctionPresenter.h
rename to qt/scientific_interfaces/Muon/MuonAnalysisFitFunctionPresenter.h
index a26f1ea3cd5..f7a6af2d2ea 100644
--- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/MuonAnalysisFitFunctionPresenter.h
+++ b/qt/scientific_interfaces/Muon/MuonAnalysisFitFunctionPresenter.h
@@ -1,10 +1,10 @@
#ifndef MANTID_CUSTOMINTERFACES_MUONANALYSISFITFUNCTIONPRESENTER_H_
#define MANTID_CUSTOMINTERFACES_MUONANALYSISFITFUNCTIONPRESENTER_H_
-#include "MantidQtCustomInterfaces/DllConfig.h"
-#include "MantidQtCustomInterfaces/Muon/MuonAnalysisHelper.h"
-#include "MantidQtMantidWidgets/IFunctionBrowser.h"
-#include "MantidQtMantidWidgets/IMuonFitFunctionModel.h"
+#include "DllConfig.h"
+#include "MuonAnalysisHelper.h"
+#include "MantidQtWidgets/Common/IFunctionBrowser.h"
+#include "MantidQtWidgets/Common/IMuonFitFunctionModel.h"
#include <QObject>
namespace MantidQt {
@@ -37,7 +37,7 @@ namespace CustomInterfaces {
File change history is stored at: <https://github.com/mantidproject/mantid>
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
-class MANTIDQT_CUSTOMINTERFACES_DLL MuonAnalysisFitFunctionPresenter : QObject {
+class MANTIDQT_MUONINTERFACE_DLL MuonAnalysisFitFunctionPresenter : QObject {
Q_OBJECT
public:
/// Constructor
diff --git a/MantidQt/CustomInterfaces/src/Muon/MuonAnalysisHelper.cpp b/qt/scientific_interfaces/Muon/MuonAnalysisHelper.cpp
similarity index 99%
rename from MantidQt/CustomInterfaces/src/Muon/MuonAnalysisHelper.cpp
rename to qt/scientific_interfaces/Muon/MuonAnalysisHelper.cpp
index a7501a47be3..b79dd579291 100644
--- a/MantidQt/CustomInterfaces/src/Muon/MuonAnalysisHelper.cpp
+++ b/qt/scientific_interfaces/Muon/MuonAnalysisHelper.cpp
@@ -1,4 +1,4 @@
-#include "MantidQtCustomInterfaces/Muon/MuonAnalysisHelper.h"
+#include "MuonAnalysisHelper.h"
#include "MantidAPI/AlgorithmManager.h"
#include "MantidAPI/ITableWorkspace.h"
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/MuonAnalysisHelper.h b/qt/scientific_interfaces/Muon/MuonAnalysisHelper.h
similarity index 81%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/MuonAnalysisHelper.h
rename to qt/scientific_interfaces/Muon/MuonAnalysisHelper.h
index 988912f5392..1c2a75b2528 100644
--- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/MuonAnalysisHelper.h
+++ b/qt/scientific_interfaces/Muon/MuonAnalysisHelper.h
@@ -1,7 +1,7 @@
#ifndef MANTIDQT_CUSTOMINTERFACES_MUONANALYSISHELPER_H_
#define MANTIDQT_CUSTOMINTERFACES_MUONANALYSISHELPER_H_
-#include "MantidQtCustomInterfaces/DllConfig.h"
+#include "DllConfig.h"
#include "MantidKernel/System.h"
#include "MantidAPI/Workspace_fwd.h"
#include "MantidAPI/MatrixWorkspace_fwd.h"
@@ -43,100 +43,100 @@ enum class TFAsymmState { Enabled, Disabled };
namespace MuonAnalysisHelper {
/// Sets double validator for specified field
-MANTIDQT_CUSTOMINTERFACES_DLL void setDoubleValidator(QLineEdit *field,
+MANTIDQT_MUONINTERFACE_DLL void setDoubleValidator(QLineEdit *field,
bool allowEmpty = false);
/// Returns a first period MatrixWorkspace in a run workspace
-MANTIDQT_CUSTOMINTERFACES_DLL Mantid::API::MatrixWorkspace_sptr
+MANTIDQT_MUONINTERFACE_DLL Mantid::API::MatrixWorkspace_sptr
firstPeriod(Mantid::API::Workspace_sptr ws);
/// Validates the field and returns the value
-MANTIDQT_CUSTOMINTERFACES_DLL double
+MANTIDQT_MUONINTERFACE_DLL double
getValidatedDouble(QLineEdit *field, const QString &defaultValue,
const QString &valueDescr, Mantid::Kernel::Logger &log);
/// Returns a number of periods in a run workspace
-MANTIDQT_CUSTOMINTERFACES_DLL size_t numPeriods(Mantid::API::Workspace_sptr ws);
+MANTIDQT_MUONINTERFACE_DLL size_t numPeriods(Mantid::API::Workspace_sptr ws);
/// Print various information about the run
-MANTIDQT_CUSTOMINTERFACES_DLL void
+MANTIDQT_MUONINTERFACE_DLL void
printRunInfo(Mantid::API::MatrixWorkspace_sptr runWs, std::ostringstream &out);
/// Get a run label for the workspace
-MANTIDQT_CUSTOMINTERFACES_DLL std::string
+MANTIDQT_MUONINTERFACE_DLL std::string
getRunLabel(const Mantid::API::Workspace_sptr &ws);
/// Get a run label for a list of workspaces
-MANTIDQT_CUSTOMINTERFACES_DLL std::string
+MANTIDQT_MUONINTERFACE_DLL std::string
getRunLabel(const std::vector<Mantid::API::Workspace_sptr> &wsList);
/// Get a run label given instrument and run numbers
-MANTIDQT_CUSTOMINTERFACES_DLL std::string
+MANTIDQT_MUONINTERFACE_DLL std::string
getRunLabel(const std::string &instrument, const std::vector<int> &runNumbers);
/// Sums a list of workspaces together
-MANTIDQT_CUSTOMINTERFACES_DLL Mantid::API::Workspace_sptr
+MANTIDQT_MUONINTERFACE_DLL Mantid::API::Workspace_sptr
sumWorkspaces(const std::vector<Mantid::API::Workspace_sptr> &workspaces);
/// Makes sure the specified workspaces are in specified group
-MANTIDQT_CUSTOMINTERFACES_DLL void
+MANTIDQT_MUONINTERFACE_DLL void
groupWorkspaces(const std::string &groupName,
const std::vector<std::string> &inputWorkspaces);
/// Finds runs of consecutive numbers
-MANTIDQT_CUSTOMINTERFACES_DLL std::vector<std::pair<int, int>>
+MANTIDQT_MUONINTERFACE_DLL std::vector<std::pair<int, int>>
findConsecutiveRuns(const std::vector<int> &runs);
/// Replaces sample log value
-MANTIDQT_CUSTOMINTERFACES_DLL void replaceLogValue(const std::string &wsName,
+MANTIDQT_MUONINTERFACE_DLL void replaceLogValue(const std::string &wsName,
const std::string &logName,
const std::string &logValue);
/// Finds all of the values for a log
-MANTIDQT_CUSTOMINTERFACES_DLL std::vector<std::string>
+MANTIDQT_MUONINTERFACE_DLL std::vector<std::string>
findLogValues(const Mantid::API::Workspace_sptr ws, const std::string &logName);
/// Finds the range of values for a log
-MANTIDQT_CUSTOMINTERFACES_DLL std::pair<std::string, std::string> findLogRange(
+MANTIDQT_MUONINTERFACE_DLL std::pair<std::string, std::string> findLogRange(
const Mantid::API::Workspace_sptr ws, const std::string &logName,
bool (*isLessThan)(const std::string &first, const std::string &second));
/// Finds the range of values for a log for a vector of workspaces
-MANTIDQT_CUSTOMINTERFACES_DLL std::pair<std::string, std::string> findLogRange(
+MANTIDQT_MUONINTERFACE_DLL std::pair<std::string, std::string> findLogRange(
const std::vector<Mantid::API::Workspace_sptr> &workspaces,
const std::string &logName,
bool (*isLessThan)(const std::string &first, const std::string &second));
/// Concatenates time-series log of one workspace with the second
-MANTIDQT_CUSTOMINTERFACES_DLL void
+MANTIDQT_MUONINTERFACE_DLL void
appendTimeSeriesLogs(boost::shared_ptr<Mantid::API::Workspace> toAppend,
boost::shared_ptr<Mantid::API::Workspace> resultant,
const std::string &logName);
/// Parse analysis workspace name
-MANTIDQT_CUSTOMINTERFACES_DLL MantidQt::CustomInterfaces::Muon::DatasetParams
+MANTIDQT_MUONINTERFACE_DLL MantidQt::CustomInterfaces::Muon::DatasetParams
parseWorkspaceName(const std::string &wsName);
/// Generate new analysis workspace name
-MANTIDQT_CUSTOMINTERFACES_DLL std::string generateWorkspaceName(
+MANTIDQT_MUONINTERFACE_DLL std::string generateWorkspaceName(
const MantidQt::CustomInterfaces::Muon::DatasetParams ¶ms);
/// Get "run: period" string from workspace name
-MANTIDQT_CUSTOMINTERFACES_DLL QString
+MANTIDQT_MUONINTERFACE_DLL QString
runNumberString(const std::string &workspaceName, const std::string &firstRun);
/// Decide if grouping needs to be reloaded
-MANTIDQT_CUSTOMINTERFACES_DLL bool isReloadGroupingNecessary(
+MANTIDQT_MUONINTERFACE_DLL bool isReloadGroupingNecessary(
const boost::shared_ptr<Mantid::API::Workspace> currentWorkspace,
const boost::shared_ptr<Mantid::API::Workspace> loadedWorkspace);
/// Parse run label into instrument and runs
-MANTIDQT_CUSTOMINTERFACES_DLL void parseRunLabel(const std::string &label,
+MANTIDQT_MUONINTERFACE_DLL void parseRunLabel(const std::string &label,
std::string &instrument,
std::vector<int> &runNumbers);
/// Get colors for workspaces to go in table
-MANTIDQT_CUSTOMINTERFACES_DLL QMap<int, QColor> getWorkspaceColors(
+MANTIDQT_MUONINTERFACE_DLL QMap<int, QColor> getWorkspaceColors(
const std::vector<boost::shared_ptr<Mantid::API::Workspace>> &workspaces);
/**
@@ -144,7 +144,7 @@ MANTIDQT_CUSTOMINTERFACES_DLL QMap<int, QColor> getWorkspaceColors(
* registered and then on any
* change, their value is stored using QSettings.
*/
-class MANTIDQT_CUSTOMINTERFACES_DLL WidgetAutoSaver : QObject {
+class MANTIDQT_MUONINTERFACE_DLL WidgetAutoSaver : QObject {
Q_OBJECT
public:
@@ -199,7 +199,7 @@ private:
};
/// Validator which accepts valid doubles OR empty strings
-class MANTIDQT_CUSTOMINTERFACES_DLL DoubleOrEmptyValidator
+class MANTIDQT_MUONINTERFACE_DLL DoubleOrEmptyValidator
: public QDoubleValidator {
Q_OBJECT
diff --git a/MantidQt/CustomInterfaces/src/Muon/MuonAnalysisOptionTab.cpp b/qt/scientific_interfaces/Muon/MuonAnalysisOptionTab.cpp
similarity index 98%
rename from MantidQt/CustomInterfaces/src/Muon/MuonAnalysisOptionTab.cpp
rename to qt/scientific_interfaces/Muon/MuonAnalysisOptionTab.cpp
index 00b41a04f62..150d737084d 100644
--- a/MantidQt/CustomInterfaces/src/Muon/MuonAnalysisOptionTab.cpp
+++ b/qt/scientific_interfaces/Muon/MuonAnalysisOptionTab.cpp
@@ -1,9 +1,9 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include "MantidQtAPI/HelpWindow.h"
-#include "MantidQtCustomInterfaces/Muon/MuonAnalysisOptionTab.h"
-#include "MantidQtCustomInterfaces/Muon/MuonAnalysisHelper.h"
+#include "MantidQtWidgets/Common/HelpWindow.h"
+#include "MuonAnalysisOptionTab.h"
+#include "MuonAnalysisHelper.h"
#include <QLineEdit>
#include <QSettings>
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/MuonAnalysisOptionTab.h b/qt/scientific_interfaces/Muon/MuonAnalysisOptionTab.h
similarity index 98%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/MuonAnalysisOptionTab.h
rename to qt/scientific_interfaces/Muon/MuonAnalysisOptionTab.h
index 97fb9ab9374..6349e5a490b 100644
--- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/MuonAnalysisOptionTab.h
+++ b/qt/scientific_interfaces/Muon/MuonAnalysisOptionTab.h
@@ -6,7 +6,7 @@
//----------------------
#include "ui_MuonAnalysis.h"
-#include "MantidQtCustomInterfaces/Muon/MuonAnalysisHelper.h"
+#include "MuonAnalysisHelper.h"
namespace MantidQt {
namespace CustomInterfaces {
diff --git a/MantidQt/CustomInterfaces/src/Muon/MuonAnalysisResultTableCreator.cpp b/qt/scientific_interfaces/Muon/MuonAnalysisResultTableCreator.cpp
similarity index 99%
rename from MantidQt/CustomInterfaces/src/Muon/MuonAnalysisResultTableCreator.cpp
rename to qt/scientific_interfaces/Muon/MuonAnalysisResultTableCreator.cpp
index 12ddafb3d2b..836f2cf153a 100644
--- a/MantidQt/CustomInterfaces/src/Muon/MuonAnalysisResultTableCreator.cpp
+++ b/qt/scientific_interfaces/Muon/MuonAnalysisResultTableCreator.cpp
@@ -6,8 +6,8 @@
#include "MantidAPI/WorkspaceFactory.h"
#include "MantidAPI/WorkspaceGroup.h"
-#include "MantidQtCustomInterfaces/Muon/MuonAnalysisHelper.h"
-#include "MantidQtCustomInterfaces/Muon/MuonAnalysisResultTableCreator.h"
+#include "MuonAnalysisHelper.h"
+#include "MuonAnalysisResultTableCreator.h"
using Mantid::API::AnalysisDataService;
using Mantid::API::ITableWorkspace;
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/MuonAnalysisResultTableCreator.h b/qt/scientific_interfaces/Muon/MuonAnalysisResultTableCreator.h
similarity index 97%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/MuonAnalysisResultTableCreator.h
rename to qt/scientific_interfaces/Muon/MuonAnalysisResultTableCreator.h
index 6aaedc00eff..f8bdf14b3cf 100644
--- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/MuonAnalysisResultTableCreator.h
+++ b/qt/scientific_interfaces/Muon/MuonAnalysisResultTableCreator.h
@@ -1,7 +1,7 @@
#ifndef MANTIDQT_CUSTOMINTERFACES_MUONANALYSISRESULTTABLECREATOR_H_
#define MANTIDQT_CUSTOMINTERFACES_MUONANALYSISRESULTTABLECREATOR_H_
-#include "MantidQtCustomInterfaces/DllConfig.h"
+#include "DllConfig.h"
#include "MantidAPI/ITableWorkspace_fwd.h"
#include <QStringList>
@@ -36,7 +36,7 @@ typedef QMap<QString, QMap<QString, QVariant>> LogValuesMap;
File change history is stored at: <https://github.com/mantidproject/mantid>
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
-class MANTIDQT_CUSTOMINTERFACES_DLL MuonAnalysisResultTableCreator {
+class MANTIDQT_MUONINTERFACE_DLL MuonAnalysisResultTableCreator {
public:
/// Constructor
MuonAnalysisResultTableCreator(const QStringList &itemsSelected,
diff --git a/MantidQt/CustomInterfaces/src/Muon/MuonAnalysisResultTableTab.cpp b/qt/scientific_interfaces/Muon/MuonAnalysisResultTableTab.cpp
similarity index 98%
rename from MantidQt/CustomInterfaces/src/Muon/MuonAnalysisResultTableTab.cpp
rename to qt/scientific_interfaces/Muon/MuonAnalysisResultTableTab.cpp
index 51835401244..397bb84e1a0 100644
--- a/MantidQt/CustomInterfaces/src/Muon/MuonAnalysisResultTableTab.cpp
+++ b/qt/scientific_interfaces/Muon/MuonAnalysisResultTableTab.cpp
@@ -1,4 +1,4 @@
-#include "MantidQtCustomInterfaces/Muon/MuonAnalysisResultTableTab.h"
+#include "MuonAnalysisResultTableTab.h"
#include "MantidAPI/ExperimentInfo.h"
#include "MantidAPI/ITableWorkspace.h"
#include "MantidAPI/MatrixWorkspace.h"
@@ -9,12 +9,12 @@
#include "MantidKernel/ConfigService.h"
#include "MantidKernel/TimeSeriesProperty.h"
-#include "MantidQtMantidWidgets/MuonFitPropertyBrowser.h"
-#include "MantidQtAPI/HelpWindow.h"
-#include "MantidQtAPI/UserSubWindow.h"
-#include "MantidQtCustomInterfaces/Muon/MuonAnalysisHelper.h"
-#include "MantidQtCustomInterfaces/Muon/MuonAnalysisResultTableCreator.h"
-#include "MantidQtCustomInterfaces/Muon/MuonSequentialFitDialog.h"
+#include "MantidQtWidgets/Common/MuonFitPropertyBrowser.h"
+#include "MantidQtWidgets/Common/HelpWindow.h"
+#include "MantidQtWidgets/Common/UserSubWindow.h"
+#include "MuonAnalysisHelper.h"
+#include "MuonAnalysisResultTableCreator.h"
+#include "MuonSequentialFitDialog.h"
#include <boost/shared_ptr.hpp>
#include <boost/algorithm/string/predicate.hpp>
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/MuonAnalysisResultTableTab.h b/qt/scientific_interfaces/Muon/MuonAnalysisResultTableTab.h
similarity index 100%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/MuonAnalysisResultTableTab.h
rename to qt/scientific_interfaces/Muon/MuonAnalysisResultTableTab.h
diff --git a/MantidQt/CustomInterfaces/src/Muon/MuonSequentialFitDialog.cpp b/qt/scientific_interfaces/Muon/MuonSequentialFitDialog.cpp
similarity index 99%
rename from MantidQt/CustomInterfaces/src/Muon/MuonSequentialFitDialog.cpp
rename to qt/scientific_interfaces/Muon/MuonSequentialFitDialog.cpp
index 4b20fb0baaf..a1a3584c9eb 100644
--- a/MantidQt/CustomInterfaces/src/Muon/MuonSequentialFitDialog.cpp
+++ b/qt/scientific_interfaces/Muon/MuonSequentialFitDialog.cpp
@@ -1,4 +1,4 @@
-#include "MantidQtCustomInterfaces/Muon/MuonSequentialFitDialog.h"
+#include "MuonSequentialFitDialog.h"
#include "MantidAPI/AnalysisDataService.h"
#include "MantidAPI/AlgorithmProxy.h"
@@ -8,8 +8,8 @@
#include "MantidAPI/WorkspaceGroup.h"
#include "MantidAPI/WorkspaceProperty.h"
#include "MantidGeometry/Instrument.h"
-#include "MantidQtCustomInterfaces/Muon/MuonAnalysisFitDataPresenter.h"
-#include "MantidQtMantidWidgets/MuonFitPropertyBrowser.h"
+#include "MuonAnalysisFitDataPresenter.h"
+#include "MantidQtWidgets/Common/MuonFitPropertyBrowser.h"
namespace MantidQt {
namespace CustomInterfaces {
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/MuonSequentialFitDialog.h b/qt/scientific_interfaces/Muon/MuonSequentialFitDialog.h
similarity index 94%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/MuonSequentialFitDialog.h
rename to qt/scientific_interfaces/Muon/MuonSequentialFitDialog.h
index 55b2a439f21..80bd7673a0a 100644
--- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/MuonSequentialFitDialog.h
+++ b/qt/scientific_interfaces/Muon/MuonSequentialFitDialog.h
@@ -5,9 +5,9 @@
#include "MantidAPI/GroupingLoader.h"
#include "MantidKernel/System.h"
-#include "MantidQtCustomInterfaces/DllConfig.h"
-#include "MantidQtCustomInterfaces/Muon/MuonAnalysisHelper.h"
-#include "MantidQtMantidWidgets/MuonFitPropertyBrowser.h"
+#include "DllConfig.h"
+#include "MuonAnalysisHelper.h"
+#include "MantidQtWidgets/Common/MuonFitPropertyBrowser.h"
#include <QDialog>
@@ -39,7 +39,7 @@ class MuonAnalysisFitDataPresenter;
File change history is stored at: <https://github.com/mantidproject/mantid>
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
-class MANTIDQT_CUSTOMINTERFACES_DLL MuonSequentialFitDialog : public QDialog {
+class MANTIDQT_MUONINTERFACE_DLL MuonSequentialFitDialog : public QDialog {
Q_OBJECT
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/MuonSequentialFitDialog.ui b/qt/scientific_interfaces/Muon/MuonSequentialFitDialog.ui
similarity index 99%
rename from MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/MuonSequentialFitDialog.ui
rename to qt/scientific_interfaces/Muon/MuonSequentialFitDialog.ui
index f76871a008f..b7215e4db42 100644
--- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/MuonSequentialFitDialog.ui
+++ b/qt/scientific_interfaces/Muon/MuonSequentialFitDialog.ui
@@ -259,7 +259,7 @@
<customwidget>
<class>MantidQt::API::MWRunFiles</class>
<extends>QWidget</extends>
- <header>MantidQtAPI/MWRunFiles.h</header>
+ <header>MantidQtWidgets/Common/MWRunFiles.h</header>
</customwidget>
</customwidgets>
<resources/>
diff --git a/qt/scientific_interfaces/Muon/PrecompiledHeader.h b/qt/scientific_interfaces/Muon/PrecompiledHeader.h
new file mode 100644
index 00000000000..286ef064fc5
--- /dev/null
+++ b/qt/scientific_interfaces/Muon/PrecompiledHeader.h
@@ -0,0 +1,20 @@
+#ifndef MANTIDQT_MUON_PRECOMPILEDHEADER_H_
+#define MANTIDQT_MUON_PRECOMPILEDHEADER_H_
+
+// Mantid
+#include "MantidKernel/System.h"
+#include "MantidAPI/Algorithm.h"
+#include "MantidAPI/MatrixWorkspace_fwd.h"
+
+// Qt
+#include <QWidget>
+#include <QDialog>
+#include <QString>
+
+// STL
+#include <vector>
+#include <map>
+#include <set>
+#include <string>
+
+#endif // MANTIDQT_MUON_PRECOMPILEDHEADER_H_
\ No newline at end of file
diff --git a/MantidQt/CustomInterfaces/icons/CustomInterfacesIcons.qrc b/qt/scientific_interfaces/icons/CustomInterfacesIcons.qrc
similarity index 100%
rename from MantidQt/CustomInterfaces/icons/CustomInterfacesIcons.qrc
rename to qt/scientific_interfaces/icons/CustomInterfacesIcons.qrc
diff --git a/MantidQt/CustomInterfaces/icons/export-all-plots.png b/qt/scientific_interfaces/icons/export-all-plots.png
similarity index 100%
rename from MantidQt/CustomInterfaces/icons/export-all-plots.png
rename to qt/scientific_interfaces/icons/export-all-plots.png
diff --git a/MantidQt/CustomInterfaces/icons/export-plot.png b/qt/scientific_interfaces/icons/export-plot.png
similarity index 100%
rename from MantidQt/CustomInterfaces/icons/export-plot.png
rename to qt/scientific_interfaces/icons/export-plot.png
diff --git a/MantidQt/CustomInterfaces/icons/panning.png b/qt/scientific_interfaces/icons/panning.png
similarity index 100%
rename from MantidQt/CustomInterfaces/icons/panning.png
rename to qt/scientific_interfaces/icons/panning.png
diff --git a/MantidQt/CustomInterfaces/icons/range.png b/qt/scientific_interfaces/icons/range.png
similarity index 100%
rename from MantidQt/CustomInterfaces/icons/range.png
rename to qt/scientific_interfaces/icons/range.png
diff --git a/MantidQt/CustomInterfaces/icons/zoom.png b/qt/scientific_interfaces/icons/zoom.png
similarity index 100%
rename from MantidQt/CustomInterfaces/icons/zoom.png
rename to qt/scientific_interfaces/icons/zoom.png
diff --git a/MantidQt/CustomInterfaces/test/ALCBaselineModellingModelTest.h b/qt/scientific_interfaces/test/ALCBaselineModellingModelTest.h
similarity index 100%
rename from MantidQt/CustomInterfaces/test/ALCBaselineModellingModelTest.h
rename to qt/scientific_interfaces/test/ALCBaselineModellingModelTest.h
diff --git a/MantidQt/CustomInterfaces/test/ALCBaselineModellingPresenterTest.h b/qt/scientific_interfaces/test/ALCBaselineModellingPresenterTest.h
similarity index 100%
rename from MantidQt/CustomInterfaces/test/ALCBaselineModellingPresenterTest.h
rename to qt/scientific_interfaces/test/ALCBaselineModellingPresenterTest.h
diff --git a/MantidQt/CustomInterfaces/test/ALCDataLoadingPresenterTest.h b/qt/scientific_interfaces/test/ALCDataLoadingPresenterTest.h
similarity index 100%
rename from MantidQt/CustomInterfaces/test/ALCDataLoadingPresenterTest.h
rename to qt/scientific_interfaces/test/ALCDataLoadingPresenterTest.h
diff --git a/MantidQt/CustomInterfaces/test/ALCLatestFileFinderTest.h b/qt/scientific_interfaces/test/ALCLatestFileFinderTest.h
similarity index 100%
rename from MantidQt/CustomInterfaces/test/ALCLatestFileFinderTest.h
rename to qt/scientific_interfaces/test/ALCLatestFileFinderTest.h
diff --git a/MantidQt/CustomInterfaces/test/ALCPeakFittingModelTest.h b/qt/scientific_interfaces/test/ALCPeakFittingModelTest.h
similarity index 100%
rename from MantidQt/CustomInterfaces/test/ALCPeakFittingModelTest.h
rename to qt/scientific_interfaces/test/ALCPeakFittingModelTest.h
diff --git a/MantidQt/CustomInterfaces/test/ALCPeakFittingPresenterTest.h b/qt/scientific_interfaces/test/ALCPeakFittingPresenterTest.h
similarity index 100%
rename from MantidQt/CustomInterfaces/test/ALCPeakFittingPresenterTest.h
rename to qt/scientific_interfaces/test/ALCPeakFittingPresenterTest.h
diff --git a/qt/scientific_interfaces/test/CMakeLists.txt b/qt/scientific_interfaces/test/CMakeLists.txt
new file mode 100644
index 00000000000..f6d354568f1
--- /dev/null
+++ b/qt/scientific_interfaces/test/CMakeLists.txt
@@ -0,0 +1,67 @@
+set ( TEST_FILES
+ ALCBaselineModellingModelTest.h
+ ALCBaselineModellingPresenterTest.h
+ ALCDataLoadingPresenterTest.h
+ ALCLatestFileFinderTest.h
+ ALCPeakFittingModelTest.h
+ ALCPeakFittingPresenterTest.h
+# EnggDiffFittingPresenterTest.h
+# EnggDiffractionPresenterTest.h
+# IO_MuonGroupingTest.h
+# MDFLogValueFinderTest.h
+# MeasurementItemTest.h
+ MuonAnalysisDataLoaderTest.h
+ MuonAnalysisFitDataPresenterTest.h
+ MuonAnalysisFitFunctionPresenterTest.h
+ MuonAnalysisHelperTest.h
+ MuonAnalysisResultTableCreatorTest.h
+# ReflDataProcessorPresenterTest.h
+# ReflEventPresenterTest.h
+# ReflEventTabPresenterTest.h
+# ReflLegacyTransferStrategyTest.h
+# ReflMainWindowPresenterTest.h
+# ReflMeasureTransferStrategyTest.h
+# ReflNexusMeasurementItemSourceTest.h
+# ReflRunsTabPresenterTest.h
+# ReflSaveTabPresenterTest.h
+# ReflSettingsPresenterTest.h
+# ReflSettingsTabPresenterTest.h
+# UserInputValidatorTest.h
+)
+
+if ( CXXTEST_FOUND )
+ include_directories ( SYSTEM ${CXXTEST_INCLUDE_DIR} ${GMOCK_INCLUDE_DIR} ${GTEST_INCLUDE_DIR} )
+
+ include_directories( ../../../Framework/TestHelpers/inc ../../../Framework/DataObjects/inc )
+
+ set ( TESTHELPER_SRCS ../../../Framework/TestHelpers/src/ComponentCreationHelper.cpp
+ ../../../Framework/TestHelpers/src/InstrumentCreationHelper.cpp
+ ../../../Framework/TestHelpers/src/WorkspaceCreationHelper.cpp
+ ../../../Framework/TestHelpers/src/ScopedFileHelper.cpp
+ ../../../Framework/TestHelpers/src/TearDownWorld.cpp
+ )
+
+ cxxtest_add_test ( ScientificInterfacesTest ${TEST_FILES} ${GMOCK_TEST_FILES} )
+ target_link_libraries( ScientificInterfacesTest LINK_PRIVATE ${TCMALLOC_LIBRARIES_LINKTIME}
+ MantidQtMuonInterface
+ qtwidgetscommon
+ API
+ DataObjects
+ Geometry
+ HistogramData
+ Kernel
+ ${Boost_LIBRARIES}
+ ${POCO_LIBRARIES}
+ ${QWT_LIBRARIES}
+ ${QT_LIBRARIES}
+ ${GMOCK_LIBRARIES}
+ ${GTEST_LIBRARIES} )
+
+ add_dependencies( ScientificInterfacesTest MDAlgorithms )
+ # Test data
+ add_dependencies( ScientificInterfacesTest StandardTestData )
+ add_dependencies( GUITests ScientificInterfacesTest )
+ # Add to the 'UnitTests' group in VS
+ set_property( TARGET ScientificInterfacesTest PROPERTY FOLDER "UnitTests" )
+
+endif ()
diff --git a/MantidQt/CustomInterfaces/test/EnggDiffFittingPresenterTest.h b/qt/scientific_interfaces/test/EnggDiffFittingPresenterTest.h
similarity index 100%
rename from MantidQt/CustomInterfaces/test/EnggDiffFittingPresenterTest.h
rename to qt/scientific_interfaces/test/EnggDiffFittingPresenterTest.h
diff --git a/MantidQt/CustomInterfaces/test/EnggDiffFittingViewMock.h b/qt/scientific_interfaces/test/EnggDiffFittingViewMock.h
similarity index 100%
rename from MantidQt/CustomInterfaces/test/EnggDiffFittingViewMock.h
rename to qt/scientific_interfaces/test/EnggDiffFittingViewMock.h
diff --git a/MantidQt/CustomInterfaces/test/EnggDiffractionPresenterTest.h b/qt/scientific_interfaces/test/EnggDiffractionPresenterTest.h
similarity index 100%
rename from MantidQt/CustomInterfaces/test/EnggDiffractionPresenterTest.h
rename to qt/scientific_interfaces/test/EnggDiffractionPresenterTest.h
diff --git a/MantidQt/CustomInterfaces/test/EnggDiffractionViewMock.h b/qt/scientific_interfaces/test/EnggDiffractionViewMock.h
similarity index 100%
rename from MantidQt/CustomInterfaces/test/EnggDiffractionViewMock.h
rename to qt/scientific_interfaces/test/EnggDiffractionViewMock.h
diff --git a/MantidQt/CustomInterfaces/test/IO_MuonGroupingTest.h b/qt/scientific_interfaces/test/IO_MuonGroupingTest.h
similarity index 100%
rename from MantidQt/CustomInterfaces/test/IO_MuonGroupingTest.h
rename to qt/scientific_interfaces/test/IO_MuonGroupingTest.h
diff --git a/MantidQt/CustomInterfaces/test/MDFLogValueFinderTest.h b/qt/scientific_interfaces/test/MDFLogValueFinderTest.h
similarity index 100%
rename from MantidQt/CustomInterfaces/test/MDFLogValueFinderTest.h
rename to qt/scientific_interfaces/test/MDFLogValueFinderTest.h
diff --git a/MantidQt/CustomInterfaces/test/MeasurementItemTest.h b/qt/scientific_interfaces/test/MeasurementItemTest.h
similarity index 100%
rename from MantidQt/CustomInterfaces/test/MeasurementItemTest.h
rename to qt/scientific_interfaces/test/MeasurementItemTest.h
diff --git a/MantidQt/CustomInterfaces/test/MuonAnalysisDataLoaderTest.h b/qt/scientific_interfaces/test/MuonAnalysisDataLoaderTest.h
similarity index 100%
rename from MantidQt/CustomInterfaces/test/MuonAnalysisDataLoaderTest.h
rename to qt/scientific_interfaces/test/MuonAnalysisDataLoaderTest.h
diff --git a/MantidQt/CustomInterfaces/test/MuonAnalysisFitDataPresenterTest.h b/qt/scientific_interfaces/test/MuonAnalysisFitDataPresenterTest.h
similarity index 100%
rename from MantidQt/CustomInterfaces/test/MuonAnalysisFitDataPresenterTest.h
rename to qt/scientific_interfaces/test/MuonAnalysisFitDataPresenterTest.h
diff --git a/MantidQt/CustomInterfaces/test/MuonAnalysisFitFunctionPresenterTest.h b/qt/scientific_interfaces/test/MuonAnalysisFitFunctionPresenterTest.h
similarity index 100%
rename from MantidQt/CustomInterfaces/test/MuonAnalysisFitFunctionPresenterTest.h
rename to qt/scientific_interfaces/test/MuonAnalysisFitFunctionPresenterTest.h
diff --git a/MantidQt/CustomInterfaces/test/MuonAnalysisHelperTest.h b/qt/scientific_interfaces/test/MuonAnalysisHelperTest.h
similarity index 100%
rename from MantidQt/CustomInterfaces/test/MuonAnalysisHelperTest.h
rename to qt/scientific_interfaces/test/MuonAnalysisHelperTest.h
diff --git a/MantidQt/CustomInterfaces/test/MuonAnalysisResultTableCreatorTest.h b/qt/scientific_interfaces/test/MuonAnalysisResultTableCreatorTest.h
similarity index 100%
rename from MantidQt/CustomInterfaces/test/MuonAnalysisResultTableCreatorTest.h
rename to qt/scientific_interfaces/test/MuonAnalysisResultTableCreatorTest.h
diff --git a/MantidQt/CustomInterfaces/test/ReflDataProcessorPresenterTest.h b/qt/scientific_interfaces/test/ReflDataProcessorPresenterTest.h
similarity index 100%
rename from MantidQt/CustomInterfaces/test/ReflDataProcessorPresenterTest.h
rename to qt/scientific_interfaces/test/ReflDataProcessorPresenterTest.h
diff --git a/MantidQt/CustomInterfaces/test/ReflEventPresenterTest.h b/qt/scientific_interfaces/test/ReflEventPresenterTest.h
similarity index 100%
rename from MantidQt/CustomInterfaces/test/ReflEventPresenterTest.h
rename to qt/scientific_interfaces/test/ReflEventPresenterTest.h
diff --git a/MantidQt/CustomInterfaces/test/ReflEventTabPresenterTest.h b/qt/scientific_interfaces/test/ReflEventTabPresenterTest.h
similarity index 100%
rename from MantidQt/CustomInterfaces/test/ReflEventTabPresenterTest.h
rename to qt/scientific_interfaces/test/ReflEventTabPresenterTest.h
diff --git a/MantidQt/CustomInterfaces/test/ReflLegacyTransferStrategyTest.h b/qt/scientific_interfaces/test/ReflLegacyTransferStrategyTest.h
similarity index 100%
rename from MantidQt/CustomInterfaces/test/ReflLegacyTransferStrategyTest.h
rename to qt/scientific_interfaces/test/ReflLegacyTransferStrategyTest.h
diff --git a/MantidQt/CustomInterfaces/test/ReflMainWindowPresenterTest.h b/qt/scientific_interfaces/test/ReflMainWindowPresenterTest.h
similarity index 100%
rename from MantidQt/CustomInterfaces/test/ReflMainWindowPresenterTest.h
rename to qt/scientific_interfaces/test/ReflMainWindowPresenterTest.h
diff --git a/MantidQt/CustomInterfaces/test/ReflMeasureTransferStrategyTest.h b/qt/scientific_interfaces/test/ReflMeasureTransferStrategyTest.h
similarity index 100%
rename from MantidQt/CustomInterfaces/test/ReflMeasureTransferStrategyTest.h
rename to qt/scientific_interfaces/test/ReflMeasureTransferStrategyTest.h
diff --git a/MantidQt/CustomInterfaces/test/ReflMockObjects.h b/qt/scientific_interfaces/test/ReflMockObjects.h
similarity index 100%
rename from MantidQt/CustomInterfaces/test/ReflMockObjects.h
rename to qt/scientific_interfaces/test/ReflMockObjects.h
diff --git a/MantidQt/CustomInterfaces/test/ReflNexusMeasurementItemSourceTest.h b/qt/scientific_interfaces/test/ReflNexusMeasurementItemSourceTest.h
similarity index 100%
rename from MantidQt/CustomInterfaces/test/ReflNexusMeasurementItemSourceTest.h
rename to qt/scientific_interfaces/test/ReflNexusMeasurementItemSourceTest.h
diff --git a/MantidQt/CustomInterfaces/test/ReflRunsTabPresenterTest.h b/qt/scientific_interfaces/test/ReflRunsTabPresenterTest.h
similarity index 100%
rename from MantidQt/CustomInterfaces/test/ReflRunsTabPresenterTest.h
rename to qt/scientific_interfaces/test/ReflRunsTabPresenterTest.h
diff --git a/MantidQt/CustomInterfaces/test/ReflSaveTabPresenterTest.h b/qt/scientific_interfaces/test/ReflSaveTabPresenterTest.h
similarity index 100%
rename from MantidQt/CustomInterfaces/test/ReflSaveTabPresenterTest.h
rename to qt/scientific_interfaces/test/ReflSaveTabPresenterTest.h
diff --git a/MantidQt/CustomInterfaces/test/ReflSettingsPresenterTest.h b/qt/scientific_interfaces/test/ReflSettingsPresenterTest.h
similarity index 100%
rename from MantidQt/CustomInterfaces/test/ReflSettingsPresenterTest.h
rename to qt/scientific_interfaces/test/ReflSettingsPresenterTest.h
diff --git a/MantidQt/CustomInterfaces/test/ReflSettingsTabPresenterTest.h b/qt/scientific_interfaces/test/ReflSettingsTabPresenterTest.h
similarity index 100%
rename from MantidQt/CustomInterfaces/test/ReflSettingsTabPresenterTest.h
rename to qt/scientific_interfaces/test/ReflSettingsTabPresenterTest.h
diff --git a/MantidQt/CustomInterfaces/test/UserInputValidatorTest.h b/qt/scientific_interfaces/test/UserInputValidatorTest.h
similarity index 100%
rename from MantidQt/CustomInterfaces/test/UserInputValidatorTest.h
rename to qt/scientific_interfaces/test/UserInputValidatorTest.h
--
GitLab