diff --git a/ccm-cms-types-organization/pdl/com/arsdigita/content-types/SimpleOrganization.pdl b/ccm-cms-types-organization/pdl/com/arsdigita/content-types/ldn/Organization.pdl
similarity index 93%
rename from ccm-cms-types-organization/pdl/com/arsdigita/content-types/SimpleOrganization.pdl
rename to ccm-cms-types-organization/pdl/com/arsdigita/content-types/ldn/Organization.pdl
index 78a7e8efc..06e26c6e1 100755
--- a/ccm-cms-types-organization/pdl/com/arsdigita/content-types/SimpleOrganization.pdl
+++ b/ccm-cms-types-organization/pdl/com/arsdigita/content-types/ldn/Organization.pdl
@@ -17,11 +17,11 @@
 //
 // $Id: Organization.pdl 287 2005-02-22 00:29:02Z sskracic $
 // $DateTime: 2004/08/17 23:15:09 $
-model com.arsdigita.cms.contenttypes;
+model com.arsdigita.cms.contenttypes.ldn;
 
 import com.arsdigita.cms.*;
 
-object type SimpleOrganization extends ContentPage {
+object type Organization extends ContentPage {
     String [0..1] link  = ct_ldn_organization.link VARCHAR(1000);
     String [0..1] contact = ct_ldn_organization.contact VARCHAR(2000);
 
diff --git a/ccm-cms-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Organization.xml b/ccm-cms-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Organization.xml
deleted file mode 100755
index 8f5aee759..000000000
--- a/ccm-cms-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Organization.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ctd:content-types xmlns:ctd="http://xmlns.redhat.com/cms/content-types" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.redhat.com/cms/content-types content-types.xsd">
-  <ctd:content-type label="Organization"
-		    description="An organization profile"
-		    objectType="com.arsdigita.cms.contenttypes.Organization"
-		    classname="com.arsdigita.cms.contenttypes.Organization">
-
-        <ctd:authoring-kit createComponent="com.arsdigita.cms.contenttypes.ui.authoring.OrganizationCreate">
-
-      <ctd:authoring-step 
-         labelKey="cms.contenttypes.shared.basic_properties.title" 
-         labelBundle="com.arsdigita.cms.CMSResources"
-         descriptionKey="cms.contenttypes.shared.basic_properties.description" 
-         descriptionBundle="com.arsdigita.cms.CMSResources"
-         component="com.arsdigita.cms.contenttypes.ui.OrganizationPropertiesStep" 
-        ordering="1"/>
-		
-       <ctd:authoring-step
-        labelKey="organization.authoring.logo_image.title" 
-        labelBundle="com.arsdigita.cms.contenttypes.OrganizationResources"
-        descriptionKey="organization.authoring.logo_image.description" 
-        descriptionBundle="com.arsdigita.cms.contenttypes.OrganizationResources"
-        component="com.arsdigita.cms.contenttypes.ui.OrganizationImageStep" 
-        ordering="2"/>
-		
-      <ctd:include href="/WEB-INF/content-types/assign-categories-step.xml"/>
-
-      </ctd:authoring-kit>
-  </ctd:content-type>
-</ctd:content-types>
-
diff --git a/ccm-cms-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/ldn/Organization.xml b/ccm-cms-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/ldn/Organization.xml
new file mode 100755
index 000000000..3b3e62822
--- /dev/null
+++ b/ccm-cms-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/ldn/Organization.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ctd:content-types xmlns:ctd="http://xmlns.redhat.com/cms/content-types" 
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+                   xsi:schemaLocation="http://xmlns.redhat.com/cms/content-types content-types.xsd">
+    <ctd:content-type label="Organization"
+                      description="An organization profile"
+                      objectType="com.arsdigita.cms.contenttypes.ldn.Organization"
+                      classname="com.arsdigita.cms.contenttypes.ldn.Organization">
+
+        <ctd:authoring-kit createComponent="com.arsdigita.cms.contenttypes.ldn.ui.authoring.OrganizationCreate">
+
+            <ctd:authoring-step 
+                labelKey="cms.contenttypes.shared.basic_properties.title" 
+                labelBundle="com.arsdigita.cms.CMSResources"
+                descriptionKey="cms.contenttypes.shared.basic_properties.description" 
+                descriptionBundle="com.arsdigita.cms.CMSResources"
+                component="com.arsdigita.cms.contenttypes.ldn.ui.OrganizationPropertiesStep" 
+                ordering="1"/>
+
+            <ctd:authoring-step
+                labelKey="organization.authoring.logo_image.title" 
+                labelBundle="com.arsdigita.cms.ldn.contenttypes.OrganizationResources"
+                descriptionKey="organization.authoring.logo_image.description" 
+                descriptionBundle="com.arsdigita.cms.contenttypes.ldn.OrganizationResources"
+                component="com.arsdigita.cms.contenttypes.ldn.ui.OrganizationImageStep" 
+                ordering="2"/>
+
+            <ctd:include href="/WEB-INF/content-types/assign-categories-step.xml"/>
+
+        </ctd:authoring-kit>
+    </ctd:content-type>
+</ctd:content-types>
+
diff --git a/ccm-cms-types-organization/web/themes/heirloom/contenttypes/Organization.xsl b/ccm-cms-types-organization/web/themes/heirloom/contenttypes/Organization.xsl
index fee1912fd..23a9be619 100755
--- a/ccm-cms-types-organization/web/themes/heirloom/contenttypes/Organization.xsl
+++ b/ccm-cms-types-organization/web/themes/heirloom/contenttypes/Organization.xsl
@@ -6,15 +6,15 @@
                 xmlns:cms="http://www.arsdigita.com/cms/1.0"
                 version="1.0">
 
-  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.Organization']" mode="cms:CT_graphics"
-    name="cms:CT_graphics_com_arsdigita_cms_contenttypes_Organization">
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.ldn.Organization']" mode="cms:CT_graphics"
+    name="cms:CT_graphics_com_arsdigita_cms_contenttypes_ldn_Organization">
     <p><xsl:value-of select="title"/></p>
     <p>Contact: <xsl:value-of select="contact"/></p>
     <p><a><xsl:attribute name="href"><xsl:value-of select="link"/></xsl:attribute><xsl:value-of select="link"/></a></p>
   </xsl:template>
 
-  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.Organization']" mode="cms:CT_text"
-    name="cms:CT_text_com_arsdigita_cms_contenttypes_Organization">
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.ldn.Organization']" mode="cms:CT_text"
+    name="cms:CT_text_com_arsdigita_cms_contenttypes_ldn_Organization">
     <span class="text"><xsl:value-of select="title"/></span><br/>
     <span class="text"><xsl:value-of select="contact"/></span><br/>
     <span class="text"><a><xsl:attribute name="href"><xsl:value-of select="link"/></xsl:attribute><xsl:value-of select="link"/></a></span><br/>