folder structure

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 {

src/entity/club/protocol/protocolPresence.ts

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

src/entity/refresh.ts

@@ -1,5 +1,5 @@
 import { Column, Entity, ManyToOne, PrimaryColumn } from "typeorm";
-import { user } from "./user";
+import { user } from "./user/user";
 
 @Entity()
 export class refresh {

src/entity/settings/award.ts

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

src/entity/settings/calendarType.ts

@@ -1,5 +1,5 @@
 import { Column, Entity, OneToMany, PrimaryColumn, PrimaryGeneratedColumn } from "typeorm";
-import { calendar } from "./calendar";
+import { calendar } from "../club/calendar";
 
 @Entity()
 export class calendarType {

src/entity/settings/communicationType.ts

@@ -1,6 +1,6 @@
 import { Column, Entity, OneToMany, PrimaryColumn } from "typeorm";
-import { communication } from "./communication";
-import { CommunicationFieldType, communicationFieldTypes } from "../type/fieldTypes";
+import { communication } from "../club/member/communication";
+import { CommunicationFieldType, communicationFieldTypes } from "../../type/fieldTypes";
 
 @Entity()
 export class communicationType {

src/entity/settings/executivePosition.ts

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

src/entity/settings/membershipStatus.ts

@@ -1,5 +1,5 @@
 import { Column, Entity, OneToMany, PrimaryColumn } from "typeorm";
-import { membership } from "./membership";
+import { membership } from "../club/member/membership";
 
 @Entity()
 export class membershipStatus {

src/entity/settings/newsletterConfig.ts

@@ -1,5 +1,5 @@
 import { Column, Entity, ManyToOne, PrimaryColumn } from "typeorm";
-import { NewsletterConfigType } from "../enums/newsletterConfigType";
+import { NewsletterConfigType } from "../../enums/newsletterConfigType";
 import { communicationType } from "./communicationType";
 
 @Entity()

src/entity/settings/qualification.ts

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

src/entity/settings/templateUsage.ts

@@ -1,6 +1,6 @@
 import { Column, Entity, ManyToOne, PrimaryColumn } from "typeorm";
 import { template } from "./template";
-import { PermissionModule } from "../type/permissionTypes";
+import { PermissionModule } from "../../type/permissionTypes";
 
 @Entity()
 export class templateUsage {

src/entity/user/role_permission.ts

@@ -1,5 +1,5 @@
 import { Column, Entity, ManyToOne, PrimaryColumn } from "typeorm";
-import { PermissionString } from "../type/permissionTypes";
+import { PermissionString } from "../../type/permissionTypes";
 import { role } from "./role";
 
 @Entity()

src/entity/user/user_permission.ts

@@ -1,6 +1,6 @@
 import { Column, Entity, ManyToOne, PrimaryColumn } from "typeorm";
 import { user } from "./user";
-import { PermissionObject, PermissionString } from "../type/permissionTypes";
+import { PermissionObject, PermissionString } from "../../type/permissionTypes";
 
 @Entity()
 export class userPermission {