diff --git a/ccm-gen-aplaws/src/com/arsdigita/aplaws/Loader.java b/ccm-gen-aplaws/src/com/arsdigita/aplaws/Loader.java
index 5d2d4ffea..6a4f0a1f6 100755
--- a/ccm-gen-aplaws/src/com/arsdigita/aplaws/Loader.java
+++ b/ccm-gen-aplaws/src/com/arsdigita/aplaws/Loader.java
@@ -18,7 +18,7 @@
 
 package com.arsdigita.aplaws;
 
-import com.arsdigita.london.navigation.Template;
+import com.arsdigita.navigation.Template;
 import com.arsdigita.london.terms.Domain;
 import com.arsdigita.london.terms.importer.Parser;
 // import com.arsdigita.portalworkspace.PageLayout;
diff --git a/ccm-gen-aplaws/src/com/arsdigita/aplaws/ui/AssignedIndexItemTerms.java b/ccm-gen-aplaws/src/com/arsdigita/aplaws/ui/AssignedIndexItemTerms.java
index 38efa6beb..56e2985d2 100755
--- a/ccm-gen-aplaws/src/com/arsdigita/aplaws/ui/AssignedIndexItemTerms.java
+++ b/ccm-gen-aplaws/src/com/arsdigita/aplaws/ui/AssignedIndexItemTerms.java
@@ -24,7 +24,7 @@ import com.arsdigita.cms.ContentBundle;
 import com.arsdigita.cms.ContentItem;
 import com.arsdigita.cms.ContentPage;
 import com.arsdigita.kernel.ACSObject;
-import com.arsdigita.london.navigation.Navigation;
+import com.arsdigita.navigation.Navigation;
 import com.arsdigita.london.terms.ui.AbstractAssignedTerms;
 
 import org.apache.log4j.Logger;
diff --git a/ccm-gen-aplaws/src/com/arsdigita/aplaws/ui/CategoryPortalSelectionModel.java b/ccm-gen-aplaws/src/com/arsdigita/aplaws/ui/CategoryPortalSelectionModel.java
index 5aecfcebe..93e06af4a 100755
--- a/ccm-gen-aplaws/src/com/arsdigita/aplaws/ui/CategoryPortalSelectionModel.java
+++ b/ccm-gen-aplaws/src/com/arsdigita/aplaws/ui/CategoryPortalSelectionModel.java
@@ -18,8 +18,8 @@
 
 package com.arsdigita.aplaws.ui;
 
-import com.arsdigita.london.navigation.Navigation;
-import com.arsdigita.london.navigation.NavigationModel;
+import com.arsdigita.navigation.Navigation;
+import com.arsdigita.navigation.NavigationModel;
 
 import com.arsdigita.persistence.SessionManager;
 import com.arsdigita.persistence.DataCollection;
diff --git a/ccm-gen-aplaws/src/com/arsdigita/aplaws/ui/CategoryTermDetails.java b/ccm-gen-aplaws/src/com/arsdigita/aplaws/ui/CategoryTermDetails.java
index 4c8bf00ff..146e4c9e7 100755
--- a/ccm-gen-aplaws/src/com/arsdigita/aplaws/ui/CategoryTermDetails.java
+++ b/ccm-gen-aplaws/src/com/arsdigita/aplaws/ui/CategoryTermDetails.java
@@ -22,7 +22,7 @@ import com.arsdigita.london.terms.Term;
 import com.arsdigita.london.terms.ui.AbstractTermDetails;
 import com.arsdigita.persistence.DataCollection;
 import com.arsdigita.persistence.SessionManager;
-import com.arsdigita.london.navigation.Navigation;
+import com.arsdigita.navigation.Navigation;
 import com.arsdigita.categorization.Category;
 import com.arsdigita.bebop.PageState;
 import com.arsdigita.domain.DomainObjectFactory;
diff --git a/ccm-sci-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/SciOrganizationDescription.jsp b/ccm-sci-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/SciOrganizationDescription.jsp
index f230b8493..36bd83a39 100644
--- a/ccm-sci-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/SciOrganizationDescription.jsp
+++ b/ccm-sci-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/SciOrganizationDescription.jsp
@@ -6,9 +6,9 @@
 
     <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
     <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
