diff --git a/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/Organization.java b/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ldn/Organization.java
similarity index 98%
rename from ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/Organization.java
rename to ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ldn/Organization.java
index 6a78bc244..60655d108 100755
--- a/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/Organization.java
+++ b/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ldn/Organization.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
  */
-package com.arsdigita.cms.contenttypes;
+package com.arsdigita.cms.contenttypes.ldn;
 
 import com.arsdigita.persistence.OID;
 import com.arsdigita.persistence.DataObject;
diff --git a/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/OrganizationInitializer.java b/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ldn/OrganizationInitializer.java
similarity index 94%
rename from ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/OrganizationInitializer.java
rename to ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ldn/OrganizationInitializer.java
index 6a2965763..88826af83 100755
--- a/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/OrganizationInitializer.java
+++ b/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ldn/OrganizationInitializer.java
@@ -17,8 +17,10 @@
  *
  */
 
-package com.arsdigita.cms.contenttypes;
+package com.arsdigita.cms.contenttypes.ldn;
 
+import com.arsdigita.cms.contenttypes.ContentTypeInitializer;
+import com.arsdigita.cms.contenttypes.ldn.Organization;
 import org.apache.log4j.Logger;
 
 /**
diff --git a/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/OrganizationLoader.java b/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ldn/OrganizationLoader.java
similarity index 92%
rename from ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/OrganizationLoader.java
rename to ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ldn/OrganizationLoader.java
index 972c84639..02ecd882c 100755
--- a/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/OrganizationLoader.java
+++ b/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ldn/OrganizationLoader.java
@@ -16,9 +16,10 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
  */
-package com.arsdigita.cms.contenttypes;
+package com.arsdigita.cms.contenttypes.ldn;
 
 import com.arsdigita.cms.contenttypes.AbstractContentTypeLoader;
+import com.arsdigita.cms.contenttypes.AbstractContentTypeLoader;
 
 
 /**
diff --git a/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/OrganizationResources.properties b/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ldn/OrganizationResources.properties
similarity index 100%
rename from ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/OrganizationResources.properties
rename to ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ldn/OrganizationResources.properties
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/ldn/OrganizationResources_de.properties
similarity index 100%
rename from ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/OrganizationResources_de.properties
rename to ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ldn/OrganizationResources_de.properties
diff --git a/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ui/OrganizationImageForm.java b/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ldn/ui/OrganizationImageForm.java
similarity index 98%
rename from ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ui/OrganizationImageForm.java
rename to ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ldn/ui/OrganizationImageForm.java
index 776007162..954cd15b0 100755
--- a/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ui/OrganizationImageForm.java
+++ b/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ldn/ui/OrganizationImageForm.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
  */
-package com.arsdigita.cms.contenttypes.ui;
+package com.arsdigita.cms.contenttypes.ldn.ui;
 
 import com.arsdigita.bebop.ColumnPanel;
 import com.arsdigita.bebop.event.FormInitListener;
@@ -35,8 +35,8 @@ import com.arsdigita.bebop.Label;
 import com.arsdigita.bebop.PageState;
 import com.arsdigita.bebop.parameters.StringParameter;
 import com.arsdigita.bebop.SaveCancelSection;
-import com.arsdigita.cms.contenttypes.Organization;
-import com.arsdigita.cms.contenttypes.util.OrganizationGlobalizationUtil;
+import com.arsdigita.cms.contenttypes.ldn.Organization;
+import com.arsdigita.cms.contenttypes.ldn.util.OrganizationGlobalizationUtil;
 import com.arsdigita.cms.ImageAsset;
 import com.arsdigita.cms.ItemSelectionModel;
 import com.arsdigita.cms.ui.ImageDisplay;
diff --git a/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ui/OrganizationImageStep.java b/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ldn/ui/OrganizationImageStep.java
similarity index 94%
rename from ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ui/OrganizationImageStep.java
rename to ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ldn/ui/OrganizationImageStep.java
index 6f70d3919..a481d5d01 100755
--- a/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ui/OrganizationImageStep.java
+++ b/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ldn/ui/OrganizationImageStep.java
@@ -16,10 +16,11 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
  */
-package com.arsdigita.cms.contenttypes.ui;
+package com.arsdigita.cms.contenttypes.ldn.ui;
 
-import com.arsdigita.cms.contenttypes.Organization;
-import com.arsdigita.cms.contenttypes.util.OrganizationGlobalizationUtil;
+import com.arsdigita.cms.contenttypes.ldn.ui.OrganizationImageForm;
+import com.arsdigita.cms.contenttypes.ldn.Organization;
+import com.arsdigita.cms.contenttypes.ldn.util.OrganizationGlobalizationUtil;
 
 import com.arsdigita.bebop.PageState;
 import com.arsdigita.cms.ContentItem;
