diff --git a/frontend/src/app/app-routing.module.ts b/frontend/src/app/app-routing.module.ts
index 65130cf..fd45f92 100644
--- a/frontend/src/app/app-routing.module.ts
+++ b/frontend/src/app/app-routing.module.ts
@@ -3,9 +3,6 @@ import { RouterModule, Routes } from '@angular/router';
 import { HomeComponent } from './components/home/home.component';
 import { LoginDialogComponent } from './components/login/login-dialog.component';
 import { MessageComponent } from './components/message/message.component';
-import { TournamentsComponent } from './components/tournaments/tournaments.component';
-import { TournamentCreateComponent } from './components/tournament-create/tournament-create.component';
-import { UserDetailComponent } from './components/user-detail/user-detail.component';
 import { TeamSignupComponent } from './components/tournament/team-signup/team-signup.component';
 import { UserRegisterComponent } from './components/user-register/user-register.component';
 import { AuthGuard } from './guards/auth.guard';
@@ -13,6 +10,8 @@ import { AuthLayoutComponent } from './layouts/auth-layout/auth-layout.component
 import { MainLayoutComponent } from './layouts/main-layout/main-layout.component';
 import { BeerPongTableCreateComponent } from './components/beer-pong-table-create/beer-pong-table-create.component';
 import { BeerPongTableUpdateComponent } from './components/beer-pong-table-update/beer-pong-table-update.component';
