diff --git a/qt/python/mantidqt.sip b/qt/python/mantidqt.sip
index 8550a099832cfb82b1a075690223d28f028c3d1b..11efdd444d9a870e4090e604b14d0d2d4fc13364 100644
--- a/qt/python/mantidqt.sip
+++ b/qt/python/mantidqt.sip
@@ -1492,6 +1492,8 @@ namespace MantidQt
 {
 namespace MantidWidgets
 {
+namespace DataProcessor
+{
 class DataProcessorWhiteList
 {
 %TypeHeaderCode
@@ -1536,23 +1538,23 @@ class QDataProcessorWidget : QWidget
 #include "MantidQtWidgets/Common/DataProcessorUI/QDataProcessorWidget.h"
 %End
 public:
-QDataProcessorWidget(const MantidQt::MantidWidgets::DataProcessorWhiteList &,
-                     const MantidQt::MantidWidgets::DataProcessorProcessingAlgorithm &,
+QDataProcessorWidget(const MantidQt::MantidWidgets::DataProcessor::DataProcessorWhiteList &,
+                     const MantidQt::MantidWidgets::DataProcessor::DataProcessorProcessingAlgorithm &,
                      QWidget *parent );
-QDataProcessorWidget(const MantidQt::MantidWidgets::DataProcessorWhiteList &,
-                     const MantidQt::MantidWidgets::DataProcessorPreprocessMap &,
-                     const MantidQt::MantidWidgets::DataProcessorProcessingAlgorithm &,
+QDataProcessorWidget(const MantidQt::MantidWidgets::DataProcessor::DataProcessorWhiteList &,
+                     const MantidQt::MantidWidgets::DataProcessor::DataProcessorPreprocessMap &,
+                     const MantidQt::MantidWidgets::DataProcessor::DataProcessorProcessingAlgorithm &,
                      QWidget *parent );
-QDataProcessorWidget(const MantidQt::MantidWidgets::DataProcessorWhiteList &,
-                     const MantidQt::MantidWidgets::DataProcessorProcessingAlgorithm &,
-                     const MantidQt::MantidWidgets::DataProcessorPostprocessingAlgorithm &,
+QDataProcessorWidget(const MantidQt::MantidWidgets::DataProcessor::DataProcessorWhiteList &,
+                     const MantidQt::MantidWidgets::DataProcessor::DataProcessorProcessingAlgorithm &,
+                     const MantidQt::MantidWidgets::DataProcessor::DataProcessorPostprocessingAlgorithm &,
                      QWidget *parent );
-QDataProcessorWidget(const MantidQt::MantidWidgets::DataProcessorWhiteList &,
-                     const MantidQt::MantidWidgets::DataProcessorPreprocessMap &,
-                     const MantidQt::MantidWidgets::DataProcessorProcessingAlgorithm &,
-                     const MantidQt::MantidWidgets::DataProcessorPostprocessingAlgorithm &,
+QDataProcessorWidget(const MantidQt::MantidWidgets::DataProcessor::DataProcessorWhiteList &,
+                     const MantidQt::MantidWidgets::DataProcessor::DataProcessorPreprocessMap &,
+                     const MantidQt::MantidWidgets::DataProcessor::DataProcessorProcessingAlgorithm &,
+                     const MantidQt::MantidWidgets::DataProcessor::DataProcessorPostprocessingAlgorithm &,
                      QWidget *parent );
-void accept(MantidQt::MantidWidgets::DataProcessorMainPresenter *);
+void accept(MantidQt::MantidWidgets::DataProcessor::DataProcessorMainPresenter *);
 void setInstrumentList(const QString &instruments, const QString &defaultInstrument);
 void transfer(const QList<QString> &);
 void setForcedReProcessing(bool);
@@ -1561,7 +1563,7 @@ signals:
 void runPythonCode(const QString &);
 
 private:
-QDataProcessorWidget(const MantidQt::MantidWidgets::QDataProcessorWidget &);
+QDataProcessorWidget(const MantidQt::MantidWidgets::DataProcessor::QDataProcessorWidget &);
 };
 
 class DataProcessorMainPresenter
@@ -1585,7 +1587,7 @@ class DataProcessorAppendRowCommand
 #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorAppendRowCommand.h"
 %End
 public:
-DataProcessorAppendRowCommand(const MantidQt::MantidWidgets::QDataProcessorWidget &);
+DataProcessorAppendRowCommand(const MantidQt::MantidWidgets::DataProcessor::QDataProcessorWidget &);
 void execute();
 QString name();
 QString icon();
@@ -1595,7 +1597,7 @@ QString shortcut();
 
 private:
 DataProcessorAppendRowCommand();
-DataProcessorAppendRowCommand(const MantidQt::MantidWidgets::DataProcessorAppendRowCommand &);
+DataProcessorAppendRowCommand(const MantidQt::MantidWidgets::DataProcessor::DataProcessorAppendRowCommand &);
 };
 
 class DataProcessorAppendGroupCommand
@@ -1604,7 +1606,7 @@ class DataProcessorAppendGroupCommand
 #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorAppendGroupCommand.h"
 %End
 public:
-DataProcessorAppendGroupCommand(const MantidQt::MantidWidgets::QDataProcessorWidget &);
+DataProcessorAppendGroupCommand(const MantidQt::MantidWidgets::DataProcessor::QDataProcessorWidget &);
 void execute();
 QString name();
 QString icon();
@@ -1614,7 +1616,7 @@ QString shortcut();
 
 private:
 DataProcessorAppendGroupCommand();
-DataProcessorAppendGroupCommand(const MantidQt::MantidWidgets::DataProcessorAppendGroupCommand &);
+DataProcessorAppendGroupCommand(const MantidQt::MantidWidgets::DataProcessor::DataProcessorAppendGroupCommand &);
 };
 
 class DataProcessorClearSelectedCommand
@@ -1623,7 +1625,7 @@ class DataProcessorClearSelectedCommand
 #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorClearSelectedCommand.h"
 %End
 public:
-DataProcessorClearSelectedCommand(const MantidQt::MantidWidgets::QDataProcessorWidget &);
+DataProcessorClearSelectedCommand(const MantidQt::MantidWidgets::DataProcessor::QDataProcessorWidget &);
 void execute();
 QString name();
 QString icon();
@@ -1633,7 +1635,7 @@ QString shortcut();
 
 private:
 DataProcessorClearSelectedCommand();
-DataProcessorClearSelectedCommand(const MantidQt::MantidWidgets::DataProcessorClearSelectedCommand &);
+DataProcessorClearSelectedCommand(const MantidQt::MantidWidgets::DataProcessor::DataProcessorClearSelectedCommand &);
 };
 
 class DataProcessorCopySelectedCommand
@@ -1642,7 +1644,7 @@ class DataProcessorCopySelectedCommand
 #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCopySelectedCommand.h"
 %End
 public:
-DataProcessorCopySelectedCommand(const MantidQt::MantidWidgets::QDataProcessorWidget &);
+DataProcessorCopySelectedCommand(const MantidQt::MantidWidgets::DataProcessor::QDataProcessorWidget &);
 void execute();
 QString name();
 QString icon();
@@ -1652,7 +1654,7 @@ QString shortcut();
 
 private:
 DataProcessorCopySelectedCommand();
-DataProcessorCopySelectedCommand(const MantidQt::MantidWidgets::DataProcessorCopySelectedCommand &);
+DataProcessorCopySelectedCommand(const MantidQt::MantidWidgets::DataProcessor::DataProcessorCopySelectedCommand &);
 };
 
 class DataProcessorCutSelectedCommand
@@ -1661,7 +1663,7 @@ class DataProcessorCutSelectedCommand
 #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCutSelectedCommand.h"
 %End
 public:
-DataProcessorCutSelectedCommand(const MantidQt::MantidWidgets::QDataProcessorWidget &);
+DataProcessorCutSelectedCommand(const MantidQt::MantidWidgets::DataProcessor::QDataProcessorWidget &);
 void execute();
 QString name();
 QString icon();
@@ -1671,7 +1673,7 @@ QString shortcut();
 
 private:
 DataProcessorCutSelectedCommand();
-DataProcessorCutSelectedCommand(const MantidQt::MantidWidgets::DataProcessorCutSelectedCommand &);
+DataProcessorCutSelectedCommand(const MantidQt::MantidWidgets::DataProcessor::DataProcessorCutSelectedCommand &);
 };
 
 class DataProcessorDeleteGroupCommand
@@ -1680,7 +1682,7 @@ class DataProcessorDeleteGroupCommand
 #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorDeleteGroupCommand.h"
 %End
 public:
-DataProcessorDeleteGroupCommand(const MantidQt::MantidWidgets::QDataProcessorWidget &);
+DataProcessorDeleteGroupCommand(const MantidQt::MantidWidgets::DataProcessor::QDataProcessorWidget &);
 void execute();
 QString name();
 QString icon();
@@ -1690,7 +1692,7 @@ QString shortcut();
 
 private:
 DataProcessorDeleteGroupCommand();
-DataProcessorDeleteGroupCommand(const MantidQt::MantidWidgets::DataProcessorDeleteGroupCommand &);
+DataProcessorDeleteGroupCommand(const MantidQt::MantidWidgets::DataProcessor::DataProcessorDeleteGroupCommand &);
 };
 
 class DataProcessorDeleteRowCommand
@@ -1699,7 +1701,7 @@ class DataProcessorDeleteRowCommand
 #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorDeleteRowCommand.h"
 %End
 public:
-DataProcessorDeleteRowCommand(const MantidQt::MantidWidgets::QDataProcessorWidget &);
+DataProcessorDeleteRowCommand(const MantidQt::MantidWidgets::DataProcessor::QDataProcessorWidget &);
 void execute();
 QString name();
 QString icon();
@@ -1709,7 +1711,7 @@ QString shortcut();
 
 private:
 DataProcessorDeleteRowCommand();
-DataProcessorDeleteRowCommand(const MantidQt::MantidWidgets::DataProcessorDeleteRowCommand &);
+DataProcessorDeleteRowCommand(const MantidQt::MantidWidgets::DataProcessor::DataProcessorDeleteRowCommand &);
 };
 
 class DataProcessorExpandCommand
