diff --git a/src/components/usergroups/AddGroupModal.svelte b/src/components/groups/AddGroupModal.svelte
similarity index 100%
rename from src/components/usergroups/AddGroupModal.svelte
rename to src/components/groups/AddGroupModal.svelte
diff --git a/src/components/usergroups/GroupDetail.svelte b/src/components/groups/GroupDetail.svelte
similarity index 100%
rename from src/components/usergroups/GroupDetail.svelte
rename to src/components/groups/GroupDetail.svelte
diff --git a/src/components/usergroups/Groups.svelte b/src/components/groups/Groups.svelte
similarity index 100%
rename from src/components/usergroups/Groups.svelte
rename to src/components/groups/Groups.svelte
diff --git a/src/components/usergroups/UserGroupsEmptyState.svelte b/src/components/groups/UserGroupsEmptyState.svelte
similarity index 100%
rename from src/components/usergroups/UserGroupsEmptyState.svelte
rename to src/components/groups/UserGroupsEmptyState.svelte
diff --git a/src/components/usergroups/UserGroupsOverview.svelte b/src/components/groups/UserGroupsOverview.svelte
similarity index 100%
rename from src/components/usergroups/UserGroupsOverview.svelte
rename to src/components/groups/UserGroupsOverview.svelte
diff --git a/src/components/usergroups/groups_empty.svg b/src/components/groups/groups_empty.svg
similarity index 100%
rename from src/components/usergroups/groups_empty.svg
rename to src/components/groups/groups_empty.svg