@@ -13,8 +15,13 @@
:link="item"
/>
@@ -30,7 +37,7 @@ import { useAuthStore } from "@/stores/auth";
import { useNavigationStore } from "@/stores/admin/navigation";
import TopLevelLink from "./admin/TopLevelLink.vue";
import UserMenu from "./UserMenu.vue";
-import { config } from "@/config"
+import { config } from "@/config";
diff --git a/src/components/admin/club/member/MemberAwardEditModal.vue b/src/components/admin/club/member/MemberAwardEditModal.vue
index e21b7e5..ff977d2 100644
--- a/src/components/admin/club/member/MemberAwardEditModal.vue
+++ b/src/components/admin/club/member/MemberAwardEditModal.vue
@@ -100,7 +100,7 @@ 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/configuration/award";
import type {
CreateMemberAwardViewModel,
MemberAwardViewModel,
diff --git a/src/components/admin/club/member/MemberCommunicationCreateModal.vue b/src/components/admin/club/member/MemberCommunicationCreateModal.vue
index ecb2fe7..ba45472 100644
--- a/src/components/admin/club/member/MemberCommunicationCreateModal.vue
+++ b/src/components/admin/club/member/MemberCommunicationCreateModal.vue
@@ -131,8 +131,8 @@ import { Listbox, ListboxButton, ListboxOptions, ListboxOption, ListboxLabel } f
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 { useCommunicationTypeStore } from "@/stores/admin/configuration/communicationType";
+import type { CommunicationTypeViewModel } from "@/viewmodels/admin/configuration/communicationType.models";
diff --git a/src/components/admin/club/member/MemberExecutivePositionEditModal.vue b/src/components/admin/club/member/MemberExecutivePositionEditModal.vue
index f3a4e4d..e59292a 100644
--- a/src/components/admin/club/member/MemberExecutivePositionEditModal.vue
+++ b/src/components/admin/club/member/MemberExecutivePositionEditModal.vue
@@ -106,7 +106,7 @@ 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/configuration/executivePosition";
import type {
CreateMemberExecutivePositionViewModel,
MemberExecutivePositionViewModel,
diff --git a/src/components/admin/club/member/MemberQualificationCreateModal.vue b/src/components/admin/club/member/MemberQualificationCreateModal.vue
index 9566636..817e452 100644
--- a/src/components/admin/club/member/MemberQualificationCreateModal.vue
+++ b/src/components/admin/club/member/MemberQualificationCreateModal.vue
@@ -106,12 +106,12 @@ 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 { useMembershipStatusStore } from "@/stores/admin/configuration/membershipStatus";
+import type { MembershipStatusViewModel } from "@/viewmodels/admin/configuration/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 { useQualificationStore } from "@/stores/admin/configuration/qualification";
+import type { QualificationViewModel } from "@/viewmodels/admin/configuration/qualification.models";
import type { CreateMemberQualificationViewModel } from "@/viewmodels/admin/club/member/memberQualification.models";
import { useMemberQualificationStore } from "@/stores/admin/club/member/memberQualification";
diff --git a/src/components/admin/club/member/MemberQualificationDeleteModal.vue b/src/components/admin/club/member/MemberQualificationDeleteModal.vue
index 260713b..16a3bfc 100644
--- a/src/components/admin/club/member/MemberQualificationDeleteModal.vue
+++ b/src/components/admin/club/member/MemberQualificationDeleteModal.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 { useQualificationStore } from "@/stores/admin/settings/qualification";
+import { useQualificationStore } from "@/stores/admin/configuration/qualification";
import { useMemberQualificationStore } from "@/stores/admin/club/member/memberQualification";
diff --git a/src/components/admin/club/member/MemberQualificationEditModal.vue b/src/components/admin/club/member/MemberQualificationEditModal.vue
index 8c38b67..6355561 100644
--- a/src/components/admin/club/member/MemberQualificationEditModal.vue
+++ b/src/components/admin/club/member/MemberQualificationEditModal.vue
@@ -107,7 +107,7 @@ 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/configuration/qualification";
import type {
CreateMemberQualificationViewModel,
MemberQualificationViewModel,
diff --git a/src/components/admin/club/member/MembershipCreateModal.vue b/src/components/admin/club/member/MembershipCreateModal.vue
index b7372f9..48aa0f9 100644
--- a/src/components/admin/club/member/MembershipCreateModal.vue
+++ b/src/components/admin/club/member/MembershipCreateModal.vue
@@ -94,8 +94,8 @@ 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 { useMembershipStatusStore } from "@/stores/admin/configuration/membershipStatus";
+import type { MembershipStatusViewModel } from "@/viewmodels/admin/configuration/membershipStatus.models";
import type { CreateMembershipViewModel } from "@/viewmodels/admin/club/member/membership.models";
import { useMembershipStore } from "@/stores/admin/club/member/membership";
diff --git a/src/components/admin/club/member/MembershipEditModal.vue b/src/components/admin/club/member/MembershipEditModal.vue
index 2b05623..a376800 100644
--- a/src/components/admin/club/member/MembershipEditModal.vue
+++ b/src/components/admin/club/member/MembershipEditModal.vue
@@ -103,7 +103,7 @@ 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/configuration/membershipStatus";
import type {
CreateMembershipViewModel,
MembershipViewModel,
diff --git a/src/components/admin/club/newsletter/NewsletterMailProgressModal.vue b/src/components/admin/club/newsletter/NewsletterMailProgressModal.vue
index 2083eeb..27f1690 100644
--- a/src/components/admin/club/newsletter/NewsletterMailProgressModal.vue
+++ b/src/components/admin/club/newsletter/NewsletterMailProgressModal.vue
@@ -5,17 +5,21 @@