diff --git a/ccm-ldn-aplaws/bundles/custom/AUTHORS b/ccm-ldn-aplaws/bundles/base/AUTHORS
similarity index 100%
rename from ccm-ldn-aplaws/bundles/custom/AUTHORS
rename to ccm-ldn-aplaws/bundles/base/AUTHORS
diff --git a/ccm-ldn-aplaws/bundles/custom/ChangeLog b/ccm-ldn-aplaws/bundles/base/ChangeLog
similarity index 100%
rename from ccm-ldn-aplaws/bundles/custom/ChangeLog
rename to ccm-ldn-aplaws/bundles/base/ChangeLog
diff --git a/ccm-ldn-aplaws/bundles/custom/NEWS b/ccm-ldn-aplaws/bundles/base/NEWS
similarity index 100%
rename from ccm-ldn-aplaws/bundles/custom/NEWS
rename to ccm-ldn-aplaws/bundles/base/NEWS
diff --git a/ccm-ldn-aplaws/bundles/custom/README b/ccm-ldn-aplaws/bundles/base/README
similarity index 100%
rename from ccm-ldn-aplaws/bundles/custom/README
rename to ccm-ldn-aplaws/bundles/base/README
diff --git a/ccm-ldn-aplaws/bundles/custom/bundle.in b/ccm-ldn-aplaws/bundles/base/bundle.in
similarity index 100%
rename from ccm-ldn-aplaws/bundles/custom/bundle.in
rename to ccm-ldn-aplaws/bundles/base/bundle.in
diff --git a/ccm-ldn-aplaws/bundles/custom/cfg/integration.properties b/ccm-ldn-aplaws/bundles/base/cfg/integration.properties
similarity index 99%
rename from ccm-ldn-aplaws/bundles/custom/cfg/integration.properties
rename to ccm-ldn-aplaws/bundles/base/cfg/integration.properties
index 08a52d421..9321ea7fb 100755
--- a/ccm-ldn-aplaws/bundles/custom/cfg/integration.properties
+++ b/ccm-ldn-aplaws/bundles/base/cfg/integration.properties
@@ -1,4 +1,4 @@
-# APLAWS+ Custom bundle integration.properties
+# APLAWS+ Base Bundle integration.properties
 #
 waf.bebop.base_page=com.arsdigita.aplaws.ui.SimplePage
 #
diff --git a/ccm-ldn-aplaws/bundles/custom/cfg/project.xml b/ccm-ldn-aplaws/bundles/base/cfg/project.xml
similarity index 93%
rename from ccm-ldn-aplaws/bundles/custom/cfg/project.xml
rename to ccm-ldn-aplaws/bundles/base/cfg/project.xml
index 54fb689b6..45c3f1629 100755
--- a/ccm-ldn-aplaws/bundles/custom/cfg/project.xml
+++ b/ccm-ldn-aplaws/bundles/base/cfg/project.xml
@@ -1,16 +1,20 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<!-- project.xml -custom- containing all modules of the current aplaws
+<!-- project.xml - BASE - containing all modules of the current aplaws
      repository. A set of core modules is active, others are commented out 
-     and should activated (uncomment) according to customers requirements.  -->
+     and may be activated (uncomment) according to customers requirements.
+     
+     The unmodified (as distributed) bundle may be used to create a custom
+     set of packages by a site administrator using ccm-hostinit command and
+     an appropriate set of add-on packages.                                  -->
 
 <ccm:project   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  
                xmlns:ccm="http://ccm.redhat.com/ccm-project" 
                ccmVersion="6.1" 
                name="aplaws" 
-               prettyName="APLAWS plus Custom Spin" 
+               prettyName="APLAWS plus Base Bundle" 
                version="2-0-0" 
-               release="custom-beta-1-r2234"
+               release="base-beta-1"
                webxml="web.xml" 
                webapp="ROOT" 
    xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd">
