diff --git a/src/App.svelte b/src/App.svelte
index aef1c587..cec35a20 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -28,33 +28,33 @@
     description: "LfK! admin dashbaord",
   });
   //
-  import Login from "./components/Login.svelte";
-  import Dashboard from "./components/Dashboard.svelte";
+  import Login from "./components/auth/Login.svelte";
+  import Dashboard from "./components/dashboard/Dashboard.svelte";
   import store from "./store.js";
-  import ForgotPassword from "./components/ForgotPassword.svelte";
-  import MainDashContent from "./components/MainDashContent.svelte";
-  import Users from "./components/Users.svelte";
-  import About from "./components/About.svelte";
-  import Settings from "./components/Settings.svelte";
-  import Transition from "./components/Transition.svelte";
-  import Orgs from "./components/Orgs.svelte";
-  import Runners from "./components/Runners.svelte";
-  import Footer from "./components/Footer.svelte";
-  import TracksOverview from "./components/TracksOverview.svelte";
-  import OrgDetail from "./components/OrgDetail.svelte";
-  import Teams from "./components/Teams.svelte";
+  import ForgotPassword from "./components/auth/ForgotPassword.svelte";
+  import MainDashContent from "./components/dashboard/MainDashContent.svelte";
+  import Users from "./components/users/Users.svelte";
+  import About from "./components/general/About.svelte";
+  import Settings from "./components/general/Settings.svelte";
+  import Transition from "./components/base/Transition.svelte";
+  import Orgs from "./components/orgs/Orgs.svelte";
+  import Runners from "./components/runners/Runners.svelte";
+  import Footer from "./components/general/Footer.svelte";
+  import TracksOverview from "./components/tracks/TracksOverview.svelte";
+  import OrgDetail from "./components/orgs/OrgDetail.svelte";
+  import Teams from "./components/teams/Teams.svelte";
   import { OpenAPI } from "@odit/lfk-client-js";
-  import UserDetail from "./components/UserDetail.svelte";
+  import UserDetail from "./components/users/UserDetail.svelte";
   OpenAPI.BASE = config.baseurl;
   import { register as registerSW } from "./swmodule";
-  import TeamDetail from "./components/TeamDetail.svelte";
-  import UserPermissions from "./components/UserPermissions.svelte";
-  import RunnerDetail from "./components/RunnerDetail.svelte";
-  import Imprint from "./components/Imprint.svelte";
-  import Privacy from "./components/Privacy.svelte";
-import ResetPassword from "./components/ResetPassword.svelte";
-import Contacts from "./components/Contacts.svelte";
-import ContactDetail from "./components/ContactDetail.svelte";
+  import TeamDetail from "./components/teams/TeamDetail.svelte";
+  import UserPermissions from "./components/users/UserPermissions.svelte";
+  import RunnerDetail from "./components/runners/RunnerDetail.svelte";
+  import Imprint from "./components/general/Imprint.svelte";
+  import Privacy from "./components/general/Privacy.svelte";
+import ResetPassword from "./components/auth/ResetPassword.svelte";
+import Contacts from "./components/contacts/Contacts.svelte";
+import ContactDetail from "./components/contacts/ContactDetail.svelte";
   store.init();
   registerSW();
 </script>
diff --git a/src/components/ForgotPassword.svelte b/src/components/auth/ForgotPassword.svelte
similarity index 100%
rename from src/components/ForgotPassword.svelte
rename to src/components/auth/ForgotPassword.svelte
diff --git a/src/components/Login.svelte b/src/components/auth/Login.svelte
similarity index 98%
rename from src/components/Login.svelte
rename to src/components/auth/Login.svelte
index fac549c2..b6d21c73 100644
--- a/src/components/Login.svelte
+++ b/src/components/auth/Login.svelte
@@ -1,10 +1,10 @@
 <script>
-  import store from "../store.js";
+  import store from "../../store.js";
   import localForage from "localforage";
   import { _ } from "svelte-i18n";
   store.init();
   import { OpenAPI, AuthService } from "@odit/lfk-client-js";
-  import Footer from "./Footer.svelte";
+  import Footer from "../general/Footer.svelte";
   import Toastify from "toastify-js";
   // ------
   let username = "demo";
