diff --git a/tools-ng/netbeans/project.xml b/tools-ng/netbeans/project.xml
index 6f6450e00..1425d2ffc 100644
--- a/tools-ng/netbeans/project.xml
+++ b/tools-ng/netbeans/project.xml
@@ -307,18 +307,30 @@
                     <location>ccm-bookmarks/src</location>
                     <encoding>UTF-8</encoding>
                 </source-folder>
-                <source-folder>
-                    <label>ccm-bundle (Source)</label>
-                    <type>java</type>
-                    <location>ccm-bundle/src</location>
-                    <encoding>UTF-8</encoding>
-                </source-folder>
                 <source-folder>
                     <label>ccm-calendar (Source)</label>
                     <type>java</type>
                     <location>ccm-calendar/src</location>
                     <encoding>UTF-8</encoding>
                 </source-folder>
+                <source-folder>
+                    <label>ccm-cms-bundle (Source)</label>
+                    <type>java</type>
+                    <location>ccm-cms-bundle/src</location>
+                    <encoding>UTF-8</encoding>
+                </source-folder>
+                <source-folder>
+                    <label>ccm-cms-publicpersonalprofile (Source)</label>
+                    <type>java</type>
+                    <location>ccm-cms-publicpersonalprofile/src</location>
+                    <encoding>UTF-8</encoding>
+                </source-folder>
+                <source-folder>
+                    <label>ccm-cms-personalcontentcomponent (Source)</label>
+                    <type>java</type>
+                    <location>ccm-cms-personalcontentcomponent/src</location>
+                    <encoding>UTF-8</encoding>
+                </source-folder>
                 <source-folder>
                     <label>ccm-docmgr (Source)</label>
                     <type>java</type>
@@ -505,6 +517,12 @@
                     <location>ccm-ldn-types-contact/src</location>
                     <encoding>UTF-8</encoding>
                 </source-folder>
+                <source-folder>
+                    <label>ccm-ldn-types-councillor (Source)</label>
+                    <type>java</type>
+                    <location>ccm-ldn-types-councillor/src</location>
+                    <encoding>UTF-8</encoding>
+                </source-folder>
                 <source-folder>
                     <label>ccm-ldn-types-esdservice (Source)</label>
                     <type>java</type>
@@ -904,14 +922,22 @@
                         <label>ccm-bookmarks (Source)</label>
                         <location>ccm-bookmarks/src</location>
                     </source-folder>
-                    <source-folder style="packages">
-                        <label>ccm-bundle (Source)</label>
-                        <location>ccm-bundle/src</location>
-                    </source-folder>
                     <source-folder style="packages">
                         <label>ccm-calendar (Source)</label>
                         <location>ccm-calendar/src</location>
                     </source-folder>
+                    <source-folder style="packages">
+                        <label>ccm-cms-bundle (Source)</label>
+                        <location>ccm-cms-bundle/src</location>
+                    </source-folder>
+                    <source-folder style="packages">
+                        <label>ccm-cms-publicpersonalprofile (Source)</label>
+                        <location>ccm-cms-publicpersonalprofile/src</location>
+                    </source-folder>
+                    <source-folder style="packages">
+                        <label>ccm-cms-personalcontentcomponent (Source)</label>
+                        <location>ccm-cms-personalcontentcomponent/src</location>
+                    </source-folder>
                     <source-folder style="packages">
                         <label>ccm-docmgr (Source)</label>
                         <location>ccm-docmgr/src</location>
@@ -1220,8 +1246,10 @@
                 <package-root>ccm-atoz-siteproxy/src</package-root>
                 <package-root>ccm-auth-http/src</package-root>
                 <package-root>ccm-bookmarks/src</package-root>
-                <package-root>ccm-bundle/src</package-root>
                 <package-root>ccm-calendar/src</package-root>
+                <package-root>ccm-cms-bundle/src</package-root>
+                <package-root>ccm-cms-personalcontentcomponent/src</package-root>
+                <package-root>ccm-cms-publicpersonalprofile/src</package-root>
                 <package-root>ccm-docmgr/src</package-root>
                 <package-root>ccm-docrepo/src</package-root>
                 <package-root>ccm-faq/src</package-root>
@@ -1282,7 +1310,7 @@
                 <package-root>ccm-sci-types-institute/src</package-root>
                 <package-root>ccm-sci-types-member/src</package-root>
                 <package-root>ccm-sci-types-project/src</package-root>
