diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 2701a63cf05469551ca0b8e103bd579e9f422fab..1279c5b43e693307657c1e5d9f88c5ec55913a05 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -1,6 +1,6 @@
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
-import { LoginPageComponent } from './components/login-page/login-page.component';
+import { LoginPageComponent } from './components/home/login-page/login-page.component';
 import { FooterImprintComponent } from './components/shared/footer-imprint/footer-imprint.component';
 import { PageNotFoundComponent } from './components/shared/page-not-found/page-not-found.component';
 import { CreatorModule } from './components/creator/creator.module';
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 7086311394794195b36616b02be30685be20a7dc..9597fe202d4cf7ff688c15dc735e2e6114ede633 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -1,13 +1,13 @@
 import { NgModule } from '@angular/core';
 import { AppComponent } from './app.component';
-import { LoginComponent } from './components/login/login.component';
-import { RegisterComponent } from './components/_dialogs/register/register.component';
-import { PasswordResetComponent } from './components/_dialogs/password-reset/password-reset.component';
+import { LoginComponent } from './components/home/login/login.component';
+import { RegisterComponent } from './components/home/_dialogs/register/register.component';
+import { PasswordResetComponent } from './components/home/_dialogs/password-reset/password-reset.component';
 import { AppRoutingModule } from './app-routing.module';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
 import { HTTP_INTERCEPTORS } from '@angular/common/http';
 import { UserService } from './services/http/user.service';
-import { LoginPageComponent } from './components/login-page/login-page.component';
+import { LoginPageComponent } from './components/home/login-page/login-page.component';
 import { NotificationService } from './services/util/notification.service';
 import { AuthenticationService } from './services/http/authentication.service';
 import { AuthenticationGuard } from './guards/authentication.guard';
@@ -16,7 +16,7 @@ import { CommentService } from './services/http/comment.service';
 import { DataStoreService } from './services/util/data-store.service';
 import { ContentService } from './services/http/content.service';
 import { ContentAnswerService } from './services/http/content-answer.service';
-import { UserActivationComponent } from './components/_dialogs/user-activation/user-activation.component';
+import { UserActivationComponent } from './components/home/_dialogs/user-activation/user-activation.component';
 import { AuthenticationInterceptor } from './interceptors/authentication.interceptor';
 import { GenericDataDialogComponent } from './components/shared/_dialogs/generic-data-dialog/generic-data-dialog.component';
 import { FooterLoginDialogComponent } from './components/shared/_dialogs/footer-login-dialog/footer-login-dialog.component';