diff --git a/ccm-ldn-aplaws/bundles/custom/cfg/web.xml b/ccm-ldn-aplaws/bundles/base/cfg/web.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/custom/cfg/web.xml
rename to ccm-ldn-aplaws/bundles/base/cfg/web.xml
diff --git a/ccm-ldn-aplaws/bundles/custom/res/bundle/aplaws/addendum-3rd-level/domain-nav-1.03-addendum.xml b/ccm-ldn-aplaws/bundles/base/res/bundle/aplaws/addendum-3rd-level/domain-nav-1.03-addendum.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/custom/res/bundle/aplaws/addendum-3rd-level/domain-nav-1.03-addendum.xml
rename to ccm-ldn-aplaws/bundles/base/res/bundle/aplaws/addendum-3rd-level/domain-nav-1.03-addendum.xml
diff --git a/ccm-ldn-aplaws/bundles/custom/res/bundle/aplaws/addendum-3rd-level/hierarchy-nav-1.03-addendum.xml b/ccm-ldn-aplaws/bundles/base/res/bundle/aplaws/addendum-3rd-level/hierarchy-nav-1.03-addendum.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/custom/res/bundle/aplaws/addendum-3rd-level/hierarchy-nav-1.03-addendum.xml
rename to ccm-ldn-aplaws/bundles/base/res/bundle/aplaws/addendum-3rd-level/hierarchy-nav-1.03-addendum.xml
diff --git a/ccm-ldn-aplaws/bundles/custom/res/bundle/aplaws/addendum-3rd-level/make/lgcl-1.03.xml b/ccm-ldn-aplaws/bundles/base/res/bundle/aplaws/addendum-3rd-level/make/lgcl-1.03.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/custom/res/bundle/aplaws/addendum-3rd-level/make/lgcl-1.03.xml
rename to ccm-ldn-aplaws/bundles/base/res/bundle/aplaws/addendum-3rd-level/make/lgcl-1.03.xml
diff --git a/ccm-ldn-aplaws/bundles/custom/res/bundle/aplaws/addendum-3rd-level/make/make-domain-nav-1.03-addendum.xsl b/ccm-ldn-aplaws/bundles/base/res/bundle/aplaws/addendum-3rd-level/make/make-domain-nav-1.03-addendum.xsl
similarity index 100%
rename from ccm-ldn-aplaws/bundles/custom/res/bundle/aplaws/addendum-3rd-level/make/make-domain-nav-1.03-addendum.xsl
rename to ccm-ldn-aplaws/bundles/base/res/bundle/aplaws/addendum-3rd-level/make/make-domain-nav-1.03-addendum.xsl
diff --git a/ccm-ldn-aplaws/bundles/custom/res/bundle/aplaws/addendum-3rd-level/make/make-hierarchy-nav-1.03-addendum.xsl b/ccm-ldn-aplaws/bundles/base/res/bundle/aplaws/addendum-3rd-level/make/make-hierarchy-nav-1.03-addendum.xsl
similarity index 100%
rename from ccm-ldn-aplaws/bundles/custom/res/bundle/aplaws/addendum-3rd-level/make/make-hierarchy-nav-1.03-addendum.xsl
rename to ccm-ldn-aplaws/bundles/base/res/bundle/aplaws/addendum-3rd-level/make/make-hierarchy-nav-1.03-addendum.xsl
diff --git a/ccm-ldn-aplaws/bundles/custom/res/bundle/aplaws/addendum-3rd-level/make/make.sh b/ccm-ldn-aplaws/bundles/base/res/bundle/aplaws/addendum-3rd-level/make/make.sh
similarity index 100%
rename from ccm-ldn-aplaws/bundles/custom/res/bundle/aplaws/addendum-3rd-level/make/make.sh
rename to ccm-ldn-aplaws/bundles/base/res/bundle/aplaws/addendum-3rd-level/make/make.sh
diff --git a/ccm-ldn-aplaws/bundles/custom/res/bundle/aplaws/addendum-3rd-level/upgrade.sh b/ccm-ldn-aplaws/bundles/base/res/bundle/aplaws/addendum-3rd-level/upgrade.sh
similarity index 100%
rename from ccm-ldn-aplaws/bundles/custom/res/bundle/aplaws/addendum-3rd-level/upgrade.sh
rename to ccm-ldn-aplaws/bundles/base/res/bundle/aplaws/addendum-3rd-level/upgrade.sh
diff --git a/ccm-ldn-aplaws/bundles/custom/res/bundle/aplaws/addendum/Readme.txt b/ccm-ldn-aplaws/bundles/base/res/bundle/aplaws/addendum/Readme.txt
similarity index 100%
rename from ccm-ldn-aplaws/bundles/custom/res/bundle/aplaws/addendum/Readme.txt
rename to ccm-ldn-aplaws/bundles/base/res/bundle/aplaws/addendum/Readme.txt
diff --git a/ccm-ldn-aplaws/bundles/custom/res/bundle/aplaws/addendum/domain-nav-1.03-addendum.xml b/ccm-ldn-aplaws/bundles/base/res/bundle/aplaws/addendum/domain-nav-1.03-addendum.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/custom/res/bundle/aplaws/addendum/domain-nav-1.03-addendum.xml
rename to ccm-ldn-aplaws/bundles/base/res/bundle/aplaws/addendum/domain-nav-1.03-addendum.xml
diff --git a/ccm-ldn-aplaws/bundles/custom/res/bundle/aplaws/addendum/hierarchy-nav-1.03-addendum.xml b/ccm-ldn-aplaws/bundles/base/res/bundle/aplaws/addendum/hierarchy-nav-1.03-addendum.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/custom/res/bundle/aplaws/addendum/hierarchy-nav-1.03-addendum.xml
rename to ccm-ldn-aplaws/bundles/base/res/bundle/aplaws/addendum/hierarchy-nav-1.03-addendum.xml
diff --git a/ccm-ldn-aplaws/bundles/custom/res/bundle/aplaws/addendum/make/combined-hierlgcl-hieranav.xml b/ccm-ldn-aplaws/bundles/base/res/bundle/aplaws/addendum/make/combined-hierlgcl-hieranav.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/custom/res/bundle/aplaws/addendum/make/combined-hierlgcl-hieranav.xml
rename to ccm-ldn-aplaws/bundles/base/res/bundle/aplaws/addendum/make/combined-hierlgcl-hieranav.xml
diff --git a/ccm-ldn-aplaws/bundles/custom/res/bundle/aplaws/addendum/make/combined-lgcl-and-anav.xml b/ccm-ldn-aplaws/bundles/base/res/bundle/aplaws/addendum/make/combined-lgcl-and-anav.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/custom/res/bundle/aplaws/addendum/make/combined-lgcl-and-anav.xml
rename to ccm-ldn-aplaws/bundles/base/res/bundle/aplaws/addendum/make/combined-lgcl-and-anav.xml
diff --git a/ccm-ldn-aplaws/bundles/custom/res/bundle/aplaws/addendum/make/make-domain-nav-1.03-addendum.xsl b/ccm-ldn-aplaws/bundles/base/res/bundle/aplaws/addendum/make/make-domain-nav-1.03-addendum.xsl
similarity index 100%
rename from ccm-ldn-aplaws/bundles/custom/res/bundle/aplaws/addendum/make/make-domain-nav-1.03-addendum.xsl
rename to ccm-ldn-aplaws/bundles/base/res/bundle/aplaws/addendum/make/make-domain-nav-1.03-addendum.xsl
diff --git a/ccm-ldn-aplaws/bundles/custom/res/bundle/aplaws/addendum/make/make-hierarchy-nav-1.03-addendum.xsl b/ccm-ldn-aplaws/bundles/base/res/bundle/aplaws/addendum/make/make-hierarchy-nav-1.03-addendum.xsl
similarity index 100%
rename from ccm-ldn-aplaws/bundles/custom/res/bundle/aplaws/addendum/make/make-hierarchy-nav-1.03-addendum.xsl
rename to ccm-ldn-aplaws/bundles/base/res/bundle/aplaws/addendum/make/make-hierarchy-nav-1.03-addendum.xsl
diff --git a/ccm-ldn-aplaws/bundles/custom/res/bundle/aplaws/addendum/make/make-mapping-lgcl-1.03-anav-1.03-addendum.xsl b/ccm-ldn-aplaws/bundles/base/res/bundle/aplaws/addendum/make/make-mapping-lgcl-1.03-anav-1.03-addendum.xsl
similarity index 100%
rename from ccm-ldn-aplaws/bundles/custom/res/bundle/aplaws/addendum/make/make-mapping-lgcl-1.03-anav-1.03-addendum.xsl
rename to ccm-ldn-aplaws/bundles/base/res/bundle/aplaws/addendum/make/make-mapping-lgcl-1.03-anav-1.03-addendum.xsl
diff --git a/ccm-ldn-aplaws/bundles/custom/res/bundle/aplaws/addendum/mapping-lgcl-1.03-anav-1.03-addendum.xml b/ccm-ldn-aplaws/bundles/base/res/bundle/aplaws/addendum/mapping-lgcl-1.03-anav-1.03-addendum.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/custom/res/bundle/aplaws/addendum/mapping-lgcl-1.03-anav-1.03-addendum.xml
rename to ccm-ldn-aplaws/bundles/base/res/bundle/aplaws/addendum/mapping-lgcl-1.03-anav-1.03-addendum.xml
diff --git a/ccm-ldn-aplaws/bundles/custom/res/bundle/aplaws/domain-nav-1.03.xml b/ccm-ldn-aplaws/bundles/base/res/bundle/aplaws/domain-nav-1.03.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/custom/res/bundle/aplaws/domain-nav-1.03.xml
rename to ccm-ldn-aplaws/bundles/base/res/bundle/aplaws/domain-nav-1.03.xml
diff --git a/ccm-ldn-aplaws/bundles/custom/res/bundle/aplaws/domain-rss-1.00.xml b/ccm-ldn-aplaws/bundles/base/res/bundle/aplaws/domain-rss-1.00.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/custom/res/bundle/aplaws/domain-rss-1.00.xml
rename to ccm-ldn-aplaws/bundles/base/res/bundle/aplaws/domain-rss-1.00.xml
diff --git a/ccm-ldn-aplaws/bundles/custom/res/bundle/aplaws/hierarchy-nav-1.03.xml b/ccm-ldn-aplaws/bundles/base/res/bundle/aplaws/hierarchy-nav-1.03.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/custom/res/bundle/aplaws/hierarchy-nav-1.03.xml
rename to ccm-ldn-aplaws/bundles/base/res/bundle/aplaws/hierarchy-nav-1.03.xml
diff --git a/ccm-ldn-aplaws/bundles/custom/res/bundle/aplaws/hierarchy-rss-1.00.xml b/ccm-ldn-aplaws/bundles/base/res/bundle/aplaws/hierarchy-rss-1.00.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/custom/res/bundle/aplaws/hierarchy-rss-1.00.xml
rename to ccm-ldn-aplaws/bundles/base/res/bundle/aplaws/hierarchy-rss-1.00.xml
diff --git a/ccm-ldn-aplaws/bundles/custom/res/bundle/aplaws/mapping-lgcl-1.03-anav-1.03.xml b/ccm-ldn-aplaws/bundles/base/res/bundle/aplaws/mapping-lgcl-1.03-anav-1.03.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/custom/res/bundle/aplaws/mapping-lgcl-1.03-anav-1.03.xml
rename to ccm-ldn-aplaws/bundles/base/res/bundle/aplaws/mapping-lgcl-1.03-anav-1.03.xml
diff --git a/ccm-ldn-aplaws/bundles/custom/res/bundle/aplaws/mapping-lgcl-1.03-anav-1.03.xsl b/ccm-ldn-aplaws/bundles/base/res/bundle/aplaws/mapping-lgcl-1.03-anav-1.03.xsl
similarity index 100%
rename from ccm-ldn-aplaws/bundles/custom/res/bundle/aplaws/mapping-lgcl-1.03-anav-1.03.xsl
rename to ccm-ldn-aplaws/bundles/base/res/bundle/aplaws/mapping-lgcl-1.03-anav-1.03.xsl
diff --git a/ccm-ldn-aplaws/bundles/custom/res/bundle/categories/placeholder.info b/ccm-ldn-aplaws/bundles/base/res/bundle/categories/placeholder.info
similarity index 100%
rename from ccm-ldn-aplaws/bundles/custom/res/bundle/categories/placeholder.info
rename to ccm-ldn-aplaws/bundles/base/res/bundle/categories/placeholder.info
diff --git a/ccm-ldn-aplaws/bundles/custom/res/bundle/categories/xample-nav-domain.xml b/ccm-ldn-aplaws/bundles/base/res/bundle/categories/xample-nav-domain.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/custom/res/bundle/categories/xample-nav-domain.xml
rename to ccm-ldn-aplaws/bundles/base/res/bundle/categories/xample-nav-domain.xml
diff --git a/ccm-ldn-aplaws/bundles/custom/res/bundle/categories/xample-nav-hierarchy.xml b/ccm-ldn-aplaws/bundles/base/res/bundle/categories/xample-nav-hierarchy.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/custom/res/bundle/categories/xample-nav-hierarchy.xml
rename to ccm-ldn-aplaws/bundles/base/res/bundle/categories/xample-nav-hierarchy.xml
diff --git a/ccm-ldn-aplaws/bundles/custom/res/bundle/categories/xample-nav-mapping-lgcl-anav.xml b/ccm-ldn-aplaws/bundles/base/res/bundle/categories/xample-nav-mapping-lgcl-anav.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/custom/res/bundle/categories/xample-nav-mapping-lgcl-anav.xml
rename to ccm-ldn-aplaws/bundles/base/res/bundle/categories/xample-nav-mapping-lgcl-anav.xml
diff --git a/ccm-ldn-aplaws/bundles/custom/res/bundle/categories/xample-nav-mapping-lgcl-anav.xsl b/ccm-ldn-aplaws/bundles/base/res/bundle/categories/xample-nav-mapping-lgcl-anav.xsl
similarity index 100%
rename from ccm-ldn-aplaws/bundles/custom/res/bundle/categories/xample-nav-mapping-lgcl-anav.xsl
rename to ccm-ldn-aplaws/bundles/base/res/bundle/categories/xample-nav-mapping-lgcl-anav.xsl
diff --git a/ccm-ldn-aplaws/bundles/custom/res/bundle/esd-toolkit/domain-gcl-2.10.xml b/ccm-ldn-aplaws/bundles/base/res/bundle/esd-toolkit/domain-gcl-2.10.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/custom/res/bundle/esd-toolkit/domain-gcl-2.10.xml
rename to ccm-ldn-aplaws/bundles/base/res/bundle/esd-toolkit/domain-gcl-2.10.xml
diff --git a/ccm-ldn-aplaws/bundles/custom/res/bundle/esd-toolkit/domain-lgal-0.01.xml b/ccm-ldn-aplaws/bundles/base/res/bundle/esd-toolkit/domain-lgal-0.01.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/custom/res/bundle/esd-toolkit/domain-lgal-0.01.xml
rename to ccm-ldn-aplaws/bundles/base/res/bundle/esd-toolkit/domain-lgal-0.01.xml
diff --git a/ccm-ldn-aplaws/bundles/custom/res/bundle/esd-toolkit/domain-lgcl-1.04.xml b/ccm-ldn-aplaws/bundles/base/res/bundle/esd-toolkit/domain-lgcl-1.04.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/custom/res/bundle/esd-toolkit/domain-lgcl-1.04.xml
rename to ccm-ldn-aplaws/bundles/base/res/bundle/esd-toolkit/domain-lgcl-1.04.xml
diff --git a/ccm-ldn-aplaws/bundles/custom/res/bundle/esd-toolkit/domain-lgcl-lite-1.04.xml b/ccm-ldn-aplaws/bundles/base/res/bundle/esd-toolkit/domain-lgcl-lite-1.04.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/custom/res/bundle/esd-toolkit/domain-lgcl-lite-1.04.xml
rename to ccm-ldn-aplaws/bundles/base/res/bundle/esd-toolkit/domain-lgcl-lite-1.04.xml
diff --git a/ccm-ldn-aplaws/bundles/custom/res/bundle/esd-toolkit/domain-lgdl-2.01.xml b/ccm-ldn-aplaws/bundles/base/res/bundle/esd-toolkit/domain-lgdl-2.01.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/custom/res/bundle/esd-toolkit/domain-lgdl-2.01.xml
rename to ccm-ldn-aplaws/bundles/base/res/bundle/esd-toolkit/domain-lgdl-2.01.xml
diff --git a/ccm-ldn-aplaws/bundles/custom/res/bundle/esd-toolkit/domain-lgil-0.01.xml b/ccm-ldn-aplaws/bundles/base/res/bundle/esd-toolkit/domain-lgil-0.01.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/custom/res/bundle/esd-toolkit/domain-lgil-0.01.xml
rename to ccm-ldn-aplaws/bundles/base/res/bundle/esd-toolkit/domain-lgil-0.01.xml
diff --git a/ccm-ldn-aplaws/bundles/custom/res/bundle/esd-toolkit/domain-lgsl-2.01.xml b/ccm-ldn-aplaws/bundles/base/res/bundle/esd-toolkit/domain-lgsl-2.01.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/custom/res/bundle/esd-toolkit/domain-lgsl-2.01.xml
rename to ccm-ldn-aplaws/bundles/base/res/bundle/esd-toolkit/domain-lgsl-2.01.xml
diff --git a/ccm-ldn-aplaws/bundles/custom/res/bundle/esd-toolkit/hierarchy-lgcl-1.04.xml b/ccm-ldn-aplaws/bundles/base/res/bundle/esd-toolkit/hierarchy-lgcl-1.04.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/custom/res/bundle/esd-toolkit/hierarchy-lgcl-1.04.xml
rename to ccm-ldn-aplaws/bundles/base/res/bundle/esd-toolkit/hierarchy-lgcl-1.04.xml
diff --git a/ccm-ldn-aplaws/bundles/custom/res/bundle/esd-toolkit/hierarchy-lgcl-lite-1.04.xml b/ccm-ldn-aplaws/bundles/base/res/bundle/esd-toolkit/hierarchy-lgcl-lite-1.04.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/custom/res/bundle/esd-toolkit/hierarchy-lgcl-lite-1.04.xml
rename to ccm-ldn-aplaws/bundles/base/res/bundle/esd-toolkit/hierarchy-lgcl-lite-1.04.xml
diff --git a/ccm-ldn-aplaws/bundles/custom/res/bundle/esd-toolkit/hierarchy-lgdl-2.01-lgsl-2.01.xml b/ccm-ldn-aplaws/bundles/base/res/bundle/esd-toolkit/hierarchy-lgdl-2.01-lgsl-2.01.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/custom/res/bundle/esd-toolkit/hierarchy-lgdl-2.01-lgsl-2.01.xml
rename to ccm-ldn-aplaws/bundles/base/res/bundle/esd-toolkit/hierarchy-lgdl-2.01-lgsl-2.01.xml
diff --git a/ccm-ldn-aplaws/bundles/custom/res/bundle/esd-toolkit/hierarchy-lgdl-2.01.xml b/ccm-ldn-aplaws/bundles/base/res/bundle/esd-toolkit/hierarchy-lgdl-2.01.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/custom/res/bundle/esd-toolkit/hierarchy-lgdl-2.01.xml
rename to ccm-ldn-aplaws/bundles/base/res/bundle/esd-toolkit/hierarchy-lgdl-2.01.xml
diff --git a/ccm-ldn-aplaws/bundles/custom/res/bundle/esd-toolkit/hierarchy-lgil-0.01.xml b/ccm-ldn-aplaws/bundles/base/res/bundle/esd-toolkit/hierarchy-lgil-0.01.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/custom/res/bundle/esd-toolkit/hierarchy-lgil-0.01.xml
rename to ccm-ldn-aplaws/bundles/base/res/bundle/esd-toolkit/hierarchy-lgil-0.01.xml
diff --git a/ccm-ldn-aplaws/bundles/custom/res/bundle/esd-toolkit/lite-to-full/hierarchy-lgcl-1.03-addendum.xml b/ccm-ldn-aplaws/bundles/base/res/bundle/esd-toolkit/lite-to-full/hierarchy-lgcl-1.03-addendum.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/custom/res/bundle/esd-toolkit/lite-to-full/hierarchy-lgcl-1.03-addendum.xml
rename to ccm-ldn-aplaws/bundles/base/res/bundle/esd-toolkit/lite-to-full/hierarchy-lgcl-1.03-addendum.xml
diff --git a/ccm-ldn-aplaws/bundles/custom/res/bundle/esd-toolkit/lite-to-full/lgcl-1.03-addendum.xml b/ccm-ldn-aplaws/bundles/base/res/bundle/esd-toolkit/lite-to-full/lgcl-1.03-addendum.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/custom/res/bundle/esd-toolkit/lite-to-full/lgcl-1.03-addendum.xml
rename to ccm-ldn-aplaws/bundles/base/res/bundle/esd-toolkit/lite-to-full/lgcl-1.03-addendum.xml
diff --git a/ccm-ldn-aplaws/bundles/custom/res/bundle/esd-toolkit/lite-to-full/make/combined-hier-lgcl-and-lgcllite.xml b/ccm-ldn-aplaws/bundles/base/res/bundle/esd-toolkit/lite-to-full/make/combined-hier-lgcl-and-lgcllite.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/custom/res/bundle/esd-toolkit/lite-to-full/make/combined-hier-lgcl-and-lgcllite.xml
rename to ccm-ldn-aplaws/bundles/base/res/bundle/esd-toolkit/lite-to-full/make/combined-hier-lgcl-and-lgcllite.xml
diff --git a/ccm-ldn-aplaws/bundles/custom/res/bundle/esd-toolkit/lite-to-full/make/combined-lgcl-and-lgcllite.xml b/ccm-ldn-aplaws/bundles/base/res/bundle/esd-toolkit/lite-to-full/make/combined-lgcl-and-lgcllite.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/custom/res/bundle/esd-toolkit/lite-to-full/make/combined-lgcl-and-lgcllite.xml
rename to ccm-ldn-aplaws/bundles/base/res/bundle/esd-toolkit/lite-to-full/make/combined-lgcl-and-lgcllite.xml
diff --git a/ccm-ldn-aplaws/bundles/custom/res/bundle/esd-toolkit/lite-to-full/make/make-hierarchy-lgcl-1.03-addendum.xsl b/ccm-ldn-aplaws/bundles/base/res/bundle/esd-toolkit/lite-to-full/make/make-hierarchy-lgcl-1.03-addendum.xsl
similarity index 100%
rename from ccm-ldn-aplaws/bundles/custom/res/bundle/esd-toolkit/lite-to-full/make/make-hierarchy-lgcl-1.03-addendum.xsl
rename to ccm-ldn-aplaws/bundles/base/res/bundle/esd-toolkit/lite-to-full/make/make-hierarchy-lgcl-1.03-addendum.xsl
diff --git a/ccm-ldn-aplaws/bundles/custom/res/bundle/esd-toolkit/lite-to-full/make/make-lgcl-1.03-addendum.xsl b/ccm-ldn-aplaws/bundles/base/res/bundle/esd-toolkit/lite-to-full/make/make-lgcl-1.03-addendum.xsl
similarity index 100%
rename from ccm-ldn-aplaws/bundles/custom/res/bundle/esd-toolkit/lite-to-full/make/make-lgcl-1.03-addendum.xsl
rename to ccm-ldn-aplaws/bundles/base/res/bundle/esd-toolkit/lite-to-full/make/make-lgcl-1.03-addendum.xsl
diff --git a/ccm-ldn-aplaws/bundles/custom/res/bundle/esd-toolkit/lite-to-full/upgrade.sh b/ccm-ldn-aplaws/bundles/base/res/bundle/esd-toolkit/lite-to-full/upgrade.sh
similarity index 100%
rename from ccm-ldn-aplaws/bundles/custom/res/bundle/esd-toolkit/lite-to-full/upgrade.sh
rename to ccm-ldn-aplaws/bundles/base/res/bundle/esd-toolkit/lite-to-full/upgrade.sh
diff --git a/ccm-ldn-aplaws/bundles/custom/res/bundle/esd-toolkit/mapping-lgcl-1.04-gcl-2.10.xml b/ccm-ldn-aplaws/bundles/base/res/bundle/esd-toolkit/mapping-lgcl-1.04-gcl-2.10.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/custom/res/bundle/esd-toolkit/mapping-lgcl-1.04-gcl-2.10.xml
rename to ccm-ldn-aplaws/bundles/base/res/bundle/esd-toolkit/mapping-lgcl-1.04-gcl-2.10.xml
diff --git a/ccm-ldn-aplaws/bundles/custom/res/bundle/esd-toolkit/mapping-lgcl-1.04-lgsl-2.01.xml b/ccm-ldn-aplaws/bundles/base/res/bundle/esd-toolkit/mapping-lgcl-1.04-lgsl-2.01.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/custom/res/bundle/esd-toolkit/mapping-lgcl-1.04-lgsl-2.01.xml
rename to ccm-ldn-aplaws/bundles/base/res/bundle/esd-toolkit/mapping-lgcl-1.04-lgsl-2.01.xml
diff --git a/ccm-ldn-aplaws/bundles/custom/res/bundle/esd-toolkit/mapping-lgsl-2.00-lgcl-1.04.xml b/ccm-ldn-aplaws/bundles/base/res/bundle/esd-toolkit/mapping-lgsl-2.00-lgcl-1.04.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/custom/res/bundle/esd-toolkit/mapping-lgsl-2.00-lgcl-1.04.xml
rename to ccm-ldn-aplaws/bundles/base/res/bundle/esd-toolkit/mapping-lgsl-2.00-lgcl-1.04.xml
diff --git a/ccm-ldn-aplaws/bundles/custom/res/bundle/esd-toolkit/related-lgcl-1.04.xml b/ccm-ldn-aplaws/bundles/base/res/bundle/esd-toolkit/related-lgcl-1.04.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/custom/res/bundle/esd-toolkit/related-lgcl-1.04.xml
rename to ccm-ldn-aplaws/bundles/base/res/bundle/esd-toolkit/related-lgcl-1.04.xml
diff --git a/ccm-ldn-aplaws/bundles/custom/res/bundle/navigation/placeholder.info b/ccm-ldn-aplaws/bundles/base/res/bundle/navigation/placeholder.info
similarity index 100%
rename from ccm-ldn-aplaws/bundles/custom/res/bundle/navigation/placeholder.info
rename to ccm-ldn-aplaws/bundles/base/res/bundle/navigation/placeholder.info
diff --git a/ccm-ldn-aplaws/bundles/custom/res/bundle/navigation/templates.txt b/ccm-ldn-aplaws/bundles/base/res/bundle/navigation/templates.txt
similarity index 100%
rename from ccm-ldn-aplaws/bundles/custom/res/bundle/navigation/templates.txt
rename to ccm-ldn-aplaws/bundles/base/res/bundle/navigation/templates.txt
diff --git a/ccm-ldn-aplaws/bundles/custom/res/placeholder.info b/ccm-ldn-aplaws/bundles/base/res/placeholder.info
similarity index 100%
rename from ccm-ldn-aplaws/bundles/custom/res/placeholder.info
rename to ccm-ldn-aplaws/bundles/base/res/placeholder.info
diff --git a/ccm-ldn-aplaws/bundles/custom/templates/placeholder.info b/ccm-ldn-aplaws/bundles/base/templates/placeholder.info
similarity index 100%
rename from ccm-ldn-aplaws/bundles/custom/templates/placeholder.info
rename to ccm-ldn-aplaws/bundles/base/templates/placeholder.info
diff --git a/ccm-ldn-aplaws/bundles/custom/themes/master/dummy b/ccm-ldn-aplaws/bundles/base/themes/master/dummy
similarity index 100%
rename from ccm-ldn-aplaws/bundles/custom/themes/master/dummy
rename to ccm-ldn-aplaws/bundles/base/themes/master/dummy
diff --git a/ccm-ldn-aplaws/bundles/custom/themes/placeholder.info b/ccm-ldn-aplaws/bundles/base/themes/placeholder.info
similarity index 100%
rename from ccm-ldn-aplaws/bundles/custom/themes/placeholder.info
rename to ccm-ldn-aplaws/bundles/base/themes/placeholder.info
diff --git a/ccm-ldn-aplaws/bundles/extended/AUTHORS b/ccm-ldn-aplaws/bundles/complete/AUTHORS
similarity index 100%
rename from ccm-ldn-aplaws/bundles/extended/AUTHORS
rename to ccm-ldn-aplaws/bundles/complete/AUTHORS
diff --git a/ccm-ldn-aplaws/bundles/extended/ChangeLog b/ccm-ldn-aplaws/bundles/complete/ChangeLog
similarity index 100%
rename from ccm-ldn-aplaws/bundles/extended/ChangeLog
rename to ccm-ldn-aplaws/bundles/complete/ChangeLog
diff --git a/ccm-ldn-aplaws/bundles/extended/NEWS b/ccm-ldn-aplaws/bundles/complete/NEWS
similarity index 100%
rename from ccm-ldn-aplaws/bundles/extended/NEWS
rename to ccm-ldn-aplaws/bundles/complete/NEWS
diff --git a/ccm-ldn-aplaws/bundles/extended/README b/ccm-ldn-aplaws/bundles/complete/README
similarity index 100%
rename from ccm-ldn-aplaws/bundles/extended/README
rename to ccm-ldn-aplaws/bundles/complete/README
diff --git a/ccm-ldn-aplaws/bundles/extended/bundle.in b/ccm-ldn-aplaws/bundles/complete/bundle.in
similarity index 100%
rename from ccm-ldn-aplaws/bundles/extended/bundle.in
rename to ccm-ldn-aplaws/bundles/complete/bundle.in
diff --git a/ccm-ldn-aplaws/bundles/extended/cfg/integration.properties b/ccm-ldn-aplaws/bundles/complete/cfg/integration.properties
similarity index 98%
rename from ccm-ldn-aplaws/bundles/extended/cfg/integration.properties
rename to ccm-ldn-aplaws/bundles/complete/cfg/integration.properties
index d4e8dd1f9..b25f484ea 100755
--- a/ccm-ldn-aplaws/bundles/extended/cfg/integration.properties
+++ b/ccm-ldn-aplaws/bundles/complete/cfg/integration.properties
@@ -1,4 +1,5 @@
-# APLAWS+ Extended bundle integration.properties
+# APLAWS+ Complete Bundle integration.properties
+# Complete Bundle is DEPRECATED!
 #
 waf.bebop.base_page=com.arsdigita.aplaws.ui.SimplePage
 #