@@ -1718,7 +1720,7 @@ class DataProcessorExpandCommand
 #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorExpandCommand.h"
 %End
 public:
-DataProcessorExpandCommand(const MantidQt::MantidWidgets::QDataProcessorWidget &);
+DataProcessorExpandCommand(const MantidQt::MantidWidgets::DataProcessor::QDataProcessorWidget &);
 void execute();
 QString name();
 QString icon();
@@ -1728,7 +1730,7 @@ QString shortcut();
 
 private:
 DataProcessorExpandCommand();
-DataProcessorExpandCommand(const MantidQt::MantidWidgets::DataProcessorExpandCommand &);
+DataProcessorExpandCommand(const MantidQt::MantidWidgets::DataProcessor::DataProcessorExpandCommand &);
 };
 
 class DataProcessorExportTableCommand
@@ -1737,7 +1739,7 @@ class DataProcessorExportTableCommand
 #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorExportTableCommand.h"
 %End
 public:
-DataProcessorExportTableCommand(const MantidQt::MantidWidgets::QDataProcessorWidget &);
+DataProcessorExportTableCommand(const MantidQt::MantidWidgets::DataProcessor::QDataProcessorWidget &);
 void execute();
 QString name();
 QString icon();
@@ -1747,7 +1749,7 @@ QString shortcut();
 
 private:
 DataProcessorExportTableCommand();
-DataProcessorExportTableCommand(const MantidQt::MantidWidgets::DataProcessorExportTableCommand &);
+DataProcessorExportTableCommand(const MantidQt::MantidWidgets::DataProcessor::DataProcessorExportTableCommand &);
 };
 
 class DataProcessorGroupRowsCommand
