diff --git a/ccm-atoz-siteproxy/sql/ccm-atoz-siteproxy/upgrade/6.6.1-6.6.2/add_siteproxyprovider_inits.sql b/ccm-atoz-siteproxy/sql/ccm-atoz-siteproxy/upgrade/6.6.1-6.6.2/add_siteproxyprovider_inits.sql
new file mode 100644
index 000000000..525fbe0d4
--- /dev/null
+++ b/ccm-atoz-siteproxy/sql/ccm-atoz-siteproxy/upgrade/6.6.1-6.6.2/add_siteproxyprovider_inits.sql
@@ -0,0 +1,36 @@
+--
+-- Copyright (C) 2012 Peter Boy All Rights Reserved.
+--
+-- This library is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU Lesser General Public License
+-- as published by the Free Software Foundation; either version 2.1 of
+-- the License, or (at your option) any later version.
+--
+-- This library is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+-- Lesser General Public License for more details.
+--
+-- You should have received a copy of the GNU Lesser General Public
+-- License along with this library; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+--
+-- $Id: add_siteproxyprovider_inits.sql pboy $
+
+-- With this update the package ccm-atoz has been divided into a vore atoz
+-- package and optional extensions, e.g. this siteproxy extension.
+-- Therefore, in an update situation where atoz is already installed, all
+-- tables exists and we must just added Initializer to the startup.
+
+
+INSERT INTO inits (class_name) 
+       VALUES ('com.arsdigita.atoz.siteproxy.Initializer') ;
+
+INSERT INTO init_requirements (required_init, init) 
+       VALUES ('com.arsdigita.atoz.Initializer',
+               'com.arsdigita.atoz.siteproxy.Initializer') ;
+
+INSERT INTO init_requirements (required_init, init) 
+       VALUES ('com.arsdigita.core.Initializer',
+               'com.arsdigita.atoz.siteproxy.Initializer') ;
+
diff --git a/ccm-atoz-siteproxy/sql/ccm-atoz-siteproxy/upgrade/oracle-se-6.6.1-6.6.2.sql b/ccm-atoz-siteproxy/sql/ccm-atoz-siteproxy/upgrade/oracle-se-6.6.1-6.6.2.sql
new file mode 100644
index 000000000..18eb03b84
--- /dev/null
+++ b/ccm-atoz-siteproxy/sql/ccm-atoz-siteproxy/upgrade/oracle-se-6.6.1-6.6.2.sql
@@ -0,0 +1,26 @@
+--
+-- Copyright (C) 2012 Peter Boy. All Rights Reserved.
+--
+-- This library is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU Lesser General Public License
+-- as published by the Free Software Foundation; either version 2.1 of
+-- the License, or (at your option) any later version.
+--
+-- This library is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+-- Lesser General Public License for more details.
+--
+-- You should have received a copy of the GNU Lesser General Public
+-- License along with this library; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+--
+-- $Id: oracle-se-6.6.1-6.6.2.sql  $
+
+-- With this update the package ccm-atoz has been divided into a vore atoz
+-- package and optional extensions, e.g. this siteproxy extension.
+-- Therefore, in an update situation where atoz is already installed, all
+-- tables exists and we must just added Initializer to the startup.
+
+@@ default/6.6.1-6.6.2/add_siteproxyprovider_inits.sql
+
diff --git a/ccm-atoz-siteproxy/sql/ccm-atoz-siteproxy/upgrade/postgres-6.6.1-6.6.2.sql b/ccm-atoz-siteproxy/sql/ccm-atoz-siteproxy/upgrade/postgres-6.6.1-6.6.2.sql
new file mode 100644
index 000000000..1c47f67f2
--- /dev/null
+++ b/ccm-atoz-siteproxy/sql/ccm-atoz-siteproxy/upgrade/postgres-6.6.1-6.6.2.sql
@@ -0,0 +1,30 @@
+--
+-- Copyright (C) 2012 Peter Boy. All Rights Reserved.
+--
+-- This library is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU Lesser General Public License
+-- as published by the Free Software Foundation; either version 2.1 of
+-- the License, or (at your option) any later version.
+--
+-- This library is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+-- Lesser General Public License for more details.
+--
+-- You should have received a copy of the GNU Lesser General Public
+-- License along with this library; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+--
+-- $Id: postgres-6.6.1-6.6.2.sql  $
+
+-- With this update the package ccm-atoz has been divided into a vore atoz
+-- package and optional extensions, e.g. this siteproxy extension.
+-- Therefore, in an update situation where atoz is already installed, all
+-- tables exists and we must just added Initializer to the startup.
+
+
+begin;
+
+\i default/6.6.1-6.6.2/add_siteproxyprovider_inits.sql
+
+commit;
diff --git a/ccm-atoz-siteproxy/src/ccm-atoz-siteproxy.upgrade b/ccm-atoz-siteproxy/src/ccm-atoz-siteproxy.upgrade
index e96ac28ef..75ea954d2 100755
--- a/ccm-atoz-siteproxy/src/ccm-atoz-siteproxy.upgrade
+++ b/ccm-atoz-siteproxy/src/ccm-atoz-siteproxy.upgrade
@@ -1,8 +1,6 @@
 <upgrade>
-<!--
-  <version from="x.y.z" to="x.y.a">
-    <!-- AtoZ SiteProxy ........                 -->
-    <script sql="ccm-atoz-siteproxy/upgrade/::database::-x.y.z-x.y.a.sql"/>
+  <version from="6.6.1" to="6.6.2">
+    <!-- AtoZ SiteProxy add inits after split from generic atoz package     -->
+    <script sql="ccm-atoz-siteproxy/upgrade/::database::-6.6.1-6.6.2.sql"/>
   </version>
--->
 </upgrade>
diff --git a/ccm-atoz-siteproxy/src/com/arsdigita/atoz/siteproxy/Initializer.java b/ccm-atoz-siteproxy/src/com/arsdigita/atoz/siteproxy/Initializer.java
index ea717799d..065476f2a 100644
--- a/ccm-atoz-siteproxy/src/com/arsdigita/atoz/siteproxy/Initializer.java
+++ b/ccm-atoz-siteproxy/src/com/arsdigita/atoz/siteproxy/Initializer.java
@@ -22,17 +22,34 @@ import com.arsdigita.atoz.AtoZ;
 import com.arsdigita.atoz.AtoZProviderType;
 import com.arsdigita.atoz.siteproxy.ui.admin.SiteProxyProviderAdmin;
 import com.arsdigita.atoz.siteproxy.ui.admin.SiteProxyProviderForm;
+import com.arsdigita.db.DbHelper;
 import com.arsdigita.domain.xml.TraversalHandler;
+import com.arsdigita.persistence.pdl.ManifestSource;
+import com.arsdigita.persistence.pdl.NameFilter;
 import com.arsdigita.runtime.CompoundInitializer;
 import com.arsdigita.runtime.DomainInitEvent;
