diff --git a/ccm-cms-types-simpleorganization/application.xml b/ccm-cms-types-organization/application.xml
similarity index 93%
rename from ccm-cms-types-simpleorganization/application.xml
rename to ccm-cms-types-organization/application.xml
index b2e215147..1699a7255 100644
--- a/ccm-cms-types-simpleorganization/application.xml
+++ b/ccm-cms-types-organization/application.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
-name="ccm-cms-types-simpleorganization"
+name="ccm-cms-types-organization"
 prettyName="Simple contenttype which exposed GenericOrganizationalUnit"
-version = "6.6.6"
+version = "6.6.7"
 release="1"
 webapp="ROOT">
 
diff --git a/ccm-cms-types-organization/pdl/com/arsdigita/content-types/Organization.pdl b/ccm-cms-types-organization/pdl/com/arsdigita/content-types/Organization.pdl
new file mode 100644
index 000000000..7f3b8b04d
--- /dev/null
+++ b/ccm-cms-types-organization/pdl/com/arsdigita/content-types/Organization.pdl
@@ -0,0 +1,12 @@
+model com.arsdigita.cms.contenttypes;
+
+import com.arsdigita.kernel.ACSObject;
+import com.arsdigita.cms.*;
+
+object type Organization extends GenericOrganizationalUnit {
+       reference key (ct_organizations.organization_id);
+}
+
+object type OrganizationBundle extends GenericOrganizationalUnitBundle {
+       reference key (ct_organization_bundles.bundle_id);
+}
\ No newline at end of file
diff --git a/ccm-cms-types-simpleorganization/sql/ccm-cms-types-simpleorganization/oracle-se-create.sql b/ccm-cms-types-organization/sql/ccm-cms-types-organization/oracle-se-create.sql
similarity index 100%
rename from ccm-cms-types-simpleorganization/sql/ccm-cms-types-simpleorganization/oracle-se-create.sql
rename to ccm-cms-types-organization/sql/ccm-cms-types-organization/oracle-se-create.sql
diff --git a/ccm-cms-types-simpleorganization/sql/ccm-cms-types-simpleorganization/postgres-create.sql b/ccm-cms-types-organization/sql/ccm-cms-types-organization/postgres-create.sql
similarity index 100%
rename from ccm-cms-types-simpleorganization/sql/ccm-cms-types-simpleorganization/postgres-create.sql
rename to ccm-cms-types-organization/sql/ccm-cms-types-organization/postgres-create.sql
diff --git a/ccm-cms-types-organization/sql/ccm-cms-types-organization/upgrade/default/rename_simpleorga_to_orga.sql b/ccm-cms-types-organization/sql/ccm-cms-types-organization/upgrade/default/rename_simpleorga_to_orga.sql
new file mode 100644
index 000000000..0c73e21f5
--- /dev/null
+++ b/ccm-cms-types-organization/sql/ccm-cms-types-organization/upgrade/default/rename_simpleorga_to_orga.sql
@@ -0,0 +1,68 @@
+--
+-- Copyright (C) 2014 Jens Pelzetter All Rights Reserved.
+--
+-- This library is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU Lesser General Public License
+-- as published by the Free Software Foundation; either version 2.1 of
+-- the License, or (at your option) any later version.
+--
+-- This library is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+-- Lesser General Public License for more details.
+--
+-- You should have received a copy of the GNU Lesser General Public
+-- License along with this library; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+-- Renaming ccm-cms-types-simpleorganization to ccm-cms-types-organization to keep the naming
+-- schema
+
+-- Rename tables
+ALTER TABLE ct_simpleorganizations TO ct_organizations;
+
+-- Update inits
+
+-- Drop constraints for init_requirements temporaly (otherwise we can't update 
+-- the tables)
+ALTER TABLE init_requirements DROP CONSTRAINT init_requirements_init_f_cmmdn ;
+ALTER TABLE init_requirements DROP CONSTRAINT init_require_requ_init_f_i6rgg ;
+
+-- Adjust the class name of the Initializer
+UPDATE inits
+   SET class_name='com.arsdigita.cms.contenttypes.OrganizationInitializer'
+ WHERE class_name='com.arsdigita.cms.contenttypes.SimpleOrganizationInitializer';
+
+-- Adjust the class name of the Initializer in init-requirements
+UPDATE init_requirements
+   SET init='com.arsdigita.cms.contenttypes.OrganizationInitializer'
+ WHERE init='com.arsdigita.cms.contenttypes.SimpleOrganizationInitializer';
+
+-- Restore the constraints for init_requirements
+ALTER TABLE init_requirements
+  ADD CONSTRAINT init_requirements_init_f_cmmdn FOREIGN KEY (init)
+      REFERENCES inits (class_name) MATCH SIMPLE
+      ON UPDATE NO ACTION ON DELETE NO ACTION;
+ALTER TABLE init_requirements
+  ADD CONSTRAINT init_require_requ_init_f_i6rgg FOREIGN KEY (required_init)
+      REFERENCES inits (class_name) MATCH SIMPLE
+      ON UPDATE NO ACTION ON DELETE NO ACTION;
+
+-- Update system tables
+
+-- Adjust the class name in acs-objects for all DecisionTree instances
+UPDATE acs_objects
+   SET object_type = 'com.arsdigita.cms.contenttypes.Organization',
+       default_domain_class = 'com.arsdigita.cms.contenttypes.Organization'
+ WHERE default_domain_class = 'com.arsdigita.cms.contenttypes.SimpleOrganization';
+
+--Adjust content type organization in contenttype directory table
+UPDATE content_types
+   SET object_type = 'com.arsdigita.cms.contenttypes.Organization', 
+       classname = 'com.arsdigita.cms.contenttypes.Organization'
+ WHERE object_type = 'com.arsdigita.cms.contenttypes.SimpleOrganization' ;
+
+--Adjust content type decisiontree in authoring_steps directory table
+UPDATE authoring_steps 
+   SET component = 'com.arsdigita.cms.contenttypes.ui.OrganizationPropertiesStep'
+ WHERE component = 'com.arsdigita.cms.contenttypes.ui.SimpleOrganizationPropertiesStep';
\ No newline at end of file
diff --git a/ccm-cms-types-organization/sql/ccm-cms-types-organization/upgrade/oracle-se-6.6.6-6.6.7.sql b/ccm-cms-types-organization/sql/ccm-cms-types-organization/upgrade/oracle-se-6.6.6-6.6.7.sql
new file mode 100644
index 000000000..3a7381897
--- /dev/null
+++ b/ccm-cms-types-organization/sql/ccm-cms-types-organization/upgrade/oracle-se-6.6.6-6.6.7.sql
@@ -0,0 +1,22 @@
+--
+-- Copyright (C) 2014 Jens Pelzetter All Rights Reserved.
+--
+-- This library is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU Lesser General Public License
+-- as published by the Free Software Foundation; either version 2.1 of
+-- the License, or (at your option) any later version.
+--
+-- This library is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+-- Lesser General Public License for more details.
+--
+-- You should have received a copy of the GNU Lesser General Public
+-- License along with this library; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+--
+-- $Id: oracle-se-6.6.0-6.6.1.sql 293 2011-01-07 15:10:39Z pboy $
+
+PROMPT LibreCCM types organization 6.6.6 -> 6.6.7 Upgrade Script (Oracle)
+
+@@ default/6.6.6-6.6.7/rename_simpleorga_to_orga.sql
\ No newline at end of file
diff --git a/ccm-cms-types-organization/sql/ccm-cms-types-organization/upgrade/postgres-6.6.6-6.6.7.sql b/ccm-cms-types-organization/sql/ccm-cms-types-organization/upgrade/postgres-6.6.6-6.6.7.sql
new file mode 100644
index 000000000..3cf78bd25
--- /dev/null
+++ b/ccm-cms-types-organization/sql/ccm-cms-types-organization/upgrade/postgres-6.6.6-6.6.7.sql
@@ -0,0 +1,24 @@
+--
+-- Copyright (C) 2014 Jens Pelzetter All Rights Reserved.
+--
+-- This library is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU Lesser General Public License
+-- as published by the Free Software Foundation; either version 2.1 of
+-- the License, or (at your option) any later version.
+--
+-- This library is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+-- Lesser General Public License for more details.
+--
+-- You should have received a copy of the GNU Lesser General Public
+-- License along with this library; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+\echo LibreCMS types Organization 6.6.6 -> 6.6.7 Upgrade Script (PostgreSQL)
+
+begin;
+
+\i default/6.6.6-6.6.7/rename_simpleorga_to_orga.sql
+
+end;
\ No newline at end of file
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
new file mode 100644
index 000000000..68ba4863a
--- /dev/null
+++ b/ccm-cms-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Organization.xml
@@ -0,0 +1,28 @@
+<?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="Exposed GenericOrganizationalUnit"
+                    objectType="com.arsdigita.cms.contenttypes.Organization"
+                    classname="com.arsdigita.cms.contenttypes.Organization">
+
+        <ctd:authoring-kit createComponent="com.arsdigita.cms.contenttypes.ui.OrganizationCreate">
+      
+            <ctd:authoring-step
+                labelKey="sciorganization.ui.organization_properties.title"
+                labelBundle="com.arsdigita.cms.contenttypes.ui.OrganizationResources"
+                descriptionKey="sciorganization.ui.organization_properties.title"
+                descriptionBundle="com.arsdigita.cms.contenttypes.ui.OrganizationResources"
+                component="com.arsdigita.cms.contenttypes.ui.OrganizationPropertiesStep"
+                ordering="1"/>
+
+            <ctd:include href="/WEB-INF/content-types/assign-categories-step.xml"/>
+
+        </ctd:authoring-kit>
+
+    </ctd:content-type>
+
+</ctd:content-types>
\ No newline at end of file
diff --git a/ccm-cms-types-simpleorganization/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/SimpleOrganization.xml b/ccm-cms-types-organization/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/Organization.xml
similarity index 86%
rename from ccm-cms-types-simpleorganization/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/SimpleOrganization.xml
rename to ccm-cms-types-organization/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/Organization.xml
index d374db42a..8500cea13 100644
--- a/ccm-cms-types-simpleorganization/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/SimpleOrganization.xml
+++ b/ccm-cms-types-organization/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/Organization.xml
@@ -6,7 +6,8 @@
     xsi:schemaLocation="http://rhea.redhat.com/schemas/waf/xml-renderer-rules xml-renderer-rules.xsd">
         
     <xrd:context name="com.arsdigita.cms.dispatcher.SimpleXMLGenerator">
