📏 fit to new structure

# Conflicts:
#	src/models/entities/User.ts

.vscode/settings.json

@@ -10,7 +10,7 @@
         "editor.defaultFormatter": "vscode.typescript-language-features",
         "editor.codeActionsOnSave": {
             "source.organizeImports": true,
-            "source.fixAll": true
+            // "source.fixAll": true
         }
     },
     "javascript.preferences.quoteStyle": "single",

ormconfig.ts

@@ -8,5 +8,5 @@ export default {
 	username: process.env.DB_USER,
 	password: process.env.DB_PASSWORD,
 	database: process.env.DB_NAME,
-	entities: ["src/models/*.ts"]
+	entities: ["src/models/entities/*.ts"]
 };

src/controllers/RunnerController.ts

@@ -2,9 +2,9 @@ import { JsonController, Param, Body, Get, Post, Put, Delete, OnUndefined } from
 import { getConnectionManager, Repository } from 'typeorm';
 import { EntityFromBody } from 'typeorm-routing-controllers-extensions';
 import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi';
-import { Runner } from '../models/Runner';
+import { Runner } from '../models/entities/Runner';
 import { RunnerGroupNeededError, RunnerGroupNotFoundError, RunnerIdsNotMatchingError, RunnerNotFoundError, RunnerOnlyOneGroupAllowedError } from '../errors/RunnerErrors';
-import { CreateRunner } from '../models/CreateRunner';
+import { CreateRunner } from '../models/creation/CreateRunner';
 
 
 @JsonController('/runners')

src/controllers/RunnerOrganisationController.ts

@@ -2,10 +2,10 @@ import { JsonController, Param, Body, Get, Post, Put, Delete, OnUndefined } from
 import { getConnectionManager, Repository } from 'typeorm';
 import { EntityFromBody } from 'typeorm-routing-controllers-extensions';
 import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi';
-import { RunnerOrganisation } from '../models/RunnerOrganisation';
+import { RunnerOrganisation } from '../models/entities/RunnerOrganisation';
 import { RunnerOrganisationIdsNotMatchingError, RunnerOrganisationNotFoundError } from '../errors/RunnerOrganisationErrors';
-import { CreateRunnerOrganisation } from '../models/CreateRunnerOrganisation';
+import { CreateRunnerOrganisation } from '../models/creation/CreateRunnerOrganisation';
-import { RunnerGroup } from '../models/RunnerGroup';
+import { RunnerGroup } from '../models/entities/RunnerGroup';
 
 
 @JsonController('/organisations')

src/controllers/TrackController.ts

@@ -2,10 +2,10 @@ import { JsonController, Param, Body, Get, Post, Put, Delete, NotFoundError, OnU
 import { getConnectionManager, Repository } from 'typeorm';
 import { EntityFromBody } from 'typeorm-routing-controllers-extensions';
 import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi';
-import { Track } from '../models/Track';
+import { Track } from '../models/entities/Track';
 import { IsInt, IsNotEmpty, IsPositive, IsString } from 'class-validator';
 import { TrackIdsNotMatchingError, TrackNotFoundError } from "../errors/TrackErrors";
-import { CreateTrack } from '../models/CreateTrack';
+import { CreateTrack } from '../models/creation/CreateTrack';
 
 @JsonController('/tracks')
 //@Authorized("TRACKS:read")

src/models/creation/CreateRunner.ts

@@ -1,11 +1,11 @@
 import { IsEmail, IsInt, IsNotEmpty, IsOptional, IsPhoneNumber, IsPositive, IsString } from 'class-validator';
-import { Runner } from '../models/Runner';
+import { Runner } from '../entities/Runner';
 import { getConnectionManager, Repository } from 'typeorm';
 import { group } from 'console';
-import { RunnerOnlyOneGroupAllowedError, RunnerGroupNeededError, RunnerGroupNotFoundError } from '../errors/RunnerErrors';
+import { RunnerOnlyOneGroupAllowedError, RunnerGroupNeededError, RunnerGroupNotFoundError } from '../../errors/RunnerErrors';
-import { RunnerOrganisation } from './RunnerOrganisation';
+import { RunnerOrganisation } from '../entities/RunnerOrganisation';
-import { RunnerTeam } from './RunnerTeam';
+import { RunnerTeam } from '../entities/RunnerTeam';
-import { RunnerGroup } from './RunnerGroup';
+import { RunnerGroup } from '../entities/RunnerGroup';
 import { Address } from 'cluster';
 
 export class CreateRunner {

src/models/creation/CreateRunnerOrganisation.ts

@@ -1,5 +1,5 @@
 import { IsString } from 'class-validator';
-import { RunnerOrganisation } from './RunnerOrganisation';
+import { RunnerOrganisation } from '../entities/RunnerOrganisation';
 
 export class CreateRunnerOrganisation {
     @IsString()

src/models/creation/CreateTrack.ts

@@ -1,5 +1,5 @@
 import { IsInt, IsNotEmpty, IsPositive, IsString } from 'class-validator';
-import { Track } from './Track';
+import { Track } from '../entities/Track';
 
 export class CreateTrack {
     /**

src/models/creation/CreateUser.ts

@@ -1,8 +1,8 @@
 import * as argon2 from "argon2";
 import { IsInt, IsOptional, IsPhoneNumber, IsString, IsUUID } from 'class-validator';
 import * as uuid from 'uuid';
-import { UserGroupNotFoundError, UsernameOrEmailNeededError } from '../errors/CreateUserErrors';
+import { UserGroupNotFoundError, UsernameOrEmailNeededError } from '../../errors/CreateUserErrors';
-import { User } from '../models/User';
+import { User } from '../entities/User';
 
 export class CreateUser {
     @IsString()