From db5b5a8e253e66bc1856cf9f81b91d40634a820f Mon Sep 17 00:00:00 2001
From: Roman Tolchenov <roman.tolchenov@stfc.ac.uk>
Date: Tue, 1 Aug 2017 15:15:19 +0100
Subject: [PATCH] Moved Reflectometry interface.

---
 qt/scientific_interfaces/CMakeLists.txt       |   1 +
 .../ISISReflectometryOld/CMakeLists.txt       | 127 ++++++++++++++++++
 .../ISISReflectometryOld/DllConfig.h          |  39 ++++++
 .../IReflEventPresenter.h                     |   6 +-
 .../IReflEventTabPresenter.h                  |   6 +-
 .../IReflEventView.h                          |   8 +-
 .../IReflMainWindowPresenter.h                |   6 +-
 .../IReflMainWindowView.h                     |   6 +-
 .../IReflRunsTabPresenter.h                   |   6 +-
 .../IReflRunsTabView.h                        |   6 +-
 .../IReflSaveTabPresenter.h                   |   6 +-
 .../IReflSaveTabView.h                        |   8 +-
 .../IReflSearcher.h                           |   6 +-
 .../IReflSettingsPresenter.h                  |   6 +-
 .../IReflSettingsTabPresenter.h               |   6 +-
 .../IReflSettingsView.h                       |   8 +-
 .../{src => }/MeasurementItem.cpp             |   2 +-
 .../MeasurementItem.h                         |   4 +-
 .../ISISReflectometryOld/PrecompiledHeader.h  |  20 +++
 .../{src => }/QtReflEventTabView.cpp          |   6 +-
 .../QtReflEventTabView.h                      |   4 +-
 .../{src => }/QtReflEventView.cpp             |   4 +-
 .../QtReflEventView.h                         |   2 +-
 .../{src => }/QtReflMainWindowView.cpp        |  12 +-
 .../QtReflMainWindowView.h                    |  10 +-
 .../{src => }/QtReflRunsTabView.cpp           |  26 ++--
 .../QtReflRunsTabView.h                       |  16 +--
 .../{src => }/QtReflSaveTabView.cpp           |   4 +-
 .../QtReflSaveTabView.h                       |   4 +-
 .../{src => }/QtReflSettingsTabView.cpp       |   6 +-
 .../QtReflSettingsTabView.h                   |   4 +-
 .../{src => }/QtReflSettingsView.cpp          |   6 +-
 .../QtReflSettingsView.h                      |   2 +-
 .../{src => }/ReflCatalogSearcher.cpp         |   2 +-
 .../ReflCatalogSearcher.h                     |   6 +-
 .../ReflDataProcessorMainPresenter.h          |   0
 .../{src => }/ReflDataProcessorPresenter.cpp  |  10 +-
 .../ReflDataProcessorPresenter.h              |  16 +--
 .../{src => }/ReflEventPresenter.cpp          |   6 +-
 .../ReflEventPresenter.h                      |  12 +-
 .../{src => }/ReflEventTabPresenter.cpp       |   6 +-
 .../ReflEventTabPresenter.h                   |  12 +-
 .../ReflEventTabWidget.ui                     |   0
 .../ReflEventWidget.ui                        |   0
 ...flGenericDataProcessorPresenterFactory.cpp |   2 +-
 ...ReflGenericDataProcessorPresenterFactory.h |  12 +-
 .../{src => }/ReflLegacyTransferStrategy.cpp  |   4 +-
 .../ReflLegacyTransferStrategy.h              |   6 +-
 .../{src => }/ReflMainWindowPresenter.cpp     |  12 +-
 .../ReflMainWindowPresenter.h                 |  12 +-
 .../ReflMainWindowWidget.ui                   |   0
 .../{src => }/ReflMeasureTransferStrategy.cpp |   6 +-
 .../ReflMeasureTransferStrategy.h             |  12 +-
 .../ReflMeasurementItemSource.h               |   6 +-
 .../ReflNexusMeasurementItemSource.cpp        |   2 +-
 .../ReflNexusMeasurementItemSource.h          |   8 +-
 .../{src => }/ReflRunsTabPresenter.cpp        |  24 ++--
 .../ReflRunsTabPresenter.h                    |  14 +-
 .../ReflRunsTabWidget.ui                      |   0
 .../{src => }/ReflSaveTabPresenter.cpp        |   6 +-
 .../ReflSaveTabPresenter.h                    |   6 +-
 .../ReflSaveTabWidget.ui                      |   0
 .../{src => }/ReflSearchModel.cpp             |   4 +-
 .../ReflSearchModel.h                         |   6 +-
 .../{src => }/ReflSettingsPresenter.cpp       |   8 +-
 .../ReflSettingsPresenter.h                   |  12 +-
 .../{src => }/ReflSettingsTabPresenter.cpp    |   8 +-
 .../ReflSettingsTabPresenter.h                |  12 +-
 .../ReflSettingsTabWidget.ui                  |   0
 .../ReflSettingsWidget.ui                     |   0
 .../{src => }/ReflTableSchema.cpp             |   2 +-
 .../ReflTableSchema.h                         |   8 +-
 .../ReflTransferStrategy.h                    |   6 +-
 .../{ISISReflectometryOld => }/ReflWindow.ui  |   2 +-
 .../{src => }/TransferResults.cpp             |   2 +-
 .../TransferResults.h                         |  10 +-
 .../ISISSANS/SANSAddFiles.h                   |   2 +-
 .../ISISSANS/SANSDiagnostics.h                |   2 +-
 .../ISISSANS/SANSEventSlicing.h               |   2 +-
 .../ISISSANS/SANSEventSlicing.ui              |   2 +-
 .../ISISSANS/SANSPlotSpecial.cpp              |   2 +-
 .../ISISSANS/SANSPlotSpecial.ui               |   2 +-
 .../ISISSANS/SANSRunWindow.cpp                |   4 +-
 .../ISISSANS/SANSRunWindow.h                  |   4 +-
 .../ISISSANS/SANSRunWindow.ui                 |   4 +-
 85 files changed, 438 insertions(+), 251 deletions(-)
 create mode 100644 qt/scientific_interfaces/ISISReflectometryOld/CMakeLists.txt
 create mode 100644 qt/scientific_interfaces/ISISReflectometryOld/DllConfig.h
 rename qt/scientific_interfaces/ISISReflectometryOld/{ISISReflectometryOld => }/IReflEventPresenter.h (88%)
 rename qt/scientific_interfaces/ISISReflectometryOld/{ISISReflectometryOld => }/IReflEventTabPresenter.h (88%)
 rename qt/scientific_interfaces/ISISReflectometryOld/{ISISReflectometryOld => }/IReflEventView.h (89%)
 rename qt/scientific_interfaces/ISISReflectometryOld/{ISISReflectometryOld => }/IReflMainWindowPresenter.h (92%)
 rename qt/scientific_interfaces/ISISReflectometryOld/{ISISReflectometryOld => }/IReflMainWindowView.h (90%)
 rename qt/scientific_interfaces/ISISReflectometryOld/{ISISReflectometryOld => }/IReflRunsTabPresenter.h (90%)
 rename qt/scientific_interfaces/ISISReflectometryOld/{ISISReflectometryOld => }/IReflRunsTabView.h (94%)
 rename qt/scientific_interfaces/ISISReflectometryOld/{ISISReflectometryOld => }/IReflSaveTabPresenter.h (89%)
 rename qt/scientific_interfaces/ISISReflectometryOld/{ISISReflectometryOld => }/IReflSaveTabView.h (91%)
 rename qt/scientific_interfaces/ISISReflectometryOld/{ISISReflectometryOld => }/IReflSearcher.h (88%)
 rename qt/scientific_interfaces/ISISReflectometryOld/{ISISReflectometryOld => }/IReflSettingsPresenter.h (90%)
 rename qt/scientific_interfaces/ISISReflectometryOld/{ISISReflectometryOld => }/IReflSettingsTabPresenter.h (89%)
 rename qt/scientific_interfaces/ISISReflectometryOld/{ISISReflectometryOld => }/IReflSettingsView.h (94%)
 rename qt/scientific_interfaces/ISISReflectometryOld/{src => }/MeasurementItem.cpp (97%)
 rename qt/scientific_interfaces/ISISReflectometryOld/{ISISReflectometryOld => }/MeasurementItem.h (95%)
 create mode 100644 qt/scientific_interfaces/ISISReflectometryOld/PrecompiledHeader.h
 rename qt/scientific_interfaces/ISISReflectometryOld/{src => }/QtReflEventTabView.cpp (85%)
 rename qt/scientific_interfaces/ISISReflectometryOld/{ISISReflectometryOld => }/QtReflEventTabView.h (93%)
 rename qt/scientific_interfaces/ISISReflectometryOld/{src => }/QtReflEventView.cpp (96%)
 rename qt/scientific_interfaces/ISISReflectometryOld/{ISISReflectometryOld => }/QtReflEventView.h (97%)
 rename qt/scientific_interfaces/ISISReflectometryOld/{src => }/QtReflMainWindowView.cpp (90%)
 rename qt/scientific_interfaces/ISISReflectometryOld/{ISISReflectometryOld => }/QtReflMainWindowView.h (90%)
 rename qt/scientific_interfaces/ISISReflectometryOld/{src => }/QtReflRunsTabView.cpp (93%)
 rename qt/scientific_interfaces/ISISReflectometryOld/{ISISReflectometryOld => }/QtReflRunsTabView.h (90%)
 rename qt/scientific_interfaces/ISISReflectometryOld/{src => }/QtReflSaveTabView.cpp (97%)
 rename qt/scientific_interfaces/ISISReflectometryOld/{ISISReflectometryOld => }/QtReflSaveTabView.h (96%)
 rename qt/scientific_interfaces/ISISReflectometryOld/{src => }/QtReflSettingsTabView.cpp (85%)
 rename qt/scientific_interfaces/ISISReflectometryOld/{ISISReflectometryOld => }/QtReflSettingsTabView.h (93%)
 rename qt/scientific_interfaces/ISISReflectometryOld/{src => }/QtReflSettingsView.cpp (98%)
 rename qt/scientific_interfaces/ISISReflectometryOld/{ISISReflectometryOld => }/QtReflSettingsView.h (98%)
 rename qt/scientific_interfaces/ISISReflectometryOld/{src => }/ReflCatalogSearcher.cpp (95%)
 rename qt/scientific_interfaces/ISISReflectometryOld/{ISISReflectometryOld => }/ReflCatalogSearcher.h (87%)
 rename qt/scientific_interfaces/ISISReflectometryOld/{ISISReflectometryOld => }/ReflDataProcessorMainPresenter.h (100%)
 rename qt/scientific_interfaces/ISISReflectometryOld/{src => }/ReflDataProcessorPresenter.cpp (98%)
 rename qt/scientific_interfaces/ISISReflectometryOld/{ISISReflectometryOld => }/ReflDataProcessorPresenter.h (89%)
 rename qt/scientific_interfaces/ISISReflectometryOld/{src => }/ReflEventPresenter.cpp (75%)
 rename qt/scientific_interfaces/ISISReflectometryOld/{ISISReflectometryOld => }/ReflEventPresenter.h (81%)
 rename qt/scientific_interfaces/ISISReflectometryOld/{src => }/ReflEventTabPresenter.cpp (82%)
 rename qt/scientific_interfaces/ISISReflectometryOld/{ISISReflectometryOld => }/ReflEventTabPresenter.h (82%)
 rename qt/scientific_interfaces/ISISReflectometryOld/{ISISReflectometryOld => }/ReflEventTabWidget.ui (100%)
 rename qt/scientific_interfaces/ISISReflectometryOld/{ISISReflectometryOld => }/ReflEventWidget.ui (100%)
 rename qt/scientific_interfaces/ISISReflectometryOld/{src => }/ReflGenericDataProcessorPresenterFactory.cpp (98%)
 rename qt/scientific_interfaces/ISISReflectometryOld/{ISISReflectometryOld => }/ReflGenericDataProcessorPresenterFactory.h (75%)
 rename qt/scientific_interfaces/ISISReflectometryOld/{src => }/ReflLegacyTransferStrategy.cpp (96%)
 rename qt/scientific_interfaces/ISISReflectometryOld/{ISISReflectometryOld => }/ReflLegacyTransferStrategy.h (88%)
 rename qt/scientific_interfaces/ISISReflectometryOld/{src => }/ReflMainWindowPresenter.cpp (93%)
 rename qt/scientific_interfaces/ISISReflectometryOld/{ISISReflectometryOld => }/ReflMainWindowPresenter.h (91%)
 rename qt/scientific_interfaces/ISISReflectometryOld/{ISISReflectometryOld => }/ReflMainWindowWidget.ui (100%)
 rename qt/scientific_interfaces/ISISReflectometryOld/{src => }/ReflMeasureTransferStrategy.cpp (96%)
 rename qt/scientific_interfaces/ISISReflectometryOld/{ISISReflectometryOld => }/ReflMeasureTransferStrategy.h (85%)
 rename qt/scientific_interfaces/ISISReflectometryOld/{ISISReflectometryOld => }/ReflMeasurementItemSource.h (90%)
 rename qt/scientific_interfaces/ISISReflectometryOld/{src => }/ReflNexusMeasurementItemSource.cpp (97%)
 rename qt/scientific_interfaces/ISISReflectometryOld/{ISISReflectometryOld => }/ReflNexusMeasurementItemSource.h (87%)
 rename qt/scientific_interfaces/ISISReflectometryOld/{src => }/ReflRunsTabPresenter.cpp (95%)
 rename qt/scientific_interfaces/ISISReflectometryOld/{ISISReflectometryOld => }/ReflRunsTabPresenter.h (90%)
 rename qt/scientific_interfaces/ISISReflectometryOld/{ISISReflectometryOld => }/ReflRunsTabWidget.ui (100%)
 rename qt/scientific_interfaces/ISISReflectometryOld/{src => }/ReflSaveTabPresenter.cpp (97%)
 rename qt/scientific_interfaces/ISISReflectometryOld/{ISISReflectometryOld => }/ReflSaveTabPresenter.h (93%)
 rename qt/scientific_interfaces/ISISReflectometryOld/{ISISReflectometryOld => }/ReflSaveTabWidget.ui (100%)
 rename qt/scientific_interfaces/ISISReflectometryOld/{src => }/ReflSearchModel.cpp (97%)
 rename qt/scientific_interfaces/ISISReflectometryOld/{ISISReflectometryOld => }/ReflSearchModel.h (94%)
 rename qt/scientific_interfaces/ISISReflectometryOld/{src => }/ReflSettingsPresenter.cpp (97%)
 rename qt/scientific_interfaces/ISISReflectometryOld/{ISISReflectometryOld => }/ReflSettingsPresenter.h (87%)
 rename qt/scientific_interfaces/ISISReflectometryOld/{src => }/ReflSettingsTabPresenter.cpp (89%)
 rename qt/scientific_interfaces/ISISReflectometryOld/{ISISReflectometryOld => }/ReflSettingsTabPresenter.h (85%)
 rename qt/scientific_interfaces/ISISReflectometryOld/{ISISReflectometryOld => }/ReflSettingsTabWidget.ui (100%)
 rename qt/scientific_interfaces/ISISReflectometryOld/{ISISReflectometryOld => }/ReflSettingsWidget.ui (100%)
 rename qt/scientific_interfaces/ISISReflectometryOld/{src => }/ReflTableSchema.cpp (91%)
 rename qt/scientific_interfaces/ISISReflectometryOld/{ISISReflectometryOld => }/ReflTableSchema.h (88%)
 rename qt/scientific_interfaces/ISISReflectometryOld/{ISISReflectometryOld => }/ReflTransferStrategy.h (93%)
 rename qt/scientific_interfaces/ISISReflectometryOld/{ISISReflectometryOld => }/ReflWindow.ui (99%)
 rename qt/scientific_interfaces/ISISReflectometryOld/{src => }/TransferResults.cpp (91%)
 rename qt/scientific_interfaces/ISISReflectometryOld/{ISISReflectometryOld => }/TransferResults.h (73%)

