diff --git a/FencerJudgeFront/src/app/app-routing.module.ts b/FencerJudgeFront/src/app/app-routing.module.ts
index fcdc89f..b958478 100644
--- a/FencerJudgeFront/src/app/app-routing.module.ts
+++ b/FencerJudgeFront/src/app/app-routing.module.ts
@@ -5,15 +5,19 @@ import { authGuard } from '@guards/auth.guard';
 
 import { LoginComponent } from './components/essentials/login/login.component';
 import { LogoutComponent } from './components/essentials/logout/logout.component';
+
 import { HomeComponent } from './components/home/home.component';
-import { MatchesComponent } from './components/matches/matches.component';
-import { MatchesIdComponent } from './components/matches-id/matches-id.component';
+
+import { MatchesComponent } from './components/match/matches/matches.component';
+import { MatchesIdComponent } from './components/match/matches-id/matches-id.component';
 
 const routes: Routes = [
   { path: 'login', component: LoginComponent },
   { path: 'logout', component: LogoutComponent },
+
   { path: '', component: HomeComponent },
   { path: 'home', component: HomeComponent },
+
   { path: 'matches', component: MatchesComponent },
   { path: 'matches/:id', component: MatchesIdComponent },
 ];
diff --git a/FencerJudgeFront/src/app/app.module.ts b/FencerJudgeFront/src/app/app.module.ts
index 0c33646..e17ffe8 100644
--- a/FencerJudgeFront/src/app/app.module.ts
+++ b/FencerJudgeFront/src/app/app.module.ts
@@ -9,8 +9,8 @@ import { FooterComponent } from './components/essentials/footer/footer.component
 import { HomeComponent } from './components/home/home.component';
 import { LoginComponent } from './components/essentials/login/login.component';
 import { LogoutComponent } from './components/essentials/logout/logout.component';