-        <xrd:adapter objectType="com.arsdigita.cms.contenttypes.SimpleOrganization" extends="com.arsdigita.cms.ContentPage">
+        <xrd:adapter objectType="com.arsdigita.cms.contenttypes.Organization" 
+                     extends="com.arsdigita.cms.ContentPage">
         </xrd:adapter>
     </xrd:context>
     
diff --git a/ccm-cms-types-simpleorganization/src/ccm-cms-types-simpleorganization.config b/ccm-cms-types-organization/src/ccm-cms-types-organization.config
similarity index 100%
rename from ccm-cms-types-simpleorganization/src/ccm-cms-types-simpleorganization.config
rename to ccm-cms-types-organization/src/ccm-cms-types-organization.config
diff --git a/ccm-cms-types-organization/src/ccm-cms-types-organization.load b/ccm-cms-types-organization/src/ccm-cms-types-organization.load
new file mode 100644
index 000000000..a4d29ceb0
--- /dev/null
+++ b/ccm-cms-types-organization/src/ccm-cms-types-organization.load
@@ -0,0 +1,16 @@
+<load>
+    <requires>
+        <table name="inits"/>
+        <table name="acs_objects"/>
+        <table name="cms_items"/>
+        <initializer class="com.arsdigita.cms.Initializer"/>
+    </requires>
+    <provides>
+        <table name="ct_organizations"/>
+        <initializer class="com.arsdigita.cms.contenttypes.OrganizationInitializer"/>
+    </provides>
+    <scripts>
+        <schema directory="ccm-cms-types-organization"/>
+        <data class="com.arsdigita.cms.contenttypes.OrganizationLoader"/>
+    </scripts>
+</load>
\ No newline at end of file
diff --git a/ccm-cms-types-organization/src/ccm-cms-types-organization.upgrade b/ccm-cms-types-organization/src/ccm-cms-types-organization.upgrade
new file mode 100644
index 000000000..917e2e4e9
--- /dev/null
+++ b/ccm-cms-types-organization/src/ccm-cms-types-organization.upgrade
@@ -0,0 +1,5 @@
+<upgrade>
+    <version from="6.6.6" to="6.6.7">
+        <script sql="ccm-cms-types-organization/upgrade/::database::-6.6.6-6.6.7.sql">
+    </version>
+</upgrade>
\ No newline at end of file
diff --git a/ccm-cms-types-simpleorganization/src/com/arsdigita/cms/contenttypes/SimpleOrganization.java b/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/Organization.java
similarity index 62%
rename from ccm-cms-types-simpleorganization/src/com/arsdigita/cms/contenttypes/SimpleOrganization.java
rename to ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/Organization.java
index 3cfef1817..32c5a1807 100644
--- a/ccm-cms-types-simpleorganization/src/com/arsdigita/cms/contenttypes/SimpleOrganization.java
+++ b/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/Organization.java
@@ -1,7 +1,7 @@
 package com.arsdigita.cms.contenttypes;
 
 import com.arsdigita.cms.ExtraXMLGenerator;