diff --git a/ccm-ldn-aplaws/bundles/extended/cfg/project.xml b/ccm-ldn-aplaws/bundles/complete/cfg/project.xml
similarity index 94%
rename from ccm-ldn-aplaws/bundles/extended/cfg/project.xml
rename to ccm-ldn-aplaws/bundles/complete/cfg/project.xml
index bb8e68ed3..18c3af658 100755
--- a/ccm-ldn-aplaws/bundles/extended/cfg/project.xml
+++ b/ccm-ldn-aplaws/bundles/complete/cfg/project.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<!-- project.xml -extended- containing a nearly complete set of modules.     -->
+<!-- project.xml - COMPLETE - containing a nearly complete set of modules.   -->
+<!-- DEPRECATED!  DON'T USE for new installations!                           -->
 
 <ccm:project   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  
                xmlns:ccm="http://ccm.redhat.com/ccm-project" 
                ccmVersion="6.1" 
                name="aplaws" 
-               prettyName="APLAWS plus Extended Spin" 
+               prettyName="APLAWS plus Complete Bundle" 
                version="2-0-0" 
-               release="ext-beta"
+               release="compl-beta-1"
                webxml="web.xml" 
                webapp="ROOT" 
    xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd">
@@ -106,7 +107,7 @@
              neither it does not appear in content center -->
         <ccm:application name="ccm-cms-types-motditem"/>
 
