From c9c9f44ceaddb1dfc24721391dc570bb28d3624e Mon Sep 17 00:00:00 2001
From: Dan Nixon <dan@dan-nixon.com>
Date: Mon, 26 Jan 2015 15:00:28 +0000
Subject: [PATCH] Moved Indirect interface files to their own folder
Previously that accounted for around half the UI and source
files, this is just to help keep the directories a little cleaner.
Refs #10960
---
.../MantidQt/CustomInterfaces/CMakeLists.txt | 232 +++++++++---------
.../{ => Indirect}/ApplyCorr.h | 2 +-
.../{ => Indirect}/CalcCorr.h | 2 +-
.../{ => Indirect}/ConvFit.h | 2 +-
.../{ => Indirect}/Elwin.h | 2 +-
.../{ => Indirect}/Fury.h | 2 +-
.../{ => Indirect}/FuryFit.h | 2 +-
.../{ => Indirect}/IDATab.h | 4 +-
.../{ => Indirect}/IndirectBayes.h | 2 +-
.../{ => Indirect}/IndirectBayes.ui | 0
.../{ => Indirect}/IndirectBayesTab.h | 2 +-
.../{ => Indirect}/IndirectCalibration.h | 2 +-
.../{ => Indirect}/IndirectConvertToEnergy.h | 2 +-
.../{ => Indirect}/IndirectDataAnalysis.h | 2 +-
.../{ => Indirect}/IndirectDataAnalysis.ui | 0
.../{ => Indirect}/IndirectDataReduction.h | 2 +-
.../{ => Indirect}/IndirectDataReduction.ui | 0
.../{ => Indirect}/IndirectDataReductionTab.h | 4 +-
.../{ => Indirect}/IndirectDiagnostics.h | 2 +-
.../IndirectDiffractionReduction.h | 0
.../IndirectDiffractionReduction.ui | 0
.../{ => Indirect}/IndirectLoadILL.h | 2 +-
.../{ => Indirect}/IndirectLoadILL.ui | 0
.../{ => Indirect}/IndirectMolDyn.h | 2 +-
.../{ => Indirect}/IndirectMolDyn.ui | 0
.../{ => Indirect}/IndirectMoments.h | 2 +-
.../{ => Indirect}/IndirectSassena.h | 2 +-
.../{ => Indirect}/IndirectSassena.ui | 0
.../{ => Indirect}/IndirectSimulation.h | 2 +-
.../{ => Indirect}/IndirectSimulation.ui | 0
.../{ => Indirect}/IndirectSimulationTab.h | 2 +-
.../{ => Indirect}/IndirectSqw.h | 2 +-
.../{ => Indirect}/IndirectSymmetrise.h | 2 +-
.../{ => Indirect}/IndirectTab.h | 0
.../{ => Indirect}/IndirectTools.h | 2 +-
.../{ => Indirect}/IndirectTools.ui | 0
.../{ => Indirect}/IndirectToolsTab.h | 0
.../{ => Indirect}/IndirectTransmission.h | 2 +-
.../{ => Indirect}/IndirectTransmissionCalc.h | 2 +-
.../IndirectTransmissionCalc.ui | 0
.../{ => Indirect}/JumpFit.h | 2 +-
.../{ => Indirect}/JumpFit.ui | 0
.../{ => Indirect}/MSDFit.h | 2 +-
.../{ => Indirect}/Quasi.h | 2 +-
.../{ => Indirect}/Quasi.ui | 0
.../{ => Indirect}/ResNorm.h | 2 +-
.../{ => Indirect}/ResNorm.ui | 0
.../{ => Indirect}/Stretch.h | 2 +-
.../{ => Indirect}/Stretch.ui | 0
.../src/{ => Indirect}/ApplyCorr.cpp | 2 +-
.../src/{ => Indirect}/CalcCorr.cpp | 2 +-
.../src/{ => Indirect}/ConvFit.cpp | 2 +-
.../src/{ => Indirect}/Elwin.cpp | 2 +-
.../src/{ => Indirect}/Fury.cpp | 2 +-
.../src/{ => Indirect}/FuryFit.cpp | 2 +-
.../src/{ => Indirect}/IDATab.cpp | 2 +-
.../src/{ => Indirect}/IndirectBayes.cpp | 10 +-
.../src/{ => Indirect}/IndirectBayesTab.cpp | 2 +-
.../{ => Indirect}/IndirectCalibration.cpp | 2 +-
.../IndirectConvertToEnergy.cpp | 2 +-
.../{ => Indirect}/IndirectDataAnalysis.cpp | 16 +-
.../{ => Indirect}/IndirectDataReduction.cpp | 16 +-
.../IndirectDataReductionTab.cpp | 2 +-
.../{ => Indirect}/IndirectDiagnostics.cpp | 2 +-
.../IndirectDiffractionReduction.cpp | 2 +-
.../src/{ => Indirect}/IndirectLoadILL.cpp | 2 +-
.../src/{ => Indirect}/IndirectMolDyn.cpp | 2 +-
.../src/{ => Indirect}/IndirectMoments.cpp | 2 +-
.../src/{ => Indirect}/IndirectSassena.cpp | 2 +-
.../src/{ => Indirect}/IndirectSimulation.cpp | 6 +-
.../{ => Indirect}/IndirectSimulationTab.cpp | 2 +-
.../src/{ => Indirect}/IndirectSqw.cpp | 2 +-
.../src/{ => Indirect}/IndirectSymmetrise.cpp | 2 +-
.../src/{ => Indirect}/IndirectTab.cpp | 2 +-
.../src/{ => Indirect}/IndirectTools.cpp | 6 +-
.../src/{ => Indirect}/IndirectToolsTab.cpp | 2 +-
.../{ => Indirect}/IndirectTransmission.cpp | 2 +-
.../IndirectTransmissionCalc.cpp | 2 +-
.../src/{ => Indirect}/JumpFit.cpp | 2 +-
.../src/{ => Indirect}/MSDFit.cpp | 2 +-
.../src/{ => Indirect}/Quasi.cpp | 2 +-
.../src/{ => Indirect}/ResNorm.cpp | 2 +-
.../src/{ => Indirect}/Stretch.cpp | 2 +-
83 files changed, 205 insertions(+), 205 deletions(-)
rename Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/{ => Indirect}/ApplyCorr.h (96%)
rename Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/{ => Indirect}/CalcCorr.h (94%)
rename Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/{ => Indirect}/ConvFit.h (97%)
rename Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/{ => Indirect}/Elwin.h (95%)
rename Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/{ => Indirect}/Fury.h (95%)
rename Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/{ => Indirect}/FuryFit.h (97%)
rename Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/{ => Indirect}/IDATab.h (96%)
rename Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/{ => Indirect}/IndirectBayes.h (98%)
rename Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/{ => Indirect}/IndirectBayes.ui (100%)
rename Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/{ => Indirect}/IndirectBayesTab.h (98%)
rename Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/{ => Indirect}/IndirectCalibration.h (97%)
rename Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/{ => Indirect}/IndirectConvertToEnergy.h (98%)
rename Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/{ => Indirect}/IndirectDataAnalysis.h (98%)
rename Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/{ => Indirect}/IndirectDataAnalysis.ui (100%)
rename Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/{ => Indirect}/IndirectDataReduction.h (98%)
rename Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/{ => Indirect}/IndirectDataReduction.ui (100%)
rename Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/{ => Indirect}/IndirectDataReductionTab.h (96%)
rename Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/{ => Indirect}/IndirectDiagnostics.h (97%)
rename Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/{ => Indirect}/IndirectDiffractionReduction.h (100%)
rename Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/{ => Indirect}/IndirectDiffractionReduction.ui (100%)
rename Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/{ => Indirect}/IndirectLoadILL.h (94%)
rename Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/{ => Indirect}/IndirectLoadILL.ui (100%)
rename Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/{ => Indirect}/IndirectMolDyn.h (92%)
rename Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/{ => Indirect}/IndirectMolDyn.ui (100%)
rename Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/{ => Indirect}/IndirectMoments.h (97%)
rename Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/{ => Indirect}/IndirectSassena.h (93%)
rename Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/{ => Indirect}/IndirectSassena.ui (100%)
rename Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/{ => Indirect}/IndirectSimulation.h (98%)
rename Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/{ => Indirect}/IndirectSimulation.ui (100%)
rename Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/{ => Indirect}/IndirectSimulationTab.h (97%)
rename Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/{ => Indirect}/IndirectSqw.h (96%)
rename Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/{ => Indirect}/IndirectSymmetrise.h (97%)
rename Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/{ => Indirect}/IndirectTab.h (100%)
rename Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/{ => Indirect}/IndirectTools.h (98%)
rename Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/{ => Indirect}/IndirectTools.ui (100%)
rename Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/{ => Indirect}/IndirectToolsTab.h (100%)
rename Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/{ => Indirect}/IndirectTransmission.h (96%)
rename Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/{ => Indirect}/IndirectTransmissionCalc.h (95%)
rename Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/{ => Indirect}/IndirectTransmissionCalc.ui (100%)
rename Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/{ => Indirect}/JumpFit.h (96%)
rename Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/{ => Indirect}/JumpFit.ui (100%)
rename Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/{ => Indirect}/MSDFit.h (95%)
rename Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/{ => Indirect}/Quasi.h (96%)
rename Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/{ => Indirect}/Quasi.ui (100%)
rename Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/{ => Indirect}/ResNorm.h (95%)
rename Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/{ => Indirect}/ResNorm.ui (100%)
rename Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/{ => Indirect}/Stretch.h (95%)
rename Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/{ => Indirect}/Stretch.ui (100%)
rename Code/Mantid/MantidQt/CustomInterfaces/src/{ => Indirect}/ApplyCorr.cpp (99%)
rename Code/Mantid/MantidQt/CustomInterfaces/src/{ => Indirect}/CalcCorr.cpp (99%)
rename Code/Mantid/MantidQt/CustomInterfaces/src/{ => Indirect}/ConvFit.cpp (99%)
rename Code/Mantid/MantidQt/CustomInterfaces/src/{ => Indirect}/Elwin.cpp (99%)
rename Code/Mantid/MantidQt/CustomInterfaces/src/{ => Indirect}/Fury.cpp (99%)
rename Code/Mantid/MantidQt/CustomInterfaces/src/{ => Indirect}/FuryFit.cpp (99%)
rename Code/Mantid/MantidQt/CustomInterfaces/src/{ => Indirect}/IDATab.cpp (98%)
rename Code/Mantid/MantidQt/CustomInterfaces/src/{ => Indirect}/IndirectBayes.cpp (93%)
rename Code/Mantid/MantidQt/CustomInterfaces/src/{ => Indirect}/IndirectBayesTab.cpp (98%)
rename Code/Mantid/MantidQt/CustomInterfaces/src/{ => Indirect}/IndirectCalibration.cpp (99%)
rename Code/Mantid/MantidQt/CustomInterfaces/src/{ => Indirect}/IndirectConvertToEnergy.cpp (99%)
rename Code/Mantid/MantidQt/CustomInterfaces/src/{ => Indirect}/IndirectDataAnalysis.cpp (92%)
rename Code/Mantid/MantidQt/CustomInterfaces/src/{ => Indirect}/IndirectDataReduction.cpp (96%)
rename Code/Mantid/MantidQt/CustomInterfaces/src/{ => Indirect}/IndirectDataReductionTab.cpp (99%)
rename Code/Mantid/MantidQt/CustomInterfaces/src/{ => Indirect}/IndirectDiagnostics.cpp (99%)
rename Code/Mantid/MantidQt/CustomInterfaces/src/{ => Indirect}/IndirectDiffractionReduction.cpp (99%)
rename Code/Mantid/MantidQt/CustomInterfaces/src/{ => Indirect}/IndirectLoadILL.cpp (98%)
rename Code/Mantid/MantidQt/CustomInterfaces/src/{ => Indirect}/IndirectMolDyn.cpp (98%)
rename Code/Mantid/MantidQt/CustomInterfaces/src/{ => Indirect}/IndirectMoments.cpp (99%)
rename Code/Mantid/MantidQt/CustomInterfaces/src/{ => Indirect}/IndirectSassena.cpp (98%)
rename Code/Mantid/MantidQt/CustomInterfaces/src/{ => Indirect}/IndirectSimulation.cpp (95%)
rename Code/Mantid/MantidQt/CustomInterfaces/src/{ => Indirect}/IndirectSimulationTab.cpp (92%)
rename Code/Mantid/MantidQt/CustomInterfaces/src/{ => Indirect}/IndirectSqw.cpp (99%)
rename Code/Mantid/MantidQt/CustomInterfaces/src/{ => Indirect}/IndirectSymmetrise.cpp (99%)
rename Code/Mantid/MantidQt/CustomInterfaces/src/{ => Indirect}/IndirectTab.cpp (99%)
rename Code/Mantid/MantidQt/CustomInterfaces/src/{ => Indirect}/IndirectTools.cpp (95%)
rename Code/Mantid/MantidQt/CustomInterfaces/src/{ => Indirect}/IndirectToolsTab.cpp (94%)
rename Code/Mantid/MantidQt/CustomInterfaces/src/{ => Indirect}/IndirectTransmission.cpp (98%)
rename Code/Mantid/MantidQt/CustomInterfaces/src/{ => Indirect}/IndirectTransmissionCalc.cpp (98%)
rename Code/Mantid/MantidQt/CustomInterfaces/src/{ => Indirect}/JumpFit.cpp (99%)
rename Code/Mantid/MantidQt/CustomInterfaces/src/{ => Indirect}/MSDFit.cpp (99%)
rename Code/Mantid/MantidQt/CustomInterfaces/src/{ => Indirect}/Quasi.cpp (99%)
rename Code/Mantid/MantidQt/CustomInterfaces/src/{ => Indirect}/ResNorm.cpp (99%)
rename Code/Mantid/MantidQt/CustomInterfaces/src/{ => Indirect}/Stretch.cpp (99%)
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/CMakeLists.txt b/Code/Mantid/MantidQt/CustomInterfaces/CMakeLists.txt
index 049063234c6..939d62cb612 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/CMakeLists.txt
+++ b/Code/Mantid/MantidQt/CustomInterfaces/CMakeLists.txt
@@ -1,37 +1,37 @@
set ( SRC_FILES
- src/ApplyCorr.cpp
- src/CalcCorr.cpp
- src/ConvFit.cpp
+ src/Indirect/ApplyCorr.cpp
+ src/Indirect/CalcCorr.cpp
+ src/Indirect/ConvFit.cpp
src/DirectConvertToEnergy.cpp
- src/Elwin.cpp
- src/Fury.cpp
- src/FuryFit.cpp
+ src/Indirect/Elwin.cpp
+ src/Indirect/Fury.cpp
+ src/Indirect/FuryFit.cpp
src/Homer.cpp
- src/IDATab.cpp
- src/IndirectBayes.cpp
- src/IndirectBayesTab.cpp
- src/IndirectCalibration.cpp
- src/IndirectConvertToEnergy.cpp
- src/IndirectDataAnalysis.cpp
- src/IndirectDataReduction.cpp
- src/IndirectDataReductionTab.cpp
- src/IndirectDiagnostics.cpp
- src/IndirectDiffractionReduction.cpp
- src/IndirectLoadILL.cpp
- src/IndirectMolDyn.cpp
- src/IndirectMoments.cpp
- src/IndirectSassena.cpp
- src/IndirectSimulation.cpp
- src/IndirectSimulationTab.cpp
- src/IndirectSqw.cpp
- src/IndirectSymmetrise.cpp
- src/IndirectTab.cpp
- src/IndirectTools.cpp
- src/IndirectToolsTab.cpp
- src/IndirectTransmission.cpp
- src/IndirectTransmissionCalc.cpp
- src/JumpFit.cpp
- src/MSDFit.cpp
+ src/Indirect/IDATab.cpp
+ src/Indirect/IndirectBayes.cpp
+ src/Indirect/IndirectBayesTab.cpp
+ src/Indirect/IndirectCalibration.cpp
+ src/Indirect/IndirectConvertToEnergy.cpp
+ src/Indirect/IndirectDataAnalysis.cpp
+ src/Indirect/IndirectDataReduction.cpp
+ src/Indirect/IndirectDataReductionTab.cpp
+ src/Indirect/IndirectDiagnostics.cpp
+ src/Indirect/IndirectDiffractionReduction.cpp
+ src/Indirect/IndirectLoadILL.cpp
+ src/Indirect/IndirectMolDyn.cpp
+ src/Indirect/IndirectMoments.cpp
+ src/Indirect/IndirectSassena.cpp
+ src/Indirect/IndirectSimulation.cpp
+ src/Indirect/IndirectSimulationTab.cpp
+ src/Indirect/IndirectSqw.cpp
+ src/Indirect/IndirectSymmetrise.cpp
+ src/Indirect/IndirectTab.cpp
+ src/Indirect/IndirectTools.cpp
+ src/Indirect/IndirectToolsTab.cpp
+ src/Indirect/IndirectTransmission.cpp
+ src/Indirect/IndirectTransmissionCalc.cpp
+ src/Indirect/JumpFit.cpp
+ src/Indirect/MSDFit.cpp
src/MantidEV.cpp
src/MantidEVWorker.cpp
src/MultiDatasetFit.cpp
@@ -54,19 +54,19 @@ set ( SRC_FILES
src/QReflTableModel.cpp
src/QtReflMainView.cpp
src/QtReflOptionsDialog.cpp
- src/Quasi.cpp
+ src/Indirect/Quasi.cpp
src/ReflCatalogSearcher.cpp
src/ReflLegacyTransferStrategy.cpp
src/ReflMainViewPresenter.cpp
src/ReflSearchModel.cpp
- src/ResNorm.cpp
+ src/Indirect/ResNorm.cpp
src/SANSAddFiles.cpp
src/SANSDiagnostics.cpp
src/SANSEventSlicing.cpp
src/SANSPlotSpecial.cpp
src/SANSRunWindow.cpp
src/StepScan.cpp
- src/Stretch.cpp
+ src/Indirect/Stretch.cpp
src/UserInputValidator.cpp
src/background.cpp
src/deltaECalc.cpp
@@ -74,43 +74,43 @@ set ( SRC_FILES
# Include files aren't required, but this makes them appear in Visual Studio
set ( INC_FILES
- inc/MantidQtCustomInterfaces/ApplyCorr.h
+ inc/MantidQtCustomInterfaces/Indirect/ApplyCorr.h
inc/MantidQtCustomInterfaces/Background.h
- inc/MantidQtCustomInterfaces/CalcCorr.h
- inc/MantidQtCustomInterfaces/ConvFit.h
+ inc/MantidQtCustomInterfaces/Indirect/CalcCorr.h
+ inc/MantidQtCustomInterfaces/Indirect/ConvFit.h
inc/MantidQtCustomInterfaces/DirectConvertToEnergy.h
inc/MantidQtCustomInterfaces/DllConfig.h
- inc/MantidQtCustomInterfaces/Elwin.h
- inc/MantidQtCustomInterfaces/Fury.h
- inc/MantidQtCustomInterfaces/FuryFit.h
+ inc/MantidQtCustomInterfaces/Indirect/Elwin.h
+ inc/MantidQtCustomInterfaces/Indirect/Fury.h
+ inc/MantidQtCustomInterfaces/Indirect/FuryFit.h
inc/MantidQtCustomInterfaces/Homer.h
- inc/MantidQtCustomInterfaces/IDATab.h
- inc/MantidQtCustomInterfaces/IndirectBayes.h
- inc/MantidQtCustomInterfaces/IndirectBayesTab.h
- inc/MantidQtCustomInterfaces/IndirectCalibration.h
- inc/MantidQtCustomInterfaces/IndirectConvertToEnergy.h
- inc/MantidQtCustomInterfaces/IndirectDataAnalysis.h
- inc/MantidQtCustomInterfaces/IndirectDataReduction.h
- inc/MantidQtCustomInterfaces/IndirectDataReductionTab.h
- inc/MantidQtCustomInterfaces/IndirectDiagnostics.h
- inc/MantidQtCustomInterfaces/IndirectDiffractionReduction.h
- inc/MantidQtCustomInterfaces/IndirectLoadILL.h
- inc/MantidQtCustomInterfaces/IndirectMolDyn.h
- inc/MantidQtCustomInterfaces/IndirectMoments.h
- inc/MantidQtCustomInterfaces/IndirectSassena.h
- inc/MantidQtCustomInterfaces/IndirectSimulation.h
- inc/MantidQtCustomInterfaces/IndirectSimulationTab.h
- inc/MantidQtCustomInterfaces/IndirectSqw.h
- inc/MantidQtCustomInterfaces/IndirectSymmetrise.h
- inc/MantidQtCustomInterfaces/IndirectTransmission.h
- inc/MantidQtCustomInterfaces/IndirectTransmissionCalc.h
- inc/MantidQtCustomInterfaces/IndirectTools.h
- inc/MantidQtCustomInterfaces/IndirectToolsTab.h
- inc/MantidQtCustomInterfaces/IndirectTab.h
+ inc/MantidQtCustomInterfaces/Indirect/IDATab.h
+ inc/MantidQtCustomInterfaces/Indirect/IndirectBayes.h
+ inc/MantidQtCustomInterfaces/Indirect/IndirectBayesTab.h
+ inc/MantidQtCustomInterfaces/Indirect/IndirectCalibration.h
+ inc/MantidQtCustomInterfaces/Indirect/IndirectConvertToEnergy.h
+ inc/MantidQtCustomInterfaces/Indirect/IndirectDataAnalysis.h
+ inc/MantidQtCustomInterfaces/Indirect/IndirectDataReduction.h
+ inc/MantidQtCustomInterfaces/Indirect/IndirectDataReductionTab.h
+ inc/MantidQtCustomInterfaces/Indirect/IndirectDiagnostics.h
+ inc/MantidQtCustomInterfaces/Indirect/IndirectDiffractionReduction.h
+ inc/MantidQtCustomInterfaces/Indirect/IndirectLoadILL.h
+ inc/MantidQtCustomInterfaces/Indirect/IndirectMolDyn.h
+ inc/MantidQtCustomInterfaces/Indirect/IndirectMoments.h
+ inc/MantidQtCustomInterfaces/Indirect/IndirectSassena.h
+ inc/MantidQtCustomInterfaces/Indirect/IndirectSimulation.h
+ inc/MantidQtCustomInterfaces/Indirect/IndirectSimulationTab.h
+ inc/MantidQtCustomInterfaces/Indirect/IndirectSqw.h
+ inc/MantidQtCustomInterfaces/Indirect/IndirectSymmetrise.h
+ inc/MantidQtCustomInterfaces/Indirect/IndirectTransmission.h
+ inc/MantidQtCustomInterfaces/Indirect/IndirectTransmissionCalc.h
+ inc/MantidQtCustomInterfaces/Indirect/IndirectTools.h
+ inc/MantidQtCustomInterfaces/Indirect/IndirectToolsTab.h
+ inc/MantidQtCustomInterfaces/Indirect/IndirectTab.h
inc/MantidQtCustomInterfaces/IReflPresenter.h
inc/MantidQtCustomInterfaces/IReflSearcher.h
- inc/MantidQtCustomInterfaces/JumpFit.h
- inc/MantidQtCustomInterfaces/MSDFit.h
+ inc/MantidQtCustomInterfaces/Indirect/JumpFit.h
+ inc/MantidQtCustomInterfaces/Indirect/MSDFit.h
inc/MantidQtCustomInterfaces/MantidEV.h
inc/MantidQtCustomInterfaces/MantidEVWorker.h
inc/MantidQtCustomInterfaces/MultiDatasetFit.h
@@ -144,15 +144,15 @@ set ( INC_FILES
inc/MantidQtCustomInterfaces/QReflTableModel.h
inc/MantidQtCustomInterfaces/QtReflMainView.h
inc/MantidQtCustomInterfaces/QtReflOptionsDialog.h
- inc/MantidQtCustomInterfaces/Quasi.h
- inc/MantidQtCustomInterfaces/ResNorm.h
+ inc/MantidQtCustomInterfaces/Indirect/Quasi.h
+ inc/MantidQtCustomInterfaces/Indirect/ResNorm.h
inc/MantidQtCustomInterfaces/SANSAddFiles.h
inc/MantidQtCustomInterfaces/SANSDiagnostics.h
inc/MantidQtCustomInterfaces/SANSEventSlicing.h
inc/MantidQtCustomInterfaces/SANSPlotSpecial.h
inc/MantidQtCustomInterfaces/SANSRunWindow.h
inc/MantidQtCustomInterfaces/StepScan.h
- inc/MantidQtCustomInterfaces/Stretch.h
+ inc/MantidQtCustomInterfaces/Indirect/Stretch.h
inc/MantidQtCustomInterfaces/Updateable.h
inc/MantidQtCustomInterfaces/UserInputValidator.h
inc/MantidQtCustomInterfaces/deltaECalc.h
@@ -161,39 +161,39 @@ set ( INC_FILES
set ( SRC_UNITY_IGNORE_FILES )
set ( MOC_FILES inc/MantidQtCustomInterfaces/Background.h
- inc/MantidQtCustomInterfaces/ApplyCorr.h
- inc/MantidQtCustomInterfaces/CalcCorr.h
- inc/MantidQtCustomInterfaces/ConvFit.h
+ inc/MantidQtCustomInterfaces/Indirect/ApplyCorr.h
+ inc/MantidQtCustomInterfaces/Indirect/CalcCorr.h
+ inc/MantidQtCustomInterfaces/Indirect/ConvFit.h
inc/MantidQtCustomInterfaces/DirectConvertToEnergy.h
- inc/MantidQtCustomInterfaces/Elwin.h
- inc/MantidQtCustomInterfaces/Fury.h
- inc/MantidQtCustomInterfaces/FuryFit.h
+ inc/MantidQtCustomInterfaces/Indirect/Elwin.h
+ inc/MantidQtCustomInterfaces/Indirect/Fury.h
+ inc/MantidQtCustomInterfaces/Indirect/FuryFit.h
inc/MantidQtCustomInterfaces/Homer.h
- inc/MantidQtCustomInterfaces/IDATab.h
- inc/MantidQtCustomInterfaces/IndirectBayes.h
- inc/MantidQtCustomInterfaces/IndirectBayesTab.h
- inc/MantidQtCustomInterfaces/IndirectCalibration.h
- inc/MantidQtCustomInterfaces/IndirectConvertToEnergy.h
- inc/MantidQtCustomInterfaces/IndirectDataAnalysis.h
- inc/MantidQtCustomInterfaces/IndirectDataReduction.h
- inc/MantidQtCustomInterfaces/IndirectDataReductionTab.h
- inc/MantidQtCustomInterfaces/IndirectDiagnostics.h
- inc/MantidQtCustomInterfaces/IndirectDiffractionReduction.h
- inc/MantidQtCustomInterfaces/IndirectLoadILL.h
- inc/MantidQtCustomInterfaces/IndirectMolDyn.h
- inc/MantidQtCustomInterfaces/IndirectMoments.h
- inc/MantidQtCustomInterfaces/IndirectSassena.h
- inc/MantidQtCustomInterfaces/IndirectSimulation.h
- inc/MantidQtCustomInterfaces/IndirectSimulationTab.h
- inc/MantidQtCustomInterfaces/IndirectSqw.h
- inc/MantidQtCustomInterfaces/IndirectSymmetrise.h
- inc/MantidQtCustomInterfaces/IndirectTransmission.h
- inc/MantidQtCustomInterfaces/IndirectTransmissionCalc.h
- inc/MantidQtCustomInterfaces/IndirectTools.h
- inc/MantidQtCustomInterfaces/IndirectToolsTab.h
- inc/MantidQtCustomInterfaces/IndirectTab.h
- inc/MantidQtCustomInterfaces/JumpFit.h
- inc/MantidQtCustomInterfaces/MSDFit.h
+ inc/MantidQtCustomInterfaces/Indirect/IDATab.h
+ inc/MantidQtCustomInterfaces/Indirect/IndirectBayes.h
+ inc/MantidQtCustomInterfaces/Indirect/IndirectBayesTab.h
+ inc/MantidQtCustomInterfaces/Indirect/IndirectCalibration.h
+ inc/MantidQtCustomInterfaces/Indirect/IndirectConvertToEnergy.h
+ inc/MantidQtCustomInterfaces/Indirect/IndirectDataAnalysis.h
+ inc/MantidQtCustomInterfaces/Indirect/IndirectDataReduction.h
+ inc/MantidQtCustomInterfaces/Indirect/IndirectDataReductionTab.h
+ inc/MantidQtCustomInterfaces/Indirect/IndirectDiagnostics.h
+ inc/MantidQtCustomInterfaces/Indirect/IndirectDiffractionReduction.h
+ inc/MantidQtCustomInterfaces/Indirect/IndirectLoadILL.h
+ inc/MantidQtCustomInterfaces/Indirect/IndirectMolDyn.h
+ inc/MantidQtCustomInterfaces/Indirect/IndirectMoments.h
+ inc/MantidQtCustomInterfaces/Indirect/IndirectSassena.h
+ inc/MantidQtCustomInterfaces/Indirect/IndirectSimulation.h
+ inc/MantidQtCustomInterfaces/Indirect/IndirectSimulationTab.h
+ inc/MantidQtCustomInterfaces/Indirect/IndirectSqw.h
+ inc/MantidQtCustomInterfaces/Indirect/IndirectSymmetrise.h
+ inc/MantidQtCustomInterfaces/Indirect/IndirectTransmission.h
+ inc/MantidQtCustomInterfaces/Indirect/IndirectTransmissionCalc.h
+ inc/MantidQtCustomInterfaces/Indirect/IndirectTools.h
+ inc/MantidQtCustomInterfaces/Indirect/IndirectToolsTab.h
+ inc/MantidQtCustomInterfaces/Indirect/IndirectTab.h
+ inc/MantidQtCustomInterfaces/Indirect/JumpFit.h
+ inc/MantidQtCustomInterfaces/Indirect/MSDFit.h
inc/MantidQtCustomInterfaces/MultiDatasetFit.h
inc/MantidQtCustomInterfaces/Muon/ALCBaselineModellingPresenter.h
inc/MantidQtCustomInterfaces/Muon/ALCBaselineModellingView.h
@@ -214,46 +214,46 @@ set ( MOC_FILES inc/MantidQtCustomInterfaces/Background.h
inc/MantidQtCustomInterfaces/QReflTableModel.h
inc/MantidQtCustomInterfaces/QtReflMainView.h
inc/MantidQtCustomInterfaces/QtReflOptionsDialog.h
- inc/MantidQtCustomInterfaces/Quasi.h
- inc/MantidQtCustomInterfaces/ResNorm.h
+ inc/MantidQtCustomInterfaces/Indirect/Quasi.h
+ inc/MantidQtCustomInterfaces/Indirect/ResNorm.h
inc/MantidQtCustomInterfaces/SANSAddFiles.h
inc/MantidQtCustomInterfaces/SANSPlotSpecial.h
inc/MantidQtCustomInterfaces/SANSRunWindow.h
inc/MantidQtCustomInterfaces/SANSEventSlicing.h
inc/MantidQtCustomInterfaces/SANSDiagnostics.h
- inc/MantidQtCustomInterfaces/Stretch.h
+ inc/MantidQtCustomInterfaces/Indirect/Stretch.h
inc/MantidQtCustomInterfaces/MantidEV.h
inc/MantidQtCustomInterfaces/StepScan.h
)
set ( UI_FILES inc/MantidQtCustomInterfaces/AddWorkspace.ui
inc/MantidQtCustomInterfaces/DirectConvertToEnergy.ui
- inc/MantidQtCustomInterfaces/IndirectBayes.ui
- inc/MantidQtCustomInterfaces/IndirectDataAnalysis.ui
- inc/MantidQtCustomInterfaces/IndirectDataReduction.ui
- inc/MantidQtCustomInterfaces/IndirectDiffractionReduction.ui
- inc/MantidQtCustomInterfaces/IndirectLoadILL.ui
- inc/MantidQtCustomInterfaces/IndirectMolDyn.ui
- inc/MantidQtCustomInterfaces/IndirectSassena.ui
- inc/MantidQtCustomInterfaces/IndirectSimulation.ui
- inc/MantidQtCustomInterfaces/IndirectTools.ui
- inc/MantidQtCustomInterfaces/IndirectTransmissionCalc.ui
- inc/MantidQtCustomInterfaces/JumpFit.ui
+ inc/MantidQtCustomInterfaces/Indirect/IndirectBayes.ui
+ inc/MantidQtCustomInterfaces/Indirect/IndirectDataAnalysis.ui
+ inc/MantidQtCustomInterfaces/Indirect/IndirectDataReduction.ui
+ inc/MantidQtCustomInterfaces/Indirect/IndirectDiffractionReduction.ui
+ inc/MantidQtCustomInterfaces/Indirect/IndirectLoadILL.ui
+ inc/MantidQtCustomInterfaces/Indirect/IndirectMolDyn.ui
+ inc/MantidQtCustomInterfaces/Indirect/IndirectSassena.ui
+ inc/MantidQtCustomInterfaces/Indirect/IndirectSimulation.ui
+ inc/MantidQtCustomInterfaces/Indirect/IndirectTools.ui
+ inc/MantidQtCustomInterfaces/Indirect/IndirectTransmissionCalc.ui
+ inc/MantidQtCustomInterfaces/Indirect/JumpFit.ui
inc/MantidQtCustomInterfaces/MultiDatasetFit.ui
inc/MantidQtCustomInterfaces/Muon/ALCBaselineModellingView.ui
inc/MantidQtCustomInterfaces/Muon/ALCDataLoadingView.ui
inc/MantidQtCustomInterfaces/Muon/ALCInterface.ui
inc/MantidQtCustomInterfaces/Muon/ALCPeakFittingView.ui
inc/MantidQtCustomInterfaces/Muon/MuonAnalysis.ui
- inc/MantidQtCustomInterfaces/Quasi.ui
+ inc/MantidQtCustomInterfaces/Indirect/Quasi.ui
inc/MantidQtCustomInterfaces/ReflMainWidget.ui
inc/MantidQtCustomInterfaces/ReflOptionsDialog.ui
inc/MantidQtCustomInterfaces/ReflWindow.ui
- inc/MantidQtCustomInterfaces/ResNorm.ui
+ inc/MantidQtCustomInterfaces/Indirect/ResNorm.ui
inc/MantidQtCustomInterfaces/SANSPlotSpecial.ui
inc/MantidQtCustomInterfaces/SANSRunWindow.ui
inc/MantidQtCustomInterfaces/SANSEventSlicing.ui
- inc/MantidQtCustomInterfaces/Stretch.ui
+ inc/MantidQtCustomInterfaces/Indirect/Stretch.ui
inc/MantidQtCustomInterfaces/MantidEV.ui
inc/MantidQtCustomInterfaces/StepScan.ui
inc/MantidQtCustomInterfaces/EditLocalParameterDialog.ui
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ApplyCorr.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ApplyCorr.h
similarity index 96%
rename from Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ApplyCorr.h
rename to Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ApplyCorr.h
index 8549dfa1017..1a6f5ed49a6 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ApplyCorr.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ApplyCorr.h
@@ -2,7 +2,7 @@
#define MANTIDQTCUSTOMINTERFACESIDA_APPLYCORR_H_
#include "MantidAPI/MatrixWorkspace.h"
-#include "MantidQtCustomInterfaces/IDATab.h"
+#include "IDATab.h"
namespace MantidQt
{
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/CalcCorr.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/CalcCorr.h
similarity index 94%
rename from Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/CalcCorr.h
rename to Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/CalcCorr.h
index 1c56fd8fefc..9845fa67d11 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/CalcCorr.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/CalcCorr.h
@@ -1,7 +1,7 @@
#ifndef MANTIDQTCUSTOMINTERFACESIDA_CALCCORR_H_
#define MANTIDQTCUSTOMINTERFACESIDA_CALCCORR_H_
-#include "MantidQtCustomInterfaces/IDATab.h"
+#include "IDATab.h"
namespace MantidQt
{
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ConvFit.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ConvFit.h
similarity index 97%
rename from Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ConvFit.h
rename to Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ConvFit.h
index 7a3b8fe60ab..c396eae1bee 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ConvFit.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ConvFit.h
@@ -1,7 +1,7 @@
#ifndef MANTIDQTCUSTOMINTERFACESIDA_CONVFIT_H_
#define MANTIDQTCUSTOMINTERFACESIDA_CONVFIT_H_
-#include "MantidQtCustomInterfaces/IDATab.h"
+#include "IDATab.h"
#include "MantidAPI/MatrixWorkspace.h"
#include "MantidAPI/CompositeFunction.h"
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Elwin.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/Elwin.h
similarity index 95%
rename from Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Elwin.h
rename to Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/Elwin.h
index b3e70b9750e..7e860508075 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Elwin.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/Elwin.h
@@ -2,7 +2,7 @@
#define MANTIDQTCUSTOMINTERFACESIDA_ELWIN_H_
#include "MantidAPI/MatrixWorkspace.h"
-#include "MantidQtCustomInterfaces/IDATab.h"
+#include "MantidQtCustomInterfaces/Indirect/IDATab.h"
namespace MantidQt
{
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Fury.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/Fury.h
similarity index 95%
rename from Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Fury.h
rename to Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/Fury.h
index eb63d5f6066..3de4cc76674 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Fury.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/Fury.h
@@ -1,7 +1,7 @@
#ifndef MANTIDQTCUSTOMINTERFACESIDA_FURY_H_
#define MANTIDQTCUSTOMINTERFACESIDA_FURY_H_
-#include "MantidQtCustomInterfaces/IDATab.h"
+#include "IDATab.h"
namespace MantidQt
{
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/FuryFit.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/FuryFit.h
similarity index 97%
rename from Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/FuryFit.h
rename to Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/FuryFit.h
index 2d30bde7ff6..c11edb0f0cb 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/FuryFit.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/FuryFit.h
@@ -1,7 +1,7 @@
#ifndef MANTIDQTCUSTOMINTERFACESIDA_FURYFIT_H_
#define MANTIDQTCUSTOMINTERFACESIDA_FURYFIT_H_
-#include "MantidQtCustomInterfaces/IDATab.h"
+#include "IDATab.h"
#include "MantidAPI/CompositeFunction.h"
#include "MantidAPI/MatrixWorkspace.h"
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IDATab.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IDATab.h
similarity index 96%
rename from Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IDATab.h
rename to Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IDATab.h
index 0370f251f71..3349a0d6168 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IDATab.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IDATab.h
@@ -3,8 +3,8 @@
#include "MantidAPI/AlgorithmManager.h"
#include "MantidAPI/MatrixWorkspace.h"
-#include "MantidQtCustomInterfaces/IndirectDataAnalysis.h"
-#include "MantidQtCustomInterfaces/IndirectTab.h"
+#include "IndirectDataAnalysis.h"
+#include "IndirectTab.h"
class QwtPlotCurve;
class QwtPlot;
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectBayes.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectBayes.h
similarity index 98%
rename from Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectBayes.h
rename to Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectBayes.h
index 149be80b719..83cdc666b5d 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectBayes.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectBayes.h
@@ -6,7 +6,7 @@
//----------------------
#include "ui_IndirectBayes.h"
#include "MantidQtAPI/UserSubWindow.h"
-#include "MantidQtCustomInterfaces/IndirectBayesTab.h"
+#include "IndirectBayesTab.h"
#include <Poco/NObserver.h>
#include "MantidKernel/ConfigService.h"
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectBayes.ui b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectBayes.ui
similarity index 100%
rename from Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectBayes.ui
rename to Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectBayes.ui
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectBayesTab.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectBayesTab.h
similarity index 98%
rename from Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectBayesTab.h
rename to Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectBayesTab.h
index 3f073e758bb..b0e55dd30fd 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectBayesTab.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectBayesTab.h
@@ -2,7 +2,7 @@
#define MANTID_CUSTOMINTERFACES_INDIRECTBAYESTAB_H_
#include "MantidAPI/MatrixWorkspace.h"
-#include "MantidQtCustomInterfaces/IndirectTab.h"
+#include "IndirectTab.h"
#include "MantidQtMantidWidgets/RangeSelector.h"
#include "MantidQtAPI/AlgorithmRunner.h"
#include "MantidQtAPI/QwtWorkspaceSpectrumData.h"
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectCalibration.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectCalibration.h
similarity index 97%
rename from Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectCalibration.h
rename to Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectCalibration.h
index 69496515579..c14ec0a22ba 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectCalibration.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectCalibration.h
@@ -1,7 +1,7 @@
#ifndef MANTIDQTCUSTOMINTERFACES_INDIRECTCALIBRATION_H_
#define MANTIDQTCUSTOMINTERFACES_INDIRECTCALIBRATION_H_
-#include "MantidQtCustomInterfaces/IndirectDataReductionTab.h"
+#include "IndirectDataReductionTab.h"
#include "MantidKernel/System.h"
#include "MantidQtCustomInterfaces/UserInputValidator.h"
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectConvertToEnergy.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectConvertToEnergy.h
similarity index 98%
rename from Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectConvertToEnergy.h
rename to Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectConvertToEnergy.h
index e09ab59bc35..5c430ced51f 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectConvertToEnergy.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectConvertToEnergy.h
@@ -1,7 +1,7 @@
#ifndef MANTIDQTCUSTOMINTERFACES_INDIRECTCONVERTTOENERGY_H_
#define MANTIDQTCUSTOMINTERFACES_INDIRECTCONVERTTOENERGY_H_
-#include "MantidQtCustomInterfaces/IndirectDataReductionTab.h"
+#include "IndirectDataReductionTab.h"
#include "MantidKernel/System.h"
#include "MantidQtCustomInterfaces/Background.h"
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectDataAnalysis.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectDataAnalysis.h
similarity index 98%
rename from Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectDataAnalysis.h
rename to Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectDataAnalysis.h
index c1d283acdea..c7233144d7e 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectDataAnalysis.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectDataAnalysis.h
@@ -6,7 +6,7 @@
//----------------------
#include "ui_IndirectDataAnalysis.h"
#include "MantidQtAPI/UserSubWindow.h"
-#include "MantidQtCustomInterfaces/IndirectTab.h"
+#include "IndirectTab.h"
#include <Poco/NObserver.h>
#include "MantidKernel/ConfigService.h"
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectDataAnalysis.ui b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectDataAnalysis.ui
similarity index 100%
rename from Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectDataAnalysis.ui
rename to Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectDataAnalysis.ui
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectDataReduction.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectDataReduction.h
similarity index 98%
rename from Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectDataReduction.h
rename to Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectDataReduction.h
index 79eb954a858..0f3219bbbe1 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectDataReduction.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectDataReduction.h
@@ -8,7 +8,7 @@
#include "MantidQtAPI/AlgorithmRunner.h"
#include "MantidQtAPI/UserSubWindow.h"
-#include "MantidQtCustomInterfaces/IndirectDataReductionTab.h"
+#include "IndirectDataReductionTab.h"
#include <qwt_plot.h>
#include <qwt_plot_curve.h>
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectDataReduction.ui b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectDataReduction.ui
similarity index 100%
rename from Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectDataReduction.ui
rename to Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectDataReduction.ui
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectDataReductionTab.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectDataReductionTab.h
similarity index 96%
rename from Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectDataReductionTab.h
rename to Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectDataReductionTab.h
index 10079fcd929..bd9af5f20f5 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectDataReductionTab.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectDataReductionTab.h
@@ -8,8 +8,8 @@
#include "MantidQtAPI/BatchAlgorithmRunner.h"
#include "MantidQtAPI/PythonRunner.h"
#include "MantidQtAPI/QwtWorkspaceSpectrumData.h"
-#include "MantidQtCustomInterfaces/IndirectDataReduction.h"
-#include "MantidQtCustomInterfaces/IndirectTab.h"
+#include "IndirectDataReduction.h"
+#include "IndirectTab.h"
#include "MantidQtMantidWidgets/RangeSelector.h"
#include <QDoubleValidator>
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectDiagnostics.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectDiagnostics.h
similarity index 97%
rename from Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectDiagnostics.h
rename to Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectDiagnostics.h
index c58d8f69300..72b6dcc0609 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectDiagnostics.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectDiagnostics.h
@@ -1,7 +1,7 @@
#ifndef MANTIDQTCUSTOMINTERFACES_INDIRECTDIAGNOSTICS_H_
#define MANTIDQTCUSTOMINTERFACES_INDIRECTDIAGNOSTICS_H_
-#include "MantidQtCustomInterfaces/IndirectDataReductionTab.h"
+#include "IndirectDataReductionTab.h"
#include "MantidAPI/MatrixWorkspace.h"
#include "MantidKernel/System.h"
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectDiffractionReduction.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectDiffractionReduction.h
similarity index 100%
rename from Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectDiffractionReduction.h
rename to Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectDiffractionReduction.h
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectDiffractionReduction.ui b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectDiffractionReduction.ui
similarity index 100%
rename from Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectDiffractionReduction.ui
rename to Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectDiffractionReduction.ui
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectLoadILL.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectLoadILL.h
similarity index 94%
rename from Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectLoadILL.h
rename to Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectLoadILL.h
index a29fcea2d34..9fed1e099c0 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectLoadILL.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectLoadILL.h
@@ -2,7 +2,7 @@
#define MANTIDQTCUSTOMINTERFACES_INDIRECTLOADILL_H_
#include "ui_IndirectLoadILL.h"
-#include "MantidQtCustomInterfaces/IndirectToolsTab.h"
+#include "IndirectToolsTab.h"
#include "MantidAPI/ExperimentInfo.h"
#include <QComboBox>
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectLoadILL.ui b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectLoadILL.ui
similarity index 100%
rename from Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectLoadILL.ui
rename to Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectLoadILL.ui
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectMolDyn.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectMolDyn.h
similarity index 92%
rename from Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectMolDyn.h
rename to Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectMolDyn.h
index 000c1a164ac..49641a23e47 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectMolDyn.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectMolDyn.h
@@ -2,7 +2,7 @@
#define MANTIDQTCUSTOMINTERFACES_INDIRECTMOLDYN_H_
#include "ui_IndirectMolDyn.h"
-#include "MantidQtCustomInterfaces/IndirectSimulationTab.h"
+#include "IndirectSimulationTab.h"
namespace MantidQt
{
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectMolDyn.ui b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectMolDyn.ui
similarity index 100%
rename from Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectMolDyn.ui
rename to Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectMolDyn.ui
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectMoments.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectMoments.h
similarity index 97%
rename from Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectMoments.h
rename to Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectMoments.h
index c28b5cb44ac..8e6ce70f327 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectMoments.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectMoments.h
@@ -1,7 +1,7 @@
#ifndef MANTID_CUSTOMINTERFACES_INDIRECTMOMENTS_H_
#define MANTID_CUSTOMINTERFACES_INDIRECTMOMENTS_H_
-#include "MantidQtCustomInterfaces/IndirectDataReductionTab.h"
+#include "IndirectDataReductionTab.h"
#include "MantidKernel/System.h"
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectSassena.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectSassena.h
similarity index 93%
rename from Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectSassena.h
rename to Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectSassena.h
index dc373046b05..25837e522d6 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectSassena.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectSassena.h
@@ -2,7 +2,7 @@
#define MANTIDQTCUSTOMINTERFACES_INDIRECTSASSENA_H_
#include "ui_IndirectSassena.h"
-#include "MantidQtCustomInterfaces/IndirectSimulationTab.h"
+#include "IndirectSimulationTab.h"
namespace MantidQt
{
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectSassena.ui b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectSassena.ui
similarity index 100%
rename from Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectSassena.ui
rename to Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectSassena.ui
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectSimulation.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectSimulation.h
similarity index 98%
rename from Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectSimulation.h
rename to Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectSimulation.h
index 5ac204d0b15..b41d0633333 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectSimulation.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectSimulation.h
@@ -7,7 +7,7 @@
#include "ui_IndirectSimulation.h"
#include "MantidKernel/ConfigService.h"
#include "MantidQtAPI/UserSubWindow.h"
-#include "MantidQtCustomInterfaces/IndirectSimulationTab.h"
+#include "IndirectSimulationTab.h"
#include <Poco/NObserver.h>
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectSimulation.ui b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectSimulation.ui
similarity index 100%
rename from Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectSimulation.ui
rename to Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectSimulation.ui
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectSimulationTab.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectSimulationTab.h
similarity index 97%
rename from Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectSimulationTab.h
rename to Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectSimulationTab.h
index 5b29466890c..d2a1c1d51c2 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectSimulationTab.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectSimulationTab.h
@@ -4,7 +4,7 @@
#include "MantidAPI/AlgorithmManager.h"
#include "MantidKernel/System.h"
#include "MantidQtAPI/AlgorithmRunner.h"
-#include "MantidQtCustomInterfaces/IndirectTab.h"
+#include "IndirectTab.h"
#include <QSettings>
#include <QWidget>
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectSqw.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectSqw.h
similarity index 96%
rename from Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectSqw.h
rename to Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectSqw.h
index 8185f93f619..c8a730e7479 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectSqw.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectSqw.h
@@ -1,7 +1,7 @@
#ifndef MANTIDQTCUSTOMINTERFACES_INDIRECTSQW_H_
#define MANTIDQTCUSTOMINTERFACES_INDIRECTSQW_H_
-#include "MantidQtCustomInterfaces/IndirectDataReductionTab.h"
+#include "IndirectDataReductionTab.h"
#include "MantidKernel/System.h"
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectSymmetrise.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectSymmetrise.h
similarity index 97%
rename from Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectSymmetrise.h
rename to Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectSymmetrise.h
index 2951a409215..c391d8f3806 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectSymmetrise.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectSymmetrise.h
@@ -1,7 +1,7 @@
#ifndef MANTIDQTCUSTOMINTERFACES_INDIRECTSYMMETRISE_H_
#define MANTIDQTCUSTOMINTERFACES_INDIRECTSYMMETRISE_H_
-#include "MantidQtCustomInterfaces/IndirectDataReductionTab.h"
+#include "IndirectDataReductionTab.h"
#include "MantidAPI/MatrixWorkspace.h"
#include "MantidKernel/System.h"
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectTab.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectTab.h
similarity index 100%
rename from Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectTab.h
rename to Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectTab.h
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectTools.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectTools.h
similarity index 98%
rename from Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectTools.h
rename to Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectTools.h
index 7acf833d1ef..664ce3f1c27 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectTools.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectTools.h
@@ -7,7 +7,7 @@
#include "ui_IndirectTools.h"
#include "MantidKernel/ConfigService.h"
#include "MantidQtAPI/UserSubWindow.h"
-#include "MantidQtCustomInterfaces/IndirectToolsTab.h"
+#include "IndirectToolsTab.h"
#include <Poco/NObserver.h>
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectTools.ui b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectTools.ui
similarity index 100%
rename from Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectTools.ui
rename to Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectTools.ui
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectToolsTab.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectToolsTab.h
similarity index 100%
rename from Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectToolsTab.h
rename to Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectToolsTab.h
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectTransmission.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectTransmission.h
similarity index 96%
rename from Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectTransmission.h
rename to Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectTransmission.h
index f0b69a70958..bc57dc29e72 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectTransmission.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectTransmission.h
@@ -1,7 +1,7 @@
#ifndef MANTID_CUSTOMINTERFACES_INDIRECTTRANSMISSION_H_
#define MANTID_CUSTOMINTERFACES_INDIRECTTRANSMISSION_H_
-#include "MantidQtCustomInterfaces/IndirectDataReductionTab.h"
+#include "IndirectDataReductionTab.h"
#include "MantidKernel/System.h"
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectTransmissionCalc.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectTransmissionCalc.h
similarity index 95%
rename from Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectTransmissionCalc.h
rename to Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectTransmissionCalc.h
index c1b2b31011c..a52722639af 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectTransmissionCalc.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectTransmissionCalc.h
@@ -2,7 +2,7 @@
#define MANTIDQTCUSTOMINTERFACES_INDIRECTTRANSMISSIONCALC_H_
#include "ui_IndirectTransmissionCalc.h"
-#include "MantidQtCustomInterfaces/IndirectToolsTab.h"
+#include "IndirectToolsTab.h"
#include "MantidAPI/ExperimentInfo.h"
#include <QComboBox>
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectTransmissionCalc.ui b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectTransmissionCalc.ui
similarity index 100%
rename from Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectTransmissionCalc.ui
rename to Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectTransmissionCalc.ui
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/JumpFit.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/JumpFit.h
similarity index 96%
rename from Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/JumpFit.h
rename to Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/JumpFit.h
index fbde3aabb08..3f2b9750657 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/JumpFit.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/JumpFit.h
@@ -2,7 +2,7 @@
#define MANTIDQTCUSTOMINTERFACES_JUMPFIT_H_
#include "ui_JumpFit.h"
-#include "MantidQtCustomInterfaces/IndirectBayesTab.h"
+#include "IndirectBayesTab.h"
namespace MantidQt
{
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/JumpFit.ui b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/JumpFit.ui
similarity index 100%
rename from Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/JumpFit.ui
rename to Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/JumpFit.ui
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/MSDFit.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/MSDFit.h
similarity index 95%
rename from Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/MSDFit.h
rename to Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/MSDFit.h
index fd0951849ee..bd23d836b3d 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/MSDFit.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/MSDFit.h
@@ -1,7 +1,7 @@
#ifndef MANTIDQTCUSTOMINTERFACESIDA_MSDFIT_H_
#define MANTIDQTCUSTOMINTERFACESIDA_MSDFIT_H_
-#include "MantidQtCustomInterfaces/IDATab.h"
+#include "IDATab.h"
namespace MantidQt
{
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Quasi.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/Quasi.h
similarity index 96%
rename from Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Quasi.h
rename to Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/Quasi.h
index d7cd02ab6dc..df94ec39c20 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Quasi.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/Quasi.h
@@ -2,7 +2,7 @@
#define MANTIDQTCUSTOMINTERFACES_QUASI_H_
#include "ui_Quasi.h"
-#include "MantidQtCustomInterfaces/IndirectBayesTab.h"
+#include "IndirectBayesTab.h"
namespace MantidQt
{
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Quasi.ui b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/Quasi.ui
similarity index 100%
rename from Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Quasi.ui
rename to Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/Quasi.ui
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ResNorm.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ResNorm.h
similarity index 95%
rename from Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ResNorm.h
rename to Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ResNorm.h
index 66c0f03b7a1..1377de73f02 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ResNorm.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ResNorm.h
@@ -2,7 +2,7 @@
#define MANTIDQTCUSTOMINTERFACES_RESNORM_H_
#include "ui_ResNorm.h"
-#include "MantidQtCustomInterfaces/IndirectBayesTab.h"
+#include "IndirectBayesTab.h"
namespace MantidQt
{
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ResNorm.ui b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ResNorm.ui
similarity index 100%
rename from Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ResNorm.ui
rename to Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ResNorm.ui
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Stretch.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/Stretch.h
similarity index 95%
rename from Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Stretch.h
rename to Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/Stretch.h
index b35d2dec4ad..6fbfdaea0c3 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Stretch.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/Stretch.h
@@ -2,7 +2,7 @@
#define MANTIDQTCUSTOMINTERFACES_STRETCH_H_
#include "ui_Stretch.h"
-#include "MantidQtCustomInterfaces/IndirectBayesTab.h"
+#include "IndirectBayesTab.h"
namespace MantidQt
{
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Stretch.ui b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/Stretch.ui
similarity index 100%
rename from Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Stretch.ui
rename to Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/Stretch.ui
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/ApplyCorr.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/ApplyCorr.cpp
similarity index 99%
rename from Code/Mantid/MantidQt/CustomInterfaces/src/ApplyCorr.cpp
rename to Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/ApplyCorr.cpp
index 3b7de751945..138fe1c3e9d 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/ApplyCorr.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/ApplyCorr.cpp
@@ -1,4 +1,4 @@
-#include "MantidQtCustomInterfaces/ApplyCorr.h"
+#include "MantidQtCustomInterfaces/Indirect/ApplyCorr.h"
#include "MantidAPI/AnalysisDataService.h"
#include "MantidAPI/TextAxis.h"
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/CalcCorr.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/CalcCorr.cpp
similarity index 99%
rename from Code/Mantid/MantidQt/CustomInterfaces/src/CalcCorr.cpp
rename to Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/CalcCorr.cpp
index 325451b7e79..ea58f2f06cb 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/CalcCorr.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/CalcCorr.cpp
@@ -1,5 +1,5 @@
#include "MantidAPI/AnalysisDataService.h"
-#include "MantidQtCustomInterfaces/CalcCorr.h"
+#include "MantidQtCustomInterfaces/Indirect/CalcCorr.h"
#include "MantidQtCustomInterfaces/UserInputValidator.h"
#include "MantidQtMantidWidgets/WorkspaceSelector.h"
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/ConvFit.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/ConvFit.cpp
similarity index 99%
rename from Code/Mantid/MantidQt/CustomInterfaces/src/ConvFit.cpp
rename to Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/ConvFit.cpp
index 81a70982483..897185cd9ab 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/ConvFit.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/ConvFit.cpp
@@ -1,4 +1,4 @@
-#include "MantidQtCustomInterfaces/ConvFit.h"
+#include "MantidQtCustomInterfaces/Indirect/ConvFit.h"
#include "MantidQtCustomInterfaces/UserInputValidator.h"
#include "MantidQtMantidWidgets/RangeSelector.h"
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Elwin.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/Elwin.cpp
similarity index 99%
rename from Code/Mantid/MantidQt/CustomInterfaces/src/Elwin.cpp
rename to Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/Elwin.cpp
index 919f78b0549..ac1443964f0 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/Elwin.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/Elwin.cpp
@@ -1,4 +1,4 @@
-#include "MantidQtCustomInterfaces/Elwin.h"
+#include "MantidQtCustomInterfaces/Indirect/Elwin.h"
#include "MantidQtCustomInterfaces/UserInputValidator.h"
#include "MantidQtMantidWidgets/RangeSelector.h"
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Fury.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/Fury.cpp
similarity index 99%
rename from Code/Mantid/MantidQt/CustomInterfaces/src/Fury.cpp
rename to Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/Fury.cpp
index 8ae8c8e6818..6598db8fc9d 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/Fury.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/Fury.cpp
@@ -1,4 +1,4 @@
-#include "MantidQtCustomInterfaces/Fury.h"
+#include "MantidQtCustomInterfaces/Indirect/Fury.h"
#include "MantidQtCustomInterfaces/UserInputValidator.h"
#include "MantidQtMantidWidgets/RangeSelector.h"
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/FuryFit.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/FuryFit.cpp
similarity index 99%
rename from Code/Mantid/MantidQt/CustomInterfaces/src/FuryFit.cpp
rename to Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/FuryFit.cpp
index 6fab6fc6d2f..d9e3a568d01 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/FuryFit.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/FuryFit.cpp
@@ -1,4 +1,4 @@
-#include "MantidQtCustomInterfaces/FuryFit.h"
+#include "MantidQtCustomInterfaces/Indirect/FuryFit.h"
#include "MantidQtCustomInterfaces/UserInputValidator.h"
#include "MantidQtMantidWidgets/RangeSelector.h"
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/IDATab.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IDATab.cpp
similarity index 98%
rename from Code/Mantid/MantidQt/CustomInterfaces/src/IDATab.cpp
rename to Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IDATab.cpp
index 587c2921c73..225408fc783 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/IDATab.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IDATab.cpp
@@ -1,4 +1,4 @@
-#include "MantidQtCustomInterfaces/IDATab.h"
+#include "MantidQtCustomInterfaces/Indirect/IDATab.h"
#include "MantidAPI/MatrixWorkspace.h"
#include "MantidAPI/AnalysisDataService.h"
#include "boost/shared_ptr.hpp"
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/IndirectBayes.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectBayes.cpp
similarity index 93%
rename from Code/Mantid/MantidQt/CustomInterfaces/src/IndirectBayes.cpp
rename to Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectBayes.cpp
index 49db0e54f64..2460528a582 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/IndirectBayes.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectBayes.cpp
@@ -1,9 +1,9 @@
#include "MantidQtAPI/ManageUserDirectories.h"
-#include "MantidQtCustomInterfaces/IndirectBayes.h"
-#include "MantidQtCustomInterfaces/JumpFit.h"
-#include "MantidQtCustomInterfaces/Quasi.h"
-#include "MantidQtCustomInterfaces/ResNorm.h"
-#include "MantidQtCustomInterfaces/Stretch.h"
+#include "MantidQtCustomInterfaces/Indirect/IndirectBayes.h"
+#include "MantidQtCustomInterfaces/Indirect/JumpFit.h"
+#include "MantidQtCustomInterfaces/Indirect/Quasi.h"
+#include "MantidQtCustomInterfaces/Indirect/ResNorm.h"
+#include "MantidQtCustomInterfaces/Indirect/Stretch.h"
#include <QDesktopServices>
#include <QUrl>
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/IndirectBayesTab.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectBayesTab.cpp
similarity index 98%
rename from Code/Mantid/MantidQt/CustomInterfaces/src/IndirectBayesTab.cpp
rename to Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectBayesTab.cpp
index 6ce219f719e..c87d289b062 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/IndirectBayesTab.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectBayesTab.cpp
@@ -2,7 +2,7 @@
#include "MantidAPI/AnalysisDataService.h"
#include "MantidQtAPI/QwtWorkspaceSpectrumData.h"
#include "MantidQtAPI/UserSubWindow.h"
-#include "MantidQtCustomInterfaces/IndirectBayesTab.h"
+#include "MantidQtCustomInterfaces/Indirect/IndirectBayesTab.h"
using MantidQt::MantidWidgets::RangeSelector;
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/IndirectCalibration.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectCalibration.cpp
similarity index 99%
rename from Code/Mantid/MantidQt/CustomInterfaces/src/IndirectCalibration.cpp
rename to Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectCalibration.cpp
index 498b5fbc861..c67673eb9a5 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/IndirectCalibration.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectCalibration.cpp
@@ -1,4 +1,4 @@
-#include "MantidQtCustomInterfaces/IndirectCalibration.h"
+#include "MantidQtCustomInterfaces/Indirect/IndirectCalibration.h"
#include "MantidKernel/Logger.h"
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/IndirectConvertToEnergy.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectConvertToEnergy.cpp
similarity index 99%
rename from Code/Mantid/MantidQt/CustomInterfaces/src/IndirectConvertToEnergy.cpp
rename to Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectConvertToEnergy.cpp
index 15d765f96f8..e55a58c742b 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/IndirectConvertToEnergy.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectConvertToEnergy.cpp
@@ -1,4 +1,4 @@
-#include "MantidQtCustomInterfaces/IndirectConvertToEnergy.h"
+#include "MantidQtCustomInterfaces/Indirect/IndirectConvertToEnergy.h"
#include "MantidQtCustomInterfaces/Background.h"
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/IndirectDataAnalysis.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectDataAnalysis.cpp
similarity index 92%
rename from Code/Mantid/MantidQt/CustomInterfaces/src/IndirectDataAnalysis.cpp
rename to Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectDataAnalysis.cpp
index 6ca177b4536..c8debe57996 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/IndirectDataAnalysis.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectDataAnalysis.cpp
@@ -1,16 +1,16 @@
//----------------------
// Includes
//----------------------
-#include "MantidQtCustomInterfaces/IndirectDataAnalysis.h"
+#include "MantidQtCustomInterfaces/Indirect/IndirectDataAnalysis.h"
// IDATab subclasses:
-#include "MantidQtCustomInterfaces/Elwin.h"
-#include "MantidQtCustomInterfaces/MSDFit.h"
-#include "MantidQtCustomInterfaces/Fury.h"
-#include "MantidQtCustomInterfaces/FuryFit.h"
-#include "MantidQtCustomInterfaces/ConvFit.h"
-#include "MantidQtCustomInterfaces/CalcCorr.h"
-#include "MantidQtCustomInterfaces/ApplyCorr.h"
+#include "MantidQtCustomInterfaces/Indirect/Elwin.h"
+#include "MantidQtCustomInterfaces/Indirect/MSDFit.h"
+#include "MantidQtCustomInterfaces/Indirect/Fury.h"
+#include "MantidQtCustomInterfaces/Indirect/FuryFit.h"
+#include "MantidQtCustomInterfaces/Indirect/ConvFit.h"
+#include "MantidQtCustomInterfaces/Indirect/CalcCorr.h"
+#include "MantidQtCustomInterfaces/Indirect/ApplyCorr.h"
#include "MantidQtAPI/ManageUserDirectories.h"
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/IndirectDataReduction.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectDataReduction.cpp
similarity index 96%
rename from Code/Mantid/MantidQt/CustomInterfaces/src/IndirectDataReduction.cpp
rename to Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectDataReduction.cpp
index a77827f97c3..bc53306820a 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/IndirectDataReduction.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectDataReduction.cpp
@@ -1,20 +1,20 @@
//----------------------
// Includes
//----------------------
-#include "MantidQtCustomInterfaces/IndirectDataReduction.h"
+#include "MantidQtCustomInterfaces/Indirect/IndirectDataReduction.h"
#include "MantidAPI/AlgorithmManager.h"
#include "MantidAPI/AnalysisDataService.h"
#include "MantidAPI/ExperimentInfo.h"
#include "MantidKernel/ConfigService.h"
#include "MantidQtAPI/ManageUserDirectories.h"
-#include "MantidQtCustomInterfaces/IndirectCalibration.h"
-#include "MantidQtCustomInterfaces/IndirectConvertToEnergy.h"
-#include "MantidQtCustomInterfaces/IndirectDiagnostics.h"
-#include "MantidQtCustomInterfaces/IndirectMoments.h"
-#include "MantidQtCustomInterfaces/IndirectSqw.h"
-#include "MantidQtCustomInterfaces/IndirectSymmetrise.h"
-#include "MantidQtCustomInterfaces/IndirectTransmission.h"
+#include "MantidQtCustomInterfaces/Indirect/IndirectCalibration.h"
+#include "MantidQtCustomInterfaces/Indirect/IndirectConvertToEnergy.h"
+#include "MantidQtCustomInterfaces/Indirect/IndirectDiagnostics.h"
+#include "MantidQtCustomInterfaces/Indirect/IndirectMoments.h"
+#include "MantidQtCustomInterfaces/Indirect/IndirectSqw.h"
+#include "MantidQtCustomInterfaces/Indirect/IndirectSymmetrise.h"
+#include "MantidQtCustomInterfaces/Indirect/IndirectTransmission.h"
#include <QDesktopServices>
#include <QDir>
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/IndirectDataReductionTab.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectDataReductionTab.cpp
similarity index 99%
rename from Code/Mantid/MantidQt/CustomInterfaces/src/IndirectDataReductionTab.cpp
rename to Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectDataReductionTab.cpp
index b2013ec7468..714864136dc 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/IndirectDataReductionTab.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectDataReductionTab.cpp
@@ -1,4 +1,4 @@
-#include "MantidQtCustomInterfaces/IndirectDataReductionTab.h"
+#include "MantidQtCustomInterfaces/Indirect/IndirectDataReductionTab.h"
#include "MantidAPI/AlgorithmManager.h"
#include "MantidKernel/Logger.h"
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/IndirectDiagnostics.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectDiagnostics.cpp
similarity index 99%
rename from Code/Mantid/MantidQt/CustomInterfaces/src/IndirectDiagnostics.cpp
rename to Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectDiagnostics.cpp
index f67c7e3a023..308bed8c099 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/IndirectDiagnostics.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectDiagnostics.cpp
@@ -1,4 +1,4 @@
-#include "MantidQtCustomInterfaces/IndirectDiagnostics.h"
+#include "MantidQtCustomInterfaces/Indirect/IndirectDiagnostics.h"
#include "MantidAPI/MatrixWorkspace.h"
#include "MantidKernel/Logger.h"
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/IndirectDiffractionReduction.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectDiffractionReduction.cpp
similarity index 99%
rename from Code/Mantid/MantidQt/CustomInterfaces/src/IndirectDiffractionReduction.cpp
rename to Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectDiffractionReduction.cpp
index db1faf3e810..c78a88e67c7 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/IndirectDiffractionReduction.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectDiffractionReduction.cpp
@@ -1,7 +1,7 @@
//----------------------
// Includes
//----------------------
-#include "MantidQtCustomInterfaces/IndirectDiffractionReduction.h"
+#include "MantidQtCustomInterfaces/Indirect/IndirectDiffractionReduction.h"
#include "MantidQtAPI/ManageUserDirectories.h"
#include "MantidAPI/AlgorithmManager.h"
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/IndirectLoadILL.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectLoadILL.cpp
similarity index 98%
rename from Code/Mantid/MantidQt/CustomInterfaces/src/IndirectLoadILL.cpp
rename to Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectLoadILL.cpp
index 65692fbe9d4..a0a004f611a 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/IndirectLoadILL.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectLoadILL.cpp
@@ -3,7 +3,7 @@
#include "MantidAPI/MatrixWorkspace.h"
#include "MantidKernel/ConfigService.h"
#include "MantidKernel/FacilityInfo.h"
-#include "MantidQtCustomInterfaces/IndirectLoadILL.h"
+#include "MantidQtCustomInterfaces/Indirect/IndirectLoadILL.h"
#include <QFileInfo>
#include <QStringList>
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/IndirectMolDyn.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectMolDyn.cpp
similarity index 98%
rename from Code/Mantid/MantidQt/CustomInterfaces/src/IndirectMolDyn.cpp
rename to Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectMolDyn.cpp
index ed3b97c72d1..53d90a12c73 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/IndirectMolDyn.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectMolDyn.cpp
@@ -1,4 +1,4 @@
-#include "MantidQtCustomInterfaces/IndirectMolDyn.h"
+#include "MantidQtCustomInterfaces/Indirect/IndirectMolDyn.h"
#include <QFileInfo>
#include <QString>
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/IndirectMoments.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectMoments.cpp
similarity index 99%
rename from Code/Mantid/MantidQt/CustomInterfaces/src/IndirectMoments.cpp
rename to Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectMoments.cpp
index 3c485433864..75ddd23b90f 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/IndirectMoments.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectMoments.cpp
@@ -1,4 +1,4 @@
-#include "MantidQtCustomInterfaces/IndirectMoments.h"
+#include "MantidQtCustomInterfaces/Indirect/IndirectMoments.h"
#include "MantidQtCustomInterfaces/UserInputValidator.h"
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/IndirectSassena.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectSassena.cpp
similarity index 98%
rename from Code/Mantid/MantidQt/CustomInterfaces/src/IndirectSassena.cpp
rename to Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectSassena.cpp
index 457718358c6..ad7c8326902 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/IndirectSassena.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectSassena.cpp
@@ -1,4 +1,4 @@
-#include "MantidQtCustomInterfaces/IndirectSassena.h"
+#include "MantidQtCustomInterfaces/Indirect/IndirectSassena.h"
#include <QFileInfo>
#include <QString>
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/IndirectSimulation.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectSimulation.cpp
similarity index 95%
rename from Code/Mantid/MantidQt/CustomInterfaces/src/IndirectSimulation.cpp
rename to Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectSimulation.cpp
index 649cdfa022b..17386eaa3a0 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/IndirectSimulation.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectSimulation.cpp
@@ -1,8 +1,8 @@
#include "MantidKernel/ConfigService.h"
#include "MantidQtAPI/ManageUserDirectories.h"
-#include "MantidQtCustomInterfaces/IndirectSimulation.h"
-#include "MantidQtCustomInterfaces/IndirectMolDyn.h"
-#include "MantidQtCustomInterfaces/IndirectSassena.h"
+#include "MantidQtCustomInterfaces/Indirect/IndirectSimulation.h"
+#include "MantidQtCustomInterfaces/Indirect/IndirectMolDyn.h"
+#include "MantidQtCustomInterfaces/Indirect/IndirectSassena.h"
#include <QDesktopServices>
#include <QUrl>
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/IndirectSimulationTab.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectSimulationTab.cpp
similarity index 92%
rename from Code/Mantid/MantidQt/CustomInterfaces/src/IndirectSimulationTab.cpp
rename to Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectSimulationTab.cpp
index 47d7cef49b8..d0f2a7f11cd 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/IndirectSimulationTab.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectSimulationTab.cpp
@@ -1,5 +1,5 @@
#include "MantidQtAPI/UserSubWindow.h"
-#include "MantidQtCustomInterfaces/IndirectSimulationTab.h"
+#include "MantidQtCustomInterfaces/Indirect/IndirectSimulationTab.h"
using namespace Mantid::API;
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/IndirectSqw.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectSqw.cpp
similarity index 99%
rename from Code/Mantid/MantidQt/CustomInterfaces/src/IndirectSqw.cpp
rename to Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectSqw.cpp
index 3003c32c3af..71ee2abab16 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/IndirectSqw.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectSqw.cpp
@@ -1,4 +1,4 @@
-#include "MantidQtCustomInterfaces/IndirectSqw.h"
+#include "MantidQtCustomInterfaces/Indirect/IndirectSqw.h"
#include "MantidQtCustomInterfaces/UserInputValidator.h"
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/IndirectSymmetrise.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectSymmetrise.cpp
similarity index 99%
rename from Code/Mantid/MantidQt/CustomInterfaces/src/IndirectSymmetrise.cpp
rename to Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectSymmetrise.cpp
index ce99f8dcb63..0bbe9cad085 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/IndirectSymmetrise.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectSymmetrise.cpp
@@ -1,4 +1,4 @@
-#include "MantidQtCustomInterfaces/IndirectSymmetrise.h"
+#include "MantidQtCustomInterfaces/Indirect/IndirectSymmetrise.h"
#include "MantidAPI/MatrixWorkspace.h"
#include "MantidAPI/ITableWorkspace.h"
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/IndirectTab.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectTab.cpp
similarity index 99%
rename from Code/Mantid/MantidQt/CustomInterfaces/src/IndirectTab.cpp
rename to Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectTab.cpp
index 8940d782fcf..6e2d5109c05 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/IndirectTab.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectTab.cpp
@@ -1,4 +1,4 @@
-#include "MantidQtCustomInterfaces/IndirectTab.h"
+#include "MantidQtCustomInterfaces/Indirect/IndirectTab.h"
#include "MantidAPI/AlgorithmManager.h"
#include "MantidKernel/Logger.h"
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/IndirectTools.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectTools.cpp
similarity index 95%
rename from Code/Mantid/MantidQt/CustomInterfaces/src/IndirectTools.cpp
rename to Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectTools.cpp
index 23729ba8c0c..2b6fb85e5ae 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/IndirectTools.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectTools.cpp
@@ -1,8 +1,8 @@
#include "MantidKernel/ConfigService.h"
#include "MantidQtAPI/ManageUserDirectories.h"
-#include "MantidQtCustomInterfaces/IndirectTools.h"
-#include "MantidQtCustomInterfaces/IndirectTransmissionCalc.h"
-#include "MantidQtCustomInterfaces/IndirectLoadILL.h"
+#include "MantidQtCustomInterfaces/Indirect/IndirectTools.h"
+#include "MantidQtCustomInterfaces/Indirect/IndirectTransmissionCalc.h"
+#include "MantidQtCustomInterfaces/Indirect/IndirectLoadILL.h"
#include <QDesktopServices>
#include <QUrl>
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/IndirectToolsTab.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectToolsTab.cpp
similarity index 94%
rename from Code/Mantid/MantidQt/CustomInterfaces/src/IndirectToolsTab.cpp
rename to Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectToolsTab.cpp
index 768f9aafa86..f1b1c007648 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/IndirectToolsTab.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectToolsTab.cpp
@@ -1,5 +1,5 @@
#include "MantidQtAPI/UserSubWindow.h"
-#include "MantidQtCustomInterfaces/IndirectToolsTab.h"
+#include "MantidQtCustomInterfaces/Indirect/IndirectToolsTab.h"
namespace MantidQt
{
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/IndirectTransmission.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectTransmission.cpp
similarity index 98%
rename from Code/Mantid/MantidQt/CustomInterfaces/src/IndirectTransmission.cpp
rename to Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectTransmission.cpp
index 035353ab4c6..c1d4683fad2 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/IndirectTransmission.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectTransmission.cpp
@@ -1,4 +1,4 @@
-#include "MantidQtCustomInterfaces/IndirectTransmission.h"
+#include "MantidQtCustomInterfaces/Indirect/IndirectTransmission.h"
#include <QFileInfo>
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/IndirectTransmissionCalc.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectTransmissionCalc.cpp
similarity index 98%
rename from Code/Mantid/MantidQt/CustomInterfaces/src/IndirectTransmissionCalc.cpp
rename to Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectTransmissionCalc.cpp
index 1ff2c198a7f..08b4c88e807 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/IndirectTransmissionCalc.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectTransmissionCalc.cpp
@@ -2,7 +2,7 @@
#include "MantidAPI/ExperimentInfo.h"
#include "MantidAPI/MatrixWorkspace.h"
#include "MantidAPI/ITableWorkspace.h"
-#include "MantidQtCustomInterfaces/IndirectTransmissionCalc.h"
+#include "MantidQtCustomInterfaces/Indirect/IndirectTransmissionCalc.h"
#include "MantidQtCustomInterfaces/UserInputValidator.h"
#include <QTreeWidgetItem>
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/JumpFit.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/JumpFit.cpp
similarity index 99%
rename from Code/Mantid/MantidQt/CustomInterfaces/src/JumpFit.cpp
rename to Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/JumpFit.cpp
index 240174dc14c..6a093dcd26d 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/JumpFit.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/JumpFit.cpp
@@ -1,7 +1,7 @@
#include "MantidAPI/AlgorithmManager.h"
#include "MantidAPI/Run.h"
#include "MantidAPI/TextAxis.h"
-#include "MantidQtCustomInterfaces/JumpFit.h"
+#include "MantidQtCustomInterfaces/Indirect/JumpFit.h"
#include "MantidQtCustomInterfaces/UserInputValidator.h"
#include <string>
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/MSDFit.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/MSDFit.cpp
similarity index 99%
rename from Code/Mantid/MantidQt/CustomInterfaces/src/MSDFit.cpp
rename to Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/MSDFit.cpp
index 8ea5836e8c0..fda5bdef0cf 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/MSDFit.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/MSDFit.cpp
@@ -1,6 +1,6 @@
#include "MantidAPI/AnalysisDataService.h"
#include "MantidAPI/WorkspaceGroup.h"
-#include "MantidQtCustomInterfaces/MSDFit.h"
+#include "MantidQtCustomInterfaces/Indirect/MSDFit.h"
#include "MantidQtCustomInterfaces/UserInputValidator.h"
#include "MantidQtMantidWidgets/RangeSelector.h"
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Quasi.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/Quasi.cpp
similarity index 99%
rename from Code/Mantid/MantidQt/CustomInterfaces/src/Quasi.cpp
rename to Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/Quasi.cpp
index a27a8d564b0..e70b4d3310f 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/Quasi.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/Quasi.cpp
@@ -1,5 +1,5 @@
#include "MantidAPI/TextAxis.h"
-#include "MantidQtCustomInterfaces/Quasi.h"
+#include "MantidQtCustomInterfaces/Indirect/Quasi.h"
#include "MantidQtCustomInterfaces/UserInputValidator.h"
using namespace Mantid::API;
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/ResNorm.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/ResNorm.cpp
similarity index 99%
rename from Code/Mantid/MantidQt/CustomInterfaces/src/ResNorm.cpp
rename to Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/ResNorm.cpp
index 907609ff5ff..a9ccfd47614 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/ResNorm.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/ResNorm.cpp
@@ -1,4 +1,4 @@
-#include "MantidQtCustomInterfaces/ResNorm.h"
+#include "MantidQtCustomInterfaces/Indirect/ResNorm.h"
#include "MantidQtCustomInterfaces/UserInputValidator.h"
using namespace Mantid::API;
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Stretch.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/Stretch.cpp
similarity index 99%
rename from Code/Mantid/MantidQt/CustomInterfaces/src/Stretch.cpp
rename to Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/Stretch.cpp
index 83f8217d283..616c9ff8523 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/Stretch.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/Stretch.cpp
@@ -1,4 +1,4 @@
-#include "MantidQtCustomInterfaces/Stretch.h"
+#include "MantidQtCustomInterfaces/Indirect/Stretch.h"
#include "MantidQtCustomInterfaces/UserInputValidator.h"
namespace
--
GitLab