diff --git a/ccm-core/src/com/arsdigita/web/Web.java b/ccm-core/src/com/arsdigita/web/Web.java
index 6721a89a4..c4b6b2491 100755
--- a/ccm-core/src/com/arsdigita/web/Web.java
+++ b/ccm-core/src/com/arsdigita/web/Web.java
@@ -104,6 +104,7 @@ public class Web {
      * Gets the web context object from the current thread.
      *
      * @return A <code>WebContext</code> object; it cannot be null
+     * Note: Rename from getContext()
      */
     public static WebContext getWebContext() {
         if (s_context == null) {
@@ -486,6 +487,10 @@ public class Web {
      */
 //  private static final Map s_contexts = new HashMap();
 
+    /**
+     * @deprecated renamed to getWebContext
+     */
+//  getContext()
     
     /**
      * Gets the servlet context matching the provided URI. The URI
diff --git a/tools-ng/netbeans/project.xml b/tools-ng/netbeans/project.xml
index ec52ec173..dc8dcc1bf 100644
--- a/tools-ng/netbeans/project.xml
+++ b/tools-ng/netbeans/project.xml
@@ -259,12 +259,6 @@
                     <location>ccm-cms-types-simpleaddress/src</location>
                     <encoding>UTF-8</encoding>
                 </source-folder>
-                <source-folder>
-                    <label>ccm-cms-types-simpleorganization (Source)</label>
-                    <type>java</type>
-                    <location>ccm-cms-types-simpleorganization/src</location>
-                    <encoding>UTF-8</encoding>
-                </source-folder>
                 <source-folder>
                     <label>ccm-cms-types-siteproxy (Source)</label>
                     <type>java</type>
@@ -511,6 +505,12 @@
                     <location>ccm-ldn-types-esdservice/src</location>
                     <encoding>UTF-8</encoding>
                 </source-folder>
+                <source-folder>
+                    <label>ccm-ldn-types-organization (Source)</label>
+                    <type>java</type>
+                    <location>ccm-ldn-types-organization/src</location>
+                    <encoding>UTF-8</encoding>
+                </source-folder>
                 <source-folder>
                     <label>ccm-ldn-userpreferences (Source)</label>
                     <type>java</type>
@@ -866,10 +866,6 @@
                         <label>ccm-cms-types-simpleaddress (Source)</label>
                         <location>ccm-cms-types-simpleaddress/src</location>
                     </source-folder>
-                    <source-folder style="packages">
-                        <label>ccm-cms-types-simpleorganization (Source)</label>
-                        <location>ccm-cms-types-simpleorganization/src</location>
-                    </source-folder>
                     <source-folder style="packages">
                         <label>ccm-cms-types-siteproxy (Source)</label>
                         <location>ccm-cms-types-siteproxy/src</location>
@@ -1038,6 +1034,10 @@
                         <label>ccm-ldn-types-esdservice (Source)</label>
                         <location>ccm-ldn-types-esdservice/src</location>
                     </source-folder>
+                    <source-folder style="packages">
+                        <label>ccm-ldn-types-organization (Source)</label>
+                        <location>ccm-ldn-types-organization/src</location>
+                    </source-folder>
                     <source-folder style="packages">
                         <label>ccm-ldn-userpreferences (Source)</label>
                         <location>ccm-ldn-userpreferences/src</location>
@@ -1178,6 +1178,7 @@
                 <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-faqitem/src</package-root>
                 <package-root>ccm-cms-types-filestorageitem/src</package-root>
@@ -1201,7 +1202,6 @@
                 <package-root>ccm-cms-types-researchnetwork/src</package-root>
                 <package-root>ccm-cms-types-service/src</package-root>
                 <package-root>ccm-cms-types-simpleaddress/src</package-root>
-                <package-root>ccm-cms-types-simpleorganisation/src</package-root>
                 <package-root>ccm-cms-types-siteproxy/src</package-root>
                 <package-root>ccm-cms-types-survey/src</package-root>
                 <package-root>ccm-cms-types-xmlfeed/src</package-root>
@@ -1244,6 +1244,7 @@
                 <package-root>ccm-ldn-types-contact/src</package-root>
                 <package-root>ccm-ldn-types-councillor/src</package-root>
                 <package-root>ccm-ldn-types-esdservice/src</package-root>
+                <package-root>ccm-ldn-types-organization/src</package-root>
                 <package-root>ccm-ldn-userpreferences/src</package-root>
                 <package-root>ccm-ldn-util/src</package-root>
                 <package-root>ccm-lbc-aplaws/src</package-root>