diff --git a/ccm-sci-bundle/bundles/devel/cat/placeholder.info b/ccm-sci-bundle/bundles/devel/cat/placeholder.info
new file mode 100644
index 000000000..5ae76207c
--- /dev/null
+++ b/ccm-sci-bundle/bundles/devel/cat/placeholder.info
@@ -0,0 +1,3 @@
+Subdirectory  <cat> may optionally contain one or more local site specific 
+import xml files for Terms domain categories. 
+
diff --git a/ccm-sci-bundle/bundles/devel/cfg/integration.properties b/ccm-sci-bundle/bundles/devel/cfg/integration.properties
index 85795d65f..367634a7e 100644
--- a/ccm-sci-bundle/bundles/devel/cfg/integration.properties
+++ b/ccm-sci-bundle/bundles/devel/cfg/integration.properties
@@ -96,7 +96,9 @@ com.arsdigita.forum.disable_page_caching=true
 # ccm-ldn-navigation application
 com.arsdigita.london.navigation.category_menu_show_grand_children=false
 com.arsdigita.london.navigation.default_cat_root_path=/navigation/
-com.arsdigita.london.navigation.default_template=/packages/navigation/templates/zes-default.jsp
+# com.arsdigita.london.navigation.default_template=/packages/navigation/templates/zes-default.jsp
+com.arsdigita.london.navigation.default_template=/templates/ccm-ldn-navigation/navigation/sci-default.jsp
+com.arsdigita.london.navigation.templates_file=WEB-INF/navigation/sci-templates.txt
 
 
 # ccm-ldn-search application
@@ -114,6 +116,9 @@ themedirector.default_theme_path=themes/static/aplaws-generic
 themedirector.file_extensions=bmp css gif jpeg jpg js png xml xsl
 
 
+# ccm-sci-bundle (Loader only)
+# com.arsdigita.bundle.category_files=WEB-INF/sci/sci-nav-domain-1.00.xml,WEB-INF/sci/sci-nav-hierarchy-1.00.xml
+
 # =============================================================================================
 # runtime specific configurations
 
diff --git a/ccm-sci-bundle/bundles/devel/cfg/project.xml b/ccm-sci-bundle/bundles/devel/cfg/project.xml
index c53d2a9cf..1b6253d3a 100644
--- a/ccm-sci-bundle/bundles/devel/cfg/project.xml
+++ b/ccm-sci-bundle/bundles/devel/cfg/project.xml
@@ -53,7 +53,7 @@
 
 <!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
 <!--    Scientific CMS  OPTIONAL packages                                    -->
-<!--    Various combinations of packages make up specific editions           -->
+<!--    Various combinations of these packages make up specific editions     -->
 <!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
 
 <!--   Content Assets   -->
@@ -75,7 +75,9 @@
         <ccm:application name="ccm-portalserver"/>
 
 <!--   LDN extension  -->
+<!--    temporyrily excluded because configuration has to be cleared
         <ccm:application name="ccm-ldn-rss"/>                        
+-->
 
 <!--   SCI extension  -->
 <!--