-import com.arsdigita.cms.contenttypes.ui.SimpleOrganizationExtraXmlGenerator;
+import com.arsdigita.cms.contenttypes.ui.OrganizationExtraXmlGenerator;
 import com.arsdigita.domain.DataObjectNotFoundException;
 import com.arsdigita.persistence.DataObject;
 import com.arsdigita.persistence.OID;
@@ -13,41 +13,41 @@ import java.util.List;
  * @author Jens Pelzetter 
  * @version $Id$
  */
-public class SimpleOrganization extends GenericOrganizationalUnit {
+public class Organization extends GenericOrganizationalUnit {
     
-    public static final String BASE_DATA_OBJECT_TYPE = "com.arsdigita.cms.contenttypes.SimpleOrganization";
+    public static final String BASE_DATA_OBJECT_TYPE = "com.arsdigita.cms.contenttypes.Organization";
     
-    public SimpleOrganization() {
+    public Organization() {
         super(BASE_DATA_OBJECT_TYPE);
     }
     
-    public SimpleOrganization(final BigDecimal id) throws DataObjectNotFoundException {
+    public Organization(final BigDecimal id) throws DataObjectNotFoundException {
         this(new OID(BASE_DATA_OBJECT_TYPE, id));
     }
     
-    public SimpleOrganization(final OID oid) throws DataObjectNotFoundException {
+    public Organization(final OID oid) throws DataObjectNotFoundException {
         super(oid);
     }
     
-    public SimpleOrganization(final DataObject dobj) {
+    public Organization(final DataObject dobj) {
         super(dobj);
     }
     
-    public SimpleOrganization(final String type) {
+    public Organization(final String type) {
         super(type);
     }
     
     @Override
     public List<ExtraXMLGenerator> getExtraXMLGenerators() {
         final List<ExtraXMLGenerator> generators = super.getExtraListXMLGenerators();
-        generators.add(new SimpleOrganizationExtraXmlGenerator());
+        generators.add(new OrganizationExtraXmlGenerator());
         return generators;
     }
     
     @Override
     public List<ExtraXMLGenerator> getExtraListXMLGenerators() {
         final List<ExtraXMLGenerator> generators = super.getExtraListXMLGenerators();
-        generators.add(new SimpleOrganizationExtraXmlGenerator());
+        generators.add(new OrganizationExtraXmlGenerator());
         return generators;
     }
 }
diff --git a/ccm-cms-types-simpleorganization/src/com/arsdigita/cms/contenttypes/SimpleOrganizationBundle.java b/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/OrganizationBundle.java
similarity index 57%
rename from ccm-cms-types-simpleorganization/src/com/arsdigita/cms/contenttypes/SimpleOrganizationBundle.java
rename to ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/OrganizationBundle.java
index 369a3b0c3..fadb6258b 100644
--- a/ccm-cms-types-simpleorganization/src/com/arsdigita/cms/contenttypes/SimpleOrganizationBundle.java
+++ b/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/OrganizationBundle.java
@@ -12,12 +12,12 @@ import java.math.BigDecimal;
  * @author Jens Pelzetter 
  * @version $Id$
  */
-public class SimpleOrganizationBundle extends GenericOrganizationalUnitBundle {
+public class OrganizationBundle extends GenericOrganizationalUnitBundle {
 
     public static final String BASE_DATA_OBJECT_TYPE =
-                               "com.arsdigita.cms.contenttypes.SimpleOrganizationBundle";
+                               "com.arsdigita.cms.contenttypes.OrganizationBundle";
 
-    public SimpleOrganizationBundle(final ContentItem primary) {
+    public OrganizationBundle(final ContentItem primary) {
         super(BASE_DATA_OBJECT_TYPE);
 
         Assert.exists(primary, ContentItem.class);
@@ -29,29 +29,29 @@ public class SimpleOrganizationBundle extends GenericOrganizationalUnitBundle {
         setName(primary.getName());
     }
 
-    public SimpleOrganizationBundle(final OID oid)
+    public OrganizationBundle(final OID oid)
             throws DataObjectNotFoundException {
         super(oid);
     }
     
-    public SimpleOrganizationBundle(final BigDecimal id) 
+    public OrganizationBundle(final BigDecimal id) 
             throws DataObjectNotFoundException {
         super(new OID(BASE_DATA_OBJECT_TYPE, id));
     }
     
-    public SimpleOrganizationBundle(final DataObject dobj) {
+    public OrganizationBundle(final DataObject dobj) {
         super(dobj);
     }
     
-    public SimpleOrganizationBundle(final String type) {
+    public OrganizationBundle(final String type) {
         super(type);
     }
     
-    public SimpleOrganization getOrganization() {
-        return (SimpleOrganization) getPrimaryInstance();
+    public Organization getOrganization() {
+        return (Organization) getPrimaryInstance();
     }
     
-    public SimpleOrganization getOrganization(final String language) {
-        return (SimpleOrganization) getInstance(language);
+    public Organization getOrganization(final String language) {
+        return (Organization) getInstance(language);
     }
 }
diff --git a/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/OrganizationInitializer.java b/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/OrganizationInitializer.java
new file mode 100644
index 000000000..48c941ec3
--- /dev/null
+++ b/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/OrganizationInitializer.java
@@ -0,0 +1,24 @@
+package com.arsdigita.cms.contenttypes;
+
+/**
+ *
+ * @author Jens Pelzetter 
+ * @version $Id$
+ */
+public class OrganizationInitializer extends ContentTypeInitializer {
+
+    public OrganizationInitializer() {
+        super("ccm-cms-types-organization.pdl.mf",
+              Organization.BASE_DATA_OBJECT_TYPE);
+    }
+    
+   @Override 
+   public String[] getStylesheets() {
+       return new String[]{INTERNAL_THEME_TYPES_DIR + "Organization.xsl"};
+   }
+   
+    @Override
+    public String getTraversalXML() {
+        return "/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/Organization.xml";
+    }
+}
diff --git a/ccm-cms-types-simpleorganization/src/com/arsdigita/cms/contenttypes/SimpleOrganizationLoader.java b/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/OrganizationLoader.java
similarity index 57%
rename from ccm-cms-types-simpleorganization/src/com/arsdigita/cms/contenttypes/SimpleOrganizationLoader.java
rename to ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/OrganizationLoader.java
index 5bd3ddec4..cd21e7560 100644
--- a/ccm-cms-types-simpleorganization/src/com/arsdigita/cms/contenttypes/SimpleOrganizationLoader.java
+++ b/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/OrganizationLoader.java
@@ -5,14 +5,14 @@ package com.arsdigita.cms.contenttypes;
  * @author Jens Pelzetter 
  * @version $Id$
  */
-public class SimpleOrganizationLoader extends AbstractContentTypeLoader {
+public class OrganizationLoader extends AbstractContentTypeLoader {
     
-    public SimpleOrganizationLoader() {
+    public OrganizationLoader() {
         super();
     }
     
       private static final String[] TYPES = {
-        "/WEB-INF/content-types/com/arsdigita/cms/contenttypes/SimpleOrganization.xml"
+        "/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Organization.xml"
     };
     
     @Override
diff --git a/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/OrganizationResources.properties b/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/OrganizationResources.properties
new file mode 100644
index 000000000..ec3dc29e1
--- /dev/null
+++ b/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/OrganizationResources.properties
@@ -0,0 +1,2 @@
+sciorganization.ui.organization_properties.title=Basic properties
+cms.contenttypes.organization.type_label=Organization
diff --git a/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/OrganizationResources_de.properties b/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/OrganizationResources_de.properties
new file mode 100644
index 000000000..c49e86b1b
--- /dev/null
+++ b/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/OrganizationResources_de.properties
@@ -0,0 +1,2 @@
+sciorganization.ui.organization_properties.title=Basiseigenschaften
+cms.contenttypes.organization.type_label=Organisation
diff --git a/ccm-cms-types-simpleorganization/src/com/arsdigita/cms/contenttypes/ui/SimpleOrganizationCreate.java b/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ui/OrganizationCreate.java
similarity index 67%
rename from ccm-cms-types-simpleorganization/src/com/arsdigita/cms/contenttypes/ui/SimpleOrganizationCreate.java
rename to ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ui/OrganizationCreate.java
index 9e3b98a37..3b01a74c0 100644
--- a/ccm-cms-types-simpleorganization/src/com/arsdigita/cms/contenttypes/ui/SimpleOrganizationCreate.java
+++ b/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ui/OrganizationCreate.java
@@ -3,7 +3,7 @@ package com.arsdigita.cms.contenttypes.ui;
 import com.arsdigita.cms.ContentItem;
 import com.arsdigita.cms.ItemSelectionModel;
 import com.arsdigita.cms.contenttypes.GenericOrganizationalUnitBundle;
-import com.arsdigita.cms.contenttypes.SimpleOrganizationBundle;
+import com.arsdigita.cms.contenttypes.OrganizationBundle;
 import com.arsdigita.cms.ui.authoring.CreationSelector;
 
 /**
@@ -11,9 +11,9 @@ import com.arsdigita.cms.ui.authoring.CreationSelector;
  * @author Jens Pelzetter 
  * @version $Id$
  */
-public class SimpleOrganizationCreate extends GenericOrganizationalUnitCreate {
+public class OrganizationCreate extends GenericOrganizationalUnitCreate {
     
-    public SimpleOrganizationCreate(final ItemSelectionModel itemModel,
+    public OrganizationCreate(final ItemSelectionModel itemModel,
                                     final CreationSelector parent) {
         super(itemModel, parent);
     }
@@ -21,7 +21,7 @@ public class SimpleOrganizationCreate extends GenericOrganizationalUnitCreate {
     @Override
     protected GenericOrganizationalUnitBundle createBundle(
             final ContentItem primary) {
-        return new SimpleOrganizationBundle(primary);
+        return new OrganizationBundle(primary);
     }
     
 }
diff --git a/ccm-cms-types-simpleorganization/src/com/arsdigita/cms/contenttypes/ui/SimpleOrganizationExtraXmlGenerator.java b/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ui/OrganizationExtraXmlGenerator.java
similarity index 83%
rename from ccm-cms-types-simpleorganization/src/com/arsdigita/cms/contenttypes/ui/SimpleOrganizationExtraXmlGenerator.java
rename to ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ui/OrganizationExtraXmlGenerator.java
index e2c449b16..859e0ac4a 100644
--- a/ccm-cms-types-simpleorganization/src/com/arsdigita/cms/contenttypes/ui/SimpleOrganizationExtraXmlGenerator.java
+++ b/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ui/OrganizationExtraXmlGenerator.java
@@ -6,7 +6,7 @@ import com.arsdigita.cms.ContentItem;
 import com.arsdigita.cms.ExtraXMLGenerator;
 import com.arsdigita.cms.contenttypes.GenericContact;
 import com.arsdigita.cms.contenttypes.GenericOrganizationalUnitContactCollection;
-import com.arsdigita.cms.contenttypes.SimpleOrganization;
+import com.arsdigita.cms.contenttypes.Organization;
 import com.arsdigita.cms.dispatcher.SimpleXMLGenerator;
 import com.arsdigita.globalization.GlobalizationHelper;
 import com.arsdigita.xml.Element;
@@ -16,17 +16,17 @@ import com.arsdigita.xml.Element;
  * @author Jens Pelzetter <jens@jp-digital.de>
  * @version $Id$
  */
-public class SimpleOrganizationExtraXmlGenerator implements ExtraXMLGenerator {
+public class OrganizationExtraXmlGenerator implements ExtraXMLGenerator {
 
     private boolean listMode;
 
     public void generateXML(final ContentItem item, final Element element, final PageState state) {
-        if (!(item instanceof SimpleOrganization)) {
-            throw new IllegalArgumentException("The SimpleOrganizationExtraXMLGenerator can only process instances"
-                                               + "of SimpleOrganization.");
+        if (!(item instanceof Organization)) {
+            throw new IllegalArgumentException("The OrganizationExtraXMLGenerator can only process instances"
+                                               + "of Organization.");
         }
 
-        final SimpleOrganization organization = (SimpleOrganization) item;
+        final Organization organization = (Organization) item;
         final GenericOrganizationalUnitContactCollection contacts = organization.getContacts();
 
         final Element contactsElem = element.newChildElement("contacts");
diff --git a/ccm-cms-types-simpleorganization/src/com/arsdigita/cms/contenttypes/ui/SimpleOrganizationPropertiesStep.java b/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ui/OrganizationPropertiesStep.java
similarity index 77%
rename from ccm-cms-types-simpleorganization/src/com/arsdigita/cms/contenttypes/ui/SimpleOrganizationPropertiesStep.java
rename to ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ui/OrganizationPropertiesStep.java
index e620c3473..1bbe07026 100644
--- a/ccm-cms-types-simpleorganization/src/com/arsdigita/cms/contenttypes/ui/SimpleOrganizationPropertiesStep.java
+++ b/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ui/OrganizationPropertiesStep.java
@@ -11,17 +11,17 @@ import com.arsdigita.cms.ui.workflow.WorkflowLockedComponentAccess;
  * @author Jens Pelzetter 
  * @version $Id$
  */
-public class SimpleOrganizationPropertiesStep extends GenericOrganizationalUnitPropertiesStep {
+public class OrganizationPropertiesStep extends GenericOrganizationalUnitPropertiesStep {
 
     public static final String EDIT_SHEET_NAME = "edit";
 
-    public SimpleOrganizationPropertiesStep(final ItemSelectionModel itemModel,
+    public OrganizationPropertiesStep(final ItemSelectionModel itemModel,
                                             final AuthoringKitWizard parent) {
         super(itemModel, parent);
     }
 
     protected void createEditSheet(final ItemSelectionModel itemModel) {
-        final BasicPageForm editSheet = new SimpleOrganizationPropertyForm(
+        final BasicPageForm editSheet = new OrganizationPropertyForm(
                 itemModel, this);
         add(EDIT_SHEET_NAME,
             "Edit",
@@ -29,7 +29,7 @@ public class SimpleOrganizationPropertiesStep extends GenericOrganizationalUnitP
             editSheet.getSaveCancelSection().getCancelButton());
     }
 
-    public static Component getSimpleOrganizationPropertySheet(
+    public static Component getOrganizationPropertySheet(
             final ItemSelectionModel itemModel) {
         final Component sheet = GenericOrganizationalUnitPropertiesStep.
                 getGenericOrganizationalUnitPropertySheet(itemModel);
diff --git a/ccm-cms-types-simpleorganization/src/com/arsdigita/cms/contenttypes/ui/SimpleOrganizationPropertyForm.java b/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ui/OrganizationPropertyForm.java
similarity index 61%
rename from ccm-cms-types-simpleorganization/src/com/arsdigita/cms/contenttypes/ui/SimpleOrganizationPropertyForm.java
rename to ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ui/OrganizationPropertyForm.java
index 0494b9107..bb22b5385 100644
--- a/ccm-cms-types-simpleorganization/src/com/arsdigita/cms/contenttypes/ui/SimpleOrganizationPropertyForm.java
+++ b/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ui/OrganizationPropertyForm.java
@@ -7,21 +7,21 @@ import com.arsdigita.cms.ItemSelectionModel;
 /**
  *
  * @author Jens Pelzetter
- * @version $Id: SimpleOrganizationPropertyForm.java 1611 2012-04-23 08:57:28Z
- * jensp $
+ * @version $Id: OrganizationPropertyForm.java 1611 2012-04-23 08:57:28Z
+ jensp $
  */
-public class SimpleOrganizationPropertyForm extends GenericOrganizationalUnitPropertyForm {
+public class OrganizationPropertyForm extends GenericOrganizationalUnitPropertyForm {
 
-    private SimpleOrganizationPropertiesStep m_step;
-    public static final String ID = "SimpleOrganization_edit";
+    private OrganizationPropertiesStep m_step;
+    public static final String ID = "Organization_edit";
 
-    public SimpleOrganizationPropertyForm(final ItemSelectionModel itemModel) {
+    public OrganizationPropertyForm(final ItemSelectionModel itemModel) {
         this(itemModel, null);
     }
 
-    public SimpleOrganizationPropertyForm(
+    public OrganizationPropertyForm(
             final ItemSelectionModel itemModel,
-            final SimpleOrganizationPropertiesStep step) {
+            final OrganizationPropertiesStep step) {
         super(itemModel, step);
         m_step = step;
         addSubmissionListener(this);
diff --git a/ccm-cms-types-organization/web/themes/heirloom/contenttypes/Organization.xsl b/ccm-cms-types-organization/web/themes/heirloom/contenttypes/Organization.xsl
new file mode 100644
index 000000000..84e9e4816
--- /dev/null
+++ b/ccm-cms-types-organization/web/themes/heirloom/contenttypes/Organization.xsl
@@ -0,0 +1,25 @@
+<!DOCTYPE stylesheet [
+<!ENTITY nbsp   "&#160;" ><!-- no-break space = non-breaking space, U+00A0 ISOnum -->
+]>
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                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">
+        <p>
+            <xsl:value-of select="./name"/>
+        </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">
+        <p>
+            <xsl:value-of select="./name"/>
+        </p>
+    </xsl:template>
+
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/ccm-cms-types-simpleorganization/pdl/com/arsdigita/content-types/SimpleOrganization.pdl b/ccm-cms-types-simpleorganization/pdl/com/arsdigita/content-types/SimpleOrganization.pdl
deleted file mode 100644
index 6c17bfe98..000000000
--- a/ccm-cms-types-simpleorganization/pdl/com/arsdigita/content-types/SimpleOrganization.pdl
+++ /dev/null
@@ -1,12 +0,0 @@
-model com.arsdigita.cms.contenttypes;
-
-import com.arsdigita.kernel.ACSObject;
-import com.arsdigita.cms.*;
-
-object type SimpleOrganization extends GenericOrganizationalUnit {
-       reference key (ct_simpleorganizations.organization_id);
-}
-
-object type SimpleOrganizationBundle extends GenericOrganizationalUnitBundle {
-       reference key (ct_simpleorganization_bundles.bundle_id);
-}
\ No newline at end of file
diff --git a/ccm-cms-types-simpleorganization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/SimpleOrganization.xml b/ccm-cms-types-simpleorganization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/SimpleOrganization.xml
deleted file mode 100644
index ea6cb2e0a..000000000
--- a/ccm-cms-types-simpleorganization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/SimpleOrganization.xml
+++ /dev/null
@@ -1,28 +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="SimpleOrganization"
-		    description="Exposed GenericOrganizationalUnit"
-		    objectType="com.arsdigita.cms.contenttypes.SimpleOrganization"
-		    classname="com.arsdigita.cms.contenttypes.SimpleOrganization">
-
-    <ctd:authoring-kit createComponent="com.arsdigita.cms.contenttypes.ui.SimpleOrganizationCreate">
-      
-      <ctd:authoring-step
-	  labelKey="sciorganization.ui.simpleorganization_properties.title"
-	  labelBundle="com.arsdigita.cms.contenttypes.ui.SimpleOrganizationResources"
-	  descriptionKey="sciorganization.ui.simpleorganization_properties.title"
-	  descriptionBundle="com.arsdigita.cms.contenttypes.ui.SimpleOrganizationResources"
-	  component="com.arsdigita.cms.contenttypes.ui.SimpleOrganizationPropertiesStep"
-	  ordering="1"/>
-
-      <ctd:include href="/WEB-INF/content-types/assign-categories-step.xml"/>
-
-    </ctd:authoring-kit>
-
-  </ctd:content-type>
-
-</ctd:content-types>
\ No newline at end of file
diff --git a/ccm-cms-types-simpleorganization/src/ccm-cms-types-simpleorganization.load b/ccm-cms-types-simpleorganization/src/ccm-cms-types-simpleorganization.load
deleted file mode 100644
index f89f10ed7..000000000
--- a/ccm-cms-types-simpleorganization/src/ccm-cms-types-simpleorganization.load
+++ /dev/null
@@ -1,16 +0,0 @@
-<load>
-    <requires>
-        <table name="inits"/>
-        <table name="acs_objects"/>
-        <table name="cms_items"/>
-        <initializer class="com.arsdigita.cms.Initializer"/>
-    </requires>
-    <provides>
-        <table name="ct_simpleorganizations"/>
-        <initializer class="com.arsdigita.cms.contenttypes.SimpleOrganizationInitializer"/>
-    </provides>
-    <scripts>
-        <schema directory="ccm-cms-types-simpleorganization"/>
-        <data class="com.arsdigita.cms.contenttypes.SimpleOrganizationLoader"/>
-    </scripts>
-</load>
\ No newline at end of file
diff --git a/ccm-cms-types-simpleorganization/src/com/arsdigita/cms/contenttypes/SimpleOrganizationInitializer.java b/ccm-cms-types-simpleorganization/src/com/arsdigita/cms/contenttypes/SimpleOrganizationInitializer.java
deleted file mode 100644
index 2a700acc5..000000000
--- a/ccm-cms-types-simpleorganization/src/com/arsdigita/cms/contenttypes/SimpleOrganizationInitializer.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.arsdigita.cms.contenttypes;
-
-/**
- *
- * @author Jens Pelzetter 
- * @version $Id$
- */
-public class SimpleOrganizationInitializer extends ContentTypeInitializer {
-
-    public SimpleOrganizationInitializer() {
-        super("ccm-cms-types-simpleorganization.pdl.mf",
-              SimpleOrganization.BASE_DATA_OBJECT_TYPE);
-    }
-    
-   @Override 
-   public String[] getStylesheets() {
-       return new String[]{INTERNAL_THEME_TYPES_DIR + "SimpleOrganization.xsl"};
-   }
-   
-    @Override
-    public String getTraversalXML() {
-        return "/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/SimpleOrganization.xml";
-    }
-}
diff --git a/ccm-cms-types-simpleorganization/src/com/arsdigita/cms/contenttypes/SimpleOrganizationResources.properties b/ccm-cms-types-simpleorganization/src/com/arsdigita/cms/contenttypes/SimpleOrganizationResources.properties
deleted file mode 100644
index eac188996..000000000
--- a/ccm-cms-types-simpleorganization/src/com/arsdigita/cms/contenttypes/SimpleOrganizationResources.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-sciorganization.ui.simpleorganization_properties.title=Basic properties
-cms.contenttypes.simpleorganization.type_label=Organization
diff --git a/ccm-cms-types-simpleorganization/src/com/arsdigita/cms/contenttypes/SimpleOrganizationResources_de.properties b/ccm-cms-types-simpleorganization/src/com/arsdigita/cms/contenttypes/SimpleOrganizationResources_de.properties
deleted file mode 100644
index 933dc5fa2..000000000
--- a/ccm-cms-types-simpleorganization/src/com/arsdigita/cms/contenttypes/SimpleOrganizationResources_de.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-sciorganization.ui.simpleorganization_properties.title=Basiseigenschaften
-cms.contenttypes.simpleorganization.type_label=Organisation
diff --git a/ccm-cms-types-simpleorganization/web/themes/heirloom/contenttypes/SimpleOrganization.xsl b/ccm-cms-types-simpleorganization/web/themes/heirloom/contenttypes/SimpleOrganization.xsl
deleted file mode 100644
index aa771f5ac..000000000
--- a/ccm-cms-types-simpleorganization/web/themes/heirloom/contenttypes/SimpleOrganization.xsl
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE stylesheet [
-<!ENTITY nbsp   "&#160;" ><!-- no-break space = non-breaking space, U+00A0 ISOnum -->
-]>
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:cms="http://www.arsdigita.com/cms/1.0"
-                version="1.0">
-
-  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.SimpleOrganization']" mode="cms:CT_graphics"
-    name="cms:CT_graphics_com_arsdigita_cms_contenttypes_SimpleOrganization">
-    <p><xsl:value-of select="./name"/></p>
-  </xsl:template>
-
-<xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.SimpleOrganization']" mode="cms:CT_text"
-    name="cms:CT_text_com_arsdigita_cms_contenttypes_SimpleOrganization">
-    <p><xsl:value-of select="./name"/></p>
-  </xsl:template>
-
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/ccm-ldn-types-organization/src/ccm-ldn-types-organization.load b/ccm-ldn-types-organization/src/ccm-ldn-types-organization.load
index d2ed92a9e..61340f231 100755
--- a/ccm-ldn-types-organization/src/ccm-ldn-types-organization.load
+++ b/ccm-ldn-types-organization/src/ccm-ldn-types-organization.load
@@ -6,7 +6,7 @@
     <initializer class="com.arsdigita.cms.Initializer"/>
   </requires>
   <provides>
-    <table name="ct_organization"/>
+    <table name="ct_ldn_organization"/>
     <initializer class="com.arsdigita.cms.contenttypes.ldn.OrganizationInitializer"/>
   </provides>
   <scripts>