diff --git a/tools-ng/ecdc/bundles/apache-tomcat-6.0.33.zip b/tools-ng/ecdc/bundles/apache-tomcat-6.0.33.zip
deleted file mode 100644
index bc19b49db..000000000
Binary files a/tools-ng/ecdc/bundles/apache-tomcat-6.0.33.zip and /dev/null differ
diff --git a/tools-ng/ecdc/bundles/apache-tomcat-6.0.53.zip b/tools-ng/ecdc/bundles/apache-tomcat-6.0.53.zip
new file mode 100644
index 000000000..aa6a38ee5
Binary files /dev/null and b/tools-ng/ecdc/bundles/apache-tomcat-6.0.53.zip differ
diff --git a/tools-ng/ecdc/bundles/apache-tomcat-7.0.78.zip b/tools-ng/ecdc/bundles/apache-tomcat-7.0.78.zip
new file mode 100644
index 000000000..559adbcae
Binary files /dev/null and b/tools-ng/ecdc/bundles/apache-tomcat-7.0.78.zip differ
diff --git a/tools-ng/ecdc/bundles/apache-tomcat-8.0.44.zip b/tools-ng/ecdc/bundles/apache-tomcat-8.0.44.zip
new file mode 100644
index 000000000..71369d0c5
Binary files /dev/null and b/tools-ng/ecdc/bundles/apache-tomcat-8.0.44.zip differ
diff --git a/tools-ng/ecdc/bundles/apache-tomcat-8.5.15.zip b/tools-ng/ecdc/bundles/apache-tomcat-8.5.15.zip
new file mode 100644
index 000000000..d8690e427
Binary files /dev/null and b/tools-ng/ecdc/bundles/apache-tomcat-8.5.15.zip differ
diff --git a/tools-ng/ecdc/local.ccm.properties b/tools-ng/ecdc/local.ccm.properties
index 9ebea5341..3bad7f71d 100644
--- a/tools-ng/ecdc/local.ccm.properties
+++ b/tools-ng/ecdc/local.ccm.properties
@@ -6,16 +6,16 @@
 ## Usually you will define your own specific bundle!
 ## -------------------------------------------------
 
-#ccm.bundle.folder=${ccm.project.dir}/ccm-bundle/bundles/base
-#ccm.bundle.folder=${ccm.project.dir}/ccm-bundle/bundles/devel
-#ccm.bundle.folder=${ccm.project.dir}/ccm-bundle/bundles/standard
+#ccm.bundle.folder=${ccm.project.dir}/ccm-lcs-bundle/bundles/base
+#ccm.bundle.folder=${ccm.project.dir}/ccm-lcs-bundle/bundles/devel
+#ccm.bundle.folder=${ccm.project.dir}/ccm-lcs-bundle/bundles/standard
 # ==============================================================================
 # Use a project in the local subdir to specify your own local/custom development
 # project. Don't modify any of the system provided specifications! Instead, copy
 # one of the systems project, e.g. devel, to local and modify it according to
 #  your needs!
 # ==============================================================================
-#ccm.bundle.folder=${ccm.project.dir}/ccm-bundle/bundles/local/my-devel
+#ccm.bundle.folder=${ccm.project.dir}/ccm-lcs-bundle/bundles/local/my-devel
 
 #ccm.bundle.folder=${ccm.project.dir}/ccm-ldn-aplaws/bundles/custom
 #ccm.bundle.folder=${ccm.project.dir}/ccm-ldn-aplaws/bundles/demo
diff --git a/tools-ng/ecdc/local.runtime.properties b/tools-ng/ecdc/local.runtime.properties
index 7293f2309..a88b8f813 100644
--- a/tools-ng/ecdc/local.runtime.properties
+++ b/tools-ng/ecdc/local.runtime.properties
@@ -11,10 +11,17 @@
     #app.server.vendor=apache
     #app.server.type=tomcat
     #app.server.version=6.0.39
-
-    ## Alternative available server
+    #app.server.version=6.0.53
 
     # app.server.version=7.0.53
+    # app.server.version=7.0.78
+
+    # app.server.version=8.0.44
+
+      app.server.version=8.5.15
+
+
+    ## Alternative available server
 
     # app.server.type=pluto
     # app.server.version=2.0.3
diff --git a/tools-ng/netbeans/project.xml b/tools-ng/netbeans/project.xml
index 0dad1cff4..a6d20a9a1 100644
--- a/tools-ng/netbeans/project.xml
+++ b/tools-ng/netbeans/project.xml
@@ -313,12 +313,6 @@
                     <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>
@@ -451,6 +445,12 @@
                     <location>ccm-webpage/src</location>
                     <encoding>UTF-8</encoding>
                 </source-folder>
+                <source-folder>
+                    <label>ccm-lcs-bundle (Source)</label>
+                    <type>java</type>
+                    <location>ccm-lcs-bundle/src</location>
+                    <encoding>UTF-8</encoding>
+                </source-folder>
                 <source-folder>
                     <label>ccm-ldn-aplaws (Source)</label>
                     <type>java</type>
@@ -926,10 +926,6 @@
                         <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>
@@ -1018,6 +1014,10 @@
                         <label>ccm-webpage (Source)</label>
                         <location>ccm-webpage/src</location>
                     </source-folder>
+                    <source-folder style="packages">
+                        <label>ccm-lcs-bundle (Source)</label>
+                        <location>ccm-lcs-bundle/src</location>
+                    </source-folder>
                     <source-folder style="packages">
                         <label>ccm-ldn-aplaws (Source)</label>
                         <location>ccm-ldn-aplaws/src</location>
@@ -1247,7 +1247,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-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>
@@ -1270,6 +1269,7 @@
                 <package-root>ccm-themedirector/src</package-root>
                 <package-root>ccm-weblog/src</package-root>
                 <package-root>ccm-webpage/src</package-root>
+                <package-root>ccm-lcs-bundle/src</package-root>
                 <package-root>ccm-ldn-aplaws/src</package-root>
                 <package-root>ccm-ldn-atoz/src</package-root>
                 <package-root>ccm-ldn-atoz-siteproxy/src</package-root>