folder structure

src/service/club/calendarService.ts

@@ -1,6 +1,6 @@
-import { dataSource } from "../data-source";
-import { calendar } from "../entity/calendar";
-import InternalException from "../exceptions/internalException";
+import { dataSource } from "../../data-source";
+import { calendar } from "../../entity/club/calendar";
+import InternalException from "../../exceptions/internalException";
 
 export default abstract class CalendarService {
   /**

src/service/club/member/communicationService.ts

@@ -1,6 +1,6 @@
-import { dataSource } from "../data-source";
-import { communication } from "../entity/communication";
-import InternalException from "../exceptions/internalException";
+import { dataSource } from "../../../data-source";
+import { communication } from "../../../entity/club/member/communication";
+import InternalException from "../../../exceptions/internalException";
 
 export default abstract class CommunicationService {
   /**

src/service/club/member/memberAwardService.ts

@@ -1,6 +1,6 @@
-import { dataSource } from "../data-source";
-import { memberAwards } from "../entity/memberAwards";
-import InternalException from "../exceptions/internalException";
+import { dataSource } from "../../../data-source";
+import { memberAwards } from "../../../entity/club/member/memberAwards";
+import InternalException from "../../../exceptions/internalException";
 
 export default abstract class MemberAwardService {
   /**

src/service/club/member/memberExecutivePositionService.ts

@@ -1,6 +1,6 @@
-import { dataSource } from "../data-source";
-import { memberExecutivePositions } from "../entity/memberExecutivePositions";
-import InternalException from "../exceptions/internalException";
+import { dataSource } from "../../../data-source";
+import { memberExecutivePositions } from "../../../entity/club/member/memberExecutivePositions";
+import InternalException from "../../../exceptions/internalException";
 
 export default abstract class MemberExecutivePositionService {
   /**

src/service/club/member/memberQualificationService.ts

@@ -1,6 +1,6 @@
-import { dataSource } from "../data-source";
-import { memberQualifications } from "../entity/memberQualifications";
-import InternalException from "../exceptions/internalException";
+import { dataSource } from "../../../data-source";
+import { memberQualifications } from "../../../entity/club/member/memberQualifications";
+import InternalException from "../../../exceptions/internalException";
 
 export default abstract class MemberQualificationService {
   /**

src/service/club/member/memberService.ts

@@ -1,7 +1,7 @@
-import { dataSource } from "../data-source";
-import { member } from "../entity/member";
-import { membership } from "../entity/membership";
-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 InternalException from "../../../exceptions/internalException";
 
 export default abstract class MemberService {
   /**

src/service/club/member/membershipService.ts

@@ -1,6 +1,6 @@
-import { dataSource } from "../data-source";
-import { membership } from "../entity/membership";
-import InternalException from "../exceptions/internalException";
+import { dataSource } from "../../../data-source";
+import { membership } from "../../../entity/club/member/membership";
+import InternalException from "../../../exceptions/internalException";
 
 export default abstract class MembershipService {
   /**

src/service/club/newsletter/newsletterDatesService.ts

@@ -1,7 +1,7 @@
-import { dataSource } from "../data-source";
-import { newsletterDates } from "../entity/newsletterDates";
-import { member } from "../entity/member";
-import InternalException from "../exceptions/internalException";
+import { dataSource } from "../../../data-source";
+import { newsletterDates } from "../../../entity/club/newsletter/newsletterDates";
+import { member } from "../../../entity/club/member/member";
+import InternalException from "../../../exceptions/internalException";
 
 export default abstract class NewsletterDatesService {
   /**

src/service/club/newsletter/newsletterRecipientsService.ts

@@ -1,7 +1,7 @@
-import { dataSource } from "../data-source";
-import { newsletterRecipients } from "../entity/newsletterRecipients";
-import { member } from "../entity/member";
-import InternalException from "../exceptions/internalException";
+import { dataSource } from "../../../data-source";
+import { newsletterRecipients } from "../../../entity/club/newsletter/newsletterRecipients";
+import { member } from "../../../entity/club/member/member";
+import InternalException from "../../../exceptions/internalException";
 
 export default abstract class NewsletterRecipientsService {
   /**

src/service/club/newsletter/newsletterService.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";
 
 export default abstract class NewsletterService {
   /**

src/service/club/protocol/protocolAgendaService.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";
 
 export default abstract class ProtocolAgendaService {
   /**

src/service/club/protocol/protocolDecisionService.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";
 
 export default abstract class ProtocolDecisionService {
   /**

src/service/club/protocol/protocolPrecenseService.ts

@@ -1,6 +1,6 @@
-import { dataSource } from "../data-source";
-import { protocolPresence } from "../entity/protocolPresence";
-import InternalException from "../exceptions/internalException";
+import { dataSource } from "../../../data-source";
+import { protocolPresence } from "../../../entity/club/protocol/protocolPresence";
+import InternalException from "../../../exceptions/internalException";
 
 export default abstract class ProtocolPresenceService {
   /**

src/service/club/protocol/protocolPrintoutService.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";
 
 export default abstract class ProtocolPrintoutService {
   /**

src/service/club/protocol/protocolService.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";
 
 export default abstract class ProtocolService {
   /**

src/service/club/protocol/protocolVotingService.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";
 
 export default abstract class ProtocolVotingService {
   /**

src/service/settings/awardService.ts

@@ -1,7 +1,7 @@
-import { dataSource } from "../data-source";
-import { award } from "../entity/award";
-import { member } from "../entity/member";
-import InternalException from "../exceptions/internalException";
+import { dataSource } from "../../data-source";
+import { award } from "../../entity/settings/award";
+import { member } from "../../entity/club/member/member";
+import InternalException from "../../exceptions/internalException";
 
 export default abstract class AwardService {
   /**

src/service/settings/calendarTypeService.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";
 
 export default abstract class CalendarTypeService {
   /**

src/service/settings/communicationTypeService.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";
 
 export default abstract class CommunicationTypeService {
   /**

src/service/settings/executivePositionService.ts

@@ -1,7 +1,7 @@
-import { dataSource } from "../data-source";
-import { executivePosition } from "../entity/executivePosition";
-import { memberExecutivePositions } from "../entity/memberExecutivePositions";
-import InternalException from "../exceptions/internalException";
+import { dataSource } from "../../data-source";
+import { executivePosition } from "../../entity/settings/executivePosition";
+import { memberExecutivePositions } from "../../entity/club/member/memberExecutivePositions";
+import InternalException from "../../exceptions/internalException";
 
 export default abstract class ExecutivePositionService {
   /**

src/service/settings/membershipStatusService.ts

@@ -1,7 +1,7 @@
-import { dataSource } from "../data-source";
-import { membershipStatus } from "../entity/membershipStatus";
-import InternalException from "../exceptions/internalException";
-import { membership } from "../entity/membership";
+import { dataSource } from "../../data-source";
+import { membershipStatus } from "../../entity/settings/membershipStatus";
+import InternalException from "../../exceptions/internalException";
+import { membership } from "../../entity/club/member/membership";
 
 export default abstract class MembershipStatusService {
   /**

src/service/settings/newsletterConfigService.ts

@@ -1,7 +1,7 @@
-import { dataSource } from "../data-source";
-import { newsletterConfig } from "../entity/newsletterConfig";
-import { member } from "../entity/member";
-import InternalException from "../exceptions/internalException";
+import { dataSource } from "../../data-source";
+import { newsletterConfig } from "../../entity/settings/newsletterConfig";
+import { member } from "../../entity/club/member/member";
+import InternalException from "../../exceptions/internalException";
 
 export default abstract class NewsletterConfigService {
   /**

src/service/settings/qualification.ts

@@ -1,8 +1,8 @@
-import { dataSource } from "../data-source";
-import { memberQualifications } from "../entity/memberQualifications";
-import { qualification } from "../entity/qualification";
-import { user } from "../entity/user";
-import InternalException from "../exceptions/internalException";
+import { dataSource } from "../../data-source";
+import { memberQualifications } from "../../entity/club/member/memberQualifications";
+import { qualification } from "../../entity/settings/qualification";
+import { user } from "../../entity/user/user";
+import InternalException from "../../exceptions/internalException";
 
 export default abstract class QualificationService {
   /**

src/service/settings/queryStoreService.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";
 
 export default abstract class QueryStoreService {
   /**

src/service/settings/templateService.ts

@@ -1,7 +1,7 @@
-import { dataSource } from "../data-source";
-import { template } from "../entity/template";
-import { member } from "../entity/member";
-import InternalException from "../exceptions/internalException";
+import { dataSource } from "../../data-source";
+import { template } from "../../entity/settings/template";
+import { member } from "../../entity/club/member/member";
+import InternalException from "../../exceptions/internalException";
 
 export default abstract class TemplateService {
   /**

src/service/settings/templateUsageService.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";
 
 export default abstract class TemplateUsageService {
   /**

src/service/user/inviteService.ts

@@ -1,6 +1,6 @@
-import { dataSource } from "../data-source";
-import { invite } from "../entity/invite";
-import InternalException from "../exceptions/internalException";
+import { dataSource } from "../../data-source";
+import { invite } from "../../entity/user/invite";
+import InternalException from "../../exceptions/internalException";
 
 export default abstract class InviteService {
   /**

src/service/user/rolePermissionService.ts

@@ -1,7 +1,7 @@
-import { dataSource } from "../data-source";
-import { rolePermission } from "../entity/role_permission";
-import { userPermission } from "../entity/user_permission";
-import InternalException from "../exceptions/internalException";
+import { dataSource } from "../../data-source";
+import { rolePermission } from "../../entity/user/role_permission";
+import { userPermission } from "../../entity/user/user_permission";
+import InternalException from "../../exceptions/internalException";
 
 export default abstract class RolePermissionService {
   /**

src/service/user/roleService.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";
 
 export default abstract class RoleService {
   /**

src/service/user/userPermissionService.ts

@@ -1,6 +1,6 @@
-import { dataSource } from "../data-source";
-import { userPermission } from "../entity/user_permission";
-import InternalException from "../exceptions/internalException";
+import { dataSource } from "../../data-source";
+import { userPermission } from "../../entity/user/user_permission";
+import InternalException from "../../exceptions/internalException";
 
 export default abstract class UserPermissionService {
   /**

src/service/user/userService.ts

@@ -1,7 +1,7 @@
-import { dataSource } from "../data-source";
-import { role } from "../entity/role";
-import { user } from "../entity/user";
-import InternalException from "../exceptions/internalException";
+import { dataSource } from "../../data-source";
+import { role } from "../../entity/user/role";
+import { user } from "../../entity/user/user";
+import InternalException from "../../exceptions/internalException";
 
 export default abstract class UserService {
   /**