diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 040c162adeb888f971bace875835cd20731728fd..750933cbd6b2648911323012f11af390cc0149bd 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -5,7 +5,7 @@ import { LoginScreenComponent } from './components/pages/login-screen/login-scre
 import { CreatorHomeScreenComponent } from './components/pages/creator-home-screen/creator-home-screen.component';
 import { CreateCommentComponent } from './components/pages/create-comment/create-comment.component';
 import { ParticipantHomeScreenComponent } from './components/pages/participant-home-screen/participant-home-screen.component';
-import { AuthenticationGuard } from './authentication.guard';
+import { AuthenticationGuard } from './guards/authentication.guard';
 import { UserRole } from './user-roles.enum';
 import { ParticipantRoomComponent } from './components/pages/participant-room/participant-room.component';
 import { CreatorRoomComponent } from './components/pages/creator-room/creator-room.component';
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 2a494a909b351e33e9af9d68f23961aedcabd54e..79d14e898d35eb6eb0e3381a42d1e8cfcf8ac889 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -54,7 +54,7 @@ import { RoomCreationComponent } from './components/dialogs/room-creation/room-c
 import { LoginScreenComponent } from './components/pages/login-screen/login-screen.component';
 import { NotificationService } from './notification.service';
 import { AuthenticationService } from './authentication.service';
-import { AuthenticationGuard } from './authentication.guard';
+import { AuthenticationGuard } from './guards/authentication.guard';
 import { ContentCreationComponent } from './content-creation/content-creation.component';
 import { RoomService } from './room.service';
 import { RoomListComponent } from './components/fragments/room-list/room-list.component';
diff --git a/src/app/authentication.guard.spec.ts b/src/app/guards/authentication.guard.spec.ts
similarity index 100%
rename from src/app/authentication.guard.spec.ts
rename to src/app/guards/authentication.guard.spec.ts
diff --git a/src/app/authentication.guard.ts b/src/app/guards/authentication.guard.ts
similarity index 86%
rename from src/app/authentication.guard.ts
rename to src/app/guards/authentication.guard.ts
index 4e4f004072101b72a224b54a4236be5b33d5202d..28db8c95edc448816003f67af2f79de994855cf5 100644
--- a/src/app/authentication.guard.ts
+++ b/src/app/guards/authentication.guard.ts
@@ -1,12 +1,12 @@
 import { Injectable } from '@angular/core';
 import { CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot, Router } from '@angular/router';
-import { AuthenticationService } from './authentication.service';
+import { AuthenticationService } from '../authentication.service';
 import 'rxjs/add/operator/map';
 import 'rxjs/add/observable/of';
 import 'rxjs/add/operator/catch';
-import { NotificationService } from './notification.service';
-import { UserRole } from './user-roles.enum';
-import { User } from './user';
+import { NotificationService } from '../notification.service';
+import { UserRole } from '../user-roles.enum';
+import { User } from '../user';
 
 @Injectable()
 export class AuthenticationGuard implements CanActivate {