diff --git a/src/command/club/calendar/calendarCommandHandler.ts b/src/command/club/calendar/calendarCommandHandler.ts
index 97fbff4..794736e 100644
--- a/src/command/club/calendar/calendarCommandHandler.ts
+++ b/src/command/club/calendar/calendarCommandHandler.ts
@@ -1,6 +1,6 @@
 import { dataSource } from "../../../data-source";
 import { calendar } from "../../../entity/club/calendar";
-import { calendarType } from "../../../entity/settings/calendarType";
+import { calendarType } from "../../../entity/configuration/calendarType";
 import DatabaseActionException from "../../../exceptions/databaseActionException";
 import InternalException from "../../../exceptions/internalException";
 import { CreateCalendarCommand, DeleteCalendarCommand, UpdateCalendarCommand } from "./calendarCommand";
diff --git a/src/command/settings/award/awardCommand.ts b/src/command/configuration/award/awardCommand.ts
similarity index 100%
rename from src/command/settings/award/awardCommand.ts
rename to src/command/configuration/award/awardCommand.ts
diff --git a/src/command/settings/award/awardCommandHandler.ts b/src/command/configuration/award/awardCommandHandler.ts
similarity index 96%
rename from src/command/settings/award/awardCommandHandler.ts
rename to src/command/configuration/award/awardCommandHandler.ts
index bad5746..cb9580c 100644
--- a/src/command/settings/award/awardCommandHandler.ts
+++ b/src/command/configuration/award/awardCommandHandler.ts
@@ -1,5 +1,5 @@
 import { dataSource } from "../../../data-source";
-import { award } from "../../../entity/settings/award";
+import { award } from "../../../entity/configuration/award";
 import DatabaseActionException from "../../../exceptions/databaseActionException";
 import InternalException from "../../../exceptions/internalException";
 import { CreateAwardCommand, DeleteAwardCommand, UpdateAwardCommand } from "./awardCommand";
diff --git a/src/command/settings/calendarType/calendarTypeCommand.ts b/src/command/configuration/calendarType/calendarTypeCommand.ts
similarity index 100%
rename from src/command/settings/calendarType/calendarTypeCommand.ts
rename to src/command/configuration/calendarType/calendarTypeCommand.ts
diff --git a/src/command/settings/calendarType/calendarTypeCommandHandler.ts b/src/command/configuration/calendarType/calendarTypeCommandHandler.ts
similarity index 97%
rename from src/command/settings/calendarType/calendarTypeCommandHandler.ts
rename to src/command/configuration/calendarType/calendarTypeCommandHandler.ts
index 7de554c..4a35f2b 100644
--- a/src/command/settings/calendarType/calendarTypeCommandHandler.ts
+++ b/src/command/configuration/calendarType/calendarTypeCommandHandler.ts
@@ -1,5 +1,5 @@
 import { dataSource } from "../../../data-source";
-import { calendarType } from "../../../entity/settings/calendarType";
+import { calendarType } from "../../../entity/configuration/calendarType";
 import DatabaseActionException from "../../../exceptions/databaseActionException";
 import InternalException from "../../../exceptions/internalException";
 import { CreateCalendarTypeCommand, DeleteCalendarTypeCommand, UpdateCalendarTypeCommand } from "./calendarTypeCommand";
diff --git a/src/command/settings/communicationType/communicationTypeCommand.ts b/src/command/configuration/communicationType/communicationTypeCommand.ts
similarity index 100%
rename from src/command/settings/communicationType/communicationTypeCommand.ts
rename to src/command/configuration/communicationType/communicationTypeCommand.ts
diff --git a/src/command/settings/communicationType/communicationTypeCommandHandler.ts b/src/command/configuration/communicationType/communicationTypeCommandHandler.ts
similarity index 96%
rename from src/command/settings/communicationType/communicationTypeCommandHandler.ts
rename to src/command/configuration/communicationType/communicationTypeCommandHandler.ts
index f05b0ff..52f4cb6 100644
--- a/src/command/settings/communicationType/communicationTypeCommandHandler.ts
+++ b/src/command/configuration/communicationType/communicationTypeCommandHandler.ts
@@ -1,5 +1,5 @@
 import { dataSource } from "../../../data-source";
