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";

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";

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";

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 {

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 {

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 {

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";

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 {

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";

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";

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";

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";

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";

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";
 

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";

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 {

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 { user } from "../../../entity/management/user";
-import { userPermission } from "../../../entity/user/user_permission";
+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";

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 {

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";
 

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";
 

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 CalendarTypeService from "../../../service/configuration/calendarTypeService";
-import CalendarTypeFactory from "../../../factory/admin/settings/calendarType";
+import CalendarTypeFactory from "../../../factory/admin/configuration/calendarType";
-import { CreateCalendarCommand, DeleteCalendarCommand, UpdateCalendarCommand } from "../../../command/club/calendar/calendarCommand";
+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";
+} from "../../../command/configuration/calendarType/calendarTypeCommand";
-import CalendarTypeCommandHandler from "../../../command/settings/calendarType/calendarTypeCommandHandler";
+import CalendarTypeCommandHandler from "../../../command/configuration/calendarType/calendarTypeCommandHandler";
 
 /**
  * @description get all calendar items

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";

src/controller/admin/configuration/awardController.ts

@@ -1,8 +1,12 @@
 import { Request, Response } from "express";
-import AwardService from "../../../service/settings/awardService";
+import AwardService from "../../../service/configuration/awardService";
-import AwardFactory from "../../../factory/admin/settings/award";
+import AwardFactory from "../../../factory/admin/configuration/award";
-import { CreateAwardCommand, DeleteAwardCommand, UpdateAwardCommand } from "../../../command/settings/award/awardCommand";
+import {
-import AwardCommandHandler from "../../../command/settings/award/awardCommandHandler";
+  CreateAwardCommand,
+  DeleteAwardCommand,
+  UpdateAwardCommand,
+} from "../../../command/configuration/award/awardCommand";
+import AwardCommandHandler from "../../../command/configuration/award/awardCommandHandler";
 
 /**
  * @description get all awards

src/controller/admin/configuration/communicationTypeController.ts

@@ -1,13 +1,13 @@
 import { Request, Response } from "express";
-import CommunicationTypeService from "../../../service/settings/communicationTypeService";
+import CommunicationTypeService from "../../../service/configuration/communicationTypeService";
-import CommunicationTypeFactory from "../../../factory/admin/settings/communicationType";
+import CommunicationTypeFactory from "../../../factory/admin/configuration/communicationType";
 import CommunicationService from "../../../service/club/member/communicationService";
 import {
   CreateCommunicationTypeCommand,
   DeleteCommunicationTypeCommand,
   UpdateCommunicationTypeCommand,
-} from "../../../command/settings/communicationType/communicationTypeCommand";
+} from "../../../command/configuration/communicationType/communicationTypeCommand";
-import CommunicationTypeCommandHandler from "../../../command/settings/communicationType/communicationTypeCommandHandler";
+import CommunicationTypeCommandHandler from "../../../command/configuration/communicationType/communicationTypeCommandHandler";
 
 /**
  * @description get all communicationTypes

src/controller/admin/configuration/executivePositionController.ts

@@ -1,12 +1,12 @@
 import { Request, Response } from "express";
-import ExecutivePositionService from "../../../service/settings/executivePositionService";
+import ExecutivePositionService from "../../../service/configuration/executivePositionService";
-import ExecutivePositionFactory from "../../../factory/admin/settings/executivePosition";
+import ExecutivePositionFactory from "../../../factory/admin/configuration/executivePosition";
 import {
   CreateExecutivePositionCommand,
   DeleteExecutivePositionCommand,
   UpdateExecutivePositionCommand,
-} from "../../../command/settings/executivePosition/executivePositionCommand";
+} from "../../../command/configuration/executivePosition/executivePositionCommand";
-import ExecutivePositionCommandHandler from "../../../command/settings/executivePosition/executivePositionCommandHandler";
+import ExecutivePositionCommandHandler from "../../../command/configuration/executivePosition/executivePositionCommandHandler";
 
 /**
  * @description get all executivePositions

src/controller/admin/configuration/membershipStatusController.ts

@@ -1,12 +1,12 @@
 import { Request, Response } from "express";
-import MembershipStatusService from "../../../service/settings/membershipStatusService";
+import MembershipStatusService from "../../../service/configuration/membershipStatusService";
-import MembershipStatusFactory from "../../../factory/admin/settings/membershipStatus";
+import MembershipStatusFactory from "../../../factory/admin/configuration/membershipStatus";
 import {
   CreateMembershipStatusCommand,
   DeleteMembershipStatusCommand,
   UpdateMembershipStatusCommand,
-} from "../../../command/settings/membershipStatus/membershipStatusCommand";
+} from "../../../command/configuration/membershipStatus/membershipStatusCommand";
-import MembershipStatusCommandHandler from "../../../command/settings/membershipStatus/membershipStatusCommandHandler";
+import MembershipStatusCommandHandler from "../../../command/configuration/membershipStatus/membershipStatusCommandHandler";
 
 /**
  * @description get all membershipStatus

src/controller/admin/configuration/newsletterConfigController.ts

@@ -1,11 +1,11 @@
 import { Request, Response } from "express";
-import NewsletterConfigService from "../../../service/settings/newsletterConfigService";
+import NewsletterConfigService from "../../../service/configuration/newsletterConfigService";
-import NewsletterConfigFactory from "../../../factory/admin/settings/newsletterConfig";
+import NewsletterConfigFactory from "../../../factory/admin/configuration/newsletterConfig";
-import NewsletterConfigCommandHandler from "../../../command/settings/newsletterConfig/newsletterConfigCommandHandler";
+import NewsletterConfigCommandHandler from "../../../command/configuration/newsletterConfig/newsletterConfigCommandHandler";
 import {
   DeleteNewsletterConfigCommand,
   SetNewsletterConfigCommand,
-} from "../../../command/settings/newsletterConfig/newsletterConfigCommand";
+} from "../../../command/configuration/newsletterConfig/newsletterConfigCommand";
 
 /**
  * @description get all newsletterConfigs

src/controller/admin/configuration/qualificationController.ts

@@ -1,12 +1,12 @@
 import { Request, Response } from "express";
-import QualificationService from "../../../service/settings/qualification";
+import QualificationService from "../../../service/configuration/qualification";
-import QualificationFactory from "../../../factory/admin/settings/qualification";
+import QualificationFactory from "../../../factory/admin/configuration/qualification";
 import {
   CreateQualificationCommand,
   DeleteQualificationCommand,
   UpdateQualificationCommand,
-} from "../../../command/settings/qualification/qualificationCommand";
+} from "../../../command/configuration/qualification/qualificationCommand";
-import QualificationCommandHandler from "../../../command/settings/qualification/qualificationCommandHandler";
+import QualificationCommandHandler from "../../../command/configuration/qualification/qualificationCommandHandler";
 
 /**
  * @description get all qualifications

src/controller/admin/configuration/queryStoreController.ts

@@ -1,12 +1,12 @@
 import { Request, Response } from "express";
-import QueryStoreFactory from "../../../factory/admin/settings/queryStore";
+import QueryStoreFactory from "../../../factory/admin/configuration/queryStore";
-import QueryStoreService from "../../../service/settings/queryStoreService";
+import QueryStoreService from "../../../service/configuration/queryStoreService";
 import {
   CreateQueryStoreCommand,
   DeleteQueryStoreCommand,
   UpdateQueryStoreCommand,
-} from "../../../command/settings/queryStore/queryStoreCommand";
+} from "../../../command/configuration/queryStore/queryStoreCommand";
-import QueryStoreCommandHandler from "../../../command/settings/queryStore/queryStoreCommandHandler";
+import QueryStoreCommandHandler from "../../../command/configuration/queryStore/queryStoreCommandHandler";
 
 /**
  * @description get all queryStores

src/controller/admin/configuration/salutationController.ts

@@ -1,12 +1,12 @@
 import { Request, Response } from "express";
-import SalutationService from "../../../service/settings/salutationService";
+import SalutationService from "../../../service/configuration/salutationService";
-import SalutationFactory from "../../../factory/admin/settings/salutation";
+import SalutationFactory from "../../../factory/admin/configuration/salutation";
 import {
   CreateSalutationCommand,
   DeleteSalutationCommand,
   UpdateSalutationCommand,
-} from "../../../command/settings/salutation/salutationCommand";
+} from "../../../command/configuration/salutation/salutationCommand";
-import SalutationCommandHandler from "../../../command/settings/salutation/salutationCommandHandler";
+import SalutationCommandHandler from "../../../command/configuration/salutation/salutationCommandHandler";
 
 /**
  * @description get all salutations

src/controller/admin/configuration/templateController.ts

@@ -1,8 +1,12 @@
 import { Request, Response } from "express";
-import TemplateService from "../../../service/settings/templateService";
+import TemplateService from "../../../service/configuration/templateService";
-import TemplateFactory from "../../../factory/admin/settings/template";
+import TemplateFactory from "../../../factory/admin/configuration/template";
-import { CreateTemplateCommand, DeleteTemplateCommand, UpdateTemplateCommand } from "../../../command/settings/template/templateCommand";
+import {
-import TemplateCommandHandler from "../../../command/settings/template/templateCommandHandler";
+  CreateTemplateCommand,
+  DeleteTemplateCommand,
+  UpdateTemplateCommand,
+} from "../../../command/configuration/template/templateCommand";
+import TemplateCommandHandler from "../../../command/configuration/template/templateCommandHandler";
 
 /**
  * @description get all templates

src/controller/admin/configuration/templateUsageController.ts

@@ -1,8 +1,8 @@
 import { Request, Response } from "express";
-import TemplateUsageService from "../../../service/settings/templateUsageService";
+import TemplateUsageService from "../../../service/configuration/templateUsageService";
-import TemplateUsageFactory from "../../../factory/admin/settings/templateUsage";
+import TemplateUsageFactory from "../../../factory/admin/configuration/templateUsage";
-import { UpdateTemplateUsageCommand } from "../../../command/settings/templateUsage/templateUsageCommand";
+import { UpdateTemplateUsageCommand } from "../../../command/configuration/templateUsage/templateUsageCommand";
-import TemplateUsageCommandHandler from "../../../command/settings/templateUsage/templateUsageCommandHandler";
+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);

src/controller/admin/management/roleController.ts

@@ -1,12 +1,12 @@
 import { Request, Response } from "express";
-import RoleService from "../../../service/user/roleService";
+import RoleService from "../../../service/management/roleService";
-import RoleFactory from "../../../factory/admin/user/role";
+import RoleFactory from "../../../factory/admin/management/role";
-import RolePermissionService from "../../../service/user/rolePermissionService";
+import RolePermissionService from "../../../service/management/rolePermissionService";
 import PermissionHelper from "../../../helpers/permissionHelper";
-import { CreateRoleCommand, DeleteRoleCommand, UpdateRoleCommand } from "../../../command/user/role/roleCommand";
+import { CreateRoleCommand, DeleteRoleCommand, UpdateRoleCommand } from "../../../command/management/role/roleCommand";
-import RoleCommandHandler from "../../../command/user/role/roleCommandHandler";
+import RoleCommandHandler from "../../../command/management/role/roleCommandHandler";
-import { UpdateRolePermissionsCommand } from "../../../command/user/role/rolePermissionCommand";
+import { UpdateRolePermissionsCommand } from "../../../command/management/role/rolePermissionCommand";
-import RolePermissionCommandHandler from "../../../command/user/role/rolePermissionCommandHandler";
+import RolePermissionCommandHandler from "../../../command/management/role/rolePermissionCommandHandler";
 
 /**
  * @description get All roles

src/controller/admin/management/userController.ts

@@ -1,15 +1,19 @@
 import { Request, Response } from "express";
-import UserService from "../../../service/user/userService";
+import UserService from "../../../service/management/userService";
-import UserFactory from "../../../factory/admin/user/user";
+import UserFactory from "../../../factory/admin/management/user";
-import UserPermissionService from "../../../service/user/userPermissionService";
+import UserPermissionService from "../../../service/management/userPermissionService";
 import PermissionHelper from "../../../helpers/permissionHelper";
-import RoleFactory from "../../../factory/admin/user/role";
+import RoleFactory from "../../../factory/admin/management/role";
-import { DeleteUserCommand, UpdateUserCommand, UpdateUserRolesCommand } from "../../../command/user/user/userCommand";
+import {
-import UserCommandHandler from "../../../command/user/user/userCommandHandler";
+  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 { UpdateUserPermissionsCommand } from "../../../command/management/user/userPermissionCommand";
-import UserPermissionCommandHandler from "../../../command/user/user/userPermissionCommandHandler";
+import UserPermissionCommandHandler from "../../../command/management/user/userPermissionCommandHandler";
 import BadRequestException from "../../../exceptions/badRequestException";
 
 /**

src/controller/admin/management/webapiController.ts

@@ -1,16 +1,16 @@
 import { Request, Response } from "express";
-import WebapiService from "../../../service/user/webapiService";
+import WebapiService from "../../../service/management/webapiService";
-import ApiFactory from "../../../factory/admin/user/webapi";
+import ApiFactory from "../../../factory/admin/management/webapi";
-import WebapiPermissionService from "../../../service/user/webapiPermissionService";
+import WebapiPermissionService from "../../../service/management/webapiPermissionService";
 import PermissionHelper from "../../../helpers/permissionHelper";
 import {
   CreateWebapiCommand,
   DeleteWebapiCommand,
   UpdateWebapiCommand,
-} from "../../../command/user/webapi/webapiCommand";
+} from "../../../command/management/webapi/webapiCommand";
-import WebapiCommandHandler from "../../../command/user/webapi/webapiCommandHandler";
+import WebapiCommandHandler from "../../../command/management/webapi/webapiCommandHandler";
-import { UpdateWebapiPermissionsCommand } from "../../../command/user/webapi/webapiPermissionCommand";
+import { UpdateWebapiPermissionsCommand } from "../../../command/management/webapi/webapiPermissionCommand";
-import WebapiPermissionCommandHandler from "../../../command/user/webapi/webapiPermissionCommandHandler";
+import WebapiPermissionCommandHandler from "../../../command/management/webapi/webapiPermissionCommandHandler";
 import { JWTHelper } from "../../../helpers/jwtHelper";
 import { CLUB_NAME } from "../../../env.defaults";
 import { StringHelper } from "../../../helpers/stringHelper";

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";

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 { CreateUserCommand } from "../command/management/user/userCommand";
-import UserCommandHandler from "../command/user/user/userCommandHandler";
+import UserCommandHandler from "../command/management/user/userCommandHandler";
-import { CreateInviteCommand, DeleteInviteCommand } from "../command/user/user/inviteCommand";
+import { CreateInviteCommand, DeleteInviteCommand } from "../command/management/user/inviteCommand";
-import InviteCommandHandler from "../command/user/user/inviteCommandHandler";
+import InviteCommandHandler from "../command/management/user/inviteCommandHandler";
 import MailHelper from "../helpers/mailHelper";
-import InviteService from "../service/user/inviteService";
+import InviteService from "../service/management/inviteService";
-import UserService from "../service/user/userService";
+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 { CreateUserPermissionCommand } from "../command/management/user/userPermissionCommand";
-import UserPermissionCommandHandler from "../command/user/user/userPermissionCommandHandler";
+import UserPermissionCommandHandler from "../command/management/user/userPermissionCommandHandler";
-import InviteFactory from "../factory/admin/user/invite";
+import InviteFactory from "../factory/admin/management/invite";
 
 /**
  * @description get all invites

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";

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 RolePermissionService from "../service/management/rolePermissionService";
-import UserPermissionService from "../service/user/userPermissionService";
+import UserPermissionService from "../service/management/userPermissionService";
-import { UpdateUserSecretCommand } from "../command/user/user/userCommand";
+import { UpdateUserSecretCommand } from "../command/management/user/userCommand";
-import UserCommandHandler from "../command/user/user/userCommandHandler";
+import UserCommandHandler from "../command/management/user/userCommandHandler";
 
 /**
  * @description request totp reset

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 UserService from "../service/management/userService";
-import UserFactory from "../factory/admin/user/user";
+import UserFactory from "../factory/admin/management/user";
-import { TransferUserOwnerCommand, UpdateUserCommand } from "../command/user/user/userCommand";
+import { TransferUserOwnerCommand, UpdateUserCommand } from "../command/management/user/userCommand";
-import UserCommandHandler from "../command/user/user/userCommandHandler";
+import UserCommandHandler from "../command/management/user/userCommandHandler";
 import ForbiddenRequestException from "../exceptions/forbiddenRequestException";
 
 /**

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

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 { invite } from "./entity/management/invite";
-import { userPermission } from "./entity/user/user_permission";
+import { userPermission } from "./entity/management/user_permission";
-import { role } from "./entity/user/role";
+import { role } from "./entity/management/role";
-import { rolePermission } from "./entity/user/role_permission";
+import { rolePermission } from "./entity/management/role_permission";
-import { award } from "./entity/settings/award";
+import { award } from "./entity/configuration/award";
 import { communication } from "./entity/club/member/communication";
-import { communicationType } from "./entity/settings/communicationType";
+import { communicationType } from "./entity/configuration/communicationType";
-import { executivePosition } from "./entity/settings/executivePosition";
+import { executivePosition } from "./entity/configuration/executivePosition";
-import { membershipStatus } from "./entity/settings/membershipStatus";
+import { membershipStatus } from "./entity/configuration/membershipStatus";
-import { qualification } from "./entity/settings/qualification";
+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 { template } from "./entity/configuration/template";
-import { templateUsage } from "./entity/settings/templateUsage";
+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 { newsletterConfig } from "./entity/configuration/newsletterConfig";
-import { webapi } from "./entity/user/webapi";
+import { webapi } from "./entity/management/webapi";
-import { webapiPermission } from "./entity/user/webapi_permission";
+import { webapiPermission } from "./entity/management/webapi_permission";
-import { salutation } from "./entity/settings/salutation";
+import { salutation } from "./entity/configuration/salutation";
 
 import { BackupAndResetDatabase1738166124200 } from "./migrations/1738166124200-BackupAndResetDatabase";
 import { CreateSchema1738166167472 } from "./migrations/1738166167472-CreateSchema";

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()

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 {

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()

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()

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()

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()

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()

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 {

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()

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 {
   /**

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 {
   /**

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";

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 {
   /**

src/factory/admin/configuration/award.ts

@@ -1,5 +1,5 @@
-import { award } from "../../../entity/settings/award";
+import { award } from "../../../entity/configuration/award";
-import { AwardViewModel } from "../../../viewmodel/admin/settings/award.models";
+import { AwardViewModel } from "../../../viewmodel/admin/configuration/award.models";
 
 export default abstract class AwardFactory {
   /**

src/factory/admin/configuration/calendarType.ts

@@ -1,5 +1,5 @@
-import { calendarType } from "../../../entity/settings/calendarType";
+import { calendarType } from "../../../entity/configuration/calendarType";
-import { CalendarTypeViewModel } from "../../../viewmodel/admin/settings/calendarType.models";
+import { CalendarTypeViewModel } from "../../../viewmodel/admin/configuration/calendarType.models";
 
 export default abstract class CalendarTypeFactory {
   /**

src/factory/admin/configuration/communicationType.ts

@@ -1,5 +1,5 @@
-import { communicationType } from "../../../entity/settings/communicationType";
+import { communicationType } from "../../../entity/configuration/communicationType";
-import { CommunicationTypeViewModel } from "../../../viewmodel/admin/settings/communicationType.models";
+import { CommunicationTypeViewModel } from "../../../viewmodel/admin/configuration/communicationType.models";
 
 export default abstract class CommunicationTypeFactory {
   /**

src/factory/admin/configuration/executivePosition.ts

@@ -1,5 +1,5 @@
-import { executivePosition } from "../../../entity/settings/executivePosition";
+import { executivePosition } from "../../../entity/configuration/executivePosition";
-import { ExecutivePositionViewModel } from "../../../viewmodel/admin/settings/executivePosition.models";
+import { ExecutivePositionViewModel } from "../../../viewmodel/admin/configuration/executivePosition.models";
 
 export default abstract class ExecutivePositionFactory {
   /**

src/factory/admin/configuration/membershipStatus.ts

@@ -1,5 +1,5 @@
-import { membershipStatus } from "../../../entity/settings/membershipStatus";
+import { membershipStatus } from "../../../entity/configuration/membershipStatus";
-import { MembershipStatusViewModel } from "../../../viewmodel/admin/settings/membershipStatus.models";
+import { MembershipStatusViewModel } from "../../../viewmodel/admin/configuration/membershipStatus.models";
 
 export default abstract class MembershipStatusFactory {
   /**

src/factory/admin/configuration/newsletterConfig.ts

@@ -1,5 +1,5 @@
-import { newsletterConfig } from "../../../entity/settings/newsletterConfig";
+import { newsletterConfig } from "../../../entity/configuration/newsletterConfig";
-import { NewsletterConfigViewModel } from "../../../viewmodel/admin/settings/newsletterConfig.models";
+import { NewsletterConfigViewModel } from "../../../viewmodel/admin/configuration/newsletterConfig.models";
 import CommunicationTypeFactory from "./communicationType";
 
 export default abstract class NewsletterConfigFactory {

src/factory/admin/configuration/qualification.ts

@@ -1,5 +1,5 @@
-import { qualification } from "../../../entity/settings/qualification";
+import { qualification } from "../../../entity/configuration/qualification";
-import { QualificationViewModel } from "../../../viewmodel/admin/settings/qualification.models";
+import { QualificationViewModel } from "../../../viewmodel/admin/configuration/qualification.models";
 
 export default abstract class QualificationFactory {
   /**

src/factory/admin/configuration/queryStore.ts

@@ -1,5 +1,5 @@
-import { query } from "../../../entity/settings/query";
+import { query } from "../../../entity/configuration/query";
-import { QueryStoreViewModel } from "../../../viewmodel/admin/settings/queryStore.models";
+import { QueryStoreViewModel } from "../../../viewmodel/admin/configuration/queryStore.models";
 
 export default abstract class QueryStoreFactory {
   /**