diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/GroupController.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/controller/GroupController.java
similarity index 94%
rename from backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/GroupController.java
rename to backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/controller/GroupController.java
index bb54d113b..71e9ccf33 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/GroupController.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/controller/GroupController.java
@@ -1,4 +1,4 @@
-package edu.internet2.tier.shibboleth.admin.ui.controller;
+package edu.internet2.tier.shibboleth.admin.ui.security.controller;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
@@ -15,8 +15,9 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
 
-import edu.internet2.tier.shibboleth.admin.ui.domain.Group;
-import edu.internet2.tier.shibboleth.admin.ui.service.IGroupService;
+import edu.internet2.tier.shibboleth.admin.ui.controller.ErrorResponse;
+import edu.internet2.tier.shibboleth.admin.ui.security.model.Group;
+import edu.internet2.tier.shibboleth.admin.ui.security.service.IGroupService;
 
 @Controller
 @RequestMapping(value = "/api/groups")
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/Group.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/model/Group.java
similarity index 88%
rename from backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/Group.java
rename to backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/model/Group.java
index 92d836b59..b91bcaf8e 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/Group.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/model/Group.java
@@ -1,4 +1,4 @@
-package edu.internet2.tier.shibboleth.admin.ui.domain;
+package edu.internet2.tier.shibboleth.admin.ui.security.model;
 
 import java.util.UUID;
 
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/repository/GroupRepository.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/repository/GroupRepository.java
similarity index 69%
rename from backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/repository/GroupRepository.java
rename to backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/repository/GroupRepository.java
index 231e00348..8781b69f4 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/repository/GroupRepository.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/repository/GroupRepository.java
@@ -1,10 +1,10 @@
-package edu.internet2.tier.shibboleth.admin.ui.repository;
+package edu.internet2.tier.shibboleth.admin.ui.security.repository;
 
 import java.util.List;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 
-import edu.internet2.tier.shibboleth.admin.ui.domain.Group;
+import edu.internet2.tier.shibboleth.admin.ui.security.model.Group;
 
 public interface GroupRepository extends JpaRepository<Group, String> {
     List<Group> findAll();
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/GroupServiceImpl.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/service/GroupServiceImpl.java
similarity index 75%
rename from backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/GroupServiceImpl.java
rename to backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/service/GroupServiceImpl.java
index 03d4085ce..4f6f1a762 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/GroupServiceImpl.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/service/GroupServiceImpl.java
@@ -1,12 +1,12 @@
-package edu.internet2.tier.shibboleth.admin.ui.service;
+package edu.internet2.tier.shibboleth.admin.ui.security.service;
 
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import edu.internet2.tier.shibboleth.admin.ui.domain.Group;
-import edu.internet2.tier.shibboleth.admin.ui.repository.GroupRepository;
+import edu.internet2.tier.shibboleth.admin.ui.security.model.Group;
+import edu.internet2.tier.shibboleth.admin.ui.security.repository.GroupRepository;
 
 @Service
 public class GroupServiceImpl implements IGroupService {
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/IGroupService.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/service/IGroupService.java
similarity index 60%
rename from backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/IGroupService.java
rename to backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/service/IGroupService.java
index 1c5f92e93..1e040a9d1 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/IGroupService.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/service/IGroupService.java
@@ -1,8 +1,8 @@
-package edu.internet2.tier.shibboleth.admin.ui.service;
+package edu.internet2.tier.shibboleth.admin.ui.security.service;
 
 import java.util.List;
 
-import edu.internet2.tier.shibboleth.admin.ui.domain.Group;
+import edu.internet2.tier.shibboleth.admin.ui.security.model.Group;
 
 public interface IGroupService {
 
diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/GroupRepositoryTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/security/repository/GroupRepositoryTests.groovy
similarity index 94%
rename from backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/GroupRepositoryTests.groovy
rename to backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/security/repository/GroupRepositoryTests.groovy
index e7f59b23c..fe0657403 100644
--- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/GroupRepositoryTests.groovy
+++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/security/repository/GroupRepositoryTests.groovy
@@ -1,4 +1,4 @@
-package edu.internet2.tier.shibboleth.admin.ui.repository
+package edu.internet2.tier.shibboleth.admin.ui.security.repository
 
 import javax.persistence.EntityManager
 
@@ -9,8 +9,7 @@ import org.springframework.data.jpa.repository.config.EnableJpaRepositories
 import org.springframework.test.context.ContextConfiguration
 
 import edu.internet2.tier.shibboleth.admin.ui.configuration.InternationalizationConfiguration
-import edu.internet2.tier.shibboleth.admin.ui.domain.CustomEntityAttributeDefinition
-import edu.internet2.tier.shibboleth.admin.ui.domain.Group
+import edu.internet2.tier.shibboleth.admin.ui.security.model.Group
 import spock.lang.Specification
 
 /**