diff --git a/src/components/FormBottomBar.vue b/src/components/FormBottomBar.vue
index 3f96f55..16a1269 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 href="https://jk-effects.com/privacy" target="_blank">Datenschutz</a>
-      <a href="https://jk-effects.com/imprint" target="_blank">Impressum</a>
+      <a ref="https://jk-effects.com/privacy" target="_blank">Datenschutz</a>
+      <a ref="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>
\ No newline at end of file
+</template>
diff --git a/src/components/Pagination.vue b/src/components/Pagination.vue
index 194a328..8b6ead5 100644
--- a/src/components/Pagination.vue
+++ b/src/components/Pagination.vue
@@ -1,10 +1,9 @@
 <template>
   <div class="grow flex flex-col gap-2 overflow-hidden">
-    <div v-if="useSearch" class="relative self-end flex flex-row items-center gap-2">
-      <Spinner v-if="deferingSearch"  />
+    <div v-if="useSearch" class="relative self-end">
       <input
         type="text"
-        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"
+        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"
         placeholder="Suche"
         v-model="searchString"
       />
@@ -88,22 +87,15 @@ 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";
@@ -112,7 +104,7 @@ const emit = defineEmits({
     return typeof offset == "number" && typeof offset == "number" && typeof searchString == "number";
   },
   search(search: string) {
-    return typeof search == "string";
+    return typeof search == "number";
   },
   clickRow(elem: T) {
     return true;
@@ -159,8 +151,7 @@ const loadPage = (newPage: number | ".") => {
   if (pageEnd > entryCount.value) pageEnd = entryCount.value;
 
   let loadedElementCount = filterData(props.items, searchString.value, pageStart, pageEnd).length;
-  console.log(loadedElementCount, props.maxEntriesPerPage, pageStart, pageEnd)
-  if (loadedElementCount < props.maxEntriesPerPage && (pageEnd != props.totalCount || loadedElementCount == 0))
+  if (loadedElementCount < props.maxEntriesPerPage)
     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 e304e6e..5c16641 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/settings/calendarType";
-import type { CalendarTypeViewModel } from "@/viewmodels/admin/settings/calendarType.models";
+import { useCalendarTypeStore } from "@/stores/admin/calendarType";
+import type { CalendarTypeViewModel } from "@/viewmodels/admin/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 5b068a9..1d71265 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/club/calendar";
-import type { CreateCalendarViewModel } from "@/viewmodels/admin/club/calendar.models";
+import { useCalendarStore } from "@/stores/admin/calendar";
+import type { CreateCalendarViewModel } from "@/viewmodels/admin/calendar.models";
 import { Listbox, ListboxButton, ListboxOptions, ListboxOption, ListboxLabel } from "@headlessui/vue";
 import { CheckIcon, ChevronUpDownIcon } from "@heroicons/vue/20/solid";
-import { useCalendarTypeStore } from "@/stores/admin/settings/calendarType";
-import type { CalendarTypeViewModel } from "@/viewmodels/admin/settings/calendarType.models";
+import { useCalendarTypeStore } from "@/stores/admin/calendarType";
+import type { CalendarTypeViewModel } from "@/viewmodels/admin/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 368b51b..07fc72f 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/club/calendar";
+import { useCalendarStore } from "@/stores/admin/calendar";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/club/calendar/UpdateCalendarModal.vue b/src/components/admin/club/calendar/UpdateCalendarModal.vue
index 499adda..6fe1197 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/club/calendar";
+import { useCalendarStore } from "@/stores/admin/calendar";
 import type {
   CalendarViewModel,
   CreateCalendarViewModel,
   UpdateCalendarViewModel,
-} from "@/viewmodels/admin/club/calendar.models";
+} from "@/viewmodels/admin/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/settings/calendarType";
-import type { CalendarTypeViewModel } from "@/viewmodels/admin/settings/calendarType.models";
+import { useCalendarTypeStore } from "@/stores/admin/calendarType";
+import type { CalendarTypeViewModel } from "@/viewmodels/admin/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 177f4af..0addfc7 100644
--- a/src/components/admin/club/member/CreateMemberModal.vue
+++ b/src/components/admin/club/member/CreateMemberModal.vue
@@ -66,10 +66,6 @@
         <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" />
@@ -98,8 +94,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/club/member/member";
-import type { CreateMemberViewModel } from "@/viewmodels/admin/club/member/member.models";
+import { useMemberStore } from "@/stores/admin/member";
+import type { CreateMemberViewModel } from "@/viewmodels/admin/member.models";
 </script>
 
 <script lang="ts">
@@ -131,7 +127,6 @@ 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 2852777..d9be02d 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/club/member/member";
-import type { CreateMemberViewModel } from "@/viewmodels/admin/club/member/member.models";
+import { useMemberStore } from "@/stores/admin/member";
+import type { CreateMemberViewModel } from "@/viewmodels/admin/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 34a123c..1554413 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/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";
+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";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/club/member/MemberAwardDeleteModal.vue b/src/components/admin/club/member/MemberAwardDeleteModal.vue
index 7fcdd3f..ff4aed0 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/club/member/memberAward";
+import { useMemberAwardStore } from "@/stores/admin/memberAward";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/club/member/MemberAwardEditModal.vue b/src/components/admin/club/member/MemberAwardEditModal.vue
index 1523f47..8e6e9bf 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/settings/award";
+import { useAwardStore } from "@/stores/admin/award";
 import type {
   CreateMemberAwardViewModel,
   MemberAwardViewModel,
   UpdateMemberAwardViewModel,
-} from "@/viewmodels/admin/club/member/memberAward.models";
-import { useMemberAwardStore } from "@/stores/admin/club/member/memberAward";
+} from "@/viewmodels/admin/memberAward.models";
+import { useMemberAwardStore } from "@/stores/admin/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 da4d776..8f14877 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/club/member/memberAward.models";
+import type { MemberAwardViewModel } from "@/viewmodels/admin/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 1c2af29..734b73e 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/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";
+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";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/club/member/MemberCommunicationDeleteModal.vue b/src/components/admin/club/member/MemberCommunicationDeleteModal.vue
index 51fc2a9..5c0dcd1 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/club/member/communication";
+import { useCommunicationStore } from "@/stores/admin/communication";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/club/member/MemberCommunicationEditModal.vue b/src/components/admin/club/member/MemberCommunicationEditModal.vue
index afe680f..33b34d4 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/club/member/communication";
+import { useCommunicationStore } from "@/stores/admin/communication";
 import type {
   CreateCommunicationViewModel,
   CommunicationViewModel,
   UpdateCommunicationViewModel,
-} from "@/viewmodels/admin/club/member/communication.models";
+} from "@/viewmodels/admin/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 1aca640..7e09f13 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/club/member/communication.models";
+import type { CommunicationViewModel } from "@/viewmodels/admin/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 5c4ef8e..b0a868c 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/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";
+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";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/club/member/MemberExecutivePositionDeleteModal.vue b/src/components/admin/club/member/MemberExecutivePositionDeleteModal.vue
index 7009b6d..5e6b3ca 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/club/member/memberExecutivePosition";
+import { useMemberExecutivePositionStore } from "@/stores/admin/memberExecutivePosition";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/club/member/MemberExecutivePositionEditModal.vue b/src/components/admin/club/member/MemberExecutivePositionEditModal.vue
index 00f09dd..269472b 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/settings/executivePosition";
+import { useExecutivePositionStore } from "@/stores/admin/executivePosition";
 import type {
   CreateMemberExecutivePositionViewModel,
   MemberExecutivePositionViewModel,
   UpdateMemberExecutivePositionViewModel,
-} from "@/viewmodels/admin/club/member/memberExecutivePosition.models";
-import { useMemberExecutivePositionStore } from "@/stores/admin/club/member/memberExecutivePosition";
+} from "@/viewmodels/admin/memberExecutivePosition.models";
+import { useMemberExecutivePositionStore } from "@/stores/admin/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 87ba2b2..0cd4c30 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/club/member/memberExecutivePosition.models";
+import type { MemberExecutivePositionViewModel } from "@/viewmodels/admin/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 e490fea..24daf11 100644
--- a/src/components/admin/club/member/MemberListItem.vue
+++ b/src/components/admin/club/member/MemberListItem.vue
@@ -1,26 +1,42 @@
 <template>
-  <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
+  <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 } }"
       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>
+      <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 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>
+      <p v-if="member.lastMembershipEntry?.end">ausgetreten: {{ member.lastMembershipEntry?.end }}</p>
     </div>
-  </RouterLink>
+  </div>
 </template>
 
 <script setup lang="ts">
-import { defineComponent, type PropType } from "vue";
+import { defineComponent, defineAsyncComponent, markRaw, type PropType } from "vue";
 import { mapState, mapActions } from "pinia";
+import { PencilIcon, TrashIcon, CircleStackIcon } from "@heroicons/vue/24/outline";
 import { useAbilityStore } from "@/stores/ability";
-import type { MemberViewModel } from "@/viewmodels/admin/club/member/member.models";
+import { useModalStore } from "@/stores/modal";
+import type { MemberViewModel } from "@/viewmodels/admin/member.models";
 </script>
 
 <script lang="ts">
@@ -31,5 +47,14 @@ 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 86690ff..f814539 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/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";
+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";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/club/member/MemberQualificationDeleteModal.vue b/src/components/admin/club/member/MemberQualificationDeleteModal.vue
index fa3f694..d9fd39b 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/settings/qualification";
-import { useMemberQualificationStore } from "@/stores/admin/club/member/memberQualification";
+import { useQualificationStore } from "@/stores/admin/qualification";
+import { useMemberQualificationStore } from "@/stores/admin/memberQualification";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/club/member/MemberQualificationEditModal.vue b/src/components/admin/club/member/MemberQualificationEditModal.vue
index db203c7..3eef402 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/settings/qualification";
+import { useQualificationStore } from "@/stores/admin/qualification";
 import type {
   CreateMemberQualificationViewModel,
   MemberQualificationViewModel,
   UpdateMemberQualificationViewModel,
-} from "@/viewmodels/admin/club/member/memberQualification.models";
-import { useMemberQualificationStore } from "@/stores/admin/club/member/memberQualification";
+} from "@/viewmodels/admin/memberQualification.models";
+import { useMemberQualificationStore } from "@/stores/admin/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 8fd6b98..4c8625b 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/club/member/memberQualification.models";
+import type { MemberQualificationViewModel } from "@/viewmodels/admin/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 0bda496..433392f 100644
--- a/src/components/admin/club/member/MembershipCreateModal.vue
+++ b/src/components/admin/club/member/MembershipCreateModal.vue
@@ -63,6 +63,10 @@
           </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 />
@@ -94,10 +98,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/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 { 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";
 </script>
 
 <script lang="ts">
@@ -128,6 +132,7 @@ 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 a9fdf0d..d66e95c 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/club/member/membership";
+import { useMembershipStore } from "@/stores/admin/membership";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/club/member/MembershipEditModal.vue b/src/components/admin/club/member/MembershipEditModal.vue
index 7d93b43..4d621ae 100644
--- a/src/components/admin/club/member/MembershipEditModal.vue
+++ b/src/components/admin/club/member/MembershipEditModal.vue
@@ -63,6 +63,10 @@
           </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" />
@@ -101,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 { useMembershipStatusStore } from "@/stores/admin/settings/membershipStatus";
+import { useMembershipStatusStore } from "@/stores/admin/membershipStatus";
 import type {
   CreateMembershipViewModel,
   MembershipViewModel,
   UpdateMembershipViewModel,
-} from "@/viewmodels/admin/club/member/membership.models";
-import { useMembershipStore } from "@/stores/admin/club/member/membership";
+} from "@/viewmodels/admin/membership.models";
+import { useMembershipStore } from "@/stores/admin/membership";
 import isEqual from "lodash.isequal";
 import cloneDeep from "lodash.clonedeep";
 </script>
@@ -165,6 +169,7 @@ 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 3a674f0..a7dab8c 100644
--- a/src/components/admin/club/member/MembershipListItem.vue
+++ b/src/components/admin/club/member/MembershipListItem.vue
@@ -8,8 +8,9 @@
       <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" class="p-2">
-      <p v-if="membership.terminationReason">Grund: {{ membership.terminationReason }}</p>
+    <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>
   </div>
 </template>
