diff --git a/livesupport/products/scheduler/src/ScheduleEntry.h b/livesupport/modules/core/include/LiveSupport/Core/ScheduleEntry.h
similarity index 94%
rename from livesupport/products/scheduler/src/ScheduleEntry.h
rename to livesupport/modules/core/include/LiveSupport/Core/ScheduleEntry.h
index 12b37c2b9..e35869d70 100644
--- a/livesupport/products/scheduler/src/ScheduleEntry.h
+++ b/livesupport/modules/core/include/LiveSupport/Core/ScheduleEntry.h
@@ -22,12 +22,12 @@
  
  
     Author   : $Author: maroy $
-    Version  : $Revision: 1.2 $
-    Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/Attic/ScheduleEntry.h,v $
+    Version  : $Revision: 1.1 $
+    Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/core/include/LiveSupport/Core/ScheduleEntry.h,v $
 
 ------------------------------------------------------------------------------*/
-#ifndef ScheduleEntry_h
-#define ScheduleEntry_h
+#ifndef LiveSupport_Core_ScheduleEntry_h
+#define LiveSupport_Core_ScheduleEntry_h
 
 #ifndef __cplusplus
 #error This is a C++ include file
@@ -48,12 +48,11 @@
 
 
 namespace LiveSupport {
-namespace Scheduler {
+namespace Core {
 
 using namespace boost::posix_time;
 
 using namespace LiveSupport;
-using namespace LiveSupport::Core;
 
 
 /* ================================================================ constants */
@@ -68,7 +67,7 @@ using namespace LiveSupport::Core;
  *  A scheduled event.
  *
  *  @author  $Author: maroy $
- *  @version $Revision: 1.2 $
+ *  @version $Revision: 1.1 $
  */
 class ScheduleEntry
 {
@@ -193,8 +192,8 @@ class ScheduleEntry
 /* ====================================================== function prototypes */
 
 
-} // namespace Scheduler
+} // namespace Core
 } // namespace LiveSupport
 
-#endif // ScheduleEntry_h
+#endif // LiveSupport_Core_ScheduleEntry_h
 
diff --git a/livesupport/products/scheduler/src/DisplayScheduleMethod.h b/livesupport/products/scheduler/src/DisplayScheduleMethod.h
index 3231a468d..645349c67 100644
--- a/livesupport/products/scheduler/src/DisplayScheduleMethod.h
+++ b/livesupport/products/scheduler/src/DisplayScheduleMethod.h
@@ -21,8 +21,8 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  
  
-    Author   : $Author: fgerlits $
-    Version  : $Revision: 1.6 $
+    Author   : $Author: maroy $
+    Version  : $Revision: 1.7 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/DisplayScheduleMethod.h,v $
 
 ------------------------------------------------------------------------------*/
@@ -49,7 +49,7 @@
 #include <XmlRpcException.h>
 
 #include "LiveSupport/Core/Ptr.h"
-#include "ScheduleEntry.h"
+#include "LiveSupport/Core/ScheduleEntry.h"
 
 
 namespace LiveSupport {
@@ -106,8 +106,8 @@ using namespace LiveSupport::Core;
  *     <li>1120 - missing session ID argument </li>
  *  </ul>
  *
- *  @author  $Author: fgerlits $
- *  @version $Revision: 1.6 $
+ *  @author  $Author: maroy $
+ *  @version $Revision: 1.7 $
  */
 class DisplayScheduleMethod : public XmlRpc::XmlRpcServerMethod
 {
diff --git a/livesupport/products/scheduler/src/PlaylistEvent.h b/livesupport/products/scheduler/src/PlaylistEvent.h
index d67186b53..468839782 100644
--- a/livesupport/products/scheduler/src/PlaylistEvent.h
+++ b/livesupport/products/scheduler/src/PlaylistEvent.h
@@ -21,8 +21,8 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  
  
-    Author   : $Author: fgerlits $
-    Version  : $Revision: 1.4 $
+    Author   : $Author: maroy $
+    Version  : $Revision: 1.5 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/PlaylistEvent.h,v $
 
 ------------------------------------------------------------------------------*/
@@ -40,12 +40,11 @@
 #include "configure.h"
 #endif
 
+#include "LiveSupport/Core/ScheduleEntry.h"
 #include "LiveSupport/Storage/StorageClientInterface.h"
 #include "LiveSupport/PlaylistExecutor/AudioPlayerInterface.h"
 #include "LiveSupport/EventScheduler/ScheduledEventInterface.h"
 
-#include "ScheduleEntry.h"
-
 namespace LiveSupport {
 namespace Scheduler {
 
@@ -69,8 +68,8 @@ using namespace LiveSupport::Storage;
 /**
  *  A scheduled event for playing a playlist.
  *
- *  @author  $Author: fgerlits $
- *  @version $Revision: 1.4 $
+ *  @author  $Author: maroy $
+ *  @version $Revision: 1.5 $
  */
 class PlaylistEvent : public virtual ScheduledEventInterface
 {
diff --git a/livesupport/products/scheduler/src/ScheduleInterface.h b/livesupport/products/scheduler/src/ScheduleInterface.h
index 17e4a5a9d..f2679316b 100644
--- a/livesupport/products/scheduler/src/ScheduleInterface.h
+++ b/livesupport/products/scheduler/src/ScheduleInterface.h
@@ -22,7 +22,7 @@
  
  
     Author   : $Author: maroy $
-    Version  : $Revision: 1.5 $
+    Version  : $Revision: 1.6 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/ScheduleInterface.h,v $
 
 ------------------------------------------------------------------------------*/
@@ -46,7 +46,7 @@
 #include "LiveSupport/Core/Ptr.h"
 #include "LiveSupport/Core/Installable.h"
 #include "LiveSupport/Core/Playlist.h"
-#include "ScheduleEntry.h"
+#include "LiveSupport/Core/ScheduleEntry.h"
 
 
 namespace LiveSupport {
@@ -70,7 +70,7 @@ using namespace LiveSupport::Core;
  *  The generic interface for the component scheduling events.
  *
  *  @author  $Author: maroy $
- *  @version $Revision: 1.5 $
+ *  @version $Revision: 1.6 $
  */
 class ScheduleInterface : virtual public Installable
 {
diff --git a/livesupport/products/scheduler/src/XmlRpcTools.h b/livesupport/products/scheduler/src/XmlRpcTools.h
index 185c953b7..500eaddd0 100644
--- a/livesupport/products/scheduler/src/XmlRpcTools.h
+++ b/livesupport/products/scheduler/src/XmlRpcTools.h
@@ -21,8 +21,8 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  
  
-    Author   : $Author: fgerlits $
-    Version  : $Revision: 1.13 $
+    Author   : $Author: maroy $
+    Version  : $Revision: 1.14 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/Attic/XmlRpcTools.h,v $
 
 ------------------------------------------------------------------------------*/
@@ -50,8 +50,8 @@
 #include "LiveSupport/Core/Ptr.h"
 #include "LiveSupport/Core/SessionId.h"
 #include "LiveSupport/Core/Playlist.h"
+#include "LiveSupport/Core/ScheduleEntry.h"
 #include "PlayLogEntry.h"
-#include "ScheduleEntry.h"
 
 
 namespace LiveSupport {
@@ -73,8 +73,8 @@ using namespace LiveSupport::Core;
  *  and XmlRpcValues.  Used by almost all XmlRpcServerMethod subclasses
  *  in the Scheduler.
  *
- *  @author  $Author: fgerlits $
- *  @version $Revision: 1.13 $
+ *  @author  $Author: maroy $
+ *  @version $Revision: 1.14 $
  */
 class XmlRpcTools
 {