@@ -1756,7 +1758,7 @@ class DataProcessorGroupRowsCommand
 #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorGroupRowsCommand.h"
 %End
 public:
-DataProcessorGroupRowsCommand(const MantidQt::MantidWidgets::QDataProcessorWidget &);
+DataProcessorGroupRowsCommand(const MantidQt::MantidWidgets::DataProcessor::QDataProcessorWidget &);
 void execute();
 QString name();
 QString icon();
@@ -1766,7 +1768,7 @@ QString shortcut();
 
 private:
 DataProcessorGroupRowsCommand();
-DataProcessorGroupRowsCommand(const MantidQt::MantidWidgets::DataProcessorGroupRowsCommand &);
+DataProcessorGroupRowsCommand(const MantidQt::MantidWidgets::DataProcessor::DataProcessorGroupRowsCommand &);
 };
 
 class DataProcessorImportTableCommand
@@ -1775,7 +1777,7 @@ class DataProcessorImportTableCommand
 #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorImportTableCommand.h"
 %End
 public:
-DataProcessorImportTableCommand(const MantidQt::MantidWidgets::QDataProcessorWidget &);
+DataProcessorImportTableCommand(const MantidQt::MantidWidgets::DataProcessor::QDataProcessorWidget &);
 void execute();
 QString name();
 QString icon();
@@ -1785,7 +1787,7 @@ QString shortcut();
 
 private:
 DataProcessorImportTableCommand();
-DataProcessorImportTableCommand(const MantidQt::MantidWidgets::DataProcessorImportTableCommand &);
+DataProcessorImportTableCommand(const MantidQt::MantidWidgets::DataProcessor::DataProcessorImportTableCommand &);
 };
 
 class DataProcessorNewTableCommand
@@ -1794,7 +1796,7 @@ class DataProcessorNewTableCommand
 #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorNewTableCommand.h"
 %End
 public:
-DataProcessorNewTableCommand(const MantidQt::MantidWidgets::QDataProcessorWidget &);
+DataProcessorNewTableCommand(const MantidQt::MantidWidgets::DataProcessor::QDataProcessorWidget &);
 void execute();
 QString name();
 QString icon();
@@ -1804,7 +1806,7 @@ QString shortcut();
 
 private:
 DataProcessorNewTableCommand();
-DataProcessorNewTableCommand(const MantidQt::MantidWidgets::DataProcessorNewTableCommand &);
+DataProcessorNewTableCommand(const MantidQt::MantidWidgets::DataProcessor::DataProcessorNewTableCommand &);
 };
 
 class DataProcessorOpenTableCommand
@@ -1813,7 +1815,7 @@ class DataProcessorOpenTableCommand
 #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorOpenTableCommand.h"
 %End
 public:
-DataProcessorOpenTableCommand(const MantidQt::MantidWidgets::QDataProcessorWidget &);
+DataProcessorOpenTableCommand(const MantidQt::MantidWidgets::DataProcessor::QDataProcessorWidget &);
 void execute();
 QString name();
 QString icon();
@@ -1823,7 +1825,7 @@ QString shortcut();
 
 private:
 DataProcessorOpenTableCommand();
-DataProcessorOpenTableCommand(const MantidQt::MantidWidgets::DataProcessorOpenTableCommand &);
+DataProcessorOpenTableCommand(const MantidQt::MantidWidgets::DataProcessor::DataProcessorOpenTableCommand &);
 };
 
 class DataProcessorOptionsCommand
@@ -1832,7 +1834,7 @@ class DataProcessorOptionsCommand
 #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorOptionsCommand.h"
 %End
 public:
-DataProcessorOptionsCommand(const MantidQt::MantidWidgets::QDataProcessorWidget &);
+DataProcessorOptionsCommand(const MantidQt::MantidWidgets::DataProcessor::QDataProcessorWidget &);
 void execute();
 QString name();
 QString icon();
@@ -1842,7 +1844,7 @@ QString shortcut();
 
 private:
 DataProcessorOptionsCommand();
-DataProcessorOptionsCommand(const MantidQt::MantidWidgets::DataProcessorOptionsCommand &);
+DataProcessorOptionsCommand(const MantidQt::MantidWidgets::DataProcessor::DataProcessorOptionsCommand &);
 };
 
 class DataProcessorPasteSelectedCommand
@@ -1851,7 +1853,7 @@ class DataProcessorPasteSelectedCommand
 #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPasteSelectedCommand.h"
 %End
 public:
-DataProcessorPasteSelectedCommand(const MantidQt::MantidWidgets::QDataProcessorWidget &);
+DataProcessorPasteSelectedCommand(const MantidQt::MantidWidgets::DataProcessor::QDataProcessorWidget &);
 void execute();
 QString name();
 QString icon();
@@ -1861,7 +1863,7 @@ QString shortcut();
 
 private:
 DataProcessorPasteSelectedCommand();
-DataProcessorPasteSelectedCommand(const MantidQt::MantidWidgets::DataProcessorPasteSelectedCommand &);
+DataProcessorPasteSelectedCommand(const MantidQt::MantidWidgets::DataProcessor::DataProcessorPasteSelectedCommand &);
 };
 
 class DataProcessorPlotGroupCommand
@@ -1870,7 +1872,7 @@ class DataProcessorPlotGroupCommand
 #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPlotGroupCommand.h"
 %End
 public:
-DataProcessorPlotGroupCommand(const MantidQt::MantidWidgets::QDataProcessorWidget &);
+DataProcessorPlotGroupCommand(const MantidQt::MantidWidgets::DataProcessor::QDataProcessorWidget &);
 void execute();
 QString name();
 QString icon();
@@ -1880,7 +1882,7 @@ QString shortcut();
 
 private:
 DataProcessorPlotGroupCommand();
