diff --git a/tools-ng/netbeans/project.xml b/tools-ng/netbeans/project.xml
index d8817ba41..664c0f223 100644
--- a/tools-ng/netbeans/project.xml
+++ b/tools-ng/netbeans/project.xml
@@ -15,16 +15,6 @@
                     <location>.</location>
                     <encoding>UTF-8</encoding>
                 </source-folder>
-                <source-folder>
-                    <label>webapps</label>
-                    <type>doc_root</type>
-                    <location>runtime/webapps</location>
-                </source-folder>
-                <source-folder>
-                    <label>WEB-INF</label>
-                    <type>web_inf</type>
-                    <location>runtime/webapps/WEB-INF</location>
-                </source-folder>
                 <source-folder>
                     <label>ccm-core (Source)</label>
                     <type>java</type>
@@ -73,6 +63,18 @@
                     <location>ccm-cms-assets-relatedlink/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-cms-publicpersonalprofile (Source)</label>
+                    <type>java</type>
+                    <location>ccm-cms-publicpersonalprofile/src</location>
+                    <encoding>UTF-8</encoding>
+                </source-folder>
                 <source-folder>
                     <label>ccm-cms-types-address (Source)</label>
                     <type>java</type>
@@ -301,18 +303,6 @@
                     <location>ccm-calendar/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>
@@ -703,6 +693,16 @@
                     <location>ccm-sci-types-project/src</location>
                     <encoding>UTF-8</encoding>
                 </source-folder>
+                <source-folder>
+                    <label>webapps</label>
+                    <type>doc_root</type>
+                    <location>runtime/webapps</location>
+                </source-folder>
+                <source-folder>
+                    <label>WEB-INF</label>
+                    <type>web_inf</type>
+                    <location>runtime/webapps/WEB-INF</location>
+                </source-folder>
             </folders>
             <ide-actions>
                 <action name="build">
@@ -778,6 +778,14 @@
                         <label>ccm-cms-assets-relatedlink (Source)</label>
                         <location>ccm-cms-assets-relatedlink/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-cms-publicpersonalprofile (Source)</label>
+                        <location>ccm-cms-publicpersonalprofile/src</location>
+                    </source-folder>
                     <source-folder style="packages">
                         <label>ccm-cms-types-address (Source)</label>
                         <location>ccm-cms-types-address/src</location>
@@ -930,14 +938,6 @@
                         <label>ccm-calendar (Source)</label>
                         <location>ccm-calendar/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>
@@ -1172,7 +1172,7 @@
                     </source-folder>
                     <source-folder style="packages">
                         <label>ccm-sci-publicationscvsexporter (Source)</label>
-                        <location>ccm-sci-cvsexporter/src</location>
+                        <location>ccm-sci-publicationscsvexporter/src</location>
                     </source-folder>
                     <source-folder style="packages">
                         <label>ccm-sci-publicationscvsimporter (Source)</label>
@@ -1215,7 +1215,7 @@
             </view>
             <subprojects/>
         </general-data>
-        <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/3">
+        <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/4">
             <compilation-unit>
                 <package-root>ccm-core/src</package-root>
                 <package-root>ccm-cms/src</package-root>
@@ -1225,14 +1225,14 @@
                 <package-root>ccm-cms-assets-notes/src</package-root>
                 <package-root>ccm-cms-assets-orgaunittext/src</package-root>
                 <package-root>ccm-cms-assets-relatedlink/src</package-root>
+                <package-root>ccm-cms-personalcontentcomponent/src</package-root>
+                <package-root>ccm-cms-publicpersonalprofile/src</package-root>
                 <package-root>ccm-cms-types-address/src</package-root>
                 <package-root>ccm-cms-types-agenda/src</package-root>
                 <package-root>ccm-cms-types-article/src</package-root>
                 <package-root>ccm-cms-types-bookmark/src</package-root>
                 <package-root>ccm-cms-types-contact/src</package-root>
                 <package-root>ccm-cms-types-decisiontree/src</package-root>
-                <package-root>ccm-cms-types-esdservice/src</package-root>
-                <package-root>ccm-cms-types-organization/src</package-root>
                 <package-root>ccm-cms-types-event/src</package-root>
                 <package-root>ccm-cms-types-externallink/src</package-root>
                 <package-root>ccm-cms-types-faqitem/src</package-root>
@@ -1265,8 +1265,6 @@
                 <package-root>ccm-auth-http/src</package-root>
                 <package-root>ccm-bookmarks/src</package-root>
                 <package-root>ccm-calendar/src</package-root>
-                <package-root>ccm-cms-publicpersonalprofile/src</package-root>
-                <package-root>ccm-cms-personalcontentcomponent/src</package-root>
                 <package-root>ccm-docmgr/src</package-root>
                 <package-root>ccm-docrepo/src</package-root>
                 <package-root>ccm-faq/src</package-root>
@@ -1332,8 +1330,8 @@
                 <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-1.2-api-2.8.2.jar:ccm-core/lib/log4j-api-2.8.2.jar: ccm-core/lib/log4j-core-2.8.2.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/saxon9h2.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:ccm-themedirector/lib/jlessc-1.5.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.7</source-level>
+                <classpath mode="compile">ccm-core/lib/log4j-1.2-api-2.8.2.jar:ccm-core/lib/log4j-api-2.8.2.jar: ccm-core/lib/log4j-core-2.8.2.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/saxon9h2.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:ccm-themedirector/lib/jlessc-1.5.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:ccm-themedirector/lib/jlessc-1.5.jar</classpath>
+                <source-level>1.8</source-level>
             </compilation-unit>
         </java-data>
         <preferences xmlns="http://www.netbeans.org/ns/auxiliary-configuration-preferences/1">
@@ -1357,7 +1355,7 @@
         <web-data xmlns="http://www.netbeans.org/ns/freeform-project-web/1">
             <web-module>
                 <doc-root>runtime/webapps</doc-root>
-                <classpath>ccm-core/lib/log4j.jar:tools-ng/devel/lib/servlet-api.jar:tools-ng/devel/lib/jsp-api</classpath>
+                <classpath>tools-ng/devel/lib/servlet-api.jar:tools-ng/devel/lib/jsp-api</classpath>
                 <context-path/>
                 <j2ee-spec-level>1.5</j2ee-spec-level>
             </web-module>