diff --git a/src/components/ResetPassword.svelte b/src/components/auth/ResetPassword.svelte
similarity index 100%
rename from src/components/ResetPassword.svelte
rename to src/components/auth/ResetPassword.svelte
diff --git a/src/components/FormLayout.svelte b/src/components/base/FormLayout.svelte
similarity index 100%
rename from src/components/FormLayout.svelte
rename to src/components/base/FormLayout.svelte
diff --git a/src/components/NoComponentLoaded.svelte b/src/components/base/NoComponentLoaded.svelte
similarity index 100%
rename from src/components/NoComponentLoaded.svelte
rename to src/components/base/NoComponentLoaded.svelte
diff --git a/src/components/PromiseError.svelte b/src/components/base/PromiseError.svelte
similarity index 100%
rename from src/components/PromiseError.svelte
rename to src/components/base/PromiseError.svelte
diff --git a/src/components/Transition.svelte b/src/components/base/Transition.svelte
similarity index 100%
rename from src/components/Transition.svelte
rename to src/components/base/Transition.svelte
diff --git a/src/components/datatable_i18n.js b/src/components/base/datatable_i18n.js
similarity index 100%
rename from src/components/datatable_i18n.js
rename to src/components/base/datatable_i18n.js
diff --git a/src/components/outsideclick.js b/src/components/base/outsideclick.js
similarity index 100%
rename from src/components/outsideclick.js
rename to src/components/base/outsideclick.js
diff --git a/src/components/AddContactModal.svelte b/src/components/contacts/AddContactModal.svelte
similarity index 99%
rename from src/components/AddContactModal.svelte
rename to src/components/contacts/AddContactModal.svelte
index 2ea11bce..837408d1 100644
--- a/src/components/AddContactModal.svelte
+++ b/src/components/contacts/AddContactModal.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 {
     GroupContactService,
diff --git a/src/components/ContactDetail.svelte b/src/components/contacts/ContactDetail.svelte
similarity index 99%
rename from src/components/ContactDetail.svelte
rename to src/components/contacts/ContactDetail.svelte
index 6e8888d9..0d8fae48 100644
--- a/src/components/ContactDetail.svelte
+++ b/src/components/contacts/ContactDetail.svelte
@@ -1,13 +1,13 @@
 <script>
   import { _ } from "svelte-i18n";
-  import store from "../store";
+  import store from "../../store";
   import {
     GroupContactService,
     RunnerTeamService,
     RunnerOrganizationService,
   } from "@odit/lfk-client-js";
   import Toastify from "toastify-js";
-  import PromiseError from "./PromiseError.svelte";
+  import PromiseError from "../base/PromiseError.svelte";
   import isEmail from "validator/es/lib/isEmail";
   let data_loaded = false;
   let orgs = [];
diff --git a/src/components/Contacts.svelte b/src/components/contacts/Contacts.svelte
similarity index 96%
rename from src/components/Contacts.svelte
rename to src/components/contacts/Contacts.svelte
index cfd8fa73..b37f28fb 100644
--- a/src/components/Contacts.svelte
+++ b/src/components/contacts/Contacts.svelte
@@ -1,6 +1,6 @@
 <script>
   import { _ } from "svelte-i18n";
-  import store from "../store";
+  import store from "../../store";
   import AddContactModal from "./AddContactModal.svelte";
   import ContactsOverview from "./ContactsOverview.svelte";
   export let modal_open = false;
diff --git a/src/components/ContactsEmptyState.svelte b/src/components/contacts/ContactsEmptyState.svelte
similarity index 90%
rename from src/components/ContactsEmptyState.svelte
rename to src/components/contacts/ContactsEmptyState.svelte
index 7188c76f..7ac2d6ba 100644
--- a/src/components/ContactsEmptyState.svelte
+++ b/src/components/contacts/ContactsEmptyState.svelte
@@ -1,7 +1,7 @@
 <script>
   import { _ } from "svelte-i18n";
   import AddContactModal from "./AddContactModal.svelte";
-  import team_empty from "./team_empty.svg";
+  import team_empty from "../teams/team_empty.svg";
   let modal_open = false;
   let current_contacts = [];
 </script>
diff --git a/src/components/ContactsOverview.svelte b/src/components/contacts/ContactsOverview.svelte
similarity index 100%
rename from src/components/ContactsOverview.svelte
rename to src/components/contacts/ContactsOverview.svelte
diff --git a/src/components/Dashboard.svelte b/src/components/dashboard/Dashboard.svelte
similarity index 99%
rename from src/components/Dashboard.svelte
rename to src/components/dashboard/Dashboard.svelte
index 72ffc38d..40401798 100644
--- a/src/components/Dashboard.svelte
+++ b/src/components/dashboard/Dashboard.svelte
@@ -1,9 +1,9 @@
 <script>
   import { _ } from "svelte-i18n";
   import localForage from "localforage";
-  import store from "../store";
+  import store from "../../store";
   import { router } from "tinro";
-  import NoComponentLoaded from "./NoComponentLoaded.svelte";
+  import NoComponentLoaded from "../base/NoComponentLoaded.svelte";
   import { AuthService } from "@odit/lfk-client-js";
   let dropdown1 = false;
   $: navOpen = false;
diff --git a/src/components/MainDashContent.svelte b/src/components/dashboard/MainDashContent.svelte
similarity index 94%
rename from src/components/MainDashContent.svelte
rename to src/components/dashboard/MainDashContent.svelte
index 781deb2f..4d3efd2a 100644
--- a/src/components/MainDashContent.svelte
+++ b/src/components/dashboard/MainDashContent.svelte
@@ -1,7 +1,7 @@
 <script>
   import { _ } from "svelte-i18n";
   import StatCards from "./StatCards.svelte";
-  import store from "../store";
+  import store from "../../store";
   let navOpen = false;
 </script>
 
diff --git a/src/components/StatCards.svelte b/src/components/dashboard/StatCards.svelte
similarity index 100%
rename from src/components/StatCards.svelte
rename to src/components/dashboard/StatCards.svelte
diff --git a/src/components/About.svelte b/src/components/general/About.svelte
similarity index 99%
rename from src/components/About.svelte
rename to src/components/general/About.svelte
index 5c375323..c080b251 100644
--- a/src/components/About.svelte
+++ b/src/components/general/About.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";
   export let modal_open;
   (function () {
diff --git a/src/components/Footer.svelte b/src/components/general/Footer.svelte
similarity index 100%
rename from src/components/Footer.svelte
rename to src/components/general/Footer.svelte
diff --git a/src/components/Imprint.svelte b/src/components/general/Imprint.svelte
similarity index 97%
rename from src/components/Imprint.svelte
rename to src/components/general/Imprint.svelte
index 9eb3ca9c..d9a9b3ff 100644
--- a/src/components/Imprint.svelte
+++ b/src/components/general/Imprint.svelte
@@ -1,6 +1,5 @@
 <script>
   import { _, getLocaleFromNavigator } from "svelte-i18n";
-  import * as css from "./simple.css";
   import marked from "marked";
   import Footer from "./Footer.svelte";
   let html = "";
diff --git a/src/components/NotFound.svelte b/src/components/general/NotFound.svelte
similarity index 100%
rename from src/components/NotFound.svelte
rename to src/components/general/NotFound.svelte
diff --git a/src/components/Privacy.svelte b/src/components/general/Privacy.svelte
similarity index 97%
rename from src/components/Privacy.svelte
rename to src/components/general/Privacy.svelte
index 1d8710a1..845d296d 100644
--- a/src/components/Privacy.svelte
+++ b/src/components/general/Privacy.svelte
@@ -1,6 +1,5 @@
 <script>
   import { _, getLocaleFromNavigator } from "svelte-i18n";
-  import * as css from "./simple.css";
   import marked from "marked";
   import Footer from "./Footer.svelte";
   let html = "";
diff --git a/src/components/Settings.svelte b/src/components/general/Settings.svelte
similarity index 95%
rename from src/components/Settings.svelte
rename to src/components/general/Settings.svelte
index 21d3aafd..e1963b30 100644
--- a/src/components/Settings.svelte
+++ b/src/components/general/Settings.svelte
@@ -1,6 +1,6 @@
 <script>
   import { _ } from "svelte-i18n";
-import FormLayout from "./FormLayout.svelte";
+import FormLayout from "../base/FormLayout.svelte";
 </script>
 
 <div class="pt-12 px-4 sm:px-6 lg:px-8 lg:pt-20 bg-gray-900 pb-12">
diff --git a/src/components/Sidebar.svelte b/src/components/general/Sidebar.svelte
similarity index 100%
rename from src/components/Sidebar.svelte
rename to src/components/general/Sidebar.svelte
diff --git a/src/components/AddOrgModal.svelte b/src/components/orgs/AddOrgModal.svelte
similarity index 99%
rename from src/components/AddOrgModal.svelte
rename to src/components/orgs/AddOrgModal.svelte
index f41c5888..54ba1051 100644
--- a/src/components/AddOrgModal.svelte
+++ b/src/components/orgs/AddOrgModal.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 { RunnerOrganizationService } from "@odit/lfk-client-js";
   import Toastify from "toastify-js";
diff --git a/src/components/ConfirmOrgDeletion.svelte b/src/components/orgs/ConfirmOrgDeletion.svelte
similarity index 98%
rename from src/components/ConfirmOrgDeletion.svelte
rename to src/components/orgs/ConfirmOrgDeletion.svelte
index f5b82744..926dc5ba 100644
--- a/src/components/ConfirmOrgDeletion.svelte
+++ b/src/components/orgs/ConfirmOrgDeletion.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 { RunnerOrganizationService } from "@odit/lfk-client-js";
   import Toastify from "toastify-js";
diff --git a/src/components/OrgDetail.svelte b/src/components/orgs/OrgDetail.svelte
similarity index 98%
rename from src/components/OrgDetail.svelte
rename to src/components/orgs/OrgDetail.svelte
index 8e6b5f24..d5b53914 100644
--- a/src/components/OrgDetail.svelte
+++ b/src/components/orgs/OrgDetail.svelte
@@ -5,10 +5,10 @@
   } from "@odit/lfk-client-js";
   import { _ } from "svelte-i18n";
   import Toastify from "toastify-js";
-  import store from "../store";
+  import store from "../../store";
   import ConfirmOrgDeletion from "./ConfirmOrgDeletion.svelte";
-  import ImportRunnerModal from "./ImportRunnerModal.svelte";
-  import PromiseError from "./PromiseError.svelte";
+  import ImportRunnerModal from "../runners/ImportRunnerModal.svelte";
+  import PromiseError from "../base/PromiseError.svelte";
   $: delete_triggered = false;
   $: save_enabled = !data_changed;
   export let params;
diff --git a/src/components/OrgOverview.svelte b/src/components/orgs/OrgOverview.svelte
similarity index 99%
rename from src/components/OrgOverview.svelte
rename to src/components/orgs/OrgOverview.svelte
index 4f14ca3e..7d4cd967 100644
--- a/src/components/OrgOverview.svelte
+++ b/src/components/orgs/OrgOverview.svelte
@@ -3,7 +3,7 @@
   let modal_open = false;
   let delete_org = {};
   import { RunnerOrganizationService } from "@odit/lfk-client-js";
-  import store from "../store";
+  import store from "../../store";
   import OrgsEmptyState from "./OrgsEmptyState.svelte";
   import Toastify from "toastify-js";
   import ConfirmOrgDeletion from "./ConfirmOrgDeletion.svelte";
diff --git a/src/components/Orgs.svelte b/src/components/orgs/Orgs.svelte
similarity index 94%
rename from src/components/Orgs.svelte
rename to src/components/orgs/Orgs.svelte
index abecc713..43e9bbfd 100644
--- a/src/components/Orgs.svelte
+++ b/src/components/orgs/Orgs.svelte
@@ -1,10 +1,10 @@
 <script>
   import { _ } from "svelte-i18n";
-  import store from "../store";
+  import store from "../../store";
   import AddOrgModal from "./AddOrgModal.svelte";
   export let modal_open = false;
   import OrgOverview from "./OrgOverview.svelte";
-  import ImportRunnerModal from "./ImportRunnerModal.svelte";
+  import ImportRunnerModal from "../runners/ImportRunnerModal.svelte";
   let current_organizations = [];
   export let import_modal_open = false;
 </script>
diff --git a/src/components/OrgsEmptyState.svelte b/src/components/orgs/OrgsEmptyState.svelte
similarity index 100%
rename from src/components/OrgsEmptyState.svelte
rename to src/components/orgs/OrgsEmptyState.svelte
diff --git a/src/components/org_empty.svg b/src/components/orgs/org_empty.svg
similarity index 100%
rename from src/components/org_empty.svg
rename to src/components/orgs/org_empty.svg
diff --git a/src/components/Avatars.svelte b/src/components/random/Avatars.svelte
similarity index 100%
rename from src/components/Avatars.svelte
rename to src/components/random/Avatars.svelte
diff --git a/src/components/Badges.svelte b/src/components/random/Badges.svelte
similarity index 100%
rename from src/components/Badges.svelte
rename to src/components/random/Badges.svelte
diff --git a/src/components/BreadcrumbNav.svelte b/src/components/random/BreadcrumbNav.svelte
similarity index 100%
rename from src/components/BreadcrumbNav.svelte
rename to src/components/random/BreadcrumbNav.svelte
diff --git a/src/components/ComponentDump.svelte b/src/components/random/ComponentDump.svelte
similarity index 100%
rename from src/components/ComponentDump.svelte
rename to src/components/random/ComponentDump.svelte
diff --git a/src/components/ConversionsChart.svelte b/src/components/random/ConversionsChart.svelte
similarity index 100%
rename from src/components/ConversionsChart.svelte
rename to src/components/random/ConversionsChart.svelte
diff --git a/src/components/DataTable.svelte b/src/components/random/DataTable.svelte
similarity index 100%
rename from src/components/DataTable.svelte
rename to src/components/random/DataTable.svelte
diff --git a/src/components/FileUpload.svelte b/src/components/random/FileUpload.svelte
similarity index 100%
rename from src/components/FileUpload.svelte
rename to src/components/random/FileUpload.svelte
diff --git a/src/components/Pagination.svelte b/src/components/random/Pagination.svelte
similarity index 100%
rename from src/components/Pagination.svelte
rename to src/components/random/Pagination.svelte
diff --git a/src/components/Profile.svelte b/src/components/random/Profile.svelte
similarity index 100%
rename from src/components/Profile.svelte
rename to src/components/random/Profile.svelte
diff --git a/src/components/Table.svelte b/src/components/random/Table.svelte
similarity index 100%
rename from src/components/Table.svelte
rename to src/components/random/Table.svelte
diff --git a/src/components/Tabs.svelte b/src/components/random/Tabs.svelte
similarity index 100%
rename from src/components/Tabs.svelte
rename to src/components/random/Tabs.svelte
diff --git a/src/components/Tags.svelte b/src/components/random/Tags.svelte
similarity index 100%
rename from src/components/Tags.svelte
rename to src/components/random/Tags.svelte
diff --git a/src/components/Test.svelte b/src/components/random/Test.svelte
similarity index 100%
rename from src/components/Test.svelte
rename to src/components/random/Test.svelte
diff --git a/src/components/simple.css b/src/components/random/simple.css
similarity index 100%
rename from src/components/simple.css
rename to src/components/random/simple.css
diff --git a/src/components/AddRunnerModal.svelte b/src/components/runners/AddRunnerModal.svelte
similarity index 99%
rename from src/components/AddRunnerModal.svelte
rename to src/components/runners/AddRunnerModal.svelte
index fe4cc642..d2017d27 100644
--- a/src/components/AddRunnerModal.svelte
+++ b/src/components/runners/AddRunnerModal.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/ImportRunnerModal.svelte b/src/components/runners/ImportRunnerModal.svelte
similarity index 99%
rename from src/components/ImportRunnerModal.svelte
rename to src/components/runners/ImportRunnerModal.svelte
index 0b39ace5..1fcd35af 100644
--- a/src/components/ImportRunnerModal.svelte
+++ b/src/components/runners/ImportRunnerModal.svelte
@@ -2,7 +2,7 @@
   import csv from "csvtojson";
   import { read as readXlsx, utils as xlsx_utils } from "xlsx";
   import { _ } from "svelte-i18n";
-  import { clickOutside } from "./outsideclick";
+  import { clickOutside } from "../base/outsideclick";
   import { focusTrap } from "svelte-focus-trap";
   import Toastify from "toastify-js";
   import {
diff --git a/src/components/RunnerDetail.svelte b/src/components/runners/RunnerDetail.svelte
similarity index 99%
rename from src/components/RunnerDetail.svelte
rename to src/components/runners/RunnerDetail.svelte
index 0b9827fe..80eabb96 100644
--- a/src/components/RunnerDetail.svelte
+++ b/src/components/runners/RunnerDetail.svelte
@@ -1,14 +1,14 @@
 <script>
   import { _ } from "svelte-i18n";
   import lodashIsEqual from "lodash.isequal";
-  import store from "../store";
+  import store from "../../store";
   import {
     RunnerService,
     RunnerTeamService,
     RunnerOrganizationService,
   } from "@odit/lfk-client-js";
   import Toastify from "toastify-js";
-  import PromiseError from "./PromiseError.svelte";
+  import PromiseError from "../base/PromiseError.svelte";
   import isEmail from "validator/es/lib/isEmail";
   let data_loaded = false;
   export let params;
diff --git a/src/components/Runners.svelte b/src/components/runners/Runners.svelte
similarity index 98%
rename from src/components/Runners.svelte
rename to src/components/runners/Runners.svelte
index f8c784f4..92043e74 100644
--- a/src/components/Runners.svelte
+++ b/src/components/runners/Runners.svelte
@@ -1,6 +1,6 @@
 <script>
   import { _ } from "svelte-i18n";
-  import store from "../store";
+  import store from "../../store";
   import AddRunnerModal from "./AddRunnerModal.svelte";
   import ImportRunnerModal from "./ImportRunnerModal.svelte";
   import RunnersOverview from "./RunnersOverview.svelte";
diff --git a/src/components/RunnersEmptyState.svelte b/src/components/runners/RunnersEmptyState.svelte
similarity index 100%
rename from src/components/RunnersEmptyState.svelte
rename to src/components/runners/RunnersEmptyState.svelte
diff --git a/src/components/RunnersOverview.svelte b/src/components/runners/RunnersOverview.svelte
similarity index 99%
rename from src/components/RunnersOverview.svelte
rename to src/components/runners/RunnersOverview.svelte
index 9ff8b3c7..320a70cc 100644
--- a/src/components/RunnersOverview.svelte
+++ b/src/components/runners/RunnersOverview.svelte
@@ -2,7 +2,7 @@
   import { _ } from "svelte-i18n";
   import { RunnerService,RunnerTeamService,
     RunnerOrganizationService, } from "@odit/lfk-client-js";
-  import store from "../store";
+  import store from "../../store";
   import RunnersEmptyState from "./RunnersEmptyState.svelte";
   import Select from 'svelte-select';
   $: searchvalue = "";
diff --git a/src/components/runners_empty.svg b/src/components/runners/runners_empty.svg
similarity index 100%
rename from src/components/runners_empty.svg
rename to src/components/runners/runners_empty.svg
diff --git a/src/components/AddTeamModal.svelte b/src/components/teams/AddTeamModal.svelte
similarity index 99%
rename from src/components/AddTeamModal.svelte
rename to src/components/teams/AddTeamModal.svelte
index 0dade820..34e9d1d1 100644
--- a/src/components/AddTeamModal.svelte
+++ b/src/components/teams/AddTeamModal.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 {
     RunnerOrganizationService,
diff --git a/src/components/ConfirmTeamDeletion.svelte b/src/components/teams/ConfirmTeamDeletion.svelte
similarity index 98%
rename from src/components/ConfirmTeamDeletion.svelte
rename to src/components/teams/ConfirmTeamDeletion.svelte
index 7d7c8e3b..c3e52686 100644
--- a/src/components/ConfirmTeamDeletion.svelte
+++ b/src/components/teams/ConfirmTeamDeletion.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 { RunnerTeamService } from "@odit/lfk-client-js";
   import Toastify from "toastify-js";
diff --git a/src/components/TeamDetail.svelte b/src/components/teams/TeamDetail.svelte
similarity index 98%
rename from src/components/TeamDetail.svelte
rename to src/components/teams/TeamDetail.svelte
index 4248fc69..af83bfc0 100644
--- a/src/components/TeamDetail.svelte
+++ b/src/components/teams/TeamDetail.svelte
@@ -6,9 +6,9 @@
   } from "@odit/lfk-client-js";
   import { _ } from "svelte-i18n";
   import Toastify from "toastify-js";
-  import store from "../store";
-  import ImportRunnerModal from "./ImportRunnerModal.svelte";
-  import PromiseError from "./PromiseError.svelte";
+  import store from "../../store";
+  import ImportRunnerModal from "../runners/ImportRunnerModal.svelte";
+  import PromiseError from "../base/PromiseError.svelte";
   import ConfirmTeamDeletion from "./ConfirmTeamDeletion.svelte";
   let [teamdata, original, delete_team, orgs, contacts, modal_open] = [
     {},
diff --git a/src/components/Teams.svelte b/src/components/teams/Teams.svelte
similarity index 97%
rename from src/components/Teams.svelte
rename to src/components/teams/Teams.svelte
index 75ad7411..26e5bb01 100644
--- a/src/components/Teams.svelte
+++ b/src/components/teams/Teams.svelte
@@ -1,6 +1,6 @@
 <script>
   import { _ } from "svelte-i18n";
-  import store from "../store";
+  import store from "../../store";
   import AddTeamModal from "./AddTeamModal.svelte";
   export let modal_open = false;
   import TeamsOverview from "./TeamsOverview.svelte";
diff --git a/src/components/TeamsEmptyState.svelte b/src/components/teams/TeamsEmptyState.svelte
similarity index 100%
rename from src/components/TeamsEmptyState.svelte
rename to src/components/teams/TeamsEmptyState.svelte
diff --git a/src/components/TeamsOverview.svelte b/src/components/teams/TeamsOverview.svelte
similarity index 98%
rename from src/components/TeamsOverview.svelte
rename to src/components/teams/TeamsOverview.svelte
index 204d3ddc..afba7be8 100644
--- a/src/components/TeamsOverview.svelte
+++ b/src/components/teams/TeamsOverview.svelte
@@ -3,8 +3,7 @@
   import Toastify from "toastify-js";
   import { RunnerTeamService } from "@odit/lfk-client-js";
   const teams_promise = RunnerTeamService.runnerTeamControllerGetAll();
-  import { users as usersstore } from "../store.js";
-  import store from "../store";
+  import { users as usersstore, store } from "../../store.js";
   import TeamsEmptyState from "./TeamsEmptyState.svelte";
   import ConfirmTeamDeletion from "./ConfirmTeamDeletion.svelte";
   $: searchvalue = "";
diff --git a/src/components/team_empty.svg b/src/components/teams/team_empty.svg
similarity index 100%
rename from src/components/team_empty.svg
rename to src/components/teams/team_empty.svg
diff --git a/src/components/AddTrackModal.svelte b/src/components/tracks/AddTrackModal.svelte
similarity index 98%
rename from src/components/AddTrackModal.svelte
rename to src/components/tracks/AddTrackModal.svelte
index 05a2b8f8..b70147ef 100644
--- a/src/components/AddTrackModal.svelte
+++ b/src/components/tracks/AddTrackModal.svelte
@@ -1,8 +1,8 @@
 <script>
   import { _ } from "svelte-i18n";
-  import { clickOutside } from "./outsideclick";
+  import { clickOutside } from "../base/outsideclick";
   import { focusTrap } from "svelte-focus-trap";
-  import { tracks as tracksstore } from "../store.js";
+  import { tracks as tracksstore } from "../../store.js";
   import { TrackService } from "@odit/lfk-client-js";
   import Toastify from "toastify-js";
   import "toastify-js/src/toastify.css";
diff --git a/src/components/Tracks.svelte b/src/components/tracks/Tracks.svelte
similarity index 98%
rename from src/components/Tracks.svelte
rename to src/components/tracks/Tracks.svelte
index 1b981ac1..ef321af5 100644
--- a/src/components/Tracks.svelte
+++ b/src/components/tracks/Tracks.svelte
@@ -4,9 +4,9 @@
   import TracksEmptyState from "./TracksEmptyState.svelte";
   import { TrackService } from "@odit/lfk-client-js";
   const tracks_promise = TrackService.trackControllerGetAll();
-  import { getlang } from "./datatable_i18n";
+  import { getlang } from "../base/datatable_i18n";
   import { Grid, html } from "gridjs";
-  import { tracks as tracksstore } from "../store.js";
+  import { tracks as tracksstore } from "../../store.js";
   $: trackscache = [];
   $: blocked = [];
   let table;
diff --git a/src/components/TracksEmptyState.svelte b/src/components/tracks/TracksEmptyState.svelte
similarity index 100%
rename from src/components/TracksEmptyState.svelte
rename to src/components/tracks/TracksEmptyState.svelte
diff --git a/src/components/TracksOverview.svelte b/src/components/tracks/TracksOverview.svelte
similarity index 100%
rename from src/components/TracksOverview.svelte
rename to src/components/tracks/TracksOverview.svelte
diff --git a/src/components/AddUserModal.svelte b/src/components/users/AddUserModal.svelte
similarity index 99%
rename from src/components/AddUserModal.svelte
rename to src/components/users/AddUserModal.svelte
index 7d7ad331..e047fca7 100644
--- a/src/components/AddUserModal.svelte
+++ b/src/components/users/AddUserModal.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 { UserService } from "@odit/lfk-client-js";
   import isEmail from "validator/es/lib/isEmail";
diff --git a/src/components/UserDetail.svelte b/src/components/users/UserDetail.svelte
similarity index 99%
rename from src/components/UserDetail.svelte
rename to src/components/users/UserDetail.svelte
index d079beef..94b0b52f 100644
--- a/src/components/UserDetail.svelte
+++ b/src/components/users/UserDetail.svelte
@@ -1,11 +1,11 @@
 <script>
   import { _ } from "svelte-i18n";
   import lodashIsEqual from "lodash.isequal";
-  import store from "../store";
+  import store from "../../store";
   import isEmail from "validator/es/lib/isEmail";
   import { UserService, UserGroupService } from "@odit/lfk-client-js";
   import Toastify from "toastify-js";
-  import PromiseError from "./PromiseError.svelte";
+  import PromiseError from "../base/PromiseError.svelte";
   export let params;
   const user_promise = UserService.userControllerGetOne(params.userid);
   let data_loaded = false;
diff --git a/src/components/UserPermissions.svelte b/src/components/users/UserPermissions.svelte
similarity index 99%
rename from src/components/UserPermissions.svelte
rename to src/components/users/UserPermissions.svelte
index 1ae23e20..5a020cb1 100644
--- a/src/components/UserPermissions.svelte
+++ b/src/components/users/UserPermissions.svelte
@@ -6,7 +6,7 @@
     CreatePermission,
   } from "@odit/lfk-client-js";
   import Toastify from "toastify-js";
-  import PromiseError from "./PromiseError.svelte";
+  import PromiseError from "../base/PromiseError.svelte";
   export let params;
   let [
     grantedPermissions_initial,
diff --git a/src/components/Users.svelte b/src/components/users/Users.svelte
similarity index 97%
rename from src/components/Users.svelte
rename to src/components/users/Users.svelte
index c3fdc0f0..1ffd9dc4 100644
--- a/src/components/Users.svelte
+++ b/src/components/users/Users.svelte
@@ -1,6 +1,6 @@
 <script>
   import { _ } from "svelte-i18n";
-  import store from "../store";
+  import store from "../../store";
   import AddUserModal from "./AddUserModal.svelte";
   export let modal_open = false;
   import UsersOverview from "./UsersOverview.svelte";
diff --git a/src/components/UsersEmptyState.svelte b/src/components/users/UsersEmptyState.svelte
similarity index 100%
rename from src/components/UsersEmptyState.svelte
rename to src/components/users/UsersEmptyState.svelte
diff --git a/src/components/UsersOverview.svelte b/src/components/users/UsersOverview.svelte
similarity index 98%
rename from src/components/UsersOverview.svelte
rename to src/components/users/UsersOverview.svelte
index 014ad6ef..00e83fb0 100644
--- a/src/components/UsersOverview.svelte
+++ b/src/components/users/UsersOverview.svelte
@@ -2,8 +2,7 @@
   import { _ } from "svelte-i18n";
   import { UserService } from "@odit/lfk-client-js";
   const users_promise = UserService.userControllerGetAll();
-  import { users as usersstore } from "../store.js";
-  import store from "../store";
+  import { users as usersstore, store } from "../../store.js";
   import UsersEmptyState from "./UsersEmptyState.svelte";
   $: searchvalue = "";
   $: active_deletes = [];
diff --git a/src/components/users_empty.svg b/src/components/users/users_empty.svg
similarity index 100%
rename from src/components/users_empty.svg
rename to src/components/users/users_empty.svg