-    <jsp:directive.page import="com.arsdigita.london.navigation.Navigation"/>
-    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionDefinition"/>
-    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionRenderer"/>
+    <jsp:directive.page import="com.arsdigita.navigation.Navigation"/>
+    <jsp:directive.page import="com.arsdigita.navigation.cms.CMSDataCollectionDefinition"/>
+    <jsp:directive.page import="com.arsdigita.navigation.cms.CMSDataCollectionRenderer"/>
 
 
     <jsp:scriptlet>
@@ -24,22 +24,22 @@
                  title="Navigation" cache="true">
 
         <define:component name="greetingItem"
-                          classname="com.arsdigita.london.navigation.ui.GreetingItem"/>
+                          classname="com.arsdigita.navigation.ui.GreetingItem"/>
         <define:component name="categoryPath"
-                          classname="com.arsdigita.london.navigation.ui.category.Path"/>
+                          classname="com.arsdigita.navigation.ui.category.Path"/>
         <define:component name="categoryMenu"
-                          classname="com.arsdigita.london.navigation.ui.category.Menu"/>
+                          classname="com.arsdigita.navigation.ui.category.Menu"/>
         <define:component name="itemList"
-                          classname="com.arsdigita.london.navigation.ui.object.SimpleObjectList"/>
+                          classname="com.arsdigita.navigation.ui.object.SimpleObjectList"/>
 
         <define:component name="assignedTerms"
-                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>        
+                          classname="com.arsdigita.navigation.ui.CategoryIndexAssignedTerms"/>        
 
         <define:component name="itemXML"
                           classname="com.arsdigita.cms.dispatcher.SciOrganizationDescriptionPanel"/>
 
           <define:component name="assignedTerms"
-                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
+                          classname="com.arsdigita.navigation.ui.CategoryIndexAssignedTerms"/>
 
     </define:page>
 
diff --git a/ccm-sci-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/scidepartment-item.jsp b/ccm-sci-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/scidepartment-item.jsp
index 243a5eecf..c53ce0e63 100644
--- a/ccm-sci-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/scidepartment-item.jsp
+++ b/ccm-sci-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/scidepartment-item.jsp
@@ -4,8 +4,8 @@
           version="1.2">
 
     <jsp:directive.page
-        import="com.arsdigita.london.navigation.NavigationModel,
-        com.arsdigita.london.navigation.cms.CMSNavigationModel"/>
+        import="com.arsdigita.navigation.NavigationModel,
+        com.arsdigita.navigation.cms.CMSNavigationModel"/>
 
     <jsp:declaration>
     NavigationModel model = new CMSNavigationModel();
@@ -15,15 +15,15 @@
                  title="APLAWS" cache="false">
 
         <define:component name="categoryPath"
-                          classname="com.arsdigita.london.navigation.ui.category.Path"/>
+                          classname="com.arsdigita.navigation.ui.category.Path"/>
         <jsp:scriptlet>
-       ((com.arsdigita.london.navigation.ui.category.Path)categoryPath)
+       ((com.arsdigita.navigation.ui.category.Path)categoryPath)
          .setModel(model);
         </jsp:scriptlet>
         <define:component name="categoryMenu"
-                          classname="com.arsdigita.london.navigation.ui.category.Menu"/>
+                          classname="com.arsdigita.navigation.ui.category.Menu"/>
         <jsp:scriptlet>
-       ((com.arsdigita.london.navigation.ui.category.Menu)categoryMenu)
+       ((com.arsdigita.navigation.ui.category.Menu)categoryMenu)
          .setModel(model);
         </jsp:scriptlet>
         <define:component name="itemXML"
@@ -32,10 +32,10 @@
                           classname="com.arsdigita.cms.contenttypes.ui.SciDepartmentPanel"/>
 
         <define:component name="relatedItems"
-                          classname="com.arsdigita.london.navigation.ui.RelatedItems"/>
+                          classname="com.arsdigita.lnavigation.ui.RelatedItems"/>
 
         <define:component name="assignedTerms"
-                          classname="com.arsdigita.aplaws.ui.AssignedItemTerms"/>
+                          classname="com.arsdigita.bundle.ui.AssignedItemTerms"/>
     </define:page>
 
     <show:all/>
diff --git a/ccm-sci-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/sciorganization-item.jsp b/ccm-sci-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/sciorganization-item.jsp
index 62af26a79..8ef611dd3 100644
--- a/ccm-sci-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/sciorganization-item.jsp
+++ b/ccm-sci-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/sciorganization-item.jsp
@@ -4,8 +4,8 @@
           version="1.2">
 
     <jsp:directive.page
