From a42ebc3baff9c8718f044acc4b3a3f9f8d86ef7d Mon Sep 17 00:00:00 2001
From: Lukas Kimpel <lukas.kimpel@mni.thm.de>
Date: Tue, 20 Mar 2018 14:23:46 +0100
Subject: [PATCH] Move components in specific folders

---
 src/app/app-routing.module.ts                 | 26 ++++-----
 src/app/app.module.ts                         | 54 +++++++++----------
 .../password-reset.component.html             |  0
 .../password-reset.component.scss             |  0
 .../password-reset.component.spec.ts          |  0
 .../password-reset.component.ts               |  0
 .../dialogs}/register/register.component.html |  0
 .../dialogs}/register/register.component.scss |  0
 .../register/register.component.spec.ts       |  0
 .../dialogs}/register/register.component.ts   |  0
 .../room-creation.component.html              |  0
 .../room-creation.component.scss              |  0
 .../room-creation.component.spec.ts           |  0
 .../room-creation/room-creation.component.ts  |  6 +--
 .../room-deletion.component.html              |  0
 .../room-deletion.component.scss              |  0
 .../room-deletion.component.spec.ts           |  0
 .../room-deletion/room-deletion.component.ts  |  6 +--
 .../room-modification.component.html          |  0
 .../room-modification.component.scss          |  0
 .../room-modification.component.spec.ts       |  0
 .../room-modification.component.ts            |  6 +--
 .../answer-statistics.component.html          |  0
 .../answer-statistics.component.scss          |  0
 .../answer-statistics.component.spec.ts       |  0
 .../answer-statistics.component.ts            | 14 ++---
 .../comment-list/comment-list.component.html  |  0
 .../comment-list/comment-list.component.scss  |  0
 .../comment-list.component.spec.ts            |  0
 .../comment-list/comment-list.component.ts    | 14 ++---
 .../content-answers-list.component.html       |  0
 .../content-answers-list.component.scss       |  0
 .../content-answers-list.component.spec.ts    |  0
 .../content-answers-list.component.ts         |  6 +--
 .../content-list/content-list.component.html  |  0
 .../content-list/content-list.component.scss  |  0
 .../content-list.component.spec.ts            |  0
 .../content-list/content-list.component.ts    |  4 +-
 .../creator-choice-content.component.html     |  0
 .../creator-choice-content.component.scss     |  0
 .../creator-choice-content.component.spec.ts  |  0
 .../creator-choice-content.component.ts       |  6 +--
 .../creator-text-content.component.html       |  0
 .../creator-text-content.component.scss       |  0
 .../creator-text-content.component.spec.ts    |  0
 .../creator-text-content.component.ts         |  0
 .../join-room/join-room.component.html        |  0
 .../join-room/join-room.component.scss        |  0
 .../join-room/join-room.component.spec.ts     |  0
 .../join-room/join-room.component.ts          |  8 +--
 .../fragments}/login/login.component.html     |  0
 .../fragments}/login/login.component.scss     |  0
 .../fragments}/login/login.component.spec.ts  |  0
 .../fragments}/login/login.component.ts       | 10 ++--
 .../participant-choice-content.component.html |  0
 .../participant-choice-content.component.scss |  0
 ...rticipant-choice-content.component.spec.ts |  0
 .../participant-choice-content.component.ts   |  6 +--
 .../participant-text-content.component.html   |  0
 .../participant-text-content.component.scss   |  0
 ...participant-text-content.component.spec.ts |  0
 .../participant-text-content.component.ts     |  6 +--
 .../room-list/room-list.component.html        |  0
 .../room-list/room-list.component.scss        |  0
 .../room-list/room-list.component.spec.ts     |  0
 .../room-list/room-list.component.ts          |  8 +--
 .../add-content/add-content.component.html    |  0
 .../add-content/add-content.component.scss    |  0
 .../add-content/add-content.component.spec.ts |  0
 .../add-content/add-content.component.ts      |  0
 .../content-detail.component.html             |  0
 .../content-detail.component.scss             |  0
 .../content-detail.component.spec.ts          |  0
 .../content-detail.component.ts               |  4 +-
 .../create-comment.component.html             |  0
 .../create-comment.component.scss             |  0
 .../create-comment.component.spec.ts          |  0
 .../create-comment.component.ts               | 16 +++---
 .../creator-home-screen.component.html        |  0
 .../creator-home-screen.component.scss        |  0
 .../creator-home-screen.component.spec.ts     |  0
 .../creator-home-screen.component.ts          |  2 +-
 .../creator-room/creator-room.component.html  |  0
 .../creator-room/creator-room.component.scss  |  0
 .../creator-room.component.spec.ts            |  0
 .../creator-room/creator-room.component.ts    | 10 ++--
 .../login-screen/login-screen.component.html  |  0
 .../login-screen/login-screen.component.scss  |  0
 .../login-screen.component.spec.ts            |  0
 .../login-screen/login-screen.component.ts    |  0
 .../page-not-found.component.html             |  0
 .../page-not-found.component.scss             |  0
 .../page-not-found.component.spec.ts          |  0
 .../page-not-found.component.ts               |  0
 ...ipant-content-carousel-page.component.html |  0
 ...ipant-content-carousel-page.component.scss |  0
 ...nt-content-carousel-page.component.spec.ts |  0
 ...icipant-content-carousel-page.component.ts |  4 +-
 .../participant-home-screen.component.html    |  0
 .../participant-home-screen.component.scss    |  0
 .../participant-home-screen.component.spec.ts |  0
 .../participant-home-screen.component.ts      |  0
 .../participant-room.component.html           |  0
 .../participant-room.component.scss           |  0
 .../participant-room.component.spec.ts        |  0
 .../participant-room.component.ts             |  4 +-
 .../pages}/room/room.component.html           |  0
 .../pages}/room/room.component.scss           |  0
 .../pages}/room/room.component.spec.ts        |  0
 .../pages}/room/room.component.ts             |  4 +-
 .../content-answers.component.html            |  7 ---
 .../content-answers.component.scss            |  0
 .../content-answers.component.spec.ts         | 25 ---------
 .../content-answers.component.ts              | 14 -----
 .../content-creation.component.html           | 23 --------
 .../content-creation.component.scss           |  0
 .../content-creation.component.spec.ts        | 25 ---------
 .../content-creation.component.ts             | 48 -----------------
 118 files changed, 112 insertions(+), 254 deletions(-)
 rename src/app/{ => components/dialogs}/password-reset/password-reset.component.html (100%)
 rename src/app/{ => components/dialogs}/password-reset/password-reset.component.scss (100%)
 rename src/app/{ => components/dialogs}/password-reset/password-reset.component.spec.ts (100%)
 rename src/app/{ => components/dialogs}/password-reset/password-reset.component.ts (100%)
 rename src/app/{ => components/dialogs}/register/register.component.html (100%)
 rename src/app/{ => components/dialogs}/register/register.component.scss (100%)
 rename src/app/{ => components/dialogs}/register/register.component.spec.ts (100%)
 rename src/app/{ => components/dialogs}/register/register.component.ts (100%)
 rename src/app/{ => components/dialogs}/room-creation/room-creation.component.html (100%)
 rename src/app/{ => components/dialogs}/room-creation/room-creation.component.scss (100%)
 rename src/app/{ => components/dialogs}/room-creation/room-creation.component.spec.ts (100%)
 rename src/app/{ => components/dialogs}/room-creation/room-creation.component.ts (90%)
 rename src/app/{ => components/dialogs}/room-deletion/room-deletion.component.html (100%)
 rename src/app/{ => components/dialogs}/room-deletion/room-deletion.component.scss (100%)
 rename src/app/{ => components/dialogs}/room-deletion/room-deletion.component.spec.ts (100%)
 rename src/app/{ => components/dialogs}/room-deletion/room-deletion.component.ts (83%)
 rename src/app/{ => components/dialogs}/room-modification/room-modification.component.html (100%)
 rename src/app/{ => components/dialogs}/room-modification/room-modification.component.scss (100%)
 rename src/app/{ => components/dialogs}/room-modification/room-modification.component.spec.ts (100%)
 rename src/app/{ => components/dialogs}/room-modification/room-modification.component.ts (83%)
 rename src/app/{ => components/fragments}/answer-statistics/answer-statistics.component.html (100%)
 rename src/app/{ => components/fragments}/answer-statistics/answer-statistics.component.scss (100%)
 rename src/app/{ => components/fragments}/answer-statistics/answer-statistics.component.spec.ts (100%)
 rename src/app/{ => components/fragments}/answer-statistics/answer-statistics.component.ts (88%)
 rename src/app/{ => components/fragments}/comment-list/comment-list.component.html (100%)
 rename src/app/{ => components/fragments}/comment-list/comment-list.component.scss (100%)
 rename src/app/{ => components/fragments}/comment-list/comment-list.component.spec.ts (100%)
 rename src/app/{ => components/fragments}/comment-list/comment-list.component.ts (84%)
 rename src/app/{ => components/fragments}/content-answers-list/content-answers-list.component.html (100%)
 rename src/app/{ => components/fragments}/content-answers-list/content-answers-list.component.scss (100%)
 rename src/app/{ => components/fragments}/content-answers-list/content-answers-list.component.spec.ts (100%)
 rename src/app/{ => components/fragments}/content-answers-list/content-answers-list.component.ts (81%)
 rename src/app/{ => components/fragments}/content-list/content-list.component.html (100%)
 rename src/app/{ => components/fragments}/content-list/content-list.component.scss (100%)
 rename src/app/{ => components/fragments}/content-list/content-list.component.spec.ts (100%)
 rename src/app/{ => components/fragments}/content-list/content-list.component.ts (87%)
 rename src/app/{ => components/fragments}/creator-choice-content/creator-choice-content.component.html (100%)
 rename src/app/{ => components/fragments}/creator-choice-content/creator-choice-content.component.scss (100%)
 rename src/app/{ => components/fragments}/creator-choice-content/creator-choice-content.component.spec.ts (100%)
 rename src/app/{ => components/fragments}/creator-choice-content/creator-choice-content.component.ts (91%)
 rename src/app/{ => components/fragments}/creator-text-content/creator-text-content.component.html (100%)
 rename src/app/{ => components/fragments}/creator-text-content/creator-text-content.component.scss (100%)
 rename src/app/{ => components/fragments}/creator-text-content/creator-text-content.component.spec.ts (100%)
 rename src/app/{ => components/fragments}/creator-text-content/creator-text-content.component.ts (100%)
 rename src/app/{ => components/fragments}/join-room/join-room.component.html (100%)
 rename src/app/{ => components/fragments}/join-room/join-room.component.scss (100%)
 rename src/app/{ => components/fragments}/join-room/join-room.component.spec.ts (100%)
 rename src/app/{ => components/fragments}/join-room/join-room.component.ts (87%)
 rename src/app/{ => components/fragments}/login/login.component.html (100%)
 rename src/app/{ => components/fragments}/login/login.component.scss (100%)
 rename src/app/{ => components/fragments}/login/login.component.spec.ts (100%)
 rename src/app/{ => components/fragments}/login/login.component.ts (88%)
 rename src/app/{ => components/fragments}/participant-choice-content/participant-choice-content.component.html (100%)
 rename src/app/{ => components/fragments}/participant-choice-content/participant-choice-content.component.scss (100%)
 rename src/app/{ => components/fragments}/participant-choice-content/participant-choice-content.component.spec.ts (100%)
 rename src/app/{ => components/fragments}/participant-choice-content/participant-choice-content.component.ts (89%)
 rename src/app/{ => components/fragments}/participant-text-content/participant-text-content.component.html (100%)
 rename src/app/{ => components/fragments}/participant-text-content/participant-text-content.component.scss (100%)
 rename src/app/{ => components/fragments}/participant-text-content/participant-text-content.component.spec.ts (100%)
 rename src/app/{ => components/fragments}/participant-text-content/participant-text-content.component.ts (83%)
 rename src/app/{ => components/fragments}/room-list/room-list.component.html (100%)
 rename src/app/{ => components/fragments}/room-list/room-list.component.scss (100%)
 rename src/app/{ => components/fragments}/room-list/room-list.component.spec.ts (100%)
 rename src/app/{ => components/fragments}/room-list/room-list.component.ts (84%)
 rename src/app/{ => components/pages}/add-content/add-content.component.html (100%)
 rename src/app/{ => components/pages}/add-content/add-content.component.scss (100%)
 rename src/app/{ => components/pages}/add-content/add-content.component.spec.ts (100%)
 rename src/app/{ => components/pages}/add-content/add-content.component.ts (100%)
 rename src/app/{ => components/pages}/content-detail/content-detail.component.html (100%)
 rename src/app/{ => components/pages}/content-detail/content-detail.component.scss (100%)
 rename src/app/{ => components/pages}/content-detail/content-detail.component.spec.ts (100%)
 rename src/app/{ => components/pages}/content-detail/content-detail.component.ts (87%)
 rename src/app/{ => components/pages}/create-comment/create-comment.component.html (100%)
 rename src/app/{ => components/pages}/create-comment/create-comment.component.scss (100%)
 rename src/app/{ => components/pages}/create-comment/create-comment.component.spec.ts (100%)
 rename src/app/{ => components/pages}/create-comment/create-comment.component.ts (77%)
 rename src/app/{ => components/pages}/creator-home-screen/creator-home-screen.component.html (100%)
 rename src/app/{ => components/pages}/creator-home-screen/creator-home-screen.component.scss (100%)
 rename src/app/{ => components/pages}/creator-home-screen/creator-home-screen.component.spec.ts (100%)
 rename src/app/{ => components/pages}/creator-home-screen/creator-home-screen.component.ts (84%)
 rename src/app/{ => components/pages}/creator-room/creator-room.component.html (100%)
 rename src/app/{ => components/pages}/creator-room/creator-room.component.scss (100%)
 rename src/app/{ => components/pages}/creator-room/creator-room.component.spec.ts (100%)
 rename src/app/{ => components/pages}/creator-room/creator-room.component.ts (89%)
 rename src/app/{ => components/pages}/login-screen/login-screen.component.html (100%)
 rename src/app/{ => components/pages}/login-screen/login-screen.component.scss (100%)
 rename src/app/{ => components/pages}/login-screen/login-screen.component.spec.ts (100%)
 rename src/app/{ => components/pages}/login-screen/login-screen.component.ts (100%)
 rename src/app/{ => components/pages}/page-not-found/page-not-found.component.html (100%)
 rename src/app/{ => components/pages}/page-not-found/page-not-found.component.scss (100%)
 rename src/app/{ => components/pages}/page-not-found/page-not-found.component.spec.ts (100%)
 rename src/app/{ => components/pages}/page-not-found/page-not-found.component.ts (100%)
 rename src/app/{ => components/pages}/participant-content-carousel-page/participant-content-carousel-page.component.html (100%)
 rename src/app/{ => components/pages}/participant-content-carousel-page/participant-content-carousel-page.component.scss (100%)
 rename src/app/{ => components/pages}/participant-content-carousel-page/participant-content-carousel-page.component.spec.ts (100%)
 rename src/app/{ => components/pages}/participant-content-carousel-page/participant-content-carousel-page.component.ts (81%)
 rename src/app/{ => components/pages}/participant-home-screen/participant-home-screen.component.html (100%)
 rename src/app/{ => components/pages}/participant-home-screen/participant-home-screen.component.scss (100%)
 rename src/app/{ => components/pages}/participant-home-screen/participant-home-screen.component.spec.ts (100%)
 rename src/app/{ => components/pages}/participant-home-screen/participant-home-screen.component.ts (100%)
 rename src/app/{ => components/pages}/participant-room/participant-room.component.html (100%)
 rename src/app/{ => components/pages}/participant-room/participant-room.component.scss (100%)
 rename src/app/{ => components/pages}/participant-room/participant-room.component.spec.ts (100%)
 rename src/app/{ => components/pages}/participant-room/participant-room.component.ts (90%)
 rename src/app/{ => components/pages}/room/room.component.html (100%)
 rename src/app/{ => components/pages}/room/room.component.scss (100%)
 rename src/app/{ => components/pages}/room/room.component.spec.ts (100%)
 rename src/app/{ => components/pages}/room/room.component.ts (90%)
 delete mode 100644 src/app/content-answers/content-answers.component.html
 delete mode 100644 src/app/content-answers/content-answers.component.scss
 delete mode 100644 src/app/content-answers/content-answers.component.spec.ts
 delete mode 100644 src/app/content-answers/content-answers.component.ts
 delete mode 100644 src/app/content-creation/content-creation.component.html
 delete mode 100644 src/app/content-creation/content-creation.component.scss
 delete mode 100644 src/app/content-creation/content-creation.component.spec.ts
 delete mode 100644 src/app/content-creation/content-creation.component.ts

diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 23b61440d..040c162ad 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -1,20 +1,20 @@
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
-import { PageNotFoundComponent } from './page-not-found/page-not-found.component';
-import { LoginScreenComponent } from './login-screen/login-screen.component';
-import { CreatorHomeScreenComponent } from './creator-home-screen/creator-home-screen.component';
-import { CreateCommentComponent } from './create-comment/create-comment.component';
-import { ParticipantHomeScreenComponent } from './participant-home-screen/participant-home-screen.component';
+import { PageNotFoundComponent } from './components/pages/page-not-found/page-not-found.component';
+import { LoginScreenComponent } from './components/pages/login-screen/login-screen.component';
+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 { UserRole } from './user-roles.enum';
-import { ParticipantRoomComponent } from './participant-room/participant-room.component';
-import { CreatorRoomComponent } from './creator-room/creator-room.component';
-import { CommentListComponent } from './comment-list/comment-list.component';
-import { ContentListComponent } from './content-list/content-list.component';
-import { ContentDetailComponent } from './content-detail/content-detail.component';
-import { AnswerStatisticsComponent } from './answer-statistics/answer-statistics.component';
-import { AddContentComponent } from './add-content/add-content.component';
-import { ParticipantContentCarouselPageComponent } from './participant-content-carousel-page/participant-content-carousel-page.component';
+import { ParticipantRoomComponent } from './components/pages/participant-room/participant-room.component';
+import { CreatorRoomComponent } from './components/pages/creator-room/creator-room.component';
+import { CommentListComponent } from './components/fragments/comment-list/comment-list.component';
+import { ContentListComponent } from './components/fragments/content-list/content-list.component';
+import { ContentDetailComponent } from './components/pages/content-detail/content-detail.component';
+import { AnswerStatisticsComponent } from './components/fragments/answer-statistics/answer-statistics.component';
+import { AddContentComponent } from './components/pages/add-content/add-content.component';
+import { ParticipantContentCarouselPageComponent } from './components/pages/participant-content-carousel-page/participant-content-carousel-page.component';
 
 const routes: Routes = [
   {
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index ea85e15dc..2a494a909 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -4,15 +4,15 @@ import { NgModule } from '@angular/core';
 
 import { AppComponent } from './app.component';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { JoinRoomComponent } from './join-room/join-room.component';
-import { LoginComponent } from './login/login.component';
-import { RegisterComponent } from './register/register.component';
-import { PasswordResetComponent } from './password-reset/password-reset.component';
-import { CommentListComponent } from './comment-list/comment-list.component';
+import { JoinRoomComponent } from './components/fragments/join-room/join-room.component';
+import { LoginComponent } from './components/fragments/login/login.component';
+import { RegisterComponent } from './components/dialogs/register/register.component';
+import { PasswordResetComponent } from './components/dialogs/password-reset/password-reset.component';
+import { CommentListComponent } from './components/fragments/comment-list/comment-list.component';
 
 import { AppRoutingModule } from './app-routing.module';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { PageNotFoundComponent } from './page-not-found/page-not-found.component';
+import { PageNotFoundComponent } from './components/pages/page-not-found/page-not-found.component';
 import { FlexLayoutModule } from '@angular/flex-layout';
 import {
   MatAutocompleteModule,
@@ -49,36 +49,36 @@ import {
 } from '@angular/material';
 import { ContentAnswersComponent } from './content-answers/content-answers.component';
 import { HTTP_INTERCEPTORS, HttpClientModule } from '@angular/common/http';
-import { RoomComponent } from './room/room.component';
-import { RoomCreationComponent } from './room-creation/room-creation.component';
-import { LoginScreenComponent } from './login-screen/login-screen.component';
+import { RoomComponent } from './components/pages/room/room.component';
+import { RoomCreationComponent } from './components/dialogs/room-creation/room-creation.component';
+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 { ContentCreationComponent } from './content-creation/content-creation.component';
 import { RoomService } from './room.service';
-import { RoomListComponent } from './room-list/room-list.component';
-import { CreatorHomeScreenComponent } from './creator-home-screen/creator-home-screen.component';
-import { CreateCommentComponent } from './create-comment/create-comment.component';
+import { RoomListComponent } from './components/fragments/room-list/room-list.component';
+import { CreatorHomeScreenComponent } from './components/pages/creator-home-screen/creator-home-screen.component';
+import { CreateCommentComponent } from './components/pages/create-comment/create-comment.component';
 import { CommentService } from './comment.service';
-import { ParticipantHomeScreenComponent } from './participant-home-screen/participant-home-screen.component';
-import { ParticipantRoomComponent } from './participant-room/participant-room.component';
+import { ParticipantHomeScreenComponent } from './components/pages/participant-home-screen/participant-home-screen.component';
+import { ParticipantRoomComponent } from './components/pages/participant-room/participant-room.component';
 import { DataStoreService } from './data-store.service';
-import { CreatorRoomComponent } from './creator-room/creator-room.component';
-import { ContentDetailComponent } from './content-detail/content-detail.component';
-import { ContentListComponent } from './content-list/content-list.component';
+import { CreatorRoomComponent } from './components/pages/creator-room/creator-room.component';
+import { ContentDetailComponent } from './components/pages/content-detail/content-detail.component';
+import { ContentListComponent } from './components/fragments/content-list/content-list.component';
 import { ContentService } from './content.service';
-import { ContentAnswersListComponent } from './content-answers-list/content-answers-list.component';
+import { ContentAnswersListComponent } from './components/fragments/content-answers-list/content-answers-list.component';
 import { ContentAnswerService } from './content-answer.service';
-import { RoomDeletionComponent } from './room-deletion/room-deletion.component';
-import { AnswerStatisticsComponent } from './answer-statistics/answer-statistics.component';
-import { RoomModificationComponent } from './room-modification/room-modification.component';
-import { ParticipantChoiceContentComponent } from './participant-choice-content/participant-choice-content.component';
-import { CreatorChoiceContentComponent } from './creator-choice-content/creator-choice-content.component';
-import { AddContentComponent } from './add-content/add-content.component';
-import { ParticipantContentCarouselPageComponent } from './participant-content-carousel-page/participant-content-carousel-page.component';
-import { ParticipantTextContentComponent } from './participant-text-content/participant-text-content.component';
-import { CreatorTextContentComponent } from './creator-text-content/creator-text-content.component';
+import { RoomDeletionComponent } from './components/dialogs/room-deletion/room-deletion.component';
+import { AnswerStatisticsComponent } from './components/fragments/answer-statistics/answer-statistics.component';
+import { RoomModificationComponent } from './components/dialogs/room-modification/room-modification.component';
+import { ParticipantChoiceContentComponent } from './components/fragments/participant-choice-content/participant-choice-content.component';
+import { CreatorChoiceContentComponent } from './components/fragments/creator-choice-content/creator-choice-content.component';
+import { AddContentComponent } from './components/pages/add-content/add-content.component';
+import { ParticipantContentCarouselPageComponent } from './components/pages/participant-content-carousel-page/participant-content-carousel-page.component';
+import { ParticipantTextContentComponent } from './components/fragments/participant-text-content/participant-text-content.component';
+import { CreatorTextContentComponent } from './components/fragments/creator-text-content/creator-text-content.component';
 import { AuthenticationInterceptor } from './authentication.interceptor';
 
 @NgModule({
diff --git a/src/app/password-reset/password-reset.component.html b/src/app/components/dialogs/password-reset/password-reset.component.html
similarity index 100%
rename from src/app/password-reset/password-reset.component.html
rename to src/app/components/dialogs/password-reset/password-reset.component.html
diff --git a/src/app/password-reset/password-reset.component.scss b/src/app/components/dialogs/password-reset/password-reset.component.scss
similarity index 100%
rename from src/app/password-reset/password-reset.component.scss
rename to src/app/components/dialogs/password-reset/password-reset.component.scss
diff --git a/src/app/password-reset/password-reset.component.spec.ts b/src/app/components/dialogs/password-reset/password-reset.component.spec.ts
similarity index 100%
rename from src/app/password-reset/password-reset.component.spec.ts
rename to src/app/components/dialogs/password-reset/password-reset.component.spec.ts
diff --git a/src/app/password-reset/password-reset.component.ts b/src/app/components/dialogs/password-reset/password-reset.component.ts
similarity index 100%
rename from src/app/password-reset/password-reset.component.ts
rename to src/app/components/dialogs/password-reset/password-reset.component.ts
diff --git a/src/app/register/register.component.html b/src/app/components/dialogs/register/register.component.html
similarity index 100%
rename from src/app/register/register.component.html
rename to src/app/components/dialogs/register/register.component.html
diff --git a/src/app/register/register.component.scss b/src/app/components/dialogs/register/register.component.scss
similarity index 100%
rename from src/app/register/register.component.scss
rename to src/app/components/dialogs/register/register.component.scss
diff --git a/src/app/register/register.component.spec.ts b/src/app/components/dialogs/register/register.component.spec.ts
similarity index 100%
rename from src/app/register/register.component.spec.ts
rename to src/app/components/dialogs/register/register.component.spec.ts
diff --git a/src/app/register/register.component.ts b/src/app/components/dialogs/register/register.component.ts
similarity index 100%
rename from src/app/register/register.component.ts
rename to src/app/components/dialogs/register/register.component.ts
diff --git a/src/app/room-creation/room-creation.component.html b/src/app/components/dialogs/room-creation/room-creation.component.html
similarity index 100%
rename from src/app/room-creation/room-creation.component.html
rename to src/app/components/dialogs/room-creation/room-creation.component.html
diff --git a/src/app/room-creation/room-creation.component.scss b/src/app/components/dialogs/room-creation/room-creation.component.scss
similarity index 100%
rename from src/app/room-creation/room-creation.component.scss
rename to src/app/components/dialogs/room-creation/room-creation.component.scss
diff --git a/src/app/room-creation/room-creation.component.spec.ts b/src/app/components/dialogs/room-creation/room-creation.component.spec.ts
similarity index 100%
rename from src/app/room-creation/room-creation.component.spec.ts
rename to src/app/components/dialogs/room-creation/room-creation.component.spec.ts
diff --git a/src/app/room-creation/room-creation.component.ts b/src/app/components/dialogs/room-creation/room-creation.component.ts
similarity index 90%
rename from src/app/room-creation/room-creation.component.ts
rename to src/app/components/dialogs/room-creation/room-creation.component.ts
index 01733d1da..e4a3d9fbb 100644
--- a/src/app/room-creation/room-creation.component.ts
+++ b/src/app/components/dialogs/room-creation/room-creation.component.ts
@@ -1,8 +1,8 @@
 import { Component, Inject, OnInit } from '@angular/core';
-import { RoomService } from '../room.service';
-import { Room } from '../room';
+import { RoomService } from '../../../room.service';
+import { Room } from '../../../room';
 import { Router } from '@angular/router';
-import { NotificationService } from '../notification.service';
+import { NotificationService } from '../../../notification.service';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
 
 @Component({
diff --git a/src/app/room-deletion/room-deletion.component.html b/src/app/components/dialogs/room-deletion/room-deletion.component.html
similarity index 100%
rename from src/app/room-deletion/room-deletion.component.html
rename to src/app/components/dialogs/room-deletion/room-deletion.component.html
diff --git a/src/app/room-deletion/room-deletion.component.scss b/src/app/components/dialogs/room-deletion/room-deletion.component.scss
similarity index 100%
rename from src/app/room-deletion/room-deletion.component.scss
rename to src/app/components/dialogs/room-deletion/room-deletion.component.scss
diff --git a/src/app/room-deletion/room-deletion.component.spec.ts b/src/app/components/dialogs/room-deletion/room-deletion.component.spec.ts
similarity index 100%
rename from src/app/room-deletion/room-deletion.component.spec.ts
rename to src/app/components/dialogs/room-deletion/room-deletion.component.spec.ts
diff --git a/src/app/room-deletion/room-deletion.component.ts b/src/app/components/dialogs/room-deletion/room-deletion.component.ts
similarity index 83%
rename from src/app/room-deletion/room-deletion.component.ts
rename to src/app/components/dialogs/room-deletion/room-deletion.component.ts
index 55b5a1cf1..e05371e3e 100644
--- a/src/app/room-deletion/room-deletion.component.ts
+++ b/src/app/components/dialogs/room-deletion/room-deletion.component.ts
@@ -1,10 +1,10 @@
 import { Component, Inject, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
-import { NotificationService } from '../notification.service';
+import { NotificationService } from '../../../notification.service';
 import { RoomCreationComponent } from '../room-creation/room-creation.component';
-import { RoomService } from '../room.service';
-import { Room } from '../room';
+import { RoomService } from '../../../room.service';
+import { Room } from '../../../room';
 
 @Component({
   selector: 'app-room-deletion',
diff --git a/src/app/room-modification/room-modification.component.html b/src/app/components/dialogs/room-modification/room-modification.component.html
similarity index 100%
rename from src/app/room-modification/room-modification.component.html
rename to src/app/components/dialogs/room-modification/room-modification.component.html
diff --git a/src/app/room-modification/room-modification.component.scss b/src/app/components/dialogs/room-modification/room-modification.component.scss
similarity index 100%
rename from src/app/room-modification/room-modification.component.scss
rename to src/app/components/dialogs/room-modification/room-modification.component.scss
diff --git a/src/app/room-modification/room-modification.component.spec.ts b/src/app/components/dialogs/room-modification/room-modification.component.spec.ts
similarity index 100%
rename from src/app/room-modification/room-modification.component.spec.ts
rename to src/app/components/dialogs/room-modification/room-modification.component.spec.ts
diff --git a/src/app/room-modification/room-modification.component.ts b/src/app/components/dialogs/room-modification/room-modification.component.ts
similarity index 83%
rename from src/app/room-modification/room-modification.component.ts
rename to src/app/components/dialogs/room-modification/room-modification.component.ts
index 54573ac6e..d4c4f1bc7 100644
--- a/src/app/room-modification/room-modification.component.ts
+++ b/src/app/components/dialogs/room-modification/room-modification.component.ts
@@ -1,9 +1,9 @@
 import { Component, Inject, OnInit } from '@angular/core';
-import { Room } from '../room';
-import { RoomService } from '../room.service';
+import { Room } from '../../../room';
+import { RoomService } from '../../../room.service';
 import { RoomCreationComponent } from '../room-creation/room-creation.component';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
-import { NotificationService } from '../notification.service';
+import { NotificationService } from '../../../notification.service';
 import { Router } from '@angular/router';
 
 @Component({
diff --git a/src/app/answer-statistics/answer-statistics.component.html b/src/app/components/fragments/answer-statistics/answer-statistics.component.html
similarity index 100%
rename from src/app/answer-statistics/answer-statistics.component.html
rename to src/app/components/fragments/answer-statistics/answer-statistics.component.html
diff --git a/src/app/answer-statistics/answer-statistics.component.scss b/src/app/components/fragments/answer-statistics/answer-statistics.component.scss
similarity index 100%
rename from src/app/answer-statistics/answer-statistics.component.scss
rename to src/app/components/fragments/answer-statistics/answer-statistics.component.scss
diff --git a/src/app/answer-statistics/answer-statistics.component.spec.ts b/src/app/components/fragments/answer-statistics/answer-statistics.component.spec.ts
similarity index 100%
rename from src/app/answer-statistics/answer-statistics.component.spec.ts
rename to src/app/components/fragments/answer-statistics/answer-statistics.component.spec.ts
diff --git a/src/app/answer-statistics/answer-statistics.component.ts b/src/app/components/fragments/answer-statistics/answer-statistics.component.ts
similarity index 88%
rename from src/app/answer-statistics/answer-statistics.component.ts
rename to src/app/components/fragments/answer-statistics/answer-statistics.component.ts
index 686f82be5..9ba05072c 100644
--- a/src/app/answer-statistics/answer-statistics.component.ts
+++ b/src/app/components/fragments/answer-statistics/answer-statistics.component.ts
@@ -1,12 +1,12 @@
 import { Component, Input, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { RoomService } from '../room.service';
-import { Content } from '../content';
-import { ContentService } from '../content.service';
-import { ContentAnswerService } from '../content-answer.service';
-import { AnswerText } from '../answer-text';
-import { ChoiceAnswer } from '../choice-answer';
-import { ContentType } from '../content-type';
+import { RoomService } from '../../../room.service';
+import { Content } from '../../../content';
+import { ContentService } from '../../../content.service';
+import { ContentAnswerService } from '../../../content-answer.service';
+import { AnswerText } from '../../../answer-text';
+import { ChoiceAnswer } from '../../../choice-answer';
+import { ContentType } from '../../../content-type';
 
 @Component({
   selector: 'app-answer-statistics',
diff --git a/src/app/comment-list/comment-list.component.html b/src/app/components/fragments/comment-list/comment-list.component.html
similarity index 100%
rename from src/app/comment-list/comment-list.component.html
rename to src/app/components/fragments/comment-list/comment-list.component.html
diff --git a/src/app/comment-list/comment-list.component.scss b/src/app/components/fragments/comment-list/comment-list.component.scss
similarity index 100%
rename from src/app/comment-list/comment-list.component.scss
rename to src/app/components/fragments/comment-list/comment-list.component.scss
diff --git a/src/app/comment-list/comment-list.component.spec.ts b/src/app/components/fragments/comment-list/comment-list.component.spec.ts
similarity index 100%
rename from src/app/comment-list/comment-list.component.spec.ts
rename to src/app/components/fragments/comment-list/comment-list.component.spec.ts
diff --git a/src/app/comment-list/comment-list.component.ts b/src/app/components/fragments/comment-list/comment-list.component.ts
similarity index 84%
rename from src/app/comment-list/comment-list.component.ts
rename to src/app/components/fragments/comment-list/comment-list.component.ts
index f952012f1..3cdf6e20d 100644
--- a/src/app/comment-list/comment-list.component.ts
+++ b/src/app/components/fragments/comment-list/comment-list.component.ts
@@ -1,13 +1,13 @@
 import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { Location } from '@angular/common';
-import { Comment } from '../comment';
-import { CommentService } from '../comment.service';
-import { RoomService } from '../room.service';
-import { NotificationService } from '../notification.service';
-import { AuthenticationService } from '../authentication.service';
-import { UserRole } from '../user-roles.enum';
-import { User } from '../user';
+import { Comment } from '../../../comment';
+import { CommentService } from '../../../comment.service';
+import { RoomService } from '../../../room.service';
+import { NotificationService } from '../../../notification.service';
+import { AuthenticationService } from '../../../authentication.service';
+import { UserRole } from '../../../user-roles.enum';
+import { User } from '../../../user';
 
 @Component({
   selector: 'app-comment-list',
diff --git a/src/app/content-answers-list/content-answers-list.component.html b/src/app/components/fragments/content-answers-list/content-answers-list.component.html
similarity index 100%
rename from src/app/content-answers-list/content-answers-list.component.html
rename to src/app/components/fragments/content-answers-list/content-answers-list.component.html
diff --git a/src/app/content-answers-list/content-answers-list.component.scss b/src/app/components/fragments/content-answers-list/content-answers-list.component.scss
similarity index 100%
rename from src/app/content-answers-list/content-answers-list.component.scss
rename to src/app/components/fragments/content-answers-list/content-answers-list.component.scss
diff --git a/src/app/content-answers-list/content-answers-list.component.spec.ts b/src/app/components/fragments/content-answers-list/content-answers-list.component.spec.ts
similarity index 100%
rename from src/app/content-answers-list/content-answers-list.component.spec.ts
rename to src/app/components/fragments/content-answers-list/content-answers-list.component.spec.ts
diff --git a/src/app/content-answers-list/content-answers-list.component.ts b/src/app/components/fragments/content-answers-list/content-answers-list.component.ts
similarity index 81%
rename from src/app/content-answers-list/content-answers-list.component.ts
rename to src/app/components/fragments/content-answers-list/content-answers-list.component.ts
index 30d2d94b5..84918dd0c 100644
--- a/src/app/content-answers-list/content-answers-list.component.ts
+++ b/src/app/components/fragments/content-answers-list/content-answers-list.component.ts
@@ -1,8 +1,8 @@
 import { Component, OnInit } from '@angular/core';
-import { ContentAnswerService } from '../content-answer.service';
-import { AnswerText } from '../answer-text';
+import { ContentAnswerService } from '../../../content-answer.service';
+import { AnswerText } from '../../../answer-text';
 import { ActivatedRoute } from '@angular/router';
-import { ContentService } from '../content.service';
+import { ContentService } from '../../../content.service';
 
 @Component({
   selector: 'app-content-answers-list',
diff --git a/src/app/content-list/content-list.component.html b/src/app/components/fragments/content-list/content-list.component.html
similarity index 100%
rename from src/app/content-list/content-list.component.html
rename to src/app/components/fragments/content-list/content-list.component.html
diff --git a/src/app/content-list/content-list.component.scss b/src/app/components/fragments/content-list/content-list.component.scss
similarity index 100%
rename from src/app/content-list/content-list.component.scss
rename to src/app/components/fragments/content-list/content-list.component.scss
diff --git a/src/app/content-list/content-list.component.spec.ts b/src/app/components/fragments/content-list/content-list.component.spec.ts
similarity index 100%
rename from src/app/content-list/content-list.component.spec.ts
rename to src/app/components/fragments/content-list/content-list.component.spec.ts
diff --git a/src/app/content-list/content-list.component.ts b/src/app/components/fragments/content-list/content-list.component.ts
similarity index 87%
rename from src/app/content-list/content-list.component.ts
rename to src/app/components/fragments/content-list/content-list.component.ts
index 2db858053..197360e38 100644
--- a/src/app/content-list/content-list.component.ts
+++ b/src/app/components/fragments/content-list/content-list.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
-import { ContentService } from '../content.service';
-import { Content } from '../content';
+import { ContentService } from '../../../content.service';
+import { Content } from '../../../content';
 import { ActivatedRoute } from '@angular/router';
 
 @Component({
diff --git a/src/app/creator-choice-content/creator-choice-content.component.html b/src/app/components/fragments/creator-choice-content/creator-choice-content.component.html
similarity index 100%
rename from src/app/creator-choice-content/creator-choice-content.component.html
rename to src/app/components/fragments/creator-choice-content/creator-choice-content.component.html
diff --git a/src/app/creator-choice-content/creator-choice-content.component.scss b/src/app/components/fragments/creator-choice-content/creator-choice-content.component.scss
similarity index 100%
rename from src/app/creator-choice-content/creator-choice-content.component.scss
rename to src/app/components/fragments/creator-choice-content/creator-choice-content.component.scss
diff --git a/src/app/creator-choice-content/creator-choice-content.component.spec.ts b/src/app/components/fragments/creator-choice-content/creator-choice-content.component.spec.ts
similarity index 100%
rename from src/app/creator-choice-content/creator-choice-content.component.spec.ts
rename to src/app/components/fragments/creator-choice-content/creator-choice-content.component.spec.ts
diff --git a/src/app/creator-choice-content/creator-choice-content.component.ts b/src/app/components/fragments/creator-choice-content/creator-choice-content.component.ts
similarity index 91%
rename from src/app/creator-choice-content/creator-choice-content.component.ts
rename to src/app/components/fragments/creator-choice-content/creator-choice-content.component.ts
index 8c72948d8..3a686b4a3 100644
--- a/src/app/creator-choice-content/creator-choice-content.component.ts
+++ b/src/app/components/fragments/creator-choice-content/creator-choice-content.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit } from '@angular/core';
-import { AnswerOption } from '../answer-option';
-import { ChoiceContent } from '../choice-content';
-import { ContentService } from '../content.service';
+import { AnswerOption } from '../../../answer-option';
+import { ChoiceContent } from '../../../choice-content';
+import { ContentService } from '../../../content.service';
 
 export class DisplayAnswer {
   answerOption: AnswerOption;
diff --git a/src/app/creator-text-content/creator-text-content.component.html b/src/app/components/fragments/creator-text-content/creator-text-content.component.html
similarity index 100%
rename from src/app/creator-text-content/creator-text-content.component.html
rename to src/app/components/fragments/creator-text-content/creator-text-content.component.html
diff --git a/src/app/creator-text-content/creator-text-content.component.scss b/src/app/components/fragments/creator-text-content/creator-text-content.component.scss
similarity index 100%
rename from src/app/creator-text-content/creator-text-content.component.scss
rename to src/app/components/fragments/creator-text-content/creator-text-content.component.scss
diff --git a/src/app/creator-text-content/creator-text-content.component.spec.ts b/src/app/components/fragments/creator-text-content/creator-text-content.component.spec.ts
similarity index 100%
rename from src/app/creator-text-content/creator-text-content.component.spec.ts
rename to src/app/components/fragments/creator-text-content/creator-text-content.component.spec.ts
diff --git a/src/app/creator-text-content/creator-text-content.component.ts b/src/app/components/fragments/creator-text-content/creator-text-content.component.ts
similarity index 100%
rename from src/app/creator-text-content/creator-text-content.component.ts
rename to src/app/components/fragments/creator-text-content/creator-text-content.component.ts
diff --git a/src/app/join-room/join-room.component.html b/src/app/components/fragments/join-room/join-room.component.html
similarity index 100%
rename from src/app/join-room/join-room.component.html
rename to src/app/components/fragments/join-room/join-room.component.html
diff --git a/src/app/join-room/join-room.component.scss b/src/app/components/fragments/join-room/join-room.component.scss
similarity index 100%
rename from src/app/join-room/join-room.component.scss
rename to src/app/components/fragments/join-room/join-room.component.scss
diff --git a/src/app/join-room/join-room.component.spec.ts b/src/app/components/fragments/join-room/join-room.component.spec.ts
similarity index 100%
rename from src/app/join-room/join-room.component.spec.ts
rename to src/app/components/fragments/join-room/join-room.component.spec.ts
diff --git a/src/app/join-room/join-room.component.ts b/src/app/components/fragments/join-room/join-room.component.ts
similarity index 87%
rename from src/app/join-room/join-room.component.ts
rename to src/app/components/fragments/join-room/join-room.component.ts
index 113255d63..29240dce2 100644
--- a/src/app/join-room/join-room.component.ts
+++ b/src/app/components/fragments/join-room/join-room.component.ts
@@ -1,11 +1,11 @@
 import { Component, OnInit } from '@angular/core';
-import { Room } from '../room';
-import { RoomService } from '../room.service';
+import { Room } from '../../../room';
+import { RoomService } from '../../../room.service';
 import { Router } from '@angular/router';
-import { RegisterErrorStateMatcher } from '../register/register.component';
+import { RegisterErrorStateMatcher } from '../../dialogs/register/register.component';
 import { FormControl, FormGroupDirective, NgForm, Validators } from '@angular/forms';
 import { ErrorStateMatcher } from '@angular/material';
-import { NotificationService } from '../notification.service';
+import { NotificationService } from '../../../notification.service';
 
 export class JoinErrorStateMatcher implements ErrorStateMatcher {
   isErrorState(control: FormControl | null, form: FormGroupDirective | NgForm | null): boolean {
diff --git a/src/app/login/login.component.html b/src/app/components/fragments/login/login.component.html
similarity index 100%
rename from src/app/login/login.component.html
rename to src/app/components/fragments/login/login.component.html
diff --git a/src/app/login/login.component.scss b/src/app/components/fragments/login/login.component.scss
similarity index 100%
rename from src/app/login/login.component.scss
rename to src/app/components/fragments/login/login.component.scss
diff --git a/src/app/login/login.component.spec.ts b/src/app/components/fragments/login/login.component.spec.ts
similarity index 100%
rename from src/app/login/login.component.spec.ts
rename to src/app/components/fragments/login/login.component.spec.ts
diff --git a/src/app/login/login.component.ts b/src/app/components/fragments/login/login.component.ts
similarity index 88%
rename from src/app/login/login.component.ts
rename to src/app/components/fragments/login/login.component.ts
index cc6bcb187..24f4c8c8a 100644
--- a/src/app/login/login.component.ts
+++ b/src/app/components/fragments/login/login.component.ts
@@ -1,12 +1,12 @@
 import { Component, Input, OnInit } from '@angular/core';
-import { AuthenticationService } from '../authentication.service';
+import { AuthenticationService } from '../../../authentication.service';
 import { Router } from '@angular/router';
-import { NotificationService } from '../notification.service';
+import { NotificationService } from '../../../notification.service';
 import { ErrorStateMatcher } from '@angular/material';
 import { FormControl, FormGroupDirective, NgForm, Validators } from '@angular/forms';
-import { UserRole } from '../user-roles.enum';
-import { ClientAuthentication } from '../client-authentication';
-import { User } from '../user';
+import { UserRole } from '../../../user-roles.enum';
+import { ClientAuthentication } from '../../../client-authentication';
+import { User } from '../../../user';
 
 export class LoginErrorStateMatcher implements ErrorStateMatcher {
   isErrorState(control: FormControl | null, form: FormGroupDirective | NgForm | null): boolean {
diff --git a/src/app/participant-choice-content/participant-choice-content.component.html b/src/app/components/fragments/participant-choice-content/participant-choice-content.component.html
similarity index 100%
rename from src/app/participant-choice-content/participant-choice-content.component.html
rename to src/app/components/fragments/participant-choice-content/participant-choice-content.component.html
diff --git a/src/app/participant-choice-content/participant-choice-content.component.scss b/src/app/components/fragments/participant-choice-content/participant-choice-content.component.scss
similarity index 100%
rename from src/app/participant-choice-content/participant-choice-content.component.scss
rename to src/app/components/fragments/participant-choice-content/participant-choice-content.component.scss
diff --git a/src/app/participant-choice-content/participant-choice-content.component.spec.ts b/src/app/components/fragments/participant-choice-content/participant-choice-content.component.spec.ts
similarity index 100%
rename from src/app/participant-choice-content/participant-choice-content.component.spec.ts
rename to src/app/components/fragments/participant-choice-content/participant-choice-content.component.spec.ts
diff --git a/src/app/participant-choice-content/participant-choice-content.component.ts b/src/app/components/fragments/participant-choice-content/participant-choice-content.component.ts
similarity index 89%
rename from src/app/participant-choice-content/participant-choice-content.component.ts
rename to src/app/components/fragments/participant-choice-content/participant-choice-content.component.ts
index 1840583d1..5d0448a40 100644
--- a/src/app/participant-choice-content/participant-choice-content.component.ts
+++ b/src/app/components/fragments/participant-choice-content/participant-choice-content.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit } from '@angular/core';
-import { ChoiceContent } from '../choice-content';
-import { AnswerOption } from '../answer-option';
-import { ContentAnswerService } from '../content-answer.service';
+import { ChoiceContent } from '../../../choice-content';
+import { AnswerOption } from '../../../answer-option';
+import { ContentAnswerService } from '../../../content-answer.service';
 
 class CheckedAnswer {
   answerOption: AnswerOption;
diff --git a/src/app/participant-text-content/participant-text-content.component.html b/src/app/components/fragments/participant-text-content/participant-text-content.component.html
similarity index 100%
rename from src/app/participant-text-content/participant-text-content.component.html
rename to src/app/components/fragments/participant-text-content/participant-text-content.component.html
diff --git a/src/app/participant-text-content/participant-text-content.component.scss b/src/app/components/fragments/participant-text-content/participant-text-content.component.scss
similarity index 100%
rename from src/app/participant-text-content/participant-text-content.component.scss
rename to src/app/components/fragments/participant-text-content/participant-text-content.component.scss
diff --git a/src/app/participant-text-content/participant-text-content.component.spec.ts b/src/app/components/fragments/participant-text-content/participant-text-content.component.spec.ts
similarity index 100%
rename from src/app/participant-text-content/participant-text-content.component.spec.ts
rename to src/app/components/fragments/participant-text-content/participant-text-content.component.spec.ts
diff --git a/src/app/participant-text-content/participant-text-content.component.ts b/src/app/components/fragments/participant-text-content/participant-text-content.component.ts
similarity index 83%
rename from src/app/participant-text-content/participant-text-content.component.ts
rename to src/app/components/fragments/participant-text-content/participant-text-content.component.ts
index 7f1837eaa..bc09b4368 100644
--- a/src/app/participant-text-content/participant-text-content.component.ts
+++ b/src/app/components/fragments/participant-text-content/participant-text-content.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit } from '@angular/core';
-import { TextContent } from '../text-content';
-import { ContentAnswerService } from '../content-answer.service';
-import { AnswerText } from '../answer-text';
+import { TextContent } from '../../../text-content';
+import { ContentAnswerService } from '../../../content-answer.service';
+import { AnswerText } from '../../../answer-text';
 
 @Component({
   selector: 'app-participant-text-content',
diff --git a/src/app/room-list/room-list.component.html b/src/app/components/fragments/room-list/room-list.component.html
similarity index 100%
rename from src/app/room-list/room-list.component.html
rename to src/app/components/fragments/room-list/room-list.component.html
diff --git a/src/app/room-list/room-list.component.scss b/src/app/components/fragments/room-list/room-list.component.scss
similarity index 100%
rename from src/app/room-list/room-list.component.scss
rename to src/app/components/fragments/room-list/room-list.component.scss
diff --git a/src/app/room-list/room-list.component.spec.ts b/src/app/components/fragments/room-list/room-list.component.spec.ts
similarity index 100%
rename from src/app/room-list/room-list.component.spec.ts
rename to src/app/components/fragments/room-list/room-list.component.spec.ts
diff --git a/src/app/room-list/room-list.component.ts b/src/app/components/fragments/room-list/room-list.component.ts
similarity index 84%
rename from src/app/room-list/room-list.component.ts
rename to src/app/components/fragments/room-list/room-list.component.ts
index cf5720a1b..c19ce981f 100644
--- a/src/app/room-list/room-list.component.ts
+++ b/src/app/components/fragments/room-list/room-list.component.ts
@@ -1,8 +1,8 @@
 import { Component, OnInit } from '@angular/core';
-import { Room } from '../room';
-import { RoomService } from '../room.service';
-import { AuthenticationService } from '../authentication.service';
-import { UserRole } from '../user-roles.enum';
+import { Room } from '../../../room';
+import { RoomService } from '../../../room.service';
+import { AuthenticationService } from '../../../authentication.service';
+import { UserRole } from '../../../user-roles.enum';
 
 @Component({
   selector: 'app-room-list',
diff --git a/src/app/add-content/add-content.component.html b/src/app/components/pages/add-content/add-content.component.html
similarity index 100%
rename from src/app/add-content/add-content.component.html
rename to src/app/components/pages/add-content/add-content.component.html
diff --git a/src/app/add-content/add-content.component.scss b/src/app/components/pages/add-content/add-content.component.scss
similarity index 100%
rename from src/app/add-content/add-content.component.scss
rename to src/app/components/pages/add-content/add-content.component.scss
diff --git a/src/app/add-content/add-content.component.spec.ts b/src/app/components/pages/add-content/add-content.component.spec.ts
similarity index 100%
rename from src/app/add-content/add-content.component.spec.ts
rename to src/app/components/pages/add-content/add-content.component.spec.ts
diff --git a/src/app/add-content/add-content.component.ts b/src/app/components/pages/add-content/add-content.component.ts
similarity index 100%
rename from src/app/add-content/add-content.component.ts
rename to src/app/components/pages/add-content/add-content.component.ts
diff --git a/src/app/content-detail/content-detail.component.html b/src/app/components/pages/content-detail/content-detail.component.html
similarity index 100%
rename from src/app/content-detail/content-detail.component.html
rename to src/app/components/pages/content-detail/content-detail.component.html
diff --git a/src/app/content-detail/content-detail.component.scss b/src/app/components/pages/content-detail/content-detail.component.scss
similarity index 100%
rename from src/app/content-detail/content-detail.component.scss
rename to src/app/components/pages/content-detail/content-detail.component.scss
diff --git a/src/app/content-detail/content-detail.component.spec.ts b/src/app/components/pages/content-detail/content-detail.component.spec.ts
similarity index 100%
rename from src/app/content-detail/content-detail.component.spec.ts
rename to src/app/components/pages/content-detail/content-detail.component.spec.ts
diff --git a/src/app/content-detail/content-detail.component.ts b/src/app/components/pages/content-detail/content-detail.component.ts
similarity index 87%
rename from src/app/content-detail/content-detail.component.ts
rename to src/app/components/pages/content-detail/content-detail.component.ts
index 288ec68f4..76928771f 100644
--- a/src/app/content-detail/content-detail.component.ts
+++ b/src/app/components/pages/content-detail/content-detail.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
-import { Content } from '../content';
-import { ContentService } from '../content.service';
+import { Content } from '../../../content';
+import { ContentService } from '../../../content.service';
 import { ActivatedRoute } from '@angular/router';
 
 @Component({
diff --git a/src/app/create-comment/create-comment.component.html b/src/app/components/pages/create-comment/create-comment.component.html
similarity index 100%
rename from src/app/create-comment/create-comment.component.html
rename to src/app/components/pages/create-comment/create-comment.component.html
diff --git a/src/app/create-comment/create-comment.component.scss b/src/app/components/pages/create-comment/create-comment.component.scss
similarity index 100%
rename from src/app/create-comment/create-comment.component.scss
rename to src/app/components/pages/create-comment/create-comment.component.scss
diff --git a/src/app/create-comment/create-comment.component.spec.ts b/src/app/components/pages/create-comment/create-comment.component.spec.ts
similarity index 100%
rename from src/app/create-comment/create-comment.component.spec.ts
rename to src/app/components/pages/create-comment/create-comment.component.spec.ts
diff --git a/src/app/create-comment/create-comment.component.ts b/src/app/components/pages/create-comment/create-comment.component.ts
similarity index 77%
rename from src/app/create-comment/create-comment.component.ts
rename to src/app/components/pages/create-comment/create-comment.component.ts
index ee5833c4c..8e70fde71 100644
--- a/src/app/create-comment/create-comment.component.ts
+++ b/src/app/components/pages/create-comment/create-comment.component.ts
@@ -1,14 +1,14 @@
 import { Component, OnInit, Input, ViewChild } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { Location } from '@angular/common';
-import { Room } from '../room';
-import { Comment } from '../comment';
-import { RoomService } from '../room.service';
-import { CommentService } from '../comment.service';
-import { NotificationService } from '../notification.service';
-import { AuthenticationService } from '../authentication.service';
-import { User } from '../user';
-import { CommentListComponent } from '../comment-list/comment-list.component';
+import { Room } from '../../../room';
+import { Comment } from '../../../comment';
+import { RoomService } from '../../../room.service';
+import { CommentService } from '../../../comment.service';
+import { NotificationService } from '../../../notification.service';
+import { AuthenticationService } from '../../../authentication.service';
+import { User } from '../../../user';
+import { CommentListComponent } from '../../fragments/comment-list/comment-list.component';
 
 @Component({
   selector: 'app-create-comment',
diff --git a/src/app/creator-home-screen/creator-home-screen.component.html b/src/app/components/pages/creator-home-screen/creator-home-screen.component.html
similarity index 100%
rename from src/app/creator-home-screen/creator-home-screen.component.html
rename to src/app/components/pages/creator-home-screen/creator-home-screen.component.html
diff --git a/src/app/creator-home-screen/creator-home-screen.component.scss b/src/app/components/pages/creator-home-screen/creator-home-screen.component.scss
similarity index 100%
rename from src/app/creator-home-screen/creator-home-screen.component.scss
rename to src/app/components/pages/creator-home-screen/creator-home-screen.component.scss
diff --git a/src/app/creator-home-screen/creator-home-screen.component.spec.ts b/src/app/components/pages/creator-home-screen/creator-home-screen.component.spec.ts
similarity index 100%
rename from src/app/creator-home-screen/creator-home-screen.component.spec.ts
rename to src/app/components/pages/creator-home-screen/creator-home-screen.component.spec.ts
diff --git a/src/app/creator-home-screen/creator-home-screen.component.ts b/src/app/components/pages/creator-home-screen/creator-home-screen.component.ts
similarity index 84%
rename from src/app/creator-home-screen/creator-home-screen.component.ts
rename to src/app/components/pages/creator-home-screen/creator-home-screen.component.ts
index 6b964e396..b365c0005 100644
--- a/src/app/creator-home-screen/creator-home-screen.component.ts
+++ b/src/app/components/pages/creator-home-screen/creator-home-screen.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import { MatDialog } from '@angular/material';
-import { RoomCreationComponent } from '../room-creation/room-creation.component';
+import { RoomCreationComponent } from '../../dialogs/room-creation/room-creation.component';
 
 @Component({
   selector: 'app-creator-home-screen',
diff --git a/src/app/creator-room/creator-room.component.html b/src/app/components/pages/creator-room/creator-room.component.html
similarity index 100%
rename from src/app/creator-room/creator-room.component.html
rename to src/app/components/pages/creator-room/creator-room.component.html
diff --git a/src/app/creator-room/creator-room.component.scss b/src/app/components/pages/creator-room/creator-room.component.scss
similarity index 100%
rename from src/app/creator-room/creator-room.component.scss
rename to src/app/components/pages/creator-room/creator-room.component.scss
diff --git a/src/app/creator-room/creator-room.component.spec.ts b/src/app/components/pages/creator-room/creator-room.component.spec.ts
similarity index 100%
rename from src/app/creator-room/creator-room.component.spec.ts
rename to src/app/components/pages/creator-room/creator-room.component.spec.ts
diff --git a/src/app/creator-room/creator-room.component.ts b/src/app/components/pages/creator-room/creator-room.component.ts
similarity index 89%
rename from src/app/creator-room/creator-room.component.ts
rename to src/app/components/pages/creator-room/creator-room.component.ts
index 675e8b12a..fb1445182 100644
--- a/src/app/creator-room/creator-room.component.ts
+++ b/src/app/components/pages/creator-room/creator-room.component.ts
@@ -1,14 +1,14 @@
 import { Component, OnInit } from '@angular/core';
-import { RoomService } from '../room.service';
+import { RoomService } from '../../../room.service';
 import { ActivatedRoute } from '@angular/router';
 import { RoomComponent } from '../room/room.component';
-import { Room } from '../room';
+import { Room } from '../../../room';
 import { Location } from '@angular/common';
-import { NotificationService } from '../notification.service';
+import { NotificationService } from '../../../notification.service';
 import { MatDialog } from '@angular/material';
 import { ContentCreationComponent } from '../content-creation/content-creation.component';
-import { RoomDeletionComponent } from '../room-deletion/room-deletion.component';
-import { RoomModificationComponent } from '../room-modification/room-modification.component';
+import { RoomDeletionComponent } from '../../dialogs/room-deletion/room-deletion.component';
+import { RoomModificationComponent } from '../../dialogs/room-modification/room-modification.component';
 
 @Component({
   selector: 'app-creator-room',
diff --git a/src/app/login-screen/login-screen.component.html b/src/app/components/pages/login-screen/login-screen.component.html
similarity index 100%
rename from src/app/login-screen/login-screen.component.html
rename to src/app/components/pages/login-screen/login-screen.component.html
diff --git a/src/app/login-screen/login-screen.component.scss b/src/app/components/pages/login-screen/login-screen.component.scss
similarity index 100%
rename from src/app/login-screen/login-screen.component.scss
rename to src/app/components/pages/login-screen/login-screen.component.scss
diff --git a/src/app/login-screen/login-screen.component.spec.ts b/src/app/components/pages/login-screen/login-screen.component.spec.ts
similarity index 100%
rename from src/app/login-screen/login-screen.component.spec.ts
rename to src/app/components/pages/login-screen/login-screen.component.spec.ts
diff --git a/src/app/login-screen/login-screen.component.ts b/src/app/components/pages/login-screen/login-screen.component.ts
similarity index 100%
rename from src/app/login-screen/login-screen.component.ts
rename to src/app/components/pages/login-screen/login-screen.component.ts
diff --git a/src/app/page-not-found/page-not-found.component.html b/src/app/components/pages/page-not-found/page-not-found.component.html
similarity index 100%
rename from src/app/page-not-found/page-not-found.component.html
rename to src/app/components/pages/page-not-found/page-not-found.component.html
diff --git a/src/app/page-not-found/page-not-found.component.scss b/src/app/components/pages/page-not-found/page-not-found.component.scss
similarity index 100%
rename from src/app/page-not-found/page-not-found.component.scss
rename to src/app/components/pages/page-not-found/page-not-found.component.scss
diff --git a/src/app/page-not-found/page-not-found.component.spec.ts b/src/app/components/pages/page-not-found/page-not-found.component.spec.ts
similarity index 100%
rename from src/app/page-not-found/page-not-found.component.spec.ts
rename to src/app/components/pages/page-not-found/page-not-found.component.spec.ts
diff --git a/src/app/page-not-found/page-not-found.component.ts b/src/app/components/pages/page-not-found/page-not-found.component.ts
similarity index 100%
rename from src/app/page-not-found/page-not-found.component.ts
rename to src/app/components/pages/page-not-found/page-not-found.component.ts
diff --git a/src/app/participant-content-carousel-page/participant-content-carousel-page.component.html b/src/app/components/pages/participant-content-carousel-page/participant-content-carousel-page.component.html
similarity index 100%
rename from src/app/participant-content-carousel-page/participant-content-carousel-page.component.html
rename to src/app/components/pages/participant-content-carousel-page/participant-content-carousel-page.component.html
diff --git a/src/app/participant-content-carousel-page/participant-content-carousel-page.component.scss b/src/app/components/pages/participant-content-carousel-page/participant-content-carousel-page.component.scss
similarity index 100%
rename from src/app/participant-content-carousel-page/participant-content-carousel-page.component.scss
rename to src/app/components/pages/participant-content-carousel-page/participant-content-carousel-page.component.scss
diff --git a/src/app/participant-content-carousel-page/participant-content-carousel-page.component.spec.ts b/src/app/components/pages/participant-content-carousel-page/participant-content-carousel-page.component.spec.ts
similarity index 100%
rename from src/app/participant-content-carousel-page/participant-content-carousel-page.component.spec.ts
rename to src/app/components/pages/participant-content-carousel-page/participant-content-carousel-page.component.spec.ts
diff --git a/src/app/participant-content-carousel-page/participant-content-carousel-page.component.ts b/src/app/components/pages/participant-content-carousel-page/participant-content-carousel-page.component.ts
similarity index 81%
rename from src/app/participant-content-carousel-page/participant-content-carousel-page.component.ts
rename to src/app/components/pages/participant-content-carousel-page/participant-content-carousel-page.component.ts
index b1ae4172b..653957631 100644
--- a/src/app/participant-content-carousel-page/participant-content-carousel-page.component.ts
+++ b/src/app/components/pages/participant-content-carousel-page/participant-content-carousel-page.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
-import { Content } from '../content';
-import { ContentType } from '../content-type';
+import { Content } from '../../../content';
+import { ContentType } from '../../../content-type';
 
 @Component({
   selector: 'app-participant-content-carousel-page',
diff --git a/src/app/participant-home-screen/participant-home-screen.component.html b/src/app/components/pages/participant-home-screen/participant-home-screen.component.html
similarity index 100%
rename from src/app/participant-home-screen/participant-home-screen.component.html
rename to src/app/components/pages/participant-home-screen/participant-home-screen.component.html
diff --git a/src/app/participant-home-screen/participant-home-screen.component.scss b/src/app/components/pages/participant-home-screen/participant-home-screen.component.scss
similarity index 100%
rename from src/app/participant-home-screen/participant-home-screen.component.scss
rename to src/app/components/pages/participant-home-screen/participant-home-screen.component.scss
diff --git a/src/app/participant-home-screen/participant-home-screen.component.spec.ts b/src/app/components/pages/participant-home-screen/participant-home-screen.component.spec.ts
similarity index 100%
rename from src/app/participant-home-screen/participant-home-screen.component.spec.ts
rename to src/app/components/pages/participant-home-screen/participant-home-screen.component.spec.ts
diff --git a/src/app/participant-home-screen/participant-home-screen.component.ts b/src/app/components/pages/participant-home-screen/participant-home-screen.component.ts
similarity index 100%
rename from src/app/participant-home-screen/participant-home-screen.component.ts
rename to src/app/components/pages/participant-home-screen/participant-home-screen.component.ts
diff --git a/src/app/participant-room/participant-room.component.html b/src/app/components/pages/participant-room/participant-room.component.html
similarity index 100%
rename from src/app/participant-room/participant-room.component.html
rename to src/app/components/pages/participant-room/participant-room.component.html
diff --git a/src/app/participant-room/participant-room.component.scss b/src/app/components/pages/participant-room/participant-room.component.scss
similarity index 100%
rename from src/app/participant-room/participant-room.component.scss
rename to src/app/components/pages/participant-room/participant-room.component.scss
diff --git a/src/app/participant-room/participant-room.component.spec.ts b/src/app/components/pages/participant-room/participant-room.component.spec.ts
similarity index 100%
rename from src/app/participant-room/participant-room.component.spec.ts
rename to src/app/components/pages/participant-room/participant-room.component.spec.ts
diff --git a/src/app/participant-room/participant-room.component.ts b/src/app/components/pages/participant-room/participant-room.component.ts
similarity index 90%
rename from src/app/participant-room/participant-room.component.ts
rename to src/app/components/pages/participant-room/participant-room.component.ts
index 2e865692e..bae277250 100644
--- a/src/app/participant-room/participant-room.component.ts
+++ b/src/app/components/pages/participant-room/participant-room.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit } from '@angular/core';
-import { Room } from '../room';
+import { Room } from '../../../room';
 import { Location } from '@angular/common';
-import { RoomService } from '../room.service';
+import { RoomService } from '../../../room.service';
 import { ActivatedRoute } from '@angular/router';
 
 @Component({
diff --git a/src/app/room/room.component.html b/src/app/components/pages/room/room.component.html
similarity index 100%
rename from src/app/room/room.component.html
rename to src/app/components/pages/room/room.component.html
diff --git a/src/app/room/room.component.scss b/src/app/components/pages/room/room.component.scss
similarity index 100%
rename from src/app/room/room.component.scss
rename to src/app/components/pages/room/room.component.scss
diff --git a/src/app/room/room.component.spec.ts b/src/app/components/pages/room/room.component.spec.ts
similarity index 100%
rename from src/app/room/room.component.spec.ts
rename to src/app/components/pages/room/room.component.spec.ts
diff --git a/src/app/room/room.component.ts b/src/app/components/pages/room/room.component.ts
similarity index 90%
rename from src/app/room/room.component.ts
rename to src/app/components/pages/room/room.component.ts
index 1d4c01da8..b77f30a77 100644
--- a/src/app/room/room.component.ts
+++ b/src/app/components/pages/room/room.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
-import { Room } from '../room';
-import { RoomService } from '../room.service';
+import { Room } from '../../../room';
+import { RoomService } from '../../../room.service';
 import { ActivatedRoute } from '@angular/router';
 import { Location } from '@angular/common';
 
diff --git a/src/app/content-answers/content-answers.component.html b/src/app/content-answers/content-answers.component.html
deleted file mode 100644
index 36077ff41..000000000
--- a/src/app/content-answers/content-answers.component.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<mat-card>content</mat-card>
-
-<mat-card>
-  <mat-form-field>
-    <textarea matInput placeholder="Answer" matTextareaAutosize matAutosizeMinRows="3" matAutosizeMaxRows="8"></textarea>
-  </mat-form-field>
-</mat-card>
diff --git a/src/app/content-answers/content-answers.component.scss b/src/app/content-answers/content-answers.component.scss
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/app/content-answers/content-answers.component.spec.ts b/src/app/content-answers/content-answers.component.spec.ts
deleted file mode 100644
index 4b1e1a322..000000000
--- a/src/app/content-answers/content-answers.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ContentAnswersComponent } from './content-answers.component';
-
-describe('ContentAnswersComponent', () => {
-  let component: ContentAnswersComponent;
-  let fixture: ComponentFixture<ContentAnswersComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ ContentAnswersComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ContentAnswersComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/content-answers/content-answers.component.ts b/src/app/content-answers/content-answers.component.ts
deleted file mode 100644
index 896e7cf36..000000000
--- a/src/app/content-answers/content-answers.component.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-
-@Component({
-  selector: 'app-content-answers',
-  templateUrl: './content-answers.component.html',
-  styleUrls: ['./content-answers.component.scss']
-})
-export class ContentAnswersComponent implements OnInit {
-
-  constructor() { }
-
-  ngOnInit() {
-  }
-}
\ No newline at end of file
diff --git a/src/app/content-creation/content-creation.component.html b/src/app/content-creation/content-creation.component.html
deleted file mode 100644
index 06ffdeade..000000000
--- a/src/app/content-creation/content-creation.component.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<form (ngSubmit)="addContent(subjectTitle.value, bodyText.value)">
-  <div fxLayout="column" fxLayoutAlign="center" fxLayoutGap="10px">
-    <mat-form-field>
-      <input class="input-block" #subjectTitle matInput (keypress)="resetEmptyInputs()" placeholder="Subject" [(ngModel)]="subject"
-        name="Title">
-      <button mat-button *ngIf="subject" type="text" matSuffix mat-icon-button aria-label="Clear" (click)="subject=''">
-        <mat-icon>close</mat-icon>
-      </button>
-    </mat-form-field>
-    <mat-form-field>
-      <textarea #bodyText matInput matTextareaAutosize matAutosizeMinRows="3" matAutosizeMaxRows="8" (keypress)="resetEmptyInputs()"
-        placeholder="Body" [(ngModel)]="body" name="Text"></textarea>
-      <button mat-button *ngIf="body" type="text" matSuffix mat-icon-button aria-label="Clear" (click)="body=''">
-        <mat-icon>close</mat-icon>
-      </button>
-    </mat-form-field>
-    <div fxLayout="row" fxLayoutGap="10px">
-      <mat-slide-toggle>Allow absention</mat-slide-toggle>
-      <mat-slide-toggle>Show hints</mat-slide-toggle>
-    </div>
-    <button mat-raised-button color="primary" type="submit">Create content</button>
-  </div>
-</form>
diff --git a/src/app/content-creation/content-creation.component.scss b/src/app/content-creation/content-creation.component.scss
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/app/content-creation/content-creation.component.spec.ts b/src/app/content-creation/content-creation.component.spec.ts
deleted file mode 100644
index 7e3fe7640..000000000
--- a/src/app/content-creation/content-creation.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ContentCreationComponent } from './content-creation.component';
-
-describe('ContentCreationComponent', () => {
-  let component: ContentCreationComponent;
-  let fixture: ComponentFixture<ContentCreationComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ ContentCreationComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ContentCreationComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/content-creation/content-creation.component.ts b/src/app/content-creation/content-creation.component.ts
deleted file mode 100644
index 5c535419a..000000000
--- a/src/app/content-creation/content-creation.component.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import { Component, Inject, OnInit } from '@angular/core';
-import { ContentService } from '../content.service';
-import { Router } from '@angular/router';
-import { NotificationService } from '../notification.service';
-import { Content } from '../content';
-import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
-import { RoomComponent } from '../room/room.component';
-
-@Component({
-  selector: 'app-content-creation',
-  templateUrl: './content-creation.component.html',
-  styleUrls: ['./content-creation.component.scss']
-})
-export class ContentCreationComponent implements OnInit {
-  subject: string;
-  body: string;
-  roomId: string;
-  emptyInputs = false;
-
-  constructor(private contentService: ContentService,
-              private router: Router,
-              private notification: NotificationService) {
-  }
-
-  onNoClick(): void {
-  }
-
-  ngOnInit() {
-  }
-
-  resetEmptyInputs(): void {
-    this.emptyInputs = false;
-  }
-
-  addContent(subject: string, body: string) {
-    subject = subject.trim();
-    body = body.trim();
-    if (!subject || !body) {
-      this.emptyInputs = true;
-      return;
-    }
-    this.contentService.addContent({ subject: subject, body: body, roomId: this.roomId } as Content)
-      .subscribe(content => {
-        this.notification.show(`Content '${content.subject}' successfully created.`);
-        // this.router.navigate([`/creator/room/${content.roomId}/${content.contentId}`]);
-      });
-  }
-}
-- 
GitLab