diff --git a/qt/scientific_interfaces/CMakeLists.txt b/qt/scientific_interfaces/CMakeLists.txt
index 6ae324a481e..976563c0ed9 100644
--- a/qt/scientific_interfaces/CMakeLists.txt
+++ b/qt/scientific_interfaces/CMakeLists.txt
@@ -13,6 +13,7 @@ endif ( ${Boost_VERSION} GREATER 104799 AND ${qt_version} VERSION_GREATER 4.7.3
 add_subdirectory ( Muon )
 add_subdirectory ( MultiDatasetFit )
 add_subdirectory ( ISISSANS )
+add_subdirectory ( ISISReflectometryOld )
 
 ###########################################################################
 # Testing
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/CMakeLists.txt b/qt/scientific_interfaces/ISISReflectometryOld/CMakeLists.txt
new file mode 100644
index 00000000000..5df110bbb50
--- /dev/null
+++ b/qt/scientific_interfaces/ISISReflectometryOld/CMakeLists.txt
@@ -0,0 +1,127 @@
+set ( SRC_FILES
+	MeasurementItem.cpp
+	QtReflEventTabView.cpp
+	QtReflEventView.cpp
+	QtReflMainWindowView.cpp
+	QtReflRunsTabView.cpp
+	QtReflSaveTabView.cpp
+	QtReflSettingsTabView.cpp
+	QtReflSettingsView.cpp
+	ReflCatalogSearcher.cpp
+	ReflDataProcessorPresenter.cpp
+	ReflEventPresenter.cpp
+	ReflEventTabPresenter.cpp
+	ReflGenericDataProcessorPresenterFactory.cpp
+	ReflLegacyTransferStrategy.cpp
+	ReflMainWindowPresenter.cpp
+	ReflMeasureTransferStrategy.cpp
+	ReflNexusMeasurementItemSource.cpp
+	ReflRunsTabPresenter.cpp
+	ReflSearchModel.cpp
+	ReflSaveTabPresenter.cpp
+	ReflSettingsPresenter.cpp
+	ReflSettingsTabPresenter.cpp
+	ReflTableSchema.cpp
+	TransferResults.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
+    DllConfig.h
+	IReflEventPresenter.h
+	IReflEventTabPresenter.h
+	IReflEventView.h
+	IReflMainWindowPresenter.h
+	IReflMainWindowView.h
+	IReflRunsTabPresenter.h
+	IReflRunsTabView.h
+	IReflSearcher.h
+	IReflSaveTabPresenter.h
+	IReflSaveTabView.h
+	IReflSettingsPresenter.h
+	IReflSettingsTabPresenter.h
+	IReflSettingsView.h
+	MeasurementItem.h
+	QtReflMainWindowView.h
+	QtReflRunsTabView.h
+	ReflCatalogSearcher.h
+	ReflDataProcessorPresenter.h
+	ReflEventPresenter.h
+	ReflEventTabPresenter.h
+	ReflGenericDataProcessorPresenterFactory.h
+	ReflLegacyTransferStrategy.h
+	ReflMainWindowPresenter.h
+	ReflMeasureTransferStrategy.h
+	ReflMeasurementItemSource.h
+	ReflNexusMeasurementItemSource.h
+	ReflRunsTabPresenter.h
+	ReflSettingsPresenter.h
+	ReflSettingsTabPresenter.h
+	ReflSearchModel.h
+	ReflTableSchema.h
+	ReflTransferStrategy.h
+	TransferResults.h
+)
+
+set ( MOC_FILES 
+    ReflSearchModel.h
+    QtReflEventTabView.h
+    QtReflEventView.h
+    QtReflRunsTabView.h
+    QtReflSaveTabView.h
+    QtReflSettingsTabView.h
+    QtReflSettingsView.h
+)
+
+set ( UI_FILES 
+   ReflEventTabWidget.ui
+   ReflEventWidget.ui
+   ReflMainWindowWidget.ui
+   ReflRunsTabWidget.ui
+   ReflSaveTabWidget.ui
+   ReflSettingsTabWidget.ui
+   ReflSettingsWidget.ui
+   ReflWindow.ui
+)
+
+
+qt4_wrap_cpp ( MOCCED_FILES ${MOC_FILES} OPTIONS ${extra_options} )
+
+set ( ALL_SRC ${SRC_FILES} ${MOCCED_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 ( MantidScientificInterfacesISISReflectometryOld ${ALL_SRC} ${INC_FILES} ${UI_HDRS} )
+
+# Set the name of the generated library
+set_target_properties ( MantidScientificInterfacesISISReflectometryOld PROPERTIES COMPILE_DEFINITIONS IN_MANTIDQT_ISISREFLECTOMETRYOLD )
+if ( MSVC_IDE )
+#  # Add to the 'ScientificInterfaces' group in VS
+  set_property ( TARGET MantidScientificInterfacesISISReflectometryOld PROPERTY FOLDER "ScientificInterfaces" )
+endif()
+
+if (OSX_VERSION VERSION_GREATER 10.8)
+  set_target_properties ( MantidScientificInterfacesISISReflectometryOld PROPERTIES INSTALL_RPATH "@loader_path/../../../Contents/MacOS")
+endif ()
+
+find_Package(Threads)
+
+target_link_libraries ( MantidScientificInterfacesISISReflectometryOld 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 MantidScientificInterfacesISISReflectometryOld ${SYSTEM_PACKAGE_TARGET} DESTINATION ${PLUGINS_DIR}/qtplugins/mantid )
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/DllConfig.h b/qt/scientific_interfaces/ISISReflectometryOld/DllConfig.h
new file mode 100644
index 00000000000..a53ec1e87f8
--- /dev/null
+++ b/qt/scientific_interfaces/ISISReflectometryOld/DllConfig.h
@@ -0,0 +1,39 @@
+#ifndef MANTIDQT_ISISREFLECTOMETRYOLD_DLLCONFIG_H_
+#define MANTIDQT_ISISREFLECTOMETRYOLD_DLLCONFIG_H_
+
+#include "MantidKernel/System.h"
+
+/*
+    This file contains the DLLExport/DLLImport linkage configuration for the
+    MantidQt CustomInterfaces library
+
+    Copyright &copy; 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_ISISREFLECTOMETRYOLD
+#define MANTIDQT_ISISREFLECTOMETRYOLD_DLL DLLExport
+#define EXTERN_MANTIDQT_ISISREFLECTOMETRYOLD
+#else
+#define MANTIDQT_ISISREFLECTOMETRYOLD_DLL DLLImport
+#define EXTERN_MANTIDQT_ISISREFLECTOMETRYOLD EXTERN_IMPORT
+#endif
+
+#endif // MANTIDQT_ISISREFLECTOMETRYOLD_DLLCONFIG_H_
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/IReflEventPresenter.h b/qt/scientific_interfaces/ISISReflectometryOld/IReflEventPresenter.h
similarity index 88%
rename from qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/IReflEventPresenter.h
rename to qt/scientific_interfaces/ISISReflectometryOld/IReflEventPresenter.h
index 890c68daffb..34c2510bd20 100644
--- a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/IReflEventPresenter.h
+++ b/qt/scientific_interfaces/ISISReflectometryOld/IReflEventPresenter.h
@@ -1,5 +1,5 @@
-#ifndef MANTID_CUSTOMINTERFACES_IREFLEVENTPRESENTER_H
-#define MANTID_CUSTOMINTERFACES_IREFLEVENTPRESENTER_H
+#ifndef MANTID_ISISREFLECTOMETRYOLD_IREFLEVENTPRESENTER_H
+#define MANTID_ISISREFLECTOMETRYOLD_IREFLEVENTPRESENTER_H
 
 #include <string>
 
@@ -45,4 +45,4 @@ public:
 };
 }
 }
-#endif /* MANTID_CUSTOMINTERFACES_IREFLEVENTPRESENTER_H */
+#endif /* MANTID_ISISREFLECTOMETRYOLD_IREFLEVENTPRESENTER_H */
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/IReflEventTabPresenter.h b/qt/scientific_interfaces/ISISReflectometryOld/IReflEventTabPresenter.h
similarity index 88%
rename from qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/IReflEventTabPresenter.h
rename to qt/scientific_interfaces/ISISReflectometryOld/IReflEventTabPresenter.h
index 8ed9b19cea2..0a487935c34 100644
--- a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/IReflEventTabPresenter.h
+++ b/qt/scientific_interfaces/ISISReflectometryOld/IReflEventTabPresenter.h
@@ -1,5 +1,5 @@
-#ifndef MANTID_CUSTOMINTERFACES_IREFLEVENTTABPRESENTER_H
-#define MANTID_CUSTOMINTERFACES_IREFLEVENTTABPRESENTER_H
+#ifndef MANTID_ISISREFLECTOMETRYOLD_IREFLEVENTTABPRESENTER_H
+#define MANTID_ISISREFLECTOMETRYOLD_IREFLEVENTTABPRESENTER_H
 
 #include <string>
 
@@ -44,4 +44,4 @@ public:
 };
 }
 }
-#endif /* MANTID_CUSTOMINTERFACES_IREFLEVENTTABPRESENTER_H */
+#endif /* MANTID_ISISREFLECTOMETRYOLD_IREFLEVENTTABPRESENTER_H */
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/IReflEventView.h b/qt/scientific_interfaces/ISISReflectometryOld/IReflEventView.h
similarity index 89%
rename from qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/IReflEventView.h
rename to qt/scientific_interfaces/ISISReflectometryOld/IReflEventView.h
index f4b9b584e96..8d098e6eafa 100644
--- a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/IReflEventView.h
+++ b/qt/scientific_interfaces/ISISReflectometryOld/IReflEventView.h
@@ -1,7 +1,7 @@
-#ifndef MANTID_CUSTOMINTERFACES_IREFLEVENTVIEW_H
-#define MANTID_CUSTOMINTERFACES_IREFLEVENTVIEW_H
+#ifndef MANTID_ISISREFLECTOMETRYOLD_IREFLEVENTVIEW_H
+#define MANTID_ISISREFLECTOMETRYOLD_IREFLEVENTVIEW_H
 
-#include "MantidQtCustomInterfaces/DllConfig.h"
+#include "DllConfig.h"
 #include <string>
 
 namespace MantidQt {
@@ -54,4 +54,4 @@ public:
 };
 }
 }
-#endif /* MANTID_CUSTOMINTERFACES_IREFLEVENTVIEW_H */
+#endif /* MANTID_ISISREFLECTOMETRYOLD_IREFLEVENTVIEW_H */
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/IReflMainWindowPresenter.h b/qt/scientific_interfaces/ISISReflectometryOld/IReflMainWindowPresenter.h
similarity index 92%
rename from qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/IReflMainWindowPresenter.h
rename to qt/scientific_interfaces/ISISReflectometryOld/IReflMainWindowPresenter.h
index ecd8c97f385..5ad4ee41826 100644
--- a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/IReflMainWindowPresenter.h
+++ b/qt/scientific_interfaces/ISISReflectometryOld/IReflMainWindowPresenter.h
@@ -1,5 +1,5 @@
-#ifndef MANTID_CUSTOMINTERFACES_IREFLMAINWINDOWPRESENTER_H
-#define MANTID_CUSTOMINTERFACES_IREFLMAINWINDOWPRESENTER_H
+#ifndef MANTID_ISISREFLECTOMETRYOLD_IREFLMAINWINDOWPRESENTER_H
+#define MANTID_ISISREFLECTOMETRYOLD_IREFLMAINWINDOWPRESENTER_H
 
 #include <map>
 #include <string>
@@ -67,4 +67,4 @@ public:
 };
 }
 }
-#endif /* MANTID_CUSTOMINTERFACES_IREFLMAINWINDOWPRESENTER_H */
+#endif /* MANTID_ISISREFLECTOMETRYOLD_IREFLMAINWINDOWPRESENTER_H */
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/IReflMainWindowView.h b/qt/scientific_interfaces/ISISReflectometryOld/IReflMainWindowView.h
similarity index 90%
rename from qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/IReflMainWindowView.h
rename to qt/scientific_interfaces/ISISReflectometryOld/IReflMainWindowView.h
index ef47845883f..68e93b91e61 100644
--- a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/IReflMainWindowView.h
+++ b/qt/scientific_interfaces/ISISReflectometryOld/IReflMainWindowView.h
@@ -1,5 +1,5 @@
-#ifndef MANTID_CUSTOMINTERFACES_IREFLMAINWINDOWVIEW_H
-#define MANTID_CUSTOMINTERFACES_IREFLMAINWINDOWVIEW_H
+#ifndef MANTID_ISISREFLECTOMETRYOLD_IREFLMAINWINDOWVIEW_H
+#define MANTID_ISISREFLECTOMETRYOLD_IREFLMAINWINDOWVIEW_H
 
 #include <string>
 
@@ -50,4 +50,4 @@ public:
 };
 }
 }
-#endif /* MANTID_CUSTOMINTERFACES_IREFLMAINWINDOWVIEW_H */
+#endif /* MANTID_ISISREFLECTOMETRYOLD_IREFLMAINWINDOWVIEW_H */
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/IReflRunsTabPresenter.h b/qt/scientific_interfaces/ISISReflectometryOld/IReflRunsTabPresenter.h
similarity index 90%
rename from qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/IReflRunsTabPresenter.h
rename to qt/scientific_interfaces/ISISReflectometryOld/IReflRunsTabPresenter.h
index 9696e9c9c4e..7099646ab64 100644
--- a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/IReflRunsTabPresenter.h
+++ b/qt/scientific_interfaces/ISISReflectometryOld/IReflRunsTabPresenter.h
@@ -1,5 +1,5 @@
-#ifndef MANTID_CUSTOMINTERFACES_IREFLRUNSTABPRESENTER_H
-#define MANTID_CUSTOMINTERFACES_IREFLRUNSTABPRESENTER_H
+#ifndef MANTID_ISISREFLECTOMETRYOLD_IREFLRUNSTABPRESENTER_H
+#define MANTID_ISISREFLECTOMETRYOLD_IREFLRUNSTABPRESENTER_H
 
 namespace MantidQt {
 namespace CustomInterfaces {
@@ -55,4 +55,4 @@ public:
 };
 }
 }