-        import="com.arsdigita.london.navigation.NavigationModel,
-        com.arsdigita.london.navigation.cms.CMSNavigationModel"/>
+        import="com.arsdigita.navigation.NavigationModel,
+        com.arsdigita.navigation.cms.CMSNavigationModel"/>
 
     <jsp:declaration>
     NavigationModel model = new CMSNavigationModel();
@@ -15,15 +15,15 @@
                  title="APLAWS" cache="false">
 
         <define:component name="categoryPath"
-                          classname="com.arsdigita.london.navigation.ui.category.Path"/>
+                          classname="com.arsdigita.navigation.ui.category.Path"/>
         <jsp:scriptlet>
-       ((com.arsdigita.london.navigation.ui.category.Path)categoryPath)
+       ((com.arsdigita.navigation.ui.category.Path)categoryPath)
          .setModel(model);
         </jsp:scriptlet>
         <define:component name="categoryMenu"
-                          classname="com.arsdigita.london.navigation.ui.category.Menu"/>
+                          classname="com.arsdigita.navigation.ui.category.Menu"/>
         <jsp:scriptlet>
-       ((com.arsdigita.london.navigation.ui.category.Menu)categoryMenu)
+       ((com.arsdigita.navigation.ui.category.Menu)categoryMenu)
          .setModel(model);
         </jsp:scriptlet>
         <define:component name="itemXML"
@@ -32,10 +32,10 @@
                           classname="com.arsdigita.cms.contenttypes.ui.SciOrganizationPanel"/>
 
         <define:component name="relatedItems"
-                          classname="com.arsdigita.london.navigation.ui.RelatedItems"/>
+                          classname="com.arsdigita.navigation.ui.RelatedItems"/>
 
         <define:component name="assignedTerms"
-                          classname="com.arsdigita.aplaws.ui.AssignedItemTerms"/>
+                          classname="com.arsdigita.bundle.ui.AssignedItemTerms"/>
     </define:page>
 
     <show:all/>
diff --git a/ccm-sci-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/sciproject-item.jsp b/ccm-sci-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/sciproject-item.jsp
index 7fdea09ed..c7f8a2d93 100644
--- a/ccm-sci-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/sciproject-item.jsp
+++ b/ccm-sci-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/sciproject-item.jsp
@@ -4,8 +4,8 @@
           version="1.2">
 
     <jsp:directive.page
-        import="com.arsdigita.london.navigation.NavigationModel,
-        com.arsdigita.london.navigation.cms.CMSNavigationModel"/>
+        import="com.arsdigita.navigation.NavigationModel,
+        com.arsdigita.navigation.cms.CMSNavigationModel"/>
 
     <jsp:declaration>
     NavigationModel model = new CMSNavigationModel();
@@ -15,15 +15,15 @@
                  title="APLAWS" cache="false">
 
         <define:component name="categoryPath"
-                          classname="com.arsdigita.london.navigation.ui.category.Path"/>
+                          classname="com.arsdigita.navigation.ui.category.Path"/>
         <jsp:scriptlet>
-       ((com.arsdigita.london.navigation.ui.category.Path)categoryPath)
+       ((com.arsdigita.navigation.ui.category.Path)categoryPath)
          .setModel(model);
         </jsp:scriptlet>
         <define:component name="categoryMenu"
-                          classname="com.arsdigita.london.navigation.ui.category.Menu"/>
+                          classname="com.arsdigita.navigation.ui.category.Menu"/>
         <jsp:scriptlet>
-       ((com.arsdigita.london.navigation.ui.category.Menu)categoryMenu)
+       ((com.arsdigita.navigation.ui.category.Menu)categoryMenu)
          .setModel(model);
         </jsp:scriptlet>
         <define:component name="itemXML"
@@ -32,10 +32,10 @@
                           classname="com.arsdigita.cms.contenttypes.ui.SciProjectPanel"/>
 
         <define:component name="relatedItems"
-                          classname="com.arsdigita.london.navigation.ui.RelatedItems"/>
+                          classname="com.arsdigita.navigation.ui.RelatedItems"/>
 
         <define:component name="assignedTerms"
-                          classname="com.arsdigita.aplaws.ui.AssignedItemTerms"/>
+                          classname="com.arsdigita.bundle.ui.AssignedItemTerms"/>
     </define:page>
 
     <show:all/>
