diff --git a/ccm-ldn-navigation/src/ccm-ldn-navigation.config b/ccm-ldn-navigation/src/ccm-ldn-navigation.config
deleted file mode 100755
index a75b0e70c..000000000
--- a/ccm-ldn-navigation/src/ccm-ldn-navigation.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<registry>
-   <config class="com.arsdigita.london.navigation.NavigationConfig"
-           storage="ccm-ldn-navigation/navigation.properties"/>
-</registry>
diff --git a/ccm-ldn-navigation/src/ccm-ldn-navigation.upgrade b/ccm-ldn-navigation/src/ccm-ldn-navigation.upgrade
deleted file mode 100755
index 11e06778c..000000000
--- a/ccm-ldn-navigation/src/ccm-ldn-navigation.upgrade
+++ /dev/null
@@ -1,22 +0,0 @@
-<upgrade>
-  <version from="1.4.1" to="1.4.2">
-    <script sql="ccm-ldn-navigation/upgrade/::database::-1.4.1-1.4.2.sql"/>
-    <script class="com.arsdigita.london.navigation.upgrades.Upgrade141to142"/>
-  </version>
-  <version from="1.4.2" to="1.4.3">
-    <script sql="ccm-ldn-navigation/upgrade/::database::-1.4.2-1.4.3.sql"/>
-  </version>
-  <version from="1.4.3" to="1.4.4">
-    <script sql="ccm-ldn-navigation/upgrade/::database::-1.4.3-1.4.4.sql"/>
-  </version>
-  <version from="6.5.0" to="6.5.1">
-    <script sql="ccm-ldn-navigation/upgrade/::database::-6.5.0-6.5.1.sql"/>
-    <script class="com.arsdigita.london.navigation.upgrades.Upgrade650to651"/>
-  </version>
-  <version from="6.6.0" to="6.6.1">
-    <script sql="ccm-ldn-navigation/upgrade/::database::-6.6.0-6.6.1.sql"/>
-  </version>
-  <version from="6.6.1" to="6.6.2">
-    <script sql="ccm-ldn-navigation/upgrade/::database::-6.6.1-6.6.2.sql"/>
-  </version>
-</upgrade>
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/NavigationConfig_parameter.properties b/ccm-ldn-navigation/src/com/arsdigita/london/navigation/NavigationConfig_parameter.properties
deleted file mode 100755
index fe0e78cd0..000000000
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/NavigationConfig_parameter.properties
+++ /dev/null
@@ -1,89 +0,0 @@
-com.arsdigita.london.navigation.index_page_cache_lifetime.title=Index Page Cache Lifetime
-com.arsdigita.london.navigation.index_page_cache_lifetime.purpose=The cache lifetime for category index pages in seconds. Default 1 hour
-com.arsdigita.london.navigation.index_page_cache_lifetime.example=3600
-com.arsdigita.london.navigation.index_page_cache_lifetime.format=[integer]
-
-com.arsdigita.london.navigation.generate_item_url.title=Generate Item URL
-com.arsdigita.london.navigation.generate_item_url.purpose=Generate full item URLs instead of going via search redirector
-com.arsdigita.london.navigation.generate_item_url.example=true
-com.arsdigita.london.navigation.generate_item_url.format=[boolean]
-
-com.arsdigita.london.navigation.default_template.title=Default Template
-com.arsdigita.london.navigation.default_template.purpose=The default category template
-com.arsdigita.london.navigation.default_template.example=/packages/navigation/templates/default.jsp
-com.arsdigita.london.navigation.default_template.format=[string]
-
-com.arsdigita.london.navigation.inherit_templates.title=Inherit Templates from Parent
-com.arsdigita.london.navigation.inherit_templates.purpose=If no template for category, should it get template from parent, or fall back on default
-com.arsdigita.london.navigation.inherit_templates.example=true|false
-com.arsdigita.london.navigation.inherit_templates.format=[boolean]
-
-com.arsdigita.london.navigation.default_content_section_url.title=Default Content Section URL
-com.arsdigita.london.navigation.default_content_section_url.purpose=The URL of the default content section
-com.arsdigita.london.navigation.default_content_section_url.example=/content/
-com.arsdigita.london.navigation.default_content_section_url.format=[string]
-
-com.arsdigita.london.navigation.related_items_context.title=Related items category use context
-com.arsdigita.london.navigation.related_items_context.purpose=The category use context for the related items query
-com.arsdigita.london.navigation.related_items_context.example=subject
-com.arsdigita.london.navigation.related_items_context.format=[string]
-
-com.arsdigita.london.navigation.related_items_factory.title=Related items factory implementation
-com.arsdigita.london.navigation.related_items_factory.purpose=The implementation of RelatedItemsQueryFactory class
-com.arsdigita.london.navigation.related_items_factory.example=com.arsdigita.london.navigation.RelatedItemsQueryFactoryImpl
-com.arsdigita.london.navigation.related_items_factory.format=[class]
-
-com.arsdigita.london.navigation.default_cat_root_path.title=Default Category Root Path
-com.arsdigita.london.navigation.default_cat_root_path.purpose=The URL of the application whose root category is to be used as the default root category
-com.arsdigita.london.navigation.default_cat_root_path.example=/navigation/
-com.arsdigita.london.navigation.default_cat_root_path.format=[string]
-
-com.arsdigita.london.navigation.default_nav_model.title=Default Navigation Model
-com.arsdigita.london.navigation.default_nav_model.purpose=The class of the default navigation model
-com.arsdigita.london.navigation.default_nav_model.example=com.arsdigita.london.navigation.ApplicationNavigationModel
-com.arsdigita.london.navigation.default_nav_model.format=[class]
-
-com.arsdigita.london.navigation.traversal_adapters.title=XML renderer rules
-com.arsdigita.london.navigation.traversal_adapters.purpose=Name of file with rules for configuring information in generated XML
-com.arsdigita.london.navigation.traversal_adapters.format=[string]
-com.arsdigita.london.navigation.traversal_adapters.example=/WEB-INF/resources/navigation-adapters.xml
-
-com.arsdigita.london.navigation.category_menu_show_nephews.title=Show nephew categories in CategoryMenu
-com.arsdigita.london.navigation.category_menu_show_nephews.purpose=Whether CategoryMenu should display the categories who are nephews to the current category
-com.arsdigita.london.navigation.category_menu_show_nephews.example=false
-com.arsdigita.london.navigation.category_menu_show_nephews.format=[boolean]
-
-com.arsdigita.london.navigation.category_menu_show_grand_children.title=Show grand children categories in CategoryMenu
-com.arsdigita.london.navigation.category_menu_show_grand_children.purpose=Whether CategoryMenu should display the categories which are grand children to the current category. Possible Value: false, adaptiv, true.
-com.arsdigita.london.navigation.category_menu_show_grand_children.example=false
-com.arsdigita.london.navigation.category_menu_show_grand_children.format=[string]
-
-com.arsdigita.london.navigation.category_menu_show_grand_children_max.title=Max. number of grand children shown in the navigation menu with show_grand_children in adaptive mode.
-com.arsdigita.london.navigation.category_menu_show_grand_children_max.purpose=Max. number of grand children shown in the navigation menu with show_grand_children in adaptive mode. Set to 0 to show all.
-com.arsdigita.london.navigation.category_menu_show_grand_children_max.example=0
-com.arsdigita.london.navigation.category_menu_show_grand_children_max.format=[integer]
-
-com.arsdigita.london.navigation.category_menu_show_grand_children_min.title=Min. number of grand children shown in the navigation menu with show_grand_children in adaptive mode.
-com.arsdigita.london.navigation.category_menu_show_grand_children_min.purpose=Min. number of grand children shown in the navigation menu with show_grand_children in adaptive mode. To avoid showing only 1 entry or none at all at a higher level in the navigation menu.
-com.arsdigita.london.navigation.category_menu_show_grand_children_min.example=1
-com.arsdigita.london.navigation.category_menu_show_grand_children_min.format=[integer]
-
-com.arsdigita.london.navigation.category_menu_show_grand_children_limit.title=Limit adaptive mode for show_grand_children to the first n levels
-com.arsdigita.london.navigation.category_menu_show_grand_children_limit.purpose=Limit adaptive mode for show_grand_children to the first n levels. After reaching the limit, fallback to show_grand_children=false.
-com.arsdigita.london.navigation.category_menu_show_grand_children_limit.example=1
-com.arsdigita.london.navigation.category_menu_show_grand_children_limit.format=[integer]
-
-com.arsdigita.london.navigation.date_order_categories.title=Date Order Categories
-com.arsdigita.london.navigation.date_order_categories.purpose=Specify which nav categories should have items sorted by date
-com.arsdigita.london.navigation.date_order_categories.example=68594,345:ascending,687493
-com.arsdigita.london.navigation.date_order_categories.format=[string,string,string]
-
-com.arsdigita.london.navigation.top_level_date_order_categories.title=Top level date order categories
-com.arsdigita.london.navigation.top_level_date_order_categories.purpose=Categories which will have all their children date ordered
-com.arsdigita.london.navigation.top_level_date_order_categories.example=68594,345:ascending
-com.arsdigita.london.navigation.top_level_date_order_categories.format=[string,string,string]
-
-com.arsdigita.london.navigation.default_menu_cat_provider.title=Default Menu Category Provider
-com.arsdigita.london.navigation.default_menu_cat_provider.purpose=Class that provides categories included in menu for any categories that do not have an alternative provider registered
-com.arsdigita.london.navigation.default_menu_cat_provider.example=com.arsdigita.navigation.ui.category.TreeCatProviderImpl
-com.arsdigita.london.navigation.default_menu_cat_provider.format=[class]
diff --git a/ccm-ldn-navigation/web/templates/ccm-ldn-navigation/navigation/nav-atoz.jsp b/ccm-ldn-navigation/web/templates/ccm-ldn-navigation/navigation/nav-atoz.jsp
deleted file mode 100755
index 475677b62..000000000
--- a/ccm-ldn-navigation/web/templates/ccm-ldn-navigation/navigation/nav-atoz.jsp
+++ /dev/null
@@ -1,47 +0,0 @@
-<jsp:root 
-  xmlns:jsp="http://java.sun.com/JSP/Page" 
-  xmlns:define="/WEB-INF/bebop-define.tld"
-  xmlns:show="/WEB-INF/bebop-show.tld"
-  version="1.2">
-
-  <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:scriptlet>
-    long age = Navigation.getConfig().getIndexPageCacheLifetime();
-    if (age == 0) {
-      DispatcherHelper.cacheDisable(response);
-    } else {
-      DispatcherHelper.cacheForWorld(response, (int)age);
-    }
-  </jsp:scriptlet>
-
-  <define:page name="atozItemPage" application="navigation"
-    title="Navigation" cache="true">
-
-    <define:component name="greetingItem"
-      classname="com.arsdigita.london.navigation.ui.GreetingItem"/>
-    <define:component name="categoryPath"
-      classname="com.arsdigita.london.navigation.ui.category.Path"/>
-    <define:component name="categoryMenu"
-      classname="com.arsdigita.london.navigation.ui.category.Menu"/>
-    <define:component name="itemList"
-      classname="com.arsdigita.london.navigation.ui.object.AtoZObjectList"/>
-    <jsp:scriptlet>
-      ((com.arsdigita.london.navigation.ui.object.AtoZObjectList) itemList).setDefinition(new CMSDataCollectionDefinition());
-      ((com.arsdigita.london.navigation.ui.object.AtoZObjectList) itemList).setRenderer(new CMSDataCollectionRenderer());
-      ((com.arsdigita.london.navigation.ui.object.AtoZObjectList) itemList).getDefinition().setObjectType("com.arsdigita.cms.ContentPage");
-
-      ((com.arsdigita.london.navigation.ui.object.AtoZObjectList) itemList).getDefinition().setDescendCategories(false);      
-      
-      ((com.arsdigita.london.navigation.ui.object.AtoZObjectList) itemList).getRenderer().setPageSize(30);
-      ((com.arsdigita.london.navigation.ui.object.AtoZObjectList) itemList).getRenderer().addAttribute("objectType");
-      ((com.arsdigita.london.navigation.ui.object.AtoZObjectList) itemList).getRenderer().addAttribute( "title");
-    </jsp:scriptlet>
-  </define:page>
-
-  <show:all/>
-</jsp:root>
diff --git a/ccm-ldn-navigation/web/templates/ccm-ldn-navigation/navigation/nav-default.jsp b/ccm-ldn-navigation/web/templates/ccm-ldn-navigation/navigation/nav-default.jsp
deleted file mode 100755
index d1bb18f37..000000000
--- a/ccm-ldn-navigation/web/templates/ccm-ldn-navigation/navigation/nav-default.jsp
+++ /dev/null
@@ -1,84 +0,0 @@
-<!--
-   A default item page (index page) provided by ccm-navigation package. Sites
-   will probably use a customized index page. 
-   Set the actual in dex page to be used by parameter
-      com.arsdigita.london.navigation.default_template
-
-   ##Title: Default Items Page
-   ##Descr: Default Navigation Index Page, ordering items in ascending order
-   ##Path : /templates/ccm-ldn-navigation/navigation/nav-default.jsp
--->
-<jsp:root 
-  xmlns:jsp="http://java.sun.com/JSP/Page" 
-  xmlns:define="/WEB-INF/bebop-define.tld"
-  xmlns:show="/WEB-INF/bebop-show.tld"
-  version="1.2">
-
-  <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.london.navigation.DataCollectionDefinition"/>
-  <jsp:directive.page import="com.arsdigita.london.navigation.DataCollectionRenderer"/>
-  
-
-  <jsp:scriptlet>
-    long age = Navigation.getConfig().getIndexPageCacheLifetime();
-    if (age == 0) {
-      DispatcherHelper.cacheDisable(response);
-    } else {
-      DispatcherHelper.cacheForWorld(response, (int)age);
-    }
-  </jsp:scriptlet>
-
-  <define:page name="defaultItemPage" application="navigation"
-    title="Navigation" cache="true">
-
-    <define:component name="greetingItem"
-      classname="com.arsdigita.london.navigation.ui.GreetingItem"/>
-    <define:component name="greetingItemExtraXML"
-      classname="com.arsdigita.london.navigation.ui.GreetingItemExtraXML"/>
-    <define:component name="categoryPath"
-      classname="com.arsdigita.london.navigation.ui.category.Path"/>
-    <define:component name="categoryMenu"
-      classname="com.arsdigita.london.navigation.ui.category.Menu"/>
-    <define:component name="itemList"
-      classname="com.arsdigita.london.navigation.ui.object.SimpleObjectList"/>
-    <define:component name="applicationList"
-      classname="com.arsdigita.london.navigation.ui.object.SimpleObjectList"/>
-   
-    <jsp:scriptlet>
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).setDefinition(new CMSDataCollectionDefinition());
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).setRenderer(new CMSDataCollectionRenderer());
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getDefinition().setObjectType("com.arsdigita.cms.ContentPage");
-
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getDefinition().setDescendCategories(false);      
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getDefinition().addOrder("parent.categories.link.sortKey");
-      
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().setPageSize(30);
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("objectType");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("title");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("displayName");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("launchDate");
-      
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) applicationList).setDefinition(new DataCollectionDefinition());
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) applicationList).setRenderer(new DataCollectionRenderer());
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) applicationList).getDefinition().setObjectType("com.arsdigita.web.Application");
-
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) applicationList).getDefinition().setDescendCategories(false);      
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) applicationList).getDefinition().addOrder("categories.link.sortKey");
-      
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) applicationList).getRenderer().setPageSize(30);
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) applicationList).getRenderer().addAttribute("displayName");
-      
-    </jsp:scriptlet>
-
-    <define:component name="assignedTerms"
-         classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
-   <define:component name="dateOrderCategories"
-      classname="com.arsdigita.london.navigation.ui.DateOrderedCategoryComponent"/>
-
-  </define:page>
-  <show:all/>
-</jsp:root>
diff --git a/ccm-ldn-navigation/web/templates/ccm-ldn-navigation/navigation/nav-recent.jsp b/ccm-ldn-navigation/web/templates/ccm-ldn-navigation/navigation/nav-recent.jsp
deleted file mode 100755
index f30d3bde5..000000000
--- a/ccm-ldn-navigation/web/templates/ccm-ldn-navigation/navigation/nav-recent.jsp
+++ /dev/null
@@ -1,48 +0,0 @@
-<jsp:root 
-  xmlns:jsp="http://java.sun.com/JSP/Page" 
-  xmlns:define="/WEB-INF/bebop-define.tld"
-  xmlns:show="/WEB-INF/bebop-show.tld"
-  version="1.2">
-
-  <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:scriptlet>
-    long age = Navigation.getConfig().getIndexPageCacheLifetime();
-    if (age == 0) {
-      DispatcherHelper.cacheDisable(response);
-    } else {
-      DispatcherHelper.cacheForWorld(response, (int)age);
-    }
-  </jsp:scriptlet>
-
-  <define:page name="recentItemPage" application="navigation"
-    title="Navigation" cache="true">
-
-    <define:component name="greetingItem"
-      classname="com.arsdigita.london.navigation.ui.GreetingItem"/>
-    <define:component name="categoryPath"
-      classname="com.arsdigita.london.navigation.ui.category.Path"/>
-    <define:component name="categoryMenu"
-      classname="com.arsdigita.london.navigation.ui.category.Menu"/>
-    <define:component name="itemList"
-      classname="com.arsdigita.london.navigation.ui.object.SimpleObjectList"/>
-    <jsp:scriptlet>
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).setDefinition(new CMSDataCollectionDefinition());
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).setRenderer(new CMSDataCollectionRenderer());
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getDefinition().setObjectType("com.arsdigita.cms.ContentPage");
-
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getDefinition().setDescendCategories(false);      
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getDefinition().addOrder("id");
-      
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().setPageSize(30);
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("objectType");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("title");
-    </jsp:scriptlet>
-  </define:page>
-
-  <show:all/>
-</jsp:root>
diff --git a/ccm-ldn-navigation/.classpath b/ccm-navigation/.classpath
similarity index 100%
rename from ccm-ldn-navigation/.classpath
rename to ccm-navigation/.classpath
diff --git a/ccm-ldn-navigation/.project b/ccm-navigation/.project
similarity index 100%
rename from ccm-ldn-navigation/.project
rename to ccm-navigation/.project
diff --git a/ccm-ldn-navigation/.settings/org.eclipse.jdt.core.prefs b/ccm-navigation/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from ccm-ldn-navigation/.settings/org.eclipse.jdt.core.prefs
rename to ccm-navigation/.settings/org.eclipse.jdt.core.prefs
diff --git a/ccm-ldn-navigation/.settings/org.eclipse.jdt.ui.prefs b/ccm-navigation/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from ccm-ldn-navigation/.settings/org.eclipse.jdt.ui.prefs
rename to ccm-navigation/.settings/org.eclipse.jdt.ui.prefs
diff --git a/ccm-ldn-navigation/.svnignore b/ccm-navigation/.svnignore
similarity index 100%
rename from ccm-ldn-navigation/.svnignore
rename to ccm-navigation/.svnignore
diff --git a/ccm-ldn-navigation/application.xml b/ccm-navigation/application.xml
similarity index 94%
rename from ccm-ldn-navigation/application.xml
rename to ccm-navigation/application.xml
index d2eae437b..8e430e847 100755
--- a/ccm-ldn-navigation/application.xml
+++ b/ccm-navigation/application.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
-  name="ccm-ldn-navigation"
+  name="ccm-navigation"
   prettyName="Navigation"
-  version="6.6.2"
+  version="6.6.3"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>
diff --git a/ccm-ldn-navigation/doc/README.calendar b/ccm-navigation/doc/README.calendar
similarity index 100%
rename from ccm-ldn-navigation/doc/README.calendar
rename to ccm-navigation/doc/README.calendar
diff --git a/ccm-ldn-navigation/doc/calendar.jsp b/ccm-navigation/doc/calendar.jsp
similarity index 64%
rename from ccm-ldn-navigation/doc/calendar.jsp
rename to ccm-navigation/doc/calendar.jsp
index 2e90e04a9..b9690c1ca 100644
--- a/ccm-ldn-navigation/doc/calendar.jsp
+++ b/ccm-navigation/doc/calendar.jsp
@@ -6,7 +6,7 @@
 
   <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.navigation.Navigation"/>
 
   <jsp:scriptlet>
     long age = Navigation.getConfig().getIndexPageCacheLifetime();
@@ -21,16 +21,16 @@
     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="categoryItemList"
-      classname="com.arsdigita.london.navigation.ui.CalendarBrowser"/>
+      classname="com.arsdigita.navigation.ui.CalendarBrowser"/>
     <jsp:scriptlet>
-      ((com.arsdigita.london.navigation.ui.CalendarBrowser) categoryItemList).addAttribute("objectType");
-      ((com.arsdigita.london.navigation.ui.CalendarBrowser) categoryItemList).setHowMany(30);
+      ((com.arsdigita.navigation.ui.CalendarBrowser) categoryItemList).addAttribute("objectType");
+      ((com.arsdigita.navigation.ui.CalendarBrowser) categoryItemList).setHowMany(30);
       itemPage.addGlobalStateParam(new BigDecimalParameter("categoryID"));
     </jsp:scriptlet>
   </define:page>
diff --git a/ccm-ldn-navigation/doc/directory.xsd b/ccm-navigation/doc/directory.xsd
similarity index 96%
rename from ccm-ldn-navigation/doc/directory.xsd
rename to ccm-navigation/doc/directory.xsd
index cd97da858..6787e10d4 100755
--- a/ccm-ldn-navigation/doc/directory.xsd
+++ b/ccm-navigation/doc/directory.xsd
@@ -15,7 +15,7 @@
       </xs:documentation>
 
       <xs:appinfo>
-        <gen:class>com.arsdigita.london.navigation.ui.DirectoryComponent</gen:class>
+        <gen:class>com.arsdigita.navigation.ui.DirectoryComponent</gen:class>
       </xs:appinfo>
     </xs:annotation>
 
diff --git a/ccm-ldn-navigation/doc/experimental/AbstractComponentWrapper.java b/ccm-navigation/doc/experimental/AbstractComponentWrapper.java
similarity index 96%
rename from ccm-ldn-navigation/doc/experimental/AbstractComponentWrapper.java
rename to ccm-navigation/doc/experimental/AbstractComponentWrapper.java
index 37bdacbb5..44e015b77 100755
--- a/ccm-ldn-navigation/doc/experimental/AbstractComponentWrapper.java
+++ b/ccm-navigation/doc/experimental/AbstractComponentWrapper.java
@@ -17,7 +17,7 @@
  */
 
 
-package com.arsdigita.london.navigation.ui;
+package com.arsdigita.navigation.ui;
 
 
 public abstract class AbstractComponentWrapper extends AbstractComponent 
diff --git a/ccm-ldn-navigation/doc/experimental/ComponentWrapper.java b/ccm-navigation/doc/experimental/ComponentWrapper.java
similarity index 95%
rename from ccm-ldn-navigation/doc/experimental/ComponentWrapper.java
rename to ccm-navigation/doc/experimental/ComponentWrapper.java
index b404f31f5..b9f5601cf 100755
--- a/ccm-ldn-navigation/doc/experimental/ComponentWrapper.java
+++ b/ccm-navigation/doc/experimental/ComponentWrapper.java
@@ -17,7 +17,7 @@
  */
 
 