-<!--   Extended Bundle's Applications   -->
+<!--   Complete Bundle's Applications   -->
         <ccm:application name="ccm-atoz-siteproxy"/> <!-- requires siteproxy!--> 
         <ccm:application name="ccm-auth-http"/>
         <!--  currently doesn't work for unknown reason                      -->
@@ -115,7 +116,7 @@
         <ccm:application name="ccm-formbuilder-pdf"/>
         <ccm:application name="ccm-ldn-userpreferences"/>
 
-<!--   Extended Bundle's  LDN extensions  -->
+<!--   Complete Bundle's  LDN extensions  -->
         <ccm:application name="ccm-ldn-exporter"/>
         <ccm:application name="ccm-ldn-freeform"/>
 
diff --git a/ccm-ldn-aplaws/bundles/extended/cfg/web.xml b/ccm-ldn-aplaws/bundles/complete/cfg/web.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/extended/cfg/web.xml
rename to ccm-ldn-aplaws/bundles/complete/cfg/web.xml
diff --git a/ccm-ldn-aplaws/bundles/extended/res/bundle/aplaws/addendum-3rd-level/domain-nav-1.03-addendum.xml b/ccm-ldn-aplaws/bundles/complete/res/bundle/aplaws/addendum-3rd-level/domain-nav-1.03-addendum.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/extended/res/bundle/aplaws/addendum-3rd-level/domain-nav-1.03-addendum.xml
rename to ccm-ldn-aplaws/bundles/complete/res/bundle/aplaws/addendum-3rd-level/domain-nav-1.03-addendum.xml
diff --git a/ccm-ldn-aplaws/bundles/extended/res/bundle/aplaws/addendum-3rd-level/hierarchy-nav-1.03-addendum.xml b/ccm-ldn-aplaws/bundles/complete/res/bundle/aplaws/addendum-3rd-level/hierarchy-nav-1.03-addendum.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/extended/res/bundle/aplaws/addendum-3rd-level/hierarchy-nav-1.03-addendum.xml
rename to ccm-ldn-aplaws/bundles/complete/res/bundle/aplaws/addendum-3rd-level/hierarchy-nav-1.03-addendum.xml
diff --git a/ccm-ldn-aplaws/bundles/extended/res/bundle/aplaws/addendum-3rd-level/make/lgcl-1.03.xml b/ccm-ldn-aplaws/bundles/complete/res/bundle/aplaws/addendum-3rd-level/make/lgcl-1.03.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/extended/res/bundle/aplaws/addendum-3rd-level/make/lgcl-1.03.xml
rename to ccm-ldn-aplaws/bundles/complete/res/bundle/aplaws/addendum-3rd-level/make/lgcl-1.03.xml
diff --git a/ccm-ldn-aplaws/bundles/extended/res/bundle/aplaws/addendum-3rd-level/make/make-domain-nav-1.03-addendum.xsl b/ccm-ldn-aplaws/bundles/complete/res/bundle/aplaws/addendum-3rd-level/make/make-domain-nav-1.03-addendum.xsl
similarity index 100%
rename from ccm-ldn-aplaws/bundles/extended/res/bundle/aplaws/addendum-3rd-level/make/make-domain-nav-1.03-addendum.xsl
rename to ccm-ldn-aplaws/bundles/complete/res/bundle/aplaws/addendum-3rd-level/make/make-domain-nav-1.03-addendum.xsl
diff --git a/ccm-ldn-aplaws/bundles/extended/res/bundle/aplaws/addendum-3rd-level/make/make-hierarchy-nav-1.03-addendum.xsl b/ccm-ldn-aplaws/bundles/complete/res/bundle/aplaws/addendum-3rd-level/make/make-hierarchy-nav-1.03-addendum.xsl
similarity index 100%
rename from ccm-ldn-aplaws/bundles/extended/res/bundle/aplaws/addendum-3rd-level/make/make-hierarchy-nav-1.03-addendum.xsl
rename to ccm-ldn-aplaws/bundles/complete/res/bundle/aplaws/addendum-3rd-level/make/make-hierarchy-nav-1.03-addendum.xsl
diff --git a/ccm-ldn-aplaws/bundles/extended/res/bundle/aplaws/addendum-3rd-level/make/make.sh b/ccm-ldn-aplaws/bundles/complete/res/bundle/aplaws/addendum-3rd-level/make/make.sh
similarity index 100%
rename from ccm-ldn-aplaws/bundles/extended/res/bundle/aplaws/addendum-3rd-level/make/make.sh
rename to ccm-ldn-aplaws/bundles/complete/res/bundle/aplaws/addendum-3rd-level/make/make.sh
diff --git a/ccm-ldn-aplaws/bundles/extended/res/bundle/aplaws/addendum-3rd-level/upgrade.sh b/ccm-ldn-aplaws/bundles/complete/res/bundle/aplaws/addendum-3rd-level/upgrade.sh
similarity index 100%
rename from ccm-ldn-aplaws/bundles/extended/res/bundle/aplaws/addendum-3rd-level/upgrade.sh
rename to ccm-ldn-aplaws/bundles/complete/res/bundle/aplaws/addendum-3rd-level/upgrade.sh
diff --git a/ccm-ldn-aplaws/bundles/extended/res/bundle/aplaws/addendum/Readme.txt b/ccm-ldn-aplaws/bundles/complete/res/bundle/aplaws/addendum/Readme.txt
similarity index 100%
rename from ccm-ldn-aplaws/bundles/extended/res/bundle/aplaws/addendum/Readme.txt
rename to ccm-ldn-aplaws/bundles/complete/res/bundle/aplaws/addendum/Readme.txt
diff --git a/ccm-ldn-aplaws/bundles/extended/res/bundle/aplaws/addendum/domain-nav-1.03-addendum.xml b/ccm-ldn-aplaws/bundles/complete/res/bundle/aplaws/addendum/domain-nav-1.03-addendum.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/extended/res/bundle/aplaws/addendum/domain-nav-1.03-addendum.xml
rename to ccm-ldn-aplaws/bundles/complete/res/bundle/aplaws/addendum/domain-nav-1.03-addendum.xml
diff --git a/ccm-ldn-aplaws/bundles/extended/res/bundle/aplaws/addendum/hierarchy-nav-1.03-addendum.xml b/ccm-ldn-aplaws/bundles/complete/res/bundle/aplaws/addendum/hierarchy-nav-1.03-addendum.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/extended/res/bundle/aplaws/addendum/hierarchy-nav-1.03-addendum.xml
rename to ccm-ldn-aplaws/bundles/complete/res/bundle/aplaws/addendum/hierarchy-nav-1.03-addendum.xml
diff --git a/ccm-ldn-aplaws/bundles/extended/res/bundle/aplaws/addendum/make/combined-hierlgcl-hieranav.xml b/ccm-ldn-aplaws/bundles/complete/res/bundle/aplaws/addendum/make/combined-hierlgcl-hieranav.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/extended/res/bundle/aplaws/addendum/make/combined-hierlgcl-hieranav.xml
rename to ccm-ldn-aplaws/bundles/complete/res/bundle/aplaws/addendum/make/combined-hierlgcl-hieranav.xml
diff --git a/ccm-ldn-aplaws/bundles/extended/res/bundle/aplaws/addendum/make/combined-lgcl-and-anav.xml b/ccm-ldn-aplaws/bundles/complete/res/bundle/aplaws/addendum/make/combined-lgcl-and-anav.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/extended/res/bundle/aplaws/addendum/make/combined-lgcl-and-anav.xml
rename to ccm-ldn-aplaws/bundles/complete/res/bundle/aplaws/addendum/make/combined-lgcl-and-anav.xml
diff --git a/ccm-ldn-aplaws/bundles/extended/res/bundle/aplaws/addendum/make/make-domain-nav-1.03-addendum.xsl b/ccm-ldn-aplaws/bundles/complete/res/bundle/aplaws/addendum/make/make-domain-nav-1.03-addendum.xsl
similarity index 100%
rename from ccm-ldn-aplaws/bundles/extended/res/bundle/aplaws/addendum/make/make-domain-nav-1.03-addendum.xsl
rename to ccm-ldn-aplaws/bundles/complete/res/bundle/aplaws/addendum/make/make-domain-nav-1.03-addendum.xsl
diff --git a/ccm-ldn-aplaws/bundles/extended/res/bundle/aplaws/addendum/make/make-hierarchy-nav-1.03-addendum.xsl b/ccm-ldn-aplaws/bundles/complete/res/bundle/aplaws/addendum/make/make-hierarchy-nav-1.03-addendum.xsl
similarity index 100%
rename from ccm-ldn-aplaws/bundles/extended/res/bundle/aplaws/addendum/make/make-hierarchy-nav-1.03-addendum.xsl
rename to ccm-ldn-aplaws/bundles/complete/res/bundle/aplaws/addendum/make/make-hierarchy-nav-1.03-addendum.xsl
diff --git a/ccm-ldn-aplaws/bundles/extended/res/bundle/aplaws/addendum/make/make-mapping-lgcl-1.03-anav-1.03-addendum.xsl b/ccm-ldn-aplaws/bundles/complete/res/bundle/aplaws/addendum/make/make-mapping-lgcl-1.03-anav-1.03-addendum.xsl
similarity index 100%
rename from ccm-ldn-aplaws/bundles/extended/res/bundle/aplaws/addendum/make/make-mapping-lgcl-1.03-anav-1.03-addendum.xsl
rename to ccm-ldn-aplaws/bundles/complete/res/bundle/aplaws/addendum/make/make-mapping-lgcl-1.03-anav-1.03-addendum.xsl
diff --git a/ccm-ldn-aplaws/bundles/extended/res/bundle/aplaws/addendum/mapping-lgcl-1.03-anav-1.03-addendum.xml b/ccm-ldn-aplaws/bundles/complete/res/bundle/aplaws/addendum/mapping-lgcl-1.03-anav-1.03-addendum.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/extended/res/bundle/aplaws/addendum/mapping-lgcl-1.03-anav-1.03-addendum.xml
rename to ccm-ldn-aplaws/bundles/complete/res/bundle/aplaws/addendum/mapping-lgcl-1.03-anav-1.03-addendum.xml
diff --git a/ccm-ldn-aplaws/bundles/extended/res/bundle/aplaws/domain-nav-1.03.xml b/ccm-ldn-aplaws/bundles/complete/res/bundle/aplaws/domain-nav-1.03.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/extended/res/bundle/aplaws/domain-nav-1.03.xml
rename to ccm-ldn-aplaws/bundles/complete/res/bundle/aplaws/domain-nav-1.03.xml
diff --git a/ccm-ldn-aplaws/bundles/extended/res/bundle/aplaws/domain-rss-1.00.xml b/ccm-ldn-aplaws/bundles/complete/res/bundle/aplaws/domain-rss-1.00.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/extended/res/bundle/aplaws/domain-rss-1.00.xml
rename to ccm-ldn-aplaws/bundles/complete/res/bundle/aplaws/domain-rss-1.00.xml
diff --git a/ccm-ldn-aplaws/bundles/extended/res/bundle/aplaws/hierarchy-nav-1.03.xml b/ccm-ldn-aplaws/bundles/complete/res/bundle/aplaws/hierarchy-nav-1.03.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/extended/res/bundle/aplaws/hierarchy-nav-1.03.xml
rename to ccm-ldn-aplaws/bundles/complete/res/bundle/aplaws/hierarchy-nav-1.03.xml
diff --git a/ccm-ldn-aplaws/bundles/extended/res/bundle/aplaws/hierarchy-rss-1.00.xml b/ccm-ldn-aplaws/bundles/complete/res/bundle/aplaws/hierarchy-rss-1.00.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/extended/res/bundle/aplaws/hierarchy-rss-1.00.xml
rename to ccm-ldn-aplaws/bundles/complete/res/bundle/aplaws/hierarchy-rss-1.00.xml
diff --git a/ccm-ldn-aplaws/bundles/extended/res/bundle/aplaws/mapping-lgcl-1.03-anav-1.03.xml b/ccm-ldn-aplaws/bundles/complete/res/bundle/aplaws/mapping-lgcl-1.03-anav-1.03.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/extended/res/bundle/aplaws/mapping-lgcl-1.03-anav-1.03.xml
rename to ccm-ldn-aplaws/bundles/complete/res/bundle/aplaws/mapping-lgcl-1.03-anav-1.03.xml
diff --git a/ccm-ldn-aplaws/bundles/extended/res/bundle/aplaws/mapping-lgcl-1.03-anav-1.03.xsl b/ccm-ldn-aplaws/bundles/complete/res/bundle/aplaws/mapping-lgcl-1.03-anav-1.03.xsl
similarity index 100%
rename from ccm-ldn-aplaws/bundles/extended/res/bundle/aplaws/mapping-lgcl-1.03-anav-1.03.xsl
rename to ccm-ldn-aplaws/bundles/complete/res/bundle/aplaws/mapping-lgcl-1.03-anav-1.03.xsl
diff --git a/ccm-ldn-aplaws/bundles/extended/res/bundle/categories/placeholder.info b/ccm-ldn-aplaws/bundles/complete/res/bundle/categories/placeholder.info
similarity index 100%
rename from ccm-ldn-aplaws/bundles/extended/res/bundle/categories/placeholder.info
rename to ccm-ldn-aplaws/bundles/complete/res/bundle/categories/placeholder.info
diff --git a/ccm-ldn-aplaws/bundles/extended/res/bundle/categories/xample-nav-domain.xml b/ccm-ldn-aplaws/bundles/complete/res/bundle/categories/xample-nav-domain.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/extended/res/bundle/categories/xample-nav-domain.xml
rename to ccm-ldn-aplaws/bundles/complete/res/bundle/categories/xample-nav-domain.xml
diff --git a/ccm-ldn-aplaws/bundles/extended/res/bundle/categories/xample-nav-hierarchy.xml b/ccm-ldn-aplaws/bundles/complete/res/bundle/categories/xample-nav-hierarchy.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/extended/res/bundle/categories/xample-nav-hierarchy.xml
rename to ccm-ldn-aplaws/bundles/complete/res/bundle/categories/xample-nav-hierarchy.xml
diff --git a/ccm-ldn-aplaws/bundles/extended/res/bundle/categories/xample-nav-mapping-lgcl-anav.xml b/ccm-ldn-aplaws/bundles/complete/res/bundle/categories/xample-nav-mapping-lgcl-anav.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/extended/res/bundle/categories/xample-nav-mapping-lgcl-anav.xml
rename to ccm-ldn-aplaws/bundles/complete/res/bundle/categories/xample-nav-mapping-lgcl-anav.xml
diff --git a/ccm-ldn-aplaws/bundles/extended/res/bundle/categories/xample-nav-mapping-lgcl-anav.xsl b/ccm-ldn-aplaws/bundles/complete/res/bundle/categories/xample-nav-mapping-lgcl-anav.xsl
similarity index 100%
rename from ccm-ldn-aplaws/bundles/extended/res/bundle/categories/xample-nav-mapping-lgcl-anav.xsl
rename to ccm-ldn-aplaws/bundles/complete/res/bundle/categories/xample-nav-mapping-lgcl-anav.xsl
diff --git a/ccm-ldn-aplaws/bundles/extended/res/bundle/esd-toolkit/domain-gcl-2.10.xml b/ccm-ldn-aplaws/bundles/complete/res/bundle/esd-toolkit/domain-gcl-2.10.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/extended/res/bundle/esd-toolkit/domain-gcl-2.10.xml
rename to ccm-ldn-aplaws/bundles/complete/res/bundle/esd-toolkit/domain-gcl-2.10.xml
diff --git a/ccm-ldn-aplaws/bundles/extended/res/bundle/esd-toolkit/domain-lgal-0.01.xml b/ccm-ldn-aplaws/bundles/complete/res/bundle/esd-toolkit/domain-lgal-0.01.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/extended/res/bundle/esd-toolkit/domain-lgal-0.01.xml
rename to ccm-ldn-aplaws/bundles/complete/res/bundle/esd-toolkit/domain-lgal-0.01.xml
diff --git a/ccm-ldn-aplaws/bundles/extended/res/bundle/esd-toolkit/domain-lgcl-1.04.xml b/ccm-ldn-aplaws/bundles/complete/res/bundle/esd-toolkit/domain-lgcl-1.04.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/extended/res/bundle/esd-toolkit/domain-lgcl-1.04.xml
rename to ccm-ldn-aplaws/bundles/complete/res/bundle/esd-toolkit/domain-lgcl-1.04.xml
diff --git a/ccm-ldn-aplaws/bundles/extended/res/bundle/esd-toolkit/domain-lgcl-lite-1.04.xml b/ccm-ldn-aplaws/bundles/complete/res/bundle/esd-toolkit/domain-lgcl-lite-1.04.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/extended/res/bundle/esd-toolkit/domain-lgcl-lite-1.04.xml
rename to ccm-ldn-aplaws/bundles/complete/res/bundle/esd-toolkit/domain-lgcl-lite-1.04.xml
diff --git a/ccm-ldn-aplaws/bundles/extended/res/bundle/esd-toolkit/domain-lgdl-2.01.xml b/ccm-ldn-aplaws/bundles/complete/res/bundle/esd-toolkit/domain-lgdl-2.01.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/extended/res/bundle/esd-toolkit/domain-lgdl-2.01.xml
rename to ccm-ldn-aplaws/bundles/complete/res/bundle/esd-toolkit/domain-lgdl-2.01.xml
diff --git a/ccm-ldn-aplaws/bundles/extended/res/bundle/esd-toolkit/domain-lgil-0.01.xml b/ccm-ldn-aplaws/bundles/complete/res/bundle/esd-toolkit/domain-lgil-0.01.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/extended/res/bundle/esd-toolkit/domain-lgil-0.01.xml
rename to ccm-ldn-aplaws/bundles/complete/res/bundle/esd-toolkit/domain-lgil-0.01.xml
diff --git a/ccm-ldn-aplaws/bundles/extended/res/bundle/esd-toolkit/domain-lgsl-2.01.xml b/ccm-ldn-aplaws/bundles/complete/res/bundle/esd-toolkit/domain-lgsl-2.01.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/extended/res/bundle/esd-toolkit/domain-lgsl-2.01.xml
rename to ccm-ldn-aplaws/bundles/complete/res/bundle/esd-toolkit/domain-lgsl-2.01.xml
diff --git a/ccm-ldn-aplaws/bundles/extended/res/bundle/esd-toolkit/hierarchy-lgcl-1.04.xml b/ccm-ldn-aplaws/bundles/complete/res/bundle/esd-toolkit/hierarchy-lgcl-1.04.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/extended/res/bundle/esd-toolkit/hierarchy-lgcl-1.04.xml
rename to ccm-ldn-aplaws/bundles/complete/res/bundle/esd-toolkit/hierarchy-lgcl-1.04.xml
diff --git a/ccm-ldn-aplaws/bundles/extended/res/bundle/esd-toolkit/hierarchy-lgcl-lite-1.04.xml b/ccm-ldn-aplaws/bundles/complete/res/bundle/esd-toolkit/hierarchy-lgcl-lite-1.04.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/extended/res/bundle/esd-toolkit/hierarchy-lgcl-lite-1.04.xml
rename to ccm-ldn-aplaws/bundles/complete/res/bundle/esd-toolkit/hierarchy-lgcl-lite-1.04.xml
diff --git a/ccm-ldn-aplaws/bundles/extended/res/bundle/esd-toolkit/hierarchy-lgdl-2.01-lgsl-2.01.xml b/ccm-ldn-aplaws/bundles/complete/res/bundle/esd-toolkit/hierarchy-lgdl-2.01-lgsl-2.01.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/extended/res/bundle/esd-toolkit/hierarchy-lgdl-2.01-lgsl-2.01.xml
rename to ccm-ldn-aplaws/bundles/complete/res/bundle/esd-toolkit/hierarchy-lgdl-2.01-lgsl-2.01.xml
diff --git a/ccm-ldn-aplaws/bundles/extended/res/bundle/esd-toolkit/hierarchy-lgdl-2.01.xml b/ccm-ldn-aplaws/bundles/complete/res/bundle/esd-toolkit/hierarchy-lgdl-2.01.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/extended/res/bundle/esd-toolkit/hierarchy-lgdl-2.01.xml
rename to ccm-ldn-aplaws/bundles/complete/res/bundle/esd-toolkit/hierarchy-lgdl-2.01.xml
diff --git a/ccm-ldn-aplaws/bundles/extended/res/bundle/esd-toolkit/hierarchy-lgil-0.01.xml b/ccm-ldn-aplaws/bundles/complete/res/bundle/esd-toolkit/hierarchy-lgil-0.01.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/extended/res/bundle/esd-toolkit/hierarchy-lgil-0.01.xml
rename to ccm-ldn-aplaws/bundles/complete/res/bundle/esd-toolkit/hierarchy-lgil-0.01.xml
diff --git a/ccm-ldn-aplaws/bundles/extended/res/bundle/esd-toolkit/lite-to-full/hierarchy-lgcl-1.03-addendum.xml b/ccm-ldn-aplaws/bundles/complete/res/bundle/esd-toolkit/lite-to-full/hierarchy-lgcl-1.03-addendum.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/extended/res/bundle/esd-toolkit/lite-to-full/hierarchy-lgcl-1.03-addendum.xml
rename to ccm-ldn-aplaws/bundles/complete/res/bundle/esd-toolkit/lite-to-full/hierarchy-lgcl-1.03-addendum.xml
diff --git a/ccm-ldn-aplaws/bundles/extended/res/bundle/esd-toolkit/lite-to-full/lgcl-1.03-addendum.xml b/ccm-ldn-aplaws/bundles/complete/res/bundle/esd-toolkit/lite-to-full/lgcl-1.03-addendum.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/extended/res/bundle/esd-toolkit/lite-to-full/lgcl-1.03-addendum.xml
rename to ccm-ldn-aplaws/bundles/complete/res/bundle/esd-toolkit/lite-to-full/lgcl-1.03-addendum.xml
diff --git a/ccm-ldn-aplaws/bundles/extended/res/bundle/esd-toolkit/lite-to-full/make/combined-hier-lgcl-and-lgcllite.xml b/ccm-ldn-aplaws/bundles/complete/res/bundle/esd-toolkit/lite-to-full/make/combined-hier-lgcl-and-lgcllite.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/extended/res/bundle/esd-toolkit/lite-to-full/make/combined-hier-lgcl-and-lgcllite.xml
rename to ccm-ldn-aplaws/bundles/complete/res/bundle/esd-toolkit/lite-to-full/make/combined-hier-lgcl-and-lgcllite.xml
diff --git a/ccm-ldn-aplaws/bundles/extended/res/bundle/esd-toolkit/lite-to-full/make/combined-lgcl-and-lgcllite.xml b/ccm-ldn-aplaws/bundles/complete/res/bundle/esd-toolkit/lite-to-full/make/combined-lgcl-and-lgcllite.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/extended/res/bundle/esd-toolkit/lite-to-full/make/combined-lgcl-and-lgcllite.xml
rename to ccm-ldn-aplaws/bundles/complete/res/bundle/esd-toolkit/lite-to-full/make/combined-lgcl-and-lgcllite.xml
diff --git a/ccm-ldn-aplaws/bundles/extended/res/bundle/esd-toolkit/lite-to-full/make/make-hierarchy-lgcl-1.03-addendum.xsl b/ccm-ldn-aplaws/bundles/complete/res/bundle/esd-toolkit/lite-to-full/make/make-hierarchy-lgcl-1.03-addendum.xsl
similarity index 100%
rename from ccm-ldn-aplaws/bundles/extended/res/bundle/esd-toolkit/lite-to-full/make/make-hierarchy-lgcl-1.03-addendum.xsl
rename to ccm-ldn-aplaws/bundles/complete/res/bundle/esd-toolkit/lite-to-full/make/make-hierarchy-lgcl-1.03-addendum.xsl
diff --git a/ccm-ldn-aplaws/bundles/extended/res/bundle/esd-toolkit/lite-to-full/make/make-lgcl-1.03-addendum.xsl b/ccm-ldn-aplaws/bundles/complete/res/bundle/esd-toolkit/lite-to-full/make/make-lgcl-1.03-addendum.xsl
similarity index 100%
rename from ccm-ldn-aplaws/bundles/extended/res/bundle/esd-toolkit/lite-to-full/make/make-lgcl-1.03-addendum.xsl
rename to ccm-ldn-aplaws/bundles/complete/res/bundle/esd-toolkit/lite-to-full/make/make-lgcl-1.03-addendum.xsl
diff --git a/ccm-ldn-aplaws/bundles/extended/res/bundle/esd-toolkit/lite-to-full/upgrade.sh b/ccm-ldn-aplaws/bundles/complete/res/bundle/esd-toolkit/lite-to-full/upgrade.sh
similarity index 100%
rename from ccm-ldn-aplaws/bundles/extended/res/bundle/esd-toolkit/lite-to-full/upgrade.sh
rename to ccm-ldn-aplaws/bundles/complete/res/bundle/esd-toolkit/lite-to-full/upgrade.sh
diff --git a/ccm-ldn-aplaws/bundles/extended/res/bundle/esd-toolkit/mapping-lgcl-1.04-gcl-2.10.xml b/ccm-ldn-aplaws/bundles/complete/res/bundle/esd-toolkit/mapping-lgcl-1.04-gcl-2.10.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/extended/res/bundle/esd-toolkit/mapping-lgcl-1.04-gcl-2.10.xml
rename to ccm-ldn-aplaws/bundles/complete/res/bundle/esd-toolkit/mapping-lgcl-1.04-gcl-2.10.xml
diff --git a/ccm-ldn-aplaws/bundles/extended/res/bundle/esd-toolkit/mapping-lgcl-1.04-lgsl-2.01.xml b/ccm-ldn-aplaws/bundles/complete/res/bundle/esd-toolkit/mapping-lgcl-1.04-lgsl-2.01.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/extended/res/bundle/esd-toolkit/mapping-lgcl-1.04-lgsl-2.01.xml
rename to ccm-ldn-aplaws/bundles/complete/res/bundle/esd-toolkit/mapping-lgcl-1.04-lgsl-2.01.xml
diff --git a/ccm-ldn-aplaws/bundles/extended/res/bundle/esd-toolkit/mapping-lgsl-2.00-lgcl-1.04.xml b/ccm-ldn-aplaws/bundles/complete/res/bundle/esd-toolkit/mapping-lgsl-2.00-lgcl-1.04.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/extended/res/bundle/esd-toolkit/mapping-lgsl-2.00-lgcl-1.04.xml
rename to ccm-ldn-aplaws/bundles/complete/res/bundle/esd-toolkit/mapping-lgsl-2.00-lgcl-1.04.xml
diff --git a/ccm-ldn-aplaws/bundles/extended/res/bundle/esd-toolkit/related-lgcl-1.04.xml b/ccm-ldn-aplaws/bundles/complete/res/bundle/esd-toolkit/related-lgcl-1.04.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/extended/res/bundle/esd-toolkit/related-lgcl-1.04.xml
rename to ccm-ldn-aplaws/bundles/complete/res/bundle/esd-toolkit/related-lgcl-1.04.xml
diff --git a/ccm-ldn-aplaws/bundles/extended/res/bundle/navigation/placeholder.info b/ccm-ldn-aplaws/bundles/complete/res/bundle/navigation/placeholder.info
similarity index 100%
rename from ccm-ldn-aplaws/bundles/extended/res/bundle/navigation/placeholder.info
rename to ccm-ldn-aplaws/bundles/complete/res/bundle/navigation/placeholder.info
diff --git a/ccm-ldn-aplaws/bundles/extended/res/bundle/navigation/templates.txt b/ccm-ldn-aplaws/bundles/complete/res/bundle/navigation/templates.txt
similarity index 100%
rename from ccm-ldn-aplaws/bundles/extended/res/bundle/navigation/templates.txt
rename to ccm-ldn-aplaws/bundles/complete/res/bundle/navigation/templates.txt
diff --git a/ccm-ldn-aplaws/bundles/extended/res/placeholder.info b/ccm-ldn-aplaws/bundles/complete/res/placeholder.info
similarity index 100%
rename from ccm-ldn-aplaws/bundles/extended/res/placeholder.info
rename to ccm-ldn-aplaws/bundles/complete/res/placeholder.info
diff --git a/ccm-ldn-aplaws/bundles/extended/templates/placeholder.info b/ccm-ldn-aplaws/bundles/complete/templates/placeholder.info
similarity index 100%
rename from ccm-ldn-aplaws/bundles/extended/templates/placeholder.info
rename to ccm-ldn-aplaws/bundles/complete/templates/placeholder.info
diff --git a/ccm-ldn-aplaws/bundles/extended/themes/master/dummy b/ccm-ldn-aplaws/bundles/complete/themes/master/dummy
similarity index 100%
rename from ccm-ldn-aplaws/bundles/extended/themes/master/dummy
rename to ccm-ldn-aplaws/bundles/complete/themes/master/dummy
diff --git a/ccm-ldn-aplaws/bundles/extended/themes/placeholder.info b/ccm-ldn-aplaws/bundles/complete/themes/placeholder.info
similarity index 100%
rename from ccm-ldn-aplaws/bundles/extended/themes/placeholder.info
rename to ccm-ldn-aplaws/bundles/complete/themes/placeholder.info
diff --git a/ccm-ldn-aplaws/bundles/devel/cfg/project.xml b/ccm-ldn-aplaws/bundles/devel/cfg/project.xml
index 3ef78a650..8e381b5dd 100755
--- a/ccm-ldn-aplaws/bundles/devel/cfg/project.xml
+++ b/ccm-ldn-aplaws/bundles/devel/cfg/project.xml
@@ -91,13 +91,13 @@
         <ccm:application name="ccm-ldn-types-esdservice"/>
 
 <!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