-DataProcessorPlotGroupCommand(const MantidQt::MantidWidgets::DataProcessorPlotGroupCommand &);
+DataProcessorPlotGroupCommand(const MantidQt::MantidWidgets::DataProcessor::DataProcessorPlotGroupCommand &);
 };
 
 class DataProcessorPlotRowCommand
@@ -1889,7 +1891,7 @@ class DataProcessorPlotRowCommand
 #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPlotRowCommand.h"
 %End
 public:
-DataProcessorPlotRowCommand(const MantidQt::MantidWidgets::QDataProcessorWidget &);
+DataProcessorPlotRowCommand(const MantidQt::MantidWidgets::DataProcessor::QDataProcessorWidget &);
 void execute();
 QString name();
 QString icon();
@@ -1899,7 +1901,7 @@ QString shortcut();
 
 private:
 DataProcessorPlotRowCommand();
-DataProcessorPlotRowCommand(const MantidQt::MantidWidgets::DataProcessorPlotRowCommand &);
+DataProcessorPlotRowCommand(const MantidQt::MantidWidgets::DataProcessor::DataProcessorPlotRowCommand &);
 };
 
 class DataProcessorProcessCommand
@@ -1908,7 +1910,7 @@ class DataProcessorProcessCommand
 #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorProcessCommand.h"
 %End
 public:
-DataProcessorProcessCommand(const MantidQt::MantidWidgets::QDataProcessorWidget &);
+DataProcessorProcessCommand(const MantidQt::MantidWidgets::DataProcessor::QDataProcessorWidget &);
 void execute();
 QString name();
 QString icon();
@@ -1918,7 +1920,7 @@ QString shortcut();
 
 private:
 DataProcessorProcessCommand();
-DataProcessorProcessCommand(const MantidQt::MantidWidgets::DataProcessorProcessCommand &);
+DataProcessorProcessCommand(const MantidQt::MantidWidgets::DataProcessor::DataProcessorProcessCommand &);
 };
 
 class DataProcessorSaveTableCommand
@@ -1927,7 +1929,7 @@ class DataProcessorSaveTableCommand
 #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorSaveTableCommand.h"
 %End
 public:
-DataProcessorSaveTableCommand(const MantidQt::MantidWidgets::QDataProcessorWidget &);
+DataProcessorSaveTableCommand(const MantidQt::MantidWidgets::DataProcessor::QDataProcessorWidget &);
 void execute();
 QString name();
 QString icon();
@@ -1937,7 +1939,7 @@ QString shortcut();
 
 private:
 DataProcessorSaveTableCommand();
-DataProcessorSaveTableCommand(const MantidQt::MantidWidgets::DataProcessorSaveTableCommand &);
+DataProcessorSaveTableCommand(const MantidQt::MantidWidgets::DataProcessor::DataProcessorSaveTableCommand &);
 };
 
 class DataProcessorSaveTableAsCommand
@@ -1946,7 +1948,7 @@ class DataProcessorSaveTableAsCommand
 #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorSaveTableAsCommand.h"
 %End
 public:
-DataProcessorSaveTableAsCommand(const MantidQt::MantidWidgets::QDataProcessorWidget &);
+DataProcessorSaveTableAsCommand(const MantidQt::MantidWidgets::DataProcessor::QDataProcessorWidget &);
 void execute();
 QString name();
 QString icon();
@@ -1956,7 +1958,7 @@ QString shortcut();
 
 private:
 DataProcessorSaveTableAsCommand();
-DataProcessorSaveTableAsCommand(const MantidQt::MantidWidgets::DataProcessorSaveTableAsCommand &);
+DataProcessorSaveTableAsCommand(const MantidQt::MantidWidgets::DataProcessor::DataProcessorSaveTableAsCommand &);
 };
 
 class DataProcessorSeparatorCommand
@@ -1965,7 +1967,7 @@ class DataProcessorSeparatorCommand
 #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorSeparatorCommand.h"
 %End
 public:
-DataProcessorSeparatorCommand(const MantidQt::MantidWidgets::QDataProcessorWidget &);
+DataProcessorSeparatorCommand(const MantidQt::MantidWidgets::DataProcessor::QDataProcessorWidget &);
 void execute();
 QString name();
 QString icon();
@@ -1975,7 +1977,7 @@ QString shortcut();
 
 private:
 DataProcessorSeparatorCommand();
-DataProcessorSeparatorCommand(const MantidQt::MantidWidgets::DataProcessorSeparatorCommand &);
+DataProcessorSeparatorCommand(const MantidQt::MantidWidgets::DataProcessor::DataProcessorSeparatorCommand &);
 };
 
 class DataProcessorWorkspaceCommand
@@ -1984,7 +1986,7 @@ class DataProcessorWorkspaceCommand
 #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorWorkspaceCommand.h"
 %End
 public:
-DataProcessorWorkspaceCommand(const MantidQt::MantidWidgets::QDataProcessorWidget &, const QString &);
+DataProcessorWorkspaceCommand(const MantidQt::MantidWidgets::DataProcessor::QDataProcessorWidget &, const QString &);
 void execute();
 QString name();
 QString icon();
@@ -1994,9 +1996,10 @@ QString shortcut();
 
 private:
 DataProcessorWorkspaceCommand();
-DataProcessorWorkspaceCommand(const MantidQt::MantidWidgets::DataProcessorWorkspaceCommand &);
+DataProcessorWorkspaceCommand(const MantidQt::MantidWidgets::DataProcessor::DataProcessorWorkspaceCommand &);
 };
 
+}; // end namespace DataProcessor
 }; // end namespace MantidWidgets
 }; // end namespace MantidQt
 