-                <classpath mode="compile">ccm-core/lib/log4j.jar:ccm-core/lib/mail.jar:ccm-core/lib/commons-beanutils.jar:ccm-core/lib/commons-cli-1.0.jar:ccm-core/lib/commons-collections-3.0.jar:ccm-core/lib/commons-codec-1.3.jar:ccm-core/lib/commons-fileupload-1.1.1.jar:ccm-core/lib/commons-io-1.3.1.jar:ccm-core/lib/commons-lang-2.1.jar:ccm-core/lib/commons-primitives-1.0.jar:ccm-core/lib/xercesImpl.jar:ccm-core/lib/jakarta-oro-2.0.8.jar:ccm-core/lib/Tidy.jar:ccm-core/lib/imgscalr-lib-4.3-SNAPSHOT.jar:ccm-core/lib/jdom.jar:ccm-core/lib/jdxslt.jar:ccm-core/lib/lucene-core-2.4.0.jar:ccm-core/lib/saxon.jar:ccm-core/lib/poi-2.5-final-20040302.jar:ccm-core/lib/pdfbox-1.4.0.jar:ccm-core/lib/tm-extractors-0.4.jar:ccm-core/lib/bcprov-jdk16-144.jar:ccm-cms/lib/jai_codec.jar:ccm-cms/lib/jai_core.jar:ccm-cms/lib/mlibwrapper_jai.jar:ccm-ldn-search/lib/axis.jar:ccm-ldn-search/lib/jaxrpc.jar:ccm-ldn-search/lib/jobo.jar:ccm-ldn-terms/lib/commons-digester.jar:ccm-ldn-terms/lib/jena.jar:ccm-ldn-terms/lib/snowball.jar:ccm-ldn-terms/lib/weka-3.5.5.jar:ccm-ldn-terms/lib/xstream-1.3.1.jar:ccm-formbuilder-pdf/lib/fop.jar:ccm-sci-publications/lib/jbibtex-1.0.2.jar:tools-ng/devel/lib/ojdbc14.jar:tools-ng/devel/lib/servlet-api.jar:tools-ng/devel/lib/jsp-api.jar:tools-ng/devel/lib/portlet-2.0.jar</classpath>
+                <classpath mode="compile">ccm-core/lib/log4j.jar:ccm-core/lib/mail.jar:ccm-core/lib/jsoup.jar:ccm-core/lib/commons-beanutils.jar:ccm-core/lib/commons-cli-1.0.jar:ccm-core/lib/commons-collections-3.0.jar:ccm-core/lib/commons-codec-1.3.jar:ccm-core/lib/commons-fileupload-1.1.1.jar:ccm-core/lib/commons-io-1.3.1.jar:ccm-core/lib/commons-lang-2.1.jar:ccm-core/lib/commons-primitives-1.0.jar:ccm-core/lib/xercesImpl.jar:ccm-core/lib/jakarta-oro-2.0.8.jar:ccm-core/lib/Tidy.jar:ccm-core/lib/imgscalr-lib-4.3-SNAPSHOT.jar:ccm-core/lib/jdom.jar:ccm-core/lib/jdxslt.jar:ccm-core/lib/lucene-core-2.4.0.jar:ccm-core/lib/saxon.jar:ccm-core/lib/poi-2.5-final-20040302.jar:ccm-core/lib/pdfbox-1.4.0.jar:ccm-core/lib/tm-extractors-0.4.jar:ccm-core/lib/bcprov-jdk16-144.jar:ccm-cms/lib/jai_codec.jar:ccm-cms/lib/jai_core.jar:ccm-cms/lib/mlibwrapper_jai.jar:ccm-ldn-search/lib/axis.jar:ccm-ldn-search/lib/jaxrpc.jar:ccm-ldn-search/lib/jobo.jar:ccm-ldn-terms/lib/commons-digester.jar:ccm-ldn-terms/lib/jena.jar:ccm-ldn-terms/lib/snowball.jar:ccm-ldn-terms/lib/weka-3.5.5.jar:ccm-ldn-terms/lib/xstream-1.3.1.jar:ccm-formbuilder-pdf/lib/fop.jar:ccm-sci-publications/lib/jbibtex-1.0.2.jar:tools-ng/devel/lib/ojdbc14.jar:tools-ng/devel/lib/servlet-api.jar:tools-ng/devel/lib/jsp-api.jar:tools-ng/devel/lib/portlet-2.0.jar</classpath>
                 <source-level>1.6</source-level>
             </compilation-unit>
         </java-data>