diff --git a/ccm-sci-bundle/bundles/devel/nav/placeholder.info b/ccm-sci-bundle/bundles/devel/nav/placeholder.info
new file mode 100644
index 000000000..38db9a8ae
--- /dev/null
+++ b/ccm-sci-bundle/bundles/devel/nav/placeholder.info
@@ -0,0 +1,12 @@
+Subdirectory  <nav> may optionally contain navigation item templates for
+navigation index pages which either overwrite or ammend those templates
+which are default for ccm-sci-bundle and stored in 
+   /web/templates/ccm-navigation/navigation
+
+Templates of the same name in this subdirectory just overwrite the
+default files. Templates of different names are stored in addition
+to the default template files. In the later case a developer must
+provide a customised template.txt file replacing the default file
+   /src/WEB-INF/navigation/sci-templates.txt
+This file must be specified in parameter 
+   com.arsdigita.london.navigation.templates_file
\ No newline at end of file
diff --git a/ccm-sci-bundle/bundles/local/aap/cat/placeholder.info b/ccm-sci-bundle/bundles/local/aap/cat/placeholder.info
new file mode 100644
index 000000000..5ae76207c
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/aap/cat/placeholder.info
@@ -0,0 +1,3 @@
+Subdirectory  <cat> may optionally contain one or more local site specific 
+import xml files for Terms domain categories. 
+
diff --git a/ccm-sci-bundle/bundles/local/aap/nav/placeholder.info b/ccm-sci-bundle/bundles/local/aap/nav/placeholder.info
new file mode 100644
index 000000000..38db9a8ae
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/aap/nav/placeholder.info
@@ -0,0 +1,12 @@
+Subdirectory  <nav> may optionally contain navigation item templates for
+navigation index pages which either overwrite or ammend those templates
+which are default for ccm-sci-bundle and stored in 
+   /web/templates/ccm-navigation/navigation
+
+Templates of the same name in this subdirectory just overwrite the
+default files. Templates of different names are stored in addition
+to the default template files. In the later case a developer must
+provide a customised template.txt file replacing the default file
+   /src/WEB-INF/navigation/sci-templates.txt
+This file must be specified in parameter 
+   com.arsdigita.london.navigation.templates_file
\ No newline at end of file
diff --git a/ccm-sci-bundle/bundles/local/iaw/AUTHORS b/ccm-sci-bundle/bundles/local/iaw/AUTHORS
new file mode 100644
index 000000000..e69de29bb
diff --git a/ccm-sci-bundle/bundles/local/iaw/ChangeLog b/ccm-sci-bundle/bundles/local/iaw/ChangeLog
new file mode 100644
index 000000000..786623bdb
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/iaw/ChangeLog
@@ -0,0 +1,9 @@
+* Thu Sep 22 2005 Alan Pevec <apevec@redhat.com>
+- Build all APLAWS+ bundles from the common set of templates.
+
+* Mon Feb 21 2005 Alan Pevec <apevec@redhat.com>
+- Requires applications.
+
+* Mon Jan 26 2004 Daniel Berrange <berrange@redhat.com>
+- Initial build.
+
diff --git a/ccm-sci-bundle/bundles/local/iaw/NEWS b/ccm-sci-bundle/bundles/local/iaw/NEWS
new file mode 100644
index 000000000..e69de29bb
diff --git a/ccm-sci-bundle/bundles/local/iaw/README b/ccm-sci-bundle/bundles/local/iaw/README
new file mode 100644
index 000000000..e69de29bb
diff --git a/ccm-sci-bundle/bundles/local/iaw/bundle.in b/ccm-sci-bundle/bundles/local/iaw/bundle.in
new file mode 100644
index 000000000..093aac421
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/iaw/bundle.in
@@ -0,0 +1,4 @@
+BUNDLE_NAME=aplaws-plus-zes-devel
+BUNDLE_PRETTY_NAME="APLAWS+ ZeS Devel Bundle"
+VERSION=1.1.2devel
+RELEASE=1
diff --git a/ccm-sci-bundle/bundles/local/iaw/cat/placeholder.info b/ccm-sci-bundle/bundles/local/iaw/cat/placeholder.info
new file mode 100644
index 000000000..5ae76207c
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/iaw/cat/placeholder.info
@@ -0,0 +1,3 @@
+Subdirectory  <cat> may optionally contain one or more local site specific 
+import xml files for Terms domain categories. 
+
diff --git a/ccm-sci-bundle/bundles/local/iaw/cfg/integration.properties b/ccm-sci-bundle/bundles/local/iaw/cfg/integration.properties
new file mode 100644
index 000000000..85795d65f
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/iaw/cfg/integration.properties
@@ -0,0 +1,137 @@
+# Scientific CMS devel bundle integration.properties
+#
+waf.bebop.base_page=com.arsdigita.aplaws.ui.SimplePage
+#
+; dhtml editor to use (system wide)
+; Xinha is default
+; default: Xinha editor & src=/assets/xinha/XinhaLoader.js
+#waf.bebop.dhtml_editor=FCKeditor
+
+waf.categorization.show_internal_name=true
+waf.categorization.supported_languages=de,en
+
+waf.dispatcher.default_expiry=3600
+;
+waf.kernel.data_permission_check_enabled=false
+waf.kernel.primary_user_identifier=email
+; if you activate screen_name, forum loader does not work.
+; waf.kernel.primary_user_identifier=screen_name
+waf.kernel.supported_languages=de,en
+
+; security.properties: 
+waf.auto_registration_on=false
+
+; Searches for localized style sheet (among others) 
+waf.templating.stylesheet_resolver=com.arsdigita.templating.PatternStylesheetResolver
+waf.templating.stylesheet_paths=/WEB-INF/resources/scientificCMS-stylesheet-paths.txt
+
+core.ui.pagemap.root_page_url=navigation/
+core.ui.pagemap.workspace_url=navigation/
+core.ui.pagemap.user_redirect_url=content/content-center-redirect.jsp
+
+; workflow configuration
+waf.workflow.simple.alerts_enabled=true
+waf.workflow.simple.alerts_sender=root@localhost.localdomain
+
+; Configures the xml processing
+waf.xml.xsl_transformer=xalan
+waf.xml.activate_full_date_formatter=true
+
+# ccm-cms parameters
+
+com.arsdigita.cms.category_authoring_add_form=com.arsdigita.aplaws.ui.ItemCategoryPicker
+
+com.arsdigita.cms.default_folder_template_path=/default/aplaws-folder.jsp
+com.arsdigita.cms.default_item_template_path=/default/aplaws-item.jsp
+com.arsdigita.cms.default_template_resolver_class=com.arsdigita.london.subsite.dispatcher.SubsiteItemTemplateResolver
+
+; Configure dhtml editor for use in cms content-center
+; Xinha is default and should work out of the box
+; com.arsdigita.cms.dhtml_editor_config=XinhaConfig,/assets/xinha/XinhaConfig.js
+; as a temporary measure a different configuration file which includes a link selection box for CCM items
+; and CCM images should be specified:
+com.arsdigita.cms.dhtml_editor_config=XinhaConfig,/assets/xinha/CCMcmsXinhaConfig.js
+
+; to use FCKeditor:
+; com.arsdigita.cms.dhtml_editor_config=FCKEditor.Config.StyleDefault?,/assets/fckeditor/config/fckconfigOpenCCM.js
+; com.arsdigita.cms.dhtml_editor_config=XinhaConfig,/assets/xinha/XinhaConfig.js
+; com.arsdigita.cms.dhtml_editor_hidden_buttons=
+; com.arsdigita.cms.dhtml_editor_plugins=TableOperations,CSS
+com.arsdigita.cms.dhtml_editor_plugins=
+
+com.arsdigita.cms.disable_item_pfs=true
+
+com.arsdigita.cms.hide_admin_tabs=true
+com.arsdigita.cms.hide_folder_index_checkbox=true
+com.arsdigita.cms.hide_launch_date=true
+com.arsdigita.cms.hide_templates_tab=true
+com.arsdigita.cms.hide_timezone=true
+com.arsdigita.cms.hide_udct_ui=true
+
+com.arsdigita.cms.use_section_categories=false
+com.arsdigita.cms.use_streamlined_creation=true
+
+
+# ccm-cms-types-event parameters
+com.arsdigita.cms.contenttypes.event.hide_cost=true
+com.arsdigita.cms.contenttypes.event.hide_link_to_map=true
+com.arsdigita.cms.contenttypes.event.use_html_date_description=false
+com.arsdigita.cms.contenttypes.event.start_year=2000
+com.arsdigita.cms.contenttypes.event.end_year_delta=5
+
+
+# ccm-cms-types-newsitem parameters
+com.arsdigita.cms.contenttypes.newsitem.hide_homepage=true
+com.arsdigita.cms.contenttypes.newsitem.start_year=2000
+com.arsdigita.cms.contenttypes.newsitem.end_year_delta=5
+
+
+# Forum application
+com.arsdigita.forum.show_new_tabs=true
+com.arsdigita.forum.use_wysiwyg_editor=true
+com.arsdigita.forum.allow_quick_finish=true
+com.arsdigita.forum.disable_page_caching=true
+
+
+# ccm-ldn-navigation application
+com.arsdigita.london.navigation.category_menu_show_grand_children=false
+com.arsdigita.london.navigation.default_cat_root_path=/navigation/
+com.arsdigita.london.navigation.default_template=/packages/navigation/templates/zes-default.jsp
+
+
+# ccm-ldn-search application
+com.arsdigita.london.search.show_sponsored_links=true
+
+
+# ccm-ldn-subsite application
+com.arsdigita.london.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
+
+
+# ccm-ldn-themedirector application
+themedirector.default_theme_context=
+themedirector.default_theme_manifest=ccm-zes-aplaws.web.mf
+themedirector.default_theme_path=themes/static/aplaws-generic
+themedirector.file_extensions=bmp css gif jpeg jpg js png xml xsl
+
+
+# =============================================================================================
+# runtime specific configurations
+
+waf.admin.email=webmaster@scientificCMS.org
+waf.admin.name.given=SCI
+waf.admin.name.family=Administrator
+waf.admin.password=sci2000
+waf.admin.password.question=12345
+waf.admin.password.answer=6
+
+waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/ccm-sci?user\=sci&password\=sci47web&stringtype\=unspecified
+waf.runtime.jdbc_pool_size=30
+
+waf.web.server=localhost\:8080
+
+
+# =============================================================================================
+# devel specific configurations
+waf.debug=true
+waf.bebop.fancy_xsl_errors=true
+
diff --git a/ccm-sci-bundle/bundles/local/iaw/cfg/project.xml b/ccm-sci-bundle/bundles/local/iaw/cfg/project.xml
new file mode 100644
index 000000000..c53d2a9cf
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/iaw/cfg/project.xml
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!--  project.xml SCI devel - containing only modules used for ScientificCMS  -->
+
+<ccm:project   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  
+               xmlns:ccm="http://ccm.redhat.com/ccm-project" 
+              ccmVersion="6.1" 
+                    name="ScientificCMS" 
+              prettyName="Scientific CMS" 
+                 version="1-1-6" 
+                 release="devel" 
+                  webxml="web.xml-sci" 
+                  webapp="ROOT" 
+      xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd">
+
+  <ccm:build>
+
+<!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
+<!--    Scientific CMS set of CORE packages                                  -->
+<!--    NONE can be omitted for technical reasons / internal dependencies    -->
+<!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
+
+<!--   Main apps   -->
+        <ccm:application name="ccm-core"/>
+        <ccm:application name="ccm-cms"/>
+
+<!--   Content Assets   -->
+        <ccm:application name="ccm-cms-assets-imagestep"/>
+        <ccm:application name="ccm-cms-assets-relatedlink"/>
+
+<!--   Content Types   -->
+        <ccm:application name="ccm-cms-types-article"/>
+        <ccm:application name="ccm-cms-types-filestorageitem"/>
+        <ccm:application name="ccm-cms-types-formitem"/>
+        <ccm:application name="ccm-cms-types-formsectionitem"/>
+
+<!--   Applications   -->
+        <ccm:application name="ccm-portalworkspace"/>
+        <ccm:application name="ccm-themedirector"/>
+
+<!--   LDN extension  -->
+        <ccm:application name="ccm-ldn-navigation"/>
+        <ccm:application name="ccm-ldn-search"/>
+        <ccm:application name="ccm-ldn-shortcuts"/>
+        <ccm:application name="ccm-ldn-subsite"/>                    
+        <ccm:application name="ccm-ldn-terms"/>
+        <ccm:application name="ccm-ldn-util"/>
+
+<!--   SCI extension  -->
+        <ccm:application name="ccm-sci-bundle"/>
+
+
+
+<!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
+<!--    Scientific CMS  OPTIONAL packages                                    -->
+<!--    Various combinations of packages make up specific editions           -->
+<!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
+
+<!--   Content Assets   -->
+        <ccm:application name="ccm-cms-assets-fileattachment"/>
+        <ccm:application name="ccm-cms-assets-notes"/>
+
+<!--   Content Types   -->
+        <ccm:application name="ccm-cms-types-address"/>
+        <ccm:application name="ccm-cms-types-bookmark"/>
+        <ccm:application name="ccm-cms-types-contact"/>
+        <ccm:application name="ccm-cms-types-event"/>
+        <ccm:application name="ccm-cms-types-image"/>
+        <ccm:application name="ccm-cms-types-mparticle"/>
+        <ccm:application name="ccm-cms-types-newsitem"/>
+        <ccm:application name="ccm-cms-types-person"/>
+
+<!--   Applications   -->
+        <ccm:application name="ccm-cms-publicpersonalprofile"/>
+        <ccm:application name="ccm-portalserver"/>
+
+<!--   LDN extension  -->
+        <ccm:application name="ccm-ldn-rss"/>                        
+
+<!--   SCI extension  -->
+<!--
+        <ccm:application name="ccm-sci-personalprojects"/>
+-->
+        <ccm:application name="ccm-sci-personalpublications"/>
+        <ccm:application name="ccm-sci-publications"/>
+
+        <ccm:application name="ccm-sci-types-member"/>
+
+
+
+<!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
+<!--    Scientific CMS   potential ADD-ONS packages                          -->
+<!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
+
+<!--   Content Types   -->
+<!--    
+        <ccm:application name="ccm-cms-types-agenda"/>
+        <ccm:application name="ccm-cms-types-faqitem"/>
+        <ccm:application name="ccm-cms-types-glossaryitem"/>
+        <ccm:application name="ccm-cms-types-htmlform"/>
+        <ccm:application name="ccm-cms-types-inlinesite"/>
+        <ccm:application name="ccm-cms-types-job"/>
+        <ccm:application name="ccm-cms-types-legalnotice"/>
+        <ccm:application name="ccm-cms-types-minutes"/>
+        <ccm:application name="ccm-cms-types-organization"/>
+        <ccm:application name="ccm-cms-types-pressrelease"/>
+        <ccm:application name="ccm-cms-types-service"/>
+        <ccm:application name="ccm-cms-types-siteproxy"/>
+        <ccm:application name="ccm-cms-types-xmlfeed"/>
+-->
+
+<!--   Applications   -->
+<!--
+        <ccm:application name="ccm-auth-http"/>
+        <ccm:application name="ccm-bookmarks"/>
+        <ccm:application name="ccm-docmgr"/>
+-->
+        <ccm:application name="ccm-docrepo"/>
+        <ccm:application name="ccm-forum"/>  
+        <ccm:application name="ccm-forum-categorised"/>
+<!--
+        <ccm:application name="ccm-weblog"/>
+        <ccm:application name="ccm-webpage"/>
+-->
+
+<!--   LDN extension  -->
+<!--
+        <ccm:application name="ccm-ldn-exporter"/>
+        <ccm:application name="ccm-ldn-freeform"/>
+        <ccm:application name="ccm-ldn-importer"/>
+-->
+
+
+  </ccm:build>
+
+
+<!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
+<!--    Scientific CMS   list of OBSOLETE modules                            -->
+<!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
+
+<!--   Content Types   -->
+<!--    Without known funcionality
+        <ccm:application name="ccm-cms-types-motditem"/>             -->
+
+<!--   Applications   -->
+<!--    currently doesn't work for unknown reason
+        <ccm:application name="ccm-simplesurvey"/>                   -->
+<!--    Without known funcionality
+        <ccm:application name="ccm-formbuilder-pdf"/>
+        <ccm:application name="ccm-user-preferences"/>               -->
+
+<!--   LDN extension  -->
+<!--    Conflicts with ccm-sci-bundle (this package)                 -->
+<!--    <ccm:application name="ccm-ldn-aplaws"/>                     -->
+<!--    In it's current implementation very ldn / aplaws specific
+        <ccm:application name="ccm-ldn-atoz"/>  
+        <ccm:application name="ccm-ldn-dublin"/>                     -->
+
+
+<!-- tools will be downloaded from trunk, but does not
+     contain java code to be compiled!
+        <ccm:application name="tools"/>           -->
+
+</ccm:project>
diff --git a/ccm-sci-bundle/bundles/local/iaw/cfg/web.xml-sci b/ccm-sci-bundle/bundles/local/iaw/cfg/web.xml-sci
new file mode 100644
index 000000000..390ca7722
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/iaw/cfg/web.xml-sci
@@ -0,0 +1,540 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app         xmlns="http://java.sun.com/xml/ns/j2ee"
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+               version="2.4">
+
+  <display-name>Scientific CMS</display-name> 
+  <description>Content and Collaboration Management for Scientific Institutions</description>
+
+  <!-- path and filename of the log4j user accessible config file
+       WEB-INF/conf/log4j.properties is the built-in default value -->
+  <context-param>
+    <param-name>log4j-conf-file</param-name>
+    <param-value>WEB-INF/conf/log4j.properties</param-value>
+  </context-param>
+
+
+  <!-- Require secure connection by redirect to host-port part
+       of parameter waf.web.secure_server               
+       NOT USED with ZeS                                        
+  <filter>
+    <filter-name>secured</filter-name>
+    <filter-class>com.arsdigita.web.SecureFilter</filter-class>
+  </filter>
+  -->
+  <!-- Initialize Profiler timers
+       NOT USED with ZeS standard / production                                  
+  <filter>
+    <filter-name>profiler</filter-name>
+    <filter-class>com.arsdigita.profiler.ProfilerFilter</filter-class>
+  </filter>
+  -->
+
+  <filter>
+    <filter-name>shortcuts</filter-name>
+    <filter-class>com.arsdigita.london.shortcuts.ShortcutFilter</filter-class>
+  </filter>
+
+  <filter>
+    <filter-name>subsite</filter-name>
+    <filter-class>com.arsdigita.london.subsite.SubsiteFilter</filter-class>
+  </filter>
+
+<!--    NOT USED HERE
+  <filter-mapping>
+    <filter-name>secured</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+
+  <filter-mapping>
+    <filter-name>profiler</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+-->
+
+  <filter-mapping>
+    <filter-name>subsite</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+
+  <filter-mapping>
+    <filter-name>shortcuts</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+     Context Listener 
+     required and used to initialize the runtime environment before any other 
+     task is performed or any servlet initialized. 
+     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+  <listener>
+    <listener-class>com.arsdigita.web.CCMApplicationContextListener</listener-class>
+  </listener>
+
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+     BASE SERVLET DECLARATIONS SECTION
+     basically requirred by ccm-core
+     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+  <servlet>
+    <servlet-name>reg</servlet-name>
+    <servlet-class>com.arsdigita.web.ContextRegistrationServlet</servlet-class>
+    <init-param>
+      <param-name>uri</param-name>
+      <param-value>/</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+
+  <servlet>
+    <servlet-name>legacy-dispatcher</servlet-name>
+    <servlet-class>com.arsdigita.sitenode.SiteNodeDispatcher</servlet-class>
+    <load-on-startup>3</load-on-startup>
+  </servlet>
+
+  <servlet>
+    <servlet-name>ccm-dispatcher</servlet-name>
+    <servlet-class>com.arsdigita.web.DispatcherServlet</servlet-class>
+    <init-param>
+      <param-name>fallback-servlet</param-name>
+      <param-value>legacy-dispatcher</param-value>
+    </init-param>
+    <load-on-startup>2</load-on-startup>
+  </servlet>
+
+  <servlet>
+    <servlet-name>legacy-adapter</servlet-name>
+    <servlet-class>com.arsdigita.web.LegacyAdapterServlet</servlet-class>
+  </servlet>
+
+  <servlet>
+    <servlet-name>cache-manager</servlet-name>
+    <servlet-class>com.arsdigita.caching.CacheServlet</servlet-class>
+  </servlet>
+
+  <servlet>
+    <servlet-name>db-test</servlet-name>
+    <servlet-class>com.arsdigita.web.monitoring.DBTestServlet</servlet-class>
+  </servlet>
+
+  <servlet>
+    <servlet-name>versioning-log</servlet-name>
+    <servlet-class>com.arsdigita.versioning.VersioningServlet</servlet-class>
+  </servlet>
+
+  <servlet>
+    <servlet-name>oid-redirect</servlet-name>
+    <servlet-class>com.arsdigita.web.OIDRedirectServlet</servlet-class>
+  </servlet>
+
+  <servlet>
+    <servlet-name>resource-resolver</servlet-name>
+    <servlet-class>com.arsdigita.web.ResourceServlet</servlet-class>
+  </servlet>
+
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+     ADDITIONAL SERVLET DECLARATIONS SECTION 
+     basically requirred by ccm-cms
+     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+  <servlet>
+    <servlet-name>content-section</servlet-name>
+    <servlet-class>com.arsdigita.cms.ContentSectionServlet</servlet-class>
+  </servlet>
+
+  <servlet>
+    <servlet-name>content-type-xsl</servlet-name>
+    <servlet-class>com.arsdigita.cms.dispatcher.ContentTypeXSLServlet</servlet-class>
+  </servlet>
+
+  <servlet>
+    <servlet-name>content-item-xsl</servlet-name>
+    <servlet-class>com.arsdigita.cms.dispatcher.ContentItemXSLServlet</servlet-class>
+  </servlet>
+
+  <servlet>
+    <servlet-name>template-xsl</servlet-name>
+    <servlet-class>com.arsdigita.cms.dispatcher.TemplateXSLServlet</servlet-class>
+  </servlet>
+
+ <servlet>
+   <servlet-name>TextOnlyServlet</servlet-name>
+   <display-name>Text Only Servlet</display-name>
+   <servlet-class>
+    com.arsdigita.web.InternalPrefixerServlet
+   </servlet-class>
+   <init-param>
+     <param-name>prefix</param-name>
+     <param-value>/text</param-value>
+   </init-param>
+ </servlet>
+
+ <servlet>
+   <servlet-name>PrintFriendlyServlet</servlet-name>
+   <display-name>Printer Friendly Output Servlet</display-name>
+   <servlet-class>
+    com.arsdigita.web.InternalPrefixerServlet
+   </servlet-class>
+   <init-param>
+     <param-name>prefix</param-name>
+     <param-value>/print</param-value>
+   </init-param>
+ </servlet>
+
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+     MODULES SERVLET DECLARATIONS SECTION
+     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+
+  <!-- module ccm-forum  -  servlet declarations BEGIN  -->  
+  <servlet>
+    <servlet-name>forum-main</servlet-name>
+    <servlet-class>com.arsdigita.forum.ForumServlet</servlet-class>
+  </servlet>
+  <!-- module ccm-forum  -  servlet declarations END    -->  
+
+  <servlet>
+    <servlet-name>portalworkspace-files</servlet-name>
+    <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
+    <init-param>
+      <param-name>template-path</param-name>
+      <param-value>/templates/ccm-portalworkspace</param-value>
+    </init-param>
+  </servlet>
+
+  <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>
+    </init-param>
+    <init-param>
+      <param-name>file-resolver</param-name>
+      <param-value>com.arsdigita.london.navigation.NavigationFileResolver</param-value>
+    </init-param>
+  </servlet>
+
+  <servlet>
+    <servlet-name>portlet-type-xsl</servlet-name>
+    <servlet-class>com.arsdigita.dispatcher.PortletTypeXSLServlet</servlet-class>
+  </servlet>
+ 
+  <!-- module ccm-ldn-rss  -  servlet declaration BEGIN   -->
+  <servlet>
+    <servlet-name>rss-files</servlet-name>
+    <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
+    <init-param>
+      <param-name>template-path</param-name>
+      <param-value>/templates/ccm-ldn-rss</param-value>
+    </init-param>
+    <init-param>
+      <param-name>file-resolver</param-name>
+      <param-value>com.arsdigita.london.rss.RSSFileResolver</param-value>
+    </init-param>
+  </servlet>
+  <!-- module ccm-ldn-rss  -  servlet declaration END   -->
+
+  <!-- module ccm-ldn-search  -  servlet declarations BEGIN   -->
+  <servlet>
+    <servlet-name>worker</servlet-name>
+    <servlet-class>com.arsdigita.london.search.SearchWorkerServlet</servlet-class>
+    <load-on-startup>4</load-on-startup>
+  </servlet>
+  
+  <servlet>
+    <servlet-name>search-files</servlet-name>
+    <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
+    <init-param>
+      <param-name>template-path</param-name>
+      <param-value>/templates/ccm-ldn-search</param-value>
+    </init-param>
+  </servlet>
+
+  <servlet>
+    <servlet-name>AxisServlet</servlet-name>
+    <display-name>Apache-Axis Servlet</display-name>
+    <servlet-class>
+     org.apache.axis.transport.http.AxisServlet
+    </servlet-class>
+  </servlet>
+  <!-- module ccm-ldn-search  -  servlet declarations END  -->
+
+  <!-- module ccm-ldn-shortcuts  -  servlet definitions   -->
+  <servlet>
+    <servlet-name>shortcuts-files</servlet-name>
+    <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
+    <init-param>
+      <param-name>template-path</param-name>
+      <param-value>/templates/ccm-ldn-shortcuts</param-value>
+    </init-param>
+  </servlet>
+
+  <!-- module ccm-ldn-subsite  -  servlet declarations BEGIN  -->
+  <servlet>
+    <servlet-name>subsite-files</servlet-name>
+    <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
+    <init-param>
+      <param-name>template-path</param-name>
+      <param-value>/templates/ccm-ldn-subsite</param-value>
+    </init-param>
+  </servlet>
+  <!-- module ccm-ldn-subsite  -  servlet declarations END  -->
+
+  <!-- module ccm-ldn-terms  -  servlet declarations BEGIN   -->
+  <servlet>
+    <servlet-name>terms-files</servlet-name>
+    <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
+    <init-param>
+      <param-name>template-path</param-name>
+      <param-value>/templates/ccm-ldn-terms</param-value>
+    </init-param>
+  </servlet>
+  <!-- module ccm-ldn-terms  -  servlet declarations END   -->
+
+  <!-- module ccm-themedirector  -  servlet declarations BEGIN   -->
+  <servlet>
+    <servlet-name>theme-files</servlet-name>
+    <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
+    <init-param>
+      <param-name>template-path</param-name>
+      <param-value>/templates/ccm-themedirector</param-value>
+    </init-param>
+  </servlet>
+
+  <servlet>
+     <servlet-name>ThemeDownload</servlet-name>
+     <servlet-class>com.arsdigita.themedirector.dispatcher.ThemeDownloadServlet</servlet-class>
+  </servlet>
+
+  <servlet>
+    <servlet-name>ThemePreviewServlet</servlet-name>
+     <display-name>Servlet to allow admins to preview look/feel</display-name>
+    <servlet-class>
+     com.arsdigita.themedirector.dispatcher.InternalThemePrefixerServlet
+    </servlet-class>
+    <init-param>
+      <param-name>prefix</param-name>
+      <param-value>/theme</param-value>
+    </init-param>
+  </servlet>
+  <!-- module ccm-themedirector  -  servlet declarations END   -->
+
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+     MODULES SERVLET MAPPINGS SECTION
+     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+
+  <!-- module ccm-forum  -  servlet mappings BEGIN  -->
+  <servlet-mapping>
+    <servlet-name>forum-main</servlet-name>
+    <url-pattern>/forum-main/main/*</url-pattern>
+  </servlet-mapping>
+  <!-- module ccm-forum  -  servlet mappings END    -->
+
+  <servlet-mapping>
+    <servlet-name>portlet-type-xsl</servlet-name>
+    <url-pattern>/__ccm__/servlet/portlet-type/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>portalworkspace-files</servlet-name>
+    <url-pattern>/ccm-portalworkspace/files/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>navigation-files</servlet-name>
+    <url-pattern>/ccm-ldn-navigation/files/*</url-pattern>
+  </servlet-mapping>
+
+  <!-- module ccm-ldn-rss  -  servlet mappings   -->
+  <servlet-mapping>
+    <servlet-name>rss-files</servlet-name>
+    <url-pattern>/ccm-ldn-rss/files/*</url-pattern>
+  </servlet-mapping>
+
+  <!-- module ccm-ldn-search  -  servlet mappings BEGIN  -->
+  <servlet-mapping>
+    <servlet-name>search-files</servlet-name>
+    <url-pattern>/ccm-ldn-search/files/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>AxisServlet</servlet-name>
+    <url-pattern>/services/*</url-pattern>
+  </servlet-mapping>
+  <!-- module ccm-ldn-search  -  servlet mappings END  -->
+
+  <!-- module ccm-ldn-shortcuts  -  servlet mappings   -->
+  <servlet-mapping>
+    <servlet-name>shortcuts-files</servlet-name>
+    <url-pattern>/ccm-ldn-shortcuts/files/*</url-pattern>
+  </servlet-mapping>
+
+  <!-- module ccm-ldn-subsite  -  servlet mappings BEGIN  -->
+  <servlet-mapping>
+    <servlet-name>subsite-files</servlet-name>
+    <url-pattern>/ccm-ldn-subsite/files/*</url-pattern>
+  </servlet-mapping>
+  <!-- module ccm-ldn-subsite  -  servlet mappings END  -->
+
+  <!-- module ccm-ldn-terms  -  servlet mappings BEGIN  -->
+  <servlet-mapping>
+    <servlet-name>terms-files</servlet-name>
+    <url-pattern>/ccm-ldn-terms/files/*</url-pattern>
+  </servlet-mapping>
+  <!-- module ccm-ldn-terms  -  servlet mappings END  -->
+
+  <!-- module ccm-themedirector  -  servlet mappings BEGIN   -->
+  <servlet-mapping>
+    <servlet-name>theme-files</servlet-name>
+    <url-pattern>/theme-files/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>ThemeDownload</servlet-name>
+    <url-pattern>/theme-files/download/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>ThemePreviewServlet</servlet-name>
+    <url-pattern>/theme/*</url-pattern>
+  </servlet-mapping>
+  <!-- module ccm-themedirector  -  servlet mappings END   -->
+
+
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+     BASE SERVLET MAPPINGS SECTION
+     basically requirred by ccm-core
+     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+  <servlet-mapping>
+    <servlet-name>reg</servlet-name>
+    <url-pattern>/__ccm__/null/reg/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>ccm-dispatcher</servlet-name>
+    <url-pattern>/ccm/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>legacy-adapter</servlet-name>
+    <url-pattern>/__ccm__/servlet/legacy-adapter/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>cache-manager</servlet-name>
+    <url-pattern>/expireCache/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>db-test</servlet-name>
+    <url-pattern>/dbtest</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>versioning-log</servlet-name>
+    <url-pattern>/versioning/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>oid-redirect</servlet-name>
+    <url-pattern>/redirect/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>resource-resolver</servlet-name>
+    <url-pattern>/resource/*</url-pattern>
+  </servlet-mapping>
+
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+     ADDITIONAL SERVLET MAPPINGS SECTION
+     basically requirred by ccm-cms
+     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+  <servlet-mapping>
+    <servlet-name>content-section</servlet-name>
+    <url-pattern>/__ccm__/servlet/content-section/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>content-item-xsl</servlet-name>
+    <url-pattern>/__ccm__/servlet/content-item/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>content-type-xsl</servlet-name>
+    <url-pattern>/__ccm__/servlet/content-type/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>template-xsl</servlet-name>
+    <url-pattern>/__ccm__/servlet/template/*</url-pattern>
+  </servlet-mapping>
+
+ <servlet-mapping>
+     <servlet-name>TextOnlyServlet</servlet-name>
+     <url-pattern>/text/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+     <servlet-name>PrintFriendlyServlet</servlet-name>
+     <url-pattern>/print/*</url-pattern>
+ </servlet-mapping>
+
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+     ERROR PAGES
+     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+  <error-page>
+    <exception-type>com.arsdigita.dispatcher.AccessDeniedException</exception-type>
+    <location>/error/access-denied.jsp</location>
+  </error-page>
+
+  <error-page>
+    <exception-type>com.arsdigita.dispatcher.ObjectNotFoundException</exception-type>
+    <location>/error/object-not-found.jsp</location>
+  </error-page>
+
+  <error-page>
+    <exception-type>com.arsdigita.kernel.permissions.PermissionException</exception-type>
+    <location>/error/permission-denied.jsp</location>
+  </error-page>
+
+  <error-page>
+    <exception-type>com.arsdigita.persistence.DbNotAvailableException</exception-type>
+    <location>/error/db-not-available.jsp</location>
+  </error-page>
+
+  <error-page>
+    <exception-type>com.arsdigita.db.DbNotAvailableException</exception-type>
+    <location>/error/db-not-available.jsp</location>
+  </error-page>
+
+  <error-page>
+    <exception-type>java.lang.Exception</exception-type>
+    <location>/error/general.jsp</location>
+  </error-page>
+
+  <error-page>
+    <exception-type>java.lang.Error</exception-type>
+    <location>/error/general.jsp</location>
+  </error-page>
+
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+     TAG LIBS
+     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+  <taglib>
+    <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
+    <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
+  </taglib>
+
+  <taglib>
+    <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
+    <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
+  </taglib>
+
+</web-app>
diff --git a/ccm-sci-bundle/bundles/local/iaw/nav/placeholder.info b/ccm-sci-bundle/bundles/local/iaw/nav/placeholder.info
new file mode 100644
index 000000000..38db9a8ae
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/iaw/nav/placeholder.info
@@ -0,0 +1,12 @@
+Subdirectory  <nav> may optionally contain navigation item templates for
+navigation index pages which either overwrite or ammend those templates
+which are default for ccm-sci-bundle and stored in 
+   /web/templates/ccm-navigation/navigation
+
+Templates of the same name in this subdirectory just overwrite the
+default files. Templates of different names are stored in addition
+to the default template files. In the later case a developer must
+provide a customised template.txt file replacing the default file
+   /src/WEB-INF/navigation/sci-templates.txt
+This file must be specified in parameter 
+   com.arsdigita.london.navigation.templates_file
\ No newline at end of file
diff --git a/ccm-sci-bundle/src/WEB-INF/navigation/sci-templates.txt b/ccm-sci-bundle/src/WEB-INF/navigation/sci-templates.txt
new file mode 100755
index 000000000..80d8612e5
--- /dev/null
+++ b/ccm-sci-bundle/src/WEB-INF/navigation/sci-templates.txt
@@ -0,0 +1,9 @@
+ScientificCMS Default Items Page,Sci Default Navigation Index Page ordering items in ascending order,/templates/ccm-ldn-navigation/navigation/sci-default.jsp
+ScientificCMS Recent Items Page,Sci List of items ordered with most recent first,/templates/ccm-ldn-navigation/navigation/sci-recent.jsp
+ScientificCMS A-Z Items,Sci List of items paginated as A-Z,/templates/ccm-ldn-navigation/navigation/sci-atoz.jsp
+ScientificCMS Events Page,Sci Events Page ordering events in ??? order,/templates/ccm-ldn-navigation/navigation/sci-events.jsp
+ScientificCMS Portal Page,Sci Portal Page for embedding a portal page as navigation leaves page,/templates/ccm-ldn-navigation/navigation/sci-portal.jsp
+ScientificCMS Portal Welcome Page,Sci Portal page meant as site welcome page,/templates/ccm-ldn-navigation/navigation/sci-portal-welcome.jsp
+ScientificCMS Navigation Welcome Page,Sci site welcome page created by navigation root term,/templates/ccm-ldn-navigation/navigation/sci-welcome.jsp
+ScientificCMS Specializing Items List,Sci Specialising List item page,/templates/ccm-ldn-navigation/navigation/SpecializingList.jsp
+ScientificCMS Publications List,Sci publications listing page,/templates/ccm-ldn-navigation/navigation/SciPublicationList.jsp
diff --git a/ccm-sci-bundle/src/WEB-INF/sci/zes-nav-domain-1.00.xml b/ccm-sci-bundle/src/WEB-INF/sci/sci-nav-domain-1.00.xml
similarity index 66%
rename from ccm-sci-bundle/src/WEB-INF/sci/zes-nav-domain-1.00.xml
rename to ccm-sci-bundle/src/WEB-INF/sci/sci-nav-domain-1.00.xml
index f568d3278..31486e212 100644
--- a/ccm-sci-bundle/src/WEB-INF/sci/zes-nav-domain-1.00.xml
+++ b/ccm-sci-bundle/src/WEB-INF/sci/sci-nav-domain-1.00.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Document   : domain-nav-zes-1.00.xml
+    Document   : domain-nav-sci-1.00.xml
     Created on : 8. Aug. 2007, 10:00
     Author     : pb
     Description:
@@ -10,17 +10,17 @@
 
 <terms:domain xmlns:terms="http://xmlns.redhat.com/london/terms/1.0" 
               about="http://www.aplaws.org.uk/standards/nav/1.03/termslist.xml" 
-              key="ZES-NAV" 
-              title="ZeS Navigation List" 
+              key="STD-NAV" 
+              title="Sci Navigation List" 
               version="1.00" released="2007-08-10">
 
   <terms:term id="1000" name="Institut" inAtoZ="false"/>
     <terms:term id="1200" name="Abteilungen" inAtoZ="false"/>
-      <terms:term id="1220" name="Abteilung Theorie und Verfassung des Wohlfahrsstaates" inAtoZ="false"/>
-      <terms:term id="1240" name="Abteilung Institutionen und Geschichte des Wohlfahrsstaates" inAtoZ="false"/>
-      <terms:term id="1260" name="Wirtschaftswissenschaftliche Abteilung" inAtoZ="false"/>
-      <terms:term id="1280" name="Abteilung Arbeit und Gesundheit" inAtoZ="false"/>
-      <terms:term id="1300" name="Geschlechterpolitik im Wohlfahrtsstaat" inAtoZ="false"/>
+      <terms:term id="1220" name="Abteilung 1" inAtoZ="false"/>
+      <terms:term id="1240" name="Abteilung 2" inAtoZ="false"/>
+      <terms:term id="1260" name="Abteilung 3" inAtoZ="false"/>
+      <terms:term id="1280" name="Abteilung 4" inAtoZ="false"/>
+      <terms:term id="1300" name="Abteilung 5" inAtoZ="false"/>
     <terms:term id="1400" name="Mitglieder" inAtoZ="false"/>
     <terms:term id="1600" name="Bibliothek" inAtoZ="false"/>
     <terms:term id="1800" name="Ankündigungen" inAtoZ="false"/>
@@ -31,14 +31,14 @@
       <terms:term id="3420" name="Publikationen" inAtoZ="false"/>
       <terms:term id="3440" name="Arbeitspapiere" inAtoZ="false"/>
       <terms:term id="3460" name="Schriftenreihe" inAtoZ="false"/>
-      <terms:term id="3480" name="ZeS Report" inAtoZ="false"/>
+      <terms:term id="3480" name="Sci Report" inAtoZ="false"/>
       <terms:term id="3500" name="Jahresberichte" inAtoZ="false"/>
-    <terms:term id="3600" name="Gesundheitspolitisches Kolloquium" inAtoZ="false"/>
+    <terms:term id="3600" name="Kolloquium" inAtoZ="false"/>
     <terms:term id="3800" name="Jour Fix" inAtoZ="false"/>
     <terms:term id="4000" name="Tagungen" inAtoZ="false"/>
   
   <terms:term id="5000" name="Lehre und Studium" inAtoZ="false"/>
-    <terms:term id="5200" name="Masterstudiengang Sozialpolitik" inAtoZ="false"/>
+    <terms:term id="5200" name="Masterstudiengang Sci" inAtoZ="false"/>
     <terms:term id="5400" name="Weitere Lehre" inAtoZ="false"/>
     
   <terms:term id="9002" name="Archiv" inAtoZ="false"/>
diff --git a/ccm-sci-bundle/src/WEB-INF/sci/zes-nav-hierarchy-1.00.xml b/ccm-sci-bundle/src/WEB-INF/sci/sci-nav-hierarchy-1.00.xml
similarity index 99%
rename from ccm-sci-bundle/src/WEB-INF/sci/zes-nav-hierarchy-1.00.xml
rename to ccm-sci-bundle/src/WEB-INF/sci/sci-nav-hierarchy-1.00.xml
index bd3872ec7..cfce50400 100644
--- a/ccm-sci-bundle/src/WEB-INF/sci/zes-nav-hierarchy-1.00.xml
+++ b/ccm-sci-bundle/src/WEB-INF/sci/sci-nav-hierarchy-1.00.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Document   : hierarchy-nav-zes-1.00.xml
+    Document   : hierarchy-nav-sci-1.00.xml
     Created on : 8. Aug. 2007, 10:30
     Author     : pb
     Description:
diff --git a/ccm-sci-bundle/src/com/arsdigita/bundle/Loader.java b/ccm-sci-bundle/src/com/arsdigita/bundle/Loader.java
index 6d71b1b16..290fa5318 100644
--- a/ccm-sci-bundle/src/com/arsdigita/bundle/Loader.java
+++ b/ccm-sci-bundle/src/com/arsdigita/bundle/Loader.java
@@ -18,7 +18,7 @@
 
 package com.arsdigita.bundle;
 
-import com.arsdigita.london.navigation.Template;
+// import com.arsdigita.london.navigation.Template;
 import com.arsdigita.london.terms.Domain;
 import com.arsdigita.london.terms.importer.Parser;
 
@@ -34,7 +34,8 @@ import com.arsdigita.kernel.permissions.PrivilegeDescriptor;
 import com.arsdigita.persistence.DataQuery;
 import com.arsdigita.runtime.ScriptContext;
 import com.arsdigita.util.parameter.Parameter;
-import com.arsdigita.util.parameter.StringParameter;
+import com.arsdigita.util.parameter.StringArrayParameter;
+// import com.arsdigita.util.parameter.StringParameter;
 import com.arsdigita.web.Application;
 
 import org.apache.log4j.Logger;
@@ -42,10 +43,11 @@ import org.apache.log4j.Logger;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
+import java.util.StringTokenizer;
 
 /**
- * <p>Loader executes nonrecurring at install time and loads (installs and
- * initializes) the ScientificCMS integration module persistently into database.</p>
+ * Loader executes nonrecurring at install time and loads (installs and
+ * initializes) the ScientificCMS integration module persistently into database.
  *
  * Creates category domains in the terms application according to 
  * configuration files and adds jsp templates to navigation.
@@ -56,78 +58,126 @@ import java.util.Set;
  */
 public class Loader extends PackageLoader {
 
+    /** Logger instance for debugging  */
     private static final Logger s_log = Logger.getLogger(Loader.class);
-
-    // Name of files containing an initial category tree(s).
-    // Files are stored as part of the jar, so classloader can find them.
-    // ToDo: relocate files user accessible outside the jar.
-    private static final String[] categoryFiles = new String[]{
-        "WEB-INF/sci/zes-nav-domain-1.00.xml",
-        "WEB-INF/sci/zes-nav-hierarchy-1.00.xml"
-    };
-
-    private StringParameter m_navigationDomain;
-    // private StringParameter m_servicesDomain;
-    // private StringParameter m_interactionDomain;
-    // private StringParameter m_subjectDomain;
-    // private StringParameter m_rssDomain;
+    
+    /**
+     * List of comma separated sets of application instance specifications,
+     * optionally used to create arbitrary custom application instances 
+     * according to local sites requirements.
+     * It's the developers / administrators responsibility to ensure all
+     * necessary application types have been created previously.
+     * Example:
+     *   "FULL_QUALIFIED_CLASS_NAME : URL : TITLE , 
+     *    FULL_QUALIFIED_CLASS_NAME : URL : TITLE ,
+     *    ....                                    ,
+     *    FULL_QUALIFIED_CLASS_NAME : URL : TITLE "
+     */
+    private Parameter m_customApplicationInstances = new StringArrayParameter(
+                "com.arsdigita.bundle.local_app_instances",
+                Parameter.OPTIONAL, null
+                );
+    
+    /**
+     * Comma separated list of fully qualified filenames, each file containing
+     * a set of Terms domain catagories definitions. These form an initial set
+     * of category tree(s), at minimum for navigation, optionally additional
+     * domains.
+     * Files are stored as part of the jar, so classloader can find them.
+     */
+    private Parameter m_categoryFiles = new StringArrayParameter(
+                "com.arsdigita.bundle.category_files",
+                Parameter.REQUIRED,new String[]{
+                    "WEB-INF/sci/sci-nav-domain-1.00.xml",
+                    "WEB-INF/sci/sci-nav-hierarchy-1.00.xml" }
+                );
 
     /**
-     * Constructor 
+     * List of comma separated sets of domain mappings.
+     * It's the developers / administrators responsibility to ensure all
+     * necessary category domains have been imported previously and are spelled
+     * correctly. The list may contain set for different domain key and/or
+     * different applications and contexts. If an domain key requires several
+     * applications, repeat the key and specify a different application and/or
+     * context
+     * Example:
+     *   "DOMAIN_KEY_1 : APP_URL_1 [: CONTEXT_1] , 
+     *    DOMAIN_KEY_1 : APP_URL_2 [: CONTEXT_1] ,
+     *    DOMAIN_KEY_2 : APP_URL_1 [: CONTEXT] ,
+     *    ....                             ,
+     *    DOMAIN_KEY_n : APP_URL_n [: CONTEXT_n] "
+     * 
+     */
+    private Parameter m_domainMappings = new StringArrayParameter(
+                "com.arsdigita.bundle.domain_mappings",
+                Parameter.REQUIRED,new String[]{ "STD-NAV:/navigation/",
+                                                 "STD-NAV:/content/",
+                                                 "STD-NAV:/portal/"      }
+                );
+
+    
+    /**
+     * Constructor
      */
     public Loader() {
 
-        // Es werden stumpf mehrere Kategorisierungsdomains fuer TERMS 
-        // definiert und dann über xml Dateien gefüllt:
-        // navigationDomain f. Navigation
-        // subjectDomain f. ???
-        // interactionDomain f. ???
-        // rssDomain fuer vermutlich RSS Feed
-        //
-        m_navigationDomain = new StringParameter(
-                "com.arsdigita.aplaws.navigation_domain",
-                Parameter.REQUIRED,
-                "STD-NAV");
-        // Registers to the context by adding the parameter to a map of parameters
-        register(m_navigationDomain);
-
-        /*
-         * You may add more catagory domains by adding resources
-         * according the following schema
-         */
-
-        /* currently not used
-        m_subjectDomain = new StringParameter(
-            "com.arsdigita.aplaws.subject_domain",
-            Parameter.REQUIRED,
-            "LGCL");
-        register(m_subjectDomain);
-         */
-
-        /* currently not used
-        m_interactionDomain = new StringParameter(
-            "com.arsdigita.aplaws.subject_domain",
-            Parameter.REQUIRED,
-            "LGIL");
-        register(m_interactionDomain);
-         */
-        
-        /* currently not used
-        m_rssDomain = new StringParameter(
-            "com.arsdigita.aplaws.rss_domain",
-            Parameter.REQUIRED,
-            "APLAWS-RSS");
-        register(m_rssDomain);
-         */
-
+        // Register defined parametgers to the context by adding 
+        // the parameter to a map of parameters
+        register(m_customApplicationInstances);
+        register(m_categoryFiles);
+        register(m_domainMappings);
 
     }
 
 
     public void run(final ScriptContext ctx) {
 
-        String[] files = categoryFiles;
+        /* Create site specific custom applications instances of arbitrary
+         * type specified by optional configuration parameter.
+         * Typically used to create additional navigation instances for alternativ 
+         * navigation tree(s) or additional content sections.
+         */
+        String[] customApplicationInstances = (String[]) get(m_customApplicationInstances);
+        if ( customApplicationInstances != null) {
+            
+            for (int i = 0 ; i < customApplicationInstances.length ; i++) {
+            
+                final String aCustomApplicationInstance = customApplicationInstances[i];
 
+                StringTokenizer tok = new StringTokenizer( aCustomApplicationInstance, ":" );
+                String type = null;    // full qualified class name
+                String url = null;     // url fragment (last part)
+                String title = null;   // title of new application instance
+                String parent = null;  // parent class name
+                for ( int j = 0; tok.hasMoreTokens(); j++ ) {
+                    if ( 0 == j ) {
+                        type = tok.nextToken();
+                    } else if ( 1 == j ) {
+                        url = tok.nextToken();
+                    } else if ( 2 == j ) { 
+                        title = tok.nextToken();
+                    } else if ( 3 == j ) { 
+                        parent = tok.nextToken();
+                    } else {
+                        parent = null;
+                    }
+                }
+
+                Application.createApplication(type, url, title, null);
+            }
+
+        }
+
+        
+        /* Import from the categories definition files: Create Terms domains 
+         * and populate them with categories                                  
+         * (alternatively this could be delegated to terms.Loader because it's
+         * all Terms)                                                         
+         * Creates one or more Terms domains, but NO domain mapping for navigation.
+         * Therefore, registerDomains is required for /navigation/ otherwise
+         * the systems throws NPE for ccm/navigation.
+         */
+        String[] files = (String[]) get(m_categoryFiles);
         final Parser parser = new Parser();
         // for each filename in the array of files containing categories
         for (int i = 0 ; i < files.length ; i++) {
@@ -135,57 +185,49 @@ public class Loader extends PackageLoader {
             if (s_log.isInfoEnabled()) {
                 s_log.info("Process " + file);
             }
+            /* Import a Terms category domain.                                */
             parser.parse(Thread.currentThread().getContextClassLoader().
                     getResourceAsStream(file));
         }
 
-        String navigationKey = (String) get(m_navigationDomain);
-        registerDomain(navigationKey, "/navigation/", null);
-        registerDomain(navigationKey, "/content/", null);
-        registerDomain(navigationKey, "/portal/", null);
-        //registerDomain(navigationKey, "/admin/subsite/", null);
 
-        /*
-         * You may add more catagory domains by adding resources
-         * according the following schema
+        /* Creates domain mappings according to configuration file. By default
+         * at least one domain mapping for standard navigation is created,
+         * otherwise navigation wouldn't work.
+         * IOt is the developers / administrators responsibility that KEY is
+         * existent, i.e. previously importet in the previous step. 
          */
+        String[] domainMappings = (String[]) get(m_domainMappings);
+        for (int i = 0 ; i < domainMappings.length ; i++) {
+            
+            final String aDomainMapping = domainMappings[i];
 
-        // String subjectKey = (String)get(m_subjectDomain);
-        // registerDomain(subjectKey, "/search/", null);
-        // registerDomain(subjectKey, "/content/", "subject");
+            StringTokenizer tok = new StringTokenizer( aDomainMapping, ":" );
+            String key = null;
+            String app = null;
+            String context = null;
+            for ( int j = 0; tok.hasMoreTokens(); j++ ) {
+                if ( 0 == j ) {
+                    key = tok.nextToken();
+                } else if ( 1 == j ) {
+                    app = tok.nextToken();
+                } else if ( 2 == j ) { 
+                    context = tok.nextToken();
+                } else {
+                    context = null;
+                }
+            }
 
-        // String servicesKey = (String)get(m_servicesDomain);
-        // registerDomain(servicesKey, "/services/", null);
-        // registerDomain(servicesKey, "/content/", "services");
+            registerDomain(key, app, context);
 
-        // String rssKey = (String)get(m_rssDomain);
-        // registerDomain(rssKey, "/channels/", null);
-        // registerDomain(rssKey, "/content/", "rss");
+        }
+        
 
-        // String interactionKey = (String)get(m_interactionDomain);
-        // registerDomain(interactionKey, "/content/", "interaction");
+        // registerServicesTemplate("/services/");  wird nicht gebraucht        
 
-
-
-        // register new / addidional JSP templates (index pages) in Navigation
-        // registerServicesTemplate("/services/");  wird nicht gebraucht
-        registerNavigationTemplates();
-
-        // Switch /portal/ to use 1 column layout for funky aplaws stuff.
-        // pboy: This will have no effect at all. A portal page created at
-        // url /portal/ (and beneath) will always use the homepage jsp's which
-        // are hardcoded to create a three column design and ignore any
-        // column configuration. All portal pages at other urls are not
-        // affect by this setting which touches only the one application (portal)
-        // at url /portal/. Portal pages at other urls use the corresponding
-        // configuration parameter for its initial value and number of columns
-        // may be modified at any time using configuration ui.
-/*      Workspace portal = (Workspace)Application
-              .retrieveApplicationForPath("/portal/");
-        portal.setDefaultLayout(PageLayout
-              .findLayoutByFormat(PageLayout.FORMAT_ONE_COLUMN));             */
     }  // end run method
 
+    
 //  public void registerServicesTemplate(String appURL) {
 //      Application app = Application.retrieveApplicationForPath(appURL);
 //      Assert.exists(app, Application.class);
@@ -203,144 +245,17 @@ public class Loader extends PackageLoader {
 //                           Template.DEFAULT_USE_CONTEXT );
 //  }
     
+    
     /**
-     * Use Package com.arsdigita.london.navigation to add additional
-     * templates (JSP page - index page) for use in navigation.
-     * These JSP pages can be choosen in admin/navigation as index
-     * pages for one or more specific categories.
+     * Determines the Terms domain using domainKey as well as the application
+     * instance using appURL and then creates a domain mapping using context
+     * as domain context.
      * 
-     * TODO: make configurable without recompiling!
-     */
-    public void registerNavigationTemplates() {
-
-        Template template;
-
-        /*  In navigation werden bereits Grund-Templates erstellt.
-         */
-        template = Template.create(
-                "ZeS AtoZ paginator",
-                "ZeS AtoZ paginator index page",
-                "/packages/navigation/templates/zes-atoz.jsp");
-
-        template = Template.create(
-                "ZeS Default",
-                "ZeS default index page",
-                "/packages/navigation/templates/zes-default.jsp");
-
-        template = Template.create(
-                "ZeS Portalseite",
-                "ZeS Portal Page",
-                "/packages/navigation/templates/zes-portal.jsp");
-
-        template = Template.create(
-                "ZeS Recent",
-                "ZeS reverse order page",
-                "/packages/navigation/templates/zes-recent.jsp");
-
-        template = Template.create(
-                "ZeS Welcome Page",
-                "ZeS Welcome Page for navigation",
-                "/packages/navigation/templates/zes-welcome.jsp");
-
-        template =
-        Template.create(
-                "MultiPartArticle as Index Item",
-                "Display a MultiPartArticle as index item",
-                "/packages/navigation/templates/mparticle-index.jsp");
-
-
-        template =
-        Template.create(
-                "Specializing list",
-                "Displays a list of items as the ordinary template, but specializes the objects in the list.",
-                "/packages/navigation/templates/SpecializingList.jsp");
-
-        template =
-        Template.create(
-                "SciProject list",
-                "Displays a list of SciProject items, including some attributes.",
-                "/packages/navigation/templates/SciProjectList.jsp");
-
-        template =
-        Template.create(
-                "SciPublication list",
-                "Displays a list of publication items, including some attributes.",
-                "/packages/navigation/templates/SciPublicationList.jsp");
-
-    }
-
-    /**
-     * Function to create an empty default domain in terms, preconfigured
-     * for navigation. It may be populated manually by the user/publisher 
-     * using the terms admin application.
-     * This step is useful only if no specific navigation tree is
-     * delivered.  
-     */
-    // -- public void registerDefaultNavigationDomain() {
-    // -- private StringParameter m_customNavKey;
-    // -- private URLParameter    m_customNavDomainURL;
-    // -- private StringParameter m_customNavPath;
-    // -- private StringParameter m_customNavUseContext;
-    // -- private StringParameter m_customNavTitle;
-    // -- private StringParameter m_customNavDesc;
-    // -- m_customNavKey = new StringParameter(
-    // --     "com.arsdigita.aplaws.custom_nav_key",
-    // --     Parameter.REQUIRED,
-    // --     "APLAWS-NAVIGATION");
-
-    /*   Zugriff auf Website wird nicht benötigt, aber der Parameter bei Einrichtung
-     *   der Kategorien. Funktion URL prüft auf korrekte Syntax, nicht auf Existenz
-     */
-    // -- try {
-    // --     m_customNavDomainURL = new URLParameter(
-    // --         "com.arsdigita.aplaws.custom_nav_domain_url",
-    // --         Parameter.REQUIRED,
-    // --         new URL("http://www.aplaws.org.uk/" +
-    // --                 "standards/custom/1.00/termslist.xml"));
-    // -- } catch (MalformedURLException ex) {
-    // --     throw new UncheckedWrapperException("Cannot parse url", ex);
-    // -- }
-    // -- m_customNavPath = new StringParameter(
-    // --     "com.arsdigita.aplaws.custom_nav_path",
-    // --     Parameter.REQUIRED,
-    // --     "local");
-    // -- m_customNavUseContext = new StringParameter(
-    // --     "com.arsdigita.aplaws.custom_nav_use_context",
-    // --     Parameter.REQUIRED,
-    // --     "local");
-    // -- m_customNavTitle = new StringParameter(
-    // --     "com.arsdigita.aplaws.custom_nav_title",
-    // --     Parameter.REQUIRED,
-    // --     "APLAWS Custom Navigation");
-    // -- m_customNavDesc = new StringParameter(
-    // --     "com.arsdigita.aplaws.custom_nav_desc",
-    // --     Parameter.REQUIRED,
-    // --     "Installation specific navigation tree");
-    // -- register(m_customNavDesc);
-    // -- register(m_customNavDomainURL);
-    // -- register(m_customNavKey);
-    // -- register(m_customNavPath);
-    // -- register(m_customNavTitle);
-    // -- register(m_customNavUseContext);
-    // -- String customNavPath = (String)get(m_customNavPath);
-    // -- String customNavTitle = (String)get(m_customNavTitle);
-    // Package com.arsdigita.web
-    // Application.createApplication(Navigation.BASE_DATA_OBJECT_TYPE,
-    //                               customNavPath,
-    //                               customNavTitle,
-    //                               null);
-    // -- String customNavDesc = (String)get(m_customNavDesc);
-    // -- String customNavKey = (String)get(m_customNavKey);
-    // -- String customNavUseContext = (String)get(m_customNavUseContext);
-    // -- URL customNavDomainURL = (URL)get(m_customNavDomainURL);
-    // -- Domain.create(customNavKey, customNavDomainURL,
-    // --               customNavTitle, customNavDesc, "1.0.0", new Date());
-    // registerDomain(customNavKey, '/'+customNavPath+'/', null);
-    // -- registerDomain(customNavKey, "/content/", customNavUseContext);
-    // -- }
-    /**
-     * Use Package com.arsdigita.london.terms to register a Domain for
-     * Categorisation
+     * Uses Package com.arsdigita.london.terms.Domain (!) 
+     * 
+     * @param domainKey
+     * @param appURL
+     * @param context 
      */
     public void registerDomain(String domainKey,
                                String appURL,
@@ -350,9 +265,14 @@ public class Loader extends PackageLoader {
                         + " in context " + context);
         }
 
-        Domain domain = Domain.retrieve(domainKey);  // package com.arsdigita.london.terms
+        /* Determine Domain and Application objects, both MUST exist!         */
+        Domain domain = Domain.retrieve(domainKey);  
         Application app = Application.retrieveApplicationForPath(appURL);
+        
+        /* Create domain mapping                                              */
         domain.setAsRootForObject(app, context);
+        
+        /* Create permissions and roles for content-center applications only  */
         if (app instanceof ContentSection) {
             RoleCollection coll = ((ContentSection) app).getStaffGroup().getOrderedRoles();
             Set adminRoles = new HashSet();
diff --git a/ccm-sci-bundle/src/com/arsdigita/bundle/ui/AssignedIndexItemTerms.java b/ccm-sci-bundle/src/com/arsdigita/bundle/ui/AssignedIndexItemTerms.java.probably.nolongerInUse
similarity index 100%
rename from ccm-sci-bundle/src/com/arsdigita/bundle/ui/AssignedIndexItemTerms.java
rename to ccm-sci-bundle/src/com/arsdigita/bundle/ui/AssignedIndexItemTerms.java.probably.nolongerInUse
diff --git a/ccm-sci-bundle/src/com/arsdigita/bundle/ui/AssignedItemTerms.java b/ccm-sci-bundle/src/com/arsdigita/bundle/ui/AssignedItemTerms.java
index 6e3680d09..433c7478e 100644
--- a/ccm-sci-bundle/src/com/arsdigita/bundle/ui/AssignedItemTerms.java
+++ b/ccm-sci-bundle/src/com/arsdigita/bundle/ui/AssignedItemTerms.java
@@ -23,6 +23,11 @@ import com.arsdigita.cms.CMS;
 import com.arsdigita.kernel.ACSObject;
 import com.arsdigita.london.terms.ui.AbstractAssignedTerms;
 
+/**
+ * 
+ * Invoked by jsp
+ * (e.g. packages/content-section/templates/default/aplaws-item.jsp)
+ */
 public class AssignedItemTerms extends AbstractAssignedTerms {
 
     protected ACSObject getObject(PageState state) {
diff --git a/ccm-sci-bundle/src/com/arsdigita/bundle/ui/CategoryTermDetails.java b/ccm-sci-bundle/src/com/arsdigita/bundle/ui/CategoryTermDetails.java.probably.nolongerInUse
similarity index 98%
rename from ccm-sci-bundle/src/com/arsdigita/bundle/ui/CategoryTermDetails.java
rename to ccm-sci-bundle/src/com/arsdigita/bundle/ui/CategoryTermDetails.java.probably.nolongerInUse
index 4c8bf00ff..70bb784d1 100644
--- a/ccm-sci-bundle/src/com/arsdigita/bundle/ui/CategoryTermDetails.java
+++ b/ccm-sci-bundle/src/com/arsdigita/bundle/ui/CategoryTermDetails.java.probably.nolongerInUse
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.aplaws.ui;
+package com.arsdigita.bundle.ui;
 
 import com.arsdigita.london.terms.Term;
 import com.arsdigita.london.terms.ui.AbstractTermDetails;
diff --git a/ccm-sci-bundle/web/packages/navigation/templates/SciDepartment-index.jsp b/ccm-sci-bundle/web/packages/navigation/templates/SciDepartment-index.jsp
deleted file mode 100644
index 335e93ba7..000000000
--- a/ccm-sci-bundle/web/packages/navigation/templates/SciDepartment-index.jsp
+++ /dev/null
@@ -1,67 +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="defaultItemPage" application="navigation"
-    title="Navigation" cache="false">
-
-    <define:component name="greetingItem"
-      classname="com.arsdigita.london.navigation.ui.GreetingItem"/>
-    <define:component name="sectionXML"
-      classname="com.arsdigita.cms.contenttypes.ui.SciDepartmentWithPublicationsPanel"/>
-    <jsp:scriptlet>
-        com.arsdigita.cms.ContentItem item = (com.arsdigita.cms.ContentItem)((com.arsdigita.london.navigation.ui.GreetingItem) greetingItem).getObject();
-        ((com.arsdigita.cms.contenttypes.ui.SciDepartmentPanel) sectionXML).setContentItem(item);
-    </jsp:scriptlet>
-    <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.cms.contenttypes.ui.SciDepartmentPanel)sectionXML).setPageSize(30);
-
-      ((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( "definition");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "summary");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "lead");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "description");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "eventDate");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "startDate" );
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "endDate");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "newsDate");
-    </jsp:scriptlet>
-
-    <define:component name="assignedTerms"
-         classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
-
-  </define:page>
-  <show:all/>
-</jsp:root>
-
diff --git a/ccm-sci-bundle/web/packages/navigation/templates/SciDepartmentActiveMembers.jsp b/ccm-sci-bundle/web/packages/navigation/templates/SciDepartmentActiveMembers.jsp
deleted file mode 100644
index 6e81f3f34..000000000
--- a/ccm-sci-bundle/web/packages/navigation/templates/SciDepartmentActiveMembers.jsp
+++ /dev/null
@@ -1,56 +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.NavigationModel"/>
-    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSNavigationModel"/>
-    <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.cms.dispatcher.SimpleXMLGenerator"/>
-
-
-    <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.CustomizableGreetingItem"/>
-        <jsp:scriptlet>
-            ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciDepartment",
-                             SimpleXMLGenerator.ADAPTER_CONTEXT);
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/departmentDescription");
-        ((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).addFilter("formerMember != true");
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).addFilter("associatedMember != true");
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setOrder("surname asc, givenname asc");
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
-        </jsp:scriptlet>
-
-        <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="assignedTerms"
-                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
-
-    </define:page>
-
-    <show:all/>
-
-
-</jsp:root>
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/packages/navigation/templates/SciDepartmentAssociatedMembers.jsp b/ccm-sci-bundle/web/packages/navigation/templates/SciDepartmentAssociatedMembers.jsp
deleted file mode 100644
index 890957e58..000000000
--- a/ccm-sci-bundle/web/packages/navigation/templates/SciDepartmentAssociatedMembers.jsp
+++ /dev/null
@@ -1,57 +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.NavigationModel"/>
-    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSNavigationModel"/>
-    <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.cms.dispatcher.SimpleXMLGenerator"/>
-
-
-    <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.CustomizableGreetingItem"/>
-        <jsp:scriptlet>
-            ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciDepartment",
-                             SimpleXMLGenerator.ADAPTER_CONTEXT);
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/departmentDescription");
-        ((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).addFilter("formerMember != true");
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).addFilter("associatedMember = true");
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setOrder("surname asc, givenname asc");
-
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
-        </jsp:scriptlet>
-
-        <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="assignedTerms"
-                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
-
-    </define:page>
-
-    <show:all/>
-
-
-</jsp:root>
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/packages/navigation/templates/SciDepartmentDescription.jsp b/ccm-sci-bundle/web/packages/navigation/templates/SciDepartmentDescription.jsp
deleted file mode 100644
index 2e1d5a139..000000000
--- a/ccm-sci-bundle/web/packages/navigation/templates/SciDepartmentDescription.jsp
+++ /dev/null
@@ -1,50 +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.NavigationModel"/>
-    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSNavigationModel"/>
-    <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.cms.dispatcher.SimpleXMLGenerator"/>
-
-
-    <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.CustomizableGreetingItem"/>
-        <jsp:scriptlet>
-            ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciDepartment",
-                             SimpleXMLGenerator.ADAPTER_CONTEXT);
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties();
-        </jsp:scriptlet>
-
-        <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="assignedTerms"
-                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
-
-    </define:page>
-
-    <show:all/>
-
-
-</jsp:root>
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/packages/navigation/templates/SciDepartmentFinishedProjects.jsp b/ccm-sci-bundle/web/packages/navigation/templates/SciDepartmentFinishedProjects.jsp
deleted file mode 100644
index b6c5815fa..000000000
--- a/ccm-sci-bundle/web/packages/navigation/templates/SciDepartmentFinishedProjects.jsp
+++ /dev/null
@@ -1,60 +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.NavigationModel"/>
-    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSNavigationModel"/>
-    <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.cms.dispatcher.SimpleXMLGenerator"/>
-
-
-    <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.CustomizableGreetingItem"/>
-        <jsp:scriptlet><![CDATA[
-            ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciDepartment",
-                             SimpleXMLGenerator.ADAPTER_CONTEXT);
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/departmentDescription");
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties();
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/projects");
-
-        java.util.Calendar today = new java.util.GregorianCalendar();
-        String todayDate = String.format("%d-%2d-%2d", today.get(java.util.Calendar.YEAR),
-                                                today.get(java.util.Calendar.MONTH) + 1,
-                                                today.get(java.util.Calendar.DAY_OF_MONTH));
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).addFilter("projectend <= '" + todayDate + "'");
-
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
-        ]]></jsp:scriptlet>
-
-        <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="assignedTerms"
-                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
-
-    </define:page>
-
-    <show:all/>
-
-
-</jsp:root>
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/packages/navigation/templates/SciDepartmentFormerMembers.jsp b/ccm-sci-bundle/web/packages/navigation/templates/SciDepartmentFormerMembers.jsp
deleted file mode 100644
index 706a76a3a..000000000
--- a/ccm-sci-bundle/web/packages/navigation/templates/SciDepartmentFormerMembers.jsp
+++ /dev/null
@@ -1,56 +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.NavigationModel"/>
-    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSNavigationModel"/>
-    <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.cms.dispatcher.SimpleXMLGenerator"/>
-
-
-    <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.CustomizableGreetingItem"/>
-        <jsp:scriptlet>
-            ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciDepartment",
-                             SimpleXMLGenerator.ADAPTER_CONTEXT);
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/departmentDescription");
-        ((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).addFilter("formerMember = true");
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setOrder("surname asc, givenname asc");
-
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
-        </jsp:scriptlet>
-
-        <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="assignedTerms"
-                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
-
-    </define:page>
-
-    <show:all/>
-
-
-</jsp:root>
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/packages/navigation/templates/SciDepartmentMembers.jsp b/ccm-sci-bundle/web/packages/navigation/templates/SciDepartmentMembers.jsp
deleted file mode 100644
index 87af629b7..000000000
--- a/ccm-sci-bundle/web/packages/navigation/templates/SciDepartmentMembers.jsp
+++ /dev/null
@@ -1,55 +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.NavigationModel"/>
-    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSNavigationModel"/>
-    <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.cms.dispatcher.SimpleXMLGenerator"/>
-
-
-    <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.CustomizableGreetingItem"/>
-        <jsp:scriptlet>
-            ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciDepartment",
-                             SimpleXMLGenerator.ADAPTER_CONTEXT);
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/departmentDescription");
-        ((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.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
-        </jsp:scriptlet>
-
-        <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="assignedTerms"
-                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
-
-    </define:page>
-
-    <show:all/>
-
-
-</jsp:root>
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/packages/navigation/templates/SciDepartmentOngoingProjects.jsp b/ccm-sci-bundle/web/packages/navigation/templates/SciDepartmentOngoingProjects.jsp
deleted file mode 100644
index e910d132d..000000000
--- a/ccm-sci-bundle/web/packages/navigation/templates/SciDepartmentOngoingProjects.jsp
+++ /dev/null
@@ -1,60 +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.NavigationModel"/>
-    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSNavigationModel"/>
-    <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.cms.dispatcher.SimpleXMLGenerator"/>
-
-
-    <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.CustomizableGreetingItem"/>
-        <jsp:scriptlet><![CDATA[
-            ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciDepartment",
-                             SimpleXMLGenerator.ADAPTER_CONTEXT);
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/departmentDescription");
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties();
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/projects");
-
-        java.util.Calendar today = new java.util.GregorianCalendar();
-        String todayDate = String.format("%d-%2d-%2d", today.get(java.util.Calendar.YEAR),
-                                                today.get(java.util.Calendar.MONTH) + 1,
-                                                today.get(java.util.Calendar.DAY_OF_MONTH));
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).addFilter("projectend > '" + todayDate + "'");
-
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
-        ]]></jsp:scriptlet>
-
-        <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="assignedTerms"
-                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
-
-    </define:page>
-
-    <show:all/>
-
-
-</jsp:root>
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/packages/navigation/templates/SciDepartmentProjects.jsp b/ccm-sci-bundle/web/packages/navigation/templates/SciDepartmentProjects.jsp
deleted file mode 100644
index 15b32d4c1..000000000
--- a/ccm-sci-bundle/web/packages/navigation/templates/SciDepartmentProjects.jsp
+++ /dev/null
@@ -1,54 +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.NavigationModel"/>
-    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSNavigationModel"/>
-    <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.cms.dispatcher.SimpleXMLGenerator"/>
-
-
-    <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.CustomizableGreetingItem"/>
-        <jsp:scriptlet>
-            ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciDepartment",
-                             SimpleXMLGenerator.ADAPTER_CONTEXT);
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/departmentDescription");
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties();
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/projects");
-
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
-        </jsp:scriptlet>
-
-        <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="assignedTerms"
-                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
-
-    </define:page>
-
-    <show:all/>
-
-
-</jsp:root>
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/packages/navigation/templates/SciDepartmentSubDepartments.jsp b/ccm-sci-bundle/web/packages/navigation/templates/SciDepartmentSubDepartments.jsp
deleted file mode 100644
index f4ee43330..000000000
--- a/ccm-sci-bundle/web/packages/navigation/templates/SciDepartmentSubDepartments.jsp
+++ /dev/null
@@ -1,54 +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.NavigationModel"/>
-    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSNavigationModel"/>
-    <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.cms.dispatcher.SimpleXMLGenerator"/>
-
-
-    <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.CustomizableGreetingItem"/>
-        <jsp:scriptlet>
-            ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciDepartment",
-                             SimpleXMLGenerator.ADAPTER_CONTEXT);
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/departmentDescription");
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties();
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/subDepartments");
-
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
-        </jsp:scriptlet>
-
-        <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="assignedTerms"
-                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
-
-    </define:page>
-
-    <show:all/>
-
-
-</jsp:root>
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/packages/navigation/templates/SciMember-index.jsp b/ccm-sci-bundle/web/packages/navigation/templates/SciMember-index.jsp
deleted file mode 100644
index 5fb8f9004..000000000
--- a/ccm-sci-bundle/web/packages/navigation/templates/SciMember-index.jsp
+++ /dev/null
@@ -1,70 +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="defaultItemPage" application="navigation"
-                 title="Navigation" cache="false">
-
-        <define:component name="greetingItem"
-                          classname="com.arsdigita.london.navigation.ui.GreetingItem"/>
-        <define:component name="sectionXML"
-                          classname="com.arsdigita.cms.contenttypes.ui.SciMemberDemoPanel"/>
-
-        <jsp:scriptlet>
-        com.arsdigita.cms.ContentItem item = (com.arsdigita.cms.ContentItem)((com.arsdigita.london.navigation.ui.GreetingItem) greetingItem).getObject();
-        ((com.arsdigita.cms.contenttypes.ui.SciMemberDemoPanel) sectionXML).setContentItem(item);       
-        </jsp:scriptlet>
-
-        <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.cms.contenttypes.ui.SciMemberDemoPanel)sectionXML).setPageSize(20);
-
-      ((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( "definition");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "summary");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "lead");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "description");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "eventDate");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "startDate" );
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "endDate");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "newsDate");
-        </jsp:scriptlet>
-
-        <define:component name="assignedTerms"
-                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
-
-    </define:page>
-    <show:all/>
-    
-</jsp:root>
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/packages/navigation/templates/SciOrganization-index.jsp b/ccm-sci-bundle/web/packages/navigation/templates/SciOrganization-index.jsp
deleted file mode 100644
index 5aee1477f..000000000
--- a/ccm-sci-bundle/web/packages/navigation/templates/SciOrganization-index.jsp
+++ /dev/null
@@ -1,67 +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="defaultItemPage" application="navigation"
-    title="Navigation" cache="false">
-
-    <define:component name="greetingItem"
-      classname="com.arsdigita.london.navigation.ui.GreetingItem"/>
-    <define:component name="sectionXML"
-      classname="com.arsdigita.cms.contenttypes.ui.SciOrganizationWithPublicationsPanel"/>
-    <jsp:scriptlet>
-        com.arsdigita.cms.ContentItem item = (com.arsdigita.cms.ContentItem)((com.arsdigita.london.navigation.ui.GreetingItem) greetingItem).getObject();
-        ((com.arsdigita.cms.contenttypes.ui.SciOrganizationPanel) sectionXML).setContentItem(item);
-    </jsp:scriptlet>
-    <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.cms.contenttypes.ui.SciOrganizationPanel)sectionXML).setPageSize(30);
-
-      ((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( "definition");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "summary");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "lead");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "description");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "eventDate");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "startDate" );
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "endDate");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "newsDate");
-    </jsp:scriptlet>
-
-    <define:component name="assignedTerms"
-         classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
-
-  </define:page>
-  <show:all/>
-</jsp:root>
-
diff --git a/ccm-sci-bundle/web/packages/navigation/templates/SciOrganizationActiveMembers.jsp b/ccm-sci-bundle/web/packages/navigation/templates/SciOrganizationActiveMembers.jsp
deleted file mode 100644
index f94befbc7..000000000
--- a/ccm-sci-bundle/web/packages/navigation/templates/SciOrganizationActiveMembers.jsp
+++ /dev/null
@@ -1,58 +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.NavigationModel"/>
-    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSNavigationModel"/>
-    <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.cms.dispatcher.SimpleXMLGenerator"/>
-
-
-    <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.CustomizableGreetingItem"/>
-        <jsp:scriptlet>
-            ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciOrganization",
-                             SimpleXMLGenerator.ADAPTER_CONTEXT);
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/organizationDescription");
-        ((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).getTraversalAdapter().addAssociationProperty("/object/departments/persons");
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).addFilter("formerMember != true");
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).addFilter("associatedMember != true");
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setOrder("surname asc, givenname asc");
-
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
-        </jsp:scriptlet>
-
-        <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="assignedTerms"
-                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
-
-    </define:page>
-
-    <show:all/>
-
-
-</jsp:root>
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/packages/navigation/templates/SciOrganizationAssociatedMembers.jsp b/ccm-sci-bundle/web/packages/navigation/templates/SciOrganizationAssociatedMembers.jsp
deleted file mode 100644
index 6041bad0d..000000000
--- a/ccm-sci-bundle/web/packages/navigation/templates/SciOrganizationAssociatedMembers.jsp
+++ /dev/null
@@ -1,58 +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.NavigationModel"/>
-    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSNavigationModel"/>
-    <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.cms.dispatcher.SimpleXMLGenerator"/>
-
-
-    <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.CustomizableGreetingItem"/>
-        <jsp:scriptlet>
-            ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciOrganization",
-                             SimpleXMLGenerator.ADAPTER_CONTEXT);
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/organizationDescription");
-        ((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).getTraversalAdapter().addAssociationProperty("/object/departments/persons");
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).addFilter("formerMember != true");
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).addFilter("associatedMember = true");
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setOrder("surname asc, givenname asc");
-
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
-        </jsp:scriptlet>
-
-        <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="assignedTerms"
-                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
-
-    </define:page>
-
-    <show:all/>
-
-
-</jsp:root>
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/packages/navigation/templates/SciOrganizationDepartments.jsp b/ccm-sci-bundle/web/packages/navigation/templates/SciOrganizationDepartments.jsp
deleted file mode 100644
index 7ff218392..000000000
--- a/ccm-sci-bundle/web/packages/navigation/templates/SciOrganizationDepartments.jsp
+++ /dev/null
@@ -1,54 +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.NavigationModel"/>
-    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSNavigationModel"/>
-    <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.cms.dispatcher.SimpleXMLGenerator"/>
-
-
-    <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.CustomizableGreetingItem"/>
-        <jsp:scriptlet>
-            ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciOrganization",
-                             SimpleXMLGenerator.ADAPTER_CONTEXT);
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/organizationDescription");
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties();
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/departments");        
-
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
-        </jsp:scriptlet>
-
-        <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="assignedTerms"
-                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
-
-    </define:page>
-
-    <show:all/>
-
-
-</jsp:root>
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/packages/navigation/templates/SciOrganizationDescription.jsp b/ccm-sci-bundle/web/packages/navigation/templates/SciOrganizationDescription.jsp
deleted file mode 100644
index 9fcaecf02..000000000
--- a/ccm-sci-bundle/web/packages/navigation/templates/SciOrganizationDescription.jsp
+++ /dev/null
@@ -1,50 +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.NavigationModel"/>
-    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSNavigationModel"/>
-    <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.cms.dispatcher.SimpleXMLGenerator"/>
-
-
-    <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.CustomizableGreetingItem"/>
-        <jsp:scriptlet>
-            ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciOrganization",
-                             SimpleXMLGenerator.ADAPTER_CONTEXT);
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties();        
-        </jsp:scriptlet>
-
-        <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="assignedTerms"
-                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
-
-    </define:page>
-
-    <show:all/>
-
-
-</jsp:root>
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/packages/navigation/templates/SciOrganizationFinishedProjects.jsp b/ccm-sci-bundle/web/packages/navigation/templates/SciOrganizationFinishedProjects.jsp
deleted file mode 100644
index c31ed85e1..000000000
--- a/ccm-sci-bundle/web/packages/navigation/templates/SciOrganizationFinishedProjects.jsp
+++ /dev/null
@@ -1,61 +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.NavigationModel"/>
-    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSNavigationModel"/>
-    <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.cms.dispatcher.SimpleXMLGenerator"/>
-
-
-    <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.CustomizableGreetingItem"/>
-        <jsp:scriptlet><![CDATA[
-            ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciOrganization",
-                             SimpleXMLGenerator.ADAPTER_CONTEXT);
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/organizationDescription");
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties();
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/projects");
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/departments/projects");
-
-        java.util.Calendar today = new java.util.GregorianCalendar();
-        String todayDate = String.format("%d-%2d-%2d", today.get(java.util.Calendar.YEAR),
-                                                today.get(java.util.Calendar.MONTH) + 1,
-                                                today.get(java.util.Calendar.DAY_OF_MONTH));
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).addFilter("projectend <= '" + todayDate + "'");
-
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
-        ]]></jsp:scriptlet>
-
-        <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="assignedTerms"
-                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
-
-    </define:page>
-
-    <show:all/>
-
-
-</jsp:root>
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/packages/navigation/templates/SciOrganizationFormerMembers.jsp b/ccm-sci-bundle/web/packages/navigation/templates/SciOrganizationFormerMembers.jsp
deleted file mode 100644
index 3e702b584..000000000
--- a/ccm-sci-bundle/web/packages/navigation/templates/SciOrganizationFormerMembers.jsp
+++ /dev/null
@@ -1,57 +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.NavigationModel"/>
-    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSNavigationModel"/>
-    <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.cms.dispatcher.SimpleXMLGenerator"/>
-
-
-    <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.CustomizableGreetingItem"/>
-        <jsp:scriptlet>
-            ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciOrganization",
-                             SimpleXMLGenerator.ADAPTER_CONTEXT);
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/organizationDescription");
-        ((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).getTraversalAdapter().addAssociationProperty("/object/departments/persons");
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).addFilter("formerMember = true");
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setOrder("surname asc, givenname asc");
-
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
-        </jsp:scriptlet>
-
-        <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="assignedTerms"
-                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
-
-    </define:page>
-
-    <show:all/>
-
-
-</jsp:root>
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/packages/navigation/templates/SciOrganizationMembers.jsp b/ccm-sci-bundle/web/packages/navigation/templates/SciOrganizationMembers.jsp
deleted file mode 100644
index 0289f84c1..000000000
--- a/ccm-sci-bundle/web/packages/navigation/templates/SciOrganizationMembers.jsp
+++ /dev/null
@@ -1,56 +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.NavigationModel"/>
-    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSNavigationModel"/>
-    <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.cms.dispatcher.SimpleXMLGenerator"/>
-
-
-    <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.CustomizableGreetingItem"/>
-        <jsp:scriptlet>
-            ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciOrganization",
-                             SimpleXMLGenerator.ADAPTER_CONTEXT);
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/organizationDescription");
-        ((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).getTraversalAdapter().addAssociationProperty("/object/departments/persons");
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setOrder("surname asc, givenname asc");
-
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
-        </jsp:scriptlet>
-
-        <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="assignedTerms"
-                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
-
-    </define:page>
-
-    <show:all/>
-
-
-</jsp:root>
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/packages/navigation/templates/SciOrganizationOngoingProjects.jsp b/ccm-sci-bundle/web/packages/navigation/templates/SciOrganizationOngoingProjects.jsp
deleted file mode 100644
index 5b2f64a9d..000000000
--- a/ccm-sci-bundle/web/packages/navigation/templates/SciOrganizationOngoingProjects.jsp
+++ /dev/null
@@ -1,61 +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.NavigationModel"/>
-    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSNavigationModel"/>
-    <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.cms.dispatcher.SimpleXMLGenerator"/>
-
-
-    <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.CustomizableGreetingItem"/>
-        <jsp:scriptlet><![CDATA[
-            ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciOrganization",
-                             SimpleXMLGenerator.ADAPTER_CONTEXT);
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/organizationDescription");
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties();
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/projects");
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/departments/projects");
-        
-        java.util.Calendar today = new java.util.GregorianCalendar();
-        String todayDate = String.format("%d-%2d-%2d", today.get(java.util.Calendar.YEAR),
-                                                today.get(java.util.Calendar.MONTH) + 1,
-                                                today.get(java.util.Calendar.DAY_OF_MONTH));
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).addFilter("projectend > '" + todayDate + "'");
-
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
-        ]]></jsp:scriptlet>
-
-        <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="assignedTerms"
-                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
-
-    </define:page>
-
-    <show:all/>
-
-
-</jsp:root>
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/packages/navigation/templates/SciOrganizationProjects.jsp b/ccm-sci-bundle/web/packages/navigation/templates/SciOrganizationProjects.jsp
deleted file mode 100644
index 286fb0f0a..000000000
--- a/ccm-sci-bundle/web/packages/navigation/templates/SciOrganizationProjects.jsp
+++ /dev/null
@@ -1,56 +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.NavigationModel"/>
-    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSNavigationModel"/>
-    <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.cms.dispatcher.SimpleXMLGenerator"/>
-
-
-    <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.CustomizableGreetingItem"/>
-        <jsp:scriptlet>
-            ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciOrganization",
-                             SimpleXMLGenerator.ADAPTER_CONTEXT);
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/organizationDescription");
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties();
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/projects");
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/departments/projects");
-
-
-        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
-        </jsp:scriptlet>
-
-        <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="assignedTerms"
-                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
-
-    </define:page>
-
-    <show:all/>
-
-
-</jsp:root>
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/packages/navigation/templates/SciProjectList.jsp b/ccm-sci-bundle/web/packages/navigation/templates/SciProjectList.jsp
deleted file mode 100644
index ccb76568a..000000000
--- a/ccm-sci-bundle/web/packages/navigation/templates/SciProjectList.jsp
+++ /dev/null
@@ -1,67 +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:directive.page import="com.arsdigita.london.navigation.ui.object.CustomizableObjectList"/>
-    <jsp:directive.page import="com.arsdigita.london.navigation.ui.object.CompareFilter"/>
-
-    <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="false">
-        <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.CustomizableObjectList"/>
-
-      <jsp:scriptlet>
-      CustomizableObjectList objList = (CustomizableObjectList) itemList;
-      objList.setDefinition(new CMSDataCollectionDefinition());
-      objList.setRenderer(new CMSDataCollectionRenderer());
-      objList.setCustomName("SciProjectList");
-      objList.getDefinition().setObjectType("com.arsdigita.cms.contenttypes.SciProject");
-      objList.getDefinition().setDescendCategories(false);
-      objList.addTextFilter("title", "title");
-
-      java.util.GregorianCalendar now = new java.util.GregorianCalendar();
-      String today = String.format("%d-%02d-%02d", now.get(java.util.GregorianCalendar.YEAR),
-                                                   now.get(java.util.GregorianCalendar.MONTH) + 1,
-                                                   now.get(java.util.GregorianCalendar.DATE));
-
-      objList.addCompareFilter("projectend", "projectstatus", true, true, false)
-        .addOption("ongoing", CompareFilter.Operators.GTEQ, today, true)
-        .addOption("finished", CompareFilter.Operators.LT, today, false);
-      objList.addSortField("title", "title asc");      
-      objList.getDefinition().addOrder(objList.getOrder(request.getParameter("sort")));
-
-      objList.getRenderer().setPageSize(20);
-      objList.getRenderer().setSpecializeObjects(true);
-      objList.getRenderer().setSpecializeObjectsContext("sciProjectList");
-
-      </jsp:scriptlet>
-
-      <define:component name="assignedTerms"
-                        classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
-
-    </define:page>
-    <show:all/>
-
-</jsp:root>
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/packages/navigation/templates/mparticle-index.jsp b/ccm-sci-bundle/web/packages/navigation/templates/mparticle-index.jsp
deleted file mode 100644
index 70e1e089a..000000000
--- a/ccm-sci-bundle/web/packages/navigation/templates/mparticle-index.jsp
+++ /dev/null
@@ -1,65 +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="defaultItemPage" application="navigation"
-    title="Navigation" cache="true">
-
-    <define:component name="greetingItem"
-      classname="com.arsdigita.london.navigation.ui.GreetingItem"/>
-    <define:component name="sectionXML"
-      classname="com.arsdigita.cms.contenttypes.ui.mparticle.ArticleSectionPanel"/>
-    <jsp:scriptlet>
-        com.arsdigita.cms.ContentItem item = (com.arsdigita.cms.ContentItem)((com.arsdigita.london.navigation.ui.GreetingItem) greetingItem).getObject();
-        ((com.arsdigita.cms.contenttypes.ui.mparticle.ArticleSectionPanel) sectionXML).setContentItem(item);
-    </jsp:scriptlet>
-    <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("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( "definition");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "summary");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "lead");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "description");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "eventDate");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "startDate" );
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "endDate");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "newsDate");
-    </jsp:scriptlet>
-
-    <define:component name="assignedTerms"
-         classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
-
-  </define:page>
-  <show:all/>
-</jsp:root>
-
diff --git a/ccm-sci-bundle/web/templates/ccm-ldn-navigation/navigation/Sci-README b/ccm-sci-bundle/web/templates/ccm-ldn-navigation/navigation/Sci-README
new file mode 100644
index 000000000..034e7065c
--- /dev/null
+++ b/ccm-sci-bundle/web/templates/ccm-ldn-navigation/navigation/Sci-README
@@ -0,0 +1,9 @@
+Information for administrators and developers:
+
+This directory contains Navigation item pages specifically crafted for 
+Scientific CMS. The are activated by a customized template.txt file list.
+
+These file may be overwritten or ammended by site specific templates stored
+in den bundles subdirectory. In case of additional templates a customised
+template.txt must be provided and activated in the integrations.properties
+configuration file.  
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/packages/navigation/templates/SciPublicationList.jsp b/ccm-sci-bundle/web/templates/ccm-ldn-navigation/navigation/SciPublicationList.jsp
similarity index 100%
rename from ccm-sci-bundle/web/packages/navigation/templates/SciPublicationList.jsp
rename to ccm-sci-bundle/web/templates/ccm-ldn-navigation/navigation/SciPublicationList.jsp
diff --git a/ccm-sci-bundle/web/packages/navigation/templates/SpecializingList.jsp b/ccm-sci-bundle/web/templates/ccm-ldn-navigation/navigation/SpecializingList.jsp
similarity index 100%
rename from ccm-sci-bundle/web/packages/navigation/templates/SpecializingList.jsp
rename to ccm-sci-bundle/web/templates/ccm-ldn-navigation/navigation/SpecializingList.jsp
diff --git a/ccm-sci-bundle/web/packages/navigation/templates/zes-atoz.jsp b/ccm-sci-bundle/web/templates/ccm-ldn-navigation/navigation/sci-atoz.jsp
similarity index 100%
rename from ccm-sci-bundle/web/packages/navigation/templates/zes-atoz.jsp
rename to ccm-sci-bundle/web/templates/ccm-ldn-navigation/navigation/sci-atoz.jsp
diff --git a/ccm-sci-bundle/web/packages/navigation/templates/zes-default.jsp b/ccm-sci-bundle/web/templates/ccm-ldn-navigation/navigation/sci-default.jsp
similarity index 100%
rename from ccm-sci-bundle/web/packages/navigation/templates/zes-default.jsp
rename to ccm-sci-bundle/web/templates/ccm-ldn-navigation/navigation/sci-default.jsp
diff --git a/ccm-sci-bundle/web/packages/navigation/templates/zes-events.jsp b/ccm-sci-bundle/web/templates/ccm-ldn-navigation/navigation/sci-events.jsp
similarity index 100%
rename from ccm-sci-bundle/web/packages/navigation/templates/zes-events.jsp
rename to ccm-sci-bundle/web/templates/ccm-ldn-navigation/navigation/sci-events.jsp
diff --git a/ccm-sci-bundle/web/packages/navigation/templates/zes-portal.jsp b/ccm-sci-bundle/web/templates/ccm-ldn-navigation/navigation/sci-portal-welcome.jsp
similarity index 100%
rename from ccm-sci-bundle/web/packages/navigation/templates/zes-portal.jsp
rename to ccm-sci-bundle/web/templates/ccm-ldn-navigation/navigation/sci-portal-welcome.jsp
diff --git a/ccm-sci-bundle/web/packages/navigation/templates/zes-welcome-portal.jsp b/ccm-sci-bundle/web/templates/ccm-ldn-navigation/navigation/sci-portal.jsp
similarity index 100%
rename from ccm-sci-bundle/web/packages/navigation/templates/zes-welcome-portal.jsp
rename to ccm-sci-bundle/web/templates/ccm-ldn-navigation/navigation/sci-portal.jsp
diff --git a/ccm-sci-bundle/web/packages/navigation/templates/zes-recent.jsp b/ccm-sci-bundle/web/templates/ccm-ldn-navigation/navigation/sci-recent.jsp
similarity index 100%
rename from ccm-sci-bundle/web/packages/navigation/templates/zes-recent.jsp
rename to ccm-sci-bundle/web/templates/ccm-ldn-navigation/navigation/sci-recent.jsp
diff --git a/ccm-sci-bundle/web/packages/navigation/templates/zes-welcome.jsp b/ccm-sci-bundle/web/templates/ccm-ldn-navigation/navigation/sci-welcome.jsp
similarity index 100%
rename from ccm-sci-bundle/web/packages/navigation/templates/zes-welcome.jsp
rename to ccm-sci-bundle/web/templates/ccm-ldn-navigation/navigation/sci-welcome.jsp