diff --git a/Framework/Algorithms/CMakeLists.txt b/Framework/Algorithms/CMakeLists.txt
index 5629fdf87de96d8d8182439d927ad926bec7ab95..549a7b699ef8253726ddd2068fbdaafa637f4da9 100644
--- a/Framework/Algorithms/CMakeLists.txt
+++ b/Framework/Algorithms/CMakeLists.txt
@@ -224,7 +224,6 @@ set ( SRC_FILES
 	src/SampleCorrections/MayersSampleCorrection.cpp
 	src/SampleCorrections/MayersSampleCorrectionStrategy.cpp
 	src/SassenaFFT.cpp
-	src/SaveGSASInstrumentFile.cpp
 	src/Scale.cpp
 	src/ScaleX.cpp
 	src/Segfault.cpp
@@ -503,7 +502,6 @@ set ( INC_FILES
 	inc/MantidAlgorithms/SampleCorrections/MayersSampleCorrection.h
 	inc/MantidAlgorithms/SampleCorrections/MayersSampleCorrectionStrategy.h
 	inc/MantidAlgorithms/SassenaFFT.h
-	inc/MantidAlgorithms/SaveGSASInstrumentFile.h
 	inc/MantidAlgorithms/Scale.h
 	inc/MantidAlgorithms/ScaleX.h
 	inc/MantidAlgorithms/Segfault.h
@@ -776,7 +774,6 @@ set ( TEST_FILES
 	RingProfileTest.h
 	SANSCollimationLengthEstimatorTest.h
 	SassenaFFTTest.h
-	SaveGSASInstrumentFileTest.h
 	ScaleTest.h
 	ScaleXTest.h
 	SetInstrumentParameterTest.h
diff --git a/Framework/DataHandling/CMakeLists.txt b/Framework/DataHandling/CMakeLists.txt
index 073b714476895963e67645f6fb98f45005d6e9b0..19b51063671b284ebf54c83aa5db18884eac823c 100644
--- a/Framework/DataHandling/CMakeLists.txt
+++ b/Framework/DataHandling/CMakeLists.txt
@@ -126,6 +126,7 @@ set ( SRC_FILES
 	src/SaveDspacemap.cpp
 	src/SaveFocusedXYE.cpp
 	src/SaveFullprofResolution.cpp
+	src/SaveGSASInstrumentFile.cpp
 	src/SaveGSS.cpp
 	src/SaveILLCosmosAscii.cpp
 	src/SaveISISNexus.cpp
@@ -278,6 +279,7 @@ set ( INC_FILES
 	inc/MantidDataHandling/SaveDspacemap.h
 	inc/MantidDataHandling/SaveFocusedXYE.h
 	inc/MantidDataHandling/SaveFullprofResolution.h
+	inc/MantidDataHandling/SaveGSASInstrumentFile.h
 	inc/MantidDataHandling/SaveGSS.h
 	inc/MantidDataHandling/SaveILLCosmosAscii.h
 	inc/MantidDataHandling/SaveISISNexus.h
@@ -427,6 +429,7 @@ set ( TEST_FILES
 	SaveDspacemapTest.h
 	SaveFocussedXYETest.h
 	SaveFullprofResolutionTest.h
+	SaveGSASInstrumentFileTest.h
 	SaveGSSTest.h
 	SaveILLCosmosAsciiTest.h
 	SaveIsawDetCalTest.h
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/SaveGSASInstrumentFile.h b/Framework/DataHandling/inc/MantidDataHandling/SaveGSASInstrumentFile.h
similarity index 98%
rename from Framework/Algorithms/inc/MantidAlgorithms/SaveGSASInstrumentFile.h
rename to Framework/DataHandling/inc/MantidDataHandling/SaveGSASInstrumentFile.h
index c53091d43df01a1524780c7138a11db3a0935887..c5c97f533d0313071ff268ce5856f930bbdcac78 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/SaveGSASInstrumentFile.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveGSASInstrumentFile.h
@@ -7,7 +7,7 @@
 #include "MantidDataObjects/TableWorkspace.h"
 
 namespace Mantid {
-namespace Algorithms {
+namespace DataHandling {
 
 class ChopperConfiguration;
 
@@ -53,7 +53,7 @@ public:
   virtual int version() const { return (1); }
   /// Algorithm's category for identification
   virtual const std::string category() const {
-    return "Diffraction\\DataHandling";
+    return "DataHandling\\Instrument";
   }
 
 private:
diff --git a/Framework/Algorithms/src/SaveGSASInstrumentFile.cpp b/Framework/DataHandling/src/SaveGSASInstrumentFile.cpp
similarity index 99%
rename from Framework/Algorithms/src/SaveGSASInstrumentFile.cpp
rename to Framework/DataHandling/src/SaveGSASInstrumentFile.cpp
index 8fc922fe4b86c0cb05f950d0b1c1e4dcb56f8633..64b493d683472fc1b9c855adab107d4536cfe2c1 100644
--- a/Framework/Algorithms/src/SaveGSASInstrumentFile.cpp
+++ b/Framework/DataHandling/src/SaveGSASInstrumentFile.cpp
@@ -1,4 +1,4 @@
-#include "MantidAlgorithms/SaveGSASInstrumentFile.h"
+#include "MantidDataHandling/SaveGSASInstrumentFile.h"
 #include "MantidAPI/FrameworkManager.h"
 #include "MantidAPI/FileProperty.h"
 #include "MantidKernel/ListValidator.h"
@@ -16,7 +16,7 @@ using namespace Mantid::DataObjects;
 using namespace std;
 
 namespace Mantid {
-namespace Algorithms {
+namespace DataHandling {
 
 DECLARE_ALGORITHM(SaveGSASInstrumentFile)
 
diff --git a/Framework/Algorithms/test/SaveGSASInstrumentFileTest.h b/Framework/DataHandling/test/SaveGSASInstrumentFileTest.h
similarity index 99%
rename from Framework/Algorithms/test/SaveGSASInstrumentFileTest.h
rename to Framework/DataHandling/test/SaveGSASInstrumentFileTest.h
index 2b6992e306b4ee096c3f5e349e67398125e40d2f..7c1fce3fb1dbf7f3182e5f1d609f97e01ac3d0c6 100644
--- a/Framework/Algorithms/test/SaveGSASInstrumentFileTest.h
+++ b/Framework/DataHandling/test/SaveGSASInstrumentFileTest.h
@@ -3,7 +3,7 @@
 
 #include <cxxtest/TestSuite.h>
 
-#include "MantidAlgorithms/SaveGSASInstrumentFile.h"
+#include "MantidDataHandling/SaveGSASInstrumentFile.h"
 #include "MantidDataObjects/TableWorkspace.h"
 #include "MantidAPI/TableRow.h"
 #include "MantidAPI/FrameworkManager.h"
@@ -17,7 +17,7 @@ using namespace Mantid::DataObjects;
 
 using namespace std;
 
-using Mantid::Algorithms::SaveGSASInstrumentFile;
+using Mantid::DataHandling::SaveGSASInstrumentFile;
 
 class SaveGSASInstrumentFileTest : public CxxTest::TestSuite {
 public: