diff --git a/ccm-bundle/bundles/demo/cfg/web-sci.xml b/ccm-bundle/bundles/demo/cfg/web-sci.xml
index b6c7b4f3d..4720b7c45 100644
--- a/ccm-bundle/bundles/demo/cfg/web-sci.xml
+++ b/ccm-bundle/bundles/demo/cfg/web-sci.xml
@@ -32,7 +32,7 @@
 
   <filter>
     <filter-name>shortcuts</filter-name>
-    <filter-class>com.arsdigita.london.shortcuts.ShortcutFilter</filter-class>
+    <filter-class>com.arsdigita.shortcuts.ShortcutFilter</filter-class>
   </filter>
 
   <filter>
@@ -52,6 +52,7 @@
   </filter-mapping>
 -->
 
+
   <filter-mapping>
     <filter-name>subsite</filter-name>
     <url-pattern>/*</url-pattern>
@@ -157,11 +158,21 @@
      basically requirred by ccm-cms
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
+  <servlet>
+    <servlet-name>content-center</servlet-name>
+    <servlet-class>com.arsdigita.cms.WorkspaceServlet</servlet-class>
+  </servlet>
+
   <servlet>
     <servlet-name>content-section</servlet-name>
     <servlet-class>com.arsdigita.cms.ContentSectionServlet</servlet-class>
   </servlet>
 
+  <servlet>
+    <servlet-name>cms-service</servlet-name>
+    <servlet-class>com.arsdigita.cms.ServiceServlet</servlet-class>
+  </servlet>
+
   <servlet>
     <servlet-name>content-type-xsl</servlet-name>
     <servlet-class>com.arsdigita.cms.dispatcher.ContentTypeXSLServlet</servlet-class>
@@ -280,13 +291,13 @@
   </servlet>
   <!-- module ccm-ldn-search  -  servlet declarations END  -->
 
-  <!-- module ccm-ldn-shortcuts  -  servlet definitions   -->
+  <!-- module ccm-shortcuts  -  servlet definitions   -->
   <servlet>
     <servlet-name>shortcuts-files</servlet-name>
     <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
     <init-param>
       <param-name>template-path</param-name>
-      <param-value>/templates/ccm-ldn-shortcuts</param-value>
+      <param-value>/templates/ccm-shortcuts</param-value>
     </init-param>
   </servlet>
 
@@ -386,10 +397,10 @@
   </servlet-mapping>
   <!-- module ccm-ldn-search  -  servlet mappings END  -->
 
-  <!-- module ccm-ldn-shortcuts  -  servlet mappings   -->
+  <!-- module ccm-shortcuts  -  servlet mappings   -->
   <servlet-mapping>
     <servlet-name>shortcuts-files</servlet-name>
-    <url-pattern>/ccm-ldn-shortcuts/files/*</url-pattern>
+    <url-pattern>/ccm-shortcuts/files/*</url-pattern>
   </servlet-mapping>
 
   <!-- module ccm-subsite  -  servlet mappings BEGIN  -->
@@ -494,9 +505,19 @@
      basically requirred by ccm-cms
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
+  <servlet-mapping>
+    <servlet-name>content-center</servlet-name>
+    <url-pattern>/templates/servlet/content-center/*</url-pattern>
+  </servlet-mapping>
+
   <servlet-mapping>
     <servlet-name>content-section</servlet-name>
-    <url-pattern>/themes/servlet/content-section/*</url-pattern>
+    <url-pattern>/templates/servlet/content-section/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>cms-service</servlet-name>
+    <url-pattern>/templates/servlet/cms-service/*</url-pattern>
   </servlet-mapping>
 
   <servlet-mapping>
diff --git a/ccm-bundle/bundles/devel/cfg/web-sci.xml b/ccm-bundle/bundles/devel/cfg/web-sci.xml
index 7dc51883a..b27996d55 100644
--- a/ccm-bundle/bundles/devel/cfg/web-sci.xml
+++ b/ccm-bundle/bundles/devel/cfg/web-sci.xml
@@ -32,7 +32,7 @@
 
   <filter>
     <filter-name>shortcuts</filter-name>
-    <filter-class>com.arsdigita.london.shortcuts.ShortcutFilter</filter-class>
+    <filter-class>com.arsdigita.shortcuts.ShortcutFilter</filter-class>
   </filter>
 
   <filter>
@@ -52,6 +52,7 @@
   </filter-mapping>
 -->
 
+
   <filter-mapping>
     <filter-name>subsite</filter-name>
     <url-pattern>/*</url-pattern>
@@ -157,11 +158,21 @@
      basically requirred by ccm-cms
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
+  <servlet>
+    <servlet-name>content-center</servlet-name>
+    <servlet-class>com.arsdigita.cms.WorkspaceServlet</servlet-class>
+  </servlet>
+
   <servlet>
     <servlet-name>content-section</servlet-name>
     <servlet-class>com.arsdigita.cms.ContentSectionServlet</servlet-class>
   </servlet>
 
+  <servlet>
+    <servlet-name>cms-service</servlet-name>
+    <servlet-class>com.arsdigita.cms.ServiceServlet</servlet-class>
+  </servlet>
+
   <servlet>
     <servlet-name>content-type-xsl</servlet-name>
     <servlet-class>com.arsdigita.cms.dispatcher.ContentTypeXSLServlet</servlet-class>
@@ -280,13 +291,13 @@
   </servlet>
   <!-- module ccm-ldn-search  -  servlet declarations END  -->
 
-  <!-- module ccm-ldn-shortcuts  -  servlet definitions   -->
+  <!-- module ccm-shortcuts  -  servlet definitions   -->
   <servlet>
     <servlet-name>shortcuts-files</servlet-name>
     <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
     <init-param>
       <param-name>template-path</param-name>
-      <param-value>/templates/ccm-ldn-shortcuts</param-value>
+      <param-value>/templates/ccm-shortcuts</param-value>
     </init-param>
   </servlet>
 
@@ -386,10 +397,10 @@
   </servlet-mapping>
   <!-- module ccm-ldn-search  -  servlet mappings END  -->
 
-  <!-- module ccm-ldn-shortcuts  -  servlet mappings   -->
+  <!-- module ccm-shortcuts  -  servlet mappings   -->
   <servlet-mapping>
     <servlet-name>shortcuts-files</servlet-name>
-    <url-pattern>/ccm-ldn-shortcuts/files/*</url-pattern>
+    <url-pattern>/ccm-shortcuts/files/*</url-pattern>
   </servlet-mapping>
 
   <!-- module ccm-subsite  -  servlet mappings BEGIN  -->
@@ -494,9 +505,19 @@
      basically requirred by ccm-cms
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
+  <servlet-mapping>
+    <servlet-name>content-center</servlet-name>
+    <url-pattern>/templates/servlet/content-center/*</url-pattern>
+  </servlet-mapping>
+
   <servlet-mapping>
     <servlet-name>content-section</servlet-name>
-    <url-pattern>/themes/servlet/content-section/*</url-pattern>
+    <url-pattern>/templates/servlet/content-section/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>cms-service</servlet-name>
+    <url-pattern>/templates/servlet/cms-service/*</url-pattern>
   </servlet-mapping>
 
   <servlet-mapping>
diff --git a/ccm-cms/src/com/arsdigita/cms/Loader.java b/ccm-cms/src/com/arsdigita/cms/Loader.java
index 83ef3e0e1..0fdad9909 100755
--- a/ccm-cms/src/com/arsdigita/cms/Loader.java
+++ b/ccm-cms/src/com/arsdigita/cms/Loader.java
@@ -55,7 +55,7 @@ import org.apache.log4j.Logger;
 //  Next Try
 //  Refactor using legacy compatible web/Application and ApplicationSetup  *DONE*
 //  Refactor content-section als legacy free application                   *DONE*
-//  Refactor workspace (content-center) as a legacy free application
+//  Refactor workspace (content-center) as a legacy free application       *DONE*
 //  Refactor cms-service as a legacy free application                      *DONE*
 
 /**
@@ -185,11 +185,11 @@ public class Loader extends PackageLoader {
         s_log.debug("Creating CMS Workspace...");
 
         /* Create new type legacy compatible application type               */
-        ApplicationType type =  ApplicationType
-                                .createApplicationType(Workspace.PACKAGE_KEY,
-                                                       Workspace.INSTANCE_NAME,
-                                                       Workspace.BASE_DATA_OBJECT_TYPE);
-        type.setDispatcherClass(Workspace.DISPATCHER_CLASS);
+    //  ApplicationType type =  ApplicationType
+    //                          .createApplicationType(Workspace.PACKAGE_KEY,
+    //                                                 Workspace.INSTANCE_NAME,
+    //                                                 Workspace.BASE_DATA_OBJECT_TYPE);
+    //  type.setDispatcherClass(Workspace.DISPATCHER_CLASS);
 
         /* Create new type legacy free application type                 
          * NOTE: The wording in the title parameter of ApplicationType
@@ -198,9 +198,9 @@ public class Loader extends PackageLoader {
          * replacing blanks between words and illegal characters with an
          * hyphen and converted to lower case.
          * "Content Center" will become "content-center".                   */
-    //  ApplicationType type = new 
-    //                         ApplicationType(Workspace.INSTANCE_NAME,
-    //                                         Workspace.BASE_DATA_OBJECT_TYPE );
+        ApplicationType type = new 
+                               ApplicationType(Workspace.INSTANCE_NAME,
+                                               Workspace.BASE_DATA_OBJECT_TYPE );
 
         type.setDescription("The content center workspace for content creators.");
         type.save();
@@ -262,7 +262,7 @@ public class Loader extends PackageLoader {
         // there is only one
 //      appsetup.setDescription("Services to store global resources and assets.");
         // old style / legacy compatible properties
-//      appsetup.setKey(Service.PACKAGE_KEY);
+//      appsetup.setKey(Service.PRIMARY_URL_STUB);
 //      appsetup.setDispatcherClass(Service.DISPATCHER_CLASS);
 //      appsetup.setSingleton(true);
 //      appsetup.setPortalApplication(false);
@@ -278,7 +278,7 @@ public class Loader extends PackageLoader {
 //      //////////////    Current style to create app type    ///////////////
         /* Create new type legacy compatible application type               */
   //    ApplicationType type =  ApplicationType
-  //                            .createApplicationType(Service.PACKAGE_KEY,
+  //                            .createApplicationType(Service.PRIMARY_URL_STUB,
   //                                                   Service.INSTANCE_NAME,
   //                                                   Service.BASE_DATA_OBJECT_TYPE);
   //    type.setDispatcherClass(Service.DISPATCHER_CLASS);
@@ -289,10 +289,9 @@ public class Loader extends PackageLoader {
          * It gets "urlized", i.e. trimming leading and trailing blanks and
          * replacing blanks between words and illegal characters with an
          * hyphen and converted to lower case.
-         * "Content Section" will become "content-section".                   */
-        ApplicationType type = new ApplicationType( 
-                                                Service.INSTANCE_NAME,
-                                                Service.BASE_DATA_OBJECT_TYPE );
+         * "CMS Service" will become "cms-service".                   */
+        ApplicationType type = new ApplicationType("CMS Service", 
+                                                   Service.BASE_DATA_OBJECT_TYPE );
 
         type.setDescription("Services to store global resources and assets.");
         type.save();
@@ -311,7 +310,7 @@ public class Loader extends PackageLoader {
         // old-style package key used as url fragment where to install the instance
         Service app = (Service) Application.createApplication(
                 serviceType,                      // type
-                Service.PACKAGE_KEY,              // url fragment
+                Service.PRIMARY_URL_STUB,         // url fragment
                 "CMS Service Instance",           // title
                 null);                            // parent
         app.setDescription("The default CMS service instance.");
diff --git a/ccm-cms/src/com/arsdigita/cms/Service.java b/ccm-cms/src/com/arsdigita/cms/Service.java
index eeaa64855..7bcb9c13f 100644
--- a/ccm-cms/src/com/arsdigita/cms/Service.java
+++ b/ccm-cms/src/com/arsdigita/cms/Service.java
@@ -23,11 +23,9 @@ import com.arsdigita.cms.dispatcher.StreamImage;
 import com.arsdigita.domain.DataObjectNotFoundException;
 import com.arsdigita.persistence.DataObject;
 import com.arsdigita.persistence.OID;
-// import com.arsdigita.persistence.DataAssociation;
-// import com.arsdigita.persistence.PersistenceException;
 import com.arsdigita.web.Application;
-import com.arsdigita.web.URL;
 
+import com.arsdigita.web.URL;
 import java.math.BigDecimal;
 
 import org.apache.log4j.Logger;
@@ -54,10 +52,9 @@ public class Service extends Application {
                                "com.arsdigita.cms.Service";
 
     // general constants
-    public static final String PACKAGE_KEY = "cms-service";
-    public static final String INSTANCE_NAME = "CMS Service";
-    public static final String DISPATCHER_CLASS =
-                               "com.arsdigita.cms.dispatcher.ServiceDispatcher";
+    public static final String PRIMARY_URL_STUB = "cms-service";
+ // public static final String DISPATCHER_CLASS =
+ //                            "com.arsdigita.cms.dispatcher.ServiceDispatcher";
     // Service has no direct user interface, therefore no styesheet
     // public final static String STYLESHEET =
     //                         "/packages/content-section/xsl/content-center.xsl";
@@ -102,7 +99,7 @@ public class Service extends Application {
 
 
     public static String getURL() {
-        return "/" + PACKAGE_KEY + "/";
+        return "/" + PRIMARY_URL_STUB + "/";
     }
 
     
@@ -171,8 +168,7 @@ public class Service extends Application {
 
     @Override
     public String getServletPath() {
-      //return URL.SERVLET_DIR + "/cms-service";
-        return "/templates/servlet/cms-service";
+        return URL.SERVLET_DIR + "/cms-service";
     }
 
 
diff --git a/ccm-cms/src/com/arsdigita/cms/Workspace.java b/ccm-cms/src/com/arsdigita/cms/Workspace.java
index 17d0e36bb..53fc57593 100644
--- a/ccm-cms/src/com/arsdigita/cms/Workspace.java
+++ b/ccm-cms/src/com/arsdigita/cms/Workspace.java
@@ -21,17 +21,15 @@ package com.arsdigita.cms;
 import com.arsdigita.domain.DataObjectNotFoundException;
 import com.arsdigita.persistence.DataObject;
 import com.arsdigita.persistence.OID;
-// import com.arsdigita.persistence.DataAssociation;
-// import com.arsdigita.persistence.PersistenceException;
 import com.arsdigita.web.Application;
-
 import com.arsdigita.web.ApplicationCollection;
 import com.arsdigita.web.ApplicationType;
+import com.arsdigita.web.URL;
+
 import java.math.BigDecimal;
 
 import org.apache.log4j.Logger;
 
-//  WORK IN PROGRESS !!
 
 /**
  * Application domain class for the CMS module user entry page (content-center)
@@ -50,8 +48,8 @@ public class Workspace extends Application {
     // general constants
     public static final String PACKAGE_KEY = "content-center";
     public static final String INSTANCE_NAME = "Content Center";
-    public static final String DISPATCHER_CLASS =
-                               "com.arsdigita.cms.dispatcher.ContentCenterDispatcher";
+//  public static final String DISPATCHER_CLASS =
+//                             "com.arsdigita.cms.dispatcher.ContentCenterDispatcher";
 
     /**
      * Constructor retrieving a workspace from the database usings its OID.
@@ -142,4 +140,39 @@ public class Workspace extends Application {
         }
     }
 
+    /**
+     * Returns the path name of the location of the applications servlet/JSP.
+     *
+     * Application implementations should overwrite this method to provide an
+     * application specific location, especially if an application (module) is
+     * to be installed along with others in one context.
+     *
+     * If you install the module into its own context you may use a standard
+     * location. In most cases though all modules (applications) of an
+     * webapplication should be installed into one context.
+     *
+     * Frequently it is a symbolic name/path, which will be mapped in the web.xml
+     * to the real location in the file system. Example:
+     * <servlet>
+     *   <servlet-name>content-center</servlet-name>
+     *   <servlet-class>com.arsdigita.cms.WorkspaceServlet</servlet-class>
+     * </servlet>
+     *
+     * <servlet-mapping>
+     *   <servlet-name>content-center</servlet-name>
+     *   <url-pattern>/ccm-applicationName/content-center/*</url-pattern>
+     * </servlet-mapping>
+     *
+     * NOTE: According to Servlet API the path always starts with a leading '/'
+     * and includes either the servlet name or a path to the servlet, but does 
+     * not include any extra path information or a query string. Returns an
+     * empry string ("") is the servlet used was matched using the "/*" pattern.
+     * 
+     * @return path name to the applications servlet/JSP
+     */
+    @Override
+    public String getServletPath() {
+        return URL.SERVLET_DIR + "/content-center";
+    }
+
 }
diff --git a/ccm-cms/src/com/arsdigita/cms/WorkspaceServlet.java b/ccm-cms/src/com/arsdigita/cms/WorkspaceServlet.java
index bded28f89..7faedd532 100644
--- a/ccm-cms/src/com/arsdigita/cms/WorkspaceServlet.java
+++ b/ccm-cms/src/com/arsdigita/cms/WorkspaceServlet.java
@@ -38,6 +38,7 @@ import java.io.IOException;
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Iterator;
 import javax.servlet.RequestDispatcher;
 
 import javax.servlet.ServletException;
@@ -172,6 +173,22 @@ public class WorkspaceServlet extends BaseApplicationServlet {
         }
     }
 
+    /**
+     * Service Method returns the URL stub for the class name,
+     * can return null if not mapped
+     */
+    public static String getURLStubForClass(String classname) {
+        s_log.debug("Getting URL Stub for : " + classname);
+        Iterator itr = s_pageURLs.keySet().iterator();
+        while (itr.hasNext()) {
+            String classname2 = (String)itr.next();
+            s_log.debug("key: " + classname + " value: " +
+                        (String)s_pageURLs.get(classname2));
+        }
+        String url = (String)s_pageURLs.get(classname);
+        return url;
+    }
+
     /**
      * Fetch a page based on the URL stub.
      *
@@ -215,6 +232,28 @@ public class WorkspaceServlet extends BaseApplicationServlet {
         return page;
     }
 
+    /**
+     * Map a page to a URL.
+     *
+     * @param url The URL
+     * @param className The name of the ResourceHandler class
+     * @pre (url != null && className != null)
+     */
+    protected void addResource(String url, String className) {
+        s_pageClasses.put(url, className);
+        s_pageURLs.put(className, url);
+    }
+
+    /**
+     * Release the page at the specified URL.
+     *
+     * @param url The URL
+     * @pre (url != null)
+     */
+    public static void releaseResource(String url) {
+        s_pages.remove(url);
+    }
+
     
     /**
      * Verify that the user is logged in and is able to view the
diff --git a/ccm-cms/src/com/arsdigita/cms/dispatcher/ContentCenterDispatcher.java b/ccm-cms/src/com/arsdigita/cms/dispatcher/ContentCenterDispatcher.java.nolongerInUse
similarity index 100%
rename from ccm-cms/src/com/arsdigita/cms/dispatcher/ContentCenterDispatcher.java
rename to ccm-cms/src/com/arsdigita/cms/dispatcher/ContentCenterDispatcher.java.nolongerInUse
diff --git a/ccm-cms/src/com/arsdigita/cms/dispatcher/ServiceDispatcher.java b/ccm-cms/src/com/arsdigita/cms/dispatcher/ServiceDispatcher..nolongerInUse
similarity index 100%
rename from ccm-cms/src/com/arsdigita/cms/dispatcher/ServiceDispatcher.java
rename to ccm-cms/src/com/arsdigita/cms/dispatcher/ServiceDispatcher..nolongerInUse
diff --git a/ccm-cms/src/com/arsdigita/cms/dispatcher/Utilities.java b/ccm-cms/src/com/arsdigita/cms/dispatcher/Utilities.java
index 6e8414853..f3a8602bd 100755
--- a/ccm-cms/src/com/arsdigita/cms/dispatcher/Utilities.java
+++ b/ccm-cms/src/com/arsdigita/cms/dispatcher/Utilities.java
@@ -26,6 +26,7 @@ import com.arsdigita.cms.ImageAsset;
 import com.arsdigita.cms.SecurityManager;
 import com.arsdigita.cms.Service;
 import com.arsdigita.cms.Workspace;
+import com.arsdigita.cms.WorkspaceServlet;
 import com.arsdigita.dispatcher.DispatcherHelper;
 import com.arsdigita.kernel.Kernel;
 import com.arsdigita.kernel.KernelContext;
@@ -270,8 +271,8 @@ public class Utilities {
         // OLD APPROACH: used in conjunction with CMSDispatcher.  This
         // shouldn't do any harm even if CMSDispatcher is not being used.
         CMSDispatcher.releaseResource(section, "admin/item");
-        ContentCenterDispatcher.releaseResource("");
-        ContentCenterDispatcher.releaseResource("index");
+        WorkspaceServlet.releaseResource("");
+        WorkspaceServlet.releaseResource("index");
         refreshAdminUI(state);
 
         // NEW APPROACH: used in conjunction with
@@ -295,8 +296,8 @@ public class Utilities {
         CMSDispatcher.releaseResource(section, "admin");
         CMSDispatcher.releaseResource(section, "admin/index");
         CMSDispatcher.releaseResource(section, "");
-        ContentCenterDispatcher.releaseResource("");
-        ContentCenterDispatcher.releaseResource("index");
+        WorkspaceServlet.releaseResource("");
+        WorkspaceServlet.releaseResource("index");
     }
 
     /**
diff --git a/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchWidget.java b/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchWidget.java
index 4724b9e46..3a197cbcc 100755
--- a/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchWidget.java
+++ b/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchWidget.java
@@ -39,7 +39,7 @@ import com.arsdigita.cms.CMS;
 import com.arsdigita.cms.ContentItem;
 import com.arsdigita.cms.ContentType;
 import com.arsdigita.cms.Workspace;
-import com.arsdigita.cms.dispatcher.ContentCenterDispatcher;
+import com.arsdigita.cms.WorkspaceServlet;
 import com.arsdigita.domain.DataObjectNotFoundException;
 import com.arsdigita.web.ParameterMap;
 import com.arsdigita.web.URL;
@@ -222,7 +222,7 @@ public class ItemSearchWidget extends FormSection
                 }
 
 
-                String searchURL = ContentCenterDispatcher.getURLStubForClass(
+                String searchURL = WorkspaceServlet.getURLStubForClass(
                         ItemSearchPage.class.getName());
                 s_log.debug("Search URL stub is: " + searchURL);
 
diff --git a/ccm-core/src/com/arsdigita/web/BaseApplicationServlet.java b/ccm-core/src/com/arsdigita/web/BaseApplicationServlet.java
index 4177c0298..974f7b3e1 100755
--- a/ccm-core/src/com/arsdigita/web/BaseApplicationServlet.java
+++ b/ccm-core/src/com/arsdigita/web/BaseApplicationServlet.java
@@ -65,6 +65,7 @@ import org.apache.log4j.Logger;
  */
 public abstract class BaseApplicationServlet extends BaseServlet {
 
+    /** Logger instance for debugging purpose.                                */
     private static Logger s_log = Logger.getLogger(BaseApplicationServlet.class);
 
     /**
diff --git a/ccm-core/src/com/arsdigita/web/URL.java b/ccm-core/src/com/arsdigita/web/URL.java
index 7d850100f..184846ee1 100755
--- a/ccm-core/src/com/arsdigita/web/URL.java
+++ b/ccm-core/src/com/arsdigita/web/URL.java
@@ -159,7 +159,7 @@ public class URL {
     /**
      * The standard location for servlets.
      */
-    public static final String SERVLET_DIR = THEMES_DIR + "/servlet";
+    public static final String SERVLET_DIR = "/templates/servlet";
     
     public static final String INTERNAL_THEME_DIR = THEMES_DIR + "/heirloom";
     
diff --git a/ccm-ldn-aplaws/bundles/custom/cfg/web.xml b/ccm-ldn-aplaws/bundles/custom/cfg/web.xml
index 614bd934b..7c467a083 100755
--- a/ccm-ldn-aplaws/bundles/custom/cfg/web.xml
+++ b/ccm-ldn-aplaws/bundles/custom/cfg/web.xml
@@ -158,11 +158,21 @@
      basically requirred by ccm-cms
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
+  <servlet>
+    <servlet-name>content-center</servlet-name>
+    <servlet-class>com.arsdigita.cms.WorkspaceServlet</servlet-class>
+  </servlet>
+
   <servlet>
     <servlet-name>content-section</servlet-name>
     <servlet-class>com.arsdigita.cms.ContentSectionServlet</servlet-class>
   </servlet>
 
+  <servlet>
+    <servlet-name>cms-service</servlet-name>
+    <servlet-class>com.arsdigita.cms.ServiceServlet</servlet-class>
+  </servlet>
+
   <servlet>
     <servlet-name>content-type-xsl</servlet-name>
     <servlet-class>com.arsdigita.cms.dispatcher.ContentTypeXSLServlet</servlet-class>
@@ -178,7 +188,6 @@
     <servlet-class>com.arsdigita.cms.dispatcher.TemplateXSLServlet</servlet-class>
   </servlet>
 
-
  <servlet>
    <servlet-name>TextOnlyServlet</servlet-name>
    <display-name>Text Only Servlet</display-name>
@@ -512,9 +521,19 @@
      basically requirred by ccm-cms
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
+  <servlet-mapping>
+    <servlet-name>content-center</servlet-name>
+    <url-pattern>/templates/servlet/content-center/*</url-pattern>
+  </servlet-mapping>
+
   <servlet-mapping>
     <servlet-name>content-section</servlet-name>
-    <url-pattern>/themes/servlet/content-section/*</url-pattern>
+    <url-pattern>/templates/servlet/content-section/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>cms-service</servlet-name>
+    <url-pattern>/templates/servlet/cms-service/*</url-pattern>
   </servlet-mapping>
 
   <servlet-mapping>
diff --git a/ccm-ldn-aplaws/bundles/demo/cfg/web.xml b/ccm-ldn-aplaws/bundles/demo/cfg/web.xml
index 771eeab52..71ab96690 100755
--- a/ccm-ldn-aplaws/bundles/demo/cfg/web.xml
+++ b/ccm-ldn-aplaws/bundles/demo/cfg/web.xml
@@ -130,11 +130,21 @@
      basically requirred by ccm-cms
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
+  <servlet>
+    <servlet-name>content-center</servlet-name>
+    <servlet-class>com.arsdigita.cms.WorkspaceServlet</servlet-class>
+  </servlet>
+
   <servlet>
     <servlet-name>content-section</servlet-name>
     <servlet-class>com.arsdigita.cms.ContentSectionServlet</servlet-class>
   </servlet>
 
+  <servlet>
+    <servlet-name>cms-service</servlet-name>
+    <servlet-class>com.arsdigita.cms.ServiceServlet</servlet-class>
+  </servlet>
+
   <servlet>
     <servlet-name>content-type-xsl</servlet-name>
     <servlet-class>com.arsdigita.cms.dispatcher.ContentTypeXSLServlet</servlet-class>
@@ -150,7 +160,6 @@
     <servlet-class>com.arsdigita.cms.dispatcher.TemplateXSLServlet</servlet-class>
   </servlet>
 
-
  <servlet>
    <servlet-name>TextOnlyServlet</servlet-name>
    <display-name>Text Only Servlet</display-name>
@@ -484,9 +493,19 @@
      basically requirred by ccm-cms
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
+  <servlet-mapping>
+    <servlet-name>content-center</servlet-name>
+    <url-pattern>/templates/servlet/content-center/*</url-pattern>
+  </servlet-mapping>
+
   <servlet-mapping>
     <servlet-name>content-section</servlet-name>
-    <url-pattern>/themes/servlet/content-section/*</url-pattern>
+    <url-pattern>/templates/servlet/content-section/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>cms-service</servlet-name>
+    <url-pattern>/templates/servlet/cms-service/*</url-pattern>
   </servlet-mapping>
 
   <servlet-mapping>
diff --git a/ccm-ldn-aplaws/bundles/devel/cfg/web.xml b/ccm-ldn-aplaws/bundles/devel/cfg/web.xml
index ebbf50373..7c467a083 100755
--- a/ccm-ldn-aplaws/bundles/devel/cfg/web.xml
+++ b/ccm-ldn-aplaws/bundles/devel/cfg/web.xml
@@ -158,11 +158,21 @@
      basically requirred by ccm-cms
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
+  <servlet>
+    <servlet-name>content-center</servlet-name>
+    <servlet-class>com.arsdigita.cms.WorkspaceServlet</servlet-class>
+  </servlet>
+
   <servlet>
     <servlet-name>content-section</servlet-name>
     <servlet-class>com.arsdigita.cms.ContentSectionServlet</servlet-class>
   </servlet>
 
+  <servlet>
+    <servlet-name>cms-service</servlet-name>
+    <servlet-class>com.arsdigita.cms.ServiceServlet</servlet-class>
+  </servlet>
+
   <servlet>
     <servlet-name>content-type-xsl</servlet-name>
     <servlet-class>com.arsdigita.cms.dispatcher.ContentTypeXSLServlet</servlet-class>
@@ -511,9 +521,19 @@
      basically requirred by ccm-cms
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
+  <servlet-mapping>
+    <servlet-name>content-center</servlet-name>
+    <url-pattern>/templates/servlet/content-center/*</url-pattern>
+  </servlet-mapping>
+
   <servlet-mapping>
     <servlet-name>content-section</servlet-name>
-    <url-pattern>/themes/servlet/content-section/*</url-pattern>
+    <url-pattern>/templates/servlet/content-section/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>cms-service</servlet-name>
+    <url-pattern>/templates/servlet/cms-service/*</url-pattern>
   </servlet-mapping>
 
   <servlet-mapping>
diff --git a/ccm-ldn-aplaws/bundles/extended/cfg/web.xml b/ccm-ldn-aplaws/bundles/extended/cfg/web.xml
index 614bd934b..7c467a083 100755
--- a/ccm-ldn-aplaws/bundles/extended/cfg/web.xml
+++ b/ccm-ldn-aplaws/bundles/extended/cfg/web.xml
@@ -158,11 +158,21 @@
      basically requirred by ccm-cms
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
+  <servlet>
+    <servlet-name>content-center</servlet-name>
+    <servlet-class>com.arsdigita.cms.WorkspaceServlet</servlet-class>
+  </servlet>
+
   <servlet>
     <servlet-name>content-section</servlet-name>
     <servlet-class>com.arsdigita.cms.ContentSectionServlet</servlet-class>
   </servlet>
 
+  <servlet>
+    <servlet-name>cms-service</servlet-name>
+    <servlet-class>com.arsdigita.cms.ServiceServlet</servlet-class>
+  </servlet>
+
   <servlet>
     <servlet-name>content-type-xsl</servlet-name>
     <servlet-class>com.arsdigita.cms.dispatcher.ContentTypeXSLServlet</servlet-class>
@@ -178,7 +188,6 @@
     <servlet-class>com.arsdigita.cms.dispatcher.TemplateXSLServlet</servlet-class>
   </servlet>
 
-
  <servlet>
    <servlet-name>TextOnlyServlet</servlet-name>
    <display-name>Text Only Servlet</display-name>
@@ -512,9 +521,19 @@
      basically requirred by ccm-cms
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
+  <servlet-mapping>
+    <servlet-name>content-center</servlet-name>
+    <url-pattern>/templates/servlet/content-center/*</url-pattern>
+  </servlet-mapping>
+
   <servlet-mapping>
     <servlet-name>content-section</servlet-name>
-    <url-pattern>/themes/servlet/content-section/*</url-pattern>
+    <url-pattern>/templates/servlet/content-section/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>cms-service</servlet-name>
+    <url-pattern>/templates/servlet/cms-service/*</url-pattern>
   </servlet-mapping>
 
   <servlet-mapping>
diff --git a/ccm-ldn-aplaws/bundles/standard/cfg/web.xml b/ccm-ldn-aplaws/bundles/standard/cfg/web.xml
index 614bd934b..7c467a083 100755
--- a/ccm-ldn-aplaws/bundles/standard/cfg/web.xml
+++ b/ccm-ldn-aplaws/bundles/standard/cfg/web.xml
@@ -158,11 +158,21 @@
      basically requirred by ccm-cms
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
+  <servlet>
+    <servlet-name>content-center</servlet-name>
+    <servlet-class>com.arsdigita.cms.WorkspaceServlet</servlet-class>
+  </servlet>
+
   <servlet>
     <servlet-name>content-section</servlet-name>
     <servlet-class>com.arsdigita.cms.ContentSectionServlet</servlet-class>
   </servlet>
 
+  <servlet>
+    <servlet-name>cms-service</servlet-name>
+    <servlet-class>com.arsdigita.cms.ServiceServlet</servlet-class>
+  </servlet>
+
   <servlet>
     <servlet-name>content-type-xsl</servlet-name>
     <servlet-class>com.arsdigita.cms.dispatcher.ContentTypeXSLServlet</servlet-class>
@@ -178,7 +188,6 @@
     <servlet-class>com.arsdigita.cms.dispatcher.TemplateXSLServlet</servlet-class>
   </servlet>
 
-
  <servlet>
    <servlet-name>TextOnlyServlet</servlet-name>
    <display-name>Text Only Servlet</display-name>
@@ -512,9 +521,19 @@
      basically requirred by ccm-cms
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
+  <servlet-mapping>
+    <servlet-name>content-center</servlet-name>
+    <url-pattern>/templates/servlet/content-center/*</url-pattern>
+  </servlet-mapping>
+
   <servlet-mapping>
     <servlet-name>content-section</servlet-name>
-    <url-pattern>/themes/servlet/content-section/*</url-pattern>
+    <url-pattern>/templates/servlet/content-section/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>cms-service</servlet-name>
+    <url-pattern>/templates/servlet/cms-service/*</url-pattern>
   </servlet-mapping>
 
   <servlet-mapping>
diff --git a/ccm-sci-bundle/bundles/demo/cfg/web-sci.xml b/ccm-sci-bundle/bundles/demo/cfg/web-sci.xml
index f6b04e92f..69abc6f99 100644
--- a/ccm-sci-bundle/bundles/demo/cfg/web-sci.xml
+++ b/ccm-sci-bundle/bundles/demo/cfg/web-sci.xml
@@ -32,7 +32,7 @@
 
   <filter>
     <filter-name>shortcuts</filter-name>
-    <filter-class>com.arsdigita.london.shortcuts.ShortcutFilter</filter-class>
+    <filter-class>com.arsdigita.shortcuts.ShortcutFilter</filter-class>
   </filter>
 
   <filter>
@@ -52,6 +52,7 @@
   </filter-mapping>
 -->
 
+
   <filter-mapping>
     <filter-name>subsite</filter-name>
     <url-pattern>/*</url-pattern>
@@ -157,11 +158,21 @@
      basically requirred by ccm-cms
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
+  <servlet>
+    <servlet-name>content-center</servlet-name>
+    <servlet-class>com.arsdigita.cms.WorkspaceServlet</servlet-class>
+  </servlet>
+
   <servlet>
     <servlet-name>content-section</servlet-name>
     <servlet-class>com.arsdigita.cms.ContentSectionServlet</servlet-class>
   </servlet>
 
+  <servlet>
+    <servlet-name>cms-service</servlet-name>
+    <servlet-class>com.arsdigita.cms.ServiceServlet</servlet-class>
+  </servlet>
+
   <servlet>
     <servlet-name>content-type-xsl</servlet-name>
     <servlet-class>com.arsdigita.cms.dispatcher.ContentTypeXSLServlet</servlet-class>
@@ -280,17 +291,17 @@
   </servlet>
   <!-- module ccm-ldn-search  -  servlet declarations END  -->
 
-  <!-- module ccm-ldn-shortcuts  -  servlet definitions   -->
+  <!-- module ccm-shortcuts  -  servlet definitions   -->
   <servlet>
     <servlet-name>shortcuts-files</servlet-name>
     <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
     <init-param>
       <param-name>template-path</param-name>
-      <param-value>/templates/ccm-ldn-shortcuts</param-value>
+      <param-value>/templates/ccm-shortcuts</param-value>
     </init-param>
   </servlet>
 
-  <!-- module ccm-ldn-subsite  -  servlet declarations BEGIN  -->
+  <!-- module ccm-subsite  -  servlet declarations BEGIN  -->
   <servlet>
     <servlet-name>subsite-files</servlet-name>
     <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
@@ -299,7 +310,7 @@
       <param-value>/templates/ccm-subsite</param-value>
     </init-param>
   </servlet>
-  <!-- module ccm-ldn-subsite  -  servlet declarations END  -->
+  <!-- module ccm-subsite  -  servlet declarations END  -->
 
   <!-- module ccm-ldn-terms  -  servlet declarations BEGIN   -->
   <servlet>
@@ -386,18 +397,18 @@
   </servlet-mapping>
   <!-- module ccm-ldn-search  -  servlet mappings END  -->
 
-  <!-- module ccm-ldn-shortcuts  -  servlet mappings   -->
+  <!-- module ccm-shortcuts  -  servlet mappings   -->
   <servlet-mapping>
     <servlet-name>shortcuts-files</servlet-name>
-    <url-pattern>/ccm-ldn-shortcuts/files/*</url-pattern>
+    <url-pattern>/ccm-shortcuts/files/*</url-pattern>
   </servlet-mapping>
 
-  <!-- module ccm-ldn-subsite  -  servlet mappings BEGIN  -->
+  <!-- module ccm-subsite  -  servlet mappings BEGIN  -->
   <servlet-mapping>
     <servlet-name>subsite-files</servlet-name>
     <url-pattern>/ccm-subsite/files/*</url-pattern>
   </servlet-mapping>
-  <!-- module ccm-ldn-subsite  -  servlet mappings END  -->
+  <!-- module ccm-subsite  -  servlet mappings END  -->
 
   <!-- module ccm-ldn-terms  -  servlet mappings BEGIN  -->
   <servlet-mapping>
@@ -494,9 +505,19 @@
      basically requirred by ccm-cms
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
+  <servlet-mapping>
+    <servlet-name>content-center</servlet-name>
+    <url-pattern>/templates/servlet/content-center/*</url-pattern>
+  </servlet-mapping>
+
   <servlet-mapping>
     <servlet-name>content-section</servlet-name>
-    <url-pattern>/themes/servlet/content-section/*</url-pattern>
+    <url-pattern>/templates/servlet/content-section/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>cms-service</servlet-name>
+    <url-pattern>/templates/servlet/cms-service/*</url-pattern>
   </servlet-mapping>
 
   <servlet-mapping>
diff --git a/ccm-sci-bundle/bundles/devel/cfg/web-sci.xml b/ccm-sci-bundle/bundles/devel/cfg/web-sci.xml
index f036018a8..69abc6f99 100644
--- a/ccm-sci-bundle/bundles/devel/cfg/web-sci.xml
+++ b/ccm-sci-bundle/bundles/devel/cfg/web-sci.xml
@@ -158,6 +158,11 @@
      basically requirred by ccm-cms
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
+  <servlet>
+    <servlet-name>content-center</servlet-name>
+    <servlet-class>com.arsdigita.cms.WorkspaceServlet</servlet-class>
+  </servlet>
+
   <servlet>
     <servlet-name>content-section</servlet-name>
     <servlet-class>com.arsdigita.cms.ContentSectionServlet</servlet-class>
@@ -500,9 +505,14 @@
      basically requirred by ccm-cms
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
+  <servlet-mapping>
+    <servlet-name>content-center</servlet-name>
+    <url-pattern>/templates/servlet/content-center/*</url-pattern>
+  </servlet-mapping>
+
   <servlet-mapping>
     <servlet-name>content-section</servlet-name>
-    <url-pattern>/themes/servlet/content-section/*</url-pattern>
+    <url-pattern>/templates/servlet/content-section/*</url-pattern>
   </servlet-mapping>
 
   <servlet-mapping>
diff --git a/ccm-sci-bundle/bundles/local/jensp-dev/cfg/web-sci.xml b/ccm-sci-bundle/bundles/local/jensp-dev/cfg/web-sci.xml
index f6b04e92f..69abc6f99 100644
--- a/ccm-sci-bundle/bundles/local/jensp-dev/cfg/web-sci.xml
+++ b/ccm-sci-bundle/bundles/local/jensp-dev/cfg/web-sci.xml
@@ -32,7 +32,7 @@
 
   <filter>
     <filter-name>shortcuts</filter-name>
-    <filter-class>com.arsdigita.london.shortcuts.ShortcutFilter</filter-class>
+    <filter-class>com.arsdigita.shortcuts.ShortcutFilter</filter-class>
   </filter>
 
   <filter>
@@ -52,6 +52,7 @@
   </filter-mapping>
 -->
 
+
   <filter-mapping>
     <filter-name>subsite</filter-name>
     <url-pattern>/*</url-pattern>
@@ -157,11 +158,21 @@
      basically requirred by ccm-cms
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
+  <servlet>
+    <servlet-name>content-center</servlet-name>
+    <servlet-class>com.arsdigita.cms.WorkspaceServlet</servlet-class>
+  </servlet>
+
   <servlet>
     <servlet-name>content-section</servlet-name>
     <servlet-class>com.arsdigita.cms.ContentSectionServlet</servlet-class>
   </servlet>
 
+  <servlet>
+    <servlet-name>cms-service</servlet-name>
+    <servlet-class>com.arsdigita.cms.ServiceServlet</servlet-class>
+  </servlet>
+
   <servlet>
     <servlet-name>content-type-xsl</servlet-name>
     <servlet-class>com.arsdigita.cms.dispatcher.ContentTypeXSLServlet</servlet-class>
@@ -280,17 +291,17 @@
   </servlet>
   <!-- module ccm-ldn-search  -  servlet declarations END  -->
 
-  <!-- module ccm-ldn-shortcuts  -  servlet definitions   -->
+  <!-- module ccm-shortcuts  -  servlet definitions   -->
   <servlet>
     <servlet-name>shortcuts-files</servlet-name>
     <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
     <init-param>
       <param-name>template-path</param-name>
-      <param-value>/templates/ccm-ldn-shortcuts</param-value>
+      <param-value>/templates/ccm-shortcuts</param-value>
     </init-param>
   </servlet>
 
-  <!-- module ccm-ldn-subsite  -  servlet declarations BEGIN  -->
+  <!-- module ccm-subsite  -  servlet declarations BEGIN  -->
   <servlet>
     <servlet-name>subsite-files</servlet-name>
     <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
@@ -299,7 +310,7 @@
       <param-value>/templates/ccm-subsite</param-value>
     </init-param>
   </servlet>
-  <!-- module ccm-ldn-subsite  -  servlet declarations END  -->
+  <!-- module ccm-subsite  -  servlet declarations END  -->
 
   <!-- module ccm-ldn-terms  -  servlet declarations BEGIN   -->
   <servlet>
@@ -386,18 +397,18 @@
   </servlet-mapping>
   <!-- module ccm-ldn-search  -  servlet mappings END  -->
 
-  <!-- module ccm-ldn-shortcuts  -  servlet mappings   -->
+  <!-- module ccm-shortcuts  -  servlet mappings   -->
   <servlet-mapping>
     <servlet-name>shortcuts-files</servlet-name>
-    <url-pattern>/ccm-ldn-shortcuts/files/*</url-pattern>
+    <url-pattern>/ccm-shortcuts/files/*</url-pattern>
   </servlet-mapping>
 
-  <!-- module ccm-ldn-subsite  -  servlet mappings BEGIN  -->
+  <!-- module ccm-subsite  -  servlet mappings BEGIN  -->
   <servlet-mapping>
     <servlet-name>subsite-files</servlet-name>
     <url-pattern>/ccm-subsite/files/*</url-pattern>
   </servlet-mapping>
-  <!-- module ccm-ldn-subsite  -  servlet mappings END  -->
+  <!-- module ccm-subsite  -  servlet mappings END  -->
 
   <!-- module ccm-ldn-terms  -  servlet mappings BEGIN  -->
   <servlet-mapping>
@@ -494,9 +505,19 @@
      basically requirred by ccm-cms
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
+  <servlet-mapping>
+    <servlet-name>content-center</servlet-name>
+    <url-pattern>/templates/servlet/content-center/*</url-pattern>
+  </servlet-mapping>
+
   <servlet-mapping>
     <servlet-name>content-section</servlet-name>
-    <url-pattern>/themes/servlet/content-section/*</url-pattern>
+    <url-pattern>/templates/servlet/content-section/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>cms-service</servlet-name>
+    <url-pattern>/templates/servlet/cms-service/*</url-pattern>
   </servlet-mapping>
 
   <servlet-mapping>