diff --git a/ccm-core/src/com/arsdigita/portation/modules/core/security/Group.java b/ccm-core/src/com/arsdigita/portation/modules/core/security/Group.java
index 77960744d..3d718e947 100644
--- a/ccm-core/src/com/arsdigita/portation/modules/core/security/Group.java
+++ b/ccm-core/src/com/arsdigita/portation/modules/core/security/Group.java
@@ -16,13 +16,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA 02110-1301  USA
  */
-package com.arsdigita.portation.categories.core.security;
+package com.arsdigita.portation.modules.core.security;
 
 import com.arsdigita.portation.AbstractMarshaller;
 import com.arsdigita.portation.Identifiable;
 
 import java.util.HashSet;
-import java.util.List;
 import java.util.Set;
 
 /**
@@ -34,10 +33,6 @@ public class Group extends Party {
     private Set<GroupMembership> memberships = new HashSet<>();
 
 
-    public Group() {
-
-    }
-
     @Override
     public AbstractMarshaller<? extends Identifiable> getMarshaller() {
         return new GroupMarshaller();
diff --git a/ccm-core/src/com/arsdigita/portation/modules/core/security/GroupMarshaller.java b/ccm-core/src/com/arsdigita/portation/modules/core/security/GroupMarshaller.java
index 06c4b59e7..9c781a742 100644
--- a/ccm-core/src/com/arsdigita/portation/modules/core/security/GroupMarshaller.java
+++ b/ccm-core/src/com/arsdigita/portation/modules/core/security/GroupMarshaller.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA 02110-1301  USA
  */
-package com.arsdigita.portation.categories.core.security;
+package com.arsdigita.portation.modules.core.security;
 
 import com.arsdigita.portation.AbstractMarshaller;
 
diff --git a/ccm-core/src/com/arsdigita/portation/modules/core/security/Party.java b/ccm-core/src/com/arsdigita/portation/modules/core/security/Party.java
index 11f200a1d..1fb9f2673 100644
--- a/ccm-core/src/com/arsdigita/portation/modules/core/security/Party.java
+++ b/ccm-core/src/com/arsdigita/portation/modules/core/security/Party.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA 02110-1301  USA
  */
-package com.arsdigita.portation.categories.core.security;
+package com.arsdigita.portation.modules.core.security;
 
 import com.arsdigita.portation.AbstractMarshaller;
 import com.arsdigita.portation.Identifiable;
diff --git a/ccm-core/src/com/arsdigita/portation/modules/core/security/PartyMarshaller.java b/ccm-core/src/com/arsdigita/portation/modules/core/security/PartyMarshaller.java
index babc22303..8db3dd6d8 100644
--- a/ccm-core/src/com/arsdigita/portation/modules/core/security/PartyMarshaller.java
+++ b/ccm-core/src/com/arsdigita/portation/modules/core/security/PartyMarshaller.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA 02110-1301  USA
  */
-package com.arsdigita.portation.categories.core.security;
+package com.arsdigita.portation.modules.core.security;
 
 import com.arsdigita.portation.AbstractMarshaller;
 
diff --git a/ccm-core/src/com/arsdigita/portation/modules/core/security/User.java b/ccm-core/src/com/arsdigita/portation/modules/core/security/User.java
index e8259c0c6..f6a8d6208 100644
--- a/ccm-core/src/com/arsdigita/portation/modules/core/security/User.java
+++ b/ccm-core/src/com/arsdigita/portation/modules/core/security/User.java
@@ -16,12 +16,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA 02110-1301  USA
  */
-package com.arsdigita.portation.categories.core.security;
+package com.arsdigita.portation.modules.core.security;
 
 import com.arsdigita.portation.AbstractMarshaller;
 import com.arsdigita.portation.Identifiable;
-import com.arsdigita.portation.categories.core.core.EmailAddress;
-import com.arsdigita.portation.categories.core.utils.CollectionConverter;
+import com.arsdigita.portation.modules.core.core.EmailAddress;
 
 import java.util.HashSet;
 import java.util.List;
diff --git a/ccm-core/src/com/arsdigita/portation/modules/core/security/UserMarshaller.java b/ccm-core/src/com/arsdigita/portation/modules/core/security/UserMarshaller.java
index c8560e995..f92d39753 100644
--- a/ccm-core/src/com/arsdigita/portation/modules/core/security/UserMarshaller.java
+++ b/ccm-core/src/com/arsdigita/portation/modules/core/security/UserMarshaller.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA 02110-1301  USA
  */
-package com.arsdigita.portation.categories.core.security;
+package com.arsdigita.portation.modules.core.security;
 
 import com.arsdigita.portation.AbstractMarshaller;
 
diff --git a/ccm-core/src/com/arsdigita/portation/modules/core/utils/CollectionConverter.java b/ccm-core/src/com/arsdigita/portation/modules/core/utils/CollectionConverter.java
index d751b62e0..f47638ae3 100644
--- a/ccm-core/src/com/arsdigita/portation/modules/core/utils/CollectionConverter.java
+++ b/ccm-core/src/com/arsdigita/portation/modules/core/utils/CollectionConverter.java
@@ -16,15 +16,15 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA 02110-1301  USA
  */
-package com.arsdigita.portation.categories.core.utils;
+package com.arsdigita.portation.modules.core.utils;
 
 import com.arsdigita.kernel.EmailAddress;
 import com.arsdigita.kernel.GroupCollection;
 import com.arsdigita.kernel.PartyCollection;
 import com.arsdigita.kernel.UserCollection;
-import com.arsdigita.portation.categories.core.security.Group;
-import com.arsdigita.portation.categories.core.security.Party;
-import com.arsdigita.portation.categories.core.security.User;
+import com.arsdigita.portation.modules.core.security.Group;
+import com.arsdigita.portation.modules.core.security.Party;
+import com.arsdigita.portation.modules.core.security.User;
 import org.apache.log4j.Logger;
 
 import java.util.ArrayList;
@@ -42,7 +42,7 @@ public class CollectionConverter {
         List<Party> parties = new ArrayList<>();
         if (partyCollection != null) {
             while (partyCollection.next()) {
-                parties.add(new Party(partyCollection.getParty()));
+                parties.add(new Party());
             }
             partyCollection.close();
         } else {
@@ -55,7 +55,7 @@ public class CollectionConverter {
         List<User> users = new ArrayList<>();
         if (userCollection != null) {
             while (userCollection.next()) {
-                users.add(new User(userCollection.getUser()));
+                users.add(new User());
             }
             userCollection.close();
         } else {
@@ -68,7 +68,7 @@ public class CollectionConverter {
         List<Group> groups = new ArrayList<>();
         if (groupCollection != null) {
             while (groupCollection.next()) {
-                groups.add(new Group(groupCollection.getGroup()));
+                groups.add(new Group());
             }
             groupCollection.close();
         } else {