diff --git a/ccm-sci-types-organizationwithpublications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/scidepartment-with-publications-item.jsp b/ccm-sci-types-organizationwithpublications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/scidepartment-with-publications-item.jsp
index 8e3e4cb3c..b8003537c 100644
--- a/ccm-sci-types-organizationwithpublications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/scidepartment-with-publications-item.jsp
+++ b/ccm-sci-types-organizationwithpublications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/scidepartment-with-publications-item.jsp
@@ -4,8 +4,8 @@
           version="1.2">
 
     <jsp:directive.page
-        import="com.arsdigita.london.navigation.NavigationModel,
-        com.arsdigita.london.navigation.cms.CMSNavigationModel"/>
+        import="com.arsdigita.navigation.NavigationModel,
+        com.arsdigita.navigation.cms.CMSNavigationModel"/>
 
     <jsp:declaration>
     NavigationModel model = new CMSNavigationModel();
@@ -15,15 +15,15 @@
                  title="APLAWS" cache="false">
 
         <define:component name="categoryPath"
-                          classname="com.arsdigita.london.navigation.ui.category.Path"/>
+                          classname="com.arsdigita.navigation.ui.category.Path"/>
         <jsp:scriptlet>
-       ((com.arsdigita.london.navigation.ui.category.Path)categoryPath)
+       ((com.arsdigita.navigation.ui.category.Path)categoryPath)
          .setModel(model);
         </jsp:scriptlet>
         <define:component name="categoryMenu"
-                          classname="com.arsdigita.london.navigation.ui.category.Menu"/>
+                          classname="com.arsdigita.navigation.ui.category.Menu"/>
         <jsp:scriptlet>
-       ((com.arsdigita.london.navigation.ui.category.Menu)categoryMenu)
+       ((com.arsdigita.navigation.ui.category.Menu)categoryMenu)
          .setModel(model);
         </jsp:scriptlet>
         <define:component name="itemXML"
@@ -32,10 +32,10 @@
                           classname="com.arsdigita.cms.contenttypes.ui.SciDepartmentWithPublicationsPanel"/>
 
         <define:component name="relatedItems"
-                          classname="com.arsdigita.london.navigation.ui.RelatedItems"/>
+                          classname="com.arsdigita.navigation.ui.RelatedItems"/>
 
         <define:component name="assignedTerms"
-                          classname="com.arsdigita.aplaws.ui.AssignedItemTerms"/>
+                          classname="com.arsdigita.bundle.ui.AssignedItemTerms"/>
     </define:page>
 
     <show:all/>
diff --git a/ccm-sci-types-organizationwithpublications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/sciproject-with-publications-item.jsp b/ccm-sci-types-organizationwithpublications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/sciproject-with-publications-item.jsp
index 739de1477..a5f875fe1 100644
--- a/ccm-sci-types-organizationwithpublications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/sciproject-with-publications-item.jsp
+++ b/ccm-sci-types-organizationwithpublications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/sciproject-with-publications-item.jsp
@@ -4,8 +4,8 @@
           version="1.2">
 
     <jsp:directive.page
-        import="com.arsdigita.london.navigation.NavigationModel,
-        com.arsdigita.london.navigation.cms.CMSNavigationModel"/>
+        import="com.arsdigita.navigation.NavigationModel,
+        com.arsdigita.navigation.cms.CMSNavigationModel"/>
 
     <jsp:declaration>
     NavigationModel model = new CMSNavigationModel();
@@ -15,15 +15,15 @@
                  title="APLAWS" cache="false">
 
         <define:component name="categoryPath"
-                          classname="com.arsdigita.london.navigation.ui.category.Path"/>
+                          classname="com.arsdigita.navigation.ui.category.Path"/>
         <jsp:scriptlet>
-       ((com.arsdigita.london.navigation.ui.category.Path)categoryPath)
+       ((com.arsdigita.navigation.ui.category.Path)categoryPath)
          .setModel(model);
         </jsp:scriptlet>
         <define:component name="categoryMenu"
-                          classname="com.arsdigita.london.navigation.ui.category.Menu"/>
+                          classname="com.arsdigita.navigation.ui.category.Menu"/>
         <jsp:scriptlet>
-       ((com.arsdigita.london.navigation.ui.category.Menu)categoryMenu)
+       ((com.arsdigita.navigation.ui.category.Menu)categoryMenu)
          .setModel(model);
         </jsp:scriptlet>
         <define:component name="itemXML"