+import { TournamentsComponent } from './components/tournament/tournaments/tournaments.component';
+import { TournamentCreateComponent } from './components/tournament/tournament-create/tournament-create.component';
 
 const routes: Routes = [
   {
diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts
index d217d88..2584748 100644
--- a/frontend/src/app/app.module.ts
+++ b/frontend/src/app/app.module.ts
@@ -19,8 +19,6 @@ import { MatCardModule } from '@angular/material/card';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { MatDialogModule, MatDialogRef } from '@angular/material/dialog';
 import { MatFormFieldModule } from '@angular/material/form-field';
-import { TournamentsComponent } from './components/tournaments/tournaments.component';
-import { TournamentCardComponent } from './components/tournament-card/tournament-card.component';
 import { UserDetailComponent } from './components/user-detail/user-detail.component';
 import { UserEditDetailsForm } from './components/user-edit-details-form/user-edit-details-form.component';
 import { UpdateUserComponent } from './components/update-user/update-user.component';
@@ -36,6 +34,8 @@ import { ConfirmDialogComponent } from './components/confirm-dialog/confirm-dial
 import { MatInputModule } from '@angular/material/input';
 import { CommonModule } from '@angular/common';
 import { TeamSignupComponent } from './components/tournament/team-signup/team-signup.component';
+import { TournamentsComponent } from './components/tournament/tournaments/tournaments.component';
+import { TournamentCardComponent } from './components/tournament/tournament-card/tournament-card.component';
 
 @NgModule({
   declarations: [
diff --git a/frontend/src/app/components/tournament-card/tournament-card.component.html b/frontend/src/app/components/tournament/tournament-card/tournament-card.component.html
similarity index 100%
rename from frontend/src/app/components/tournament-card/tournament-card.component.html
rename to frontend/src/app/components/tournament/tournament-card/tournament-card.component.html
diff --git a/frontend/src/app/components/tournament-card/tournament-card.component.scss b/frontend/src/app/components/tournament/tournament-card/tournament-card.component.scss
similarity index 100%
rename from frontend/src/app/components/tournament-card/tournament-card.component.scss
rename to frontend/src/app/components/tournament/tournament-card/tournament-card.component.scss
diff --git a/frontend/src/app/components/tournament-card/tournament-card.component.spec.ts b/frontend/src/app/components/tournament/tournament-card/tournament-card.component.spec.ts
similarity index 100%
rename from frontend/src/app/components/tournament-card/tournament-card.component.spec.ts
rename to frontend/src/app/components/tournament/tournament-card/tournament-card.component.spec.ts
diff --git a/frontend/src/app/components/tournament-card/tournament-card.component.ts b/frontend/src/app/components/tournament/tournament-card/tournament-card.component.ts
similarity index 100%
rename from frontend/src/app/components/tournament-card/tournament-card.component.ts
rename to frontend/src/app/components/tournament/tournament-card/tournament-card.component.ts
diff --git a/frontend/src/app/components/tournament-create/tournament-create.component.html b/frontend/src/app/components/tournament/tournament-create/tournament-create.component.html
similarity index 100%
rename from frontend/src/app/components/tournament-create/tournament-create.component.html
rename to frontend/src/app/components/tournament/tournament-create/tournament-create.component.html
diff --git a/frontend/src/app/components/tournament-create/tournament-create.component.scss b/frontend/src/app/components/tournament/tournament-create/tournament-create.component.scss
similarity index 100%
rename from frontend/src/app/components/tournament-create/tournament-create.component.scss
rename to frontend/src/app/components/tournament/tournament-create/tournament-create.component.scss
diff --git a/frontend/src/app/components/tournament-create/tournament-create.component.spec.ts b/frontend/src/app/components/tournament/tournament-create/tournament-create.component.spec.ts
similarity index 100%
rename from frontend/src/app/components/tournament-create/tournament-create.component.spec.ts
rename to frontend/src/app/components/tournament/tournament-create/tournament-create.component.spec.ts
diff --git a/frontend/src/app/components/tournament-create/tournament-create.component.ts b/frontend/src/app/components/tournament/tournament-create/tournament-create.component.ts
similarity index 98%
rename from frontend/src/app/components/tournament-create/tournament-create.component.ts
rename to frontend/src/app/components/tournament/tournament-create/tournament-create.component.ts
index 214f0cb..4459173 100644
--- a/frontend/src/app/components/tournament-create/tournament-create.component.ts
+++ b/frontend/src/app/components/tournament/tournament-create/tournament-create.component.ts
@@ -21,7 +21,7 @@ import { MatSnackBar } from '@angular/material/snack-bar';
 import { HttpErrorResponse } from '@angular/common/http';
 import { NgxMatTimepickerComponent, NgxMatTimepickerDirective } from 'ngx-mat-timepicker';
 import { isValidDate } from 'rxjs/internal/util/isDate';
-import { CustomDateAdapter } from '../../adapters/date-adapter';
+import { CustomDateAdapter } from '../../../adapters/date-adapter';
 
 @Component({
   selector: 'app-tournament-create',
diff --git a/frontend/src/app/components/tournaments/tournaments.component.html b/frontend/src/app/components/tournament/tournaments/tournaments.component.html
similarity index 100%
rename from frontend/src/app/components/tournaments/tournaments.component.html
rename to frontend/src/app/components/tournament/tournaments/tournaments.component.html
diff --git a/frontend/src/app/components/tournaments/tournaments.component.scss b/frontend/src/app/components/tournament/tournaments/tournaments.component.scss
similarity index 100%
rename from frontend/src/app/components/tournaments/tournaments.component.scss
rename to frontend/src/app/components/tournament/tournaments/tournaments.component.scss
diff --git a/frontend/src/app/components/tournaments/tournaments.component.spec.ts b/frontend/src/app/components/tournament/tournaments/tournaments.component.spec.ts
similarity index 100%
rename from frontend/src/app/components/tournaments/tournaments.component.spec.ts
rename to frontend/src/app/components/tournament/tournaments/tournaments.component.spec.ts
diff --git a/frontend/src/app/components/tournaments/tournaments.component.ts b/frontend/src/app/components/tournament/tournaments/tournaments.component.ts
similarity index 100%
rename from frontend/src/app/components/tournaments/tournaments.component.ts
rename to frontend/src/app/components/tournament/tournaments/tournaments.component.ts