-#endif /* MANTID_CUSTOMINTERFACES_IREFLRUNSTABPRESENTER_H */
\ No newline at end of file
+#endif /* MANTID_ISISREFLECTOMETRYOLD_IREFLRUNSTABPRESENTER_H */
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/IReflRunsTabView.h b/qt/scientific_interfaces/ISISReflectometryOld/IReflRunsTabView.h
similarity index 94%
rename from qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/IReflRunsTabView.h
rename to qt/scientific_interfaces/ISISReflectometryOld/IReflRunsTabView.h
index 75599113329..92faa5c5522 100644
--- a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/IReflRunsTabView.h
+++ b/qt/scientific_interfaces/ISISReflectometryOld/IReflRunsTabView.h
@@ -1,5 +1,5 @@
-#ifndef MANTID_CUSTOMINTERFACES_IREFLRUNSTABVIEW_H
-#define MANTID_CUSTOMINTERFACES_IREFLRUNSTABVIEW_H
+#ifndef MANTID_ISISREFLECTOMETRYOLD_IREFLRUNSTABVIEW_H
+#define MANTID_ISISREFLECTOMETRYOLD_IREFLRUNSTABVIEW_H
 
 #include <set>
 #include <string>
@@ -82,4 +82,4 @@ public:
 };
 }
 }
-#endif /* MANTID_CUSTOMINTERFACES_IREFLRUNSTABVIEW_H */
+#endif /* MANTID_ISISREFLECTOMETRYOLD_IREFLRUNSTABVIEW_H */
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/IReflSaveTabPresenter.h b/qt/scientific_interfaces/ISISReflectometryOld/IReflSaveTabPresenter.h
similarity index 89%
rename from qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/IReflSaveTabPresenter.h
rename to qt/scientific_interfaces/ISISReflectometryOld/IReflSaveTabPresenter.h
index 059a87ba8f5..bfa5bb0037f 100644
--- a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/IReflSaveTabPresenter.h
+++ b/qt/scientific_interfaces/ISISReflectometryOld/IReflSaveTabPresenter.h
@@ -1,5 +1,5 @@
-#ifndef MANTID_CUSTOMINTERFACES_IREFLSAVETABPRESENTER_H
-#define MANTID_CUSTOMINTERFACES_IREFLSAVETABPRESENTER_H
+#ifndef MANTID_ISISREFLECTOMETRYOLD_IREFLSAVETABPRESENTER_H
+#define MANTID_ISISREFLECTOMETRYOLD_IREFLSAVETABPRESENTER_H
 
 namespace MantidQt {
 namespace CustomInterfaces {
@@ -51,4 +51,4 @@ public:
 };
 }
 }
-#endif /* MANTID_CUSTOMINTERFACES_IREFLSAVETABPRESENTER_H */
\ No newline at end of file
+#endif /* MANTID_ISISREFLECTOMETRYOLD_IREFLSAVETABPRESENTER_H */
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/IReflSaveTabView.h b/qt/scientific_interfaces/ISISReflectometryOld/IReflSaveTabView.h
similarity index 91%
rename from qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/IReflSaveTabView.h
rename to qt/scientific_interfaces/ISISReflectometryOld/IReflSaveTabView.h
index a812a527790..dda0050f902 100644
--- a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/IReflSaveTabView.h
+++ b/qt/scientific_interfaces/ISISReflectometryOld/IReflSaveTabView.h
@@ -1,7 +1,7 @@
-#ifndef MANTID_CUSTOMINTERFACES_IREFLSAVETABVIEW_H
-#define MANTID_CUSTOMINTERFACES_IREFLSAVETABVIEW_H
+#ifndef MANTID_ISISREFLECTOMETRYOLD_IREFLSAVETABVIEW_H
+#define MANTID_ISISREFLECTOMETRYOLD_IREFLSAVETABVIEW_H
 
-#include "MantidQtCustomInterfaces/DllConfig.h"
+#include "DllConfig.h"
 #include <string>
 #include <vector>
 
@@ -67,4 +67,4 @@ public:
 };
 }
 }
-#endif /* MANTID_CUSTOMINTERFACES_IREFLSAVETABVIEW_H */
+#endif /* MANTID_ISISREFLECTOMETRYOLD_IREFLSAVETABVIEW_H */
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/IReflSearcher.h b/qt/scientific_interfaces/ISISReflectometryOld/IReflSearcher.h
similarity index 88%
rename from qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/IReflSearcher.h
rename to qt/scientific_interfaces/ISISReflectometryOld/IReflSearcher.h
index bf487550420..43e010aa903 100644
--- a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/IReflSearcher.h
+++ b/qt/scientific_interfaces/ISISReflectometryOld/IReflSearcher.h
@@ -1,9 +1,9 @@
-#ifndef MANTID_CUSTOMINTERFACES_IREFLSEARCHER_H
-#define MANTID_CUSTOMINTERFACES_IREFLSEARCHER_H
+#ifndef MANTID_ISISREFLECTOMETRYOLD_IREFLSEARCHER_H
+#define MANTID_ISISREFLECTOMETRYOLD_IREFLSEARCHER_H
 
 #include <string>
 
-#include "MantidQtCustomInterfaces/Reflectometry/IReflRunsTabPresenter.h"
+#include "IReflRunsTabPresenter.h"
 #include "MantidAPI/ITableWorkspace_fwd.h"
 
 namespace MantidQt {
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/IReflSettingsPresenter.h b/qt/scientific_interfaces/ISISReflectometryOld/IReflSettingsPresenter.h
similarity index 90%
rename from qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/IReflSettingsPresenter.h
rename to qt/scientific_interfaces/ISISReflectometryOld/IReflSettingsPresenter.h
index b1603e98a9e..daa153df5dd 100644
--- a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/IReflSettingsPresenter.h
+++ b/qt/scientific_interfaces/ISISReflectometryOld/IReflSettingsPresenter.h
@@ -1,5 +1,5 @@
-#ifndef MANTID_CUSTOMINTERFACES_IREFLSETTINGSPRESENTER_H
-#define MANTID_CUSTOMINTERFACES_IREFLSETTINGSPRESENTER_H
+#ifndef MANTID_ISISREFLECTOMETRYOLD_IREFLSETTINGSPRESENTER_H
+#define MANTID_ISISREFLECTOMETRYOLD_IREFLSETTINGSPRESENTER_H
 
 #include <string>
 
@@ -54,4 +54,4 @@ public:
 };
 }
 }
-#endif /* MANTID_CUSTOMINTERFACES_IREFLSETTINGSPRESENTER_H */
+#endif /* MANTID_ISISREFLECTOMETRYOLD_IREFLSETTINGSPRESENTER_H */
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/IReflSettingsTabPresenter.h b/qt/scientific_interfaces/ISISReflectometryOld/IReflSettingsTabPresenter.h
similarity index 89%
rename from qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/IReflSettingsTabPresenter.h
rename to qt/scientific_interfaces/ISISReflectometryOld/IReflSettingsTabPresenter.h
index 065e4fdd957..a31330f40cf 100644
--- a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/IReflSettingsTabPresenter.h
+++ b/qt/scientific_interfaces/ISISReflectometryOld/IReflSettingsTabPresenter.h
@@ -1,5 +1,5 @@
-#ifndef MANTID_CUSTOMINTERFACES_IREFLSETTINGSTABPRESENTER_H
-#define MANTID_CUSTOMINTERFACES_IREFLSETTINGSTABPRESENTER_H
+#ifndef MANTID_ISISREFLECTOMETRYOLD_IREFLSETTINGSTABPRESENTER_H
+#define MANTID_ISISREFLECTOMETRYOLD_IREFLSETTINGSTABPRESENTER_H
 
 #include <string>
 
@@ -49,4 +49,4 @@ public:
 };
 }
 }
-#endif /* MANTID_CUSTOMINTERFACES_IREFLSETTINGSTABPRESENTER_H */
+#endif /* MANTID_ISISREFLECTOMETRYOLD_IREFLSETTINGSTABPRESENTER_H */
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/IReflSettingsView.h b/qt/scientific_interfaces/ISISReflectometryOld/IReflSettingsView.h
similarity index 94%
rename from qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/IReflSettingsView.h
rename to qt/scientific_interfaces/ISISReflectometryOld/IReflSettingsView.h
index 988bf84adae..a79abc41c3c 100644
--- a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/IReflSettingsView.h
+++ b/qt/scientific_interfaces/ISISReflectometryOld/IReflSettingsView.h
@@ -1,7 +1,7 @@
-#ifndef MANTID_CUSTOMINTERFACES_IREFLSETTINGSVIEW_H
-#define MANTID_CUSTOMINTERFACES_IREFLSETTINGSVIEW_H
+#ifndef MANTID_ISISREFLECTOMETRYOLD_IREFLSETTINGSVIEW_H
+#define MANTID_ISISREFLECTOMETRYOLD_IREFLSETTINGSVIEW_H
 
-#include "MantidQtCustomInterfaces/DllConfig.h"
+#include "DllConfig.h"
 #include <map>
 #include <vector>
 
@@ -93,4 +93,4 @@ public:
 };
 }
 }
-#endif /* MANTID_CUSTOMINTERFACES_IREFLSETTINGSVIEW_H */
+#endif /* MANTID_ISISREFLECTOMETRYOLD_IREFLSETTINGSVIEW_H */
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/src/MeasurementItem.cpp b/qt/scientific_interfaces/ISISReflectometryOld/MeasurementItem.cpp
similarity index 97%
rename from qt/scientific_interfaces/ISISReflectometryOld/src/MeasurementItem.cpp
rename to qt/scientific_interfaces/ISISReflectometryOld/MeasurementItem.cpp
index a9b14fa49e0..595833d4c82 100644
--- a/qt/scientific_interfaces/ISISReflectometryOld/src/MeasurementItem.cpp
+++ b/qt/scientific_interfaces/ISISReflectometryOld/MeasurementItem.cpp
@@ -1,4 +1,4 @@
-#include "MantidQtCustomInterfaces/Reflectometry/MeasurementItem.h"
+#include "MeasurementItem.h"
 #include <string>
 #include <sstream>
 
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/MeasurementItem.h b/qt/scientific_interfaces/ISISReflectometryOld/MeasurementItem.h
similarity index 95%
rename from qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/MeasurementItem.h
rename to qt/scientific_interfaces/ISISReflectometryOld/MeasurementItem.h
index 85b6b21f58f..43623a9f3a1 100644
--- a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/MeasurementItem.h
+++ b/qt/scientific_interfaces/ISISReflectometryOld/MeasurementItem.h
@@ -1,7 +1,7 @@
 #ifndef MANTIDQT_CUSTOMINTERFACES_MEASUREMENTITEM_H_
 #define MANTIDQT_CUSTOMINTERFACES_MEASUREMENTITEM_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 MeasurementItem {