-<!--   Extended Bundle                                                       -->
+<!--   Complete Bundle   DEPRECATED!                                         -->
 <!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
 
-<!--   Extended Bundle's Content Assets   -->
+<!--   Complete Bundle's Content Assets   -->
         <ccm:application name="ccm-cms-assets-imagestep"/>
 
-<!--   Extended Bundle's  Content Types   -->
+<!--   Complete Bundle's  Content Types   -->
         <ccm:application name="ccm-cms-types-agenda"/>
         <ccm:application name="ccm-cms-types-bookmark"/>
         <ccm:application name="ccm-cms-types-event"/>
@@ -115,7 +115,7 @@
              neither it does not appear in content center -->
         <ccm:application name="ccm-cms-types-motditem"/>
 
-<!--   Extended Bundle's Applications   -->
+<!--   Complete Bundle's Applications   -->
         <ccm:application name="ccm-atoz-siteproxy"/> <!-- requires siteproxy!--> 
         <ccm:application name="ccm-auth-http"/>
         <!--  currently doesn't work for unknown reason                      -->
@@ -124,7 +124,7 @@
         <ccm:application name="ccm-formbuilder-pdf"/>
         <ccm:application name="ccm-ldn-userpreferences"/>
 
-<!--   Extended Bundle's  LDN extensions  -->
+<!--   Complete Bundle's  LDN extensions  -->
         <ccm:application name="ccm-ldn-exporter"/>
         <ccm:application name="ccm-ldn-freeform"/>