diff --git a/MantidQt/CustomDialogs/CMakeLists.txt b/MantidQt/CustomDialogs/CMakeLists.txt
deleted file mode 100644
index a4d4a8f6d7b658eac683a5186ed9ffe025d0e8de..0000000000000000000000000000000000000000
--- a/MantidQt/CustomDialogs/CMakeLists.txt
+++ /dev/null
@@ -1,95 +0,0 @@
-set ( SRC_FILES src/CatalogPublishDialog.cpp
- src/CreateSampleShapeDialog.cpp
- src/ConvertTableToMatrixWorkspaceDialog.cpp
- src/StartLiveDataDialog.cpp
- src/FitDialog.cpp
- src/LoadDialog.cpp
- src/LoadAsciiDialog.cpp
- src/LoadDAEDialog.cpp
- src/LoadRawDialog.cpp
- src/LOQScriptInputDialog.cpp
- src/MantidGLWidget.cpp
- src/GetNegMuMuonicXRDDialog.cpp
- src/PlotAsymmetryByLogValueDialog.cpp
- src/SampleShapeHelpers.cpp
- src/SmoothNeighboursDialog.cpp
- src/SortTableWorkspaceDialog.cpp
-)
-
-set ( SRC_UNITY_IGNORE_FILES )
-
-
-set ( MOC_FILES inc/MantidQtCustomDialogs/CatalogPublishDialog.h
- inc/MantidQtCustomDialogs/CreateSampleShapeDialog.h
- inc/MantidQtCustomDialogs/ConvertTableToMatrixWorkspaceDialog.h
- inc/MantidQtCustomDialogs/StartLiveDataDialog.h
- inc/MantidQtCustomDialogs/FitDialog.h
- inc/MantidQtCustomDialogs/LoadDialog.h
- inc/MantidQtCustomDialogs/LoadAsciiDialog.h
- inc/MantidQtCustomDialogs/LoadDAEDialog.h
- inc/MantidQtCustomDialogs/LoadRawDialog.h
- inc/MantidQtCustomDialogs/LOQScriptInputDialog.h
- inc/MantidQtCustomDialogs/MantidGLWidget.h
- inc/MantidQtCustomDialogs/GetNegMuMuonicXRDDialog.h
- inc/MantidQtCustomDialogs/PlotAsymmetryByLogValueDialog.h
- inc/MantidQtCustomDialogs/SampleShapeHelpers.h
- inc/MantidQtCustomDialogs/SmoothNeighboursDialog.h
- inc/MantidQtCustomDialogs/SortTableWorkspaceDialog.h
-)
-
-# Include files aren't required, but this makes them appear in Visual Studio
-set ( INC_FILES
- ${MOC_FILES}
-)
-
-set ( UI_FILES inc/MantidQtCustomDialogs/CatalogPublishDialog.ui
- inc/MantidQtCustomDialogs/CreateSampleShapeDialog.ui
- inc/MantidQtCustomDialogs/ConvertTableToMatrixWorkspaceDialog.ui
- inc/MantidQtCustomDialogs/DiagScriptInputDialog.ui
- inc/MantidQtCustomDialogs/LOQScriptInputDialog.ui
- inc/MantidQtCustomDialogs/PlotAsymmetryByLogValueDialog.ui
- inc/MantidQtCustomDialogs/LoadDialog.ui
- inc/MantidQtCustomDialogs/StartLiveDataDialog.ui
- inc/MantidQtCustomDialogs/FitDialog.ui
- inc/MantidQtCustomDialogs/SortTableWorkspaceDialog.ui
-)
-
-include_directories ( inc )
-
-qt4_wrap_cpp ( MOCCED_FILES ${MOC_FILES} )
-
-set ( ALL_SRC ${SRC_FILES} ${MOCCED_FILES} )
-
-qt4_wrap_ui ( UI_HDRS ${UI_FILES} )
-include_directories ( ${CMAKE_CURRENT_BINARY_DIR} )
-
-if(UNITY_BUILD)
- include(UnityBuild)
- enable_unity_build(CustomDialogs SRC_FILES SRC_UNITY_IGNORE_FILES 10)
-endif(UNITY_BUILD)
-
-# Use a precompiled header where they are supported
-enable_precompiled_headers( inc/MantidQtCustomDialogs/PrecompiledHeader.h ALL_SRC )
-add_library ( CustomDialogs ${ALL_SRC} ${INC_FILES} ${UI_HDRS} )
-# Set the name of the generated library
-set_target_properties ( CustomDialogs PROPERTIES OUTPUT_NAME MantidQtCustomDialogs )
-
-if (OSX_VERSION VERSION_GREATER 10.8)
- set_target_properties ( CustomDialogs PROPERTIES INSTALL_RPATH "@loader_path/../../../Contents/MacOS")
-endif ()
-
-target_link_libraries ( CustomDialogs LINK_PRIVATE ${TCMALLOC_LIBRARIES_LINKTIME}
- MantidQtAPI
- MantidWidgets
- ${CORE_MANTIDLIBS}
- ${QT_LIBRARIES}
- ${POCO_LIBRARIES}
- ${Boost_LIBRARIES}
- ${OPENGL_LIBRARIES}
- )
-
-###########################################################################
-# Installation settings
-###########################################################################
-
-install ( TARGETS CustomDialogs ${SYSTEM_PACKAGE_TARGET} DESTINATION ${PLUGINS_DIR}/qtplugins/mantid )
diff --git a/qt/CMakeLists.txt b/qt/CMakeLists.txt
index 34ed588e9cdb442f88c24539640c0bd993b90ae4..05850ff08c36ca1e1f96957b55d4e1b3a02dfd09 100644
--- a/qt/CMakeLists.txt
+++ b/qt/CMakeLists.txt
@@ -24,7 +24,7 @@ if ( MSVC_IDE )
set_property ( TARGET qtwidgetsrefdetectorview PROPERTY FOLDER "MantidQt" )
set_property ( TARGET qtwidgetsfactory PROPERTY FOLDER "MantidQt" )
set_property ( TARGET qtwidgetspluginsdesigner PROPERTY FOLDER "MantidQt" )
-# set_property ( TARGET CustomDialogs PROPERTY FOLDER "MantidQt" )
+ set_property ( TARGET qtwidgetspluginsalgorithm_dialogs PROPERTY FOLDER "MantidQt" )
# set_property ( TARGET CustomInterfaces PROPERTY FOLDER "MantidQt" )
# set_property ( TARGET mantidqtpython PROPERTY FOLDER "MantidQt" )
else ()
@@ -33,7 +33,8 @@ else ()
qtwidgetsspectrumviewer
qtwidgetsrefdetectorview
qtwidgetsfactory
-# CustomDialogs CustomInterfaces
+ qtwidgetspluginsalgorithm_dialogs
+# CustomInterfaces
# mantidqtpython
)
endif ()
diff --git a/qt/widgets/plugins/CMakeLists.txt b/qt/widgets/plugins/CMakeLists.txt
index 31f052f7ddee3a0d23f42359eed930f76451c492..96934e9dd896330fcab67ca72773be93dbe691ff 100644
--- a/qt/widgets/plugins/CMakeLists.txt
+++ b/qt/widgets/plugins/CMakeLists.txt
@@ -1,6 +1,6 @@
###########################################################################
# Now add the packages one-by-one, building up the dependencies as we go
###########################################################################
-#add_subdirectory ( CustomDialogs )
+add_subdirectory ( algorithm_dialogs )
add_subdirectory ( designer )
diff --git a/qt/widgets/plugins/algorithm_dialogs/CMakeLists.txt b/qt/widgets/plugins/algorithm_dialogs/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..14690d46655187edadad7e9e6d4f19e3ac01c97b
--- /dev/null
+++ b/qt/widgets/plugins/algorithm_dialogs/CMakeLists.txt
@@ -0,0 +1,92 @@
+set ( SRC_FILES src/CatalogPublishDialog.cpp
+ src/CreateSampleShapeDialog.cpp
+ src/ConvertTableToMatrixWorkspaceDialog.cpp
+ src/StartLiveDataDialog.cpp
+ src/FitDialog.cpp
+ src/LoadDialog.cpp
+ src/LoadAsciiDialog.cpp
+ src/LoadDAEDialog.cpp
+ src/LoadRawDialog.cpp
+ src/LOQScriptInputDialog.cpp
+ src/MantidGLWidget.cpp
+ src/GetNegMuMuonicXRDDialog.cpp
+ src/PlotAsymmetryByLogValueDialog.cpp
+ src/SampleShapeHelpers.cpp
+ src/SmoothNeighboursDialog.cpp
+ src/SortTableWorkspaceDialog.cpp
+)
+
+set ( SRC_UNITY_IGNORE_FILES )
+
+
+set ( MOC_FILES inc/MantidQtWidgets/Plugins/AlgorithmDialogs/CatalogPublishDialog.h
+ inc/MantidQtWidgets/Plugins/AlgorithmDialogs/CreateSampleShapeDialog.h
+ inc/MantidQtWidgets/Plugins/AlgorithmDialogs/ConvertTableToMatrixWorkspaceDialog.h
+ inc/MantidQtWidgets/Plugins/AlgorithmDialogs/StartLiveDataDialog.h
+ inc/MantidQtWidgets/Plugins/AlgorithmDialogs/FitDialog.h
+ inc/MantidQtWidgets/Plugins/AlgorithmDialogs/LoadDialog.h
+ inc/MantidQtWidgets/Plugins/AlgorithmDialogs/LoadAsciiDialog.h
+ inc/MantidQtWidgets/Plugins/AlgorithmDialogs/LoadDAEDialog.h
+ inc/MantidQtWidgets/Plugins/AlgorithmDialogs/LoadRawDialog.h
+ inc/MantidQtWidgets/Plugins/AlgorithmDialogs/LOQScriptInputDialog.h
+ inc/MantidQtWidgets/Plugins/AlgorithmDialogs/MantidGLWidget.h
+ inc/MantidQtWidgets/Plugins/AlgorithmDialogs/GetNegMuMuonicXRDDialog.h
+ inc/MantidQtWidgets/Plugins/AlgorithmDialogs/PlotAsymmetryByLogValueDialog.h
+ inc/MantidQtWidgets/Plugins/AlgorithmDialogs/SampleShapeHelpers.h
+ inc/MantidQtWidgets/Plugins/AlgorithmDialogs/SmoothNeighboursDialog.h
+ inc/MantidQtWidgets/Plugins/AlgorithmDialogs/SortTableWorkspaceDialog.h
+)
+
+# Include files aren't required, but this makes them appear in Visual Studio
+set ( INC_FILES
+ ${MOC_FILES}
+)
+
+set ( UI_FILES inc/MantidQtWidgets/Plugins/AlgorithmDialogs/CatalogPublishDialog.ui
+ inc/MantidQtWidgets/Plugins/AlgorithmDialogs/CreateSampleShapeDialog.ui
+ inc/MantidQtWidgets/Plugins/AlgorithmDialogs/ConvertTableToMatrixWorkspaceDialog.ui
+ inc/MantidQtWidgets/Plugins/AlgorithmDialogs/DiagScriptInputDialog.ui
+ inc/MantidQtWidgets/Plugins/AlgorithmDialogs/LOQScriptInputDialog.ui
+ inc/MantidQtWidgets/Plugins/AlgorithmDialogs/PlotAsymmetryByLogValueDialog.ui
+ inc/MantidQtWidgets/Plugins/AlgorithmDialogs/LoadDialog.ui
+ inc/MantidQtWidgets/Plugins/AlgorithmDialogs/StartLiveDataDialog.ui
+ inc/MantidQtWidgets/Plugins/AlgorithmDialogs/FitDialog.ui
+ inc/MantidQtWidgets/Plugins/AlgorithmDialogs/SortTableWorkspaceDialog.ui
+)
+
+include_directories ( inc )
+
+qt4_wrap_cpp ( MOCCED_FILES ${MOC_FILES} )
+
+set ( ALL_SRC ${SRC_FILES} ${MOCCED_FILES} )
+
+qt4_wrap_ui ( UI_HDRS ${UI_FILES} )
+include_directories ( ${CMAKE_CURRENT_BINARY_DIR} )
+
+if(UNITY_BUILD)
+ include(UnityBuild)
+ enable_unity_build(qtwidgetspluginsalgorithm_dialogs SRC_FILES SRC_UNITY_IGNORE_FILES 10)
+endif(UNITY_BUILD)
+
+# Use a precompiled header where they are supported
+enable_precompiled_headers( inc/MantidQtWidgets/Plugins/AlgorithmDialogs/PrecompiledHeader.h ALL_SRC )
+add_library ( qtwidgetspluginsalgorithm_dialogs ${ALL_SRC} ${INC_FILES} ${UI_HDRS} )
+
+if (OSX_VERSION VERSION_GREATER 10.8)
+ set_target_properties ( qtwidgetspluginsalgorithm_dialogs PROPERTIES INSTALL_RPATH "@loader_path/../../../Contents/MacOS")
+endif ()
+
+target_link_libraries ( qtwidgetspluginsalgorithm_dialogs LINK_PRIVATE ${TCMALLOC_LIBRARIES_LINKTIME}
+ qtwidgetscommon
+ ${CORE_MANTIDLIBS}
+ ${QT_LIBRARIES}
+ ${POCO_LIBRARIES}
+ ${Boost_LIBRARIES}
+ ${OPENGL_LIBRARIES}
+ )
+
+###########################################################################
+# Installation settings
+###########################################################################
+
+install ( TARGETS qtwidgetspluginsalgorithm_dialogs ${SYSTEM_PACKAGE_TARGET} DESTINATION ${PLUGINS_DIR}/qtplugins/mantid )
diff --git a/MantidQt/CustomDialogs/customDialogTemplate.py b/qt/widgets/plugins/algorithm_dialogs/customDialogTemplate.py
old mode 100755
new mode 100644
similarity index 100%
rename from MantidQt/CustomDialogs/customDialogTemplate.py
rename to qt/widgets/plugins/algorithm_dialogs/customDialogTemplate.py
diff --git a/MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/CatalogPublishDialog.h b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/CatalogPublishDialog.h
similarity index 97%
rename from MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/CatalogPublishDialog.h
rename to qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/CatalogPublishDialog.h
index e74233985c6e1a85b7696e45af1eb7b98cebcdf5..a15a313ba26ada0687e99b8f6956ce60d31839de 100644
--- a/MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/CatalogPublishDialog.h
+++ b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/CatalogPublishDialog.h
@@ -1,7 +1,7 @@
#ifndef MANTIDQT_CUSTOM_DIALOGS_CATALOGPUBLISHDIALOG_H
#define MANTIDQT_CUSTOM_DIALOGS_CATALOGPUBLISHDIALOG_H
-#include "MantidQtAPI/AlgorithmDialog.h"
+#include "MantidQtWidgets/Common/AlgorithmDialog.h"
#include "ui_CatalogPublishDialog.h"
namespace MantidQt {
diff --git a/MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/CatalogPublishDialog.ui b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/CatalogPublishDialog.ui
similarity index 99%
rename from MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/CatalogPublishDialog.ui
rename to qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/CatalogPublishDialog.ui
index ae1921184f11cb1f217f97a7e9fd6153162a0ecb..c15c2b776e60cee32e9b33a19b0188f262f3bccc 100644
--- a/MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/CatalogPublishDialog.ui
+++ b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/CatalogPublishDialog.ui
@@ -309,7 +309,7 @@
<customwidget>
<class>MantidQt::MantidWidgets::DataSelector</class>
<extends>QWidget</extends>
- <header>MantidQtMantidWidgets/DataSelector.h</header>
+ <header>MantidQtWidgets/Common/DataSelector.h</header>
</customwidget>
</customwidgets>
<resources/>
diff --git a/MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/ConvertTableToMatrixWorkspaceDialog.h b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/ConvertTableToMatrixWorkspaceDialog.h
similarity index 97%
rename from MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/ConvertTableToMatrixWorkspaceDialog.h
rename to qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/ConvertTableToMatrixWorkspaceDialog.h
index d1f7c31e7f39c84b6786339d19de6ebf0c85fa67..21c17842f6813fe71510e6e5b6ade486ccef410a 100644
--- a/MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/ConvertTableToMatrixWorkspaceDialog.h
+++ b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/ConvertTableToMatrixWorkspaceDialog.h
@@ -4,7 +4,7 @@
//------------------------------------------------------------------------------
// Includes
//------------------------------------------------------------------------------
-#include "MantidQtAPI/AlgorithmDialog.h"
+#include "MantidQtWidgets/Common/AlgorithmDialog.h"
#include "ui_ConvertTableToMatrixWorkspaceDialog.h"
//------------------------------------------------------------------------------
diff --git a/MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/ConvertTableToMatrixWorkspaceDialog.ui b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/ConvertTableToMatrixWorkspaceDialog.ui
similarity index 100%
rename from MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/ConvertTableToMatrixWorkspaceDialog.ui
rename to qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/ConvertTableToMatrixWorkspaceDialog.ui
diff --git a/MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/CreateSampleShapeDialog.h b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/CreateSampleShapeDialog.h
similarity index 99%
rename from MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/CreateSampleShapeDialog.h
rename to qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/CreateSampleShapeDialog.h
index 053b2938eb71978fa0010a71caa6b91b567623aa..763d1d521f90e8f896b91e95669a3cc417b1f8e8 100644
--- a/MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/CreateSampleShapeDialog.h
+++ b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/CreateSampleShapeDialog.h
@@ -5,7 +5,7 @@
// Includes
//--------------------------
#include "ui_CreateSampleShapeDialog.h"
-#include "MantidQtAPI/AlgorithmDialog.h"
+#include "MantidQtWidgets/Common/AlgorithmDialog.h"
#include <QTreeWidget>
#include <QItemDelegate>
diff --git a/MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/CreateSampleShapeDialog.ui b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/CreateSampleShapeDialog.ui
similarity index 100%
rename from MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/CreateSampleShapeDialog.ui
rename to qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/CreateSampleShapeDialog.ui
diff --git a/MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/DiagScriptInputDialog.ui b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/DiagScriptInputDialog.ui
similarity index 100%
rename from MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/DiagScriptInputDialog.ui
rename to qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/DiagScriptInputDialog.ui
diff --git a/MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/FitDialog.h b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/FitDialog.h
similarity index 99%
rename from MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/FitDialog.h
rename to qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/FitDialog.h
index 5734b42f133237445ab154c42178750e9b5323fe..3cd784a41ea7a5c7faf262efe1cd91f96c9ee10a 100644
--- a/MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/FitDialog.h
+++ b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/FitDialog.h
@@ -4,7 +4,7 @@
//------------------------------------------------------------------------------
// Includes
//------------------------------------------------------------------------------
-#include "MantidQtAPI/AlgorithmDialog.h"
+#include "MantidQtWidgets/Common/AlgorithmDialog.h"
#include "ui_FitDialog.h"
//------------------------------------------------------------------------------
diff --git a/MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/FitDialog.ui b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/FitDialog.ui
similarity index 99%
rename from MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/FitDialog.ui
rename to qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/FitDialog.ui
index df992c38327a45264c67077dd1a88fb6171e45c0..00e9b4571cc233ad724338bd06a300d3b7fc2754 100644
--- a/MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/FitDialog.ui
+++ b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/FitDialog.ui
@@ -288,7 +288,7 @@
<customwidget>
<class>MantidQt::MantidWidgets::FunctionBrowser</class>
<extends>QWidget</extends>
- <header>MantidQtMantidWidgets/FunctionBrowser.h</header>
+ <header>MantidQtWidgets/Common/FunctionBrowser.h</header>
<container>1</container>
</customwidget>
</customwidgets>
diff --git a/MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/GetNegMuMuonicXRDDialog.h b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/GetNegMuMuonicXRDDialog.h
similarity index 95%
rename from MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/GetNegMuMuonicXRDDialog.h
rename to qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/GetNegMuMuonicXRDDialog.h
index a6eb65a281a7bfdc6d978241921a1da27000ba7d..9508cae31dedcde2bdd0ab12963eb05e81625721 100644
--- a/MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/GetNegMuMuonicXRDDialog.h
+++ b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/GetNegMuMuonicXRDDialog.h
@@ -1,8 +1,8 @@
#ifndef MANTIDQT_CUSTOM_DIALOGS_GETNEGMUMUONICXRD_H_
#define MANTIDQT_CUSTOM_DIALOGS_GETNEGMUMUONICXRD_H_
-#include "MantidQtAPI/AlgorithmDialog.h"
-#include "MantidQtMantidWidgets/PeriodicTableWidget.h"
+#include "MantidQtWidgets/Common/AlgorithmDialog.h"
+#include "MantidQtWidgets/Common/PeriodicTableWidget.h"
#include <QDoubleSpinBox>
namespace MantidQt {
diff --git a/MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/LOQScriptInputDialog.h b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/LOQScriptInputDialog.h
similarity index 97%
rename from MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/LOQScriptInputDialog.h
rename to qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/LOQScriptInputDialog.h
index c915d061f6d0cf1a353546db4c814128e69d40bd..a1f36b7a00aaa5ec5c418dc95d0e1d1144a52ab0 100644
--- a/MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/LOQScriptInputDialog.h
+++ b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/LOQScriptInputDialog.h
@@ -5,7 +5,7 @@
// Includes
//--------------------------
#include "ui_LOQScriptInputDialog.h"
-#include "MantidQtAPI/AlgorithmDialog.h"
+#include "MantidQtWidgets/Common/AlgorithmDialog.h"
namespace MantidQt {
namespace CustomDialogs {
diff --git a/MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/LOQScriptInputDialog.ui b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/LOQScriptInputDialog.ui
similarity index 100%
rename from MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/LOQScriptInputDialog.ui
rename to qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/LOQScriptInputDialog.ui
diff --git a/MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/LoadAsciiDialog.h b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/LoadAsciiDialog.h
similarity index 97%
rename from MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/LoadAsciiDialog.h
rename to qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/LoadAsciiDialog.h
index b8ecf1809f8ac18a7445e48a00952bf2edd1b989..18c7ce9b8e753bf3438e8583d4424eb74b79ccfe 100644
--- a/MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/LoadAsciiDialog.h
+++ b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/LoadAsciiDialog.h
@@ -4,7 +4,7 @@
//----------------------
// Includes
//----------------------
-#include "MantidQtAPI/AlgorithmDialog.h"
+#include "MantidQtWidgets/Common/AlgorithmDialog.h"
//---------------------------
// Qt Forward declarations
diff --git a/MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/LoadDAEDialog.h b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/LoadDAEDialog.h
similarity index 97%
rename from MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/LoadDAEDialog.h
rename to qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/LoadDAEDialog.h
index 599353af0e200d9bfc574732ad221290b25b0ce0..bf7eab4a3661a93fc761509a8a591ecc1644df0d 100644
--- a/MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/LoadDAEDialog.h
+++ b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/LoadDAEDialog.h
@@ -4,7 +4,7 @@
//----------------------
// Includes
//----------------------
-#include "MantidQtAPI/AlgorithmDialog.h"
+#include "MantidQtWidgets/Common/AlgorithmDialog.h"
//---------------------------
// Qt Forward declarations
diff --git a/MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/LoadDialog.h b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/LoadDialog.h
similarity index 98%
rename from MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/LoadDialog.h
rename to qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/LoadDialog.h
index 19afc1b1469ab97cced34f6366fe05f53eca8e37..864623dd9042dda9bce71443fd48cf5ced2f526e 100644
--- a/MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/LoadDialog.h
+++ b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/LoadDialog.h
@@ -4,7 +4,7 @@
//------------------------------------------------------------------------------
// Includes
//------------------------------------------------------------------------------
-#include "MantidQtAPI/AlgorithmDialog.h"
+#include "MantidQtWidgets/Common/AlgorithmDialog.h"
#include "ui_LoadDialog.h"
//------------------------------------------------------------------------------
diff --git a/MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/LoadDialog.ui b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/LoadDialog.ui
similarity index 99%
rename from MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/LoadDialog.ui
rename to qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/LoadDialog.ui
index 685333e22a57f7b6b9f86c1196aeb3eeb864c27f..ceb654647cfdd43644a95b40a820cb678b7a2a6c 100644
--- a/MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/LoadDialog.ui
+++ b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/LoadDialog.ui
@@ -230,7 +230,7 @@
<customwidget>
<class>MantidQt::API::MWRunFiles</class>
<extends>QWidget</extends>
- <header>MantidQtAPI/MWRunFiles.h</header>
+ <header>MantidQtWidgets/Common/MWRunFiles.h</header>
</customwidget>
</customwidgets>
<resources/>
diff --git a/MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/LoadRawDialog.h b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/LoadRawDialog.h
similarity index 97%
rename from MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/LoadRawDialog.h
rename to qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/LoadRawDialog.h
index 76fcf0884afaaa34bf705affaabb6bbffb458c42..db8791e33da7f3bcb2db80bb682d5cadb62d460e 100644
--- a/MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/LoadRawDialog.h
+++ b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/LoadRawDialog.h
@@ -4,7 +4,7 @@
//----------------------
// Includes
//----------------------
-#include "MantidQtAPI/AlgorithmDialog.h"
+#include "MantidQtWidgets/Common/AlgorithmDialog.h"
#include <QString>
diff --git a/MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/MantidGLWidget.h b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/MantidGLWidget.h
similarity index 100%
rename from MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/MantidGLWidget.h
rename to qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/MantidGLWidget.h
diff --git a/MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/PlotAsymmetryByLogValueDialog.h b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/PlotAsymmetryByLogValueDialog.h
similarity index 98%
rename from MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/PlotAsymmetryByLogValueDialog.h
rename to qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/PlotAsymmetryByLogValueDialog.h
index 3a87542d37b57a16e2f4058225ad3d1ffabfca56..c0f0f188791dec3a347a2930c5c3dc0c021002a5 100644
--- a/MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/PlotAsymmetryByLogValueDialog.h
+++ b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/PlotAsymmetryByLogValueDialog.h
@@ -4,7 +4,7 @@
//----------------------
// Includes
//----------------------
-#include "MantidQtAPI/AlgorithmDialog.h"
+#include "MantidQtWidgets/Common/AlgorithmDialog.h"
#include "ui_PlotAsymmetryByLogValueDialog.h"
#include <QString>
diff --git a/MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/PlotAsymmetryByLogValueDialog.ui b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/PlotAsymmetryByLogValueDialog.ui
similarity index 100%
rename from MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/PlotAsymmetryByLogValueDialog.ui
rename to qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/PlotAsymmetryByLogValueDialog.ui
diff --git a/MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/PrecompiledHeader.h b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/PrecompiledHeader.h
similarity index 100%
rename from MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/PrecompiledHeader.h
rename to qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/PrecompiledHeader.h
diff --git a/MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/SampleShapeHelpers.h b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/SampleShapeHelpers.h
similarity index 100%
rename from MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/SampleShapeHelpers.h
rename to qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/SampleShapeHelpers.h
diff --git a/MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/SmoothNeighboursDialog.h b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/SmoothNeighboursDialog.h
similarity index 88%
rename from MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/SmoothNeighboursDialog.h
rename to qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/SmoothNeighboursDialog.h
index 0aa50bcd63abf9a4bc9db463f3da84354322428f..daa8d9494e4324732f75e4ce071e0f9f28597328 100644
--- a/MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/SmoothNeighboursDialog.h
+++ b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/SmoothNeighboursDialog.h
@@ -1,8 +1,8 @@
#ifndef SMOOTH_NEIGHBOURS_DIALOG_H_
#define SMOOTH_NEIGHBOURS_DIALOG_H_
-#include "MantidQtAPI/AlgorithmDialog.h"
-#include "MantidQtAPI/AlgorithmPropertiesWidget.h"
+#include "MantidQtWidgets/Common/AlgorithmDialog.h"
+#include "MantidQtWidgets/Common/AlgorithmPropertiesWidget.h"
class SmoothNeighboursDialog : public MantidQt::API::AlgorithmDialog {
Q_OBJECT
diff --git a/MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/SortTableWorkspaceDialog.h b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/SortTableWorkspaceDialog.h
similarity index 97%
rename from MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/SortTableWorkspaceDialog.h
rename to qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/SortTableWorkspaceDialog.h
index 24cd9a9a15ee0c3cdcd959bb50f1aa578a6dd905..89d485ef2bb6313006ddcc87707f5e134bfe86ad 100644
--- a/MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/SortTableWorkspaceDialog.h
+++ b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/SortTableWorkspaceDialog.h
@@ -4,7 +4,7 @@
//------------------------------------------------------------------------------
// Includes
//------------------------------------------------------------------------------
-#include "MantidQtAPI/AlgorithmDialog.h"
+#include "MantidQtWidgets/Common/AlgorithmDialog.h"
#include "ui_SortTableWorkspaceDialog.h"
#include <QMap>
diff --git a/MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/SortTableWorkspaceDialog.ui b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/SortTableWorkspaceDialog.ui
similarity index 98%
rename from MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/SortTableWorkspaceDialog.ui
rename to qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/SortTableWorkspaceDialog.ui
index ef3bba99dd8f28264d2c18b9f9e4322134145166..bf745698608f9c4154d9a49cd7eb2efb0b62b536 100644
--- a/MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/SortTableWorkspaceDialog.ui
+++ b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/SortTableWorkspaceDialog.ui
@@ -175,7 +175,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/MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/StartLiveDataDialog.h b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/StartLiveDataDialog.h
similarity index 92%
rename from MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/StartLiveDataDialog.h
rename to qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/StartLiveDataDialog.h
index 7a1572dc07940a7ec82f46282e3bc17cf89811ec..f7d9511a9d5f810d78a2f9e14a8f22f9c1a1806e 100644
--- a/MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/StartLiveDataDialog.h
+++ b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/StartLiveDataDialog.h
@@ -7,9 +7,9 @@
#include "ui_StartLiveDataDialog.h"
#include "MantidAPI/IAlgorithm.h"
#include "MantidAPI/Algorithm.h"
-#include "MantidQtAPI/AlgorithmDialog.h"
-#include "MantidQtAPI/AlgorithmInputHistory.h"
-#include "MantidQtAPI/WidgetScrollbarDecorator.h"
+#include "MantidQtWidgets/Common/AlgorithmDialog.h"
+#include "MantidQtWidgets/Common/AlgorithmInputHistory.h"
+#include "MantidQtWidgets/Common/WidgetScrollbarDecorator.h"
namespace MantidQt {
namespace CustomDialogs {
diff --git a/MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/StartLiveDataDialog.ui b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/StartLiveDataDialog.ui
similarity index 99%
rename from MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/StartLiveDataDialog.ui
rename to qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/StartLiveDataDialog.ui
index 3e8796f7c606b5af30a946fc1090a267d5696183..434bcde5eb2e3a1b558bfe8390c5527b27a2dee1 100644
--- a/MantidQt/CustomDialogs/inc/MantidQtCustomDialogs/StartLiveDataDialog.ui
+++ b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/StartLiveDataDialog.ui
@@ -478,7 +478,7 @@ In the python script 'input' is a reference to the input workspace and 'output'
<customwidget>
<class>MantidQt::MantidWidgets::ProcessingAlgoWidget</class>
<extends>QWidget</extends>
- <header>MantidQtMantidWidgets/ProcessingAlgoWidget.h</header>
+ <header>MantidQtWidgets/Common/ProcessingAlgoWidget.h</header>
</customwidget>
</customwidgets>
<resources/>
diff --git a/MantidQt/CustomDialogs/src/CatalogPublishDialog.cpp b/qt/widgets/plugins/algorithm_dialogs/src/CatalogPublishDialog.cpp
similarity index 97%
rename from MantidQt/CustomDialogs/src/CatalogPublishDialog.cpp
rename to qt/widgets/plugins/algorithm_dialogs/src/CatalogPublishDialog.cpp
index 74ad703a088cb26727a4e7ae4fb8060d946fa379..65d7b5af635c94ee33da985841bca4a5615c0046 100644
--- a/MantidQt/CustomDialogs/src/CatalogPublishDialog.cpp
+++ b/qt/widgets/plugins/algorithm_dialogs/src/CatalogPublishDialog.cpp
@@ -1,4 +1,4 @@
-#include "MantidQtCustomDialogs/CatalogPublishDialog.h"
+#include "MantidQtWidgets/Plugins/AlgorithmDialogs/CatalogPublishDialog.h"
#include "MantidAPI/CatalogFactory.h"
#include "MantidAPI/CatalogManager.h"
@@ -8,8 +8,8 @@
#include "MantidAPI/WorkspaceFactory.h"
#include "MantidKernel/ConfigService.h"
#include "MantidKernel/FacilityInfo.h"
-#include "MantidQtAPI/AlgorithmInputHistory.h"
-#include "MantidQtMantidWidgets/DataSelector.h"
+#include "MantidQtWidgets/Common/AlgorithmInputHistory.h"
+#include "MantidQtWidgets/Common/DataSelector.h"
namespace MantidQt {
namespace CustomDialogs {
diff --git a/MantidQt/CustomDialogs/src/ConvertTableToMatrixWorkspaceDialog.cpp b/qt/widgets/plugins/algorithm_dialogs/src/ConvertTableToMatrixWorkspaceDialog.cpp
similarity index 96%
rename from MantidQt/CustomDialogs/src/ConvertTableToMatrixWorkspaceDialog.cpp
rename to qt/widgets/plugins/algorithm_dialogs/src/ConvertTableToMatrixWorkspaceDialog.cpp
index 3287aba559e39b0531d769261294dc3db4980caa..9cf4198edefe787113f187892d6dc7ef98738317 100644
--- a/MantidQt/CustomDialogs/src/ConvertTableToMatrixWorkspaceDialog.cpp
+++ b/qt/widgets/plugins/algorithm_dialogs/src/ConvertTableToMatrixWorkspaceDialog.cpp
@@ -1,5 +1,5 @@
-#include "MantidQtCustomDialogs/ConvertTableToMatrixWorkspaceDialog.h"
-#include "MantidQtAPI/AlgorithmInputHistory.h"
+#include "MantidQtWidgets/Plugins/AlgorithmDialogs/ConvertTableToMatrixWorkspaceDialog.h"
+#include "MantidQtWidgets/Common/AlgorithmInputHistory.h"
// Qt
#include <QCheckBox>
#include <QComboBox>
diff --git a/MantidQt/CustomDialogs/src/CreateSampleShapeDialog.cpp b/qt/widgets/plugins/algorithm_dialogs/src/CreateSampleShapeDialog.cpp
similarity index 98%
rename from MantidQt/CustomDialogs/src/CreateSampleShapeDialog.cpp
rename to qt/widgets/plugins/algorithm_dialogs/src/CreateSampleShapeDialog.cpp
index 1e96c67fcf1673af795b5ec7137be3355718c758..2e3d53c4a58cf99e1e1b2cfd3c7c4198753d845a 100644
--- a/MantidQt/CustomDialogs/src/CreateSampleShapeDialog.cpp
+++ b/qt/widgets/plugins/algorithm_dialogs/src/CreateSampleShapeDialog.cpp
@@ -1,10 +1,10 @@
//---------------------------
// Includes
//--------------------------
-#include "MantidQtCustomDialogs/CreateSampleShapeDialog.h"
-#include "MantidQtAPI/AlgorithmInputHistory.h"
-#include "MantidQtCustomDialogs/SampleShapeHelpers.h"
-#include "MantidQtCustomDialogs/MantidGLWidget.h"
+#include "MantidQtWidgets/Plugins/AlgorithmDialogs/CreateSampleShapeDialog.h"
+#include "MantidQtWidgets/Common/AlgorithmInputHistory.h"
+#include "MantidQtWidgets/Plugins/AlgorithmDialogs/SampleShapeHelpers.h"
+#include "MantidQtWidgets/Plugins/AlgorithmDialogs/MantidGLWidget.h"
#include "MantidGeometry/Objects/ShapeFactory.h"
#include "MantidGeometry/Objects/Object.h"
diff --git a/MantidQt/CustomDialogs/src/FitDialog.cpp b/qt/widgets/plugins/algorithm_dialogs/src/FitDialog.cpp
similarity index 99%
rename from MantidQt/CustomDialogs/src/FitDialog.cpp
rename to qt/widgets/plugins/algorithm_dialogs/src/FitDialog.cpp
index 044fcc1e98b64ab332bae8145e532e67fae48076..a3894a60835aa0104269e7b4cc38459bc9a0f52c 100644
--- a/MantidQt/CustomDialogs/src/FitDialog.cpp
+++ b/qt/widgets/plugins/algorithm_dialogs/src/FitDialog.cpp
@@ -1,8 +1,8 @@
//------------------------------------------------------------------------------
// Includes
//------------------------------------------------------------------------------
-#include "MantidQtCustomDialogs/FitDialog.h"
-#include "MantidQtAPI/AlgorithmInputHistory.h"
+#include "MantidQtWidgets/Plugins/AlgorithmDialogs/FitDialog.h"
+#include "MantidQtWidgets/Common/AlgorithmInputHistory.h"
// Qt
#include <QCheckBox>
#include <QComboBox>
diff --git a/MantidQt/CustomDialogs/src/GetNegMuMuonicXRDDialog.cpp b/qt/widgets/plugins/algorithm_dialogs/src/GetNegMuMuonicXRDDialog.cpp
similarity index 95%
rename from MantidQt/CustomDialogs/src/GetNegMuMuonicXRDDialog.cpp
rename to qt/widgets/plugins/algorithm_dialogs/src/GetNegMuMuonicXRDDialog.cpp
index 5154d5420261bc80e7cb51b39e02d1a6c3d8996d..c74f1457a9438d4bd6f1ebc84196bce01a2be4dd 100644
--- a/MantidQt/CustomDialogs/src/GetNegMuMuonicXRDDialog.cpp
+++ b/qt/widgets/plugins/algorithm_dialogs/src/GetNegMuMuonicXRDDialog.cpp
@@ -1,6 +1,6 @@
-#include "MantidQtCustomDialogs/GetNegMuMuonicXRDDialog.h"
-#include "MantidQtAPI/AlgorithmInputHistory.h"
-#include "MantidQtCustomDialogs/MantidGLWidget.h"
+#include "MantidQtWidgets/Plugins/AlgorithmDialogs/GetNegMuMuonicXRDDialog.h"
+#include "MantidQtWidgets/Common/AlgorithmInputHistory.h"
+#include "MantidQtWidgets/Plugins/AlgorithmDialogs/MantidGLWidget.h"
#include <QCheckBox>
#include <QMessageBox>
#include <QLineEdit>
diff --git a/MantidQt/CustomDialogs/src/LOQScriptInputDialog.cpp b/qt/widgets/plugins/algorithm_dialogs/src/LOQScriptInputDialog.cpp
similarity index 96%
rename from MantidQt/CustomDialogs/src/LOQScriptInputDialog.cpp
rename to qt/widgets/plugins/algorithm_dialogs/src/LOQScriptInputDialog.cpp
index 79b8bfc8938e9486f89e02e3e7a557d0218d3c99..1c53d21befb2b216787a1ba321daf5154478b6f4 100644
--- a/MantidQt/CustomDialogs/src/LOQScriptInputDialog.cpp
+++ b/qt/widgets/plugins/algorithm_dialogs/src/LOQScriptInputDialog.cpp
@@ -1,8 +1,8 @@
//---------------------------
// Includes
//--------------------------
-#include "MantidQtCustomDialogs/LOQScriptInputDialog.h"
-#include "MantidQtAPI/AlgorithmInputHistory.h"
+#include "MantidQtWidgets/Plugins/AlgorithmDialogs/LOQScriptInputDialog.h"
+#include "MantidQtWidgets/Common/AlgorithmInputHistory.h"
#include <QFileInfo>
#include <QDir>
diff --git a/MantidQt/CustomDialogs/src/LoadAsciiDialog.cpp b/qt/widgets/plugins/algorithm_dialogs/src/LoadAsciiDialog.cpp
similarity index 97%
rename from MantidQt/CustomDialogs/src/LoadAsciiDialog.cpp
rename to qt/widgets/plugins/algorithm_dialogs/src/LoadAsciiDialog.cpp
index cfb2e542f3c808cc8fc03e29b98e88c7097f3996..8e273694b7e6132ce090dcfb1d52995674ee38aa 100644
--- a/MantidQt/CustomDialogs/src/LoadAsciiDialog.cpp
+++ b/qt/widgets/plugins/algorithm_dialogs/src/LoadAsciiDialog.cpp
@@ -1,8 +1,8 @@
//----------------------
// Includes
//----------------------
-#include "MantidQtCustomDialogs/LoadAsciiDialog.h"
-#include "MantidQtAPI/AlgorithmInputHistory.h"
+#include "MantidQtWidgets/Plugins/AlgorithmDialogs/LoadAsciiDialog.h"
+#include "MantidQtWidgets/Common/AlgorithmInputHistory.h"
#include <QValidator>
#include <QtGui>
diff --git a/MantidQt/CustomDialogs/src/LoadDAEDialog.cpp b/qt/widgets/plugins/algorithm_dialogs/src/LoadDAEDialog.cpp
similarity index 95%
rename from MantidQt/CustomDialogs/src/LoadDAEDialog.cpp
rename to qt/widgets/plugins/algorithm_dialogs/src/LoadDAEDialog.cpp
index c752896afadd209fc5990b17298082004ffa743f..48334a4fe38aae0c955776e9d5b3e8c31f6c2877 100644
--- a/MantidQt/CustomDialogs/src/LoadDAEDialog.cpp
+++ b/qt/widgets/plugins/algorithm_dialogs/src/LoadDAEDialog.cpp
@@ -1,8 +1,8 @@
//----------------------
// Includes
//----------------------
-#include "MantidQtCustomDialogs/LoadDAEDialog.h"
-#include "MantidQtAPI/AlgorithmInputHistory.h"
+#include "MantidQtWidgets/Plugins/AlgorithmDialogs/LoadDAEDialog.h"
+#include "MantidQtWidgets/Common/AlgorithmInputHistory.h"
#include <QValidator>
#include <QtGui>
diff --git a/MantidQt/CustomDialogs/src/LoadDialog.cpp b/qt/widgets/plugins/algorithm_dialogs/src/LoadDialog.cpp
similarity index 98%
rename from MantidQt/CustomDialogs/src/LoadDialog.cpp
rename to qt/widgets/plugins/algorithm_dialogs/src/LoadDialog.cpp
index 0489e557d7956fb3a0cb32864de6515572f15c42..f5bd3fd749d8e8ccd91e747163f9dda0e1ca0316 100644
--- a/MantidQt/CustomDialogs/src/LoadDialog.cpp
+++ b/qt/widgets/plugins/algorithm_dialogs/src/LoadDialog.cpp
@@ -1,9 +1,9 @@
//------------------------------------------------------------------------------
// Includes
//------------------------------------------------------------------------------
-#include "MantidQtCustomDialogs/LoadDialog.h"
-#include "MantidQtAPI/MWRunFiles.h"
-#include "MantidQtAPI/AlgorithmInputHistory.h"
+#include "MantidQtWidgets/Plugins/AlgorithmDialogs/LoadDialog.h"
+#include "MantidQtWidgets/Common/MWRunFiles.h"
+#include "MantidQtWidgets/Common/AlgorithmInputHistory.h"
// Qt
#include <QCheckBox>
#include <QComboBox>
@@ -17,7 +17,7 @@
#include "MantidAPI/IWorkspaceProperty.h"
#include "MantidAPI/FileProperty.h"
#include "MantidAPI/AlgorithmManager.h"
-#include "MantidQtAPI/HelpWindow.h"
+#include "MantidQtWidgets/Common/HelpWindow.h"
namespace MantidQt {
namespace CustomDialogs {
diff --git a/MantidQt/CustomDialogs/src/LoadRawDialog.cpp b/qt/widgets/plugins/algorithm_dialogs/src/LoadRawDialog.cpp
similarity index 97%
rename from MantidQt/CustomDialogs/src/LoadRawDialog.cpp
rename to qt/widgets/plugins/algorithm_dialogs/src/LoadRawDialog.cpp
index d5ba446b1934e6f2e53bc3e057125ef072affd77..8aee2511db5b9ec66b2347d62ba40fb5d7ce676b 100644
--- a/MantidQt/CustomDialogs/src/LoadRawDialog.cpp
+++ b/qt/widgets/plugins/algorithm_dialogs/src/LoadRawDialog.cpp
@@ -1,5 +1,5 @@
-#include "MantidQtCustomDialogs/LoadRawDialog.h"
-#include "MantidQtAPI/AlgorithmInputHistory.h"
+#include "MantidQtWidgets/Plugins/AlgorithmDialogs/LoadRawDialog.h"
+#include "MantidQtWidgets/Common/AlgorithmInputHistory.h"
#include "MantidKernel/Property.h"
diff --git a/MantidQt/CustomDialogs/src/MantidGLWidget.cpp b/qt/widgets/plugins/algorithm_dialogs/src/MantidGLWidget.cpp
similarity index 99%
rename from MantidQt/CustomDialogs/src/MantidGLWidget.cpp
rename to qt/widgets/plugins/algorithm_dialogs/src/MantidGLWidget.cpp
index 556ee6f1ed8ebfaf5be562df83eb66f1dea6df27..84d8c0a324ae6e291f505e5e3c7de41ffe5ddf23 100644
--- a/MantidQt/CustomDialogs/src/MantidGLWidget.cpp
+++ b/qt/widgets/plugins/algorithm_dialogs/src/MantidGLWidget.cpp
@@ -1,7 +1,7 @@
//-----------------------------------------
// Includes
//-----------------------------------------
-#include "MantidQtCustomDialogs/MantidGLWidget.h"
+#include "MantidQtWidgets/Plugins/AlgorithmDialogs/MantidGLWidget.h"
#include "MantidGeometry/Objects/Object.h"
#include <QtOpenGL>
diff --git a/MantidQt/CustomDialogs/src/PlotAsymmetryByLogValueDialog.cpp b/qt/widgets/plugins/algorithm_dialogs/src/PlotAsymmetryByLogValueDialog.cpp
similarity index 98%
rename from MantidQt/CustomDialogs/src/PlotAsymmetryByLogValueDialog.cpp
rename to qt/widgets/plugins/algorithm_dialogs/src/PlotAsymmetryByLogValueDialog.cpp
index 1f23d623eefa79be0205514619a189099d78b520..f46b39297c38dc9d04bebd84096b8c8f7c7f999c 100644
--- a/MantidQt/CustomDialogs/src/PlotAsymmetryByLogValueDialog.cpp
+++ b/qt/widgets/plugins/algorithm_dialogs/src/PlotAsymmetryByLogValueDialog.cpp
@@ -1,5 +1,5 @@
-#include "MantidQtCustomDialogs/PlotAsymmetryByLogValueDialog.h"
-#include "MantidQtAPI/AlgorithmInputHistory.h"
+#include "MantidQtWidgets/Plugins/AlgorithmDialogs/PlotAsymmetryByLogValueDialog.h"
+#include "MantidQtWidgets/Common/AlgorithmInputHistory.h"
#include "MantidKernel/Property.h"
#include "MantidAPI/AlgorithmFactory.h"
diff --git a/MantidQt/CustomDialogs/src/SampleShapeHelpers.cpp b/qt/widgets/plugins/algorithm_dialogs/src/SampleShapeHelpers.cpp
similarity index 99%
rename from MantidQt/CustomDialogs/src/SampleShapeHelpers.cpp
rename to qt/widgets/plugins/algorithm_dialogs/src/SampleShapeHelpers.cpp
index ec469a02eac3ec183c228a226f1177f9cfe65c1e..1d8bc62a0a54780394e11477d651237c56ccadc6 100644
--- a/MantidQt/CustomDialogs/src/SampleShapeHelpers.cpp
+++ b/qt/widgets/plugins/algorithm_dialogs/src/SampleShapeHelpers.cpp
@@ -1,7 +1,7 @@
//------------------------------------------
// Includes
//-----------------------------------------
-#include "MantidQtCustomDialogs/SampleShapeHelpers.h"
+#include "MantidQtWidgets/Plugins/AlgorithmDialogs/SampleShapeHelpers.h"
#include <QLabel>
#include <QLineEdit>
diff --git a/MantidQt/CustomDialogs/src/SmoothNeighboursDialog.cpp b/qt/widgets/plugins/algorithm_dialogs/src/SmoothNeighboursDialog.cpp
similarity index 98%
rename from MantidQt/CustomDialogs/src/SmoothNeighboursDialog.cpp
rename to qt/widgets/plugins/algorithm_dialogs/src/SmoothNeighboursDialog.cpp
index b7cf8cf8a5322822fc5c311c50e3ba0eace217aa..25b9299448817da80229ceef9bdd92390cdfac55 100644
--- a/MantidQt/CustomDialogs/src/SmoothNeighboursDialog.cpp
+++ b/qt/widgets/plugins/algorithm_dialogs/src/SmoothNeighboursDialog.cpp
@@ -1,7 +1,7 @@
#include "MantidAPI/WorkspaceGroup.h"
#include "MantidAPI/MatrixWorkspace.h"
#include "MantidGeometry/Instrument.h"
-#include "MantidQtCustomDialogs/SmoothNeighboursDialog.h"
+#include "MantidQtWidgets/Plugins/AlgorithmDialogs/SmoothNeighboursDialog.h"
using namespace Mantid::API;
using namespace Mantid::Geometry;
diff --git a/MantidQt/CustomDialogs/src/SortTableWorkspaceDialog.cpp b/qt/widgets/plugins/algorithm_dialogs/src/SortTableWorkspaceDialog.cpp
similarity index 98%
rename from MantidQt/CustomDialogs/src/SortTableWorkspaceDialog.cpp
rename to qt/widgets/plugins/algorithm_dialogs/src/SortTableWorkspaceDialog.cpp
index f9d0bc7f2de7ce94afd416c7d782a07e0d340287..38724263bc780d0360fa5df78862dc86d6500b68 100644
--- a/MantidQt/CustomDialogs/src/SortTableWorkspaceDialog.cpp
+++ b/qt/widgets/plugins/algorithm_dialogs/src/SortTableWorkspaceDialog.cpp
@@ -1,8 +1,8 @@
//------------------------------------------------------------------------------
// Includes
//------------------------------------------------------------------------------
-#include "MantidQtCustomDialogs/SortTableWorkspaceDialog.h"
-#include "MantidQtAPI/AlgorithmInputHistory.h"
+#include "MantidQtWidgets/Plugins/AlgorithmDialogs/SortTableWorkspaceDialog.h"
+#include "MantidQtWidgets/Common/AlgorithmInputHistory.h"
#include "MantidAPI/AnalysisDataService.h"
#include "MantidAPI/ITableWorkspace.h"
#include "MantidKernel/Exception.h"
diff --git a/MantidQt/CustomDialogs/src/StartLiveDataDialog.cpp b/qt/widgets/plugins/algorithm_dialogs/src/StartLiveDataDialog.cpp
similarity index 98%
rename from MantidQt/CustomDialogs/src/StartLiveDataDialog.cpp
rename to qt/widgets/plugins/algorithm_dialogs/src/StartLiveDataDialog.cpp
index b2ffecae7d843eaff53c8b15dea5efc8c4d34933..1463d688ffd7d14c6bd1ee0bec02fca85b02b950 100644
--- a/MantidQt/CustomDialogs/src/StartLiveDataDialog.cpp
+++ b/qt/widgets/plugins/algorithm_dialogs/src/StartLiveDataDialog.cpp
@@ -1,9 +1,9 @@
//----------------------
// Includes
//----------------------
-#include "MantidQtCustomDialogs/StartLiveDataDialog.h"
-#include "MantidQtAPI/AlgorithmInputHistory.h"
-#include "MantidQtAPI/PropertyWidgetFactory.h"
+#include "MantidQtWidgets/Plugins/AlgorithmDialogs/StartLiveDataDialog.h"
+#include "MantidQtWidgets/Common/AlgorithmInputHistory.h"
+#include "MantidQtWidgets/Common/PropertyWidgetFactory.h"
#include "qboxlayout.h"
#include "MantidAPI/AlgorithmManager.h"
#include <QtCore/qvariant.h>
@@ -16,7 +16,7 @@
#include "MantidKernel/InstrumentInfo.h"
#include "MantidKernel/LiveListenerInfo.h"
#include <QtGui>
-#include "MantidQtAPI/AlgorithmInputHistory.h"
+#include "MantidQtWidgets/Common/AlgorithmInputHistory.h"
using namespace MantidQt::CustomDialogs;
using namespace MantidQt::API;