diff --git a/src/app/components/home/_dialogs/password-reset/password-reset.component.ts b/src/app/components/home/_dialogs/password-reset/password-reset.component.ts
index 9057d61477585fd84ef5c52fc8ba2eb7ee5eb362..ff2378684ec1305d9484eb63a1d7cb5928a8c75c 100644
--- a/src/app/components/home/_dialogs/password-reset/password-reset.component.ts
+++ b/src/app/components/home/_dialogs/password-reset/password-reset.component.ts
@@ -2,8 +2,8 @@ import { Component, Inject, OnInit } from '@angular/core';
 import { FormControl, FormGroupDirective, NgForm, Validators } from '@angular/forms';
 import { ErrorStateMatcher, MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
 import { RegisterComponent } from '../register/register.component';
-import { AuthenticationService } from '../../../services/http/authentication.service';
-import { NotificationService } from '../../../services/util/notification.service';
+import { AuthenticationService } from '../../../../services/http/authentication.service';
+import { NotificationService } from '../../../../services/util/notification.service';
 import { TranslateService } from '@ngx-translate/core';
 
 export class PasswordResetErrorStateMatcher implements ErrorStateMatcher {
diff --git a/src/app/components/home/_dialogs/register/register.component.ts b/src/app/components/home/_dialogs/register/register.component.ts
index a34d2ed63fa5bab967644ef746a263a547911852..fb58693558c793ab18ede34cc6bc71806cd80361 100644
--- a/src/app/components/home/_dialogs/register/register.component.ts
+++ b/src/app/components/home/_dialogs/register/register.component.ts
@@ -1,8 +1,8 @@
 import { Component, Inject, OnInit } from '@angular/core';
 import { ErrorStateMatcher, MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
 import { FormControl, FormGroupDirective, NgForm, Validators } from '@angular/forms';
-import { AuthenticationService } from '../../../services/http/authentication.service';
-import { NotificationService } from '../../../services/util/notification.service';
+import { AuthenticationService } from '../../../../services/http/authentication.service';
+import { NotificationService } from '../../../../services/util/notification.service';
 import { TranslateService } from '@ngx-translate/core';
 
 export class RegisterErrorStateMatcher implements ErrorStateMatcher {
diff --git a/src/app/components/home/_dialogs/user-activation/user-activation.component.ts b/src/app/components/home/_dialogs/user-activation/user-activation.component.ts
index f9519ba3fc412c6e4cb2b876c3fa3f50995a403f..f0f71df0deb6b774d711a2c02a39686215c08054 100644
--- a/src/app/components/home/_dialogs/user-activation/user-activation.component.ts
+++ b/src/app/components/home/_dialogs/user-activation/user-activation.component.ts
@@ -1,6 +1,6 @@
 import { Component, Inject, OnInit } from '@angular/core';
-import { NotificationService } from '../../../services/util/notification.service';
-import { UserService } from '../../../services/http/user.service';
+import { NotificationService } from '../../../../services/util/notification.service';
+import { UserService } from '../../../../services/http/user.service';
 import { FormControl, Validators} from '@angular/forms';
 import { MAT_DIALOG_DATA, MatDialogRef} from '@angular/material';
 import { TranslateService } from '@ngx-translate/core';
diff --git a/src/app/components/home/login-page/login-page.component.ts b/src/app/components/home/login-page/login-page.component.ts
index c6b788cbdcd2433c107fab48573b6bcff786f880..05ba1d0157f30658ac913dfb601359d26ce048f1 100644
--- a/src/app/components/home/login-page/login-page.component.ts
+++ b/src/app/components/home/login-page/login-page.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { MatDialog } from '@angular/material';
 import { RegisterComponent } from '../_dialogs/register/register.component';
 import { PasswordResetComponent } from '../_dialogs/password-reset/password-reset.component';
-import { UserRole } from '../../models/user-roles.enum';
+import { UserRole } from '../../../models/user-roles.enum';
 
 @Component({
   selector: 'app-login-page',
diff --git a/src/app/components/home/login/login.component.ts b/src/app/components/home/login/login.component.ts
index 47278a73fb9df956dc1d64ee05a98868e36f5e11..c27b42247c48afc6315110660820ff42d2017172 100644
--- a/src/app/components/home/login/login.component.ts
+++ b/src/app/components/home/login/login.component.ts
@@ -1,10 +1,10 @@
 import { Component, Input, OnInit, OnChanges, SimpleChanges } from '@angular/core';
-import { AuthenticationService } from '../../services/http/authentication.service';
+import { AuthenticationService } from '../../../services/http/authentication.service';
 import { Router } from '@angular/router';
-import { NotificationService } from '../../services/util/notification.service';
+import { NotificationService } from '../../../services/util/notification.service';
 import { ErrorStateMatcher, MatDialog } from '@angular/material';
 import { FormControl, FormGroupDirective, NgForm, Validators } from '@angular/forms';
-import { UserRole } from '../../models/user-roles.enum';
+import { UserRole } from '../../../models/user-roles.enum';
 import { TranslateService } from '@ngx-translate/core';
 import { UserActivationComponent } from '../_dialogs/user-activation/user-activation.component';
 
diff --git a/src/app/components/shared/room-join/room-join.component.ts b/src/app/components/shared/room-join/room-join.component.ts
index 7525e1164ddc869e59c78701aab0946444c51c34..d8475228fc68e88e05628a710e3eedba68caeb99 100644
--- a/src/app/components/shared/room-join/room-join.component.ts
+++ b/src/app/components/shared/room-join/room-join.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { Room } from '../../../models/room';
 import { RoomService } from '../../../services/http/room.service';
 import { Router } from '@angular/router';
-import { RegisterErrorStateMatcher } from '../../_dialogs/register/register.component';
+import { RegisterErrorStateMatcher } from '../../home/_dialogs/register/register.component';
 import { FormControl, FormGroupDirective, NgForm, Validators } from '@angular/forms';
 import { ErrorStateMatcher } from '@angular/material';
 import { NotificationService } from '../../../services/util/notification.service';