+class MANTIDQT_ISISREFLECTOMETRYOLD_DLL MeasurementItem {
 
 public:
   typedef std::string IDType;
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/PrecompiledHeader.h b/qt/scientific_interfaces/ISISReflectometryOld/PrecompiledHeader.h
new file mode 100644
index 00000000000..286ef064fc5
--- /dev/null
+++ b/qt/scientific_interfaces/ISISReflectometryOld/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/qt/scientific_interfaces/ISISReflectometryOld/src/QtReflEventTabView.cpp b/qt/scientific_interfaces/ISISReflectometryOld/QtReflEventTabView.cpp
similarity index 85%
rename from qt/scientific_interfaces/ISISReflectometryOld/src/QtReflEventTabView.cpp
rename to qt/scientific_interfaces/ISISReflectometryOld/QtReflEventTabView.cpp
index 2d8ff86ac65..97a24878316 100644
--- a/qt/scientific_interfaces/ISISReflectometryOld/src/QtReflEventTabView.cpp
+++ b/qt/scientific_interfaces/ISISReflectometryOld/QtReflEventTabView.cpp
@@ -1,6 +1,6 @@
-#include "MantidQtCustomInterfaces/Reflectometry/QtReflEventTabView.h"
-#include "MantidQtCustomInterfaces/Reflectometry/QtReflEventView.h"
-#include "MantidQtCustomInterfaces/Reflectometry/ReflEventTabPresenter.h"
+#include "QtReflEventTabView.h"
+#include "QtReflEventView.h"
+#include "ReflEventTabPresenter.h"
 
 namespace MantidQt {
 namespace CustomInterfaces {
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/QtReflEventTabView.h b/qt/scientific_interfaces/ISISReflectometryOld/QtReflEventTabView.h
similarity index 93%
rename from qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/QtReflEventTabView.h
rename to qt/scientific_interfaces/ISISReflectometryOld/QtReflEventTabView.h
index 2903ef246d8..073a8ba19be 100644
--- a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/QtReflEventTabView.h
+++ b/qt/scientific_interfaces/ISISReflectometryOld/QtReflEventTabView.h
@@ -1,7 +1,7 @@
 #ifndef MANTID_CUSTOMINTERFACES_QTREFLEVENTTABVIEW_H_
 #define MANTID_CUSTOMINTERFACES_QTREFLEVENTTABVIEW_H_
 
-#include "MantidQtCustomInterfaces/DllConfig.h"
+#include "DllConfig.h"
 #include "ui_ReflEventTabWidget.h"
 #include <memory>
 
@@ -35,7 +35,7 @@ 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>
 */
-class MANTIDQT_CUSTOMINTERFACES_DLL QtReflEventTabView : public QWidget {
+class MANTIDQT_ISISREFLECTOMETRYOLD_DLL QtReflEventTabView : public QWidget {
   Q_OBJECT
 public:
   /// Constructor
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/src/QtReflEventView.cpp b/qt/scientific_interfaces/ISISReflectometryOld/QtReflEventView.cpp
similarity index 96%
rename from qt/scientific_interfaces/ISISReflectometryOld/src/QtReflEventView.cpp
rename to qt/scientific_interfaces/ISISReflectometryOld/QtReflEventView.cpp
index 35b6542845f..3eeee9f49e6 100644
--- a/qt/scientific_interfaces/ISISReflectometryOld/src/QtReflEventView.cpp
+++ b/qt/scientific_interfaces/ISISReflectometryOld/QtReflEventView.cpp
@@ -1,5 +1,5 @@
-#include "MantidQtCustomInterfaces/Reflectometry/QtReflEventView.h"
-#include "MantidQtCustomInterfaces/Reflectometry/ReflEventPresenter.h"
+#include "QtReflEventView.h"
+#include "ReflEventPresenter.h"
 
 namespace MantidQt {
 namespace CustomInterfaces {
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/QtReflEventView.h b/qt/scientific_interfaces/ISISReflectometryOld/QtReflEventView.h
similarity index 97%
rename from qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/QtReflEventView.h
rename to qt/scientific_interfaces/ISISReflectometryOld/QtReflEventView.h
index a69f90912cf..b437c803a4c 100644
--- a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/QtReflEventView.h
+++ b/qt/scientific_interfaces/ISISReflectometryOld/QtReflEventView.h
@@ -1,7 +1,7 @@
 #ifndef MANTID_CUSTOMINTERFACES_QTREFLEVENTVIEW_H_
 #define MANTID_CUSTOMINTERFACES_QTREFLEVENTVIEW_H_
 
-#include "MantidQtCustomInterfaces/Reflectometry/IReflEventView.h"
+#include "IReflEventView.h"
 #include "ui_ReflEventWidget.h"
 #include <memory>
 
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/src/QtReflMainWindowView.cpp b/qt/scientific_interfaces/ISISReflectometryOld/QtReflMainWindowView.cpp
similarity index 90%
rename from qt/scientific_interfaces/ISISReflectometryOld/src/QtReflMainWindowView.cpp
rename to qt/scientific_interfaces/ISISReflectometryOld/QtReflMainWindowView.cpp
index 344a7cfdd75..c505013423f 100644
--- a/qt/scientific_interfaces/ISISReflectometryOld/src/QtReflMainWindowView.cpp
+++ b/qt/scientific_interfaces/ISISReflectometryOld/QtReflMainWindowView.cpp
@@ -1,9 +1,9 @@
-#include "MantidQtCustomInterfaces/Reflectometry/QtReflMainWindowView.h"
-#include "MantidQtCustomInterfaces/Reflectometry/QtReflEventTabView.h"
-#include "MantidQtCustomInterfaces/Reflectometry/QtReflRunsTabView.h"
-#include "MantidQtCustomInterfaces/Reflectometry/QtReflSaveTabView.h"
-#include "MantidQtCustomInterfaces/Reflectometry/QtReflSettingsTabView.h"
-#include "MantidQtCustomInterfaces/Reflectometry/ReflMainWindowPresenter.h"
+#include "QtReflMainWindowView.h"
+#include "QtReflEventTabView.h"
+#include "QtReflRunsTabView.h"
+#include "QtReflSaveTabView.h"
+#include "QtReflSettingsTabView.h"
+#include "ReflMainWindowPresenter.h"
 
 #include <qmessagebox.h>
 
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/QtReflMainWindowView.h b/qt/scientific_interfaces/ISISReflectometryOld/QtReflMainWindowView.h
similarity index 90%
rename from qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/QtReflMainWindowView.h
rename to qt/scientific_interfaces/ISISReflectometryOld/QtReflMainWindowView.h
index 5874c1edf01..0245fe4c94d 100644
--- a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/QtReflMainWindowView.h
+++ b/qt/scientific_interfaces/ISISReflectometryOld/QtReflMainWindowView.h
@@ -1,8 +1,8 @@
-#ifndef MANTID_CUSTOMINTERFACES_QTREFLMAINWINDOWVIEW_H
-#define MANTID_CUSTOMINTERFACES_QTREFLMAINWINDOWVIEW_H
+#ifndef MANTID_ISISREFLECTOMETRYOLD_QTREFLMAINWINDOWVIEW_H
+#define MANTID_ISISREFLECTOMETRYOLD_QTREFLMAINWINDOWVIEW_H
 
-#include "MantidQtAPI/UserSubWindow.h"
-#include "MantidQtCustomInterfaces/Reflectometry/IReflMainWindowView.h"
+#include "MantidQtWidgets/Common/UserSubWindow.h"
+#include "IReflMainWindowView.h"
 #include "ui_ReflMainWindowWidget.h"
 
 #include <QCloseEvent>
@@ -85,4 +85,4 @@ private:
 };
 }
 }
-#endif /* MANTID_CUSTOMINTERFACES_QTREFLMAINWINDOWVIEW_H */
+#endif /* MANTID_ISISREFLECTOMETRYOLD_QTREFLMAINWINDOWVIEW_H */
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/src/QtReflRunsTabView.cpp b/qt/scientific_interfaces/ISISReflectometryOld/QtReflRunsTabView.cpp
similarity index 93%
rename from qt/scientific_interfaces/ISISReflectometryOld/src/QtReflRunsTabView.cpp
rename to qt/scientific_interfaces/ISISReflectometryOld/QtReflRunsTabView.cpp
index db051cdef2e..949ca5b232a 100644
--- a/qt/scientific_interfaces/ISISReflectometryOld/src/QtReflRunsTabView.cpp
+++ b/qt/scientific_interfaces/ISISReflectometryOld/QtReflRunsTabView.cpp
@@ -1,18 +1,18 @@
-#include "MantidQtCustomInterfaces/Reflectometry/QtReflRunsTabView.h"
+#include "QtReflRunsTabView.h"
 #include "MantidAPI/ITableWorkspace.h"
 #include "MantidKernel/ConfigService.h"
-#include "MantidQtAPI/AlgorithmRunner.h"
-#include "MantidQtAPI/FileDialogHandler.h"
-#include "MantidQtAPI/HelpWindow.h"
-#include "MantidQtCustomInterfaces/Reflectometry/IReflRunsTabPresenter.h"
-#include "MantidQtCustomInterfaces/Reflectometry/ReflGenericDataProcessorPresenterFactory.h"
-#include "MantidQtCustomInterfaces/Reflectometry/ReflRunsTabPresenter.h"
-#include "MantidQtCustomInterfaces/Reflectometry/ReflSearchModel.h"
-#include "MantidQtMantidWidgets/DataProcessorUI/DataProcessorCommandAdapter.h"
-#include "MantidQtMantidWidgets/DataProcessorUI/DataProcessorPresenter.h"
-#include "MantidQtMantidWidgets/DataProcessorUI/QDataProcessorWidget.h"
-#include "MantidQtMantidWidgets/HintingLineEditFactory.h"
-#include "MantidQtMantidWidgets/SlitCalculator.h"
+#include "MantidQtWidgets/Common/AlgorithmRunner.h"
+#include "MantidQtWidgets/Common/FileDialogHandler.h"
+#include "MantidQtWidgets/Common/HelpWindow.h"
+#include "IReflRunsTabPresenter.h"
+#include "ReflGenericDataProcessorPresenterFactory.h"
+#include "ReflRunsTabPresenter.h"
+#include "ReflSearchModel.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandAdapter.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPresenter.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/QDataProcessorWidget.h"
+#include "MantidQtWidgets/Common/HintingLineEditFactory.h"
+#include "MantidQtWidgets/Common/SlitCalculator.h"
 
 namespace MantidQt {
 namespace CustomInterfaces {
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/QtReflRunsTabView.h b/qt/scientific_interfaces/ISISReflectometryOld/QtReflRunsTabView.h
similarity index 90%
rename from qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/QtReflRunsTabView.h
rename to qt/scientific_interfaces/ISISReflectometryOld/QtReflRunsTabView.h
index d9a34adb42f..a1a66272674 100644
--- a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/QtReflRunsTabView.h
+++ b/qt/scientific_interfaces/ISISReflectometryOld/QtReflRunsTabView.h
@@ -1,11 +1,11 @@
-#ifndef MANTID_CUSTOMINTERFACES_QTREFLRUNSTABVIEW_H_
-#define MANTID_CUSTOMINTERFACES_QTREFLRUNSTABVIEW_H_
+#ifndef MANTID_ISISREFLECTOMETRYOLD_QTREFLRUNSTABVIEW_H_
+#define MANTID_ISISREFLECTOMETRYOLD_QTREFLRUNSTABVIEW_H_
 
 #include "MantidKernel/System.h"
-#include "MantidQtAPI/MantidWidget.h"
-#include "MantidQtCustomInterfaces/DllConfig.h"
-#include "MantidQtCustomInterfaces/Reflectometry/IReflRunsTabView.h"
-#include "MantidQtMantidWidgets/ProgressableView.h"
+#include "MantidQtWidgets/Common/MantidWidget.h"
+#include "DllConfig.h"
+#include "IReflRunsTabView.h"
+#include "MantidQtWidgets/Common/ProgressableView.h"
 
 #include "ui_ReflRunsTabWidget.h"
 
@@ -55,7 +55,7 @@ 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>
 */
-class MANTIDQT_CUSTOMINTERFACES_DLL QtReflRunsTabView
+class MANTIDQT_ISISREFLECTOMETRYOLD_DLL QtReflRunsTabView
     : public MantidQt::API::MantidWidget,
       public IReflRunsTabView,
       public MantidQt::MantidWidgets::ProgressableView {
@@ -131,4 +131,4 @@ private slots:
 } // namespace Mantid
 } // namespace CustomInterfaces
 
-#endif /* MANTID_CUSTOMINTERFACES_QTREFLRUNSTABVIEW_H_ */
+#endif /* MANTID_ISISREFLECTOMETRYOLD_QTREFLRUNSTABVIEW_H_ */
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/src/QtReflSaveTabView.cpp b/qt/scientific_interfaces/ISISReflectometryOld/QtReflSaveTabView.cpp
similarity index 97%
rename from qt/scientific_interfaces/ISISReflectometryOld/src/QtReflSaveTabView.cpp
rename to qt/scientific_interfaces/ISISReflectometryOld/QtReflSaveTabView.cpp
index 58d331b812a..9d96d85b016 100644
--- a/qt/scientific_interfaces/ISISReflectometryOld/src/QtReflSaveTabView.cpp
+++ b/qt/scientific_interfaces/ISISReflectometryOld/QtReflSaveTabView.cpp
@@ -1,5 +1,5 @@
-#include "MantidQtCustomInterfaces/Reflectometry/QtReflSaveTabView.h"
-#include "MantidQtCustomInterfaces/Reflectometry/ReflSaveTabPresenter.h"
+#include "QtReflSaveTabView.h"
+#include "ReflSaveTabPresenter.h"
 
 #include <boost/algorithm/string.hpp>
 
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/QtReflSaveTabView.h b/qt/scientific_interfaces/ISISReflectometryOld/QtReflSaveTabView.h
similarity index 96%
rename from qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/QtReflSaveTabView.h
rename to qt/scientific_interfaces/ISISReflectometryOld/QtReflSaveTabView.h
index 1e3108301bf..e066a733aee 100644
--- a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/QtReflSaveTabView.h
+++ b/qt/scientific_interfaces/ISISReflectometryOld/QtReflSaveTabView.h
@@ -1,7 +1,7 @@
 #ifndef MANTID_CUSTOMINTERFACES_QTREFLSAVETABVIEW_H_
 #define MANTID_CUSTOMINTERFACES_QTREFLSAVETABVIEW_H_
 
-#include "MantidQtCustomInterfaces/Reflectometry/IReflSaveTabView.h"
+#include "IReflSaveTabView.h"
 #include "ui_ReflSaveTabWidget.h"
 #include <memory>
 
@@ -35,7 +35,7 @@ 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>
 */
-class MANTIDQT_CUSTOMINTERFACES_DLL QtReflSaveTabView
+class MANTIDQT_ISISREFLECTOMETRYOLD_DLL QtReflSaveTabView
     : public QWidget,
       public IReflSaveTabView {
   Q_OBJECT
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/src/QtReflSettingsTabView.cpp b/qt/scientific_interfaces/ISISReflectometryOld/QtReflSettingsTabView.cpp
similarity index 85%
rename from qt/scientific_interfaces/ISISReflectometryOld/src/QtReflSettingsTabView.cpp
rename to qt/scientific_interfaces/ISISReflectometryOld/QtReflSettingsTabView.cpp
index 0dd9bf213f4..f9b459ccdeb 100644
--- a/qt/scientific_interfaces/ISISReflectometryOld/src/QtReflSettingsTabView.cpp
+++ b/qt/scientific_interfaces/ISISReflectometryOld/QtReflSettingsTabView.cpp
@@ -1,6 +1,6 @@
-#include "MantidQtCustomInterfaces/Reflectometry/QtReflSettingsTabView.h"
-#include "MantidQtCustomInterfaces/Reflectometry/QtReflSettingsView.h"
-#include "MantidQtCustomInterfaces/Reflectometry/ReflSettingsTabPresenter.h"
+#include "QtReflSettingsTabView.h"
+#include "QtReflSettingsView.h"
+#include "ReflSettingsTabPresenter.h"
 
 namespace MantidQt {
 namespace CustomInterfaces {
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/QtReflSettingsTabView.h b/qt/scientific_interfaces/ISISReflectometryOld/QtReflSettingsTabView.h
similarity index 93%
rename from qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/QtReflSettingsTabView.h
rename to qt/scientific_interfaces/ISISReflectometryOld/QtReflSettingsTabView.h
index 0021f0bd9de..98c65b056f0 100644
--- a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/QtReflSettingsTabView.h
+++ b/qt/scientific_interfaces/ISISReflectometryOld/QtReflSettingsTabView.h
@@ -1,7 +1,7 @@
 #ifndef MANTID_CUSTOMINTERFACES_QTREFLSETTINGSTABVIEW_H_
 #define MANTID_CUSTOMINTERFACES_QTREFLSETTINGSTABVIEW_H_
 
-#include "MantidQtCustomInterfaces/DllConfig.h"
+#include "DllConfig.h"
 #include "ui_ReflSettingsTabWidget.h"
 #include <memory>
 
@@ -35,7 +35,7 @@ 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>
 */
-class MANTIDQT_CUSTOMINTERFACES_DLL QtReflSettingsTabView : public QWidget {
+class MANTIDQT_ISISREFLECTOMETRYOLD_DLL QtReflSettingsTabView : public QWidget {
   Q_OBJECT
 public:
   /// Constructor
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/src/QtReflSettingsView.cpp b/qt/scientific_interfaces/ISISReflectometryOld/QtReflSettingsView.cpp
similarity index 98%
rename from qt/scientific_interfaces/ISISReflectometryOld/src/QtReflSettingsView.cpp
rename to qt/scientific_interfaces/ISISReflectometryOld/QtReflSettingsView.cpp
index 91ff253c0c4..eee2c908dda 100644
--- a/qt/scientific_interfaces/ISISReflectometryOld/src/QtReflSettingsView.cpp
+++ b/qt/scientific_interfaces/ISISReflectometryOld/QtReflSettingsView.cpp
@@ -1,6 +1,6 @@
-#include "MantidQtCustomInterfaces/Reflectometry/QtReflSettingsView.h"
-#include "MantidQtCustomInterfaces/Reflectometry/ReflSettingsPresenter.h"
-#include "MantidQtMantidWidgets/HintingLineEdit.h"
+#include "QtReflSettingsView.h"
+#include "ReflSettingsPresenter.h"
+#include "MantidQtWidgets/Common/HintingLineEdit.h"
 
 namespace MantidQt {
 namespace CustomInterfaces {
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/QtReflSettingsView.h b/qt/scientific_interfaces/ISISReflectometryOld/QtReflSettingsView.h
similarity index 98%
rename from qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/QtReflSettingsView.h
rename to qt/scientific_interfaces/ISISReflectometryOld/QtReflSettingsView.h
index 27c4860177c..6bba5c2f490 100644
--- a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/QtReflSettingsView.h
+++ b/qt/scientific_interfaces/ISISReflectometryOld/QtReflSettingsView.h
@@ -1,7 +1,7 @@
 #ifndef MANTID_CUSTOMINTERFACES_QTREFLSETTINGSVIEW_H_
 #define MANTID_CUSTOMINTERFACES_QTREFLSETTINGSVIEW_H_
 
-#include "MantidQtCustomInterfaces/Reflectometry/IReflSettingsView.h"
+#include "IReflSettingsView.h"
 #include "ui_ReflSettingsWidget.h"
 #include <memory>
 
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/src/ReflCatalogSearcher.cpp b/qt/scientific_interfaces/ISISReflectometryOld/ReflCatalogSearcher.cpp
similarity index 95%
rename from qt/scientific_interfaces/ISISReflectometryOld/src/ReflCatalogSearcher.cpp
rename to qt/scientific_interfaces/ISISReflectometryOld/ReflCatalogSearcher.cpp
index 2c1d393cfe5..dad71841c5a 100644
--- a/qt/scientific_interfaces/ISISReflectometryOld/src/ReflCatalogSearcher.cpp
+++ b/qt/scientific_interfaces/ISISReflectometryOld/ReflCatalogSearcher.cpp
@@ -1,4 +1,4 @@
-#include "MantidQtCustomInterfaces/Reflectometry/ReflCatalogSearcher.h"
+#include "ReflCatalogSearcher.h"
 
 #include "MantidAPI/AlgorithmManager.h"
 #include "MantidAPI/CatalogManager.h"
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflCatalogSearcher.h b/qt/scientific_interfaces/ISISReflectometryOld/ReflCatalogSearcher.h
similarity index 87%
rename from qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflCatalogSearcher.h
rename to qt/scientific_interfaces/ISISReflectometryOld/ReflCatalogSearcher.h
index c9dd04e0eb7..af50330a445 100644
--- a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflCatalogSearcher.h
+++ b/qt/scientific_interfaces/ISISReflectometryOld/ReflCatalogSearcher.h
@@ -1,7 +1,7 @@
-#ifndef MANTID_CUSTOMINTERFACES_REFLCATALOGSEARCHER_H
-#define MANTID_CUSTOMINTERFACES_REFLCATALOGSEARCHER_H
+#ifndef MANTID_ISISREFLECTOMETRYOLD_REFLCATALOGSEARCHER_H
+#define MANTID_ISISREFLECTOMETRYOLD_REFLCATALOGSEARCHER_H
 
-#include "MantidQtCustomInterfaces/Reflectometry/IReflSearcher.h"
+#include "IReflSearcher.h"
 
 namespace MantidQt {
 namespace CustomInterfaces {
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflDataProcessorMainPresenter.h b/qt/scientific_interfaces/ISISReflectometryOld/ReflDataProcessorMainPresenter.h
similarity index 100%
rename from qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflDataProcessorMainPresenter.h
rename to qt/scientific_interfaces/ISISReflectometryOld/ReflDataProcessorMainPresenter.h
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/src/ReflDataProcessorPresenter.cpp b/qt/scientific_interfaces/ISISReflectometryOld/ReflDataProcessorPresenter.cpp
similarity index 98%
rename from qt/scientific_interfaces/ISISReflectometryOld/src/ReflDataProcessorPresenter.cpp
rename to qt/scientific_interfaces/ISISReflectometryOld/ReflDataProcessorPresenter.cpp
index 8f51eac9be9..794dc28810d 100644
--- a/qt/scientific_interfaces/ISISReflectometryOld/src/ReflDataProcessorPresenter.cpp
+++ b/qt/scientific_interfaces/ISISReflectometryOld/ReflDataProcessorPresenter.cpp
@@ -1,12 +1,12 @@
-#include "MantidQtCustomInterfaces/Reflectometry/ReflDataProcessorPresenter.h"
+#include "ReflDataProcessorPresenter.h"
 #include "MantidAPI/AlgorithmManager.h"
 #include "MantidAPI/IEventWorkspace.h"
 #include "MantidAPI/MatrixWorkspace.h"
 #include "MantidAPI/Run.h"
-#include "MantidQtMantidWidgets/DataProcessorUI/DataProcessorTreeManager.h"
-#include "MantidQtMantidWidgets/DataProcessorUI/DataProcessorView.h"
-#include "MantidQtMantidWidgets/DataProcessorUI/ParseKeyValueString.h"
-#include "MantidQtMantidWidgets/ProgressPresenter.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorTreeManager.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorView.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/ParseKeyValueString.h"
+#include "MantidQtWidgets/Common/ProgressPresenter.h"
 
 using namespace MantidQt::MantidWidgets;
 using namespace Mantid::API;
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflDataProcessorPresenter.h b/qt/scientific_interfaces/ISISReflectometryOld/ReflDataProcessorPresenter.h
similarity index 89%
rename from qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflDataProcessorPresenter.h
rename to qt/scientific_interfaces/ISISReflectometryOld/ReflDataProcessorPresenter.h
index 174e2cadb6e..30411430a80 100644
--- a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflDataProcessorPresenter.h
+++ b/qt/scientific_interfaces/ISISReflectometryOld/ReflDataProcessorPresenter.h
@@ -1,11 +1,11 @@
-#ifndef MANTID_CUSTOMINTERFACES_REFLDATAPROCESSORPRESENTER_H
-#define MANTID_CUSTOMINTERFACES_REFLDATAPROCESSORPRESENTER_H
+#ifndef MANTID_ISISREFLECTOMETRYOLD_REFLDATAPROCESSORPRESENTER_H
+#define MANTID_ISISREFLECTOMETRYOLD_REFLDATAPROCESSORPRESENTER_H
 
-#include "MantidQtMantidWidgets/DataProcessorUI/GenericDataProcessorPresenter.h"
-#include "MantidQtMantidWidgets/DataProcessorUI/DataProcessorMainPresenter.h"
-#include "MantidQtMantidWidgets/DataProcessorUI/DataProcessorTreeManager.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/GenericDataProcessorPresenter.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorMainPresenter.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorTreeManager.h"
 
-#include "MantidQtCustomInterfaces/DllConfig.h"
+#include "DllConfig.h"
 
 namespace MantidQt {
 namespace CustomInterfaces {
@@ -38,7 +38,7 @@ 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>
 */
-class MANTIDQT_CUSTOMINTERFACES_DLL ReflDataProcessorPresenter
+class MANTIDQT_ISISREFLECTOMETRYOLD_DLL ReflDataProcessorPresenter
     : public GenericDataProcessorPresenter {
 public:
   // Constructor
@@ -115,4 +115,4 @@ private:
 };
 }
 }
-#endif /*MANTID_CUSTOMINTERFACES_REFLDATAPROCESSORPRESENTER_H*/
+#endif /*MANTID_ISISREFLECTOMETRYOLD_REFLDATAPROCESSORPRESENTER_H*/
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/src/ReflEventPresenter.cpp b/qt/scientific_interfaces/ISISReflectometryOld/ReflEventPresenter.cpp
similarity index 75%
rename from qt/scientific_interfaces/ISISReflectometryOld/src/ReflEventPresenter.cpp
rename to qt/scientific_interfaces/ISISReflectometryOld/ReflEventPresenter.cpp
index 665e68f5d98..388f7f43b1e 100644
--- a/qt/scientific_interfaces/ISISReflectometryOld/src/ReflEventPresenter.cpp
+++ b/qt/scientific_interfaces/ISISReflectometryOld/ReflEventPresenter.cpp
@@ -1,6 +1,6 @@
-#include "MantidQtCustomInterfaces/Reflectometry/ReflEventPresenter.h"
-#include "MantidQtCustomInterfaces/Reflectometry/IReflEventTabPresenter.h"
-#include "MantidQtCustomInterfaces/Reflectometry/IReflEventView.h"
+#include "ReflEventPresenter.h"
+#include "IReflEventTabPresenter.h"
+#include "IReflEventView.h"
 
 #include <boost/algorithm/string.hpp>
 
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflEventPresenter.h b/qt/scientific_interfaces/ISISReflectometryOld/ReflEventPresenter.h
similarity index 81%
rename from qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflEventPresenter.h
rename to qt/scientific_interfaces/ISISReflectometryOld/ReflEventPresenter.h
index 40339190fc1..e11e136df90 100644
--- a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflEventPresenter.h
+++ b/qt/scientific_interfaces/ISISReflectometryOld/ReflEventPresenter.h
@@ -1,8 +1,8 @@
-#ifndef MANTID_CUSTOMINTERFACES_REFLEVENTPRESENTER_H
-#define MANTID_CUSTOMINTERFACES_REFLEVENTPRESENTER_H
+#ifndef MANTID_ISISREFLECTOMETRYOLD_REFLEVENTPRESENTER_H
+#define MANTID_ISISREFLECTOMETRYOLD_REFLEVENTPRESENTER_H
 
-#include "MantidQtCustomInterfaces/DllConfig.h"
-#include "MantidQtCustomInterfaces/Reflectometry/IReflEventPresenter.h"
+#include "DllConfig.h"
+#include "IReflEventPresenter.h"
 
 namespace MantidQt {
 namespace CustomInterfaces {
@@ -36,7 +36,7 @@ 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>
 */
-class MANTIDQT_CUSTOMINTERFACES_DLL ReflEventPresenter
+class MANTIDQT_ISISREFLECTOMETRYOLD_DLL ReflEventPresenter
     : public IReflEventPresenter {
 public:
   /// Constructor
@@ -55,4 +55,4 @@ private:
 };
 }
 }
-#endif /* MANTID_CUSTOMINTERFACES_REFLEVENTPRESENTER_H */
+#endif /* MANTID_ISISREFLECTOMETRYOLD_REFLEVENTPRESENTER_H */
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/src/ReflEventTabPresenter.cpp b/qt/scientific_interfaces/ISISReflectometryOld/ReflEventTabPresenter.cpp
similarity index 82%
rename from qt/scientific_interfaces/ISISReflectometryOld/src/ReflEventTabPresenter.cpp
rename to qt/scientific_interfaces/ISISReflectometryOld/ReflEventTabPresenter.cpp
index 2c0baf52fda..1b549ad2090 100644
--- a/qt/scientific_interfaces/ISISReflectometryOld/src/ReflEventTabPresenter.cpp
+++ b/qt/scientific_interfaces/ISISReflectometryOld/ReflEventTabPresenter.cpp
@@ -1,6 +1,6 @@
-#include "MantidQtCustomInterfaces/Reflectometry/ReflEventTabPresenter.h"
-#include "MantidQtCustomInterfaces/Reflectometry/IReflMainWindowPresenter.h"
-#include "MantidQtCustomInterfaces/Reflectometry/ReflEventPresenter.h"
+#include "ReflEventTabPresenter.h"
+#include "IReflMainWindowPresenter.h"
+#include "ReflEventPresenter.h"
 
 namespace MantidQt {
 namespace CustomInterfaces {
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflEventTabPresenter.h b/qt/scientific_interfaces/ISISReflectometryOld/ReflEventTabPresenter.h
similarity index 82%
rename from qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflEventTabPresenter.h
rename to qt/scientific_interfaces/ISISReflectometryOld/ReflEventTabPresenter.h
index 5581421eb52..31e7979f5a9 100644
--- a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflEventTabPresenter.h
+++ b/qt/scientific_interfaces/ISISReflectometryOld/ReflEventTabPresenter.h
@@ -1,8 +1,8 @@
-#ifndef MANTID_CUSTOMINTERFACES_REFLEVENTTABPRESENTER_H
-#define MANTID_CUSTOMINTERFACES_REFLEVENTTABPRESENTER_H
+#ifndef MANTID_ISISREFLECTOMETRYOLD_REFLEVENTTABPRESENTER_H
+#define MANTID_ISISREFLECTOMETRYOLD_REFLEVENTTABPRESENTER_H
 
-#include "MantidQtCustomInterfaces/DllConfig.h"
-#include "MantidQtCustomInterfaces/Reflectometry/IReflEventTabPresenter.h"
+#include "DllConfig.h"
+#include "IReflEventTabPresenter.h"
 #include <vector>
 
 namespace MantidQt {
@@ -38,7 +38,7 @@ 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>
 */
-class MANTIDQT_CUSTOMINTERFACES_DLL ReflEventTabPresenter
+class MANTIDQT_ISISREFLECTOMETRYOLD_DLL ReflEventTabPresenter
     : public IReflEventTabPresenter {
 public:
   /// Constructor
@@ -57,4 +57,4 @@ private:
 };
 }
 }
-#endif /* MANTID_CUSTOMINTERFACES_REFLEVENTTABPRESENTER_H */
+#endif /* MANTID_ISISREFLECTOMETRYOLD_REFLEVENTTABPRESENTER_H */
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflEventTabWidget.ui b/qt/scientific_interfaces/ISISReflectometryOld/ReflEventTabWidget.ui
similarity index 100%
rename from qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflEventTabWidget.ui
rename to qt/scientific_interfaces/ISISReflectometryOld/ReflEventTabWidget.ui
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflEventWidget.ui b/qt/scientific_interfaces/ISISReflectometryOld/ReflEventWidget.ui
similarity index 100%
rename from qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflEventWidget.ui
rename to qt/scientific_interfaces/ISISReflectometryOld/ReflEventWidget.ui
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/src/ReflGenericDataProcessorPresenterFactory.cpp b/qt/scientific_interfaces/ISISReflectometryOld/ReflGenericDataProcessorPresenterFactory.cpp
similarity index 98%
rename from qt/scientific_interfaces/ISISReflectometryOld/src/ReflGenericDataProcessorPresenterFactory.cpp
rename to qt/scientific_interfaces/ISISReflectometryOld/ReflGenericDataProcessorPresenterFactory.cpp
index f9474688dd9..7e46eeb53cd 100644
--- a/qt/scientific_interfaces/ISISReflectometryOld/src/ReflGenericDataProcessorPresenterFactory.cpp
+++ b/qt/scientific_interfaces/ISISReflectometryOld/ReflGenericDataProcessorPresenterFactory.cpp
@@ -1,4 +1,4 @@
-#include "MantidQtCustomInterfaces/Reflectometry/ReflGenericDataProcessorPresenterFactory.h"
+#include "ReflGenericDataProcessorPresenterFactory.h"
 #include "MantidKernel/make_unique.h"
 
 namespace MantidQt {
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflGenericDataProcessorPresenterFactory.h b/qt/scientific_interfaces/ISISReflectometryOld/ReflGenericDataProcessorPresenterFactory.h
similarity index 75%
rename from qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflGenericDataProcessorPresenterFactory.h
rename to qt/scientific_interfaces/ISISReflectometryOld/ReflGenericDataProcessorPresenterFactory.h
index db6cfee7f75..9a9ecfd2728 100644
--- a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflGenericDataProcessorPresenterFactory.h
+++ b/qt/scientific_interfaces/ISISReflectometryOld/ReflGenericDataProcessorPresenterFactory.h
@@ -1,8 +1,8 @@
-#ifndef MANTID_CUSTOMINTERFACES_REFLGENERICDATAPROCESSORPRESENTERFACTORY_H
-#define MANTID_CUSTOMINTERFACES_REFLGENERICDATAPROCESSORPRESENTERFACTORY_H
+#ifndef MANTID_ISISREFLECTOMETRYOLD_REFLGENERICDATAPROCESSORPRESENTERFACTORY_H
+#define MANTID_ISISREFLECTOMETRYOLD_REFLGENERICDATAPROCESSORPRESENTERFACTORY_H
 
-#include "MantidQtCustomInterfaces/DllConfig.h"
-#include "MantidQtCustomInterfaces/Reflectometry/ReflDataProcessorPresenter.h"
+#include "DllConfig.h"
+#include "ReflDataProcessorPresenter.h"
 
 namespace MantidQt {
 namespace CustomInterfaces {
@@ -32,7 +32,7 @@ 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>
 */
-class MANTIDQT_CUSTOMINTERFACES_DLL ReflGenericDataProcessorPresenterFactory {
+class MANTIDQT_ISISREFLECTOMETRYOLD_DLL ReflGenericDataProcessorPresenterFactory {
 public:
   ReflGenericDataProcessorPresenterFactory() = default;
   virtual ~ReflGenericDataProcessorPresenterFactory() = default;
@@ -44,4 +44,4 @@ public:
 };
 }
 }
-#endif /*MANTID_CUSTOMINTERFACES_REFLGENERICDATAPROCESSORPRESENTERFACTORY_H*/
+#endif /*MANTID_ISISREFLECTOMETRYOLD_REFLGENERICDATAPROCESSORPRESENTERFACTORY_H*/
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/src/ReflLegacyTransferStrategy.cpp b/qt/scientific_interfaces/ISISReflectometryOld/ReflLegacyTransferStrategy.cpp
similarity index 96%
rename from qt/scientific_interfaces/ISISReflectometryOld/src/ReflLegacyTransferStrategy.cpp
rename to qt/scientific_interfaces/ISISReflectometryOld/ReflLegacyTransferStrategy.cpp
index e6f10cce1e3..906b0114d3b 100644
--- a/qt/scientific_interfaces/ISISReflectometryOld/src/ReflLegacyTransferStrategy.cpp
+++ b/qt/scientific_interfaces/ISISReflectometryOld/ReflLegacyTransferStrategy.cpp
@@ -1,7 +1,7 @@
-#include "MantidQtCustomInterfaces/Reflectometry/ReflLegacyTransferStrategy.h"
+#include "ReflLegacyTransferStrategy.h"
 #include "MantidKernel/ProgressBase.h"
 #include "MantidKernel/ProgressBase.h"
-#include "MantidQtCustomInterfaces/Reflectometry/ReflTableSchema.h"
+#include "ReflTableSchema.h"
 #include <algorithm>
 #include <boost/lexical_cast.hpp>
 #include <boost/regex.hpp>
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflLegacyTransferStrategy.h b/qt/scientific_interfaces/ISISReflectometryOld/ReflLegacyTransferStrategy.h
similarity index 88%
rename from qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflLegacyTransferStrategy.h
rename to qt/scientific_interfaces/ISISReflectometryOld/ReflLegacyTransferStrategy.h
index 3c5de489311..d7db658e378 100644
--- a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflLegacyTransferStrategy.h
+++ b/qt/scientific_interfaces/ISISReflectometryOld/ReflLegacyTransferStrategy.h
@@ -1,8 +1,8 @@
-#ifndef MANTID_CUSTOMINTERFACES_REFLLEGACYTRANSFERSTRATEGY_H
-#define MANTID_CUSTOMINTERFACES_REFLLEGACYTRANSFERSTRATEGY_H
+#ifndef MANTID_ISISREFLECTOMETRYOLD_REFLLEGACYTRANSFERSTRATEGY_H
+#define MANTID_ISISREFLECTOMETRYOLD_REFLLEGACYTRANSFERSTRATEGY_H
 
 #include "MantidKernel/System.h"
-#include "MantidQtCustomInterfaces/Reflectometry/ReflTransferStrategy.h"
+#include "ReflTransferStrategy.h"
 
 namespace MantidQt {
 namespace CustomInterfaces {
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/src/ReflMainWindowPresenter.cpp b/qt/scientific_interfaces/ISISReflectometryOld/ReflMainWindowPresenter.cpp
similarity index 93%
rename from qt/scientific_interfaces/ISISReflectometryOld/src/ReflMainWindowPresenter.cpp
rename to qt/scientific_interfaces/ISISReflectometryOld/ReflMainWindowPresenter.cpp
index bf032768bac..e4f24c48528 100644
--- a/qt/scientific_interfaces/ISISReflectometryOld/src/ReflMainWindowPresenter.cpp
+++ b/qt/scientific_interfaces/ISISReflectometryOld/ReflMainWindowPresenter.cpp
@@ -1,9 +1,9 @@
-#include "MantidQtCustomInterfaces/Reflectometry/ReflMainWindowPresenter.h"
-#include "MantidQtCustomInterfaces/Reflectometry/IReflMainWindowView.h"
-#include "MantidQtCustomInterfaces/Reflectometry/IReflRunsTabPresenter.h"
-#include "MantidQtCustomInterfaces/Reflectometry/IReflEventTabPresenter.h"
-#include "MantidQtCustomInterfaces/Reflectometry/IReflSettingsTabPresenter.h"
-#include "MantidQtCustomInterfaces/Reflectometry/IReflSaveTabPresenter.h"
+#include "ReflMainWindowPresenter.h"
+#include "IReflMainWindowView.h"
+#include "IReflRunsTabPresenter.h"
+#include "IReflEventTabPresenter.h"
+#include "IReflSettingsTabPresenter.h"
+#include "IReflSaveTabPresenter.h"
 
 namespace MantidQt {
 namespace CustomInterfaces {
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflMainWindowPresenter.h b/qt/scientific_interfaces/ISISReflectometryOld/ReflMainWindowPresenter.h
similarity index 91%
rename from qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflMainWindowPresenter.h
rename to qt/scientific_interfaces/ISISReflectometryOld/ReflMainWindowPresenter.h
index af3d5b721b9..8e205fc89b4 100644
--- a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflMainWindowPresenter.h
+++ b/qt/scientific_interfaces/ISISReflectometryOld/ReflMainWindowPresenter.h
@@ -1,8 +1,8 @@
-#ifndef MANTID_CUSTOMINTERFACES_REFLMAINWINDOWPRESENTER_H
-#define MANTID_CUSTOMINTERFACES_REFLMAINWINDOWPRESENTER_H
+#ifndef MANTID_ISISREFLECTOMETRYOLD_REFLMAINWINDOWPRESENTER_H
+#define MANTID_ISISREFLECTOMETRYOLD_REFLMAINWINDOWPRESENTER_H
 
-#include "MantidQtCustomInterfaces/DllConfig.h"
-#include "MantidQtCustomInterfaces/Reflectometry/IReflMainWindowPresenter.h"
+#include "DllConfig.h"
+#include "IReflMainWindowPresenter.h"
 
 namespace MantidQt {
 namespace CustomInterfaces {
@@ -39,7 +39,7 @@ 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>
 */
-class MANTIDQT_CUSTOMINTERFACES_DLL ReflMainWindowPresenter
+class MANTIDQT_ISISREFLECTOMETRYOLD_DLL ReflMainWindowPresenter
     : public IReflMainWindowPresenter {
 public:
   /// Constructor
@@ -105,4 +105,4 @@ private:
 };
 }
 }
-#endif /* MANTID_CUSTOMINTERFACES_REFLMAINWINDOWPRESENTER_H */
+#endif /* MANTID_ISISREFLECTOMETRYOLD_REFLMAINWINDOWPRESENTER_H */
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflMainWindowWidget.ui b/qt/scientific_interfaces/ISISReflectometryOld/ReflMainWindowWidget.ui
similarity index 100%
rename from qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflMainWindowWidget.ui
rename to qt/scientific_interfaces/ISISReflectometryOld/ReflMainWindowWidget.ui
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/src/ReflMeasureTransferStrategy.cpp b/qt/scientific_interfaces/ISISReflectometryOld/ReflMeasureTransferStrategy.cpp
similarity index 96%
rename from qt/scientific_interfaces/ISISReflectometryOld/src/ReflMeasureTransferStrategy.cpp
rename to qt/scientific_interfaces/ISISReflectometryOld/ReflMeasureTransferStrategy.cpp
index c0eea692814..30709e65744 100644
--- a/qt/scientific_interfaces/ISISReflectometryOld/src/ReflMeasureTransferStrategy.cpp
+++ b/qt/scientific_interfaces/ISISReflectometryOld/ReflMeasureTransferStrategy.cpp
@@ -1,9 +1,9 @@
-#include "MantidQtCustomInterfaces/Reflectometry/ReflMeasureTransferStrategy.h"
+#include "ReflMeasureTransferStrategy.h"
 #include "MantidKernel/ICatalogInfo.h"
 #include "MantidKernel/ProgressBase.h"
 #include "MantidKernel/UserCatalogInfo.h"
-#include "MantidQtCustomInterfaces/Reflectometry/ReflMeasurementItemSource.h"
-#include "MantidQtCustomInterfaces/Reflectometry/ReflTableSchema.h"
+#include "ReflMeasurementItemSource.h"
+#include "ReflTableSchema.h"
 #include <boost/regex.hpp>
 #include <limits>
 #include <map>
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflMeasureTransferStrategy.h b/qt/scientific_interfaces/ISISReflectometryOld/ReflMeasureTransferStrategy.h
similarity index 85%
rename from qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflMeasureTransferStrategy.h
rename to qt/scientific_interfaces/ISISReflectometryOld/ReflMeasureTransferStrategy.h
index 63d85c1cb25..b9ff1e3f6c6 100644
--- a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflMeasureTransferStrategy.h
+++ b/qt/scientific_interfaces/ISISReflectometryOld/ReflMeasureTransferStrategy.h
@@ -1,8 +1,8 @@
-#ifndef MANTID_CUSTOMINTERFACES_REFLMEASURETRANSFERSTRATEGY_H_
-#define MANTID_CUSTOMINTERFACES_REFLMEASURETRANSFERSTRATEGY_H_
+#ifndef MANTID_ISISREFLECTOMETRYOLD_REFLMEASURETRANSFERSTRATEGY_H_
+#define MANTID_ISISREFLECTOMETRYOLD_REFLMEASURETRANSFERSTRATEGY_H_
 
-#include "MantidQtCustomInterfaces/DllConfig.h"
-#include "MantidQtCustomInterfaces/Reflectometry/ReflTransferStrategy.h"
+#include "DllConfig.h"
+#include "ReflTransferStrategy.h"
 
 #include <map>
 #include <memory>
@@ -47,7 +47,7 @@ class ReflMeasurementItemSource;
   File change history is stored at: <https://github.com/mantidproject/mantid>
   Code Documentation is available at: <http://doxygen.mantidproject.org>
 */
-class MANTIDQT_CUSTOMINTERFACES_DLL ReflMeasureTransferStrategy
+class MANTIDQT_ISISREFLECTOMETRYOLD_DLL ReflMeasureTransferStrategy
     : public ReflTransferStrategy {
 public:
   ReflMeasureTransferStrategy(
@@ -78,4 +78,4 @@ private:
 } // namespace CustomInterfaces
 } // namespace MantidQt
 
-#endif /* MANTID_CUSTOMINTERFACES_REFLMEASURETRANSFERSTRATEGY_H_ */
+#endif /* MANTID_ISISREFLECTOMETRYOLD_REFLMEASURETRANSFERSTRATEGY_H_ */
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflMeasurementItemSource.h b/qt/scientific_interfaces/ISISReflectometryOld/ReflMeasurementItemSource.h
similarity index 90%
rename from qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflMeasurementItemSource.h
rename to qt/scientific_interfaces/ISISReflectometryOld/ReflMeasurementItemSource.h
index 48c91502199..c03cd44c987 100644
--- a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflMeasurementItemSource.h
+++ b/qt/scientific_interfaces/ISISReflectometryOld/ReflMeasurementItemSource.h
@@ -1,8 +1,8 @@
 #ifndef MANTIDQT_CUSTOMINTERFACES_REFLMEASUREMENTITEMSOURCE_H_
 #define MANTIDQT_CUSTOMINTERFACES_REFLMEASUREMENTITEMSOURCE_H_
 
-#include "MantidQtCustomInterfaces/DllConfig.h"
-#include "MantidQtCustomInterfaces/Reflectometry/MeasurementItem.h"
+#include "DllConfig.h"
+#include "MeasurementItem.h"
 #include <string>
 
 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 ReflMeasurementItemSource {
+class MANTIDQT_ISISREFLECTOMETRYOLD_DLL ReflMeasurementItemSource {
 public:
   /// Get the measurement somehow using location, or fuzzy path
   virtual MeasurementItem obtain(const std::string &definedPath,
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/src/ReflNexusMeasurementItemSource.cpp b/qt/scientific_interfaces/ISISReflectometryOld/ReflNexusMeasurementItemSource.cpp
similarity index 97%
rename from qt/scientific_interfaces/ISISReflectometryOld/src/ReflNexusMeasurementItemSource.cpp
rename to qt/scientific_interfaces/ISISReflectometryOld/ReflNexusMeasurementItemSource.cpp
index e185395fa11..8c6e192d199 100644
--- a/qt/scientific_interfaces/ISISReflectometryOld/src/ReflNexusMeasurementItemSource.cpp
+++ b/qt/scientific_interfaces/ISISReflectometryOld/ReflNexusMeasurementItemSource.cpp
@@ -1,4 +1,4 @@
-#include "MantidQtCustomInterfaces/Reflectometry/ReflNexusMeasurementItemSource.h"
+#include "ReflNexusMeasurementItemSource.h"
 #include <Poco/File.h>
 #include <Poco/Exception.h>
 #include "MantidAPI/AlgorithmManager.h"
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflNexusMeasurementItemSource.h b/qt/scientific_interfaces/ISISReflectometryOld/ReflNexusMeasurementItemSource.h
similarity index 87%
rename from qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflNexusMeasurementItemSource.h
rename to qt/scientific_interfaces/ISISReflectometryOld/ReflNexusMeasurementItemSource.h
index f756a713462..b961f196139 100644
--- a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflNexusMeasurementItemSource.h
+++ b/qt/scientific_interfaces/ISISReflectometryOld/ReflNexusMeasurementItemSource.h
@@ -1,9 +1,9 @@
 #ifndef MANTIDQT_CUSTOMINTERFACES_REFLNEXUSMEASUREMENTITEMSOURCE_H_
 #define MANTIDQT_CUSTOMINTERFACES_REFLNEXUSMEASUREMENTITEMSOURCE_H_
 
-#include "MantidQtCustomInterfaces/DllConfig.h"
-#include "MantidQtCustomInterfaces/Reflectometry/ReflMeasurementItemSource.h"
-#include "MantidQtCustomInterfaces/Reflectometry/MeasurementItem.h"
+#include "DllConfig.h"
+#include "ReflMeasurementItemSource.h"
+#include "MeasurementItem.h"
 
 #include <string>
 
@@ -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 ReflNexusMeasurementItemSource
+class MANTIDQT_ISISREFLECTOMETRYOLD_DLL ReflNexusMeasurementItemSource
     : public ReflMeasurementItemSource {
 public:
   ReflNexusMeasurementItemSource();
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/src/ReflRunsTabPresenter.cpp b/qt/scientific_interfaces/ISISReflectometryOld/ReflRunsTabPresenter.cpp
similarity index 95%
rename from qt/scientific_interfaces/ISISReflectometryOld/src/ReflRunsTabPresenter.cpp
rename to qt/scientific_interfaces/ISISReflectometryOld/ReflRunsTabPresenter.cpp
index 0d1298fdef8..4b66ec54671 100644
--- a/qt/scientific_interfaces/ISISReflectometryOld/src/ReflRunsTabPresenter.cpp
+++ b/qt/scientific_interfaces/ISISReflectometryOld/ReflRunsTabPresenter.cpp
@@ -1,4 +1,4 @@
-#include "MantidQtCustomInterfaces/Reflectometry/ReflRunsTabPresenter.h"
+#include "ReflRunsTabPresenter.h"
 #include "MantidAPI/AlgorithmManager.h"
 #include "MantidAPI/CatalogManager.h"
 #include "MantidAPI/ITableWorkspace.h"
@@ -6,17 +6,17 @@
 #include "MantidKernel/ConfigService.h"
 #include "MantidKernel/FacilityInfo.h"
 #include "MantidKernel/UserCatalogInfo.h"
-#include "MantidQtAPI/AlgorithmRunner.h"
-#include "MantidQtCustomInterfaces/Reflectometry/IReflMainWindowPresenter.h"
-#include "MantidQtCustomInterfaces/Reflectometry/IReflRunsTabView.h"
-#include "MantidQtCustomInterfaces/Reflectometry/ReflCatalogSearcher.h"
-#include "MantidQtCustomInterfaces/Reflectometry/ReflLegacyTransferStrategy.h"
-#include "MantidQtCustomInterfaces/Reflectometry/ReflMeasureTransferStrategy.h"
-#include "MantidQtCustomInterfaces/Reflectometry/ReflNexusMeasurementItemSource.h"
-#include "MantidQtCustomInterfaces/Reflectometry/ReflSearchModel.h"
-#include "MantidQtMantidWidgets/DataProcessorUI/DataProcessorCommand.h"
-#include "MantidQtMantidWidgets/DataProcessorUI/DataProcessorPresenter.h"
-#include "MantidQtMantidWidgets/ProgressPresenter.h"
+#include "MantidQtWidgets/Common/AlgorithmRunner.h"
+#include "IReflMainWindowPresenter.h"
+#include "IReflRunsTabView.h"
+#include "ReflCatalogSearcher.h"
+#include "ReflLegacyTransferStrategy.h"
+#include "ReflMeasureTransferStrategy.h"
+#include "ReflNexusMeasurementItemSource.h"
+#include "ReflSearchModel.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPresenter.h"
+#include "MantidQtWidgets/Common/ProgressPresenter.h"
 
 #include <boost/regex.hpp>
 #include <boost/tokenizer.hpp>
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflRunsTabPresenter.h b/qt/scientific_interfaces/ISISReflectometryOld/ReflRunsTabPresenter.h
similarity index 90%
rename from qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflRunsTabPresenter.h
rename to qt/scientific_interfaces/ISISReflectometryOld/ReflRunsTabPresenter.h
index 3b2efab6ddf..9a27db998f5 100644
--- a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflRunsTabPresenter.h
+++ b/qt/scientific_interfaces/ISISReflectometryOld/ReflRunsTabPresenter.h
@@ -1,10 +1,10 @@
-#ifndef MANTID_CUSTOMINTERFACES_REFLRUNSTABPRESENTER_H
-#define MANTID_CUSTOMINTERFACES_REFLRUNSTABPRESENTER_H
+#ifndef MANTID_ISISREFLECTOMETRYOLD_REFLRUNSTABPRESENTER_H
+#define MANTID_ISISREFLECTOMETRYOLD_REFLRUNSTABPRESENTER_H
 
 #include "MantidAPI/IAlgorithm.h"
-#include "MantidQtCustomInterfaces/DllConfig.h"
-#include "MantidQtCustomInterfaces/Reflectometry/IReflRunsTabPresenter.h"
-#include "MantidQtMantidWidgets/DataProcessorUI/DataProcessorMainPresenter.h"
+#include "DllConfig.h"
+#include "IReflRunsTabPresenter.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorMainPresenter.h"
 #include <boost/shared_ptr.hpp>
 
 namespace MantidQt {
@@ -53,7 +53,7 @@ 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>
 */
-class MANTIDQT_CUSTOMINTERFACES_DLL ReflRunsTabPresenter
+class MANTIDQT_ISISREFLECTOMETRYOLD_DLL ReflRunsTabPresenter
     : public IReflRunsTabPresenter,
       public MantidQt::MantidWidgets::DataProcessorMainPresenter {
 public:
@@ -120,4 +120,4 @@ private:
 };
 }
 }
-#endif /* MANTID_CUSTOMINTERFACES_REFLRUNSTABPRESENTER_H */
+#endif /* MANTID_ISISREFLECTOMETRYOLD_REFLRUNSTABPRESENTER_H */
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflRunsTabWidget.ui b/qt/scientific_interfaces/ISISReflectometryOld/ReflRunsTabWidget.ui
similarity index 100%
rename from qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflRunsTabWidget.ui
rename to qt/scientific_interfaces/ISISReflectometryOld/ReflRunsTabWidget.ui
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/src/ReflSaveTabPresenter.cpp b/qt/scientific_interfaces/ISISReflectometryOld/ReflSaveTabPresenter.cpp
similarity index 97%
rename from qt/scientific_interfaces/ISISReflectometryOld/src/ReflSaveTabPresenter.cpp
rename to qt/scientific_interfaces/ISISReflectometryOld/ReflSaveTabPresenter.cpp
index d543bf8b1db..316fa0dd725 100644
--- a/qt/scientific_interfaces/ISISReflectometryOld/src/ReflSaveTabPresenter.cpp
+++ b/qt/scientific_interfaces/ISISReflectometryOld/ReflSaveTabPresenter.cpp
@@ -1,6 +1,6 @@
-#include "MantidQtCustomInterfaces/Reflectometry/ReflSaveTabPresenter.h"
-#include "MantidQtCustomInterfaces/Reflectometry/IReflSaveTabView.h"
-#include "MantidQtCustomInterfaces/Reflectometry/IReflMainWindowPresenter.h"
+#include "ReflSaveTabPresenter.h"
+#include "IReflSaveTabView.h"
+#include "IReflMainWindowPresenter.h"
 #include "MantidKernel/ConfigService.h"
 #include "MantidAPI/ITableWorkspace.h"
 #include "MantidAPI/WorkspaceGroup.h"
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflSaveTabPresenter.h b/qt/scientific_interfaces/ISISReflectometryOld/ReflSaveTabPresenter.h
similarity index 93%
rename from qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflSaveTabPresenter.h
rename to qt/scientific_interfaces/ISISReflectometryOld/ReflSaveTabPresenter.h
index f1381d72fd2..a53bac0fc37 100644
--- a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflSaveTabPresenter.h
+++ b/qt/scientific_interfaces/ISISReflectometryOld/ReflSaveTabPresenter.h
@@ -1,8 +1,8 @@
 #ifndef MANTID_CUSTOMINTERFACES_REFLSAVETABPRESENTER_H
 #define MANTID_CUSTOMINTERFACES_REFLSAVETABPRESENTER_H
 
-#include "MantidQtCustomInterfaces/DllConfig.h"
-#include "MantidQtCustomInterfaces/Reflectometry/IReflSaveTabPresenter.h"
+#include "DllConfig.h"
+#include "IReflSaveTabPresenter.h"
 #include <vector>
 #include <string>
 
@@ -39,7 +39,7 @@ 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>
 */
-class MANTIDQT_CUSTOMINTERFACES_DLL ReflSaveTabPresenter
+class MANTIDQT_ISISREFLECTOMETRYOLD_DLL ReflSaveTabPresenter
     : public IReflSaveTabPresenter {
 public:
   /// Constructor
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflSaveTabWidget.ui b/qt/scientific_interfaces/ISISReflectometryOld/ReflSaveTabWidget.ui
similarity index 100%
rename from qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflSaveTabWidget.ui
rename to qt/scientific_interfaces/ISISReflectometryOld/ReflSaveTabWidget.ui
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/src/ReflSearchModel.cpp b/qt/scientific_interfaces/ISISReflectometryOld/ReflSearchModel.cpp
similarity index 97%
rename from qt/scientific_interfaces/ISISReflectometryOld/src/ReflSearchModel.cpp
rename to qt/scientific_interfaces/ISISReflectometryOld/ReflSearchModel.cpp
index 1e1342f643f..360849c99e5 100644
--- a/qt/scientific_interfaces/ISISReflectometryOld/src/ReflSearchModel.cpp
+++ b/qt/scientific_interfaces/ISISReflectometryOld/ReflSearchModel.cpp
@@ -1,5 +1,5 @@
-#include "MantidQtCustomInterfaces/Reflectometry/ReflSearchModel.h"
-#include "MantidQtCustomInterfaces/Reflectometry/ReflTransferStrategy.h"
+#include "ReflSearchModel.h"
+#include "ReflTransferStrategy.h"
 #include "MantidAPI/ITableWorkspace.h"
 #include "MantidAPI/TableRow.h"
 #include <QColor>
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflSearchModel.h b/qt/scientific_interfaces/ISISReflectometryOld/ReflSearchModel.h
similarity index 94%
rename from qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflSearchModel.h
rename to qt/scientific_interfaces/ISISReflectometryOld/ReflSearchModel.h
index 8f8163010a1..7ded5c79270 100644
--- a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflSearchModel.h
+++ b/qt/scientific_interfaces/ISISReflectometryOld/ReflSearchModel.h
@@ -1,5 +1,5 @@
-#ifndef MANTID_CUSTOMINTERFACES_REFLSEARCHMODEL_H_
-#define MANTID_CUSTOMINTERFACES_REFLSEARCHMODEL_H_
+#ifndef MANTID_ISISREFLECTOMETRYOLD_REFLSEARCHMODEL_H_
+#define MANTID_ISISREFLECTOMETRYOLD_REFLSEARCHMODEL_H_
 
 #include "MantidAPI/ITableWorkspace_fwd.h"
 #include <QAbstractTableModel>
@@ -77,4 +77,4 @@ typedef boost::shared_ptr<ReflSearchModel> ReflSearchModel_sptr;
 } // namespace CustomInterfaces
 } // namespace Mantid
 
-#endif /* MANTID_CUSTOMINTERFACES_REFLSEARCHMODEL_H_ */
+#endif /* MANTID_ISISREFLECTOMETRYOLD_REFLSEARCHMODEL_H_ */
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/src/ReflSettingsPresenter.cpp b/qt/scientific_interfaces/ISISReflectometryOld/ReflSettingsPresenter.cpp
similarity index 97%
rename from qt/scientific_interfaces/ISISReflectometryOld/src/ReflSettingsPresenter.cpp
rename to qt/scientific_interfaces/ISISReflectometryOld/ReflSettingsPresenter.cpp
index c2a31e7f72e..56c2aa16a09 100644
--- a/qt/scientific_interfaces/ISISReflectometryOld/src/ReflSettingsPresenter.cpp
+++ b/qt/scientific_interfaces/ISISReflectometryOld/ReflSettingsPresenter.cpp
@@ -1,12 +1,12 @@
-#include "MantidQtCustomInterfaces/Reflectometry/ReflSettingsPresenter.h"
+#include "ReflSettingsPresenter.h"
 #include "MantidAPI/AlgorithmManager.h"
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidAPI/IAlgorithm.h"
 #include "MantidAPI/MatrixWorkspace.h"
 #include "MantidGeometry/Instrument.h"
-#include "MantidQtCustomInterfaces/Reflectometry/IReflSettingsTabPresenter.h"
-#include "MantidQtCustomInterfaces/Reflectometry/IReflSettingsView.h"
-#include "MantidQtMantidWidgets/AlgorithmHintStrategy.h"
+#include "IReflSettingsTabPresenter.h"
+#include "IReflSettingsView.h"
+#include "MantidQtWidgets/Common/AlgorithmHintStrategy.h"
 
 namespace MantidQt {
 namespace CustomInterfaces {
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflSettingsPresenter.h b/qt/scientific_interfaces/ISISReflectometryOld/ReflSettingsPresenter.h
similarity index 87%
rename from qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflSettingsPresenter.h
rename to qt/scientific_interfaces/ISISReflectometryOld/ReflSettingsPresenter.h
index 23a5dbba56b..a3a6bb69773 100644
--- a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflSettingsPresenter.h
+++ b/qt/scientific_interfaces/ISISReflectometryOld/ReflSettingsPresenter.h
@@ -1,10 +1,10 @@
-#ifndef MANTID_CUSTOMINTERFACES_REFLSETTINGSPRESENTER_H
-#define MANTID_CUSTOMINTERFACES_REFLSETTINGSPRESENTER_H
+#ifndef MANTID_ISISREFLECTOMETRYOLD_REFLSETTINGSPRESENTER_H
+#define MANTID_ISISREFLECTOMETRYOLD_REFLSETTINGSPRESENTER_H
 
 #include "MantidAPI/IAlgorithm_fwd.h"
 #include "MantidGeometry/Instrument_fwd.h"
-#include "MantidQtCustomInterfaces/DllConfig.h"
-#include "MantidQtCustomInterfaces/Reflectometry/IReflSettingsPresenter.h"
+#include "DllConfig.h"
+#include "IReflSettingsPresenter.h"
 
 namespace MantidQt {
 namespace CustomInterfaces {
@@ -38,7 +38,7 @@ 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>
 */
-class MANTIDQT_CUSTOMINTERFACES_DLL ReflSettingsPresenter
+class MANTIDQT_ISISREFLECTOMETRYOLD_DLL ReflSettingsPresenter
     : public IReflSettingsPresenter {
 public:
   /// Constructor
@@ -73,4 +73,4 @@ private:
 };
 }
 }
-#endif /* MANTID_CUSTOMINTERFACES_REFLSETTINGSPRESENTER_H */
+#endif /* MANTID_ISISREFLECTOMETRYOLD_REFLSETTINGSPRESENTER_H */
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/src/ReflSettingsTabPresenter.cpp b/qt/scientific_interfaces/ISISReflectometryOld/ReflSettingsTabPresenter.cpp
similarity index 89%
rename from qt/scientific_interfaces/ISISReflectometryOld/src/ReflSettingsTabPresenter.cpp
rename to qt/scientific_interfaces/ISISReflectometryOld/ReflSettingsTabPresenter.cpp
index cf86cb3de77..f917a3e9aaf 100644
--- a/qt/scientific_interfaces/ISISReflectometryOld/src/ReflSettingsTabPresenter.cpp
+++ b/qt/scientific_interfaces/ISISReflectometryOld/ReflSettingsTabPresenter.cpp
@@ -1,7 +1,7 @@
-#include "MantidQtCustomInterfaces/Reflectometry/ReflSettingsTabPresenter.h"
-#include "MantidQtCustomInterfaces/Reflectometry/IReflMainWindowPresenter.h"
-#include "MantidQtCustomInterfaces/Reflectometry/ReflSettingsPresenter.h"
-#include "MantidQtMantidWidgets/AlgorithmHintStrategy.h"
+#include "ReflSettingsTabPresenter.h"
+#include "IReflMainWindowPresenter.h"
+#include "ReflSettingsPresenter.h"
+#include "MantidQtWidgets/Common/AlgorithmHintStrategy.h"
 #include "MantidAPI/AlgorithmManager.h"
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidAPI/MatrixWorkspace.h"
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflSettingsTabPresenter.h b/qt/scientific_interfaces/ISISReflectometryOld/ReflSettingsTabPresenter.h
similarity index 85%
rename from qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflSettingsTabPresenter.h
rename to qt/scientific_interfaces/ISISReflectometryOld/ReflSettingsTabPresenter.h
index b0728f28e0c..0bb48069aa8 100644
--- a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflSettingsTabPresenter.h
+++ b/qt/scientific_interfaces/ISISReflectometryOld/ReflSettingsTabPresenter.h
@@ -1,8 +1,8 @@
-#ifndef MANTID_CUSTOMINTERFACES_REFLSETTINGSTABPRESENTER_H
-#define MANTID_CUSTOMINTERFACES_REFLSETTINGSTABPRESENTER_H
+#ifndef MANTID_ISISREFLECTOMETRYOLD_REFLSETTINGSTABPRESENTER_H
+#define MANTID_ISISREFLECTOMETRYOLD_REFLSETTINGSTABPRESENTER_H
 
-#include "MantidQtCustomInterfaces/DllConfig.h"
-#include "MantidQtCustomInterfaces/Reflectometry/IReflSettingsTabPresenter.h"
+#include "DllConfig.h"
+#include "IReflSettingsTabPresenter.h"
 #include <vector>
 
 namespace MantidQt {
@@ -38,7 +38,7 @@ 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>
 */
-class MANTIDQT_CUSTOMINTERFACES_DLL ReflSettingsTabPresenter
+class MANTIDQT_ISISREFLECTOMETRYOLD_DLL ReflSettingsTabPresenter
     : public IReflSettingsTabPresenter {
 public:
   /// Constructor
@@ -63,4 +63,4 @@ private:
 };
 }
 }
-#endif /* MANTID_CUSTOMINTERFACES_REFLSETTINGSTABPRESENTER_H */
+#endif /* MANTID_ISISREFLECTOMETRYOLD_REFLSETTINGSTABPRESENTER_H */
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflSettingsTabWidget.ui b/qt/scientific_interfaces/ISISReflectometryOld/ReflSettingsTabWidget.ui
similarity index 100%
rename from qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflSettingsTabWidget.ui
rename to qt/scientific_interfaces/ISISReflectometryOld/ReflSettingsTabWidget.ui
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflSettingsWidget.ui b/qt/scientific_interfaces/ISISReflectometryOld/ReflSettingsWidget.ui
similarity index 100%
rename from qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflSettingsWidget.ui
rename to qt/scientific_interfaces/ISISReflectometryOld/ReflSettingsWidget.ui
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/src/ReflTableSchema.cpp b/qt/scientific_interfaces/ISISReflectometryOld/ReflTableSchema.cpp
similarity index 91%
rename from qt/scientific_interfaces/ISISReflectometryOld/src/ReflTableSchema.cpp
rename to qt/scientific_interfaces/ISISReflectometryOld/ReflTableSchema.cpp
index b2ff19d2160..ce8e47d50a1 100644
--- a/qt/scientific_interfaces/ISISReflectometryOld/src/ReflTableSchema.cpp
+++ b/qt/scientific_interfaces/ISISReflectometryOld/ReflTableSchema.cpp
@@ -1,4 +1,4 @@
-#include "MantidQtCustomInterfaces/Reflectometry/ReflTableSchema.h"
+#include "ReflTableSchema.h"
 #include <utility>
 
 namespace MantidQt {
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflTableSchema.h b/qt/scientific_interfaces/ISISReflectometryOld/ReflTableSchema.h
similarity index 88%
rename from qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflTableSchema.h
rename to qt/scientific_interfaces/ISISReflectometryOld/ReflTableSchema.h
index c07f004aaeb..0fda28496b6 100644
--- a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflTableSchema.h
+++ b/qt/scientific_interfaces/ISISReflectometryOld/ReflTableSchema.h
@@ -1,7 +1,7 @@
-#ifndef MANTID_CUSTOMINTERFACES_REFLTABLESCHEMA_H_
-#define MANTID_CUSTOMINTERFACES_REFLTABLESCHEMA_H_
+#ifndef MANTID_ISISREFLECTOMETRYOLD_REFLTABLESCHEMA_H_
+#define MANTID_ISISREFLECTOMETRYOLD_REFLTABLESCHEMA_H_
 
-#include "MantidQtCustomInterfaces/DllConfig.h"
+#include "DllConfig.h"
 #include "string"
 #include "map"
 
@@ -61,4 +61,4 @@ ColumnNameIndexMap makeColumnNameMap();
 } // namespace CustomInterfaces
 } // namespace Mantid
 
-#endif /* MANTID_CUSTOMINTERFACES_REFLTABLESCHEMA_H_ */
+#endif /* MANTID_ISISREFLECTOMETRYOLD_REFLTABLESCHEMA_H_ */
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflTransferStrategy.h b/qt/scientific_interfaces/ISISReflectometryOld/ReflTransferStrategy.h
similarity index 93%
rename from qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflTransferStrategy.h
rename to qt/scientific_interfaces/ISISReflectometryOld/ReflTransferStrategy.h
index a54a0d00480..69512dac604 100644
--- a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflTransferStrategy.h
+++ b/qt/scientific_interfaces/ISISReflectometryOld/ReflTransferStrategy.h
@@ -1,11 +1,11 @@
-#ifndef MANTID_CUSTOMINTERFACES_REFLTRANSFERSTRATEGY_H
-#define MANTID_CUSTOMINTERFACES_REFLTRANSFERSTRATEGY_H
+#ifndef MANTID_ISISREFLECTOMETRYOLD_REFLTRANSFERSTRATEGY_H
+#define MANTID_ISISREFLECTOMETRYOLD_REFLTRANSFERSTRATEGY_H
 
 #include <map>
 #include <string>
 #include <vector>
 
-#include "MantidQtCustomInterfaces/Reflectometry/TransferResults.h"
+#include "TransferResults.h"
 
 namespace Mantid {
 namespace Kernel {
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflWindow.ui b/qt/scientific_interfaces/ISISReflectometryOld/ReflWindow.ui
similarity index 99%
rename from qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflWindow.ui
rename to qt/scientific_interfaces/ISISReflectometryOld/ReflWindow.ui
index c0375ae18d2..98bcbcfd90a 100644
--- a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/ReflWindow.ui
+++ b/qt/scientific_interfaces/ISISReflectometryOld/ReflWindow.ui
@@ -581,7 +581,7 @@
   <customwidget>
    <class>MantidQt::MantidWidgets::WorkspaceSelector</class>
    <extends>QComboBox</extends>
-   <header>MantidQtMantidWidgets/WorkspaceSelector.h</header>
+   <header>MantidQtWidgets/Common/WorkspaceSelector.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/src/TransferResults.cpp b/qt/scientific_interfaces/ISISReflectometryOld/TransferResults.cpp
similarity index 91%
rename from qt/scientific_interfaces/ISISReflectometryOld/src/TransferResults.cpp
rename to qt/scientific_interfaces/ISISReflectometryOld/TransferResults.cpp
index e5edd5f2e56..59983394542 100644
--- a/qt/scientific_interfaces/ISISReflectometryOld/src/TransferResults.cpp
+++ b/qt/scientific_interfaces/ISISReflectometryOld/TransferResults.cpp
@@ -1,4 +1,4 @@
-#include "MantidQtCustomInterfaces/Reflectometry/TransferResults.h"
+#include "TransferResults.h"
 
 namespace MantidQt {
 namespace CustomInterfaces {
diff --git a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/TransferResults.h b/qt/scientific_interfaces/ISISReflectometryOld/TransferResults.h
similarity index 73%
rename from qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/TransferResults.h
rename to qt/scientific_interfaces/ISISReflectometryOld/TransferResults.h
index c1768018301..48983b4cb06 100644
--- a/qt/scientific_interfaces/ISISReflectometryOld/ISISReflectometryOld/TransferResults.h
+++ b/qt/scientific_interfaces/ISISReflectometryOld/TransferResults.h
@@ -1,14 +1,14 @@
-#ifndef MANTID_CUSTOMINTERFACES_TRASNFERRESULTS_H_
-#define MANTID_CUSTOMINTERFACES_TRASNFERRESULTS_H_
+#ifndef MANTID_ISISREFLECTOMETRYOLD_TRASNFERRESULTS_H_
+#define MANTID_ISISREFLECTOMETRYOLD_TRASNFERRESULTS_H_
 
-#include "MantidQtCustomInterfaces/DllConfig.h"
+#include "DllConfig.h"
 #include <vector>
 #include <map>
 #include <boost/make_shared.hpp>
 
 namespace MantidQt {
 namespace CustomInterfaces {
-class MANTIDQT_CUSTOMINTERFACES_DLL TransferResults {
+class MANTIDQT_ISISREFLECTOMETRYOLD_DLL TransferResults {
 public:
   using COLUMN_NAME_TYPE = std::string;
   using COLUMN_VALUE_TYPE = std::string;
@@ -30,4 +30,4 @@ public:
 }
 }
 
-#endif // MANTID_CUSTOMINTERFACES_TRASNFERRESULTS_H_!
+#endif // MANTID_ISISREFLECTOMETRYOLD_TRASNFERRESULTS_H_!
diff --git a/qt/scientific_interfaces/ISISSANS/SANSAddFiles.h b/qt/scientific_interfaces/ISISSANS/SANSAddFiles.h
index ade2aa1a847..b860511c48e 100644
--- a/qt/scientific_interfaces/ISISSANS/SANSAddFiles.h
+++ b/qt/scientific_interfaces/ISISSANS/SANSAddFiles.h
@@ -3,7 +3,7 @@
 
 #include "ui_SANSRunWindow.h"
 #include "SANSConstants.h"
-#include "MantidQtWidgets/Common/UserSubWindow.h"
+#include "MantidQtWidgets/Common/Common/UserSubWindow.h"
 #include "MantidKernel/ConfigService.h"
 #include <Poco/NObserver.h>
 #include <QString>
diff --git a/qt/scientific_interfaces/ISISSANS/SANSDiagnostics.h b/qt/scientific_interfaces/ISISSANS/SANSDiagnostics.h
index 349d1e85b99..7567356c80c 100644
--- a/qt/scientific_interfaces/ISISSANS/SANSDiagnostics.h
+++ b/qt/scientific_interfaces/ISISSANS/SANSDiagnostics.h
@@ -2,7 +2,7 @@
 #define MANTIDQTCUSTOMINTERFACES_SANSDIAGNOSTICS_H_
 
 #include "ui_SANSRunWindow.h"
-#include "MantidQtWidgets/Common/UserSubWindow.h"
+#include "MantidQtWidgets/Common/Common/UserSubWindow.h"
 #include "MantidAPI/Workspace_fwd.h"
 #include "MantidAPI/MatrixWorkspace_fwd.h"
 #include "MantidGeometry/IDetector.h"
diff --git a/qt/scientific_interfaces/ISISSANS/SANSEventSlicing.h b/qt/scientific_interfaces/ISISSANS/SANSEventSlicing.h
index 3b7f190b1c3..fb883de84aa 100644
--- a/qt/scientific_interfaces/ISISSANS/SANSEventSlicing.h
+++ b/qt/scientific_interfaces/ISISSANS/SANSEventSlicing.h
@@ -2,7 +2,7 @@
 #define MANTIDQTCUSTOMINTERFACES_SANSEVENTSLICING_H_
 
 #include "ui_SANSEventSlicing.h"
-#include "MantidQtWidgets/Common/UserSubWindow.h"
+#include "MantidQtWidgets/Common/Common/UserSubWindow.h"
 #include <QString>
 
 namespace MantidQt {
diff --git a/qt/scientific_interfaces/ISISSANS/SANSEventSlicing.ui b/qt/scientific_interfaces/ISISSANS/SANSEventSlicing.ui
index 10391ce263c..c0d97b8ae64 100644
--- a/qt/scientific_interfaces/ISISSANS/SANSEventSlicing.ui
+++ b/qt/scientific_interfaces/ISISSANS/SANSEventSlicing.ui
@@ -221,7 +221,7 @@
   <customwidget>
    <class>MantidQt::MantidWidgets::WorkspaceSelector</class>
    <extends>QComboBox</extends>
-   <header>MantidQtWidgets/Common/WorkspaceSelector.h</header>
+   <header>MantidQtWidgets/Common/Common/WorkspaceSelector.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/qt/scientific_interfaces/ISISSANS/SANSPlotSpecial.cpp b/qt/scientific_interfaces/ISISSANS/SANSPlotSpecial.cpp
index 4ad1284f4b9..78c6150bdc8 100644
--- a/qt/scientific_interfaces/ISISSANS/SANSPlotSpecial.cpp
+++ b/qt/scientific_interfaces/ISISSANS/SANSPlotSpecial.cpp
@@ -5,7 +5,7 @@
 #include "MantidAPI/MatrixWorkspace.h"
 #include "MantidKernel/PhysicalConstants.h"
 
-#include "MantidQtWidgets/Common/RangeSelector.h"
+#include "MantidQtWidgets/Common/Common/RangeSelector.h"
 
 #include "qwt_plot_curve.h"
 #include <QLineEdit>
diff --git a/qt/scientific_interfaces/ISISSANS/SANSPlotSpecial.ui b/qt/scientific_interfaces/ISISSANS/SANSPlotSpecial.ui
index c5ca037a215..eb8310cb4ed 100644
--- a/qt/scientific_interfaces/ISISSANS/SANSPlotSpecial.ui
+++ b/qt/scientific_interfaces/ISISSANS/SANSPlotSpecial.ui
@@ -403,7 +403,7 @@
   <customwidget>
    <class>MantidQt::MantidWidgets::WorkspaceSelector</class>
    <extends>QComboBox</extends>
-   <header>MantidQtWidgets/Common/WorkspaceSelector.h</header>
+   <header>MantidQtWidgets/Common/Common/WorkspaceSelector.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/qt/scientific_interfaces/ISISSANS/SANSRunWindow.cpp b/qt/scientific_interfaces/ISISSANS/SANSRunWindow.cpp
index b66230ab5af..0d2ef91e918 100644
--- a/qt/scientific_interfaces/ISISSANS/SANSRunWindow.cpp
+++ b/qt/scientific_interfaces/ISISSANS/SANSRunWindow.cpp
@@ -20,8 +20,8 @@
 #include "MantidKernel/PropertyWithValue.h"
 #include "MantidKernel/V3D.h"
 
-#include "MantidQtWidgets/Common/ManageUserDirectories.h"
-#include "MantidQtWidgets/Common/MantidDesktopServices.h"
+#include "MantidQtWidgets/Common/Common/ManageUserDirectories.h"
+#include "MantidQtWidgets/Common/Common/MantidDesktopServices.h"
 #include "SANSAddFiles.h"
 #include "SANSBackgroundCorrectionSettings.h"
 #include "SANSEventSlicing.h"
diff --git a/qt/scientific_interfaces/ISISSANS/SANSRunWindow.h b/qt/scientific_interfaces/ISISSANS/SANSRunWindow.h
index 7b2e2921e33..b0ec65128f7 100644
--- a/qt/scientific_interfaces/ISISSANS/SANSRunWindow.h
+++ b/qt/scientific_interfaces/ISISSANS/SANSRunWindow.h
@@ -4,12 +4,12 @@
 //----------------------
 // Includes
 //----------------------
-#include "MantidQtWidgets/Common/UserSubWindow.h"
+#include "MantidQtWidgets/Common/Common/UserSubWindow.h"
 #include "SANSAddFiles.h"
 #include "SANSConstants.h"
 #include "SANSDiagnostics.h"
 #include "SANSPlotSpecial.h"
-#include "MantidQtWidgets/Common/SaveWorkspaces.h"
+#include "MantidQtWidgets/Common/Common/SaveWorkspaces.h"
 #include "ui_SANSRunWindow.h"
 
 #include "MantidAPI/AnalysisDataService.h"
diff --git a/qt/scientific_interfaces/ISISSANS/SANSRunWindow.ui b/qt/scientific_interfaces/ISISSANS/SANSRunWindow.ui
index 42847d3c15d..628f8f2babd 100644
--- a/qt/scientific_interfaces/ISISSANS/SANSRunWindow.ui
+++ b/qt/scientific_interfaces/ISISSANS/SANSRunWindow.ui
@@ -4684,12 +4684,12 @@ p, li { white-space: pre-wrap; }
   <customwidget>
    <class>MantidQt::API::MWRunFiles</class>
    <extends>QWidget</extends>
-   <header>MantidQtWidgets/Common/MWRunFiles.h</header>
+   <header>MantidQtWidgets/Common/Common/MWRunFiles.h</header>
   </customwidget>
   <customwidget>
    <class>MantidQt::MantidWidgets::MessageDisplay</class>
    <extends>QWidget</extends>
-   <header>MantidQtWidgets/Common/MessageDisplay.h</header>
+   <header>MantidQtWidgets/Common/Common/MessageDisplay.h</header>
   </customwidget>
   <customwidget>
    <class>MantidQt::CustomInterfaces::SANSBackgroundCorrectionWidget</class>
-- 
GitLab