-import { communicationType } from "../../../entity/settings/communicationType";
+import { communicationType } from "../../../entity/configuration/communicationType";
 import DatabaseActionException from "../../../exceptions/databaseActionException";
 import InternalException from "../../../exceptions/internalException";
 import {
diff --git a/src/command/settings/executivePosition/executivePositionCommand.ts b/src/command/configuration/executivePosition/executivePositionCommand.ts
similarity index 100%
rename from src/command/settings/executivePosition/executivePositionCommand.ts
rename to src/command/configuration/executivePosition/executivePositionCommand.ts
diff --git a/src/command/settings/executivePosition/executivePositionCommandHandler.ts b/src/command/configuration/executivePosition/executivePositionCommandHandler.ts
similarity index 96%
rename from src/command/settings/executivePosition/executivePositionCommandHandler.ts
rename to src/command/configuration/executivePosition/executivePositionCommandHandler.ts
index d2fb77e..3c26a46 100644
--- a/src/command/settings/executivePosition/executivePositionCommandHandler.ts
+++ b/src/command/configuration/executivePosition/executivePositionCommandHandler.ts
@@ -1,5 +1,5 @@
 import { dataSource } from "../../../data-source";
-import { executivePosition } from "../../../entity/settings/executivePosition";
+import { executivePosition } from "../../../entity/configuration/executivePosition";
 import DatabaseActionException from "../../../exceptions/databaseActionException";
 import InternalException from "../../../exceptions/internalException";
 import {
diff --git a/src/command/settings/membershipStatus/membershipStatusCommand.ts b/src/command/configuration/membershipStatus/membershipStatusCommand.ts
similarity index 100%
rename from src/command/settings/membershipStatus/membershipStatusCommand.ts
rename to src/command/configuration/membershipStatus/membershipStatusCommand.ts
diff --git a/src/command/settings/membershipStatus/membershipStatusCommandHandler.ts b/src/command/configuration/membershipStatus/membershipStatusCommandHandler.ts
similarity index 96%
rename from src/command/settings/membershipStatus/membershipStatusCommandHandler.ts
rename to src/command/configuration/membershipStatus/membershipStatusCommandHandler.ts
index e1cff7f..25e25de 100644
--- a/src/command/settings/membershipStatus/membershipStatusCommandHandler.ts
+++ b/src/command/configuration/membershipStatus/membershipStatusCommandHandler.ts
@@ -1,5 +1,5 @@
 import { dataSource } from "../../../data-source";
-import { membershipStatus } from "../../../entity/settings/membershipStatus";
+import { membershipStatus } from "../../../entity/configuration/membershipStatus";
 import DatabaseActionException from "../../../exceptions/databaseActionException";
 import InternalException from "../../../exceptions/internalException";
 import {
diff --git a/src/command/settings/newsletterConfig/newsletterConfigCommand.ts b/src/command/configuration/newsletterConfig/newsletterConfigCommand.ts
similarity index 100%
rename from src/command/settings/newsletterConfig/newsletterConfigCommand.ts
rename to src/command/configuration/newsletterConfig/newsletterConfigCommand.ts
diff --git a/src/command/settings/newsletterConfig/newsletterConfigCommandHandler.ts b/src/command/configuration/newsletterConfig/newsletterConfigCommandHandler.ts
similarity index 95%
rename from src/command/settings/newsletterConfig/newsletterConfigCommandHandler.ts
rename to src/command/configuration/newsletterConfig/newsletterConfigCommandHandler.ts
index 47fa295..e9d3d2f 100644
--- a/src/command/settings/newsletterConfig/newsletterConfigCommandHandler.ts
+++ b/src/command/configuration/newsletterConfig/newsletterConfigCommandHandler.ts
@@ -1,5 +1,5 @@
 import { dataSource } from "../../../data-source";
-import { newsletterConfig } from "../../../entity/settings/newsletterConfig";
+import { newsletterConfig } from "../../../entity/configuration/newsletterConfig";
 import DatabaseActionException from "../../../exceptions/databaseActionException";
 import InternalException from "../../../exceptions/internalException";
 import { DeleteNewsletterConfigCommand, SetNewsletterConfigCommand } from "./newsletterConfigCommand";
diff --git a/src/command/settings/qualification/qualificationCommand.ts b/src/command/configuration/qualification/qualificationCommand.ts
similarity index 100%
rename from src/command/settings/qualification/qualificationCommand.ts
rename to src/command/configuration/qualification/qualificationCommand.ts
diff --git a/src/command/settings/qualification/qualificationCommandHandler.ts b/src/command/configuration/qualification/qualificationCommandHandler.ts
similarity index 96%
rename from src/command/settings/qualification/qualificationCommandHandler.ts
rename to src/command/configuration/qualification/qualificationCommandHandler.ts
index 31480f2..130775e 100644
--- a/src/command/settings/qualification/qualificationCommandHandler.ts
+++ b/src/command/configuration/qualification/qualificationCommandHandler.ts
@@ -1,5 +1,5 @@
 import { dataSource } from "../../../data-source";
-import { qualification } from "../../../entity/settings/qualification";
+import { qualification } from "../../../entity/configuration/qualification";
 import DatabaseActionException from "../../../exceptions/databaseActionException";
 import InternalException from "../../../exceptions/internalException";
 import {
diff --git a/src/command/settings/queryStore/queryStoreCommand.ts b/src/command/configuration/queryStore/queryStoreCommand.ts
similarity index 100%
rename from src/command/settings/queryStore/queryStoreCommand.ts
rename to src/command/configuration/queryStore/queryStoreCommand.ts
diff --git a/src/command/settings/queryStore/queryStoreCommandHandler.ts b/src/command/configuration/queryStore/queryStoreCommandHandler.ts
similarity index 97%
rename from src/command/settings/queryStore/queryStoreCommandHandler.ts
rename to src/command/configuration/queryStore/queryStoreCommandHandler.ts
index c33cadc..7bdd227 100644
--- a/src/command/settings/queryStore/queryStoreCommandHandler.ts
+++ b/src/command/configuration/queryStore/queryStoreCommandHandler.ts
@@ -1,5 +1,5 @@
 import { dataSource } from "../../../data-source";
-import { query } from "../../../entity/settings/query";
+import { query } from "../../../entity/configuration/query";
 import DatabaseActionException from "../../../exceptions/databaseActionException";
 import InternalException from "../../../exceptions/internalException";
 import { CreateQueryStoreCommand, DeleteQueryStoreCommand, UpdateQueryStoreCommand } from "./queryStoreCommand";
diff --git a/src/command/settings/salutation/salutationCommand.ts b/src/command/configuration/salutation/salutationCommand.ts
similarity index 100%
rename from src/command/settings/salutation/salutationCommand.ts
rename to src/command/configuration/salutation/salutationCommand.ts
diff --git a/src/command/settings/salutation/salutationCommandHandler.ts b/src/command/configuration/salutation/salutationCommandHandler.ts
similarity index 96%
rename from src/command/settings/salutation/salutationCommandHandler.ts
rename to src/command/configuration/salutation/salutationCommandHandler.ts
index 70b24c2..3625ac4 100644
--- a/src/command/settings/salutation/salutationCommandHandler.ts
+++ b/src/command/configuration/salutation/salutationCommandHandler.ts
@@ -1,5 +1,5 @@
 import { dataSource } from "../../../data-source";
-import { salutation } from "../../../entity/settings/salutation";
+import { salutation } from "../../../entity/configuration/salutation";
 import DatabaseActionException from "../../../exceptions/databaseActionException";
 import InternalException from "../../../exceptions/internalException";
 import { CreateSalutationCommand, DeleteSalutationCommand, UpdateSalutationCommand } from "./salutationCommand";
diff --git a/src/command/settings/template/templateCommand.ts b/src/command/configuration/template/templateCommand.ts
similarity index 100%
rename from src/command/settings/template/templateCommand.ts
rename to src/command/configuration/template/templateCommand.ts
diff --git a/src/command/settings/template/templateCommandHandler.ts b/src/command/configuration/template/templateCommandHandler.ts
similarity index 96%
rename from src/command/settings/template/templateCommandHandler.ts
rename to src/command/configuration/template/templateCommandHandler.ts
index ebb2df7..3de378a 100644
--- a/src/command/settings/template/templateCommandHandler.ts
+++ b/src/command/configuration/template/templateCommandHandler.ts
@@ -1,5 +1,5 @@
 import { dataSource } from "../../../data-source";
-import { template } from "../../../entity/settings/template";
+import { template } from "../../../entity/configuration/template";
 import DatabaseActionException from "../../../exceptions/databaseActionException";
 import InternalException from "../../../exceptions/internalException";
 import { CreateTemplateCommand, DeleteTemplateCommand, UpdateTemplateCommand } from "./templateCommand";
diff --git a/src/command/settings/templateUsage/templateUsageCommand.ts b/src/command/configuration/templateUsage/templateUsageCommand.ts
similarity index 100%
rename from src/command/settings/templateUsage/templateUsageCommand.ts
rename to src/command/configuration/templateUsage/templateUsageCommand.ts
diff --git a/src/command/settings/templateUsage/templateUsageCommandHandler.ts b/src/command/configuration/templateUsage/templateUsageCommandHandler.ts
similarity index 93%
rename from src/command/settings/templateUsage/templateUsageCommandHandler.ts
rename to src/command/configuration/templateUsage/templateUsageCommandHandler.ts
index dc75944..7134148 100644
--- a/src/command/settings/templateUsage/templateUsageCommandHandler.ts
+++ b/src/command/configuration/templateUsage/templateUsageCommandHandler.ts
@@ -1,5 +1,5 @@
 import { dataSource } from "../../../data-source";
-import { templateUsage } from "../../../entity/settings/templateUsage";
+import { templateUsage } from "../../../entity/configuration/templateUsage";
 import DatabaseActionException from "../../../exceptions/databaseActionException";
 import InternalException from "../../../exceptions/internalException";
 import { UpdateTemplateUsageCommand } from "./templateUsageCommand";
diff --git a/src/command/user/role/roleCommand.ts b/src/command/management/role/roleCommand.ts
similarity index 100%
rename from src/command/user/role/roleCommand.ts
rename to src/command/management/role/roleCommand.ts
diff --git a/src/command/user/role/roleCommandHandler.ts b/src/command/management/role/roleCommandHandler.ts
similarity index 97%
rename from src/command/user/role/roleCommandHandler.ts
rename to src/command/management/role/roleCommandHandler.ts
index 40f9a8f..0a12e1f 100644
--- a/src/command/user/role/roleCommandHandler.ts
+++ b/src/command/management/role/roleCommandHandler.ts
@@ -1,5 +1,5 @@
 import { dataSource } from "../../../data-source";
-import { role } from "../../../entity/user/role";
+import { role } from "../../../entity/management/role";
 import DatabaseActionException from "../../../exceptions/databaseActionException";
 import InternalException from "../../../exceptions/internalException";
 import { CreateRoleCommand, DeleteRoleCommand, UpdateRoleCommand } from "./roleCommand";
diff --git a/src/command/user/role/rolePermissionCommand.ts b/src/command/management/role/rolePermissionCommand.ts
similarity index 100%
rename from src/command/user/role/rolePermissionCommand.ts
rename to src/command/management/role/rolePermissionCommand.ts
diff --git a/src/command/user/role/rolePermissionCommandHandler.ts b/src/command/management/role/rolePermissionCommandHandler.ts
similarity index 91%
rename from src/command/user/role/rolePermissionCommandHandler.ts
rename to src/command/management/role/rolePermissionCommandHandler.ts
index 21a98d4..8a9230e 100644
--- a/src/command/user/role/rolePermissionCommandHandler.ts
+++ b/src/command/management/role/rolePermissionCommandHandler.ts
@@ -1,15 +1,15 @@
 import { DeleteResult, EntityManager, InsertResult } from "typeorm";
 import { dataSource } from "../../../data-source";
-import { rolePermission } from "../../../entity/user/role_permission";
+import { rolePermission } from "../../../entity/management/role_permission";
 import InternalException from "../../../exceptions/internalException";
-import RoleService from "../../../service/user/roleService";
+import RoleService from "../../../service/management/roleService";
 import {
   CreateRolePermissionCommand,
   DeleteRolePermissionCommand,
   UpdateRolePermissionsCommand,
 } from "./rolePermissionCommand";
 import PermissionHelper from "../../../helpers/permissionHelper";
-import RolePermissionService from "../../../service/user/rolePermissionService";
+import RolePermissionService from "../../../service/management/rolePermissionService";
 import { PermissionString } from "../../../type/permissionTypes";
 import DatabaseActionException from "../../../exceptions/databaseActionException";
 
diff --git a/src/command/user/user/inviteCommand.ts b/src/command/management/user/inviteCommand.ts
similarity index 100%
rename from src/command/user/user/inviteCommand.ts
rename to src/command/management/user/inviteCommand.ts
diff --git a/src/command/user/user/inviteCommandHandler.ts b/src/command/management/user/inviteCommandHandler.ts
similarity index 97%
rename from src/command/user/user/inviteCommandHandler.ts
rename to src/command/management/user/inviteCommandHandler.ts
index fd760d4..5c01044 100644
--- a/src/command/user/user/inviteCommandHandler.ts
+++ b/src/command/management/user/inviteCommandHandler.ts
@@ -1,5 +1,5 @@
 import { dataSource } from "../../../data-source";
-import { invite } from "../../../entity/user/invite";
+import { invite } from "../../../entity/management/invite";
 import DatabaseActionException from "../../../exceptions/databaseActionException";
 import InternalException from "../../../exceptions/internalException";
 import { StringHelper } from "../../../helpers/stringHelper";
diff --git a/src/command/user/user/userCommand.ts b/src/command/management/user/userCommand.ts
similarity index 100%
rename from src/command/user/user/userCommand.ts
rename to src/command/management/user/userCommand.ts
diff --git a/src/command/user/user/userCommandHandler.ts b/src/command/management/user/userCommandHandler.ts
similarity index 97%
rename from src/command/user/user/userCommandHandler.ts
rename to src/command/management/user/userCommandHandler.ts
index 0f1102a..590b2de 100644
--- a/src/command/user/user/userCommandHandler.ts
+++ b/src/command/management/user/userCommandHandler.ts
@@ -1,6 +1,6 @@
 import { EntityManager } from "typeorm";
 import { dataSource } from "../../../data-source";
-import { user } from "../../../entity/user/user";
+import { user } from "../../../entity/management/user";
 import InternalException from "../../../exceptions/internalException";
 import {
   CreateUserCommand,
@@ -10,7 +10,7 @@ import {
   UpdateUserRolesCommand,
   UpdateUserSecretCommand,
 } from "./userCommand";
-import UserService from "../../../service/user/userService";
+import UserService from "../../../service/management/userService";
 import DatabaseActionException from "../../../exceptions/databaseActionException";
 
 export default abstract class UserCommandHandler {
diff --git a/src/command/user/user/userPermissionCommand.ts b/src/command/management/user/userPermissionCommand.ts
similarity index 100%
rename from src/command/user/user/userPermissionCommand.ts
rename to src/command/management/user/userPermissionCommand.ts
diff --git a/src/command/user/user/userPermissionCommandHandler.ts b/src/command/management/user/userPermissionCommandHandler.ts
similarity index 92%
rename from src/command/user/user/userPermissionCommandHandler.ts
rename to src/command/management/user/userPermissionCommandHandler.ts
index 77694f3..337f68a 100644
--- a/src/command/user/user/userPermissionCommandHandler.ts
+++ b/src/command/management/user/userPermissionCommandHandler.ts
@@ -1,14 +1,14 @@
 import { DeleteResult, EntityManager, InsertResult } from "typeorm";
 import { dataSource } from "../../../data-source";
-import { user } from "../../../entity/user/user";
-import { userPermission } from "../../../entity/user/user_permission";
+import { user } from "../../../entity/management/user";
+import { userPermission } from "../../../entity/management/user_permission";
 import InternalException from "../../../exceptions/internalException";
 import {
   CreateUserPermissionCommand,
   DeleteUserPermissionCommand,
   UpdateUserPermissionsCommand,
 } from "./userPermissionCommand";
-import UserPermissionService from "../../../service/user/userPermissionService";
+import UserPermissionService from "../../../service/management/userPermissionService";
 import PermissionHelper from "../../../helpers/permissionHelper";
 import { PermissionString } from "../../../type/permissionTypes";
 import DatabaseActionException from "../../../exceptions/databaseActionException";
diff --git a/src/command/user/webapi/webapiCommand.ts b/src/command/management/webapi/webapiCommand.ts
similarity index 100%
rename from src/command/user/webapi/webapiCommand.ts
rename to src/command/management/webapi/webapiCommand.ts
diff --git a/src/command/user/webapi/webapiCommandHandler.ts b/src/command/management/webapi/webapiCommandHandler.ts
similarity index 97%
rename from src/command/user/webapi/webapiCommandHandler.ts
rename to src/command/management/webapi/webapiCommandHandler.ts
index ea12d98..8a3b864 100644
--- a/src/command/user/webapi/webapiCommandHandler.ts
+++ b/src/command/management/webapi/webapiCommandHandler.ts
@@ -1,5 +1,5 @@
 import { dataSource } from "../../../data-source";
-import { webapi } from "../../../entity/user/webapi";
+import { webapi } from "../../../entity/management/webapi";
 import DatabaseActionException from "../../../exceptions/databaseActionException";
 import InternalException from "../../../exceptions/internalException";
 import {
diff --git a/src/command/user/webapi/webapiPermissionCommand.ts b/src/command/management/webapi/webapiPermissionCommand.ts
similarity index 100%
rename from src/command/user/webapi/webapiPermissionCommand.ts
rename to src/command/management/webapi/webapiPermissionCommand.ts
diff --git a/src/command/user/webapi/webapiPermissionCommandHandler.ts b/src/command/management/webapi/webapiPermissionCommandHandler.ts
similarity index 91%
rename from src/command/user/webapi/webapiPermissionCommandHandler.ts
rename to src/command/management/webapi/webapiPermissionCommandHandler.ts
index ec661f4..57e27fb 100644
--- a/src/command/user/webapi/webapiPermissionCommandHandler.ts
+++ b/src/command/management/webapi/webapiPermissionCommandHandler.ts
@@ -1,15 +1,15 @@
 import { DeleteResult, EntityManager, InsertResult } from "typeorm";
 import { dataSource } from "../../../data-source";
-import { webapiPermission } from "../../../entity/user/webapi_permission";
+import { webapiPermission } from "../../../entity/management/webapi_permission";
 import InternalException from "../../../exceptions/internalException";
-import WebapiService from "../../../service/user/webapiService";
+import WebapiService from "../../../service/management/webapiService";
 import {
   CreateWebapiPermissionCommand,
   DeleteWebapiPermissionCommand,
   UpdateWebapiPermissionsCommand,
 } from "./webapiPermissionCommand";
 import PermissionHelper from "../../../helpers/permissionHelper";
-import WebapiPermissionService from "../../../service/user/webapiPermissionService";
+import WebapiPermissionService from "../../../service/management/webapiPermissionService";
 import { PermissionString } from "../../../type/permissionTypes";
 import DatabaseActionException from "../../../exceptions/databaseActionException";
 
diff --git a/src/command/refreshCommandHandler.ts b/src/command/refreshCommandHandler.ts
index 1588449..df6a8ea 100644
--- a/src/command/refreshCommandHandler.ts
+++ b/src/command/refreshCommandHandler.ts
@@ -4,7 +4,7 @@ import { PWA_REFRESH_EXPIRATION, REFRESH_EXPIRATION } from "../env.defaults";
 import DatabaseActionException from "../exceptions/databaseActionException";
 import InternalException from "../exceptions/internalException";
 import { StringHelper } from "../helpers/stringHelper";
-import UserService from "../service/user/userService";
+import UserService from "../service/management/userService";
 import { CreateRefreshCommand, DeleteRefreshCommand } from "./refreshCommand";
 import ms from "ms";
 
diff --git a/src/controller/admin/club/calendarController.ts b/src/controller/admin/club/calendarController.ts
index fcb5ddb..81a50d1 100644
--- a/src/controller/admin/club/calendarController.ts
+++ b/src/controller/admin/club/calendarController.ts
@@ -1,16 +1,20 @@
 import { Request, Response } from "express";
 import CalendarService from "../../../service/club/calendarService";
 import CalendarFactory from "../../../factory/admin/club/calendar";
-import CalendarTypeService from "../../../service/settings/calendarTypeService";
-import CalendarTypeFactory from "../../../factory/admin/settings/calendarType";
-import { CreateCalendarCommand, DeleteCalendarCommand, UpdateCalendarCommand } from "../../../command/club/calendar/calendarCommand";
+import CalendarTypeService from "../../../service/configuration/calendarTypeService";
+import CalendarTypeFactory from "../../../factory/admin/configuration/calendarType";
+import {
+  CreateCalendarCommand,
+  DeleteCalendarCommand,
+  UpdateCalendarCommand,
+} from "../../../command/club/calendar/calendarCommand";
 import CalendarCommandHandler from "../../../command/club/calendar/calendarCommandHandler";
 import {
   CreateCalendarTypeCommand,
   DeleteCalendarTypeCommand,
   UpdateCalendarTypeCommand,
-} from "../../../command/settings/calendarType/calendarTypeCommand";
-import CalendarTypeCommandHandler from "../../../command/settings/calendarType/calendarTypeCommandHandler";
+} from "../../../command/configuration/calendarType/calendarTypeCommand";
+import CalendarTypeCommandHandler from "../../../command/configuration/calendarType/calendarTypeCommandHandler";
 
 /**
  * @description get all calendar items
diff --git a/src/controller/admin/club/newsletterController.ts b/src/controller/admin/club/newsletterController.ts
index eeb25e6..68854c9 100644
--- a/src/controller/admin/club/newsletterController.ts
+++ b/src/controller/admin/club/newsletterController.ts
@@ -17,7 +17,7 @@ import { SynchronizeNewsletterRecipientsCommand } from "../../../command/club/ne
 import NewsletterRecipientsCommandHandler from "../../../command/club/newsletter/newsletterRecipientsCommandHandler";
 import { NewsletterDatesViewModel } from "../../../viewmodel/admin/club/newsletter/newsletterDates.models";
 import { PdfExport } from "../../../helpers/pdfExport";
-import UserService from "../../../service/user/userService";
+import UserService from "../../../service/management/userService";
 import { TemplateHelper } from "../../../helpers/templateHelper";
 import MailHelper from "../../../helpers/mailHelper";
 import { NewsletterEventType, NewsletterHelper } from "../../../helpers/newsletterHelper";
diff --git a/src/controller/admin/settings/awardController.ts b/src/controller/admin/configuration/awardController.ts
similarity index 84%
rename from src/controller/admin/settings/awardController.ts
rename to src/controller/admin/configuration/awardController.ts
index a87b1c3..b8597ec 100644
--- a/src/controller/admin/settings/awardController.ts
+++ b/src/controller/admin/configuration/awardController.ts
@@ -1,8 +1,12 @@
 import { Request, Response } from "express";
-import AwardService from "../../../service/settings/awardService";
-import AwardFactory from "../../../factory/admin/settings/award";
-import { CreateAwardCommand, DeleteAwardCommand, UpdateAwardCommand } from "../../../command/settings/award/awardCommand";
-import AwardCommandHandler from "../../../command/settings/award/awardCommandHandler";
+import AwardService from "../../../service/configuration/awardService";
+import AwardFactory from "../../../factory/admin/configuration/award";
+import {
+  CreateAwardCommand,
+  DeleteAwardCommand,
+  UpdateAwardCommand,
+} from "../../../command/configuration/award/awardCommand";
+import AwardCommandHandler from "../../../command/configuration/award/awardCommandHandler";
 
 /**
  * @description get all awards
diff --git a/src/controller/admin/settings/communicationTypeController.ts b/src/controller/admin/configuration/communicationTypeController.ts
similarity index 88%
rename from src/controller/admin/settings/communicationTypeController.ts
rename to src/controller/admin/configuration/communicationTypeController.ts
index ad46b03..d3aae1b 100644
--- a/src/controller/admin/settings/communicationTypeController.ts
+++ b/src/controller/admin/configuration/communicationTypeController.ts
@@ -1,13 +1,13 @@
 import { Request, Response } from "express";
-import CommunicationTypeService from "../../../service/settings/communicationTypeService";
-import CommunicationTypeFactory from "../../../factory/admin/settings/communicationType";
+import CommunicationTypeService from "../../../service/configuration/communicationTypeService";
+import CommunicationTypeFactory from "../../../factory/admin/configuration/communicationType";
 import CommunicationService from "../../../service/club/member/communicationService";
 import {
   CreateCommunicationTypeCommand,
   DeleteCommunicationTypeCommand,
   UpdateCommunicationTypeCommand,
-} from "../../../command/settings/communicationType/communicationTypeCommand";
-import CommunicationTypeCommandHandler from "../../../command/settings/communicationType/communicationTypeCommandHandler";
+} from "../../../command/configuration/communicationType/communicationTypeCommand";
+import CommunicationTypeCommandHandler from "../../../command/configuration/communicationType/communicationTypeCommandHandler";
 
 /**
  * @description get all communicationTypes
diff --git a/src/controller/admin/settings/executivePositionController.ts b/src/controller/admin/configuration/executivePositionController.ts
similarity index 86%
rename from src/controller/admin/settings/executivePositionController.ts
rename to src/controller/admin/configuration/executivePositionController.ts
index 15437ef..2e72ae6 100644
--- a/src/controller/admin/settings/executivePositionController.ts
+++ b/src/controller/admin/configuration/executivePositionController.ts
@@ -1,12 +1,12 @@
 import { Request, Response } from "express";
-import ExecutivePositionService from "../../../service/settings/executivePositionService";
-import ExecutivePositionFactory from "../../../factory/admin/settings/executivePosition";
+import ExecutivePositionService from "../../../service/configuration/executivePositionService";
+import ExecutivePositionFactory from "../../../factory/admin/configuration/executivePosition";
 import {
   CreateExecutivePositionCommand,
   DeleteExecutivePositionCommand,
   UpdateExecutivePositionCommand,
-} from "../../../command/settings/executivePosition/executivePositionCommand";
-import ExecutivePositionCommandHandler from "../../../command/settings/executivePosition/executivePositionCommandHandler";
+} from "../../../command/configuration/executivePosition/executivePositionCommand";
+import ExecutivePositionCommandHandler from "../../../command/configuration/executivePosition/executivePositionCommandHandler";
 
 /**
  * @description get all executivePositions
diff --git a/src/controller/admin/settings/membershipStatusController.ts b/src/controller/admin/configuration/membershipStatusController.ts
similarity index 86%
rename from src/controller/admin/settings/membershipStatusController.ts
rename to src/controller/admin/configuration/membershipStatusController.ts
index 9c5fa23..2b620e7 100644
--- a/src/controller/admin/settings/membershipStatusController.ts
+++ b/src/controller/admin/configuration/membershipStatusController.ts
@@ -1,12 +1,12 @@
 import { Request, Response } from "express";
-import MembershipStatusService from "../../../service/settings/membershipStatusService";
-import MembershipStatusFactory from "../../../factory/admin/settings/membershipStatus";
+import MembershipStatusService from "../../../service/configuration/membershipStatusService";
+import MembershipStatusFactory from "../../../factory/admin/configuration/membershipStatus";
 import {
   CreateMembershipStatusCommand,
   DeleteMembershipStatusCommand,
   UpdateMembershipStatusCommand,
-} from "../../../command/settings/membershipStatus/membershipStatusCommand";
-import MembershipStatusCommandHandler from "../../../command/settings/membershipStatus/membershipStatusCommandHandler";
+} from "../../../command/configuration/membershipStatus/membershipStatusCommand";
+import MembershipStatusCommandHandler from "../../../command/configuration/membershipStatus/membershipStatusCommandHandler";
 
 /**
  * @description get all membershipStatus
diff --git a/src/controller/admin/settings/newsletterConfigController.ts b/src/controller/admin/configuration/newsletterConfigController.ts
similarity index 83%
rename from src/controller/admin/settings/newsletterConfigController.ts
rename to src/controller/admin/configuration/newsletterConfigController.ts
index c476c54..2227bee 100644
--- a/src/controller/admin/settings/newsletterConfigController.ts
+++ b/src/controller/admin/configuration/newsletterConfigController.ts
@@ -1,11 +1,11 @@
 import { Request, Response } from "express";
-import NewsletterConfigService from "../../../service/settings/newsletterConfigService";
-import NewsletterConfigFactory from "../../../factory/admin/settings/newsletterConfig";
-import NewsletterConfigCommandHandler from "../../../command/settings/newsletterConfig/newsletterConfigCommandHandler";
+import NewsletterConfigService from "../../../service/configuration/newsletterConfigService";
+import NewsletterConfigFactory from "../../../factory/admin/configuration/newsletterConfig";
+import NewsletterConfigCommandHandler from "../../../command/configuration/newsletterConfig/newsletterConfigCommandHandler";
 import {
   DeleteNewsletterConfigCommand,
   SetNewsletterConfigCommand,
-} from "../../../command/settings/newsletterConfig/newsletterConfigCommand";
+} from "../../../command/configuration/newsletterConfig/newsletterConfigCommand";
 
 /**
  * @description get all newsletterConfigs
diff --git a/src/controller/admin/settings/qualificationController.ts b/src/controller/admin/configuration/qualificationController.ts
similarity index 87%
rename from src/controller/admin/settings/qualificationController.ts
rename to src/controller/admin/configuration/qualificationController.ts
index 75c9b15..e9102eb 100644
--- a/src/controller/admin/settings/qualificationController.ts
+++ b/src/controller/admin/configuration/qualificationController.ts
@@ -1,12 +1,12 @@
 import { Request, Response } from "express";
-import QualificationService from "../../../service/settings/qualification";
-import QualificationFactory from "../../../factory/admin/settings/qualification";
+import QualificationService from "../../../service/configuration/qualification";
+import QualificationFactory from "../../../factory/admin/configuration/qualification";
 import {
   CreateQualificationCommand,
   DeleteQualificationCommand,
   UpdateQualificationCommand,
-} from "../../../command/settings/qualification/qualificationCommand";
-import QualificationCommandHandler from "../../../command/settings/qualification/qualificationCommandHandler";
+} from "../../../command/configuration/qualification/qualificationCommand";
+import QualificationCommandHandler from "../../../command/configuration/qualification/qualificationCommandHandler";
 
 /**
  * @description get all qualifications
diff --git a/src/controller/admin/settings/queryStoreController.ts b/src/controller/admin/configuration/queryStoreController.ts
similarity index 87%
rename from src/controller/admin/settings/queryStoreController.ts
rename to src/controller/admin/configuration/queryStoreController.ts
index 397b898..f963f8d 100644
--- a/src/controller/admin/settings/queryStoreController.ts
+++ b/src/controller/admin/configuration/queryStoreController.ts
@@ -1,12 +1,12 @@
 import { Request, Response } from "express";
-import QueryStoreFactory from "../../../factory/admin/settings/queryStore";
-import QueryStoreService from "../../../service/settings/queryStoreService";
+import QueryStoreFactory from "../../../factory/admin/configuration/queryStore";
+import QueryStoreService from "../../../service/configuration/queryStoreService";
 import {
   CreateQueryStoreCommand,
   DeleteQueryStoreCommand,
   UpdateQueryStoreCommand,
-} from "../../../command/settings/queryStore/queryStoreCommand";
-import QueryStoreCommandHandler from "../../../command/settings/queryStore/queryStoreCommandHandler";
+} from "../../../command/configuration/queryStore/queryStoreCommand";
+import QueryStoreCommandHandler from "../../../command/configuration/queryStore/queryStoreCommandHandler";
 
 /**
  * @description get all queryStores
diff --git a/src/controller/admin/settings/salutationController.ts b/src/controller/admin/configuration/salutationController.ts
similarity index 86%
rename from src/controller/admin/settings/salutationController.ts
rename to src/controller/admin/configuration/salutationController.ts
index d27f4e4..732e8cf 100644
--- a/src/controller/admin/settings/salutationController.ts
+++ b/src/controller/admin/configuration/salutationController.ts
@@ -1,12 +1,12 @@
 import { Request, Response } from "express";
-import SalutationService from "../../../service/settings/salutationService";
-import SalutationFactory from "../../../factory/admin/settings/salutation";
+import SalutationService from "../../../service/configuration/salutationService";
+import SalutationFactory from "../../../factory/admin/configuration/salutation";
 import {
   CreateSalutationCommand,
   DeleteSalutationCommand,
   UpdateSalutationCommand,
-} from "../../../command/settings/salutation/salutationCommand";
-import SalutationCommandHandler from "../../../command/settings/salutation/salutationCommandHandler";
+} from "../../../command/configuration/salutation/salutationCommand";
+import SalutationCommandHandler from "../../../command/configuration/salutation/salutationCommandHandler";
 
 /**
  * @description get all salutations
diff --git a/src/controller/admin/settings/templateController.ts b/src/controller/admin/configuration/templateController.ts
similarity index 88%
rename from src/controller/admin/settings/templateController.ts
rename to src/controller/admin/configuration/templateController.ts
index eb9d31e..012cccb 100644
--- a/src/controller/admin/settings/templateController.ts
+++ b/src/controller/admin/configuration/templateController.ts
@@ -1,8 +1,12 @@
 import { Request, Response } from "express";
-import TemplateService from "../../../service/settings/templateService";
-import TemplateFactory from "../../../factory/admin/settings/template";
-import { CreateTemplateCommand, DeleteTemplateCommand, UpdateTemplateCommand } from "../../../command/settings/template/templateCommand";
-import TemplateCommandHandler from "../../../command/settings/template/templateCommandHandler";
+import TemplateService from "../../../service/configuration/templateService";
+import TemplateFactory from "../../../factory/admin/configuration/template";
+import {
+  CreateTemplateCommand,
+  DeleteTemplateCommand,
+  UpdateTemplateCommand,
+} from "../../../command/configuration/template/templateCommand";
+import TemplateCommandHandler from "../../../command/configuration/template/templateCommandHandler";
 
 /**
  * @description get all templates
diff --git a/src/controller/admin/settings/templateUsageController.ts b/src/controller/admin/configuration/templateUsageController.ts
similarity index 84%
rename from src/controller/admin/settings/templateUsageController.ts
rename to src/controller/admin/configuration/templateUsageController.ts
index eb8b71f..e34f49e 100644
--- a/src/controller/admin/settings/templateUsageController.ts
+++ b/src/controller/admin/configuration/templateUsageController.ts
@@ -1,8 +1,8 @@
 import { Request, Response } from "express";
-import TemplateUsageService from "../../../service/settings/templateUsageService";
-import TemplateUsageFactory from "../../../factory/admin/settings/templateUsage";
-import { UpdateTemplateUsageCommand } from "../../../command/settings/templateUsage/templateUsageCommand";
-import TemplateUsageCommandHandler from "../../../command/settings/templateUsage/templateUsageCommandHandler";
+import TemplateUsageService from "../../../service/configuration/templateUsageService";
+import TemplateUsageFactory from "../../../factory/admin/configuration/templateUsage";
+import { UpdateTemplateUsageCommand } from "../../../command/configuration/templateUsage/templateUsageCommand";
+import TemplateUsageCommandHandler from "../../../command/configuration/templateUsage/templateUsageCommandHandler";
 import PermissionHelper from "../../../helpers/permissionHelper";
 import ForbiddenRequestException from "../../../exceptions/forbiddenRequestException";
 import { PermissionModule } from "../../../type/permissionTypes";
@@ -21,7 +21,7 @@ export async function getAllTemplateUsages(req: Request, res: Response): Promise
   if (!req.isOwner) {
     templateUsages = templateUsages.filter((tu) => {
       return (
-        PermissionHelper.can(req.permissions, "update", "settings", tu.scope.split(".")[0] as PermissionModule) ||
+        PermissionHelper.can(req.permissions, "update", "configuration", tu.scope.split(".")[0] as PermissionModule) ||
         PermissionHelper.can(req.permissions, "update", "club", tu.scope.split(".")[0] as PermissionModule)
       );
     });
@@ -66,7 +66,7 @@ export async function updateTemplateUsage(req: Request, res: Response): Promise<
   let allowedSettings = PermissionHelper.can(
     req.permissions,
     "update",
-    "settings",
+    "configuration",
     req.params.scope as PermissionModule
   );
   let allowedClub = PermissionHelper.can(req.permissions, "update", "club", req.params.scope as PermissionModule);
diff --git a/src/controller/admin/user/backupController.ts b/src/controller/admin/management/backupController.ts
similarity index 100%
rename from src/controller/admin/user/backupController.ts
rename to src/controller/admin/management/backupController.ts
diff --git a/src/controller/admin/user/roleController.ts b/src/controller/admin/management/roleController.ts
similarity index 84%
rename from src/controller/admin/user/roleController.ts
rename to src/controller/admin/management/roleController.ts
index f482b63..3af6ec8 100644
--- a/src/controller/admin/user/roleController.ts
+++ b/src/controller/admin/management/roleController.ts
@@ -1,12 +1,12 @@
 import { Request, Response } from "express";
-import RoleService from "../../../service/user/roleService";
-import RoleFactory from "../../../factory/admin/user/role";
-import RolePermissionService from "../../../service/user/rolePermissionService";
+import RoleService from "../../../service/management/roleService";
+import RoleFactory from "../../../factory/admin/management/role";
+import RolePermissionService from "../../../service/management/rolePermissionService";
 import PermissionHelper from "../../../helpers/permissionHelper";
-import { CreateRoleCommand, DeleteRoleCommand, UpdateRoleCommand } from "../../../command/user/role/roleCommand";
-import RoleCommandHandler from "../../../command/user/role/roleCommandHandler";
-import { UpdateRolePermissionsCommand } from "../../../command/user/role/rolePermissionCommand";
-import RolePermissionCommandHandler from "../../../command/user/role/rolePermissionCommandHandler";
+import { CreateRoleCommand, DeleteRoleCommand, UpdateRoleCommand } from "../../../command/management/role/roleCommand";
+import RoleCommandHandler from "../../../command/management/role/roleCommandHandler";
+import { UpdateRolePermissionsCommand } from "../../../command/management/role/rolePermissionCommand";
+import RolePermissionCommandHandler from "../../../command/management/role/rolePermissionCommandHandler";
 
 /**
  * @description get All roles
diff --git a/src/controller/admin/user/userController.ts b/src/controller/admin/management/userController.ts
similarity index 85%
rename from src/controller/admin/user/userController.ts
rename to src/controller/admin/management/userController.ts
index 58d815e..ba2a134 100644
--- a/src/controller/admin/user/userController.ts
+++ b/src/controller/admin/management/userController.ts
@@ -1,15 +1,19 @@
 import { Request, Response } from "express";
-import UserService from "../../../service/user/userService";
-import UserFactory from "../../../factory/admin/user/user";
-import UserPermissionService from "../../../service/user/userPermissionService";
+import UserService from "../../../service/management/userService";
+import UserFactory from "../../../factory/admin/management/user";
+import UserPermissionService from "../../../service/management/userPermissionService";
 import PermissionHelper from "../../../helpers/permissionHelper";
-import RoleFactory from "../../../factory/admin/user/role";
-import { DeleteUserCommand, UpdateUserCommand, UpdateUserRolesCommand } from "../../../command/user/user/userCommand";
-import UserCommandHandler from "../../../command/user/user/userCommandHandler";
+import RoleFactory from "../../../factory/admin/management/role";
+import {
+  DeleteUserCommand,
+  UpdateUserCommand,
+  UpdateUserRolesCommand,
+} from "../../../command/management/user/userCommand";
+import UserCommandHandler from "../../../command/management/user/userCommandHandler";
 import MailHelper from "../../../helpers/mailHelper";
 import { CLUB_NAME } from "../../../env.defaults";
-import { UpdateUserPermissionsCommand } from "../../../command/user/user/userPermissionCommand";
-import UserPermissionCommandHandler from "../../../command/user/user/userPermissionCommandHandler";
+import { UpdateUserPermissionsCommand } from "../../../command/management/user/userPermissionCommand";
+import UserPermissionCommandHandler from "../../../command/management/user/userPermissionCommandHandler";
 import BadRequestException from "../../../exceptions/badRequestException";
 
 /**
diff --git a/src/controller/admin/user/webapiController.ts b/src/controller/admin/management/webapiController.ts
similarity index 88%
rename from src/controller/admin/user/webapiController.ts
rename to src/controller/admin/management/webapiController.ts
index d5390ff..80df60a 100644
--- a/src/controller/admin/user/webapiController.ts
+++ b/src/controller/admin/management/webapiController.ts
@@ -1,16 +1,16 @@
 import { Request, Response } from "express";
-import WebapiService from "../../../service/user/webapiService";
-import ApiFactory from "../../../factory/admin/user/webapi";
-import WebapiPermissionService from "../../../service/user/webapiPermissionService";
+import WebapiService from "../../../service/management/webapiService";
+import ApiFactory from "../../../factory/admin/management/webapi";
+import WebapiPermissionService from "../../../service/management/webapiPermissionService";
 import PermissionHelper from "../../../helpers/permissionHelper";
 import {
   CreateWebapiCommand,
   DeleteWebapiCommand,
   UpdateWebapiCommand,
-} from "../../../command/user/webapi/webapiCommand";
-import WebapiCommandHandler from "../../../command/user/webapi/webapiCommandHandler";
-import { UpdateWebapiPermissionsCommand } from "../../../command/user/webapi/webapiPermissionCommand";
-import WebapiPermissionCommandHandler from "../../../command/user/webapi/webapiPermissionCommandHandler";
+} from "../../../command/management/webapi/webapiCommand";
+import WebapiCommandHandler from "../../../command/management/webapi/webapiCommandHandler";
+import { UpdateWebapiPermissionsCommand } from "../../../command/management/webapi/webapiPermissionCommand";
+import WebapiPermissionCommandHandler from "../../../command/management/webapi/webapiPermissionCommandHandler";
 import { JWTHelper } from "../../../helpers/jwtHelper";
 import { CLUB_NAME } from "../../../env.defaults";
 import { StringHelper } from "../../../helpers/stringHelper";
diff --git a/src/controller/authController.ts b/src/controller/authController.ts
index e3f5af2..9ecfa64 100644
--- a/src/controller/authController.ts
+++ b/src/controller/authController.ts
@@ -4,7 +4,7 @@ import { JWTToken } from "../type/jwtTypes";
 import InternalException from "../exceptions/internalException";
 import RefreshCommandHandler from "../command/refreshCommandHandler";
 import { CreateRefreshCommand, DeleteRefreshCommand } from "../command/refreshCommand";
-import UserService from "../service/user/userService";
+import UserService from "../service/management/userService";
 import speakeasy from "speakeasy";
 import UnauthorizedRequestException from "../exceptions/unauthorizedRequestException";
 import RefreshService from "../service/refreshService";
diff --git a/src/controller/inviteController.ts b/src/controller/inviteController.ts
index 544aa14..e5d2df9 100644
--- a/src/controller/inviteController.ts
+++ b/src/controller/inviteController.ts
@@ -7,18 +7,18 @@ import { CreateRefreshCommand } from "../command/refreshCommand";
 import speakeasy from "speakeasy";
 import UnauthorizedRequestException from "../exceptions/unauthorizedRequestException";
 import QRCode from "qrcode";
-import { CreateUserCommand } from "../command/user/user/userCommand";
-import UserCommandHandler from "../command/user/user/userCommandHandler";
-import { CreateInviteCommand, DeleteInviteCommand } from "../command/user/user/inviteCommand";
-import InviteCommandHandler from "../command/user/user/inviteCommandHandler";
+import { CreateUserCommand } from "../command/management/user/userCommand";
+import UserCommandHandler from "../command/management/user/userCommandHandler";
+import { CreateInviteCommand, DeleteInviteCommand } from "../command/management/user/inviteCommand";
+import InviteCommandHandler from "../command/management/user/inviteCommandHandler";
 import MailHelper from "../helpers/mailHelper";
-import InviteService from "../service/user/inviteService";
-import UserService from "../service/user/userService";
+import InviteService from "../service/management/inviteService";
+import UserService from "../service/management/userService";
 import CustomRequestException from "../exceptions/customRequestException";
 import { CLUB_NAME } from "../env.defaults";
-import { CreateUserPermissionCommand } from "../command/user/user/userPermissionCommand";
-import UserPermissionCommandHandler from "../command/user/user/userPermissionCommandHandler";
-import InviteFactory from "../factory/admin/user/invite";
+import { CreateUserPermissionCommand } from "../command/management/user/userPermissionCommand";
+import UserPermissionCommandHandler from "../command/management/user/userPermissionCommandHandler";
+import InviteFactory from "../factory/admin/management/invite";
 
 /**
  * @description get all invites
diff --git a/src/controller/publicController.ts b/src/controller/publicController.ts
index b3bf2b0..f44100d 100644
--- a/src/controller/publicController.ts
+++ b/src/controller/publicController.ts
@@ -1,6 +1,6 @@
 import { Request, Response } from "express";
 import CalendarService from "../service/club/calendarService";
-import CalendarTypeService from "../service/settings/calendarTypeService";
+import CalendarTypeService from "../service/configuration/calendarTypeService";
 import { calendar } from "../entity/club/calendar";
 import { createEvents } from "ics";
 import moment from "moment";
diff --git a/src/controller/resetController.ts b/src/controller/resetController.ts
index eec65b4..70561ec 100644
--- a/src/controller/resetController.ts
+++ b/src/controller/resetController.ts
@@ -11,13 +11,13 @@ import { CreateResetCommand, DeleteResetCommand } from "../command/resetCommand"
 import ResetCommandHandler from "../command/resetCommandHandler";
 import MailHelper from "../helpers/mailHelper";
 import ResetService from "../service/resetService";
-import UserService from "../service/user/userService";
+import UserService from "../service/management/userService";
 import { CLUB_NAME } from "../env.defaults";
 import PermissionHelper from "../helpers/permissionHelper";
-import RolePermissionService from "../service/user/rolePermissionService";
-import UserPermissionService from "../service/user/userPermissionService";
-import { UpdateUserSecretCommand } from "../command/user/user/userCommand";
-import UserCommandHandler from "../command/user/user/userCommandHandler";
+import RolePermissionService from "../service/management/rolePermissionService";
+import UserPermissionService from "../service/management/userPermissionService";
+import { UpdateUserSecretCommand } from "../command/management/user/userCommand";
+import UserCommandHandler from "../command/management/user/userCommandHandler";
 
 /**
  * @description request totp reset
diff --git a/src/controller/userController.ts b/src/controller/userController.ts
index fb5b874..c084ec5 100644
--- a/src/controller/userController.ts
+++ b/src/controller/userController.ts
@@ -3,10 +3,10 @@ import speakeasy from "speakeasy";
 import QRCode from "qrcode";
 import InternalException from "../exceptions/internalException";
 import { CLUB_NAME } from "../env.defaults";
-import UserService from "../service/user/userService";
-import UserFactory from "../factory/admin/user/user";
-import { TransferUserOwnerCommand, UpdateUserCommand } from "../command/user/user/userCommand";
-import UserCommandHandler from "../command/user/user/userCommandHandler";
+import UserService from "../service/management/userService";
+import UserFactory from "../factory/admin/management/user";
+import { TransferUserOwnerCommand, UpdateUserCommand } from "../command/management/user/userCommand";
+import UserCommandHandler from "../command/management/user/userCommandHandler";
 import ForbiddenRequestException from "../exceptions/forbiddenRequestException";
 
 /**
diff --git a/src/controller/webapiController.ts b/src/controller/webapiController.ts
index 7af86dd..e8e4206 100644
--- a/src/controller/webapiController.ts
+++ b/src/controller/webapiController.ts
@@ -4,13 +4,13 @@ import { JWTToken } from "../type/jwtTypes";
 import InternalException from "../exceptions/internalException";
 import RefreshCommandHandler from "../command/refreshCommandHandler";
 import { CreateRefreshCommand, DeleteRefreshCommand } from "../command/refreshCommand";
-import UserService from "../service/user/userService";
+import UserService from "../service/management/userService";
 import speakeasy from "speakeasy";
 import UnauthorizedRequestException from "../exceptions/unauthorizedRequestException";
 import RefreshService from "../service/refreshService";
-import WebapiService from "../service/user/webapiService";
+import WebapiService from "../service/management/webapiService";
 import ForbiddenRequestException from "../exceptions/forbiddenRequestException";
-import WebapiCommandHandler from "../command/user/webapi/webapiCommandHandler";
+import WebapiCommandHandler from "../command/management/webapi/webapiCommandHandler";
 
 /**
  * @description Check authentication status by token
diff --git a/src/data-source.ts b/src/data-source.ts
index e775503..6babcb1 100644
--- a/src/data-source.ts
+++ b/src/data-source.ts
@@ -3,18 +3,18 @@ import "reflect-metadata";
 import { DataSource } from "typeorm";
 import { DB_HOST, DB_USERNAME, DB_PASSWORD, DB_NAME, DB_TYPE, DB_PORT } from "./env.defaults";
 
-import { user } from "./entity/user/user";
+import { user } from "./entity/management/user";
 import { refresh } from "./entity/refresh";
-import { invite } from "./entity/user/invite";
-import { userPermission } from "./entity/user/user_permission";
-import { role } from "./entity/user/role";
-import { rolePermission } from "./entity/user/role_permission";
-import { award } from "./entity/settings/award";
+import { invite } from "./entity/management/invite";
+import { userPermission } from "./entity/management/user_permission";
+import { role } from "./entity/management/role";
+import { rolePermission } from "./entity/management/role_permission";
+import { award } from "./entity/configuration/award";
 import { communication } from "./entity/club/member/communication";
-import { communicationType } from "./entity/settings/communicationType";
-import { executivePosition } from "./entity/settings/executivePosition";
-import { membershipStatus } from "./entity/settings/membershipStatus";
-import { qualification } from "./entity/settings/qualification";
+import { communicationType } from "./entity/configuration/communicationType";
+import { executivePosition } from "./entity/configuration/executivePosition";
+import { membershipStatus } from "./entity/configuration/membershipStatus";
+import { qualification } from "./entity/configuration/qualification";
 
 import { member } from "./entity/club/member/member";
 import { memberAwards } from "./entity/club/member/memberAwards";
@@ -28,22 +28,22 @@ import { protocolPresence } from "./entity/club/protocol/protocolPresence";
 import { protocolVoting } from "./entity/club/protocol/protocolVoting";
 import { protocolPrintout } from "./entity/club/protocol/protocolPrintout";
 import { calendar } from "./entity/club/calendar";
-import { calendarType } from "./entity/settings/calendarType";
+import { calendarType } from "./entity/configuration/calendarType";
 import { reset } from "./entity/reset";
-import { query } from "./entity/settings/query";
+import { query } from "./entity/configuration/query";
 import { memberView } from "./views/memberView";
 import { memberExecutivePositionsView } from "./views/memberExecutivePositionView";
 import { memberQualificationsView } from "./views/memberQualificationsView";
 import { membershipView } from "./views/membershipsView";
-import { template } from "./entity/settings/template";
-import { templateUsage } from "./entity/settings/templateUsage";
+import { template } from "./entity/configuration/template";
+import { templateUsage } from "./entity/configuration/templateUsage";
 import { newsletter } from "./entity/club/newsletter/newsletter";
 import { newsletterDates } from "./entity/club/newsletter/newsletterDates";
 import { newsletterRecipients } from "./entity/club/newsletter/newsletterRecipients";
-import { newsletterConfig } from "./entity/settings/newsletterConfig";
-import { webapi } from "./entity/user/webapi";
-import { webapiPermission } from "./entity/user/webapi_permission";
-import { salutation } from "./entity/settings/salutation";
+import { newsletterConfig } from "./entity/configuration/newsletterConfig";
+import { webapi } from "./entity/management/webapi";
+import { webapiPermission } from "./entity/management/webapi_permission";
+import { salutation } from "./entity/configuration/salutation";
 
 import { BackupAndResetDatabase1738166124200 } from "./migrations/1738166124200-BackupAndResetDatabase";
 import { CreateSchema1738166167472 } from "./migrations/1738166167472-CreateSchema";
diff --git a/src/entity/club/calendar.ts b/src/entity/club/calendar.ts
index e6488f6..6e64553 100644
--- a/src/entity/club/calendar.ts
+++ b/src/entity/club/calendar.ts
@@ -10,7 +10,7 @@ import {
   BeforeUpdate,
   ColumnType,
 } from "typeorm";
-import { calendarType } from "../settings/calendarType";
+import { calendarType } from "../configuration/calendarType";
 import { getTypeByORM } from "../../migrations/ormHelper";
 
 @Entity()
diff --git a/src/entity/club/member/communication.ts b/src/entity/club/member/communication.ts
index 3ec5062..de3e181 100644
--- a/src/entity/club/member/communication.ts
+++ b/src/entity/club/member/communication.ts
@@ -1,6 +1,6 @@
 import { Column, Entity, ManyToOne, PrimaryColumn } from "typeorm";
 import { member } from "./member";
-import { communicationType } from "../../settings/communicationType";
+import { communicationType } from "../../configuration/communicationType";
 
 @Entity()
 export class communication {
diff --git a/src/entity/club/member/member.ts b/src/entity/club/member/member.ts
index d387469..1678e39 100644
--- a/src/entity/club/member/member.ts
+++ b/src/entity/club/member/member.ts
@@ -4,7 +4,7 @@ import { memberAwards } from "./memberAwards";
 import { memberQualifications } from "./memberQualifications";
 import { memberExecutivePositions } from "./memberExecutivePositions";
 import { communication } from "./communication";
-import { salutation } from "../../settings/salutation";
+import { salutation } from "../../configuration/salutation";
 import { getTypeByORM } from "../../../migrations/ormHelper";
 
 @Entity()
diff --git a/src/entity/club/member/memberAwards.ts b/src/entity/club/member/memberAwards.ts
index 3559024..ef7aa76 100644
--- a/src/entity/club/member/memberAwards.ts
+++ b/src/entity/club/member/memberAwards.ts
@@ -1,6 +1,6 @@
 import { Column, ColumnType, Entity, ManyToOne, PrimaryColumn } from "typeorm";
 import { member } from "./member";
-import { award } from "../../settings/award";
+import { award } from "../../configuration/award";
 import { getTypeByORM } from "../../../migrations/ormHelper";
 
 @Entity()
diff --git a/src/entity/club/member/memberExecutivePositions.ts b/src/entity/club/member/memberExecutivePositions.ts
index c972d85..9686497 100644
--- a/src/entity/club/member/memberExecutivePositions.ts
+++ b/src/entity/club/member/memberExecutivePositions.ts
@@ -1,6 +1,6 @@
 import { Column, ColumnType, Entity, ManyToOne, PrimaryColumn } from "typeorm";
 import { member } from "./member";
-import { executivePosition } from "../../settings/executivePosition";
+import { executivePosition } from "../../configuration/executivePosition";
 import { getTypeByORM } from "../../../migrations/ormHelper";
 
 @Entity()
diff --git a/src/entity/club/member/memberQualifications.ts b/src/entity/club/member/memberQualifications.ts
index c4e5a46..40336cd 100644
--- a/src/entity/club/member/memberQualifications.ts
+++ b/src/entity/club/member/memberQualifications.ts
@@ -1,6 +1,6 @@
 import { Column, ColumnType, Entity, ManyToOne, PrimaryColumn } from "typeorm";
 import { member } from "./member";
-import { qualification } from "../../settings/qualification";
+import { qualification } from "../../configuration/qualification";
 import { getTypeByORM } from "../../../migrations/ormHelper";
 
 @Entity()
diff --git a/src/entity/club/member/membership.ts b/src/entity/club/member/membership.ts
index 1186f9c..4a4e69c 100644
--- a/src/entity/club/member/membership.ts
+++ b/src/entity/club/member/membership.ts
@@ -1,6 +1,6 @@
 import { Column, ColumnType, Entity, JoinColumn, ManyToOne, PrimaryColumn } from "typeorm";
 import { member } from "./member";
-import { membershipStatus } from "../../settings/membershipStatus";
+import { membershipStatus } from "../../configuration/membershipStatus";
 import { getTypeByORM } from "../../../migrations/ormHelper";
 
 @Entity()
diff --git a/src/entity/club/newsletter/newsletter.ts b/src/entity/club/newsletter/newsletter.ts
index 90650e4..11ac94a 100644
--- a/src/entity/club/newsletter/newsletter.ts
+++ b/src/entity/club/newsletter/newsletter.ts
@@ -2,7 +2,7 @@ import { Column, Entity, ManyToOne, OneToMany, PrimaryColumn } from "typeorm";
 import { newsletterDates } from "./newsletterDates";
 import { member } from "../member/member";
 import { newsletterRecipients } from "./newsletterRecipients";
-import { query } from "../../settings/query";
+import { query } from "../../configuration/query";
 
 @Entity()
 export class newsletter {
diff --git a/src/entity/settings/award.ts b/src/entity/configuration/award.ts
similarity index 100%
rename from src/entity/settings/award.ts
rename to src/entity/configuration/award.ts
diff --git a/src/entity/settings/calendarType.ts b/src/entity/configuration/calendarType.ts
similarity index 100%
rename from src/entity/settings/calendarType.ts
rename to src/entity/configuration/calendarType.ts
diff --git a/src/entity/settings/communicationType.ts b/src/entity/configuration/communicationType.ts
similarity index 100%
rename from src/entity/settings/communicationType.ts
rename to src/entity/configuration/communicationType.ts
diff --git a/src/entity/settings/executivePosition.ts b/src/entity/configuration/executivePosition.ts
similarity index 100%
rename from src/entity/settings/executivePosition.ts
rename to src/entity/configuration/executivePosition.ts
diff --git a/src/entity/settings/membershipStatus.ts b/src/entity/configuration/membershipStatus.ts
similarity index 100%
rename from src/entity/settings/membershipStatus.ts
rename to src/entity/configuration/membershipStatus.ts
diff --git a/src/entity/settings/newsletterConfig.ts b/src/entity/configuration/newsletterConfig.ts
similarity index 100%
rename from src/entity/settings/newsletterConfig.ts
rename to src/entity/configuration/newsletterConfig.ts
diff --git a/src/entity/settings/qualification.ts b/src/entity/configuration/qualification.ts
similarity index 100%
rename from src/entity/settings/qualification.ts
rename to src/entity/configuration/qualification.ts
diff --git a/src/entity/settings/query.ts b/src/entity/configuration/query.ts
similarity index 100%
rename from src/entity/settings/query.ts
rename to src/entity/configuration/query.ts
diff --git a/src/entity/settings/salutation.ts b/src/entity/configuration/salutation.ts
similarity index 100%
rename from src/entity/settings/salutation.ts
rename to src/entity/configuration/salutation.ts
diff --git a/src/entity/settings/template.ts b/src/entity/configuration/template.ts
similarity index 100%
rename from src/entity/settings/template.ts
rename to src/entity/configuration/template.ts
diff --git a/src/entity/settings/templateUsage.ts b/src/entity/configuration/templateUsage.ts
similarity index 100%
rename from src/entity/settings/templateUsage.ts
rename to src/entity/configuration/templateUsage.ts
diff --git a/src/entity/user/invite.ts b/src/entity/management/invite.ts
similarity index 100%
rename from src/entity/user/invite.ts
rename to src/entity/management/invite.ts
diff --git a/src/entity/user/role.ts b/src/entity/management/role.ts
similarity index 100%
rename from src/entity/user/role.ts
rename to src/entity/management/role.ts
diff --git a/src/entity/user/role_permission.ts b/src/entity/management/role_permission.ts
similarity index 100%
rename from src/entity/user/role_permission.ts
rename to src/entity/management/role_permission.ts
diff --git a/src/entity/user/user.ts b/src/entity/management/user.ts
similarity index 100%
rename from src/entity/user/user.ts
rename to src/entity/management/user.ts
diff --git a/src/entity/user/user_permission.ts b/src/entity/management/user_permission.ts
similarity index 100%
rename from src/entity/user/user_permission.ts
rename to src/entity/management/user_permission.ts
diff --git a/src/entity/user/webapi.ts b/src/entity/management/webapi.ts
similarity index 100%
rename from src/entity/user/webapi.ts
rename to src/entity/management/webapi.ts
diff --git a/src/entity/user/webapi_permission.ts b/src/entity/management/webapi_permission.ts
similarity index 100%
rename from src/entity/user/webapi_permission.ts
rename to src/entity/management/webapi_permission.ts
diff --git a/src/entity/refresh.ts b/src/entity/refresh.ts
index c9a82e0..09f90a7 100644
--- a/src/entity/refresh.ts
+++ b/src/entity/refresh.ts
@@ -1,5 +1,5 @@
 import { Column, ColumnType, Entity, ManyToOne, PrimaryColumn } from "typeorm";
-import { user } from "./user/user";
+import { user } from "./management/user";
 import { getTypeByORM } from "../migrations/ormHelper";
 
 @Entity()
diff --git a/src/factory/admin/club/calendar.ts b/src/factory/admin/club/calendar.ts
index 33eb7f2..2954be5 100644
--- a/src/factory/admin/club/calendar.ts
+++ b/src/factory/admin/club/calendar.ts
@@ -1,6 +1,6 @@
 import { calendar } from "../../../entity/club/calendar";
 import { CalendarViewModel } from "../../../viewmodel/admin/club/calendar.models";
-import CalendarTypeFactory from "../settings/calendarType";
+import CalendarTypeFactory from "../configuration/calendarType";
 
 export default abstract class CalendarFactory {
   /**
diff --git a/src/factory/admin/club/member/communication.ts b/src/factory/admin/club/member/communication.ts
index 127ab82..fc81906 100644
--- a/src/factory/admin/club/member/communication.ts
+++ b/src/factory/admin/club/member/communication.ts
@@ -1,6 +1,6 @@
 import { communication } from "../../../../entity/club/member/communication";
 import { CommunicationViewModel } from "../../../../viewmodel/admin/club/member/communication.models";
-import CommunicationTypeFactory from "../../settings/communicationType";
+import CommunicationTypeFactory from "../../configuration/communicationType";
 
 export default abstract class CommunicationFactory {
   /**
diff --git a/src/factory/admin/club/member/member.ts b/src/factory/admin/club/member/member.ts
index 536b012..246c0ae 100644
--- a/src/factory/admin/club/member/member.ts
+++ b/src/factory/admin/club/member/member.ts
@@ -1,7 +1,7 @@
 import { member } from "../../../../entity/club/member/member";
 import { MemberStatisticsViewModel, MemberViewModel } from "../../../../viewmodel/admin/club/member/member.models";
 import { memberView } from "../../../../views/memberView";
-import SalutationFactory from "../../settings/salutation";
+import SalutationFactory from "../../configuration/salutation";
 import CommunicationFactory from "./communication";
 import DateMappingHelper from "./dateMappingHelper";
 import MembershipFactory from "./membership";
diff --git a/src/factory/admin/club/newsletter/newsletter.ts b/src/factory/admin/club/newsletter/newsletter.ts
index dff2de4..39c19e3 100644
--- a/src/factory/admin/club/newsletter/newsletter.ts
+++ b/src/factory/admin/club/newsletter/newsletter.ts
@@ -1,6 +1,6 @@
 import { newsletter } from "../../../../entity/club/newsletter/newsletter";
 import { NewsletterViewModel } from "../../../../viewmodel/admin/club/newsletter/newsletter.models";
-import QueryStoreFactory from "../../settings/queryStore";
+import QueryStoreFactory from "../../configuration/queryStore";
 
 export default abstract class NewsletterFactory {
   /**
diff --git a/src/factory/admin/settings/award.ts b/src/factory/admin/configuration/award.ts
similarity index 78%
rename from src/factory/admin/settings/award.ts
rename to src/factory/admin/configuration/award.ts
index 3191a4f..bfcc2f0 100644
--- a/src/factory/admin/settings/award.ts
+++ b/src/factory/admin/configuration/award.ts
@@ -1,5 +1,5 @@
-import { award } from "../../../entity/settings/award";
-import { AwardViewModel } from "../../../viewmodel/admin/settings/award.models";
+import { award } from "../../../entity/configuration/award";
+import { AwardViewModel } from "../../../viewmodel/admin/configuration/award.models";
 
 export default abstract class AwardFactory {
   /**
diff --git a/src/factory/admin/settings/calendarType.ts b/src/factory/admin/configuration/calendarType.ts
similarity index 87%
rename from src/factory/admin/settings/calendarType.ts
rename to src/factory/admin/configuration/calendarType.ts
index 2ee7ce2..813dbb2 100644
--- a/src/factory/admin/settings/calendarType.ts
+++ b/src/factory/admin/configuration/calendarType.ts
@@ -1,5 +1,5 @@
-import { calendarType } from "../../../entity/settings/calendarType";
-import { CalendarTypeViewModel } from "../../../viewmodel/admin/settings/calendarType.models";
+import { calendarType } from "../../../entity/configuration/calendarType";
+import { CalendarTypeViewModel } from "../../../viewmodel/admin/configuration/calendarType.models";
 
 export default abstract class CalendarTypeFactory {
   /**
diff --git a/src/factory/admin/settings/communicationType.ts b/src/factory/admin/configuration/communicationType.ts
similarity index 85%
rename from src/factory/admin/settings/communicationType.ts
rename to src/factory/admin/configuration/communicationType.ts
index 5721f0e..b0d54b7 100644
--- a/src/factory/admin/settings/communicationType.ts
+++ b/src/factory/admin/configuration/communicationType.ts
@@ -1,5 +1,5 @@
-import { communicationType } from "../../../entity/settings/communicationType";
-import { CommunicationTypeViewModel } from "../../../viewmodel/admin/settings/communicationType.models";
+import { communicationType } from "../../../entity/configuration/communicationType";
+import { CommunicationTypeViewModel } from "../../../viewmodel/admin/configuration/communicationType.models";
 
 export default abstract class CommunicationTypeFactory {
   /**
diff --git a/src/factory/admin/settings/executivePosition.ts b/src/factory/admin/configuration/executivePosition.ts
similarity index 85%
rename from src/factory/admin/settings/executivePosition.ts
rename to src/factory/admin/configuration/executivePosition.ts
index 5c44bd9..8c7a448 100644
--- a/src/factory/admin/settings/executivePosition.ts
+++ b/src/factory/admin/configuration/executivePosition.ts
@@ -1,5 +1,5 @@
-import { executivePosition } from "../../../entity/settings/executivePosition";
-import { ExecutivePositionViewModel } from "../../../viewmodel/admin/settings/executivePosition.models";
+import { executivePosition } from "../../../entity/configuration/executivePosition";
+import { ExecutivePositionViewModel } from "../../../viewmodel/admin/configuration/executivePosition.models";
 
 export default abstract class ExecutivePositionFactory {
   /**
diff --git a/src/factory/admin/settings/membershipStatus.ts b/src/factory/admin/configuration/membershipStatus.ts
similarity index 85%
rename from src/factory/admin/settings/membershipStatus.ts
rename to src/factory/admin/configuration/membershipStatus.ts
index f45f5b8..98cef48 100644
--- a/src/factory/admin/settings/membershipStatus.ts
+++ b/src/factory/admin/configuration/membershipStatus.ts
@@ -1,5 +1,5 @@
-import { membershipStatus } from "../../../entity/settings/membershipStatus";
-import { MembershipStatusViewModel } from "../../../viewmodel/admin/settings/membershipStatus.models";
+import { membershipStatus } from "../../../entity/configuration/membershipStatus";
+import { MembershipStatusViewModel } from "../../../viewmodel/admin/configuration/membershipStatus.models";
 
 export default abstract class MembershipStatusFactory {
   /**
diff --git a/src/factory/admin/settings/newsletterConfig.ts b/src/factory/admin/configuration/newsletterConfig.ts
similarity index 87%
rename from src/factory/admin/settings/newsletterConfig.ts
rename to src/factory/admin/configuration/newsletterConfig.ts
index f71889e..17d2461 100644
--- a/src/factory/admin/settings/newsletterConfig.ts
+++ b/src/factory/admin/configuration/newsletterConfig.ts
@@ -1,5 +1,5 @@
-import { newsletterConfig } from "../../../entity/settings/newsletterConfig";
-import { NewsletterConfigViewModel } from "../../../viewmodel/admin/settings/newsletterConfig.models";
+import { newsletterConfig } from "../../../entity/configuration/newsletterConfig";
+import { NewsletterConfigViewModel } from "../../../viewmodel/admin/configuration/newsletterConfig.models";
 import CommunicationTypeFactory from "./communicationType";
 
 export default abstract class NewsletterConfigFactory {
diff --git a/src/factory/admin/settings/qualification.ts b/src/factory/admin/configuration/qualification.ts
similarity index 86%
rename from src/factory/admin/settings/qualification.ts
rename to src/factory/admin/configuration/qualification.ts
index 0a6a05f..5e59e99 100644
--- a/src/factory/admin/settings/qualification.ts
+++ b/src/factory/admin/configuration/qualification.ts
@@ -1,5 +1,5 @@
-import { qualification } from "../../../entity/settings/qualification";
-import { QualificationViewModel } from "../../../viewmodel/admin/settings/qualification.models";
+import { qualification } from "../../../entity/configuration/qualification";
+import { QualificationViewModel } from "../../../viewmodel/admin/configuration/qualification.models";
 
 export default abstract class QualificationFactory {
   /**
diff --git a/src/factory/admin/settings/queryStore.ts b/src/factory/admin/configuration/queryStore.ts
similarity index 81%
rename from src/factory/admin/settings/queryStore.ts
rename to src/factory/admin/configuration/queryStore.ts
index 067c494..5f7b8a6 100644
--- a/src/factory/admin/settings/queryStore.ts
+++ b/src/factory/admin/configuration/queryStore.ts
@@ -1,5 +1,5 @@
-import { query } from "../../../entity/settings/query";
-import { QueryStoreViewModel } from "../../../viewmodel/admin/settings/queryStore.models";
+import { query } from "../../../entity/configuration/query";
+import { QueryStoreViewModel } from "../../../viewmodel/admin/configuration/queryStore.models";
 
 export default abstract class QueryStoreFactory {
   /**
diff --git a/src/factory/admin/settings/salutation.ts b/src/factory/admin/configuration/salutation.ts
similarity index 78%
rename from src/factory/admin/settings/salutation.ts
rename to src/factory/admin/configuration/salutation.ts
index 65ac3dd..1c65df0 100644
--- a/src/factory/admin/settings/salutation.ts
+++ b/src/factory/admin/configuration/salutation.ts
@@ -1,5 +1,5 @@
-import { salutation } from "../../../entity/settings/salutation";
-import { SalutationViewModel } from "../../../viewmodel/admin/settings/salutation.models";
+import { salutation } from "../../../entity/configuration/salutation";
+import { SalutationViewModel } from "../../../viewmodel/admin/configuration/salutation.models";
 
 export default abstract class SalutationFactory {
   /**
diff --git a/src/factory/admin/settings/template.ts b/src/factory/admin/configuration/template.ts
similarity index 80%
rename from src/factory/admin/settings/template.ts
rename to src/factory/admin/configuration/template.ts
index ba87719..5e8aad1 100644
--- a/src/factory/admin/settings/template.ts
+++ b/src/factory/admin/configuration/template.ts
@@ -1,5 +1,5 @@
-import { template } from "../../../entity/settings/template";
-import { TemplateViewModel } from "../../../viewmodel/admin/settings/template.models";
+import { template } from "../../../entity/configuration/template";
+import { TemplateViewModel } from "../../../viewmodel/admin/configuration/template.models";
 
 export default abstract class TemplateFactory {
   /**
diff --git a/src/factory/admin/settings/templateUsage.ts b/src/factory/admin/configuration/templateUsage.ts
similarity index 90%
rename from src/factory/admin/settings/templateUsage.ts
rename to src/factory/admin/configuration/templateUsage.ts
index a34f50f..784e6d8 100644
--- a/src/factory/admin/settings/templateUsage.ts
+++ b/src/factory/admin/configuration/templateUsage.ts
@@ -1,5 +1,5 @@
-import { templateUsage } from "../../../entity/settings/templateUsage";
-import { TemplateUsageViewModel } from "../../../viewmodel/admin/settings/templateUsage.models";
+import { templateUsage } from "../../../entity/configuration/templateUsage";
+import { TemplateUsageViewModel } from "../../../viewmodel/admin/configuration/templateUsage.models";
 
 export default abstract class TemplateUsageFactory {
   /**
diff --git a/src/factory/admin/user/invite.ts b/src/factory/admin/management/invite.ts
similarity index 81%
rename from src/factory/admin/user/invite.ts
rename to src/factory/admin/management/invite.ts
index 6aa5647..9ff0fc2 100644
--- a/src/factory/admin/user/invite.ts
+++ b/src/factory/admin/management/invite.ts
@@ -1,5 +1,5 @@
-import { invite } from "../../../entity/user/invite";
-import { InviteViewModel } from "../../../viewmodel/admin/user/invite.models";
+import { invite } from "../../../entity/management/invite";
+import { InviteViewModel } from "../../../viewmodel/admin/management/invite.models";
 
 export default abstract class InviteFactory {
   /**
diff --git a/src/factory/admin/user/role.ts b/src/factory/admin/management/role.ts
similarity index 83%
rename from src/factory/admin/user/role.ts
rename to src/factory/admin/management/role.ts
index 8490735..56bb479 100644
--- a/src/factory/admin/user/role.ts
+++ b/src/factory/admin/management/role.ts
@@ -1,6 +1,6 @@
-import { role } from "../../../entity/user/role";
+import { role } from "../../../entity/management/role";
 import PermissionHelper from "../../../helpers/permissionHelper";
-import { RoleViewModel } from "../../../viewmodel/admin/user/role.models";
+import { RoleViewModel } from "../../../viewmodel/admin/management/role.models";
 
 export default abstract class RoleFactory {
   /**
diff --git a/src/factory/admin/user/user.ts b/src/factory/admin/management/user.ts
similarity index 90%
rename from src/factory/admin/user/user.ts
rename to src/factory/admin/management/user.ts
index 0a82ace..3910bf2 100644
--- a/src/factory/admin/user/user.ts
+++ b/src/factory/admin/management/user.ts
@@ -1,6 +1,6 @@
-import { user } from "../../../entity/user/user";
+import { user } from "../../../entity/management/user";
 import PermissionHelper from "../../../helpers/permissionHelper";
-import { UserViewModel } from "../../../viewmodel/admin/user/user.models";
+import { UserViewModel } from "../../../viewmodel/admin/management/user.models";
 import RoleFactory from "./role";
 
 export default abstract class UserFactory {
diff --git a/src/factory/admin/user/webapi.ts b/src/factory/admin/management/webapi.ts
similarity index 84%
rename from src/factory/admin/user/webapi.ts
rename to src/factory/admin/management/webapi.ts
index 3c0ede4..e540ecb 100644
--- a/src/factory/admin/user/webapi.ts
+++ b/src/factory/admin/management/webapi.ts
@@ -1,6 +1,6 @@
-import { webapi } from "../../../entity/user/webapi";
+import { webapi } from "../../../entity/management/webapi";
 import PermissionHelper from "../../../helpers/permissionHelper";
-import { ApiViewModel } from "../../../viewmodel/admin/user/webapi.models";
+import { ApiViewModel } from "../../../viewmodel/admin/management/webapi.models";
 
 export default abstract class ApiFactory {
   /**
diff --git a/src/helpers/backupHelper.ts b/src/helpers/backupHelper.ts
index 1024943..a60e963 100644
--- a/src/helpers/backupHelper.ts
+++ b/src/helpers/backupHelper.ts
@@ -3,7 +3,7 @@ import { FileSystemHelper } from "./fileSystemHelper";
 import { EntityManager } from "typeorm";
 import uniqBy from "lodash.uniqby";
 import InternalException from "../exceptions/internalException";
-import UserService from "../service/user/userService";
+import UserService from "../service/management/userService";
 import { BACKUP_COPIES, BACKUP_INTERVAL } from "../env.defaults";
 import DatabaseActionException from "../exceptions/databaseActionException";
 
diff --git a/src/helpers/jwtHelper.ts b/src/helpers/jwtHelper.ts
index 11a5232..c16f2a2 100644
--- a/src/helpers/jwtHelper.ts
+++ b/src/helpers/jwtHelper.ts
@@ -2,12 +2,12 @@ import jwt from "jsonwebtoken";
 import { JWTData, JWTToken } from "../type/jwtTypes";
 import { JWT_SECRET, JWT_EXPIRATION } from "../env.defaults";
 import InternalException from "../exceptions/internalException";
-import RolePermissionService from "../service/user/rolePermissionService";
-import UserPermissionService from "../service/user/userPermissionService";
-import UserService from "../service/user/userService";
+import RolePermissionService from "../service/management/rolePermissionService";
+import UserPermissionService from "../service/management/userPermissionService";
+import UserService from "../service/management/userService";
 import PermissionHelper from "./permissionHelper";
-import WebapiService from "../service/user/webapiService";
-import WebapiPermissionService from "../service/user/webapiPermissionService";
+import WebapiService from "../service/management/webapiService";
+import WebapiPermissionService from "../service/management/webapiPermissionService";
 import ms from "ms";
 
 export abstract class JWTHelper {
diff --git a/src/helpers/newsletterHelper.ts b/src/helpers/newsletterHelper.ts
index 782594a..e5e619b 100644
--- a/src/helpers/newsletterHelper.ts
+++ b/src/helpers/newsletterHelper.ts
@@ -14,7 +14,7 @@ import MailHelper from "./mailHelper";
 import { CLUB_NAME } from "../env.defaults";
 import { TemplateHelper } from "./templateHelper";
 import { PdfExport } from "./pdfExport";
-import NewsletterConfigService from "../service/settings/newsletterConfigService";
+import NewsletterConfigService from "../service/configuration/newsletterConfigService";
 import { NewsletterConfigType } from "../enums/newsletterConfigType";
 import InternalException from "../exceptions/internalException";
 import EventEmitter from "events";
diff --git a/src/helpers/templateHelper.ts b/src/helpers/templateHelper.ts
index f7d8aa6..fa4be26 100644
--- a/src/helpers/templateHelper.ts
+++ b/src/helpers/templateHelper.ts
@@ -1,6 +1,6 @@
-import TemplateService from "../service/settings/templateService";
+import TemplateService from "../service/configuration/templateService";
 import { PermissionModule } from "../type/permissionTypes";
-import TemplateUsageService from "../service/settings/templateUsageService";
+import TemplateUsageService from "../service/configuration/templateUsageService";
 import Handlebars, { template } from "handlebars";
 import { FileSystemHelper } from "./fileSystemHelper";
 
@@ -34,7 +34,7 @@ export abstract class TemplateHelper {
     bodyData = {},
     footerData = {},
   }: {
-    module: `${PermissionModule}`|`${PermissionModule}.${string}`;
+    module: `${PermissionModule}` | `${PermissionModule}.${string}`;
     title?: string;
     headerData?: any;
     bodyData?: any;
diff --git a/src/middleware/allowSetup.ts b/src/middleware/allowSetup.ts
index 981d955..10d53fa 100644
--- a/src/middleware/allowSetup.ts
+++ b/src/middleware/allowSetup.ts
@@ -1,5 +1,5 @@
 import { NextFunction, Request, Response } from "express";
-import UserService from "../service/user/userService";
+import UserService from "../service/management/userService";
 import CustomRequestException from "../exceptions/customRequestException";
 
 export default async function allowSetup(req: Request, res: Response, next: NextFunction) {
diff --git a/src/migrations/1738166167472-CreateSchema.ts b/src/migrations/1738166167472-CreateSchema.ts
index 70a6c97..5dcd9db 100644
--- a/src/migrations/1738166167472-CreateSchema.ts
+++ b/src/migrations/1738166167472-CreateSchema.ts
@@ -11,7 +11,7 @@ import {
   webapi_permission_table,
   webapi_table,
 } from "./baseSchemaTables/admin";
-import { templateUsage } from "../entity/settings/templateUsage";
+import { templateUsage } from "../entity/configuration/templateUsage";
 import {
   award_table,
   communication_type_table,
diff --git a/src/routes/admin/settings/award.ts b/src/routes/admin/configuration/award.ts
similarity index 73%
rename from src/routes/admin/settings/award.ts
rename to src/routes/admin/configuration/award.ts
index d5eddeb..5873452 100644
--- a/src/routes/admin/settings/award.ts
+++ b/src/routes/admin/configuration/award.ts
@@ -5,7 +5,7 @@ import {
   getAllAwards,
   getAwardById,
   updateAward,
-} from "../../../controller/admin/settings/awardController";
+} from "../../../controller/admin/configuration/awardController";
 import PermissionHelper from "../../../helpers/permissionHelper";
 
 var router = express.Router({ mergeParams: true });
@@ -20,7 +20,7 @@ router.get("/:id", async (req: Request, res: Response) => {
 
 router.post(
   "/",
-  PermissionHelper.passCheckMiddleware("create", "settings", "award"),
+  PermissionHelper.passCheckMiddleware("create", "configuration", "award"),
   async (req: Request, res: Response) => {
     await createAward(req, res);
   }
@@ -28,7 +28,7 @@ router.post(
 
 router.patch(
   "/:id",
-  PermissionHelper.passCheckMiddleware("update", "settings", "award"),
+  PermissionHelper.passCheckMiddleware("update", "configuration", "award"),
   async (req: Request, res: Response) => {
     await updateAward(req, res);
   }
@@ -36,7 +36,7 @@ router.patch(
 
 router.delete(
   "/:id",
-  PermissionHelper.passCheckMiddleware("delete", "settings", "award"),
+  PermissionHelper.passCheckMiddleware("delete", "configuration", "award"),
   async (req: Request, res: Response) => {
     await deleteAward(req, res);
   }
diff --git a/src/routes/admin/settings/calendarType.ts b/src/routes/admin/configuration/calendarType.ts
similarity index 80%
rename from src/routes/admin/settings/calendarType.ts
rename to src/routes/admin/configuration/calendarType.ts
index 37cf230..1455c20 100644
--- a/src/routes/admin/settings/calendarType.ts
+++ b/src/routes/admin/configuration/calendarType.ts
@@ -25,7 +25,7 @@ router.get("/:id", async (req: Request, res: Response) => {
 
 router.post(
   "/",
-  PermissionHelper.passCheckMiddleware("create", "settings", "calendar_type"),
+  PermissionHelper.passCheckMiddleware("create", "configuration", "calendar_type"),
   async (req: Request, res: Response) => {
     await createCalendarType(req, res);
   }
@@ -33,7 +33,7 @@ router.post(
 
 router.patch(
   "/:id",
-  PermissionHelper.passCheckMiddleware("update", "settings", "calendar_type"),
+  PermissionHelper.passCheckMiddleware("update", "configuration", "calendar_type"),
   async (req: Request, res: Response) => {
     await updateCalendarType(req, res);
   }
@@ -41,7 +41,7 @@ router.patch(
 
 router.delete(
   "/:id",
-  PermissionHelper.passCheckMiddleware("delete", "settings", "calendar_type"),
+  PermissionHelper.passCheckMiddleware("delete", "configuration", "calendar_type"),
   async (req: Request, res: Response) => {
     await deleteCalendarType(req, res);
   }
diff --git a/src/routes/admin/settings/communicationType.ts b/src/routes/admin/configuration/communicationType.ts
similarity index 75%
rename from src/routes/admin/settings/communicationType.ts
rename to src/routes/admin/configuration/communicationType.ts
index aaf3c46..b00bbef 100644
--- a/src/routes/admin/settings/communicationType.ts
+++ b/src/routes/admin/configuration/communicationType.ts
@@ -6,7 +6,7 @@ import {
   getCommunicationTypeAvailableColumns,
   getCommunicationTypeById,
   updateCommunicationType,
-} from "../../../controller/admin/settings/communicationTypeController";
+} from "../../../controller/admin/configuration/communicationTypeController";
 import PermissionHelper from "../../../helpers/permissionHelper";
 
 var router = express.Router({ mergeParams: true });
@@ -25,7 +25,7 @@ router.get("/:id", async (req: Request, res: Response) => {
 
 router.post(
   "/",
-  PermissionHelper.passCheckMiddleware("create", "settings", "communication_type"),
+  PermissionHelper.passCheckMiddleware("create", "configuration", "communication_type"),
   async (req: Request, res: Response) => {
     await createCommunicationType(req, res);
   }
@@ -33,7 +33,7 @@ router.post(
 
 router.patch(
   "/:id",
-  PermissionHelper.passCheckMiddleware("update", "settings", "communication_type"),
+  PermissionHelper.passCheckMiddleware("update", "configuration", "communication_type"),
   async (req: Request, res: Response) => {
     await updateCommunicationType(req, res);
   }
@@ -41,7 +41,7 @@ router.patch(
 
 router.delete(
   "/:id",
-  PermissionHelper.passCheckMiddleware("delete", "settings", "communication_type"),
+  PermissionHelper.passCheckMiddleware("delete", "configuration", "communication_type"),
   async (req: Request, res: Response) => {
     await deleteCommunicationType(req, res);
   }
diff --git a/src/routes/admin/settings/executivePosition.ts b/src/routes/admin/configuration/executivePosition.ts
similarity index 72%
rename from src/routes/admin/settings/executivePosition.ts
rename to src/routes/admin/configuration/executivePosition.ts
index dd698ea..d0cbf01 100644
--- a/src/routes/admin/settings/executivePosition.ts
+++ b/src/routes/admin/configuration/executivePosition.ts
@@ -5,7 +5,7 @@ import {
   getAllExecutivePositions,
   getExecutivePositionById,
   updateExecutivePosition,
-} from "../../../controller/admin/settings/executivePositionController";
+} from "../../../controller/admin/configuration/executivePositionController";
 import PermissionHelper from "../../../helpers/permissionHelper";
 
 var router = express.Router({ mergeParams: true });
@@ -20,7 +20,7 @@ router.get("/:id", async (req: Request, res: Response) => {
 
 router.post(
   "/",
-  PermissionHelper.passCheckMiddleware("create", "settings", "executive_position"),
+  PermissionHelper.passCheckMiddleware("create", "configuration", "executive_position"),
   async (req: Request, res: Response) => {
     await createExecutivePosition(req, res);
   }
@@ -28,7 +28,7 @@ router.post(
 
 router.patch(
   "/:id",
-  PermissionHelper.passCheckMiddleware("update", "settings", "executive_position"),
+  PermissionHelper.passCheckMiddleware("update", "configuration", "executive_position"),
   async (req: Request, res: Response) => {
     await updateExecutivePosition(req, res);
   }
@@ -36,7 +36,7 @@ router.patch(
 
 router.delete(
   "/:id",
-  PermissionHelper.passCheckMiddleware("delete", "settings", "executive_position"),
+  PermissionHelper.passCheckMiddleware("delete", "configuration", "executive_position"),
   async (req: Request, res: Response) => {
     await deleteExecutivePosition(req, res);
   }
diff --git a/src/routes/admin/settings/membershipStatus.ts b/src/routes/admin/configuration/membershipStatus.ts
similarity index 72%
rename from src/routes/admin/settings/membershipStatus.ts
rename to src/routes/admin/configuration/membershipStatus.ts
index 72673f1..46c47d9 100644
--- a/src/routes/admin/settings/membershipStatus.ts
+++ b/src/routes/admin/configuration/membershipStatus.ts
@@ -5,7 +5,7 @@ import {
   getAllMembershipStatus,
   getMembershipStatusById,
   updateMembershipStatus,
-} from "../../../controller/admin/settings/membershipStatusController";
+} from "../../../controller/admin/configuration/membershipStatusController";
 import PermissionHelper from "../../../helpers/permissionHelper";
 
 var router = express.Router({ mergeParams: true });
@@ -20,7 +20,7 @@ router.get("/:id", async (req: Request, res: Response) => {
 
 router.post(
   "/",
-  PermissionHelper.passCheckMiddleware("create", "settings", "membership_status"),
+  PermissionHelper.passCheckMiddleware("create", "configuration", "membership_status"),
   async (req: Request, res: Response) => {
     await createMembershipStatus(req, res);
   }
@@ -28,7 +28,7 @@ router.post(
 
 router.patch(
   "/:id",
-  PermissionHelper.passCheckMiddleware("update", "settings", "membership_status"),
+  PermissionHelper.passCheckMiddleware("update", "configuration", "membership_status"),
   async (req: Request, res: Response) => {
     await updateMembershipStatus(req, res);
   }
@@ -36,7 +36,7 @@ router.patch(
 
 router.delete(
   "/:id",
-  PermissionHelper.passCheckMiddleware("delete", "settings", "membership_status"),
+  PermissionHelper.passCheckMiddleware("delete", "configuration", "membership_status"),
   async (req: Request, res: Response) => {
     await deleteMembershipStatus(req, res);
   }
diff --git a/src/routes/admin/settings/newsletterConfig.ts b/src/routes/admin/configuration/newsletterConfig.ts
similarity index 75%
rename from src/routes/admin/settings/newsletterConfig.ts
rename to src/routes/admin/configuration/newsletterConfig.ts
index a874cc7..b1b805b 100644
--- a/src/routes/admin/settings/newsletterConfig.ts
+++ b/src/routes/admin/configuration/newsletterConfig.ts
@@ -4,7 +4,7 @@ import {
   getAllNewsletterConfigs,
   getNewsletterConfigById,
   setNewsletterConfig,
-} from "../../../controller/admin/settings/newsletterConfigController";
+} from "../../../controller/admin/configuration/newsletterConfigController";
 import PermissionHelper from "../../../helpers/permissionHelper";
 
 var router = express.Router({ mergeParams: true });
@@ -19,7 +19,7 @@ router.get("/:id", async (req: Request, res: Response) => {
 
 router.put(
   "/",
-  PermissionHelper.passCheckMiddleware("create", "settings", "newsletter_config"),
+  PermissionHelper.passCheckMiddleware("create", "configuration", "newsletter_config"),
   async (req: Request, res: Response) => {
     await setNewsletterConfig(req, res);
   }
@@ -27,7 +27,7 @@ router.put(
 
 router.delete(
   "/:comTypeId",
-  PermissionHelper.passCheckMiddleware("create", "settings", "newsletter_config"),
+  PermissionHelper.passCheckMiddleware("create", "configuration", "newsletter_config"),
   async (req: Request, res: Response) => {
     await deleteNewsletterConfig(req, res);
   }
diff --git a/src/routes/admin/settings/qualification.ts b/src/routes/admin/configuration/qualification.ts
similarity index 72%
rename from src/routes/admin/settings/qualification.ts
rename to src/routes/admin/configuration/qualification.ts
index efa34a8..80babc1 100644
--- a/src/routes/admin/settings/qualification.ts
+++ b/src/routes/admin/configuration/qualification.ts
@@ -5,7 +5,7 @@ import {
   getAllQualifications,
   getQualificationById,
   updateQualification,
-} from "../../../controller/admin/settings/qualificationController";
+} from "../../../controller/admin/configuration/qualificationController";
 import PermissionHelper from "../../../helpers/permissionHelper";
 
 var router = express.Router({ mergeParams: true });
@@ -20,7 +20,7 @@ router.get("/:id", async (req: Request, res: Response) => {
 
 router.post(
   "/",
-  PermissionHelper.passCheckMiddleware("create", "settings", "qualification"),
+  PermissionHelper.passCheckMiddleware("create", "configuration", "qualification"),
   async (req: Request, res: Response) => {
     await createQualification(req, res);
   }
@@ -28,7 +28,7 @@ router.post(
 
 router.patch(
   "/:id",
-  PermissionHelper.passCheckMiddleware("update", "settings", "qualification"),
+  PermissionHelper.passCheckMiddleware("update", "configuration", "qualification"),
   async (req: Request, res: Response) => {
     await updateQualification(req, res);
   }
@@ -36,7 +36,7 @@ router.patch(
 
 router.delete(
   "/:id",
-  PermissionHelper.passCheckMiddleware("delete", "settings", "qualification"),
+  PermissionHelper.passCheckMiddleware("delete", "configuration", "qualification"),
   async (req: Request, res: Response) => {
     await deleteQualification(req, res);
   }
diff --git a/src/routes/admin/settings/queryStore.ts b/src/routes/admin/configuration/queryStore.ts
similarity index 72%
rename from src/routes/admin/settings/queryStore.ts
rename to src/routes/admin/configuration/queryStore.ts
index 85b408c..a9963d9 100644
--- a/src/routes/admin/settings/queryStore.ts
+++ b/src/routes/admin/configuration/queryStore.ts
@@ -6,7 +6,7 @@ import {
   getAllQueryStores,
   getQueryStoreById,
   updateQueryStore,
-} from "../../../controller/admin/settings/queryStoreController";
+} from "../../../controller/admin/configuration/queryStoreController";
 
 var router = express.Router({ mergeParams: true });
 
@@ -20,7 +20,7 @@ router.get("/:id", async (req: Request, res: Response) => {
 
 router.post(
   "/",
-  PermissionHelper.passCheckMiddleware("create", "settings", "query_store"),
+  PermissionHelper.passCheckMiddleware("create", "configuration", "query_store"),
   async (req: Request, res: Response) => {
     await createQueryStore(req, res);
   }
@@ -28,7 +28,7 @@ router.post(
 
 router.patch(
   "/:id",
-  PermissionHelper.passCheckMiddleware("update", "settings", "query_store"),
+  PermissionHelper.passCheckMiddleware("update", "configuration", "query_store"),
   async (req: Request, res: Response) => {
     await updateQueryStore(req, res);
   }
@@ -36,7 +36,7 @@ router.patch(
 
 router.delete(
   "/:id",
-  PermissionHelper.passCheckMiddleware("delete", "settings", "query_store"),
+  PermissionHelper.passCheckMiddleware("delete", "configuration", "query_store"),
   async (req: Request, res: Response) => {
     await deleteQueryStore(req, res);
   }
diff --git a/src/routes/admin/settings/salutation.ts b/src/routes/admin/configuration/salutation.ts
similarity index 72%
rename from src/routes/admin/settings/salutation.ts
rename to src/routes/admin/configuration/salutation.ts
index c4c53a0..bf4eb84 100644
--- a/src/routes/admin/settings/salutation.ts
+++ b/src/routes/admin/configuration/salutation.ts
@@ -5,7 +5,7 @@ import {
   getAllSalutations,
   getSalutationById,
   updateSalutation,
-} from "../../../controller/admin/settings/salutationController";
+} from "../../../controller/admin/configuration/salutationController";
 import PermissionHelper from "../../../helpers/permissionHelper";
 
 var router = express.Router({ mergeParams: true });
@@ -20,7 +20,7 @@ router.get("/:id", async (req: Request, res: Response) => {
 
 router.post(
   "/",
-  PermissionHelper.passCheckMiddleware("create", "settings", "salutation"),
+  PermissionHelper.passCheckMiddleware("create", "configuration", "salutation"),
   async (req: Request, res: Response) => {
     await createSalutation(req, res);
   }
@@ -28,7 +28,7 @@ router.post(
 
 router.patch(
   "/:id",
-  PermissionHelper.passCheckMiddleware("update", "settings", "salutation"),
+  PermissionHelper.passCheckMiddleware("update", "configuration", "salutation"),
   async (req: Request, res: Response) => {
     await updateSalutation(req, res);
   }
@@ -36,7 +36,7 @@ router.patch(
 
 router.delete(
   "/:id",
-  PermissionHelper.passCheckMiddleware("delete", "settings", "salutation"),
+  PermissionHelper.passCheckMiddleware("delete", "configuration", "salutation"),
   async (req: Request, res: Response) => {
     await deleteSalutation(req, res);
   }
diff --git a/src/routes/admin/settings/template.ts b/src/routes/admin/configuration/template.ts
similarity index 71%
rename from src/routes/admin/settings/template.ts
rename to src/routes/admin/configuration/template.ts
index e04f7d4..d8dd35f 100644
--- a/src/routes/admin/settings/template.ts
+++ b/src/routes/admin/configuration/template.ts
@@ -6,7 +6,7 @@ import {
   getAllTemplates,
   getTemplateById,
   updateTemplate,
-} from "../../../controller/admin/settings/templateController";
+} from "../../../controller/admin/configuration/templateController";
 import PermissionHelper from "../../../helpers/permissionHelper";
 
 var router = express.Router({ mergeParams: true });
@@ -21,7 +21,7 @@ router.get("/:id", async (req: Request, res: Response) => {
 
 router.post(
   "/",
-  PermissionHelper.passCheckMiddleware("create", "settings", "template"),
+  PermissionHelper.passCheckMiddleware("create", "configuration", "template"),
   async (req: Request, res: Response) => {
     await createTemplate(req, res);
   }
@@ -29,7 +29,7 @@ router.post(
 
 router.post(
   "/clone",
-  PermissionHelper.passCheckMiddleware("create", "settings", "template"),
+  PermissionHelper.passCheckMiddleware("create", "configuration", "template"),
   async (req: Request, res: Response) => {
     await cloneTemplate(req, res);
   }
@@ -37,7 +37,7 @@ router.post(
 
 router.patch(
   "/:id",
-  PermissionHelper.passCheckMiddleware("update", "settings", "template"),
+  PermissionHelper.passCheckMiddleware("update", "configuration", "template"),
   async (req: Request, res: Response) => {
     await updateTemplate(req, res);
   }
@@ -45,7 +45,7 @@ router.patch(
 
 router.delete(
   "/:id",
-  PermissionHelper.passCheckMiddleware("delete", "settings", "template"),
+  PermissionHelper.passCheckMiddleware("delete", "configuration", "template"),
   async (req: Request, res: Response) => {
     await deleteTemplate(req, res);
   }
diff --git a/src/routes/admin/settings/templateUsage.ts b/src/routes/admin/configuration/templateUsage.ts
similarity index 82%
rename from src/routes/admin/settings/templateUsage.ts
rename to src/routes/admin/configuration/templateUsage.ts
index 6c8f3a9..36f6bb9 100644
--- a/src/routes/admin/settings/templateUsage.ts
+++ b/src/routes/admin/configuration/templateUsage.ts
@@ -4,7 +4,7 @@ import {
   getAllTemplateUsages,
   printTemplateUsageDemo,
   updateTemplateUsage,
-} from "../../../controller/admin/settings/templateUsageController";
+} from "../../../controller/admin/configuration/templateUsageController";
 import { PermissionModule } from "../../../type/permissionTypes";
 import ForbiddenRequestException from "../../../exceptions/forbiddenRequestException";
 
@@ -20,7 +20,7 @@ router.get("/:scope", async (req: Request, res: Response) => {
 
 router.patch(
   "/:scope",
-  PermissionHelper.passCheckMiddleware("update", "settings", "template_usage"),
+  PermissionHelper.passCheckMiddleware("update", "configuration", "template_usage"),
   async (req: Request, res: Response) => {
     await updateTemplateUsage(req, res);
   }
diff --git a/src/routes/admin/index.ts b/src/routes/admin/index.ts
index 59d5990..3dddb4f 100644
--- a/src/routes/admin/index.ts
+++ b/src/routes/admin/index.ts
@@ -2,17 +2,17 @@ import express from "express";
 import PermissionHelper from "../../helpers/permissionHelper";
 import preventWebapiAccess from "../../middleware/preventWebApiAccess";
 
-import award from "./settings/award";
-import communicationType from "./settings/communicationType";
-import executivePosition from "./settings/executivePosition";
-import membershipStatus from "./settings/membershipStatus";
-import qualification from "./settings/qualification";
-import salutation from "./settings/salutation";
-import calendarType from "./settings/calendarType";
-import queryStore from "./settings/queryStore";
-import template from "./settings/template";
-import templateUsage from "./settings/templateUsage";
-import newsletterConfig from "./settings/newsletterConfig";
+import award from "./configuration/award";
+import communicationType from "./configuration/communicationType";
+import executivePosition from "./configuration/executivePosition";
+import membershipStatus from "./configuration/membershipStatus";
+import qualification from "./configuration/qualification";
+import salutation from "./configuration/salutation";
+import calendarType from "./configuration/calendarType";
+import queryStore from "./configuration/queryStore";
+import template from "./configuration/template";
+import templateUsage from "./configuration/templateUsage";
+import newsletterConfig from "./configuration/newsletterConfig";
 
 import member from "./club/member";
 import protocol from "./club/protocol";
@@ -20,18 +20,18 @@ import calendar from "./club/calendar";
 import queryBuilder from "./club/queryBuilder";
 import newsletter from "./club/newsletter";
 
-import role from "./user/role";
-import user from "./user/user";
-import invite from "./user/invite";
-import api from "./user/webapi";
-import backup from "./user/backup";
+import role from "./management/role";
+import user from "./management/user";
+import invite from "./management/invite";
+import api from "./management/webapi";
+import backup from "./management/backup";
 
 var router = express.Router({ mergeParams: true });
 
 router.use(
   "/award",
   PermissionHelper.passCheckSomeMiddleware([
-    { requiredPermissions: "read", section: "settings", module: "award" },
+    { requiredPermissions: "read", section: "configuration", module: "award" },
     { requiredPermissions: "read", section: "club", module: "member" },
   ]),
   award
@@ -39,7 +39,7 @@ router.use(
 router.use(
   "/communicationtype",
   PermissionHelper.passCheckSomeMiddleware([
-    { requiredPermissions: "read", section: "settings", module: "communication_type" },
+    { requiredPermissions: "read", section: "configuration", module: "communication_type" },
     { requiredPermissions: "read", section: "club", module: "member" },
   ]),
   communicationType
@@ -47,7 +47,7 @@ router.use(
 router.use(
   "/executiveposition",
   PermissionHelper.passCheckSomeMiddleware([
-    { requiredPermissions: "read", section: "settings", module: "executive_position" },
+    { requiredPermissions: "read", section: "configuration", module: "executive_position" },
     { requiredPermissions: "read", section: "club", module: "member" },
   ]),
   executivePosition
@@ -55,7 +55,7 @@ router.use(
 router.use(
   "/membershipstatus",
   PermissionHelper.passCheckSomeMiddleware([
-    { requiredPermissions: "read", section: "settings", module: "membership_status" },
+    { requiredPermissions: "read", section: "configuration", module: "membership_status" },
     { requiredPermissions: "read", section: "club", module: "member" },
   ]),
   membershipStatus
@@ -63,7 +63,7 @@ router.use(
 router.use(
   "/qualification",
   PermissionHelper.passCheckSomeMiddleware([
-    { requiredPermissions: "read", section: "settings", module: "qualification" },
+    { requiredPermissions: "read", section: "configuration", module: "qualification" },
     { requiredPermissions: "read", section: "club", module: "member" },
   ]),
   qualification
@@ -71,7 +71,7 @@ router.use(
 router.use(
   "/salutation",
   PermissionHelper.passCheckSomeMiddleware([
-    { requiredPermissions: "read", section: "settings", module: "salutation" },
+    { requiredPermissions: "read", section: "configuration", module: "salutation" },
     { requiredPermissions: "read", section: "club", module: "member" },
   ]),
   salutation
@@ -79,26 +79,26 @@ router.use(
 router.use(
   "/calendartype",
   PermissionHelper.passCheckSomeMiddleware([
-    { requiredPermissions: "read", section: "settings", module: "calendar_type" },
+    { requiredPermissions: "read", section: "configuration", module: "calendar_type" },
     { requiredPermissions: "read", section: "club", module: "calendar" },
   ]),
   calendarType
 );
-router.use("/querystore", PermissionHelper.passCheckMiddleware("read", "settings", "query_store"), queryStore);
-router.use("/template", PermissionHelper.passCheckMiddleware("read", "settings", "template"), template);
+router.use("/querystore", PermissionHelper.passCheckMiddleware("read", "configuration", "query_store"), queryStore);
+router.use("/template", PermissionHelper.passCheckMiddleware("read", "configuration", "template"), template);
 router.use(
   "/templateusage",
   PermissionHelper.passCheckSomeMiddleware([
-    { requiredPermissions: "read", section: "settings", module: "template_usage" },
-    { requiredPermissions: "read", section: "settings", module: "template" },
+    { requiredPermissions: "read", section: "configuration", module: "template_usage" },
+    { requiredPermissions: "read", section: "configuration", module: "template" },
   ]),
   templateUsage
 );
 router.use(
   "/newsletterconfig",
   PermissionHelper.passCheckSomeMiddleware([
-    { requiredPermissions: "read", section: "settings", module: "newsletter_config" },
-    { requiredPermissions: "read", section: "settings", module: "communication_type" },
+    { requiredPermissions: "read", section: "configuration", module: "newsletter_config" },
+    { requiredPermissions: "read", section: "configuration", module: "communication_type" },
   ]),
   newsletterConfig
 );
@@ -117,7 +117,7 @@ router.use(
   "/querybuilder",
   PermissionHelper.passCheckSomeMiddleware([
     { requiredPermissions: "read", section: "club", module: "query" },
-    { requiredPermissions: "read", section: "settings", module: "query_store" },
+    { requiredPermissions: "read", section: "configuration", module: "query_store" },
   ]),
   queryBuilder
 );
@@ -128,22 +128,27 @@ router.use(
     { requiredPermissions: "read", section: "club", module: "member" },
     { requiredPermissions: "read", section: "club", module: "calendar" },
     { requiredPermissions: "read", section: "club", module: "query" },
-    { requiredPermissions: "read", section: "settings", module: "query_store" },
+    { requiredPermissions: "read", section: "configuration", module: "query_store" },
   ]),
   newsletter
 );
 
-router.use("/role", PermissionHelper.passCheckMiddleware("read", "user", "role"), role);
+router.use("/role", PermissionHelper.passCheckMiddleware("read", "management", "role"), role);
 router.use(
   "/user",
   PermissionHelper.passCheckSomeMiddleware([
-    { requiredPermissions: "read", section: "user", module: "user" },
-    { requiredPermissions: "read", section: "user", module: "role" },
+    { requiredPermissions: "read", section: "management", module: "user" },
+    { requiredPermissions: "read", section: "management", module: "role" },
   ]),
   user
 );
-router.use("/invite", PermissionHelper.passCheckMiddleware("read", "user", "user"), invite);
-router.use("/webapi", preventWebapiAccess, PermissionHelper.passCheckMiddleware("read", "user", "webapi"), api);
-router.use("/backup", preventWebapiAccess, PermissionHelper.passCheckMiddleware("read", "user", "backup"), backup);
+router.use("/invite", PermissionHelper.passCheckMiddleware("read", "management", "user"), invite);
+router.use("/webapi", preventWebapiAccess, PermissionHelper.passCheckMiddleware("read", "management", "webapi"), api);
+router.use(
+  "/backup",
+  preventWebapiAccess,
+  PermissionHelper.passCheckMiddleware("read", "management", "backup"),
+  backup
+);
 
 export default router;
diff --git a/src/routes/admin/user/backup.ts b/src/routes/admin/management/backup.ts
similarity index 84%
rename from src/routes/admin/user/backup.ts
rename to src/routes/admin/management/backup.ts
index b486a49..f093554 100644
--- a/src/routes/admin/user/backup.ts
+++ b/src/routes/admin/management/backup.ts
@@ -10,7 +10,7 @@ import {
   restoreBackupByLocalFile,
   restoreBackupByUploadedFile,
   uploadBackupFile,
-} from "../../../controller/admin/user/backupController";
+} from "../../../controller/admin/management/backupController";
 import { FileSystemHelper } from "../../../helpers/fileSystemHelper";
 
 const storage = multer.diskStorage({
@@ -54,7 +54,7 @@ router.get("/uploaded/:filename", async (req: Request, res: Response) => {
 
 router.post(
   "/",
-  PermissionHelper.passCheckMiddleware("create", "user", "backup"),
+  PermissionHelper.passCheckMiddleware("create", "management", "backup"),
   async (req: Request, res: Response) => {
     await createManualBackup(req, res);
   }
@@ -62,7 +62,7 @@ router.post(
 
 router.post(
   "/generated/restore",
-  PermissionHelper.passCheckMiddleware("admin", "user", "backup"),
+  PermissionHelper.passCheckMiddleware("admin", "management", "backup"),
   async (req: Request, res: Response) => {
     await restoreBackupByLocalFile(req, res);
   }
@@ -70,7 +70,7 @@ router.post(
 
 router.post(
   "/uploaded/restore",
-  PermissionHelper.passCheckMiddleware("admin", "user", "backup"),
+  PermissionHelper.passCheckMiddleware("admin", "management", "backup"),
   async (req: Request, res: Response) => {
     await restoreBackupByUploadedFile(req, res);
   }
@@ -78,7 +78,7 @@ router.post(
 
 router.post(
   "/upload",
-  PermissionHelper.passCheckMiddleware("create", "user", "backup"),
+  PermissionHelper.passCheckMiddleware("create", "management", "backup"),
   upload.single("file"),
   async (req: Request, res: Response) => {
     await uploadBackupFile(req, res);
diff --git a/src/routes/admin/user/invite.ts b/src/routes/admin/management/invite.ts
similarity index 80%
rename from src/routes/admin/user/invite.ts
rename to src/routes/admin/management/invite.ts
index 814a13c..3f6f7d8 100644
--- a/src/routes/admin/user/invite.ts
+++ b/src/routes/admin/management/invite.ts
@@ -10,7 +10,7 @@ router.get("/", async (req: Request, res: Response) => {
 
 router.post(
   "/",
-  PermissionHelper.passCheckMiddleware("create", "user", "user"),
+  PermissionHelper.passCheckMiddleware("create", "management", "user"),
   async (req: Request, res: Response) => {
     await inviteUser(req, res);
   }
@@ -18,7 +18,7 @@ router.post(
 
 router.delete(
   "/:mail",
-  PermissionHelper.passCheckMiddleware("delete", "user", "user"),
+  PermissionHelper.passCheckMiddleware("delete", "management", "user"),
   async (req: Request, res: Response) => {
     await deleteInvite(req, res);
   }
diff --git a/src/routes/admin/user/role.ts b/src/routes/admin/management/role.ts
similarity index 75%
rename from src/routes/admin/user/role.ts
rename to src/routes/admin/management/role.ts
index c9f831c..1087920 100644
--- a/src/routes/admin/user/role.ts
+++ b/src/routes/admin/management/role.ts
@@ -8,7 +8,7 @@ import {
   getRolePermissions,
   updateRole,
   updateRolePermissions,
-} from "../../../controller/admin/user/roleController";
+} from "../../../controller/admin/management/roleController";
 
 var router = express.Router({ mergeParams: true });
 
@@ -26,7 +26,7 @@ router.get("/:id/permissions", async (req: Request, res: Response) => {
 
 router.post(
   "/",
-  PermissionHelper.passCheckMiddleware("create", "user", "role"),
+  PermissionHelper.passCheckMiddleware("create", "management", "role"),
   async (req: Request, res: Response) => {
     await createRole(req, res);
   }
@@ -34,7 +34,7 @@ router.post(
 
 router.patch(
   "/:id",
-  PermissionHelper.passCheckMiddleware("update", "user", "role"),
+  PermissionHelper.passCheckMiddleware("update", "management", "role"),
   async (req: Request, res: Response) => {
     await updateRole(req, res);
   }
@@ -42,7 +42,7 @@ router.patch(
 
 router.patch(
   "/:id/permissions",
-  PermissionHelper.passCheckMiddleware("admin", "user", "role"),
+  PermissionHelper.passCheckMiddleware("admin", "management", "role"),
   async (req: Request, res: Response) => {
     await updateRolePermissions(req, res);
   }
@@ -50,7 +50,7 @@ router.patch(
 
 router.delete(
   "/:id",
-  PermissionHelper.passCheckMiddleware("delete", "user", "role"),
+  PermissionHelper.passCheckMiddleware("delete", "management", "role"),
   async (req: Request, res: Response) => {
     await deleteRole(req, res);
   }
diff --git a/src/routes/admin/user/user.ts b/src/routes/admin/management/user.ts
similarity index 78%
rename from src/routes/admin/user/user.ts
rename to src/routes/admin/management/user.ts
index 693e8ea..3a419d6 100644
--- a/src/routes/admin/user/user.ts
+++ b/src/routes/admin/management/user.ts
@@ -9,7 +9,7 @@ import {
   updateUser,
   updateUserPermissions,
   updateUserRoles,
-} from "../../../controller/admin/user/userController";
+} from "../../../controller/admin/management/userController";
 import { inviteUser } from "../../../controller/inviteController";
 
 var router = express.Router({ mergeParams: true });
@@ -32,7 +32,7 @@ router.get("/:id/roles", async (req: Request, res: Response) => {
 
 router.patch(
   "/:id",
-  PermissionHelper.passCheckMiddleware("update", "user", "user"),
+  PermissionHelper.passCheckMiddleware("update", "management", "user"),
   async (req: Request, res: Response) => {
     await updateUser(req, res);
   }
@@ -40,7 +40,7 @@ router.patch(
 
 router.patch(
   "/:id/permissions",
-  PermissionHelper.passCheckMiddleware("admin", "user", "user"),
+  PermissionHelper.passCheckMiddleware("admin", "management", "user"),
   async (req: Request, res: Response) => {
     await updateUserPermissions(req, res);
   }
@@ -48,7 +48,7 @@ router.patch(
 
 router.patch(
   "/:id/roles",
-  PermissionHelper.passCheckMiddleware("update", "user", "user"),
+  PermissionHelper.passCheckMiddleware("update", "management", "user"),
   async (req: Request, res: Response) => {
     await updateUserRoles(req, res);
   }
@@ -56,7 +56,7 @@ router.patch(
 
 router.delete(
   "/:id",
-  PermissionHelper.passCheckMiddleware("delete", "user", "user"),
+  PermissionHelper.passCheckMiddleware("delete", "management", "user"),
   async (req: Request, res: Response) => {
     await deleteUser(req, res);
   }
diff --git a/src/routes/admin/user/webapi.ts b/src/routes/admin/management/webapi.ts
similarity index 77%
rename from src/routes/admin/user/webapi.ts
rename to src/routes/admin/management/webapi.ts
index 0d0e7ab..e8d2f87 100644
--- a/src/routes/admin/user/webapi.ts
+++ b/src/routes/admin/management/webapi.ts
@@ -9,7 +9,7 @@ import {
   getWebapiTokenById,
   updateWebapi,
   updateWebapiPermissions,
-} from "../../../controller/admin/user/webapiController";
+} from "../../../controller/admin/management/webapiController";
 
 var router = express.Router({ mergeParams: true });
 
@@ -31,7 +31,7 @@ router.get("/:id/permissions", async (req: Request, res: Response) => {
 
 router.post(
   "/",
-  PermissionHelper.passCheckMiddleware("create", "user", "webapi"),
+  PermissionHelper.passCheckMiddleware("create", "management", "webapi"),
   async (req: Request, res: Response) => {
     await createWebapi(req, res);
   }
@@ -39,7 +39,7 @@ router.post(
 
 router.patch(
   "/:id",
-  PermissionHelper.passCheckMiddleware("update", "user", "webapi"),
+  PermissionHelper.passCheckMiddleware("update", "management", "webapi"),
   async (req: Request, res: Response) => {
     await updateWebapi(req, res);
   }
@@ -47,7 +47,7 @@ router.patch(
 
 router.patch(
   "/:id/permissions",
-  PermissionHelper.passCheckMiddleware("admin", "user", "webapi"),
+  PermissionHelper.passCheckMiddleware("admin", "management", "webapi"),
   async (req: Request, res: Response) => {
     await updateWebapiPermissions(req, res);
   }
@@ -55,7 +55,7 @@ router.patch(
 
 router.delete(
   "/:id",
-  PermissionHelper.passCheckMiddleware("delete", "user", "webapi"),
+  PermissionHelper.passCheckMiddleware("delete", "management", "webapi"),
   async (req: Request, res: Response) => {
     await deleteWebapi(req, res);
   }
diff --git a/src/service/settings/awardService.ts b/src/service/configuration/awardService.ts
similarity index 95%
rename from src/service/settings/awardService.ts
rename to src/service/configuration/awardService.ts
index cdf95d8..223d676 100644
--- a/src/service/settings/awardService.ts
+++ b/src/service/configuration/awardService.ts
@@ -1,5 +1,5 @@
 import { dataSource } from "../../data-source";
-import { award } from "../../entity/settings/award";
+import { award } from "../../entity/configuration/award";
 import { member } from "../../entity/club/member/member";
 import InternalException from "../../exceptions/internalException";
 import DatabaseActionException from "../../exceptions/databaseActionException";
diff --git a/src/service/settings/calendarTypeService.ts b/src/service/configuration/calendarTypeService.ts
similarity index 96%
rename from src/service/settings/calendarTypeService.ts
rename to src/service/configuration/calendarTypeService.ts
index 74be65f..7d82ef4 100644
--- a/src/service/settings/calendarTypeService.ts
+++ b/src/service/configuration/calendarTypeService.ts
@@ -1,5 +1,5 @@
 import { dataSource } from "../../data-source";
-import { calendarType } from "../../entity/settings/calendarType";
+import { calendarType } from "../../entity/configuration/calendarType";
 import DatabaseActionException from "../../exceptions/databaseActionException";
 import InternalException from "../../exceptions/internalException";
 
diff --git a/src/service/settings/communicationTypeService.ts b/src/service/configuration/communicationTypeService.ts
similarity index 93%
rename from src/service/settings/communicationTypeService.ts
rename to src/service/configuration/communicationTypeService.ts
index fa71786..4ee9de0 100644
--- a/src/service/settings/communicationTypeService.ts
+++ b/src/service/configuration/communicationTypeService.ts
@@ -1,5 +1,5 @@
 import { dataSource } from "../../data-source";
-import { communicationType } from "../../entity/settings/communicationType";
+import { communicationType } from "../../entity/configuration/communicationType";
 import DatabaseActionException from "../../exceptions/databaseActionException";
 import InternalException from "../../exceptions/internalException";
 
diff --git a/src/service/settings/executivePositionService.ts b/src/service/configuration/executivePositionService.ts
similarity index 94%
rename from src/service/settings/executivePositionService.ts
rename to src/service/configuration/executivePositionService.ts
index ef161d3..6a2bf8d 100644
--- a/src/service/settings/executivePositionService.ts
+++ b/src/service/configuration/executivePositionService.ts
@@ -1,5 +1,5 @@
 import { dataSource } from "../../data-source";
-import { executivePosition } from "../../entity/settings/executivePosition";
+import { executivePosition } from "../../entity/configuration/executivePosition";
 import { memberExecutivePositions } from "../../entity/club/member/memberExecutivePositions";
 import InternalException from "../../exceptions/internalException";
 import DatabaseActionException from "../../exceptions/databaseActionException";
diff --git a/src/service/settings/membershipStatusService.ts b/src/service/configuration/membershipStatusService.ts
similarity index 94%
rename from src/service/settings/membershipStatusService.ts
rename to src/service/configuration/membershipStatusService.ts
index 317f788..ade5a53 100644
--- a/src/service/settings/membershipStatusService.ts
+++ b/src/service/configuration/membershipStatusService.ts
@@ -1,5 +1,5 @@
 import { dataSource } from "../../data-source";
-import { membershipStatus } from "../../entity/settings/membershipStatus";
+import { membershipStatus } from "../../entity/configuration/membershipStatus";
 import InternalException from "../../exceptions/internalException";
 import { membership } from "../../entity/club/member/membership";
 import DatabaseActionException from "../../exceptions/databaseActionException";
diff --git a/src/service/settings/newsletterConfigService.ts b/src/service/configuration/newsletterConfigService.ts
similarity index 94%
rename from src/service/settings/newsletterConfigService.ts
rename to src/service/configuration/newsletterConfigService.ts
index 104968b..64c4c7d 100644
--- a/src/service/settings/newsletterConfigService.ts
+++ b/src/service/configuration/newsletterConfigService.ts
@@ -1,5 +1,5 @@
 import { dataSource } from "../../data-source";
-import { newsletterConfig } from "../../entity/settings/newsletterConfig";
+import { newsletterConfig } from "../../entity/configuration/newsletterConfig";
 import { member } from "../../entity/club/member/member";
 import InternalException from "../../exceptions/internalException";
 import DatabaseActionException from "../../exceptions/databaseActionException";
diff --git a/src/service/settings/qualification.ts b/src/service/configuration/qualification.ts
similarity index 91%
rename from src/service/settings/qualification.ts
rename to src/service/configuration/qualification.ts
index 2d232d7..137bda2 100644
--- a/src/service/settings/qualification.ts
+++ b/src/service/configuration/qualification.ts
@@ -1,7 +1,7 @@
 import { dataSource } from "../../data-source";
 import { memberQualifications } from "../../entity/club/member/memberQualifications";
-import { qualification } from "../../entity/settings/qualification";
-import { user } from "../../entity/user/user";
+import { qualification } from "../../entity/configuration/qualification";
+import { user } from "../../entity/management/user";
 import DatabaseActionException from "../../exceptions/databaseActionException";
 import InternalException from "../../exceptions/internalException";
 
diff --git a/src/service/settings/queryStoreService.ts b/src/service/configuration/queryStoreService.ts
similarity index 95%
rename from src/service/settings/queryStoreService.ts
rename to src/service/configuration/queryStoreService.ts
index 5a4edcb..46bbc4c 100644
--- a/src/service/settings/queryStoreService.ts
+++ b/src/service/configuration/queryStoreService.ts
@@ -1,5 +1,5 @@
 import { dataSource } from "../../data-source";
-import { query } from "../../entity/settings/query";
+import { query } from "../../entity/configuration/query";
 import DatabaseActionException from "../../exceptions/databaseActionException";
 import InternalException from "../../exceptions/internalException";
 
diff --git a/src/service/settings/salutationService.ts b/src/service/configuration/salutationService.ts
similarity index 94%
rename from src/service/settings/salutationService.ts
rename to src/service/configuration/salutationService.ts
index 2337748..f8a020e 100644
--- a/src/service/settings/salutationService.ts
+++ b/src/service/configuration/salutationService.ts
@@ -1,5 +1,5 @@
 import { dataSource } from "../../data-source";
-import { salutation } from "../../entity/settings/salutation";
+import { salutation } from "../../entity/configuration/salutation";
 import DatabaseActionException from "../../exceptions/databaseActionException";
 import InternalException from "../../exceptions/internalException";
 
diff --git a/src/service/settings/templateService.ts b/src/service/configuration/templateService.ts
similarity index 95%
rename from src/service/settings/templateService.ts
rename to src/service/configuration/templateService.ts
index e605ab9..dd3e008 100644
--- a/src/service/settings/templateService.ts
+++ b/src/service/configuration/templateService.ts
@@ -1,5 +1,5 @@
 import { dataSource } from "../../data-source";
-import { template } from "../../entity/settings/template";
+import { template } from "../../entity/configuration/template";
 import { member } from "../../entity/club/member/member";
 import InternalException from "../../exceptions/internalException";
 import DatabaseActionException from "../../exceptions/databaseActionException";
diff --git a/src/service/settings/templateUsageService.ts b/src/service/configuration/templateUsageService.ts
similarity index 95%
rename from src/service/settings/templateUsageService.ts
rename to src/service/configuration/templateUsageService.ts
index cfa1d25..ce6b508 100644
--- a/src/service/settings/templateUsageService.ts
+++ b/src/service/configuration/templateUsageService.ts
@@ -1,5 +1,5 @@
 import { dataSource } from "../../data-source";
-import { templateUsage } from "../../entity/settings/templateUsage";
+import { templateUsage } from "../../entity/configuration/templateUsage";
 import DatabaseActionException from "../../exceptions/databaseActionException";
 import InternalException from "../../exceptions/internalException";
 
diff --git a/src/service/user/inviteService.ts b/src/service/management/inviteService.ts
similarity index 95%
rename from src/service/user/inviteService.ts
rename to src/service/management/inviteService.ts
index b2cd07a..573975a 100644
--- a/src/service/user/inviteService.ts
+++ b/src/service/management/inviteService.ts
@@ -1,5 +1,5 @@
 import { dataSource } from "../../data-source";
-import { invite } from "../../entity/user/invite";
+import { invite } from "../../entity/management/invite";
 import DatabaseActionException from "../../exceptions/databaseActionException";
 import InternalException from "../../exceptions/internalException";
 
diff --git a/src/service/user/rolePermissionService.ts b/src/service/management/rolePermissionService.ts
similarity index 90%
rename from src/service/user/rolePermissionService.ts
rename to src/service/management/rolePermissionService.ts
index 1cfe6f2..c96c73b 100644
--- a/src/service/user/rolePermissionService.ts
+++ b/src/service/management/rolePermissionService.ts
@@ -1,6 +1,6 @@
 import { dataSource } from "../../data-source";
-import { rolePermission } from "../../entity/user/role_permission";
-import { userPermission } from "../../entity/user/user_permission";
+import { rolePermission } from "../../entity/management/role_permission";
+import { userPermission } from "../../entity/management/user_permission";
 import DatabaseActionException from "../../exceptions/databaseActionException";
 import InternalException from "../../exceptions/internalException";
 
diff --git a/src/service/user/roleService.ts b/src/service/management/roleService.ts
similarity index 95%
rename from src/service/user/roleService.ts
rename to src/service/management/roleService.ts
index 7601063..c3a2dcd 100644
--- a/src/service/user/roleService.ts
+++ b/src/service/management/roleService.ts
@@ -1,5 +1,5 @@
 import { dataSource } from "../../data-source";
-import { role } from "../../entity/user/role";
+import { role } from "../../entity/management/role";
 import DatabaseActionException from "../../exceptions/databaseActionException";
 import InternalException from "../../exceptions/internalException";
 
diff --git a/src/service/user/userPermissionService.ts b/src/service/management/userPermissionService.ts
similarity index 91%
rename from src/service/user/userPermissionService.ts
rename to src/service/management/userPermissionService.ts
index 0dee9da..0be67e0 100644
--- a/src/service/user/userPermissionService.ts
+++ b/src/service/management/userPermissionService.ts
@@ -1,5 +1,5 @@
 import { dataSource } from "../../data-source";
-import { userPermission } from "../../entity/user/user_permission";
+import { userPermission } from "../../entity/management/user_permission";
 import DatabaseActionException from "../../exceptions/databaseActionException";
 import InternalException from "../../exceptions/internalException";
 
diff --git a/src/service/user/userService.ts b/src/service/management/userService.ts
similarity index 97%
rename from src/service/user/userService.ts
rename to src/service/management/userService.ts
index 2abb7f7..8fe4dd4 100644
--- a/src/service/user/userService.ts
+++ b/src/service/management/userService.ts
@@ -1,6 +1,6 @@
 import { dataSource } from "../../data-source";
-import { role } from "../../entity/user/role";
-import { user } from "../../entity/user/user";
+import { role } from "../../entity/management/role";
+import { user } from "../../entity/management/user";
 import DatabaseActionException from "../../exceptions/databaseActionException";
 import InternalException from "../../exceptions/internalException";
 
diff --git a/src/service/user/webapiPermissionService.ts b/src/service/management/webapiPermissionService.ts
similarity index 91%
rename from src/service/user/webapiPermissionService.ts
rename to src/service/management/webapiPermissionService.ts
index ab57582..114d9db 100644
--- a/src/service/user/webapiPermissionService.ts
+++ b/src/service/management/webapiPermissionService.ts
@@ -1,5 +1,5 @@
 import { dataSource } from "../../data-source";
-import { webapiPermission } from "../../entity/user/webapi_permission";
+import { webapiPermission } from "../../entity/management/webapi_permission";
 import DatabaseActionException from "../../exceptions/databaseActionException";
 import InternalException from "../../exceptions/internalException";
 
diff --git a/src/service/user/webapiService.ts b/src/service/management/webapiService.ts
similarity index 97%
rename from src/service/user/webapiService.ts
rename to src/service/management/webapiService.ts
index 571a013..eeae20d 100644
--- a/src/service/user/webapiService.ts
+++ b/src/service/management/webapiService.ts
@@ -1,5 +1,5 @@
 import { dataSource } from "../../data-source";
-import { webapi } from "../../entity/user/webapi";
+import { webapi } from "../../entity/management/webapi";
 import DatabaseActionException from "../../exceptions/databaseActionException";
 import InternalException from "../../exceptions/internalException";
 
diff --git a/src/type/permissionTypes.ts b/src/type/permissionTypes.ts
index e3d3105..a031c0e 100644
--- a/src/type/permissionTypes.ts
+++ b/src/type/permissionTypes.ts
@@ -1,4 +1,4 @@
-export type PermissionSection = "club" | "settings" | "user";
+export type PermissionSection = "club" | "configuration" | "management";
 
 export type PermissionModule =
   | "member"
@@ -43,7 +43,7 @@ export type SectionsAndModulesObject = {
   [section in PermissionSection]: Array<PermissionModule>;
 };
 
-export const permissionSections: Array<PermissionSection> = ["club", "settings", "user"];
+export const permissionSections: Array<PermissionSection> = ["club", "configuration", "management"];
 export const permissionModules: Array<PermissionModule> = [
   "member",
   "calendar",
@@ -69,7 +69,7 @@ export const permissionModules: Array<PermissionModule> = [
 export const permissionTypes: Array<PermissionType> = ["read", "create", "update", "delete"];
 export const sectionsAndModules: SectionsAndModulesObject = {
   club: ["member", "calendar", "newsletter", "protocol", "query"],
-  settings: [
+  configuration: [
     "qualification",
     "award",
     "executive_position",
@@ -82,5 +82,5 @@ export const sectionsAndModules: SectionsAndModulesObject = {
     "template_usage",
     "newsletter_config",
   ],
-  user: ["user", "role", "webapi", "backup"],
+  management: ["user", "role", "webapi", "backup"],
 };
diff --git a/src/viewmodel/admin/club/calendar.models.ts b/src/viewmodel/admin/club/calendar.models.ts
index 77a9622..cda3277 100644
--- a/src/viewmodel/admin/club/calendar.models.ts
+++ b/src/viewmodel/admin/club/calendar.models.ts
@@ -1,4 +1,4 @@
-import { CalendarTypeViewModel } from "../settings/calendarType.models";
+import { CalendarTypeViewModel } from "../configuration/calendarType.models";
 
 export interface CalendarViewModel {
   id: string;
diff --git a/src/viewmodel/admin/club/member/communication.models.ts b/src/viewmodel/admin/club/member/communication.models.ts
index b6c0b29..38235eb 100644
--- a/src/viewmodel/admin/club/member/communication.models.ts
+++ b/src/viewmodel/admin/club/member/communication.models.ts
@@ -1,4 +1,4 @@
-import { CommunicationTypeViewModel } from "../../settings/communicationType.models";
+import { CommunicationTypeViewModel } from "../../configuration/communicationType.models";
 
 export interface CommunicationViewModel {
   id: number;
diff --git a/src/viewmodel/admin/club/member/member.models.ts b/src/viewmodel/admin/club/member/member.models.ts
index 69f1bdf..2a0f37b 100644
--- a/src/viewmodel/admin/club/member/member.models.ts
+++ b/src/viewmodel/admin/club/member/member.models.ts
@@ -1,4 +1,4 @@
-import { SalutationViewModel } from "../../settings/salutation.models";
+import { SalutationViewModel } from "../../configuration/salutation.models";
 import { CommunicationViewModel } from "./communication.models";
 import { MembershipViewModel } from "./membership.models";
 
diff --git a/src/viewmodel/admin/club/newsletter/newsletter.models.ts b/src/viewmodel/admin/club/newsletter/newsletter.models.ts
index 9cf9bb6..ea42e46 100644
--- a/src/viewmodel/admin/club/newsletter/newsletter.models.ts
+++ b/src/viewmodel/admin/club/newsletter/newsletter.models.ts
@@ -1,4 +1,4 @@
-import { QueryStoreViewModel } from "../../settings/queryStore.models";
+import { QueryStoreViewModel } from "../../configuration/queryStore.models";
 
 export interface NewsletterViewModel {
   id: number;
diff --git a/src/viewmodel/admin/settings/award.models.ts b/src/viewmodel/admin/configuration/award.models.ts
similarity index 100%
rename from src/viewmodel/admin/settings/award.models.ts
rename to src/viewmodel/admin/configuration/award.models.ts
diff --git a/src/viewmodel/admin/settings/calendarType.models.ts b/src/viewmodel/admin/configuration/calendarType.models.ts
similarity index 100%
rename from src/viewmodel/admin/settings/calendarType.models.ts
rename to src/viewmodel/admin/configuration/calendarType.models.ts
diff --git a/src/viewmodel/admin/settings/communicationType.models.ts b/src/viewmodel/admin/configuration/communicationType.models.ts
similarity index 100%
rename from src/viewmodel/admin/settings/communicationType.models.ts
rename to src/viewmodel/admin/configuration/communicationType.models.ts
diff --git a/src/viewmodel/admin/settings/executivePosition.models.ts b/src/viewmodel/admin/configuration/executivePosition.models.ts
similarity index 100%
rename from src/viewmodel/admin/settings/executivePosition.models.ts
rename to src/viewmodel/admin/configuration/executivePosition.models.ts
diff --git a/src/viewmodel/admin/settings/membershipStatus.models.ts b/src/viewmodel/admin/configuration/membershipStatus.models.ts
similarity index 100%
rename from src/viewmodel/admin/settings/membershipStatus.models.ts
rename to src/viewmodel/admin/configuration/membershipStatus.models.ts
diff --git a/src/viewmodel/admin/settings/newsletterConfig.models.ts b/src/viewmodel/admin/configuration/newsletterConfig.models.ts
similarity index 100%
rename from src/viewmodel/admin/settings/newsletterConfig.models.ts
rename to src/viewmodel/admin/configuration/newsletterConfig.models.ts
diff --git a/src/viewmodel/admin/settings/qualification.models.ts b/src/viewmodel/admin/configuration/qualification.models.ts
similarity index 100%
rename from src/viewmodel/admin/settings/qualification.models.ts
rename to src/viewmodel/admin/configuration/qualification.models.ts
diff --git a/src/viewmodel/admin/settings/queryStore.models.ts b/src/viewmodel/admin/configuration/queryStore.models.ts
similarity index 100%
rename from src/viewmodel/admin/settings/queryStore.models.ts
rename to src/viewmodel/admin/configuration/queryStore.models.ts
diff --git a/src/viewmodel/admin/settings/salutation.models.ts b/src/viewmodel/admin/configuration/salutation.models.ts
similarity index 100%
rename from src/viewmodel/admin/settings/salutation.models.ts
rename to src/viewmodel/admin/configuration/salutation.models.ts
diff --git a/src/viewmodel/admin/settings/template.models.ts b/src/viewmodel/admin/configuration/template.models.ts
similarity index 100%
rename from src/viewmodel/admin/settings/template.models.ts
rename to src/viewmodel/admin/configuration/template.models.ts
diff --git a/src/viewmodel/admin/settings/templateUsage.models.ts b/src/viewmodel/admin/configuration/templateUsage.models.ts
similarity index 100%
rename from src/viewmodel/admin/settings/templateUsage.models.ts
rename to src/viewmodel/admin/configuration/templateUsage.models.ts
diff --git a/src/viewmodel/admin/user/invite.models.ts b/src/viewmodel/admin/management/invite.models.ts
similarity index 100%
rename from src/viewmodel/admin/user/invite.models.ts
rename to src/viewmodel/admin/management/invite.models.ts
diff --git a/src/viewmodel/admin/user/role.models.ts b/src/viewmodel/admin/management/role.models.ts
similarity index 100%
rename from src/viewmodel/admin/user/role.models.ts
rename to src/viewmodel/admin/management/role.models.ts
diff --git a/src/viewmodel/admin/user/user.models.ts b/src/viewmodel/admin/management/user.models.ts
similarity index 100%
rename from src/viewmodel/admin/user/user.models.ts
rename to src/viewmodel/admin/management/user.models.ts
diff --git a/src/viewmodel/admin/user/webapi.models.ts b/src/viewmodel/admin/management/webapi.models.ts
similarity index 100%
rename from src/viewmodel/admin/user/webapi.models.ts
rename to src/viewmodel/admin/management/webapi.models.ts