diff --git a/Code/Mantid/Framework/MDAlgorithms/CMakeLists.txt b/Code/Mantid/Framework/MDAlgorithms/CMakeLists.txt
index e5ebea75c143c7dade8ac52d61824d2bb256f479..083db4ce6e9023724379f2746df25f2cb85dff2c 100644
--- a/Code/Mantid/Framework/MDAlgorithms/CMakeLists.txt
+++ b/Code/Mantid/Framework/MDAlgorithms/CMakeLists.txt
@@ -11,6 +11,8 @@ set ( SRC_FILES
 	src/CompareMDWorkspaces.cpp
 	src/ConvertToDetectorFaceMD.cpp
 	src/ConvertToMD.cpp
+	src/CreateMDHistoWorkspace.cpp
+	src/CreateMDWorkspace.cpp	
 	src/DampedHisenbergFMSW.cpp
 	src/DivideMD.cpp
 	src/EqualToMD.cpp
@@ -87,6 +89,8 @@ set ( INC_FILES
 	inc/MantidMDAlgorithms/CompareMDWorkspaces.h
 	inc/MantidMDAlgorithms/ConvertToDetectorFaceMD.h
 	inc/MantidMDAlgorithms/ConvertToMD.h
+	inc/MantidMDAlgorithms/CreateMDHistoWorkspace.h
+	inc/MantidMDAlgorithms/CreateMDWorkspace.h	
 	inc/MantidMDAlgorithms/DampedHisenbergFMSW.h
 	inc/MantidMDAlgorithms/DivideMD.h
 	inc/MantidMDAlgorithms/DllConfig.h
@@ -178,6 +182,8 @@ set ( TEST_FILES
 	ConvertToMDComponentsTest.h	
 	ConvertToMDTest.h
 	ConvertToQ3DdETest.h
+	CreateMDHistoWorkspaceTest.h
+	CreateMDWorkspaceTest.h
 	DampedHisenbergFMSWTest.h
 	DivideMDTest.h
 	EqualToMDTest.h
diff --git a/Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/CreateMDHistoWorkspace.h b/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CreateMDHistoWorkspace.h
similarity index 93%
rename from Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/CreateMDHistoWorkspace.h
rename to Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CreateMDHistoWorkspace.h
index e9e0afdcf62c1a51143c60c7a37921b311828cfc..930830c0d0b1a7f98a270fcf8b83e11ae10a005d 100644
--- a/Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/CreateMDHistoWorkspace.h
+++ b/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CreateMDHistoWorkspace.h
@@ -6,7 +6,7 @@
 
 namespace Mantid
 {
-namespace MDEvents
+namespace MDAlgorithms
 {
 
   /** CreateMDHistoWorkspace : TODO: DESCRIPTION
@@ -33,7 +33,7 @@ namespace MDEvents
     File change history is stored at: <https://svn.mantidproject.org/mantid/trunk/Code/Mantid>
     Code Documentation is available at: <http://doxygen.mantidproject.org>
   */
-  class DLLExport CreateMDHistoWorkspace  : public ImportMDHistoWorkspaceBase
+  class DLLExport CreateMDHistoWorkspace  : public MDEvents::ImportMDHistoWorkspaceBase
   {
   public:
     CreateMDHistoWorkspace();
diff --git a/Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/CreateMDWorkspace.h b/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CreateMDWorkspace.h
similarity index 92%
rename from Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/CreateMDWorkspace.h
rename to Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CreateMDWorkspace.h
index e7df19b6fb9a4dda638f9e2e2d28508ad8c19698..3561ae64b0da0b9415b8b2048a042657269aa032 100644
--- a/Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/CreateMDWorkspace.h
+++ b/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CreateMDWorkspace.h
@@ -9,7 +9,7 @@
 
 namespace Mantid
 {
-namespace MDEvents
+namespace MDAlgorithms
 {
 
   /** CreateMDWorkspace :
@@ -20,7 +20,7 @@ namespace MDEvents
    * @author Janik Zikovsky
    * @date 2011-02-25 11:54:52.003137
    */
-  class DLLExport CreateMDWorkspace  : public BoxControllerSettingsAlgorithm
+  class DLLExport CreateMDWorkspace  : public MDEvents::BoxControllerSettingsAlgorithm
   {
   public:
     CreateMDWorkspace();
diff --git a/Code/Mantid/Framework/MDEvents/src/CreateMDHistoWorkspace.cpp b/Code/Mantid/Framework/MDAlgorithms/src/CreateMDHistoWorkspace.cpp
similarity index 98%
rename from Code/Mantid/Framework/MDEvents/src/CreateMDHistoWorkspace.cpp
rename to Code/Mantid/Framework/MDAlgorithms/src/CreateMDHistoWorkspace.cpp
index e9cae4bc0c411d407235eacbf8339c4d835bc1cc..0209f202a2ccb87b955b5da126e0093cca9a0723 100644
--- a/Code/Mantid/Framework/MDEvents/src/CreateMDHistoWorkspace.cpp
+++ b/Code/Mantid/Framework/MDAlgorithms/src/CreateMDHistoWorkspace.cpp
@@ -31,7 +31,7 @@ A very similar algorithm to this is [[ImportMDHistoWorkspace]], which takes it's
 
 *WIKI*/
 
-#include "MantidMDEvents/CreateMDHistoWorkspace.h"
+#include "MantidMDAlgorithms/CreateMDHistoWorkspace.h"
 #include "MantidKernel/ArrayProperty.h"
 #include <algorithm>
 
@@ -40,7 +40,7 @@ using namespace Mantid::API;
 
 namespace Mantid
 {
-namespace MDEvents
+namespace MDAlgorithms
 {
   /**
   Helper type to compute the square in-place.
diff --git a/Code/Mantid/Framework/MDEvents/src/CreateMDWorkspace.cpp b/Code/Mantid/Framework/MDAlgorithms/src/CreateMDWorkspace.cpp
similarity index 99%
rename from Code/Mantid/Framework/MDEvents/src/CreateMDWorkspace.cpp
rename to Code/Mantid/Framework/MDAlgorithms/src/CreateMDWorkspace.cpp
index 1ea26c6b97153e0759d8805c4b8d69b96ed3bb77..0766e761d7330b63996c5ee9c459039000a7f6d8 100644
--- a/Code/Mantid/Framework/MDEvents/src/CreateMDWorkspace.cpp
+++ b/Code/Mantid/Framework/MDAlgorithms/src/CreateMDWorkspace.cpp
@@ -20,7 +20,7 @@ You can create a file-backed MDEventWorkspace by specifying the Filename and Mem
 #include "MantidGeometry/MDGeometry/MDHistoDimension.h"
 #include "MantidKernel/ArrayProperty.h"
 #include "MantidKernel/System.h"
-#include "MantidMDEvents/CreateMDWorkspace.h"
+#include "MantidMDAlgorithms/CreateMDWorkspace.h"
 #include "MantidMDEvents/MDEventFactory.h"
 #include "MantidKernel/Memory.h"
 #include <math.h>
@@ -29,7 +29,7 @@ You can create a file-backed MDEventWorkspace by specifying the Filename and Mem
 
 namespace Mantid
 {
-namespace MDEvents
+namespace MDAlgorithms
 {
   using namespace Mantid::Kernel;
   using namespace Mantid::API;
diff --git a/Code/Mantid/Framework/MDAlgorithms/test/BinMDTest.h b/Code/Mantid/Framework/MDAlgorithms/test/BinMDTest.h
index b60338122f7774919dc795c2af550409fd4b3908..2c235c3aaf7df4ef11942adb1588704b83bb133b 100644
--- a/Code/Mantid/Framework/MDAlgorithms/test/BinMDTest.h
+++ b/Code/Mantid/Framework/MDAlgorithms/test/BinMDTest.h
@@ -225,6 +225,8 @@ public:
 
   void testExecLagreRegularSignal()
   {
+
+
     FakeMDEventData FakeDat;
     TS_ASSERT_THROWS_NOTHING( FakeDat.initialize() )
     TS_ASSERT( FakeDat.isInitialized() )
diff --git a/Code/Mantid/Framework/MDEvents/test/CreateMDHistoWorkspaceTest.h b/Code/Mantid/Framework/MDAlgorithms/test/CreateMDHistoWorkspaceTest.h
similarity index 99%
rename from Code/Mantid/Framework/MDEvents/test/CreateMDHistoWorkspaceTest.h
rename to Code/Mantid/Framework/MDAlgorithms/test/CreateMDHistoWorkspaceTest.h
index 1fa76eecd51102e21994cdd76c04741ba20f7d70..18de101bd91f572957acab7dd71d3f52ab0e4c1e 100644
--- a/Code/Mantid/Framework/MDEvents/test/CreateMDHistoWorkspaceTest.h
+++ b/Code/Mantid/Framework/MDAlgorithms/test/CreateMDHistoWorkspaceTest.h
@@ -7,7 +7,7 @@
 #include <iostream>
 #include <iomanip>
 
-#include "MantidMDEvents/CreateMDHistoWorkspace.h"
+#include "MantidMDAlgorithms/CreateMDHistoWorkspace.h"
 
 using namespace Mantid;
 using namespace Mantid::MDEvents;
diff --git a/Code/Mantid/Framework/MDEvents/test/CreateMDWorkspaceTest.h b/Code/Mantid/Framework/MDAlgorithms/test/CreateMDWorkspaceTest.h
similarity index 99%
rename from Code/Mantid/Framework/MDEvents/test/CreateMDWorkspaceTest.h
rename to Code/Mantid/Framework/MDAlgorithms/test/CreateMDWorkspaceTest.h
index c8513f218621895ffc90c45d82a0a56ab7f071d2..b86a3931e288542c6f370ccd45826637fbc9084b 100644
--- a/Code/Mantid/Framework/MDEvents/test/CreateMDWorkspaceTest.h
+++ b/Code/Mantid/Framework/MDAlgorithms/test/CreateMDWorkspaceTest.h
@@ -5,8 +5,8 @@
 #include "MantidAPI/IMDEventWorkspace.h"
 #include "MantidKernel/System.h"
 #include "MantidKernel/Timer.h"
-#include "MantidMDEvents/CreateMDWorkspace.h"
 #include "MantidMDEvents/MDEventFactory.h"
+#include "MantidMDAlgorithms/CreateMDWorkspace.h"
 #include "MantidAPI/FrameworkManager.h"
 #include <cxxtest/TestSuite.h>
 #include <iomanip>
diff --git a/Code/Mantid/Framework/MDEvents/CMakeLists.txt b/Code/Mantid/Framework/MDEvents/CMakeLists.txt
index 0e528e47263621dbd20c3b7bb966d74e68f6114d..2ecf6f89ee06a04dc09d9ef843ac5f479ae97454 100644
--- a/Code/Mantid/Framework/MDEvents/CMakeLists.txt
+++ b/Code/Mantid/Framework/MDEvents/CMakeLists.txt
@@ -17,8 +17,6 @@ set ( SRC_FILES
 	src/CoordTransformAligned.cpp
 	src/CoordTransformDistance.cpp
 	src/CoordTransformDistanceParser.cpp
-	src/CreateMDHistoWorkspace.cpp
-	src/CreateMDWorkspace.cpp
 	src/FindPeaksMD.cpp
 	src/FitMD.cpp
 	src/ImportMDEventWorkspace.cpp
@@ -83,8 +81,6 @@ set ( INC_FILES
 	inc/MantidMDEvents/CoordTransformAligned.h
 	inc/MantidMDEvents/CoordTransformDistance.h
 	inc/MantidMDEvents/CoordTransformDistanceParser.h
-	inc/MantidMDEvents/CreateMDHistoWorkspace.h
-	inc/MantidMDEvents/CreateMDWorkspace.h
 	inc/MantidMDEvents/FindPeaksMD.h
 	inc/MantidMDEvents/FitMD.h
 	inc/MantidMDEvents/ImportMDEventWorkspace.h
@@ -144,8 +140,6 @@ set ( TEST_FILES
 	CoordTransformAlignedTest.h
 	CoordTransformDistanceParserTest.h
 	CoordTransformDistanceTest.h
-	CreateMDHistoWorkspaceTest.h
-	CreateMDWorkspaceTest.h
 	FindPeaksMDTest.h
 	FitMDTest.h
 	ImportMDEventWorkspaceTest.h