src/command/club/calendar/calendarCommandHandler.ts

@@ -1,7 +1,7 @@
-import { dataSource } from "../data-source";
-import { calendar } from "../entity/calendar";
-import { calendarType } from "../entity/calendarType";
-import InternalException from "../exceptions/internalException";
+import { dataSource } from "../../../data-source";
+import { calendar } from "../../../entity/club/calendar";
+import { calendarType } from "../../../entity/settings/calendarType";
+import InternalException from "../../../exceptions/internalException";
 import { CreateCalendarCommand, DeleteCalendarCommand, UpdateCalendarCommand } from "./calendarCommand";
 
 export default abstract class CalendarCommandHandler {

src/command/club/member/communicationCommandHandler.ts

@@ -1,8 +1,8 @@
-import { dataSource } from "../data-source";
-import { communication } from "../entity/communication";
-import { communicationType } from "../entity/communicationType";
-import { user } from "../entity/user";
-import InternalException from "../exceptions/internalException";
+import { dataSource } from "../../../data-source";
+import { communication } from "../../../entity/club/member/communication";
+import { communicationType } from "../../../entity/settings/communicationType";
+import { user } from "../../../entity/user/user";
+import InternalException from "../../../exceptions/internalException";
 import {
   CreateCommunicationCommand,
   DeleteCommunicationCommand,

src/command/club/member/memberAwardCommandHandler.ts

@@ -1,8 +1,8 @@
-import { dataSource } from "../data-source";
-import { award } from "../entity/award";
-import { member } from "../entity/member";
-import { memberAwards } from "../entity/memberAwards";
-import InternalException from "../exceptions/internalException";
+import { dataSource } from "../../../data-source";
+import { award } from "../../../entity/settings/award";
+import { member } from "../../../entity/club/member/member";
+import { memberAwards } from "../../../entity/club/member/memberAwards";
+import InternalException from "../../../exceptions/internalException";
 import { CreateMemberAwardCommand, DeleteMemberAwardCommand, UpdateMemberAwardCommand } from "./memberAwardCommand";
 
 export default abstract class MemberAwardCommandHandler {

src/command/club/member/memberCommand.ts

@@ -1,4 +1,4 @@
-import { Salutation } from "../enums/salutation";
+import { Salutation } from "../../../enums/salutation";
 
 export interface CreateMemberCommand {
   salutation: Salutation;

src/command/club/member/memberCommandHandler.ts

@@ -1,8 +1,8 @@
-import { dataSource } from "../data-source";
-import { communication } from "../entity/communication";
-import { member } from "../entity/member";
-import InternalException from "../exceptions/internalException";
-import CommunicationService from "../service/communicationService";
+import { dataSource } from "../../../data-source";
+import { communication } from "../../../entity/club/member/communication";
+import { member } from "../../../entity/club/member/member";
+import InternalException from "../../../exceptions/internalException";
+import CommunicationService from "../../../service/club/member/communicationService";
 import {
   CreateMemberCommand,
   DeleteMemberCommand,

src/command/club/member/memberExecutivePositionCommandHandler.ts

@@ -1,8 +1,8 @@
-import { dataSource } from "../data-source";
-import { executivePosition } from "../entity/executivePosition";
-import { member } from "../entity/member";
-import { memberExecutivePositions } from "../entity/memberExecutivePositions";
-import InternalException from "../exceptions/internalException";
+import { dataSource } from "../../../data-source";
+import { executivePosition } from "../../../entity/settings/executivePosition";
+import { member } from "../../../entity/club/member/member";
+import { memberExecutivePositions } from "../../../entity/club/member/memberExecutivePositions";
+import InternalException from "../../../exceptions/internalException";
 import {
   CreateMemberExecutivePositionCommand,
   DeleteMemberExecutivePositionCommand,

src/command/club/member/memberQualificationCommandHandler.ts

@@ -1,13 +1,13 @@
-import { dataSource } from "../data-source";
-import { qualification } from "../entity/qualification";
-import { memberQualifications } from "../entity/memberQualifications";
-import InternalException from "../exceptions/internalException";
+import { dataSource } from "../../../data-source";
+import { qualification } from "../../../entity/settings/qualification";
+import { memberQualifications } from "../../../entity/club/member/memberQualifications";
+import InternalException from "../../../exceptions/internalException";
 import {
   CreateMemberQualificationCommand,
   DeleteMemberQualificationCommand,
   UpdateMemberQualificationCommand,
 } from "./memberQualificationCommand";
-import { member } from "../entity/member";
+import { member } from "../../../entity/club/member/member";
 
 export default abstract class MemberQualificationCommandHandler {
   /**

src/command/club/member/membershipCommandHandler.ts

@@ -1,8 +1,8 @@
-import { dataSource } from "../data-source";
-import { member } from "../entity/member";
-import { membership } from "../entity/membership";
-import { membershipStatus } from "../entity/membershipStatus";
-import InternalException from "../exceptions/internalException";
+import { dataSource } from "../../../data-source";
+import { member } from "../../../entity/club/member/member";
+import { membership } from "../../../entity/club/member/membership";
+import { membershipStatus } from "../../../entity/settings/membershipStatus";
+import InternalException from "../../../exceptions/internalException";
 import { CreateMembershipCommand, DeleteMembershipCommand, UpdateMembershipCommand } from "./membershipCommand";
 
 export default abstract class MembershipCommandHandler {

src/command/club/newsletter/newsletterCommandHandler.ts

@@ -1,6 +1,6 @@
-import { dataSource } from "../data-source";
-import { newsletter } from "../entity/newsletter";
-import InternalException from "../exceptions/internalException";
+import { dataSource } from "../../../data-source";
+import { newsletter } from "../../../entity/club/newsletter/newsletter";
+import InternalException from "../../../exceptions/internalException";
 import { CreateNewsletterCommand, SendNewsletterCommand, SynchronizeNewsletterCommand } from "./newsletterCommand";
 
 export default abstract class NewsletterCommandHandler {

src/command/club/newsletter/newsletterDatesCommandHandler.ts

@@ -1,9 +1,9 @@
 import { DeleteResult, EntityManager, InsertResult, UpdateResult } from "typeorm";
-import { dataSource } from "../data-source";
-import InternalException from "../exceptions/internalException";
-import NewsletterDatesService from "../service/newsletterDatesService";
+import { dataSource } from "../../../data-source";
+import InternalException from "../../../exceptions/internalException";
+import NewsletterDatesService from "../../../service/club/newsletter/newsletterDatesService";
 import { NewsletterDateCommand, SynchronizeNewsletterDatesCommand } from "./newsletterDatesCommand";
-import { newsletterDates } from "../entity/newsletterDates";
+import { newsletterDates } from "../../../entity/club/newsletter/newsletterDates";
 
 export default abstract class NewsletterDatesCommandHandler {
   /**

src/command/club/newsletter/newsletterRecipientsCommandHandler.ts

@@ -1,9 +1,9 @@
 import { DeleteResult, EntityManager, InsertResult, UpdateResult } from "typeorm";
-import { dataSource } from "../data-source";
-import InternalException from "../exceptions/internalException";
-import NewsletterRecipientsService from "../service/newsletterRecipientsService";
+import { dataSource } from "../../../data-source";
+import InternalException from "../../../exceptions/internalException";
+import NewsletterRecipientsService from "../../../service/club/newsletter/newsletterRecipientsService";
 import { SynchronizeNewsletterRecipientsCommand } from "./newsletterRecipientsCommand";
-import { newsletterRecipients } from "../entity/newsletterRecipients";
+import { newsletterRecipients } from "../../../entity/club/newsletter/newsletterRecipients";
 
 export default abstract class NewsletterRecipientsCommandHandler {
   /**

src/command/club/protocol/protocolAgendaCommandHandler.ts

@@ -1,6 +1,6 @@
-import { dataSource } from "../data-source";
-import { protocolAgenda } from "../entity/protocolAgenda";
-import InternalException from "../exceptions/internalException";
+import { dataSource } from "../../../data-source";
+import { protocolAgenda } from "../../../entity/club/protocol/protocolAgenda";
+import InternalException from "../../../exceptions/internalException";
 import { SynchronizeProtocolAgendaCommand } from "./protocolAgendaCommand";
 
 export default abstract class ProtocolAgendaCommandHandler {

src/command/club/protocol/protocolCommandHandler.ts

@@ -1,6 +1,6 @@
-import { dataSource } from "../data-source";
-import { protocol } from "../entity/protocol";
-import InternalException from "../exceptions/internalException";
+import { dataSource } from "../../../data-source";
+import { protocol } from "../../../entity/club/protocol/protocol";
+import InternalException from "../../../exceptions/internalException";
 import { CreateProtocolCommand, SynchronizeProtocolCommand } from "./protocolCommand";
 
 export default abstract class ProtocolCommandHandler {

src/command/club/protocol/protocolDecisionCommandHandler.ts

@@ -1,6 +1,6 @@
-import { dataSource } from "../data-source";
-import { protocolDecision } from "../entity/protocolDecision";
-import InternalException from "../exceptions/internalException";
+import { dataSource } from "../../../data-source";
+import { protocolDecision } from "../../../entity/club/protocol/protocolDecision";
+import InternalException from "../../../exceptions/internalException";
 import { SynchronizeProtocolDecisionCommand } from "./protocolDecisionCommand";
 
 export default abstract class ProtocolDecisionCommandHandler {

src/command/club/protocol/protocolPresenceCommandHandler.ts

@@ -1,8 +1,8 @@
 import { DeleteResult, EntityManager, InsertResult, UpdateResult } from "typeorm";
-import { dataSource } from "../data-source";
-import { protocolPresence } from "../entity/protocolPresence";
-import InternalException from "../exceptions/internalException";
-import ProtocolPresenceService from "../service/protocolPrecenseService";
+import { dataSource } from "../../../data-source";
+import { protocolPresence } from "../../../entity/club/protocol/protocolPresence";
+import InternalException from "../../../exceptions/internalException";
+import ProtocolPresenceService from "../../../service/club/protocol/protocolPrecenseService";
 import { ProtocolPresenceCommand, SynchronizeProtocolPresenceCommand } from "./protocolPresenceCommand";
 
 export default abstract class ProtocolPresenceCommandHandler {

src/command/club/protocol/protocolPrintoutCommandHandler.ts

@@ -1,6 +1,6 @@
-import { dataSource } from "../data-source";
-import { protocolPrintout } from "../entity/protocolPrintout";
-import InternalException from "../exceptions/internalException";
+import { dataSource } from "../../../data-source";
+import { protocolPrintout } from "../../../entity/club/protocol/protocolPrintout";
+import InternalException from "../../../exceptions/internalException";
 import { CreateProtocolPrintoutCommand } from "./protocolPrintoutCommand";
 
 export default abstract class ProtocolPrintoutCommandHandler {

src/command/club/protocol/protocolVotingCommandHandler.ts

@@ -1,6 +1,6 @@
-import { dataSource } from "../data-source";
-import { protocolVoting } from "../entity/protocolVoting";
-import InternalException from "../exceptions/internalException";
+import { dataSource } from "../../../data-source";
+import { protocolVoting } from "../../../entity/club/protocol/protocolVoting";
+import InternalException from "../../../exceptions/internalException";
 import { SynchronizeProtocolVotingCommand } from "./protocolVotingCommand";
 
 export default abstract class ProtocolVotingCommandHandler {

src/command/refreshCommandHandler.ts

@@ -4,7 +4,7 @@ import { REFRESH_EXPIRATION } from "../env.defaults";
 import InternalException from "../exceptions/internalException";
 import { JWTHelper } from "../helpers/jwtHelper";
 import { StringHelper } from "../helpers/stringHelper";
-import UserService from "../service/userService";
+import UserService from "../service/user/userService";
 import { JWTRefresh } from "../type/jwtTypes";
 import { CreateRefreshCommand, DeleteRefreshCommand } from "./refreshCommand";
 import ms from "ms";

src/command/settings/award/awardCommandHandler.ts

@@ -1,6 +1,6 @@
-import { dataSource } from "../data-source";
-import { award } from "../entity/award";
-import InternalException from "../exceptions/internalException";
+import { dataSource } from "../../../data-source";
+import { award } from "../../../entity/settings/award";
+import InternalException from "../../../exceptions/internalException";
 import { CreateAwardCommand, DeleteAwardCommand, UpdateAwardCommand } from "./awardCommand";
 
 export default abstract class AwardCommandHandler {

src/command/settings/calendarType/calendarTypeCommandHandler.ts

@@ -1,6 +1,6 @@
-import { dataSource } from "../data-source";
-import { calendarType } from "../entity/calendarType";
-import InternalException from "../exceptions/internalException";
+import { dataSource } from "../../../data-source";
+import { calendarType } from "../../../entity/settings/calendarType";
+import InternalException from "../../../exceptions/internalException";
 import { CreateCalendarTypeCommand, DeleteCalendarTypeCommand, UpdateCalendarTypeCommand } from "./calendarTypeCommand";
 
 export default abstract class CalendarTypeCommandHandler {

src/command/settings/communicationType/communicationTypeCommand.ts

@@ -1,4 +1,4 @@
-import { CommunicationFieldType } from "../type/fieldTypes";
+import { CommunicationFieldType } from "../../../type/fieldTypes";
 
 export interface CreateCommunicationTypeCommand {
   type: string;

src/command/settings/communicationType/communicationTypeCommandHandler.ts

@@ -1,6 +1,6 @@
-import { dataSource } from "../data-source";
-import { communicationType } from "../entity/communicationType";
-import InternalException from "../exceptions/internalException";
+import { dataSource } from "../../../data-source";
+import { communicationType } from "../../../entity/settings/communicationType";
+import InternalException from "../../../exceptions/internalException";
 import {
   CreateCommunicationTypeCommand,
   DeleteCommunicationTypeCommand,

src/command/settings/executivePosition/executivePositionCommandHandler.ts

@@ -1,6 +1,6 @@
-import { dataSource } from "../data-source";
-import { executivePosition } from "../entity/executivePosition";
-import InternalException from "../exceptions/internalException";
+import { dataSource } from "../../../data-source";
+import { executivePosition } from "../../../entity/settings/executivePosition";
+import InternalException from "../../../exceptions/internalException";
 import {
   CreateExecutivePositionCommand,
   DeleteExecutivePositionCommand,

src/command/settings/membershipStatus/membershipStatusCommandHandler.ts

@@ -1,6 +1,6 @@
-import { dataSource } from "../data-source";
-import { membershipStatus } from "../entity/membershipStatus";
-import InternalException from "../exceptions/internalException";
+import { dataSource } from "../../../data-source";
+import { membershipStatus } from "../../../entity/settings/membershipStatus";
+import InternalException from "../../../exceptions/internalException";
 import {
   CreateMembershipStatusCommand,
   DeleteMembershipStatusCommand,

src/command/settings/newsletterConfig/newsletterConfigCommand.ts

@@ -1,4 +1,4 @@
-import { NewsletterConfigType } from "../enums/newsletterConfigType";
+import { NewsletterConfigType } from "../../../enums/newsletterConfigType";
 
 export interface SetNewsletterConfigCommand {
   comTypeId: number;

src/command/settings/newsletterConfig/newsletterConfigCommandHandler.ts

@@ -1,6 +1,6 @@
-import { dataSource } from "../data-source";
-import { newsletterConfig } from "../entity/newsletterConfig";
-import InternalException from "../exceptions/internalException";
+import { dataSource } from "../../../data-source";
+import { newsletterConfig } from "../../../entity/settings/newsletterConfig";
+import InternalException from "../../../exceptions/internalException";
 import { DeleteNewsletterConfigCommand, SetNewsletterConfigCommand } from "./newsletterConfigCommand";
 
 export default abstract class NewsletterConfigCommandHandler {

src/command/settings/qualification/qualificationCommandHandler.ts

@@ -1,6 +1,6 @@
-import { dataSource } from "../data-source";
-import { qualification } from "../entity/qualification";
-import InternalException from "../exceptions/internalException";
+import { dataSource } from "../../../data-source";
+import { qualification } from "../../../entity/settings/qualification";
+import InternalException from "../../../exceptions/internalException";
 import {
   CreateQualificationCommand,
   DeleteQualificationCommand,

src/command/settings/queryStore/queryStoreCommand.ts

@@ -1,4 +1,4 @@
-import { DynamicQueryStructure } from "../type/dynamicQueries";
+import { DynamicQueryStructure } from "../../../type/dynamicQueries";
 
 export interface CreateQueryStoreCommand {
   title: string;

src/command/settings/queryStore/queryStoreCommandHandler.ts

@@ -1,6 +1,6 @@
-import { dataSource } from "../data-source";
-import { query } from "../entity/query";
-import InternalException from "../exceptions/internalException";
+import { dataSource } from "../../../data-source";
+import { query } from "../../../entity/settings/query";
+import InternalException from "../../../exceptions/internalException";
 import { CreateQueryStoreCommand, DeleteQueryStoreCommand, UpdateQueryStoreCommand } from "./queryStoreCommand";
 
 export default abstract class QueryStoreCommandHandler {

src/command/settings/template/templateCommandHandler.ts

@@ -1,6 +1,6 @@
-import { dataSource } from "../data-source";
-import { template } from "../entity/template";
-import InternalException from "../exceptions/internalException";
+import { dataSource } from "../../../data-source";
+import { template } from "../../../entity/settings/template";
+import InternalException from "../../../exceptions/internalException";
 import { CreateTemplateCommand, DeleteTemplateCommand, UpdateTemplateCommand } from "./templateCommand";
 
 export default abstract class TemplateCommandHandler {

src/command/settings/templateUsage/templateUsageCommandHandler.ts

@@ -1,6 +1,6 @@
-import { dataSource } from "../data-source";
-import { templateUsage } from "../entity/templateUsage";
-import InternalException from "../exceptions/internalException";
+import { dataSource } from "../../../data-source";
+import { templateUsage } from "../../../entity/settings/templateUsage";
+import InternalException from "../../../exceptions/internalException";
 import { UpdateTemplateUsageCommand } from "./templateUsageCommand";
 
 export default abstract class TemplateUsageCommandHandler {

src/command/user/role/roleCommandHandler.ts

@@ -1,6 +1,6 @@
-import { dataSource } from "../data-source";
-import { role } from "../entity/role";
-import InternalException from "../exceptions/internalException";
+import { dataSource } from "../../../data-source";
+import { role } from "../../../entity/user/role";
+import InternalException from "../../../exceptions/internalException";
 import { CreateRoleCommand, DeleteRoleCommand, UpdateRoleCommand } from "./roleCommand";
 
 export default abstract class RoleCommandHandler {

src/command/user/role/rolePermissionCommand.ts

@@ -1,4 +1,4 @@
-import { PermissionString } from "../type/permissionTypes";
+import { PermissionString } from "../../../type/permissionTypes";
 
 export interface CreateRolePermissionCommand {
   permission: PermissionString;

src/command/user/role/rolePermissionCommandHandler.ts

@@ -1,17 +1,17 @@
 import { DeleteResult, EntityManager, InsertResult } from "typeorm";
-import { dataSource } from "../data-source";
-import { rolePermission } from "../entity/role_permission";
-import InternalException from "../exceptions/internalException";
-import RoleService from "../service/roleService";
+import { dataSource } from "../../../data-source";
+import { rolePermission } from "../../../entity/user/role_permission";
+import InternalException from "../../../exceptions/internalException";
+import RoleService from "../../../service/user/roleService";
 import {
   CreateRolePermissionCommand,
   DeleteRolePermissionCommand,
   UpdateRolePermissionsCommand,
 } from "./rolePermissionCommand";
-import PermissionHelper from "../helpers/permissionHelper";
-import RolePermissionService from "../service/rolePermissionService";
-import { role } from "../entity/role";
-import { PermissionString } from "../type/permissionTypes";
+import PermissionHelper from "../../../helpers/permissionHelper";
+import RolePermissionService from "../../../service/user/rolePermissionService";
+import { role } from "../../../entity/user/role";
+import { PermissionString } from "../../../type/permissionTypes";
 
 export default abstract class RolePermissionCommandHandler {
   /**

src/command/user/user/inviteCommandHandler.ts

@@ -1,7 +1,7 @@
-import { dataSource } from "../data-source";
-import { invite } from "../entity/invite";
-import InternalException from "../exceptions/internalException";
-import { StringHelper } from "../helpers/stringHelper";
+import { dataSource } from "../../../data-source";
+import { invite } from "../../../entity/user/invite";
+import InternalException from "../../../exceptions/internalException";
+import { StringHelper } from "../../../helpers/stringHelper";
 import { CreateInviteCommand, DeleteInviteCommand } from "./inviteCommand";
 
 export default abstract class InviteCommandHandler {

src/command/user/user/userCommandHandler.ts

@@ -1,7 +1,7 @@
 import { EntityManager } from "typeorm";
-import { dataSource } from "../data-source";
-import { user } from "../entity/user";
-import InternalException from "../exceptions/internalException";
+import { dataSource } from "../../../data-source";
+import { user } from "../../../entity/user/user";
+import InternalException from "../../../exceptions/internalException";
 import {
   CreateUserCommand,
   DeleteUserCommand,
@@ -10,7 +10,7 @@ import {
   UpdateUserRolesCommand,
   UpdateUserSecretCommand,
 } from "./userCommand";
-import UserService from "../service/userService";
+import UserService from "../../../service/user/userService";
 
 export default abstract class UserCommandHandler {
   /**

src/command/user/user/userPermissionCommand.ts

@@ -1,4 +1,4 @@
-import { PermissionString } from "../type/permissionTypes";
+import { PermissionString } from "../../../type/permissionTypes";
 
 export interface CreateUserPermissionCommand {
   permission: PermissionString;

src/command/user/user/userPermissionCommandHandler.ts

@@ -1,16 +1,16 @@
 import { DeleteResult, EntityManager, InsertResult } from "typeorm";
-import { dataSource } from "../data-source";
-import { user } from "../entity/user";
-import { userPermission } from "../entity/user_permission";
-import InternalException from "../exceptions/internalException";
+import { dataSource } from "../../../data-source";
+import { user } from "../../../entity/user/user";
+import { userPermission } from "../../../entity/user/user_permission";
+import InternalException from "../../../exceptions/internalException";
 import {
   CreateUserPermissionCommand,
   DeleteUserPermissionCommand,
   UpdateUserPermissionsCommand,
 } from "./userPermissionCommand";
-import UserPermissionService from "../service/userPermissionService";
-import PermissionHelper from "../helpers/permissionHelper";
-import { PermissionString } from "../type/permissionTypes";
+import UserPermissionService from "../../../service/user/userPermissionService";
+import PermissionHelper from "../../../helpers/permissionHelper";
+import { PermissionString } from "../../../type/permissionTypes";
 
 export default abstract class UserPermissionCommandHandler {
   /**

src/controller/admin/club/calendarController.ts

@@ -1,16 +1,16 @@
 import { Request, Response } from "express";
-import CalendarService from "../../service/calendarService";
-import CalendarFactory from "../../factory/admin/calendar";
-import CalendarTypeService from "../../service/calendarTypeService";
-import CalendarTypeFactory from "../../factory/admin/calendarType";
-import { CreateCalendarCommand, DeleteCalendarCommand, UpdateCalendarCommand } from "../../command/calendarCommand";
-import CalendarCommandHandler from "../../command/calendarCommandHandler";
+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 CalendarCommandHandler from "../../../command/club/calendar/calendarCommandHandler";
 import {
   CreateCalendarTypeCommand,
   DeleteCalendarTypeCommand,
   UpdateCalendarTypeCommand,
-} from "../../command/calendarTypeCommand";
-import CalendarTypeCommandHandler from "../../command/calendarTypeCommandHandler";
+} from "../../../command/settings/calendarType/calendarTypeCommand";
+import CalendarTypeCommandHandler from "../../../command/settings/calendarType/calendarTypeCommandHandler";
 
 /**
  * @description get all calendar items

src/controller/admin/club/memberController.ts

@@ -1,55 +1,55 @@
 import { Request, Response } from "express";
-import MemberService from "../../service/memberService";
-import MemberFactory from "../../factory/admin/member";
-import MembershipService from "../../service/membershipService";
-import MembershipFactory from "../../factory/admin/membership";
-import MemberAwardService from "../../service/memberAwardService";
-import MemberAwardFactory from "../../factory/admin/memberAward";
-import MemberQualificationService from "../../service/memberQualificationService";
-import MemberQualificationFactory from "../../factory/admin/memberQualification";
-import MemberExecutivePositionService from "../../service/memberExecutivePositionService";
-import MemberExecutivePositionFactory from "../../factory/admin/memberExecutivePosition";
-import CommunicationService from "../../service/communicationService";
-import CommunicationFactory from "../../factory/admin/communication";
+import MemberService from "../../../service/club/member/memberService";
+import MemberFactory from "../../../factory/admin/club/member/member";
+import MembershipService from "../../../service/club/member/membershipService";
+import MembershipFactory from "../../../factory/admin/club/member/membership";
+import MemberAwardService from "../../../service/club/member/memberAwardService";
+import MemberAwardFactory from "../../../factory/admin/club/member/memberAward";
+import MemberQualificationService from "../../../service/club/member/memberQualificationService";
+import MemberQualificationFactory from "../../../factory/admin/club/member/memberQualification";
+import MemberExecutivePositionService from "../../../service/club/member/memberExecutivePositionService";
+import MemberExecutivePositionFactory from "../../../factory/admin/club/member/memberExecutivePosition";
+import CommunicationService from "../../../service/club/member/communicationService";
+import CommunicationFactory from "../../../factory/admin/club/member/communication";
 import {
   CreateMemberCommand,
   DeleteMemberCommand,
   UpdateMemberCommand,
   UpdateMemberNewsletterCommand,
-} from "../../command/memberCommand";
-import MemberCommandHandler from "../../command/memberCommandHandler";
+} from "../../../command/club/member/memberCommand";
+import MemberCommandHandler from "../../../command/club/member/memberCommandHandler";
 import {
   CreateMembershipCommand,
   DeleteMembershipCommand,
   UpdateMembershipCommand,
-} from "../../command/membershipCommand";
-import MembershipCommandHandler from "../../command/membershipCommandHandler";
+} from "../../../command/club/member/membershipCommand";
+import MembershipCommandHandler from "../../../command/club/member/membershipCommandHandler";
 import {
   CreateMemberAwardCommand,
   DeleteMemberAwardCommand,
   UpdateMemberAwardCommand,
-} from "../../command/memberAwardCommand";
-import MemberAwardCommandHandler from "../../command/memberAwardCommandHandler";
+} from "../../../command/club/member/memberAwardCommand";
+import MemberAwardCommandHandler from "../../../command/club/member/memberAwardCommandHandler";
 import {
   CreateMemberExecutivePositionCommand,
   DeleteMemberExecutivePositionCommand,
   UpdateMemberExecutivePositionCommand,
-} from "../../command/memberExecutivePositionCommand";
-import MemberExecutivePositionCommandHandler from "../../command/memberExecutivePositionCommandHandler";
+} from "../../../command/club/member/memberExecutivePositionCommand";
+import MemberExecutivePositionCommandHandler from "../../../command/club/member/memberExecutivePositionCommandHandler";
 import {
   CreateMemberQualificationCommand,
   DeleteMemberQualificationCommand,
   UpdateMemberQualificationCommand,
-} from "../../command/memberQualificationCommand";
-import MemberQualificationCommandHandler from "../../command/memberQualificationCommandHandler";
+} from "../../../command/club/member/memberQualificationCommand";
+import MemberQualificationCommandHandler from "../../../command/club/member/memberQualificationCommandHandler";
 import {
   CreateCommunicationCommand,
   DeleteCommunicationCommand,
   UpdateCommunicationCommand,
-} from "../../command/communicationCommand";
-import CommunicationCommandHandler from "../../command/communicationCommandHandler";
-import {PdfExport} from "../../helpers/pdfExport";
-import {PermissionModule} from "../../type/permissionTypes";
+} from "../../../command/club/member/communicationCommand";
+import CommunicationCommandHandler from "../../../command/club/member/communicationCommandHandler";
+import {PdfExport} from "../../../helpers/pdfExport";
+import {PermissionModule} from "../../../type/permissionTypes";
 
 /**
  * @description get all members

src/controller/admin/club/newsletterController.ts

@@ -1,24 +1,24 @@
 import { Request, Response } from "express";
-import NewsletterService from "../../service/newsletterService";
-import NewsletterFactory from "../../factory/admin/newsletter";
-import NewsletterDatesService from "../../service/newsletterDatesService";
-import NewsletterDatesFactory from "../../factory/admin/newsletterDates";
-import NewsletterRecipientsService from "../../service/newsletterRecipientsService";
-import NewsletterRecipientsFactory from "../../factory/admin/newsletterRecipients";
-import { FileSystemHelper } from "../../helpers/fileSystemHelper";
-import { CreateNewsletterCommand, SynchronizeNewsletterCommand } from "../../command/newsletterCommand";
-import NewsletterCommandHandler from "../../command/newsletterCommandHandler";
-import { SynchronizeNewsletterDatesCommand } from "../../command/newsletterDatesCommand";
-import NewsletterDatesCommandHandler from "../../command/newsletterDatesCommandHandler";
-import { SynchronizeNewsletterRecipientsCommand } from "../../command/newsletterRecipientsCommand";
-import NewsletterRecipientsCommandHandler from "../../command/newsletterRecipientsCommandHandler";
-import { NewsletterDatesViewModel } from "../../viewmodel/admin/newsletterDates.models";
-import { PdfExport } from "../../helpers/pdfExport";
-import UserService from "../../service/userService";
-import { TemplateHelper } from "../../helpers/templateHelper";
-import MailHelper from "../../helpers/mailHelper";
-import { NewsletterEventType, NewsletterHelper } from "../../helpers/newsletterHelper";
-import { Salutation } from "../../enums/salutation";
+import NewsletterService from "../../../service/club/newsletter/newsletterService";
+import NewsletterFactory from "../../../factory/admin/club/newsletter/newsletter";
+import NewsletterDatesService from "../../../service/club/newsletter/newsletterDatesService";
+import NewsletterDatesFactory from "../../../factory/admin/club/newsletter/newsletterDates";
+import NewsletterRecipientsService from "../../../service/club/newsletter/newsletterRecipientsService";
+import NewsletterRecipientsFactory from "../../../factory/admin/club/newsletter/newsletterRecipients";
+import { FileSystemHelper } from "../../../helpers/fileSystemHelper";
+import { CreateNewsletterCommand, SynchronizeNewsletterCommand } from "../../../command/club/newsletter/newsletterCommand";
+import NewsletterCommandHandler from "../../../command/club/newsletter/newsletterCommandHandler";
+import { SynchronizeNewsletterDatesCommand } from "../../../command/club/newsletter/newsletterDatesCommand";
+import NewsletterDatesCommandHandler from "../../../command/club/newsletter/newsletterDatesCommandHandler";
+import { SynchronizeNewsletterRecipientsCommand } from "../../../command/club/newsletter/newsletterRecipientsCommand";
+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 { TemplateHelper } from "../../../helpers/templateHelper";
+import MailHelper from "../../../helpers/mailHelper";
+import { NewsletterEventType, NewsletterHelper } from "../../../helpers/newsletterHelper";
+import { Salutation } from "../../../enums/salutation";
 
 /**
  * @description get all newsletters

src/controller/admin/club/protocolController.ts

@@ -1,34 +1,34 @@
 import { Request, Response } from "express";
-import ProtocolService from "../../service/protocolService";
-import ProtocolFactory from "../../factory/admin/protocol";
-import ProtocolAgendaService from "../../service/protocolAgendaService";
-import ProtocolAgendaFactory from "../../factory/admin/protocolAgenda";
-import ProtocolDecisionService from "../../service/protocolDecisionService";
-import ProtocolDecisionFactory from "../../factory/admin/protocolDecision";
-import ProtocolPresenceService from "../../service/protocolPrecenseService";
-import ProtocolPresenceFactory from "../../factory/admin/protocolPresence";
-import ProtocolVotingService from "../../service/protocolVotingService";
-import ProtocolVotingFactory from "../../factory/admin/protocolVoting";
-import { CreateProtocolCommand, SynchronizeProtocolCommand } from "../../command/protocolCommand";
-import ProtocolCommandHandler from "../../command/protocolCommandHandler";
-import { SynchronizeProtocolAgendaCommand } from "../../command/protocolAgendaCommand";
-import ProtocolAgendaCommandHandler from "../../command/protocolAgendaCommandHandler";
-import { ProtocolAgendaViewModel } from "../../viewmodel/admin/protocolAgenda.models";
-import ProtocolDecisionCommandHandler from "../../command/protocolDecisionCommandHandler";
-import { ProtocolDecisionViewModel } from "../../viewmodel/admin/protocolDecision.models";
-import ProtocolPresenceCommandHandler from "../../command/protocolPresenceCommandHandler";
-import { SynchronizeProtocolPresenceCommand } from "../../command/protocolPresenceCommand";
-import { SynchronizeProtocolDecisionCommand } from "../../command/protocolDecisionCommand";
-import { SynchronizeProtocolVotingCommand } from "../../command/protocolVotingCommand";
-import { ProtocolVotingViewModel } from "../../viewmodel/admin/protocolVoting.models";
-import ProtocolVotingCommandHandler from "../../command/protocolVotingCommandHandler";
-import { PdfExport } from "../../helpers/pdfExport";
-import ProtocolPrintoutService from "../../service/protocolPrintoutService";
-import ProtocolPrintoutFactory from "../../factory/admin/protocolPrintout";
-import { CreateProtocolPrintoutCommand } from "../../command/protocolPrintoutCommand";
-import ProtocolPrintoutCommandHandler from "../../command/protocolPrintoutCommandHandler";
-import { FileSystemHelper } from "../../helpers/fileSystemHelper";
-import { ProtocolPresenceViewModel } from "../../viewmodel/admin/protocolPresence.models";
+import ProtocolService from "../../../service/club/protocol/protocolService";
+import ProtocolFactory from "../../../factory/admin/club/protocol/protocol";
+import ProtocolAgendaService from "../../../service/club/protocol/protocolAgendaService";
+import ProtocolAgendaFactory from "../../../factory/admin/club/protocol/protocolAgenda";
+import ProtocolDecisionService from "../../../service/club/protocol/protocolDecisionService";
+import ProtocolDecisionFactory from "../../../factory/admin/club/protocol/protocolDecision";
+import ProtocolPresenceService from "../../../service/club/protocol/protocolPrecenseService";
+import ProtocolPresenceFactory from "../../../factory/admin/club/protocol/protocolPresence";
+import ProtocolVotingService from "../../../service/club/protocol/protocolVotingService";
+import ProtocolVotingFactory from "../../../factory/admin/club/protocol/protocolVoting";
+import { CreateProtocolCommand, SynchronizeProtocolCommand } from "../../../command/club/protocol/protocolCommand";
+import ProtocolCommandHandler from "../../../command/club/protocol/protocolCommandHandler";
+import { SynchronizeProtocolAgendaCommand } from "../../../command/club/protocol/protocolAgendaCommand";
+import ProtocolAgendaCommandHandler from "../../../command/club/protocol/protocolAgendaCommandHandler";
+import { ProtocolAgendaViewModel } from "../../../viewmodel/admin/club/protocol/protocolAgenda.models";
+import ProtocolDecisionCommandHandler from "../../../command/club/protocol/protocolDecisionCommandHandler";
+import { ProtocolDecisionViewModel } from "../../../viewmodel/admin/club/protocol/protocolDecision.models";
+import ProtocolPresenceCommandHandler from "../../../command/club/protocol/protocolPresenceCommandHandler";
+import { SynchronizeProtocolPresenceCommand } from "../../../command/club/protocol/protocolPresenceCommand";
+import { SynchronizeProtocolDecisionCommand } from "../../../command/club/protocol/protocolDecisionCommand";
+import { SynchronizeProtocolVotingCommand } from "../../../command/club/protocol/protocolVotingCommand";
+import { ProtocolVotingViewModel } from "../../../viewmodel/admin/club/protocol/protocolVoting.models";
+import ProtocolVotingCommandHandler from "../../../command/club/protocol/protocolVotingCommandHandler";
+import { PdfExport } from "../../../helpers/pdfExport";
+import ProtocolPrintoutService from "../../../service/club/protocol/protocolPrintoutService";
+import ProtocolPrintoutFactory from "../../../factory/admin/club/protocol/protocolPrintout";
+import { CreateProtocolPrintoutCommand } from "../../../command/club/protocol/protocolPrintoutCommand";
+import ProtocolPrintoutCommandHandler from "../../../command/club/protocol/protocolPrintoutCommandHandler";
+import { FileSystemHelper } from "../../../helpers/fileSystemHelper";
+import { ProtocolPresenceViewModel } from "../../../viewmodel/admin/club/protocol/protocolPresence.models";
 
 /**
  * @description get all protocols

src/controller/admin/club/queryBuilderController.ts

@@ -1,6 +1,6 @@
 import { Request, Response } from "express";
-import DynamicQueryBuilder from "../../helpers/dynamicQueryBuilder";
-import { dataSource } from "../../data-source";
+import DynamicQueryBuilder from "../../../helpers/dynamicQueryBuilder";
+import { dataSource } from "../../../data-source";
 
 /**
  * @description get all table metas

src/controller/admin/settings/awardController.ts

@@ -1,8 +1,8 @@
 import { Request, Response } from "express";
-import AwardService from "../../service/awardService";
-import AwardFactory from "../../factory/admin/award";
-import { CreateAwardCommand, DeleteAwardCommand, UpdateAwardCommand } from "../../command/awardCommand";
-import AwardCommandHandler from "../../command/awardCommandHandler";
+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";
 
 /**
  * @description get all awards

src/controller/admin/settings/communicationTypeController.ts

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

src/controller/admin/settings/executivePositionController.ts

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

src/controller/admin/settings/membershipStatusController.ts

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

src/controller/admin/settings/newsletterConfigController.ts

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

src/controller/admin/settings/qualificationController.ts

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

src/controller/admin/settings/queryStoreController.ts

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

src/controller/admin/settings/templateController.ts

@@ -1,8 +1,8 @@
 import { Request, Response } from "express";
-import TemplateService from "../../service/templateService";
-import TemplateFactory from "../../factory/admin/template";
-import { CreateTemplateCommand, DeleteTemplateCommand, UpdateTemplateCommand } from "../../command/templateCommand";
-import TemplateCommandHandler from "../../command/templateCommandHandler";
+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";
 
 /**
  * @description get all templates

src/controller/admin/settings/templateUsageController.ts

@@ -1,13 +1,13 @@
 import { Request, Response } from "express";
-import TemplateUsageService from "../../service/templateUsageService";
-import TemplateUsageFactory from "../../factory/admin/templateUsage";
-import { UpdateTemplateUsageCommand } from "../../command/templateUsageCommand";
-import TemplateUsageCommandHandler from "../../command/templateUsageCommandHandler";
-import PermissionHelper from "../../helpers/permissionHelper";
-import ForbiddenRequestException from "../../exceptions/forbiddenRequestException";
-import { PermissionModule } from "../../type/permissionTypes";
-import { PdfExport } from "../../helpers/pdfExport";
-import { DemoDataHelper } from "../../helpers/demoDataHelper";
+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 PermissionHelper from "../../../helpers/permissionHelper";
+import ForbiddenRequestException from "../../../exceptions/forbiddenRequestException";
+import { PermissionModule } from "../../../type/permissionTypes";
+import { PdfExport } from "../../../helpers/pdfExport";
+import { DemoDataHelper } from "../../../helpers/demoDataHelper";
 
 /**
  * @description get all templateUsages

src/controller/admin/user/roleController.ts

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

src/controller/admin/user/userController.ts

@@ -1,15 +1,15 @@
 import { Request, Response } from "express";
-import UserService from "../../service/userService";
-import UserFactory from "../../factory/admin/user";
-import UserPermissionService from "../../service/userPermissionService";
-import PermissionHelper from "../../helpers/permissionHelper";
-import RoleFactory from "../../factory/admin/role";
-import { DeleteUserCommand, UpdateUserCommand, UpdateUserRolesCommand } from "../../command/userCommand";
-import UserCommandHandler from "../../command/userCommandHandler";
-import MailHelper from "../../helpers/mailHelper";
-import { CLUB_NAME } from "../../env.defaults";
-import { UpdateUserPermissionsCommand } from "../../command/userPermissionCommand";
-import UserPermissionCommandHandler from "../../command/userPermissionCommandHandler";
+import UserService from "../../../service/user/userService";
+import UserFactory from "../../../factory/admin/user/user";
+import UserPermissionService from "../../../service/user/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 MailHelper from "../../../helpers/mailHelper";
+import { CLUB_NAME } from "../../../env.defaults";
+import { UpdateUserPermissionsCommand } from "../../../command/user/user/userPermissionCommand";
+import UserPermissionCommandHandler from "../../../command/user/user/userPermissionCommandHandler";
 
 /**
  * @description get All users

src/controller/authController.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/userService";
+import UserService from "../service/user/userService";
 import speakeasy from "speakeasy";
 import UnauthorizedRequestException from "../exceptions/unauthorizedRequestException";
 import RefreshService from "../service/refreshService";
-import UserPermissionService from "../service/userPermissionService";
+import UserPermissionService from "../service/user/userPermissionService";
 import PermissionHelper from "../helpers/permissionHelper";
-import RolePermissionService from "../service/rolePermissionService";
+import RolePermissionService from "../service/user/rolePermissionService";
 
 /**
  * @description Check authentication status by token

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

src/controller/publicController.ts

@@ -1,11 +1,11 @@
 import { Request, Response } from "express";
-import CalendarService from "../service/calendarService";
-import CalendarTypeService from "../service/calendarTypeService";
-import { calendar } from "../entity/calendar";
+import CalendarService from "../service/club/calendarService";
+import CalendarTypeService from "../service/settings/calendarTypeService";
+import { calendar } from "../entity/club/calendar";
 import { createEvents } from "ics";
 import moment from "moment";
 import InternalException from "../exceptions/internalException";
-import CalendarFactory from "../factory/admin/calendar";
+import CalendarFactory from "../factory/admin/club/calendar";
 import { CalendarHelper } from "../helpers/calendarHelper";
 
 /**

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/userService";
+import UserService from "../service/user/userService";
 import { CLUB_NAME } from "../env.defaults";
 import PermissionHelper from "../helpers/permissionHelper";
-import RolePermissionService from "../service/rolePermissionService";
-import UserPermissionService from "../service/userPermissionService";
-import { UpdateUserSecretCommand } from "../command/userCommand";
-import UserCommandHandler from "../command/userCommandHandler";
+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";
 
 /**
  * @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/userService";
-import UserFactory from "../factory/admin/user";
-import { TransferUserOwnerCommand, UpdateUserCommand } from "../command/userCommand";
-import UserCommandHandler from "../command/userCommandHandler";
+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 ForbiddenRequestException from "../exceptions/forbiddenRequestException";
 
 /**

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 } from "./env.defaults";
 
-import { user } from "./entity/user";
+import { user } from "./entity/user/user";
 import { refresh } from "./entity/refresh";
-import { invite } from "./entity/invite";
-import { userPermission } from "./entity/user_permission";
-import { role } from "./entity/role";
-import { rolePermission } from "./entity/role_permission";
-import { award } from "./entity/award";
-import { communication } from "./entity/communication";
-import { communicationType } from "./entity/communicationType";
-import { executivePosition } from "./entity/executivePosition";
-import { membershipStatus } from "./entity/membershipStatus";
-import { qualification } from "./entity/qualification";
+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 { 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 { Initial1724317398939 } from "./migrations/1724317398939-initial";
 import { RefreshPrimaryChange1724573307851 } from "./migrations/1724573307851-refreshPrimaryChange";
@@ -22,44 +22,44 @@ import { Invite1724579024939 } from "./migrations/1724579024939-invite";
 import { Permissions1724661484664 } from "./migrations/1724661484664-permissions";
 import { RolePermission1724771491085 } from "./migrations/1724771491085-role_permission";
 import { MemberBaseData1725435669492 } from "./migrations/1725435669492-member_base_data";
-import { member } from "./entity/member";
-import { memberAwards } from "./entity/memberAwards";
-import { memberExecutivePositions } from "./entity/memberExecutivePositions";
-import { memberQualifications } from "./entity/memberQualifications";
-import { membership } from "./entity/membership";
+import { member } from "./entity/club/member/member";
+import { memberAwards } from "./entity/club/member/memberAwards";
+import { memberExecutivePositions } from "./entity/club/member/memberExecutivePositions";
+import { memberQualifications } from "./entity/club/member/memberQualifications";
+import { membership } from "./entity/club/member/membership";
 import { Memberdata1726301836849 } from "./migrations/1726301836849-memberdata";
 import { CommunicationFields1727439800630 } from "./migrations/1727439800630-communicationFields";
 import { Ownership1728313041449 } from "./migrations/1728313041449-ownership";
-import { protocol } from "./entity/protocol";
-import { protocolAgenda } from "./entity/protocolAgenda";
-import { protocolDecision } from "./entity/protocolDecision";
-import { protocolPresence } from "./entity/protocolPresence";
-import { protocolVoting } from "./entity/protocolVoting";
-import { protocolPrintout } from "./entity/protocolPrintout";
+import { protocol } from "./entity/club/protocol/protocol";
+import { protocolAgenda } from "./entity/club/protocol/protocolAgenda";
+import { protocolDecision } from "./entity/club/protocol/protocolDecision";
+import { protocolPresence } from "./entity/club/protocol/protocolPresence";
+import { protocolVoting } from "./entity/club/protocol/protocolVoting";
+import { protocolPrintout } from "./entity/club/protocol/protocolPrintout";
 import { Protocol1729347911107 } from "./migrations/1729347911107-protocol";
-import { calendar } from "./entity/calendar";
-import { calendarType } from "./entity/calendarType";
+import { calendar } from "./entity/club/calendar";
+import { calendarType } from "./entity/settings/calendarType";
 import { Calendar1729947763295 } from "./migrations/1729947763295-calendar";
 import { reset } from "./entity/reset";
 import { ResetToken1732358596823 } from "./migrations/1732358596823-resetToken";
 import { SMSAlarming1732696919191 } from "./migrations/1732696919191-SMSAlarming";
 import { SecuringCalendarType1733249553766 } from "./migrations/1733249553766-securingCalendarType";
-import { query } from "./entity/query";
+import { query } from "./entity/settings/query";
 import { QueryStore1734187754677 } from "./migrations/1734187754677-queryStore";
 import { memberView } from "./views/memberView";
 import { memberExecutivePositionsView } from "./views/memberExecutivePositionView";
 import { memberQualificationsView } from "./views/memberQualificationsView";
 import { membershipView } from "./views/membershipsView";
 import { MemberDataViews1734520998539 } from "./migrations/1734520998539-memberDataViews";
-import { template } from "./entity/template";
+import { template } from "./entity/settings/template";
 import { Template1734854680201 } from "./migrations/1734854680201-template";
-import { templateUsage } from "./entity/templateUsage";
+import { templateUsage } from "./entity/settings/templateUsage";
 import { TemplateUsage1734949173739 } from "./migrations/1734949173739-templateUsage";
-import { newsletter } from "./entity/newsletter";
-import { newsletterDates } from "./entity/newsletterDates";
-import { newsletterRecipients } from "./entity/newsletterRecipients";
+import { newsletter } from "./entity/club/newsletter/newsletter";
+import { newsletterDates } from "./entity/club/newsletter/newsletterDates";
+import { newsletterRecipients } from "./entity/club/newsletter/newsletterRecipients";
 import { Newsletter1735118780511 } from "./migrations/1735118780511-newsletter";
-import { newsletterConfig } from "./entity/newsletterConfig";
+import { newsletterConfig } from "./entity/settings/newsletterConfig";
 import { NewsletterConfig1735207446910 } from "./migrations/1735207446910-newsletterConfig";
 import { TemplateMargins1735733514043 } from "./migrations/1735733514043-templateMargins";
 import { InternalId1735822722235 } from "./migrations/1735822722235-internalId";

src/demodata/member.list.data.ts

@@ -1,7 +1,7 @@
-import { member } from "../entity/member";
-import { protocolAgenda } from "../entity/protocolAgenda";
-import { protocolDecision } from "../entity/protocolDecision";
-import { protocolVoting } from "../entity/protocolVoting";
+import { member } from "../entity/club/member/member";
+import { protocolAgenda } from "../entity/club/protocol/protocolAgenda";
+import { protocolDecision } from "../entity/club/protocol/protocolDecision";
+import { protocolVoting } from "../entity/club/protocol/protocolVoting";
 
 export const memberlistDemoData: { member: Array<Partial<member>> } = {
   member: [

src/demodata/newsletter.data.ts

@@ -1,5 +1,5 @@
-import { calendar } from "../entity/calendar";
-import { member } from "../entity/member";
+import { calendar } from "../entity/club/calendar";
+import { member } from "../entity/club/member/member";
 import { Salutation } from "../enums/salutation";
 
 export const newsletterDemoData: {

src/demodata/protocol.data.ts

@@ -1,7 +1,7 @@
-import { member } from "../entity/member";
-import { protocolAgenda } from "../entity/protocolAgenda";
-import { protocolDecision } from "../entity/protocolDecision";
-import { protocolVoting } from "../entity/protocolVoting";
+import { member } from "../entity/club/member/member";
+import { protocolAgenda } from "../entity/club/protocol/protocolAgenda";
+import { protocolDecision } from "../entity/club/protocol/protocolDecision";
+import { protocolVoting } from "../entity/club/protocol/protocolVoting";
 
 export const protocolDemoData: {
   title: string;

src/entity/club/calendar.ts

@@ -9,7 +9,7 @@ import {
   AfterUpdate,
   BeforeUpdate,
 } from "typeorm";
-import { calendarType } from "./calendarType";
+import { calendarType } from "../settings/calendarType";
 
 @Entity()
 export class calendar {

src/entity/club/member/communication.ts

@@ -1,6 +1,6 @@
 import { Column, Entity, ManyToOne, PrimaryColumn } from "typeorm";
 import { member } from "./member";
-import { communicationType } from "./communicationType";
+import { communicationType } from "../../settings/communicationType";
 
 @Entity()
 export class communication {

src/entity/club/member/member.ts

@@ -1,11 +1,11 @@
 import { Column, Entity, JoinColumn, ManyToOne, OneToMany, OneToOne, PrimaryColumn } from "typeorm";
-import { Salutation } from "../enums/salutation";
+import { Salutation } from "../../../enums/salutation";
 import { membership } from "./membership";
 import { memberAwards } from "./memberAwards";
 import { memberQualifications } from "./memberQualifications";
 import { memberExecutivePositions } from "./memberExecutivePositions";
 import { communication } from "./communication";
-import { CommunicationViewModel } from "../viewmodel/admin/communication.models";
+import { CommunicationViewModel } from "../../../viewmodel/admin/club/member/communication.models";
 
 @Entity()
 export class member {

src/entity/club/member/memberAwards.ts

@@ -1,6 +1,6 @@
 import { Column, Entity, ManyToOne, PrimaryColumn } from "typeorm";
 import { member } from "./member";
-import { award } from "./award";
+import { award } from "../../settings/award";
 
 @Entity()
 export class memberAwards {

src/entity/club/member/memberExecutivePositions.ts

@@ -1,6 +1,6 @@
 import { Column, Entity, ManyToOne, PrimaryColumn } from "typeorm";
 import { member } from "./member";
-import { executivePosition } from "./executivePosition";
+import { executivePosition } from "../../settings/executivePosition";
 
 @Entity()
 export class memberExecutivePositions {

src/entity/club/member/memberQualifications.ts

@@ -1,6 +1,6 @@
 import { Column, Entity, ManyToOne, PrimaryColumn } from "typeorm";
 import { member } from "./member";
-import { qualification } from "./qualification";
+import { qualification } from "../../settings/qualification";
 
 @Entity()
 export class memberQualifications {

src/entity/club/member/membership.ts

@@ -1,6 +1,6 @@
 import { Column, Entity, JoinColumn, ManyToOne, PrimaryColumn } from "typeorm";
 import { member } from "./member";
-import { membershipStatus } from "./membershipStatus";
+import { membershipStatus } from "../../settings/membershipStatus";
 
 @Entity()
 export class membership {

src/entity/club/newsletter/newsletter.ts

@@ -1,8 +1,8 @@
 import { Column, Entity, ManyToOne, OneToMany, PrimaryColumn } from "typeorm";
 import { newsletterDates } from "./newsletterDates";
-import { member } from "./member";
+import { member } from "../member/member";
 import { newsletterRecipients } from "./newsletterRecipients";
-import { query } from "./query";
+import { query } from "../../settings/query";
 
 @Entity()
 export class newsletter {

src/entity/club/newsletter/newsletterDates.ts

@@ -1,6 +1,6 @@
 import { Column, Entity, ManyToOne, PrimaryColumn } from "typeorm";
 import { newsletter } from "./newsletter";
-import { calendar } from "./calendar";
+import { calendar } from "../calendar";
 
 @Entity()
 export class newsletterDates {

src/entity/club/newsletter/newsletterRecipients.ts

@@ -1,6 +1,6 @@
 import { Column, Entity, ManyToOne, PrimaryColumn } from "typeorm";
 import { newsletter } from "./newsletter";
-import { member } from "./member";
+import { member } from "../member/member";
 
 @Entity()
 export class newsletterRecipients {