@@ -17,7 +18,7 @@
 <script setup lang="ts">
 import { defineAsyncComponent, defineComponent, markRaw, type PropType } from "vue";
 import { mapState, mapActions } from "pinia";
-import type { MembershipViewModel } from "@/viewmodels/admin/club/member/membership.models";
+import type { MembershipViewModel } from "@/viewmodels/admin/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 8948a70..301b436 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/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";
+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";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/club/newsletter/CurrentlySyncingModal.vue b/src/components/admin/club/newsletter/CurrentlySyncingModal.vue
index 4a8f0e8..5d14c37 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/club/protocol/protocol";
-import type { CreateProtocolViewModel } from "@/viewmodels/admin/club/protocol/protocol.models";
+import { useProtocolStore } from "@/stores/admin/protocol";
+import type { CreateProtocolViewModel } from "@/viewmodels/admin/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 04a334f..bbc488a 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/club/newsletter/newsletter.models";
+import type { NewsletterViewModel } from "@/viewmodels/admin/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 c5b3b4a..eac4d6d 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/club/newsletter/newsletterPrintout";
+import { useNewsletterPrintoutStore } from "@/stores/admin/newsletterPrintout";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/club/newsletter/NewsletterSyncing.vue b/src/components/admin/club/newsletter/NewsletterSyncing.vue
index 384b6ef..1e60b0f 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/club/newsletter/newsletter";
+import { useNewsletterStore } from "@/stores/admin/newsletter";
 import { ArrowPathIcon, CloudArrowUpIcon, CloudIcon, ExclamationTriangleIcon } from "@heroicons/vue/24/outline";
-import { useNewsletterDatesStore } from "@/stores/admin/club/newsletter/newsletterDates";
-import { useNewsletterRecipientsStore } from "@/stores/admin/club/newsletter/newsletterRecipients";
+import { useNewsletterDatesStore } from "@/stores/admin/newsletterDates";
+import { useNewsletterRecipientsStore } from "@/stores/admin/newsletterRecipients";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/club/protocol/CreateProtocolModal.vue b/src/components/admin/club/protocol/CreateProtocolModal.vue
index f49a50f..704af64 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/club/protocol/protocol";
-import type { CreateProtocolViewModel } from "@/viewmodels/admin/club/protocol/protocol.models";
+import { useProtocolStore } from "@/stores/admin/protocol";
+import type { CreateProtocolViewModel } from "@/viewmodels/admin/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 f261b28..5bd8f47 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/club/protocol/protocol";
-import type { CreateProtocolViewModel } from "@/viewmodels/admin/club/protocol/protocol.models";
+import { useProtocolStore } from "@/stores/admin/protocol";
+import type { CreateProtocolViewModel } from "@/viewmodels/admin/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 d2775f2..168477e 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/club/protocol/protocol.models";
+import type { ProtocolViewModel } from "@/viewmodels/admin/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 7fca129..1c848ff 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/club/protocol/protocolPrintout";
+import { useProtocolPrintoutStore } from "@/stores/admin/protocolPrintout";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/club/protocol/ProtocolSyncing.vue b/src/components/admin/club/protocol/ProtocolSyncing.vue
index b1f4308..eb2c25b 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/club/protocol/protocol";
+import { useProtocolStore } from "@/stores/admin/protocol";
 import { ArrowPathIcon, CloudArrowUpIcon, CloudIcon, ExclamationTriangleIcon } from "@heroicons/vue/24/outline";
-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";
+import { useProtocolAgendaStore } from "@/stores/admin/protocolAgenda";
+import { useProtocolPresenceStore } from "@/stores/admin/protocolPresence";
+import { useProtocolDecisionStore } from "@/stores/admin/protocolDecision";
+import { useProtocolVotingStore } from "@/stores/admin/protocolVoting";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/settings/award/AwardListItem.vue b/src/components/admin/settings/award/AwardListItem.vue
index 67fc63a..2d0ee58 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/settings/award.models";
+import type { AwardViewModel } from "@/viewmodels/admin/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 6daeff0..5da402a 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/settings/award";
-import type { CreateAwardViewModel } from "@/viewmodels/admin/settings/award.models";
+import { useAwardStore } from "@/stores/admin/award";
+import type { CreateAwardViewModel } from "@/viewmodels/admin/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 c3a1e6a..5f3b7cd 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/user/role";
-import { useAwardStore } from "@/stores/admin/settings/award";
+import { useRoleStore } from "@/stores/admin/role";
+import { useAwardStore } from "@/stores/admin/award";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/settings/calendarType/CalendarTypeListItem.vue b/src/components/admin/settings/calendarType/CalendarTypeListItem.vue
index 6201d30..f80cbc7 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/settings/calendarType.models";
+import type { CalendarTypeViewModel } from "@/viewmodels/admin/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 b35a897..909075f 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/settings/calendarType";
-import type { CreateCalendarTypeViewModel } from "@/viewmodels/admin/settings/calendarType.models";
+import { useCalendarTypeStore } from "@/stores/admin/calendarType";
+import type { CreateCalendarTypeViewModel } from "@/viewmodels/admin/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 46642ec..e974962 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/settings/calendarType";
+import { useCalendarTypeStore } from "@/stores/admin/calendarType";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/settings/communicationType/CommunicationTypeListItem.vue b/src/components/admin/settings/communicationType/CommunicationTypeListItem.vue
index a55a77e..7b60ae0 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/settings/communicationType.models";
+import type { CommunicationTypeViewModel } from "@/viewmodels/admin/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 c9cf750..b6a33a1 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/settings/communicationType";
-import type { CreateCommunicationTypeViewModel } from "@/viewmodels/admin/settings/communicationType.models";
+import { useCommunicationTypeStore } from "@/stores/admin/communicationType";
+import type { CreateCommunicationTypeViewModel } from "@/viewmodels/admin/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 f9a18a3..d371e5e 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/settings/communicationType";
+import { useCommunicationTypeStore } from "@/stores/admin/communicationType";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/settings/executivePosition/CreateExecutivePositionModal.vue b/src/components/admin/settings/executivePosition/CreateExecutivePositionModal.vue
index c01cc47..9c4bf5c 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/settings/executivePosition";
-import type { CreateExecutivePositionViewModel } from "@/viewmodels/admin/settings/executivePosition.models";
+import { useExecutivePositionStore } from "@/stores/admin/executivePosition";
+import type { CreateExecutivePositionViewModel } from "@/viewmodels/admin/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 399bdcd..ce4344b 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/user/role";
-import { useExecutivePositionStore } from "@/stores/admin/settings/executivePosition";
+import { useRoleStore } from "@/stores/admin/role";
+import { useExecutivePositionStore } from "@/stores/admin/executivePosition";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/settings/executivePosition/ExecutivePositionListItem.vue b/src/components/admin/settings/executivePosition/ExecutivePositionListItem.vue
index 4babe24..14185d2 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/settings/executivePosition.models";
+import type { ExecutivePositionViewModel } from "@/viewmodels/admin/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 8bbe3af..d0d3eb2 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/settings/membershipStatus";
-import type { CreateMembershipStatusViewModel } from "@/viewmodels/admin/settings/membershipStatus.models";
+import { useMembershipStatusStore } from "@/stores/admin/membershipStatus";
+import type { CreateMembershipStatusViewModel } from "@/viewmodels/admin/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 081727a..ad2d851 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/user/role";
-import { useMembershipStatusStore } from "@/stores/admin/settings/membershipStatus";
+import { useRoleStore } from "@/stores/admin/role";
+import { useMembershipStatusStore } from "@/stores/admin/membershipStatus";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/settings/membershipStatus/MembershipStatusListItem.vue b/src/components/admin/settings/membershipStatus/MembershipStatusListItem.vue
index 3b9d5fa..801af12 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/settings/membershipStatus.models";
+import type { MembershipStatusViewModel } from "@/viewmodels/admin/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 90f803a..a8f8668 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/settings/newsletterConfig";
+import { useNewsletterConfigStore } from "@/stores/admin/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/settings/communicationType.models";
+import type { CommunicationTypeViewModel } from "@/viewmodels/admin/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 a70a710..691bbd1 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/settings/qualification";
-import type { CreateQualificationViewModel } from "@/viewmodels/admin/settings/qualification.models";
+import { useQualificationStore } from "@/stores/admin/qualification";
+import type { CreateQualificationViewModel } from "@/viewmodels/admin/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 ffdb77b..431de33 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/user/role";
-import { useQualificationStore } from "@/stores/admin/settings/qualification";
+import { useRoleStore } from "@/stores/admin/role";
+import { useQualificationStore } from "@/stores/admin/qualification";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/settings/qualification/QualificationListItem.vue b/src/components/admin/settings/qualification/QualificationListItem.vue
index 979593c..e35d4eb 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/settings/qualification.models";
+import type { QualificationViewModel } from "@/viewmodels/admin/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 485381a..158a948 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/settings/queryStore";
-import type { CreateQueryViewModel } from "@/viewmodels/admin/settings/query.models";
-import { useQueryBuilderStore } from "@/stores/admin/club/queryBuilder";
+import { useQueryStoreStore } from "@/stores/admin/queryStore";
+import type { CreateQueryViewModel } from "@/viewmodels/admin/query.models";
+import { useQueryBuilderStore } from "@/stores/admin/queryBuilder";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/settings/queryStore/DeleteQueryStoreModal.vue b/src/components/admin/settings/queryStore/DeleteQueryStoreModal.vue
index eb50139..feff89b 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/settings/queryStore";
+import { useQueryStoreStore } from "@/stores/admin/queryStore";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/settings/queryStore/QueryStoreListItem.vue b/src/components/admin/settings/queryStore/QueryStoreListItem.vue
index 4ed4be5..9c4ddb4 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/settings/query.models";
-import { useQueryBuilderStore } from "@/stores/admin/club/queryBuilder";
+import type { QueryViewModel } from "@/viewmodels/admin/query.models";
+import { useQueryBuilderStore } from "@/stores/admin/queryBuilder";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/settings/queryStore/UpdateQueryStoreModal.vue b/src/components/admin/settings/queryStore/UpdateQueryStoreModal.vue
index a60b8b7..bc30f32 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/settings/queryStore";
-import type { CreateQueryViewModel, UpdateQueryViewModel } from "@/viewmodels/admin/settings/query.models";
-import { useQueryBuilderStore } from "@/stores/admin/club/queryBuilder";
+import { useQueryStoreStore } from "@/stores/admin/queryStore";
+import type { CreateQueryViewModel, UpdateQueryViewModel } from "@/viewmodels/admin/query.models";
+import { useQueryBuilderStore } from "@/stores/admin/queryBuilder";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/settings/template/CreateTemplateModal.vue b/src/components/admin/settings/template/CreateTemplateModal.vue
index 14ddbdd..4f10366 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/settings/template";
-import type { CreateTemplateViewModel } from "@/viewmodels/admin/settings/template.models";
+import { useTemplateStore } from "@/stores/admin/template";
+import type { CreateTemplateViewModel } from "@/viewmodels/admin/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 8bbf2ba..1be82f9 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/settings/queryStore";
-import { useTemplateStore } from "@/stores/admin/settings/template";
+import { useQueryStoreStore } from "@/stores/admin/queryStore";
+import { useTemplateStore } from "@/stores/admin/template";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/settings/template/TemplateListItem.vue b/src/components/admin/settings/template/TemplateListItem.vue
index e2a77f5..a4084d6 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/settings/template.models";
-import { useTemplateStore } from "@/stores/admin/settings/template";
+import type { TemplateViewModel } from "@/viewmodels/admin/template.models";
+import { useTemplateStore } from "@/stores/admin/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 e3d5d77..41e7c27 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/settings/templateUsage";
+import { useTemplateUsageStore } from "@/stores/admin/templateUsage";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/settings/templateUsage/TemplateUsageListItem.vue b/src/components/admin/settings/templateUsage/TemplateUsageListItem.vue
index f5025e8..c5562fe 100644
--- a/src/components/admin/settings/templateUsage/TemplateUsageListItem.vue
+++ b/src/components/admin/settings/templateUsage/TemplateUsageListItem.vue
@@ -18,18 +18,12 @@
       </div>
     </div>
     <div class="flex flex-col p-2 gap-2">
-      <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 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>
       <div class="flex flex-row gap-2 items-center">
         <p class="min-w-16">Hauptteil:</p>