diff --git a/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ui/OrganizationPropertiesStep.java b/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ldn/ui/OrganizationPropertiesStep.java
similarity index 94%
rename from ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ui/OrganizationPropertiesStep.java
rename to ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ldn/ui/OrganizationPropertiesStep.java
index 33e0b63b2..cd03b7b30 100755
--- a/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ui/OrganizationPropertiesStep.java
+++ b/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ldn/ui/OrganizationPropertiesStep.java
@@ -16,13 +16,13 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
  */
-package com.arsdigita.cms.contenttypes.ui;
+package com.arsdigita.cms.contenttypes.ldn.ui;
 
-import com.arsdigita.cms.contenttypes.Organization;
+import com.arsdigita.cms.contenttypes.ldn.Organization;
 
 import com.arsdigita.bebop.Component;
 import com.arsdigita.cms.ItemSelectionModel;
-import com.arsdigita.cms.contenttypes.util.OrganizationGlobalizationUtil;
+import com.arsdigita.cms.contenttypes.ldn.util.OrganizationGlobalizationUtil;
 import com.arsdigita.cms.ui.authoring.AuthoringKitWizard;
 import com.arsdigita.cms.ui.authoring.BasicPageForm;
 import com.arsdigita.cms.ui.authoring.SimpleEditStep;
diff --git a/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ui/OrganizationPropertyForm.java b/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ldn/ui/OrganizationPropertyForm.java
similarity index 95%
rename from ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ui/OrganizationPropertyForm.java
rename to ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ldn/ui/OrganizationPropertyForm.java
index 803521be5..3ec2dfb25 100755
--- a/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ui/OrganizationPropertyForm.java
+++ b/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ldn/ui/OrganizationPropertyForm.java
@@ -16,9 +16,10 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
  */
-package com.arsdigita.cms.contenttypes.ui;
+package com.arsdigita.cms.contenttypes.ldn.ui;
 
-import com.arsdigita.cms.contenttypes.Organization;
+import com.arsdigita.cms.contenttypes.ldn.ui.OrganizationPropertiesStep;
+import com.arsdigita.cms.contenttypes.ldn.Organization;
 import com.arsdigita.bebop.FormData;
 import com.arsdigita.bebop.Label;
 import com.arsdigita.bebop.event.FormInitListener;
@@ -29,7 +30,7 @@ import com.arsdigita.bebop.form.TextField;
 // import com.arsdigita.bebop.parameters.ParameterModel;
 import com.arsdigita.cms.ItemSelectionModel;
 import com.arsdigita.cms.ui.authoring.BasicPageForm;
-import com.arsdigita.cms.contenttypes.util.OrganizationGlobalizationUtil;
+import com.arsdigita.cms.contenttypes.ldn.util.OrganizationGlobalizationUtil;
 
 
 /**
diff --git a/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ui/authoring/OrganizationCreate.java b/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ldn/ui/authoring/OrganizationCreate.java
similarity index 94%
rename from ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ui/authoring/OrganizationCreate.java
rename to ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ldn/ui/authoring/OrganizationCreate.java
index 8eedbcd28..c533793a2 100755
--- a/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ui/authoring/OrganizationCreate.java
+++ b/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ldn/ui/authoring/OrganizationCreate.java
@@ -16,10 +16,10 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
  */
-package com.arsdigita.cms.contenttypes.ui.authoring;
+package com.arsdigita.cms.contenttypes.ldn.ui.authoring;
 
-import com.arsdigita.cms.contenttypes.Organization;
-import com.arsdigita.cms.contenttypes.util.OrganizationGlobalizationUtil;
+import com.arsdigita.cms.contenttypes.ldn.Organization;
+import com.arsdigita.cms.contenttypes.ldn.util.OrganizationGlobalizationUtil;
 
 import com.arsdigita.cms.Folder;
 import com.arsdigita.cms.ContentBundle;
diff --git a/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/util/OrganizationGlobalizationUtil.java b/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ldn/util/OrganizationGlobalizationUtil.java
similarity index 97%
rename from ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/util/OrganizationGlobalizationUtil.java
rename to ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ldn/util/OrganizationGlobalizationUtil.java
index 34f9d2347..1c43523ae 100755
--- a/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/util/OrganizationGlobalizationUtil.java
+++ b/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ldn/util/OrganizationGlobalizationUtil.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
  */
-package com.arsdigita.cms.contenttypes.util;
+package com.arsdigita.cms.contenttypes.ldn.util;
 
 import com.arsdigita.globalization.Globalized;
 import com.arsdigita.globalization.GlobalizedMessage;