diff --git a/src/components/FormBottomBar.vue b/src/components/FormBottomBar.vue
index 16a1269..3f96f55 100644
--- a/src/components/FormBottomBar.vue
+++ b/src/components/FormBottomBar.vue
@@ -1,9 +1,9 @@
 <template>
   <div class="flex flex-col text-gray-400 text-sm mt-4 items-center">
     <div class="flex flex-row gap-2 justify-center">
-      <a ref="https://jk-effects.com/privacy" target="_blank">Datenschutz</a>
-      <a ref="https://jk-effects.com/imprint" target="_blank">Impressum</a>
+      <a href="https://jk-effects.com/privacy" target="_blank">Datenschutz</a>
+      <a href="https://jk-effects.com/imprint" target="_blank">Impressum</a>
     </div>
     <a href="https://jk-effects.com" target="_blank"> &copy; Admin-Portal by JK Effects </a>
   </div>
-</template>
+</template>
\ No newline at end of file
diff --git a/src/components/Pagination.vue b/src/components/Pagination.vue
index 8b6ead5..194a328 100644
--- a/src/components/Pagination.vue
+++ b/src/components/Pagination.vue
@@ -1,9 +1,10 @@
 <template>
   <div class="grow flex flex-col gap-2 overflow-hidden">
-    <div v-if="useSearch" class="relative self-end">
+    <div v-if="useSearch" class="relative self-end flex flex-row items-center gap-2">
+      <Spinner v-if="deferingSearch"  />
       <input
         type="text"
-        class="w-64 rounded-md shadow-sm relative block px-3 py-2 pr-5 border border-gray-300 placeholder-gray-500 text-gray-900 rounded-b-md focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 focus:z-10 sm:text-sm"
+        class="!max-w-64 !w-64 rounded-md shadow-sm relative block px-3 py-2 pr-5 border border-gray-300 placeholder-gray-500 text-gray-900 rounded-b-md focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 focus:z-10 sm:text-sm"
         placeholder="Suche"
         v-model="searchString"
       />
