diff --git a/src/components/AddGroupModal.svelte b/src/components/usergroups/AddGroupModal.svelte
similarity index 99%
rename from src/components/AddGroupModal.svelte
rename to src/components/usergroups/AddGroupModal.svelte
index 32c0da99..b635d6a3 100644
--- a/src/components/AddGroupModal.svelte
+++ b/src/components/usergroups/AddGroupModal.svelte
@@ -1,6 +1,6 @@
 <script>
   import { _ } from "svelte-i18n";
-  import { clickOutside } from "./outsideclick";
+  import { clickOutside } from "../base/outsideclick";
   import { focusTrap } from "svelte-focus-trap";
   import {
     RunnerService,
diff --git a/src/components/GroupDetail.svelte b/src/components/usergroups/GroupDetail.svelte
similarity index 98%
rename from src/components/GroupDetail.svelte
rename to src/components/usergroups/GroupDetail.svelte
index 5c434392..6e9686f2 100644
--- a/src/components/GroupDetail.svelte
+++ b/src/components/usergroups/GroupDetail.svelte
@@ -1,12 +1,12 @@
 <script>
   import { _ } from "svelte-i18n";
   import lodashIsEqual from "lodash.isequal";
-  import store from "../store";
+  import store from "../../store";
   import {
     UserGroupService
   } from "@odit/lfk-client-js";
   import Toastify from "toastify-js";
-  import PromiseError from "./PromiseError.svelte";
+  import PromiseError from "../base/PromiseError.svelte";
   let data_loaded = false;
   export let params;
   const promise = UserGroupService.userGroupControllerGetOne(params.groupid);
diff --git a/src/components/Groups.svelte b/src/components/usergroups/Groups.svelte
similarity index 96%
rename from src/components/Groups.svelte
rename to src/components/usergroups/Groups.svelte
index d56e0925..fa5ea4ab 100644
--- a/src/components/Groups.svelte
+++ b/src/components/usergroups/Groups.svelte
@@ -1,6 +1,6 @@
 <script>
   import { _ } from "svelte-i18n";
-  import store from "../store";
+  import store from "../../store";
   import AddGroupModal from "./AddGroupModal.svelte";
   import UserGroupsOverview from "./UserGroupsOverview.svelte";
   $: current_groups = [];
diff --git a/src/components/UserGroupsEmptyState.svelte b/src/components/usergroups/UserGroupsEmptyState.svelte
similarity index 100%
rename from src/components/UserGroupsEmptyState.svelte
rename to src/components/usergroups/UserGroupsEmptyState.svelte
diff --git a/src/components/UserGroupsOverview.svelte b/src/components/usergroups/UserGroupsOverview.svelte
similarity index 99%
rename from src/components/UserGroupsOverview.svelte
rename to src/components/usergroups/UserGroupsOverview.svelte
index 21270b98..f2317db8 100644
--- a/src/components/UserGroupsOverview.svelte
+++ b/src/components/usergroups/UserGroupsOverview.svelte
@@ -1,7 +1,7 @@
 <script>
   import { _ } from "svelte-i18n";
   import { UserGroupService } from "@odit/lfk-client-js";
-  import store from "../store";
+  import store from "../../store";
   import UserGroupsEmptyState from "./UserGroupsEmptyState.svelte";
   $: searchvalue = "";
   $: active_deletes = [];
diff --git a/src/components/groups_empty.svg b/src/components/usergroups/groups_empty.svg
similarity index 100%
rename from src/components/groups_empty.svg
rename to src/components/usergroups/groups_empty.svg