-package com.arsdigita.london.navigation.ui;
+package com.arsdigita.navigation.ui;
 
 
 public interface ComponentWrapper extends Component {
diff --git a/ccm-ldn-navigation/doc/experimental/DevSupportComponentWrapper.java b/ccm-navigation/doc/experimental/DevSupportComponentWrapper.java
similarity index 98%
rename from ccm-ldn-navigation/doc/experimental/DevSupportComponentWrapper.java
rename to ccm-navigation/doc/experimental/DevSupportComponentWrapper.java
index ca0668e4f..6cbb61003 100755
--- a/ccm-ldn-navigation/doc/experimental/DevSupportComponentWrapper.java
+++ b/ccm-navigation/doc/experimental/DevSupportComponentWrapper.java
@@ -17,7 +17,7 @@
  */
 
 
-package com.arsdigita.london.navigation.ui;
+package com.arsdigita.navigation.ui;
 
 import com.arsdigita.developersupport.DeveloperSupport;
 import com.arsdigita.webdevsupport.RequestInfo;
diff --git a/ccm-ldn-navigation/doc/navigation.xsd b/ccm-navigation/doc/navigation.xsd
similarity index 88%
rename from ccm-ldn-navigation/doc/navigation.xsd
rename to ccm-navigation/doc/navigation.xsd
index 117751e63..696f0f615 100755
--- a/ccm-ldn-navigation/doc/navigation.xsd
+++ b/ccm-navigation/doc/navigation.xsd
@@ -12,7 +12,7 @@
       </xs:documentation>
 
       <xs:appinfo>
-        <gen:class>com.arsdigita.london.navigation.ui.category.Root</gen:class>
+        <gen:class>com.arsdigita.navigation.ui.category.Root</gen:class>
       </xs:appinfo>
     </xs:annotation>
 
@@ -31,7 +31,7 @@
       </xs:documentation>
 
       <xs:appinfo>
-        <gen:class>com.arsdigita.london.navigation.ui.category.TopLevel</gen:class>
+        <gen:class>com.arsdigita.navigation.ui.category.TopLevel</gen:class>
       </xs:appinfo>
     </xs:annotation>
 
@@ -50,7 +50,7 @@
       </xs:documentation>
 
       <xs:appinfo>
-        <gen:class>com.arsdigita.london.navigation.ui.category.Siblings</gen:class>
+        <gen:class>com.arsdigita.navigation.ui.category.Siblings</gen:class>
       </xs:appinfo>
     </xs:annotation>
 
@@ -68,7 +68,7 @@
       </xs:documentation>
 
       <xs:appinfo>
-        <gen:class>com.arsdigita.london.navigation.ui.category.Children</gen:class>
+        <gen:class>com.arsdigita.navigation.ui.category.Children</gen:class>
       </xs:appinfo>
     </xs:annotation>
 
@@ -87,7 +87,7 @@
       </xs:documentation>
 
       <xs:appinfo>
-        <gen:class>com.arsdigita.london.navigation.ui.category.Path</gen:class>
+        <gen:class>com.arsdigita.navigation.ui.category.Path</gen:class>
       </xs:appinfo>
     </xs:annotation>
 
@@ -108,7 +108,7 @@
       </xs:documentation>
 
       <xs:appinfo>
-        <gen:class>com.arsdigita.london.navigation.ui.category.Menu</gen:class>
+        <gen:class>com.arsdigita.navigation.ui.category.Menu</gen:class>
       </xs:appinfo>
     </xs:annotation>
 
@@ -127,7 +127,7 @@
       </xs:documentation>
 
       <xs:appinfo>
-        <gen:class>com.arsdigita.london.navigation.ui.category.Hierarchy</gen:class>
+        <gen:class>com.arsdigita.navigation.ui.category.Hierarchy</gen:class>
       </xs:appinfo>
     </xs:annotation>
 
diff --git a/ccm-ldn-navigation/pdl/com/arsdigita/london/navigation/CMS.pdl b/ccm-navigation/pdl/com/arsdigita/navigation/CMS.pdl
similarity index 100%
rename from ccm-ldn-navigation/pdl/com/arsdigita/london/navigation/CMS.pdl
rename to ccm-navigation/pdl/com/arsdigita/navigation/CMS.pdl
diff --git a/ccm-ldn-navigation/pdl/com/arsdigita/london/navigation/Category.pdl b/ccm-navigation/pdl/com/arsdigita/navigation/Category.pdl
similarity index 100%
rename from ccm-ldn-navigation/pdl/com/arsdigita/london/navigation/Category.pdl
rename to ccm-navigation/pdl/com/arsdigita/navigation/Category.pdl
diff --git a/ccm-ldn-navigation/pdl/com/arsdigita/london/navigation/ContentTypes.pdl b/ccm-navigation/pdl/com/arsdigita/navigation/ContentTypes.pdl
similarity index 92%
rename from ccm-ldn-navigation/pdl/com/arsdigita/london/navigation/ContentTypes.pdl
rename to ccm-navigation/pdl/com/arsdigita/navigation/ContentTypes.pdl
index 416c2c567..e99cdef4c 100755
--- a/ccm-ldn-navigation/pdl/com/arsdigita/london/navigation/ContentTypes.pdl
+++ b/ccm-navigation/pdl/com/arsdigita/navigation/ContentTypes.pdl
@@ -1,4 +1,4 @@
-model com.arsdigita.london.navigation;
+model com.arsdigita.navigation;
 
 query TypesInSection {
     BigDecimal typeID;
diff --git a/ccm-ldn-navigation/pdl/com/arsdigita/london/navigation/Navigation.pdl b/ccm-navigation/pdl/com/arsdigita/navigation/Navigation.pdl
similarity index 98%
rename from ccm-ldn-navigation/pdl/com/arsdigita/london/navigation/Navigation.pdl
rename to ccm-navigation/pdl/com/arsdigita/navigation/Navigation.pdl
index 75d7618c8..dfae488dd 100755
--- a/ccm-ldn-navigation/pdl/com/arsdigita/london/navigation/Navigation.pdl
+++ b/ccm-navigation/pdl/com/arsdigita/navigation/Navigation.pdl
@@ -1,4 +1,4 @@
-model com.arsdigita.london.navigation;
+model com.arsdigita.navigation;
 
 import com.arsdigita.web.Application;
 
diff --git a/ccm-ldn-navigation/pdl/com/arsdigita/london/navigation/QuickLink.pdl b/ccm-navigation/pdl/com/arsdigita/navigation/QuickLink.pdl
similarity index 96%
rename from ccm-ldn-navigation/pdl/com/arsdigita/london/navigation/QuickLink.pdl
rename to ccm-navigation/pdl/com/arsdigita/navigation/QuickLink.pdl
index ffd5ac78a..90f4902a9 100755
--- a/ccm-ldn-navigation/pdl/com/arsdigita/london/navigation/QuickLink.pdl
+++ b/ccm-navigation/pdl/com/arsdigita/navigation/QuickLink.pdl
@@ -16,7 +16,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 
-model com.arsdigita.london.navigation;
+model com.arsdigita.navigation;
 
 import com.arsdigita.kernel.ACSObject;
 
diff --git a/ccm-ldn-navigation/pdl/com/arsdigita/london/navigation/Template.pdl b/ccm-navigation/pdl/com/arsdigita/navigation/Template.pdl
similarity index 97%
rename from ccm-ldn-navigation/pdl/com/arsdigita/london/navigation/Template.pdl
rename to ccm-navigation/pdl/com/arsdigita/navigation/Template.pdl
index 84d968897..aeace283c 100755
--- a/ccm-ldn-navigation/pdl/com/arsdigita/london/navigation/Template.pdl
+++ b/ccm-navigation/pdl/com/arsdigita/navigation/Template.pdl
@@ -1,4 +1,4 @@
-model com.arsdigita.london.navigation;
+model com.arsdigita.navigation;
 
 import com.arsdigita.categorization.Category;
 
diff --git a/ccm-ldn-navigation/pdl/com/arsdigita/london/navigation/portlet/ItemListPortlet.pdl b/ccm-navigation/pdl/com/arsdigita/navigation/portlet/ItemListPortlet.pdl
similarity index 95%
rename from ccm-ldn-navigation/pdl/com/arsdigita/london/navigation/portlet/ItemListPortlet.pdl
rename to ccm-navigation/pdl/com/arsdigita/navigation/portlet/ItemListPortlet.pdl
index 2154e4bb2..cc6735a2b 100755
--- a/ccm-ldn-navigation/pdl/com/arsdigita/london/navigation/portlet/ItemListPortlet.pdl
+++ b/ccm-navigation/pdl/com/arsdigita/navigation/portlet/ItemListPortlet.pdl
@@ -16,7 +16,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 
-model com.arsdigita.london.navigation.portlet;
+model com.arsdigita.navigation.portlet;
 
 
 object type ItemListPortlet extends ObjectListPortlet {
diff --git a/ccm-ldn-navigation/pdl/com/arsdigita/london/navigation/portlet/NavigationDirectoryPortlet.pdl b/ccm-navigation/pdl/com/arsdigita/navigation/portlet/NavigationDirectoryPortlet.pdl
similarity index 92%
rename from ccm-ldn-navigation/pdl/com/arsdigita/london/navigation/portlet/NavigationDirectoryPortlet.pdl
rename to ccm-navigation/pdl/com/arsdigita/navigation/portlet/NavigationDirectoryPortlet.pdl
index a3872acf9..bc90c7ba9 100644
--- a/ccm-ldn-navigation/pdl/com/arsdigita/london/navigation/portlet/NavigationDirectoryPortlet.pdl
+++ b/ccm-navigation/pdl/com/arsdigita/navigation/portlet/NavigationDirectoryPortlet.pdl
@@ -14,9 +14,9 @@
 // along with this library; if not, write to the Free Software Foundation, Inc.,
 // 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  
-model com.arsdigita.london.navigation.portlet;
+model com.arsdigita.navigation.portlet;
 
-import com.arsdigita.london.navigation.Navigation;
+import com.arsdigita.navigation.Navigation;
 import com.arsdigita.portal.Portlet;
 
 object type NavigationTreePortlet extends Portlet {
diff --git a/ccm-ldn-navigation/pdl/com/arsdigita/london/navigation/portlet/ObjectListPortlet.pdl b/ccm-navigation/pdl/com/arsdigita/navigation/portlet/ObjectListPortlet.pdl
similarity index 97%
rename from ccm-ldn-navigation/pdl/com/arsdigita/london/navigation/portlet/ObjectListPortlet.pdl
rename to ccm-navigation/pdl/com/arsdigita/navigation/portlet/ObjectListPortlet.pdl
index b93f47242..6dd557bc2 100755
--- a/ccm-ldn-navigation/pdl/com/arsdigita/london/navigation/portlet/ObjectListPortlet.pdl
+++ b/ccm-navigation/pdl/com/arsdigita/navigation/portlet/ObjectListPortlet.pdl
@@ -15,7 +15,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-model com.arsdigita.london.navigation.portlet;
+model com.arsdigita.navigation.portlet;
 
 import com.arsdigita.portal.Portlet;
 import com.arsdigita.categorization.Category;
diff --git a/ccm-ldn-navigation/pdl/com/arsdigita/london/navigation/query-PopulatedSubCategories.pdl b/ccm-navigation/pdl/com/arsdigita/navigation/query-PopulatedSubCategories.pdl
similarity index 97%
rename from ccm-ldn-navigation/pdl/com/arsdigita/london/navigation/query-PopulatedSubCategories.pdl
rename to ccm-navigation/pdl/com/arsdigita/navigation/query-PopulatedSubCategories.pdl
index a7f2bab38..0c7746663 100755
--- a/ccm-ldn-navigation/pdl/com/arsdigita/london/navigation/query-PopulatedSubCategories.pdl
+++ b/ccm-navigation/pdl/com/arsdigita/navigation/query-PopulatedSubCategories.pdl
@@ -1,4 +1,4 @@
-model com.arsdigita.london.navigation;
+model com.arsdigita.navigation;
 
 
 import com.arsdigita.kernel.ACSObject;
diff --git a/ccm-ldn-navigation/pdl/com/arsdigita/london/navigation/query-RelatedItems.ora.pdl b/ccm-navigation/pdl/com/arsdigita/navigation/query-RelatedItems.ora.pdl
similarity index 98%
rename from ccm-ldn-navigation/pdl/com/arsdigita/london/navigation/query-RelatedItems.ora.pdl
rename to ccm-navigation/pdl/com/arsdigita/navigation/query-RelatedItems.ora.pdl
index 97c172bc3..cf1ad960c 100755
--- a/ccm-ldn-navigation/pdl/com/arsdigita/london/navigation/query-RelatedItems.ora.pdl
+++ b/ccm-navigation/pdl/com/arsdigita/navigation/query-RelatedItems.ora.pdl
@@ -12,7 +12,7 @@
 // rights and limitations under the License.
 //
 
-model com.arsdigita.london.navigation;
+model com.arsdigita.navigation;
 
 // This query returns related items with an exact category map,
 // It has replaced the one below since, although it is technically
diff --git a/ccm-ldn-navigation/pdl/com/arsdigita/london/navigation/query-RelatedItems.pg.pdl b/ccm-navigation/pdl/com/arsdigita/navigation/query-RelatedItems.pg.pdl
similarity index 98%
rename from ccm-ldn-navigation/pdl/com/arsdigita/london/navigation/query-RelatedItems.pg.pdl
rename to ccm-navigation/pdl/com/arsdigita/navigation/query-RelatedItems.pg.pdl
index 97c172bc3..cf1ad960c 100755
--- a/ccm-ldn-navigation/pdl/com/arsdigita/london/navigation/query-RelatedItems.pg.pdl
+++ b/ccm-navigation/pdl/com/arsdigita/navigation/query-RelatedItems.pg.pdl
@@ -12,7 +12,7 @@
 // rights and limitations under the License.
 //
 
-model com.arsdigita.london.navigation;
+model com.arsdigita.navigation;
 
 // This query returns related items with an exact category map,
 // It has replaced the one below since, although it is technically
diff --git a/ccm-ldn-navigation/pdl/com/arsdigita/london/navigation/query-catItemsInSubtree.ora.pdl b/ccm-navigation/pdl/com/arsdigita/navigation/query-catItemsInSubtree.ora.pdl
similarity index 100%
rename from ccm-ldn-navigation/pdl/com/arsdigita/london/navigation/query-catItemsInSubtree.ora.pdl
rename to ccm-navigation/pdl/com/arsdigita/navigation/query-catItemsInSubtree.ora.pdl
diff --git a/ccm-ldn-navigation/pdl/com/arsdigita/london/navigation/query-catItemsInSubtree.pg.pdl b/ccm-navigation/pdl/com/arsdigita/navigation/query-catItemsInSubtree.pg.pdl
similarity index 100%
rename from ccm-ldn-navigation/pdl/com/arsdigita/london/navigation/query-catItemsInSubtree.pg.pdl
rename to ccm-navigation/pdl/com/arsdigita/navigation/query-catItemsInSubtree.pg.pdl
diff --git a/ccm-ldn-navigation/sql/ccm-ldn-navigation/oracle-se-create.sql b/ccm-navigation/sql/ccm-navigation/oracle-se-create.sql
similarity index 100%
rename from ccm-ldn-navigation/sql/ccm-ldn-navigation/oracle-se-create.sql
rename to ccm-navigation/sql/ccm-navigation/oracle-se-create.sql
diff --git a/ccm-ldn-navigation/sql/ccm-ldn-navigation/postgres-create.sql b/ccm-navigation/sql/ccm-navigation/postgres-create.sql
similarity index 100%
rename from ccm-ldn-navigation/sql/ccm-ldn-navigation/postgres-create.sql
rename to ccm-navigation/sql/ccm-navigation/postgres-create.sql
diff --git a/ccm-ldn-navigation/sql/ccm-ldn-navigation/upgrade/default/6.6.1-6.6.2/remove_legacy_entries.sql b/ccm-navigation/sql/ccm-navigation/upgrade/default/6.6.1-6.6.2/remove_legacy_entries.sql
similarity index 100%
rename from ccm-ldn-navigation/sql/ccm-ldn-navigation/upgrade/default/6.6.1-6.6.2/remove_legacy_entries.sql
rename to ccm-navigation/sql/ccm-navigation/upgrade/default/6.6.1-6.6.2/remove_legacy_entries.sql
diff --git a/ccm-ldn-navigation/sql/ccm-ldn-navigation/upgrade/default/recreate-quick-links.sql b/ccm-navigation/sql/ccm-navigation/upgrade/default/recreate-quick-links.sql
similarity index 100%
rename from ccm-ldn-navigation/sql/ccm-ldn-navigation/upgrade/default/recreate-quick-links.sql
rename to ccm-navigation/sql/ccm-navigation/upgrade/default/recreate-quick-links.sql
diff --git a/ccm-ldn-navigation/sql/ccm-ldn-navigation/upgrade/oracle-se-1.4.1-1.4.2.sql b/ccm-navigation/sql/ccm-navigation/upgrade/oracle-se-1.4.1-1.4.2.sql
similarity index 100%
rename from ccm-ldn-navigation/sql/ccm-ldn-navigation/upgrade/oracle-se-1.4.1-1.4.2.sql
rename to ccm-navigation/sql/ccm-navigation/upgrade/oracle-se-1.4.1-1.4.2.sql
diff --git a/ccm-ldn-navigation/sql/ccm-ldn-navigation/upgrade/oracle-se-1.4.2-1.4.3.sql b/ccm-navigation/sql/ccm-navigation/upgrade/oracle-se-1.4.2-1.4.3.sql
similarity index 100%
rename from ccm-ldn-navigation/sql/ccm-ldn-navigation/upgrade/oracle-se-1.4.2-1.4.3.sql
rename to ccm-navigation/sql/ccm-navigation/upgrade/oracle-se-1.4.2-1.4.3.sql
diff --git a/ccm-ldn-navigation/sql/ccm-ldn-navigation/upgrade/oracle-se-1.4.3-1.4.4.sql b/ccm-navigation/sql/ccm-navigation/upgrade/oracle-se-1.4.3-1.4.4.sql
similarity index 100%
rename from ccm-ldn-navigation/sql/ccm-ldn-navigation/upgrade/oracle-se-1.4.3-1.4.4.sql
rename to ccm-navigation/sql/ccm-navigation/upgrade/oracle-se-1.4.3-1.4.4.sql
diff --git a/ccm-ldn-navigation/sql/ccm-ldn-navigation/upgrade/oracle-se-6.5.0-6.5.1.sql b/ccm-navigation/sql/ccm-navigation/upgrade/oracle-se-6.5.0-6.5.1.sql
similarity index 100%
rename from ccm-ldn-navigation/sql/ccm-ldn-navigation/upgrade/oracle-se-6.5.0-6.5.1.sql
rename to ccm-navigation/sql/ccm-navigation/upgrade/oracle-se-6.5.0-6.5.1.sql
diff --git a/ccm-ldn-navigation/sql/ccm-ldn-navigation/upgrade/oracle-se-6.6.0-6.6.1.sql b/ccm-navigation/sql/ccm-navigation/upgrade/oracle-se-6.6.0-6.6.1.sql
similarity index 100%
rename from ccm-ldn-navigation/sql/ccm-ldn-navigation/upgrade/oracle-se-6.6.0-6.6.1.sql
rename to ccm-navigation/sql/ccm-navigation/upgrade/oracle-se-6.6.0-6.6.1.sql
diff --git a/ccm-ldn-navigation/sql/ccm-ldn-navigation/upgrade/oracle-se-6.6.1-6.6.2.sql b/ccm-navigation/sql/ccm-navigation/upgrade/oracle-se-6.6.1-6.6.2.sql
similarity index 100%
rename from ccm-ldn-navigation/sql/ccm-ldn-navigation/upgrade/oracle-se-6.6.1-6.6.2.sql
rename to ccm-navigation/sql/ccm-navigation/upgrade/oracle-se-6.6.1-6.6.2.sql
diff --git a/ccm-ldn-navigation/sql/ccm-ldn-navigation/upgrade/oracle-se/1.4.1-1.4.2/create-portlet-item-list.sql b/ccm-navigation/sql/ccm-navigation/upgrade/oracle-se/1.4.1-1.4.2/create-portlet-item-list.sql
similarity index 100%
rename from ccm-ldn-navigation/sql/ccm-ldn-navigation/upgrade/oracle-se/1.4.1-1.4.2/create-portlet-item-list.sql
rename to ccm-navigation/sql/ccm-navigation/upgrade/oracle-se/1.4.1-1.4.2/create-portlet-item-list.sql
diff --git a/ccm-ldn-navigation/sql/ccm-ldn-navigation/upgrade/oracle-se/1.4.1-1.4.2/create-portlet-object-list.sql b/ccm-navigation/sql/ccm-navigation/upgrade/oracle-se/1.4.1-1.4.2/create-portlet-object-list.sql
similarity index 100%
rename from ccm-ldn-navigation/sql/ccm-ldn-navigation/upgrade/oracle-se/1.4.1-1.4.2/create-portlet-object-list.sql
rename to ccm-navigation/sql/ccm-navigation/upgrade/oracle-se/1.4.1-1.4.2/create-portlet-object-list.sql
diff --git a/ccm-ldn-navigation/sql/ccm-ldn-navigation/upgrade/oracle-se/1.4.2-1.4.3/add-new-use-context.sql b/ccm-navigation/sql/ccm-navigation/upgrade/oracle-se/1.4.2-1.4.3/add-new-use-context.sql
similarity index 100%
rename from ccm-ldn-navigation/sql/ccm-ldn-navigation/upgrade/oracle-se/1.4.2-1.4.3/add-new-use-context.sql
rename to ccm-navigation/sql/ccm-navigation/upgrade/oracle-se/1.4.2-1.4.3/add-new-use-context.sql
diff --git a/ccm-ldn-navigation/sql/ccm-ldn-navigation/upgrade/oracle-se/1.4.2-1.4.3/add-template_mapping_id.sql b/ccm-navigation/sql/ccm-navigation/upgrade/oracle-se/1.4.2-1.4.3/add-template_mapping_id.sql
similarity index 100%
rename from ccm-ldn-navigation/sql/ccm-ldn-navigation/upgrade/oracle-se/1.4.2-1.4.3/add-template_mapping_id.sql
rename to ccm-navigation/sql/ccm-navigation/upgrade/oracle-se/1.4.2-1.4.3/add-template_mapping_id.sql
diff --git a/ccm-ldn-navigation/sql/ccm-ldn-navigation/upgrade/oracle-se/1.4.2-1.4.3/rename-use-context.sql b/ccm-navigation/sql/ccm-navigation/upgrade/oracle-se/1.4.2-1.4.3/rename-use-context.sql
similarity index 100%
rename from ccm-ldn-navigation/sql/ccm-ldn-navigation/upgrade/oracle-se/1.4.2-1.4.3/rename-use-context.sql
rename to ccm-navigation/sql/ccm-navigation/upgrade/oracle-se/1.4.2-1.4.3/rename-use-context.sql
diff --git a/ccm-ldn-navigation/sql/ccm-ldn-navigation/upgrade/oracle-se/6.5.0-6.5.1/add-quicklink-cascade.sql b/ccm-navigation/sql/ccm-navigation/upgrade/oracle-se/6.5.0-6.5.1/add-quicklink-cascade.sql
similarity index 100%
rename from ccm-ldn-navigation/sql/ccm-ldn-navigation/upgrade/oracle-se/6.5.0-6.5.1/add-quicklink-cascade.sql
rename to ccm-navigation/sql/ccm-navigation/upgrade/oracle-se/6.5.0-6.5.1/add-quicklink-cascade.sql
diff --git a/ccm-ldn-navigation/sql/ccm-ldn-navigation/upgrade/oracle-se/6.6.0-6.6.1/upd_acs_objects.sql b/ccm-navigation/sql/ccm-navigation/upgrade/oracle-se/6.6.0-6.6.1/upd_acs_objects.sql
similarity index 100%
rename from ccm-ldn-navigation/sql/ccm-ldn-navigation/upgrade/oracle-se/6.6.0-6.6.1/upd_acs_objects.sql
rename to ccm-navigation/sql/ccm-navigation/upgrade/oracle-se/6.6.0-6.6.1/upd_acs_objects.sql
diff --git a/ccm-ldn-navigation/sql/ccm-ldn-navigation/upgrade/oracle-se/6.6.0-6.6.1/upd_application_tables.sql b/ccm-navigation/sql/ccm-navigation/upgrade/oracle-se/6.6.0-6.6.1/upd_application_tables.sql
similarity index 100%
rename from ccm-ldn-navigation/sql/ccm-ldn-navigation/upgrade/oracle-se/6.6.0-6.6.1/upd_application_tables.sql
rename to ccm-navigation/sql/ccm-navigation/upgrade/oracle-se/6.6.0-6.6.1/upd_application_tables.sql
diff --git a/ccm-ldn-navigation/sql/ccm-ldn-navigation/upgrade/oracle-se/6.6.0-6.6.1/upd_nav_tree_portlet.sql b/ccm-navigation/sql/ccm-navigation/upgrade/oracle-se/6.6.0-6.6.1/upd_nav_tree_portlet.sql
similarity index 100%
rename from ccm-ldn-navigation/sql/ccm-ldn-navigation/upgrade/oracle-se/6.6.0-6.6.1/upd_nav_tree_portlet.sql
rename to ccm-navigation/sql/ccm-navigation/upgrade/oracle-se/6.6.0-6.6.1/upd_nav_tree_portlet.sql
diff --git a/ccm-ldn-navigation/sql/ccm-ldn-navigation/upgrade/postgres-1.4.1-1.4.2.sql b/ccm-navigation/sql/ccm-navigation/upgrade/postgres-1.4.1-1.4.2.sql
similarity index 100%
rename from ccm-ldn-navigation/sql/ccm-ldn-navigation/upgrade/postgres-1.4.1-1.4.2.sql
rename to ccm-navigation/sql/ccm-navigation/upgrade/postgres-1.4.1-1.4.2.sql
diff --git a/ccm-ldn-navigation/sql/ccm-ldn-navigation/upgrade/postgres-1.4.2-1.4.3.sql b/ccm-navigation/sql/ccm-navigation/upgrade/postgres-1.4.2-1.4.3.sql
similarity index 100%
rename from ccm-ldn-navigation/sql/ccm-ldn-navigation/upgrade/postgres-1.4.2-1.4.3.sql
rename to ccm-navigation/sql/ccm-navigation/upgrade/postgres-1.4.2-1.4.3.sql
diff --git a/ccm-ldn-navigation/sql/ccm-ldn-navigation/upgrade/postgres-1.4.3-1.4.4.sql b/ccm-navigation/sql/ccm-navigation/upgrade/postgres-1.4.3-1.4.4.sql
similarity index 100%
rename from ccm-ldn-navigation/sql/ccm-ldn-navigation/upgrade/postgres-1.4.3-1.4.4.sql
rename to ccm-navigation/sql/ccm-navigation/upgrade/postgres-1.4.3-1.4.4.sql
diff --git a/ccm-ldn-navigation/sql/ccm-ldn-navigation/upgrade/postgres-6.5.0-6.5.1.sql b/ccm-navigation/sql/ccm-navigation/upgrade/postgres-6.5.0-6.5.1.sql
similarity index 100%
rename from ccm-ldn-navigation/sql/ccm-ldn-navigation/upgrade/postgres-6.5.0-6.5.1.sql
rename to ccm-navigation/sql/ccm-navigation/upgrade/postgres-6.5.0-6.5.1.sql
diff --git a/ccm-ldn-navigation/sql/ccm-ldn-navigation/upgrade/postgres-6.6.0-6.6.1.sql b/ccm-navigation/sql/ccm-navigation/upgrade/postgres-6.6.0-6.6.1.sql
similarity index 100%
rename from ccm-ldn-navigation/sql/ccm-ldn-navigation/upgrade/postgres-6.6.0-6.6.1.sql
rename to ccm-navigation/sql/ccm-navigation/upgrade/postgres-6.6.0-6.6.1.sql
diff --git a/ccm-ldn-navigation/sql/ccm-ldn-navigation/upgrade/postgres-6.6.1-6.6.2.sql b/ccm-navigation/sql/ccm-navigation/upgrade/postgres-6.6.1-6.6.2.sql
similarity index 100%
rename from ccm-ldn-navigation/sql/ccm-ldn-navigation/upgrade/postgres-6.6.1-6.6.2.sql
rename to ccm-navigation/sql/ccm-navigation/upgrade/postgres-6.6.1-6.6.2.sql
diff --git a/ccm-ldn-navigation/sql/ccm-ldn-navigation/upgrade/postgres/1.4.1-1.4.2/create-portlet-item-list.sql b/ccm-navigation/sql/ccm-navigation/upgrade/postgres/1.4.1-1.4.2/create-portlet-item-list.sql
similarity index 100%
rename from ccm-ldn-navigation/sql/ccm-ldn-navigation/upgrade/postgres/1.4.1-1.4.2/create-portlet-item-list.sql
rename to ccm-navigation/sql/ccm-navigation/upgrade/postgres/1.4.1-1.4.2/create-portlet-item-list.sql
diff --git a/ccm-ldn-navigation/sql/ccm-ldn-navigation/upgrade/postgres/1.4.1-1.4.2/create-portlet-object-list.sql b/ccm-navigation/sql/ccm-navigation/upgrade/postgres/1.4.1-1.4.2/create-portlet-object-list.sql
similarity index 100%
rename from ccm-ldn-navigation/sql/ccm-ldn-navigation/upgrade/postgres/1.4.1-1.4.2/create-portlet-object-list.sql
rename to ccm-navigation/sql/ccm-navigation/upgrade/postgres/1.4.1-1.4.2/create-portlet-object-list.sql
diff --git a/ccm-ldn-navigation/sql/ccm-ldn-navigation/upgrade/postgres/1.4.2-1.4.3/add-new-use-context.sql b/ccm-navigation/sql/ccm-navigation/upgrade/postgres/1.4.2-1.4.3/add-new-use-context.sql
similarity index 100%
rename from ccm-ldn-navigation/sql/ccm-ldn-navigation/upgrade/postgres/1.4.2-1.4.3/add-new-use-context.sql
rename to ccm-navigation/sql/ccm-navigation/upgrade/postgres/1.4.2-1.4.3/add-new-use-context.sql
diff --git a/ccm-ldn-navigation/sql/ccm-ldn-navigation/upgrade/postgres/1.4.2-1.4.3/add-template_mapping_id.sql b/ccm-navigation/sql/ccm-navigation/upgrade/postgres/1.4.2-1.4.3/add-template_mapping_id.sql
similarity index 100%
rename from ccm-ldn-navigation/sql/ccm-ldn-navigation/upgrade/postgres/1.4.2-1.4.3/add-template_mapping_id.sql
rename to ccm-navigation/sql/ccm-navigation/upgrade/postgres/1.4.2-1.4.3/add-template_mapping_id.sql
diff --git a/ccm-ldn-navigation/sql/ccm-ldn-navigation/upgrade/postgres/1.4.2-1.4.3/rename-use-context.sql b/ccm-navigation/sql/ccm-navigation/upgrade/postgres/1.4.2-1.4.3/rename-use-context.sql
similarity index 100%
rename from ccm-ldn-navigation/sql/ccm-ldn-navigation/upgrade/postgres/1.4.2-1.4.3/rename-use-context.sql
rename to ccm-navigation/sql/ccm-navigation/upgrade/postgres/1.4.2-1.4.3/rename-use-context.sql
diff --git a/ccm-ldn-navigation/sql/ccm-ldn-navigation/upgrade/postgres/6.5.0-6.5.1/add-quicklink-cascade.sql b/ccm-navigation/sql/ccm-navigation/upgrade/postgres/6.5.0-6.5.1/add-quicklink-cascade.sql
similarity index 100%
rename from ccm-ldn-navigation/sql/ccm-ldn-navigation/upgrade/postgres/6.5.0-6.5.1/add-quicklink-cascade.sql
rename to ccm-navigation/sql/ccm-navigation/upgrade/postgres/6.5.0-6.5.1/add-quicklink-cascade.sql
diff --git a/ccm-ldn-navigation/sql/ccm-ldn-navigation/upgrade/postgres/6.6.0-6.6.1/upd_acs_objects.sql b/ccm-navigation/sql/ccm-navigation/upgrade/postgres/6.6.0-6.6.1/upd_acs_objects.sql
similarity index 100%
rename from ccm-ldn-navigation/sql/ccm-ldn-navigation/upgrade/postgres/6.6.0-6.6.1/upd_acs_objects.sql
rename to ccm-navigation/sql/ccm-navigation/upgrade/postgres/6.6.0-6.6.1/upd_acs_objects.sql
diff --git a/ccm-ldn-navigation/sql/ccm-ldn-navigation/upgrade/postgres/6.6.0-6.6.1/upd_application_tables.sql b/ccm-navigation/sql/ccm-navigation/upgrade/postgres/6.6.0-6.6.1/upd_application_tables.sql
similarity index 100%
rename from ccm-ldn-navigation/sql/ccm-ldn-navigation/upgrade/postgres/6.6.0-6.6.1/upd_application_tables.sql
rename to ccm-navigation/sql/ccm-navigation/upgrade/postgres/6.6.0-6.6.1/upd_application_tables.sql
diff --git a/ccm-ldn-navigation/sql/ccm-ldn-navigation/upgrade/postgres/6.6.0-6.6.1/upd_nav_tree_portlet.sql b/ccm-navigation/sql/ccm-navigation/upgrade/postgres/6.6.0-6.6.1/upd_nav_tree_portlet.sql
similarity index 100%
rename from ccm-ldn-navigation/sql/ccm-ldn-navigation/upgrade/postgres/6.6.0-6.6.1/upd_nav_tree_portlet.sql
rename to ccm-navigation/sql/ccm-navigation/upgrade/postgres/6.6.0-6.6.1/upd_nav_tree_portlet.sql
diff --git a/ccm-ldn-navigation/src/WEB-INF/navigation/templates.txt b/ccm-navigation/src/WEB-INF/navigation/templates.txt
similarity index 100%
rename from ccm-ldn-navigation/src/WEB-INF/navigation/templates.txt
rename to ccm-navigation/src/WEB-INF/navigation/templates.txt
diff --git a/ccm-ldn-navigation/src/WEB-INF/resources/navigation-adapters.xml b/ccm-navigation/src/WEB-INF/resources/navigation-adapters.xml
similarity index 75%
rename from ccm-ldn-navigation/src/WEB-INF/resources/navigation-adapters.xml
rename to ccm-navigation/src/WEB-INF/resources/navigation-adapters.xml
index 263690b23..1ea57f702 100755
--- a/ccm-ldn-navigation/src/WEB-INF/resources/navigation-adapters.xml
+++ b/ccm-navigation/src/WEB-INF/resources/navigation-adapters.xml
@@ -4,8 +4,8 @@
               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://rhea.redhat.com/schemas/waf/xml-renderer-rules xml-renderer-rules.xsd">
 
-  <xrd:context name="com.arsdigita.london.navigation.ui.QuickLinks">
-    <xrd:adapter objectType="com.arsdigita.london.navigation.QuickLink">
+  <xrd:context name="com.arsdigita.navigation.ui.QuickLinks">
+    <xrd:adapter objectType="com.arsdigita.navigation.QuickLink">
       <xrd:attributes rule="exclude">
         <xrd:property name="/object/id"/>
         <xrd:property name="/object/objectType"/>
@@ -15,8 +15,8 @@
     </xrd:adapter>
   </xrd:context>
 
-  <xrd:context name="com.arsdigita.london.navigation.ui.admin.QuickLinkListing">
-    <xrd:adapter objectType="com.arsdigita.london.navigation.QuickLink">
+  <xrd:context name="com.arsdigita.navigation.ui.admin.QuickLinkListing">
+    <xrd:adapter objectType="com.arsdigita.navigation.QuickLink">
       <xrd:attributes rule="exclude">
         <xrd:property name="/object/id"/>
         <xrd:property name="/object/objectType"/>
diff --git a/ccm-navigation/src/ccm-navigation.config b/ccm-navigation/src/ccm-navigation.config
new file mode 100755
index 000000000..0828a92bc
--- /dev/null
+++ b/ccm-navigation/src/ccm-navigation.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<registry>
+   <config class="com.arsdigita.navigation.NavigationConfig"
+           storage="ccm-navigation/navigation.properties"/>
+</registry>
diff --git a/ccm-ldn-navigation/src/ccm-ldn-navigation.load b/ccm-navigation/src/ccm-navigation.load
similarity index 67%
rename from ccm-ldn-navigation/src/ccm-ldn-navigation.load
rename to ccm-navigation/src/ccm-navigation.load
index 284e1faa1..77910fc4b 100755
--- a/ccm-ldn-navigation/src/ccm-ldn-navigation.load
+++ b/ccm-navigation/src/ccm-navigation.load
@@ -8,10 +8,10 @@
     <initializer class="com.arsdigita.london.util.Initializer"/>
   </requires>
   <provides>
-    <initializer class="com.arsdigita.london.navigation.Initializer"/>
+    <initializer class="com.arsdigita.navigation.Initializer"/>
   </provides>
   <scripts>
-    <schema directory="ccm-ldn-navigation"/>
-    <data class="com.arsdigita.london.navigation.Loader"/>
+    <schema directory="ccm-navigation"/>
+    <data class="com.arsdigita.navigation.Loader"/>
   </scripts>
 </load>
diff --git a/ccm-navigation/src/ccm-navigation.upgrade b/ccm-navigation/src/ccm-navigation.upgrade
new file mode 100755
index 000000000..4ae3b1689
--- /dev/null
+++ b/ccm-navigation/src/ccm-navigation.upgrade
@@ -0,0 +1,22 @@
+<upgrade>
+  <version from="1.4.1" to="1.4.2">
+    <script sql="ccm-navigation/upgrade/::database::-1.4.1-1.4.2.sql"/>
+    <script class="com.arsdigita.navigation.upgrades.Upgrade141to142"/>
+  </version>
+  <version from="1.4.2" to="1.4.3">
+    <script sql="ccm-navigation/upgrade/::database::-1.4.2-1.4.3.sql"/>
+  </version>
+  <version from="1.4.3" to="1.4.4">
+    <script sql="ccm-navigation/upgrade/::database::-1.4.3-1.4.4.sql"/>
+  </version>
+  <version from="6.5.0" to="6.5.1">
+    <script sql="ccm-navigation/upgrade/::database::-6.5.0-6.5.1.sql"/>
+    <script class="com.arsdigita.navigation.upgrades.Upgrade650to651"/>
+  </version>
+  <version from="6.6.0" to="6.6.1">
+    <script sql="ccm-navigation/upgrade/::database::-6.6.0-6.6.1.sql"/>
+  </version>
+  <version from="6.6.1" to="6.6.2">
+    <script sql="ccm-navigation/upgrade/::database::-6.6.1-6.6.2.sql"/>
+  </version>
+</upgrade>
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/AbstractNavigationModel.java b/ccm-navigation/src/com/arsdigita/navigation/AbstractNavigationModel.java
similarity index 98%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/AbstractNavigationModel.java
rename to ccm-navigation/src/com/arsdigita/navigation/AbstractNavigationModel.java
index 6203a336a..73073088b 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/AbstractNavigationModel.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/AbstractNavigationModel.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation;
+package com.arsdigita.navigation;
 
 import com.arsdigita.categorization.Category;
 import com.arsdigita.kernel.ACSObject;
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/AddNavigation.java b/ccm-navigation/src/com/arsdigita/navigation/AddNavigation.java
similarity index 98%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/AddNavigation.java
rename to ccm-navigation/src/com/arsdigita/navigation/AddNavigation.java
index f4fba9b0b..831215dcd 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/AddNavigation.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/AddNavigation.java
@@ -1,4 +1,4 @@
-package com.arsdigita.london.navigation;
+package com.arsdigita.navigation;
 
 import com.arsdigita.domain.DomainObject;
 import com.arsdigita.domain.DomainObjectFactory;
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ApplicationNavigationModel.java b/ccm-navigation/src/com/arsdigita/navigation/ApplicationNavigationModel.java
similarity index 96%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/ApplicationNavigationModel.java
rename to ccm-navigation/src/com/arsdigita/navigation/ApplicationNavigationModel.java
index d96c1cd36..222eff1e4 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ApplicationNavigationModel.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/ApplicationNavigationModel.java
@@ -16,9 +16,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation;
+package com.arsdigita.navigation;
 
-import com.arsdigita.london.navigation.cms.CMSNavigationModel;
+import com.arsdigita.navigation.cms.CMSNavigationModel;
 import com.arsdigita.london.util.TransactionLocal;
 
 import com.arsdigita.categorization.Category;
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/CategoryWidget.java b/ccm-navigation/src/com/arsdigita/navigation/CategoryWidget.java
similarity index 99%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/CategoryWidget.java
rename to ccm-navigation/src/com/arsdigita/navigation/CategoryWidget.java
index a9e12c5c6..f9759ac29 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/CategoryWidget.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/CategoryWidget.java
@@ -2,7 +2,7 @@
  * This is a specialised version of com.arsdigita.cms.ui.authoring.CategoryWidget
  * which adds an isEmpty attribute to the category elements.
  */
-package com.arsdigita.london.navigation;
+package com.arsdigita.navigation;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/CookieNavigationModel.java b/ccm-navigation/src/com/arsdigita/navigation/CookieNavigationModel.java
similarity index 99%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/CookieNavigationModel.java
rename to ccm-navigation/src/com/arsdigita/navigation/CookieNavigationModel.java
index 5f670d087..99f90a70b 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/CookieNavigationModel.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/CookieNavigationModel.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation;
+package com.arsdigita.navigation;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/DataCollectionDefinition.java b/ccm-navigation/src/com/arsdigita/navigation/DataCollectionDefinition.java
similarity index 98%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/DataCollectionDefinition.java
rename to ccm-navigation/src/com/arsdigita/navigation/DataCollectionDefinition.java
index e1e283c32..7088c6532 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/DataCollectionDefinition.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/DataCollectionDefinition.java
@@ -15,7 +15,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-package com.arsdigita.london.navigation;
+package com.arsdigita.navigation;
 
 import com.arsdigita.bebop.PageState;
 import com.arsdigita.categorization.Category;
@@ -244,7 +244,7 @@ public class DataCollectionDefinition extends LockableImpl {
 
         if (m_blackListTypes) {
             objects.addNotInSubqueryFilter(ACSObject.OBJECT_TYPE,
-                                           "com.arsdigita.london.navigation.blackListTypes");
+                                           "com.arsdigita.navigation.blackListTypes");
         }
 
         Category cat = getCategory(model);
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/DataCollectionProperty.java b/ccm-navigation/src/com/arsdigita/navigation/DataCollectionProperty.java
similarity index 97%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/DataCollectionProperty.java
rename to ccm-navigation/src/com/arsdigita/navigation/DataCollectionProperty.java
index 61e0bba27..9102fd0c5 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/DataCollectionProperty.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/DataCollectionProperty.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation;
+package com.arsdigita.navigation;
 
 import com.arsdigita.persistence.DataCollection;
 
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/DataCollectionPropertyRenderer.java b/ccm-navigation/src/com/arsdigita/navigation/DataCollectionPropertyRenderer.java
similarity index 97%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/DataCollectionPropertyRenderer.java
rename to ccm-navigation/src/com/arsdigita/navigation/DataCollectionPropertyRenderer.java
index 768d6aecc..9ac86ff1d 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/DataCollectionPropertyRenderer.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/DataCollectionPropertyRenderer.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation;
+package com.arsdigita.navigation;
 
 import com.arsdigita.persistence.DataCollection;
 import com.arsdigita.xml.Element;
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/DataCollectionRenderer.java b/ccm-navigation/src/com/arsdigita/navigation/DataCollectionRenderer.java
similarity index 99%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/DataCollectionRenderer.java
rename to ccm-navigation/src/com/arsdigita/navigation/DataCollectionRenderer.java
index e10a6ea28..897c02f26 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/DataCollectionRenderer.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/DataCollectionRenderer.java
@@ -15,7 +15,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-package com.arsdigita.london.navigation;
+package com.arsdigita.navigation;
 
 import com.arsdigita.cms.dispatcher.SimpleXMLGenerator;
 import com.arsdigita.domain.DomainObjectFactory;
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/DefaultNavigationModel.java b/ccm-navigation/src/com/arsdigita/navigation/DefaultNavigationModel.java
similarity index 97%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/DefaultNavigationModel.java
rename to ccm-navigation/src/com/arsdigita/navigation/DefaultNavigationModel.java
index 6760bec75..d70e8264c 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/DefaultNavigationModel.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/DefaultNavigationModel.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation;
+package com.arsdigita.navigation;
 
 import com.arsdigita.categorization.Category;
 import com.arsdigita.kernel.ACSObject;
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/DomainNavigationModel.java b/ccm-navigation/src/com/arsdigita/navigation/DomainNavigationModel.java
similarity index 98%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/DomainNavigationModel.java
rename to ccm-navigation/src/com/arsdigita/navigation/DomainNavigationModel.java
index d354d0189..aa28e6d9e 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/DomainNavigationModel.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/DomainNavigationModel.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation;
+package com.arsdigita.navigation;
 
 import com.arsdigita.categorization.Category;
 import com.arsdigita.kernel.ACSObject;
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/GenericNavigationModel.java b/ccm-navigation/src/com/arsdigita/navigation/GenericNavigationModel.java
similarity index 97%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/GenericNavigationModel.java
rename to ccm-navigation/src/com/arsdigita/navigation/GenericNavigationModel.java
index 956269e0b..188a83258 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/GenericNavigationModel.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/GenericNavigationModel.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation;
+package com.arsdigita.navigation;
 
 import com.arsdigita.categorization.Category;
 import com.arsdigita.kernel.ACSObject;
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/GlobalNavigationModel.java b/ccm-navigation/src/com/arsdigita/navigation/GlobalNavigationModel.java
similarity index 97%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/GlobalNavigationModel.java
rename to ccm-navigation/src/com/arsdigita/navigation/GlobalNavigationModel.java
index 8df03fd61..0f4bc9075 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/GlobalNavigationModel.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/GlobalNavigationModel.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation;
+package com.arsdigita.navigation;
 
 import com.arsdigita.categorization.Category;
 import com.arsdigita.kernel.ACSObject;
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/Initializer.java b/ccm-navigation/src/com/arsdigita/navigation/Initializer.java
similarity index 96%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/Initializer.java
rename to ccm-navigation/src/com/arsdigita/navigation/Initializer.java
index b83797e68..b9758fe5f 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/Initializer.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/Initializer.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation;
+package com.arsdigita.navigation;
 
 import com.arsdigita.categorization.Category;
 import com.arsdigita.categorization.CategoryCollection;
@@ -59,12 +59,12 @@ import com.arsdigita.kernel.ResourceType;
 import com.arsdigita.kernel.ui.ResourceConfigFormSection;
 import com.arsdigita.bebop.RequestLocal;
 
-import com.arsdigita.london.navigation.portlet.NavigationTreePortlet;
-import com.arsdigita.london.navigation.portlet.ObjectListPortlet;
-import com.arsdigita.london.navigation.portlet.ItemListPortlet;
+import com.arsdigita.navigation.portlet.NavigationTreePortlet;
+import com.arsdigita.navigation.portlet.ObjectListPortlet;
+import com.arsdigita.navigation.portlet.ItemListPortlet;
 
-import com.arsdigita.london.navigation.ui.portlet.ObjectListPortletEditor;
-import com.arsdigita.london.navigation.ui.portlet.ItemListPortletEditor;
+import com.arsdigita.navigation.ui.portlet.ObjectListPortletEditor;
+import com.arsdigita.navigation.ui.portlet.ItemListPortletEditor;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -78,7 +78,7 @@ import com.arsdigita.domain.xml.TraversalHandler;
 import com.arsdigita.xml.XML;
 
 /**
- * Initializer for ccm-ldn-navigation.
+ * Initializer for ccm-navigation.
  * Executes recursivly at each system startup.
  *
  * @author Justin Ross &lt;jross@redhat.com&gt;
@@ -97,7 +97,7 @@ public class Initializer extends CompoundInitializer {
 
         add(new PDLInitializer
             (new ManifestSource
-             ("ccm-ldn-navigation.pdl.mf",
+             ("ccm-navigation.pdl.mf",
               new NameFilter(DbHelper.getDatabaseSuffix(database), "pdl"))));
     }
 
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/Loader.java b/ccm-navigation/src/com/arsdigita/navigation/Loader.java
similarity index 96%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/Loader.java
rename to ccm-navigation/src/com/arsdigita/navigation/Loader.java
index 66992942f..ea3bd9e80 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/Loader.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/Loader.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation;
+package com.arsdigita.navigation;
 
 import com.arsdigita.kernel.Kernel;
 import com.arsdigita.kernel.KernelExcursion;
@@ -28,9 +28,9 @@ import com.arsdigita.util.parameter.StringParameter;
 import com.arsdigita.web.Application;
 import com.arsdigita.web.ApplicationType;
 
-import com.arsdigita.london.navigation.portlet.ObjectListPortlet;
-import com.arsdigita.london.navigation.portlet.ItemListPortlet;
-import com.arsdigita.london.navigation.portlet.NavigationTreePortlet;
+import com.arsdigita.navigation.portlet.ObjectListPortlet;
+import com.arsdigita.navigation.portlet.ItemListPortlet;
+import com.arsdigita.navigation.portlet.NavigationTreePortlet;
 
 import com.arsdigita.portal.PortletType;
 
@@ -54,7 +54,7 @@ public class Loader extends PackageLoader {
     private static final Logger s_log = Logger.getLogger(Loader.class);
 
     private StringParameter m_templatesFile = new StringParameter(
-        "com.arsdigita.london.navigation.templates_file",
+        "com.arsdigita.navigation.templates_file",
         Parameter.REQUIRED,
         "WEB-INF/navigation/templates.txt");
 
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/Navigation.java b/ccm-navigation/src/com/arsdigita/navigation/Navigation.java
similarity index 90%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/Navigation.java
rename to ccm-navigation/src/com/arsdigita/navigation/Navigation.java
index 61d6ef756..8418e1217 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/Navigation.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/Navigation.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation;
+package com.arsdigita.navigation;
 
 import com.arsdigita.persistence.DataObject;
 import com.arsdigita.persistence.OID;
@@ -35,7 +35,7 @@ public class Navigation extends Application {
     private static final Logger logger = Logger.getLogger(Navigation.class);
 
     public static final String NAV_NS =
-        "http://ccm.redhat.com/london/navigation";
+        "http://ccm.redhat.com/navigation";
     public static final String NAV_PREFIX = "nav";
     public static final String OID = "oid";
 
@@ -93,7 +93,7 @@ public class Navigation extends Application {
 
 
     public static final String BASE_DATA_OBJECT_TYPE 
-        = "com.arsdigita.london.navigation.Navigation";
+        = "com.arsdigita.navigation.Navigation";
 
     public Navigation(DataObject obj) {
         super(obj);
@@ -105,7 +105,7 @@ public class Navigation extends Application {
 
     /*
     public String getContextPath() {
-        return "ccm-ldn-navigation";
+        return "ccm-navigation";
     }
     */
 
@@ -123,25 +123,26 @@ public class Navigation extends Application {
      *   <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
      *   <init-param>
      *     <param-name>template-path</param-name>
-     *     <param-value>/templates/ccm-ldn-navigation</param-value>
+     *     <param-value>/templates/ccm-navigation</param-value>
      *   </init-param>
      *   <init-param>
      *     <param-name>file-resolver</param-name>
-     *     <param-value>com.arsdigita.london.navigation.NavigationFileResolver
+     *     <param-value>com.arsdigita.navigation.NavigationFileResolver
      *     </param-value>
      *   </init-param>
      * </servlet>
      *
      * <servlet-mapping>
      *   <servlet-name>navigation-files</servlet-name>
-     *   <url-pattern>/ccm-ldn-navigation/files/*</url-pattern>
+     *   <url-pattern>/ccm-navigation/files/*</url-pattern>
      * </servlet-mapping>
      *
      * @return path to the applications servlet/JSP
      */
+    @Override
     public String getServletPath() {
         //return "/files";
-        return "/ccm-ldn-navigation/files";
+        return "/ccm-navigation/files";
     }
 
 }
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/NavigationConfig.java b/ccm-navigation/src/com/arsdigita/navigation/NavigationConfig.java
similarity index 88%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/NavigationConfig.java
rename to ccm-navigation/src/com/arsdigita/navigation/NavigationConfig.java
index c4f6a7c58..dc4d7545b 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/NavigationConfig.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/NavigationConfig.java
@@ -16,15 +16,15 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation;
+package com.arsdigita.navigation;
 
 import com.arsdigita.bebop.PageState;
 import com.arsdigita.bebop.RequestLocal;
 import com.arsdigita.categorization.Category;
 import com.arsdigita.categorization.CategoryCollection;
 import com.arsdigita.domain.DataObjectNotFoundException;
-import com.arsdigita.london.navigation.ui.category.Menu;
-import com.arsdigita.london.navigation.ui.category.TreeCatProvider;
+import com.arsdigita.navigation.ui.category.Menu;
+import com.arsdigita.navigation.ui.category.TreeCatProvider;
 import com.arsdigita.runtime.AbstractConfig;
 import com.arsdigita.util.Assert;
 import com.arsdigita.util.StringUtils;
@@ -58,18 +58,18 @@ public final class NavigationConfig extends AbstractConfig {
 
     /** The cache lifetime for category index pages in seconds. Default 1 hour */
     private final Parameter m_indexPageCacheLifetime = new IntegerParameter
-            ("com.arsdigita.london.navigation.index_page_cache_lifetime",
+            ("com.arsdigita.navigation.index_page_cache_lifetime",
              Parameter.REQUIRED, new Integer(3600));
     
     /** Generate full item URLs instead of going via search redirector. Default true */
     private final Parameter m_generateItemURL = new BooleanParameter
-            ("com.arsdigita.london.navigation.generate_item_url",
+            ("com.arsdigita.navigation.generate_item_url",
              Parameter.REQUIRED, new Boolean(true));
     
     /** The default category template.                                        */
     private final Parameter m_defaultTemplate = new StringParameter
-            ("com.arsdigita.london.navigation.default_template",
-             Parameter.REQUIRED, "/templates/ccm-ldn-navigation/navigation/nav-default.jsp");
+            ("com.arsdigita.navigation.default_template",
+             Parameter.REQUIRED, "/templates/ccm-navigation/navigation/nav-default.jsp");
     
     /** If no template for category, should it get template from parent, or
      * fall back on default? Default: true */
@@ -114,55 +114,50 @@ public final class NavigationConfig extends AbstractConfig {
     public NavigationConfig() {
 	// not desirable default value (IMHO) but retains existing behaviour
         m_inheritTemplates = new BooleanParameter
-            ("com.arsdigita.london.navigation.inherit_templates",
+            ("com.arsdigita.navigation.inherit_templates",
             Parameter.REQUIRED, new Boolean(true));
-        // Removed, use content-section config directly instead!
-        // ContentSection.getConfig().getDefaultContentSection()
-        // m_defaultContentSectionURL = new StringParameter
-        //     ("com.arsdigita.london.navigation.default_content_section_url",
-        //      Parameter.REQUIRED, "/content/");
         m_relatedItemsContext = new StringParameter
-            ("com.arsdigita.london.navigation.related_items_context",
+            ("com.arsdigita.navigation.related_items_context",
              Parameter.REQUIRED, "subject");
         m_defaultModelClass = new StringParameter
-            ("com.arsdigita.london.navigation.default_nav_model",
+            ("com.arsdigita.navigation.default_nav_model",
              Parameter.REQUIRED, ApplicationNavigationModel.class.getName());
         m_defaultCatRootPath = new StringParameter
-            ("com.arsdigita.london.navigation.default_cat_root_path",
+            ("com.arsdigita.navigation.default_cat_root_path",
              Parameter.REQUIRED, "/navigation/");
         m_relatedItemsFactory = new ClassParameter
-            ("com.arsdigita.london.navigation.related_items_factory",
+            ("com.arsdigita.navigation.related_items_factory",
              Parameter.REQUIRED, RelatedItemsQueryFactoryImpl.class);
         m_traversalAdapters = new ResourceParameter
-            ("com.arsdigita.london.navigation.traversal_adapters", 
+            ("com.arsdigita.navigation.traversal_adapters", 
              Parameter.REQUIRED,
              "/WEB-INF/resources/navigation-adapters.xml");
         m_categoryMenuShowNephews = new BooleanParameter
-            ("com.arsdigita.london.navigation.category_menu_show_nephews",
+            ("com.arsdigita.navigation.category_menu_show_nephews",
              Parameter.OPTIONAL, new Boolean(false));
 
         // Quasimodo: Begin
         m_categoryMenuShowGrandChildren = new StringParameter
-            ("com.arsdigita.london.navigation.category_menu_show_grand_children",
+            ("com.arsdigita.navigation.category_menu_show_grand_children",
              Parameter.OPTIONAL, "false");
         m_categoryMenuShowGrandChildrenMax = new IntegerParameter
-                ("com.arsdigita.london.navigation.category_menu_show_grand_children_max",
+                ("com.arsdigita.navigation.category_menu_show_grand_children_max",
                 Parameter.OPTIONAL, new Integer(0));
         m_categoryMenuShowGrandChildrenMin = new IntegerParameter
-                ("com.arsdigita.london.navigation.category_menu_show_grand_children_min",
+                ("com.arsdigita.navigation.category_menu_show_grand_children_min",
                 Parameter.OPTIONAL, new Integer(1));
         m_categoryMenuShowGrandChildrenLimit = new IntegerParameter
-                ("com.arsdigita.london.navigation.category_menu_show_grand_children_limit",
+                ("com.arsdigita.navigation.category_menu_show_grand_children_limit",
                 Parameter.OPTIONAL, new Integer(1));
         // Quasimodo: End
         m_dateOrderCategories = new StringArrayParameter
-            ("com.arsdigita.london.navigation.date_order_categories",
+            ("com.arsdigita.navigation.date_order_categories",
              Parameter.OPTIONAL, new String[0]);
         m_topLevelDateOrderCategories = new StringArrayParameter
-            ("com.arsdigita.london.navigation.top_level_date_order_categories",
+            ("com.arsdigita.navigation.top_level_date_order_categories",
             Parameter.OPTIONAL, new String[0]);
         m_defaultMenuCatProvider = new ClassParameter
-            ("com.arsdigita.london.navigation.default_menu_cat_provider",
+            ("com.arsdigita.navigation.default_menu_cat_provider",
             Parameter.OPTIONAL, null);
 
         register(m_indexPageCacheLifetime);
@@ -195,7 +190,7 @@ public final class NavigationConfig extends AbstractConfig {
         if( param.equals("false") || param.equals("adaptive") || param.equals("true")) {
             set(m_categoryMenuShowGrandChildren, param);
         } else {
-            s_log.error("com.arsdigita.london.navigation.category_menu_show_grand_children: "+
+            s_log.error("com.arsdigita.navigation.category_menu_show_grand_children: "+
                         "Invalid setting " + param + ". Falling back to false.");
             set(m_categoryMenuShowGrandChildren, "false");            
         }
diff --git a/ccm-navigation/src/com/arsdigita/navigation/NavigationConfig_parameter.properties b/ccm-navigation/src/com/arsdigita/navigation/NavigationConfig_parameter.properties
new file mode 100755
index 000000000..85637c7f7
--- /dev/null
+++ b/ccm-navigation/src/com/arsdigita/navigation/NavigationConfig_parameter.properties
@@ -0,0 +1,89 @@
+com.arsdigita.navigation.index_page_cache_lifetime.title=Index Page Cache Lifetime
+com.arsdigita.navigation.index_page_cache_lifetime.purpose=The cache lifetime for category index pages in seconds. Default 1 hour
+com.arsdigita.navigation.index_page_cache_lifetime.example=3600
+com.arsdigita.navigation.index_page_cache_lifetime.format=[integer]
+
+com.arsdigita.navigation.generate_item_url.title=Generate Item URL
+com.arsdigita.navigation.generate_item_url.purpose=Generate full item URLs instead of going via search redirector
+com.arsdigita.navigation.generate_item_url.example=true
+com.arsdigita.navigation.generate_item_url.format=[boolean]
+
+com.arsdigita.navigation.default_template.title=Default Template
+com.arsdigita.navigation.default_template.purpose=The default category template
+com.arsdigita.navigation.default_template.example=/templates/ccm-navigation/navigation/nav-default.jsp
+com.arsdigita.navigation.default_template.format=[string]
+
+com.arsdigita.navigation.inherit_templates.title=Inherit Templates from Parent
+com.arsdigita.navigation.inherit_templates.purpose=If no template for category, should it get template from parent, or fall back on default
+com.arsdigita.navigation.inherit_templates.example=true|false
+com.arsdigita.navigation.inherit_templates.format=[boolean]
+
+com.arsdigita.navigation.default_content_section_url.title=Default Content Section URL
+com.arsdigita.navigation.default_content_section_url.purpose=The URL of the default content section
+com.arsdigita.navigation.default_content_section_url.example=/content/
+com.arsdigita.navigation.default_content_section_url.format=[string]
+
+com.arsdigita.navigation.related_items_context.title=Related items category use context
+com.arsdigita.navigation.related_items_context.purpose=The category use context for the related items query
+com.arsdigita.navigation.related_items_context.example=subject
+com.arsdigita.navigation.related_items_context.format=[string]
+
+com.arsdigita.navigation.related_items_factory.title=Related items factory implementation
+com.arsdigita.navigation.related_items_factory.purpose=The implementation of RelatedItemsQueryFactory class
+com.arsdigita.navigation.related_items_factory.example=com.arsdigita.navigation.RelatedItemsQueryFactoryImpl
+com.arsdigita.navigation.related_items_factory.format=[class]
+
+com.arsdigita.navigation.default_cat_root_path.title=Default Category Root Path
+com.arsdigita.navigation.default_cat_root_path.purpose=The URL of the application whose root category is to be used as the default root category
+com.arsdigita.navigation.default_cat_root_path.example=/navigation/
+com.arsdigita.navigation.default_cat_root_path.format=[string]
+
+com.arsdigita.navigation.default_nav_model.title=Default Navigation Model
+com.arsdigita.navigation.default_nav_model.purpose=The class of the default navigation model
+com.arsdigita.navigation.default_nav_model.example=com.arsdigita.navigation.ApplicationNavigationModel
+com.arsdigita.navigation.default_nav_model.format=[class]
+
+com.arsdigita.navigation.traversal_adapters.title=XML renderer rules
+com.arsdigita.navigation.traversal_adapters.purpose=Name of file with rules for configuring information in generated XML
+com.arsdigita.navigation.traversal_adapters.format=[string]
+com.arsdigita.navigation.traversal_adapters.example=/WEB-INF/resources/navigation-adapters.xml
+
+com.arsdigita.navigation.category_menu_show_nephews.title=Show nephew categories in CategoryMenu
+com.arsdigita.navigation.category_menu_show_nephews.purpose=Whether CategoryMenu should display the categories who are nephews to the current category
+com.arsdigita.navigation.category_menu_show_nephews.example=false
+com.arsdigita.navigation.category_menu_show_nephews.format=[boolean]
+
+com.arsdigita.navigation.category_menu_show_grand_children.title=Show grand children categories in CategoryMenu
+com.arsdigita.navigation.category_menu_show_grand_children.purpose=Whether CategoryMenu should display the categories which are grand children to the current category. Possible Value: false, adaptiv, true.
+com.arsdigita.navigation.category_menu_show_grand_children.example=false
+com.arsdigita.navigation.category_menu_show_grand_children.format=[string]
+
+com.arsdigita.navigation.category_menu_show_grand_children_max.title=Max. number of grand children shown in the navigation menu with show_grand_children in adaptive mode.
+com.arsdigita.navigation.category_menu_show_grand_children_max.purpose=Max. number of grand children shown in the navigation menu with show_grand_children in adaptive mode. Set to 0 to show all.
+com.arsdigita.navigation.category_menu_show_grand_children_max.example=0
+com.arsdigita.navigation.category_menu_show_grand_children_max.format=[integer]
+
+com.arsdigita.navigation.category_menu_show_grand_children_min.title=Min. number of grand children shown in the navigation menu with show_grand_children in adaptive mode.
+com.arsdigita.navigation.category_menu_show_grand_children_min.purpose=Min. number of grand children shown in the navigation menu with show_grand_children in adaptive mode. To avoid showing only 1 entry or none at all at a higher level in the navigation menu.
+com.arsdigita.navigation.category_menu_show_grand_children_min.example=1
+com.arsdigita.navigation.category_menu_show_grand_children_min.format=[integer]
+
+com.arsdigita.navigation.category_menu_show_grand_children_limit.title=Limit adaptive mode for show_grand_children to the first n levels
+com.arsdigita.navigation.category_menu_show_grand_children_limit.purpose=Limit adaptive mode for show_grand_children to the first n levels. After reaching the limit, fallback to show_grand_children=false.
+com.arsdigita.navigation.category_menu_show_grand_children_limit.example=1
+com.arsdigita.navigation.category_menu_show_grand_children_limit.format=[integer]
+
+com.arsdigita.navigation.date_order_categories.title=Date Order Categories
+com.arsdigita.navigation.date_order_categories.purpose=Specify which nav categories should have items sorted by date
+com.arsdigita.navigation.date_order_categories.example=68594,345:ascending,687493
+com.arsdigita.navigation.date_order_categories.format=[string,string,string]
+
+com.arsdigita.navigation.top_level_date_order_categories.title=Top level date order categories
+com.arsdigita.navigation.top_level_date_order_categories.purpose=Categories which will have all their children date ordered
+com.arsdigita.navigation.top_level_date_order_categories.example=68594,345:ascending
+com.arsdigita.navigation.top_level_date_order_categories.format=[string,string,string]
+
+com.arsdigita.navigation.default_menu_cat_provider.title=Default Menu Category Provider
+com.arsdigita.navigation.default_menu_cat_provider.purpose=Class that provides categories included in menu for any categories that do not have an alternative provider registered
+com.arsdigita.navigation.default_menu_cat_provider.example=com.arsdigita.navigation.ui.category.TreeCatProviderImpl
+com.arsdigita.navigation.default_menu_cat_provider.format=[class]
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/NavigationConstants.java b/ccm-navigation/src/com/arsdigita/navigation/NavigationConstants.java
similarity index 60%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/NavigationConstants.java
rename to ccm-navigation/src/com/arsdigita/navigation/NavigationConstants.java
index 3f87813e7..fd0e8670b 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/NavigationConstants.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/NavigationConstants.java
@@ -1,12 +1,12 @@
-package com.arsdigita.london.navigation;
+package com.arsdigita.navigation;
 
 public class NavigationConstants {
 
     public static final String NAV_NS =
-        "http://ccm.redhat.com/london/navigation";
+        "http://ccm.redhat.com/navigation";
     public static final String NAV_PREFIX = "nav";
     public static final String DEFAULT_CONTENT_SECTION_URL =
-        "com.arsdigita.london.navigation.DefaultContentSection";
+        "com.arsdigita.navigation.DefaultContentSection";
 
     public static final String OID = "oid";
     
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/NavigationContext.java b/ccm-navigation/src/com/arsdigita/navigation/NavigationContext.java
similarity index 96%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/NavigationContext.java
rename to ccm-navigation/src/com/arsdigita/navigation/NavigationContext.java
index 36d0c5f5e..3d2f7136d 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/NavigationContext.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/NavigationContext.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation;
+package com.arsdigita.navigation;
 
 import com.arsdigita.cms.TemplateContext;
 import com.arsdigita.web.Web;
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/NavigationFileResolver.java b/ccm-navigation/src/com/arsdigita/navigation/NavigationFileResolver.java
similarity index 99%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/NavigationFileResolver.java
rename to ccm-navigation/src/com/arsdigita/navigation/NavigationFileResolver.java
index 79a4d509c..8ef2df1f7 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/NavigationFileResolver.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/NavigationFileResolver.java
@@ -15,7 +15,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-package com.arsdigita.london.navigation;
+package com.arsdigita.navigation;
 
 
 import java.math.BigDecimal;
@@ -26,7 +26,7 @@ import javax.servlet.RequestDispatcher;
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+// import javax.servlet.http.HttpSession;
 
 import org.apache.log4j.Logger;
 
@@ -60,6 +60,7 @@ public class NavigationFileResolver extends DefaultApplicationFileResolver {
 	public static final String PATH_COOKIE_NAME = "ad_path";
 	public static final char PATH_COOKIE_SEPARATOR = '|';
 	
+    @Override
     public RequestDispatcher resolve(String templatePath,
                                      HttpServletRequest sreq,
                                      HttpServletResponse sresp,
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/NavigationModel.java b/ccm-navigation/src/com/arsdigita/navigation/NavigationModel.java
similarity index 97%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/NavigationModel.java
rename to ccm-navigation/src/com/arsdigita/navigation/NavigationModel.java
index b4fcfabc3..fad587ed3 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/NavigationModel.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/NavigationModel.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation;
+package com.arsdigita.navigation;
 
 import com.arsdigita.categorization.Category;
 import com.arsdigita.kernel.ACSObject;
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/QuickLink.java b/ccm-navigation/src/com/arsdigita/navigation/QuickLink.java
similarity index 97%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/QuickLink.java
rename to ccm-navigation/src/com/arsdigita/navigation/QuickLink.java
index fb7636bc8..e1e0d179c 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/QuickLink.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/QuickLink.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation;
+package com.arsdigita.navigation;
 
 import com.arsdigita.kernel.ACSObject;
 import com.arsdigita.persistence.DataObject;
@@ -30,7 +30,7 @@ import java.net.MalformedURLException;
 public class QuickLink extends ACSObject {
 
     public static final String BASE_DATA_OBJECT_TYPE =
-        "com.arsdigita.london.navigation.QuickLink";
+        "com.arsdigita.navigation.QuickLink";
 
     public static final String TITLE = "title";
     public static final String DESCRIPTION = "description";
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/RelatedItemsQuery.java b/ccm-navigation/src/com/arsdigita/navigation/RelatedItemsQuery.java
similarity index 97%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/RelatedItemsQuery.java
rename to ccm-navigation/src/com/arsdigita/navigation/RelatedItemsQuery.java
index fb29558cc..039c9e7a8 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/RelatedItemsQuery.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/RelatedItemsQuery.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation;
+package com.arsdigita.navigation;
 
 import com.arsdigita.domain.DomainQuery;
 import java.math.BigDecimal;
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/RelatedItemsQueryFactory.java b/ccm-navigation/src/com/arsdigita/navigation/RelatedItemsQueryFactory.java
similarity index 97%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/RelatedItemsQueryFactory.java
rename to ccm-navigation/src/com/arsdigita/navigation/RelatedItemsQueryFactory.java
index 37cffb2cc..4d745bde2 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/RelatedItemsQueryFactory.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/RelatedItemsQueryFactory.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation;
+package com.arsdigita.navigation;
 
 
 import com.arsdigita.util.Classes;
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/RelatedItemsQueryFactoryImpl.java b/ccm-navigation/src/com/arsdigita/navigation/RelatedItemsQueryFactoryImpl.java
similarity index 98%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/RelatedItemsQueryFactoryImpl.java
rename to ccm-navigation/src/com/arsdigita/navigation/RelatedItemsQueryFactoryImpl.java
index 02e843f59..40ec15a15 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/RelatedItemsQueryFactoryImpl.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/RelatedItemsQueryFactoryImpl.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation;
+package com.arsdigita.navigation;
 
 import com.arsdigita.cms.ContentBundle;
 import com.arsdigita.cms.ContentPage;
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/RelatedItemsQueryImpl.java b/ccm-navigation/src/com/arsdigita/navigation/RelatedItemsQueryImpl.java
similarity index 94%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/RelatedItemsQueryImpl.java
rename to ccm-navigation/src/com/arsdigita/navigation/RelatedItemsQueryImpl.java
index 83d4ba06b..54eb46814 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/RelatedItemsQueryImpl.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/RelatedItemsQueryImpl.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation;
+package com.arsdigita.navigation;
 
 import com.arsdigita.cms.ContentBundle;
 import com.arsdigita.categorization.Category;
@@ -27,7 +27,7 @@ import java.util.ArrayList;
 class RelatedItemsQueryImpl extends RelatedItemsQuery {
 
     public static final String QUERY_NAME = 
-        "com.arsdigita.london.navigation.RelatedItems";
+        "com.arsdigita.navigation.RelatedItems";
     
     public static final String BUNDLE_ID = "bundleID";
     public static final String BUNDLE_IDS = "bundleIDs";
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/Template.java b/ccm-navigation/src/com/arsdigita/navigation/Template.java
similarity index 97%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/Template.java
rename to ccm-navigation/src/com/arsdigita/navigation/Template.java
index c54a90c30..da82ceead 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/Template.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/Template.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation;
+package com.arsdigita.navigation;
 
 
 import com.arsdigita.categorization.Category;
@@ -52,11 +52,11 @@ public class Template extends DomainObject {
     public static final String DEFAULT_USE_CONTEXT = "default";
 
     public static final String BASE_DATA_OBJECT_TYPE = 
-        "com.arsdigita.london.navigation.Template";
+        "com.arsdigita.navigation.Template";
 
     // used by findBestForCategory
     private static final String TEMPLATES_FOR_CATEGORY = 
-        "com.arsdigita.london.navigation.getTemplatesForCategory";
+        "com.arsdigita.navigation.getTemplatesForCategory";
 
     protected Template() {
         this(BASE_DATA_OBJECT_TYPE);
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/TemplateCollection.java b/ccm-navigation/src/com/arsdigita/navigation/TemplateCollection.java
similarity index 96%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/TemplateCollection.java
rename to ccm-navigation/src/com/arsdigita/navigation/TemplateCollection.java
index f3f31ba5d..9e06aad1d 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/TemplateCollection.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/TemplateCollection.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation;
+package com.arsdigita.navigation;
 
 
 import com.arsdigita.domain.DomainCollection;
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/TemplateMapping.java b/ccm-navigation/src/com/arsdigita/navigation/TemplateMapping.java
similarity index 97%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/TemplateMapping.java
rename to ccm-navigation/src/com/arsdigita/navigation/TemplateMapping.java
index 01b12ebff..b09fcc975 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/TemplateMapping.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/TemplateMapping.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation;
+package com.arsdigita.navigation;
 
 import com.arsdigita.categorization.Category;
 import com.arsdigita.db.Sequences;
@@ -32,7 +32,7 @@ import java.sql.SQLException;
 
 public class TemplateMapping extends DomainObject {
     public static final String BASE_DATA_OBJECT_TYPE =
-        "com.arsdigita.london.navigation.TemplateMapping";
+        "com.arsdigita.navigation.TemplateMapping";
 
     public static final String ID = "id";
     public static final String TEMPLATE = "template";
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/TemplateTool.java b/ccm-navigation/src/com/arsdigita/navigation/TemplateTool.java
similarity index 98%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/TemplateTool.java
rename to ccm-navigation/src/com/arsdigita/navigation/TemplateTool.java
index 8268fbade..87d44377a 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/TemplateTool.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/TemplateTool.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation;
+package com.arsdigita.navigation;
 
 import com.arsdigita.london.util.Program;
 import com.arsdigita.london.util.Transaction;
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/cms/CMSCookieNavigationModel.java b/ccm-navigation/src/com/arsdigita/navigation/cms/CMSCookieNavigationModel.java
similarity index 94%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/cms/CMSCookieNavigationModel.java
rename to ccm-navigation/src/com/arsdigita/navigation/cms/CMSCookieNavigationModel.java
index 810aa78ba..7ecc26a51 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/cms/CMSCookieNavigationModel.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/cms/CMSCookieNavigationModel.java
@@ -15,14 +15,14 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation.cms;
+package com.arsdigita.navigation.cms;
 
 import org.apache.log4j.Logger;
 
 import com.arsdigita.categorization.Category;
 import com.arsdigita.cms.ContentPage;
 import com.arsdigita.kernel.ACSObject;
-import com.arsdigita.london.navigation.CookieNavigationModel;
+import com.arsdigita.navigation.CookieNavigationModel;
 
 
 /**
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/cms/CMSDataCollectionDefinition.java b/ccm-navigation/src/com/arsdigita/navigation/cms/CMSDataCollectionDefinition.java
similarity index 95%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/cms/CMSDataCollectionDefinition.java
rename to ccm-navigation/src/com/arsdigita/navigation/cms/CMSDataCollectionDefinition.java
index 7f3b89093..32466a64b 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/cms/CMSDataCollectionDefinition.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/cms/CMSDataCollectionDefinition.java
@@ -16,14 +16,14 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation.cms;
+package com.arsdigita.navigation.cms;
 
 
 import com.arsdigita.cms.CMS;
 import com.arsdigita.cms.ContentItem;
 import com.arsdigita.cms.SecurityManager;
-import com.arsdigita.london.navigation.DataCollectionDefinition;
-import com.arsdigita.london.navigation.NavigationModel;
+import com.arsdigita.navigation.DataCollectionDefinition;
+import com.arsdigita.navigation.NavigationModel;
 import com.arsdigita.kernel.ACSObject;
 import com.arsdigita.kernel.Kernel;
 import com.arsdigita.kernel.Party;
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/cms/CMSDataCollectionRenderer.java b/ccm-navigation/src/com/arsdigita/navigation/cms/CMSDataCollectionRenderer.java
similarity index 94%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/cms/CMSDataCollectionRenderer.java
rename to ccm-navigation/src/com/arsdigita/navigation/cms/CMSDataCollectionRenderer.java
index 696c768d8..ecedc1222 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/cms/CMSDataCollectionRenderer.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/cms/CMSDataCollectionRenderer.java
@@ -15,14 +15,14 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-package com.arsdigita.london.navigation.cms;
+package com.arsdigita.navigation.cms;
 
 import com.arsdigita.cms.ContentItem;
 import com.arsdigita.cms.ContentItemXMLRenderer;
 import com.arsdigita.domain.DomainObjectFactory;
 import com.arsdigita.kernel.ACSObject;
-import com.arsdigita.london.navigation.DataCollectionRenderer;
-import com.arsdigita.london.navigation.Navigation;
+import com.arsdigita.navigation.DataCollectionRenderer;
+import com.arsdigita.navigation.Navigation;
 import com.arsdigita.persistence.DataObject;
 import com.arsdigita.persistence.OID;
 import com.arsdigita.xml.Element;
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/cms/CMSNavigationModel.java b/ccm-navigation/src/com/arsdigita/navigation/cms/CMSNavigationModel.java
similarity index 97%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/cms/CMSNavigationModel.java
rename to ccm-navigation/src/com/arsdigita/navigation/cms/CMSNavigationModel.java
index c0c267092..fa1c70658 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/cms/CMSNavigationModel.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/cms/CMSNavigationModel.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation.cms;
+package com.arsdigita.navigation.cms;
 
 import com.arsdigita.categorization.Category;
 import com.arsdigita.categorization.CategoryCollection;
@@ -28,8 +28,8 @@ import com.arsdigita.domain.DomainCollection;
 import com.arsdigita.domain.DomainObjectFactory;
 import com.arsdigita.domain.DomainServiceInterfaceExposer;
 import com.arsdigita.kernel.ACSObject;
-import com.arsdigita.london.navigation.GenericNavigationModel;
-import com.arsdigita.london.navigation.Navigation;
+import com.arsdigita.navigation.GenericNavigationModel;
+import com.arsdigita.navigation.Navigation;
 import com.arsdigita.london.terms.Domain;
 import com.arsdigita.persistence.DataAssociation;
 import com.arsdigita.persistence.DataAssociationCursor;
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/cms/CategoryDataCollectionDefinition.java b/ccm-navigation/src/com/arsdigita/navigation/cms/CategoryDataCollectionDefinition.java
similarity index 93%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/cms/CategoryDataCollectionDefinition.java
rename to ccm-navigation/src/com/arsdigita/navigation/cms/CategoryDataCollectionDefinition.java
index 1b3909816..688da94c7 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/cms/CategoryDataCollectionDefinition.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/cms/CategoryDataCollectionDefinition.java
@@ -13,9 +13,9 @@
  *
  */
 
-package com.arsdigita.london.navigation.cms;
+package com.arsdigita.navigation.cms;
 
-import com.arsdigita.london.navigation.NavigationModel;
+import com.arsdigita.navigation.NavigationModel;
 import com.arsdigita.categorization.Category;
 import com.arsdigita.london.terms.Domain;
 import com.arsdigita.london.terms.Term;
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/portlet/ItemListPortlet.java b/ccm-navigation/src/com/arsdigita/navigation/portlet/ItemListPortlet.java
similarity index 86%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/portlet/ItemListPortlet.java
rename to ccm-navigation/src/com/arsdigita/navigation/portlet/ItemListPortlet.java
index 05284e74f..8945f9db7 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/portlet/ItemListPortlet.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/portlet/ItemListPortlet.java
@@ -16,13 +16,13 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation.portlet;
+package com.arsdigita.navigation.portlet;
 
 import com.arsdigita.persistence.DataObject;
 import com.arsdigita.bebop.portal.AbstractPortletRenderer;
-import com.arsdigita.london.navigation.DataCollectionDefinition;
-import com.arsdigita.london.navigation.cms.CMSDataCollectionDefinition;
-import com.arsdigita.london.navigation.ui.portlet.ItemListPortletRenderer;
+import com.arsdigita.navigation.DataCollectionDefinition;
+import com.arsdigita.navigation.cms.CMSDataCollectionDefinition;
+import com.arsdigita.navigation.ui.portlet.ItemListPortletRenderer;
 
 /**
  * Portlet to display a list of (content) items.
@@ -36,7 +36,7 @@ public class ItemListPortlet extends ObjectListPortlet {
     
 
     public static final String BASE_DATA_OBJECT_TYPE =
-        "com.arsdigita.london.navigation.portlet.ItemListPortlet";
+        "com.arsdigita.navigation.portlet.ItemListPortlet";
 
     public static final String VERSION = "version";
 
@@ -52,10 +52,12 @@ public class ItemListPortlet extends ObjectListPortlet {
         return (String)get(VERSION);
     }
 
+    @Override
     protected DataCollectionDefinition newDataCollectionDefinition() {
         return new CMSDataCollectionDefinition();
     }
 
+    @Override
     public DataCollectionDefinition getDataCollectionDefinition() {
         CMSDataCollectionDefinition def = (CMSDataCollectionDefinition)
             super.getDataCollectionDefinition();
@@ -65,6 +67,7 @@ public class ItemListPortlet extends ObjectListPortlet {
         return def;
     }
 
+    @Override
     protected AbstractPortletRenderer doGetPortletRenderer() {
         return new ItemListPortletRenderer(this);
     }
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/portlet/NavigationTreePortlet.java b/ccm-navigation/src/com/arsdigita/navigation/portlet/NavigationTreePortlet.java
similarity index 93%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/portlet/NavigationTreePortlet.java
rename to ccm-navigation/src/com/arsdigita/navigation/portlet/NavigationTreePortlet.java
index e83727225..e4402dec8 100644
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/portlet/NavigationTreePortlet.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/portlet/NavigationTreePortlet.java
@@ -17,7 +17,7 @@
  * 
  */
 
-package com.arsdigita.london.navigation.portlet;
+package com.arsdigita.navigation.portlet;
 
 import com.arsdigita.bebop.RequestLocal;
 import com.arsdigita.bebop.portal.AbstractPortletRenderer;
@@ -27,9 +27,9 @@ import com.arsdigita.kernel.ACSObjectInstantiator;
 import com.arsdigita.kernel.ResourceType;
 import com.arsdigita.kernel.ResourceTypeConfig;
 import com.arsdigita.kernel.ui.ResourceConfigFormSection;
-import com.arsdigita.london.navigation.Navigation;
-import com.arsdigita.london.navigation.ui.portlet.NavigationTreePortletEditor;
-import com.arsdigita.london.navigation.ui.portlet.NavigationTreePortletRenderer;
+import com.arsdigita.navigation.Navigation;
+import com.arsdigita.navigation.ui.portlet.NavigationTreePortletEditor;
+import com.arsdigita.navigation.ui.portlet.NavigationTreePortletRenderer;
 import com.arsdigita.persistence.DataObject;
 import com.arsdigita.portal.Portlet;
 import com.arsdigita.portal.PortletType;
@@ -52,7 +52,7 @@ public class NavigationTreePortlet extends Portlet
     private static final Logger s_log = Logger.getLogger(NavigationTreePortlet.class);
 
     public static final String BASE_DATA_OBJECT_TYPE = 
-            "com.arsdigita.london.navigation.portlet.NavigationTreePortlet";
+            "com.arsdigita.navigation.portlet.NavigationTreePortlet";
 
     public static final String DEPTH = "depth";
 
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/portlet/ObjectListPortlet.java b/ccm-navigation/src/com/arsdigita/navigation/portlet/ObjectListPortlet.java
similarity index 95%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/portlet/ObjectListPortlet.java
rename to ccm-navigation/src/com/arsdigita/navigation/portlet/ObjectListPortlet.java
index 52c3ca5a0..2822f3f67 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/portlet/ObjectListPortlet.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/portlet/ObjectListPortlet.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation.portlet;
+package com.arsdigita.navigation.portlet;
 
 import com.arsdigita.portal.Portlet;
 import com.arsdigita.bebop.portal.AbstractPortletRenderer;
@@ -27,11 +27,11 @@ import com.arsdigita.kernel.ACSObject;
 import com.arsdigita.categorization.Category;
 import com.arsdigita.categorization.CategoryCollection;
 
-import com.arsdigita.london.navigation.AbstractNavigationModel;
-import com.arsdigita.london.navigation.DataCollectionDefinition;
-import com.arsdigita.london.navigation.DataCollectionProperty;
-import com.arsdigita.london.navigation.DataCollectionPropertyRenderer;
-import com.arsdigita.london.navigation.ui.portlet.ObjectListPortletRenderer;
+import com.arsdigita.navigation.AbstractNavigationModel;
+import com.arsdigita.navigation.DataCollectionDefinition;
+import com.arsdigita.navigation.DataCollectionProperty;
+import com.arsdigita.navigation.DataCollectionPropertyRenderer;
+import com.arsdigita.navigation.ui.portlet.ObjectListPortletRenderer;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -56,7 +56,7 @@ public class ObjectListPortlet extends Portlet {
         Logger.getLogger( ObjectListPortlet.class );
 
     public static final String BASE_DATA_OBJECT_TYPE =
-        "com.arsdigita.london.navigation.portlet.ObjectListPortlet";
+        "com.arsdigita.navigation.portlet.ObjectListPortlet";
 
     public static final String BASE_OBJECT_TYPE = "baseObjectType";
     public static final String SPECIFIC_OBJECT_TYPE = "specificObjectType";
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/tools/TemplateCreator.java b/ccm-navigation/src/com/arsdigita/navigation/tools/TemplateCreator.java
similarity index 94%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/tools/TemplateCreator.java
rename to ccm-navigation/src/com/arsdigita/navigation/tools/TemplateCreator.java
index 84e75305d..5145edf26 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/tools/TemplateCreator.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/tools/TemplateCreator.java
@@ -16,9 +16,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation.tools;
+package com.arsdigita.navigation.tools;
 
-import com.arsdigita.london.navigation.Template;
+import com.arsdigita.navigation.Template;
 import com.arsdigita.london.util.Program;
 import com.arsdigita.london.util.Transaction;
 
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/AbstractComponent.java b/ccm-navigation/src/com/arsdigita/navigation/ui/AbstractComponent.java
similarity index 93%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/AbstractComponent.java
rename to ccm-navigation/src/com/arsdigita/navigation/ui/AbstractComponent.java
index 7ec49bb8c..c3b599325 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/AbstractComponent.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/ui/AbstractComponent.java
@@ -16,10 +16,10 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation.ui;
+package com.arsdigita.navigation.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.kernel.ACSObject;
 
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/AbstractContainer.java b/ccm-navigation/src/com/arsdigita/navigation/ui/AbstractContainer.java
similarity index 97%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/AbstractContainer.java
rename to ccm-navigation/src/com/arsdigita/navigation/ui/AbstractContainer.java
index 85539c6a3..7f51225c9 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/AbstractContainer.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/ui/AbstractContainer.java
@@ -17,7 +17,7 @@
  */
 
 
-package com.arsdigita.london.navigation.ui;
+package com.arsdigita.navigation.ui;
 
 import com.arsdigita.util.Assert;
 
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/AbstractObjectList.java b/ccm-navigation/src/com/arsdigita/navigation/ui/AbstractObjectList.java
similarity index 95%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/AbstractObjectList.java
rename to ccm-navigation/src/com/arsdigita/navigation/ui/AbstractObjectList.java
index b255785c2..b1762a79a 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/AbstractObjectList.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/ui/AbstractObjectList.java
@@ -15,12 +15,12 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-package com.arsdigita.london.navigation.ui;
+package com.arsdigita.navigation.ui;
 
 import com.arsdigita.globalization.GlobalizationHelper;
 import com.arsdigita.kernel.Kernel;
-import com.arsdigita.london.navigation.DataCollectionDefinition;
-import com.arsdigita.london.navigation.DataCollectionRenderer;
+import com.arsdigita.navigation.DataCollectionDefinition;
+import com.arsdigita.navigation.DataCollectionRenderer;
 
 import com.arsdigita.persistence.DataCollection;
 
@@ -103,7 +103,7 @@ public abstract class AbstractObjectList
                         addFilter(ff.equals("language", com.arsdigita.globalization.GlobalizationHelper.getNegotiatedLocale().getLanguage())).
                         addFilter(ff.and().
                             addFilter(ff.equals("language", GlobalizationHelper.LANG_INDEPENDENT)).
-                            addFilter(ff.notIn("parent", "com.arsdigita.london.navigation.getParentIDsOfMatchedItems")
+                            addFilter(ff.notIn("parent", "com.arsdigita.navigation.getParentIDsOfMatchedItems")
                                 .set("language", com.arsdigita.globalization.GlobalizationHelper.getNegotiatedLocale().getLanguage())));
                 objects.addFilter(filter);
             } else {
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/ApplicationPath.java b/ccm-navigation/src/com/arsdigita/navigation/ui/ApplicationPath.java
similarity index 96%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/ApplicationPath.java
rename to ccm-navigation/src/com/arsdigita/navigation/ui/ApplicationPath.java
index 00b0026f1..9c83e7613 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/ApplicationPath.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/ui/ApplicationPath.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation.ui;
+package com.arsdigita.navigation.ui;
 
 import com.arsdigita.bebop.PageState;
 import com.arsdigita.bebop.SimpleComponent;
@@ -24,7 +24,7 @@ import com.arsdigita.kernel.Kernel;
 import com.arsdigita.web.Application;
 import com.arsdigita.xml.Element;
 
-import com.arsdigita.london.navigation.NavigationConstants;
+import com.arsdigita.navigation.NavigationConstants;
 
 
 /**
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/BebopComponentAdapter.java b/ccm-navigation/src/com/arsdigita/navigation/ui/BebopComponentAdapter.java
similarity index 97%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/BebopComponentAdapter.java
rename to ccm-navigation/src/com/arsdigita/navigation/ui/BebopComponentAdapter.java
index accabecd9..5d26642c1 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/BebopComponentAdapter.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/ui/BebopComponentAdapter.java
@@ -17,7 +17,7 @@
  */
 
 
-package com.arsdigita.london.navigation.ui;
+package com.arsdigita.navigation.ui;
 
 import com.arsdigita.bebop.PageState;
 import com.arsdigita.bebop.SimpleComponent;
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/CategoryComponent.java b/ccm-navigation/src/com/arsdigita/navigation/ui/CategoryComponent.java
similarity index 96%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/CategoryComponent.java
rename to ccm-navigation/src/com/arsdigita/navigation/ui/CategoryComponent.java
index 3921e5c15..45a7f6a68 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/CategoryComponent.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/ui/CategoryComponent.java
@@ -16,9 +16,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation.ui;
+package com.arsdigita.navigation.ui;
 
-import com.arsdigita.london.navigation.Navigation;
+import com.arsdigita.navigation.Navigation;
 
 import com.arsdigita.categorization.Category;
 
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/CategoryIndexAssignedTerms.java b/ccm-navigation/src/com/arsdigita/navigation/ui/CategoryIndexAssignedTerms.java
similarity index 84%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/CategoryIndexAssignedTerms.java
rename to ccm-navigation/src/com/arsdigita/navigation/ui/CategoryIndexAssignedTerms.java
index 5142eaa53..2663ddea3 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/CategoryIndexAssignedTerms.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/ui/CategoryIndexAssignedTerms.java
@@ -15,11 +15,11 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-package com.arsdigita.london.navigation.ui;
+package com.arsdigita.navigation.ui;
 
 import com.arsdigita.bebop.PageState;
 import com.arsdigita.kernel.ACSObject;
-import com.arsdigita.london.navigation.Navigation;
+import com.arsdigita.navigation.Navigation;
 import com.arsdigita.london.terms.ui.AbstractAssignedTerms;
 
 /**
@@ -28,9 +28,9 @@ import com.arsdigita.london.terms.ui.AbstractAssignedTerms;
  * Put something like following in your jsp page. 
  * 
  *    <define:component name="assignedTerms"
- *    classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
+ *    classname="com.arsdigita.navigation.ui.CategoryIndexAssignedTerms"/>
  *    
- * Used in ccm-ldn-navigation/web/packages/navigation/templates/default.jsp
+ * Used in ccm-navigation/web/templates/ccm-navigation/navigation/default.jsp
  */
 public class CategoryIndexAssignedTerms extends AbstractAssignedTerms {
 
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/Component.java b/ccm-navigation/src/com/arsdigita/navigation/ui/Component.java
similarity index 96%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/Component.java
rename to ccm-navigation/src/com/arsdigita/navigation/ui/Component.java
index 4ad0099b4..d80d10cf8 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/Component.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/ui/Component.java
@@ -17,7 +17,7 @@
  */
 
 
-package com.arsdigita.london.navigation.ui;
+package com.arsdigita.navigation.ui;
 
 import com.arsdigita.util.Lockable;
 import com.arsdigita.xml.Element;
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/ComponentDispatcher.java b/ccm-navigation/src/com/arsdigita/navigation/ui/ComponentDispatcher.java
similarity index 97%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/ComponentDispatcher.java
rename to ccm-navigation/src/com/arsdigita/navigation/ui/ComponentDispatcher.java
index b49618034..9e06a2cf4 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/ComponentDispatcher.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/ui/ComponentDispatcher.java
@@ -17,7 +17,7 @@
  */
 
 
-package com.arsdigita.london.navigation.ui;
+package com.arsdigita.navigation.ui;
 
 import com.arsdigita.templating.Templating;
 import com.arsdigita.templating.PresentationManager;
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/Container.java b/ccm-navigation/src/com/arsdigita/navigation/ui/Container.java
similarity index 95%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/Container.java
rename to ccm-navigation/src/com/arsdigita/navigation/ui/Container.java
index b582167b3..c19a14aa0 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/Container.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/ui/Container.java
@@ -17,7 +17,7 @@
  */
 
 
-package com.arsdigita.london.navigation.ui;
+package com.arsdigita.navigation.ui;
 
 
 import java.util.Iterator;
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/ContentList.java b/ccm-navigation/src/com/arsdigita/navigation/ui/ContentList.java
similarity index 99%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/ContentList.java
rename to ccm-navigation/src/com/arsdigita/navigation/ui/ContentList.java
index 6cad12fa3..6362fb1b9 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/ContentList.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/ui/ContentList.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation.ui;
+package com.arsdigita.navigation.ui;
 
 import com.arsdigita.categorization.CategorizedCollection;
 import com.arsdigita.categorization.Category;
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/CustomizableGreetingItem.java b/ccm-navigation/src/com/arsdigita/navigation/ui/CustomizableGreetingItem.java
similarity index 90%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/CustomizableGreetingItem.java
rename to ccm-navigation/src/com/arsdigita/navigation/ui/CustomizableGreetingItem.java
index d585bb309..742e1e205 100644
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/CustomizableGreetingItem.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/ui/CustomizableGreetingItem.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
  */
-package com.arsdigita.london.navigation.ui;
+package com.arsdigita.navigation.ui;
 
 import com.arsdigita.cms.ContentItem;
 import com.arsdigita.cms.CustomizableContentItemXMLRenderer;
@@ -49,15 +49,15 @@ import org.apache.log4j.Logger;
  * </p>
  * <pre>
  *  &lt;define:component name="greetingItem"
- *                       classname="com.arsdigita.london.navigation.ui.CustomizableGreetingItem"/&gt;
+ *                       classname="com.arsdigita.navigation.ui.CustomizableGreetingItem"/&gt;
  *     &lt;jsp:scriptlet&gt;
- *        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciOrganization",
+ *        ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciOrganization",
  *                          SimpleXMLGenerator.ADAPTER_CONTEXT);
- *      ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties();
- *      ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/persons");
- *      ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setOrder("surname asc, givenname asc");
+ *      ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties();
+ *      ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/persons");
+ *      ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).setOrder("surname asc, givenname asc");
  *
- *       ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(5);
+ *       ((com.arsdigita.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(5);
  *      &lt;/jsp:scriptlet&gt;
  * </pre>
  * <p>
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/DateOrderedCategoryComponent.java b/ccm-navigation/src/com/arsdigita/navigation/ui/DateOrderedCategoryComponent.java
similarity index 92%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/DateOrderedCategoryComponent.java
rename to ccm-navigation/src/com/arsdigita/navigation/ui/DateOrderedCategoryComponent.java
index 7393c1984..427d6da3f 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/DateOrderedCategoryComponent.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/ui/DateOrderedCategoryComponent.java
@@ -15,7 +15,7 @@
 * License along with this library; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
-package com.arsdigita.london.navigation.ui;
+package com.arsdigita.navigation.ui;
 
 import java.util.Iterator;
 import java.util.List;
@@ -23,7 +23,7 @@ import java.util.List;
 
 import com.arsdigita.bebop.PageState;
 import com.arsdigita.bebop.SimpleComponent;
-import com.arsdigita.london.navigation.Navigation;
+import com.arsdigita.navigation.Navigation;
 import com.arsdigita.util.StringUtils;
 import com.arsdigita.xml.Element;
 
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/GreetingItem.java b/ccm-navigation/src/com/arsdigita/navigation/ui/GreetingItem.java
similarity index 98%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/GreetingItem.java
rename to ccm-navigation/src/com/arsdigita/navigation/ui/GreetingItem.java
index 697188d27..f0bd8fd0e 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/GreetingItem.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/ui/GreetingItem.java
@@ -15,7 +15,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-package com.arsdigita.london.navigation.ui;
+package com.arsdigita.navigation.ui;
 
 import com.arsdigita.bebop.PageState;
 import javax.servlet.ServletException;
@@ -37,7 +37,7 @@ import com.arsdigita.kernel.Party;
 import com.arsdigita.kernel.permissions.PermissionDescriptor;
 import com.arsdigita.kernel.permissions.PermissionService;
 import com.arsdigita.kernel.permissions.PrivilegeDescriptor;
-import com.arsdigita.london.navigation.Navigation;
+import com.arsdigita.navigation.Navigation;
 import com.arsdigita.web.LoginSignal;
 import com.arsdigita.xml.Element;
 
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/GreetingItemExtraXML.java b/ccm-navigation/src/com/arsdigita/navigation/ui/GreetingItemExtraXML.java
similarity index 97%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/GreetingItemExtraXML.java
rename to ccm-navigation/src/com/arsdigita/navigation/ui/GreetingItemExtraXML.java
index 2b4418469..fd12a8255 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/GreetingItemExtraXML.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/ui/GreetingItemExtraXML.java
@@ -2,7 +2,7 @@
  * Copyright (C) 2005 Runtime Collective Ltd. All Rights Reserved.
  */
 
-package com.arsdigita.london.navigation.ui;
+package com.arsdigita.navigation.ui;
 
 import java.util.HashMap;
 import java.util.Iterator;
@@ -22,7 +22,7 @@ import com.arsdigita.cms.ContentItem;
 import com.arsdigita.cms.CMSConfig;
 import com.arsdigita.cms.ExtraXMLGenerator;
 import com.arsdigita.globalization.GlobalizationHelper;
-import com.arsdigita.london.navigation.Navigation;
+import com.arsdigita.navigation.Navigation;
 import com.arsdigita.xml.Element;
 
 /**
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/NavigationRootIndexItem.java b/ccm-navigation/src/com/arsdigita/navigation/ui/NavigationRootIndexItem.java
similarity index 97%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/NavigationRootIndexItem.java
rename to ccm-navigation/src/com/arsdigita/navigation/ui/NavigationRootIndexItem.java
index ac2762836..8959332b8 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/NavigationRootIndexItem.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/ui/NavigationRootIndexItem.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation.ui;
+package com.arsdigita.navigation.ui;
 
 import com.arsdigita.cms.CMS;
 import com.arsdigita.cms.ContentBundle;
@@ -24,7 +24,7 @@ import com.arsdigita.cms.ContentItem;
 import com.arsdigita.cms.ContentItemXMLRenderer;
 import com.arsdigita.cms.dispatcher.SimpleXMLGenerator;
 import com.arsdigita.globalization.GlobalizationHelper;
-import com.arsdigita.london.navigation.Navigation;
+import com.arsdigita.navigation.Navigation;
 import com.arsdigita.xml.Element;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/ObjectList.java b/ccm-navigation/src/com/arsdigita/navigation/ui/ObjectList.java
similarity index 86%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/ObjectList.java
rename to ccm-navigation/src/com/arsdigita/navigation/ui/ObjectList.java
index 2b48c8467..8b29f347f 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/ObjectList.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/ui/ObjectList.java
@@ -17,10 +17,10 @@
  */
 
 
-package com.arsdigita.london.navigation.ui;
+package com.arsdigita.navigation.ui;
 
-import com.arsdigita.london.navigation.DataCollectionDefinition;
-import com.arsdigita.london.navigation.DataCollectionRenderer;
+import com.arsdigita.navigation.DataCollectionDefinition;
+import com.arsdigita.navigation.DataCollectionRenderer;
 
 public interface ObjectList extends Component {
     
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/QuickLinks.java b/ccm-navigation/src/com/arsdigita/navigation/ui/QuickLinks.java
similarity index 96%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/QuickLinks.java
rename to ccm-navigation/src/com/arsdigita/navigation/ui/QuickLinks.java
index 30bbe3d41..65d7c63f3 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/QuickLinks.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/ui/QuickLinks.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation.ui;
+package com.arsdigita.navigation.ui;
 
 import com.arsdigita.persistence.DataCollection;
 import com.arsdigita.persistence.Filter;
@@ -31,8 +31,8 @@ import com.arsdigita.kernel.permissions.PermissionDescriptor;
 import com.arsdigita.kernel.permissions.PermissionService;
 import com.arsdigita.kernel.permissions.PrivilegeDescriptor;
 
-import com.arsdigita.london.navigation.Navigation;
-import com.arsdigita.london.navigation.QuickLink;
+import com.arsdigita.navigation.Navigation;
+import com.arsdigita.navigation.QuickLink;
 
 import com.arsdigita.xml.Element;
 import javax.servlet.http.HttpServletRequest;
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/RelatedItems.java b/ccm-navigation/src/com/arsdigita/navigation/ui/RelatedItems.java
similarity index 94%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/RelatedItems.java
rename to ccm-navigation/src/com/arsdigita/navigation/ui/RelatedItems.java
index d18b7574f..ff0336746 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/RelatedItems.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/ui/RelatedItems.java
@@ -13,12 +13,12 @@
  *
  */
 
-package com.arsdigita.london.navigation.ui;
+package com.arsdigita.navigation.ui;
 
-import com.arsdigita.london.navigation.Navigation;
-import com.arsdigita.london.navigation.NavigationModel;
-import com.arsdigita.london.navigation.RelatedItemsQuery;
-import com.arsdigita.london.navigation.RelatedItemsQueryFactory;
+import com.arsdigita.navigation.Navigation;
+import com.arsdigita.navigation.NavigationModel;
+import com.arsdigita.navigation.RelatedItemsQuery;
+import com.arsdigita.navigation.RelatedItemsQueryFactory;
 
 import com.arsdigita.cms.ContentBundle;
 import com.arsdigita.cms.ContentItem;
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/SimpleContainer.java b/ccm-navigation/src/com/arsdigita/navigation/ui/SimpleContainer.java
similarity index 97%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/SimpleContainer.java
rename to ccm-navigation/src/com/arsdigita/navigation/ui/SimpleContainer.java
index 39ea74c08..48ed38ee9 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/SimpleContainer.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/ui/SimpleContainer.java
@@ -17,7 +17,7 @@
  */
 
 
-package com.arsdigita.london.navigation.ui;
+package com.arsdigita.navigation.ui;
 
 
 import com.arsdigita.util.Assert;
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/TemplateURLs.java b/ccm-navigation/src/com/arsdigita/navigation/ui/TemplateURLs.java
similarity index 96%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/TemplateURLs.java
rename to ccm-navigation/src/com/arsdigita/navigation/ui/TemplateURLs.java
index 9a3ef8a8e..f48da1269 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/TemplateURLs.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/ui/TemplateURLs.java
@@ -15,9 +15,9 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-package com.arsdigita.london.navigation.ui;
+package com.arsdigita.navigation.ui;
 
-import com.arsdigita.london.navigation.NavigationConstants;
+import com.arsdigita.navigation.NavigationConstants;
 
 import com.arsdigita.bebop.PageState;
 import com.arsdigita.bebop.SimpleComponent;
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/URLComponent.java b/ccm-navigation/src/com/arsdigita/navigation/ui/URLComponent.java
similarity index 96%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/URLComponent.java
rename to ccm-navigation/src/com/arsdigita/navigation/ui/URLComponent.java
index d79878ecf..81c09b950 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/URLComponent.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/ui/URLComponent.java
@@ -17,9 +17,9 @@
  */
 
 
-package com.arsdigita.london.navigation.ui;
+package com.arsdigita.navigation.ui;
 
-import com.arsdigita.london.navigation.Navigation;
+import com.arsdigita.navigation.Navigation;
 import com.arsdigita.web.Web;
 import com.arsdigita.web.URL;
 import com.arsdigita.util.Assert;
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/admin/CategoryForm.java b/ccm-navigation/src/com/arsdigita/navigation/ui/admin/CategoryForm.java
similarity index 97%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/admin/CategoryForm.java
rename to ccm-navigation/src/com/arsdigita/navigation/ui/admin/CategoryForm.java
index b6b2c600f..36c690bd2 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/admin/CategoryForm.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/ui/admin/CategoryForm.java
@@ -16,10 +16,10 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation.ui.admin;
+package com.arsdigita.navigation.ui.admin;
 
-import com.arsdigita.london.navigation.Template;
-import com.arsdigita.london.navigation.TemplateCollection;
+import com.arsdigita.navigation.Template;
+import com.arsdigita.navigation.TemplateCollection;
 
 import com.arsdigita.bebop.ColumnPanel;
 import com.arsdigita.bebop.Form;
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/admin/CategoryFormAddContext.java b/ccm-navigation/src/com/arsdigita/navigation/ui/admin/CategoryFormAddContext.java
similarity index 97%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/admin/CategoryFormAddContext.java
rename to ccm-navigation/src/com/arsdigita/navigation/ui/admin/CategoryFormAddContext.java
index dd5a5e7d7..fa4148904 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/admin/CategoryFormAddContext.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/ui/admin/CategoryFormAddContext.java
@@ -16,10 +16,10 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation.ui.admin;
+package com.arsdigita.navigation.ui.admin;
 
-import com.arsdigita.london.navigation.Template;
-import com.arsdigita.london.navigation.TemplateMapping;
+import com.arsdigita.navigation.Template;
+import com.arsdigita.navigation.TemplateMapping;
 
 import com.arsdigita.bebop.ColumnPanel;
 import com.arsdigita.bebop.Form;
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/admin/CategoryFormProcessListener.java b/ccm-navigation/src/com/arsdigita/navigation/ui/admin/CategoryFormProcessListener.java
similarity index 95%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/admin/CategoryFormProcessListener.java
rename to ccm-navigation/src/com/arsdigita/navigation/ui/admin/CategoryFormProcessListener.java
index 571af2cec..27098f948 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/admin/CategoryFormProcessListener.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/ui/admin/CategoryFormProcessListener.java
@@ -16,10 +16,10 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation.ui.admin;
+package com.arsdigita.navigation.ui.admin;
 
-import com.arsdigita.london.navigation.Template;
-import com.arsdigita.london.navigation.TemplateMapping;
+import com.arsdigita.navigation.Template;
+import com.arsdigita.navigation.TemplateMapping;
 
 import com.arsdigita.bebop.FormProcessException;
 import com.arsdigita.bebop.PageState;
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/admin/CategoryPanel.java b/ccm-navigation/src/com/arsdigita/navigation/ui/admin/CategoryPanel.java
similarity index 96%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/admin/CategoryPanel.java
rename to ccm-navigation/src/com/arsdigita/navigation/ui/admin/CategoryPanel.java
index 8b4282078..c1ebb0b0d 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/admin/CategoryPanel.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/ui/admin/CategoryPanel.java
@@ -16,14 +16,14 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation.ui.admin;
+package com.arsdigita.navigation.ui.admin;
 
 import com.arsdigita.bebop.SimpleContainer;
 import com.arsdigita.bebop.Page;
 import com.arsdigita.bebop.PageState;
 import com.arsdigita.bebop.event.ChangeListener;
 import com.arsdigita.bebop.event.ChangeEvent;
-import com.arsdigita.london.navigation.Navigation;
+import com.arsdigita.navigation.Navigation;
 
 public class CategoryPanel extends SimpleContainer {
     
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/admin/CategorySelectionModel.java b/ccm-navigation/src/com/arsdigita/navigation/ui/admin/CategorySelectionModel.java
similarity index 97%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/admin/CategorySelectionModel.java
rename to ccm-navigation/src/com/arsdigita/navigation/ui/admin/CategorySelectionModel.java
index d7c1ab9b1..a82bae25c 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/admin/CategorySelectionModel.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/ui/admin/CategorySelectionModel.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation.ui.admin;
+package com.arsdigita.navigation.ui.admin;
 
 import com.arsdigita.bebop.PageState;
 import com.arsdigita.bebop.parameters.BigDecimalParameter;
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/admin/CategoryTree.java b/ccm-navigation/src/com/arsdigita/navigation/ui/admin/CategoryTree.java
similarity index 95%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/admin/CategoryTree.java
rename to ccm-navigation/src/com/arsdigita/navigation/ui/admin/CategoryTree.java
index 42d33a746..ad3c561ae 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/admin/CategoryTree.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/ui/admin/CategoryTree.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation.ui.admin;
+package com.arsdigita.navigation.ui.admin;
 
 import com.arsdigita.bebop.Tree;
 import com.arsdigita.bebop.PageState;
@@ -28,7 +28,7 @@ import com.arsdigita.cms.TemplateContext;
 import com.arsdigita.web.Web;
 import com.arsdigita.util.LockableImpl;
 
-import com.arsdigita.london.navigation.Navigation;
+import com.arsdigita.navigation.Navigation;
 
 
 /**
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/admin/PopulatePathListener.java b/ccm-navigation/src/com/arsdigita/navigation/ui/admin/PopulatePathListener.java
similarity index 92%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/admin/PopulatePathListener.java
rename to ccm-navigation/src/com/arsdigita/navigation/ui/admin/PopulatePathListener.java
index ca06058f2..6250393c5 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/admin/PopulatePathListener.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/ui/admin/PopulatePathListener.java
@@ -4,7 +4,7 @@
  * To change the template for this generated file go to
  * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
  */
-package com.arsdigita.london.navigation.ui.admin;
+package com.arsdigita.navigation.ui.admin;
 
 import java.math.BigDecimal;
 
@@ -13,7 +13,7 @@ import javax.servlet.http.HttpServletRequest;
 import com.arsdigita.bebop.event.RequestEvent;
 import com.arsdigita.bebop.event.RequestListener;
 import com.arsdigita.categorization.Category;
-import com.arsdigita.london.navigation.NavigationFileResolver;
+import com.arsdigita.navigation.NavigationFileResolver;
 import com.arsdigita.util.StringUtils;
 
 /**
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/admin/QuickLinkForm.java b/ccm-navigation/src/com/arsdigita/navigation/ui/admin/QuickLinkForm.java
similarity index 97%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/admin/QuickLinkForm.java
rename to ccm-navigation/src/com/arsdigita/navigation/ui/admin/QuickLinkForm.java
index 354bbe3e8..1557ad9c6 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/admin/QuickLinkForm.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/ui/admin/QuickLinkForm.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation.ui.admin;
+package com.arsdigita.navigation.ui.admin;
 
 import com.arsdigita.bebop.Form;
 import com.arsdigita.bebop.SimpleContainer;
@@ -35,8 +35,8 @@ import com.arsdigita.bebop.event.FormSubmissionListener;
 import com.arsdigita.bebop.FormProcessException;
 import com.arsdigita.categorization.Category;
 import com.arsdigita.kernel.ui.ACSObjectSelectionModel;
-import com.arsdigita.london.navigation.Navigation;
-import com.arsdigita.london.navigation.QuickLink;
+import com.arsdigita.navigation.Navigation;
+import com.arsdigita.navigation.QuickLink;
 import com.arsdigita.london.util.ui.parameters.URLParameter;
 import java.net.URL;
 
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/admin/QuickLinkListing.java b/ccm-navigation/src/com/arsdigita/navigation/ui/admin/QuickLinkListing.java
similarity index 95%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/admin/QuickLinkListing.java
rename to ccm-navigation/src/com/arsdigita/navigation/ui/admin/QuickLinkListing.java
index 92eeb8a60..3e6e1f312 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/admin/QuickLinkListing.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/ui/admin/QuickLinkListing.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation.ui.admin;
+package com.arsdigita.navigation.ui.admin;
 
 import com.arsdigita.kernel.ui.ACSObjectSelectionModel;
 import com.arsdigita.kernel.ACSObject;
@@ -29,8 +29,8 @@ import com.arsdigita.domain.DomainObject;
 import com.arsdigita.london.util.ui.AbstractDomainObjectList;
 import com.arsdigita.london.util.ui.event.DomainObjectActionListener;
 import com.arsdigita.london.util.ui.event.DomainObjectActionEvent;
-import com.arsdigita.london.navigation.QuickLink;
-import com.arsdigita.london.navigation.Navigation;
+import com.arsdigita.navigation.QuickLink;
+import com.arsdigita.navigation.Navigation;
 
 public class QuickLinkListing extends AbstractDomainObjectList {
 
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/admin/QuickLinkPanel.java b/ccm-navigation/src/com/arsdigita/navigation/ui/admin/QuickLinkPanel.java
similarity index 97%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/admin/QuickLinkPanel.java
rename to ccm-navigation/src/com/arsdigita/navigation/ui/admin/QuickLinkPanel.java
index 92f32ad50..5d010c7fa 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/admin/QuickLinkPanel.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/ui/admin/QuickLinkPanel.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation.ui.admin;
+package com.arsdigita.navigation.ui.admin;
 
 import com.arsdigita.bebop.SimpleContainer;
 import com.arsdigita.bebop.PageState;
@@ -29,7 +29,7 @@ import com.arsdigita.bebop.parameters.BigDecimalParameter;
 import com.arsdigita.bebop.parameters.StringParameter;
 import com.arsdigita.london.util.ui.event.DomainObjectActionListener;
 import com.arsdigita.london.util.ui.event.DomainObjectActionEvent;
-import com.arsdigita.london.navigation.Navigation;
+import com.arsdigita.navigation.Navigation;
 
 public class QuickLinkPanel extends SimpleContainer {
 
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/category/AbstractList.java b/ccm-navigation/src/com/arsdigita/navigation/ui/category/AbstractList.java
similarity index 93%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/category/AbstractList.java
rename to ccm-navigation/src/com/arsdigita/navigation/ui/category/AbstractList.java
index dccf47e2d..64393e27a 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/category/AbstractList.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/ui/category/AbstractList.java
@@ -16,15 +16,15 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation.ui.category;
+package com.arsdigita.navigation.ui.category;
 
 import com.arsdigita.categorization.Category;
 import com.arsdigita.categorization.CategoryCollection;
 import com.arsdigita.xml.Element;
 
-import com.arsdigita.london.navigation.Navigation;
-import com.arsdigita.london.navigation.NavigationModel;
-import com.arsdigita.london.navigation.ui.CategoryComponent;
+import com.arsdigita.navigation.Navigation;
+import com.arsdigita.navigation.NavigationModel;
+import com.arsdigita.navigation.ui.CategoryComponent;
 
 import java.math.BigDecimal;
 
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/category/AbstractTree.java b/ccm-navigation/src/com/arsdigita/navigation/ui/category/AbstractTree.java
similarity index 98%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/category/AbstractTree.java
rename to ccm-navigation/src/com/arsdigita/navigation/ui/category/AbstractTree.java
index 0b84e9635..9f698d68a 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/category/AbstractTree.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/ui/category/AbstractTree.java
@@ -16,11 +16,11 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation.ui.category;
+package com.arsdigita.navigation.ui.category;
 
 
-import com.arsdigita.london.navigation.ui.CategoryComponent;
-import com.arsdigita.london.navigation.Navigation;
+import com.arsdigita.navigation.ui.CategoryComponent;
+import com.arsdigita.navigation.Navigation;
 
 import com.arsdigita.categorization.Category;
 import com.arsdigita.categorization.CategoryCollection;
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/category/Children.java b/ccm-navigation/src/com/arsdigita/navigation/ui/category/Children.java
similarity index 92%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/category/Children.java
rename to ccm-navigation/src/com/arsdigita/navigation/ui/category/Children.java
index a38999dd1..901f62ed1 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/category/Children.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/ui/category/Children.java
@@ -16,11 +16,11 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation.ui.category;
+package com.arsdigita.navigation.ui.category;
 
 import com.arsdigita.categorization.Category;
-import com.arsdigita.london.navigation.NavigationModel;
-import com.arsdigita.london.navigation.Navigation;
+import com.arsdigita.navigation.NavigationModel;
+import com.arsdigita.navigation.Navigation;
 
 import com.arsdigita.web.Web;
 import com.arsdigita.web.URL;
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/category/Hierarchy.java b/ccm-navigation/src/com/arsdigita/navigation/ui/category/Hierarchy.java
similarity index 98%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/category/Hierarchy.java
rename to ccm-navigation/src/com/arsdigita/navigation/ui/category/Hierarchy.java
index 50279854d..450ddaa8b 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/category/Hierarchy.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/ui/category/Hierarchy.java
@@ -16,11 +16,11 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation.ui.category;
+package com.arsdigita.navigation.ui.category;
 
 import com.arsdigita.categorization.Category;
 import com.arsdigita.categorization.CategoryCollection;
-import com.arsdigita.london.navigation.Navigation;
+import com.arsdigita.navigation.Navigation;
 import com.arsdigita.persistence.DataQuery;
 import com.arsdigita.persistence.Filter;
 import com.arsdigita.persistence.OID;
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/category/Menu.java b/ccm-navigation/src/com/arsdigita/navigation/ui/category/Menu.java
similarity index 94%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/category/Menu.java
rename to ccm-navigation/src/com/arsdigita/navigation/ui/category/Menu.java
index caf793e07..8dea4fe63 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/category/Menu.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/ui/category/Menu.java
@@ -16,12 +16,12 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation.ui.category;
+package com.arsdigita.navigation.ui.category;
 
 import com.arsdigita.categorization.Category;
 import com.arsdigita.categorization.CategoryCollection;
 import com.arsdigita.domain.DomainObjectFactory;
-import com.arsdigita.london.navigation.Navigation;
+import com.arsdigita.navigation.Navigation;
 import com.arsdigita.persistence.DataCollection;
 import com.arsdigita.persistence.SessionManager;
 import com.arsdigita.xml.Element;
@@ -277,8 +277,8 @@ public class Menu extends AbstractTree implements TreeCatProvider {
     protected long calcMaxChildCounter(Category cat, BigDecimal[] selected) {
         
         // Show all children of a category if:
-        // com.arsdigita.london.navigation.category_menu_show_grand_children is not set to adaptive or
-        // com.arsdigita.london.navigation.category_menu_show_nephews is set to true and this category has the same parents as the active category or
+        // com.arsdigita.navigation.category_menu_show_grand_children is not set to adaptive or
+        // com.arsdigita.navigation.category_menu_show_nephews is set to true and this category has the same parents as the active category or
         // this category is part of the current path
         if(!(Navigation.getConfig().getCategoryMenuShowGrandChildren().equals("adaptive")) ||
             (Navigation.getConfig().getCategoryMenuShowNephews() &&
@@ -293,7 +293,7 @@ public class Menu extends AbstractTree implements TreeCatProvider {
             // Child of active category
             if((new Category(selected[selected.length - 1])).isMemberOfSubtree(cat)) {
                 
-                // If com.arsdigita.london.navigation.category_menu_show_grand_children_max = 0
+                // If com.arsdigita.navigation.category_menu_show_grand_children_max = 0
                 if(Navigation.getConfig().getCategoryMenuShowGrandChildrenMax() == 0) {
                     
                     // Show all children
@@ -301,14 +301,14 @@ public class Menu extends AbstractTree implements TreeCatProvider {
 
                 } else {
                     
-                    // Show com.arsdigita.london.navigation.category_menu_show_grand_children_max children 
+                    // Show com.arsdigita.navigation.category_menu_show_grand_children_max children 
                     return Navigation.getConfig().getCategoryMenuShowGrandChildrenMax();
 
                 }
  
             } else {
                 
-                // Show com.arsdigita.london.navigation.category_menu_show_grand_children_min children 
+                // Show com.arsdigita.navigation.category_menu_show_grand_children_min children 
                 return Navigation.getConfig().getCategoryMenuShowGrandChildrenMin();
  
             }
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/category/Path.java b/ccm-navigation/src/com/arsdigita/navigation/ui/category/Path.java
similarity index 94%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/category/Path.java
rename to ccm-navigation/src/com/arsdigita/navigation/ui/category/Path.java
index e0a443aee..2596b71ce 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/category/Path.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/ui/category/Path.java
@@ -16,15 +16,15 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation.ui.category;
+package com.arsdigita.navigation.ui.category;
 
-import com.arsdigita.london.navigation.ui.CategoryComponent;
+import com.arsdigita.navigation.ui.CategoryComponent;
 import com.arsdigita.categorization.Category;
 import com.arsdigita.xml.Element;
 import com.arsdigita.web.Web;
 import com.arsdigita.web.URL;
 
-import com.arsdigita.london.navigation.Navigation;
+import com.arsdigita.navigation.Navigation;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/category/PopulatedSubcategoryTreeCatProvider.java b/ccm-navigation/src/com/arsdigita/navigation/ui/category/PopulatedSubcategoryTreeCatProvider.java
similarity index 86%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/category/PopulatedSubcategoryTreeCatProvider.java
rename to ccm-navigation/src/com/arsdigita/navigation/ui/category/PopulatedSubcategoryTreeCatProvider.java
index 27783faea..5a3ad80c2 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/category/PopulatedSubcategoryTreeCatProvider.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/ui/category/PopulatedSubcategoryTreeCatProvider.java
@@ -15,7 +15,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-package com.arsdigita.london.navigation.ui.category;
+package com.arsdigita.navigation.ui.category;
 
 import java.math.BigDecimal;
 import java.util.HashSet;
@@ -24,7 +24,7 @@ import java.util.List;
 import java.util.Set;
 
 import com.arsdigita.categorization.Category;
-import com.arsdigita.domain.DomainObjectFactory;
+// import com.arsdigita.domain.DomainObjectFactory;
 import com.arsdigita.kernel.Kernel;
 import com.arsdigita.kernel.Party;
 import com.arsdigita.kernel.permissions.PermissionService;
@@ -32,7 +32,7 @@ import com.arsdigita.kernel.permissions.PrivilegeDescriptor;
 import com.arsdigita.persistence.DataCollection;
 import com.arsdigita.persistence.DataObject;
 import com.arsdigita.persistence.DataQuery;
-import com.arsdigita.persistence.DataQueryDataCollectionAdapter;
+// import com.arsdigita.persistence.DataQueryDataCollectionAdapter;
 import com.arsdigita.persistence.SessionManager;
 
 /**
@@ -47,8 +47,8 @@ import com.arsdigita.persistence.SessionManager;
  * index pages.
  * 
  * To use this feature, 
- * ccm set com.arsdigita.london.navigation.default_menu_cat_provider=com.arsdigita.london.navigation.ui.category.PopulatedSubcategoryTreeCatProvider
- * and ccm set com.arsdigita.london.navigation.index_page_cache_lifetime=0
+ * ccm set com.arsdigita.navigation.default_menu_cat_provider=com.arsdigita.navigation.ui.category.PopulatedSubcategoryTreeCatProvider
+ * and ccm set com.arsdigita.navigation.index_page_cache_lifetime=0
  * 
  * This provider includes a permission check. An alternative could be written without this check
  * that may be faster.
@@ -60,7 +60,7 @@ public class PopulatedSubcategoryTreeCatProvider implements TreeCatProvider {
     public DataCollection getTreeCats(List catIDs, BigDecimal[] selectedIDs) {
 	DataQuery items =
 		SessionManager.getSession().retrieveQuery(
-		"com.arsdigita.london.navigation.PopulatedSubcategories");
+		"com.arsdigita.navigation.PopulatedSubcategories");
 	Party party = Kernel.getContext().getParty();
 	if (party == null) {
 	    party = Kernel.getPublicUser();
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/category/Root.java b/ccm-navigation/src/com/arsdigita/navigation/ui/category/Root.java
similarity index 92%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/category/Root.java
rename to ccm-navigation/src/com/arsdigita/navigation/ui/category/Root.java
index 46e43da84..3b701c992 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/category/Root.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/ui/category/Root.java
@@ -16,16 +16,16 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation.ui.category;
+package com.arsdigita.navigation.ui.category;
 
-import com.arsdigita.london.navigation.ui.CategoryComponent;
+import com.arsdigita.navigation.ui.CategoryComponent;
 
 import com.arsdigita.categorization.Category;
 import com.arsdigita.xml.Element;
 import com.arsdigita.web.Web;
 import com.arsdigita.web.URL;
 
-import com.arsdigita.london.navigation.Navigation;
+import com.arsdigita.navigation.Navigation;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/category/Siblings.java b/ccm-navigation/src/com/arsdigita/navigation/ui/category/Siblings.java
similarity index 93%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/category/Siblings.java
rename to ccm-navigation/src/com/arsdigita/navigation/ui/category/Siblings.java
index ba45a8ba7..1e4579442 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/category/Siblings.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/ui/category/Siblings.java
@@ -16,11 +16,11 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation.ui.category;
+package com.arsdigita.navigation.ui.category;
 
 import com.arsdigita.categorization.Category;
-import com.arsdigita.london.navigation.NavigationModel;
-import com.arsdigita.london.navigation.Navigation;
+import com.arsdigita.navigation.NavigationModel;
+import com.arsdigita.navigation.Navigation;
 
 import com.arsdigita.web.Web;
 import com.arsdigita.web.URL;
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/category/TopLevel.java b/ccm-navigation/src/com/arsdigita/navigation/ui/category/TopLevel.java
similarity index 93%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/category/TopLevel.java
rename to ccm-navigation/src/com/arsdigita/navigation/ui/category/TopLevel.java
index f76793896..ca02056a8 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/category/TopLevel.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/ui/category/TopLevel.java
@@ -16,10 +16,10 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation.ui.category;
+package com.arsdigita.navigation.ui.category;
 
 import com.arsdigita.categorization.Category;
-import com.arsdigita.london.navigation.NavigationModel;
+import com.arsdigita.navigation.NavigationModel;
 
 
 /**
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/category/TreeCatProvider.java b/ccm-navigation/src/com/arsdigita/navigation/ui/category/TreeCatProvider.java
similarity index 95%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/category/TreeCatProvider.java
rename to ccm-navigation/src/com/arsdigita/navigation/ui/category/TreeCatProvider.java
index 4eb81fec6..90f4a8ade 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/category/TreeCatProvider.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/ui/category/TreeCatProvider.java
@@ -15,7 +15,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-package com.arsdigita.london.navigation.ui.category;
+package com.arsdigita.navigation.ui.category;
 
 import java.math.BigDecimal;
 import java.util.List;
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/object/AtoZObjectList.java b/ccm-navigation/src/com/arsdigita/navigation/ui/object/AtoZObjectList.java
similarity index 96%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/object/AtoZObjectList.java
rename to ccm-navigation/src/com/arsdigita/navigation/ui/object/AtoZObjectList.java
index 3b6bf6d91..36a916699 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/object/AtoZObjectList.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/ui/object/AtoZObjectList.java
@@ -17,10 +17,10 @@
  */
 
 
-package com.arsdigita.london.navigation.ui.object;
+package com.arsdigita.navigation.ui.object;
 
-import com.arsdigita.london.navigation.Navigation;
-import com.arsdigita.london.navigation.ui.AbstractObjectList;
+import com.arsdigita.navigation.Navigation;
+import com.arsdigita.navigation.ui.AbstractObjectList;
 
 import com.arsdigita.persistence.FilterFactory;
 import com.arsdigita.persistence.CompoundFilter;
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/object/CompareFilter.java b/ccm-navigation/src/com/arsdigita/navigation/ui/object/CompareFilter.java
similarity index 99%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/object/CompareFilter.java
rename to ccm-navigation/src/com/arsdigita/navigation/ui/object/CompareFilter.java
index 4a1103680..e83f7308d 100644
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/object/CompareFilter.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/ui/object/CompareFilter.java
@@ -1,4 +1,4 @@
-package com.arsdigita.london.navigation.ui.object;
+package com.arsdigita.navigation.ui.object;
 
 import com.arsdigita.xml.Element;
 import java.util.ArrayList;
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/object/ComplexObjectList.java b/ccm-navigation/src/com/arsdigita/navigation/ui/object/ComplexObjectList.java
similarity index 95%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/object/ComplexObjectList.java
rename to ccm-navigation/src/com/arsdigita/navigation/ui/object/ComplexObjectList.java
index 4abfd8218..0ea7b1bf2 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/object/ComplexObjectList.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/ui/object/ComplexObjectList.java
@@ -11,10 +11,10 @@
  * Angelegt wurde Sie für die Auflistung der aktuellen News
  * und Veranstalungen auf einer Navigationsseite.
  */
-package com.arsdigita.london.navigation.ui.object;
+package com.arsdigita.navigation.ui.object;
 
-import com.arsdigita.london.navigation.Navigation;
-import com.arsdigita.london.navigation.ui.AbstractObjectList;
+import com.arsdigita.navigation.Navigation;
+import com.arsdigita.navigation.ui.AbstractObjectList;
 
 import com.arsdigita.persistence.DataCollection;
 import com.arsdigita.persistence.Filter;
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/object/CustomizableObjectList.java b/ccm-navigation/src/com/arsdigita/navigation/ui/object/CustomizableObjectList.java
similarity index 96%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/object/CustomizableObjectList.java
rename to ccm-navigation/src/com/arsdigita/navigation/ui/object/CustomizableObjectList.java
index cec1da683..2855dce8d 100644
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/object/CustomizableObjectList.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/ui/object/CustomizableObjectList.java
@@ -1,6 +1,6 @@
-package com.arsdigita.london.navigation.ui.object;
+package com.arsdigita.navigation.ui.object;
 
-import com.arsdigita.london.navigation.Navigation;
+import com.arsdigita.navigation.Navigation;
 import com.arsdigita.persistence.DataCollection;
 import com.arsdigita.xml.Element;
 import java.io.UnsupportedEncodingException;
@@ -53,7 +53,7 @@ import org.apache.log4j.Logger;
  * {@code
  * ...
  * <define:component name="itemList"
-                           classname="com.arsdigita.london.navigation.ui.object.CustomizableObjectList"/>
+ *         classname="com.arsdigita.navigation.ui.object.CustomizableObjectList"/>
  * ...
  *   <jsp:scriptlet>
       CustomizableObjectList objList = (CustomizableObjectList) itemList;
@@ -135,7 +135,7 @@ public class CustomizableObjectList extends ComplexObjectList {
      * @param propertyIsNumeric Is the property to filter numeric?
      * @return The new filter. Options can be added to the filter by calling
      * the {@link CompareFilter#addOption(java.lang.String, java.lang.String)} or
-     * the {@link CompareFilter#addOption(java.lang.String, com.arsdigita.london.navigation.ui.object.CompareFilter.Operators, java.lang.String)}
+     * the {@link CompareFilter#addOption(java.lang.String, com.arsdigita.navigation.ui.object.CompareFilter.Operators, java.lang.String)}
      * method.
      * @see CompareFilter#CompareFilter(java.lang.String, java.lang.String, boolean, boolean, boolean)
      *
@@ -166,7 +166,7 @@ public class CustomizableObjectList extends ComplexObjectList {
      * @param allOption Add an all option?
      * @param allOptionIsDefault Is the all option the default.
      * @param propertyIsNumeric Is the property numeric?
-     * @see SelectFilter#SelectFilter(java.lang.String, java.lang.String, com.arsdigita.london.navigation.ui.object.CustomizableObjectList, boolean, boolean, boolean, boolean) 
+     * @see SelectFilter#SelectFilter(java.lang.String, java.lang.String, com.arsdigita.navigation.ui.object.CustomizableObjectList, boolean, boolean, boolean, boolean) 
      */
     public void addSelectFilter(final String property,
                                 final String label,
@@ -267,7 +267,7 @@ public class CustomizableObjectList extends ComplexObjectList {
                                HttpServletResponse response) {
         //Some stuff for the list (copied from ComplexObjectList)
         Element content = Navigation.newElement("customizableObjectList");
-                
+
         if (m_customName != null) {
             content.addAttribute(CUSTOM_NAME, m_customName);
         }
@@ -290,6 +290,7 @@ public class CustomizableObjectList extends ComplexObjectList {
                 logger.error(ex);
             }
         //}
+
         for (Map.Entry<String, Filter> filterEntry : filters.entrySet()) {
             String value = request.getParameter(filterEntry.getKey());
 
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/object/Filter.java b/ccm-navigation/src/com/arsdigita/navigation/ui/object/Filter.java
similarity index 93%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/object/Filter.java
rename to ccm-navigation/src/com/arsdigita/navigation/ui/object/Filter.java
index 67f56d170..61886c1aa 100644
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/object/Filter.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/ui/object/Filter.java
@@ -1,4 +1,4 @@
-package com.arsdigita.london.navigation.ui.object;
+package com.arsdigita.navigation.ui.object;
 
 import com.arsdigita.xml.Element;
 
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/object/FilterObjectList.java b/ccm-navigation/src/com/arsdigita/navigation/ui/object/FilterObjectList.java
similarity index 93%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/object/FilterObjectList.java
rename to ccm-navigation/src/com/arsdigita/navigation/ui/object/FilterObjectList.java
index a876072ba..9cc75169a 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/object/FilterObjectList.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/ui/object/FilterObjectList.java
@@ -16,10 +16,10 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation.ui.object;
+package com.arsdigita.navigation.ui.object;
 
-import com.arsdigita.london.navigation.Navigation;
-import com.arsdigita.london.navigation.ui.AbstractObjectList;
+import com.arsdigita.navigation.Navigation;
+import com.arsdigita.navigation.ui.AbstractObjectList;
 
 import com.arsdigita.persistence.DataCollection;
 import com.arsdigita.xml.Element;
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/object/SelectFilter.java b/ccm-navigation/src/com/arsdigita/navigation/ui/object/SelectFilter.java
similarity index 98%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/object/SelectFilter.java
rename to ccm-navigation/src/com/arsdigita/navigation/ui/object/SelectFilter.java
index 175cda6b4..dc8a05480 100644
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/object/SelectFilter.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/ui/object/SelectFilter.java
@@ -1,4 +1,4 @@
-package com.arsdigita.london.navigation.ui.object;
+package com.arsdigita.navigation.ui.object;
 
 import com.arsdigita.persistence.DataCollection;
 import com.arsdigita.persistence.DataObject;
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/object/SimpleObjectList.java b/ccm-navigation/src/com/arsdigita/navigation/ui/object/SimpleObjectList.java
similarity index 91%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/object/SimpleObjectList.java
rename to ccm-navigation/src/com/arsdigita/navigation/ui/object/SimpleObjectList.java
index b15e3b006..4ef0345b3 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/object/SimpleObjectList.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/ui/object/SimpleObjectList.java
@@ -15,10 +15,10 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-package com.arsdigita.london.navigation.ui.object;
+package com.arsdigita.navigation.ui.object;
 
-import com.arsdigita.london.navigation.Navigation;
-import com.arsdigita.london.navigation.ui.AbstractObjectList;
+import com.arsdigita.navigation.Navigation;
+import com.arsdigita.navigation.ui.AbstractObjectList;
 
 import com.arsdigita.xml.Element;
 
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/object/TextFilter.java b/ccm-navigation/src/com/arsdigita/navigation/ui/object/TextFilter.java
similarity index 97%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/object/TextFilter.java
rename to ccm-navigation/src/com/arsdigita/navigation/ui/object/TextFilter.java
index 6ff3a68de..9a63d3a83 100644
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/object/TextFilter.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/ui/object/TextFilter.java
@@ -1,4 +1,4 @@
-package com.arsdigita.london.navigation.ui.object;
+package com.arsdigita.navigation.ui.object;
 
 import com.arsdigita.xml.Element;
 import java.io.UnsupportedEncodingException;
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/portlet/ItemListPortletEditor.java b/ccm-navigation/src/com/arsdigita/navigation/ui/portlet/ItemListPortletEditor.java
similarity index 97%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/portlet/ItemListPortletEditor.java
rename to ccm-navigation/src/com/arsdigita/navigation/ui/portlet/ItemListPortletEditor.java
index 22f497cdb..97330dfb9 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/portlet/ItemListPortletEditor.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/ui/portlet/ItemListPortletEditor.java
@@ -16,9 +16,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation.ui.portlet;
+package com.arsdigita.navigation.ui.portlet;
 
-import com.arsdigita.london.navigation.portlet.ItemListPortlet;
+import com.arsdigita.navigation.portlet.ItemListPortlet;
 
 import com.arsdigita.bebop.parameters.ParameterModel;
 
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/portlet/ItemListPortletRenderer.java b/ccm-navigation/src/com/arsdigita/navigation/ui/portlet/ItemListPortletRenderer.java
similarity index 81%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/portlet/ItemListPortletRenderer.java
rename to ccm-navigation/src/com/arsdigita/navigation/ui/portlet/ItemListPortletRenderer.java
index b7ed9fdf0..0c13d6f92 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/portlet/ItemListPortletRenderer.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/ui/portlet/ItemListPortletRenderer.java
@@ -16,11 +16,11 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation.ui.portlet;
+package com.arsdigita.navigation.ui.portlet;
 
-import com.arsdigita.london.navigation.DataCollectionRenderer;
-import com.arsdigita.london.navigation.cms.CMSDataCollectionRenderer;
-import com.arsdigita.london.navigation.portlet.ObjectListPortlet;
+import com.arsdigita.navigation.DataCollectionRenderer;
+import com.arsdigita.navigation.cms.CMSDataCollectionRenderer;
+import com.arsdigita.navigation.portlet.ObjectListPortlet;
 
 public class ItemListPortletRenderer extends ObjectListPortletRenderer {
     
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/portlet/NavigationTreePortletEditor.java b/ccm-navigation/src/com/arsdigita/navigation/ui/portlet/NavigationTreePortletEditor.java
similarity index 96%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/portlet/NavigationTreePortletEditor.java
rename to ccm-navigation/src/com/arsdigita/navigation/ui/portlet/NavigationTreePortletEditor.java
index 4f6d2b99e..120cad257 100644
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/portlet/NavigationTreePortletEditor.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/ui/portlet/NavigationTreePortletEditor.java
@@ -17,7 +17,7 @@
  * 
  */
 
-package com.arsdigita.london.navigation.ui.portlet;
+package com.arsdigita.navigation.ui.portlet;
 
 import java.math.BigDecimal;
 import java.util.TooManyListenersException;
@@ -41,8 +41,8 @@ import com.arsdigita.domain.DataObjectNotFoundException;
 import com.arsdigita.domain.DomainCollection;
 import com.arsdigita.domain.DomainObjectFactory;
 import com.arsdigita.kernel.ResourceType;
-import com.arsdigita.london.navigation.Navigation;
-import com.arsdigita.london.navigation.portlet.NavigationTreePortlet;
+import com.arsdigita.navigation.Navigation;
+import com.arsdigita.navigation.portlet.NavigationTreePortlet;
 // @deprecated use com.arsdigita.bebop.portal.PortletConfigFormSection
 // import com.arsdigita.london.portal.ui.PortletConfigFormSection;
 import com.arsdigita.persistence.OID;
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/portlet/NavigationTreePortletRenderer.java b/ccm-navigation/src/com/arsdigita/navigation/ui/portlet/NavigationTreePortletRenderer.java
similarity index 97%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/portlet/NavigationTreePortletRenderer.java
rename to ccm-navigation/src/com/arsdigita/navigation/ui/portlet/NavigationTreePortletRenderer.java
index a3a3855b2..302e1598e 100644
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/portlet/NavigationTreePortletRenderer.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/ui/portlet/NavigationTreePortletRenderer.java
@@ -17,7 +17,7 @@
  * 
  */
 
-package com.arsdigita.london.navigation.ui.portlet;
+package com.arsdigita.navigation.ui.portlet;
 
 import java.math.BigDecimal;
 import java.util.HashMap;
@@ -30,8 +30,8 @@ import com.arsdigita.bebop.portal.AbstractPortletRenderer;
 import com.arsdigita.categorization.Category;
 import com.arsdigita.categorization.CategoryCollection;
 import com.arsdigita.cms.TemplateContext;
-import com.arsdigita.london.navigation.Navigation;
-import com.arsdigita.london.navigation.portlet.NavigationTreePortlet;
+import com.arsdigita.navigation.Navigation;
+import com.arsdigita.navigation.portlet.NavigationTreePortlet;
 // import com.arsdigita.london.portal.ui.PortalConstants;
 import com.arsdigita.persistence.OID;
 import com.arsdigita.web.ParameterMap;
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/portlet/ObjectListPortletEditor.java b/ccm-navigation/src/com/arsdigita/navigation/ui/portlet/ObjectListPortletEditor.java
similarity index 99%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/portlet/ObjectListPortletEditor.java
rename to ccm-navigation/src/com/arsdigita/navigation/ui/portlet/ObjectListPortletEditor.java
index f072e7bfe..49b22c0ee 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/portlet/ObjectListPortletEditor.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/ui/portlet/ObjectListPortletEditor.java
@@ -16,9 +16,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation.ui.portlet;
+package com.arsdigita.navigation.ui.portlet;
 
-import com.arsdigita.london.navigation.portlet.ObjectListPortlet;
+import com.arsdigita.navigation.portlet.ObjectListPortlet;
 
 import com.arsdigita.bebop.ColumnPanel;
 import com.arsdigita.bebop.FormProcessException;
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/portlet/ObjectListPortletRenderer.java b/ccm-navigation/src/com/arsdigita/navigation/ui/portlet/ObjectListPortletRenderer.java
similarity index 90%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/portlet/ObjectListPortletRenderer.java
rename to ccm-navigation/src/com/arsdigita/navigation/ui/portlet/ObjectListPortletRenderer.java
index fe7f0d085..388ccdef6 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/portlet/ObjectListPortletRenderer.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/ui/portlet/ObjectListPortletRenderer.java
@@ -16,13 +16,13 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation.ui.portlet;
+package com.arsdigita.navigation.ui.portlet;
 
 import com.arsdigita.bebop.PageState;
 import com.arsdigita.bebop.portal.AbstractPortletRenderer;
-import com.arsdigita.london.navigation.DataCollectionPropertyRenderer;
-import com.arsdigita.london.navigation.DataCollectionRenderer;
-import com.arsdigita.london.navigation.portlet.ObjectListPortlet;
+import com.arsdigita.navigation.DataCollectionPropertyRenderer;
+import com.arsdigita.navigation.DataCollectionRenderer;
+import com.arsdigita.navigation.portlet.ObjectListPortlet;
 import com.arsdigita.persistence.DataCollection;
 import com.arsdigita.util.StringUtils;
 import com.arsdigita.xml.Element;
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/upgrades/Upgrade141to142.java b/ccm-navigation/src/com/arsdigita/navigation/upgrades/Upgrade141to142.java
similarity index 94%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/upgrades/Upgrade141to142.java
rename to ccm-navigation/src/com/arsdigita/navigation/upgrades/Upgrade141to142.java
index 6a8fb1e3f..5266a1cbc 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/upgrades/Upgrade141to142.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/upgrades/Upgrade141to142.java
@@ -16,12 +16,12 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation.upgrades;
+package com.arsdigita.navigation.upgrades;
 
 
 import com.arsdigita.london.util.Program;
 import com.arsdigita.london.util.Transaction;
-import com.arsdigita.london.navigation.Loader;
+import com.arsdigita.navigation.Loader;
 
 import com.arsdigita.kernel.Kernel;
 import com.arsdigita.kernel.KernelExcursion;
diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/upgrades/Upgrade650to651.java b/ccm-navigation/src/com/arsdigita/navigation/upgrades/Upgrade650to651.java
similarity index 97%
rename from ccm-ldn-navigation/src/com/arsdigita/london/navigation/upgrades/Upgrade650to651.java
rename to ccm-navigation/src/com/arsdigita/navigation/upgrades/Upgrade650to651.java
index f8fec5c4c..a361b6b0b 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/upgrades/Upgrade650to651.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/upgrades/Upgrade650to651.java
@@ -4,7 +4,7 @@
  * To change the template for this generated file go to
  * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
  */
-package com.arsdigita.london.navigation.upgrades;
+package com.arsdigita.navigation.upgrades;
 
 
 import org.apache.commons.cli.CommandLine;
diff --git a/ccm-ldn-navigation/test/src/com/arsdigita/london/navigation/NavigationSuite.java b/ccm-navigation/test/src/com/arsdigita/navigation/NavigationSuite.java
similarity index 97%
rename from ccm-ldn-navigation/test/src/com/arsdigita/london/navigation/NavigationSuite.java
rename to ccm-navigation/test/src/com/arsdigita/navigation/NavigationSuite.java
index 76319e822..6a5afe156 100755
--- a/ccm-ldn-navigation/test/src/com/arsdigita/london/navigation/NavigationSuite.java
+++ b/ccm-navigation/test/src/com/arsdigita/navigation/NavigationSuite.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation;
+package com.arsdigita.navigation;
 
 import com.arsdigita.tools.junit.extensions.BaseTestSetup;
 import com.arsdigita.tools.junit.extensions.CoreTestSetup;
diff --git a/ccm-ldn-navigation/test/src/com/arsdigita/london/navigation/NavigationTestSetup.java b/ccm-navigation/test/src/com/arsdigita/navigation/NavigationTestSetup.java
similarity index 92%
rename from ccm-ldn-navigation/test/src/com/arsdigita/london/navigation/NavigationTestSetup.java
rename to ccm-navigation/test/src/com/arsdigita/navigation/NavigationTestSetup.java
index 8ad388a2c..3109a7a26 100755
--- a/ccm-ldn-navigation/test/src/com/arsdigita/london/navigation/NavigationTestSetup.java
+++ b/ccm-navigation/test/src/com/arsdigita/navigation/NavigationTestSetup.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation;
+package com.arsdigita.navigation;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
@@ -41,7 +41,7 @@ public class NavigationTestSetup extends CoreTestSetup {
     protected void setUp() throws Exception {
         addRequiredInitializer("com.arsdigita.cms.Initializer");
         addRequiredInitializer("com.arsdigita.london.util.Initializer");
-        addRequiredInitializer("com.arsdigita.london.navigation.Initializer");
+        addRequiredInitializer("com.arsdigita.navigation.Initializer");
         super.setUp();
     }
 }
diff --git a/ccm-ldn-navigation/test/src/com/arsdigita/london/navigation/RelatedItemsTest.java b/ccm-navigation/test/src/com/arsdigita/navigation/RelatedItemsTest.java
similarity index 99%
rename from ccm-ldn-navigation/test/src/com/arsdigita/london/navigation/RelatedItemsTest.java
rename to ccm-navigation/test/src/com/arsdigita/navigation/RelatedItemsTest.java
index 8543b4ef0..173e232c8 100755
--- a/ccm-ldn-navigation/test/src/com/arsdigita/london/navigation/RelatedItemsTest.java
+++ b/ccm-navigation/test/src/com/arsdigita/navigation/RelatedItemsTest.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.navigation;
+package com.arsdigita.navigation;
 
 import com.arsdigita.london.util.junit.BaseTestCase;
 
diff --git a/ccm-ldn-navigation/web/WEB-INF/web.ccm-ldn-navigation.xml b/ccm-navigation/web/WEB-INF/web.ccm-navigation.xml
similarity index 61%
rename from ccm-ldn-navigation/web/WEB-INF/web.ccm-ldn-navigation.xml
rename to ccm-navigation/web/WEB-INF/web.ccm-navigation.xml
index 7f604343b..71eff45ed 100644
--- a/ccm-ldn-navigation/web/WEB-INF/web.ccm-ldn-navigation.xml
+++ b/ccm-navigation/web/WEB-INF/web.ccm-navigation.xml
@@ -5,26 +5,26 @@
                         http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
                version="2.4">
 
-    <!-- module ccm-ldn-navigation  -  servlet definitions BEGIN  -->
+    <!-- module ccm-navigation  -  servlet definitions BEGIN  -->
     <servlet>
         <servlet-name>navigation-files</servlet-name>
         <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
         <init-param>
             <param-name>template-path</param-name>
-            <param-value>/templates/ccm-ldn-navigation</param-value>
+            <param-value>/templates/ccm-navigation</param-value>
         </init-param>
         <init-param>
             <param-name>file-resolver</param-name>
-            <param-value>com.arsdigita.london.navigation.NavigationFileResolver</param-value>
+            <param-value>com.arsdigita.navigation.NavigationFileResolver</param-value>
         </init-param>
     </servlet>
-    <!-- module ccm-ldn-navigation  -  servlet definitions END  -->
+    <!-- module ccm-navigation  -  servlet definitions END  -->
 
-    <!-- module ccm-ldn-navigation  -  servlet mappings BEGIN  -->
+    <!-- module ccm-navigation  -  servlet mappings BEGIN  -->
     <servlet-mapping>
         <servlet-name>navigation-files</servlet-name>
-        <url-pattern>/ccm-ldn-navigation/files/*</url-pattern>
+        <url-pattern>/ccm-navigation/files/*</url-pattern>
     </servlet-mapping>
-    <!-- module ccm-ldn-navigation  -  servlet mappings END  -->
+    <!-- module ccm-navigation  -  servlet mappings END  -->
 
 </web-app>
diff --git a/ccm-ldn-navigation/web/__ccm__/apps/navigation/lib/category-panel.css b/ccm-navigation/web/__ccm__/apps/navigation/lib/category-panel.css
similarity index 100%
rename from ccm-ldn-navigation/web/__ccm__/apps/navigation/lib/category-panel.css
rename to ccm-navigation/web/__ccm__/apps/navigation/lib/category-panel.css
diff --git a/ccm-ldn-navigation/web/__ccm__/apps/navigation/lib/category-panel.xsl b/ccm-navigation/web/__ccm__/apps/navigation/lib/category-panel.xsl
similarity index 92%
rename from ccm-ldn-navigation/web/__ccm__/apps/navigation/lib/category-panel.xsl
rename to ccm-navigation/web/__ccm__/apps/navigation/lib/category-panel.xsl
index 800e7a9ba..e00a8fe5a 100755
--- a/ccm-ldn-navigation/web/__ccm__/apps/navigation/lib/category-panel.xsl
+++ b/ccm-navigation/web/__ccm__/apps/navigation/lib/category-panel.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
-  xmlns:nav="http://ccm.redhat.com/london/navigation"
+  xmlns:nav="http://ccm.redhat.com/navigation"
   version="1.0">
 
   <xsl:template match="nav:categoryPanel">
diff --git a/ccm-ldn-navigation/web/__ccm__/apps/navigation/lib/category.css b/ccm-navigation/web/__ccm__/apps/navigation/lib/category.css
similarity index 100%
rename from ccm-ldn-navigation/web/__ccm__/apps/navigation/lib/category.css
rename to ccm-navigation/web/__ccm__/apps/navigation/lib/category.css
diff --git a/ccm-ldn-navigation/web/__ccm__/apps/navigation/lib/category.xsl b/ccm-navigation/web/__ccm__/apps/navigation/lib/category.xsl
similarity index 94%
rename from ccm-ldn-navigation/web/__ccm__/apps/navigation/lib/category.xsl
rename to ccm-navigation/web/__ccm__/apps/navigation/lib/category.xsl
index 02b729dac..1cf19f721 100755
--- a/ccm-ldn-navigation/web/__ccm__/apps/navigation/lib/category.xsl
+++ b/ccm-navigation/web/__ccm__/apps/navigation/lib/category.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet 
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:nav="http://ccm.redhat.com/london/navigation"
+  xmlns:nav="http://ccm.redhat.com/navigation"
   version="1.0">
 
 
diff --git a/ccm-ldn-navigation/web/__ccm__/apps/navigation/lib/greeting-item.xsl b/ccm-navigation/web/__ccm__/apps/navigation/lib/greeting-item.xsl
similarity index 78%
rename from ccm-ldn-navigation/web/__ccm__/apps/navigation/lib/greeting-item.xsl
rename to ccm-navigation/web/__ccm__/apps/navigation/lib/greeting-item.xsl
index f53b5f760..d1f00f2f1 100755
--- a/ccm-ldn-navigation/web/__ccm__/apps/navigation/lib/greeting-item.xsl
+++ b/ccm-navigation/web/__ccm__/apps/navigation/lib/greeting-item.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:nav="http://ccm.redhat.com/london/navigation"
+  xmlns:nav="http://ccm.redhat.com/navigation"
   version="1.0">
 
   <xsl:template match="nav:greetingItem">
diff --git a/ccm-ldn-navigation/web/__ccm__/apps/navigation/lib/index.css b/ccm-navigation/web/__ccm__/apps/navigation/lib/index.css
similarity index 100%
rename from ccm-ldn-navigation/web/__ccm__/apps/navigation/lib/index.css
rename to ccm-navigation/web/__ccm__/apps/navigation/lib/index.css
diff --git a/ccm-ldn-navigation/web/__ccm__/apps/navigation/lib/object-list.xsl b/ccm-navigation/web/__ccm__/apps/navigation/lib/object-list.xsl
similarity index 93%
rename from ccm-ldn-navigation/web/__ccm__/apps/navigation/lib/object-list.xsl
rename to ccm-navigation/web/__ccm__/apps/navigation/lib/object-list.xsl
index b35077ac6..5e1cdba43 100755
--- a/ccm-ldn-navigation/web/__ccm__/apps/navigation/lib/object-list.xsl
+++ b/ccm-navigation/web/__ccm__/apps/navigation/lib/object-list.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet 
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:nav="http://ccm.redhat.com/london/navigation"
+  xmlns:nav="http://ccm.redhat.com/navigation"
   version="1.0">
 
 <!--<xsl:template name="contentLinks">-->
diff --git a/ccm-ldn-navigation/web/__ccm__/apps/navigation/lib/quick-link-form.css b/ccm-navigation/web/__ccm__/apps/navigation/lib/quick-link-form.css
similarity index 100%
rename from ccm-ldn-navigation/web/__ccm__/apps/navigation/lib/quick-link-form.css
rename to ccm-navigation/web/__ccm__/apps/navigation/lib/quick-link-form.css
diff --git a/ccm-ldn-navigation/web/__ccm__/apps/navigation/lib/quick-link-form.xsl b/ccm-navigation/web/__ccm__/apps/navigation/lib/quick-link-form.xsl
similarity index 93%
rename from ccm-ldn-navigation/web/__ccm__/apps/navigation/lib/quick-link-form.xsl
rename to ccm-navigation/web/__ccm__/apps/navigation/lib/quick-link-form.xsl
index bf471c2ea..afef4e918 100755
--- a/ccm-ldn-navigation/web/__ccm__/apps/navigation/lib/quick-link-form.xsl
+++ b/ccm-navigation/web/__ccm__/apps/navigation/lib/quick-link-form.xsl
@@ -2,7 +2,7 @@
 <xsl:stylesheet
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
-  xmlns:nav="http://ccm.redhat.com/london/navigation"
+  xmlns:nav="http://ccm.redhat.com/navigation"
   version="1.0">
 
   <xsl:template match="nav:quickLinkForm">
diff --git a/ccm-ldn-navigation/web/__ccm__/apps/navigation/lib/quick-link-listing.css b/ccm-navigation/web/__ccm__/apps/navigation/lib/quick-link-listing.css
similarity index 100%
rename from ccm-ldn-navigation/web/__ccm__/apps/navigation/lib/quick-link-listing.css
rename to ccm-navigation/web/__ccm__/apps/navigation/lib/quick-link-listing.css
diff --git a/ccm-ldn-navigation/web/themes/heirloom/apps/navigation/lib/quick-link-listing.xsl b/ccm-navigation/web/__ccm__/apps/navigation/lib/quick-link-listing.xsl
similarity index 95%
rename from ccm-ldn-navigation/web/themes/heirloom/apps/navigation/lib/quick-link-listing.xsl
rename to ccm-navigation/web/__ccm__/apps/navigation/lib/quick-link-listing.xsl
index c443ff691..086360ca9 100755
--- a/ccm-ldn-navigation/web/themes/heirloom/apps/navigation/lib/quick-link-listing.xsl
+++ b/ccm-navigation/web/__ccm__/apps/navigation/lib/quick-link-listing.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
-  xmlns:nav="http://ccm.redhat.com/london/navigation"
+  xmlns:nav="http://ccm.redhat.com/navigation"
   version="1.0">
 
   <xsl:template match="nav:quickLinkListing">
diff --git a/ccm-ldn-navigation/web/themes/heirloom/apps/navigation/lib/quick-link-panel.xsl b/ccm-navigation/web/__ccm__/apps/navigation/lib/quick-link-panel.xsl
similarity index 81%
rename from ccm-ldn-navigation/web/themes/heirloom/apps/navigation/lib/quick-link-panel.xsl
rename to ccm-navigation/web/__ccm__/apps/navigation/lib/quick-link-panel.xsl
index 24958015b..bec94d8d9 100755
--- a/ccm-ldn-navigation/web/themes/heirloom/apps/navigation/lib/quick-link-panel.xsl
+++ b/ccm-navigation/web/__ccm__/apps/navigation/lib/quick-link-panel.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
-  xmlns:nav="http://ccm.redhat.com/london/navigation"
+  xmlns:nav="http://ccm.redhat.com/navigation"
   version="1.0">
 
   <xsl:template match="nav:quickLinkPanel">
diff --git a/ccm-ldn-navigation/web/themes/heirloom/apps/navigation/lib/quick-links.xsl b/ccm-navigation/web/__ccm__/apps/navigation/lib/quick-links.xsl
similarity index 92%
rename from ccm-ldn-navigation/web/themes/heirloom/apps/navigation/lib/quick-links.xsl
rename to ccm-navigation/web/__ccm__/apps/navigation/lib/quick-links.xsl
index 657230c88..f91d2c2f8 100755
--- a/ccm-ldn-navigation/web/themes/heirloom/apps/navigation/lib/quick-links.xsl
+++ b/ccm-navigation/web/__ccm__/apps/navigation/lib/quick-links.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
-  xmlns:nav="http://ccm.redhat.com/london/navigation"
+  xmlns:nav="http://ccm.redhat.com/navigation"
   version="1.0">
 
   <xsl:template match="nav:quickLinks">
diff --git a/ccm-ldn-navigation/web/__ccm__/apps/navigation/xsl/admin.css b/ccm-navigation/web/__ccm__/apps/navigation/xsl/admin.css
similarity index 100%
rename from ccm-ldn-navigation/web/__ccm__/apps/navigation/xsl/admin.css
rename to ccm-navigation/web/__ccm__/apps/navigation/xsl/admin.css
diff --git a/ccm-ldn-navigation/web/__ccm__/apps/navigation/xsl/admin.xsl b/ccm-navigation/web/__ccm__/apps/navigation/xsl/admin.xsl
similarity index 71%
rename from ccm-ldn-navigation/web/__ccm__/apps/navigation/xsl/admin.xsl
rename to ccm-navigation/web/__ccm__/apps/navigation/xsl/admin.xsl
index 51f4dc445..7e26d7095 100755
--- a/ccm-ldn-navigation/web/__ccm__/apps/navigation/xsl/admin.xsl
+++ b/ccm-navigation/web/__ccm__/apps/navigation/xsl/admin.xsl
@@ -2,8 +2,8 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 version="1.0">
 
-  <xsl:import href="../../../../../ROOT/packages/bebop/xsl/bebop.xsl"/>
-  <xsl:import href="../../../../../ROOT/packages/ui/xsl/ui.xsl"/>
+  <xsl:import href="../../../../packages/bebop/xsl/bebop.xsl"/>
+  <xsl:import href="../../../../packages/ui/xsl/ui.xsl"/>
 
   <xsl:import href="../lib/category-panel.xsl"/>
   <xsl:import href="../lib/quick-link-form.xsl"/>
diff --git a/ccm-ldn-navigation/web/__ccm__/apps/navigation/xsl/content-lists.xsl b/ccm-navigation/web/__ccm__/apps/navigation/xsl/content-lists.xsl
similarity index 100%
rename from ccm-ldn-navigation/web/__ccm__/apps/navigation/xsl/content-lists.xsl
rename to ccm-navigation/web/__ccm__/apps/navigation/xsl/content-lists.xsl
diff --git a/ccm-ldn-navigation/web/__ccm__/apps/navigation/xsl/index.xsl b/ccm-navigation/web/__ccm__/apps/navigation/xsl/index.xsl
similarity index 76%
rename from ccm-ldn-navigation/web/__ccm__/apps/navigation/xsl/index.xsl
rename to ccm-navigation/web/__ccm__/apps/navigation/xsl/index.xsl
index 29066bbba..c8c6ad9db 100755
--- a/ccm-ldn-navigation/web/__ccm__/apps/navigation/xsl/index.xsl
+++ b/ccm-navigation/web/__ccm__/apps/navigation/xsl/index.xsl
@@ -2,11 +2,11 @@
 <xsl:stylesheet 
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
-  xmlns:nav="http://ccm.redhat.com/london/navigation"
+  xmlns:nav="http://ccm.redhat.com/navigation"
   version="1.0">
 
-  <xsl:import href="../../../../../ROOT/packages/bebop/xsl/bebop.xsl"/>
-  <xsl:import href="../../../../../ROOT/packages/ui/xsl/ui.xsl"/>
+  <xsl:import href="../../../../packages/bebop/xsl/bebop.xsl"/>
+  <xsl:import href="../../../../packages/ui/xsl/ui.xsl"/>
 
   <xsl:import href="../lib/category.xsl"/>
   <xsl:import href="../lib/quick-links.xsl"/>
diff --git a/ccm-ldn-navigation/web/templates/ccm-ldn-navigation/admin/index.jsp b/ccm-navigation/web/templates/ccm-navigation/admin/index.jsp
similarity index 91%
rename from ccm-ldn-navigation/web/templates/ccm-ldn-navigation/admin/index.jsp
rename to ccm-navigation/web/templates/ccm-navigation/admin/index.jsp
index b04577443..8d618639e 100755
--- a/ccm-ldn-navigation/web/templates/ccm-ldn-navigation/admin/index.jsp
+++ b/ccm-navigation/web/templates/ccm-navigation/admin/index.jsp
@@ -19,7 +19,7 @@
     </jsp:scriptlet>
 
     <define:component name="templates"
-      classname="com.arsdigita.london.navigation.ui.admin.CategoryPanel"/>
+      classname="com.arsdigita.navigation.ui.admin.CategoryPanel"/>
 
     <jsp:scriptlet>
         adminPage.addRequestListener(new ApplicationAuthenticationListener());
diff --git a/ccm-ldn-navigation/web/templates/ccm-ldn-navigation/admin/links.jsp b/ccm-navigation/web/templates/ccm-navigation/admin/links.jsp
similarity index 77%
rename from ccm-ldn-navigation/web/templates/ccm-ldn-navigation/admin/links.jsp
rename to ccm-navigation/web/templates/ccm-navigation/admin/links.jsp
index adfab619c..a846a3d4b 100755
--- a/ccm-ldn-navigation/web/templates/ccm-ldn-navigation/admin/links.jsp
+++ b/ccm-navigation/web/templates/ccm-navigation/admin/links.jsp
@@ -7,7 +7,7 @@
   <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
   <jsp:directive.page import="com.arsdigita.toolbox.ui.ApplicationAuthenticationListener"/>
   <jsp:directive.page import="com.arsdigita.kernel.permissions.PrivilegeDescriptor"/>
-  <jsp:directive.page import="com.arsdigita.london.navigation.ui.admin.PopulatePathListener"/>
+  <jsp:directive.page import="com.arsdigita.navigation.ui.admin.PopulatePathListener"/>
 
   <jsp:scriptlet>
     DispatcherHelper.cacheDisable(response);
@@ -21,11 +21,11 @@
     </jsp:scriptlet>
 
     <define:component name="quickLinks"
-      classname="com.arsdigita.london.navigation.ui.admin.QuickLinkPanel"/>
+      classname="com.arsdigita.navigation.ui.admin.QuickLinkPanel"/>
     <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"/>
 
 
     <jsp:scriptlet>
diff --git a/ccm-navigation/web/templates/ccm-navigation/navigation/nav-atoz.jsp b/ccm-navigation/web/templates/ccm-navigation/navigation/nav-atoz.jsp
new file mode 100755
index 000000000..72c1859e4
--- /dev/null
+++ b/ccm-navigation/web/templates/ccm-navigation/navigation/nav-atoz.jsp
@@ -0,0 +1,47 @@
+<jsp:root 
+  xmlns:jsp="http://java.sun.com/JSP/Page" 
+  xmlns:define="/WEB-INF/bebop-define.tld"
+  xmlns:show="/WEB-INF/bebop-show.tld"
+  version="1.2">
+
+  <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
+  <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
+  <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>
+    long age = Navigation.getConfig().getIndexPageCacheLifetime();
+    if (age == 0) {
+      DispatcherHelper.cacheDisable(response);
+    } else {
+      DispatcherHelper.cacheForWorld(response, (int)age);
+    }
+  </jsp:scriptlet>
+
+  <define:page name="atozItemPage" application="navigation"
+    title="Navigation" cache="true">
+
+    <define:component name="greetingItem"
+      classname="com.arsdigita.navigation.ui.GreetingItem"/>
+    <define:component name="categoryPath"
+      classname="com.arsdigita.navigation.ui.category.Path"/>
+    <define:component name="categoryMenu"
+      classname="com.arsdigita.navigation.ui.category.Menu"/>
+    <define:component name="itemList"
+      classname="com.arsdigita.navigation.ui.object.AtoZObjectList"/>
+    <jsp:scriptlet>
+      ((com.arsdigita.navigation.ui.object.AtoZObjectList) itemList).setDefinition(new CMSDataCollectionDefinition());
+      ((com.arsdigita.navigation.ui.object.AtoZObjectList) itemList).setRenderer(new CMSDataCollectionRenderer());
+      ((com.arsdigita.navigation.ui.object.AtoZObjectList) itemList).getDefinition().setObjectType("com.arsdigita.cms.ContentPage");
+
+      ((com.arsdigita.navigation.ui.object.AtoZObjectList) itemList).getDefinition().setDescendCategories(false);      
+      
+      ((com.arsdigita.navigation.ui.object.AtoZObjectList) itemList).getRenderer().setPageSize(30);
+      ((com.arsdigita.navigation.ui.object.AtoZObjectList) itemList).getRenderer().addAttribute("objectType");
+      ((com.arsdigita.navigation.ui.object.AtoZObjectList) itemList).getRenderer().addAttribute( "title");
+    </jsp:scriptlet>
+  </define:page>
+
+  <show:all/>
+</jsp:root>
diff --git a/ccm-navigation/web/templates/ccm-navigation/navigation/nav-default.jsp b/ccm-navigation/web/templates/ccm-navigation/navigation/nav-default.jsp
new file mode 100755
index 000000000..4323e1382
--- /dev/null
+++ b/ccm-navigation/web/templates/ccm-navigation/navigation/nav-default.jsp
@@ -0,0 +1,84 @@
+<!--
+   A default item page (index page) provided by ccm-navigation package. Sites
+   will probably use a customized index page. 
+   Set the actual in dex page to be used by parameter
+      com.arsdigita.london.navigation.default_template
+
+   ##Title: Default Items Page
+   ##Descr: Default Navigation Index Page, ordering items in ascending order
+   ##Path : /templates/ccm-navigation/navigation/nav-default.jsp
+-->
+<jsp:root 
+  xmlns:jsp="http://java.sun.com/JSP/Page" 
+  xmlns:define="/WEB-INF/bebop-define.tld"
+  xmlns:show="/WEB-INF/bebop-show.tld"
+  version="1.2">
+
+  <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
+  <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
+  <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:directive.page import="com.arsdigita.navigation.DataCollectionDefinition"/>
+  <jsp:directive.page import="com.arsdigita.navigation.DataCollectionRenderer"/>
+  
+
+  <jsp:scriptlet>
+    long age = Navigation.getConfig().getIndexPageCacheLifetime();
+    if (age == 0) {
+      DispatcherHelper.cacheDisable(response);
+    } else {
+      DispatcherHelper.cacheForWorld(response, (int)age);
+    }
+  </jsp:scriptlet>
+
+  <define:page name="defaultItemPage" application="navigation"
+    title="Navigation" cache="true">
+
+    <define:component name="greetingItem"
+      classname="com.arsdigita.navigation.ui.GreetingItem"/>
+    <define:component name="greetingItemExtraXML"
+      classname="com.arsdigita.navigation.ui.GreetingItemExtraXML"/>
+    <define:component name="categoryPath"
+      classname="com.arsdigita.navigation.ui.category.Path"/>
+    <define:component name="categoryMenu"
+      classname="com.arsdigita.navigation.ui.category.Menu"/>
+    <define:component name="itemList"
+      classname="com.arsdigita.navigation.ui.object.SimpleObjectList"/>
+    <define:component name="applicationList"
+      classname="com.arsdigita.navigation.ui.object.SimpleObjectList"/>
+   
+    <jsp:scriptlet>
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).setDefinition(new CMSDataCollectionDefinition());
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).setRenderer(new CMSDataCollectionRenderer());
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getDefinition().setObjectType("com.arsdigita.cms.ContentPage");
+
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getDefinition().setDescendCategories(false);      
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getDefinition().addOrder("parent.categories.link.sortKey");
+      
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().setPageSize(30);
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("objectType");
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("title");
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("displayName");
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("launchDate");
+      
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) applicationList).setDefinition(new DataCollectionDefinition());
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) applicationList).setRenderer(new DataCollectionRenderer());
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) applicationList).getDefinition().setObjectType("com.arsdigita.web.Application");
+
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) applicationList).getDefinition().setDescendCategories(false);      
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) applicationList).getDefinition().addOrder("categories.link.sortKey");
+      
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) applicationList).getRenderer().setPageSize(30);
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) applicationList).getRenderer().addAttribute("displayName");
+      
+    </jsp:scriptlet>
+
+    <define:component name="assignedTerms"
+         classname="com.arsdigita.navigation.ui.CategoryIndexAssignedTerms"/>
+   <define:component name="dateOrderCategories"
+      classname="com.arsdigita.navigation.ui.DateOrderedCategoryComponent"/>
+
+  </define:page>
+  <show:all/>
+</jsp:root>
diff --git a/ccm-ldn-navigation/web/templates/ccm-ldn-navigation/navigation/nav-demo.jsp b/ccm-navigation/web/templates/ccm-navigation/navigation/nav-demo.jsp
similarity index 60%
rename from ccm-ldn-navigation/web/templates/ccm-ldn-navigation/navigation/nav-demo.jsp
rename to ccm-navigation/web/templates/ccm-navigation/navigation/nav-demo.jsp
index dd55e3d80..535d300b2 100755
--- a/ccm-ldn-navigation/web/templates/ccm-ldn-navigation/navigation/nav-demo.jsp
+++ b/ccm-navigation/web/templates/ccm-navigation/navigation/nav-demo.jsp
@@ -6,10 +6,10 @@
 
   <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.ui.AbstractObjectList"/>
-  <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.ui.AbstractObjectList"/>
+  <jsp:directive.page import="com.arsdigita.navigation.cms.CMSDataCollectionDefinition"/>
+  <jsp:directive.page import="com.arsdigita.navigation.cms.CMSDataCollectionRenderer"/>
 
   <jsp:scriptlet>
     long age = Navigation.getConfig().getIndexPageCacheLifetime();
@@ -24,25 +24,25 @@
     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="categoryRoot"
-      classname="com.arsdigita.london.navigation.ui.category.Root"/>
+      classname="com.arsdigita.navigation.ui.category.Root"/>
     <define:component name="categoryHierarchy"
-      classname="com.arsdigita.london.navigation.ui.category.Hierarchy"/>
+      classname="com.arsdigita.navigation.ui.category.Hierarchy"/>
     <define:component name="categoryTopLevel"
-      classname="com.arsdigita.london.navigation.ui.category.TopLevel"/>
+      classname="com.arsdigita.navigation.ui.category.TopLevel"/>
     <define:component name="categoryChildren"
-      classname="com.arsdigita.london.navigation.ui.category.Children"/>
+      classname="com.arsdigita.navigation.ui.category.Children"/>
     <define:component name="categorySiblings"
-      classname="com.arsdigita.london.navigation.ui.category.Siblings"/>
+      classname="com.arsdigita.navigation.ui.category.Siblings"/>
     <define:component name="quickLinks"
-      classname="com.arsdigita.london.navigation.ui.QuickLinks"/>
+      classname="com.arsdigita.navigation.ui.QuickLinks"/>
     <define:component name="itemList"
-      classname="com.arsdigita.london.navigation.ui.object.AtoZObjectList"/>
+      classname="com.arsdigita.navigation.ui.object.AtoZObjectList"/>
     <jsp:scriptlet>
       AbstractObjectList obList = (AbstractObjectList)itemList;
       
diff --git a/ccm-navigation/web/templates/ccm-navigation/navigation/nav-recent.jsp b/ccm-navigation/web/templates/ccm-navigation/navigation/nav-recent.jsp
new file mode 100755
index 000000000..d1023c9a2
--- /dev/null
+++ b/ccm-navigation/web/templates/ccm-navigation/navigation/nav-recent.jsp
@@ -0,0 +1,48 @@
+<jsp:root 
+  xmlns:jsp="http://java.sun.com/JSP/Page" 
+  xmlns:define="/WEB-INF/bebop-define.tld"
+  xmlns:show="/WEB-INF/bebop-show.tld"
+  version="1.2">
+
+  <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
+  <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
+  <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>
+    long age = Navigation.getConfig().getIndexPageCacheLifetime();
+    if (age == 0) {
+      DispatcherHelper.cacheDisable(response);
+    } else {
+      DispatcherHelper.cacheForWorld(response, (int)age);
+    }
+  </jsp:scriptlet>
+
+  <define:page name="recentItemPage" application="navigation"
+    title="Navigation" cache="true">
+
+    <define:component name="greetingItem"
+      classname="com.arsdigita.navigation.ui.GreetingItem"/>
+    <define:component name="categoryPath"
+      classname="com.arsdigita.navigation.ui.category.Path"/>
+    <define:component name="categoryMenu"
+      classname="com.arsdigita.navigation.ui.category.Menu"/>
+    <define:component name="itemList"
+      classname="com.arsdigita.navigation.ui.object.SimpleObjectList"/>
+    <jsp:scriptlet>
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).setDefinition(new CMSDataCollectionDefinition());
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).setRenderer(new CMSDataCollectionRenderer());
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getDefinition().setObjectType("com.arsdigita.cms.ContentPage");
+
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getDefinition().setDescendCategories(false);      
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getDefinition().addOrder("id");
+      
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().setPageSize(30);
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("objectType");
+      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("title");
+    </jsp:scriptlet>
+  </define:page>
+
+  <show:all/>
+</jsp:root>
diff --git a/ccm-ldn-navigation/web/themes/heirloom/apps/navigation/lib/category-panel.css b/ccm-navigation/web/themes/heirloom/apps/navigation/lib/category-panel.css
similarity index 100%
rename from ccm-ldn-navigation/web/themes/heirloom/apps/navigation/lib/category-panel.css
rename to ccm-navigation/web/themes/heirloom/apps/navigation/lib/category-panel.css
diff --git a/ccm-ldn-navigation/web/themes/heirloom/apps/navigation/lib/category-panel.xsl b/ccm-navigation/web/themes/heirloom/apps/navigation/lib/category-panel.xsl
similarity index 91%
rename from ccm-ldn-navigation/web/themes/heirloom/apps/navigation/lib/category-panel.xsl
rename to ccm-navigation/web/themes/heirloom/apps/navigation/lib/category-panel.xsl
index 82bd88d47..881f4a610 100755
--- a/ccm-ldn-navigation/web/themes/heirloom/apps/navigation/lib/category-panel.xsl
+++ b/ccm-navigation/web/themes/heirloom/apps/navigation/lib/category-panel.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
               xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
-                xmlns:nav="http://ccm.redhat.com/london/navigation"
+                xmlns:nav="http://ccm.redhat.com/navigation"
                   version="1.0">
 
   <xsl:template match="nav:categoryPanel">
diff --git a/ccm-ldn-navigation/web/themes/heirloom/apps/navigation/lib/category.css b/ccm-navigation/web/themes/heirloom/apps/navigation/lib/category.css
similarity index 100%
rename from ccm-ldn-navigation/web/themes/heirloom/apps/navigation/lib/category.css
rename to ccm-navigation/web/themes/heirloom/apps/navigation/lib/category.css
diff --git a/ccm-ldn-navigation/web/themes/heirloom/apps/navigation/lib/category.xsl b/ccm-navigation/web/themes/heirloom/apps/navigation/lib/category.xsl
similarity index 93%
rename from ccm-ldn-navigation/web/themes/heirloom/apps/navigation/lib/category.xsl
rename to ccm-navigation/web/themes/heirloom/apps/navigation/lib/category.xsl
index b1ccd1404..10a6cc87f 100755
--- a/ccm-ldn-navigation/web/themes/heirloom/apps/navigation/lib/category.xsl
+++ b/ccm-navigation/web/themes/heirloom/apps/navigation/lib/category.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                 xmlns:nav="http://ccm.redhat.com/london/navigation"
+                 xmlns:nav="http://ccm.redhat.com/navigation"
                    version="1.0">
 
 
diff --git a/ccm-ldn-navigation/web/themes/heirloom/apps/navigation/lib/greeting-item.xsl b/ccm-navigation/web/themes/heirloom/apps/navigation/lib/greeting-item.xsl
similarity index 76%
rename from ccm-ldn-navigation/web/themes/heirloom/apps/navigation/lib/greeting-item.xsl
rename to ccm-navigation/web/themes/heirloom/apps/navigation/lib/greeting-item.xsl
index 4115d5106..862345ea3 100755
--- a/ccm-ldn-navigation/web/themes/heirloom/apps/navigation/lib/greeting-item.xsl
+++ b/ccm-navigation/web/themes/heirloom/apps/navigation/lib/greeting-item.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:nav="http://ccm.redhat.com/london/navigation"
+                xmlns:nav="http://ccm.redhat.com/navigation"
                   version="1.0">
 
   <xsl:template match="nav:greetingItem">
diff --git a/ccm-ldn-navigation/web/themes/heirloom/apps/navigation/lib/index.css b/ccm-navigation/web/themes/heirloom/apps/navigation/lib/index.css
similarity index 100%
rename from ccm-ldn-navigation/web/themes/heirloom/apps/navigation/lib/index.css
rename to ccm-navigation/web/themes/heirloom/apps/navigation/lib/index.css
diff --git a/ccm-ldn-navigation/web/themes/heirloom/apps/navigation/lib/object-list.xsl b/ccm-navigation/web/themes/heirloom/apps/navigation/lib/object-list.xsl
similarity index 92%
rename from ccm-ldn-navigation/web/themes/heirloom/apps/navigation/lib/object-list.xsl
rename to ccm-navigation/web/themes/heirloom/apps/navigation/lib/object-list.xsl
index b2d33ba39..78cb74d41 100755
--- a/ccm-ldn-navigation/web/themes/heirloom/apps/navigation/lib/object-list.xsl
+++ b/ccm-navigation/web/themes/heirloom/apps/navigation/lib/object-list.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet 
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:nav="http://ccm.redhat.com/london/navigation"
+  xmlns:nav="http://ccm.redhat.com/navigation"
   version="1.0">
 
 <!--<xsl:template name="contentLinks">-->
diff --git a/ccm-ldn-navigation/web/themes/heirloom/apps/navigation/lib/quick-link-form.css b/ccm-navigation/web/themes/heirloom/apps/navigation/lib/quick-link-form.css
similarity index 100%
rename from ccm-ldn-navigation/web/themes/heirloom/apps/navigation/lib/quick-link-form.css
rename to ccm-navigation/web/themes/heirloom/apps/navigation/lib/quick-link-form.css
diff --git a/ccm-ldn-navigation/web/themes/heirloom/apps/navigation/lib/quick-link-form.xsl b/ccm-navigation/web/themes/heirloom/apps/navigation/lib/quick-link-form.xsl
similarity index 92%
rename from ccm-ldn-navigation/web/themes/heirloom/apps/navigation/lib/quick-link-form.xsl
rename to ccm-navigation/web/themes/heirloom/apps/navigation/lib/quick-link-form.xsl
index 699b64fbf..7cf03c5a2 100755
--- a/ccm-ldn-navigation/web/themes/heirloom/apps/navigation/lib/quick-link-form.xsl
+++ b/ccm-navigation/web/themes/heirloom/apps/navigation/lib/quick-link-form.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
-                 xmlns:nav="http://ccm.redhat.com/london/navigation"
+                 xmlns:nav="http://ccm.redhat.com/navigation"
                    version="1.0">
 
   <xsl:template match="nav:quickLinkForm">
diff --git a/ccm-ldn-navigation/web/themes/heirloom/apps/navigation/lib/quick-link-listing.css b/ccm-navigation/web/themes/heirloom/apps/navigation/lib/quick-link-listing.css
similarity index 100%
rename from ccm-ldn-navigation/web/themes/heirloom/apps/navigation/lib/quick-link-listing.css
rename to ccm-navigation/web/themes/heirloom/apps/navigation/lib/quick-link-listing.css
diff --git a/ccm-ldn-navigation/web/__ccm__/apps/navigation/lib/quick-link-listing.xsl b/ccm-navigation/web/themes/heirloom/apps/navigation/lib/quick-link-listing.xsl
similarity index 95%
rename from ccm-ldn-navigation/web/__ccm__/apps/navigation/lib/quick-link-listing.xsl
rename to ccm-navigation/web/themes/heirloom/apps/navigation/lib/quick-link-listing.xsl
index c443ff691..086360ca9 100755
--- a/ccm-ldn-navigation/web/__ccm__/apps/navigation/lib/quick-link-listing.xsl
+++ b/ccm-navigation/web/themes/heirloom/apps/navigation/lib/quick-link-listing.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
-  xmlns:nav="http://ccm.redhat.com/london/navigation"
+  xmlns:nav="http://ccm.redhat.com/navigation"
   version="1.0">
 
   <xsl:template match="nav:quickLinkListing">
diff --git a/ccm-ldn-navigation/web/__ccm__/apps/navigation/lib/quick-link-panel.xsl b/ccm-navigation/web/themes/heirloom/apps/navigation/lib/quick-link-panel.xsl
similarity index 81%
rename from ccm-ldn-navigation/web/__ccm__/apps/navigation/lib/quick-link-panel.xsl
rename to ccm-navigation/web/themes/heirloom/apps/navigation/lib/quick-link-panel.xsl
index 24958015b..bec94d8d9 100755
--- a/ccm-ldn-navigation/web/__ccm__/apps/navigation/lib/quick-link-panel.xsl
+++ b/ccm-navigation/web/themes/heirloom/apps/navigation/lib/quick-link-panel.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
-  xmlns:nav="http://ccm.redhat.com/london/navigation"
+  xmlns:nav="http://ccm.redhat.com/navigation"
   version="1.0">
 
   <xsl:template match="nav:quickLinkPanel">
diff --git a/ccm-ldn-navigation/web/__ccm__/apps/navigation/lib/quick-links.xsl b/ccm-navigation/web/themes/heirloom/apps/navigation/lib/quick-links.xsl
similarity index 92%
rename from ccm-ldn-navigation/web/__ccm__/apps/navigation/lib/quick-links.xsl
rename to ccm-navigation/web/themes/heirloom/apps/navigation/lib/quick-links.xsl
index 657230c88..f91d2c2f8 100755
--- a/ccm-ldn-navigation/web/__ccm__/apps/navigation/lib/quick-links.xsl
+++ b/ccm-navigation/web/themes/heirloom/apps/navigation/lib/quick-links.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
-  xmlns:nav="http://ccm.redhat.com/london/navigation"
+  xmlns:nav="http://ccm.redhat.com/navigation"
   version="1.0">
 
   <xsl:template match="nav:quickLinks">
diff --git a/ccm-ldn-navigation/web/themes/heirloom/apps/navigation/xsl/admin.css b/ccm-navigation/web/themes/heirloom/apps/navigation/xsl/admin.css
similarity index 100%
rename from ccm-ldn-navigation/web/themes/heirloom/apps/navigation/xsl/admin.css
rename to ccm-navigation/web/themes/heirloom/apps/navigation/xsl/admin.css
diff --git a/ccm-ldn-navigation/web/themes/heirloom/apps/navigation/xsl/admin.xsl b/ccm-navigation/web/themes/heirloom/apps/navigation/xsl/admin.xsl
similarity index 100%
rename from ccm-ldn-navigation/web/themes/heirloom/apps/navigation/xsl/admin.xsl
rename to ccm-navigation/web/themes/heirloom/apps/navigation/xsl/admin.xsl
diff --git a/ccm-ldn-navigation/web/themes/heirloom/apps/navigation/xsl/content-lists.xsl b/ccm-navigation/web/themes/heirloom/apps/navigation/xsl/content-lists.xsl
similarity index 100%
rename from ccm-ldn-navigation/web/themes/heirloom/apps/navigation/xsl/content-lists.xsl
rename to ccm-navigation/web/themes/heirloom/apps/navigation/xsl/content-lists.xsl
diff --git a/ccm-ldn-navigation/web/themes/heirloom/apps/navigation/xsl/index.xsl b/ccm-navigation/web/themes/heirloom/apps/navigation/xsl/index.xsl
similarity index 90%
rename from ccm-ldn-navigation/web/themes/heirloom/apps/navigation/xsl/index.xsl
rename to ccm-navigation/web/themes/heirloom/apps/navigation/xsl/index.xsl
index 715240d78..b828c31e9 100755
--- a/ccm-ldn-navigation/web/themes/heirloom/apps/navigation/xsl/index.xsl
+++ b/ccm-navigation/web/themes/heirloom/apps/navigation/xsl/index.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
-                  xmlns:nav="http://ccm.redhat.com/london/navigation"
+                  xmlns:nav="http://ccm.redhat.com/navigation"
                     version="1.0">
 
   <xsl:import href="../../../packages/bebop/xsl/bebop.xsl"/>