diff --git a/ccm-bundle/application.xml b/ccm-cms-bundle/application.xml
similarity index 100%
rename from ccm-bundle/application.xml
rename to ccm-cms-bundle/application.xml
diff --git a/ccm-bundle/bundles/base/AUTHORS b/ccm-cms-bundle/bundles/base/AUTHORS
similarity index 100%
rename from ccm-bundle/bundles/base/AUTHORS
rename to ccm-cms-bundle/bundles/base/AUTHORS
diff --git a/ccm-bundle/bundles/base/ChangeLog b/ccm-cms-bundle/bundles/base/ChangeLog
similarity index 100%
rename from ccm-bundle/bundles/base/ChangeLog
rename to ccm-cms-bundle/bundles/base/ChangeLog
diff --git a/ccm-bundle/bundles/base/NEWS b/ccm-cms-bundle/bundles/base/NEWS
similarity index 100%
rename from ccm-bundle/bundles/base/NEWS
rename to ccm-cms-bundle/bundles/base/NEWS
diff --git a/ccm-bundle/bundles/base/README b/ccm-cms-bundle/bundles/base/README
similarity index 100%
rename from ccm-bundle/bundles/base/README
rename to ccm-cms-bundle/bundles/base/README
diff --git a/ccm-bundle/bundles/base/bundle.in b/ccm-cms-bundle/bundles/base/bundle.in
similarity index 100%
rename from ccm-bundle/bundles/base/bundle.in
rename to ccm-cms-bundle/bundles/base/bundle.in
diff --git a/ccm-bundle/bundles/base/cfg/integration.properties b/ccm-cms-bundle/bundles/base/cfg/integration.properties
similarity index 100%
rename from ccm-bundle/bundles/base/cfg/integration.properties
rename to ccm-cms-bundle/bundles/base/cfg/integration.properties
diff --git a/ccm-bundle/bundles/base/cfg/libre-web.xml b/ccm-cms-bundle/bundles/base/cfg/libre-web.xml
similarity index 100%
rename from ccm-bundle/bundles/base/cfg/libre-web.xml
rename to ccm-cms-bundle/bundles/base/cfg/libre-web.xml
diff --git a/ccm-bundle/bundles/base/cfg/project.xml b/ccm-cms-bundle/bundles/base/cfg/project.xml
similarity index 100%
rename from ccm-bundle/bundles/base/cfg/project.xml
rename to ccm-cms-bundle/bundles/base/cfg/project.xml
diff --git a/ccm-bundle/bundles/base/res/bundle/categories/gen-nav-domain-1.00.xml b/ccm-cms-bundle/bundles/base/res/bundle/categories/gen-nav-domain-1.00.xml
similarity index 100%
rename from ccm-bundle/bundles/base/res/bundle/categories/gen-nav-domain-1.00.xml
rename to ccm-cms-bundle/bundles/base/res/bundle/categories/gen-nav-domain-1.00.xml
diff --git a/ccm-bundle/bundles/base/res/bundle/categories/gen-nav-hierarchy-1.00.xml b/ccm-cms-bundle/bundles/base/res/bundle/categories/gen-nav-hierarchy-1.00.xml
similarity index 100%
rename from ccm-bundle/bundles/base/res/bundle/categories/gen-nav-hierarchy-1.00.xml
rename to ccm-cms-bundle/bundles/base/res/bundle/categories/gen-nav-hierarchy-1.00.xml
diff --git a/ccm-bundle/bundles/base/res/bundle/categories/placeholder.info b/ccm-cms-bundle/bundles/base/res/bundle/categories/placeholder.info
similarity index 100%
rename from ccm-bundle/bundles/base/res/bundle/categories/placeholder.info
rename to ccm-cms-bundle/bundles/base/res/bundle/categories/placeholder.info
diff --git a/ccm-bundle/bundles/base/res/bundle/categories/xample-nav-domain.xml b/ccm-cms-bundle/bundles/base/res/bundle/categories/xample-nav-domain.xml
similarity index 100%
rename from ccm-bundle/bundles/base/res/bundle/categories/xample-nav-domain.xml
rename to ccm-cms-bundle/bundles/base/res/bundle/categories/xample-nav-domain.xml
diff --git a/ccm-bundle/bundles/base/res/bundle/categories/xample-nav-hierarchy.xml b/ccm-cms-bundle/bundles/base/res/bundle/categories/xample-nav-hierarchy.xml
similarity index 100%
rename from ccm-bundle/bundles/base/res/bundle/categories/xample-nav-hierarchy.xml
rename to ccm-cms-bundle/bundles/base/res/bundle/categories/xample-nav-hierarchy.xml
diff --git a/ccm-bundle/bundles/base/res/bundle/categories/xample-nav-mapping-lgcl-anav.xml b/ccm-cms-bundle/bundles/base/res/bundle/categories/xample-nav-mapping-lgcl-anav.xml
similarity index 100%
rename from ccm-bundle/bundles/base/res/bundle/categories/xample-nav-mapping-lgcl-anav.xml
rename to ccm-cms-bundle/bundles/base/res/bundle/categories/xample-nav-mapping-lgcl-anav.xml
diff --git a/ccm-bundle/bundles/base/res/bundle/categories/xample-nav-mapping-lgcl-anav.xsl b/ccm-cms-bundle/bundles/base/res/bundle/categories/xample-nav-mapping-lgcl-anav.xsl
similarity index 100%
rename from ccm-bundle/bundles/base/res/bundle/categories/xample-nav-mapping-lgcl-anav.xsl
rename to ccm-cms-bundle/bundles/base/res/bundle/categories/xample-nav-mapping-lgcl-anav.xsl
diff --git a/ccm-bundle/bundles/base/res/bundle/navigation/gen-templates.txt b/ccm-cms-bundle/bundles/base/res/bundle/navigation/gen-templates.txt
similarity index 100%
rename from ccm-bundle/bundles/base/res/bundle/navigation/gen-templates.txt
rename to ccm-cms-bundle/bundles/base/res/bundle/navigation/gen-templates.txt
diff --git a/ccm-bundle/bundles/base/res/placeholder.info b/ccm-cms-bundle/bundles/base/res/placeholder.info
similarity index 100%
rename from ccm-bundle/bundles/base/res/placeholder.info
rename to ccm-cms-bundle/bundles/base/res/placeholder.info
diff --git a/ccm-bundle/bundles/base/templates/placeholder.info b/ccm-cms-bundle/bundles/base/templates/placeholder.info
similarity index 100%
rename from ccm-bundle/bundles/base/templates/placeholder.info
rename to ccm-cms-bundle/bundles/base/templates/placeholder.info
diff --git a/ccm-bundle/bundles/base/themes/README b/ccm-cms-bundle/bundles/base/themes/README
similarity index 100%
rename from ccm-bundle/bundles/base/themes/README
rename to ccm-cms-bundle/bundles/base/themes/README
diff --git a/ccm-bundle/bundles/base/themes/master/dummy b/ccm-cms-bundle/bundles/base/themes/master/dummy
similarity index 100%
rename from ccm-bundle/bundles/base/themes/master/dummy
rename to ccm-cms-bundle/bundles/base/themes/master/dummy
diff --git a/ccm-bundle/bundles/base/themes/placeholder.info b/ccm-cms-bundle/bundles/base/themes/placeholder.info
similarity index 100%
rename from ccm-bundle/bundles/base/themes/placeholder.info
rename to ccm-cms-bundle/bundles/base/themes/placeholder.info
diff --git a/ccm-bundle/bundles/demo/AUTHORS b/ccm-cms-bundle/bundles/demo/AUTHORS
similarity index 100%
rename from ccm-bundle/bundles/demo/AUTHORS
rename to ccm-cms-bundle/bundles/demo/AUTHORS
diff --git a/ccm-bundle/bundles/demo/ChangeLog b/ccm-cms-bundle/bundles/demo/ChangeLog
similarity index 100%
rename from ccm-bundle/bundles/demo/ChangeLog
rename to ccm-cms-bundle/bundles/demo/ChangeLog
diff --git a/ccm-bundle/bundles/demo/NEWS b/ccm-cms-bundle/bundles/demo/NEWS
similarity index 100%
rename from ccm-bundle/bundles/demo/NEWS
rename to ccm-cms-bundle/bundles/demo/NEWS
diff --git a/ccm-bundle/bundles/demo/README b/ccm-cms-bundle/bundles/demo/README
similarity index 100%
rename from ccm-bundle/bundles/demo/README
rename to ccm-cms-bundle/bundles/demo/README
diff --git a/ccm-bundle/bundles/demo/bundle.in b/ccm-cms-bundle/bundles/demo/bundle.in
similarity index 100%
rename from ccm-bundle/bundles/demo/bundle.in
rename to ccm-cms-bundle/bundles/demo/bundle.in
diff --git a/ccm-bundle/bundles/demo/cfg/integration.properties b/ccm-cms-bundle/bundles/demo/cfg/integration.properties
similarity index 100%
rename from ccm-bundle/bundles/demo/cfg/integration.properties
rename to ccm-cms-bundle/bundles/demo/cfg/integration.properties
diff --git a/ccm-bundle/bundles/demo/cfg/libre-web.xml b/ccm-cms-bundle/bundles/demo/cfg/libre-web.xml
similarity index 100%
rename from ccm-bundle/bundles/demo/cfg/libre-web.xml
rename to ccm-cms-bundle/bundles/demo/cfg/libre-web.xml
diff --git a/ccm-bundle/bundles/demo/cfg/project.xml b/ccm-cms-bundle/bundles/demo/cfg/project.xml
similarity index 100%
rename from ccm-bundle/bundles/demo/cfg/project.xml
rename to ccm-cms-bundle/bundles/demo/cfg/project.xml
diff --git a/ccm-bundle/bundles/demo/res/bundle/categories/gen-nav-domain-1.00.xml b/ccm-cms-bundle/bundles/demo/res/bundle/categories/gen-nav-domain-1.00.xml
similarity index 100%
rename from ccm-bundle/bundles/demo/res/bundle/categories/gen-nav-domain-1.00.xml
rename to ccm-cms-bundle/bundles/demo/res/bundle/categories/gen-nav-domain-1.00.xml
diff --git a/ccm-bundle/bundles/demo/res/bundle/categories/gen-nav-hierarchy-1.00.xml b/ccm-cms-bundle/bundles/demo/res/bundle/categories/gen-nav-hierarchy-1.00.xml
similarity index 100%
rename from ccm-bundle/bundles/demo/res/bundle/categories/gen-nav-hierarchy-1.00.xml
rename to ccm-cms-bundle/bundles/demo/res/bundle/categories/gen-nav-hierarchy-1.00.xml
diff --git a/ccm-bundle/bundles/demo/res/bundle/categories/placeholder.info b/ccm-cms-bundle/bundles/demo/res/bundle/categories/placeholder.info
similarity index 100%
rename from ccm-bundle/bundles/demo/res/bundle/categories/placeholder.info
rename to ccm-cms-bundle/bundles/demo/res/bundle/categories/placeholder.info
diff --git a/ccm-bundle/bundles/demo/res/bundle/categories/xample-nav-domain.xml b/ccm-cms-bundle/bundles/demo/res/bundle/categories/xample-nav-domain.xml
similarity index 100%
rename from ccm-bundle/bundles/demo/res/bundle/categories/xample-nav-domain.xml
rename to ccm-cms-bundle/bundles/demo/res/bundle/categories/xample-nav-domain.xml
diff --git a/ccm-bundle/bundles/demo/res/bundle/categories/xample-nav-hierarchy.xml b/ccm-cms-bundle/bundles/demo/res/bundle/categories/xample-nav-hierarchy.xml
similarity index 100%
rename from ccm-bundle/bundles/demo/res/bundle/categories/xample-nav-hierarchy.xml
rename to ccm-cms-bundle/bundles/demo/res/bundle/categories/xample-nav-hierarchy.xml
diff --git a/ccm-bundle/bundles/demo/res/bundle/categories/xample-nav-mapping-lgcl-anav.xml b/ccm-cms-bundle/bundles/demo/res/bundle/categories/xample-nav-mapping-lgcl-anav.xml
similarity index 100%
rename from ccm-bundle/bundles/demo/res/bundle/categories/xample-nav-mapping-lgcl-anav.xml
rename to ccm-cms-bundle/bundles/demo/res/bundle/categories/xample-nav-mapping-lgcl-anav.xml
diff --git a/ccm-bundle/bundles/demo/res/bundle/categories/xample-nav-mapping-lgcl-anav.xsl b/ccm-cms-bundle/bundles/demo/res/bundle/categories/xample-nav-mapping-lgcl-anav.xsl
similarity index 100%
rename from ccm-bundle/bundles/demo/res/bundle/categories/xample-nav-mapping-lgcl-anav.xsl
rename to ccm-cms-bundle/bundles/demo/res/bundle/categories/xample-nav-mapping-lgcl-anav.xsl
diff --git a/ccm-bundle/bundles/demo/res/bundle/navigation/gen-templates.txt b/ccm-cms-bundle/bundles/demo/res/bundle/navigation/gen-templates.txt
similarity index 100%
rename from ccm-bundle/bundles/demo/res/bundle/navigation/gen-templates.txt
rename to ccm-cms-bundle/bundles/demo/res/bundle/navigation/gen-templates.txt
diff --git a/ccm-bundle/bundles/demo/res/placeholder.info b/ccm-cms-bundle/bundles/demo/res/placeholder.info
similarity index 100%
rename from ccm-bundle/bundles/demo/res/placeholder.info
rename to ccm-cms-bundle/bundles/demo/res/placeholder.info
diff --git a/ccm-bundle/bundles/demo/templates/placeholder.info b/ccm-cms-bundle/bundles/demo/templates/placeholder.info
similarity index 100%
rename from ccm-bundle/bundles/demo/templates/placeholder.info
rename to ccm-cms-bundle/bundles/demo/templates/placeholder.info
diff --git a/ccm-bundle/bundles/demo/themes/README b/ccm-cms-bundle/bundles/demo/themes/README
similarity index 100%
rename from ccm-bundle/bundles/demo/themes/README
rename to ccm-cms-bundle/bundles/demo/themes/README
diff --git a/ccm-bundle/bundles/demo/themes/master/dummy b/ccm-cms-bundle/bundles/demo/themes/master/dummy
similarity index 100%
rename from ccm-bundle/bundles/demo/themes/master/dummy
rename to ccm-cms-bundle/bundles/demo/themes/master/dummy
diff --git a/ccm-bundle/bundles/demo/themes/placeholder.info b/ccm-cms-bundle/bundles/demo/themes/placeholder.info
similarity index 100%
rename from ccm-bundle/bundles/demo/themes/placeholder.info
rename to ccm-cms-bundle/bundles/demo/themes/placeholder.info
diff --git a/ccm-bundle/bundles/devel/AUTHORS b/ccm-cms-bundle/bundles/devel/AUTHORS
similarity index 100%
rename from ccm-bundle/bundles/devel/AUTHORS
rename to ccm-cms-bundle/bundles/devel/AUTHORS
diff --git a/ccm-bundle/bundles/devel/ChangeLog b/ccm-cms-bundle/bundles/devel/ChangeLog
similarity index 100%
rename from ccm-bundle/bundles/devel/ChangeLog
rename to ccm-cms-bundle/bundles/devel/ChangeLog
diff --git a/ccm-bundle/bundles/devel/NEWS b/ccm-cms-bundle/bundles/devel/NEWS
similarity index 100%
rename from ccm-bundle/bundles/devel/NEWS
rename to ccm-cms-bundle/bundles/devel/NEWS
diff --git a/ccm-bundle/bundles/devel/README b/ccm-cms-bundle/bundles/devel/README
similarity index 100%
rename from ccm-bundle/bundles/devel/README
rename to ccm-cms-bundle/bundles/devel/README
diff --git a/ccm-bundle/bundles/devel/bundle.in b/ccm-cms-bundle/bundles/devel/bundle.in
similarity index 100%
rename from ccm-bundle/bundles/devel/bundle.in
rename to ccm-cms-bundle/bundles/devel/bundle.in
diff --git a/ccm-bundle/bundles/devel/cfg/integration.properties b/ccm-cms-bundle/bundles/devel/cfg/integration.properties
similarity index 100%
rename from ccm-bundle/bundles/devel/cfg/integration.properties
rename to ccm-cms-bundle/bundles/devel/cfg/integration.properties
diff --git a/ccm-bundle/bundles/devel/cfg/libre-web.xml b/ccm-cms-bundle/bundles/devel/cfg/libre-web.xml
similarity index 100%
rename from ccm-bundle/bundles/devel/cfg/libre-web.xml
rename to ccm-cms-bundle/bundles/devel/cfg/libre-web.xml
diff --git a/ccm-bundle/bundles/devel/cfg/project.xml b/ccm-cms-bundle/bundles/devel/cfg/project.xml
similarity index 100%
rename from ccm-bundle/bundles/devel/cfg/project.xml
rename to ccm-cms-bundle/bundles/devel/cfg/project.xml
diff --git a/ccm-bundle/bundles/devel/res/bundle/categories/gen-nav-domain-1.00.xml b/ccm-cms-bundle/bundles/devel/res/bundle/categories/gen-nav-domain-1.00.xml
similarity index 100%
rename from ccm-bundle/bundles/devel/res/bundle/categories/gen-nav-domain-1.00.xml
rename to ccm-cms-bundle/bundles/devel/res/bundle/categories/gen-nav-domain-1.00.xml
diff --git a/ccm-bundle/bundles/devel/res/bundle/categories/gen-nav-hierarchy-1.00.xml b/ccm-cms-bundle/bundles/devel/res/bundle/categories/gen-nav-hierarchy-1.00.xml
similarity index 100%
rename from ccm-bundle/bundles/devel/res/bundle/categories/gen-nav-hierarchy-1.00.xml
rename to ccm-cms-bundle/bundles/devel/res/bundle/categories/gen-nav-hierarchy-1.00.xml
diff --git a/ccm-bundle/bundles/devel/res/bundle/categories/placeholder.info b/ccm-cms-bundle/bundles/devel/res/bundle/categories/placeholder.info
similarity index 100%
rename from ccm-bundle/bundles/devel/res/bundle/categories/placeholder.info
rename to ccm-cms-bundle/bundles/devel/res/bundle/categories/placeholder.info
diff --git a/ccm-bundle/bundles/devel/res/bundle/categories/xample-nav-domain.xml b/ccm-cms-bundle/bundles/devel/res/bundle/categories/xample-nav-domain.xml
similarity index 100%
rename from ccm-bundle/bundles/devel/res/bundle/categories/xample-nav-domain.xml
rename to ccm-cms-bundle/bundles/devel/res/bundle/categories/xample-nav-domain.xml
diff --git a/ccm-bundle/bundles/devel/res/bundle/categories/xample-nav-hierarchy.xml b/ccm-cms-bundle/bundles/devel/res/bundle/categories/xample-nav-hierarchy.xml
similarity index 100%
rename from ccm-bundle/bundles/devel/res/bundle/categories/xample-nav-hierarchy.xml
rename to ccm-cms-bundle/bundles/devel/res/bundle/categories/xample-nav-hierarchy.xml
diff --git a/ccm-bundle/bundles/devel/res/bundle/categories/xample-nav-mapping-lgcl-anav.xml b/ccm-cms-bundle/bundles/devel/res/bundle/categories/xample-nav-mapping-lgcl-anav.xml
similarity index 100%
rename from ccm-bundle/bundles/devel/res/bundle/categories/xample-nav-mapping-lgcl-anav.xml
rename to ccm-cms-bundle/bundles/devel/res/bundle/categories/xample-nav-mapping-lgcl-anav.xml
diff --git a/ccm-bundle/bundles/devel/res/bundle/categories/xample-nav-mapping-lgcl-anav.xsl b/ccm-cms-bundle/bundles/devel/res/bundle/categories/xample-nav-mapping-lgcl-anav.xsl
similarity index 100%
rename from ccm-bundle/bundles/devel/res/bundle/categories/xample-nav-mapping-lgcl-anav.xsl
rename to ccm-cms-bundle/bundles/devel/res/bundle/categories/xample-nav-mapping-lgcl-anav.xsl
diff --git a/ccm-bundle/bundles/devel/res/bundle/navigation/gen-templates.txt b/ccm-cms-bundle/bundles/devel/res/bundle/navigation/gen-templates.txt
similarity index 100%
rename from ccm-bundle/bundles/devel/res/bundle/navigation/gen-templates.txt
rename to ccm-cms-bundle/bundles/devel/res/bundle/navigation/gen-templates.txt
diff --git a/ccm-bundle/bundles/devel/res/placeholder.info b/ccm-cms-bundle/bundles/devel/res/placeholder.info
similarity index 100%
rename from ccm-bundle/bundles/devel/res/placeholder.info
rename to ccm-cms-bundle/bundles/devel/res/placeholder.info
diff --git a/ccm-bundle/bundles/devel/templates/placeholder.info b/ccm-cms-bundle/bundles/devel/templates/placeholder.info
similarity index 100%
rename from ccm-bundle/bundles/devel/templates/placeholder.info
rename to ccm-cms-bundle/bundles/devel/templates/placeholder.info
diff --git a/ccm-bundle/bundles/devel/themes/README b/ccm-cms-bundle/bundles/devel/themes/README
similarity index 100%
rename from ccm-bundle/bundles/devel/themes/README
rename to ccm-cms-bundle/bundles/devel/themes/README
diff --git a/ccm-bundle/bundles/devel/themes/master/dummy b/ccm-cms-bundle/bundles/devel/themes/master/dummy
similarity index 100%
rename from ccm-bundle/bundles/devel/themes/master/dummy
rename to ccm-cms-bundle/bundles/devel/themes/master/dummy
diff --git a/ccm-bundle/bundles/devel/themes/placeholder.info b/ccm-cms-bundle/bundles/devel/themes/placeholder.info
similarity index 100%
rename from ccm-bundle/bundles/devel/themes/placeholder.info
rename to ccm-cms-bundle/bundles/devel/themes/placeholder.info
diff --git a/ccm-bundle/bundles/slimline/AUTHORS b/ccm-cms-bundle/bundles/slimline/AUTHORS
similarity index 100%
rename from ccm-bundle/bundles/slimline/AUTHORS
rename to ccm-cms-bundle/bundles/slimline/AUTHORS
diff --git a/ccm-bundle/bundles/slimline/ChangeLog b/ccm-cms-bundle/bundles/slimline/ChangeLog
similarity index 100%
rename from ccm-bundle/bundles/slimline/ChangeLog
rename to ccm-cms-bundle/bundles/slimline/ChangeLog
diff --git a/ccm-bundle/bundles/slimline/NEWS b/ccm-cms-bundle/bundles/slimline/NEWS
similarity index 100%
rename from ccm-bundle/bundles/slimline/NEWS
rename to ccm-cms-bundle/bundles/slimline/NEWS
diff --git a/ccm-bundle/bundles/slimline/README b/ccm-cms-bundle/bundles/slimline/README
similarity index 100%
rename from ccm-bundle/bundles/slimline/README
rename to ccm-cms-bundle/bundles/slimline/README
diff --git a/ccm-bundle/bundles/slimline/bundle.in b/ccm-cms-bundle/bundles/slimline/bundle.in
similarity index 100%
rename from ccm-bundle/bundles/slimline/bundle.in
rename to ccm-cms-bundle/bundles/slimline/bundle.in
diff --git a/ccm-bundle/bundles/slimline/cfg/integration.properties b/ccm-cms-bundle/bundles/slimline/cfg/integration.properties
similarity index 100%
rename from ccm-bundle/bundles/slimline/cfg/integration.properties
rename to ccm-cms-bundle/bundles/slimline/cfg/integration.properties
diff --git a/ccm-bundle/bundles/slimline/cfg/libre-web.xml b/ccm-cms-bundle/bundles/slimline/cfg/libre-web.xml
similarity index 100%
rename from ccm-bundle/bundles/slimline/cfg/libre-web.xml
rename to ccm-cms-bundle/bundles/slimline/cfg/libre-web.xml
diff --git a/ccm-bundle/bundles/slimline/cfg/project.xml b/ccm-cms-bundle/bundles/slimline/cfg/project.xml
similarity index 100%
rename from ccm-bundle/bundles/slimline/cfg/project.xml
rename to ccm-cms-bundle/bundles/slimline/cfg/project.xml
diff --git a/ccm-bundle/bundles/slimline/res/bundle/categories/gen-nav-domain-1.00.xml b/ccm-cms-bundle/bundles/slimline/res/bundle/categories/gen-nav-domain-1.00.xml
similarity index 100%
rename from ccm-bundle/bundles/slimline/res/bundle/categories/gen-nav-domain-1.00.xml
rename to ccm-cms-bundle/bundles/slimline/res/bundle/categories/gen-nav-domain-1.00.xml
diff --git a/ccm-bundle/bundles/slimline/res/bundle/categories/gen-nav-hierarchy-1.00.xml b/ccm-cms-bundle/bundles/slimline/res/bundle/categories/gen-nav-hierarchy-1.00.xml
similarity index 100%
rename from ccm-bundle/bundles/slimline/res/bundle/categories/gen-nav-hierarchy-1.00.xml
rename to ccm-cms-bundle/bundles/slimline/res/bundle/categories/gen-nav-hierarchy-1.00.xml
diff --git a/ccm-bundle/bundles/slimline/res/bundle/categories/placeholder.info b/ccm-cms-bundle/bundles/slimline/res/bundle/categories/placeholder.info
similarity index 100%
rename from ccm-bundle/bundles/slimline/res/bundle/categories/placeholder.info
rename to ccm-cms-bundle/bundles/slimline/res/bundle/categories/placeholder.info
diff --git a/ccm-bundle/bundles/slimline/res/bundle/categories/xample-nav-domain.xml b/ccm-cms-bundle/bundles/slimline/res/bundle/categories/xample-nav-domain.xml
similarity index 100%
rename from ccm-bundle/bundles/slimline/res/bundle/categories/xample-nav-domain.xml
rename to ccm-cms-bundle/bundles/slimline/res/bundle/categories/xample-nav-domain.xml
diff --git a/ccm-bundle/bundles/slimline/res/bundle/categories/xample-nav-hierarchy.xml b/ccm-cms-bundle/bundles/slimline/res/bundle/categories/xample-nav-hierarchy.xml
similarity index 100%
rename from ccm-bundle/bundles/slimline/res/bundle/categories/xample-nav-hierarchy.xml
rename to ccm-cms-bundle/bundles/slimline/res/bundle/categories/xample-nav-hierarchy.xml
diff --git a/ccm-bundle/bundles/slimline/res/bundle/categories/xample-nav-mapping-lgcl-anav.xml b/ccm-cms-bundle/bundles/slimline/res/bundle/categories/xample-nav-mapping-lgcl-anav.xml
similarity index 100%
rename from ccm-bundle/bundles/slimline/res/bundle/categories/xample-nav-mapping-lgcl-anav.xml
rename to ccm-cms-bundle/bundles/slimline/res/bundle/categories/xample-nav-mapping-lgcl-anav.xml
diff --git a/ccm-bundle/bundles/slimline/res/bundle/categories/xample-nav-mapping-lgcl-anav.xsl b/ccm-cms-bundle/bundles/slimline/res/bundle/categories/xample-nav-mapping-lgcl-anav.xsl
similarity index 100%
rename from ccm-bundle/bundles/slimline/res/bundle/categories/xample-nav-mapping-lgcl-anav.xsl
rename to ccm-cms-bundle/bundles/slimline/res/bundle/categories/xample-nav-mapping-lgcl-anav.xsl
diff --git a/ccm-bundle/bundles/slimline/res/bundle/navigation/gen-templates.txt b/ccm-cms-bundle/bundles/slimline/res/bundle/navigation/gen-templates.txt
similarity index 100%
rename from ccm-bundle/bundles/slimline/res/bundle/navigation/gen-templates.txt
rename to ccm-cms-bundle/bundles/slimline/res/bundle/navigation/gen-templates.txt
diff --git a/ccm-bundle/bundles/slimline/res/placeholder.info b/ccm-cms-bundle/bundles/slimline/res/placeholder.info
similarity index 100%
rename from ccm-bundle/bundles/slimline/res/placeholder.info
rename to ccm-cms-bundle/bundles/slimline/res/placeholder.info
diff --git a/ccm-bundle/bundles/slimline/templates/placeholder.info b/ccm-cms-bundle/bundles/slimline/templates/placeholder.info
similarity index 100%
rename from ccm-bundle/bundles/slimline/templates/placeholder.info
rename to ccm-cms-bundle/bundles/slimline/templates/placeholder.info
diff --git a/ccm-bundle/bundles/slimline/themes/README b/ccm-cms-bundle/bundles/slimline/themes/README
similarity index 100%
rename from ccm-bundle/bundles/slimline/themes/README
rename to ccm-cms-bundle/bundles/slimline/themes/README
diff --git a/ccm-bundle/bundles/slimline/themes/master/dummy b/ccm-cms-bundle/bundles/slimline/themes/master/dummy
similarity index 100%
rename from ccm-bundle/bundles/slimline/themes/master/dummy
rename to ccm-cms-bundle/bundles/slimline/themes/master/dummy
diff --git a/ccm-bundle/bundles/slimline/themes/placeholder.info b/ccm-cms-bundle/bundles/slimline/themes/placeholder.info
similarity index 100%
rename from ccm-bundle/bundles/slimline/themes/placeholder.info
rename to ccm-cms-bundle/bundles/slimline/themes/placeholder.info
diff --git a/ccm-bundle/bundles/standard/AUTHORS b/ccm-cms-bundle/bundles/standard/AUTHORS
similarity index 100%
rename from ccm-bundle/bundles/standard/AUTHORS
rename to ccm-cms-bundle/bundles/standard/AUTHORS
diff --git a/ccm-bundle/bundles/standard/ChangeLog b/ccm-cms-bundle/bundles/standard/ChangeLog
similarity index 100%
rename from ccm-bundle/bundles/standard/ChangeLog
rename to ccm-cms-bundle/bundles/standard/ChangeLog
diff --git a/ccm-bundle/bundles/standard/NEWS b/ccm-cms-bundle/bundles/standard/NEWS
similarity index 100%
rename from ccm-bundle/bundles/standard/NEWS
rename to ccm-cms-bundle/bundles/standard/NEWS
diff --git a/ccm-bundle/bundles/standard/README b/ccm-cms-bundle/bundles/standard/README
similarity index 100%
rename from ccm-bundle/bundles/standard/README
rename to ccm-cms-bundle/bundles/standard/README
diff --git a/ccm-bundle/bundles/standard/bundle.in b/ccm-cms-bundle/bundles/standard/bundle.in
similarity index 100%
rename from ccm-bundle/bundles/standard/bundle.in
rename to ccm-cms-bundle/bundles/standard/bundle.in
diff --git a/ccm-bundle/bundles/standard/cfg/integration.properties b/ccm-cms-bundle/bundles/standard/cfg/integration.properties
similarity index 100%
rename from ccm-bundle/bundles/standard/cfg/integration.properties
rename to ccm-cms-bundle/bundles/standard/cfg/integration.properties
diff --git a/ccm-bundle/bundles/standard/cfg/libre-web.xml b/ccm-cms-bundle/bundles/standard/cfg/libre-web.xml
similarity index 100%
rename from ccm-bundle/bundles/standard/cfg/libre-web.xml
rename to ccm-cms-bundle/bundles/standard/cfg/libre-web.xml
diff --git a/ccm-bundle/bundles/standard/cfg/project.xml b/ccm-cms-bundle/bundles/standard/cfg/project.xml
similarity index 100%
rename from ccm-bundle/bundles/standard/cfg/project.xml
rename to ccm-cms-bundle/bundles/standard/cfg/project.xml
diff --git a/ccm-bundle/bundles/standard/res/bundle/categories/gen-nav-domain-1.00.xml b/ccm-cms-bundle/bundles/standard/res/bundle/categories/gen-nav-domain-1.00.xml
similarity index 100%
rename from ccm-bundle/bundles/standard/res/bundle/categories/gen-nav-domain-1.00.xml
rename to ccm-cms-bundle/bundles/standard/res/bundle/categories/gen-nav-domain-1.00.xml
diff --git a/ccm-bundle/bundles/standard/res/bundle/categories/gen-nav-hierarchy-1.00.xml b/ccm-cms-bundle/bundles/standard/res/bundle/categories/gen-nav-hierarchy-1.00.xml
similarity index 100%
rename from ccm-bundle/bundles/standard/res/bundle/categories/gen-nav-hierarchy-1.00.xml
rename to ccm-cms-bundle/bundles/standard/res/bundle/categories/gen-nav-hierarchy-1.00.xml
diff --git a/ccm-bundle/bundles/standard/res/bundle/categories/placeholder.info b/ccm-cms-bundle/bundles/standard/res/bundle/categories/placeholder.info
similarity index 100%
rename from ccm-bundle/bundles/standard/res/bundle/categories/placeholder.info
rename to ccm-cms-bundle/bundles/standard/res/bundle/categories/placeholder.info
diff --git a/ccm-bundle/bundles/standard/res/bundle/categories/xample-nav-domain.xml b/ccm-cms-bundle/bundles/standard/res/bundle/categories/xample-nav-domain.xml
similarity index 100%
rename from ccm-bundle/bundles/standard/res/bundle/categories/xample-nav-domain.xml
rename to ccm-cms-bundle/bundles/standard/res/bundle/categories/xample-nav-domain.xml
diff --git a/ccm-bundle/bundles/standard/res/bundle/categories/xample-nav-hierarchy.xml b/ccm-cms-bundle/bundles/standard/res/bundle/categories/xample-nav-hierarchy.xml
similarity index 100%
rename from ccm-bundle/bundles/standard/res/bundle/categories/xample-nav-hierarchy.xml
rename to ccm-cms-bundle/bundles/standard/res/bundle/categories/xample-nav-hierarchy.xml
diff --git a/ccm-bundle/bundles/standard/res/bundle/categories/xample-nav-mapping-lgcl-anav.xml b/ccm-cms-bundle/bundles/standard/res/bundle/categories/xample-nav-mapping-lgcl-anav.xml
similarity index 100%
rename from ccm-bundle/bundles/standard/res/bundle/categories/xample-nav-mapping-lgcl-anav.xml
rename to ccm-cms-bundle/bundles/standard/res/bundle/categories/xample-nav-mapping-lgcl-anav.xml
diff --git a/ccm-bundle/bundles/standard/res/bundle/categories/xample-nav-mapping-lgcl-anav.xsl b/ccm-cms-bundle/bundles/standard/res/bundle/categories/xample-nav-mapping-lgcl-anav.xsl
similarity index 100%
rename from ccm-bundle/bundles/standard/res/bundle/categories/xample-nav-mapping-lgcl-anav.xsl
rename to ccm-cms-bundle/bundles/standard/res/bundle/categories/xample-nav-mapping-lgcl-anav.xsl
diff --git a/ccm-bundle/bundles/standard/res/bundle/navigation/gen-templates.txt b/ccm-cms-bundle/bundles/standard/res/bundle/navigation/gen-templates.txt
similarity index 100%
rename from ccm-bundle/bundles/standard/res/bundle/navigation/gen-templates.txt
rename to ccm-cms-bundle/bundles/standard/res/bundle/navigation/gen-templates.txt
diff --git a/ccm-bundle/bundles/standard/res/placeholder.info b/ccm-cms-bundle/bundles/standard/res/placeholder.info
similarity index 100%
rename from ccm-bundle/bundles/standard/res/placeholder.info
rename to ccm-cms-bundle/bundles/standard/res/placeholder.info
diff --git a/ccm-bundle/bundles/standard/templates/placeholder.info b/ccm-cms-bundle/bundles/standard/templates/placeholder.info
similarity index 100%
rename from ccm-bundle/bundles/standard/templates/placeholder.info
rename to ccm-cms-bundle/bundles/standard/templates/placeholder.info
diff --git a/ccm-bundle/bundles/standard/themes/README b/ccm-cms-bundle/bundles/standard/themes/README
similarity index 100%
rename from ccm-bundle/bundles/standard/themes/README
rename to ccm-cms-bundle/bundles/standard/themes/README
diff --git a/ccm-bundle/bundles/standard/themes/master/dummy b/ccm-cms-bundle/bundles/standard/themes/master/dummy
similarity index 100%
rename from ccm-bundle/bundles/standard/themes/master/dummy
rename to ccm-cms-bundle/bundles/standard/themes/master/dummy
diff --git a/ccm-bundle/bundles/standard/themes/placeholder.info b/ccm-cms-bundle/bundles/standard/themes/placeholder.info
similarity index 100%
rename from ccm-bundle/bundles/standard/themes/placeholder.info
rename to ccm-cms-bundle/bundles/standard/themes/placeholder.info
diff --git a/ccm-bundle/etc/servlet-declarations.xml b/ccm-cms-bundle/etc/servlet-declarations.xml
similarity index 100%
rename from ccm-bundle/etc/servlet-declarations.xml
rename to ccm-cms-bundle/etc/servlet-declarations.xml
diff --git a/ccm-bundle/etc/servlet-mappings.xml b/ccm-cms-bundle/etc/servlet-mappings.xml
similarity index 100%
rename from ccm-bundle/etc/servlet-mappings.xml
rename to ccm-cms-bundle/etc/servlet-mappings.xml
diff --git a/ccm-bundle/sql/ccm-bundle/upgrade/default/0.0.0-6.6.0/upd_nav_templates_table.sql b/ccm-cms-bundle/sql/ccm-bundle/upgrade/default/0.0.0-6.6.0/upd_nav_templates_table.sql
similarity index 100%
rename from ccm-bundle/sql/ccm-bundle/upgrade/default/0.0.0-6.6.0/upd_nav_templates_table.sql
rename to ccm-cms-bundle/sql/ccm-bundle/upgrade/default/0.0.0-6.6.0/upd_nav_templates_table.sql
diff --git a/ccm-bundle/sql/ccm-bundle/upgrade/default/0.0.0-6.6.0/upd_system_tables.sql b/ccm-cms-bundle/sql/ccm-bundle/upgrade/default/0.0.0-6.6.0/upd_system_tables.sql
similarity index 100%
rename from ccm-bundle/sql/ccm-bundle/upgrade/default/0.0.0-6.6.0/upd_system_tables.sql
rename to ccm-cms-bundle/sql/ccm-bundle/upgrade/default/0.0.0-6.6.0/upd_system_tables.sql
diff --git a/ccm-bundle/sql/ccm-bundle/upgrade/oracle-se-0.0.0-6.6.0.sql b/ccm-cms-bundle/sql/ccm-bundle/upgrade/oracle-se-0.0.0-6.6.0.sql
similarity index 100%
rename from ccm-bundle/sql/ccm-bundle/upgrade/oracle-se-0.0.0-6.6.0.sql
rename to ccm-cms-bundle/sql/ccm-bundle/upgrade/oracle-se-0.0.0-6.6.0.sql
diff --git a/ccm-bundle/sql/ccm-bundle/upgrade/postgres-0.0.0-6.6.0.sql b/ccm-cms-bundle/sql/ccm-bundle/upgrade/postgres-0.0.0-6.6.0.sql
similarity index 100%
rename from ccm-bundle/sql/ccm-bundle/upgrade/postgres-0.0.0-6.6.0.sql
rename to ccm-cms-bundle/sql/ccm-bundle/upgrade/postgres-0.0.0-6.6.0.sql
diff --git a/ccm-bundle/src/WEB-INF/resources/librecms-stylesheet-paths.txt b/ccm-cms-bundle/src/WEB-INF/resources/librecms-stylesheet-paths.txt
similarity index 100%
rename from ccm-bundle/src/WEB-INF/resources/librecms-stylesheet-paths.txt
rename to ccm-cms-bundle/src/WEB-INF/resources/librecms-stylesheet-paths.txt
diff --git a/ccm-bundle/src/ccm-bundle.config b/ccm-cms-bundle/src/ccm-bundle.config
similarity index 100%
rename from ccm-bundle/src/ccm-bundle.config
rename to ccm-cms-bundle/src/ccm-bundle.config
diff --git a/ccm-bundle/src/ccm-bundle.load b/ccm-cms-bundle/src/ccm-bundle.load
similarity index 100%
rename from ccm-bundle/src/ccm-bundle.load
rename to ccm-cms-bundle/src/ccm-bundle.load
diff --git a/ccm-bundle/src/ccm-bundle.upgrade b/ccm-cms-bundle/src/ccm-bundle.upgrade
similarity index 100%
rename from ccm-bundle/src/ccm-bundle.upgrade
rename to ccm-cms-bundle/src/ccm-bundle.upgrade
diff --git a/ccm-bundle/src/com/arsdigita/bundle/Bundle.java.nolongerInUse b/ccm-cms-bundle/src/com/arsdigita/bundle/Bundle.java.nolongerInUse
similarity index 100%
rename from ccm-bundle/src/com/arsdigita/bundle/Bundle.java.nolongerInUse
rename to ccm-cms-bundle/src/com/arsdigita/bundle/Bundle.java.nolongerInUse
diff --git a/ccm-bundle/src/com/arsdigita/bundle/BundleConfig.java.nolongerInUse b/ccm-cms-bundle/src/com/arsdigita/bundle/BundleConfig.java.nolongerInUse
similarity index 100%
rename from ccm-bundle/src/com/arsdigita/bundle/BundleConfig.java.nolongerInUse
rename to ccm-cms-bundle/src/com/arsdigita/bundle/BundleConfig.java.nolongerInUse
diff --git a/ccm-bundle/src/com/arsdigita/bundle/BundleConfig_parameter.properties.nolongerInUse b/ccm-cms-bundle/src/com/arsdigita/bundle/BundleConfig_parameter.properties.nolongerInUse
similarity index 100%
rename from ccm-bundle/src/com/arsdigita/bundle/BundleConfig_parameter.properties.nolongerInUse
rename to ccm-cms-bundle/src/com/arsdigita/bundle/BundleConfig_parameter.properties.nolongerInUse
diff --git a/ccm-bundle/src/com/arsdigita/bundle/Initializer.java b/ccm-cms-bundle/src/com/arsdigita/bundle/Initializer.java
similarity index 100%
rename from ccm-bundle/src/com/arsdigita/bundle/Initializer.java
rename to ccm-cms-bundle/src/com/arsdigita/bundle/Initializer.java
diff --git a/ccm-bundle/src/com/arsdigita/bundle/Loader.java b/ccm-cms-bundle/src/com/arsdigita/bundle/Loader.java
similarity index 100%
rename from ccm-bundle/src/com/arsdigita/bundle/Loader.java
rename to ccm-cms-bundle/src/com/arsdigita/bundle/Loader.java
diff --git a/ccm-bundle/src/com/arsdigita/bundle/Loader_parameter.properties b/ccm-cms-bundle/src/com/arsdigita/bundle/Loader_parameter.properties
similarity index 100%
rename from ccm-bundle/src/com/arsdigita/bundle/Loader_parameter.properties
rename to ccm-cms-bundle/src/com/arsdigita/bundle/Loader_parameter.properties
diff --git a/ccm-bundle/src/com/arsdigita/bundle/ui/AssignedIndexItemTerms.java.probably.nolongerInUse b/ccm-cms-bundle/src/com/arsdigita/bundle/ui/AssignedIndexItemTerms.java.probably.nolongerInUse
similarity index 100%
rename from ccm-bundle/src/com/arsdigita/bundle/ui/AssignedIndexItemTerms.java.probably.nolongerInUse
rename to ccm-cms-bundle/src/com/arsdigita/bundle/ui/AssignedIndexItemTerms.java.probably.nolongerInUse
diff --git a/ccm-bundle/src/com/arsdigita/bundle/ui/AssignedItemTerms.java b/ccm-cms-bundle/src/com/arsdigita/bundle/ui/AssignedItemTerms.java
similarity index 100%
rename from ccm-bundle/src/com/arsdigita/bundle/ui/AssignedItemTerms.java
rename to ccm-cms-bundle/src/com/arsdigita/bundle/ui/AssignedItemTerms.java
diff --git a/ccm-bundle/src/com/arsdigita/bundle/ui/CategoryTermDetails.java.probably.nolongerInUse b/ccm-cms-bundle/src/com/arsdigita/bundle/ui/CategoryTermDetails.java.probably.nolongerInUse
similarity index 100%
rename from ccm-bundle/src/com/arsdigita/bundle/ui/CategoryTermDetails.java.probably.nolongerInUse
rename to ccm-cms-bundle/src/com/arsdigita/bundle/ui/CategoryTermDetails.java.probably.nolongerInUse
diff --git a/ccm-bundle/src/com/arsdigita/bundle/ui/ItemCategoryPicker.java b/ccm-cms-bundle/src/com/arsdigita/bundle/ui/ItemCategoryPicker.java
similarity index 100%
rename from ccm-bundle/src/com/arsdigita/bundle/ui/ItemCategoryPicker.java
rename to ccm-cms-bundle/src/com/arsdigita/bundle/ui/ItemCategoryPicker.java
diff --git a/ccm-bundle/src/com/arsdigita/bundle/ui/SimplePage.java b/ccm-cms-bundle/src/com/arsdigita/bundle/ui/SimplePage.java
similarity index 100%
rename from ccm-bundle/src/com/arsdigita/bundle/ui/SimplePage.java
rename to ccm-cms-bundle/src/com/arsdigita/bundle/ui/SimplePage.java
diff --git a/ccm-bundle/src/com/arsdigita/bundle/ui/TermItemSummary.java b/ccm-cms-bundle/src/com/arsdigita/bundle/ui/TermItemSummary.java
similarity index 100%
rename from ccm-bundle/src/com/arsdigita/bundle/ui/TermItemSummary.java
rename to ccm-cms-bundle/src/com/arsdigita/bundle/ui/TermItemSummary.java
diff --git a/ccm-bundle/web/WEB-INF/systeminformation.properties b/ccm-cms-bundle/web/WEB-INF/systeminformation.properties
similarity index 100%
rename from ccm-bundle/web/WEB-INF/systeminformation.properties
rename to ccm-cms-bundle/web/WEB-INF/systeminformation.properties
diff --git a/ccm-bundle/web/assets/fckeditor/config/fckconfigOpenCCM.js b/ccm-cms-bundle/web/assets/fckeditor/config/fckconfigOpenCCM.js
similarity index 100%
rename from ccm-bundle/web/assets/fckeditor/config/fckconfigOpenCCM.js
rename to ccm-cms-bundle/web/assets/fckeditor/config/fckconfigOpenCCM.js
diff --git a/ccm-bundle/web/assets/fckeditor/config/fckconfigOpenCCM.xml b/ccm-cms-bundle/web/assets/fckeditor/config/fckconfigOpenCCM.xml
similarity index 100%
rename from ccm-bundle/web/assets/fckeditor/config/fckconfigOpenCCM.xml
rename to ccm-cms-bundle/web/assets/fckeditor/config/fckconfigOpenCCM.xml
diff --git a/ccm-bundle/web/assets/xinha/XinhaConfig.js b/ccm-cms-bundle/web/assets/xinha/XinhaConfig.js
similarity index 100%
rename from ccm-bundle/web/assets/xinha/XinhaConfig.js
rename to ccm-cms-bundle/web/assets/xinha/XinhaConfig.js
diff --git a/ccm-bundle/web/templates/ccm-cms/content-section/admin/auto-cat.jsp b/ccm-cms-bundle/web/templates/ccm-cms/content-section/admin/auto-cat.jsp
similarity index 100%
rename from ccm-bundle/web/templates/ccm-cms/content-section/admin/auto-cat.jsp
rename to ccm-cms-bundle/web/templates/ccm-cms/content-section/admin/auto-cat.jsp
diff --git a/ccm-bundle/web/templates/ccm-cms/content-section/admin/load-cat.jsp b/ccm-cms-bundle/web/templates/ccm-cms/content-section/admin/load-cat.jsp
similarity index 100%
rename from ccm-bundle/web/templates/ccm-cms/content-section/admin/load-cat.jsp
rename to ccm-cms-bundle/web/templates/ccm-cms/content-section/admin/load-cat.jsp
diff --git a/ccm-bundle/web/templates/ccm-cms/content-section/crash-me.jsp b/ccm-cms-bundle/web/templates/ccm-cms/content-section/crash-me.jsp
similarity index 100%
rename from ccm-bundle/web/templates/ccm-cms/content-section/crash-me.jsp
rename to ccm-cms-bundle/web/templates/ccm-cms/content-section/crash-me.jsp
diff --git a/ccm-bundle/web/templates/ccm-cms/content-section/default/aplaws-folder.jsp b/ccm-cms-bundle/web/templates/ccm-cms/content-section/default/aplaws-folder.jsp
similarity index 100%
rename from ccm-bundle/web/templates/ccm-cms/content-section/default/aplaws-folder.jsp
rename to ccm-cms-bundle/web/templates/ccm-cms/content-section/default/aplaws-folder.jsp
diff --git a/ccm-bundle/web/templates/ccm-cms/content-section/default/aplaws-item.jsp b/ccm-cms-bundle/web/templates/ccm-cms/content-section/default/aplaws-item.jsp
similarity index 100%
rename from ccm-bundle/web/templates/ccm-cms/content-section/default/aplaws-item.jsp
rename to ccm-cms-bundle/web/templates/ccm-cms/content-section/default/aplaws-item.jsp
diff --git a/ccm-bundle/web/templates/ccm-cms/content-section/person4homepages.jsp b/ccm-cms-bundle/web/templates/ccm-cms/content-section/person4homepages.jsp
similarity index 100%
rename from ccm-bundle/web/templates/ccm-cms/content-section/person4homepages.jsp
rename to ccm-cms-bundle/web/templates/ccm-cms/content-section/person4homepages.jsp
diff --git a/ccm-bundle/web/templates/ccm-cms/content-section/projects4homepages.jsp b/ccm-cms-bundle/web/templates/ccm-cms/content-section/projects4homepages.jsp
similarity index 100%
rename from ccm-bundle/web/templates/ccm-cms/content-section/projects4homepages.jsp
rename to ccm-cms-bundle/web/templates/ccm-cms/content-section/projects4homepages.jsp
diff --git a/ccm-bundle/web/templates/ccm-cms/content-section/publications4homepages.jsp b/ccm-cms-bundle/web/templates/ccm-cms/content-section/publications4homepages.jsp
similarity index 100%
rename from ccm-bundle/web/templates/ccm-cms/content-section/publications4homepages.jsp
rename to ccm-cms-bundle/web/templates/ccm-cms/content-section/publications4homepages.jsp
diff --git a/ccm-bundle/web/templates/ccm-cms/content-section/textonly.jsp b/ccm-cms-bundle/web/templates/ccm-cms/content-section/textonly.jsp
similarity index 100%
rename from ccm-bundle/web/templates/ccm-cms/content-section/textonly.jsp
rename to ccm-cms-bundle/web/templates/ccm-cms/content-section/textonly.jsp
diff --git a/ccm-bundle/web/templates/ccm-navigation/navigation/README b/ccm-cms-bundle/web/templates/ccm-navigation/navigation/README
similarity index 100%
rename from ccm-bundle/web/templates/ccm-navigation/navigation/README
rename to ccm-cms-bundle/web/templates/ccm-navigation/navigation/README
diff --git a/ccm-bundle/web/templates/ccm-navigation/navigation/SpecializingList.jsp b/ccm-cms-bundle/web/templates/ccm-navigation/navigation/SpecializingList.jsp
similarity index 100%
rename from ccm-bundle/web/templates/ccm-navigation/navigation/SpecializingList.jsp
rename to ccm-cms-bundle/web/templates/ccm-navigation/navigation/SpecializingList.jsp
diff --git a/ccm-bundle/web/templates/ccm-navigation/navigation/gen-atoz.jsp b/ccm-cms-bundle/web/templates/ccm-navigation/navigation/gen-atoz.jsp
similarity index 100%
rename from ccm-bundle/web/templates/ccm-navigation/navigation/gen-atoz.jsp
rename to ccm-cms-bundle/web/templates/ccm-navigation/navigation/gen-atoz.jsp
diff --git a/ccm-bundle/web/templates/ccm-navigation/navigation/gen-default.jsp b/ccm-cms-bundle/web/templates/ccm-navigation/navigation/gen-default.jsp
similarity index 100%
rename from ccm-bundle/web/templates/ccm-navigation/navigation/gen-default.jsp
rename to ccm-cms-bundle/web/templates/ccm-navigation/navigation/gen-default.jsp
diff --git a/ccm-bundle/web/templates/ccm-navigation/navigation/gen-events.jsp b/ccm-cms-bundle/web/templates/ccm-navigation/navigation/gen-events.jsp
similarity index 100%
rename from ccm-bundle/web/templates/ccm-navigation/navigation/gen-events.jsp
rename to ccm-cms-bundle/web/templates/ccm-navigation/navigation/gen-events.jsp
diff --git a/ccm-bundle/web/templates/ccm-navigation/navigation/gen-portal-welcome.jsp b/ccm-cms-bundle/web/templates/ccm-navigation/navigation/gen-portal-welcome.jsp
similarity index 100%
rename from ccm-bundle/web/templates/ccm-navigation/navigation/gen-portal-welcome.jsp
rename to ccm-cms-bundle/web/templates/ccm-navigation/navigation/gen-portal-welcome.jsp
diff --git a/ccm-bundle/web/templates/ccm-navigation/navigation/gen-portal.jsp b/ccm-cms-bundle/web/templates/ccm-navigation/navigation/gen-portal.jsp
similarity index 100%
rename from ccm-bundle/web/templates/ccm-navigation/navigation/gen-portal.jsp
rename to ccm-cms-bundle/web/templates/ccm-navigation/navigation/gen-portal.jsp
diff --git a/ccm-bundle/web/templates/ccm-navigation/navigation/gen-recent.jsp b/ccm-cms-bundle/web/templates/ccm-navigation/navigation/gen-recent.jsp
similarity index 100%
rename from ccm-bundle/web/templates/ccm-navigation/navigation/gen-recent.jsp
rename to ccm-cms-bundle/web/templates/ccm-navigation/navigation/gen-recent.jsp
diff --git a/ccm-bundle/web/templates/ccm-navigation/navigation/gen-welcome.jsp b/ccm-cms-bundle/web/templates/ccm-navigation/navigation/gen-welcome.jsp
similarity index 100%
rename from ccm-bundle/web/templates/ccm-navigation/navigation/gen-welcome.jsp
rename to ccm-cms-bundle/web/templates/ccm-navigation/navigation/gen-welcome.jsp
diff --git a/ccm-bundle/web/templates/ccm-navigation/navigation/sitemap.jsp b/ccm-cms-bundle/web/templates/ccm-navigation/navigation/sitemap.jsp
similarity index 100%
rename from ccm-bundle/web/templates/ccm-navigation/navigation/sitemap.jsp
rename to ccm-cms-bundle/web/templates/ccm-navigation/navigation/sitemap.jsp
diff --git a/ccm-bundle/web/templates/ccm-navigation/services/pid.jsp b/ccm-cms-bundle/web/templates/ccm-navigation/services/pid.jsp
similarity index 100%
rename from ccm-bundle/web/templates/ccm-navigation/services/pid.jsp
rename to ccm-cms-bundle/web/templates/ccm-navigation/services/pid.jsp
diff --git a/ccm-bundle/web/templates/ccm-navigation/services/summary.jsp b/ccm-cms-bundle/web/templates/ccm-navigation/services/summary.jsp
similarity index 100%
rename from ccm-bundle/web/templates/ccm-navigation/services/summary.jsp
rename to ccm-cms-bundle/web/templates/ccm-navigation/services/summary.jsp
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/admin-index.css b/ccm-cms-bundle/web/themes/static/aplaws-generic/admin-index.css
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/admin-index.css
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/admin-index.css
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/admin-index.xsl b/ccm-cms-bundle/web/themes/static/aplaws-generic/admin-index.xsl
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/admin-index.xsl
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/admin-index.xsl
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/atoz-admin.css.NotUsedForNow b/ccm-cms-bundle/web/themes/static/aplaws-generic/atoz-admin.css.NotUsedForNow
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/atoz-admin.css.NotUsedForNow
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/atoz-admin.css.NotUsedForNow
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/atoz-admin.xsl.NotUsedForNow b/ccm-cms-bundle/web/themes/static/aplaws-generic/atoz-admin.xsl.NotUsedForNow
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/atoz-admin.xsl.NotUsedForNow
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/atoz-admin.xsl.NotUsedForNow
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/atoz-index.css.NotUsedForNow b/ccm-cms-bundle/web/themes/static/aplaws-generic/atoz-index.css.NotUsedForNow
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/atoz-index.css.NotUsedForNow
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/atoz-index.css.NotUsedForNow
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/atoz-index.xsl.NotUsedForNow b/ccm-cms-bundle/web/themes/static/aplaws-generic/atoz-index.xsl.NotUsedForNow
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/atoz-index.xsl.NotUsedForNow
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/atoz-index.xsl.NotUsedForNow
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/category-step.xsl b/ccm-cms-bundle/web/themes/static/aplaws-generic/category-step.xsl
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/category-step.xsl
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/category-step.xsl
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/consultations-index.xsl b/ccm-cms-bundle/web/themes/static/aplaws-generic/consultations-index.xsl
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/consultations-index.xsl
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/consultations-index.xsl
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/content-center-index.xsl b/ccm-cms-bundle/web/themes/static/aplaws-generic/content-center-index.xsl
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/content-center-index.xsl
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/content-center-index.xsl
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/content-section-admin.xsl b/ccm-cms-bundle/web/themes/static/aplaws-generic/content-section-admin.xsl
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/content-section-admin.xsl
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/content-section-admin.xsl
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/content-section-index.xsl b/ccm-cms-bundle/web/themes/static/aplaws-generic/content-section-index.xsl
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/content-section-index.xsl
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/content-section-index.xsl
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/css/main.css b/ccm-cms-bundle/web/themes/static/aplaws-generic/css/main.css
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/css/main.css
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/css/main.css
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/css/wysiwyg.css b/ccm-cms-bundle/web/themes/static/aplaws-generic/css/wysiwyg.css
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/css/wysiwyg.css
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/css/wysiwyg.css
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/forum-example/categorised-forum/forum-categories.xsl b/ccm-cms-bundle/web/themes/static/aplaws-generic/forum-example/categorised-forum/forum-categories.xsl
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/forum-example/categorised-forum/forum-categories.xsl
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/forum-example/categorised-forum/forum-categories.xsl
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/forum-example/categorised-forum/forum-index.xsl b/ccm-cms-bundle/web/themes/static/aplaws-generic/forum-example/categorised-forum/forum-index.xsl
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/forum-example/categorised-forum/forum-index.xsl
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/forum-example/categorised-forum/forum-index.xsl
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/forum-example/forum-index.css b/ccm-cms-bundle/web/themes/static/aplaws-generic/forum-example/forum-index.css
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/forum-example/forum-index.css
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/forum-example/forum-index.css
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/forum-example/forum-index.xsl b/ccm-cms-bundle/web/themes/static/aplaws-generic/forum-example/forum-index.xsl
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/forum-example/forum-index.xsl
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/forum-example/forum-index.xsl
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/forum-example/images/forum/archived-16x16.gif b/ccm-cms-bundle/web/themes/static/aplaws-generic/forum-example/images/forum/archived-16x16.gif
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/forum-example/images/forum/archived-16x16.gif
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/forum-example/images/forum/archived-16x16.gif
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/forum-example/images/forum/back-to-16x16.gif b/ccm-cms-bundle/web/themes/static/aplaws-generic/forum-example/images/forum/back-to-16x16.gif
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/forum-example/images/forum/back-to-16x16.gif
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/forum-example/images/forum/back-to-16x16.gif
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/forum-example/images/forum/delete-16x16.gif b/ccm-cms-bundle/web/themes/static/aplaws-generic/forum-example/images/forum/delete-16x16.gif
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/forum-example/images/forum/delete-16x16.gif
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/forum-example/images/forum/delete-16x16.gif
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/forum-example/images/forum/edit-16x16.gif b/ccm-cms-bundle/web/themes/static/aplaws-generic/forum-example/images/forum/edit-16x16.gif
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/forum-example/images/forum/edit-16x16.gif
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/forum-example/images/forum/edit-16x16.gif
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/forum-example/images/forum/info-16x16.gif b/ccm-cms-bundle/web/themes/static/aplaws-generic/forum-example/images/forum/info-16x16.gif
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/forum-example/images/forum/info-16x16.gif
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/forum-example/images/forum/info-16x16.gif
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/forum-example/images/forum/post-16x16.gif b/ccm-cms-bundle/web/themes/static/aplaws-generic/forum-example/images/forum/post-16x16.gif
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/forum-example/images/forum/post-16x16.gif
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/forum-example/images/forum/post-16x16.gif
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/forum-example/images/forum/read.gif b/ccm-cms-bundle/web/themes/static/aplaws-generic/forum-example/images/forum/read.gif
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/forum-example/images/forum/read.gif
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/forum-example/images/forum/read.gif
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/forum-example/images/forum/reply-16x16.gif b/ccm-cms-bundle/web/themes/static/aplaws-generic/forum-example/images/forum/reply-16x16.gif
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/forum-example/images/forum/reply-16x16.gif
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/forum-example/images/forum/reply-16x16.gif
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/forum-example/images/forum/watch-16x16.gif b/ccm-cms-bundle/web/themes/static/aplaws-generic/forum-example/images/forum/watch-16x16.gif
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/forum-example/images/forum/watch-16x16.gif
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/forum-example/images/forum/watch-16x16.gif
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/forum-index.css b/ccm-cms-bundle/web/themes/static/aplaws-generic/forum-index.css
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/forum-index.css
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/forum-index.css
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/forum-index.xsl b/ccm-cms-bundle/web/themes/static/aplaws-generic/forum-index.xsl
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/forum-index.xsl
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/forum-index.xsl
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/images/aplaws-logo-small.png b/ccm-cms-bundle/web/themes/static/aplaws-generic/images/aplaws-logo-small.png
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/images/aplaws-logo-small.png
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/images/aplaws-logo-small.png
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/images/aplaws-logo.gif b/ccm-cms-bundle/web/themes/static/aplaws-generic/images/aplaws-logo.gif
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/images/aplaws-logo.gif
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/images/aplaws-logo.gif
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/images/aplawsplus.gif b/ccm-cms-bundle/web/themes/static/aplaws-generic/images/aplawsplus.gif
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/images/aplawsplus.gif
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/images/aplawsplus.gif
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/images/arrowSitemap.gif b/ccm-cms-bundle/web/themes/static/aplaws-generic/images/arrowSitemap.gif
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/images/arrowSitemap.gif
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/images/arrowSitemap.gif
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/images/forum/archived-16x16.gif b/ccm-cms-bundle/web/themes/static/aplaws-generic/images/forum/archived-16x16.gif
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/images/forum/archived-16x16.gif
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/images/forum/archived-16x16.gif
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/images/forum/back-to-16x16.gif b/ccm-cms-bundle/web/themes/static/aplaws-generic/images/forum/back-to-16x16.gif
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/images/forum/back-to-16x16.gif
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/images/forum/back-to-16x16.gif
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/images/forum/delete-16x16.gif b/ccm-cms-bundle/web/themes/static/aplaws-generic/images/forum/delete-16x16.gif
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/images/forum/delete-16x16.gif
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/images/forum/delete-16x16.gif
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/images/forum/edit-16x16.gif b/ccm-cms-bundle/web/themes/static/aplaws-generic/images/forum/edit-16x16.gif
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/images/forum/edit-16x16.gif
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/images/forum/edit-16x16.gif
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/images/forum/info-16x16.gif b/ccm-cms-bundle/web/themes/static/aplaws-generic/images/forum/info-16x16.gif
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/images/forum/info-16x16.gif
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/images/forum/info-16x16.gif
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/images/forum/post-16x16.gif b/ccm-cms-bundle/web/themes/static/aplaws-generic/images/forum/post-16x16.gif
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/images/forum/post-16x16.gif
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/images/forum/post-16x16.gif
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/images/forum/read.gif b/ccm-cms-bundle/web/themes/static/aplaws-generic/images/forum/read.gif
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/images/forum/read.gif
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/images/forum/read.gif
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/images/forum/reply-16x16.gif b/ccm-cms-bundle/web/themes/static/aplaws-generic/images/forum/reply-16x16.gif
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/images/forum/reply-16x16.gif
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/images/forum/reply-16x16.gif
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/images/forum/watch-16x16.gif b/ccm-cms-bundle/web/themes/static/aplaws-generic/images/forum/watch-16x16.gif
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/images/forum/watch-16x16.gif
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/images/forum/watch-16x16.gif
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/images/home.png b/ccm-cms-bundle/web/themes/static/aplaws-generic/images/home.png
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/images/home.png
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/images/home.png
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/images/lock.png b/ccm-cms-bundle/web/themes/static/aplaws-generic/images/lock.png
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/images/lock.png
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/images/lock.png
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/images/portal/customize.gif b/ccm-cms-bundle/web/themes/static/aplaws-generic/images/portal/customize.gif
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/images/portal/customize.gif
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/images/portal/customize.gif
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/images/portal/delete.gif b/ccm-cms-bundle/web/themes/static/aplaws-generic/images/portal/delete.gif
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/images/portal/delete.gif
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/images/portal/delete.gif
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/images/portal/display.gif b/ccm-cms-bundle/web/themes/static/aplaws-generic/images/portal/display.gif
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/images/portal/display.gif
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/images/portal/display.gif
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/images/portal/moveDown.gif b/ccm-cms-bundle/web/themes/static/aplaws-generic/images/portal/moveDown.gif
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/images/portal/moveDown.gif
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/images/portal/moveDown.gif
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/images/portal/moveLeft.gif b/ccm-cms-bundle/web/themes/static/aplaws-generic/images/portal/moveLeft.gif
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/images/portal/moveLeft.gif
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/images/portal/moveLeft.gif
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/images/portal/moveRight.gif b/ccm-cms-bundle/web/themes/static/aplaws-generic/images/portal/moveRight.gif
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/images/portal/moveRight.gif
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/images/portal/moveRight.gif
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/images/portal/moveUp.gif b/ccm-cms-bundle/web/themes/static/aplaws-generic/images/portal/moveUp.gif
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/images/portal/moveUp.gif
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/images/portal/moveUp.gif
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/images/spacer.gif b/ccm-cms-bundle/web/themes/static/aplaws-generic/images/spacer.gif
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/images/spacer.gif
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/images/spacer.gif
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/images/tlcArrow-s.gif b/ccm-cms-bundle/web/themes/static/aplaws-generic/images/tlcArrow-s.gif
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/images/tlcArrow-s.gif
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/images/tlcArrow-s.gif
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/images/tlcArrow.gif b/ccm-cms-bundle/web/themes/static/aplaws-generic/images/tlcArrow.gif
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/images/tlcArrow.gif
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/images/tlcArrow.gif
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/images/w3c-css.bmp b/ccm-cms-bundle/web/themes/static/aplaws-generic/images/w3c-css.bmp
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/images/w3c-css.bmp
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/images/w3c-css.bmp
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/images/w3c-css.png b/ccm-cms-bundle/web/themes/static/aplaws-generic/images/w3c-css.png
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/images/w3c-css.png
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/images/w3c-css.png
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/images/w3c-xhtml.bmp b/ccm-cms-bundle/web/themes/static/aplaws-generic/images/w3c-xhtml.bmp
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/images/w3c-xhtml.bmp
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/images/w3c-xhtml.bmp
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/images/w3c-xhtml.png b/ccm-cms-bundle/web/themes/static/aplaws-generic/images/w3c-xhtml.png
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/images/w3c-xhtml.png
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/images/w3c-xhtml.png
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/lib/body.xsl b/ccm-cms-bundle/web/themes/static/aplaws-generic/lib/body.xsl
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/lib/body.xsl
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/lib/body.xsl
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/lib/head.xsl b/ccm-cms-bundle/web/themes/static/aplaws-generic/lib/head.xsl
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/lib/head.xsl
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/lib/head.xsl
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/lib/header.xsl b/ccm-cms-bundle/web/themes/static/aplaws-generic/lib/header.xsl
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/lib/header.xsl
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/lib/header.xsl
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/lib/leftNav.xsl b/ccm-cms-bundle/web/themes/static/aplaws-generic/lib/leftNav.xsl
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/lib/leftNav.xsl
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/lib/leftNav.xsl
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/lib/lib.xsl b/ccm-cms-bundle/web/themes/static/aplaws-generic/lib/lib.xsl
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/lib/lib.xsl
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/lib/lib.xsl
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/lib/page.xsl b/ccm-cms-bundle/web/themes/static/aplaws-generic/lib/page.xsl
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/lib/page.xsl
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/lib/page.xsl
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/lib/user-banner.xsl b/ccm-cms-bundle/web/themes/static/aplaws-generic/lib/user-banner.xsl
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/lib/user-banner.xsl
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/lib/user-banner.xsl
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/navigation-admin.css b/ccm-cms-bundle/web/themes/static/aplaws-generic/navigation-admin.css
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/navigation-admin.css
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/navigation-admin.css
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/navigation-admin.xsl b/ccm-cms-bundle/web/themes/static/aplaws-generic/navigation-admin.xsl
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/navigation-admin.xsl
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/navigation-admin.xsl
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/navigation-directory.xsl b/ccm-cms-bundle/web/themes/static/aplaws-generic/navigation-directory.xsl
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/navigation-directory.xsl
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/navigation-directory.xsl
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/navigation-index.xsl b/ccm-cms-bundle/web/themes/static/aplaws-generic/navigation-index.xsl
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/navigation-index.xsl
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/navigation-index.xsl
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/navigation-services.xsl b/ccm-cms-bundle/web/themes/static/aplaws-generic/navigation-services.xsl
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/navigation-services.xsl
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/navigation-services.xsl
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/navigation-sitemap.xsl b/ccm-cms-bundle/web/themes/static/aplaws-generic/navigation-sitemap.xsl
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/navigation-sitemap.xsl
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/navigation-sitemap.xsl
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/navigation-summary.xsl b/ccm-cms-bundle/web/themes/static/aplaws-generic/navigation-summary.xsl
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/navigation-summary.xsl
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/navigation-summary.xsl
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/portal-workspace-admin.xsl b/ccm-cms-bundle/web/themes/static/aplaws-generic/portal-workspace-admin.xsl
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/portal-workspace-admin.xsl
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/portal-workspace-admin.xsl
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/portal-workspace-index.xsl b/ccm-cms-bundle/web/themes/static/aplaws-generic/portal-workspace-index.xsl
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/portal-workspace-index.xsl
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/portal-workspace-index.xsl
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/portal/application-directory-portlet.xsl b/ccm-cms-bundle/web/themes/static/aplaws-generic/portal/application-directory-portlet.xsl
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/portal/application-directory-portlet.xsl
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/portal/application-directory-portlet.xsl
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/portal/content-item-portlet.xsl b/ccm-cms-bundle/web/themes/static/aplaws-generic/portal/content-item-portlet.xsl
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/portal/content-item-portlet.xsl
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/portal/content-item-portlet.xsl
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/portal/content-sections-portlet.xsl b/ccm-cms-bundle/web/themes/static/aplaws-generic/portal/content-sections-portlet.xsl
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/portal/content-sections-portlet.xsl
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/portal/content-sections-portlet.xsl
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/portal/directory-portlet.xsl b/ccm-cms-bundle/web/themes/static/aplaws-generic/portal/directory-portlet.xsl
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/portal/directory-portlet.xsl
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/portal/directory-portlet.xsl
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/portal/freeform-html-portlet.xsl b/ccm-cms-bundle/web/themes/static/aplaws-generic/portal/freeform-html-portlet.xsl
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/portal/freeform-html-portlet.xsl
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/portal/freeform-html-portlet.xsl
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/portal/lib.xsl b/ccm-cms-bundle/web/themes/static/aplaws-generic/portal/lib.xsl
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/portal/lib.xsl
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/portal/lib.xsl
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/portal/login-portlet.xsl b/ccm-cms-bundle/web/themes/static/aplaws-generic/portal/login-portlet.xsl
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/portal/login-portlet.xsl
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/portal/login-portlet.xsl
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/portal/portlets.xsl b/ccm-cms-bundle/web/themes/static/aplaws-generic/portal/portlets.xsl
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/portal/portlets.xsl
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/portal/portlets.xsl
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/portal/rss-feed-portlet.xsl b/ccm-cms-bundle/web/themes/static/aplaws-generic/portal/rss-feed-portlet.xsl
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/portal/rss-feed-portlet.xsl
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/portal/rss-feed-portlet.xsl
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/portal/tasklist-portlet.xsl b/ccm-cms-bundle/web/themes/static/aplaws-generic/portal/tasklist-portlet.xsl
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/portal/tasklist-portlet.xsl
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/portal/tasklist-portlet.xsl
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/portal/time-of-day-portlet.xsl b/ccm-cms-bundle/web/themes/static/aplaws-generic/portal/time-of-day-portlet.xsl
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/portal/time-of-day-portlet.xsl
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/portal/time-of-day-portlet.xsl
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/portal/workspace-directory-portlet.xsl b/ccm-cms-bundle/web/themes/static/aplaws-generic/portal/workspace-directory-portlet.xsl
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/portal/workspace-directory-portlet.xsl
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/portal/workspace-directory-portlet.xsl
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/search-admin.xsl b/ccm-cms-bundle/web/themes/static/aplaws-generic/search-admin.xsl
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/search-admin.xsl
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/search-admin.xsl
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/search-index.xsl b/ccm-cms-bundle/web/themes/static/aplaws-generic/search-index.xsl
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/search-index.xsl
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/search-index.xsl
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/shortcuts-index.css b/ccm-cms-bundle/web/themes/static/aplaws-generic/shortcuts-index.css
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/shortcuts-index.css
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/shortcuts-index.css
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/shortcuts-index.xsl b/ccm-cms-bundle/web/themes/static/aplaws-generic/shortcuts-index.xsl
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/shortcuts-index.xsl
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/shortcuts-index.xsl
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/subsite-index.css b/ccm-cms-bundle/web/themes/static/aplaws-generic/subsite-index.css
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/subsite-index.css
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/subsite-index.css
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/subsite-index.xsl b/ccm-cms-bundle/web/themes/static/aplaws-generic/subsite-index.xsl
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/subsite-index.xsl
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/subsite-index.xsl
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/terms-index.css b/ccm-cms-bundle/web/themes/static/aplaws-generic/terms-index.css
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/terms-index.css
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/terms-index.css
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/terms-index.xsl b/ccm-cms-bundle/web/themes/static/aplaws-generic/terms-index.xsl
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/terms-index.xsl
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/terms-index.xsl
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/theme-index.css b/ccm-cms-bundle/web/themes/static/aplaws-generic/theme-index.css
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/theme-index.css
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/theme-index.css
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/theme-index.xsl b/ccm-cms-bundle/web/themes/static/aplaws-generic/theme-index.xsl
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/theme-index.xsl
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/theme-index.xsl
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/types/Agenda.xsl b/ccm-cms-bundle/web/themes/static/aplaws-generic/types/Agenda.xsl
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/types/Agenda.xsl
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/types/Agenda.xsl
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/types/Article.xsl b/ccm-cms-bundle/web/themes/static/aplaws-generic/types/Article.xsl
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/types/Article.xsl
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/types/Article.xsl
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/types/ContentTypes.xsl b/ccm-cms-bundle/web/themes/static/aplaws-generic/types/ContentTypes.xsl
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/types/ContentTypes.xsl
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/types/ContentTypes.xsl
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/types/Event.xsl b/ccm-cms-bundle/web/themes/static/aplaws-generic/types/Event.xsl
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/types/Event.xsl
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/types/Event.xsl
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/types/FileStorageItem.xsl b/ccm-cms-bundle/web/themes/static/aplaws-generic/types/FileStorageItem.xsl
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/types/FileStorageItem.xsl
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/types/FileStorageItem.xsl
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/types/InlineSite.xsl b/ccm-cms-bundle/web/themes/static/aplaws-generic/types/InlineSite.xsl
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/types/InlineSite.xsl
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/types/InlineSite.xsl
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/types/Job.xsl b/ccm-cms-bundle/web/themes/static/aplaws-generic/types/Job.xsl
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/types/Job.xsl
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/types/Job.xsl
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/types/LegalNotice.xsl b/ccm-cms-bundle/web/themes/static/aplaws-generic/types/LegalNotice.xsl
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/types/LegalNotice.xsl
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/types/LegalNotice.xsl
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/types/Minutes.xsl b/ccm-cms-bundle/web/themes/static/aplaws-generic/types/Minutes.xsl
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/types/Minutes.xsl
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/types/Minutes.xsl
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/types/MultiPartArticle.xsl b/ccm-cms-bundle/web/themes/static/aplaws-generic/types/MultiPartArticle.xsl
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/types/MultiPartArticle.xsl
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/types/MultiPartArticle.xsl
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/types/NewsItem.xsl b/ccm-cms-bundle/web/themes/static/aplaws-generic/types/NewsItem.xsl
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/types/NewsItem.xsl
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/types/NewsItem.xsl
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/types/PressRelease.xsl b/ccm-cms-bundle/web/themes/static/aplaws-generic/types/PressRelease.xsl
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/types/PressRelease.xsl
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/types/PressRelease.xsl
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/types/Service.xsl b/ccm-cms-bundle/web/themes/static/aplaws-generic/types/Service.xsl
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/types/Service.xsl
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/types/Service.xsl
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/types/SimpleAddress.xsl b/ccm-cms-bundle/web/themes/static/aplaws-generic/types/SimpleAddress.xsl
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/types/SimpleAddress.xsl
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/types/SimpleAddress.xsl
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/types/SiteProxy.xsl b/ccm-cms-bundle/web/themes/static/aplaws-generic/types/SiteProxy.xsl
similarity index 100%
rename from ccm-bundle/web/themes/static/aplaws-generic/types/SiteProxy.xsl
rename to ccm-cms-bundle/web/themes/static/aplaws-generic/types/SiteProxy.xsl