-import { MatchesComponent } from './components/matches/matches.component';
-import { MatchesIdComponent } from './components/matches-id/matches-id.component';
+import { MatchesComponent } from './components/match/matches/matches.component';
+import { MatchesIdComponent } from './components/match/matches-id/matches-id.component';
 
 @NgModule({
   declarations: [
diff --git a/FencerJudgeFront/src/app/components/essentials/header/header.component.ts b/FencerJudgeFront/src/app/components/essentials/header/header.component.ts
index 8d32d92..cb059ae 100644
--- a/FencerJudgeFront/src/app/components/essentials/header/header.component.ts
+++ b/FencerJudgeFront/src/app/components/essentials/header/header.component.ts
@@ -1,6 +1,6 @@
 import { Component } from '@angular/core';
 import { Router } from '@angular/router';
-import { AuthService } from '@services/auth.service';
+import { AuthService } from '@services/auth/auth.service';
 
 @Component({
   selector: 'app-header',
diff --git a/FencerJudgeFront/src/app/components/essentials/login/login.component.ts b/FencerJudgeFront/src/app/components/essentials/login/login.component.ts
index 3ff2888..f7b137a 100644
--- a/FencerJudgeFront/src/app/components/essentials/login/login.component.ts
+++ b/FencerJudgeFront/src/app/components/essentials/login/login.component.ts
@@ -1,6 +1,6 @@
 import { Component } from '@angular/core';
 import { Router } from '@angular/router';
-import { AuthService } from '@services/auth.service';
+import { AuthService } from '@services/auth/auth.service';
 
 @Component({
   selector: 'app-login',
diff --git a/FencerJudgeFront/src/app/components/essentials/logout/logout.component.ts b/FencerJudgeFront/src/app/components/essentials/logout/logout.component.ts
index 6da5b61..7945a95 100644
--- a/FencerJudgeFront/src/app/components/essentials/logout/logout.component.ts
+++ b/FencerJudgeFront/src/app/components/essentials/logout/logout.component.ts
@@ -1,6 +1,6 @@
 import { Component } from '@angular/core';
 import { Router } from '@angular/router';
-import { AuthService } from '@services/auth.service';
+import { AuthService } from '@services/auth/auth.service';
 
 @Component({
   selector: 'app-logout',
diff --git a/FencerJudgeFront/src/app/components/matches-id/matches-id.component.css b/FencerJudgeFront/src/app/components/match/matches-id/matches-id.component.css
similarity index 100%
rename from FencerJudgeFront/src/app/components/matches-id/matches-id.component.css
rename to FencerJudgeFront/src/app/components/match/matches-id/matches-id.component.css
diff --git a/FencerJudgeFront/src/app/components/matches-id/matches-id.component.html b/FencerJudgeFront/src/app/components/match/matches-id/matches-id.component.html
similarity index 90%
rename from FencerJudgeFront/src/app/components/matches-id/matches-id.component.html
rename to FencerJudgeFront/src/app/components/match/matches-id/matches-id.component.html
index 38721f0..3e82262 100644
--- a/FencerJudgeFront/src/app/components/matches-id/matches-id.component.html
+++ b/FencerJudgeFront/src/app/components/match/matches-id/matches-id.component.html
@@ -21,9 +21,9 @@
 
       <div class="d-flex justify-content-between align-items-center mt-3">
         <div class="text-start">
-          <strong>{{ player1?.firstName }} {{ player1?.name }}</strong
+          <strong>{{ player1.firstName }} {{ player1.name }}</strong
           ><br />
-          <small class="text-muted">{{ player1?.club }}</small>
+          <small class="text-muted">{{ player1.club }}</small>
         </div>
 
         <div class="text-center">
@@ -58,9 +58,9 @@
         </div>
 
         <div class="text-end">
-          <strong>{{ player2?.firstName }} {{ player2?.name }}</strong
+          <strong>{{ player2.firstName }} {{ player2.name }}</strong
           ><br />
-          <small class="text-muted">{{ player2?.club }}</small>
+          <small class="text-muted">{{ player2.club }}</small>
         </div>
       </div>
 
diff --git a/FencerJudgeFront/src/app/components/matches-id/matches-id.component.spec.ts b/FencerJudgeFront/src/app/components/match/matches-id/matches-id.component.spec.ts
similarity index 100%
rename from FencerJudgeFront/src/app/components/matches-id/matches-id.component.spec.ts
rename to FencerJudgeFront/src/app/components/match/matches-id/matches-id.component.spec.ts
diff --git a/FencerJudgeFront/src/app/components/matches-id/matches-id.component.ts b/FencerJudgeFront/src/app/components/match/matches-id/matches-id.component.ts
similarity index 93%
rename from FencerJudgeFront/src/app/components/matches-id/matches-id.component.ts
rename to FencerJudgeFront/src/app/components/match/matches-id/matches-id.component.ts
index 2e0be56..65d932b 100644
--- a/FencerJudgeFront/src/app/components/matches-id/matches-id.component.ts
+++ b/FencerJudgeFront/src/app/components/match/matches-id/matches-id.component.ts
@@ -1,12 +1,12 @@
 import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { AuthService } from '@services/auth.service';
+import { AuthService } from '@services/auth/auth.service';
 
-import { MatchesService } from '@services/matches.service';
+import { MatchesService } from '@services/matches/matches.service';
 import { MatchState, Matches } from '@interfaces/matches';
-import { PlayerService } from '@services/player.service';
+import { PlayerService } from '@services/player/player.service';
 import { Player } from '@interfaces/player';
-import { RefereeService } from '@services/referee.service';
+import { RefereeService } from '@services/referee/referee.service';
 import { Referee, RefereeLevel } from '@interfaces/referee';
 
 @Component({
diff --git a/FencerJudgeFront/src/app/components/matches/matches.component.css b/FencerJudgeFront/src/app/components/match/matches/matches.component.css
similarity index 100%
rename from FencerJudgeFront/src/app/components/matches/matches.component.css
rename to FencerJudgeFront/src/app/components/match/matches/matches.component.css
diff --git a/FencerJudgeFront/src/app/components/matches/matches.component.html b/FencerJudgeFront/src/app/components/match/matches/matches.component.html
similarity index 100%
rename from FencerJudgeFront/src/app/components/matches/matches.component.html
rename to FencerJudgeFront/src/app/components/match/matches/matches.component.html
diff --git a/FencerJudgeFront/src/app/components/matches/matches.component.spec.ts b/FencerJudgeFront/src/app/components/match/matches/matches.component.spec.ts
similarity index 100%
rename from FencerJudgeFront/src/app/components/matches/matches.component.spec.ts
rename to FencerJudgeFront/src/app/components/match/matches/matches.component.spec.ts
diff --git a/FencerJudgeFront/src/app/components/matches/matches.component.ts b/FencerJudgeFront/src/app/components/match/matches/matches.component.ts
similarity index 93%
rename from FencerJudgeFront/src/app/components/matches/matches.component.ts
rename to FencerJudgeFront/src/app/components/match/matches/matches.component.ts
index 623f011..a1cf3dc 100644
--- a/FencerJudgeFront/src/app/components/matches/matches.component.ts
+++ b/FencerJudgeFront/src/app/components/match/matches/matches.component.ts
@@ -1,10 +1,10 @@
 import { Component } from '@angular/core';
 import { Router } from '@angular/router';
 
-import { MatchesService } from '@services/matches.service';
+import { MatchesService } from '@services/matches/matches.service';
 import { Matches, MatchState } from '@interfaces/matches';
 
-import { PlayerService } from '@services/player.service';
+import { PlayerService } from '@services/player/player.service';
 import { Player } from '@interfaces/player';
 
 @Component({
diff --git a/FencerJudgeFront/src/app/guards/auth.guard.ts b/FencerJudgeFront/src/app/guards/auth.guard.ts
index b3ed4e3..2da4546 100644
--- a/FencerJudgeFront/src/app/guards/auth.guard.ts
+++ b/FencerJudgeFront/src/app/guards/auth.guard.ts
@@ -1,6 +1,6 @@
 import { inject } from '@angular/core';
 import { CanActivateFn, Router } from '@angular/router';
-import { AuthService } from '@services/auth.service';
+import { AuthService } from '@services/auth/auth.service';
 
 export const authGuard: CanActivateFn = (route, state) => {
   const authService = inject(AuthService);
diff --git a/FencerJudgeFront/src/app/services/auth.service.spec.ts b/FencerJudgeFront/src/app/services/auth/auth.service.spec.ts
similarity index 100%
rename from FencerJudgeFront/src/app/services/auth.service.spec.ts
rename to FencerJudgeFront/src/app/services/auth/auth.service.spec.ts
diff --git a/FencerJudgeFront/src/app/services/auth.service.ts b/FencerJudgeFront/src/app/services/auth/auth.service.ts
similarity index 100%
rename from FencerJudgeFront/src/app/services/auth.service.ts
rename to FencerJudgeFront/src/app/services/auth/auth.service.ts
diff --git a/FencerJudgeFront/src/app/services/matches.service.spec.ts b/FencerJudgeFront/src/app/services/matches/matches.service.spec.ts
similarity index 100%
rename from FencerJudgeFront/src/app/services/matches.service.spec.ts
rename to FencerJudgeFront/src/app/services/matches/matches.service.spec.ts
diff --git a/FencerJudgeFront/src/app/services/matches.service.ts b/FencerJudgeFront/src/app/services/matches/matches.service.ts
similarity index 100%
rename from FencerJudgeFront/src/app/services/matches.service.ts
rename to FencerJudgeFront/src/app/services/matches/matches.service.ts
diff --git a/FencerJudgeFront/src/app/services/player.service.spec.ts b/FencerJudgeFront/src/app/services/player/player.service.spec.ts
similarity index 100%
rename from FencerJudgeFront/src/app/services/player.service.spec.ts
rename to FencerJudgeFront/src/app/services/player/player.service.spec.ts
diff --git a/FencerJudgeFront/src/app/services/player.service.ts b/FencerJudgeFront/src/app/services/player/player.service.ts
similarity index 100%
rename from FencerJudgeFront/src/app/services/player.service.ts
rename to FencerJudgeFront/src/app/services/player/player.service.ts
diff --git a/FencerJudgeFront/src/app/services/referee.service.spec.ts b/FencerJudgeFront/src/app/services/referee/referee.service.spec.ts
similarity index 100%
rename from FencerJudgeFront/src/app/services/referee.service.spec.ts
rename to FencerJudgeFront/src/app/services/referee/referee.service.spec.ts
diff --git a/FencerJudgeFront/src/app/services/referee.service.ts b/FencerJudgeFront/src/app/services/referee/referee.service.ts
similarity index 100%
rename from FencerJudgeFront/src/app/services/referee.service.ts
rename to FencerJudgeFront/src/app/services/referee/referee.service.ts