diff --git a/qt/scientific_interfaces/ISISReflectometry/IReflRunsTabView.h b/qt/scientific_interfaces/ISISReflectometry/IReflRunsTabView.h
index 8b9cd8844df231d3a2ca2990e4d4958928dd5f32..a00e39320ac7ce47e3963021ca6304dd3f1d9fb7 100644
--- a/qt/scientific_interfaces/ISISReflectometry/IReflRunsTabView.h
+++ b/qt/scientific_interfaces/ISISReflectometry/IReflRunsTabView.h
@@ -8,16 +8,17 @@
 namespace MantidQt {
 
 namespace MantidWidgets {
+namespace DataProcessor {
 class DataProcessorCommand;
 }
+}
 namespace API {
 class AlgorithmRunner;
 }
 
 namespace CustomInterfaces {
 
-using MantidWidgets::DataProcessorCommand;
-using API::AlgorithmRunner;
+namespace DataProcessor = MantidWidgets::DataProcessor;
 class IReflRunsTabPresenter;
 class ReflSearchModel;
 
@@ -61,9 +62,9 @@ public:
                                  const std::string &defaultInstrument) = 0;
   virtual void setTransferMethods(const std::set<std::string> &methods) = 0;
   virtual void setTableCommands(
-      std::vector<std::unique_ptr<DataProcessorCommand>> tableCommands) = 0;
+      std::vector<std::unique_ptr<DataProcessor::DataProcessorCommand>> tableCommands) = 0;
   virtual void setRowCommands(
-      std::vector<std::unique_ptr<DataProcessorCommand>> rowCommands) = 0;
+      std::vector<std::unique_ptr<DataProcessor::DataProcessorCommand>> rowCommands) = 0;
   virtual void setAllSearchRowsSelected() = 0;
   virtual void clearCommands() = 0;
   virtual void setRowActionEnabled(int index, bool enabled) = 0;
diff --git a/qt/scientific_interfaces/ISISReflectometry/QtReflRunsTabView.cpp b/qt/scientific_interfaces/ISISReflectometry/QtReflRunsTabView.cpp
index 949ca5b232a179a3a56020639efc396226d107a5..372cfb16f1cb5eb7cd7d0e85b8af60faceeb1050 100644
--- a/qt/scientific_interfaces/ISISReflectometry/QtReflRunsTabView.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/QtReflRunsTabView.cpp
@@ -51,20 +51,20 @@ void QtReflRunsTabView::initLayout() {
   ReflGenericDataProcessorPresenterFactory presenterFactory;
 
   QDataProcessorWidget *qDataProcessorWidget_1 = new QDataProcessorWidget(
-      std::unique_ptr<DataProcessorPresenter>(presenterFactory.create()), this);
+      std::unique_ptr<DataProcessor::DataProcessorPresenter>(presenterFactory.create()), this);
   ui.toolbox->addItem(qDataProcessorWidget_1, "Group 1");
   connect(qDataProcessorWidget_1,
           SIGNAL(runAsPythonScript(const QString &, bool)), this,
           SIGNAL(runAsPythonScript(const QString &, bool)));
 
   QDataProcessorWidget *qDataProcessorWidget_2 = new QDataProcessorWidget(
-      std::unique_ptr<DataProcessorPresenter>(presenterFactory.create()), this);
+      std::unique_ptr<DataProcessor::DataProcessorPresenter>(presenterFactory.create()), this);
   ui.toolbox->addItem(qDataProcessorWidget_2, "Group 2");
   connect(qDataProcessorWidget_2,
           SIGNAL(runAsPythonScript(const QString &, bool)), this,
           SIGNAL(runAsPythonScript(const QString &, bool)));
 
-  std::vector<DataProcessorPresenter *> processingWidgets;
+  std::vector<DataProcessor::DataProcessorPresenter *> processingWidgets;
   processingWidgets.push_back(qDataProcessorWidget_1->getPresenter());
   processingWidgets.push_back(qDataProcessorWidget_2->getPresenter());
 