@@ -87,15 +88,22 @@ const slots = defineSlots<{
 const timer = ref(undefined) as undefined | any;
 const currentPage = ref(0);
 const searchString = ref("");
+const deferingSearch = ref(false)
 
 watch(searchString, async () => {
+  deferingSearch.value = true
   clearTimeout(timer.value);
   timer.value = setTimeout(() => {
     currentPage.value = 0;
+    deferingSearch.value = false
     emit("search", searchString.value);
   }, 600);
 });
 
+watch(() => props.totalCount, async () => {
+  currentPage.value = 0;
+});
+
 const emit = defineEmits({
   submit(id: number) {
     return typeof id == "number";
@@ -104,7 +112,7 @@ const emit = defineEmits({
     return typeof offset == "number" && typeof offset == "number" && typeof searchString == "number";
   },
   search(search: string) {
-    return typeof search == "number";
+    return typeof search == "string";
   },
   clickRow(elem: T) {
     return true;
@@ -151,7 +159,8 @@ const loadPage = (newPage: number | ".") => {
   if (pageEnd > entryCount.value) pageEnd = entryCount.value;
 
   let loadedElementCount = filterData(props.items, searchString.value, pageStart, pageEnd).length;
-  if (loadedElementCount < props.maxEntriesPerPage)
+  console.log(loadedElementCount, props.maxEntriesPerPage, pageStart, pageEnd)
+  if (loadedElementCount < props.maxEntriesPerPage && (pageEnd != props.totalCount || loadedElementCount == 0))
     emit("loadData", pageStart, props.maxEntriesPerPage, searchString.value);
 
   currentPage.value = newPage;
diff --git a/src/components/admin/club/calendar/CalendarLinkModal.vue b/src/components/admin/club/calendar/CalendarLinkModal.vue
index 5c16641..e304e6e 100644
--- a/src/components/admin/club/calendar/CalendarLinkModal.vue
+++ b/src/components/admin/club/calendar/CalendarLinkModal.vue
@@ -105,8 +105,8 @@ import { defineComponent } from "vue";
 import { mapState, mapActions } from "pinia";
 import { RouterLink } from "vue-router";
 import { useModalStore } from "@/stores/modal";
-import { useCalendarTypeStore } from "@/stores/admin/calendarType";
-import type { CalendarTypeViewModel } from "@/viewmodels/admin/calendarType.models";
+import { useCalendarTypeStore } from "@/stores/admin/settings/calendarType";
+import type { CalendarTypeViewModel } from "@/viewmodels/admin/settings/calendarType.models";
 import { Listbox, ListboxButton, ListboxOptions, ListboxOption, ListboxLabel } from "@headlessui/vue";
 import { CheckIcon, ChevronUpDownIcon } from "@heroicons/vue/20/solid";
 import TextCopy from "@/components/TextCopy.vue";
diff --git a/src/components/admin/club/calendar/CreateCalendarModal.vue b/src/components/admin/club/calendar/CreateCalendarModal.vue
index 1d71265..5b068a9 100644
--- a/src/components/admin/club/calendar/CreateCalendarModal.vue
+++ b/src/components/admin/club/calendar/CreateCalendarModal.vue
@@ -143,12 +143,12 @@ import { useModalStore } from "@/stores/modal";
 import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
-import { useCalendarStore } from "@/stores/admin/calendar";
-import type { CreateCalendarViewModel } from "@/viewmodels/admin/calendar.models";
+import { useCalendarStore } from "@/stores/admin/club/calendar";
+import type { CreateCalendarViewModel } from "@/viewmodels/admin/club/calendar.models";
 import { Listbox, ListboxButton, ListboxOptions, ListboxOption, ListboxLabel } from "@headlessui/vue";
 import { CheckIcon, ChevronUpDownIcon } from "@heroicons/vue/20/solid";
-import { useCalendarTypeStore } from "@/stores/admin/calendarType";
-import type { CalendarTypeViewModel } from "@/viewmodels/admin/calendarType.models";
+import { useCalendarTypeStore } from "@/stores/admin/settings/calendarType";
+import type { CalendarTypeViewModel } from "@/viewmodels/admin/settings/calendarType.models";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/club/calendar/DeleteCalendarModal.vue b/src/components/admin/club/calendar/DeleteCalendarModal.vue
index 07fc72f..368b51b 100644
--- a/src/components/admin/club/calendar/DeleteCalendarModal.vue
+++ b/src/components/admin/club/calendar/DeleteCalendarModal.vue
@@ -51,7 +51,7 @@ import { useModalStore } from "@/stores/modal";
 import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
-import { useCalendarStore } from "@/stores/admin/calendar";
+import { useCalendarStore } from "@/stores/admin/club/calendar";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/club/calendar/UpdateCalendarModal.vue b/src/components/admin/club/calendar/UpdateCalendarModal.vue
index 6fe1197..499adda 100644
--- a/src/components/admin/club/calendar/UpdateCalendarModal.vue
+++ b/src/components/admin/club/calendar/UpdateCalendarModal.vue
@@ -185,16 +185,16 @@ import { useModalStore } from "@/stores/modal";
 import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
-import { useCalendarStore } from "@/stores/admin/calendar";
+import { useCalendarStore } from "@/stores/admin/club/calendar";
 import type {
   CalendarViewModel,
   CreateCalendarViewModel,
   UpdateCalendarViewModel,
-} from "@/viewmodels/admin/calendar.models";
+} from "@/viewmodels/admin/club/calendar.models";
 import { Listbox, ListboxButton, ListboxOptions, ListboxOption, ListboxLabel } from "@headlessui/vue";
 import { CheckIcon, ChevronUpDownIcon, TrashIcon } from "@heroicons/vue/20/solid";
-import { useCalendarTypeStore } from "@/stores/admin/calendarType";
-import type { CalendarTypeViewModel } from "@/viewmodels/admin/calendarType.models";
+import { useCalendarTypeStore } from "@/stores/admin/settings/calendarType";
+import type { CalendarTypeViewModel } from "@/viewmodels/admin/settings/calendarType.models";
 import cloneDeep from "lodash.clonedeep";
 import isEqual from "lodash.isequal";
 import { useAbilityStore } from "@/stores/ability";
diff --git a/src/components/admin/club/member/CreateMemberModal.vue b/src/components/admin/club/member/CreateMemberModal.vue
index 0addfc7..177f4af 100644
--- a/src/components/admin/club/member/CreateMemberModal.vue
+++ b/src/components/admin/club/member/CreateMemberModal.vue
@@ -66,6 +66,10 @@
         <label for="birthdate">Geburtsdatum</label>
         <input type="date" id="birthdate" required />
       </div>
+      <div>
+        <label for="internalId">Interne ID (optional)</label>
+        <input type="text" id="internalId" />
+      </div>
       <div class="flex flex-row gap-2">
         <button primary type="submit" :disabled="status == 'loading' || status?.status == 'success'">erstellen</button>
         <Spinner v-if="status == 'loading'" class="my-auto" />
@@ -94,8 +98,8 @@ import FailureXMark from "@/components/FailureXMark.vue";
 import { Listbox, ListboxButton, ListboxOptions, ListboxOption, ListboxLabel } from "@headlessui/vue";
 import { CheckIcon, ChevronUpDownIcon } from "@heroicons/vue/20/solid";
 import { Salutation } from "@/enums/salutation";
-import { useMemberStore } from "@/stores/admin/member";
-import type { CreateMemberViewModel } from "@/viewmodels/admin/member.models";
+import { useMemberStore } from "@/stores/admin/club/member/member";
+import type { CreateMemberViewModel } from "@/viewmodels/admin/club/member/member.models";
 </script>
 
 <script lang="ts">
@@ -127,6 +131,7 @@ export default defineComponent({
         lastname: formData.lastname.value,
         nameaffix: formData.nameaffix.value,
         birthdate: formData.birthdate.value,
+        internalId: formData.internalId.value,
       };
       this.createMember(createMember)
         .then(() => {
diff --git a/src/components/admin/club/member/DeleteMemberModal.vue b/src/components/admin/club/member/DeleteMemberModal.vue
index d9be02d..2852777 100644
--- a/src/components/admin/club/member/DeleteMemberModal.vue
+++ b/src/components/admin/club/member/DeleteMemberModal.vue
@@ -44,8 +44,8 @@ import FailureXMark from "@/components/FailureXMark.vue";
 import { Listbox, ListboxButton, ListboxOptions, ListboxOption, ListboxLabel } from "@headlessui/vue";
 import { CheckIcon, ChevronUpDownIcon } from "@heroicons/vue/20/solid";
 import { Salutation } from "@/enums/salutation";
-import { useMemberStore } from "@/stores/admin/member";
-import type { CreateMemberViewModel } from "@/viewmodels/admin/member.models";
+import { useMemberStore } from "@/stores/admin/club/member/member";
+import type { CreateMemberViewModel } from "@/viewmodels/admin/club/member/member.models";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/club/member/MemberAwardCreateModal.vue b/src/components/admin/club/member/MemberAwardCreateModal.vue
index 1554413..34a123c 100644
--- a/src/components/admin/club/member/MemberAwardCreateModal.vue
+++ b/src/components/admin/club/member/MemberAwardCreateModal.vue
@@ -97,14 +97,14 @@ import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
 import { Listbox, ListboxButton, ListboxOptions, ListboxOption, ListboxLabel } from "@headlessui/vue";
 import { CheckIcon, ChevronUpDownIcon } from "@heroicons/vue/20/solid";
-import { useMembershipStatusStore } from "@/stores/admin/membershipStatus";
-import type { MembershipStatusViewModel } from "@/viewmodels/admin/membershipStatus.models";
-import type { CreateMembershipViewModel } from "@/viewmodels/admin/membership.models";
-import { useMembershipStore } from "@/stores/admin/membership";
-import { useAwardStore } from "@/stores/admin/award";
-import type { AwardViewModel } from "@/viewmodels/admin/award.models";
-import type { CreateMemberAwardViewModel } from "@/viewmodels/admin/memberAward.models";
-import { useMemberAwardStore } from "@/stores/admin/memberAward";
+import { useMembershipStatusStore } from "@/stores/admin/settings/membershipStatus";
+import type { MembershipStatusViewModel } from "@/viewmodels/admin/settings/membershipStatus.models";
+import type { CreateMembershipViewModel } from "@/viewmodels/admin/club/member/membership.models";
+import { useMembershipStore } from "@/stores/admin/club/member/membership";
+import { useAwardStore } from "@/stores/admin/settings/award";
+import type { AwardViewModel } from "@/viewmodels/admin/settings/award.models";
+import type { CreateMemberAwardViewModel } from "@/viewmodels/admin/club/member/memberAward.models";
+import { useMemberAwardStore } from "@/stores/admin/club/member/memberAward";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/club/member/MemberAwardDeleteModal.vue b/src/components/admin/club/member/MemberAwardDeleteModal.vue
index ff4aed0..7fcdd3f 100644
--- a/src/components/admin/club/member/MemberAwardDeleteModal.vue
+++ b/src/components/admin/club/member/MemberAwardDeleteModal.vue
@@ -38,7 +38,7 @@ import { useModalStore } from "@/stores/modal";
 import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
-import { useMemberAwardStore } from "@/stores/admin/memberAward";
+import { useMemberAwardStore } from "@/stores/admin/club/member/memberAward";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/club/member/MemberAwardEditModal.vue b/src/components/admin/club/member/MemberAwardEditModal.vue
index 8e6e9bf..1523f47 100644
--- a/src/components/admin/club/member/MemberAwardEditModal.vue
+++ b/src/components/admin/club/member/MemberAwardEditModal.vue
@@ -98,13 +98,13 @@ import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
 import { Listbox, ListboxButton, ListboxOptions, ListboxOption, ListboxLabel } from "@headlessui/vue";
 import { CheckIcon, ChevronUpDownIcon } from "@heroicons/vue/20/solid";
-import { useAwardStore } from "@/stores/admin/award";
+import { useAwardStore } from "@/stores/admin/settings/award";
 import type {
   CreateMemberAwardViewModel,
   MemberAwardViewModel,
   UpdateMemberAwardViewModel,
-} from "@/viewmodels/admin/memberAward.models";
-import { useMemberAwardStore } from "@/stores/admin/memberAward";
+} from "@/viewmodels/admin/club/member/memberAward.models";
+import { useMemberAwardStore } from "@/stores/admin/club/member/memberAward";
 import isEqual from "lodash.isequal";
 import cloneDeep from "lodash.clonedeep";
 </script>
diff --git a/src/components/admin/club/member/MemberAwardListItem.vue b/src/components/admin/club/member/MemberAwardListItem.vue
index 8f14877..da4d776 100644
--- a/src/components/admin/club/member/MemberAwardListItem.vue
+++ b/src/components/admin/club/member/MemberAwardListItem.vue
@@ -16,7 +16,7 @@
 <script setup lang="ts">
 import { defineAsyncComponent, defineComponent, markRaw, type PropType } from "vue";
 import { mapState, mapActions } from "pinia";
-import type { MemberAwardViewModel } from "@/viewmodels/admin/memberAward.models";
+import type { MemberAwardViewModel } from "@/viewmodels/admin/club/member/memberAward.models";
 import { PencilIcon, TrashIcon } from "@heroicons/vue/24/outline";
 import { useModalStore } from "@/stores/modal";
 import { useAbilityStore } from "@/stores/ability";
diff --git a/src/components/admin/club/member/MemberCommunicationCreateModal.vue b/src/components/admin/club/member/MemberCommunicationCreateModal.vue
index 734b73e..1c2af29 100644
--- a/src/components/admin/club/member/MemberCommunicationCreateModal.vue
+++ b/src/components/admin/club/member/MemberCommunicationCreateModal.vue
@@ -125,10 +125,10 @@ import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
 import { Listbox, ListboxButton, ListboxOptions, ListboxOption, ListboxLabel } from "@headlessui/vue";
 import { CheckIcon, ChevronUpDownIcon } from "@heroicons/vue/20/solid";
-import { useCommunicationStore } from "@/stores/admin/communication";
-import type { CreateCommunicationViewModel } from "@/viewmodels/admin/communication.models";
-import { useCommunicationTypeStore } from "@/stores/admin/communicationType";
-import type { CommunicationTypeViewModel } from "@/viewmodels/admin/communicationType.models";
+import { useCommunicationStore } from "@/stores/admin/club/member/communication";
+import type { CreateCommunicationViewModel } from "@/viewmodels/admin/club/member/communication.models";
+import { useCommunicationTypeStore } from "@/stores/admin/settings/communicationType";
+import type { CommunicationTypeViewModel } from "@/viewmodels/admin/settings/communicationType.models";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/club/member/MemberCommunicationDeleteModal.vue b/src/components/admin/club/member/MemberCommunicationDeleteModal.vue
index 5c0dcd1..51fc2a9 100644
--- a/src/components/admin/club/member/MemberCommunicationDeleteModal.vue
+++ b/src/components/admin/club/member/MemberCommunicationDeleteModal.vue
@@ -41,7 +41,7 @@ import { useModalStore } from "@/stores/modal";
 import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
-import { useCommunicationStore } from "@/stores/admin/communication";
+import { useCommunicationStore } from "@/stores/admin/club/member/communication";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/club/member/MemberCommunicationEditModal.vue b/src/components/admin/club/member/MemberCommunicationEditModal.vue
index 33b34d4..afe680f 100644
--- a/src/components/admin/club/member/MemberCommunicationEditModal.vue
+++ b/src/components/admin/club/member/MemberCommunicationEditModal.vue
@@ -71,12 +71,12 @@ import { useModalStore } from "@/stores/modal";
 import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
-import { useCommunicationStore } from "@/stores/admin/communication";
+import { useCommunicationStore } from "@/stores/admin/club/member/communication";
 import type {
   CreateCommunicationViewModel,
   CommunicationViewModel,
   UpdateCommunicationViewModel,
-} from "@/viewmodels/admin/communication.models";
+} from "@/viewmodels/admin/club/member/communication.models";
 import isEqual from "lodash.isequal";
 import cloneDeep from "lodash.clonedeep";
 </script>
diff --git a/src/components/admin/club/member/MemberCommunicationListItem.vue b/src/components/admin/club/member/MemberCommunicationListItem.vue
index 7e09f13..1aca640 100644
--- a/src/components/admin/club/member/MemberCommunicationListItem.vue
+++ b/src/components/admin/club/member/MemberCommunicationListItem.vue
@@ -16,7 +16,7 @@
 <script setup lang="ts">
 import { defineAsyncComponent, defineComponent, markRaw, type PropType } from "vue";
 import { mapState, mapActions } from "pinia";
-import type { CommunicationViewModel } from "@/viewmodels/admin/communication.models";
+import type { CommunicationViewModel } from "@/viewmodels/admin/club/member/communication.models";
 import { EnvelopeIcon, PencilIcon, TrashIcon, FireIcon } from "@heroicons/vue/24/outline";
 import { useModalStore } from "@/stores/modal";
 import { useAbilityStore } from "@/stores/ability";
diff --git a/src/components/admin/club/member/MemberExecutivePositionCreateModal.vue b/src/components/admin/club/member/MemberExecutivePositionCreateModal.vue
index b0a868c..5c4ef8e 100644
--- a/src/components/admin/club/member/MemberExecutivePositionCreateModal.vue
+++ b/src/components/admin/club/member/MemberExecutivePositionCreateModal.vue
@@ -99,14 +99,14 @@ import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
 import { Listbox, ListboxButton, ListboxOptions, ListboxOption, ListboxLabel } from "@headlessui/vue";
 import { CheckIcon, ChevronUpDownIcon } from "@heroicons/vue/20/solid";
-import { useMembershipStatusStore } from "@/stores/admin/membershipStatus";
-import type { MembershipStatusViewModel } from "@/viewmodels/admin/membershipStatus.models";
-import type { CreateMembershipViewModel } from "@/viewmodels/admin/membership.models";
-import { useMembershipStore } from "@/stores/admin/membership";
-import { useExecutivePositionStore } from "@/stores/admin/executivePosition";
-import type { ExecutivePositionViewModel } from "@/viewmodels/admin/executivePosition.models";
-import type { CreateMemberExecutivePositionViewModel } from "@/viewmodels/admin/memberExecutivePosition.models";
-import { useMemberExecutivePositionStore } from "@/stores/admin/memberExecutivePosition";
+import { useMembershipStatusStore } from "@/stores/admin/settings/membershipStatus";
+import type { MembershipStatusViewModel } from "@/viewmodels/admin/settings/membershipStatus.models";
+import type { CreateMembershipViewModel } from "@/viewmodels/admin/club/member/membership.models";
+import { useMembershipStore } from "@/stores/admin/club/member/membership";
+import { useExecutivePositionStore } from "@/stores/admin/settings/executivePosition";
+import type { ExecutivePositionViewModel } from "@/viewmodels/admin/settings/executivePosition.models";
+import type { CreateMemberExecutivePositionViewModel } from "@/viewmodels/admin/club/member/memberExecutivePosition.models";
+import { useMemberExecutivePositionStore } from "@/stores/admin/club/member/memberExecutivePosition";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/club/member/MemberExecutivePositionDeleteModal.vue b/src/components/admin/club/member/MemberExecutivePositionDeleteModal.vue
index 5e6b3ca..7009b6d 100644
--- a/src/components/admin/club/member/MemberExecutivePositionDeleteModal.vue
+++ b/src/components/admin/club/member/MemberExecutivePositionDeleteModal.vue
@@ -38,7 +38,7 @@ import { useModalStore } from "@/stores/modal";
 import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
-import { useMemberExecutivePositionStore } from "@/stores/admin/memberExecutivePosition";
+import { useMemberExecutivePositionStore } from "@/stores/admin/club/member/memberExecutivePosition";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/club/member/MemberExecutivePositionEditModal.vue b/src/components/admin/club/member/MemberExecutivePositionEditModal.vue
index 269472b..00f09dd 100644
--- a/src/components/admin/club/member/MemberExecutivePositionEditModal.vue
+++ b/src/components/admin/club/member/MemberExecutivePositionEditModal.vue
@@ -104,13 +104,13 @@ import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
 import { Listbox, ListboxButton, ListboxOptions, ListboxOption, ListboxLabel } from "@headlessui/vue";
 import { CheckIcon, ChevronUpDownIcon } from "@heroicons/vue/20/solid";
-import { useExecutivePositionStore } from "@/stores/admin/executivePosition";
+import { useExecutivePositionStore } from "@/stores/admin/settings/executivePosition";
 import type {
   CreateMemberExecutivePositionViewModel,
   MemberExecutivePositionViewModel,
   UpdateMemberExecutivePositionViewModel,
-} from "@/viewmodels/admin/memberExecutivePosition.models";
-import { useMemberExecutivePositionStore } from "@/stores/admin/memberExecutivePosition";
+} from "@/viewmodels/admin/club/member/memberExecutivePosition.models";
+import { useMemberExecutivePositionStore } from "@/stores/admin/club/member/memberExecutivePosition";
 import isEqual from "lodash.isequal";
 import cloneDeep from "lodash.clonedeep";
 </script>
diff --git a/src/components/admin/club/member/MemberExecutivePositionListItem.vue b/src/components/admin/club/member/MemberExecutivePositionListItem.vue
index 0cd4c30..87ba2b2 100644
--- a/src/components/admin/club/member/MemberExecutivePositionListItem.vue
+++ b/src/components/admin/club/member/MemberExecutivePositionListItem.vue
@@ -14,7 +14,7 @@
 <script setup lang="ts">
 import { defineAsyncComponent, defineComponent, markRaw, type PropType } from "vue";
 import { mapState, mapActions } from "pinia";
-import type { MemberExecutivePositionViewModel } from "@/viewmodels/admin/memberExecutivePosition.models";
+import type { MemberExecutivePositionViewModel } from "@/viewmodels/admin/club/member/memberExecutivePosition.models";
 import { PencilIcon, TrashIcon } from "@heroicons/vue/24/outline";
 import { useModalStore } from "@/stores/modal";
 import { useAbilityStore } from "@/stores/ability";
diff --git a/src/components/admin/club/member/MemberListItem.vue b/src/components/admin/club/member/MemberListItem.vue
index 24daf11..e490fea 100644
--- a/src/components/admin/club/member/MemberListItem.vue
+++ b/src/components/admin/club/member/MemberListItem.vue
@@ -1,42 +1,26 @@
 <template>
-  <div class="flex flex-col h-fit w-full border border-primary rounded-md">
-    <RouterLink
-      :to="{ name: 'admin-club-member-overview', params: { memberId: member.id } }"
+  <RouterLink 
+    :to="{ name: 'admin-club-member-overview', params: { memberId: member.id } }"
+    class="flex flex-col h-fit w-full border border-primary rounded-md"
+  >
+    <div
       class="bg-primary p-2 text-white flex flex-row justify-between items-center"
     >
       <p>{{ member.lastname }}, {{ member.firstname }} {{ member.nameaffix ? `- ${member.nameaffix}` : "" }}</p>
-      <div v-if="false" class="flex flex-row">
-        <RouterLink
-          v-if="can('read', 'club', 'member')"
-          :to="{ name: 'admin-club-member-overview', params: { memberId: member.id } }"
-        >
-          <CircleStackIcon class="w-5 h-5 p-1 box-content cursor-pointer" />
-        </RouterLink>
-        <RouterLink
-          v-if="can('update', 'club', 'member')"
-          :to="{ name: 'admin-club-member-edit', params: { id: member.id } }"
-        >
-          <PencilIcon class="w-5 h-5 p-1 box-content cursor-pointer" />
-        </RouterLink>
-        <div v-if="can('delete', 'club', 'member')" @click="openDeleteModal">
-          <TrashIcon class="w-5 h-5 p-1 box-content cursor-pointer" />
-        </div>
-      </div>
-    </RouterLink>
-    <div class="p-2">
-      <p>beigetreten: {{ member.firstMembershipEntry?.start }}</p>
-      <p v-if="member.lastMembershipEntry?.end">ausgetreten: {{ member.lastMembershipEntry?.end }}</p>
     </div>
-  </div>
+    <div class="p-2">
+      <p v-if="member.internalId">Interne ID: {{ member.internalId }}</p>
+      <p>beigetreten: {{ member.firstMembershipEntry?.start }}</p>
+      <p v-if="member.lastMembershipEntry?.end">ausgetreten: {{ member.lastMembershipEntry?.end }}, da {{member.lastMembershipEntry?.terminationReason ?? '- kein Grund angegeben'}}</p>
+    </div>
+  </RouterLink>
 </template>
 
 <script setup lang="ts">
-import { defineComponent, defineAsyncComponent, markRaw, type PropType } from "vue";
+import { defineComponent, type PropType } from "vue";
 import { mapState, mapActions } from "pinia";
-import { PencilIcon, TrashIcon, CircleStackIcon } from "@heroicons/vue/24/outline";
 import { useAbilityStore } from "@/stores/ability";
-import { useModalStore } from "@/stores/modal";
-import type { MemberViewModel } from "@/viewmodels/admin/member.models";
+import type { MemberViewModel } from "@/viewmodels/admin/club/member/member.models";
 </script>
 
 <script lang="ts">
@@ -47,14 +31,5 @@ export default defineComponent({
   computed: {
     ...mapState(useAbilityStore, ["can"]),
   },
-  methods: {
-    ...mapActions(useModalStore, ["openModal"]),
-    openDeleteModal() {
-      // this.openModal(
-      //   markRaw(defineAsyncComponent(() => import("@/components/admin/.vue"))),
-      //   this.member.id
-      // );
-    },
-  },
 });
 </script>
diff --git a/src/components/admin/club/member/MemberQualificationCreateModal.vue b/src/components/admin/club/member/MemberQualificationCreateModal.vue
index f814539..86690ff 100644
--- a/src/components/admin/club/member/MemberQualificationCreateModal.vue
+++ b/src/components/admin/club/member/MemberQualificationCreateModal.vue
@@ -106,14 +106,14 @@ import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
 import { Listbox, ListboxButton, ListboxOptions, ListboxOption, ListboxLabel } from "@headlessui/vue";
 import { CheckIcon, ChevronUpDownIcon } from "@heroicons/vue/20/solid";
-import { useMembershipStatusStore } from "@/stores/admin/membershipStatus";
-import type { MembershipStatusViewModel } from "@/viewmodels/admin/membershipStatus.models";
-import type { CreateMembershipViewModel } from "@/viewmodels/admin/membership.models";
-import { useMembershipStore } from "@/stores/admin/membership";
-import { useQualificationStore } from "@/stores/admin/qualification";
-import type { QualificationViewModel } from "@/viewmodels/admin/qualification.models";
-import type { CreateMemberQualificationViewModel } from "@/viewmodels/admin/memberQualification.models";
-import { useMemberQualificationStore } from "@/stores/admin/memberQualification";
+import { useMembershipStatusStore } from "@/stores/admin/settings/membershipStatus";
+import type { MembershipStatusViewModel } from "@/viewmodels/admin/settings/membershipStatus.models";
+import type { CreateMembershipViewModel } from "@/viewmodels/admin/club/member/membership.models";
+import { useMembershipStore } from "@/stores/admin/club/member/membership";
+import { useQualificationStore } from "@/stores/admin/settings/qualification";
+import type { QualificationViewModel } from "@/viewmodels/admin/settings/qualification.models";
+import type { CreateMemberQualificationViewModel } from "@/viewmodels/admin/club/member/memberQualification.models";
+import { useMemberQualificationStore } from "@/stores/admin/club/member/memberQualification";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/club/member/MemberQualificationDeleteModal.vue b/src/components/admin/club/member/MemberQualificationDeleteModal.vue
index d9fd39b..fa3f694 100644
--- a/src/components/admin/club/member/MemberQualificationDeleteModal.vue
+++ b/src/components/admin/club/member/MemberQualificationDeleteModal.vue
@@ -41,8 +41,8 @@ import { useModalStore } from "@/stores/modal";
 import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
-import { useQualificationStore } from "@/stores/admin/qualification";
-import { useMemberQualificationStore } from "@/stores/admin/memberQualification";
+import { useQualificationStore } from "@/stores/admin/settings/qualification";
+import { useMemberQualificationStore } from "@/stores/admin/club/member/memberQualification";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/club/member/MemberQualificationEditModal.vue b/src/components/admin/club/member/MemberQualificationEditModal.vue
index 3eef402..db203c7 100644
--- a/src/components/admin/club/member/MemberQualificationEditModal.vue
+++ b/src/components/admin/club/member/MemberQualificationEditModal.vue
@@ -105,13 +105,13 @@ import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
 import { Listbox, ListboxButton, ListboxOptions, ListboxOption, ListboxLabel } from "@headlessui/vue";
 import { CheckIcon, ChevronUpDownIcon } from "@heroicons/vue/20/solid";
-import { useQualificationStore } from "@/stores/admin/qualification";
+import { useQualificationStore } from "@/stores/admin/settings/qualification";
 import type {
   CreateMemberQualificationViewModel,
   MemberQualificationViewModel,
   UpdateMemberQualificationViewModel,
-} from "@/viewmodels/admin/memberQualification.models";
-import { useMemberQualificationStore } from "@/stores/admin/memberQualification";
+} from "@/viewmodels/admin/club/member/memberQualification.models";
+import { useMemberQualificationStore } from "@/stores/admin/club/member/memberQualification";
 import isEqual from "lodash.isequal";
 import cloneDeep from "lodash.clonedeep";
 </script>
diff --git a/src/components/admin/club/member/MemberQualificationListItem.vue b/src/components/admin/club/member/MemberQualificationListItem.vue
index 4c8625b..8fd6b98 100644
--- a/src/components/admin/club/member/MemberQualificationListItem.vue
+++ b/src/components/admin/club/member/MemberQualificationListItem.vue
@@ -17,7 +17,7 @@
 <script setup lang="ts">
 import { defineAsyncComponent, defineComponent, markRaw, type PropType } from "vue";
 import { mapState, mapActions } from "pinia";
-import type { MemberQualificationViewModel } from "@/viewmodels/admin/memberQualification.models";
+import type { MemberQualificationViewModel } from "@/viewmodels/admin/club/member/memberQualification.models";
 import { PencilIcon, TrashIcon } from "@heroicons/vue/24/outline";
 import { useModalStore } from "@/stores/modal";
 import { useAbilityStore } from "@/stores/ability";
diff --git a/src/components/admin/club/member/MembershipCreateModal.vue b/src/components/admin/club/member/MembershipCreateModal.vue
index 433392f..0bda496 100644
--- a/src/components/admin/club/member/MembershipCreateModal.vue
+++ b/src/components/admin/club/member/MembershipCreateModal.vue
@@ -63,10 +63,6 @@
           </div>
         </Listbox>
       </div>
-      <div>
-        <label for="internalId">Interne ID (optional)</label>
-        <input type="text" id="internalId" />
-      </div>
       <div>
         <label for="start">Startdatum</label>
         <input type="date" id="start" required />
@@ -98,10 +94,10 @@ import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
 import { Listbox, ListboxButton, ListboxOptions, ListboxOption, ListboxLabel } from "@headlessui/vue";
 import { CheckIcon, ChevronUpDownIcon } from "@heroicons/vue/20/solid";
-import { useMembershipStatusStore } from "@/stores/admin/membershipStatus";
-import type { MembershipStatusViewModel } from "@/viewmodels/admin/membershipStatus.models";
-import type { CreateMembershipViewModel } from "@/viewmodels/admin/membership.models";
-import { useMembershipStore } from "@/stores/admin/membership";
+import { useMembershipStatusStore } from "@/stores/admin/settings/membershipStatus";
+import type { MembershipStatusViewModel } from "@/viewmodels/admin/settings/membershipStatus.models";
+import type { CreateMembershipViewModel } from "@/viewmodels/admin/club/member/membership.models";
+import { useMembershipStore } from "@/stores/admin/club/member/membership";
 </script>
 
 <script lang="ts">
@@ -132,7 +128,6 @@ export default defineComponent({
       if (this.selectedStatus == undefined) return;
       let formData = e.target.elements;
       let createMember: CreateMembershipViewModel = {
-        internalId: formData.internalId.value,
         start: formData.start.value,
         statusId: this.selectedStatus.id,
       };
diff --git a/src/components/admin/club/member/MembershipDeleteModal.vue b/src/components/admin/club/member/MembershipDeleteModal.vue
index d66e95c..a9fdf0d 100644
--- a/src/components/admin/club/member/MembershipDeleteModal.vue
+++ b/src/components/admin/club/member/MembershipDeleteModal.vue
@@ -40,7 +40,7 @@ import { useModalStore } from "@/stores/modal";
 import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
-import { useMembershipStore } from "@/stores/admin/membership";
+import { useMembershipStore } from "@/stores/admin/club/member/membership";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/club/member/MembershipEditModal.vue b/src/components/admin/club/member/MembershipEditModal.vue
index 4d621ae..7d93b43 100644
--- a/src/components/admin/club/member/MembershipEditModal.vue
+++ b/src/components/admin/club/member/MembershipEditModal.vue
@@ -63,10 +63,6 @@
           </div>
         </Listbox>
       </div>
-      <div>
-        <label for="internalId">Interne ID (optional)</label>
-        <input type="text" id="internalId" v-model="membership.internalId" />
-      </div>
       <div>
         <label for="start">Startdatum</label>
         <input type="date" id="start" required v-model="membership.start" />
@@ -105,13 +101,13 @@ import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
 import { Listbox, ListboxButton, ListboxOptions, ListboxOption, ListboxLabel } from "@headlessui/vue";
 import { CheckIcon, ChevronUpDownIcon } from "@heroicons/vue/20/solid";
-import { useMembershipStatusStore } from "@/stores/admin/membershipStatus";
+import { useMembershipStatusStore } from "@/stores/admin/settings/membershipStatus";
 import type {
   CreateMembershipViewModel,
   MembershipViewModel,
   UpdateMembershipViewModel,
-} from "@/viewmodels/admin/membership.models";
-import { useMembershipStore } from "@/stores/admin/membership";
+} from "@/viewmodels/admin/club/member/membership.models";
+import { useMembershipStore } from "@/stores/admin/club/member/membership";
 import isEqual from "lodash.isequal";
 import cloneDeep from "lodash.clonedeep";
 </script>
@@ -169,7 +165,6 @@ export default defineComponent({
       let formData = e.target.elements;
       let updateMembership: UpdateMembershipViewModel = {
         id: this.membership.id,
-        internalId: formData.internalId.value,
         start: formData.start.value,
         end: formData.end.value,
         terminationReason: formData.terminationReason.value,
diff --git a/src/components/admin/club/member/MembershipListItem.vue b/src/components/admin/club/member/MembershipListItem.vue
index a7dab8c..3a674f0 100644
--- a/src/components/admin/club/member/MembershipListItem.vue
+++ b/src/components/admin/club/member/MembershipListItem.vue
@@ -8,9 +8,8 @@
       <PencilIcon v-if="can('update', 'club', 'member')" class="w-5 h-5 cursor-pointer" @click="openEditModal" />
       <TrashIcon v-if="can('delete', 'club', 'member')" class="w-5 h-5 cursor-pointer" @click="openDeleteModal" />
     </div>
-    <div v-if="membership.terminationReason || membership.internalId" class="p-2">
-      <p v-if="membership.internalId">Interne ID: {{ membership.internalId }}</p>
-      <p v-if="membership.terminationReason">beendet, weil: {{ membership.terminationReason }}</p>
+    <div v-if="membership.terminationReason" class="p-2">
+      <p v-if="membership.terminationReason">Grund: {{ membership.terminationReason }}</p>
     </div>
   </div>
 </template>
@@ -18,7 +17,7 @@
 <script setup lang="ts">
 import { defineAsyncComponent, defineComponent, markRaw, type PropType } from "vue";
 import { mapState, mapActions } from "pinia";
-import type { MembershipViewModel } from "@/viewmodels/admin/membership.models";
+import type { MembershipViewModel } from "@/viewmodels/admin/club/member/membership.models";
 import { PencilIcon, TrashIcon } from "@heroicons/vue/24/outline";
 import { useModalStore } from "@/stores/modal";
 import { useAbilityStore } from "@/stores/ability";
diff --git a/src/components/admin/club/newsletter/CreateNewsletterModal.vue b/src/components/admin/club/newsletter/CreateNewsletterModal.vue
index 301b436..8948a70 100644
--- a/src/components/admin/club/newsletter/CreateNewsletterModal.vue
+++ b/src/components/admin/club/newsletter/CreateNewsletterModal.vue
@@ -34,10 +34,10 @@ import { useModalStore } from "@/stores/modal";
 import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
-import { useProtocolStore } from "@/stores/admin/protocol";
-import type { CreateProtocolViewModel } from "@/viewmodels/admin/protocol.models";
-import { useNewsletterStore } from "../../../../stores/admin/newsletter";
-import type { CreateNewsletterViewModel } from "../../../../viewmodels/admin/newsletter.models";
+import { useProtocolStore } from "@/stores/admin/club/protocol/protocol";
+import type { CreateProtocolViewModel } from "@/viewmodels/admin/club/protocol/protocol.models";
+import { useNewsletterStore } from "../../../../stores/admin/club/newsletter/newsletter";
+import type { CreateNewsletterViewModel } from "../../../../viewmodels/admin/club/newsletter/newsletter.models";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/club/newsletter/CurrentlySyncingModal.vue b/src/components/admin/club/newsletter/CurrentlySyncingModal.vue
index 5d14c37..4a8f0e8 100644
--- a/src/components/admin/club/newsletter/CurrentlySyncingModal.vue
+++ b/src/components/admin/club/newsletter/CurrentlySyncingModal.vue
@@ -17,8 +17,8 @@ import { useModalStore } from "@/stores/modal";
 import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
-import { useProtocolStore } from "@/stores/admin/protocol";
-import type { CreateProtocolViewModel } from "@/viewmodels/admin/protocol.models";
+import { useProtocolStore } from "@/stores/admin/club/protocol/protocol";
+import type { CreateProtocolViewModel } from "@/viewmodels/admin/club/protocol/protocol.models";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/club/newsletter/NewsletterListItem.vue b/src/components/admin/club/newsletter/NewsletterListItem.vue
index bbc488a..04a334f 100644
--- a/src/components/admin/club/newsletter/NewsletterListItem.vue
+++ b/src/components/admin/club/newsletter/NewsletterListItem.vue
@@ -16,7 +16,7 @@
 <script setup lang="ts">
 import { defineComponent, type PropType } from "vue";
 import { mapState, mapActions } from "pinia";
-import type { NewsletterViewModel } from "@/viewmodels/admin/newsletter.models";
+import type { NewsletterViewModel } from "@/viewmodels/admin/club/newsletter/newsletter.models";
 import { PaperAirplaneIcon } from "@heroicons/vue/24/outline";
 </script>
 
diff --git a/src/components/admin/club/newsletter/NewsletterPreviewModal.vue b/src/components/admin/club/newsletter/NewsletterPreviewModal.vue
index eac4d6d..c5b3b4a 100644
--- a/src/components/admin/club/newsletter/NewsletterPreviewModal.vue
+++ b/src/components/admin/club/newsletter/NewsletterPreviewModal.vue
@@ -15,7 +15,7 @@ import { mapState, mapActions } from "pinia";
 import { useModalStore } from "@/stores/modal";
 import Spinner from "@/components/Spinner.vue";
 import type { AxiosResponse } from "axios";
-import { useNewsletterPrintoutStore } from "@/stores/admin/newsletterPrintout";
+import { useNewsletterPrintoutStore } from "@/stores/admin/club/newsletter/newsletterPrintout";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/club/newsletter/NewsletterSyncing.vue b/src/components/admin/club/newsletter/NewsletterSyncing.vue
index 1e60b0f..384b6ef 100644
--- a/src/components/admin/club/newsletter/NewsletterSyncing.vue
+++ b/src/components/admin/club/newsletter/NewsletterSyncing.vue
@@ -16,10 +16,10 @@
 <script setup lang="ts">
 import { defineComponent } from "vue";
 import { mapState, mapActions } from "pinia";
-import { useNewsletterStore } from "@/stores/admin/newsletter";
+import { useNewsletterStore } from "@/stores/admin/club/newsletter/newsletter";
 import { ArrowPathIcon, CloudArrowUpIcon, CloudIcon, ExclamationTriangleIcon } from "@heroicons/vue/24/outline";
-import { useNewsletterDatesStore } from "@/stores/admin/newsletterDates";
-import { useNewsletterRecipientsStore } from "@/stores/admin/newsletterRecipients";
+import { useNewsletterDatesStore } from "@/stores/admin/club/newsletter/newsletterDates";
+import { useNewsletterRecipientsStore } from "@/stores/admin/club/newsletter/newsletterRecipients";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/club/protocol/CreateProtocolModal.vue b/src/components/admin/club/protocol/CreateProtocolModal.vue
index 704af64..f49a50f 100644
--- a/src/components/admin/club/protocol/CreateProtocolModal.vue
+++ b/src/components/admin/club/protocol/CreateProtocolModal.vue
@@ -38,8 +38,8 @@ import { useModalStore } from "@/stores/modal";
 import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
-import { useProtocolStore } from "@/stores/admin/protocol";
-import type { CreateProtocolViewModel } from "@/viewmodels/admin/protocol.models";
+import { useProtocolStore } from "@/stores/admin/club/protocol/protocol";
+import type { CreateProtocolViewModel } from "@/viewmodels/admin/club/protocol/protocol.models";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/club/protocol/CurrentlySyncingModal.vue b/src/components/admin/club/protocol/CurrentlySyncingModal.vue
index 5bd8f47..f261b28 100644
--- a/src/components/admin/club/protocol/CurrentlySyncingModal.vue
+++ b/src/components/admin/club/protocol/CurrentlySyncingModal.vue
@@ -17,8 +17,8 @@ import { useModalStore } from "@/stores/modal";
 import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
-import { useProtocolStore } from "@/stores/admin/protocol";
-import type { CreateProtocolViewModel } from "@/viewmodels/admin/protocol.models";
+import { useProtocolStore } from "@/stores/admin/club/protocol/protocol";
+import type { CreateProtocolViewModel } from "@/viewmodels/admin/club/protocol/protocol.models";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/club/protocol/ProtocolListItem.vue b/src/components/admin/club/protocol/ProtocolListItem.vue
index 168477e..d2775f2 100644
--- a/src/components/admin/club/protocol/ProtocolListItem.vue
+++ b/src/components/admin/club/protocol/ProtocolListItem.vue
@@ -15,7 +15,7 @@
 <script setup lang="ts">
 import { defineComponent, type PropType } from "vue";
 import { mapState, mapActions } from "pinia";
-import type { ProtocolViewModel } from "@/viewmodels/admin/protocol.models";
+import type { ProtocolViewModel } from "@/viewmodels/admin/club/protocol/protocol.models";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/club/protocol/ProtocolPrintoutViewerModal.vue b/src/components/admin/club/protocol/ProtocolPrintoutViewerModal.vue
index 1c848ff..7fca129 100644
--- a/src/components/admin/club/protocol/ProtocolPrintoutViewerModal.vue
+++ b/src/components/admin/club/protocol/ProtocolPrintoutViewerModal.vue
@@ -13,7 +13,7 @@ import { defineComponent } from "vue";
 import { mapState, mapActions } from "pinia";
 import { useModalStore } from "@/stores/modal";
 import Spinner from "@/components/Spinner.vue";
-import { useProtocolPrintoutStore } from "@/stores/admin/protocolPrintout";
+import { useProtocolPrintoutStore } from "@/stores/admin/club/protocol/protocolPrintout";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/club/protocol/ProtocolSyncing.vue b/src/components/admin/club/protocol/ProtocolSyncing.vue
index eb2c25b..b1f4308 100644
--- a/src/components/admin/club/protocol/ProtocolSyncing.vue
+++ b/src/components/admin/club/protocol/ProtocolSyncing.vue
@@ -16,12 +16,12 @@
 <script setup lang="ts">
 import { defineComponent } from "vue";
 import { mapState, mapActions } from "pinia";
-import { useProtocolStore } from "@/stores/admin/protocol";
+import { useProtocolStore } from "@/stores/admin/club/protocol/protocol";
 import { ArrowPathIcon, CloudArrowUpIcon, CloudIcon, ExclamationTriangleIcon } from "@heroicons/vue/24/outline";
-import { useProtocolAgendaStore } from "@/stores/admin/protocolAgenda";
-import { useProtocolPresenceStore } from "@/stores/admin/protocolPresence";
-import { useProtocolDecisionStore } from "@/stores/admin/protocolDecision";
-import { useProtocolVotingStore } from "@/stores/admin/protocolVoting";
+import { useProtocolAgendaStore } from "@/stores/admin/club/protocol/protocolAgenda";
+import { useProtocolPresenceStore } from "@/stores/admin/club/protocol/protocolPresence";
+import { useProtocolDecisionStore } from "@/stores/admin/club/protocol/protocolDecision";
+import { useProtocolVotingStore } from "@/stores/admin/club/protocol/protocolVoting";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/settings/award/AwardListItem.vue b/src/components/admin/settings/award/AwardListItem.vue
index 2d0ee58..67fc63a 100644
--- a/src/components/admin/settings/award/AwardListItem.vue
+++ b/src/components/admin/settings/award/AwardListItem.vue
@@ -23,7 +23,7 @@ import { mapState, mapActions } from "pinia";
 import { PencilIcon, TrashIcon } from "@heroicons/vue/24/outline";
 import { useAbilityStore } from "@/stores/ability";
 import { useModalStore } from "@/stores/modal";
-import type { AwardViewModel } from "@/viewmodels/admin/award.models";
+import type { AwardViewModel } from "@/viewmodels/admin/settings/award.models";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/settings/award/CreateAwardModal.vue b/src/components/admin/settings/award/CreateAwardModal.vue
index 5da402a..6daeff0 100644
--- a/src/components/admin/settings/award/CreateAwardModal.vue
+++ b/src/components/admin/settings/award/CreateAwardModal.vue
@@ -32,8 +32,8 @@ import { useModalStore } from "@/stores/modal";
 import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
-import { useAwardStore } from "@/stores/admin/award";
-import type { CreateAwardViewModel } from "@/viewmodels/admin/award.models";
+import { useAwardStore } from "@/stores/admin/settings/award";
+import type { CreateAwardViewModel } from "@/viewmodels/admin/settings/award.models";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/settings/award/DeleteAwardModal.vue b/src/components/admin/settings/award/DeleteAwardModal.vue
index 5f3b7cd..c3a1e6a 100644
--- a/src/components/admin/settings/award/DeleteAwardModal.vue
+++ b/src/components/admin/settings/award/DeleteAwardModal.vue
@@ -29,8 +29,8 @@ import { useModalStore } from "@/stores/modal";
 import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
-import { useRoleStore } from "@/stores/admin/role";
-import { useAwardStore } from "@/stores/admin/award";
+import { useRoleStore } from "@/stores/admin/user/role";
+import { useAwardStore } from "@/stores/admin/settings/award";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/settings/calendarType/CalendarTypeListItem.vue b/src/components/admin/settings/calendarType/CalendarTypeListItem.vue
index f80cbc7..6201d30 100644
--- a/src/components/admin/settings/calendarType/CalendarTypeListItem.vue
+++ b/src/components/admin/settings/calendarType/CalendarTypeListItem.vue
@@ -30,7 +30,7 @@ import { mapState, mapActions } from "pinia";
 import { PencilIcon, TrashIcon, EyeIcon } from "@heroicons/vue/24/outline";
 import { useAbilityStore } from "@/stores/ability";
 import { useModalStore } from "@/stores/modal";
-import type { CalendarTypeViewModel } from "@/viewmodels/admin/calendarType.models";
+import type { CalendarTypeViewModel } from "@/viewmodels/admin/settings/calendarType.models";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/settings/calendarType/CreateCalendarTypeModal.vue b/src/components/admin/settings/calendarType/CreateCalendarTypeModal.vue
index 909075f..b35a897 100644
--- a/src/components/admin/settings/calendarType/CreateCalendarTypeModal.vue
+++ b/src/components/admin/settings/calendarType/CreateCalendarTypeModal.vue
@@ -51,8 +51,8 @@ import { useModalStore } from "@/stores/modal";
 import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
-import { useCalendarTypeStore } from "@/stores/admin/calendarType";
-import type { CreateCalendarTypeViewModel } from "@/viewmodels/admin/calendarType.models";
+import { useCalendarTypeStore } from "@/stores/admin/settings/calendarType";
+import type { CreateCalendarTypeViewModel } from "@/viewmodels/admin/settings/calendarType.models";
 import { Listbox, ListboxButton, ListboxOptions, ListboxOption, ListboxLabel } from "@headlessui/vue";
 import { CheckIcon, ChevronUpDownIcon } from "@heroicons/vue/20/solid";
 </script>
diff --git a/src/components/admin/settings/calendarType/DeleteCalendarTypeModal.vue b/src/components/admin/settings/calendarType/DeleteCalendarTypeModal.vue
index e974962..46642ec 100644
--- a/src/components/admin/settings/calendarType/DeleteCalendarTypeModal.vue
+++ b/src/components/admin/settings/calendarType/DeleteCalendarTypeModal.vue
@@ -29,7 +29,7 @@ import { useModalStore } from "@/stores/modal";
 import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
-import { useCalendarTypeStore } from "@/stores/admin/calendarType";
+import { useCalendarTypeStore } from "@/stores/admin/settings/calendarType";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/settings/communicationType/CommunicationTypeListItem.vue b/src/components/admin/settings/communicationType/CommunicationTypeListItem.vue
index 7b60ae0..a55a77e 100644
--- a/src/components/admin/settings/communicationType/CommunicationTypeListItem.vue
+++ b/src/components/admin/settings/communicationType/CommunicationTypeListItem.vue
@@ -33,7 +33,7 @@ import { mapState, mapActions } from "pinia";
 import { PencilIcon, TrashIcon } from "@heroicons/vue/24/outline";
 import { useAbilityStore } from "@/stores/ability";
 import { useModalStore } from "@/stores/modal";
-import type { CommunicationTypeViewModel } from "@/viewmodels/admin/communicationType.models";
+import type { CommunicationTypeViewModel } from "@/viewmodels/admin/settings/communicationType.models";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/settings/communicationType/CreateCommunicationTypeModal.vue b/src/components/admin/settings/communicationType/CreateCommunicationTypeModal.vue
index b6a33a1..c9cf750 100644
--- a/src/components/admin/settings/communicationType/CreateCommunicationTypeModal.vue
+++ b/src/components/admin/settings/communicationType/CreateCommunicationTypeModal.vue
@@ -78,8 +78,8 @@ import { useModalStore } from "@/stores/modal";
 import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
-import { useCommunicationTypeStore } from "@/stores/admin/communicationType";
-import type { CreateCommunicationTypeViewModel } from "@/viewmodels/admin/communicationType.models";
+import { useCommunicationTypeStore } from "@/stores/admin/settings/communicationType";
+import type { CreateCommunicationTypeViewModel } from "@/viewmodels/admin/settings/communicationType.models";
 import { Listbox, ListboxButton, ListboxOptions, ListboxOption, ListboxLabel } from "@headlessui/vue";
 import { CheckIcon, ChevronUpDownIcon } from "@heroicons/vue/20/solid";
 import type { CommunicationFieldType } from "@/types/fieldTypes";
diff --git a/src/components/admin/settings/communicationType/DeleteCommunicationTypeModal.vue b/src/components/admin/settings/communicationType/DeleteCommunicationTypeModal.vue
index d371e5e..f9a18a3 100644
--- a/src/components/admin/settings/communicationType/DeleteCommunicationTypeModal.vue
+++ b/src/components/admin/settings/communicationType/DeleteCommunicationTypeModal.vue
@@ -29,7 +29,7 @@ import { useModalStore } from "@/stores/modal";
 import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
-import { useCommunicationTypeStore } from "@/stores/admin/communicationType";
+import { useCommunicationTypeStore } from "@/stores/admin/settings/communicationType";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/settings/executivePosition/CreateExecutivePositionModal.vue b/src/components/admin/settings/executivePosition/CreateExecutivePositionModal.vue
index 9c4bf5c..c01cc47 100644
--- a/src/components/admin/settings/executivePosition/CreateExecutivePositionModal.vue
+++ b/src/components/admin/settings/executivePosition/CreateExecutivePositionModal.vue
@@ -32,8 +32,8 @@ import { useModalStore } from "@/stores/modal";
 import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
-import { useExecutivePositionStore } from "@/stores/admin/executivePosition";
-import type { CreateExecutivePositionViewModel } from "@/viewmodels/admin/executivePosition.models";
+import { useExecutivePositionStore } from "@/stores/admin/settings/executivePosition";
+import type { CreateExecutivePositionViewModel } from "@/viewmodels/admin/settings/executivePosition.models";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/settings/executivePosition/DeleteExecutivePositionModal.vue b/src/components/admin/settings/executivePosition/DeleteExecutivePositionModal.vue
index ce4344b..399bdcd 100644
--- a/src/components/admin/settings/executivePosition/DeleteExecutivePositionModal.vue
+++ b/src/components/admin/settings/executivePosition/DeleteExecutivePositionModal.vue
@@ -29,8 +29,8 @@ import { useModalStore } from "@/stores/modal";
 import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
-import { useRoleStore } from "@/stores/admin/role";
-import { useExecutivePositionStore } from "@/stores/admin/executivePosition";
+import { useRoleStore } from "@/stores/admin/user/role";
+import { useExecutivePositionStore } from "@/stores/admin/settings/executivePosition";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/settings/executivePosition/ExecutivePositionListItem.vue b/src/components/admin/settings/executivePosition/ExecutivePositionListItem.vue
index 14185d2..4babe24 100644
--- a/src/components/admin/settings/executivePosition/ExecutivePositionListItem.vue
+++ b/src/components/admin/settings/executivePosition/ExecutivePositionListItem.vue
@@ -23,7 +23,7 @@ import { mapState, mapActions } from "pinia";
 import { PencilIcon, TrashIcon } from "@heroicons/vue/24/outline";
 import { useAbilityStore } from "@/stores/ability";
 import { useModalStore } from "@/stores/modal";
-import type { ExecutivePositionViewModel } from "@/viewmodels/admin/executivePosition.models";
+import type { ExecutivePositionViewModel } from "@/viewmodels/admin/settings/executivePosition.models";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/settings/membershipStatus/CreateMembershipStatusModal.vue b/src/components/admin/settings/membershipStatus/CreateMembershipStatusModal.vue
index d0d3eb2..8bbe3af 100644
--- a/src/components/admin/settings/membershipStatus/CreateMembershipStatusModal.vue
+++ b/src/components/admin/settings/membershipStatus/CreateMembershipStatusModal.vue
@@ -32,8 +32,8 @@ import { useModalStore } from "@/stores/modal";
 import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
-import { useMembershipStatusStore } from "@/stores/admin/membershipStatus";
-import type { CreateMembershipStatusViewModel } from "@/viewmodels/admin/membershipStatus.models";
+import { useMembershipStatusStore } from "@/stores/admin/settings/membershipStatus";
+import type { CreateMembershipStatusViewModel } from "@/viewmodels/admin/settings/membershipStatus.models";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/settings/membershipStatus/DeleteMembershipStatusModal.vue b/src/components/admin/settings/membershipStatus/DeleteMembershipStatusModal.vue
index ad2d851..081727a 100644
--- a/src/components/admin/settings/membershipStatus/DeleteMembershipStatusModal.vue
+++ b/src/components/admin/settings/membershipStatus/DeleteMembershipStatusModal.vue
@@ -29,8 +29,8 @@ import { useModalStore } from "@/stores/modal";
 import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
-import { useRoleStore } from "@/stores/admin/role";
-import { useMembershipStatusStore } from "@/stores/admin/membershipStatus";
+import { useRoleStore } from "@/stores/admin/user/role";
+import { useMembershipStatusStore } from "@/stores/admin/settings/membershipStatus";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/settings/membershipStatus/MembershipStatusListItem.vue b/src/components/admin/settings/membershipStatus/MembershipStatusListItem.vue
index 801af12..3b9d5fa 100644
--- a/src/components/admin/settings/membershipStatus/MembershipStatusListItem.vue
+++ b/src/components/admin/settings/membershipStatus/MembershipStatusListItem.vue
@@ -23,7 +23,7 @@ import { mapState, mapActions } from "pinia";
 import { PencilIcon, TrashIcon } from "@heroicons/vue/24/outline";
 import { useAbilityStore } from "@/stores/ability";
 import { useModalStore } from "@/stores/modal";
-import type { MembershipStatusViewModel } from "@/viewmodels/admin/membershipStatus.models";
+import type { MembershipStatusViewModel } from "@/viewmodels/admin/settings/membershipStatus.models";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/settings/newsletterConfig/NewsletterConfigListItem.vue b/src/components/admin/settings/newsletterConfig/NewsletterConfigListItem.vue
index a8f8668..90f803a 100644
--- a/src/components/admin/settings/newsletterConfig/NewsletterConfigListItem.vue
+++ b/src/components/admin/settings/newsletterConfig/NewsletterConfigListItem.vue
@@ -29,14 +29,14 @@
 import { defineComponent, type PropType } from "vue";
 import { mapState, mapActions } from "pinia";
 import { ArchiveBoxArrowDownIcon, ArchiveBoxXMarkIcon } from "@heroicons/vue/24/outline";
-import { useNewsletterConfigStore } from "@/stores/admin/newsletterConfig";
+import { useNewsletterConfigStore } from "@/stores/admin/settings/newsletterConfig";
 import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
 import { useModalStore } from "@/stores/modal";
 import { NewsletterConfigType } from "@/enums/newsletterConfigType";
 import type { AxiosResponse } from "axios";
-import type { CommunicationTypeViewModel } from "@/viewmodels/admin/communicationType.models";
+import type { CommunicationTypeViewModel } from "@/viewmodels/admin/settings/communicationType.models";
 import { useAbilityStore } from "@/stores/ability";
 </script>
 
diff --git a/src/components/admin/settings/qualification/CreateQualificationModal.vue b/src/components/admin/settings/qualification/CreateQualificationModal.vue
index 691bbd1..a70a710 100644
--- a/src/components/admin/settings/qualification/CreateQualificationModal.vue
+++ b/src/components/admin/settings/qualification/CreateQualificationModal.vue
@@ -36,8 +36,8 @@ import { useModalStore } from "@/stores/modal";
 import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
-import { useQualificationStore } from "@/stores/admin/qualification";
-import type { CreateQualificationViewModel } from "@/viewmodels/admin/qualification.models";
+import { useQualificationStore } from "@/stores/admin/settings/qualification";
+import type { CreateQualificationViewModel } from "@/viewmodels/admin/settings/qualification.models";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/settings/qualification/DeleteQualificationModal.vue b/src/components/admin/settings/qualification/DeleteQualificationModal.vue
index 431de33..ffdb77b 100644
--- a/src/components/admin/settings/qualification/DeleteQualificationModal.vue
+++ b/src/components/admin/settings/qualification/DeleteQualificationModal.vue
@@ -29,8 +29,8 @@ import { useModalStore } from "@/stores/modal";
 import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
-import { useRoleStore } from "@/stores/admin/role";
-import { useQualificationStore } from "@/stores/admin/qualification";
+import { useRoleStore } from "@/stores/admin/user/role";
+import { useQualificationStore } from "@/stores/admin/settings/qualification";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/settings/qualification/QualificationListItem.vue b/src/components/admin/settings/qualification/QualificationListItem.vue
index e35d4eb..979593c 100644
--- a/src/components/admin/settings/qualification/QualificationListItem.vue
+++ b/src/components/admin/settings/qualification/QualificationListItem.vue
@@ -29,7 +29,7 @@ import { mapState, mapActions } from "pinia";
 import { PencilIcon, TrashIcon } from "@heroicons/vue/24/outline";
 import { useAbilityStore } from "@/stores/ability";
 import { useModalStore } from "@/stores/modal";
-import type { QualificationViewModel } from "@/viewmodels/admin/qualification.models";
+import type { QualificationViewModel } from "@/viewmodels/admin/settings/qualification.models";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/settings/queryStore/CreateQueryStoreModal.vue b/src/components/admin/settings/queryStore/CreateQueryStoreModal.vue
index 158a948..485381a 100644
--- a/src/components/admin/settings/queryStore/CreateQueryStoreModal.vue
+++ b/src/components/admin/settings/queryStore/CreateQueryStoreModal.vue
@@ -32,9 +32,9 @@ import { useModalStore } from "@/stores/modal";
 import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
-import { useQueryStoreStore } from "@/stores/admin/queryStore";
-import type { CreateQueryViewModel } from "@/viewmodels/admin/query.models";
-import { useQueryBuilderStore } from "@/stores/admin/queryBuilder";
+import { useQueryStoreStore } from "@/stores/admin/settings/queryStore";
+import type { CreateQueryViewModel } from "@/viewmodels/admin/settings/query.models";
+import { useQueryBuilderStore } from "@/stores/admin/club/queryBuilder";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/settings/queryStore/DeleteQueryStoreModal.vue b/src/components/admin/settings/queryStore/DeleteQueryStoreModal.vue
index feff89b..eb50139 100644
--- a/src/components/admin/settings/queryStore/DeleteQueryStoreModal.vue
+++ b/src/components/admin/settings/queryStore/DeleteQueryStoreModal.vue
@@ -29,7 +29,7 @@ import { useModalStore } from "@/stores/modal";
 import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
-import { useQueryStoreStore } from "@/stores/admin/queryStore";
+import { useQueryStoreStore } from "@/stores/admin/settings/queryStore";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/settings/queryStore/QueryStoreListItem.vue b/src/components/admin/settings/queryStore/QueryStoreListItem.vue
index 9c4ddb4..4ed4be5 100644
--- a/src/components/admin/settings/queryStore/QueryStoreListItem.vue
+++ b/src/components/admin/settings/queryStore/QueryStoreListItem.vue
@@ -23,8 +23,8 @@ import { mapState, mapActions, mapWritableState } from "pinia";
 import { EyeIcon, PencilIcon, TrashIcon } from "@heroicons/vue/24/outline";
 import { useAbilityStore } from "@/stores/ability";
 import { useModalStore } from "@/stores/modal";
-import type { QueryViewModel } from "@/viewmodels/admin/query.models";
-import { useQueryBuilderStore } from "@/stores/admin/queryBuilder";
+import type { QueryViewModel } from "@/viewmodels/admin/settings/query.models";
+import { useQueryBuilderStore } from "@/stores/admin/club/queryBuilder";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/settings/queryStore/UpdateQueryStoreModal.vue b/src/components/admin/settings/queryStore/UpdateQueryStoreModal.vue
index bc30f32..a60b8b7 100644
--- a/src/components/admin/settings/queryStore/UpdateQueryStoreModal.vue
+++ b/src/components/admin/settings/queryStore/UpdateQueryStoreModal.vue
@@ -34,9 +34,9 @@ import { useModalStore } from "@/stores/modal";
 import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
-import { useQueryStoreStore } from "@/stores/admin/queryStore";
-import type { CreateQueryViewModel, UpdateQueryViewModel } from "@/viewmodels/admin/query.models";
-import { useQueryBuilderStore } from "@/stores/admin/queryBuilder";
+import { useQueryStoreStore } from "@/stores/admin/settings/queryStore";
+import type { CreateQueryViewModel, UpdateQueryViewModel } from "@/viewmodels/admin/settings/query.models";
+import { useQueryBuilderStore } from "@/stores/admin/club/queryBuilder";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/settings/template/CreateTemplateModal.vue b/src/components/admin/settings/template/CreateTemplateModal.vue
index 4f10366..14ddbdd 100644
--- a/src/components/admin/settings/template/CreateTemplateModal.vue
+++ b/src/components/admin/settings/template/CreateTemplateModal.vue
@@ -36,8 +36,8 @@ import { useModalStore } from "@/stores/modal";
 import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
-import { useTemplateStore } from "@/stores/admin/template";
-import type { CreateTemplateViewModel } from "@/viewmodels/admin/template.models";
+import { useTemplateStore } from "@/stores/admin/settings/template";
+import type { CreateTemplateViewModel } from "@/viewmodels/admin/settings/template.models";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/settings/template/DeleteTemplateModal.vue b/src/components/admin/settings/template/DeleteTemplateModal.vue
index 1be82f9..8bbf2ba 100644
--- a/src/components/admin/settings/template/DeleteTemplateModal.vue
+++ b/src/components/admin/settings/template/DeleteTemplateModal.vue
@@ -29,8 +29,8 @@ import { useModalStore } from "@/stores/modal";
 import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
-import { useQueryStoreStore } from "@/stores/admin/queryStore";
-import { useTemplateStore } from "@/stores/admin/template";
+import { useQueryStoreStore } from "@/stores/admin/settings/queryStore";
+import { useTemplateStore } from "@/stores/admin/settings/template";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/settings/template/TemplateListItem.vue b/src/components/admin/settings/template/TemplateListItem.vue
index a4084d6..e2a77f5 100644
--- a/src/components/admin/settings/template/TemplateListItem.vue
+++ b/src/components/admin/settings/template/TemplateListItem.vue
@@ -35,8 +35,8 @@ import { mapState, mapActions } from "pinia";
 import { PencilIcon, TrashIcon, DocumentDuplicateIcon } from "@heroicons/vue/24/outline";
 import { useAbilityStore } from "@/stores/ability";
 import { useModalStore } from "@/stores/modal";
-import type { TemplateViewModel } from "@/viewmodels/admin/template.models";
-import { useTemplateStore } from "@/stores/admin/template";
+import type { TemplateViewModel } from "@/viewmodels/admin/settings/template.models";
+import { useTemplateStore } from "@/stores/admin/settings/template";
 import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
diff --git a/src/components/admin/settings/templateUsage/TemplatePreviewModal.vue b/src/components/admin/settings/templateUsage/TemplatePreviewModal.vue
index 41e7c27..e3d5d77 100644
--- a/src/components/admin/settings/templateUsage/TemplatePreviewModal.vue
+++ b/src/components/admin/settings/templateUsage/TemplatePreviewModal.vue
@@ -14,7 +14,7 @@ import { defineComponent } from "vue";
 import { mapState, mapActions } from "pinia";
 import { useModalStore } from "@/stores/modal";
 import Spinner from "@/components/Spinner.vue";
-import { useTemplateUsageStore } from "@/stores/admin/templateUsage";
+import { useTemplateUsageStore } from "@/stores/admin/settings/templateUsage";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/settings/templateUsage/TemplateUsageListItem.vue b/src/components/admin/settings/templateUsage/TemplateUsageListItem.vue
index c5562fe..f5025e8 100644
--- a/src/components/admin/settings/templateUsage/TemplateUsageListItem.vue
+++ b/src/components/admin/settings/templateUsage/TemplateUsageListItem.vue
@@ -18,12 +18,18 @@
       </div>
     </div>
     <div class="flex flex-col p-2 gap-2">
-      <div class="flex flex-row gap-2 items-center">
-        <p class="min-w-16">Kopfzeile:</p>
-        <select ref="header" id="header" :value="templateUsage.header?.id ?? 'def'">
-          <option value="def">Standard-Vorlage verwenden</option>
-          <option v-for="template in templates" :key="template.id" :value="template.id">{{ template.template }}</option>
-        </select>
+      <div class="flex flex-col md:flex-row gap-2 md:items-center">
+        <div class="flex flex-row w-full gap-2 items-center">
+          <p class="min-w-16">Kopfzeile:</p>
+          <select ref="header" id="header" :value="templateUsage.header?.id ?? 'def'">
+            <option value="def">Standard-Vorlage verwenden</option>
+            <option v-for="template in templates" :key="template.id" :value="template.id">{{ template.template }}</option>
+          </select>
+        </div>
+        <div class="flex flex-row gap-2 items-center">
+          <p class="whitespace-nowrap">Höhe [mm]:</p>
+          <input id="headerHeight" type="number" :min="15" v-model="templateUsage.headerHeight" class="!w-24" placeholder="15">
+        </div>        
       </div>
       <div class="flex flex-row gap-2 items-center">
         <p class="min-w-16">Hauptteil:</p>
@@ -32,12 +38,18 @@
           <option v-for="template in templates" :key="template.id" :value="template.id">{{ template.template }}</option>
         </select>
       </div>
-      <div class="flex flex-row gap-2 items-center">
-        <p class="min-w-16">Fußzeile:</p>
-        <select ref="footer" id="footer" :value="templateUsage.footer?.id ?? 'def'">
-          <option value="def">Standard-Vorlage verwenden</option>
-          <option v-for="template in templates" :key="template.id" :value="template.id">{{ template.template }}</option>
-        </select>
+      <div class="flex flex-col md:flex-row gap-2 md:items-center">
+        <div class="flex flex-row w-full gap-2 items-center">
+          <p class="min-w-16">Fußzeile:</p>
+          <select ref="footer" id="footer" :value="templateUsage.footer?.id ?? 'def'">
+            <option value="def">Standard-Vorlage verwenden</option>
+            <option v-for="template in templates" :key="template.id" :value="template.id">{{ template.template }}</option>
+          </select>
+        </div>
+        <div class="flex flex-row gap-2 items-center">
+          <p class="whitespace-nowrap">Höhe [mm]:</p>
+          <input id="footerHeight" type="number" :min="15" v-model="templateUsage.footerHeight" class="!w-24" placeholder="15">
+        </div>
       </div>
     </div>
   </form>
@@ -47,9 +59,9 @@
 import { defineAsyncComponent, defineComponent, markRaw, type PropType } from "vue";
 import { mapState, mapActions } from "pinia";
 import { ArchiveBoxArrowDownIcon, ArchiveBoxXMarkIcon, EyeIcon } from "@heroicons/vue/24/outline";
-import type { TemplateUsageViewModel } from "@/viewmodels/admin/templateUsage.models";
-import { useTemplateStore } from "@/stores/admin/template";
-import { useTemplateUsageStore } from "@/stores/admin/templateUsage";
+import type { TemplateUsageViewModel } from "@/viewmodels/admin/settings/templateUsage.models";
+import { useTemplateStore } from "@/stores/admin/settings/template";
+import { useTemplateUsageStore } from "@/stores/admin/settings/templateUsage";
 import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
@@ -91,6 +103,8 @@ export default defineComponent({
       const headerId = fromData.header.value === "def" ? null : fromData.header.value;
       const bodyId = fromData.body.value === "def" ? null : fromData.body.value;
       const footerId = fromData.footer.value === "def" ? null : fromData.footer.value;
+      const headerHeight = fromData.footer.value === "" ? null : parseInt(fromData.headerHeight.value);
+      const footerHeight = fromData.footer.value === "" ? null : parseInt(fromData.footerHeight.value);
 
       this.status = "loading"
       this.updateTemplateUsage({
@@ -98,6 +112,8 @@ export default defineComponent({
         headerId: headerId,
         bodyId: bodyId,
         footerId: footerId,
+        headerHeight:headerHeight,
+        footerHeight: footerHeight
       })
         .then(() => {
           this.status = { status: "success" };
diff --git a/src/components/admin/user/role/CreateRoleModal.vue b/src/components/admin/user/role/CreateRoleModal.vue
index 5cad67e..87d9573 100644
--- a/src/components/admin/user/role/CreateRoleModal.vue
+++ b/src/components/admin/user/role/CreateRoleModal.vue
@@ -32,7 +32,7 @@ import { useModalStore } from "@/stores/modal";
 import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
-import { useRoleStore } from "@/stores/admin/role";
+import { useRoleStore } from "@/stores/admin/user/role";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/user/role/DeleteRoleModal.vue b/src/components/admin/user/role/DeleteRoleModal.vue
index 7297248..764c487 100644
--- a/src/components/admin/user/role/DeleteRoleModal.vue
+++ b/src/components/admin/user/role/DeleteRoleModal.vue
@@ -29,7 +29,7 @@ import { useModalStore } from "@/stores/modal";
 import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
-import { useRoleStore } from "@/stores/admin/role";
+import { useRoleStore } from "@/stores/admin/user/role";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/user/role/RoleListItem.vue b/src/components/admin/user/role/RoleListItem.vue
index 82bf151..d03c756 100644
--- a/src/components/admin/user/role/RoleListItem.vue
+++ b/src/components/admin/user/role/RoleListItem.vue
@@ -27,7 +27,7 @@
 import { defineComponent, defineAsyncComponent, markRaw, type PropType } from "vue";
 import { mapState, mapActions } from "pinia";
 import { PencilIcon, WrenchScrewdriverIcon, TrashIcon } from "@heroicons/vue/24/outline";
-import type { RoleViewModel } from "@/viewmodels/admin/role.models";
+import type { RoleViewModel } from "@/viewmodels/admin/user/role.models";
 import { RouterLink } from "vue-router";
 import { useAbilityStore } from "@/stores/ability";
 import { useModalStore } from "@/stores/modal";
diff --git a/src/components/admin/user/user/DeleteUserModal.vue b/src/components/admin/user/user/DeleteUserModal.vue
index 7cc8d5a..720a06f 100644
--- a/src/components/admin/user/user/DeleteUserModal.vue
+++ b/src/components/admin/user/user/DeleteUserModal.vue
@@ -29,7 +29,7 @@ import { useModalStore } from "@/stores/modal";
 import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
-import { useUserStore } from "@/stores/admin/user";
+import { useUserStore } from "@/stores/admin/user/user";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/user/user/InviteListItem.vue b/src/components/admin/user/user/InviteListItem.vue
index e272cbe..b9de72d 100644
--- a/src/components/admin/user/user/InviteListItem.vue
+++ b/src/components/admin/user/user/InviteListItem.vue
@@ -24,10 +24,10 @@
 <script setup lang="ts">
 import { defineComponent, type PropType } from "vue";
 import { mapState, mapActions } from "pinia";
-import type { InviteViewModel } from "@/viewmodels/admin/invite.models";
+import type { InviteViewModel } from "@/viewmodels/admin/user/invite.models";
 import { PencilIcon, UserGroupIcon, WrenchScrewdriverIcon, TrashIcon } from "@heroicons/vue/24/outline";
 import { useAbilityStore } from "@/stores/ability";
-import { useInviteStore } from "@/stores/admin/invite";
+import { useInviteStore } from "@/stores/admin/user/invite";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/user/user/InviteUserModal.vue b/src/components/admin/user/user/InviteUserModal.vue
index fff1f76..06f15f1 100644
--- a/src/components/admin/user/user/InviteUserModal.vue
+++ b/src/components/admin/user/user/InviteUserModal.vue
@@ -45,8 +45,8 @@ import { useModalStore } from "@/stores/modal";
 import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
-import { useInviteStore } from "@/stores/admin/invite";
-import type { CreateInviteViewModel } from "@/viewmodels/admin/invite.models";
+import { useInviteStore } from "@/stores/admin/user/invite";
+import type { CreateInviteViewModel } from "@/viewmodels/admin/user/invite.models";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/user/user/UserListItem.vue b/src/components/admin/user/user/UserListItem.vue
index a923919..94d0ce7 100644
--- a/src/components/admin/user/user/UserListItem.vue
+++ b/src/components/admin/user/user/UserListItem.vue
@@ -53,7 +53,7 @@
 <script setup lang="ts">
 import { defineComponent, defineAsyncComponent, markRaw, type PropType } from "vue";
 import { mapState, mapActions } from "pinia";
-import type { UserViewModel } from "@/viewmodels/admin/user.models";
+import type { UserViewModel } from "@/viewmodels/admin/user/user.models";
 import { PencilIcon, UserGroupIcon, WrenchScrewdriverIcon, TrashIcon } from "@heroicons/vue/24/outline";
 import { useAbilityStore } from "@/stores/ability";
 import { useModalStore } from "@/stores/modal";
diff --git a/src/components/queryBuilder/BuilderHost.vue b/src/components/queryBuilder/BuilderHost.vue
index 7583774..b4083f7 100644
--- a/src/components/queryBuilder/BuilderHost.vue
+++ b/src/components/queryBuilder/BuilderHost.vue
@@ -97,11 +97,11 @@ import {
   TrashIcon,
   SparklesIcon,
 } from "@heroicons/vue/24/outline";
-import { useQueryBuilderStore } from "@/stores/admin/queryBuilder";
+import { useQueryBuilderStore } from "@/stores/admin/club/queryBuilder";
 import { useModalStore } from "@/stores/modal";
 import Table from "./Table.vue";
 import { useAbilityStore } from "@/stores/ability";
-import { useQueryStoreStore } from "@/stores/admin/queryStore";
+import { useQueryStoreStore } from "@/stores/admin/settings/queryStore";
 </script>
 
 <script lang="ts">
diff --git a/src/components/queryBuilder/ColumnSelect.vue b/src/components/queryBuilder/ColumnSelect.vue
index 53e0370..e282235 100644
--- a/src/components/queryBuilder/ColumnSelect.vue
+++ b/src/components/queryBuilder/ColumnSelect.vue
@@ -25,7 +25,7 @@
 <script setup lang="ts">
 import { defineComponent, type PropType } from "vue";
 import { mapActions, mapState } from "pinia";
-import { useQueryBuilderStore } from "@/stores/admin/queryBuilder";
+import { useQueryBuilderStore } from "@/stores/admin/club/queryBuilder";
 </script>
 
 <script lang="ts">
diff --git a/src/components/queryBuilder/Condition.vue b/src/components/queryBuilder/Condition.vue
index 9c56a3d..b521fda 100644
--- a/src/components/queryBuilder/Condition.vue
+++ b/src/components/queryBuilder/Condition.vue
@@ -61,7 +61,7 @@ import {
   type WhereOperation,
   type WhereType,
 } from "@/types/dynamicQueries";
-import { useQueryBuilderStore } from "@/stores/admin/queryBuilder";
+import { useQueryBuilderStore } from "@/stores/admin/club/queryBuilder";
 import { TrashIcon } from "@heroicons/vue/24/outline";
 </script>
 
diff --git a/src/components/queryBuilder/Join.vue b/src/components/queryBuilder/Join.vue
index 6678aa7..f652f96 100644
--- a/src/components/queryBuilder/Join.vue
+++ b/src/components/queryBuilder/Join.vue
@@ -22,7 +22,7 @@
 import { defineComponent, type PropType } from "vue";
 import { mapActions, mapState } from "pinia";
 import type { DynamicQueryStructure } from "@/types/dynamicQueries";
-import { useQueryBuilderStore } from "@/stores/admin/queryBuilder";
+import { useQueryBuilderStore } from "@/stores/admin/club/queryBuilder";
 import { PlusIcon } from "@heroicons/vue/24/outline";
 import JoinTable from "./JoinTable.vue";
 </script>
diff --git a/src/components/queryBuilder/JoinTable.vue b/src/components/queryBuilder/JoinTable.vue
index c4db5b9..cedf9c3 100644
--- a/src/components/queryBuilder/JoinTable.vue
+++ b/src/components/queryBuilder/JoinTable.vue
@@ -21,7 +21,7 @@
 import { defineComponent, type PropType } from "vue";
 import { mapActions, mapState } from "pinia";
 import type { DynamicQueryStructure } from "@/types/dynamicQueries";
-import { useQueryBuilderStore } from "@/stores/admin/queryBuilder";
+import { useQueryBuilderStore } from "@/stores/admin/club/queryBuilder";
 import Table from "./Table.vue";
 import { TrashIcon } from "@heroicons/vue/24/outline";
 import { joinTableName } from "@/helpers/queryFormatter";
diff --git a/src/components/queryBuilder/NestedCondition.vue b/src/components/queryBuilder/NestedCondition.vue
index 111e8e3..d6ecbac 100644
--- a/src/components/queryBuilder/NestedCondition.vue
+++ b/src/components/queryBuilder/NestedCondition.vue
@@ -20,7 +20,7 @@
 import { defineComponent, type PropType } from "vue";
 import { mapActions, mapState } from "pinia";
 import type { ConditionStructure, WhereType } from "@/types/dynamicQueries";
-import { useQueryBuilderStore } from "@/stores/admin/queryBuilder";
+import { useQueryBuilderStore } from "@/stores/admin/club/queryBuilder";
 import { TrashIcon } from "@heroicons/vue/24/outline";
 import NestedWhere from "./NestedWhere.vue";
 </script>
diff --git a/src/components/queryBuilder/NestedWhere.vue b/src/components/queryBuilder/NestedWhere.vue
index eef4464..d07d108 100644
--- a/src/components/queryBuilder/NestedWhere.vue
+++ b/src/components/queryBuilder/NestedWhere.vue
@@ -33,7 +33,7 @@
 import { defineComponent, type PropType } from "vue";
 import { mapActions, mapState } from "pinia";
 import type { ConditionStructure } from "@/types/dynamicQueries";
-import { useQueryBuilderStore } from "@/stores/admin/queryBuilder";
+import { useQueryBuilderStore } from "@/stores/admin/club/queryBuilder";
 import NestedCondition from "./NestedCondition.vue";
 import Condition from "./Condition.vue";
 import { PlusIcon, RectangleStackIcon } from "@heroicons/vue/24/outline";
diff --git a/src/components/queryBuilder/Order.vue b/src/components/queryBuilder/Order.vue
index 50fc646..b8a6988 100644
--- a/src/components/queryBuilder/Order.vue
+++ b/src/components/queryBuilder/Order.vue
@@ -23,7 +23,7 @@
 import { defineComponent, type PropType } from "vue";
 import { mapActions, mapState } from "pinia";
 import type { OrderByStructure } from "@/types/dynamicQueries";
-import { useQueryBuilderStore } from "@/stores/admin/queryBuilder";
+import { useQueryBuilderStore } from "@/stores/admin/club/queryBuilder";
 import OrderStructure from "./OrderStructure.vue";
 import { PlusIcon } from "@heroicons/vue/24/outline";
 </script>
diff --git a/src/components/queryBuilder/OrderStructure.vue b/src/components/queryBuilder/OrderStructure.vue
index a233767..4667fcb 100644
--- a/src/components/queryBuilder/OrderStructure.vue
+++ b/src/components/queryBuilder/OrderStructure.vue
@@ -22,7 +22,7 @@
 import { defineComponent, type PropType } from "vue";
 import { mapActions, mapState } from "pinia";
 import type { OrderByStructure, OrderByType } from "@/types/dynamicQueries";
-import { useQueryBuilderStore } from "@/stores/admin/queryBuilder";
+import { useQueryBuilderStore } from "@/stores/admin/club/queryBuilder";
 import { TrashIcon } from "@heroicons/vue/24/outline";
 </script>
 
diff --git a/src/components/queryBuilder/Table.vue b/src/components/queryBuilder/Table.vue
index 72ac140..3ad97ce 100644
--- a/src/components/queryBuilder/Table.vue
+++ b/src/components/queryBuilder/Table.vue
@@ -12,7 +12,7 @@
 import { defineComponent, type PropType } from "vue";
 import { mapActions, mapState } from "pinia";
 import type { ConditionStructure, DynamicQueryStructure, OrderByStructure } from "@/types/dynamicQueries";
-import { useQueryBuilderStore } from "@/stores/admin/queryBuilder";
+import { useQueryBuilderStore } from "@/stores/admin/club/queryBuilder";
 import ColumnSelect from "./ColumnSelect.vue";
 import Where from "./Where.vue";
 import Order from "./Order.vue";
diff --git a/src/components/queryBuilder/TableSelect.vue b/src/components/queryBuilder/TableSelect.vue
index 026e363..d942da4 100644
--- a/src/components/queryBuilder/TableSelect.vue
+++ b/src/components/queryBuilder/TableSelect.vue
@@ -13,7 +13,7 @@
 <script setup lang="ts">
 import { defineComponent } from "vue";
 import { mapState } from "pinia";
-import { useQueryBuilderStore } from "@/stores/admin/queryBuilder";
+import { useQueryBuilderStore } from "@/stores/admin/club/queryBuilder";
 </script>
 
 <script lang="ts">
diff --git a/src/components/queryBuilder/Where.vue b/src/components/queryBuilder/Where.vue
index 78a9704..51c3ed8 100644
--- a/src/components/queryBuilder/Where.vue
+++ b/src/components/queryBuilder/Where.vue
@@ -34,7 +34,7 @@
 import { defineComponent, type PropType } from "vue";
 import { mapActions, mapState } from "pinia";
 import type { ConditionStructure } from "@/types/dynamicQueries";
-import { useQueryBuilderStore } from "@/stores/admin/queryBuilder";
+import { useQueryBuilderStore } from "@/stores/admin/club/queryBuilder";
 import NestedCondition from "./NestedCondition.vue";
 import Condition from "./Condition.vue";
 import { PlusIcon, RectangleStackIcon } from "@heroicons/vue/24/outline";
diff --git a/src/router/index.ts b/src/router/index.ts
index 663cad9..e9c8cbc 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -320,12 +320,12 @@ const router = createRouter({
                 {
                   path: "",
                   name: "admin-settings-qualification",
-                  component: () => import("@/views/admin/settings/Qualification.vue"),
+                  component: () => import("@/views/admin/settings/qualification/Qualification.vue"),
                 },
                 {
                   path: ":id/edit",
                   name: "admin-settings-qualification-edit",
-                  component: () => import("@/views/admin/settings/QualificationEdit.vue"),
+                  component: () => import("@/views/admin/settings/qualification/QualificationEdit.vue"),
                   meta: { type: "update", section: "settings", module: "qualification" },
                   beforeEnter: [abilityAndNavUpdate],
                   props: true,
@@ -342,12 +342,12 @@ const router = createRouter({
                 {
                   path: "",
                   name: "admin-settings-award",
-                  component: () => import("@/views/admin/settings/Award.vue"),
+                  component: () => import("@/views/admin/settings/award/Award.vue"),
                 },
                 {
                   path: ":id/edit",
                   name: "admin-settings-award-edit",
-                  component: () => import("@/views/admin/settings/AwardEdit.vue"),
+                  component: () => import("@/views/admin/settings/award/AwardEdit.vue"),
                   meta: { type: "update", section: "settings", module: "award" },
                   beforeEnter: [abilityAndNavUpdate],
                   props: true,
@@ -364,14 +364,14 @@ const router = createRouter({
                 {
                   path: "",
                   name: "admin-settings-executive_position",
-                  component: () => import("@/views/admin/settings/ExecutivePosition.vue"),
+                  component: () => import("@/views/admin/settings/executivePosition/ExecutivePosition.vue"),
                   meta: { type: "read", section: "settings", module: "executive_position" },
                   beforeEnter: [abilityAndNavUpdate],
                 },
                 {
                   path: ":id/edit",
                   name: "admin-settings-executive_position-edit",
-                  component: () => import("@/views/admin/settings/ExecutivePositionEdit.vue"),
+                  component: () => import("@/views/admin/settings/executivePosition/ExecutivePositionEdit.vue"),
                   meta: { type: "update", section: "settings", module: "executive_position" },
                   beforeEnter: [abilityAndNavUpdate],
                   props: true,
@@ -388,12 +388,12 @@ const router = createRouter({
                 {
                   path: "",
                   name: "admin-settings-communication_type",
-                  component: () => import("@/views/admin/settings/CommunicationType.vue"),
+                  component: () => import("@/views/admin/settings/communicationType/CommunicationType.vue"),
                 },
                 {
                   path: ":id/edit",
                   name: "admin-settings-communication_type-edit",
-                  component: () => import("@/views/admin/settings/CommunicationTypeEdit.vue"),
+                  component: () => import("@/views/admin/settings/communicationType/CommunicationTypeEdit.vue"),
                   meta: { type: "update", section: "settings", module: "communication_type" },
                   beforeEnter: [abilityAndNavUpdate],
                   props: true,
@@ -410,12 +410,12 @@ const router = createRouter({
                 {
                   path: "",
                   name: "admin-settings-membership_status",
-                  component: () => import("@/views/admin/settings/MembershipStatus.vue"),
+                  component: () => import("@/views/admin/settings/membershipStatus/MembershipStatus.vue"),
                 },
                 {
                   path: ":id/edit",
                   name: "admin-settings-membership_status-edit",
-                  component: () => import("@/views/admin/settings/MembershipStatusEdit.vue"),
+                  component: () => import("@/views/admin/settings/membershipStatus/MembershipStatusEdit.vue"),
                   meta: { type: "update", section: "settings", module: "membership_status" },
                   beforeEnter: [abilityAndNavUpdate],
                   props: true,
@@ -432,12 +432,12 @@ const router = createRouter({
                 {
                   path: "",
                   name: "admin-settings-calendar_type",
-                  component: () => import("@/views/admin/settings/CalendarType.vue"),
+                  component: () => import("@/views/admin/settings/calendarType/CalendarType.vue"),
                 },
                 {
                   path: ":id/edit",
                   name: "admin-settings-calendar_type-edit",
-                  component: () => import("@/views/admin/settings/CalendarTypeEdit.vue"),
+                  component: () => import("@/views/admin/settings/calendarType/CalendarTypeEdit.vue"),
                   meta: { type: "update", section: "settings", module: "calendar_type" },
                   beforeEnter: [abilityAndNavUpdate],
                   props: true,
@@ -447,7 +447,7 @@ const router = createRouter({
             {
               path: "query-store",
               name: "admin-settings-query_store",
-              component: () => import("@/views/admin/settings/QueryStore.vue"),
+              component: () => import("@/views/admin/settings/queryStore/QueryStore.vue"),
               meta: { type: "read", section: "settings", module: "query_store" },
               beforeEnter: [abilityAndNavUpdate],
             },
@@ -519,17 +519,17 @@ const router = createRouter({
                 {
                   path: "",
                   name: "admin-user-user",
-                  component: () => import("@/views/admin/user/User.vue"),
+                  component: () => import("@/views/admin/user/user/User.vue"),
                 },
                 {
                   path: "invites",
                   name: "admin-user-user-invites",
-                  component: () => import("@/views/admin/user/Invite.vue"),
+                  component: () => import("@/views/admin/user/user/Invite.vue"),
                 },
                 {
                   path: ":id/edit",
                   name: "admin-user-user-edit",
-                  component: () => import("@/views/admin/user/UserEdit.vue"),
+                  component: () => import("@/views/admin/user/user/UserEdit.vue"),
                   meta: { type: "update", section: "user", module: "user" },
                   beforeEnter: [abilityAndNavUpdate],
                   props: true,
@@ -537,7 +537,7 @@ const router = createRouter({
                 {
                   path: ":id/permission",
                   name: "admin-user-user-permission",
-                  component: () => import("@/views/admin/user/UserEditPermission.vue"),
+                  component: () => import("@/views/admin/user/user/UserEditPermission.vue"),
                   meta: { type: "update", section: "user", module: "user" },
                   beforeEnter: [abilityAndNavUpdate],
                   props: true,
@@ -545,7 +545,7 @@ const router = createRouter({
                 {
                   path: ":id/roles",
                   name: "admin-user-user-roles",
-                  component: () => import("@/views/admin/user/UserEditRoles.vue"),
+                  component: () => import("@/views/admin/user/user/UserEditRoles.vue"),
                   meta: { type: "update", section: "user", module: "user" },
                   beforeEnter: [abilityAndNavUpdate],
                   props: true,
@@ -562,12 +562,12 @@ const router = createRouter({
                 {
                   path: "",
                   name: "admin-user-role",
-                  component: () => import("@/views/admin/user/Role.vue"),
+                  component: () => import("@/views/admin/user/role/Role.vue"),
                 },
                 {
                   path: ":id/edit",
                   name: "admin-user-role-edit",
-                  component: () => import("@/views/admin/user/RoleEdit.vue"),
+                  component: () => import("@/views/admin/user/role/RoleEdit.vue"),
                   meta: { type: "update", section: "user", module: "role" },
                   beforeEnter: [abilityAndNavUpdate],
                   props: true,
@@ -575,7 +575,7 @@ const router = createRouter({
                 {
                   path: ":id/permission",
                   name: "admin-user-role-permission",
-                  component: () => import("@/views/admin/user/RoleEditPermission.vue"),
+                  component: () => import("@/views/admin/user/role/RoleEditPermission.vue"),
                   meta: { type: "update", section: "user", module: "role" },
                   beforeEnter: [abilityAndNavUpdate],
                   props: true,
diff --git a/src/router/memberGuard.ts b/src/router/memberGuard.ts
index 93406e2..498959a 100644
--- a/src/router/memberGuard.ts
+++ b/src/router/memberGuard.ts
@@ -1,9 +1,9 @@
-import { useCommunicationStore } from "@/stores/admin/communication";
-import { useMemberStore } from "@/stores/admin/member";
-import { useMemberAwardStore } from "@/stores/admin/memberAward";
-import { useMemberExecutivePositionStore } from "@/stores/admin/memberExecutivePosition";
-import { useMemberQualificationStore } from "@/stores/admin/memberQualification";
-import { useMembershipStore } from "@/stores/admin/membership";
+import { useCommunicationStore } from "@/stores/admin/club/member/communication";
+import { useMemberStore } from "@/stores/admin/club/member/member";
+import { useMemberAwardStore } from "@/stores/admin/club/member/memberAward";
+import { useMemberExecutivePositionStore } from "@/stores/admin/club/member/memberExecutivePosition";
+import { useMemberQualificationStore } from "@/stores/admin/club/member/memberQualification";
+import { useMembershipStore } from "@/stores/admin/club/member/membership";
 
 export async function setMemberId(to: any, from: any, next: any) {
   const member = useMemberStore();
diff --git a/src/router/newsletterGuard.ts b/src/router/newsletterGuard.ts
index 075d4ba..d96cb8e 100644
--- a/src/router/newsletterGuard.ts
+++ b/src/router/newsletterGuard.ts
@@ -1,7 +1,7 @@
-import { useNewsletterStore } from "@/stores/admin/newsletter";
-import { useNewsletterDatesStore } from "@/stores/admin/newsletterDates";
-import { useNewsletterRecipientsStore } from "@/stores/admin/newsletterRecipients";
-import { useNewsletterPrintoutStore } from "../stores/admin/newsletterPrintout";
+import { useNewsletterStore } from "@/stores/admin/club/newsletter/newsletter";
+import { useNewsletterDatesStore } from "@/stores/admin/club/newsletter/newsletterDates";
+import { useNewsletterRecipientsStore } from "@/stores/admin/club/newsletter/newsletterRecipients";
+import { useNewsletterPrintoutStore } from "../stores/admin/club/newsletter/newsletterPrintout";
 
 export async function setNewsletterId(to: any, from: any, next: any) {
   const newsletter = useNewsletterStore();
diff --git a/src/router/protocolGuard.ts b/src/router/protocolGuard.ts
index a86d848..9b235ce 100644
--- a/src/router/protocolGuard.ts
+++ b/src/router/protocolGuard.ts
@@ -1,9 +1,9 @@
-import { useProtocolStore } from "@/stores/admin/protocol";
-import { useProtocolAgendaStore } from "@/stores/admin/protocolAgenda";
-import { useProtocolDecisionStore } from "@/stores/admin/protocolDecision";
-import { useProtocolPresenceStore } from "@/stores/admin/protocolPresence";
-import { useProtocolVotingStore } from "@/stores/admin/protocolVoting";
-import { useProtocolPrintoutStore } from "../stores/admin/protocolPrintout";
+import { useProtocolStore } from "@/stores/admin/club/protocol/protocol";
+import { useProtocolAgendaStore } from "@/stores/admin/club/protocol/protocolAgenda";
+import { useProtocolDecisionStore } from "@/stores/admin/club/protocol/protocolDecision";
+import { useProtocolPresenceStore } from "@/stores/admin/club/protocol/protocolPresence";
+import { useProtocolVotingStore } from "@/stores/admin/club/protocol/protocolVoting";
+import { useProtocolPrintoutStore } from "../stores/admin/club/protocol/protocolPrintout";
 
 export async function setProtocolId(to: any, from: any, next: any) {
   const protocol = useProtocolStore();
diff --git a/src/stores/admin/calendar.ts b/src/stores/admin/club/calendar.ts
similarity index 97%
rename from src/stores/admin/calendar.ts
rename to src/stores/admin/club/calendar.ts
index 9df0e60..ca4fbac 100644
--- a/src/stores/admin/calendar.ts
+++ b/src/stores/admin/club/calendar.ts
@@ -3,7 +3,7 @@ import type {
   CreateCalendarViewModel,
   UpdateCalendarViewModel,
   CalendarViewModel,
-} from "@/viewmodels/admin/calendar.models";
+} from "@/viewmodels/admin/club/calendar.models";
 import { http } from "@/serverCom";
 import type { AxiosResponse } from "axios";
 
diff --git a/src/stores/admin/communication.ts b/src/stores/admin/club/member/communication.ts
similarity index 93%
rename from src/stores/admin/communication.ts
rename to src/stores/admin/club/member/communication.ts
index d0ed687..9113e2b 100644
--- a/src/stores/admin/communication.ts
+++ b/src/stores/admin/club/member/communication.ts
@@ -1,14 +1,14 @@
 import { defineStore } from "pinia";
-import type { CreateMemberViewModel, UpdateMemberViewModel } from "@/viewmodels/admin/member.models";
+import type { CreateMemberViewModel, UpdateMemberViewModel } from "@/viewmodels/admin/club/member/member.models";
 import { http } from "@/serverCom";
 import type { AxiosResponse } from "axios";
-import type { MemberViewModel } from "@/viewmodels/admin/member.models";
+import type { MemberViewModel } from "@/viewmodels/admin/club/member/member.models";
 import { useMemberStore } from "./member";
 import type {
   CreateCommunicationViewModel,
   CommunicationViewModel,
   UpdateCommunicationViewModel,
-} from "@/viewmodels/admin/communication.models";
+} from "@/viewmodels/admin/club/member/communication.models";
 
 export const useCommunicationStore = defineStore("communication", {
   state: () => {
diff --git a/src/stores/admin/member.ts b/src/stores/admin/club/member/member.ts
similarity index 87%
rename from src/stores/admin/member.ts
rename to src/stores/admin/club/member/member.ts
index b0075de..1154fb9 100644
--- a/src/stores/admin/member.ts
+++ b/src/stores/admin/club/member/member.ts
@@ -1,8 +1,8 @@
 import { defineStore } from "pinia";
-import type { CreateMemberViewModel, UpdateMemberViewModel } from "@/viewmodels/admin/member.models";
+import type { CreateMemberViewModel, UpdateMemberViewModel } from "@/viewmodels/admin/club/member/member.models";
 import { http } from "@/serverCom";
 import type { AxiosResponse } from "axios";
-import type { MemberViewModel } from "@/viewmodels/admin/member.models";
+import type { MemberViewModel } from "@/viewmodels/admin/club/member/member.models";
 
 export const useMemberStore = defineStore("member", {
   state: () => {
@@ -16,11 +16,11 @@ export const useMemberStore = defineStore("member", {
     };
   },
   actions: {
-    fetchMembers(offset = 0, count = 25, clear = false) {
+    fetchMembers(offset = 0, count = 25, search = "", clear = false) {
       if (clear) this.members = [];
       this.loading = "loading";
       http
-        .get(`/admin/member?offset=${offset}&count=${count}`)
+        .get(`/admin/member?offset=${offset}&count=${count}${search != "" ? "&search=" + search : ""}`)
         .then((result) => {
           this.totalCount = result.data.total;
           result.data.members
@@ -62,6 +62,7 @@ export const useMemberStore = defineStore("member", {
         lastname: member.lastname,
         nameaffix: member.nameaffix,
         birthdate: member.birthdate,
+        internalId: member.internalId,
       });
       this.fetchMembers();
       return result;
@@ -73,6 +74,7 @@ export const useMemberStore = defineStore("member", {
         lastname: member.lastname,
         nameaffix: member.nameaffix,
         birthdate: member.birthdate,
+        internalId: member.internalId,
       });
       this.fetchMembers();
       return result;
diff --git a/src/stores/admin/memberAward.ts b/src/stores/admin/club/member/memberAward.ts
similarity index 92%
rename from src/stores/admin/memberAward.ts
rename to src/stores/admin/club/member/memberAward.ts
index 1f133ea..0d1667a 100644
--- a/src/stores/admin/memberAward.ts
+++ b/src/stores/admin/club/member/memberAward.ts
@@ -1,14 +1,14 @@
 import { defineStore } from "pinia";
-import type { CreateMemberViewModel, UpdateMemberViewModel } from "@/viewmodels/admin/member.models";
+import type { CreateMemberViewModel, UpdateMemberViewModel } from "@/viewmodels/admin/club/member/member.models";
 import { http } from "@/serverCom";
 import type { AxiosResponse } from "axios";
-import type { MemberViewModel } from "@/viewmodels/admin/member.models";
+import type { MemberViewModel } from "@/viewmodels/admin/club/member/member.models";
 import { useMemberStore } from "./member";
 import type {
   CreateMemberAwardViewModel,
   MemberAwardViewModel,
   UpdateMemberAwardViewModel,
-} from "@/viewmodels/admin/memberAward.models";
+} from "@/viewmodels/admin/club/member/memberAward.models";
 
 export const useMemberAwardStore = defineStore("memberAward", {
   state: () => {
diff --git a/src/stores/admin/memberExecutivePosition.ts b/src/stores/admin/club/member/memberExecutivePosition.ts
similarity index 93%
rename from src/stores/admin/memberExecutivePosition.ts
rename to src/stores/admin/club/member/memberExecutivePosition.ts
index ec1b96b..d69bc95 100644
--- a/src/stores/admin/memberExecutivePosition.ts
+++ b/src/stores/admin/club/member/memberExecutivePosition.ts
@@ -1,14 +1,14 @@
 import { defineStore } from "pinia";
-import type { CreateMemberViewModel, UpdateMemberViewModel } from "@/viewmodels/admin/member.models";
+import type { CreateMemberViewModel, UpdateMemberViewModel } from "@/viewmodels/admin/club/member/member.models";
 import { http } from "@/serverCom";
 import type { AxiosResponse } from "axios";
-import type { MemberViewModel } from "@/viewmodels/admin/member.models";
+import type { MemberViewModel } from "@/viewmodels/admin/club/member/member.models";
 import { useMemberStore } from "./member";
 import type {
   CreateMemberExecutivePositionViewModel,
   MemberExecutivePositionViewModel,
   UpdateMemberExecutivePositionViewModel,
-} from "@/viewmodels/admin/memberExecutivePosition.models";
+} from "@/viewmodels/admin/club/member/memberExecutivePosition.models";
 
 export const useMemberExecutivePositionStore = defineStore("memberExecutivePosition", {
   state: () => {
diff --git a/src/stores/admin/memberQualification.ts b/src/stores/admin/club/member/memberQualification.ts
similarity index 92%
rename from src/stores/admin/memberQualification.ts
rename to src/stores/admin/club/member/memberQualification.ts
index 3c43767..0344273 100644
--- a/src/stores/admin/memberQualification.ts
+++ b/src/stores/admin/club/member/memberQualification.ts
@@ -1,14 +1,14 @@
 import { defineStore } from "pinia";
-import type { CreateMemberViewModel, UpdateMemberViewModel } from "@/viewmodels/admin/member.models";
+import type { CreateMemberViewModel, UpdateMemberViewModel } from "@/viewmodels/admin/club/member/member.models";
 import { http } from "@/serverCom";
 import type { AxiosResponse } from "axios";
-import type { MemberViewModel } from "@/viewmodels/admin/member.models";
+import type { MemberViewModel } from "@/viewmodels/admin/club/member/member.models";
 import { useMemberStore } from "./member";
 import type {
   CreateMemberQualificationViewModel,
   MemberQualificationViewModel,
   UpdateMemberQualificationViewModel,
-} from "@/viewmodels/admin/memberQualification.models";
+} from "@/viewmodels/admin/club/member/memberQualification.models";
 
 export const useMemberQualificationStore = defineStore("memberQualification", {
   state: () => {
diff --git a/src/stores/admin/membership.ts b/src/stores/admin/club/member/membership.ts
similarity index 90%
rename from src/stores/admin/membership.ts
rename to src/stores/admin/club/member/membership.ts
index e53734e..a430bf4 100644
--- a/src/stores/admin/membership.ts
+++ b/src/stores/admin/club/member/membership.ts
@@ -1,14 +1,14 @@
 import { defineStore } from "pinia";
-import type { CreateMemberViewModel, UpdateMemberViewModel } from "@/viewmodels/admin/member.models";
+import type { CreateMemberViewModel, UpdateMemberViewModel } from "@/viewmodels/admin/club/member/member.models";
 import { http } from "@/serverCom";
 import type { AxiosResponse } from "axios";
-import type { MemberViewModel } from "@/viewmodels/admin/member.models";
+import type { MemberViewModel } from "@/viewmodels/admin/club/member/member.models";
 import { useMemberStore } from "./member";
 import type {
   CreateMembershipViewModel,
   MembershipViewModel,
   UpdateMembershipViewModel,
-} from "@/viewmodels/admin/membership.models";
+} from "@/viewmodels/admin/club/member/membership.models";
 
 export const useMembershipStore = defineStore("membership", {
   state: () => {
@@ -38,7 +38,6 @@ export const useMembershipStore = defineStore("membership", {
     async createMembership(membership: CreateMembershipViewModel): Promise<AxiosResponse<any, any>> {
       const memberId = useMemberStore().activeMember;
       const result = await http.post(`/admin/member/${memberId}/membership`, {
-        internalId: membership.internalId,
         start: membership.start,
         statusId: membership.statusId,
       });
@@ -48,7 +47,6 @@ export const useMembershipStore = defineStore("membership", {
     async updateMembership(membership: UpdateMembershipViewModel): Promise<AxiosResponse<any, any>> {
       const memberId = useMemberStore().activeMember;
       const result = await http.patch(`/admin/member/${memberId}/membership/${membership.id}`, {
-        internalId: membership.internalId,
         start: membership.start,
         end: membership.end,
         terminationReason: membership.terminationReason,
diff --git a/src/stores/admin/newsletter.ts b/src/stores/admin/club/newsletter/newsletter.ts
similarity index 96%
rename from src/stores/admin/newsletter.ts
rename to src/stores/admin/club/newsletter/newsletter.ts
index 5f92914..9a7a536 100644
--- a/src/stores/admin/newsletter.ts
+++ b/src/stores/admin/club/newsletter/newsletter.ts
@@ -1,8 +1,8 @@
 import { defineStore } from "pinia";
-import type { CreateNewsletterViewModel, SyncNewsletterViewModel } from "@/viewmodels/admin/newsletter.models";
+import type { CreateNewsletterViewModel, SyncNewsletterViewModel } from "@/viewmodels/admin/club/newsletter/newsletter.models";
 import { http } from "@/serverCom";
 import type { AxiosResponse } from "axios";
-import type { NewsletterViewModel } from "@/viewmodels/admin/newsletter.models";
+import type { NewsletterViewModel } from "@/viewmodels/admin/club/newsletter/newsletter.models";
 import cloneDeep from "lodash.clonedeep";
 import isEqual from "lodash.isequal";
 import difference from "lodash.difference";
diff --git a/src/stores/admin/newsletterDates.ts b/src/stores/admin/club/newsletter/newsletterDates.ts
similarity index 97%
rename from src/stores/admin/newsletterDates.ts
rename to src/stores/admin/club/newsletter/newsletterDates.ts
index 8666d18..82d6e77 100644
--- a/src/stores/admin/newsletterDates.ts
+++ b/src/stores/admin/club/newsletter/newsletterDates.ts
@@ -1,6 +1,6 @@
 import { defineStore } from "pinia";
 import { http } from "@/serverCom";
-import type { NewsletterDatesViewModel, SyncNewsletterDatesViewModel } from "@/viewmodels/admin/newsletterDates.models";
+import type { NewsletterDatesViewModel, SyncNewsletterDatesViewModel } from "@/viewmodels/admin/club/newsletter/newsletterDates.models";
 import { useNewsletterStore } from "./newsletter";
 import cloneDeep from "lodash.clonedeep";
 import isEqual from "lodash.isequal";
diff --git a/src/stores/admin/newsletterPrintout.ts b/src/stores/admin/club/newsletter/newsletterPrintout.ts
similarity index 100%
rename from src/stores/admin/newsletterPrintout.ts
rename to src/stores/admin/club/newsletter/newsletterPrintout.ts
diff --git a/src/stores/admin/newsletterRecipients.ts b/src/stores/admin/club/newsletter/newsletterRecipients.ts
similarity index 97%
rename from src/stores/admin/newsletterRecipients.ts
rename to src/stores/admin/club/newsletter/newsletterRecipients.ts
index 3f4991d..cb45a76 100644
--- a/src/stores/admin/newsletterRecipients.ts
+++ b/src/stores/admin/club/newsletter/newsletterRecipients.ts
@@ -3,7 +3,7 @@ import { http } from "@/serverCom";
 import type {
   NewsletterRecipientsViewModel,
   SyncNewsletterRecipientsViewModel,
-} from "@/viewmodels/admin/newsletterRecipients.models";
+} from "@/viewmodels/admin/club/newsletter/newsletterRecipients.models";
 import { useNewsletterStore } from "./newsletter";
 import cloneDeep from "lodash.clonedeep";
 import isEqual from "lodash.isequal";
diff --git a/src/stores/admin/protocol.ts b/src/stores/admin/club/protocol/protocol.ts
similarity index 96%
rename from src/stores/admin/protocol.ts
rename to src/stores/admin/club/protocol/protocol.ts
index e9f8126..fb1fad0 100644
--- a/src/stores/admin/protocol.ts
+++ b/src/stores/admin/club/protocol/protocol.ts
@@ -1,8 +1,8 @@
 import { defineStore } from "pinia";
-import type { CreateProtocolViewModel, SyncProtocolViewModel } from "@/viewmodels/admin/protocol.models";
+import type { CreateProtocolViewModel, SyncProtocolViewModel } from "@/viewmodels/admin/club/protocol/protocol.models";
 import { http } from "@/serverCom";
 import type { AxiosResponse } from "axios";
-import type { ProtocolViewModel } from "@/viewmodels/admin/protocol.models";
+import type { ProtocolViewModel } from "@/viewmodels/admin/club/protocol/protocol.models";
 import cloneDeep from "lodash.clonedeep";
 import isEqual from "lodash.isequal";
 import difference from "lodash.difference";
diff --git a/src/stores/admin/protocolAgenda.ts b/src/stores/admin/club/protocol/protocolAgenda.ts
similarity index 97%
rename from src/stores/admin/protocolAgenda.ts
rename to src/stores/admin/club/protocol/protocolAgenda.ts
index 1705b9f..5cf6b0d 100644
--- a/src/stores/admin/protocolAgenda.ts
+++ b/src/stores/admin/club/protocol/protocolAgenda.ts
@@ -1,6 +1,6 @@
 import { defineStore } from "pinia";
 import { http } from "@/serverCom";
-import type { ProtocolAgendaViewModel, SyncProtocolAgendaViewModel } from "@/viewmodels/admin/protocolAgenda.models";
+import type { ProtocolAgendaViewModel, SyncProtocolAgendaViewModel } from "@/viewmodels/admin/club/protocol/protocolAgenda.models";
 import { useProtocolStore } from "./protocol";
 import cloneDeep from "lodash.clonedeep";
 import isEqual from "lodash.isequal";
diff --git a/src/stores/admin/protocolDecision.ts b/src/stores/admin/club/protocol/protocolDecision.ts
similarity index 97%
rename from src/stores/admin/protocolDecision.ts
rename to src/stores/admin/club/protocol/protocolDecision.ts
index 65a0358..632b080 100644
--- a/src/stores/admin/protocolDecision.ts
+++ b/src/stores/admin/club/protocol/protocolDecision.ts
@@ -4,7 +4,7 @@ import type { AxiosResponse } from "axios";
 import type {
   ProtocolDecisionViewModel,
   SyncProtocolDecisionViewModel,
-} from "@/viewmodels/admin/protocolDecision.models";
+} from "@/viewmodels/admin/club/protocol/protocolDecision.models";
 import { useProtocolStore } from "./protocol";
 import cloneDeep from "lodash.clonedeep";
 import isEqual from "lodash.isequal";
diff --git a/src/stores/admin/protocolPresence.ts b/src/stores/admin/club/protocol/protocolPresence.ts
similarity index 97%
rename from src/stores/admin/protocolPresence.ts
rename to src/stores/admin/club/protocol/protocolPresence.ts
index a10b610..ac7a94e 100644
--- a/src/stores/admin/protocolPresence.ts
+++ b/src/stores/admin/club/protocol/protocolPresence.ts
@@ -4,7 +4,7 @@ import type { AxiosResponse } from "axios";
 import type {
   ProtocolPresenceViewModel,
   SyncProtocolPresenceViewModel,
-} from "@/viewmodels/admin/protocolPresence.models";
+} from "@/viewmodels/admin/club/protocol/protocolPresence.models";
 import { useProtocolStore } from "./protocol";
 import cloneDeep from "lodash.clonedeep";
 import isEqual from "lodash.isequal";
diff --git a/src/stores/admin/protocolPrintout.ts b/src/stores/admin/club/protocol/protocolPrintout.ts
similarity index 97%
rename from src/stores/admin/protocolPrintout.ts
rename to src/stores/admin/club/protocol/protocolPrintout.ts
index 72462a9..81e5943 100644
--- a/src/stores/admin/protocolPrintout.ts
+++ b/src/stores/admin/club/protocol/protocolPrintout.ts
@@ -1,6 +1,6 @@
 import { defineStore } from "pinia";
 import { http } from "@/serverCom";
-import type { ProtocolPrintoutViewModel } from "@/viewmodels/admin/protocolPrintout.models";
+import type { ProtocolPrintoutViewModel } from "@/viewmodels/admin/club/protocol/protocolPrintout.models";
 import { useProtocolStore } from "./protocol";
 import type { AxiosResponse } from "axios";
 
diff --git a/src/stores/admin/protocolVoting.ts b/src/stores/admin/club/protocol/protocolVoting.ts
similarity index 97%
rename from src/stores/admin/protocolVoting.ts
rename to src/stores/admin/club/protocol/protocolVoting.ts
index cdfee66..2a0b63c 100644
--- a/src/stores/admin/protocolVoting.ts
+++ b/src/stores/admin/club/protocol/protocolVoting.ts
@@ -1,7 +1,7 @@
 import { defineStore } from "pinia";
 import { http } from "@/serverCom";
 import type { AxiosResponse } from "axios";
-import type { ProtocolVotingViewModel, SyncProtocolVotingViewModel } from "@/viewmodels/admin/protocolVoting.models";
+import type { ProtocolVotingViewModel, SyncProtocolVotingViewModel } from "@/viewmodels/admin/club/protocol/protocolVoting.models";
 import { useProtocolStore } from "./protocol";
 import cloneDeep from "lodash.clonedeep";
 import isEqual from "lodash.isequal";
diff --git a/src/stores/admin/queryBuilder.ts b/src/stores/admin/club/queryBuilder.ts
similarity index 92%
rename from src/stores/admin/queryBuilder.ts
rename to src/stores/admin/club/queryBuilder.ts
index d65e150..159a423 100644
--- a/src/stores/admin/queryBuilder.ts
+++ b/src/stores/admin/club/queryBuilder.ts
@@ -1,6 +1,6 @@
 import { defineStore } from "pinia";
 import { http } from "@/serverCom";
-import type { TableMeta } from "@/viewmodels/admin/query.models";
+import type { TableMeta } from "@/viewmodels/admin/settings/query.models";
 import type { DynamicQueryStructure, FieldType } from "@/types/dynamicQueries";
 
 export const useQueryBuilderStore = defineStore("queryBuilder", {
@@ -32,8 +32,10 @@ export const useQueryBuilderStore = defineStore("queryBuilder", {
     },
     sendQuery(offset = 0, count = 25, query?: DynamicQueryStructure | string) {
       this.queryError = "";
-      this.data = [];
-      this.totalLength = 0;
+      if (offset == 0) {
+        this.data = [];
+        this.totalLength = 0;
+      }
       let queryToSend = query ?? this.query;
       if (queryToSend == undefined || queryToSend == "" || (typeof queryToSend != "string" && queryToSend.table == ""))
         return;
@@ -44,7 +46,7 @@ export const useQueryBuilderStore = defineStore("queryBuilder", {
         })
         .then((result) => {
           if (result.data.stats == "success") {
-            this.data = result.data.rows;
+            this.data = [...this.data, ...result.data.rows];
             this.totalLength = result.data.total;
             this.loadingData = "fetched";
           } else {
diff --git a/src/stores/admin/award.ts b/src/stores/admin/settings/award.ts
similarity index 96%
rename from src/stores/admin/award.ts
rename to src/stores/admin/settings/award.ts
index f67b7e2..50b2326 100644
--- a/src/stores/admin/award.ts
+++ b/src/stores/admin/settings/award.ts
@@ -1,5 +1,5 @@
 import { defineStore } from "pinia";
-import type { CreateAwardViewModel, UpdateAwardViewModel, AwardViewModel } from "@/viewmodels/admin/award.models";
+import type { CreateAwardViewModel, UpdateAwardViewModel, AwardViewModel } from "@/viewmodels/admin/settings/award.models";
 import { http } from "@/serverCom";
 import type { AxiosResponse } from "axios";
 
diff --git a/src/stores/admin/calendarType.ts b/src/stores/admin/settings/calendarType.ts
similarity index 97%
rename from src/stores/admin/calendarType.ts
rename to src/stores/admin/settings/calendarType.ts
index 8f006f0..90ecd42 100644
--- a/src/stores/admin/calendarType.ts
+++ b/src/stores/admin/settings/calendarType.ts
@@ -3,7 +3,7 @@ import type {
   CreateCalendarTypeViewModel,
   UpdateCalendarTypeViewModel,
   CalendarTypeViewModel,
-} from "@/viewmodels/admin/calendarType.models";
+} from "@/viewmodels/admin/settings/calendarType.models";
 import { http } from "@/serverCom";
 import type { AxiosResponse } from "axios";
 
diff --git a/src/stores/admin/communicationType.ts b/src/stores/admin/settings/communicationType.ts
similarity index 97%
rename from src/stores/admin/communicationType.ts
rename to src/stores/admin/settings/communicationType.ts
index 5cb81f9..87c95fa 100644
--- a/src/stores/admin/communicationType.ts
+++ b/src/stores/admin/settings/communicationType.ts
@@ -3,7 +3,7 @@ import type {
   CreateCommunicationTypeViewModel,
   UpdateCommunicationTypeViewModel,
   CommunicationTypeViewModel,
-} from "@/viewmodels/admin/communicationType.models";
+} from "@/viewmodels/admin/settings/communicationType.models";
 import { http } from "@/serverCom";
 import type { AxiosResponse } from "axios";
 import type { CommunicationFieldType } from "@/types/fieldTypes";
diff --git a/src/stores/admin/executivePosition.ts b/src/stores/admin/settings/executivePosition.ts
similarity index 96%
rename from src/stores/admin/executivePosition.ts
rename to src/stores/admin/settings/executivePosition.ts
index 49eb8f3..9e6241b 100644
--- a/src/stores/admin/executivePosition.ts
+++ b/src/stores/admin/settings/executivePosition.ts
@@ -3,7 +3,7 @@ import type {
   CreateExecutivePositionViewModel,
   UpdateExecutivePositionViewModel,
   ExecutivePositionViewModel,
-} from "@/viewmodels/admin/executivePosition.models";
+} from "@/viewmodels/admin/settings/executivePosition.models";
 import { http } from "@/serverCom";
 import type { AxiosResponse } from "axios";
 
diff --git a/src/stores/admin/membershipStatus.ts b/src/stores/admin/settings/membershipStatus.ts
similarity index 96%
rename from src/stores/admin/membershipStatus.ts
rename to src/stores/admin/settings/membershipStatus.ts
index 6d3f6aa..8861e4c 100644
--- a/src/stores/admin/membershipStatus.ts
+++ b/src/stores/admin/settings/membershipStatus.ts
@@ -3,7 +3,7 @@ import type {
   CreateMembershipStatusViewModel,
   UpdateMembershipStatusViewModel,
   MembershipStatusViewModel,
-} from "@/viewmodels/admin/membershipStatus.models";
+} from "@/viewmodels/admin/settings/membershipStatus.models";
 import { http } from "@/serverCom";
 import type { AxiosResponse } from "axios";
 
diff --git a/src/stores/admin/newsletterConfig.ts b/src/stores/admin/settings/newsletterConfig.ts
similarity index 95%
rename from src/stores/admin/newsletterConfig.ts
rename to src/stores/admin/settings/newsletterConfig.ts
index 64b0b8b..b5f142c 100644
--- a/src/stores/admin/newsletterConfig.ts
+++ b/src/stores/admin/settings/newsletterConfig.ts
@@ -2,7 +2,7 @@ import { defineStore } from "pinia";
 import type {
   SetNewsletterConfigViewModel,
   NewsletterConfigViewModel,
-} from "@/viewmodels/admin/newsletterConfig.models";
+} from "@/viewmodels/admin/settings/newsletterConfig.models";
 import { http } from "@/serverCom";
 import type { AxiosResponse } from "axios";
 
diff --git a/src/stores/admin/qualification.ts b/src/stores/admin/settings/qualification.ts
similarity index 96%
rename from src/stores/admin/qualification.ts
rename to src/stores/admin/settings/qualification.ts
index 7deec52..b755e29 100644
--- a/src/stores/admin/qualification.ts
+++ b/src/stores/admin/settings/qualification.ts
@@ -3,7 +3,7 @@ import type {
   CreateQualificationViewModel,
   UpdateQualificationViewModel,
   QualificationViewModel,
-} from "@/viewmodels/admin/qualification.models";
+} from "@/viewmodels/admin/settings/qualification.models";
 import { http } from "@/serverCom";
 import type { AxiosResponse } from "axios";
 
diff --git a/src/stores/admin/queryStore.ts b/src/stores/admin/settings/queryStore.ts
similarity index 92%
rename from src/stores/admin/queryStore.ts
rename to src/stores/admin/settings/queryStore.ts
index ddc6c1a..764f146 100644
--- a/src/stores/admin/queryStore.ts
+++ b/src/stores/admin/settings/queryStore.ts
@@ -1,11 +1,11 @@
 import { defineStore } from "pinia";
-import type { CreateQueryViewModel, QueryViewModel, UpdateQueryViewModel } from "@/viewmodels/admin/query.models";
+import type { CreateQueryViewModel, QueryViewModel, UpdateQueryViewModel } from "@/viewmodels/admin/settings/query.models";
 import { http } from "@/serverCom";
 import type { AxiosResponse } from "axios";
-import { useQueryBuilderStore } from "./queryBuilder";
-import { useModalStore } from "../modal";
+import { useQueryBuilderStore } from "../club/queryBuilder";
+import { useModalStore } from "../../modal";
 import { defineAsyncComponent, markRaw } from "vue";
-import { useAbilityStore } from "../ability";
+import { useAbilityStore } from "../../ability";
 
 export const useQueryStoreStore = defineStore("queryStore", {
   state: () => {
diff --git a/src/stores/admin/template.ts b/src/stores/admin/settings/template.ts
similarity index 97%
rename from src/stores/admin/template.ts
rename to src/stores/admin/settings/template.ts
index 5f0484f..706002e 100644
--- a/src/stores/admin/template.ts
+++ b/src/stores/admin/settings/template.ts
@@ -5,7 +5,7 @@ import type {
   CreateTemplateViewModel,
   TemplateViewModel,
   UpdateTemplateViewModel,
-} from "@/viewmodels/admin/template.models";
+} from "@/viewmodels/admin/settings/template.models";
 
 export const useTemplateStore = defineStore("template", {
   state: () => {
diff --git a/src/stores/admin/templateUsage.ts b/src/stores/admin/settings/templateUsage.ts
similarity index 87%
rename from src/stores/admin/templateUsage.ts
rename to src/stores/admin/settings/templateUsage.ts
index 6e3aca9..89375b9 100644
--- a/src/stores/admin/templateUsage.ts
+++ b/src/stores/admin/settings/templateUsage.ts
@@ -1,8 +1,8 @@
 import { defineStore } from "pinia";
 import { http } from "@/serverCom";
 import type { AxiosResponse } from "axios";
-import type { CreateTemplateViewModel, UpdateTemplateViewModel } from "@/viewmodels/admin/template.models";
-import type { TemplateUsageViewModel, UpdateTemplateUsageViewModel } from "@/viewmodels/admin/templateUsage.models";
+import type { CreateTemplateViewModel, UpdateTemplateViewModel } from "@/viewmodels/admin/settings/template.models";
+import type { TemplateUsageViewModel, UpdateTemplateUsageViewModel } from "@/viewmodels/admin/settings/templateUsage.models";
 import type { PermissionModule } from "@/types/permissionTypes";
 
 export const useTemplateUsageStore = defineStore("templateUsage", {
@@ -35,6 +35,8 @@ export const useTemplateUsageStore = defineStore("templateUsage", {
         headerId: templateUsage.headerId,
         bodyId: templateUsage.bodyId,
         footerId: templateUsage.footerId,
+        headerHeight: templateUsage.headerHeight,
+        footerHeight: templateUsage.footerHeight,
       });
       this.fetchTemplateUsages();
       return result;
diff --git a/src/stores/admin/invite.ts b/src/stores/admin/user/invite.ts
similarity index 97%
rename from src/stores/admin/invite.ts
rename to src/stores/admin/user/invite.ts
index 58f72ed..2e0695d 100644
--- a/src/stores/admin/invite.ts
+++ b/src/stores/admin/user/invite.ts
@@ -1,5 +1,5 @@
 import { defineStore } from "pinia";
-import type { CreateInviteViewModel, InviteViewModel } from "@/viewmodels/admin/invite.models";
+import type { CreateInviteViewModel, InviteViewModel } from "@/viewmodels/admin/user/invite.models";
 import { http } from "@/serverCom";
 import type { PermissionObject } from "@/types/permissionTypes";
 import type { AxiosResponse } from "axios";
diff --git a/src/stores/admin/role.ts b/src/stores/admin/user/role.ts
similarity index 95%
rename from src/stores/admin/role.ts
rename to src/stores/admin/user/role.ts
index 93c997c..a5401ed 100644
--- a/src/stores/admin/role.ts
+++ b/src/stores/admin/user/role.ts
@@ -1,5 +1,5 @@
 import { defineStore } from "pinia";
-import type { RoleViewModel } from "@/viewmodels/admin/role.models";
+import type { RoleViewModel } from "@/viewmodels/admin/user/role.models";
 import { http } from "@/serverCom";
 import type { PermissionObject } from "@/types/permissionTypes";
 import type { AxiosResponse } from "axios";
diff --git a/src/stores/admin/user.ts b/src/stores/admin/user/user.ts
similarity index 98%
rename from src/stores/admin/user.ts
rename to src/stores/admin/user/user.ts
index 0b573cb..5696063 100644
--- a/src/stores/admin/user.ts
+++ b/src/stores/admin/user/user.ts
@@ -1,5 +1,5 @@
 import { defineStore } from "pinia";
-import type { UpdateUserViewModel, UserViewModel } from "@/viewmodels/admin/user.models";
+import type { UpdateUserViewModel, UserViewModel } from "@/viewmodels/admin/user/user.models";
 import { http } from "@/serverCom";
 import type { PermissionObject } from "@/types/permissionTypes";
 import type { AxiosResponse } from "axios";
diff --git a/src/viewmodels/admin/calendar.models.ts b/src/viewmodels/admin/club/calendar.models.ts
similarity index 88%
rename from src/viewmodels/admin/calendar.models.ts
rename to src/viewmodels/admin/club/calendar.models.ts
index a724305..ee663c1 100644
--- a/src/viewmodels/admin/calendar.models.ts
+++ b/src/viewmodels/admin/club/calendar.models.ts
@@ -1,4 +1,4 @@
-import type { CalendarTypeViewModel } from "./calendarType.models";
+import type { CalendarTypeViewModel } from "../settings/calendarType.models";
 
 export interface CalendarViewModel {
   id: string;
diff --git a/src/viewmodels/admin/communication.models.ts b/src/viewmodels/admin/club/member/communication.models.ts
similarity index 90%
rename from src/viewmodels/admin/communication.models.ts
rename to src/viewmodels/admin/club/member/communication.models.ts
index 4f54af2..8ca4af0 100644
--- a/src/viewmodels/admin/communication.models.ts
+++ b/src/viewmodels/admin/club/member/communication.models.ts
@@ -1,4 +1,4 @@
-import type { CommunicationTypeViewModel } from "./communicationType.models";
+import type { CommunicationTypeViewModel } from "../../settings/communicationType.models";
 
 export interface CommunicationViewModel {
   id: number;
diff --git a/src/viewmodels/admin/member.models.ts b/src/viewmodels/admin/club/member/member.models.ts
similarity index 92%
rename from src/viewmodels/admin/member.models.ts
rename to src/viewmodels/admin/club/member/member.models.ts
index 0f95af6..ca5fcc1 100644
--- a/src/viewmodels/admin/member.models.ts
+++ b/src/viewmodels/admin/club/member/member.models.ts
@@ -9,6 +9,7 @@ export interface MemberViewModel {
   lastname: string;
   nameaffix: string;
   birthdate: Date;
+  internalId?: string;
   firstMembershipEntry?: MembershipViewModel;
   lastMembershipEntry?: MembershipViewModel;
   sendNewsletter?: CommunicationViewModel;
@@ -22,6 +23,7 @@ export interface CreateMemberViewModel {
   lastname: string;
   nameaffix: string;
   birthdate: Date;
+  internalId?: string;
 }
 
 export interface UpdateMemberViewModel {
@@ -31,4 +33,5 @@ export interface UpdateMemberViewModel {
   lastname: string;
   nameaffix: string;
   birthdate: Date;
+  internalId?: string;
 }
diff --git a/src/viewmodels/admin/memberAward.models.ts b/src/viewmodels/admin/club/member/memberAward.models.ts
similarity index 100%
rename from src/viewmodels/admin/memberAward.models.ts
rename to src/viewmodels/admin/club/member/memberAward.models.ts
diff --git a/src/viewmodels/admin/memberExecutivePosition.models.ts b/src/viewmodels/admin/club/member/memberExecutivePosition.models.ts
similarity index 100%
rename from src/viewmodels/admin/memberExecutivePosition.models.ts
rename to src/viewmodels/admin/club/member/memberExecutivePosition.models.ts
diff --git a/src/viewmodels/admin/memberQualification.models.ts b/src/viewmodels/admin/club/member/memberQualification.models.ts
similarity index 100%
rename from src/viewmodels/admin/memberQualification.models.ts
rename to src/viewmodels/admin/club/member/memberQualification.models.ts
diff --git a/src/viewmodels/admin/membership.models.ts b/src/viewmodels/admin/club/member/membership.models.ts
similarity index 84%
rename from src/viewmodels/admin/membership.models.ts
rename to src/viewmodels/admin/club/member/membership.models.ts
index 76b804e..82ede06 100644
--- a/src/viewmodels/admin/membership.models.ts
+++ b/src/viewmodels/admin/club/member/membership.models.ts
@@ -1,6 +1,5 @@
 export interface MembershipViewModel {
   id: number;
-  internalId?: string;
   start: Date;
   end?: Date;
   terminationReason?: string;
@@ -9,14 +8,12 @@ export interface MembershipViewModel {
 }
 
 export interface CreateMembershipViewModel {
-  internalId?: string;
   start: Date;
   statusId: number;
 }
 
 export interface UpdateMembershipViewModel {
   id: number;
-  internalId?: string;
   start: Date;
   end?: Date;
   terminationReason?: string;
diff --git a/src/viewmodels/admin/newsletter.models.ts b/src/viewmodels/admin/club/newsletter/newsletter.models.ts
similarity index 90%
rename from src/viewmodels/admin/newsletter.models.ts
rename to src/viewmodels/admin/club/newsletter/newsletter.models.ts
index 19347b1..0f3e23b 100644
--- a/src/viewmodels/admin/newsletter.models.ts
+++ b/src/viewmodels/admin/club/newsletter/newsletter.models.ts
@@ -1,4 +1,4 @@
-import type { QueryViewModel } from "./query.models";
+import type { QueryViewModel } from "../../settings/query.models";
 
 export interface NewsletterViewModel {
   id: number;
diff --git a/src/viewmodels/admin/newsletterDates.models.ts b/src/viewmodels/admin/club/newsletter/newsletterDates.models.ts
similarity index 83%
rename from src/viewmodels/admin/newsletterDates.models.ts
rename to src/viewmodels/admin/club/newsletter/newsletterDates.models.ts
index 5afe116..3db4d5b 100644
--- a/src/viewmodels/admin/newsletterDates.models.ts
+++ b/src/viewmodels/admin/club/newsletter/newsletterDates.models.ts
@@ -1,4 +1,4 @@
-import type { CalendarViewModel } from "./calendar.models";
+import type { CalendarViewModel } from "../calendar.models";
 
 export interface NewsletterDatesViewModel {
   newsletterId: number;
diff --git a/src/viewmodels/admin/newsletterRecipients.models.ts b/src/viewmodels/admin/club/newsletter/newsletterRecipients.models.ts
similarity index 75%
rename from src/viewmodels/admin/newsletterRecipients.models.ts
rename to src/viewmodels/admin/club/newsletter/newsletterRecipients.models.ts
index 134fc90..7e5ab15 100644
--- a/src/viewmodels/admin/newsletterRecipients.models.ts
+++ b/src/viewmodels/admin/club/newsletter/newsletterRecipients.models.ts
@@ -1,4 +1,4 @@
-import type { MemberViewModel } from "./member.models";
+import type { MemberViewModel } from "../member/member.models";
 
 export interface NewsletterRecipientsViewModel {
   newsletterId: number;
diff --git a/src/viewmodels/admin/protocol.models.ts b/src/viewmodels/admin/club/protocol/protocol.models.ts
similarity index 100%
rename from src/viewmodels/admin/protocol.models.ts
rename to src/viewmodels/admin/club/protocol/protocol.models.ts
diff --git a/src/viewmodels/admin/protocolAgenda.models.ts b/src/viewmodels/admin/club/protocol/protocolAgenda.models.ts
similarity index 100%
rename from src/viewmodels/admin/protocolAgenda.models.ts
rename to src/viewmodels/admin/club/protocol/protocolAgenda.models.ts
diff --git a/src/viewmodels/admin/protocolDecision.models.ts b/src/viewmodels/admin/club/protocol/protocolDecision.models.ts
similarity index 100%
rename from src/viewmodels/admin/protocolDecision.models.ts
rename to src/viewmodels/admin/club/protocol/protocolDecision.models.ts
diff --git a/src/viewmodels/admin/protocolPresence.models.ts b/src/viewmodels/admin/club/protocol/protocolPresence.models.ts
similarity index 75%
rename from src/viewmodels/admin/protocolPresence.models.ts
rename to src/viewmodels/admin/club/protocol/protocolPresence.models.ts
index d72d916..a395172 100644
--- a/src/viewmodels/admin/protocolPresence.models.ts
+++ b/src/viewmodels/admin/club/protocol/protocolPresence.models.ts
@@ -1,4 +1,4 @@
-import type { MemberViewModel } from "./member.models";
+import type { MemberViewModel } from "../member/member.models";
 
 export interface ProtocolPresenceViewModel {
   memberId: number;
diff --git a/src/viewmodels/admin/protocolPrintout.models.ts b/src/viewmodels/admin/club/protocol/protocolPrintout.models.ts
similarity index 100%
rename from src/viewmodels/admin/protocolPrintout.models.ts
rename to src/viewmodels/admin/club/protocol/protocolPrintout.models.ts
diff --git a/src/viewmodels/admin/protocolVoting.models.ts b/src/viewmodels/admin/club/protocol/protocolVoting.models.ts
similarity index 100%
rename from src/viewmodels/admin/protocolVoting.models.ts
rename to src/viewmodels/admin/club/protocol/protocolVoting.models.ts
diff --git a/src/viewmodels/admin/award.models.ts b/src/viewmodels/admin/settings/award.models.ts
similarity index 100%
rename from src/viewmodels/admin/award.models.ts
rename to src/viewmodels/admin/settings/award.models.ts
diff --git a/src/viewmodels/admin/calendarType.models.ts b/src/viewmodels/admin/settings/calendarType.models.ts
similarity index 100%
rename from src/viewmodels/admin/calendarType.models.ts
rename to src/viewmodels/admin/settings/calendarType.models.ts
diff --git a/src/viewmodels/admin/communicationType.models.ts b/src/viewmodels/admin/settings/communicationType.models.ts
similarity index 100%
rename from src/viewmodels/admin/communicationType.models.ts
rename to src/viewmodels/admin/settings/communicationType.models.ts
diff --git a/src/viewmodels/admin/executivePosition.models.ts b/src/viewmodels/admin/settings/executivePosition.models.ts
similarity index 100%
rename from src/viewmodels/admin/executivePosition.models.ts
rename to src/viewmodels/admin/settings/executivePosition.models.ts
diff --git a/src/viewmodels/admin/membershipStatus.models.ts b/src/viewmodels/admin/settings/membershipStatus.models.ts
similarity index 100%
rename from src/viewmodels/admin/membershipStatus.models.ts
rename to src/viewmodels/admin/settings/membershipStatus.models.ts
diff --git a/src/viewmodels/admin/newsletterConfig.models.ts b/src/viewmodels/admin/settings/newsletterConfig.models.ts
similarity index 100%
rename from src/viewmodels/admin/newsletterConfig.models.ts
rename to src/viewmodels/admin/settings/newsletterConfig.models.ts
diff --git a/src/viewmodels/admin/qualification.models.ts b/src/viewmodels/admin/settings/qualification.models.ts
similarity index 100%
rename from src/viewmodels/admin/qualification.models.ts
rename to src/viewmodels/admin/settings/qualification.models.ts
diff --git a/src/viewmodels/admin/query.models.ts b/src/viewmodels/admin/settings/query.models.ts
similarity index 100%
rename from src/viewmodels/admin/query.models.ts
rename to src/viewmodels/admin/settings/query.models.ts
diff --git a/src/viewmodels/admin/template.models.ts b/src/viewmodels/admin/settings/template.models.ts
similarity index 100%
rename from src/viewmodels/admin/template.models.ts
rename to src/viewmodels/admin/settings/template.models.ts
diff --git a/src/viewmodels/admin/templateUsage.models.ts b/src/viewmodels/admin/settings/templateUsage.models.ts
similarity index 78%
rename from src/viewmodels/admin/templateUsage.models.ts
rename to src/viewmodels/admin/settings/templateUsage.models.ts
index 79459cd..8aa7d1f 100644
--- a/src/viewmodels/admin/templateUsage.models.ts
+++ b/src/viewmodels/admin/settings/templateUsage.models.ts
@@ -5,6 +5,8 @@ export interface TemplateUsageViewModel {
   header: { id: number; template: string } | null;
   body: { id: number; template: string } | null;
   footer: { id: number; template: string } | null;
+  headerHeight: number | null;
+  footerHeight: number | null;
 }
 
 export interface UpdateTemplateUsageViewModel {
@@ -12,4 +14,6 @@ export interface UpdateTemplateUsageViewModel {
   headerId: number | null;
   bodyId: number | null;
   footerId: number | null;
+  headerHeight: number | null;
+  footerHeight: number | null;
 }
diff --git a/src/viewmodels/admin/invite.models.ts b/src/viewmodels/admin/user/invite.models.ts
similarity index 100%
rename from src/viewmodels/admin/invite.models.ts
rename to src/viewmodels/admin/user/invite.models.ts
diff --git a/src/viewmodels/admin/role.models.ts b/src/viewmodels/admin/user/role.models.ts
similarity index 100%
rename from src/viewmodels/admin/role.models.ts
rename to src/viewmodels/admin/user/role.models.ts
diff --git a/src/viewmodels/admin/user.models.ts b/src/viewmodels/admin/user/user.models.ts
similarity index 100%
rename from src/viewmodels/admin/user.models.ts
rename to src/viewmodels/admin/user/user.models.ts
diff --git a/src/views/account/Administration.vue b/src/views/account/Administration.vue
index fad7ec1..e6dd5ca 100644
--- a/src/views/account/Administration.vue
+++ b/src/views/account/Administration.vue
@@ -88,7 +88,7 @@ import MainTemplate from "@/templates/Main.vue";
 import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
-import { useUserStore } from "@/stores/admin/user";
+import { useUserStore } from "@/stores/admin/user/user";
 import { isAuthenticatedPromise } from "@/router/authGuard";
 import {
   Combobox,
@@ -100,7 +100,7 @@ import {
   TransitionRoot,
 } from "@headlessui/vue";
 import { CheckIcon, ChevronUpDownIcon } from "@heroicons/vue/20/solid";
-import type { UserViewModel } from "@/viewmodels/admin/user.models";
+import type { UserViewModel } from "@/viewmodels/admin/user/user.models";
 </script>
 
 <script lang="ts">
diff --git a/src/views/account/Me.vue b/src/views/account/Me.vue
index df15146..8e2990e 100644
--- a/src/views/account/Me.vue
+++ b/src/views/account/Me.vue
@@ -48,7 +48,7 @@
 <script setup lang="ts">
 import { defineComponent, markRaw, defineAsyncComponent } from "vue";
 import { mapActions, mapState } from "pinia";
-import type { UserViewModel } from "@/viewmodels/admin/user.models";
+import type { UserViewModel } from "@/viewmodels/admin/user/user.models";
 import MainTemplate from "@/templates/Main.vue";
 import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
diff --git a/src/views/admin/club/calendar/Calendar.vue b/src/views/admin/club/calendar/Calendar.vue
index fbb4e25..4487079 100644
--- a/src/views/admin/club/calendar/Calendar.vue
+++ b/src/views/admin/club/calendar/Calendar.vue
@@ -24,7 +24,7 @@ import deLocale from "@fullcalendar/core/locales/de";
 import dayGridPlugin from "@fullcalendar/daygrid";
 import timeGridPlugin from "@fullcalendar/timegrid";
 import interactionPlugin from "@fullcalendar/interaction";
-import { useCalendarStore } from "@/stores/admin/calendar";
+import { useCalendarStore } from "@/stores/admin/club/calendar";
 import { useAbilityStore } from "@/stores/ability";
 import { LinkIcon } from "@heroicons/vue/24/outline";
 </script>
diff --git a/src/views/admin/club/members/Member.vue b/src/views/admin/club/members/Member.vue
index a53b80a..2d98b4d 100644
--- a/src/views/admin/club/members/Member.vue
+++ b/src/views/admin/club/members/Member.vue
@@ -11,8 +11,9 @@
           :items="members"
           :totalCount="totalCount"
           :indicateLoading="loading == 'loading'"
-          @load-data="(offset, count, search) => fetchMembers(offset, count)"
-          @search="(search) => fetchMembers(0, 25, true)"
+          :useSearch="true"
+          @load-data="(offset, count, search) => fetchMembers(offset, count, search)"
+          @search="(search) => fetchMembers(0, maxEntriesPerPage, search, true)"
         >
           <template #pageRow="{ row }: { row: MemberViewModel }">
             <MemberListItem :member="row" />
@@ -33,12 +34,11 @@
 import { defineAsyncComponent, defineComponent, markRaw } from "vue";
 import { mapActions, mapState } from "pinia";
 import MainTemplate from "@/templates/Main.vue";
-import { ChevronRightIcon, ChevronLeftIcon } from "@heroicons/vue/20/solid";
-import { useMemberStore } from "@/stores/admin/member";
+import { useMemberStore } from "@/stores/admin/club/member/member";
 import MemberListItem from "@/components/admin/club/member/MemberListItem.vue";
 import { useModalStore } from "@/stores/modal";
 import Pagination from "@/components/Pagination.vue";
-import type { MemberViewModel } from "@/viewmodels/admin/member.models";
+import type { MemberViewModel } from "@/viewmodels/admin/club/member/member.models";
 import { useAbilityStore } from "@/stores/ability";
 </script>
 
@@ -55,7 +55,7 @@ export default defineComponent({
     ...mapState(useAbilityStore, ["can"]),
   },
   mounted() {
-    this.fetchMembers(0, this.maxEntriesPerPage, true);
+    this.fetchMembers(0, this.maxEntriesPerPage, "", true);
   },
   methods: {
     ...mapActions(useMemberStore, ["fetchMembers"]),
diff --git a/src/views/admin/club/members/MemberAwards.vue b/src/views/admin/club/members/MemberAwards.vue
index bea48f3..f535d27 100644
--- a/src/views/admin/club/members/MemberAwards.vue
+++ b/src/views/admin/club/members/MemberAwards.vue
@@ -17,7 +17,7 @@
 import { defineAsyncComponent, defineComponent, markRaw } from "vue";
 import { mapActions, mapState } from "pinia";
 import Spinner from "@/components/Spinner.vue";
-import { useMemberAwardStore } from "@/stores/admin/memberAward";
+import { useMemberAwardStore } from "@/stores/admin/club/member/memberAward";
 import MemberAwardListItem from "@/components/admin/club/member/MemberAwardListItem.vue";
 import { useModalStore } from "@/stores/modal";
 import { useAbilityStore } from "@/stores/ability";
diff --git a/src/views/admin/club/members/MemberCommunication.vue b/src/views/admin/club/members/MemberCommunication.vue
index c6ac9f7..c948c22 100644
--- a/src/views/admin/club/members/MemberCommunication.vue
+++ b/src/views/admin/club/members/MemberCommunication.vue
@@ -20,11 +20,11 @@
 <script setup lang="ts">
 import { defineAsyncComponent, defineComponent, markRaw } from "vue";
 import { mapActions, mapState } from "pinia";
-import { useMemberStore } from "@/stores/admin/member";
-import type { MemberViewModel, UpdateMemberViewModel } from "@/viewmodels/admin/member.models";
+import { useMemberStore } from "@/stores/admin/club/member/member";
+import type { MemberViewModel, UpdateMemberViewModel } from "@/viewmodels/admin/club/member/member.models";
 import Spinner from "@/components/Spinner.vue";
-import type { CommunicationViewModel } from "@/viewmodels/admin/communication.models";
-import { useCommunicationStore } from "@/stores/admin/communication";
+import type { CommunicationViewModel } from "@/viewmodels/admin/club/member/communication.models";
+import { useCommunicationStore } from "@/stores/admin/club/member/communication";
 import MemberCommunicationListItem from "@/components/admin/club/member/MemberCommunicationListItem.vue";
 import { useModalStore } from "@/stores/modal";
 import { useAbilityStore } from "@/stores/ability";
diff --git a/src/views/admin/club/members/MemberEdit.vue b/src/views/admin/club/members/MemberEdit.vue
index aa70158..af6e56b 100644
--- a/src/views/admin/club/members/MemberEdit.vue
+++ b/src/views/admin/club/members/MemberEdit.vue
@@ -69,6 +69,10 @@
         <label for="birthdate">Geburtsdatum</label>
         <input type="date" id="birthdate" required v-model="member.birthdate" />
       </div>
+      <div>
+        <label for="internalId">Interne ID (optional)</label>
+        <input type="text" id="internalId" v-model="member.internalId" />
+      </div>
       <div class="flex flex-row justify-end gap-2">
         <button primary-outline type="reset" class="!w-fit" :disabled="canSaveOrReset" @click="resetForm">
           verwerfen
@@ -88,8 +92,8 @@
 import { defineComponent } from "vue";
 import { mapActions, mapState } from "pinia";
 import MainTemplate from "@/templates/Main.vue";
-import { useMemberStore } from "@/stores/admin/member";
-import type { MemberViewModel, UpdateMemberViewModel } from "@/viewmodels/admin/member.models";
+import { useMemberStore } from "@/stores/admin/club/member/member";
+import type { MemberViewModel, UpdateMemberViewModel } from "@/viewmodels/admin/club/member/member.models";
 import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
@@ -154,7 +158,8 @@ export default defineComponent({
         firstname: formData.firstname.value,
         lastname: formData.lastname.value,
         nameaffix: formData.nameaffix.value,
-        birthdate: formData.birthdate.value,
+        birthdate: formData.birthdate.value,        
+        internalId: formData.internalId.value,
       };
       this.status = "loading";
       this.updateActiveMember(updateMember)
diff --git a/src/views/admin/club/members/MemberExecutivePositions.vue b/src/views/admin/club/members/MemberExecutivePositions.vue
index e4f39bf..3ebfe98 100644
--- a/src/views/admin/club/members/MemberExecutivePositions.vue
+++ b/src/views/admin/club/members/MemberExecutivePositions.vue
@@ -21,7 +21,7 @@
 import { defineAsyncComponent, defineComponent, markRaw } from "vue";
 import { mapActions, mapState } from "pinia";
 import Spinner from "@/components/Spinner.vue";
-import { useMemberExecutivePositionStore } from "@/stores/admin/memberExecutivePosition";
+import { useMemberExecutivePositionStore } from "@/stores/admin/club/member/memberExecutivePosition";
 import MemberExecutivePositionListItem from "@/components/admin/club/member/MemberExecutivePositionListItem.vue";
 import { useModalStore } from "@/stores/modal";
 import { useAbilityStore } from "@/stores/ability";
diff --git a/src/views/admin/club/members/MemberOverview.vue b/src/views/admin/club/members/MemberOverview.vue
index b08f682..76bb61b 100644
--- a/src/views/admin/club/members/MemberOverview.vue
+++ b/src/views/admin/club/members/MemberOverview.vue
@@ -120,7 +120,7 @@
 import { defineComponent } from "vue";
 import { mapActions, mapState } from "pinia";
 import Spinner from "@/components/Spinner.vue";
-import { useMemberStore } from "@/stores/admin/member";
+import { useMemberStore } from "@/stores/admin/club/member/member";
 </script>
 
 <script lang="ts">
diff --git a/src/views/admin/club/members/MemberQualifications.vue b/src/views/admin/club/members/MemberQualifications.vue
index 7d03e6e..76b15cd 100644
--- a/src/views/admin/club/members/MemberQualifications.vue
+++ b/src/views/admin/club/members/MemberQualifications.vue
@@ -21,7 +21,7 @@
 import { defineAsyncComponent, defineComponent, markRaw } from "vue";
 import { mapActions, mapState } from "pinia";
 import Spinner from "@/components/Spinner.vue";
-import { useMemberQualificationStore } from "@/stores/admin/memberQualification";
+import { useMemberQualificationStore } from "@/stores/admin/club/member/memberQualification";
 import MemberQualificationListItem from "@/components/admin/club/member/MemberQualificationListItem.vue";
 import { useModalStore } from "@/stores/modal";
 import { useAbilityStore } from "@/stores/ability";
diff --git a/src/views/admin/club/members/MemberRouting.vue b/src/views/admin/club/members/MemberRouting.vue
index 125d69f..53ba05b 100644
--- a/src/views/admin/club/members/MemberRouting.vue
+++ b/src/views/admin/club/members/MemberRouting.vue
@@ -48,7 +48,7 @@ import { defineAsyncComponent, defineComponent, markRaw } from "vue";
 import { mapActions, mapState } from "pinia";
 import MainTemplate from "@/templates/Main.vue";
 import { RouterLink, RouterView } from "vue-router";
-import { useMemberStore } from "@/stores/admin/member";
+import { useMemberStore } from "@/stores/admin/club/member/member";
 import { PencilIcon, TrashIcon } from "@heroicons/vue/24/outline";
 import { useModalStore } from "@/stores/modal";
 import { useAbilityStore } from "@/stores/ability";
diff --git a/src/views/admin/club/members/Membership.vue b/src/views/admin/club/members/Membership.vue
index fee3485..1b5c9c5 100644
--- a/src/views/admin/club/members/Membership.vue
+++ b/src/views/admin/club/members/Membership.vue
@@ -17,7 +17,7 @@
 import { defineComponent, markRaw, defineAsyncComponent } from "vue";
 import { mapActions, mapState } from "pinia";
 import Spinner from "@/components/Spinner.vue";
-import { useMembershipStore } from "@/stores/admin/membership";
+import { useMembershipStore } from "@/stores/admin/club/member/membership";
 import { useModalStore } from "@/stores/modal";
 import MembershipListItem from "@/components/admin/club/member/MembershipListItem.vue";
 import { useAbilityStore } from "@/stores/ability";
diff --git a/src/views/admin/club/newsletter/Newsletter.vue b/src/views/admin/club/newsletter/Newsletter.vue
index 4541051..a6b3bed 100644
--- a/src/views/admin/club/newsletter/Newsletter.vue
+++ b/src/views/admin/club/newsletter/Newsletter.vue
@@ -36,8 +36,8 @@ import MainTemplate from "@/templates/Main.vue";
 import { useModalStore } from "@/stores/modal";
 import Pagination from "@/components/Pagination.vue";
 import { useAbilityStore } from "@/stores/ability";
-import { useNewsletterStore } from "@/stores/admin/newsletter";
-import type { NewsletterViewModel } from "@/viewmodels/admin/newsletter.models";
+import { useNewsletterStore } from "@/stores/admin/club/newsletter/newsletter";
+import type { NewsletterViewModel } from "@/viewmodels/admin/club/newsletter/newsletter.models";
 import NewsletterListItem from "../../../../components/admin/club/newsletter/NewsletterListItem.vue";
 </script>
 
diff --git a/src/views/admin/club/newsletter/NewsletterData.vue b/src/views/admin/club/newsletter/NewsletterData.vue
index ce665bd..f9195b6 100644
--- a/src/views/admin/club/newsletter/NewsletterData.vue
+++ b/src/views/admin/club/newsletter/NewsletterData.vue
@@ -51,7 +51,7 @@
 import { defineComponent } from "vue";
 import { mapActions, mapState, mapWritableState } from "pinia";
 import Spinner from "@/components/Spinner.vue";
-import { useNewsletterStore } from "@/stores/admin/newsletter";
+import { useNewsletterStore } from "@/stores/admin/club/newsletter/newsletter";
 import { QuillEditor } from "@vueup/vue-quill";
 import "@vueup/vue-quill/dist/vue-quill.snow.css";
 import { toolbarOptions } from "@/helpers/quillConfig";
diff --git a/src/views/admin/club/newsletter/NewsletterDates.vue b/src/views/admin/club/newsletter/NewsletterDates.vue
index cbc9414..152a63f 100644
--- a/src/views/admin/club/newsletter/NewsletterDates.vue
+++ b/src/views/admin/club/newsletter/NewsletterDates.vue
@@ -106,13 +106,13 @@ import Spinner from "@/components/Spinner.vue";
 import { QuillEditor } from "@vueup/vue-quill";
 import "@vueup/vue-quill/dist/vue-quill.snow.css";
 import { toolbarOptions } from "@/helpers/quillConfig";
-import { useNewsletterDatesStore } from "@/stores/admin/newsletterDates";
+import { useNewsletterDatesStore } from "@/stores/admin/club/newsletter/newsletterDates";
 import { useAbilityStore } from "@/stores/ability";
-import { useCalendarStore } from "@/stores/admin/calendar";
-import type { CalendarViewModel } from "@/viewmodels/admin/calendar.models";
+import { useCalendarStore } from "@/stores/admin/club/calendar";
+import type { CalendarViewModel } from "@/viewmodels/admin/club/calendar.models";
 import { TrashIcon } from "@heroicons/vue/24/outline";
 import cloneDeep from "lodash.clonedeep";
-import type { NewsletterDatesViewModel } from "@/viewmodels/admin/newsletterDates.models";
+import type { NewsletterDatesViewModel } from "@/viewmodels/admin/club/newsletter/newsletterDates.models";
 </script>
 
 <script lang="ts">
diff --git a/src/views/admin/club/newsletter/NewsletterOverview.vue b/src/views/admin/club/newsletter/NewsletterOverview.vue
index 54f6954..1097bc8 100644
--- a/src/views/admin/club/newsletter/NewsletterOverview.vue
+++ b/src/views/admin/club/newsletter/NewsletterOverview.vue
@@ -41,7 +41,7 @@
 import { defineComponent } from "vue";
 import { mapActions, mapState, mapWritableState } from "pinia";
 import Spinner from "@/components/Spinner.vue";
-import { useNewsletterStore } from "@/stores/admin/newsletter";
+import { useNewsletterStore } from "@/stores/admin/club/newsletter/newsletter";
 import { QuillEditor } from "@vueup/vue-quill";
 import "@vueup/vue-quill/dist/vue-quill.snow.css";
 import { toolbarOptions } from "@/helpers/quillConfig";
diff --git a/src/views/admin/club/newsletter/NewsletterPrintout.vue b/src/views/admin/club/newsletter/NewsletterPrintout.vue
index 72f384c..90c06c0 100644
--- a/src/views/admin/club/newsletter/NewsletterPrintout.vue
+++ b/src/views/admin/club/newsletter/NewsletterPrintout.vue
@@ -75,7 +75,7 @@ import FailureXMark from "@/components/FailureXMark.vue";
 import { ArrowDownTrayIcon, ViewfinderCircleIcon } from "@heroicons/vue/24/outline";
 import { useModalStore } from "@/stores/modal";
 import { useAbilityStore } from "@/stores/ability";
-import { useNewsletterPrintoutStore } from "../../../../stores/admin/newsletterPrintout";
+import { useNewsletterPrintoutStore } from "../../../../stores/admin/club/newsletter/newsletterPrintout";
 </script>
 
 <script lang="ts">
diff --git a/src/views/admin/club/newsletter/NewsletterRecipients.vue b/src/views/admin/club/newsletter/NewsletterRecipients.vue
index 9cd5f9b..d39c105 100644
--- a/src/views/admin/club/newsletter/NewsletterRecipients.vue
+++ b/src/views/admin/club/newsletter/NewsletterRecipients.vue
@@ -117,13 +117,13 @@ import {
 } from "@headlessui/vue";
 import { CheckIcon, ChevronUpDownIcon } from "@heroicons/vue/20/solid";
 import { TrashIcon } from "@heroicons/vue/24/outline";
-import { useMemberStore } from "@/stores/admin/member";
-import type { MemberViewModel } from "@/viewmodels/admin/member.models";
-import { useNewsletterStore } from "@/stores/admin/newsletter";
-import { useNewsletterRecipientsStore } from "@/stores/admin/newsletterRecipients";
+import { useMemberStore } from "@/stores/admin/club/member/member";
+import type { MemberViewModel } from "@/viewmodels/admin/club/member/member.models";
+import { useNewsletterStore } from "@/stores/admin/club/newsletter/newsletter";
+import { useNewsletterRecipientsStore } from "@/stores/admin/club/newsletter/newsletterRecipients";
 import { useAbilityStore } from "@/stores/ability";
-import { useQueryStoreStore } from "@/stores/admin/queryStore";
-import { useQueryBuilderStore } from "@/stores/admin/queryBuilder";
+import { useQueryStoreStore } from "@/stores/admin/settings/queryStore";
+import { useQueryBuilderStore } from "@/stores/admin/club/queryBuilder";
 import cloneDeep from "lodash.clonedeep";
 </script>
 
diff --git a/src/views/admin/club/newsletter/NewsletterRouting.vue b/src/views/admin/club/newsletter/NewsletterRouting.vue
index 351d8ab..16458a1 100644
--- a/src/views/admin/club/newsletter/NewsletterRouting.vue
+++ b/src/views/admin/club/newsletter/NewsletterRouting.vue
@@ -49,12 +49,12 @@ import { defineAsyncComponent, defineComponent, markRaw } from "vue";
 import { mapActions, mapState } from "pinia";
 import MainTemplate from "@/templates/Main.vue";
 import { RouterLink, RouterView } from "vue-router";
-import { useNewsletterStore } from "@/stores/admin/newsletter";
+import { useNewsletterStore } from "@/stores/admin/club/newsletter/newsletter";
 import { useModalStore } from "@/stores/modal";
 import NewsletterSyncing from "@/components/admin/club/newsletter/NewsletterSyncing.vue";
 import { PrinterIcon } from "@heroicons/vue/24/outline";
-import { useNewsletterDatesStore } from "../../../../stores/admin/newsletterDates";
-import { useNewsletterRecipientsStore } from "../../../../stores/admin/newsletterRecipients";
+import { useNewsletterDatesStore } from "../../../../stores/admin/club/newsletter/newsletterDates";
+import { useNewsletterRecipientsStore } from "../../../../stores/admin/club/newsletter/newsletterRecipients";
 </script>
 
 <script lang="ts">
diff --git a/src/views/admin/club/protocol/Protocol.vue b/src/views/admin/club/protocol/Protocol.vue
index 9746b96..b19c874 100644
--- a/src/views/admin/club/protocol/Protocol.vue
+++ b/src/views/admin/club/protocol/Protocol.vue
@@ -34,11 +34,11 @@ import { defineAsyncComponent, defineComponent, markRaw } from "vue";
 import { mapActions, mapState } from "pinia";
 import MainTemplate from "@/templates/Main.vue";
 import { ChevronRightIcon, ChevronLeftIcon } from "@heroicons/vue/20/solid";
-import { useProtocolStore } from "@/stores/admin/protocol";
+import { useProtocolStore } from "@/stores/admin/club/protocol/protocol";
 import ProtocolListItem from "@/components/admin/club/protocol/ProtocolListItem.vue";
 import { useModalStore } from "@/stores/modal";
 import Pagination from "@/components/Pagination.vue";
-import type { ProtocolViewModel } from "@/viewmodels/admin/protocol.models";
+import type { ProtocolViewModel } from "@/viewmodels/admin/club/protocol/protocol.models";
 import { useAbilityStore } from "@/stores/ability";
 </script>
 
diff --git a/src/views/admin/club/protocol/ProtocolAgenda.vue b/src/views/admin/club/protocol/ProtocolAgenda.vue
index a83f314..767d723 100644
--- a/src/views/admin/club/protocol/ProtocolAgenda.vue
+++ b/src/views/admin/club/protocol/ProtocolAgenda.vue
@@ -58,8 +58,8 @@ import Spinner from "@/components/Spinner.vue";
 import { QuillEditor } from "@vueup/vue-quill";
 import "@vueup/vue-quill/dist/vue-quill.snow.css";
 import { toolbarOptions } from "@/helpers/quillConfig";
-import { useProtocolAgendaStore } from "@/stores/admin/protocolAgenda";
-import type { ProtocolAgendaViewModel } from "@/viewmodels/admin/protocolAgenda.models";
+import { useProtocolAgendaStore } from "@/stores/admin/club/protocol/protocolAgenda";
+import type { ProtocolAgendaViewModel } from "@/viewmodels/admin/club/protocol/protocolAgenda.models";
 import { useAbilityStore } from "@/stores/ability";
 </script>
 
diff --git a/src/views/admin/club/protocol/ProtocolDecisions.vue b/src/views/admin/club/protocol/ProtocolDecisions.vue
index d365498..9f72172 100644
--- a/src/views/admin/club/protocol/ProtocolDecisions.vue
+++ b/src/views/admin/club/protocol/ProtocolDecisions.vue
@@ -55,11 +55,11 @@
 import { defineComponent } from "vue";
 import { mapActions, mapState, mapWritableState } from "pinia";
 import Spinner from "@/components/Spinner.vue";
-import { useProtocolStore } from "@/stores/admin/protocol";
+import { useProtocolStore } from "@/stores/admin/club/protocol/protocol";
 import { QuillEditor } from "@vueup/vue-quill";
 import "@vueup/vue-quill/dist/vue-quill.snow.css";
 import { toolbarOptions } from "@/helpers/quillConfig";
-import { useProtocolDecisionStore } from "@/stores/admin/protocolDecision";
+import { useProtocolDecisionStore } from "@/stores/admin/club/protocol/protocolDecision";
 import { useAbilityStore } from "@/stores/ability";
 </script>
 
diff --git a/src/views/admin/club/protocol/ProtocolOverview.vue b/src/views/admin/club/protocol/ProtocolOverview.vue
index e14788a..4a14774 100644
--- a/src/views/admin/club/protocol/ProtocolOverview.vue
+++ b/src/views/admin/club/protocol/ProtocolOverview.vue
@@ -63,7 +63,7 @@
 import { defineComponent } from "vue";
 import { mapActions, mapState, mapWritableState } from "pinia";
 import Spinner from "@/components/Spinner.vue";
-import { useProtocolStore } from "@/stores/admin/protocol";
+import { useProtocolStore } from "@/stores/admin/club/protocol/protocol";
 import { QuillEditor } from "@vueup/vue-quill";
 import "@vueup/vue-quill/dist/vue-quill.snow.css";
 import { toolbarOptions } from "@/helpers/quillConfig";
diff --git a/src/views/admin/club/protocol/ProtocolPresence.vue b/src/views/admin/club/protocol/ProtocolPresence.vue
index be6aab5..8696512 100644
--- a/src/views/admin/club/protocol/ProtocolPresence.vue
+++ b/src/views/admin/club/protocol/ProtocolPresence.vue
@@ -96,10 +96,10 @@ import {
 } from "@headlessui/vue";
 import { CheckIcon, ChevronUpDownIcon } from "@heroicons/vue/20/solid";
 import { TrashIcon } from "@heroicons/vue/24/outline";
-import { useProtocolStore } from "@/stores/admin/protocol";
-import { useMemberStore } from "@/stores/admin/member";
-import type { MemberViewModel } from "@/viewmodels/admin/member.models";
-import { useProtocolPresenceStore } from "@/stores/admin/protocolPresence";
+import { useProtocolStore } from "@/stores/admin/club/protocol/protocol";
+import { useMemberStore } from "@/stores/admin/club/member/member";
+import type { MemberViewModel } from "@/viewmodels/admin/club/member/member.models";
+import { useProtocolPresenceStore } from "@/stores/admin/club/protocol/protocolPresence";
 import { useAbilityStore } from "@/stores/ability";
 </script>
 
diff --git a/src/views/admin/club/protocol/ProtocolPrintout.vue b/src/views/admin/club/protocol/ProtocolPrintout.vue
index 54ecd3d..132ebb2 100644
--- a/src/views/admin/club/protocol/ProtocolPrintout.vue
+++ b/src/views/admin/club/protocol/ProtocolPrintout.vue
@@ -52,7 +52,7 @@ import { mapActions, mapState } from "pinia";
 import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
-import { useProtocolPrintoutStore } from "@/stores/admin/protocolPrintout";
+import { useProtocolPrintoutStore } from "@/stores/admin/club/protocol/protocolPrintout";
 import { ArrowDownTrayIcon, ViewfinderCircleIcon } from "@heroicons/vue/24/outline";
 import { useModalStore } from "@/stores/modal";
 import { useAbilityStore } from "@/stores/ability";
diff --git a/src/views/admin/club/protocol/ProtocolRouting.vue b/src/views/admin/club/protocol/ProtocolRouting.vue
index e333896..b730fed 100644
--- a/src/views/admin/club/protocol/ProtocolRouting.vue
+++ b/src/views/admin/club/protocol/ProtocolRouting.vue
@@ -49,7 +49,7 @@ import { defineAsyncComponent, defineComponent, markRaw } from "vue";
 import { mapActions, mapState } from "pinia";
 import MainTemplate from "@/templates/Main.vue";
 import { RouterLink, RouterView } from "vue-router";
-import { useProtocolStore } from "@/stores/admin/protocol";
+import { useProtocolStore } from "@/stores/admin/club/protocol/protocol";
 import { useModalStore } from "@/stores/modal";
 import ProtocolSyncing from "@/components/admin/club/protocol/ProtocolSyncing.vue";
 import { PrinterIcon } from "@heroicons/vue/24/outline";
diff --git a/src/views/admin/club/protocol/ProtocolVoting.vue b/src/views/admin/club/protocol/ProtocolVoting.vue
index ce60bce..595ce43 100644
--- a/src/views/admin/club/protocol/ProtocolVoting.vue
+++ b/src/views/admin/club/protocol/ProtocolVoting.vue
@@ -72,11 +72,11 @@
 import { defineComponent } from "vue";
 import { mapActions, mapState } from "pinia";
 import Spinner from "@/components/Spinner.vue";
-import { useProtocolStore } from "@/stores/admin/protocol";
+import { useProtocolStore } from "@/stores/admin/club/protocol/protocol";
 import { QuillEditor } from "@vueup/vue-quill";
 import "@vueup/vue-quill/dist/vue-quill.snow.css";
 import { toolbarOptions } from "@/helpers/quillConfig";
-import { useProtocolVotingStore } from "@/stores/admin/protocolVoting";
+import { useProtocolVotingStore } from "@/stores/admin/club/protocol/protocolVoting";
 import { useAbilityStore } from "@/stores/ability";
 </script>
 
diff --git a/src/views/admin/club/query/Builder.vue b/src/views/admin/club/query/Builder.vue
index 762abc6..faba32c 100644
--- a/src/views/admin/club/query/Builder.vue
+++ b/src/views/admin/club/query/Builder.vue
@@ -61,10 +61,10 @@ import { defineComponent } from "vue";
 import { mapActions, mapState, mapWritableState } from "pinia";
 import MainTemplate from "@/templates/Main.vue";
 import Pagination from "@/components/Pagination.vue";
-import { useQueryBuilderStore } from "@/stores/admin/queryBuilder";
+import { useQueryBuilderStore } from "@/stores/admin/club/queryBuilder";
 import BuilderHost from "@/components/queryBuilder/BuilderHost.vue";
 import type { DynamicQueryStructure, FieldType } from "@/types/dynamicQueries";
-import { useQueryStoreStore } from "@/stores/admin/queryStore";
+import { useQueryStoreStore } from "@/stores/admin/settings/queryStore";
 </script>
 
 <script lang="ts">
diff --git a/src/views/admin/settings/Award.vue b/src/views/admin/settings/award/Award.vue
similarity index 96%
rename from src/views/admin/settings/Award.vue
rename to src/views/admin/settings/award/Award.vue
index 5db2147..f17899e 100644
--- a/src/views/admin/settings/Award.vue
+++ b/src/views/admin/settings/award/Award.vue
@@ -24,7 +24,7 @@
 import { defineComponent, defineAsyncComponent, markRaw } from "vue";
 import { mapState, mapActions } from "pinia";
 import MainTemplate from "@/templates/Main.vue";
-import { useAwardStore } from "@/stores/admin/award";
+import { useAwardStore } from "@/stores/admin/settings/award";
 import AwardListItem from "@/components/admin/settings/award/AwardListItem.vue";
 import { useModalStore } from "@/stores/modal";
 import { useAbilityStore } from "@/stores/ability";
diff --git a/src/views/admin/settings/AwardEdit.vue b/src/views/admin/settings/award/AwardEdit.vue
similarity index 97%
rename from src/views/admin/settings/AwardEdit.vue
rename to src/views/admin/settings/award/AwardEdit.vue
index df7aa34..9cff484 100644
--- a/src/views/admin/settings/AwardEdit.vue
+++ b/src/views/admin/settings/award/AwardEdit.vue
@@ -40,12 +40,12 @@
 import { defineComponent } from "vue";
 import { mapState, mapActions } from "pinia";
 import MainTemplate from "@/templates/Main.vue";
-import { useAwardStore } from "@/stores/admin/award";
+import { useAwardStore } from "@/stores/admin/settings/award";
 import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
 import { RouterLink } from "vue-router";
-import type { AwardViewModel, UpdateAwardViewModel } from "@/viewmodels/admin/award.models";
+import type { AwardViewModel, UpdateAwardViewModel } from "@/viewmodels/admin/settings/award.models";
 import cloneDeep from "lodash.clonedeep";
 import isEqual from "lodash.isequal";
 </script>
diff --git a/src/views/admin/settings/CalendarType.vue b/src/views/admin/settings/calendarType/CalendarType.vue
similarity index 95%
rename from src/views/admin/settings/CalendarType.vue
rename to src/views/admin/settings/calendarType/CalendarType.vue
index 76c6296..311a4e9 100644
--- a/src/views/admin/settings/CalendarType.vue
+++ b/src/views/admin/settings/calendarType/CalendarType.vue
@@ -28,7 +28,7 @@
 import { defineComponent, defineAsyncComponent, markRaw } from "vue";
 import { mapState, mapActions } from "pinia";
 import MainTemplate from "@/templates/Main.vue";
-import { useCalendarTypeStore } from "@/stores/admin/calendarType";
+import { useCalendarTypeStore } from "@/stores/admin/settings/calendarType";
 import CalendarTypeListItem from "@/components/admin/settings/calendarType/CalendarTypeListItem.vue";
 import { useModalStore } from "@/stores/modal";
 import { useAbilityStore } from "@/stores/ability";
diff --git a/src/views/admin/settings/CalendarTypeEdit.vue b/src/views/admin/settings/calendarType/CalendarTypeEdit.vue
similarity index 97%
rename from src/views/admin/settings/CalendarTypeEdit.vue
rename to src/views/admin/settings/calendarType/CalendarTypeEdit.vue
index 14ea437..41f043a 100644
--- a/src/views/admin/settings/CalendarTypeEdit.vue
+++ b/src/views/admin/settings/calendarType/CalendarTypeEdit.vue
@@ -53,12 +53,12 @@
 import { defineComponent } from "vue";
 import { mapState, mapActions } from "pinia";
 import MainTemplate from "@/templates/Main.vue";
-import { useCalendarTypeStore } from "@/stores/admin/calendarType";
+import { useCalendarTypeStore } from "@/stores/admin/settings/calendarType";
 import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
 import { RouterLink } from "vue-router";
-import type { CalendarTypeViewModel, UpdateCalendarTypeViewModel } from "@/viewmodels/admin/calendarType.models";
+import type { CalendarTypeViewModel, UpdateCalendarTypeViewModel } from "@/viewmodels/admin/settings/calendarType.models";
 import { CheckIcon, ChevronUpDownIcon } from "@heroicons/vue/20/solid";
 import cloneDeep from "lodash.clonedeep";
 import isEqual from "lodash.isequal";
diff --git a/src/views/admin/settings/CommunicationType.vue b/src/views/admin/settings/communicationType/CommunicationType.vue
similarity index 95%
rename from src/views/admin/settings/CommunicationType.vue
rename to src/views/admin/settings/communicationType/CommunicationType.vue
index c9bdf39..a7aa92f 100644
--- a/src/views/admin/settings/CommunicationType.vue
+++ b/src/views/admin/settings/communicationType/CommunicationType.vue
@@ -28,7 +28,7 @@
 import { defineComponent, defineAsyncComponent, markRaw } from "vue";
 import { mapState, mapActions } from "pinia";
 import MainTemplate from "@/templates/Main.vue";
-import { useCommunicationTypeStore } from "@/stores/admin/communicationType";
+import { useCommunicationTypeStore } from "@/stores/admin/settings/communicationType";
 import CommunicationTypeListItem from "@/components/admin/settings/communicationType/CommunicationTypeListItem.vue";
 import { useModalStore } from "@/stores/modal";
 import { useAbilityStore } from "@/stores/ability";
diff --git a/src/views/admin/settings/CommunicationTypeEdit.vue b/src/views/admin/settings/communicationType/CommunicationTypeEdit.vue
similarity index 97%
rename from src/views/admin/settings/CommunicationTypeEdit.vue
rename to src/views/admin/settings/communicationType/CommunicationTypeEdit.vue
index 00d31e9..5ba1628 100644
--- a/src/views/admin/settings/CommunicationTypeEdit.vue
+++ b/src/views/admin/settings/communicationType/CommunicationTypeEdit.vue
@@ -85,7 +85,7 @@
 import { defineComponent } from "vue";
 import { mapState, mapActions } from "pinia";
 import MainTemplate from "@/templates/Main.vue";
-import { useCommunicationTypeStore } from "@/stores/admin/communicationType";
+import { useCommunicationTypeStore } from "@/stores/admin/settings/communicationType";
 import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
@@ -93,7 +93,7 @@ import { RouterLink } from "vue-router";
 import type {
   CommunicationTypeViewModel,
   UpdateCommunicationTypeViewModel,
-} from "@/viewmodels/admin/communicationType.models";
+} from "@/viewmodels/admin/settings/communicationType.models";
 import { Listbox, ListboxButton, ListboxOptions, ListboxOption, ListboxLabel } from "@headlessui/vue";
 import { CheckIcon, ChevronUpDownIcon } from "@heroicons/vue/20/solid";
 import cloneDeep from "lodash.clonedeep";
diff --git a/src/views/admin/settings/ExecutivePosition.vue b/src/views/admin/settings/executivePosition/ExecutivePosition.vue
similarity index 95%
rename from src/views/admin/settings/ExecutivePosition.vue
rename to src/views/admin/settings/executivePosition/ExecutivePosition.vue
index 5bf69da..46b95ff 100644
--- a/src/views/admin/settings/ExecutivePosition.vue
+++ b/src/views/admin/settings/executivePosition/ExecutivePosition.vue
@@ -33,7 +33,7 @@
 import { defineComponent, defineAsyncComponent, markRaw } from "vue";
 import { mapState, mapActions } from "pinia";
 import MainTemplate from "@/templates/Main.vue";
-import { useExecutivePositionStore } from "@/stores/admin/executivePosition";
+import { useExecutivePositionStore } from "@/stores/admin/settings/executivePosition";
 import ExecutivePositionListItem from "@/components/admin/settings/executivePosition/ExecutivePositionListItem.vue";
 import { useModalStore } from "@/stores/modal";
 import { useAbilityStore } from "@/stores/ability";
diff --git a/src/views/admin/settings/ExecutivePositionEdit.vue b/src/views/admin/settings/executivePosition/ExecutivePositionEdit.vue
similarity index 96%
rename from src/views/admin/settings/ExecutivePositionEdit.vue
rename to src/views/admin/settings/executivePosition/ExecutivePositionEdit.vue
index 9cd071f..9fcb863 100644
--- a/src/views/admin/settings/ExecutivePositionEdit.vue
+++ b/src/views/admin/settings/executivePosition/ExecutivePositionEdit.vue
@@ -40,7 +40,7 @@
 import { defineComponent } from "vue";
 import { mapState, mapActions } from "pinia";
 import MainTemplate from "@/templates/Main.vue";
-import { useExecutivePositionStore } from "@/stores/admin/executivePosition";
+import { useExecutivePositionStore } from "@/stores/admin/settings/executivePosition";
 import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
@@ -48,7 +48,7 @@ import { RouterLink } from "vue-router";
 import type {
   ExecutivePositionViewModel,
   UpdateExecutivePositionViewModel,
-} from "@/viewmodels/admin/executivePosition.models";
+} from "@/viewmodels/admin/settings/executivePosition.models";
 import cloneDeep from "lodash.clonedeep";
 import isEqual from "lodash.isequal";
 </script>
diff --git a/src/views/admin/settings/MembershipStatus.vue b/src/views/admin/settings/membershipStatus/MembershipStatus.vue
similarity index 95%
rename from src/views/admin/settings/MembershipStatus.vue
rename to src/views/admin/settings/membershipStatus/MembershipStatus.vue
index 05658fb..200da17 100644
--- a/src/views/admin/settings/MembershipStatus.vue
+++ b/src/views/admin/settings/membershipStatus/MembershipStatus.vue
@@ -24,7 +24,7 @@
 import { defineComponent, defineAsyncComponent, markRaw } from "vue";
 import { mapState, mapActions } from "pinia";
 import MainTemplate from "@/templates/Main.vue";
-import { useMembershipStatusStore } from "@/stores/admin/membershipStatus";
+import { useMembershipStatusStore } from "@/stores/admin/settings/membershipStatus";
 import MembershipStatusListItem from "@/components/admin/settings/membershipStatus/MembershipStatusListItem.vue";
 import { useModalStore } from "@/stores/modal";
 import { useAbilityStore } from "@/stores/ability";
diff --git a/src/views/admin/settings/MembershipStatusEdit.vue b/src/views/admin/settings/membershipStatus/MembershipStatusEdit.vue
similarity index 96%
rename from src/views/admin/settings/MembershipStatusEdit.vue
rename to src/views/admin/settings/membershipStatus/MembershipStatusEdit.vue
index bddc9dc..cd41e26 100644
--- a/src/views/admin/settings/MembershipStatusEdit.vue
+++ b/src/views/admin/settings/membershipStatus/MembershipStatusEdit.vue
@@ -40,7 +40,7 @@
 import { defineComponent } from "vue";
 import { mapState, mapActions } from "pinia";
 import MainTemplate from "@/templates/Main.vue";
-import { useMembershipStatusStore } from "@/stores/admin/membershipStatus";
+import { useMembershipStatusStore } from "@/stores/admin/settings/membershipStatus";
 import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
@@ -48,7 +48,7 @@ import { RouterLink } from "vue-router";
 import type {
   UpdateMembershipStatusViewModel,
   MembershipStatusViewModel,
-} from "@/viewmodels/admin/membershipStatus.models";
+} from "@/viewmodels/admin/settings/membershipStatus.models";
 import cloneDeep from "lodash.clonedeep";
 import isEqual from "lodash.isequal";
 </script>
diff --git a/src/views/admin/settings/newsletterConfig/NewsletterConfig.vue b/src/views/admin/settings/newsletterConfig/NewsletterConfig.vue
index e4865db..4775587 100644
--- a/src/views/admin/settings/newsletterConfig/NewsletterConfig.vue
+++ b/src/views/admin/settings/newsletterConfig/NewsletterConfig.vue
@@ -22,8 +22,8 @@ import {  defineComponent } from "vue";
 import { mapState, mapActions } from "pinia";
 import MainTemplate from "@/templates/Main.vue";
 import { useAbilityStore } from "@/stores/ability";
-import { useCommunicationTypeStore } from "@/stores/admin/communicationType";
-import { useNewsletterConfigStore } from "@/stores/admin/newsletterConfig";
+import { useCommunicationTypeStore } from "@/stores/admin/settings/communicationType";
+import { useNewsletterConfigStore } from "@/stores/admin/settings/newsletterConfig";
 import NewsletterConfigListItem from "@/components/admin/settings/newsletterConfig/NewsletterConfigListItem.vue";
 </script>
 
diff --git a/src/views/admin/settings/Qualification.vue b/src/views/admin/settings/qualification/Qualification.vue
similarity index 95%
rename from src/views/admin/settings/Qualification.vue
rename to src/views/admin/settings/qualification/Qualification.vue
index 20ff8f8..0159c6f 100644
--- a/src/views/admin/settings/Qualification.vue
+++ b/src/views/admin/settings/qualification/Qualification.vue
@@ -28,7 +28,7 @@
 import { defineComponent, defineAsyncComponent, markRaw } from "vue";
 import { mapState, mapActions } from "pinia";
 import MainTemplate from "@/templates/Main.vue";
-import { useQualificationStore } from "@/stores/admin/qualification";
+import { useQualificationStore } from "@/stores/admin/settings/qualification";
 import QualificationListItem from "@/components/admin/settings/qualification/QualificationListItem.vue";
 import { useModalStore } from "@/stores/modal";
 import { useAbilityStore } from "@/stores/ability";
diff --git a/src/views/admin/settings/QualificationEdit.vue b/src/views/admin/settings/qualification/QualificationEdit.vue
similarity index 96%
rename from src/views/admin/settings/QualificationEdit.vue
rename to src/views/admin/settings/qualification/QualificationEdit.vue
index 6ba4850..c973ece 100644
--- a/src/views/admin/settings/QualificationEdit.vue
+++ b/src/views/admin/settings/qualification/QualificationEdit.vue
@@ -44,12 +44,12 @@
 import { defineComponent } from "vue";
 import { mapState, mapActions } from "pinia";
 import MainTemplate from "@/templates/Main.vue";
-import { useQualificationStore } from "@/stores/admin/qualification";
+import { useQualificationStore } from "@/stores/admin/settings/qualification";
 import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
 import { RouterLink } from "vue-router";
-import type { UpdateQualificationViewModel, QualificationViewModel } from "@/viewmodels/admin/qualification.models";
+import type { UpdateQualificationViewModel, QualificationViewModel } from "@/viewmodels/admin/settings/qualification.models";
 import cloneDeep from "lodash.clonedeep";
 import isEqual from "lodash.isequal";
 </script>
diff --git a/src/views/admin/settings/QueryStore.vue b/src/views/admin/settings/queryStore/QueryStore.vue
similarity index 91%
rename from src/views/admin/settings/QueryStore.vue
rename to src/views/admin/settings/queryStore/QueryStore.vue
index d849f0c..f2ccb95 100644
--- a/src/views/admin/settings/QueryStore.vue
+++ b/src/views/admin/settings/queryStore/QueryStore.vue
@@ -31,8 +31,8 @@ import { defineComponent } from "vue";
 import { mapState, mapActions, mapWritableState } from "pinia";
 import MainTemplate from "@/templates/Main.vue";
 import { useAbilityStore } from "@/stores/ability";
-import { useQueryBuilderStore } from "@/stores/admin/queryBuilder";
-import { useQueryStoreStore } from "@/stores/admin/queryStore";
+import { useQueryBuilderStore } from "@/stores/admin/club/queryBuilder";
+import { useQueryStoreStore } from "@/stores/admin/settings/queryStore";
 import QueryStoreListItem from "@/components/admin/settings/queryStore/QueryStoreListItem.vue";
 </script>
 
diff --git a/src/views/admin/settings/template/Template.vue b/src/views/admin/settings/template/Template.vue
index 56cea4b..c9e019f 100644
--- a/src/views/admin/settings/template/Template.vue
+++ b/src/views/admin/settings/template/Template.vue
@@ -28,7 +28,7 @@ import { defineAsyncComponent, defineComponent, markRaw } from "vue";
 import { mapState, mapActions } from "pinia";
 import MainTemplate from "@/templates/Main.vue";
 import TemplateListItem from "@/components/admin/settings/template/TemplateListItem.vue";
-import { useTemplateStore } from "@/stores/admin/template";
+import { useTemplateStore } from "@/stores/admin/settings/template";
 import { useAbilityStore } from "@/stores/ability";
 import { useModalStore } from "@/stores/modal";
 import { RouterLink } from "vue-router";
diff --git a/src/views/admin/settings/template/TemplateEdit.vue b/src/views/admin/settings/template/TemplateEdit.vue
index 2a2c07c..4317717 100644
--- a/src/views/admin/settings/template/TemplateEdit.vue
+++ b/src/views/admin/settings/template/TemplateEdit.vue
@@ -54,8 +54,8 @@ import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
 import { RouterLink } from "vue-router";
 import { configureEditor } from "@/helpers/grapesEditor";
-import type { TemplateViewModel, UpdateTemplateViewModel } from "@/viewmodels/admin/template.models";
-import { useTemplateStore } from "@/stores/admin/template";
+import type { TemplateViewModel, UpdateTemplateViewModel } from "@/viewmodels/admin/settings/template.models";
+import { useTemplateStore } from "@/stores/admin/settings/template";
 import cloneDeep from "lodash.clonedeep";
 import isEqual from "lodash.isequal";
 import grapesjs, { Editor } from "grapesjs";
diff --git a/src/views/admin/settings/templateUsage/TemplateUsage.vue b/src/views/admin/settings/templateUsage/TemplateUsage.vue
index 9ad6332..ac08bef 100644
--- a/src/views/admin/settings/templateUsage/TemplateUsage.vue
+++ b/src/views/admin/settings/templateUsage/TemplateUsage.vue
@@ -15,9 +15,9 @@
 import { defineComponent } from "vue";
 import { mapState, mapActions } from "pinia";
 import MainTemplate from "@/templates/Main.vue";
-import { useTemplateUsageStore } from "@/stores/admin/templateUsage";
+import { useTemplateUsageStore } from "@/stores/admin/settings/templateUsage";
 import TemplateUsageListItem from "@/components/admin/settings/templateUsage/TemplateUsageListItem.vue";
-import { useTemplateStore } from "@/stores/admin/template";
+import { useTemplateStore } from "@/stores/admin/settings/template";
 </script>
 
 <script lang="ts">
diff --git a/src/views/admin/user/Role.vue b/src/views/admin/user/role/Role.vue
similarity index 96%
rename from src/views/admin/user/Role.vue
rename to src/views/admin/user/role/Role.vue
index 6c5f191..99430e3 100644
--- a/src/views/admin/user/Role.vue
+++ b/src/views/admin/user/role/Role.vue
@@ -24,7 +24,7 @@
 import { defineAsyncComponent, defineComponent, markRaw } from "vue";
 import { mapState, mapActions } from "pinia";
 import MainTemplate from "@/templates/Main.vue";
-import { useRoleStore } from "@/stores/admin/role";
+import { useRoleStore } from "@/stores/admin/user/role";
 import RoleListItem from "@/components/admin/user/role/RoleListItem.vue";
 import { useModalStore } from "@/stores/modal";
 import { useAbilityStore } from "@/stores/ability";
diff --git a/src/views/admin/user/RoleEdit.vue b/src/views/admin/user/role/RoleEdit.vue
similarity index 96%
rename from src/views/admin/user/RoleEdit.vue
rename to src/views/admin/user/role/RoleEdit.vue
index c1b60cf..aea09de 100644
--- a/src/views/admin/user/RoleEdit.vue
+++ b/src/views/admin/user/role/RoleEdit.vue
@@ -40,14 +40,14 @@
 import { defineComponent } from "vue";
 import { mapState, mapActions } from "pinia";
 import MainTemplate from "@/templates/Main.vue";
-import { useRoleStore } from "@/stores/admin/role";
+import { useRoleStore } from "@/stores/admin/user/role";
 import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
 import { RouterLink } from "vue-router";
 import cloneDeep from "lodash.clonedeep";
 import isEqual from "lodash.isequal";
-import type { RoleViewModel } from "@/viewmodels/admin/role.models";
+import type { RoleViewModel } from "@/viewmodels/admin/user/role.models";
 </script>
 
 <script lang="ts">
diff --git a/src/views/admin/user/RoleEditPermission.vue b/src/views/admin/user/role/RoleEditPermission.vue
similarity index 94%
rename from src/views/admin/user/RoleEditPermission.vue
rename to src/views/admin/user/role/RoleEditPermission.vue
index 0b39c30..71b93a7 100644
--- a/src/views/admin/user/RoleEditPermission.vue
+++ b/src/views/admin/user/role/RoleEditPermission.vue
@@ -25,11 +25,11 @@
 import { defineComponent } from "vue";
 import { mapState, mapActions } from "pinia";
 import MainTemplate from "@/templates/Main.vue";
-import { useRoleStore } from "@/stores/admin/role";
+import { useRoleStore } from "@/stores/admin/user/role";
 import Permission from "@/components/admin/Permission.vue";
 import Spinner from "@/components/Spinner.vue";
 import type { PermissionObject } from "@/types/permissionTypes";
-import type { RoleViewModel } from "@/viewmodels/admin/role.models";
+import type { RoleViewModel } from "@/viewmodels/admin/user/role.models";
 </script>
 
 <script lang="ts">
diff --git a/src/views/admin/user/Invite.vue b/src/views/admin/user/user/Invite.vue
similarity index 94%
rename from src/views/admin/user/Invite.vue
rename to src/views/admin/user/user/Invite.vue
index 35b326a..b79b673 100644
--- a/src/views/admin/user/Invite.vue
+++ b/src/views/admin/user/user/Invite.vue
@@ -20,7 +20,7 @@
 import { defineComponent, markRaw, defineAsyncComponent } from "vue";
 import { mapState, mapActions } from "pinia";
 import MainTemplate from "@/templates/Main.vue";
-import { useInviteStore } from "@/stores/admin/invite";
+import { useInviteStore } from "@/stores/admin/user/invite";
 import InviteListItem from "@/components/admin/user/user/InviteListItem.vue";
 </script>
 
diff --git a/src/views/admin/user/User.vue b/src/views/admin/user/user/User.vue
similarity index 96%
rename from src/views/admin/user/User.vue
rename to src/views/admin/user/user/User.vue
index d556cc6..0178302 100644
--- a/src/views/admin/user/User.vue
+++ b/src/views/admin/user/user/User.vue
@@ -28,7 +28,7 @@ import { defineComponent, markRaw, defineAsyncComponent } from "vue";
 import { RouterLink } from "vue-router";
 import { mapState, mapActions } from "pinia";
 import MainTemplate from "@/templates/Main.vue";
-import { useUserStore } from "@/stores/admin/user";
+import { useUserStore } from "@/stores/admin/user/user";
 import { useModalStore } from "@/stores/modal";
 import UserListItem from "@/components/admin/user/user/UserListItem.vue";
 import { useAbilityStore } from "@/stores/ability";
diff --git a/src/views/admin/user/UserEdit.vue b/src/views/admin/user/user/UserEdit.vue
similarity index 98%
rename from src/views/admin/user/UserEdit.vue
rename to src/views/admin/user/user/UserEdit.vue
index a4e7cfc..154b3f3 100644
--- a/src/views/admin/user/UserEdit.vue
+++ b/src/views/admin/user/user/UserEdit.vue
@@ -56,8 +56,8 @@ import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
 import { RouterLink } from "vue-router";
-import { useUserStore } from "@/stores/admin/user";
-import type { UpdateUserViewModel, UserViewModel } from "@/viewmodels/admin/user.models";
+import { useUserStore } from "@/stores/admin/user/user";
+import type { UpdateUserViewModel, UserViewModel } from "@/viewmodels/admin/user/user.models";
 import cloneDeep from "lodash.clonedeep";
 import isEqual from "lodash.isequal";
 </script>
diff --git a/src/views/admin/user/UserEditPermission.vue b/src/views/admin/user/user/UserEditPermission.vue
similarity index 95%
rename from src/views/admin/user/UserEditPermission.vue
rename to src/views/admin/user/user/UserEditPermission.vue
index b4b10bb..748cc18 100644
--- a/src/views/admin/user/UserEditPermission.vue
+++ b/src/views/admin/user/user/UserEditPermission.vue
@@ -28,9 +28,9 @@ import { mapState, mapActions } from "pinia";
 import MainTemplate from "@/templates/Main.vue";
 import Permission from "@/components/admin/Permission.vue";
 import Spinner from "@/components/Spinner.vue";
-import { useUserStore } from "@/stores/admin/user";
+import { useUserStore } from "@/stores/admin/user/user";
 import type { PermissionObject } from "@/types/permissionTypes";
-import type { UserViewModel } from "@/viewmodels/admin/user.models";
+import type { UserViewModel } from "@/viewmodels/admin/user/user.models";
 </script>
 
 <script lang="ts">
diff --git a/src/views/admin/user/UserEditRoles.vue b/src/views/admin/user/user/UserEditRoles.vue
similarity index 96%
rename from src/views/admin/user/UserEditRoles.vue
rename to src/views/admin/user/user/UserEditRoles.vue
index add4535..e162ab1 100644
--- a/src/views/admin/user/UserEditRoles.vue
+++ b/src/views/admin/user/user/UserEditRoles.vue
@@ -56,15 +56,15 @@
 import { defineComponent } from "vue";
 import { RouterLink } from "vue-router";
 import { mapState, mapActions } from "pinia";
-import { useUserStore } from "@/stores/admin/user";
-import { useRoleStore } from "@/stores/admin/role";
+import { useUserStore } from "@/stores/admin/user/user";
+import { useRoleStore } from "@/stores/admin/user/role";
 import type { PermissionObject } from "@/types/permissionTypes";
 import MainTemplate from "@/templates/Main.vue";
 import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
 import { XMarkIcon, PlusIcon } from "@heroicons/vue/24/outline";
-import type { UserViewModel } from "@/viewmodels/admin/user.models";
+import type { UserViewModel } from "@/viewmodels/admin/user/user.models";
 import cloneDeep from "lodash.clonedeep";
 import isEqual from "lodash.isequal";
 </script>
diff --git a/src/views/public/calendar/Calendar.vue b/src/views/public/calendar/Calendar.vue
index 2a185d2..0cc8d9d 100644
--- a/src/views/public/calendar/Calendar.vue
+++ b/src/views/public/calendar/Calendar.vue
@@ -29,7 +29,7 @@ import dayGridPlugin from "@fullcalendar/daygrid";
 import timeGridPlugin from "@fullcalendar/timegrid";
 import interactionPlugin from "@fullcalendar/interaction";
 import { InformationCircleIcon, LinkIcon } from "@heroicons/vue/24/outline";
-import type { CalendarViewModel } from "@/viewmodels/admin/calendar.models";
+import type { CalendarViewModel } from "@/viewmodels/admin/club/calendar.models";
 import { RouterLink } from "vue-router";
 </script>