diff --git a/ccm-quasi-aplaws/CHANGE_LOG b/ccm-quasi-aplaws/CHANGE_LOG
index 6ef21170d..209c84f44 100644
--- a/ccm-quasi-aplaws/CHANGE_LOG
+++ b/ccm-quasi-aplaws/CHANGE_LOG
@@ -1,6 +1,5 @@
-2007-08-06:
-./ccm-shp-aplaws/src/WEB-INF/content-types/c...types/aplaws-mparticle-item.jsp
-<define:page name="itemPage" application="content  changed to
-<define:page name="itemPage" application="content-section"
-as is all other contenttyp jsp pages. Requires corresponding modification
-in the theme! 
+2011-09-15:
+===========
+
+Initial Release, based on ccm-ldn-aplaws which tailors CCM for use by UK
+Local Authorities.
diff --git a/ccm-quasi-aplaws/application.xml b/ccm-quasi-aplaws/application.xml
index e09ada36f..9d7a9bad9 100644
--- a/ccm-quasi-aplaws/application.xml
+++ b/ccm-quasi-aplaws/application.xml
@@ -1,26 +1,26 @@
 <?xml version="1.0"?>
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
-  name="ccm-zes-aplaws"
-  prettyName="ZeS-APLAWS"
+  name="ccm-quasi-aplaws"
+  prettyName="Scientific CMS based on CCM"
   version="6.6.0"
   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-ldn-subsite" version="6.6.0" relation="ge"/>
+    <ccm:requires name="ccm-navigation" version="6.6.0" relation="ge"/>
     <ccm:requires name="ccm-portalworkspace" version="6.6.1" relation="ge"/>
-    <ccm:requires name="ccm-ldn-terms" version="6.6.0" relation="ge"/>
-    <!--  not required anymore (2007-06-09)
-    <ccm:requires name="ccm-ldn-dublin" version="6.6.0" relation="ge"/>
-    -->
-    <ccm:requires name="ccm-ldn-navigation" version="6.6.0" relation="ge"/>
+    <ccm:requires name="ccm-subsite" version="6.6.0" relation="ge"/>
     <ccm:requires name="ccm-ldn-search" version="6.6.0" relation="ge"/>
+    <ccm:requires name="ccm-ldn-terms" version="6.6.0" relation="ge"/>
   </ccm:dependencies>
 
   <ccm:directories>
+    <!--  pdl is empty and not used, buf required because we use sql for 
+          some update3 scripts.                                             -->
     <ccm:directory name="pdl"/>
     <ccm:directory name="src"/>
+    <ccm:directory name="sql"/>
   </ccm:directories>
 
   <ccm:contacts>
@@ -29,19 +29,16 @@
   </ccm:contacts>
 
   <ccm:description>
-    Service module which tailors the aplaws software to a specific purpose
-    and/or a specific site.
+    Service module which tailors the CCM software to use for scientific
+    research organisations creating Scientific CMS.
     - setting up a categorization / terms system (cf. load.java)
     - integrate custom spezific jsp's
     - setting up custom specific configuration parameters (cf. the bundles)
-    - overwrite default classes by custom specific ones (cf. src/.../aplaws)
+    - overwrite default classes by custom specific ones (cf. src/.../bundle)
     - provide a default theme, which meets accessibility requirements and
       overwrites the default, table based design (cf. web/.../themes)
     
-    This modules tailors APLAWS for use at the Centre for Social Policy
-    Research (Zentrum fuer Sozialpolitik - ZeS), University of Bremen, Germany.
-    
-    APLAWS is a collaboration and content management system which is based upon
+    CCM is a collaboration and content management system which is based upon
     the Red Hat Web Application Framework, which is a platform for writing
     database-backed web applications in Java. 
   </ccm:description>
diff --git a/ccm-sci-bundle/bundles/devel/cfg/integration.properties b/ccm-sci-bundle/bundles/devel/cfg/integration.properties
index 71763630c..803b34def 100644
--- a/ccm-sci-bundle/bundles/devel/cfg/integration.properties
+++ b/ccm-sci-bundle/bundles/devel/cfg/integration.properties
@@ -1,21 +1,15 @@
 # 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.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
+waf.kernel.language_independent_item=true
+waf.kernel.language_independent_code=de
 
 ; security.properties: 
 waf.auto_registration_on=false
@@ -37,7 +31,6 @@ 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
@@ -45,27 +38,17 @@ com.arsdigita.cms.default_item_template_path=/default/aplaws-item.jsp
 com.arsdigita.cms.default_template_resolver_class=com.arsdigita.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=Xinha.Config,/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=Xinha.Config,/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=Xinha.Config,/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_admin_tabs=false
 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.hide_launch_date=false
+com.arsdigita.cms.hide_templates_tab=false
+com.arsdigita.cms.hide_timezone=false
+com.arsdigita.cms.hide_udct_ui=false
 
 com.arsdigita.cms.use_section_categories=false
 com.arsdigita.cms.use_streamlined_creation=true
@@ -112,25 +95,21 @@ com.arsdigita.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCat
 
 # ccm-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
 
 
-# ccm-sci-bundle (Loader only)
-#com.arsdigita.bundle.loader.category_files=bundle/categories/sci-nav-domain-1.00.xml,bundle/categories/sci-nav-hierarchy-1.00.xml
-
 # =============================================================================================
 # runtime specific configurations
 
-waf.admin.email=webmaster@scientificCMS.org
-waf.admin.name.given=SCI
+waf.admin.email=webmaster@ccm.uni-bremen.de
+waf.admin.name.given=CCM
 waf.admin.name.family=Administrator