+import com.arsdigita.runtime.PDLInitializer;
+import com.arsdigita.runtime.RuntimeConfig;
 import com.arsdigita.xml.XML;
 
 /**
- *
+ * Initializes the A-Z system siteproxy extension
  * @author pb
  */
 public class Initializer extends CompoundInitializer {
 
+    /**
+     * Constructor
+     */
+    public Initializer() {
+
+        final String url = RuntimeConfig.getConfig().getJDBCURL();
+        final int database = DbHelper.getDatabaseFromURL(url);
+
+        add(new PDLInitializer(new ManifestSource("ccm-atoz-siteproxy.pdl.mf",
+                new NameFilter(DbHelper.getDatabaseSuffix(database), "pdl"))));
+    }
+
     /**
      * 
      * @param evt 
diff --git a/ccm-atoz/doc/atoz-standalone/README b/ccm-atoz/doc/atoz-standalone/README
index 419e67274..5bd01c890 100644
--- a/ccm-atoz/doc/atoz-standalone/README
+++ b/ccm-atoz/doc/atoz-standalone/README
@@ -1,6 +1,9 @@
 Up to APLAWS version 1.0.4 atoz had been installed into its own
 application context: [webapps]/ccm-ldn-atoz.
 
+Up to that version the package was named ccm-ldn-atoz and has then renamed to
+ccm-atoz.
+
 Now it is installed inside the main APLAWS application context along
 with all other applications.
 
@@ -8,16 +11,16 @@ If shortcuts should be installed as its own web context again following
 modifications are necessary:
 1.  remove webapp="xxx" from application.xml
 2.  move the files in this dir to WEB-INF/
-3.  change src/com/ad/london/atoz/AtoZ.java 
+3.  change src/com/ad/atoz/AtoZ.java 
     method getServletContext() as back to "/files"
 4.  edit themes/.../xsl/index.xsl according the comment
-5.  edit in ccm-ldn-aplaws /web/themes/static/aplaws/atoz.xml
+5.  edit in ccm-aplaws /web/themes/static/aplaws/atoz.xml
     according to the comment
 
 
 Running it in its own webapplication context nevertheless is not suggestive.
 It needs several xsl files of the main application (esp. core) for basic
-operations, which hac been directly mapped from the main applications directory
+operations, which has been directly mapped from the main applications directory
 tree into its own directory tree. So no module separation is possible, no
 security context useable etc.
 
diff --git a/ccm-atoz/doc/atoz-standalone/web.xml b/ccm-atoz/doc/atoz-standalone/web.xml
index b2abd7395..96f748007 100755
--- a/ccm-atoz/doc/atoz-standalone/web.xml
+++ b/ccm-atoz/doc/atoz-standalone/web.xml
@@ -9,7 +9,7 @@
     <servlet-class>com.arsdigita.web.ContextRegistrationServlet</servlet-class>
     <init-param>
       <param-name>uri</param-name>
-      <param-value>/ccm-ldn-atoz/</param-value>
+      <param-value>/ccm-atoz/</param-value>
     </init-param>
     <load-on-startup>1</load-on-startup>
   </servlet>
@@ -19,7 +19,7 @@
     <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
     <init-param>
       <param-name>template-path</param-name>
-      <param-value>/templates/ccm-ldn-atoz</param-value>
+      <param-value>/templates/ccm-atoz</param-value>
     </init-param>
   </servlet>
 
diff --git a/ccm-atoz/doc/atoz.xsd b/ccm-atoz/doc/atoz.xsd
index 4ca2a6702..f1b7f73a1 100755
--- a/ccm-atoz/doc/atoz.xsd
+++ b/ccm-atoz/doc/atoz.xsd
@@ -14,7 +14,7 @@
       </xs:documentation>
 
       <xs:appinfo>
-        <gen:class>com.arsdigita.london.atoz.ui.AtoZPane</gen:class>
+        <gen:class>com.arsdigita.atoz.ui.AtoZPane</gen:class>
       </xs:appinfo>
     </xs:annotation>
 
diff --git a/ccm-atoz/pdl/com/arsdigita/atoz/AtoZ.pdl b/ccm-atoz/pdl/com/arsdigita/atoz/AtoZ.pdl
index 05be617c5..c9090c89d 100755
--- a/ccm-atoz/pdl/com/arsdigita/atoz/AtoZ.pdl
+++ b/ccm-atoz/pdl/com/arsdigita/atoz/AtoZ.pdl
@@ -20,5 +20,8 @@ model com.arsdigita.atoz;
 import com.arsdigita.web.Application;
 
 object type AtoZ extends Application {
-    reference key (atoz_app.application_id);
+ // Nothing to persist yet
+    // there is only one instance of AtoZ and
+    // no instance specific settings about to be persisted.
+ // reference key (atoz_app.application_id);
 }
diff --git a/ccm-atoz/sql/ccm-atoz/upgrade/default/6.6.1-6.6.2/drop_app_table.sql b/ccm-atoz/sql/ccm-atoz/upgrade/default/6.6.1-6.6.2/drop_app_table.sql
new file mode 100644
index 000000000..842fe6f04
--- /dev/null
+++ b/ccm-atoz/sql/ccm-atoz/upgrade/default/6.6.1-6.6.2/drop_app_table.sql
@@ -0,0 +1,23 @@
+--
+-- Copyright (C) 2012 Peter Boy All Rights Reserved.
+--
+-- This library is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU Lesser General Public License
+-- as published by the Free Software Foundation; either version 2.1 of
+-- the License, or (at your option) any later version.
+--
+-- This library is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+-- Lesser General Public License for more details.
+--
+-- You should have received a copy of the GNU Lesser General Public
+-- License along with this library; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+--
+-- $Id: drop_app_table.sql pboy $
+
+-- drops table atoz_app which just contained application type id and is
+-- never used for any action. 
+
+drop table atoz_app ;
diff --git a/ccm-atoz/sql/ccm-atoz/upgrade/default/6.6.1-6.6.2/ren_domainprovider_table.sql b/ccm-atoz/sql/ccm-atoz/upgrade/default/6.6.1-6.6.2/ren_domainprovider_table.sql
new file mode 100644
index 000000000..6f825eb8c
--- /dev/null
+++ b/ccm-atoz/sql/ccm-atoz/upgrade/default/6.6.1-6.6.2/ren_domainprovider_table.sql
@@ -0,0 +1,42 @@
+--
+-- Copyright (C) 2011 Peter Boy All Rights Reserved.
+--
+-- This library is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU Lesser General Public License
+-- as published by the Free Software Foundation; either version 2.1 of
+-- the License, or (at your option) any later version.
+--
+-- This library is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+-- Lesser General Public License for more details.
+--
+-- You should have received a copy of the GNU Lesser General Public
+-- License along with this library; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+--
+-- $Id: ren_domainprovider_table.sql pboy $
+
+-- rename table trm_atoz_providers to atoz_trm_providers following
+-- ccm naming conventions to make maintenance tasks easier
+
+
+alter table trm_atoz_providers drop constraint trm_ato_provi_provi_id_p_3qjph ; 
+alter table trm_atoz_providers drop constraint trm_ato_provi_provi_id_f_mibvl ; 
+alter table trm_atoz_providers drop constraint trm_ato_provide_domain_f_ee4ts ; 
+
+
+alter table trm_atoz_providers  RENAME TO atoz_trm_providers ;
+
+
+alter table atoz_trm_providers 
+      add constraint atoz_trm_provi_prov_id_p_ifmav PRIMARY KEY (provider_id) ;
+alter table atoz_trm_providers 
+      add constraint atoz_trm_provi_prov_id_f_yjmjc FOREIGN KEY (provider_id) 
+      REFERENCES atoz_provider (provider_id) MATCH SIMPLE
+      ON UPDATE NO ACTION ON DELETE NO ACTION;
+alter table atoz_trm_providers 
+      add constraint atoz_trm_provid_domain_f_9drhn FOREIGN KEY ("domain") 
+      REFERENCES trm_domains ("key") MATCH SIMPLE
+      ON UPDATE NO ACTION ON DELETE NO ACTION;
+
diff --git a/ccm-atoz/sql/ccm-atoz/upgrade/default/6.6.1-6.6.2/upd_system_tables.sql b/ccm-atoz/sql/ccm-atoz/upgrade/default/6.6.1-6.6.2/upd_system_tables.sql
new file mode 100644
index 000000000..7cd81d27c
--- /dev/null
+++ b/ccm-atoz/sql/ccm-atoz/upgrade/default/6.6.1-6.6.2/upd_system_tables.sql
@@ -0,0 +1,102 @@
+--
+-- Copyright (C) 2012 Peter Boy All Rights Reserved.
+--
+-- This library is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU Lesser General Public License
+-- as published by the Free Software Foundation; either version 2.1 of
+-- the License, or (at your option) any later version.
+--
+-- This library is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+-- Lesser General Public License for more details.
+--
+-- You should have received a copy of the GNU Lesser General Public
+-- License along with this library; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+--
+-- $Id: upd_system_tables.sql pboy $
+
+-- rename cm-ldn-atoz to ccm-atoz
+-- adjust various system tables to the new name of application
+
+alter table init_requirements drop constraint init_requirements_init_f_cmmdn ;
+alter table init_requirements drop constraint init_require_requ_init_f_i6rgg ;
+
+update inits
+   set class_name='com.arsdigita.atoz.Initializer'
+ where class_name='com.arsdigita.london.atoz.Initializer' ;
+
+update init_requirements
+   set init='com.arsdigita.atoz.Initializer'
+ where init='com.arsdigita.london.atoz.Initializer' ;
+
+update init_requirements
+   set required_init='com.arsdigita.atoz.Initializer'
+ where required_init='com.arsdigita.london.atoz.Initializer' ;
+
+ALTER TABLE init_requirements
+  ADD CONSTRAINT init_requirements_init_f_cmmdn FOREIGN KEY (init)
+      REFERENCES inits (class_name) MATCH SIMPLE
+      ON UPDATE NO ACTION ON DELETE NO ACTION;
+ALTER TABLE init_requirements
+  ADD CONSTRAINT init_require_requ_init_f_i6rgg FOREIGN KEY (required_init)
+      REFERENCES inits (class_name) MATCH SIMPLE
+      ON UPDATE NO ACTION ON DELETE NO ACTION;
+
+
+update application_types
+   set object_type=replace(object_type,'london.atoz.AtoZ','atoz.AtoZ')
+ where object_type like '%london.atoz.AtoZ%' ;
+
+-- table applications doesn't require an update
+-- update applications
+--    set       title='CCM Themes Administration',
+--          description='CCM themes administration'
+--  where   primary_url='/admin/themes/' ;
+
+-- table apm_package_types doesn't require an update
+-- table apm_packages doesn't require an update either
+-- table site_nodes doesn't require an update either
+
+
+-- update application type in acs_objects
+-- update acs_objects
+--     set (object_type,display_name,default_domain_class) =
+--             ('com.arsdigita.themedirector.ThemeDirector' ,
+--              'CCM Themes Administration',
+--              'com.arsdigita.themedirector.ThemeDirector' )
+--     where default_domain_class like 'com.arsdigita.london.theme.ThemeApplication' ;
+
+-- update atoz in acs_objects
+-- replace String london.atoz by atoz for all atoz.AtoZ*
+update acs_objects
+    set (object_type,default_domain_class) =
+            (replace(object_type,'london.atoz', 'atoz') ,
+             replace(default_domain_class,'london.atoz', 'atoz') )
+    where object_type like '%london.atoz.AtoZ%' ;
+-- rename AtoZItemProvider to ItemProvider
+update acs_objects
+    set (object_type,default_domain_class) =
+            (replace(object_type,'AtoZItemProvider', 'ItemProvider') ,
+             replace(default_domain_class,'AtoZItemProvider', 'ItemProvider') )
+    where object_type like '%AtoZItemProvider%' ;
+-- rename AtoZCategoryProvider to CategoryProvider
+update acs_objects
+    set (object_type,default_domain_class) =
+            (replace(object_type,'AtoZCategoryProvider', 'CategoryProvider') ,
+             replace(default_domain_class,'AtoZCategoryProvider', 'CategoryProvider') )
+    where object_type like '%AtoZCategoryProvider%' ;
+-- rename AtoZSiteProxyProvider to siteproxy.SiteProxyProvider
+update acs_objects
+    set (object_type,default_domain_class) =
+            (replace(object_type,'AtoZSiteProxyProvider', 'siteproxy.SiteProxyProvider') ,
+             replace(default_domain_class,'AtoZSiteProxyProvider', 'siteproxy.SiteProxyProvider') )
+    where object_type like '%AtoZSiteProxyProvider%' ;
+-- rename terms.DomainProvider to DomainProvider
+update acs_objects
+    set (object_type,default_domain_class) =
+            (replace(object_type,'terms.DomainProvider', 'DomainProvider') ,
+             replace(default_domain_class,'terms.DomainProvider', 'DomainProvider') )
+    where object_type like '%atoz.terms.DomainProvider%' ;
+
diff --git a/ccm-atoz/sql/ccm-atoz/upgrade/oracle-se-6.6.1-6.6.2.sql b/ccm-atoz/sql/ccm-atoz/upgrade/oracle-se-6.6.1-6.6.2.sql
new file mode 100644
index 000000000..2494b6f97
--- /dev/null
+++ b/ccm-atoz/sql/ccm-atoz/upgrade/oracle-se-6.6.1-6.6.2.sql
@@ -0,0 +1,28 @@
+--
+-- Copyright (C) 2012 Peter Boy. All Rights Reserved.
+--
+-- This library is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU Lesser General Public License
+-- as published by the Free Software Foundation; either version 2.1 of
+-- the License, or (at your option) any later version.
+--
+-- This library is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+-- Lesser General Public License for more details.
+--
+-- You should have received a copy of the GNU Lesser General Public
+-- License along with this library; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+--
+-- $Id: oracle-se-6.6.1-6.6.2.sql  $
+
+-- AtoZ has been renamed from ccm-ldn-atoz to  ccm-atoz and split up into
+-- separate packages for generic purposes (items and categories), 
+-- siteproxy support, and LAW specific terms and ESD services.
+
+-- NOTE: Order is significant
+@@ default/6.6.1-6.6.2/upd_system_tables.sql
+@@ default/6.6.1-6.6.2/drop_app_table.sql
+@@ default/6.6.1-6.6.2/ren_domainprovider_table.sql
+
diff --git a/ccm-atoz/sql/ccm-atoz/upgrade/postgres-6.6.1-6.6.2.sql b/ccm-atoz/sql/ccm-atoz/upgrade/postgres-6.6.1-6.6.2.sql
new file mode 100644
index 000000000..45ca210ba
--- /dev/null
+++ b/ccm-atoz/sql/ccm-atoz/upgrade/postgres-6.6.1-6.6.2.sql
@@ -0,0 +1,32 @@
+--
+-- Copyright (C) 2012 Peter Boy. All Rights Reserved.
+--
+-- This library is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU Lesser General Public License
+-- as published by the Free Software Foundation; either version 2.1 of
+-- the License, or (at your option) any later version.
+--
+-- This library is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+-- Lesser General Public License for more details.
+--
+-- You should have received a copy of the GNU Lesser General Public
+-- License along with this library; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+--
+-- $Id: postgres-6.6.1-6.6.2.sql  $
+
+-- AtoZ has been renamed from ccm-ldn-atoz to  ccm-atoz and split up into
+-- separate packages for generic purposes (items and categories), 
+-- siteproxy support, and LAW specific terms and ESD services.
+
+
+begin;
+
+-- NOTE: Order is significant
+\i default/6.6.1-6.6.2/upd_system_tables.sql
+\i default/6.6.1-6.6.2/drop_app_table.sql
+\i default/6.6.1-6.6.2/ren_domainprovider_table.sql
+
+commit;
diff --git a/ccm-atoz/src/ccm-atoz.upgrade b/ccm-atoz/src/ccm-atoz.upgrade
index 71f6dc794..260f08109 100755
--- a/ccm-atoz/src/ccm-atoz.upgrade
+++ b/ccm-atoz/src/ccm-atoz.upgrade
@@ -17,6 +17,6 @@
   </version>
   <version from="6.6.1" to="6.6.2">
     <!-- AtoZ renamed from ccm-ldn-atoz to ccm-atoz               -->
-    <script sql="ccm-atoz/upgrade/::database::-6.6.0-6.6.1.sql"/>
+    <script sql="ccm-atoz/upgrade/::database::-6.6.1-6.6.2.sql"/>
   </version>
 </upgrade>
diff --git a/ccm-atoz/src/com/arsdigita/atoz/AtoZ.java b/ccm-atoz/src/com/arsdigita/atoz/AtoZ.java
index 82b72fe16..d1cef54af 100755
--- a/ccm-atoz/src/com/arsdigita/atoz/AtoZ.java
+++ b/ccm-atoz/src/com/arsdigita/atoz/AtoZ.java
@@ -147,7 +147,7 @@ public class AtoZ extends Application {
 //   * web application context
 //   */
 //  public String getContextPath() {
-//      return "/ccm-ldn-atoz";
+//      return "/ccm-atoz";
 //  }
 
     /**
diff --git a/ccm-atoz/src/com/arsdigita/atoz/Initializer.java b/ccm-atoz/src/com/arsdigita/atoz/Initializer.java
index 5061dda73..590ecf7aa 100755
--- a/ccm-atoz/src/com/arsdigita/atoz/Initializer.java
+++ b/ccm-atoz/src/com/arsdigita/atoz/Initializer.java
@@ -50,6 +50,9 @@ import com.arsdigita.xml.XML;
  */
 public class Initializer extends CompoundInitializer {
 
+    /**
+     * Constructor
+     */
     public Initializer() {
 
         final String url = RuntimeConfig.getConfig().getJDBCURL();
diff --git a/ccm-atoz/src/com/arsdigita/atoz/tools/AtoZCreator.java b/ccm-atoz/src/com/arsdigita/atoz/tools/AtoZCreator.java
index 0784d4fb7..f61651d8c 100755
--- a/ccm-atoz/src/com/arsdigita/atoz/tools/AtoZCreator.java
+++ b/ccm-atoz/src/com/arsdigita/atoz/tools/AtoZCreator.java
@@ -24,9 +24,9 @@ import com.arsdigita.domain.DomainObjectFactory;
 import com.arsdigita.domain.DomainObjectInstantiator;
 import com.arsdigita.kernel.Kernel;
 import com.arsdigita.kernel.KernelExcursion;
-import com.arsdigita.london.util.Program;
 import com.arsdigita.london.util.Transaction;
 import com.arsdigita.persistence.DataObject;
+import com.arsdigita.util.cmd.Program;
 import com.arsdigita.web.Application;
 
 import org.apache.commons.cli.CommandLine;
diff --git a/ccm-atoz/web/templates/ccm-atoz/admin/load-cat.jsp b/ccm-atoz/web/templates/ccm-atoz/admin/load-cat.jsp
index 70ceb706a..03bc166ca 100644
--- a/ccm-atoz/web/templates/ccm-atoz/admin/load-cat.jsp
+++ b/ccm-atoz/web/templates/ccm-atoz/admin/load-cat.jsp
@@ -3,7 +3,10 @@
           xmlns:show="/WEB-INF/bebop-show.tld"
     version="1.2">
 
-  <define:page name="childCategories" pageClass="com.arsdigita.cms.ui.authoring.EmptyPage" title="childCategories" cache="true">
+  <define:page name="childCategories" 
+               pageClass="com.arsdigita.cms.ui.authoring.EmptyPage" 
+               title="childCategories" 
+               cache="true">
 
     <define:component name="catSubtree"
       classname="com.arsdigita.london.terms.ui.CategorySubtree"/>
diff --git a/ccm-ldn-atoz/application.xml b/ccm-ldn-atoz/application.xml
index 18fbaf154..a17b4731d 100755
--- a/ccm-ldn-atoz/application.xml
+++ b/ccm-ldn-atoz/application.xml
@@ -2,26 +2,34 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-ldn-atoz"
   prettyName="A-Z"
-  version="6.6.1"
+  version="6.6.2"
   release="1"
   webapp="ROOT">
 
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.6.0" relation="ge"/>
     <ccm:requires name="ccm-cms" version="6.6.0" relation="ge"/>
+    <ccm:requires name="ccm-atoz" version="6.6.0" relation="ge"/>
+    <!--
     <ccm:requires name="ccm-navigation" version="6.6.0" relation="ge"/>
     <ccm:requires name="ccm-subsite" version="6.6.0" relation="ge"/>
     <ccm:requires name="ccm-ldn-aplaws" version="6.6.0" relation="ge"/>
+    -->
     <ccm:requires name="ccm-ldn-terms" version="6.6.0" relation="ge"/>
     <ccm:requires name="ccm-ldn-util" version="6.6.0" relation="ge"/>
-    <ccm:requires name="ccm-cms-types-siteproxy" version="6.6.0" relation="ge"/>
   </ccm:dependencies>
+
   <ccm:contacts>
     <ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/>
     <ccm:contact uri="mailto:rhea@redhat.com" type="support"/>
   </ccm:contacts>
+
   <ccm:description>
-    The ccm-ldn-atoz package enables a site to present all it's content in 
+    The ccm-ldn-atoz package is an extension for the ccm-atoz package in
+    combination with the ccm-ldn-terms package. It enables the ccm-atoz package
+    to deal with LAW specific terms.
+    
+    The ccm-atoz package enables a site to present all it's content in 
     alphabetical order as an additional service to it's users. Usually the 
     theme provides a link to the page as part of its static elements. 
     
diff --git a/ccm-ldn-atoz/pdl/com/arsdigita/london/atoz/terms/DomainProvider.pdl b/ccm-ldn-atoz/pdl/com/arsdigita/london/atoz/DomainProvider.pdl
similarity index 86%
rename from ccm-ldn-atoz/pdl/com/arsdigita/london/atoz/terms/DomainProvider.pdl
rename to ccm-ldn-atoz/pdl/com/arsdigita/london/atoz/DomainProvider.pdl
index ac1cc55e6..86c1ea5d3 100755
--- a/ccm-ldn-atoz/pdl/com/arsdigita/london/atoz/terms/DomainProvider.pdl
+++ b/ccm-ldn-atoz/pdl/com/arsdigita/london/atoz/DomainProvider.pdl
@@ -15,14 +15,14 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-model com.arsdigita.london.atoz.terms;
+model com.arsdigita.london.atoz;
 
 import com.arsdigita.atoz.AtoZProvider;
 import com.arsdigita.london.terms.Domain;
 
 object type DomainProvider extends AtoZProvider {
-    Domain[1..1] domain = join trm_atoz_providers.domain to trm_domains.key;
+    Domain[1..1] domain = join atoz_trm_providers.domain to trm_domains.key;
 
-    reference key (trm_atoz_providers.provider_id);
+    reference key (atoz_trm_providers.provider_id);
 }
 
diff --git a/ccm-ldn-atoz/sql/ccm-ldn-atoz/oracle-se-create.sql b/ccm-ldn-atoz/sql/ccm-ldn-atoz/oracle-se-create.sql
new file mode 100755
index 000000000..c3961626c
--- /dev/null
+++ b/ccm-ldn-atoz/sql/ccm-ldn-atoz/oracle-se-create.sql
@@ -0,0 +1,3 @@
+@ ddl/oracle-se/create.sql
+@ ddl/oracle-se/deferred.sql
+
diff --git a/ccm-ldn-atoz/sql/ccm-ldn-atoz/postgres-create.sql b/ccm-ldn-atoz/sql/ccm-ldn-atoz/postgres-create.sql
new file mode 100755
index 000000000..38209a696
--- /dev/null
+++ b/ccm-ldn-atoz/sql/ccm-ldn-atoz/postgres-create.sql
@@ -0,0 +1,4 @@
+begin;
+\i ddl/postgres/create.sql
+\i ddl/postgres/deferred.sql
+end;
diff --git a/ccm-ldn-atoz/sql/ccm-ldn-atoz/upgrade/6.6.1-6.6.2/add_domainprovider_inits.sql b/ccm-ldn-atoz/sql/ccm-ldn-atoz/upgrade/6.6.1-6.6.2/add_domainprovider_inits.sql
new file mode 100644
index 000000000..09b6e1204
--- /dev/null
+++ b/ccm-ldn-atoz/sql/ccm-ldn-atoz/upgrade/6.6.1-6.6.2/add_domainprovider_inits.sql
@@ -0,0 +1,36 @@
+--
+-- Copyright (C) 2012 Peter Boy All Rights Reserved.
+--
+-- This library is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU Lesser General Public License
+-- as published by the Free Software Foundation; either version 2.1 of
+-- the License, or (at your option) any later version.
+--
+-- This library is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+-- Lesser General Public License for more details.
+--
+-- You should have received a copy of the GNU Lesser General Public
+-- License along with this library; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+--
+-- $Id: add_domainprovider_inits.sql pboy $
+
+-- With this update the package ccm-atoz has been divided into a generic atoz
+-- package and optional extensions, e.g. this ldn (terms ESD domains) extension.
+-- Therefore, in an update situation where atoz is already installed, all
+-- tables exists and we must just added Initializer to the startup.
+
+
+INSERT INTO inits (class_name) 
+       VALUES ('com.arsdigita.london.atoz.Initializer') ;
+
+INSERT INTO init_requirements (required_init, init) 
+       VALUES ('com.arsdigita.atoz.Initializer',
+               'com.arsdigita.london.atoz.Initializer') ;
+
+INSERT INTO init_requirements (required_init, init) 
+       VALUES ('com.arsdigita.core.Initializer',
+               'com.arsdigita.london.atoz.Initializer') ;
+
diff --git a/ccm-ldn-atoz/sql/ccm-ldn-atoz/upgrade/oracle-se-6.6.1-6.6.2.sql b/ccm-ldn-atoz/sql/ccm-ldn-atoz/upgrade/oracle-se-6.6.1-6.6.2.sql
new file mode 100644
index 000000000..a020a1573
--- /dev/null
+++ b/ccm-ldn-atoz/sql/ccm-ldn-atoz/upgrade/oracle-se-6.6.1-6.6.2.sql
@@ -0,0 +1,26 @@
+--
+-- Copyright (C) 2012 Peter Boy. All Rights Reserved.
+--
+-- This library is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU Lesser General Public License
+-- as published by the Free Software Foundation; either version 2.1 of
+-- the License, or (at your option) any later version.
+--
+-- This library is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+-- Lesser General Public License for more details.
+--
+-- You should have received a copy of the GNU Lesser General Public
+-- License along with this library; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+--
+-- $Id: oracle-se-6.6.1-6.6.2.sql  $
+
+-- With this update the package ccm-atoz has been divided into a generic atoz
+-- package and optional extensions, e.g. this ldn (terms ESD domains) extension.
+-- Therefore, in an update situation where atoz is already installed, all
+-- tables exists and we must just added Initializer to the startup.
+
+@@ default/6.6.1-6.6.2/add_domainprovider_inits.sql
+
diff --git a/ccm-ldn-atoz/sql/ccm-ldn-atoz/upgrade/postgres-6.6.1-6.6.2.sql b/ccm-ldn-atoz/sql/ccm-ldn-atoz/upgrade/postgres-6.6.1-6.6.2.sql
new file mode 100644
index 000000000..9cb2d645f
--- /dev/null
+++ b/ccm-ldn-atoz/sql/ccm-ldn-atoz/upgrade/postgres-6.6.1-6.6.2.sql
@@ -0,0 +1,30 @@
+--
+-- Copyright (C) 2012 Peter Boy. All Rights Reserved.
+--
+-- This library is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU Lesser General Public License
+-- as published by the Free Software Foundation; either version 2.1 of
+-- the License, or (at your option) any later version.
+--
+-- This library is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+-- Lesser General Public License for more details.
+--
+-- You should have received a copy of the GNU Lesser General Public
+-- License along with this library; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+--
+-- $Id: postgres-6.6.1-6.6.2.sql  $
+
+-- With this update the package ccm-atoz has been divided into a generic atoz
+-- package and optional extensions, e.g. this ldn (terms ESD domains) extension.
+-- Therefore, in an update situation where atoz is already installed, all
+-- tables exists and we must just added Initializer to the startup.
+
+
+begin;
+
+\i default/6.6.1-6.6.2/add_domainprovider_inits.sql
+
+commit;
diff --git a/ccm-ldn-atoz/src/WEB-INF/resources/atoz-ldn-domain-adapters.xml b/ccm-ldn-atoz/src/WEB-INF/resources/atoz-ldn-domain-adapters.xml
new file mode 100755
index 000000000..0a1f14701
--- /dev/null
+++ b/ccm-ldn-atoz/src/WEB-INF/resources/atoz-ldn-domain-adapters.xml
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<xrd:adapters xmlns:xrd="http://xmlns.redhat.com/schemas/waf/xml-renderer-rules"
+              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation="http://rhea.redhat.com/schemas/waf/xml-renderer-rules xml-renderer-rules.xsd">
+<!--
+  <xrd:context name="com.arsdigita.atoz.ui.admin.ProviderList">
+    <xrd:adapter objectType="com.arsdigita.atoz.AtoZProvider">
+      <xrd:attributes rule="exclude">
+        <xrd:property name="/object/id"/>
+        <xrd:property name="/object/defaultDomainClass"/>
+        <xrd:property name="/object/displayName"/>
+      </xrd:attributes>
+    </xrd:adapter>
+  </xrd:context>
+-->
+
+  <xrd:context name="com.arsdigita.atoz.ui.admin.ProviderDetails">
+<!--
+    <xrd:adapter objectType="com.arsdigita.atoz.CategoryProvider">
+      <xrd:attributes rule="exclude">
+        <xrd:property name="/object/id"/>
+        <xrd:property name="/object/defaultDomainClass"/>
+        <xrd:property name="/object/displayName"/>
+        <xrd:property name="/object/rootUseContext/id"/>
+        <xrd:property name="/object/rootUseContext/rootCategory/id"/>
+        <xrd:property name="/object/rootUseContext/rootCategory/objectType"/>
+        <xrd:property name="/object/rootUseContext/rootCategory/defaultDomainClass"/>
+        <xrd:property name="/object/rootUseContext/rootCategory/defaultAncestors"/>
+      </xrd:attributes>
+
+      <xrd:associations rule="include">
+        <xrd:property name="/object/rootUseContext"/>
+        <xrd:property name="/object/rootUseContext/rootCategory"/>
+      </xrd:associations>
+    </xrd:adapter>
+-->
+<!--
+-->
+    <xrd:adapter objectType="com.arsdigita.london.atoz.DomainProvider">
+      <xrd:attributes rule="exclude">
+        <xrd:property name="/object/id"/>
+        <xrd:property name="/object/defaultDomainClass"/>
+        <xrd:property name="/object/displayName"/>
+      </xrd:attributes>
+    </xrd:adapter>
+<!--
+    <xrd:adapter objectType="com.arsdigita.atoz.ItemProvider">
+      <xrd:attributes rule="exclude">
+        <xrd:property name="/object/id"/>
+        <xrd:property name="/object/defaultDomainClass"/>
+        <xrd:property name="/object/displayName"/>
+        <xrd:property name="/object/category/id"/>
+        <xrd:property name="/object/category/objectType"/>
+        <xrd:property name="/object/category/defaultDomainClass"/>
+        <xrd:property name="/object/category/defaultAncestors"/>
+      </xrd:attributes>
+      <xrd:associations rule="include">
+        <xrd:property name="/object/category"/>
+      </xrd:associations>
+    </xrd:adapter>
+-->
+ 
+<!--
+    <xrd:adapter objectType="com.arsdigita.atoz.siteproxy.SiteProxyProvider">
+      <xrd:attributes rule="exclude">
+        <xrd:property name="/object/id"/>
+        <xrd:property name="/object/defaultDomainClass"/>
+        <xrd:property name="/object/displayName"/>
+        <xrd:property name="/object/category/id"/>
+        <xrd:property name="/object/category/objectType"/>
+        <xrd:property name="/object/category/defaultDomainClass"/>
+        <xrd:property name="/object/category/defaultAncestors"/>
+      </xrd:attributes>
+      <xrd:associations rule="include">
+        <xrd:property name="/object/category"/>
+      </xrd:associations>
+    </xrd:adapter>
+-->
+     
+  </xrd:context>
+
+<!--
+  <xrd:context name="com.arsdigita.atoz.ui.admin.CategoryProviderBlackList">
+    <xrd:adapter objectType="com.arsdigita.categorization.Category">
+      <xrd:attributes rule="exclude">
+        <xrd:property name="/object/id"/>
+        <xrd:property name="/object/objectType"/>
+        <xrd:property name="/object/defaultDomainClass"/>
+        <xrd:property name="/object/displayName"/>
+      </xrd:attributes>
+    </xrd:adapter>
+  </xrd:context>
+
+  <xrd:context name="com.arsdigita.atoz.ui.admin.CategoryProviderContentTypeBlacklist">
+    <xrd:adapter objectType="com.arsdigita.cms.ContentType">
+      <xrd:attributes rule="exclude">
+        <xrd:property name="/object/id"/>
+        <xrd:property name="/object/objectType"/>
+        <xrd:property name="/object/defaultDomainClass"/>
+        <xrd:property name="/object/displayName"/>
+      </xrd:attributes>
+    </xrd:adapter>
+  </xrd:context>
+
+  <xrd:context name="com.arsdigita.atoz.ui.admin.CategoryProviderAliasList">
+    <xrd:adapter objectType="com.arsdigita.categorization.Category">
+      <xrd:attributes rule="exclude">
+        <xrd:property name="/object/id"/>
+        <xrd:property name="/object/objectType"/>
+        <xrd:property name="/object/defaultDomainClass"/>
+        <xrd:property name="/object/displayName"/>
+      </xrd:attributes>
+    </xrd:adapter>
+    
+    <xrd:adapter objectType="com.arsdigita.atoz.CategoryAlias">
+      <xrd:attributes rule="exclude">
+        <xrd:property name="/object/id"/>
+        <xrd:property name="/object/objectType"/>
+        <xrd:property name="/object/defaultDomainClass"/>
+        <xrd:property name="/object/displayName"/>
+      </xrd:attributes>
+    </xrd:adapter>
+  </xrd:context>
+-->
+<!--
+  <xrd:context name="com.arsdigita.atoz.ui.admin.ItemProviderAliasList">
+    <xrd:adapter objectType="com.arsdigita.cms.ContentItem">
+      <xrd:attributes rule="exclude">   -->
+      <!--
+        <xrd:property name="/object/id"/>
+        <xrd:property name="/object/objectType"/>
+        <xrd:property name="/object/defaultDomainClass"/>
+        <xrd:property name="/object/displayName"/>
+      -->
+<!--  </xrd:attributes>
+    </xrd:adapter>
+
+    <xrd:adapter objectType="com.arsdigita.atoz.ItemAlias">
+      <xrd:attributes rule="exclude">   -->
+      <!--
+        <xrd:property name="/object/id"/>
+        <xrd:property name="/object/objectType"/>
+        <xrd:property name="/object/defaultDomainClass"/>
+        <xrd:property name="/object/displayName"/>
+      -->
+<!--  </xrd:attributes>
+    </xrd:adapter>
+  </xrd:context>  -->
+
+</xrd:adapters>
diff --git a/ccm-ldn-atoz/src/ccm-ldn-atoz.config b/ccm-ldn-atoz/src/ccm-ldn-atoz.config
new file mode 100755
index 000000000..2f9ab64fa
--- /dev/null
+++ b/ccm-ldn-atoz/src/ccm-ldn-atoz.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<registry>
+   <config class="com.arsdigita.london.atoz.DomainConfig"
+           storage="ccm-atoz/termsdomain.properties"/>
+</registry>
diff --git a/ccm-ldn-atoz/src/ccm-ldn-atoz.load b/ccm-ldn-atoz/src/ccm-ldn-atoz.load
new file mode 100755
index 000000000..2c32b709c
--- /dev/null
+++ b/ccm-ldn-atoz/src/ccm-ldn-atoz.load
@@ -0,0 +1,22 @@
+<load>
+
+  <requires>
+    <table name="inits"/>
+    <table name="acs_objects"/>
+    <initializer class="com.arsdigita.core.Initializer"/>
+    <initializer class="com.arsdigita.atoz.Initializer"/>
+  </requires>
+
+  <provides>
+    <table name="atoz_trm_providers"/>
+    <initializer class="com.arsdigita.london.atoz.Initializer"/>
+  </provides>
+
+  <scripts>
+    <schema directory="ccm-ldn-atoz"/>
+<!--
+    <data class="com.arsdigita.london.atoz.Loader"/>
+-->
+  </scripts>
+
+</load>
diff --git a/ccm-ldn-atoz/src/ccm-ldn-atoz.upgrade b/ccm-ldn-atoz/src/ccm-ldn-atoz.upgrade
new file mode 100755
index 000000000..ea14a1f43
--- /dev/null
+++ b/ccm-ldn-atoz/src/ccm-ldn-atoz.upgrade
@@ -0,0 +1,6 @@
+<upgrade>
+  <version from="6.6.1" to="6.6.2">
+    <!-- AtoZ ldn-domain add inits after split from generic atoz package     -->
+    <script sql="ccm-ldn-atoz/upgrade/::database::-6.6.1-6.6.2.sql"/>
+  </version>
+</upgrade>
diff --git a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/DomainConfig.java b/ccm-ldn-atoz/src/com/arsdigita/london/atoz/DomainConfig.java
new file mode 100755
index 000000000..50ea2fc0c
--- /dev/null
+++ b/ccm-ldn-atoz/src/com/arsdigita/london/atoz/DomainConfig.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2001-2004 Red Hat Inc. All Rights Reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+package com.arsdigita.london.atoz;
+
+import com.arsdigita.runtime.AbstractConfig;
+import com.arsdigita.util.parameter.Parameter;
+import com.arsdigita.util.parameter.ResourceParameter;
+
+
+import java.io.InputStream;
+
+import org.apache.log4j.Logger;
+
+/**
+ *  This is the configuration file for the AtoZ application
+ */
+public class DomainConfig extends AbstractConfig {
+    
+    /** A logger instance to assist debugging.  */
+    private static final Logger s_log = Logger.getLogger(DomainConfig.class);
+
+    /** Singelton config object.  */
+    private static DomainConfig s_conf;
+
+    /**
+     * Gain a DomainConfig object.
+     *
+     * Singelton pattern, don't instantiate a config object using the
+     * constructor directly!
+     * @return
+     */
+    public static synchronized DomainConfig getConfig() {
+        if (s_conf == null) {
+            s_conf = new DomainConfig();
+            s_conf.load();
+        }
+
+        return s_conf;
+    }
+
+
+    // ///////////////////////////////////////////////////////////////////////
+    //
+    // set of configuration parameters
+
+    /** Rules for configuring information in generated XML                    */
+    private Parameter m_adapters = new ResourceParameter
+            ("com.arsdigita.london.atoz.traversal_adapters", 
+             Parameter.REQUIRED,
+             "/WEB-INF/resources/atoz-ldn-domain-adapters.xml");
+
+    /**
+     * Constructor
+     */
+    public DomainConfig() {
+
+        register(m_adapters);
+
+        loadInfo();
+    }
+
+
+    /**
+     * Provides access to the traversal adapter as stream.
+     * @return 
+     */
+    InputStream getTraversalAdapters() {
+        return (InputStream)get(m_adapters);
+    }
+    
+}
diff --git a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/DomainConfig_parameter.properties b/ccm-ldn-atoz/src/com/arsdigita/london/atoz/DomainConfig_parameter.properties
new file mode 100755
index 000000000..6167c4f7e
--- /dev/null
+++ b/ccm-ldn-atoz/src/com/arsdigita/london/atoz/DomainConfig_parameter.properties
@@ -0,0 +1,4 @@
+com.arsdigita.london.atoz.traversal_adapters.title=XML renderer rules
+com.arsdigita.london.atoz.traversal_adapters.purpose=Rules for configuring information in generated XML
+com.arsdigita.london.atoz.traversal_adapters.format=[string]
+com.arsdigita.london.atoz.traversal_adapters.example=/WEB-INF/resources/atoz-ldn-domain-adapters.xml
diff --git a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/terms/DomainGenerator.java b/ccm-ldn-atoz/src/com/arsdigita/london/atoz/DomainGenerator.java
similarity index 97%
rename from ccm-ldn-atoz/src/com/arsdigita/london/atoz/terms/DomainGenerator.java
rename to ccm-ldn-atoz/src/com/arsdigita/london/atoz/DomainGenerator.java
index 39058c35f..cad68889d 100755
--- a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/terms/DomainGenerator.java
+++ b/ccm-ldn-atoz/src/com/arsdigita/london/atoz/DomainGenerator.java
@@ -16,16 +16,15 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.atoz.terms;
+package com.arsdigita.london.atoz;
 
 import com.arsdigita.atoz.AtoZGeneratorAbstractImpl;
 import com.arsdigita.atoz.AtoZAtomicEntry;
 import com.arsdigita.atoz.AtoZEntry;
-import com.arsdigita.london.terms.Domain;
-import com.arsdigita.london.terms.Term;
-
 import com.arsdigita.categorization.Category;
 import com.arsdigita.domain.DomainCollection;
+import com.arsdigita.london.terms.Domain;
+import com.arsdigita.london.terms.Term;
 import com.arsdigita.persistence.DataObject;
 import com.arsdigita.persistence.Filter;
 import com.arsdigita.persistence.OID;
@@ -42,6 +41,11 @@ import java.util.ArrayList;
  * 
  */
 public class DomainGenerator extends AtoZGeneratorAbstractImpl {
+
+    /**
+     * Constructor
+     * @param provider 
+     */
     public DomainGenerator(DomainProvider provider) {
         super(provider);
     }
diff --git a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/terms/DomainProvider.java b/ccm-ldn-atoz/src/com/arsdigita/london/atoz/DomainProvider.java
similarity index 95%
rename from ccm-ldn-atoz/src/com/arsdigita/london/atoz/terms/DomainProvider.java
rename to ccm-ldn-atoz/src/com/arsdigita/london/atoz/DomainProvider.java
index 13d10a136..91882e67f 100755
--- a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/terms/DomainProvider.java
+++ b/ccm-ldn-atoz/src/com/arsdigita/london/atoz/DomainProvider.java
@@ -16,13 +16,12 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.atoz.terms;
+package com.arsdigita.london.atoz;
 
 import com.arsdigita.atoz.AtoZGenerator;
 import com.arsdigita.atoz.AtoZProvider;
-import com.arsdigita.london.terms.Domain;
-
 import com.arsdigita.domain.DomainObjectFactory;
+import com.arsdigita.london.terms.Domain;
 import com.arsdigita.persistence.DataObject;
 import com.arsdigita.persistence.OID;
 
@@ -33,7 +32,7 @@ import com.arsdigita.persistence.OID;
 public class DomainProvider extends AtoZProvider {
     
     public static final String BASE_DATA_OBJECT_TYPE =
-                               "com.arsdigita.london.atoz.terms.DomainProvider";
+                               "com.arsdigita.london.atoz.DomainProvider";
 
     public static final String DOMAIN = "domain";
 
diff --git a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/terms/Initializer.java b/ccm-ldn-atoz/src/com/arsdigita/london/atoz/Initializer.java
similarity index 60%
rename from ccm-ldn-atoz/src/com/arsdigita/london/atoz/terms/Initializer.java
rename to ccm-ldn-atoz/src/com/arsdigita/london/atoz/Initializer.java
index 308ca515e..116713888 100644
--- a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/terms/Initializer.java
+++ b/ccm-ldn-atoz/src/com/arsdigita/london/atoz/Initializer.java
@@ -16,22 +16,41 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.atoz.terms;
+package com.arsdigita.london.atoz;
 
 import com.arsdigita.atoz.AtoZ;
 import com.arsdigita.atoz.AtoZProviderType;
-// import com.arsdigita.london.atoz.terms.DomainProvider;   //same package
-import com.arsdigita.london.atoz.ui.terms.DomainProviderAdmin;
-import com.arsdigita.london.atoz.ui.terms.DomainProviderForm;
+import com.arsdigita.db.DbHelper;
+import com.arsdigita.domain.xml.TraversalHandler;
+import com.arsdigita.london.atoz.ui.DomainProviderAdmin;
+import com.arsdigita.london.atoz.ui.DomainProviderForm;
+import com.arsdigita.persistence.pdl.ManifestSource;
+import com.arsdigita.persistence.pdl.NameFilter;
 import com.arsdigita.runtime.CompoundInitializer;
 import com.arsdigita.runtime.DomainInitEvent;
+import com.arsdigita.runtime.PDLInitializer;
+import com.arsdigita.runtime.RuntimeConfig;
+import com.arsdigita.xml.XML;
 
 /**
+ * Initializes ccm-ldn-atoz, a A-Z system extension for ESD terms
  *
  * @author pb
  */
 public class Initializer extends CompoundInitializer {
 
+    /**
+     * Constructor
+     */
+    public Initializer() {
+
+        final String url = RuntimeConfig.getConfig().getJDBCURL();
+        final int database = DbHelper.getDatabaseFromURL(url);
+
+        add(new PDLInitializer(new ManifestSource("ccm-ldn-atoz.pdl.mf",
+                new NameFilter(DbHelper.getDatabaseSuffix(database), "pdl"))));
+    }
+
     /**
      * 
      * @param evt 
@@ -40,7 +59,10 @@ public class Initializer extends CompoundInitializer {
 	public void init(DomainInitEvent evt) {
 		super.init(evt);
 
-        // Introduces dependency on ccm-ldn-typesesdervise ??
+        
+        XML.parse(DomainConfig.getConfig().getTraversalAdapters(),
+                  new TraversalHandler());
+
         AtoZ.registerProviderType(
                 new AtoZProviderType("ESD Toolkit Domain Provider",
                                      "Provides a ESD Toolkit A-Z", 
diff --git a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/terms/DomainProviderAdmin.java b/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/DomainProviderAdmin.java
similarity index 98%
rename from ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/terms/DomainProviderAdmin.java
rename to ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/DomainProviderAdmin.java
index 3dbf9cfcf..9a2393837 100755
--- a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/terms/DomainProviderAdmin.java
+++ b/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/DomainProviderAdmin.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.atoz.ui.terms;
+package com.arsdigita.london.atoz.ui;
 
 import com.arsdigita.atoz.ui.admin.ProviderAdmin;
 import com.arsdigita.atoz.ui.admin.ProviderDetails;
diff --git a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/terms/DomainProviderForm.java b/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/DomainProviderForm.java
similarity index 97%
rename from ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/terms/DomainProviderForm.java
rename to ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/DomainProviderForm.java
index b755bc2a8..cb30186f5 100755
--- a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/terms/DomainProviderForm.java
+++ b/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/DomainProviderForm.java
@@ -16,11 +16,11 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.atoz.ui.terms;
+package com.arsdigita.london.atoz.ui;
 
 import com.arsdigita.atoz.AtoZProvider;
 import com.arsdigita.atoz.ui.admin.ProviderForm;
-import com.arsdigita.london.atoz.terms.DomainProvider;
+import com.arsdigita.london.atoz.DomainProvider;
 import com.arsdigita.london.terms.Domain;
 
 import com.arsdigita.bebop.PageState;