@@ -32,10 +32,10 @@
                           classname="com.arsdigita.cms.contenttypes.ui.SciProjectWithPublicationsPanel"/>
 
         <define:component name="relatedItems"
-                          classname="com.arsdigita.london.navigation.ui.RelatedItems"/>
+                          classname="com.arsdigita.navigation.ui.RelatedItems"/>
 
         <define:component name="assignedTerms"
-                          classname="com.arsdigita.aplaws.ui.AssignedItemTerms"/>
+                          classname="com.arsdigita.bundle.ui.AssignedItemTerms"/>
     </define:page>
 
     <show:all/>
diff --git a/ccm-zes-aplaws/src/com/arsdigita/aplaws/Loader.java b/ccm-zes-aplaws/src/com/arsdigita/aplaws/Loader.java
index 938abe73a..7816c34ff 100644
--- a/ccm-zes-aplaws/src/com/arsdigita/aplaws/Loader.java
+++ b/ccm-zes-aplaws/src/com/arsdigita/aplaws/Loader.java
@@ -18,7 +18,7 @@
 
 package com.arsdigita.aplaws;
 
-import com.arsdigita.london.navigation.Template;
+import com.arsdigita.navigation.Template;
 import com.arsdigita.london.terms.Domain;
 import com.arsdigita.london.terms.importer.Parser;
 import com.arsdigita.portalworkspace.PageLayout;
diff --git a/ccm-zes-aplaws/src/com/arsdigita/aplaws/ui/AssignedIndexItemTerms.java b/ccm-zes-aplaws/src/com/arsdigita/aplaws/ui/AssignedIndexItemTerms.java
index 38efa6beb..56e2985d2 100644
--- a/ccm-zes-aplaws/src/com/arsdigita/aplaws/ui/AssignedIndexItemTerms.java
+++ b/ccm-zes-aplaws/src/com/arsdigita/aplaws/ui/AssignedIndexItemTerms.java
@@ -24,7 +24,7 @@ import com.arsdigita.cms.ContentBundle;
 import com.arsdigita.cms.ContentItem;
 import com.arsdigita.cms.ContentPage;
 import com.arsdigita.kernel.ACSObject;
-import com.arsdigita.london.navigation.Navigation;
+import com.arsdigita.navigation.Navigation;
 import com.arsdigita.london.terms.ui.AbstractAssignedTerms;
 
 import org.apache.log4j.Logger;
diff --git a/ccm-zes-aplaws/src/com/arsdigita/aplaws/ui/CategoryPortalSelectionModel.java b/ccm-zes-aplaws/src/com/arsdigita/aplaws/ui/CategoryPortalSelectionModel.java
index 5aecfcebe..93e06af4a 100644
--- a/ccm-zes-aplaws/src/com/arsdigita/aplaws/ui/CategoryPortalSelectionModel.java
+++ b/ccm-zes-aplaws/src/com/arsdigita/aplaws/ui/CategoryPortalSelectionModel.java
@@ -18,8 +18,8 @@
 
 package com.arsdigita.aplaws.ui;
 
-import com.arsdigita.london.navigation.Navigation;
-import com.arsdigita.london.navigation.NavigationModel;
+import com.arsdigita.navigation.Navigation;
+import com.arsdigita.navigation.NavigationModel;
 
 import com.arsdigita.persistence.SessionManager;
 import com.arsdigita.persistence.DataCollection;
diff --git a/ccm-zes-aplaws/src/com/arsdigita/aplaws/ui/CategoryTermDetails.java b/ccm-zes-aplaws/src/com/arsdigita/aplaws/ui/CategoryTermDetails.java
index 4c8bf00ff..146e4c9e7 100644
--- a/ccm-zes-aplaws/src/com/arsdigita/aplaws/ui/CategoryTermDetails.java
+++ b/ccm-zes-aplaws/src/com/arsdigita/aplaws/ui/CategoryTermDetails.java
@@ -22,7 +22,7 @@ import com.arsdigita.london.terms.Term;
 import com.arsdigita.london.terms.ui.AbstractTermDetails;
 import com.arsdigita.persistence.DataCollection;
 import com.arsdigita.persistence.SessionManager;
-import com.arsdigita.london.navigation.Navigation;
+import com.arsdigita.navigation.Navigation;
 import com.arsdigita.categorization.Category;
 import com.arsdigita.bebop.PageState;
 import com.arsdigita.domain.DomainObjectFactory;