-waf.admin.password=sci2000
+waf.admin.password=nge2015
 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_url=jdbc\:postgresql\://localhost/ccm?user\=ccm&password\=ccm
 waf.runtime.jdbc_pool_size=30
 
 waf.web.server=localhost\:8080
diff --git a/ccm-sci-bundle/bundles/devel/cfg/project.xml b/ccm-sci-bundle/bundles/devel/cfg/project.xml
index b778c4e3f..0b43595ba 100644
--- a/ccm-sci-bundle/bundles/devel/cfg/project.xml
+++ b/ccm-sci-bundle/bundles/devel/cfg/project.xml
@@ -49,7 +49,7 @@
         <ccm:application name="ccm-ldn-util"/>
 
 <!--   SCI extension  -->
-        <ccm:application name="ccm-sci-bundle"/>
+        <ccm:application name="ccm-quasi-aplaws"/>
 
 
 
diff --git a/ccm-sci-bundle/src/ccm-sci-bundle.load b/ccm-sci-bundle/src/ccm-quasi-aplaws.load
similarity index 100%
rename from ccm-sci-bundle/src/ccm-sci-bundle.load
rename to ccm-sci-bundle/src/ccm-quasi-aplaws.load
diff --git a/ccm-sci-bundle/src/ccm-sci-bundle.config b/ccm-sci-bundle/src/ccm-quasi-aplws.config
similarity index 100%
rename from ccm-sci-bundle/src/ccm-sci-bundle.config
rename to ccm-sci-bundle/src/ccm-quasi-aplws.config
diff --git a/ccm-sci-bundle/src/ccm-sci-bundle.upgrade b/ccm-sci-bundle/src/ccm-sci-bundle.upgrade
deleted file mode 100755
index ffa6136ae..000000000
--- a/ccm-sci-bundle/src/ccm-sci-bundle.upgrade
+++ /dev/null
@@ -1,5 +0,0 @@
-<upgrade>
-  <version from="0.0.0" to="6.6.0">
-    <script sql="ccm-sci-bundle/upgrade/::database::-0.0.0-6.6.0.sql"/>
-  </version>
-</upgrade>
diff --git a/ccm-sci-bundle/src/com/arsdigita/bundle/Bundle.java.nolongerInUse b/ccm-sci-bundle/src/com/arsdigita/bundle/Bundle.java.nolongerInUse
deleted file mode 100644
index 4f6d74d7e..000000000
--- a/ccm-sci-bundle/src/com/arsdigita/bundle/Bundle.java.nolongerInUse
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2002-2005 Runtime Collective Ltd. 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.aplaws;
-
-import org.apache.log4j.Logger;
-
-public class Aplaws {
-    public static final String versionId =
-        "$Id: Aplaws.java 1297 2006-08-25 18:17:50Z apevec $";
-
-    private static final Logger LOG = Logger.getLogger(Aplaws.class);
-
-    private static AplawsConfig aplawsConfig = new AplawsConfig();
-
-    static {
-        aplawsConfig.load();
-    }
-
-    public static final AplawsConfig getAplawsConfig() {
-        return aplawsConfig;
-    }
-}
diff --git a/ccm-sci-bundle/src/com/arsdigita/bundle/BundleConfig.java.nolongerInUse b/ccm-sci-bundle/src/com/arsdigita/bundle/BundleConfig.java.nolongerInUse
deleted file mode 100644
index 8be495ad3..000000000
--- a/ccm-sci-bundle/src/com/arsdigita/bundle/BundleConfig.java.nolongerInUse
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2002-2005 Runtime Collective Ltd. 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.aplaws;
-
-import com.arsdigita.runtime.AbstractConfig;
-import com.arsdigita.util.parameter.Parameter;
-import com.arsdigita.util.parameter.BooleanParameter;
-import com.arsdigita.util.parameter.StringParameter;
-
-/**
- * AplawsConfig
- *
- * @version $Revision: 1.2 $ $Date: 2005/01/07 19:01:40 $
- * @version $Id: AplawsConfig.java 1565 2007-04-18 16:46:14Z apevec $
- */
-public class AplawsConfig extends AbstractConfig {
-
-	private final Parameter m_ajaxExpandAllBranches = new BooleanParameter(
-                "com.arsdigita.aplaws.ajax_expand_on_all_branches", 
-                Parameter.OPTIONAL, 
-                Boolean.FALSE);
-	
-
-
-    public AplawsConfig() {
-        register(m_ajaxExpandAllBranches);
-        loadInfo();
-    }
-
-    
-    
-    public boolean ajaxExpandAllBranches () {
-    	return ((Boolean)get(m_ajaxExpandAllBranches)).booleanValue();
-    }
-}
diff --git a/ccm-sci-bundle/src/com/arsdigita/bundle/BundleConfig_parameter.properties.nolongerInUse b/ccm-sci-bundle/src/com/arsdigita/bundle/BundleConfig_parameter.properties.nolongerInUse
deleted file mode 100644
index b4de56826..000000000
--- a/ccm-sci-bundle/src/com/arsdigita/bundle/BundleConfig_parameter.properties.nolongerInUse
+++ /dev/null
@@ -1,4 +0,0 @@
-com.arsdigita.aplaws.ajax_expand_on_all_branches.title=Use Ajax on all branch expansions
-com.arsdigita.aplaws.ajax_expand_on_all_branches.purpose=Use Ajax on all branches, or bring back entire subtree on expansion of top level root
-com.arsdigita.aplaws.ajax_expand_on_all_branches.example=true|false
-com.arsdigita.aplaws.ajax_expand_on_all_branches.format=[boolean]