diff --git a/livesupport/modules/storage/src/WebStorageClient.h b/livesupport/modules/storage/include/LiveSupport/Storage/WebStorageClient.h
similarity index 99%
rename from livesupport/modules/storage/src/WebStorageClient.h
rename to livesupport/modules/storage/include/LiveSupport/Storage/WebStorageClient.h
index a3fa7096e..53359c0b2 100644
--- a/livesupport/modules/storage/src/WebStorageClient.h
+++ b/livesupport/modules/storage/include/LiveSupport/Storage/WebStorageClient.h
@@ -22,8 +22,8 @@
  
  
     Author   : $Author: fgerlits $
-    Version  : $Revision: 1.5 $
-    Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storage/src/WebStorageClient.h,v $
+    Version  : $Revision: 1.1 $
+    Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storage/include/LiveSupport/Storage/Attic/WebStorageClient.h,v $
 
 ------------------------------------------------------------------------------*/
 #ifndef WebStorageClient_h
@@ -99,7 +99,7 @@ using namespace LiveSupport::Core;
  *  </code></pre>
  *
  *  @author  $Author: fgerlits $
- *  @version $Revision: 1.5 $
+ *  @version $Revision: 1.1 $
  */
 class WebStorageClient :
                     virtual public Configurable,
diff --git a/livesupport/modules/storage/src/WebStorageClient.cxx b/livesupport/modules/storage/src/WebStorageClient.cxx
index 0e2dcf2c2..d4135abee 100644
--- a/livesupport/modules/storage/src/WebStorageClient.cxx
+++ b/livesupport/modules/storage/src/WebStorageClient.cxx
@@ -22,7 +22,7 @@
  
  
     Author   : $Author: fgerlits $
-    Version  : $Revision: 1.4 $
+    Version  : $Revision: 1.5 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storage/src/WebStorageClient.cxx,v $
 
 ------------------------------------------------------------------------------*/
@@ -45,7 +45,7 @@
 #include <XmlRpcClient.h>
 #include <XmlRpcValue.h>
 
-#include "WebStorageClient.h"
+#include "LiveSupport/Storage/WebStorageClient.h"
 
 using namespace boost::posix_time;
 using namespace XmlRpc;
diff --git a/livesupport/modules/storage/src/WebStorageClientTest.cxx b/livesupport/modules/storage/src/WebStorageClientTest.cxx
index b793757ac..537d0cce2 100644
--- a/livesupport/modules/storage/src/WebStorageClientTest.cxx
+++ b/livesupport/modules/storage/src/WebStorageClientTest.cxx
@@ -22,7 +22,7 @@
  
  
     Author   : $Author: fgerlits $
-    Version  : $Revision: 1.3 $
+    Version  : $Revision: 1.4 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storage/src/WebStorageClientTest.cxx,v $
 
 ------------------------------------------------------------------------------*/
@@ -47,7 +47,7 @@
 #include "WebStorageClient.h"
 #include "LiveSupport/Core/SessionId.h"
 
-#include "WebStorageClientTest.h"
+#include "LiveSupport/Storage/WebStorageClientTest.h"
 
 using namespace std;
 using namespace LiveSupport::Core;
diff --git a/livesupport/modules/storage/src/WebStorageClientTest.h b/livesupport/modules/storage/src/WebStorageClientTest.h
index c5fc76083..ec3d9ff5c 100644
--- a/livesupport/modules/storage/src/WebStorageClientTest.h
+++ b/livesupport/modules/storage/src/WebStorageClientTest.h
@@ -22,7 +22,7 @@
  
  
     Author   : $Author: fgerlits $
-    Version  : $Revision: 1.2 $
+    Version  : $Revision: 1.3 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storage/src/WebStorageClientTest.h,v $
 
 ------------------------------------------------------------------------------*/
@@ -62,7 +62,7 @@ using namespace LiveSupport::Core;
  *  Unit test for the UploadPlaylistMetohd class.
  *
  *  @author  $Author: fgerlits $
- *  @version $Revision: 1.2 $
+ *  @version $Revision: 1.3 $
  *  @see WebStorageClient
  */
 class WebStorageClientTest : public CPPUNIT_NS::TestFixture