diff --git a/Framework/API/CMakeLists.txt b/Framework/API/CMakeLists.txt
index 4690d0197b54d4c3e3264de63b3dfed66b45ce63..40fdac0ea0b6d8d7d09c557d275372bbe0a15fb3 100644
--- a/Framework/API/CMakeLists.txt
+++ b/Framework/API/CMakeLists.txt
@@ -44,8 +44,8 @@ set ( SRC_FILES
 	src/FunctionParameterDecorator.cpp
 	src/FunctionProperty.cpp
 	src/FunctionValues.cpp
-	src/GeometryInfoFactory.cpp
 	src/GeometryInfo.cpp
+	src/GeometryInfoFactory.cpp
 	src/GridDomain.cpp
 	src/GridDomain1D.cpp
 	src/GroupingLoader.cpp
@@ -110,7 +110,6 @@ set ( SRC_FILES
 	src/PeakFunctionIntegrator.cpp
 	src/Progress.cpp
 	src/Projection.cpp
-	src/PropertyManagerDataService.cpp
 	src/PropertyNexus.cpp
 	src/RawCountValidator.cpp
 	src/RefAxis.cpp
@@ -200,8 +199,8 @@ set ( INC_FILES
 	inc/MantidAPI/FunctionParameterDecorator.h
 	inc/MantidAPI/FunctionProperty.h
 	inc/MantidAPI/FunctionValues.h
-	inc/MantidAPI/GeometryInfoFactory.h
 	inc/MantidAPI/GeometryInfo.h
+	inc/MantidAPI/GeometryInfoFactory.h
 	inc/MantidAPI/GridDomain.h
 	inc/MantidAPI/GridDomain1D.h
 	inc/MantidAPI/GroupingLoader.h
@@ -295,7 +294,6 @@ set ( INC_FILES
 	inc/MantidAPI/PeakFunctionIntegrator.h
 	inc/MantidAPI/Progress.h
 	inc/MantidAPI/Projection.h
-	inc/MantidAPI/PropertyManagerDataService.h
 	inc/MantidAPI/PropertyNexus.h
 	inc/MantidAPI/RawCountValidator.h
 	inc/MantidAPI/RefAxis.h
@@ -406,7 +404,6 @@ set ( TEST_FILES
 	ParameterTieTest.h
 	PeakFunctionIntegratorTest.h
 	ProjectionTest.h
-	PropertyManagerDataServiceTest.h
 	PropertyNexusTest.h
 	RawCountValidatorTest.h
 	RemoteJobManagerFactoryTest.h
diff --git a/Framework/API/src/DataProcessorAlgorithm.cpp b/Framework/API/src/DataProcessorAlgorithm.cpp
index cfa82c4df7672f111c8d8f52ec4425e85fdbdeb0..dac0a9cadd81c479b7eeca3ba3a3defe644e47d3 100644
--- a/Framework/API/src/DataProcessorAlgorithm.cpp
+++ b/Framework/API/src/DataProcessorAlgorithm.cpp
@@ -7,7 +7,7 @@
 #include "MantidKernel/System.h"
 #include "MantidAPI/FileFinder.h"
 #include "MantidAPI/AlgorithmManager.h"
-#include "MantidAPI/PropertyManagerDataService.h"
+#include "MantidKernel/PropertyManagerDataService.h"
 #include "MantidAPI/WorkspaceFactory.h"
 #include "MantidKernel/FacilityInfo.h"
 #include "MantidKernel/PropertyManager.h"
diff --git a/Framework/API/src/FrameworkManager.cpp b/Framework/API/src/FrameworkManager.cpp
index fbdb3fa41138684aac239f465ad2ccbe3dd68d18..15f87f11f3d1a414ca3637ea4e8c228032a37780 100644
--- a/Framework/API/src/FrameworkManager.cpp
+++ b/Framework/API/src/FrameworkManager.cpp
@@ -6,14 +6,14 @@
 #include "MantidAPI/FrameworkManager.h"
 #include "MantidAPI/InstrumentDataService.h"
 #include "MantidAPI/MemoryManager.h"
-#include "MantidAPI/PropertyManagerDataService.h"
 #include "MantidAPI/WorkspaceGroup.h"
-#include "MantidKernel/UsageService.h"
 
 #include "MantidKernel/Exception.h"
 #include "MantidKernel/LibraryManager.h"
 #include "MantidKernel/Memory.h"
 #include "MantidKernel/MultiThreaded.h"
+#include "MantidKernel/PropertyManagerDataService.h"
+#include "MantidKernel/UsageService.h"
 
 #include <Poco/ActiveResult.h>
 
@@ -250,6 +250,7 @@ void FrameworkManagerImpl::clearInstruments() {
  * Clear memory associated with the PropertyManagers
  */
 void FrameworkManagerImpl::clearPropertyManagers() {
+  using Kernel::PropertyManagerDataService;
   PropertyManagerDataService::Instance().clear();
 }
 
diff --git a/Framework/API/src/PropertyManagerDataService.cpp b/Framework/API/src/PropertyManagerDataService.cpp
deleted file mode 100644
index 6a5c186190b2780bc824c79071f9a7278026cf58..0000000000000000000000000000000000000000
--- a/Framework/API/src/PropertyManagerDataService.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-#include "MantidAPI/PropertyManagerDataService.h"
-
-namespace Mantid {
-namespace API {
-/**
-* Default constructor
-*/
-PropertyManagerDataServiceImpl::PropertyManagerDataServiceImpl()
-    : Mantid::Kernel::DataService<Mantid::Kernel::PropertyManager>(
-          "PropertyManagerDataService") {}
-
-} // Namespace API
-} // Namespace Mantid
diff --git a/Framework/Algorithms/src/PDDetermineCharacterizations.cpp b/Framework/Algorithms/src/PDDetermineCharacterizations.cpp
index 4dece8677bc525e1dcecd03719f6f2b78ddea96f..1ff88b002277afeac32c5405fbbd6958681e7ec5 100644
--- a/Framework/Algorithms/src/PDDetermineCharacterizations.cpp
+++ b/Framework/Algorithms/src/PDDetermineCharacterizations.cpp
@@ -1,6 +1,6 @@
 #include "MantidAlgorithms/PDDetermineCharacterizations.h"
 #include "MantidAPI/MatrixWorkspace.h"
-#include "MantidAPI/PropertyManagerDataService.h"
+#include "MantidKernel/PropertyManagerDataService.h"
 #include "MantidAPI/ITableWorkspace.h"
 #include "MantidKernel/ArrayProperty.h"
 #include "MantidKernel/TimeSeriesProperty.h"
@@ -9,10 +9,10 @@ namespace Mantid {
 namespace Algorithms {
 
 using Mantid::API::ITableWorkspace_const_sptr;
-using Mantid::API::PropertyManagerDataService;
 using Mantid::API::WorkspaceProperty;
 using Mantid::Kernel::ArrayProperty;
 using Mantid::Kernel::Direction;
+using Mantid::Kernel::PropertyManagerDataService;
 using Mantid::Kernel::PropertyWithValue;
 using Mantid::Kernel::TimeSeriesProperty;
 
diff --git a/Framework/Algorithms/test/PDDetermineCharacterizationsTest.h b/Framework/Algorithms/test/PDDetermineCharacterizationsTest.h
index 162f2b2a6abaf5b41a111b43a75b7c6015481a23..53ed207b16aeed91bfb6c488d953e4f235ba75a7 100644
--- a/Framework/Algorithms/test/PDDetermineCharacterizationsTest.h
+++ b/Framework/Algorithms/test/PDDetermineCharacterizationsTest.h
@@ -6,7 +6,7 @@
 #include "MantidAlgorithms/PDDetermineCharacterizations.h"
 #include "MantidAPI/FrameworkManager.h"
 #include "MantidAPI/ITableWorkspace.h"
-#include "MantidAPI/PropertyManagerDataService.h"
+#include "MantidKernel/PropertyManagerDataService.h"
 #include "MantidAPI/TableRow.h"
 #include "MantidAPI/WorkspaceFactory.h"
 #include "MantidKernel/ArrayProperty.h"
diff --git a/Framework/Kernel/CMakeLists.txt b/Framework/Kernel/CMakeLists.txt
index 71d5bf8abe406a0fb7d591852024ce067bbce313..f356da643a6c6ff9ae04aa4a7bae48634ee52131 100644
--- a/Framework/Kernel/CMakeLists.txt
+++ b/Framework/Kernel/CMakeLists.txt
@@ -76,6 +76,7 @@ set ( SRC_FILES
 	src/Property.cpp
 	src/PropertyHistory.cpp
 	src/PropertyManager.cpp
+	src/PropertyManagerDataService.cpp
 	src/PropertyManagerOwner.cpp
 	src/PropertyManagerProperty.cpp
 	src/PropertyWithValue.cpp
@@ -231,9 +232,10 @@ set ( INC_FILES
 	inc/MantidKernel/Property.h
 	inc/MantidKernel/PropertyHistory.h
 	inc/MantidKernel/PropertyManager.h
-	inc/MantidKernel/PropertyManager_fwd.h
+	inc/MantidKernel/PropertyManagerDataService.h
 	inc/MantidKernel/PropertyManagerOwner.h
 	inc/MantidKernel/PropertyManagerProperty.h
+	inc/MantidKernel/PropertyManager_fwd.h
 	inc/MantidKernel/PropertyWithValue.h
 	inc/MantidKernel/ProxyInfo.h
 	inc/MantidKernel/PseudoRandomNumberGenerator.h
@@ -368,6 +370,7 @@ set ( TEST_FILES
 	ProgressBaseTest.h
 	ProgressTextTest.h
 	PropertyHistoryTest.h
+	PropertyManagerDataServiceTest.h
 	PropertyManagerPropertyTest.h
 	PropertyManagerTest.h
 	PropertyTest.h
diff --git a/Framework/API/inc/MantidAPI/PropertyManagerDataService.h b/Framework/Kernel/inc/MantidKernel/PropertyManagerDataService.h
similarity index 79%
rename from Framework/API/inc/MantidAPI/PropertyManagerDataService.h
rename to Framework/Kernel/inc/MantidKernel/PropertyManagerDataService.h
index b45a48f1b2dfaf4014fb2085a9a598d6975eec74..49aa7c28a21a8cc7db68b04e5bd36083530f0570 100644
--- a/Framework/API/inc/MantidAPI/PropertyManagerDataService.h
+++ b/Framework/Kernel/inc/MantidKernel/PropertyManagerDataService.h
@@ -1,14 +1,15 @@
-#ifndef MANTID_API_PROPERTYMANAGERDATASERVICE_
-#define MANTID_API_PROPERTYMANAGERDATASERVICE_
+#ifndef MANTID_KERNEL_PROPERTYMANAGERDATASERVICE_
+#define MANTID_KERNEL_PROPERTYMANAGERDATASERVICE_
 
-#include "MantidAPI/DllConfig.h"
 #include "MantidKernel/DataService.h"
-#include "MantidKernel/SingletonHolder.h"
 #include "MantidKernel/PropertyManager.h"
+#include "MantidKernel/SingletonHolder.h"
 
 namespace Mantid {
-namespace API {
-/** PropertyManagerDataService Class. Derived from DataService.
+namespace Kernel {
+/**
+PropertyManagerDataService Class. Derived from DataService.
+
 Copyright &copy; 2012 ISIS Rutherford Appleton Laboratory, NScD Oak Ridge
 National Laboratory & European Spallation Source
 
@@ -30,8 +31,8 @@ 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 MANTID_API_DLL PropertyManagerDataServiceImpl final
-    : public Mantid::Kernel::DataService<Mantid::Kernel::PropertyManager> {
+class MANTID_KERNEL_DLL PropertyManagerDataServiceImpl final
+    : public DataService<PropertyManager> {
 public:
   PropertyManagerDataServiceImpl(const PropertyManagerDataServiceImpl &) =
       delete;
@@ -50,12 +51,12 @@ private:
 /// typedef for it.
 #ifdef _WIN32
 // this breaks new namespace declaraion rules; need to find a better fix
-template class MANTID_API_DLL
+template class MANTID_KERNEL_DLL
     Mantid::Kernel::SingletonHolder<PropertyManagerDataServiceImpl>;
 #endif /* _WIN32 */
-typedef MANTID_API_DLL Mantid::Kernel::SingletonHolder<
+typedef MANTID_KERNEL_DLL Mantid::Kernel::SingletonHolder<
     PropertyManagerDataServiceImpl> PropertyManagerDataService;
 
-} // Namespace API
+} // Namespace Kernel
 } // Namespace Mantid
-#endif /*MANTID_API_PROPERTYMANAGERDATASERVICE_*/
+#endif /*MANTID_KERNEL_PROPERTYMANAGERDATASERVICE_*/
diff --git a/Framework/Kernel/src/PropertyManagerDataService.cpp b/Framework/Kernel/src/PropertyManagerDataService.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..bd4587f31bfc5ed75869a83b59c391d17c276858
--- /dev/null
+++ b/Framework/Kernel/src/PropertyManagerDataService.cpp
@@ -0,0 +1,13 @@
+#include "MantidKernel/PropertyManagerDataService.h"
+
+namespace Mantid {
+namespace Kernel {
+
+/**
+ * Default constructor
+ */
+PropertyManagerDataServiceImpl::PropertyManagerDataServiceImpl()
+    : DataService<PropertyManager>("PropertyManagerDataService") {}
+
+} // Namespace Kernel
+} // Namespace Mantid
diff --git a/Framework/API/test/PropertyManagerDataServiceTest.h b/Framework/Kernel/test/PropertyManagerDataServiceTest.h
similarity index 97%
rename from Framework/API/test/PropertyManagerDataServiceTest.h
rename to Framework/Kernel/test/PropertyManagerDataServiceTest.h
index 2874f1768a78c46f4b3e02f754259cb5bc30eb51..3355dd06dfbf0c29e70ea155bd2536524c54dfab 100644
--- a/Framework/API/test/PropertyManagerDataServiceTest.h
+++ b/Framework/Kernel/test/PropertyManagerDataServiceTest.h
@@ -2,12 +2,10 @@
 #define PROPERTYMANAGERDATASERVICETEST_H_
 
 #include <cxxtest/TestSuite.h>
-#include "MantidAPI/FrameworkManager.h"
-#include "MantidAPI/PropertyManagerDataService.h"
+#include "MantidKernel/PropertyManagerDataService.h"
 #include "MantidKernel/PropertyManager.h"
 #include "MantidKernel/Exception.h"
 
-using namespace Mantid::API;
 using namespace Mantid::Kernel;
 
 class PropertyManagerDataServiceTest : public CxxTest::TestSuite {
diff --git a/Framework/PythonInterface/mantid/api/CMakeLists.txt b/Framework/PythonInterface/mantid/api/CMakeLists.txt
index 687fe014b2671f80045f25d96215ac55a20d1a21..ad2413db345753f133a4c7e21fa42b6fa4d1ff42 100644
--- a/Framework/PythonInterface/mantid/api/CMakeLists.txt
+++ b/Framework/PythonInterface/mantid/api/CMakeLists.txt
@@ -66,7 +66,6 @@ set ( EXPORT_FILES
   src/Exports/IFunction1D.cpp
   src/Exports/IPeakFunction.cpp
   src/Exports/Jacobian.cpp
-  src/Exports/PropertyManagerDataService.cpp
   src/Exports/FunctionFactory.cpp
   src/Exports/Progress.cpp
   src/Exports/Projection.cpp
diff --git a/Framework/PythonInterface/mantid/api/_aliases.py b/Framework/PythonInterface/mantid/api/_aliases.py
index 1c619c0321eb44a0ab11289159d5e03c07b11526..c1b65640a98ccb9510e3908ba5b22fdd2110aa73 100644
--- a/Framework/PythonInterface/mantid/api/_aliases.py
+++ b/Framework/PythonInterface/mantid/api/_aliases.py
@@ -4,8 +4,7 @@
 from _api import (FrameworkManagerImpl, AnalysisDataServiceImpl,
                   AlgorithmFactoryImpl, AlgorithmManagerImpl,
                   FileFinderImpl, FileLoaderRegistryImpl, FunctionFactoryImpl,
-                  WorkspaceFactoryImpl,
-                  PropertyManagerDataServiceImpl, CatalogManagerImpl)
+                  WorkspaceFactoryImpl, CatalogManagerImpl)
 
 ###############################################################################
 # Singleton
@@ -29,6 +28,3 @@ FunctionFactory = FunctionFactoryImpl.Instance()
 WorkspaceFactory = WorkspaceFactoryImpl.Instance()
 
 CatalogManager = CatalogManagerImpl.Instance()
-
-PropertyManagerDataService = PropertyManagerDataServiceImpl.Instance()
-pmds = PropertyManagerDataService
diff --git a/Framework/PythonInterface/mantid/kernel/CMakeLists.txt b/Framework/PythonInterface/mantid/kernel/CMakeLists.txt
index 350958664899a3b8aad70f117cee7e334935ef77..4f44b09a0412577ae7b61b63723451cb199b5ae6 100644
--- a/Framework/PythonInterface/mantid/kernel/CMakeLists.txt
+++ b/Framework/PythonInterface/mantid/kernel/CMakeLists.txt
@@ -43,6 +43,7 @@ set ( EXPORT_FILES
   src/Exports/UnitLabel.cpp
   src/Exports/DeltaEMode.cpp
   src/Exports/PropertyManager.cpp
+  src/Exports/PropertyManagerDataService.cpp
   src/Exports/PropertyManagerProperty.cpp
   src/Exports/PropertyHistory.cpp
   src/Exports/Memory.cpp
diff --git a/Framework/PythonInterface/mantid/kernel/_aliases.py b/Framework/PythonInterface/mantid/kernel/_aliases.py
index 087a06ad5d76465b4ee961697b7ceeb828ecc57c..c8b27db9e046b1985e1c40bdfcaa8186ceecf717 100644
--- a/Framework/PythonInterface/mantid/kernel/_aliases.py
+++ b/Framework/PythonInterface/mantid/kernel/_aliases.py
@@ -2,7 +2,8 @@
     Defines a set of aliases for the kernel module to make
     accessing certain objects easier.
 """
-from _kernel import ConfigServiceImpl, Logger, UnitFactoryImpl, UsageServiceImpl
+from _kernel import (ConfigServiceImpl, Logger, UnitFactoryImpl,
+                     UsageServiceImpl, PropertyManagerDataServiceImpl)
 
 ###############################################################################
 # Singletons - Make them just look like static classes
@@ -11,10 +12,13 @@ UsageService = UsageServiceImpl.Instance()
 ConfigService = ConfigServiceImpl.Instance()
 config = ConfigService
 
+PropertyManagerDataService = PropertyManagerDataServiceImpl.Instance()
+pmds = PropertyManagerDataService
+
 UnitFactory = UnitFactoryImpl.Instance()
 
 ###############################################################################
 # Set up a general Python logger. Others can be created as they are required
 # if a user wishes to be more specific
 ###############################################################################
-logger = Logger("Python")
\ No newline at end of file
+logger = Logger("Python")
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/PropertyManagerDataService.cpp b/Framework/PythonInterface/mantid/kernel/src/Exports/PropertyManagerDataService.cpp
similarity index 94%
rename from Framework/PythonInterface/mantid/api/src/Exports/PropertyManagerDataService.cpp
rename to Framework/PythonInterface/mantid/kernel/src/Exports/PropertyManagerDataService.cpp
index 14aa7e89b1c0b5250741928fbfe4a708a13cf95f..a56b357e37408b33d8f5c29fad8d5aa3310105f6 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/PropertyManagerDataService.cpp
+++ b/Framework/PythonInterface/mantid/kernel/src/Exports/PropertyManagerDataService.cpp
@@ -1,6 +1,6 @@
 #include "MantidPythonInterface/kernel/DataServiceExporter.h"
 
-#include "MantidAPI/PropertyManagerDataService.h"
+#include "MantidKernel/PropertyManagerDataService.h"
 #include "MantidKernel/PropertyManager.h"
 
 #include <boost/python/register_ptr_to_python.hpp>
diff --git a/Framework/TestHelpers/src/TearDownWorld.cpp b/Framework/TestHelpers/src/TearDownWorld.cpp
index 57d7393bf3bc12e4301a5218303d6053325e0ed3..f0409f16dbcd504613a8e9401c987bda999fdc5d 100644
--- a/Framework/TestHelpers/src/TearDownWorld.cpp
+++ b/Framework/TestHelpers/src/TearDownWorld.cpp
@@ -4,7 +4,7 @@
 #include "MantidTestHelpers/TearDownWorld.h"
 #include "MantidAPI/AlgorithmManager.h"
 #include "MantidAPI/AnalysisDataService.h"
-#include "MantidAPI/PropertyManagerDataService.h"
+#include "MantidKernel/PropertyManagerDataService.h"
 
 // On MSVC all workspaces must be deleted by the time main() exits as the
 // Workspace destruction can call to an OpenMP loop which is not allowed
@@ -45,6 +45,6 @@ bool ClearADS::tearDownWorld() {
 
 /// @return True to indicate success of the tear down process
 bool ClearPropertyManagerDataService::tearDownWorld() {
-  Mantid::API::PropertyManagerDataService::Instance().clear();
+  Mantid::Kernel::PropertyManagerDataService::Instance().clear();
   return true;
 }
diff --git a/Framework/WorkflowAlgorithms/src/AlignAndFocusPowder.cpp b/Framework/WorkflowAlgorithms/src/AlignAndFocusPowder.cpp
index 33caee41a56f67191c066482c40ed96d0a2e350f..1b7924ac79600dae0fe612c11c6deaefa2f5d637 100644
--- a/Framework/WorkflowAlgorithms/src/AlignAndFocusPowder.cpp
+++ b/Framework/WorkflowAlgorithms/src/AlignAndFocusPowder.cpp
@@ -4,7 +4,7 @@
 #include "MantidWorkflowAlgorithms/AlignAndFocusPowder.h"
 #include "MantidAPI/FileProperty.h"
 #include "MantidAPI/MatrixWorkspace.h"
-#include "MantidAPI/PropertyManagerDataService.h"
+#include "MantidKernel/PropertyManagerDataService.h"
 #include "MantidAPI/WorkspaceFactory.h"
 #include "MantidDataObjects/GroupingWorkspace.h"
 #include "MantidDataObjects/MaskWorkspace.h"
diff --git a/Framework/WorkflowAlgorithms/src/ComputeSensitivity.cpp b/Framework/WorkflowAlgorithms/src/ComputeSensitivity.cpp
index 9ff97d56d2d544e3750afab1d15ec2990fd8785c..3dd3756b4620f674e4065645b74b6d634516ebb5 100644
--- a/Framework/WorkflowAlgorithms/src/ComputeSensitivity.cpp
+++ b/Framework/WorkflowAlgorithms/src/ComputeSensitivity.cpp
@@ -5,7 +5,7 @@
 #include "MantidAPI/AlgorithmProperty.h"
 #include "MantidAPI/FileProperty.h"
 #include "MantidAPI/MatrixWorkspace.h"
-#include "MantidAPI/PropertyManagerDataService.h"
+#include "MantidKernel/PropertyManagerDataService.h"
 #include "MantidDataObjects/TableWorkspace.h"
 #include "MantidKernel/PropertyManager.h"
 #include "MantidWorkflowAlgorithms/EQSANSInstrument.h"
diff --git a/Framework/WorkflowAlgorithms/src/DgsAbsoluteUnitsReduction.cpp b/Framework/WorkflowAlgorithms/src/DgsAbsoluteUnitsReduction.cpp
index e12bd4f5c288543e0e74c34fdda8f4dea7d1f931..541603e0a3d2b75fe6d046d59259d03e6db631ff 100644
--- a/Framework/WorkflowAlgorithms/src/DgsAbsoluteUnitsReduction.cpp
+++ b/Framework/WorkflowAlgorithms/src/DgsAbsoluteUnitsReduction.cpp
@@ -1,6 +1,6 @@
 #include "MantidWorkflowAlgorithms/DgsAbsoluteUnitsReduction.h"
 #include "MantidWorkflowAlgorithms/WorkflowAlgorithmHelpers.h"
-#include "MantidAPI/PropertyManagerDataService.h"
+#include "MantidKernel/PropertyManagerDataService.h"
 #include "MantidKernel/Atom.h"
 #include "MantidAPI/MatrixWorkspace.h"
 #include "MantidKernel/NeutronAtom.h"
diff --git a/Framework/WorkflowAlgorithms/src/DgsConvertToEnergyTransfer.cpp b/Framework/WorkflowAlgorithms/src/DgsConvertToEnergyTransfer.cpp
index 2e4c145d5f931b2a3fbabbe5b727dc19cc533fd7..0f9093674987077a6757b88c751c02a6446af7c6 100644
--- a/Framework/WorkflowAlgorithms/src/DgsConvertToEnergyTransfer.cpp
+++ b/Framework/WorkflowAlgorithms/src/DgsConvertToEnergyTransfer.cpp
@@ -1,6 +1,6 @@
 #include "MantidWorkflowAlgorithms/DgsConvertToEnergyTransfer.h"
 #include "MantidAPI/MatrixWorkspace.h"
-#include "MantidAPI/PropertyManagerDataService.h"
+#include "MantidKernel/PropertyManagerDataService.h"
 #include "MantidAPI/WorkspaceHistory.h"
 #include "MantidGeometry/IDetector.h"
 #include "MantidGeometry/Instrument.h"
diff --git a/Framework/WorkflowAlgorithms/src/DgsDiagnose.cpp b/Framework/WorkflowAlgorithms/src/DgsDiagnose.cpp
index a95ccf782e2ecc6623856e8d860a19ed562072ae..3bb92e873e1e180f4dfe8bd3e0816b5184f82c8e 100644
--- a/Framework/WorkflowAlgorithms/src/DgsDiagnose.cpp
+++ b/Framework/WorkflowAlgorithms/src/DgsDiagnose.cpp
@@ -1,5 +1,5 @@
 #include "MantidWorkflowAlgorithms/DgsDiagnose.h"
-#include "MantidAPI/PropertyManagerDataService.h"
+#include "MantidKernel/PropertyManagerDataService.h"
 #include "MantidDataObjects/MaskWorkspace.h"
 #include "MantidWorkflowAlgorithms/WorkflowAlgorithmHelpers.h"
 
diff --git a/Framework/WorkflowAlgorithms/src/DgsPreprocessData.cpp b/Framework/WorkflowAlgorithms/src/DgsPreprocessData.cpp
index 3ac902e3424ff1a8f18694a875bbedae429a9207..a12c604c37f48a0599b4cb4776351d175140590b 100644
--- a/Framework/WorkflowAlgorithms/src/DgsPreprocessData.cpp
+++ b/Framework/WorkflowAlgorithms/src/DgsPreprocessData.cpp
@@ -5,7 +5,7 @@
 #include "MantidAPI/FileFinder.h"
 #include "MantidAPI/FileProperty.h"
 #include "MantidAPI/MatrixWorkspace.h"
-#include "MantidAPI/PropertyManagerDataService.h"
+#include "MantidKernel/PropertyManagerDataService.h"
 #include "MantidGeometry/Instrument.h"
 #include "MantidKernel/ConfigService.h"
 #include "MantidKernel/FacilityInfo.h"
diff --git a/Framework/WorkflowAlgorithms/src/DgsProcessDetectorVanadium.cpp b/Framework/WorkflowAlgorithms/src/DgsProcessDetectorVanadium.cpp
index ebaee1bcb7b719afd6d27de5dfef2042ccabad63..67856b3f9208531e6b421ca619f8b36d3ec943a3 100644
--- a/Framework/WorkflowAlgorithms/src/DgsProcessDetectorVanadium.cpp
+++ b/Framework/WorkflowAlgorithms/src/DgsProcessDetectorVanadium.cpp
@@ -1,7 +1,7 @@
 #include "MantidWorkflowAlgorithms/DgsProcessDetectorVanadium.h"
 #include "MantidWorkflowAlgorithms/WorkflowAlgorithmHelpers.h"
 #include "MantidAPI/MatrixWorkspace.h"
-#include "MantidAPI/PropertyManagerDataService.h"
+#include "MantidKernel/PropertyManagerDataService.h"
 #include "MantidGeometry/Instrument.h"
 #include "MantidKernel/ConfigService.h"
 #include "MantidKernel/FacilityInfo.h"
diff --git a/Framework/WorkflowAlgorithms/src/DgsReduction.cpp b/Framework/WorkflowAlgorithms/src/DgsReduction.cpp
index 2e201659d70e0eb9c60ff145a052d5e4d9bca334..1b9eaab5e5c15bc684432bf73183fb82a8a0d87c 100644
--- a/Framework/WorkflowAlgorithms/src/DgsReduction.cpp
+++ b/Framework/WorkflowAlgorithms/src/DgsReduction.cpp
@@ -1,7 +1,7 @@
 #include "MantidWorkflowAlgorithms/DgsReduction.h"
 
 #include "MantidAPI/FileProperty.h"
-#include "MantidAPI/PropertyManagerDataService.h"
+#include "MantidKernel/PropertyManagerDataService.h"
 #include "MantidKernel/ArrayProperty.h"
 #include "MantidKernel/BoundedValidator.h"
 #include "MantidKernel/ConfigService.h"
diff --git a/Framework/WorkflowAlgorithms/src/EQSANSDarkCurrentSubtraction.cpp b/Framework/WorkflowAlgorithms/src/EQSANSDarkCurrentSubtraction.cpp
index 03f289e63799af07aa19a41ac86ade286816ef4c..e7588d49e566479d5ab4fa206112baef1777bb10 100644
--- a/Framework/WorkflowAlgorithms/src/EQSANSDarkCurrentSubtraction.cpp
+++ b/Framework/WorkflowAlgorithms/src/EQSANSDarkCurrentSubtraction.cpp
@@ -9,7 +9,7 @@
 #include "Poco/Path.h"
 #include "Poco/String.h"
 #include "MantidAPI/AlgorithmProperty.h"
-#include "MantidAPI/PropertyManagerDataService.h"
+#include "MantidKernel/PropertyManagerDataService.h"
 #include "MantidKernel/PropertyManager.h"
 
 namespace Mantid {
diff --git a/Framework/WorkflowAlgorithms/src/EQSANSDarkCurrentSubtraction2.cpp b/Framework/WorkflowAlgorithms/src/EQSANSDarkCurrentSubtraction2.cpp
index ae7b4f55e2fe06348832d551b81c99e8557ac6a8..6b0ce14b9bb07180c1b7ab724c83d8fb2d1c7a1e 100644
--- a/Framework/WorkflowAlgorithms/src/EQSANSDarkCurrentSubtraction2.cpp
+++ b/Framework/WorkflowAlgorithms/src/EQSANSDarkCurrentSubtraction2.cpp
@@ -5,7 +5,7 @@
 #include "MantidDataObjects/EventWorkspace.h"
 #include "MantidAPI/AlgorithmProperty.h"
 #include "MantidAPI/FileProperty.h"
-#include "MantidAPI/PropertyManagerDataService.h"
+#include "MantidKernel/PropertyManagerDataService.h"
 #include "MantidAPI/WorkspaceUnitValidator.h"
 #include "MantidGeometry/IDetector.h"
 #include "MantidKernel/PropertyManager.h"
diff --git a/Framework/WorkflowAlgorithms/src/EQSANSLoad.cpp b/Framework/WorkflowAlgorithms/src/EQSANSLoad.cpp
index 465479b5b87f59a03005c638a754a02ba7a1e37f..f7ba4215407a33c0b800a4c2f7447448497ad365 100644
--- a/Framework/WorkflowAlgorithms/src/EQSANSLoad.cpp
+++ b/Framework/WorkflowAlgorithms/src/EQSANSLoad.cpp
@@ -9,7 +9,7 @@
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidAPI/FileFinder.h"
 #include "MantidAPI/FileProperty.h"
-#include "MantidAPI/PropertyManagerDataService.h"
+#include "MantidKernel/PropertyManagerDataService.h"
 #include "MantidAPI/WorkspaceUnitValidator.h"
 #include "MantidGeometry/Instrument.h"
 #include "MantidKernel/PropertyManager.h"
diff --git a/Framework/WorkflowAlgorithms/src/HFIRDarkCurrentSubtraction.cpp b/Framework/WorkflowAlgorithms/src/HFIRDarkCurrentSubtraction.cpp
index 7a4b4bc739980ded2b862d7b1af974e42b9aa0db..d4b11ecfd0c47ba9abeaf1863f68d9593ac8c993 100644
--- a/Framework/WorkflowAlgorithms/src/HFIRDarkCurrentSubtraction.cpp
+++ b/Framework/WorkflowAlgorithms/src/HFIRDarkCurrentSubtraction.cpp
@@ -8,7 +8,7 @@
 #include "Poco/Path.h"
 #include "Poco/String.h"
 #include "MantidAPI/AlgorithmProperty.h"
-#include "MantidAPI/PropertyManagerDataService.h"
+#include "MantidKernel/PropertyManagerDataService.h"
 #include "MantidKernel/PropertyManager.h"
 
 namespace Mantid {
diff --git a/Framework/WorkflowAlgorithms/src/HFIRLoad.cpp b/Framework/WorkflowAlgorithms/src/HFIRLoad.cpp
index f246baf6aff6b0cc5c8d968836e6f3b42c222dfd..1873bfb3c8422cbf2bc6280960456942a139ed7d 100644
--- a/Framework/WorkflowAlgorithms/src/HFIRLoad.cpp
+++ b/Framework/WorkflowAlgorithms/src/HFIRLoad.cpp
@@ -8,7 +8,7 @@
 #include "Poco/NumberFormatter.h"
 #include "MantidKernel/BoundedValidator.h"
 #include "MantidAPI/AlgorithmProperty.h"
-#include "MantidAPI/PropertyManagerDataService.h"
+#include "MantidKernel/PropertyManagerDataService.h"
 #include "MantidAPI/FileProperty.h"
 #include "MantidKernel/PropertyManager.h"
 
diff --git a/Framework/WorkflowAlgorithms/src/SANSBeamFinder.cpp b/Framework/WorkflowAlgorithms/src/SANSBeamFinder.cpp
index 7b51e09285145691305108a8db71e6a7c83d66c7..a20d075fd1414da245982e9d8b3a8e1f0751eb7d 100644
--- a/Framework/WorkflowAlgorithms/src/SANSBeamFinder.cpp
+++ b/Framework/WorkflowAlgorithms/src/SANSBeamFinder.cpp
@@ -6,7 +6,7 @@
 #include "MantidWorkflowAlgorithms/HFIRInstrument.h"
 #include "MantidAPI/FileProperty.h"
 #include "MantidAPI/AlgorithmProperty.h"
-#include "MantidAPI/PropertyManagerDataService.h"
+#include "MantidKernel/PropertyManagerDataService.h"
 #include "MantidDataObjects/EventWorkspace.h"
 #include "MantidGeometry/Instrument.h"
 #include "MantidKernel/PropertyManager.h"
diff --git a/Framework/WorkflowAlgorithms/src/SANSSensitivityCorrection.cpp b/Framework/WorkflowAlgorithms/src/SANSSensitivityCorrection.cpp
index e965561c4af45e817a8f8f9c6bd1c4a6fc7ff7ac..130decbc662ebe8ce1bac5debd82ca76256d9705 100644
--- a/Framework/WorkflowAlgorithms/src/SANSSensitivityCorrection.cpp
+++ b/Framework/WorkflowAlgorithms/src/SANSSensitivityCorrection.cpp
@@ -17,7 +17,7 @@
 #include "MantidNexus/NexusFileIO.h"
 #include "MantidKernel/BoundedValidator.h"
 #include "MantidAPI/AlgorithmProperty.h"
-#include "MantidAPI/PropertyManagerDataService.h"
+#include "MantidKernel/PropertyManagerDataService.h"
 #include "MantidKernel/PropertyManager.h"
 namespace Mantid {
 namespace WorkflowAlgorithms {
diff --git a/Framework/WorkflowAlgorithms/src/SANSSolidAngleCorrection.cpp b/Framework/WorkflowAlgorithms/src/SANSSolidAngleCorrection.cpp
index 9e5cb1d1e2d8edb323036dc134d084bba3b550c1..c88468d3859d6cf545127470565f6533a9870733 100644
--- a/Framework/WorkflowAlgorithms/src/SANSSolidAngleCorrection.cpp
+++ b/Framework/WorkflowAlgorithms/src/SANSSolidAngleCorrection.cpp
@@ -4,7 +4,7 @@
 #include "MantidWorkflowAlgorithms/SANSSolidAngleCorrection.h"
 #include "MantidAPI/AlgorithmProperty.h"
 #include "MantidAPI/HistogramValidator.h"
-#include "MantidAPI/PropertyManagerDataService.h"
+#include "MantidKernel/PropertyManagerDataService.h"
 #include "MantidAPI/WorkspaceFactory.h"
 #include "MantidAPI/WorkspaceUnitValidator.h"
 #include "MantidDataObjects/EventWorkspace.h"
diff --git a/Framework/WorkflowAlgorithms/src/SetupEQSANSReduction.cpp b/Framework/WorkflowAlgorithms/src/SetupEQSANSReduction.cpp
index 7bb457f6bcbbd57503f526a19d55827fffd64dd0..c0f442dca0b174b05dd0ca89b4c01d094b8f511d 100644
--- a/Framework/WorkflowAlgorithms/src/SetupEQSANSReduction.cpp
+++ b/Framework/WorkflowAlgorithms/src/SetupEQSANSReduction.cpp
@@ -10,7 +10,7 @@
 #include "MantidAPI/FileProperty.h"
 #include "MantidKernel/ArrayProperty.h"
 #include "MantidAPI/AlgorithmProperty.h"
-#include "MantidAPI/PropertyManagerDataService.h"
+#include "MantidKernel/PropertyManagerDataService.h"
 #include "MantidKernel/PropertyManager.h"
 #include "Poco/NumberFormatter.h"
 
diff --git a/Framework/WorkflowAlgorithms/src/SetupHFIRReduction.cpp b/Framework/WorkflowAlgorithms/src/SetupHFIRReduction.cpp
index 8aca704e99f6d193d16efed4c4d9027411dd63fc..210b232e47e38c851356124f063618563324298a 100644
--- a/Framework/WorkflowAlgorithms/src/SetupHFIRReduction.cpp
+++ b/Framework/WorkflowAlgorithms/src/SetupHFIRReduction.cpp
@@ -3,7 +3,7 @@
 //----------------------------------------------------------------------
 #include "MantidWorkflowAlgorithms/SetupHFIRReduction.h"
 #include "MantidAPI/AlgorithmProperty.h"
-#include "MantidAPI/PropertyManagerDataService.h"
+#include "MantidKernel/PropertyManagerDataService.h"
 #include "MantidKernel/PropertyManager.h"
 #include "MantidKernel/BoundedValidator.h"
 #include "MantidKernel/ListValidator.h"
diff --git a/Framework/WorkflowAlgorithms/src/SetupILLD33Reduction.cpp b/Framework/WorkflowAlgorithms/src/SetupILLD33Reduction.cpp
index 8f3ad57e14a7f55bfb5b3a9e26945876cbf57def..a2c142e4d4e2cd6380329be17191d29a4b704f46 100644
--- a/Framework/WorkflowAlgorithms/src/SetupILLD33Reduction.cpp
+++ b/Framework/WorkflowAlgorithms/src/SetupILLD33Reduction.cpp
@@ -10,7 +10,7 @@
 #include "MantidAPI/FileProperty.h"
 #include "MantidKernel/ArrayProperty.h"
 #include "MantidAPI/AlgorithmProperty.h"
-#include "MantidAPI/PropertyManagerDataService.h"
+#include "MantidKernel/PropertyManagerDataService.h"
 #include "MantidKernel/PropertyManager.h"
 #include "Poco/NumberFormatter.h"
 
diff --git a/MantidQt/CustomInterfaces/src/SANSRunWindow.cpp b/MantidQt/CustomInterfaces/src/SANSRunWindow.cpp
index fc7303c02b92490d15da4630bc9ae27b8a316e9a..1d2638db145edd325aa73173c0667e8a9f965d85 100644
--- a/MantidQt/CustomInterfaces/src/SANSRunWindow.cpp
+++ b/MantidQt/CustomInterfaces/src/SANSRunWindow.cpp
@@ -15,7 +15,7 @@
 #include "MantidAPI/FrameworkManager.h"
 #include "MantidAPI/IAlgorithm.h"
 #include "MantidAPI/IEventWorkspace.h"
-#include "MantidAPI/PropertyManagerDataService.h"
+#include "MantidKernel/PropertyManagerDataService.h"
 #include "MantidAPI/Run.h"
 #include "MantidAPI/WorkspaceGroup.h"
 #include "MantidGeometry/IComponent.h"