@@ -114,7 +114,7 @@ void QtReflRunsTabView::initLayout() {
 * @param command : [input] The command (action) to add
 */
 void QtReflRunsTabView::addToMenu(QMenu *menu,
-                                  DataProcessorCommand_uptr command) {
+                                  DataProcessor::DataProcessorCommand_uptr command) {
 
   m_commands.push_back(Mantid::Kernel::make_unique<DataProcessorCommandAdapter>(
       menu, std::move(command)));
@@ -126,7 +126,7 @@ void QtReflRunsTabView::addToMenu(QMenu *menu,
 * "Reflectometry" menu
 */
 void QtReflRunsTabView::setTableCommands(
-    std::vector<DataProcessorCommand_uptr> tableCommands) {
+    std::vector<DataProcessor::DataProcessorCommand_uptr> tableCommands) {
 
   ui.menuTable->clear();
   for (auto &command : tableCommands) {
@@ -145,7 +145,7 @@ void QtReflRunsTabView::setTableCommands(
 * @param rowCommands : [input] The list of commands to add to the "Edit" menu
 */
 void QtReflRunsTabView::setRowCommands(
-    std::vector<DataProcessorCommand_uptr> rowCommands) {
+    std::vector<DataProcessor::DataProcessorCommand_uptr> rowCommands) {
 
   ui.menuRows->clear();
   for (auto &command : rowCommands) {
diff --git a/qt/scientific_interfaces/ISISReflectometry/QtReflRunsTabView.h b/qt/scientific_interfaces/ISISReflectometry/QtReflRunsTabView.h
index 422d49159c63fa031ca983d9e3f76be4ca1483be..5bea1d0f25f5b96e2dfe9bb96d44fc629967f738 100644
--- a/qt/scientific_interfaces/ISISReflectometry/QtReflRunsTabView.h
+++ b/qt/scientific_interfaces/ISISReflectometry/QtReflRunsTabView.h
@@ -12,9 +12,11 @@
 namespace MantidQt {
 
 namespace MantidWidgets {
+namespace DataProcessor {
 // Forward decs
 class DataProcessorCommand;
 class DataProcessorCommandAdapter;
+}
 class SlitCalculator;
 }
 namespace API {
@@ -27,9 +29,8 @@ namespace CustomInterfaces {
 class IReflRunsTabPresenter;
 class ReflSearchModel;
 
-using MantidWidgets::DataProcessorCommand;
-using MantidWidgets::DataProcessorCommandAdapter;
 using MantidWidgets::SlitCalculator;
+namespace DataProcessor = MantidWidgets::DataProcessor;
 
 /** QtReflRunsTabView : Provides an interface for the "Runs" tab in the
 ISIS Reflectometry interface.
@@ -72,10 +73,10 @@ public:
   void setInstrumentList(const std::vector<std::string> &instruments,
                          const std::string &defaultInstrument) override;
   void setTransferMethods(const std::set<std::string> &methods) override;
-  void setTableCommands(std::vector<std::unique_ptr<DataProcessorCommand>>
+  void setTableCommands(std::vector<std::unique_ptr<DataProcessor::DataProcessorCommand>>
                             tableCommands) override;
   void setRowCommands(
-      std::vector<std::unique_ptr<DataProcessorCommand>> rowCommands) override;
+      std::vector<std::unique_ptr<DataProcessor::DataProcessorCommand>> rowCommands) override;
   void setAllSearchRowsSelected() override;
   void clearCommands() override;
   void setRowActionEnabled(int index, bool enabled) override;
@@ -101,7 +102,7 @@ private:
   /// initialise the interface
   void initLayout();
   // Adds an action (command) to a menu
-  void addToMenu(QMenu *menu, std::unique_ptr<DataProcessorCommand> command);
+  void addToMenu(QMenu *menu, std::unique_ptr<DataProcessor::DataProcessorCommand> command);
 
   boost::shared_ptr<MantidQt::API::AlgorithmRunner> m_algoRunner;
 
@@ -114,7 +115,7 @@ private:
   // the slit calculator
   SlitCalculator *m_calculator;
   // Command adapters
-  std::vector<std::unique_ptr<DataProcessorCommandAdapter>> m_commands;
+  std::vector<std::unique_ptr<DataProcessor::DataProcessorCommandAdapter>> m_commands;
 
 private slots:
   void on_actionSearch_triggered();
diff --git a/qt/scientific_interfaces/ISISReflectometry/ReflDataProcessorPresenter.cpp b/qt/scientific_interfaces/ISISReflectometry/ReflDataProcessorPresenter.cpp
index 492d69742205e02acbf8d2ab7a47e0c7b289a107..3102d96929784ab4eb67a034eb6146b9865baec4 100644
--- a/qt/scientific_interfaces/ISISReflectometry/ReflDataProcessorPresenter.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/ReflDataProcessorPresenter.cpp
@@ -5,7 +5,7 @@
 #include "MantidAPI/Run.h"
 #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorTreeManager.h"
 #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorView.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/ParseKeyValueString.h"
+#include "MantidQtWidgets/Common/ParseKeyValueString.h"
 #include "MantidQtWidgets/Common/ParseNumerics.h"
 #include "MantidQtWidgets/Common/ProgressPresenter.h"
 #include "ReflFromStdStringMap.h"
diff --git a/qt/scientific_interfaces/ISISReflectometry/ReflRunsTabPresenter.cpp b/qt/scientific_interfaces/ISISReflectometry/ReflRunsTabPresenter.cpp
index 5ce120555c1eed8fdc9e2c03323a88672fbcaa48..4ae3875b7f1ffb852f4e8353d2ad2bff4d9c2b00 100644
--- a/qt/scientific_interfaces/ISISReflectometry/ReflRunsTabPresenter.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/ReflRunsTabPresenter.cpp
@@ -165,12 +165,12 @@ void ReflRunsTabPresenter::pushCommands() {
   const size_t rowCommStart = 10u;
   // We want to have two menus
   // Populate the "Reflectometry" menu
-  std::vector<DataProcessorCommand_uptr> tableCommands;
+  std::vector<MantidWidgets::DataProcessor::DataProcessorCommand_uptr> tableCommands;
   for (size_t i = 0; i < rowCommStart; i++)
     tableCommands.push_back(std::move(commands[i]));
   m_view->setTableCommands(std::move(tableCommands));
   // Populate the "Edit" menu
-  std::vector<DataProcessorCommand_uptr> rowCommands;
+  std::vector<MantidWidgets::DataProcessor::DataProcessorCommand_uptr> rowCommands;
   for (size_t i = rowCommStart; i < nCommands; i++)
     rowCommands.push_back(std::move(commands[i]));
   m_view->setRowCommands(std::move(rowCommands));
diff --git a/qt/scientific_interfaces/ISISReflectometry/ReflRunsTabPresenter.h b/qt/scientific_interfaces/ISISReflectometry/ReflRunsTabPresenter.h
index ce2c688b6e57b9f1dc21756b443ce162a110d1d1..e5a38950253b87408c9b9dc30abde43a44689ceb 100644
--- a/qt/scientific_interfaces/ISISReflectometry/ReflRunsTabPresenter.h
+++ b/qt/scientific_interfaces/ISISReflectometry/ReflRunsTabPresenter.h
@@ -12,8 +12,10 @@ namespace MantidQt {
 namespace MantidWidgets {
 // Forward decs
 class ProgressableView;
+namespace DataProcessor {
 class DataProcessorPresenter;
 }
+}
 
 namespace CustomInterfaces {
 
@@ -24,8 +26,8 @@ class IReflSearcher;
 class ReflSearchModel;
 class ReflTransferStrategy;
 
-using MantidWidgets::DataProcessorPresenter;
 using MantidWidgets::ProgressableView;
+using MantidWidgets::DataProcessor::DataProcessorPresenter;
 
 /** @class ReflRunsTabPresenter
 
@@ -55,7 +57,7 @@ Code Documentation is available at: <http://doxygen.mantidproject.org>
 */
 class MANTIDQT_ISISREFLECTOMETRY_DLL ReflRunsTabPresenter
     : public IReflRunsTabPresenter,
-      public MantidQt::MantidWidgets::DataProcessorMainPresenter {
+      public MantidWidgets::DataProcessor::DataProcessorMainPresenter {
 public:
   ReflRunsTabPresenter(IReflRunsTabView *mainView,
                        ProgressableView *progressView,
diff --git a/qt/scientific_interfaces/test/ReflMockObjects.h b/qt/scientific_interfaces/test/ReflMockObjects.h
index 0fa2c543610c33db78060c3c4ef39ae4edb0e890..fb314302d178a944ab205c1e75682256240b7a6e 100644
--- a/qt/scientific_interfaces/test/ReflMockObjects.h
+++ b/qt/scientific_interfaces/test/ReflMockObjects.h
@@ -37,13 +37,13 @@ public:
   // I will mock a proxy method, setTableCommandsProxy, I just want to test that
   // this method is invoked by the presenter's constructor
   virtual void setTableCommands(
-      std::vector<MantidQt::MantidWidgets::DataProcessorCommand_uptr>)
+      std::vector<MantidQt::MantidWidgets::DataProcessor::DataProcessorCommand_uptr>)
       override {
     setTableCommandsProxy();
   }
   // The same happens for setRowCommands
   virtual void setRowCommands(
-      std::vector<MantidQt::MantidWidgets::DataProcessorCommand_uptr>)
+      std::vector<MantidQt::MantidWidgets::DataProcessor::DataProcessorCommand_uptr>)
       override {
     setRowCommandsProxy();
   }
diff --git a/qt/widgets/common/CMakeLists.txt b/qt/widgets/common/CMakeLists.txt
index c8e5f90e676012f4d8658e03346df942ecadb7ec..52f7d34dfac8325ffaddb2bbf3156372b314b744 100644
--- a/qt/widgets/common/CMakeLists.txt
+++ b/qt/widgets/common/CMakeLists.txt
@@ -74,7 +74,7 @@
 	src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp
 	src/DataProcessorUI/DataProcessorWhiteList.cpp
 	src/DataProcessorUI/GenericDataProcessorPresenter.cpp
-	src/DataProcessorUI/ParseKeyValueString.cpp
+	src/ParseKeyValueString.cpp
 	src/ParseNumerics.cpp
 	src/DataProcessorUI/QDataProcessorOneLevelTreeModel.cpp
 	src/DataProcessorUI/QDataProcessorTwoLevelTreeModel.cpp
@@ -343,7 +343,7 @@ set ( INC_FILES
 	inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorWhiteList.h
 	inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorWorkspaceCommand.h
 	inc/MantidQtWidgets/Common/DataProcessorUI/GenericDataProcessorPresenterFactory.h
-	inc/MantidQtWidgets/Common/DataProcessorUI/ParseKeyValueString.h
+	inc/MantidQtWidgets/Common/ParseKeyValueString.h
 	inc/MantidQtWidgets/Common/ParseNumerics.h
 	inc/MantidQtWidgets/Common/ErrorCurve.h
 	inc/MantidQtWidgets/Common/HintStrategy.h
@@ -451,7 +451,7 @@ set( TEST_FILES
    DataProcessorUI/DataProcessorTwoLevelTreeManagerTest.h
    DataProcessorUI/DataProcessorWhiteListTest.h
    DataProcessorUI/GenericDataProcessorPresenterTest.h
-   DataProcessorUI/ParseKeyValueStringTest.h
+   ParseKeyValueStringTest.h
    DataProcessorUI/QDataProcessorOneLevelTreeModelTest.h
    DataProcessorUI/QDataProcessorTwoLevelTreeModelTest.h
    ProjectSaveModelTest.h
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorMockObjects.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorMockObjects.h
index 386993e0854f99d1bdcd997dd39758fd105d7a4a..751b6a5ec01b2460a386cd4e51c134e5b869b299 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorMockObjects.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorMockObjects.h
@@ -78,7 +78,7 @@ public:
 
   // Calls we don't care about
   void showTable(boost::shared_ptr<
-      MantidQt::MantidWidgets::AbstractTreeModel>) override{};
+      MantidQt::MantidWidgets::DataProcessor::AbstractTreeModel>) override{};
   void saveSettings(const std::map<QString, QVariant> &) override{};
 
   DataProcessorPresenter *getPresenter() const override { return nullptr; }
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ParseKeyValueString.h b/qt/widgets/common/inc/MantidQtWidgets/Common/ParseKeyValueString.h
similarity index 100%
rename from qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ParseKeyValueString.h
rename to qt/widgets/common/inc/MantidQtWidgets/Common/ParseKeyValueString.h
diff --git a/qt/widgets/common/src/DataProcessorUI/DataProcessorGenerateNotebook.cpp b/qt/widgets/common/src/DataProcessorUI/DataProcessorGenerateNotebook.cpp
index bcfef66fa5f3adc7a850e81290a34e7482cb43c9..81d689d17eed73162ed195912615521bf8f01d56 100644
--- a/qt/widgets/common/src/DataProcessorUI/DataProcessorGenerateNotebook.cpp
+++ b/qt/widgets/common/src/DataProcessorUI/DataProcessorGenerateNotebook.cpp
@@ -3,7 +3,7 @@
 #include "MantidAPI/NotebookWriter.h"
 #include "MantidKernel/make_unique.h"
 #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorVectorString.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/ParseKeyValueString.h"
+#include "MantidQtWidgets/Common/ParseKeyValueString.h"
 
 #include <boost/algorithm/string.hpp>
 #include <boost/foreach.hpp>
diff --git a/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp b/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp
index f5145a0b0bad628f785fed3d0e976aa7b294c2f8..a2c40a090c79ec6eb28b8419d436e04c1945932b 100644
--- a/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp
+++ b/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp
@@ -37,7 +37,6 @@
 using namespace Mantid::API;
 using namespace Mantid::Kernel;
 using namespace MantidQt::MantidWidgets;
-using namespace MantidQt::MantidWidgets::DataProcessor;
 
 namespace MantidQt {
 namespace MantidWidgets {
diff --git a/qt/widgets/common/src/DataProcessorUI/GenericDataProcessorPresenter.cpp b/qt/widgets/common/src/DataProcessorUI/GenericDataProcessorPresenter.cpp
index 652cc4cb3ce9114c26c247d03aeff30165ba6cd7..8085eb3fa1396a122cf3de8b79087296e0e12e3e 100644
--- a/qt/widgets/common/src/DataProcessorUI/GenericDataProcessorPresenter.cpp
+++ b/qt/widgets/common/src/DataProcessorUI/GenericDataProcessorPresenter.cpp
@@ -18,7 +18,7 @@
 #include "MantidQtWidgets/Common/DataProcessorUI/GenericDataProcessorPresenterRowReducerWorker.h"
 #include "MantidQtWidgets/Common/DataProcessorUI/GenericDataProcessorPresenterGroupReducerWorker.h"
 #include "MantidQtWidgets/Common/DataProcessorUI/GenericDataProcessorPresenterThread.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/ParseKeyValueString.h"
+#include "MantidQtWidgets/Common/ParseKeyValueString.h"
 #include "MantidQtWidgets/Common/DataProcessorUI/QtDataProcessorOptionsDialog.h"
 #include "MantidQtWidgets/Common/ProgressableView.h"
 
diff --git a/qt/widgets/common/src/DataProcessorUI/ParseKeyValueString.cpp b/qt/widgets/common/src/ParseKeyValueString.cpp
similarity index 94%
rename from qt/widgets/common/src/DataProcessorUI/ParseKeyValueString.cpp
rename to qt/widgets/common/src/ParseKeyValueString.cpp
index 16fef87a76db30df3cd58e1d9c1cce7612ee854e..832806478e8a489bc4d31efe50d51a61877d509e 100644
--- a/qt/widgets/common/src/DataProcessorUI/ParseKeyValueString.cpp
+++ b/qt/widgets/common/src/ParseKeyValueString.cpp
@@ -1,11 +1,10 @@
-#include "MantidQtWidgets/Common/DataProcessorUI/ParseKeyValueString.h"
+#include "MantidQtWidgets/Common/ParseKeyValueString.h"
 #include <boost/algorithm/string.hpp>
 #include <boost/tokenizer.hpp>
 #include <vector>
 
 namespace MantidQt {
 namespace MantidWidgets {
-namespace DataProcessor {
 /**
     Parses a string in the format `a = 1,b=2, c = "1,2,3,4", d = 5.0, e='a,b,c'`
    into a map of key/value pairs
@@ -56,4 +55,3 @@ std::map<std::string, std::string> parseKeyValueString(const std::string &str) {
 }
 }
 }
-}
diff --git a/qt/widgets/common/src/ParseNumerics.cpp b/qt/widgets/common/src/ParseNumerics.cpp
index 2b3a158ac80346cd2d6f5197b3c0caee365e90eb..ee7f888662f6d0c8195e238621d474640c6d7a14 100644
--- a/qt/widgets/common/src/ParseNumerics.cpp
+++ b/qt/widgets/common/src/ParseNumerics.cpp
@@ -2,7 +2,6 @@
 #include <stdexcept>
 namespace MantidQt {
 namespace MantidWidgets {
-namespace DataProcessor {
 double parseDouble(QString const &in) {
   static auto ok = false;
   auto out = in.toDouble(&ok);
@@ -25,4 +24,3 @@ int parseDenaryInteger(QString const &in) {
 }
 }
 }
-}
diff --git a/qt/widgets/common/test/DataProcessorUI/DataProcessorProcessingAlgorithmBaseTest.h b/qt/widgets/common/test/DataProcessorUI/DataProcessorProcessingAlgorithmBaseTest.h
index 17f8c65420a2d00228a0a419c37ba60b033bcf79..8dce1a048d849cb1ec99fe2491d9cf665c0ebeb5 100644
--- a/qt/widgets/common/test/DataProcessorUI/DataProcessorProcessingAlgorithmBaseTest.h
+++ b/qt/widgets/common/test/DataProcessorUI/DataProcessorProcessingAlgorithmBaseTest.h
@@ -9,8 +9,6 @@
 using namespace Mantid::API;
 using namespace MantidQt::MantidWidgets::DataProcessor;
 
-using MantidQt::MantidWidgets::DataProcessorProcessingAlgorithmBase;
-
 class DataProcessorProcessingAlgorithmBaseTest : public CxxTest::TestSuite {
 public:
   // This pair of boilerplate methods prevent the suite being created statically
diff --git a/qt/widgets/common/test/DataProcessorUI/ParseKeyValueStringTest.h b/qt/widgets/common/test/ParseKeyValueStringTest.h
similarity index 90%
rename from qt/widgets/common/test/DataProcessorUI/ParseKeyValueStringTest.h
rename to qt/widgets/common/test/ParseKeyValueStringTest.h
index cc71cb8d107328b3a25e55afcb66d31eb39361e6..f3fb517682785f000d3589d6a447819ff7e4f0c5 100644
--- a/qt/widgets/common/test/DataProcessorUI/ParseKeyValueStringTest.h
+++ b/qt/widgets/common/test/ParseKeyValueStringTest.h
@@ -1,10 +1,10 @@
 #ifndef MANTID_MANTIDWIDGETS_PARSEKEYVALUESTRINGTEST_H
 #define MANTID_MANTIDWIDGETS_PARSEKEYVALUESTRINGTEST_H
 
-#include "MantidQtWidgets/Common/DataProcessorUI/ParseKeyValueString.h"
+#include "MantidQtWidgets/Common/ParseKeyValueString.h"
 #include <cxxtest/TestSuite.h>
 
-using namespace MantidQt::MantidWidgets::DataProcessor;
+using MantidQt::MantidWidgets::parseKeyValueString;
 
 class ParseKeyValueStringTest : public CxxTest::TestSuite {