diff --git a/MantidPlot/CMakeLists.txt b/MantidPlot/CMakeLists.txt
index e2ca49d3a4fe6e5ad6123a4e625c502734ad0f64..a0719b2f00e6ad5d5a25218df0fef0ec976dc52e 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 55ab9b42e8c8a2d12463ba26e4d05c78d77409a8..312ef9f0bc52d4719e38c732695682dd2843c847 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 38d369761c1762a4975faf1c6f19f4383bc40bcf..0000000000000000000000000000000000000000
--- 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 1eecb4244c575584e8782ce225979048f2e99261..399234e31123c156f69ac5334b871391c065ddd8 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 0000000000000000000000000000000000000000..303bfcdb37806583fe328904cc0b33b07ff870eb
--- /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 a553f6c6a2d2f6e59b5487e3b86ac6bb57467926..3b6738563d4ae084572d3f308a70588e0bd9538d 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 2262a5302dc69f066f0ea86b5c14fddd12a6861d..80497c719028deb7fe62e2c8c3f6a83b2181e846 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 7c05381c01c4b0f52cc6cda90312410853e38411..f8ea5c5fdd24a02045f075315795bb39d7a7924b 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 da2c9afc50978eded33d148c981e7d8f7acf86e1..732ceefdfa54892e4c62c42e2989119e847bd08c 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 64d70f9c9bd1be46c7d8487a1ff05fab9a54e31f..b67b1f84a7c95878d34a57f3a43283a143ce3876 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 dd7e7404d31b1307f9c975274e43b2a6dcbd021f..7c5772231c14136fa383eef0e1a2d8f9e57e9da8 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 cd4faa0b2f67b33381356e619be601629134b162..6cedb77d8a474ba430e5b9d761d66bdbeb5b5abc 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 ebdee1463d6f07d6cb7850be6d14da969767e2b6..7107b363c4acc02deb7b52e182507fb54d2bfb90 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 8e707a61ae15f1ea117bd1713d3cb9987155862a..0d0d3e15ec38c87d3816a7eb140e1ebc9180fb9c 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 b9f180ec0a63e6a940cbb55b5ae950bad44db00f..bfd8d1d5e2be9010afbbff597aa29e052876e710 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 29bd0c7715d198d58a4b6fbb400ddcaeb5b12a78..cc98435de78a19f3307f9b94b0dac5471067f694 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 eb60fe4880cd9e373f8f0ab178a4bee9042e9196..d6892fbb76a8959ee3b90c475685beac4e7c4b88 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 fadb771ac3b50076724a7e36f69b82a1dbb230c4..8db1c2dcb266120d6d6ad499b962921e7d1e8052 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 96b36a097b377db553ff7852b192693ba771d53d..46a1600f707006c4e3c2d8a146b715b3a6201bf5 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 5d46d031f172be6b1ec2ad7dd88c5740dbc328f5..835bdac003c625da043a21172b550e0c6c1d968e 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 3c51c2fc1851bcbebc9e19751b307eba085f2033..23d6c2be72b9d7fae96b99754be98620012182be 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 d975ac65b84b72eb07caef77ebbfeff512b71e07..b98103caf4a72f89eb1bb43bf218a5a5bf440ee4 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 77331b800f989b2d9c41cba3639c10578fa3fd0c..917f83aebd6ec8ebafe91a5975290bed118b183b 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 6a44bf0919addfa0f4f69027e69be557fc9ee701..d898cd95a77b61edffc746f7e2661071fd6f532f 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 f9b6805bcdd3069fc64552e1499d054cd20231a8..93949f9c000b0d11f8fead2f8a005e78088d2c7b 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 02735d7ec4012cc19add48588df35e3a5cdece7c..5641a2b5c7fe11b402fe0c7ea4d6be8b395f5d11 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 25d2eb4e5b144244505e90dac50db7206e04e9e0..e69c1364c083f7f7561fb25f35b577746f81cfbb 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 ed42c3dbf1c70bc7b560d60aa8c59f6ed7390e21..9c1f8b929464854ad4022f3d2c80afd7ca927900 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 7802c1b4845e7558277fee305a2e9c119228898a..c5d7da4e95eb981fec08b228a6d8b50c184b9ea3 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 0000000000000000000000000000000000000000..50cfa1cdcc0b2eb7684ec8db7d88698d58c2c077
--- /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 0000000000000000000000000000000000000000..6d4ec95177e31c71059c0f9b348beff6847179cc
--- /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 00a515a858ed1f21c1163ff483c540fede0cf2b5..18f24cd06ea86a30fcb557b14d9c4bafe3c35050 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 518257973108e132436f9e2c12aa7744ea257709..2a9eb8dbc04ed0c60b0cab89b6f51ccf906e86df 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 aaf702dfb36be1a263e6e7d4296295fb24688432..787c5924be46b6b57cba1d289749e68c0ebd327a 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 bcaacfb66e358719c433aa49d314af8859e61d94..a6f1a666ec20ac0eec99566a90c9d80a28d55416 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 e33857b245a7c32275e80c793faf2b4fe49b45c6..92ce30fd9dc05ba4a4a23e3131a1c8702d88e5ab 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 a4ea9faff8e0c92c221c39ba9e7ac6231a645531..b15f8035066389e69fbb2b71207d0c073244c1c0 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 68b752ba74f0a26af4ba36981bdc44f3bd618977..30c5acbb259a47864a20a1a9884a2f8432f0e9ca 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 61bd89b31efdb7f2401fe124dbedd1754f11f938..62c744c50dae311250d38ef5f18d7682e37b47c4 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 792fcd97006bf6ec738644ed21f1147d5feb4935..79ba63f9e2c209d0d9f7aa49ae5af5ac38bee9c1 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 66b372aea07e7f3b9df569f727bfe50575e8a083..16e9de61d92c6c5fd586f0168ad7eb8accb9135a 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 667a4404e4fb49d224b471c3cd129c002c4d76fe..d575891ea32a8bdd8f3b34718d906beaebbf67fc 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 07e29612cc0800896c7a2ad6d79cb8e2866397d6..415c5ba0050a50d71b87b4b6b03c36702183cce2 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 b35a7338e7892cbb476d74a3ecd3ab13b901c99b..ba2be0f1b1fbbfccb670a947721a99007a3c36e5 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 5dc36a42339d35148192c74a3947e3600670c763..c9767eb7eeefd63e6b9e108919d15f6ec702f05f 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 4a5f90b151048772da203cd940e3bf4d843bc8bd..b3fa2bb308bf6068fbe1dbbd8e0a9c086bb2a0cd 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 d27c6051c1149232396904208dbf913328b91e88..4d2e039379af92282459f7e5692358ac83f67dc8 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 be8e4834773a3b86bfa8369bfb6e4c658ec4b5f6..8933f212c051a17091dd7abf75dd15a377f44e28 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 a26f1ea3cd5ce3373d432d80e8055e38df3715b4..f7a6af2d2ea6ea25b28bbd6f1a16033da12af260 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 a7501a47be37ed811d8c77f009b24f5c56553a2c..b79dd57929108d96a7350eb0a2d8c776bc86e5ed 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 988912f53921646040cb858bed566333dde3d066..1c2a75b252890aa6d395a1d6b547c2bf17f9aa1a 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 00b41a04f62e91718682ec01dac966e6ad62e4b0..150d737084d235914f9b6d649b54c95c92ad0e7d 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 97fb9ab9374df045f50e90b198d6a17c7590384b..6349e5a490b3d98e75d79718fad5d9bf165922a7 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 12ddafb3d2b60d4c02565dc7ec6194f7a5491268..836f2cf153a49451969cb570709e0b0e72b198e7 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 6aaedc00effbc0b84cfdccd9cc19360a4107275a..f8bdf14b3cfa26add9849b0f806d8008733503ec 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 51835401244fdc09cf8db5540367192d60192a12..397bb84e1a0d99a59c3d2e03cec74f1dcbf87477 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 4b20fb0baaf761be85829da8d6689fe4f6336f4d..a1a3584c9eb1a6f94255b996e862d382ab7c5760 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 55b2a439f21516473ac6b63fdc43ffd471301ae3..80bd7673a0a02661d21e7e10c31c9264da719ae0 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 f76871a008f68ae674e91b8c649d2455a97a88fe..b7215e4db426526f1758a8a093ef86089229656d 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 0000000000000000000000000000000000000000..286ef064fc5ca1150ef8eb28b39b4ea5fab64129
--- /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 0000000000000000000000000000000000000000..f6d354568f1d11543b0aa1f3e0e17810b790dace
--- /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