@@ -38,18 +32,12 @@
           <option v-for="template in templates" :key="template.id" :value="template.id">{{ template.template }}</option>
         </select>
       </div>
-      <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 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>
     </div>
   </form>
@@ -59,9 +47,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/settings/templateUsage.models";
-import { useTemplateStore } from "@/stores/admin/settings/template";
-import { useTemplateUsageStore } from "@/stores/admin/settings/templateUsage";
+import type { TemplateUsageViewModel } from "@/viewmodels/admin/templateUsage.models";
+import { useTemplateStore } from "@/stores/admin/template";
+import { useTemplateUsageStore } from "@/stores/admin/templateUsage";
 import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
@@ -103,8 +91,6 @@ 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({
@@ -112,8 +98,6 @@ 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 87d9573..5cad67e 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/user/role";
+import { useRoleStore } from "@/stores/admin/role";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/user/role/DeleteRoleModal.vue b/src/components/admin/user/role/DeleteRoleModal.vue
index 764c487..7297248 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/user/role";
+import { useRoleStore } from "@/stores/admin/role";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/user/role/RoleListItem.vue b/src/components/admin/user/role/RoleListItem.vue
index d03c756..82bf151 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/user/role.models";
+import type { RoleViewModel } from "@/viewmodels/admin/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 720a06f..7cc8d5a 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/user";
+import { useUserStore } from "@/stores/admin/user";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/user/user/InviteListItem.vue b/src/components/admin/user/user/InviteListItem.vue
index b9de72d..e272cbe 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/user/invite.models";
+import type { InviteViewModel } from "@/viewmodels/admin/invite.models";
 import { PencilIcon, UserGroupIcon, WrenchScrewdriverIcon, TrashIcon } from "@heroicons/vue/24/outline";
 import { useAbilityStore } from "@/stores/ability";
-import { useInviteStore } from "@/stores/admin/user/invite";
+import { useInviteStore } from "@/stores/admin/invite";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/user/user/InviteUserModal.vue b/src/components/admin/user/user/InviteUserModal.vue
index 06f15f1..fff1f76 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/user/invite";
-import type { CreateInviteViewModel } from "@/viewmodels/admin/user/invite.models";
+import { useInviteStore } from "@/stores/admin/invite";
+import type { CreateInviteViewModel } from "@/viewmodels/admin/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 94d0ce7..a923919 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/user.models";
+import type { UserViewModel } from "@/viewmodels/admin/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 b4083f7..7583774 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/club/queryBuilder";
+import { useQueryBuilderStore } from "@/stores/admin/queryBuilder";
 import { useModalStore } from "@/stores/modal";
 import Table from "./Table.vue";
 import { useAbilityStore } from "@/stores/ability";
-import { useQueryStoreStore } from "@/stores/admin/settings/queryStore";
+import { useQueryStoreStore } from "@/stores/admin/queryStore";
 </script>
 
 <script lang="ts">
diff --git a/src/components/queryBuilder/ColumnSelect.vue b/src/components/queryBuilder/ColumnSelect.vue
index e282235..53e0370 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/club/queryBuilder";
+import { useQueryBuilderStore } from "@/stores/admin/queryBuilder";
 </script>
 
 <script lang="ts">
diff --git a/src/components/queryBuilder/Condition.vue b/src/components/queryBuilder/Condition.vue
index b521fda..9c56a3d 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/club/queryBuilder";
+import { useQueryBuilderStore } from "@/stores/admin/queryBuilder";
 import { TrashIcon } from "@heroicons/vue/24/outline";
 </script>
 
diff --git a/src/components/queryBuilder/Join.vue b/src/components/queryBuilder/Join.vue
index f652f96..6678aa7 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/club/queryBuilder";
+import { useQueryBuilderStore } from "@/stores/admin/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 cedf9c3..c4db5b9 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/club/queryBuilder";
+import { useQueryBuilderStore } from "@/stores/admin/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 d6ecbac..111e8e3 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/club/queryBuilder";
+import { useQueryBuilderStore } from "@/stores/admin/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 d07d108..eef4464 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/club/queryBuilder";
+import { useQueryBuilderStore } from "@/stores/admin/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 b8a6988..50fc646 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/club/queryBuilder";
+import { useQueryBuilderStore } from "@/stores/admin/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 4667fcb..a233767 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/club/queryBuilder";
+import { useQueryBuilderStore } from "@/stores/admin/queryBuilder";
 import { TrashIcon } from "@heroicons/vue/24/outline";
 </script>
 
diff --git a/src/components/queryBuilder/Table.vue b/src/components/queryBuilder/Table.vue
index 3ad97ce..72ac140 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/club/queryBuilder";
+import { useQueryBuilderStore } from "@/stores/admin/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 d942da4..026e363 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/club/queryBuilder";
+import { useQueryBuilderStore } from "@/stores/admin/queryBuilder";
 </script>
 
 <script lang="ts">
diff --git a/src/components/queryBuilder/Where.vue b/src/components/queryBuilder/Where.vue
index 51c3ed8..78a9704 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/club/queryBuilder";
+import { useQueryBuilderStore } from "@/stores/admin/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 e9c8cbc..663cad9 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/Qualification.vue"),
+                  component: () => import("@/views/admin/settings/Qualification.vue"),
                 },
                 {
                   path: ":id/edit",
                   name: "admin-settings-qualification-edit",
-                  component: () => import("@/views/admin/settings/qualification/QualificationEdit.vue"),
+                  component: () => import("@/views/admin/settings/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/Award.vue"),
+                  component: () => import("@/views/admin/settings/Award.vue"),
                 },
                 {
                   path: ":id/edit",
                   name: "admin-settings-award-edit",
-                  component: () => import("@/views/admin/settings/award/AwardEdit.vue"),
+                  component: () => import("@/views/admin/settings/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/ExecutivePosition.vue"),
+                  component: () => import("@/views/admin/settings/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/executivePosition/ExecutivePositionEdit.vue"),
+                  component: () => import("@/views/admin/settings/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/CommunicationType.vue"),
+                  component: () => import("@/views/admin/settings/CommunicationType.vue"),
                 },
                 {
                   path: ":id/edit",
                   name: "admin-settings-communication_type-edit",
-                  component: () => import("@/views/admin/settings/communicationType/CommunicationTypeEdit.vue"),
+                  component: () => import("@/views/admin/settings/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/MembershipStatus.vue"),
+                  component: () => import("@/views/admin/settings/MembershipStatus.vue"),
                 },
                 {
                   path: ":id/edit",
                   name: "admin-settings-membership_status-edit",
-                  component: () => import("@/views/admin/settings/membershipStatus/MembershipStatusEdit.vue"),
+                  component: () => import("@/views/admin/settings/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/CalendarType.vue"),
+                  component: () => import("@/views/admin/settings/CalendarType.vue"),
                 },
                 {
                   path: ":id/edit",
                   name: "admin-settings-calendar_type-edit",
-                  component: () => import("@/views/admin/settings/calendarType/CalendarTypeEdit.vue"),
+                  component: () => import("@/views/admin/settings/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/QueryStore.vue"),
+              component: () => import("@/views/admin/settings/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/User.vue"),
+                  component: () => import("@/views/admin/user/User.vue"),
                 },
                 {
                   path: "invites",
                   name: "admin-user-user-invites",
-                  component: () => import("@/views/admin/user/user/Invite.vue"),
+                  component: () => import("@/views/admin/user/Invite.vue"),
                 },
                 {
                   path: ":id/edit",
                   name: "admin-user-user-edit",
-                  component: () => import("@/views/admin/user/user/UserEdit.vue"),
+                  component: () => import("@/views/admin/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/user/UserEditPermission.vue"),
+                  component: () => import("@/views/admin/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/user/UserEditRoles.vue"),
+                  component: () => import("@/views/admin/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/Role.vue"),
+                  component: () => import("@/views/admin/user/Role.vue"),
                 },
                 {
                   path: ":id/edit",
                   name: "admin-user-role-edit",
-                  component: () => import("@/views/admin/user/role/RoleEdit.vue"),
+                  component: () => import("@/views/admin/user/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/role/RoleEditPermission.vue"),
+                  component: () => import("@/views/admin/user/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 498959a..93406e2 100644
--- a/src/router/memberGuard.ts
+++ b/src/router/memberGuard.ts
@@ -1,9 +1,9 @@
-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";
+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";
 
 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 d96cb8e..075d4ba 100644
--- a/src/router/newsletterGuard.ts
+++ b/src/router/newsletterGuard.ts
@@ -1,7 +1,7 @@
-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";
+import { useNewsletterStore } from "@/stores/admin/newsletter";
+import { useNewsletterDatesStore } from "@/stores/admin/newsletterDates";
+import { useNewsletterRecipientsStore } from "@/stores/admin/newsletterRecipients";
+import { useNewsletterPrintoutStore } from "../stores/admin/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 9b235ce..a86d848 100644
--- a/src/router/protocolGuard.ts
+++ b/src/router/protocolGuard.ts
@@ -1,9 +1,9 @@
-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";
+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";
 
 export async function setProtocolId(to: any, from: any, next: any) {
   const protocol = useProtocolStore();
diff --git a/src/stores/admin/settings/award.ts b/src/stores/admin/award.ts
similarity index 96%
rename from src/stores/admin/settings/award.ts
rename to src/stores/admin/award.ts
index 50b2326..f67b7e2 100644
--- a/src/stores/admin/settings/award.ts
+++ b/src/stores/admin/award.ts
@@ -1,5 +1,5 @@
 import { defineStore } from "pinia";
-import type { CreateAwardViewModel, UpdateAwardViewModel, AwardViewModel } from "@/viewmodels/admin/settings/award.models";
+import type { CreateAwardViewModel, UpdateAwardViewModel, AwardViewModel } from "@/viewmodels/admin/award.models";
 import { http } from "@/serverCom";
 import type { AxiosResponse } from "axios";
 
diff --git a/src/stores/admin/club/calendar.ts b/src/stores/admin/calendar.ts
similarity index 97%
rename from src/stores/admin/club/calendar.ts
rename to src/stores/admin/calendar.ts
index ca4fbac..9df0e60 100644
--- a/src/stores/admin/club/calendar.ts
+++ b/src/stores/admin/calendar.ts
@@ -3,7 +3,7 @@ import type {
   CreateCalendarViewModel,
   UpdateCalendarViewModel,
   CalendarViewModel,
-} from "@/viewmodels/admin/club/calendar.models";
+} from "@/viewmodels/admin/calendar.models";
 import { http } from "@/serverCom";
 import type { AxiosResponse } from "axios";
 
diff --git a/src/stores/admin/settings/calendarType.ts b/src/stores/admin/calendarType.ts
similarity index 97%
rename from src/stores/admin/settings/calendarType.ts
rename to src/stores/admin/calendarType.ts
index 90ecd42..8f006f0 100644
--- a/src/stores/admin/settings/calendarType.ts
+++ b/src/stores/admin/calendarType.ts
@@ -3,7 +3,7 @@ import type {
   CreateCalendarTypeViewModel,
   UpdateCalendarTypeViewModel,
   CalendarTypeViewModel,
-} from "@/viewmodels/admin/settings/calendarType.models";
+} from "@/viewmodels/admin/calendarType.models";
 import { http } from "@/serverCom";
 import type { AxiosResponse } from "axios";
 
diff --git a/src/stores/admin/club/member/communication.ts b/src/stores/admin/communication.ts
similarity index 93%
rename from src/stores/admin/club/member/communication.ts
rename to src/stores/admin/communication.ts
index 9113e2b..d0ed687 100644
--- a/src/stores/admin/club/member/communication.ts
+++ b/src/stores/admin/communication.ts
@@ -1,14 +1,14 @@
 import { defineStore } from "pinia";
-import type { CreateMemberViewModel, UpdateMemberViewModel } from "@/viewmodels/admin/club/member/member.models";
+import type { CreateMemberViewModel, UpdateMemberViewModel } from "@/viewmodels/admin/member.models";
 import { http } from "@/serverCom";
 import type { AxiosResponse } from "axios";
-import type { MemberViewModel } from "@/viewmodels/admin/club/member/member.models";
+import type { MemberViewModel } from "@/viewmodels/admin/member.models";
 import { useMemberStore } from "./member";
 import type {
   CreateCommunicationViewModel,
   CommunicationViewModel,
   UpdateCommunicationViewModel,
-} from "@/viewmodels/admin/club/member/communication.models";
+} from "@/viewmodels/admin/communication.models";
 
 export const useCommunicationStore = defineStore("communication", {
   state: () => {
diff --git a/src/stores/admin/settings/communicationType.ts b/src/stores/admin/communicationType.ts
similarity index 97%
rename from src/stores/admin/settings/communicationType.ts
rename to src/stores/admin/communicationType.ts
index 87c95fa..5cb81f9 100644
--- a/src/stores/admin/settings/communicationType.ts
+++ b/src/stores/admin/communicationType.ts
@@ -3,7 +3,7 @@ import type {
   CreateCommunicationTypeViewModel,
   UpdateCommunicationTypeViewModel,
   CommunicationTypeViewModel,
-} from "@/viewmodels/admin/settings/communicationType.models";
+} from "@/viewmodels/admin/communicationType.models";
 import { http } from "@/serverCom";
 import type { AxiosResponse } from "axios";
 import type { CommunicationFieldType } from "@/types/fieldTypes";
diff --git a/src/stores/admin/settings/executivePosition.ts b/src/stores/admin/executivePosition.ts
similarity index 96%
rename from src/stores/admin/settings/executivePosition.ts
rename to src/stores/admin/executivePosition.ts
index 9e6241b..49eb8f3 100644
--- a/src/stores/admin/settings/executivePosition.ts
+++ b/src/stores/admin/executivePosition.ts
@@ -3,7 +3,7 @@ import type {
   CreateExecutivePositionViewModel,
   UpdateExecutivePositionViewModel,
   ExecutivePositionViewModel,
-} from "@/viewmodels/admin/settings/executivePosition.models";
+} from "@/viewmodels/admin/executivePosition.models";
 import { http } from "@/serverCom";
 import type { AxiosResponse } from "axios";
 
diff --git a/src/stores/admin/user/invite.ts b/src/stores/admin/invite.ts
similarity index 97%
rename from src/stores/admin/user/invite.ts
rename to src/stores/admin/invite.ts
index 2e0695d..58f72ed 100644
--- a/src/stores/admin/user/invite.ts
+++ b/src/stores/admin/invite.ts
@@ -1,5 +1,5 @@
 import { defineStore } from "pinia";
-import type { CreateInviteViewModel, InviteViewModel } from "@/viewmodels/admin/user/invite.models";
+import type { CreateInviteViewModel, InviteViewModel } from "@/viewmodels/admin/invite.models";
 import { http } from "@/serverCom";
 import type { PermissionObject } from "@/types/permissionTypes";
 import type { AxiosResponse } from "axios";
diff --git a/src/stores/admin/club/member/member.ts b/src/stores/admin/member.ts
similarity index 87%
rename from src/stores/admin/club/member/member.ts
rename to src/stores/admin/member.ts
index 1154fb9..b0075de 100644
--- a/src/stores/admin/club/member/member.ts
+++ b/src/stores/admin/member.ts
@@ -1,8 +1,8 @@
 import { defineStore } from "pinia";
-import type { CreateMemberViewModel, UpdateMemberViewModel } from "@/viewmodels/admin/club/member/member.models";
+import type { CreateMemberViewModel, UpdateMemberViewModel } from "@/viewmodels/admin/member.models";
 import { http } from "@/serverCom";
 import type { AxiosResponse } from "axios";
-import type { MemberViewModel } from "@/viewmodels/admin/club/member/member.models";
+import type { MemberViewModel } from "@/viewmodels/admin/member.models";
 
 export const useMemberStore = defineStore("member", {
   state: () => {
@@ -16,11 +16,11 @@ export const useMemberStore = defineStore("member", {
     };
   },
   actions: {
-    fetchMembers(offset = 0, count = 25, search = "", clear = false) {
+    fetchMembers(offset = 0, count = 25, clear = false) {
       if (clear) this.members = [];
       this.loading = "loading";
       http
-        .get(`/admin/member?offset=${offset}&count=${count}${search != "" ? "&search=" + search : ""}`)
+        .get(`/admin/member?offset=${offset}&count=${count}`)
         .then((result) => {
           this.totalCount = result.data.total;
           result.data.members
@@ -62,7 +62,6 @@ export const useMemberStore = defineStore("member", {
         lastname: member.lastname,
         nameaffix: member.nameaffix,
         birthdate: member.birthdate,
-        internalId: member.internalId,
       });
       this.fetchMembers();
       return result;
@@ -74,7 +73,6 @@ 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/club/member/memberAward.ts b/src/stores/admin/memberAward.ts
similarity index 92%
rename from src/stores/admin/club/member/memberAward.ts
rename to src/stores/admin/memberAward.ts
index 0d1667a..1f133ea 100644
--- a/src/stores/admin/club/member/memberAward.ts
+++ b/src/stores/admin/memberAward.ts
@@ -1,14 +1,14 @@
 import { defineStore } from "pinia";
-import type { CreateMemberViewModel, UpdateMemberViewModel } from "@/viewmodels/admin/club/member/member.models";
+import type { CreateMemberViewModel, UpdateMemberViewModel } from "@/viewmodels/admin/member.models";
 import { http } from "@/serverCom";
 import type { AxiosResponse } from "axios";
-import type { MemberViewModel } from "@/viewmodels/admin/club/member/member.models";
+import type { MemberViewModel } from "@/viewmodels/admin/member.models";
 import { useMemberStore } from "./member";
 import type {
   CreateMemberAwardViewModel,
   MemberAwardViewModel,
   UpdateMemberAwardViewModel,
-} from "@/viewmodels/admin/club/member/memberAward.models";
+} from "@/viewmodels/admin/memberAward.models";
 
 export const useMemberAwardStore = defineStore("memberAward", {
   state: () => {
diff --git a/src/stores/admin/club/member/memberExecutivePosition.ts b/src/stores/admin/memberExecutivePosition.ts
similarity index 93%
rename from src/stores/admin/club/member/memberExecutivePosition.ts
rename to src/stores/admin/memberExecutivePosition.ts
index d69bc95..ec1b96b 100644
--- a/src/stores/admin/club/member/memberExecutivePosition.ts
+++ b/src/stores/admin/memberExecutivePosition.ts
@@ -1,14 +1,14 @@
 import { defineStore } from "pinia";
-import type { CreateMemberViewModel, UpdateMemberViewModel } from "@/viewmodels/admin/club/member/member.models";
+import type { CreateMemberViewModel, UpdateMemberViewModel } from "@/viewmodels/admin/member.models";
 import { http } from "@/serverCom";
 import type { AxiosResponse } from "axios";
-import type { MemberViewModel } from "@/viewmodels/admin/club/member/member.models";
+import type { MemberViewModel } from "@/viewmodels/admin/member.models";
 import { useMemberStore } from "./member";
 import type {
   CreateMemberExecutivePositionViewModel,
   MemberExecutivePositionViewModel,
   UpdateMemberExecutivePositionViewModel,
-} from "@/viewmodels/admin/club/member/memberExecutivePosition.models";
+} from "@/viewmodels/admin/memberExecutivePosition.models";
 
 export const useMemberExecutivePositionStore = defineStore("memberExecutivePosition", {
   state: () => {
diff --git a/src/stores/admin/club/member/memberQualification.ts b/src/stores/admin/memberQualification.ts
similarity index 92%
rename from src/stores/admin/club/member/memberQualification.ts
rename to src/stores/admin/memberQualification.ts
index 0344273..3c43767 100644
--- a/src/stores/admin/club/member/memberQualification.ts
+++ b/src/stores/admin/memberQualification.ts
@@ -1,14 +1,14 @@
 import { defineStore } from "pinia";
-import type { CreateMemberViewModel, UpdateMemberViewModel } from "@/viewmodels/admin/club/member/member.models";
+import type { CreateMemberViewModel, UpdateMemberViewModel } from "@/viewmodels/admin/member.models";
 import { http } from "@/serverCom";
 import type { AxiosResponse } from "axios";
-import type { MemberViewModel } from "@/viewmodels/admin/club/member/member.models";
+import type { MemberViewModel } from "@/viewmodels/admin/member.models";
 import { useMemberStore } from "./member";
 import type {
   CreateMemberQualificationViewModel,
   MemberQualificationViewModel,
   UpdateMemberQualificationViewModel,
-} from "@/viewmodels/admin/club/member/memberQualification.models";
+} from "@/viewmodels/admin/memberQualification.models";
 
 export const useMemberQualificationStore = defineStore("memberQualification", {
   state: () => {
diff --git a/src/stores/admin/club/member/membership.ts b/src/stores/admin/membership.ts
similarity index 90%
rename from src/stores/admin/club/member/membership.ts
rename to src/stores/admin/membership.ts
index a430bf4..e53734e 100644
--- a/src/stores/admin/club/member/membership.ts
+++ b/src/stores/admin/membership.ts
@@ -1,14 +1,14 @@
 import { defineStore } from "pinia";
-import type { CreateMemberViewModel, UpdateMemberViewModel } from "@/viewmodels/admin/club/member/member.models";
+import type { CreateMemberViewModel, UpdateMemberViewModel } from "@/viewmodels/admin/member.models";
 import { http } from "@/serverCom";
 import type { AxiosResponse } from "axios";
-import type { MemberViewModel } from "@/viewmodels/admin/club/member/member.models";
+import type { MemberViewModel } from "@/viewmodels/admin/member.models";
 import { useMemberStore } from "./member";
 import type {
   CreateMembershipViewModel,
   MembershipViewModel,
   UpdateMembershipViewModel,
-} from "@/viewmodels/admin/club/member/membership.models";
+} from "@/viewmodels/admin/membership.models";
 
 export const useMembershipStore = defineStore("membership", {
   state: () => {
@@ -38,6 +38,7 @@ 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,
       });
@@ -47,6 +48,7 @@ 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/settings/membershipStatus.ts b/src/stores/admin/membershipStatus.ts
similarity index 96%
rename from src/stores/admin/settings/membershipStatus.ts
rename to src/stores/admin/membershipStatus.ts
index 8861e4c..6d3f6aa 100644
--- a/src/stores/admin/settings/membershipStatus.ts
+++ b/src/stores/admin/membershipStatus.ts
@@ -3,7 +3,7 @@ import type {
   CreateMembershipStatusViewModel,
   UpdateMembershipStatusViewModel,
   MembershipStatusViewModel,
-} from "@/viewmodels/admin/settings/membershipStatus.models";
+} from "@/viewmodels/admin/membershipStatus.models";
 import { http } from "@/serverCom";
 import type { AxiosResponse } from "axios";
 
diff --git a/src/stores/admin/club/newsletter/newsletter.ts b/src/stores/admin/newsletter.ts
similarity index 96%
rename from src/stores/admin/club/newsletter/newsletter.ts
rename to src/stores/admin/newsletter.ts
index 9a7a536..5f92914 100644
--- a/src/stores/admin/club/newsletter/newsletter.ts
+++ b/src/stores/admin/newsletter.ts
@@ -1,8 +1,8 @@
 import { defineStore } from "pinia";
-import type { CreateNewsletterViewModel, SyncNewsletterViewModel } from "@/viewmodels/admin/club/newsletter/newsletter.models";
+import type { CreateNewsletterViewModel, SyncNewsletterViewModel } from "@/viewmodels/admin/newsletter.models";
 import { http } from "@/serverCom";
 import type { AxiosResponse } from "axios";
-import type { NewsletterViewModel } from "@/viewmodels/admin/club/newsletter/newsletter.models";
+import type { NewsletterViewModel } from "@/viewmodels/admin/newsletter.models";
 import cloneDeep from "lodash.clonedeep";
 import isEqual from "lodash.isequal";
 import difference from "lodash.difference";
diff --git a/src/stores/admin/settings/newsletterConfig.ts b/src/stores/admin/newsletterConfig.ts
similarity index 95%
rename from src/stores/admin/settings/newsletterConfig.ts
rename to src/stores/admin/newsletterConfig.ts
index b5f142c..64b0b8b 100644
--- a/src/stores/admin/settings/newsletterConfig.ts
+++ b/src/stores/admin/newsletterConfig.ts
@@ -2,7 +2,7 @@ import { defineStore } from "pinia";
 import type {
   SetNewsletterConfigViewModel,
   NewsletterConfigViewModel,
-} from "@/viewmodels/admin/settings/newsletterConfig.models";
+} from "@/viewmodels/admin/newsletterConfig.models";
 import { http } from "@/serverCom";
 import type { AxiosResponse } from "axios";
 
diff --git a/src/stores/admin/club/newsletter/newsletterDates.ts b/src/stores/admin/newsletterDates.ts
similarity index 97%
rename from src/stores/admin/club/newsletter/newsletterDates.ts
rename to src/stores/admin/newsletterDates.ts
index 82d6e77..8666d18 100644
--- a/src/stores/admin/club/newsletter/newsletterDates.ts
+++ b/src/stores/admin/newsletterDates.ts
@@ -1,6 +1,6 @@
 import { defineStore } from "pinia";
 import { http } from "@/serverCom";
-import type { NewsletterDatesViewModel, SyncNewsletterDatesViewModel } from "@/viewmodels/admin/club/newsletter/newsletterDates.models";
+import type { NewsletterDatesViewModel, SyncNewsletterDatesViewModel } from "@/viewmodels/admin/newsletterDates.models";
 import { useNewsletterStore } from "./newsletter";
 import cloneDeep from "lodash.clonedeep";
 import isEqual from "lodash.isequal";
diff --git a/src/stores/admin/club/newsletter/newsletterPrintout.ts b/src/stores/admin/newsletterPrintout.ts
similarity index 100%
rename from src/stores/admin/club/newsletter/newsletterPrintout.ts
rename to src/stores/admin/newsletterPrintout.ts
diff --git a/src/stores/admin/club/newsletter/newsletterRecipients.ts b/src/stores/admin/newsletterRecipients.ts
similarity index 97%
rename from src/stores/admin/club/newsletter/newsletterRecipients.ts
rename to src/stores/admin/newsletterRecipients.ts
index cb45a76..3f4991d 100644
--- a/src/stores/admin/club/newsletter/newsletterRecipients.ts
+++ b/src/stores/admin/newsletterRecipients.ts
@@ -3,7 +3,7 @@ import { http } from "@/serverCom";
 import type {
   NewsletterRecipientsViewModel,
   SyncNewsletterRecipientsViewModel,
-} from "@/viewmodels/admin/club/newsletter/newsletterRecipients.models";
+} from "@/viewmodels/admin/newsletterRecipients.models";
 import { useNewsletterStore } from "./newsletter";
 import cloneDeep from "lodash.clonedeep";
 import isEqual from "lodash.isequal";
diff --git a/src/stores/admin/club/protocol/protocol.ts b/src/stores/admin/protocol.ts
similarity index 96%
rename from src/stores/admin/club/protocol/protocol.ts
rename to src/stores/admin/protocol.ts
index fb1fad0..e9f8126 100644
--- a/src/stores/admin/club/protocol/protocol.ts
+++ b/src/stores/admin/protocol.ts
@@ -1,8 +1,8 @@
 import { defineStore } from "pinia";
-import type { CreateProtocolViewModel, SyncProtocolViewModel } from "@/viewmodels/admin/club/protocol/protocol.models";
+import type { CreateProtocolViewModel, SyncProtocolViewModel } from "@/viewmodels/admin/protocol.models";
 import { http } from "@/serverCom";
 import type { AxiosResponse } from "axios";
-import type { ProtocolViewModel } from "@/viewmodels/admin/club/protocol/protocol.models";
+import type { ProtocolViewModel } from "@/viewmodels/admin/protocol.models";
 import cloneDeep from "lodash.clonedeep";
 import isEqual from "lodash.isequal";
 import difference from "lodash.difference";
diff --git a/src/stores/admin/club/protocol/protocolAgenda.ts b/src/stores/admin/protocolAgenda.ts
similarity index 97%
rename from src/stores/admin/club/protocol/protocolAgenda.ts
rename to src/stores/admin/protocolAgenda.ts
index 5cf6b0d..1705b9f 100644
--- a/src/stores/admin/club/protocol/protocolAgenda.ts
+++ b/src/stores/admin/protocolAgenda.ts
@@ -1,6 +1,6 @@
 import { defineStore } from "pinia";
 import { http } from "@/serverCom";
-import type { ProtocolAgendaViewModel, SyncProtocolAgendaViewModel } from "@/viewmodels/admin/club/protocol/protocolAgenda.models";
+import type { ProtocolAgendaViewModel, SyncProtocolAgendaViewModel } from "@/viewmodels/admin/protocolAgenda.models";
 import { useProtocolStore } from "./protocol";
 import cloneDeep from "lodash.clonedeep";
 import isEqual from "lodash.isequal";
diff --git a/src/stores/admin/club/protocol/protocolDecision.ts b/src/stores/admin/protocolDecision.ts
similarity index 97%
rename from src/stores/admin/club/protocol/protocolDecision.ts
rename to src/stores/admin/protocolDecision.ts
index 632b080..65a0358 100644
--- a/src/stores/admin/club/protocol/protocolDecision.ts
+++ b/src/stores/admin/protocolDecision.ts
@@ -4,7 +4,7 @@ import type { AxiosResponse } from "axios";
 import type {
   ProtocolDecisionViewModel,
   SyncProtocolDecisionViewModel,
-} from "@/viewmodels/admin/club/protocol/protocolDecision.models";
+} from "@/viewmodels/admin/protocolDecision.models";
 import { useProtocolStore } from "./protocol";
 import cloneDeep from "lodash.clonedeep";
 import isEqual from "lodash.isequal";
diff --git a/src/stores/admin/club/protocol/protocolPresence.ts b/src/stores/admin/protocolPresence.ts
similarity index 97%
rename from src/stores/admin/club/protocol/protocolPresence.ts
rename to src/stores/admin/protocolPresence.ts
index ac7a94e..a10b610 100644
--- a/src/stores/admin/club/protocol/protocolPresence.ts
+++ b/src/stores/admin/protocolPresence.ts
@@ -4,7 +4,7 @@ import type { AxiosResponse } from "axios";
 import type {
   ProtocolPresenceViewModel,
   SyncProtocolPresenceViewModel,
-} from "@/viewmodels/admin/club/protocol/protocolPresence.models";
+} from "@/viewmodels/admin/protocolPresence.models";
 import { useProtocolStore } from "./protocol";
 import cloneDeep from "lodash.clonedeep";
 import isEqual from "lodash.isequal";
diff --git a/src/stores/admin/club/protocol/protocolPrintout.ts b/src/stores/admin/protocolPrintout.ts
similarity index 97%
rename from src/stores/admin/club/protocol/protocolPrintout.ts
rename to src/stores/admin/protocolPrintout.ts
index 81e5943..72462a9 100644
--- a/src/stores/admin/club/protocol/protocolPrintout.ts
+++ b/src/stores/admin/protocolPrintout.ts
@@ -1,6 +1,6 @@
 import { defineStore } from "pinia";
 import { http } from "@/serverCom";
-import type { ProtocolPrintoutViewModel } from "@/viewmodels/admin/club/protocol/protocolPrintout.models";
+import type { ProtocolPrintoutViewModel } from "@/viewmodels/admin/protocolPrintout.models";
 import { useProtocolStore } from "./protocol";
 import type { AxiosResponse } from "axios";
 
diff --git a/src/stores/admin/club/protocol/protocolVoting.ts b/src/stores/admin/protocolVoting.ts
similarity index 97%
rename from src/stores/admin/club/protocol/protocolVoting.ts
rename to src/stores/admin/protocolVoting.ts
index 2a0b63c..cdfee66 100644
--- a/src/stores/admin/club/protocol/protocolVoting.ts
+++ b/src/stores/admin/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/club/protocol/protocolVoting.models";
+import type { ProtocolVotingViewModel, SyncProtocolVotingViewModel } from "@/viewmodels/admin/protocolVoting.models";
 import { useProtocolStore } from "./protocol";
 import cloneDeep from "lodash.clonedeep";
 import isEqual from "lodash.isequal";
diff --git a/src/stores/admin/settings/qualification.ts b/src/stores/admin/qualification.ts
similarity index 96%
rename from src/stores/admin/settings/qualification.ts
rename to src/stores/admin/qualification.ts
index b755e29..7deec52 100644
--- a/src/stores/admin/settings/qualification.ts
+++ b/src/stores/admin/qualification.ts
@@ -3,7 +3,7 @@ import type {
   CreateQualificationViewModel,
   UpdateQualificationViewModel,
   QualificationViewModel,
-} from "@/viewmodels/admin/settings/qualification.models";
+} from "@/viewmodels/admin/qualification.models";
 import { http } from "@/serverCom";
 import type { AxiosResponse } from "axios";
 
diff --git a/src/stores/admin/club/queryBuilder.ts b/src/stores/admin/queryBuilder.ts
similarity index 92%
rename from src/stores/admin/club/queryBuilder.ts
rename to src/stores/admin/queryBuilder.ts
index 159a423..d65e150 100644
--- a/src/stores/admin/club/queryBuilder.ts
+++ b/src/stores/admin/queryBuilder.ts
@@ -1,6 +1,6 @@
 import { defineStore } from "pinia";
 import { http } from "@/serverCom";
-import type { TableMeta } from "@/viewmodels/admin/settings/query.models";
+import type { TableMeta } from "@/viewmodels/admin/query.models";
 import type { DynamicQueryStructure, FieldType } from "@/types/dynamicQueries";
 
 export const useQueryBuilderStore = defineStore("queryBuilder", {
@@ -32,10 +32,8 @@ export const useQueryBuilderStore = defineStore("queryBuilder", {
     },
     sendQuery(offset = 0, count = 25, query?: DynamicQueryStructure | string) {
       this.queryError = "";
-      if (offset == 0) {
-        this.data = [];
-        this.totalLength = 0;
-      }
+      this.data = [];
+      this.totalLength = 0;
       let queryToSend = query ?? this.query;
       if (queryToSend == undefined || queryToSend == "" || (typeof queryToSend != "string" && queryToSend.table == ""))
         return;
@@ -46,7 +44,7 @@ export const useQueryBuilderStore = defineStore("queryBuilder", {
         })
         .then((result) => {
           if (result.data.stats == "success") {
-            this.data = [...this.data, ...result.data.rows];
+            this.data = result.data.rows;
             this.totalLength = result.data.total;
             this.loadingData = "fetched";
           } else {
diff --git a/src/stores/admin/settings/queryStore.ts b/src/stores/admin/queryStore.ts
similarity index 92%
rename from src/stores/admin/settings/queryStore.ts
rename to src/stores/admin/queryStore.ts
index 764f146..ddc6c1a 100644
--- a/src/stores/admin/settings/queryStore.ts
+++ b/src/stores/admin/queryStore.ts
@@ -1,11 +1,11 @@
 import { defineStore } from "pinia";
-import type { CreateQueryViewModel, QueryViewModel, UpdateQueryViewModel } from "@/viewmodels/admin/settings/query.models";
+import type { CreateQueryViewModel, QueryViewModel, UpdateQueryViewModel } from "@/viewmodels/admin/query.models";
 import { http } from "@/serverCom";
 import type { AxiosResponse } from "axios";
-import { useQueryBuilderStore } from "../club/queryBuilder";
-import { useModalStore } from "../../modal";
+import { useQueryBuilderStore } from "./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/user/role.ts b/src/stores/admin/role.ts
similarity index 95%
rename from src/stores/admin/user/role.ts
rename to src/stores/admin/role.ts
index a5401ed..93c997c 100644
--- a/src/stores/admin/user/role.ts
+++ b/src/stores/admin/role.ts
@@ -1,5 +1,5 @@
 import { defineStore } from "pinia";
-import type { RoleViewModel } from "@/viewmodels/admin/user/role.models";
+import type { RoleViewModel } from "@/viewmodels/admin/role.models";
 import { http } from "@/serverCom";
 import type { PermissionObject } from "@/types/permissionTypes";
 import type { AxiosResponse } from "axios";
diff --git a/src/stores/admin/settings/template.ts b/src/stores/admin/template.ts
similarity index 97%
rename from src/stores/admin/settings/template.ts
rename to src/stores/admin/template.ts
index 706002e..5f0484f 100644
--- a/src/stores/admin/settings/template.ts
+++ b/src/stores/admin/template.ts
@@ -5,7 +5,7 @@ import type {
   CreateTemplateViewModel,
   TemplateViewModel,
   UpdateTemplateViewModel,
-} from "@/viewmodels/admin/settings/template.models";
+} from "@/viewmodels/admin/template.models";
 
 export const useTemplateStore = defineStore("template", {
   state: () => {
diff --git a/src/stores/admin/settings/templateUsage.ts b/src/stores/admin/templateUsage.ts
similarity index 87%
rename from src/stores/admin/settings/templateUsage.ts
rename to src/stores/admin/templateUsage.ts
index 89375b9..6e3aca9 100644
--- a/src/stores/admin/settings/templateUsage.ts
+++ b/src/stores/admin/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/settings/template.models";
-import type { TemplateUsageViewModel, UpdateTemplateUsageViewModel } from "@/viewmodels/admin/settings/templateUsage.models";
+import type { CreateTemplateViewModel, UpdateTemplateViewModel } from "@/viewmodels/admin/template.models";
+import type { TemplateUsageViewModel, UpdateTemplateUsageViewModel } from "@/viewmodels/admin/templateUsage.models";
 import type { PermissionModule } from "@/types/permissionTypes";
 
 export const useTemplateUsageStore = defineStore("templateUsage", {
@@ -35,8 +35,6 @@ 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/user/user.ts b/src/stores/admin/user.ts
similarity index 98%
rename from src/stores/admin/user/user.ts
rename to src/stores/admin/user.ts
index 5696063..0b573cb 100644
--- a/src/stores/admin/user/user.ts
+++ b/src/stores/admin/user.ts
@@ -1,5 +1,5 @@
 import { defineStore } from "pinia";
-import type { UpdateUserViewModel, UserViewModel } from "@/viewmodels/admin/user/user.models";
+import type { UpdateUserViewModel, UserViewModel } from "@/viewmodels/admin/user.models";
 import { http } from "@/serverCom";
 import type { PermissionObject } from "@/types/permissionTypes";
 import type { AxiosResponse } from "axios";
diff --git a/src/viewmodels/admin/settings/award.models.ts b/src/viewmodels/admin/award.models.ts
similarity index 100%
rename from src/viewmodels/admin/settings/award.models.ts
rename to src/viewmodels/admin/award.models.ts
diff --git a/src/viewmodels/admin/club/calendar.models.ts b/src/viewmodels/admin/calendar.models.ts
similarity index 88%
rename from src/viewmodels/admin/club/calendar.models.ts
rename to src/viewmodels/admin/calendar.models.ts
index ee663c1..a724305 100644
--- a/src/viewmodels/admin/club/calendar.models.ts
+++ b/src/viewmodels/admin/calendar.models.ts
@@ -1,4 +1,4 @@
-import type { CalendarTypeViewModel } from "../settings/calendarType.models";
+import type { CalendarTypeViewModel } from "./calendarType.models";
 
 export interface CalendarViewModel {
   id: string;
diff --git a/src/viewmodels/admin/settings/calendarType.models.ts b/src/viewmodels/admin/calendarType.models.ts
similarity index 100%
rename from src/viewmodels/admin/settings/calendarType.models.ts
rename to src/viewmodels/admin/calendarType.models.ts
diff --git a/src/viewmodels/admin/club/member/communication.models.ts b/src/viewmodels/admin/communication.models.ts
similarity index 90%
rename from src/viewmodels/admin/club/member/communication.models.ts
rename to src/viewmodels/admin/communication.models.ts
index 8ca4af0..4f54af2 100644
--- a/src/viewmodels/admin/club/member/communication.models.ts
+++ b/src/viewmodels/admin/communication.models.ts
@@ -1,4 +1,4 @@
-import type { CommunicationTypeViewModel } from "../../settings/communicationType.models";
+import type { CommunicationTypeViewModel } from "./communicationType.models";
 
 export interface CommunicationViewModel {
   id: number;
diff --git a/src/viewmodels/admin/settings/communicationType.models.ts b/src/viewmodels/admin/communicationType.models.ts
similarity index 100%
rename from src/viewmodels/admin/settings/communicationType.models.ts
rename to src/viewmodels/admin/communicationType.models.ts
diff --git a/src/viewmodels/admin/settings/executivePosition.models.ts b/src/viewmodels/admin/executivePosition.models.ts
similarity index 100%
rename from src/viewmodels/admin/settings/executivePosition.models.ts
rename to src/viewmodels/admin/executivePosition.models.ts
diff --git a/src/viewmodels/admin/user/invite.models.ts b/src/viewmodels/admin/invite.models.ts
similarity index 100%
rename from src/viewmodels/admin/user/invite.models.ts
rename to src/viewmodels/admin/invite.models.ts
diff --git a/src/viewmodels/admin/club/member/member.models.ts b/src/viewmodels/admin/member.models.ts
similarity index 92%
rename from src/viewmodels/admin/club/member/member.models.ts
rename to src/viewmodels/admin/member.models.ts
index ca5fcc1..0f95af6 100644
--- a/src/viewmodels/admin/club/member/member.models.ts
+++ b/src/viewmodels/admin/member.models.ts
@@ -9,7 +9,6 @@ export interface MemberViewModel {
   lastname: string;
   nameaffix: string;
   birthdate: Date;
-  internalId?: string;
   firstMembershipEntry?: MembershipViewModel;
   lastMembershipEntry?: MembershipViewModel;
   sendNewsletter?: CommunicationViewModel;
@@ -23,7 +22,6 @@ export interface CreateMemberViewModel {
   lastname: string;
   nameaffix: string;
   birthdate: Date;
-  internalId?: string;
 }
 
 export interface UpdateMemberViewModel {
@@ -33,5 +31,4 @@ export interface UpdateMemberViewModel {
   lastname: string;
   nameaffix: string;
   birthdate: Date;
-  internalId?: string;
 }
diff --git a/src/viewmodels/admin/club/member/memberAward.models.ts b/src/viewmodels/admin/memberAward.models.ts
similarity index 100%
rename from src/viewmodels/admin/club/member/memberAward.models.ts
rename to src/viewmodels/admin/memberAward.models.ts
diff --git a/src/viewmodels/admin/club/member/memberExecutivePosition.models.ts b/src/viewmodels/admin/memberExecutivePosition.models.ts
similarity index 100%
rename from src/viewmodels/admin/club/member/memberExecutivePosition.models.ts
rename to src/viewmodels/admin/memberExecutivePosition.models.ts
diff --git a/src/viewmodels/admin/club/member/memberQualification.models.ts b/src/viewmodels/admin/memberQualification.models.ts
similarity index 100%
rename from src/viewmodels/admin/club/member/memberQualification.models.ts
rename to src/viewmodels/admin/memberQualification.models.ts
diff --git a/src/viewmodels/admin/club/member/membership.models.ts b/src/viewmodels/admin/membership.models.ts
similarity index 84%
rename from src/viewmodels/admin/club/member/membership.models.ts
rename to src/viewmodels/admin/membership.models.ts
index 82ede06..76b804e 100644
--- a/src/viewmodels/admin/club/member/membership.models.ts
+++ b/src/viewmodels/admin/membership.models.ts
@@ -1,5 +1,6 @@
 export interface MembershipViewModel {
   id: number;
+  internalId?: string;
   start: Date;
   end?: Date;
   terminationReason?: string;
@@ -8,12 +9,14 @@ 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/settings/membershipStatus.models.ts b/src/viewmodels/admin/membershipStatus.models.ts
similarity index 100%
rename from src/viewmodels/admin/settings/membershipStatus.models.ts
rename to src/viewmodels/admin/membershipStatus.models.ts
diff --git a/src/viewmodels/admin/club/newsletter/newsletter.models.ts b/src/viewmodels/admin/newsletter.models.ts
similarity index 90%
rename from src/viewmodels/admin/club/newsletter/newsletter.models.ts
rename to src/viewmodels/admin/newsletter.models.ts
index 0f3e23b..19347b1 100644
--- a/src/viewmodels/admin/club/newsletter/newsletter.models.ts
+++ b/src/viewmodels/admin/newsletter.models.ts
@@ -1,4 +1,4 @@
-import type { QueryViewModel } from "../../settings/query.models";
+import type { QueryViewModel } from "./query.models";
 
 export interface NewsletterViewModel {
   id: number;
diff --git a/src/viewmodels/admin/settings/newsletterConfig.models.ts b/src/viewmodels/admin/newsletterConfig.models.ts
similarity index 100%
rename from src/viewmodels/admin/settings/newsletterConfig.models.ts
rename to src/viewmodels/admin/newsletterConfig.models.ts
diff --git a/src/viewmodels/admin/club/newsletter/newsletterDates.models.ts b/src/viewmodels/admin/newsletterDates.models.ts
similarity index 83%
rename from src/viewmodels/admin/club/newsletter/newsletterDates.models.ts
rename to src/viewmodels/admin/newsletterDates.models.ts
index 3db4d5b..5afe116 100644
--- a/src/viewmodels/admin/club/newsletter/newsletterDates.models.ts
+++ b/src/viewmodels/admin/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/club/newsletter/newsletterRecipients.models.ts b/src/viewmodels/admin/newsletterRecipients.models.ts
similarity index 75%
rename from src/viewmodels/admin/club/newsletter/newsletterRecipients.models.ts
rename to src/viewmodels/admin/newsletterRecipients.models.ts
index 7e5ab15..134fc90 100644
--- a/src/viewmodels/admin/club/newsletter/newsletterRecipients.models.ts
+++ b/src/viewmodels/admin/newsletterRecipients.models.ts
@@ -1,4 +1,4 @@
-import type { MemberViewModel } from "../member/member.models";
+import type { MemberViewModel } from "./member.models";
 
 export interface NewsletterRecipientsViewModel {
   newsletterId: number;
diff --git a/src/viewmodels/admin/club/protocol/protocol.models.ts b/src/viewmodels/admin/protocol.models.ts
similarity index 100%
rename from src/viewmodels/admin/club/protocol/protocol.models.ts
rename to src/viewmodels/admin/protocol.models.ts
diff --git a/src/viewmodels/admin/club/protocol/protocolAgenda.models.ts b/src/viewmodels/admin/protocolAgenda.models.ts
similarity index 100%
rename from src/viewmodels/admin/club/protocol/protocolAgenda.models.ts
rename to src/viewmodels/admin/protocolAgenda.models.ts
diff --git a/src/viewmodels/admin/club/protocol/protocolDecision.models.ts b/src/viewmodels/admin/protocolDecision.models.ts
similarity index 100%
rename from src/viewmodels/admin/club/protocol/protocolDecision.models.ts
rename to src/viewmodels/admin/protocolDecision.models.ts
diff --git a/src/viewmodels/admin/club/protocol/protocolPresence.models.ts b/src/viewmodels/admin/protocolPresence.models.ts
similarity index 75%
rename from src/viewmodels/admin/club/protocol/protocolPresence.models.ts
rename to src/viewmodels/admin/protocolPresence.models.ts
index a395172..d72d916 100644
--- a/src/viewmodels/admin/club/protocol/protocolPresence.models.ts
+++ b/src/viewmodels/admin/protocolPresence.models.ts
@@ -1,4 +1,4 @@
-import type { MemberViewModel } from "../member/member.models";
+import type { MemberViewModel } from "./member.models";
 
 export interface ProtocolPresenceViewModel {
   memberId: number;
diff --git a/src/viewmodels/admin/club/protocol/protocolPrintout.models.ts b/src/viewmodels/admin/protocolPrintout.models.ts
similarity index 100%
rename from src/viewmodels/admin/club/protocol/protocolPrintout.models.ts
rename to src/viewmodels/admin/protocolPrintout.models.ts
diff --git a/src/viewmodels/admin/club/protocol/protocolVoting.models.ts b/src/viewmodels/admin/protocolVoting.models.ts
similarity index 100%
rename from src/viewmodels/admin/club/protocol/protocolVoting.models.ts
rename to src/viewmodels/admin/protocolVoting.models.ts
diff --git a/src/viewmodels/admin/settings/qualification.models.ts b/src/viewmodels/admin/qualification.models.ts
similarity index 100%
rename from src/viewmodels/admin/settings/qualification.models.ts
rename to src/viewmodels/admin/qualification.models.ts
diff --git a/src/viewmodels/admin/settings/query.models.ts b/src/viewmodels/admin/query.models.ts
similarity index 100%
rename from src/viewmodels/admin/settings/query.models.ts
rename to src/viewmodels/admin/query.models.ts
diff --git a/src/viewmodels/admin/user/role.models.ts b/src/viewmodels/admin/role.models.ts
similarity index 100%
rename from src/viewmodels/admin/user/role.models.ts
rename to src/viewmodels/admin/role.models.ts
diff --git a/src/viewmodels/admin/settings/template.models.ts b/src/viewmodels/admin/template.models.ts
similarity index 100%
rename from src/viewmodels/admin/settings/template.models.ts
rename to src/viewmodels/admin/template.models.ts
diff --git a/src/viewmodels/admin/settings/templateUsage.models.ts b/src/viewmodels/admin/templateUsage.models.ts
similarity index 78%
rename from src/viewmodels/admin/settings/templateUsage.models.ts
rename to src/viewmodels/admin/templateUsage.models.ts
index 8aa7d1f..79459cd 100644
--- a/src/viewmodels/admin/settings/templateUsage.models.ts
+++ b/src/viewmodels/admin/templateUsage.models.ts
@@ -5,8 +5,6 @@ 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 {
@@ -14,6 +12,4 @@ export interface UpdateTemplateUsageViewModel {
   headerId: number | null;
   bodyId: number | null;
   footerId: number | null;
-  headerHeight: number | null;
-  footerHeight: number | null;
 }
diff --git a/src/viewmodels/admin/user/user.models.ts b/src/viewmodels/admin/user.models.ts
similarity index 100%
rename from src/viewmodels/admin/user/user.models.ts
rename to src/viewmodels/admin/user.models.ts
diff --git a/src/views/account/Administration.vue b/src/views/account/Administration.vue
index e6dd5ca..fad7ec1 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/user";
+import { useUserStore } from "@/stores/admin/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/user.models";
+import type { UserViewModel } from "@/viewmodels/admin/user.models";
 </script>
 
 <script lang="ts">
diff --git a/src/views/account/Me.vue b/src/views/account/Me.vue
index 8e2990e..df15146 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/user.models";
+import type { UserViewModel } from "@/viewmodels/admin/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 4487079..fbb4e25 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/club/calendar";
+import { useCalendarStore } from "@/stores/admin/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 2d98b4d..a53b80a 100644
--- a/src/views/admin/club/members/Member.vue
+++ b/src/views/admin/club/members/Member.vue
@@ -11,9 +11,8 @@
           :items="members"
           :totalCount="totalCount"
           :indicateLoading="loading == 'loading'"
-          :useSearch="true"
-          @load-data="(offset, count, search) => fetchMembers(offset, count, search)"
-          @search="(search) => fetchMembers(0, maxEntriesPerPage, search, true)"
+          @load-data="(offset, count, search) => fetchMembers(offset, count)"
+          @search="(search) => fetchMembers(0, 25, true)"
         >
           <template #pageRow="{ row }: { row: MemberViewModel }">
             <MemberListItem :member="row" />
@@ -34,11 +33,12 @@
 import { defineAsyncComponent, defineComponent, markRaw } from "vue";
 import { mapActions, mapState } from "pinia";
 import MainTemplate from "@/templates/Main.vue";
-import { useMemberStore } from "@/stores/admin/club/member/member";
+import { ChevronRightIcon, ChevronLeftIcon } from "@heroicons/vue/20/solid";
+import { useMemberStore } from "@/stores/admin/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/club/member/member.models";
+import type { MemberViewModel } from "@/viewmodels/admin/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 f535d27..bea48f3 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/club/member/memberAward";
+import { useMemberAwardStore } from "@/stores/admin/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 c948c22..c6ac9f7 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/club/member/member";
-import type { MemberViewModel, UpdateMemberViewModel } from "@/viewmodels/admin/club/member/member.models";
+import { useMemberStore } from "@/stores/admin/member";
+import type { MemberViewModel, UpdateMemberViewModel } from "@/viewmodels/admin/member.models";
 import Spinner from "@/components/Spinner.vue";
-import type { CommunicationViewModel } from "@/viewmodels/admin/club/member/communication.models";
-import { useCommunicationStore } from "@/stores/admin/club/member/communication";
+import type { CommunicationViewModel } from "@/viewmodels/admin/communication.models";
+import { useCommunicationStore } from "@/stores/admin/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 af6e56b..aa70158 100644
--- a/src/views/admin/club/members/MemberEdit.vue
+++ b/src/views/admin/club/members/MemberEdit.vue
@@ -69,10 +69,6 @@
         <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
@@ -92,8 +88,8 @@
 import { defineComponent } from "vue";
 import { mapActions, mapState } from "pinia";
 import MainTemplate from "@/templates/Main.vue";
-import { useMemberStore } from "@/stores/admin/club/member/member";
-import type { MemberViewModel, UpdateMemberViewModel } from "@/viewmodels/admin/club/member/member.models";
+import { useMemberStore } from "@/stores/admin/member";
+import type { MemberViewModel, UpdateMemberViewModel } from "@/viewmodels/admin/member.models";
 import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
@@ -158,8 +154,7 @@ export default defineComponent({
         firstname: formData.firstname.value,
         lastname: formData.lastname.value,
         nameaffix: formData.nameaffix.value,
-        birthdate: formData.birthdate.value,        
-        internalId: formData.internalId.value,
+        birthdate: formData.birthdate.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 3ebfe98..e4f39bf 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/club/member/memberExecutivePosition";
+import { useMemberExecutivePositionStore } from "@/stores/admin/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 76bb61b..b08f682 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/club/member/member";
+import { useMemberStore } from "@/stores/admin/member";
 </script>
 
 <script lang="ts">
diff --git a/src/views/admin/club/members/MemberQualifications.vue b/src/views/admin/club/members/MemberQualifications.vue
index 76b15cd..7d03e6e 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/club/member/memberQualification";
+import { useMemberQualificationStore } from "@/stores/admin/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 53ba05b..125d69f 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/club/member/member";
+import { useMemberStore } from "@/stores/admin/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 1b5c9c5..fee3485 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/club/member/membership";
+import { useMembershipStore } from "@/stores/admin/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 a6b3bed..4541051 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/club/newsletter/newsletter";
-import type { NewsletterViewModel } from "@/viewmodels/admin/club/newsletter/newsletter.models";
+import { useNewsletterStore } from "@/stores/admin/newsletter";
+import type { NewsletterViewModel } from "@/viewmodels/admin/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 f9195b6..ce665bd 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/club/newsletter/newsletter";
+import { useNewsletterStore } from "@/stores/admin/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 152a63f..cbc9414 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/club/newsletter/newsletterDates";
+import { useNewsletterDatesStore } from "@/stores/admin/newsletterDates";
 import { useAbilityStore } from "@/stores/ability";
-import { useCalendarStore } from "@/stores/admin/club/calendar";
-import type { CalendarViewModel } from "@/viewmodels/admin/club/calendar.models";
+import { useCalendarStore } from "@/stores/admin/calendar";
+import type { CalendarViewModel } from "@/viewmodels/admin/calendar.models";
 import { TrashIcon } from "@heroicons/vue/24/outline";
 import cloneDeep from "lodash.clonedeep";
-import type { NewsletterDatesViewModel } from "@/viewmodels/admin/club/newsletter/newsletterDates.models";
+import type { NewsletterDatesViewModel } from "@/viewmodels/admin/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 1097bc8..54f6954 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/club/newsletter/newsletter";
+import { useNewsletterStore } from "@/stores/admin/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 90c06c0..72f384c 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/club/newsletter/newsletterPrintout";
+import { useNewsletterPrintoutStore } from "../../../../stores/admin/newsletterPrintout";
 </script>
 
 <script lang="ts">
diff --git a/src/views/admin/club/newsletter/NewsletterRecipients.vue b/src/views/admin/club/newsletter/NewsletterRecipients.vue
index d39c105..9cd5f9b 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/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 { 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 { useAbilityStore } from "@/stores/ability";
-import { useQueryStoreStore } from "@/stores/admin/settings/queryStore";
-import { useQueryBuilderStore } from "@/stores/admin/club/queryBuilder";
+import { useQueryStoreStore } from "@/stores/admin/queryStore";
+import { useQueryBuilderStore } from "@/stores/admin/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 16458a1..351d8ab 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/club/newsletter/newsletter";
+import { useNewsletterStore } from "@/stores/admin/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/club/newsletter/newsletterDates";
-import { useNewsletterRecipientsStore } from "../../../../stores/admin/club/newsletter/newsletterRecipients";
+import { useNewsletterDatesStore } from "../../../../stores/admin/newsletterDates";
+import { useNewsletterRecipientsStore } from "../../../../stores/admin/newsletterRecipients";
 </script>
 
 <script lang="ts">
diff --git a/src/views/admin/club/protocol/Protocol.vue b/src/views/admin/club/protocol/Protocol.vue
index b19c874..9746b96 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/club/protocol/protocol";
+import { useProtocolStore } from "@/stores/admin/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/club/protocol/protocol.models";
+import type { ProtocolViewModel } from "@/viewmodels/admin/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 767d723..a83f314 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/club/protocol/protocolAgenda";
-import type { ProtocolAgendaViewModel } from "@/viewmodels/admin/club/protocol/protocolAgenda.models";
+import { useProtocolAgendaStore } from "@/stores/admin/protocolAgenda";
+import type { ProtocolAgendaViewModel } from "@/viewmodels/admin/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 9f72172..d365498 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/club/protocol/protocol";
+import { useProtocolStore } from "@/stores/admin/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/club/protocol/protocolDecision";
+import { useProtocolDecisionStore } from "@/stores/admin/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 4a14774..e14788a 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/club/protocol/protocol";
+import { useProtocolStore } from "@/stores/admin/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 8696512..be6aab5 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/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 { 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 { useAbilityStore } from "@/stores/ability";
 </script>
 
diff --git a/src/views/admin/club/protocol/ProtocolPrintout.vue b/src/views/admin/club/protocol/ProtocolPrintout.vue
index 132ebb2..54ecd3d 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/club/protocol/protocolPrintout";
+import { useProtocolPrintoutStore } from "@/stores/admin/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 b730fed..e333896 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/club/protocol/protocol";
+import { useProtocolStore } from "@/stores/admin/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 595ce43..ce60bce 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/club/protocol/protocol";
+import { useProtocolStore } from "@/stores/admin/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/club/protocol/protocolVoting";
+import { useProtocolVotingStore } from "@/stores/admin/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 faba32c..762abc6 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/club/queryBuilder";
+import { useQueryBuilderStore } from "@/stores/admin/queryBuilder";
 import BuilderHost from "@/components/queryBuilder/BuilderHost.vue";
 import type { DynamicQueryStructure, FieldType } from "@/types/dynamicQueries";
-import { useQueryStoreStore } from "@/stores/admin/settings/queryStore";
+import { useQueryStoreStore } from "@/stores/admin/queryStore";
 </script>
 
 <script lang="ts">
diff --git a/src/views/admin/settings/award/Award.vue b/src/views/admin/settings/Award.vue
similarity index 96%
rename from src/views/admin/settings/award/Award.vue
rename to src/views/admin/settings/Award.vue
index f17899e..5db2147 100644
--- a/src/views/admin/settings/award/Award.vue
+++ b/src/views/admin/settings/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/settings/award";
+import { useAwardStore } from "@/stores/admin/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/award/AwardEdit.vue b/src/views/admin/settings/AwardEdit.vue
similarity index 97%
rename from src/views/admin/settings/award/AwardEdit.vue
rename to src/views/admin/settings/AwardEdit.vue
index 9cff484..df7aa34 100644
--- a/src/views/admin/settings/award/AwardEdit.vue
+++ b/src/views/admin/settings/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/settings/award";
+import { useAwardStore } from "@/stores/admin/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/settings/award.models";
+import type { AwardViewModel, UpdateAwardViewModel } from "@/viewmodels/admin/award.models";
 import cloneDeep from "lodash.clonedeep";
 import isEqual from "lodash.isequal";
 </script>
diff --git a/src/views/admin/settings/calendarType/CalendarType.vue b/src/views/admin/settings/CalendarType.vue
similarity index 95%
rename from src/views/admin/settings/calendarType/CalendarType.vue
rename to src/views/admin/settings/CalendarType.vue
index 311a4e9..76c6296 100644
--- a/src/views/admin/settings/calendarType/CalendarType.vue
+++ b/src/views/admin/settings/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/settings/calendarType";
+import { useCalendarTypeStore } from "@/stores/admin/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/calendarType/CalendarTypeEdit.vue b/src/views/admin/settings/CalendarTypeEdit.vue
similarity index 97%
rename from src/views/admin/settings/calendarType/CalendarTypeEdit.vue
rename to src/views/admin/settings/CalendarTypeEdit.vue
index 41f043a..14ea437 100644
--- a/src/views/admin/settings/calendarType/CalendarTypeEdit.vue
+++ b/src/views/admin/settings/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/settings/calendarType";
+import { useCalendarTypeStore } from "@/stores/admin/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/settings/calendarType.models";
+import type { CalendarTypeViewModel, UpdateCalendarTypeViewModel } from "@/viewmodels/admin/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/CommunicationType.vue b/src/views/admin/settings/CommunicationType.vue
similarity index 95%
rename from src/views/admin/settings/communicationType/CommunicationType.vue
rename to src/views/admin/settings/CommunicationType.vue
index a7aa92f..c9bdf39 100644
--- a/src/views/admin/settings/communicationType/CommunicationType.vue
+++ b/src/views/admin/settings/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/settings/communicationType";
+import { useCommunicationTypeStore } from "@/stores/admin/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/communicationType/CommunicationTypeEdit.vue b/src/views/admin/settings/CommunicationTypeEdit.vue
similarity index 97%
rename from src/views/admin/settings/communicationType/CommunicationTypeEdit.vue
rename to src/views/admin/settings/CommunicationTypeEdit.vue
index 5ba1628..00d31e9 100644
--- a/src/views/admin/settings/communicationType/CommunicationTypeEdit.vue
+++ b/src/views/admin/settings/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/settings/communicationType";
+import { useCommunicationTypeStore } from "@/stores/admin/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/settings/communicationType.models";
+} from "@/viewmodels/admin/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/ExecutivePosition.vue b/src/views/admin/settings/ExecutivePosition.vue
similarity index 95%
rename from src/views/admin/settings/executivePosition/ExecutivePosition.vue
rename to src/views/admin/settings/ExecutivePosition.vue
index 46b95ff..5bf69da 100644
--- a/src/views/admin/settings/executivePosition/ExecutivePosition.vue
+++ b/src/views/admin/settings/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/settings/executivePosition";
+import { useExecutivePositionStore } from "@/stores/admin/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/executivePosition/ExecutivePositionEdit.vue b/src/views/admin/settings/ExecutivePositionEdit.vue
similarity index 96%
rename from src/views/admin/settings/executivePosition/ExecutivePositionEdit.vue
rename to src/views/admin/settings/ExecutivePositionEdit.vue
index 9fcb863..9cd071f 100644
--- a/src/views/admin/settings/executivePosition/ExecutivePositionEdit.vue
+++ b/src/views/admin/settings/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/settings/executivePosition";
+import { useExecutivePositionStore } from "@/stores/admin/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/settings/executivePosition.models";
+} from "@/viewmodels/admin/executivePosition.models";
 import cloneDeep from "lodash.clonedeep";
 import isEqual from "lodash.isequal";
 </script>
diff --git a/src/views/admin/settings/membershipStatus/MembershipStatus.vue b/src/views/admin/settings/MembershipStatus.vue
similarity index 95%
rename from src/views/admin/settings/membershipStatus/MembershipStatus.vue
rename to src/views/admin/settings/MembershipStatus.vue
index 200da17..05658fb 100644
--- a/src/views/admin/settings/membershipStatus/MembershipStatus.vue
+++ b/src/views/admin/settings/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/settings/membershipStatus";
+import { useMembershipStatusStore } from "@/stores/admin/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/membershipStatus/MembershipStatusEdit.vue b/src/views/admin/settings/MembershipStatusEdit.vue
similarity index 96%
rename from src/views/admin/settings/membershipStatus/MembershipStatusEdit.vue
rename to src/views/admin/settings/MembershipStatusEdit.vue
index cd41e26..bddc9dc 100644
--- a/src/views/admin/settings/membershipStatus/MembershipStatusEdit.vue
+++ b/src/views/admin/settings/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/settings/membershipStatus";
+import { useMembershipStatusStore } from "@/stores/admin/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/settings/membershipStatus.models";
+} from "@/viewmodels/admin/membershipStatus.models";
 import cloneDeep from "lodash.clonedeep";
 import isEqual from "lodash.isequal";
 </script>
diff --git a/src/views/admin/settings/qualification/Qualification.vue b/src/views/admin/settings/Qualification.vue
similarity index 95%
rename from src/views/admin/settings/qualification/Qualification.vue
rename to src/views/admin/settings/Qualification.vue
index 0159c6f..20ff8f8 100644
--- a/src/views/admin/settings/qualification/Qualification.vue
+++ b/src/views/admin/settings/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/settings/qualification";
+import { useQualificationStore } from "@/stores/admin/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/qualification/QualificationEdit.vue b/src/views/admin/settings/QualificationEdit.vue
similarity index 96%
rename from src/views/admin/settings/qualification/QualificationEdit.vue
rename to src/views/admin/settings/QualificationEdit.vue
index c973ece..6ba4850 100644
--- a/src/views/admin/settings/qualification/QualificationEdit.vue
+++ b/src/views/admin/settings/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/settings/qualification";
+import { useQualificationStore } from "@/stores/admin/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/settings/qualification.models";
+import type { UpdateQualificationViewModel, QualificationViewModel } from "@/viewmodels/admin/qualification.models";
 import cloneDeep from "lodash.clonedeep";
 import isEqual from "lodash.isequal";
 </script>
diff --git a/src/views/admin/settings/queryStore/QueryStore.vue b/src/views/admin/settings/QueryStore.vue
similarity index 91%
rename from src/views/admin/settings/queryStore/QueryStore.vue
rename to src/views/admin/settings/QueryStore.vue
index f2ccb95..d849f0c 100644
--- a/src/views/admin/settings/queryStore/QueryStore.vue
+++ b/src/views/admin/settings/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/club/queryBuilder";
-import { useQueryStoreStore } from "@/stores/admin/settings/queryStore";
+import { useQueryBuilderStore } from "@/stores/admin/queryBuilder";
+import { useQueryStoreStore } from "@/stores/admin/queryStore";
 import QueryStoreListItem from "@/components/admin/settings/queryStore/QueryStoreListItem.vue";
 </script>
 
diff --git a/src/views/admin/settings/newsletterConfig/NewsletterConfig.vue b/src/views/admin/settings/newsletterConfig/NewsletterConfig.vue
index 4775587..e4865db 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/settings/communicationType";
-import { useNewsletterConfigStore } from "@/stores/admin/settings/newsletterConfig";
+import { useCommunicationTypeStore } from "@/stores/admin/communicationType";
+import { useNewsletterConfigStore } from "@/stores/admin/newsletterConfig";
 import NewsletterConfigListItem from "@/components/admin/settings/newsletterConfig/NewsletterConfigListItem.vue";
 </script>
 
diff --git a/src/views/admin/settings/template/Template.vue b/src/views/admin/settings/template/Template.vue
index c9e019f..56cea4b 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/settings/template";
+import { useTemplateStore } from "@/stores/admin/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 4317717..2a2c07c 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/settings/template.models";
-import { useTemplateStore } from "@/stores/admin/settings/template";
+import type { TemplateViewModel, UpdateTemplateViewModel } from "@/viewmodels/admin/template.models";
+import { useTemplateStore } from "@/stores/admin/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 ac08bef..9ad6332 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/settings/templateUsage";
+import { useTemplateUsageStore } from "@/stores/admin/templateUsage";
 import TemplateUsageListItem from "@/components/admin/settings/templateUsage/TemplateUsageListItem.vue";
-import { useTemplateStore } from "@/stores/admin/settings/template";
+import { useTemplateStore } from "@/stores/admin/template";
 </script>
 
 <script lang="ts">
diff --git a/src/views/admin/user/user/Invite.vue b/src/views/admin/user/Invite.vue
similarity index 94%
rename from src/views/admin/user/user/Invite.vue
rename to src/views/admin/user/Invite.vue
index b79b673..35b326a 100644
--- a/src/views/admin/user/user/Invite.vue
+++ b/src/views/admin/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/user/invite";
+import { useInviteStore } from "@/stores/admin/invite";
 import InviteListItem from "@/components/admin/user/user/InviteListItem.vue";
 </script>
 
diff --git a/src/views/admin/user/role/Role.vue b/src/views/admin/user/Role.vue
similarity index 96%
rename from src/views/admin/user/role/Role.vue
rename to src/views/admin/user/Role.vue
index 99430e3..6c5f191 100644
--- a/src/views/admin/user/role/Role.vue
+++ b/src/views/admin/user/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/user/role";
+import { useRoleStore } from "@/stores/admin/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/role/RoleEdit.vue b/src/views/admin/user/RoleEdit.vue
similarity index 96%
rename from src/views/admin/user/role/RoleEdit.vue
rename to src/views/admin/user/RoleEdit.vue
index aea09de..c1b60cf 100644
--- a/src/views/admin/user/role/RoleEdit.vue
+++ b/src/views/admin/user/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/user/role";
+import { useRoleStore } from "@/stores/admin/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/user/role.models";
+import type { RoleViewModel } from "@/viewmodels/admin/role.models";
 </script>
 
 <script lang="ts">
diff --git a/src/views/admin/user/role/RoleEditPermission.vue b/src/views/admin/user/RoleEditPermission.vue
similarity index 94%
rename from src/views/admin/user/role/RoleEditPermission.vue
rename to src/views/admin/user/RoleEditPermission.vue
index 71b93a7..0b39c30 100644
--- a/src/views/admin/user/role/RoleEditPermission.vue
+++ b/src/views/admin/user/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/user/role";
+import { useRoleStore } from "@/stores/admin/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/user/role.models";
+import type { RoleViewModel } from "@/viewmodels/admin/role.models";
 </script>
 
 <script lang="ts">
diff --git a/src/views/admin/user/user/User.vue b/src/views/admin/user/User.vue
similarity index 96%
rename from src/views/admin/user/user/User.vue
rename to src/views/admin/user/User.vue
index 0178302..d556cc6 100644
--- a/src/views/admin/user/user/User.vue
+++ b/src/views/admin/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/user";
+import { useUserStore } from "@/stores/admin/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/user/UserEdit.vue b/src/views/admin/user/UserEdit.vue
similarity index 98%
rename from src/views/admin/user/user/UserEdit.vue
rename to src/views/admin/user/UserEdit.vue
index 154b3f3..a4e7cfc 100644
--- a/src/views/admin/user/user/UserEdit.vue
+++ b/src/views/admin/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/user";
-import type { UpdateUserViewModel, UserViewModel } from "@/viewmodels/admin/user/user.models";
+import { useUserStore } from "@/stores/admin/user";
+import type { UpdateUserViewModel, UserViewModel } from "@/viewmodels/admin/user.models";
 import cloneDeep from "lodash.clonedeep";
 import isEqual from "lodash.isequal";
 </script>
diff --git a/src/views/admin/user/user/UserEditPermission.vue b/src/views/admin/user/UserEditPermission.vue
similarity index 95%
rename from src/views/admin/user/user/UserEditPermission.vue
rename to src/views/admin/user/UserEditPermission.vue
index 748cc18..b4b10bb 100644
--- a/src/views/admin/user/user/UserEditPermission.vue
+++ b/src/views/admin/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/user";
+import { useUserStore } from "@/stores/admin/user";
 import type { PermissionObject } from "@/types/permissionTypes";
-import type { UserViewModel } from "@/viewmodels/admin/user/user.models";
+import type { UserViewModel } from "@/viewmodels/admin/user.models";
 </script>
 
 <script lang="ts">
diff --git a/src/views/admin/user/user/UserEditRoles.vue b/src/views/admin/user/UserEditRoles.vue
similarity index 96%
rename from src/views/admin/user/user/UserEditRoles.vue
rename to src/views/admin/user/UserEditRoles.vue
index e162ab1..add4535 100644
--- a/src/views/admin/user/user/UserEditRoles.vue
+++ b/src/views/admin/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/user";
-import { useRoleStore } from "@/stores/admin/user/role";
+import { useUserStore } from "@/stores/admin/user";
+import { useRoleStore } from "@/stores/admin/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/user.models";
+import type { UserViewModel } from "@/viewmodels/admin/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 0cc8d9d..2a185d2 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/club/calendar.models";
+import type { CalendarViewModel } from "@/viewmodels/admin/calendar.models";
 import { RouterLink } from "vue-router";
 </script>