diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index d2a4669f32846c863510664cb263b1ecf2957268..cf02f258ff2dba80eb856b53df04d4e022865a35 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -1,21 +1,21 @@
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
-import { PageNotFoundComponent } from './components/pages/page-not-found/page-not-found.component';
-import { LoginComponentPageComponent } from './components/pages/login-page/login-page.component';
-import { HomeCreatorPageComponent } from './components/pages/home-creator-page/home-creator-page.component';
-import { CommentCreatePageComponent } from './components/pages/comment-create-page/comment-create-page.component';
-import { HomeParticipantPageComponent } from './components/pages/home-participant-page/home-participant-page.component';
+import { PageNotFoundComponent } from './components/shared/page-not-found/page-not-found.component';
+import { LoginPageComponent } from './components/shared/login-page/login-page.component';
+import { HomeCreatorPageComponent } from './components/creator/home-creator-page/home-creator-page.component';
+import { CommentCreatePageComponent } from './components/creator/comment-create-page/comment-create-page.component';
+import { HomeParticipantPageComponent } from './components/participant/home-participant-page/home-participant-page.component';
 import { AuthenticationGuard } from './guards/authentication.guard';
 import { UserRole } from './models/user-roles.enum';
-import { RoomParticipantPageComponent } from './components/pages/room-participant-page/room-participant-page.component';
-import { RoomCreatorPageComponent } from './components/pages/room-creator-page/room-creator-page.component';
-import { CommentListComponent } from './components/fragments/comment-list/comment-list.component';
-import { ContentListComponent } from './components/fragments/content-list/content-list.component';
-import { StatisticsComponent } from './components/fragments/statistics/statistics.component';
-import { ContentCreatePageComponent } from './components/pages/content-create-page/content-create-page.component';
-import { ContentCarouselPageComponent } from './components/pages/content-carousel-page/content-carousel-page.component';
-import { FeedbackBarometerPageComponent } from './components/pages/feedback-barometer-page/feedback-barometer-page.component';
-import { FooterImprintComponent } from './components/pages/footer-imprint/footer-imprint.component';
+import { RoomParticipantPageComponent } from './components/participant/room-participant-page/room-participant-page.component';
+import { RoomCreatorPageComponent } from './components/creator/room-creator-page/room-creator-page.component';
+import { CommentListComponent } from './components/shared/comment-list/comment-list.component';
+import { ContentListComponent } from './components/shared/content-list/content-list.component';
+import { StatisticsComponent } from './components/shared/statistics/statistics.component';
+import { ContentCreatePageComponent } from './components/creator/content-create-page/content-create-page.component';
+import { ContentCarouselPageComponent } from './components/shared/content-carousel-page/content-carousel-page.component';
+import { FeedbackBarometerPageComponent } from './components/shared/feedback-barometer-page/feedback-barometer-page.component';
+import { FooterImprintComponent } from './components/shared/footer-imprint/footer-imprint.component';
 
 const routes: Routes = [
   {
@@ -25,7 +25,7 @@ const routes: Routes = [
   },
   {
     path: 'home',
-    component: LoginComponentPageComponent
+    component: LoginPageComponent
   },
   {
     path: 'creator',
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 66ab49e75c7279e6eeca8ddd988298a751d6c945..99654302b2a87c3710e7765dfef90ac1f1a542e1 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -3,14 +3,14 @@ import { NgModule } from '@angular/core';
 
 import { AppComponent } from './app.component';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { RoomJoinComponent } from './components/fragments/room-join/room-join.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 { RoomJoinComponent } from './components/shared/room-join/room-join.component';
+import { LoginComponent } from './components/shared/login/login.component';
+import { RegisterComponent } from './components/shared/dialogs/register/register.component';
+import { PasswordResetComponent } from './components/shared/dialogs/password-reset/password-reset.component';
+import { CommentListComponent } from './components/shared/comment-list/comment-list.component';
 import { AppRoutingModule } from './app-routing.module';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { PageNotFoundComponent } from './components/pages/page-not-found/page-not-found.component';
+import { PageNotFoundComponent } from './components/shared/page-not-found/page-not-found.component';
 import { FlexLayoutModule } from '@angular/flex-layout';
 import {
   MAT_DIALOG_DATA,
@@ -50,52 +50,52 @@ import {
 } from '@angular/material';
 import { HTTP_INTERCEPTORS, HttpClient, HttpClientModule } from '@angular/common/http';
 import { UserService } from './services/http/user.service';
-import { RoomPageComponent } from './components/pages/room-page/room-page.component';
-import { RoomCreateComponent } from './components/dialogs/room-create/room-create.component';
-import { LoginComponentPageComponent } from './components/pages/login-page/login-page.component';
+import { RoomPageComponent } from './components/shared/room-page/room-page.component';
+import { RoomCreateComponent } from './components/creator/dialogs/room-create/room-create.component';
+import { LoginPageComponent } from './components/shared/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';
 import { RoomService } from './services/http/room.service';
-import { RoomListComponent } from './components/fragments/room-list/room-list.component';
-import { HomeCreatorPageComponent } from './components/pages/home-creator-page/home-creator-page.component';
-import { CommentCreatePageComponent } from './components/pages/comment-create-page/comment-create-page.component';
+import { RoomListComponent } from './components/shared/room-list/room-list.component';
+import { HomeCreatorPageComponent } from './components/creator/home-creator-page/home-creator-page.component';
+import { CommentCreatePageComponent } from './components/creator/comment-create-page/comment-create-page.component';
 import { CommentService } from './services/http/comment.service';
-import { HomeParticipantPageComponent } from './components/pages/home-participant-page/home-participant-page.component';
-import { RoomParticipantPageComponent } from './components/pages/room-participant-page/room-participant-page.component';
+import { HomeParticipantPageComponent } from './components/participant/home-participant-page/home-participant-page.component';
+import { RoomParticipantPageComponent } from './components/participant/room-participant-page/room-participant-page.component';
 import { DataStoreService } from './services/util/data-store.service';
-import { RoomCreatorPageComponent } from './components/pages/room-creator-page/room-creator-page.component';
-import { ContentListComponent } from './components/fragments/content-list/content-list.component';
-import { ContentGroupsComponent } from './components/fragments/content-groups/content-groups.component';
+import { RoomCreatorPageComponent } from './components/creator/room-creator-page/room-creator-page.component';
+import { ContentListComponent } from './components/shared/content-list/content-list.component';
+import { ContentGroupsComponent } from './components/shared/content-groups/content-groups.component';
 import { ContentService } from './services/http/content.service';
-import { AnswersListComponent } from './components/fragments/answers-list/answers-list.component';
+import { AnswersListComponent } from './components/creator/answers-list/answers-list.component';
 import { ContentAnswerService } from './services/http/content-answer.service';
-import { RoomDeleteComponent } from './components/dialogs/room-delete/room-delete.component';
-import { StatisticsComponent } from './components/fragments/statistics/statistics.component';
-import { RoomEditComponent } from './components/dialogs/room-edit/room-edit.component';
-import { UserActivationComponent } from './components/dialogs/user-activation/user-activation.component';
-import { ContentChoiceParticipantComponent } from './components/fragments/content-choice-participant/content-choice-participant.component';
-import { ContentChoiceCreatorComponent } from './components/fragments/content-choice-creator/content-choice-creator.component';
-import { ContentCreatePageComponent } from './components/pages/content-create-page/content-create-page.component';
-import { ContentCarouselPageComponent } from './components/pages/content-carousel-page/content-carousel-page.component';
-import { ContentTextParticipantComponent } from './components/fragments/content-text-participant/content-text-participant.component';
-import { ContentTextCreatorComponent } from './components/fragments/content-text-creator/content-text-creator.component';
+import { RoomDeleteComponent } from './components/creator/dialogs/room-delete/room-delete.component';
+import { StatisticsComponent } from './components/shared/statistics/statistics.component';
+import { RoomEditComponent } from './components/creator/dialogs/room-edit/room-edit.component';
+import { UserActivationComponent } from './components/shared/dialogs/user-activation/user-activation.component';
+import { ContentChoiceParticipantComponent } from './components/participant/content-choice-participant/content-choice-participant.component';
+import { ContentChoiceCreatorComponent } from './components/creator/content-choice-creator/content-choice-creator.component';
+import { ContentCreatePageComponent } from './components/creator/content-create-page/content-create-page.component';
+import { ContentCarouselPageComponent } from './components/shared/content-carousel-page/content-carousel-page.component';
+import { ContentTextParticipantComponent } from './components/participant/content-text-participant/content-text-participant.component';
+import { ContentTextCreatorComponent } from './components/creator/content-text-creator/content-text-creator.component';
 import { AuthenticationInterceptor } from './interceptors/authentication.interceptor';
-import { HeaderComponent } from './components/fragments/header/header.component';
-import { ContentLikertCreatorComponent } from './components/fragments/content-likert-creator/content-likert-creator.component';
-import { ContentYesNoCreatorComponent } from './components/fragments/content-yes-no-creator/content-yes-no-creator.component';
-import { AnswerEditComponent } from './components/dialogs/answer-edit/answer-edit.component';
-import { ContentDeleteComponent } from './components/dialogs/content-delete/content-delete.component';
-import { FeedbackBarometerPageComponent } from './components/pages/feedback-barometer-page/feedback-barometer-page.component';
+import { HeaderComponent } from './components/shared/header/header.component';
+import { ContentLikertCreatorComponent } from './components/creator/content-likert-creator/content-likert-creator.component';
+import { ContentYesNoCreatorComponent } from './components/creator/content-yes-no-creator/content-yes-no-creator.component';
+import { AnswerEditComponent } from './components/participant/dialogs/answer-edit/answer-edit.component';
+import { ContentDeleteComponent } from './components/creator/dialogs/content-delete/content-delete.component';
+import { FeedbackBarometerPageComponent } from './components/shared/feedback-barometer-page/feedback-barometer-page.component';
 import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 import { TranslateHttpLoader } from '@ngx-translate/http-loader';
 import { MarkdownModule } from 'ngx-markdown';
-import { MarkdownToolbarComponent } from './components/fragments/markdown-toolbar/markdown-toolbar.component';
-import { MarkdownHelpDialogComponent } from './components/dialogs/markdown-help-dialog/markdown-help-dialog.component';
-import { GenericDataDialogComponent } from './components/dialogs/generic-data-dialog/generic-data-dialog.component';
-import { FooterComponent } from './components/fragments/footer/footer.component';
-import { FooterLoginDialogComponent } from './components/dialogs/footer-login-dialog/footer-login-dialog.component';
-import { FooterImprintComponent } from './components/pages/footer-imprint/footer-imprint.component';
+import { MarkdownToolbarComponent } from './components/creator/markdown-toolbar/markdown-toolbar.component';
+import { MarkdownHelpDialogComponent } from './components/creator/dialogs/markdown-help-dialog/markdown-help-dialog.component';
+import { GenericDataDialogComponent } from './components/shared/dialogs/generic-data-dialog/generic-data-dialog.component';
+import { FooterComponent } from './components/shared/footer/footer.component';
+import { FooterLoginDialogComponent } from './components/shared/dialogs/footer-login-dialog/footer-login-dialog.component';
+import { FooterImprintComponent } from './components/shared/footer-imprint/footer-imprint.component';
 
 export function dialogClose(dialogResult: any) {
 }
@@ -105,7 +105,7 @@ export function dialogClose(dialogResult: any) {
     AppComponent,
     RoomJoinComponent,
     AppComponent,
-    LoginComponentPageComponent,
+    LoginPageComponent,
     LoginComponent,
     PageNotFoundComponent,
     PasswordResetComponent,
diff --git a/src/app/components/fragments/answers-list/answers-list.component.html b/src/app/components/creator/answers-list/answers-list.component.html
similarity index 100%
rename from src/app/components/fragments/answers-list/answers-list.component.html
rename to src/app/components/creator/answers-list/answers-list.component.html
diff --git a/src/app/components/fragments/answers-list/answers-list.component.scss b/src/app/components/creator/answers-list/answers-list.component.scss
similarity index 100%
rename from src/app/components/fragments/answers-list/answers-list.component.scss
rename to src/app/components/creator/answers-list/answers-list.component.scss
diff --git a/src/app/components/fragments/answers-list/answers-list.component.spec.ts b/src/app/components/creator/answers-list/answers-list.component.spec.ts
similarity index 100%
rename from src/app/components/fragments/answers-list/answers-list.component.spec.ts
rename to src/app/components/creator/answers-list/answers-list.component.spec.ts
diff --git a/src/app/components/fragments/answers-list/answers-list.component.ts b/src/app/components/creator/answers-list/answers-list.component.ts
similarity index 100%
rename from src/app/components/fragments/answers-list/answers-list.component.ts
rename to src/app/components/creator/answers-list/answers-list.component.ts
diff --git a/src/app/components/pages/comment-create-page/comment-create-page.component.html b/src/app/components/creator/comment-create-page/comment-create-page.component.html
similarity index 100%
rename from src/app/components/pages/comment-create-page/comment-create-page.component.html
rename to src/app/components/creator/comment-create-page/comment-create-page.component.html
diff --git a/src/app/components/pages/comment-create-page/comment-create-page.component.scss b/src/app/components/creator/comment-create-page/comment-create-page.component.scss
similarity index 100%
rename from src/app/components/pages/comment-create-page/comment-create-page.component.scss
rename to src/app/components/creator/comment-create-page/comment-create-page.component.scss
diff --git a/src/app/components/pages/comment-create-page/comment-create-page.component.spec.ts b/src/app/components/creator/comment-create-page/comment-create-page.component.spec.ts
similarity index 100%
rename from src/app/components/pages/comment-create-page/comment-create-page.component.spec.ts
rename to src/app/components/creator/comment-create-page/comment-create-page.component.spec.ts
diff --git a/src/app/components/pages/comment-create-page/comment-create-page.component.ts b/src/app/components/creator/comment-create-page/comment-create-page.component.ts
similarity index 95%
rename from src/app/components/pages/comment-create-page/comment-create-page.component.ts
rename to src/app/components/creator/comment-create-page/comment-create-page.component.ts
index a43e05b97564360ba7b35f0b112c4e6b58474475..4961d6c1505848d427cb2d4b32cdf1a7d87bf060 100644
--- a/src/app/components/pages/comment-create-page/comment-create-page.component.ts
+++ b/src/app/components/creator/comment-create-page/comment-create-page.component.ts
@@ -8,7 +8,7 @@ import { CommentService } from '../../../services/http/comment.service';
 import { NotificationService } from '../../../services/util/notification.service';
 import { AuthenticationService } from '../../../services/http/authentication.service';
 import { User } from '../../../models/user';
-import { CommentListComponent } from '../../fragments/comment-list/comment-list.component';
+import { CommentListComponent } from '../../shared/comment-list/comment-list.component';
 
 @Component({
   selector: 'app-comment-create-page',
diff --git a/src/app/components/fragments/content-choice-creator/content-choice-creator.component.html b/src/app/components/creator/content-choice-creator/content-choice-creator.component.html
similarity index 100%
rename from src/app/components/fragments/content-choice-creator/content-choice-creator.component.html
rename to src/app/components/creator/content-choice-creator/content-choice-creator.component.html
diff --git a/src/app/components/fragments/content-choice-creator/content-choice-creator.component.scss b/src/app/components/creator/content-choice-creator/content-choice-creator.component.scss
similarity index 100%
rename from src/app/components/fragments/content-choice-creator/content-choice-creator.component.scss
rename to src/app/components/creator/content-choice-creator/content-choice-creator.component.scss
diff --git a/src/app/components/fragments/content-choice-creator/content-choice-creator.component.spec.ts b/src/app/components/creator/content-choice-creator/content-choice-creator.component.spec.ts
similarity index 100%
rename from src/app/components/fragments/content-choice-creator/content-choice-creator.component.spec.ts
rename to src/app/components/creator/content-choice-creator/content-choice-creator.component.spec.ts
diff --git a/src/app/components/fragments/content-choice-creator/content-choice-creator.component.ts b/src/app/components/creator/content-choice-creator/content-choice-creator.component.ts
similarity index 97%
rename from src/app/components/fragments/content-choice-creator/content-choice-creator.component.ts
rename to src/app/components/creator/content-choice-creator/content-choice-creator.component.ts
index f59e731ace08637420ccab8fc0e433eabff324b1..e26eebbf56d55b11be78c1504fd73371f6c71276 100644
--- a/src/app/components/fragments/content-choice-creator/content-choice-creator.component.ts
+++ b/src/app/components/creator/content-choice-creator/content-choice-creator.component.ts
@@ -4,10 +4,10 @@ import { ContentChoice } from '../../../models/content-choice';
 import { ContentService } from '../../../services/http/content.service';
 import { NotificationService } from '../../../services/util/notification.service';
 import { MAT_DIALOG_DATA, MatDialog, MatDialogRef } from '@angular/material';
-import { AnswerEditComponent } from '../../dialogs/answer-edit/answer-edit.component';
+import { AnswerEditComponent } from '../../participant/dialogs/answer-edit/answer-edit.component';
 import { ContentType } from '../../../models/content-type.enum';
-import { ContentListComponent } from '../content-list/content-list.component';
-import { ContentDeleteComponent } from '../../dialogs/content-delete/content-delete.component';
+import { ContentListComponent } from '../../shared/content-list/content-list.component';
+import { ContentDeleteComponent } from '../dialogs/content-delete/content-delete.component';
 import { FormControl } from '@angular/forms';
 import { Observable } from 'rxjs/Observable';
 import { map, startWith } from 'rxjs/operators';
diff --git a/src/app/components/pages/content-create-page/content-create-page.component.html b/src/app/components/creator/content-create-page/content-create-page.component.html
similarity index 100%
rename from src/app/components/pages/content-create-page/content-create-page.component.html
rename to src/app/components/creator/content-create-page/content-create-page.component.html
diff --git a/src/app/components/pages/content-create-page/content-create-page.component.scss b/src/app/components/creator/content-create-page/content-create-page.component.scss
similarity index 100%
rename from src/app/components/pages/content-create-page/content-create-page.component.scss
rename to src/app/components/creator/content-create-page/content-create-page.component.scss
diff --git a/src/app/components/pages/content-create-page/content-create-page.component.spec.ts b/src/app/components/creator/content-create-page/content-create-page.component.spec.ts
similarity index 100%
rename from src/app/components/pages/content-create-page/content-create-page.component.spec.ts
rename to src/app/components/creator/content-create-page/content-create-page.component.spec.ts
diff --git a/src/app/components/pages/content-create-page/content-create-page.component.ts b/src/app/components/creator/content-create-page/content-create-page.component.ts
similarity index 100%
rename from src/app/components/pages/content-create-page/content-create-page.component.ts
rename to src/app/components/creator/content-create-page/content-create-page.component.ts
diff --git a/src/app/components/fragments/content-likert-creator/content-likert-creator.component.html b/src/app/components/creator/content-likert-creator/content-likert-creator.component.html
similarity index 100%
rename from src/app/components/fragments/content-likert-creator/content-likert-creator.component.html
rename to src/app/components/creator/content-likert-creator/content-likert-creator.component.html
diff --git a/src/app/components/fragments/content-likert-creator/content-likert-creator.component.scss b/src/app/components/creator/content-likert-creator/content-likert-creator.component.scss
similarity index 100%
rename from src/app/components/fragments/content-likert-creator/content-likert-creator.component.scss
rename to src/app/components/creator/content-likert-creator/content-likert-creator.component.scss
diff --git a/src/app/components/fragments/content-likert-creator/content-likert-creator.component.spec.ts b/src/app/components/creator/content-likert-creator/content-likert-creator.component.spec.ts
similarity index 100%
rename from src/app/components/fragments/content-likert-creator/content-likert-creator.component.spec.ts
rename to src/app/components/creator/content-likert-creator/content-likert-creator.component.spec.ts
diff --git a/src/app/components/fragments/content-likert-creator/content-likert-creator.component.ts b/src/app/components/creator/content-likert-creator/content-likert-creator.component.ts
similarity index 96%
rename from src/app/components/fragments/content-likert-creator/content-likert-creator.component.ts
rename to src/app/components/creator/content-likert-creator/content-likert-creator.component.ts
index 7f7f2bb46d9b155ef3334712e39406f50b036226..0c76385e90a9d0d38591b5a537496ba5e7bcec3f 100644
--- a/src/app/components/fragments/content-likert-creator/content-likert-creator.component.ts
+++ b/src/app/components/creator/content-likert-creator/content-likert-creator.component.ts
@@ -6,8 +6,8 @@ import { ContentType } from '../../../models/content-type.enum';
 import { ContentService } from '../../../services/http/content.service';
 import { NotificationService } from '../../../services/util/notification.service';
 import { MAT_DIALOG_DATA, MatDialog, MatDialogRef } from '@angular/material';
-import { ContentListComponent } from '../content-list/content-list.component';
-import { ContentDeleteComponent } from '../../dialogs/content-delete/content-delete.component';
+import { ContentListComponent } from '../../shared/content-list/content-list.component';
+import { ContentDeleteComponent } from '../dialogs/content-delete/content-delete.component';
 import { FormControl } from '@angular/forms';
 import { Observable } from 'rxjs/Observable';
 import { map, startWith } from 'rxjs/operators';
diff --git a/src/app/components/fragments/content-text-creator/content-text-creator.component.html b/src/app/components/creator/content-text-creator/content-text-creator.component.html
similarity index 100%
rename from src/app/components/fragments/content-text-creator/content-text-creator.component.html
rename to src/app/components/creator/content-text-creator/content-text-creator.component.html
diff --git a/src/app/components/fragments/content-text-creator/content-text-creator.component.scss b/src/app/components/creator/content-text-creator/content-text-creator.component.scss
similarity index 100%
rename from src/app/components/fragments/content-text-creator/content-text-creator.component.scss
rename to src/app/components/creator/content-text-creator/content-text-creator.component.scss
diff --git a/src/app/components/fragments/content-text-creator/content-text-creator.component.spec.ts b/src/app/components/creator/content-text-creator/content-text-creator.component.spec.ts
similarity index 100%
rename from src/app/components/fragments/content-text-creator/content-text-creator.component.spec.ts
rename to src/app/components/creator/content-text-creator/content-text-creator.component.spec.ts
diff --git a/src/app/components/fragments/content-text-creator/content-text-creator.component.ts b/src/app/components/creator/content-text-creator/content-text-creator.component.ts
similarity index 94%
rename from src/app/components/fragments/content-text-creator/content-text-creator.component.ts
rename to src/app/components/creator/content-text-creator/content-text-creator.component.ts
index 633f68e27a0dbfb0a15336d7e3a1f05c3b702346..d01dbe6ed9cbaf0c46adfea0d7651833d64251f1 100644
--- a/src/app/components/fragments/content-text-creator/content-text-creator.component.ts
+++ b/src/app/components/creator/content-text-creator/content-text-creator.component.ts
@@ -3,8 +3,8 @@ import { ContentText } from '../../../models/content-text';
 import { ContentService } from '../../../services/http/content.service';
 import { NotificationService } from '../../../services/util/notification.service';
 import { MAT_DIALOG_DATA, MatDialog, MatDialogRef } from '@angular/material';
-import { ContentListComponent } from '../content-list/content-list.component';
-import { ContentDeleteComponent } from '../../dialogs/content-delete/content-delete.component';
+import { ContentListComponent } from '../../shared/content-list/content-list.component';
+import { ContentDeleteComponent } from '../dialogs/content-delete/content-delete.component';
 import { map, startWith } from 'rxjs/operators';
 import { FormControl } from '@angular/forms';
 import { Observable } from 'rxjs/Observable';
diff --git a/src/app/components/fragments/content-yes-no-creator/content-yes-no-creator.component.html b/src/app/components/creator/content-yes-no-creator/content-yes-no-creator.component.html
similarity index 100%
rename from src/app/components/fragments/content-yes-no-creator/content-yes-no-creator.component.html
rename to src/app/components/creator/content-yes-no-creator/content-yes-no-creator.component.html
diff --git a/src/app/components/fragments/content-yes-no-creator/content-yes-no-creator.component.scss b/src/app/components/creator/content-yes-no-creator/content-yes-no-creator.component.scss
similarity index 100%
rename from src/app/components/fragments/content-yes-no-creator/content-yes-no-creator.component.scss
rename to src/app/components/creator/content-yes-no-creator/content-yes-no-creator.component.scss
diff --git a/src/app/components/fragments/content-yes-no-creator/content-yes-no-creator.component.spec.ts b/src/app/components/creator/content-yes-no-creator/content-yes-no-creator.component.spec.ts
similarity index 100%
rename from src/app/components/fragments/content-yes-no-creator/content-yes-no-creator.component.spec.ts
rename to src/app/components/creator/content-yes-no-creator/content-yes-no-creator.component.spec.ts
diff --git a/src/app/components/fragments/content-yes-no-creator/content-yes-no-creator.component.ts b/src/app/components/creator/content-yes-no-creator/content-yes-no-creator.component.ts
similarity index 95%
rename from src/app/components/fragments/content-yes-no-creator/content-yes-no-creator.component.ts
rename to src/app/components/creator/content-yes-no-creator/content-yes-no-creator.component.ts
index 472f8ba326f29f4ac79a9172d4974e2958b1a396..744783d34a663419894bb864fd4fb28650eed7b5 100644
--- a/src/app/components/fragments/content-yes-no-creator/content-yes-no-creator.component.ts
+++ b/src/app/components/creator/content-yes-no-creator/content-yes-no-creator.component.ts
@@ -6,8 +6,8 @@ import { NotificationService } from '../../../services/util/notification.service
 import { ContentType } from '../../../models/content-type.enum';
 import { ContentService } from '../../../services/http/content.service';
 import { MAT_DIALOG_DATA, MatDialog, MatDialogRef } from '@angular/material';
-import { ContentListComponent } from '../content-list/content-list.component';
-import { ContentDeleteComponent } from '../../dialogs/content-delete/content-delete.component';
+import { ContentListComponent } from '../../shared/content-list/content-list.component';
+import { ContentDeleteComponent } from '../dialogs/content-delete/content-delete.component';
 import { FormControl } from '@angular/forms';
 import { Observable } from 'rxjs/Observable';
 import { map, startWith } from 'rxjs/operators';
diff --git a/src/app/components/dialogs/content-delete/content-delete.component.html b/src/app/components/creator/dialogs/content-delete/content-delete.component.html
similarity index 100%
rename from src/app/components/dialogs/content-delete/content-delete.component.html
rename to src/app/components/creator/dialogs/content-delete/content-delete.component.html
diff --git a/src/app/components/dialogs/content-delete/content-delete.component.scss b/src/app/components/creator/dialogs/content-delete/content-delete.component.scss
similarity index 100%
rename from src/app/components/dialogs/content-delete/content-delete.component.scss
rename to src/app/components/creator/dialogs/content-delete/content-delete.component.scss
diff --git a/src/app/components/dialogs/content-delete/content-delete.component.spec.ts b/src/app/components/creator/dialogs/content-delete/content-delete.component.spec.ts
similarity index 100%
rename from src/app/components/dialogs/content-delete/content-delete.component.spec.ts
rename to src/app/components/creator/dialogs/content-delete/content-delete.component.spec.ts
diff --git a/src/app/components/dialogs/content-delete/content-delete.component.ts b/src/app/components/creator/dialogs/content-delete/content-delete.component.ts
similarity index 79%
rename from src/app/components/dialogs/content-delete/content-delete.component.ts
rename to src/app/components/creator/dialogs/content-delete/content-delete.component.ts
index a0abe7bd228e4df8c0d742dcf22fa03c39708dfe..ac8acdeda66ada98d4ce54cc40801c4439940350 100644
--- a/src/app/components/dialogs/content-delete/content-delete.component.ts
+++ b/src/app/components/creator/dialogs/content-delete/content-delete.component.ts
@@ -1,9 +1,9 @@
 import { Component, Inject, OnInit } from '@angular/core';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
 import { Router } from '@angular/router';
-import { NotificationService } from '../../../services/util/notification.service';
-import { ContentType } from '../../../models/content-type.enum';
-import { Content } from '../../../models/content';
+import { NotificationService } from '../../../../services/util/notification.service';
+import { ContentType } from '../../../../models/content-type.enum';
+import { Content } from '../../../../models/content';
 
 @Component({
   selector: 'app-content-delete',
diff --git a/src/app/components/dialogs/markdown-help-dialog/markdown-help-dialog.component.html b/src/app/components/creator/dialogs/markdown-help-dialog/markdown-help-dialog.component.html
similarity index 100%
rename from src/app/components/dialogs/markdown-help-dialog/markdown-help-dialog.component.html
rename to src/app/components/creator/dialogs/markdown-help-dialog/markdown-help-dialog.component.html
diff --git a/src/app/components/dialogs/markdown-help-dialog/markdown-help-dialog.component.scss b/src/app/components/creator/dialogs/markdown-help-dialog/markdown-help-dialog.component.scss
similarity index 100%
rename from src/app/components/dialogs/markdown-help-dialog/markdown-help-dialog.component.scss
rename to src/app/components/creator/dialogs/markdown-help-dialog/markdown-help-dialog.component.scss
diff --git a/src/app/components/dialogs/markdown-help-dialog/markdown-help-dialog.component.spec.ts b/src/app/components/creator/dialogs/markdown-help-dialog/markdown-help-dialog.component.spec.ts
similarity index 100%
rename from src/app/components/dialogs/markdown-help-dialog/markdown-help-dialog.component.spec.ts
rename to src/app/components/creator/dialogs/markdown-help-dialog/markdown-help-dialog.component.spec.ts
diff --git a/src/app/components/dialogs/markdown-help-dialog/markdown-help-dialog.component.ts b/src/app/components/creator/dialogs/markdown-help-dialog/markdown-help-dialog.component.ts
similarity index 100%
rename from src/app/components/dialogs/markdown-help-dialog/markdown-help-dialog.component.ts
rename to src/app/components/creator/dialogs/markdown-help-dialog/markdown-help-dialog.component.ts
diff --git a/src/app/components/dialogs/room-create/room-create.component.html b/src/app/components/creator/dialogs/room-create/room-create.component.html
similarity index 100%
rename from src/app/components/dialogs/room-create/room-create.component.html
rename to src/app/components/creator/dialogs/room-create/room-create.component.html
diff --git a/src/app/components/dialogs/room-create/room-create.component.scss b/src/app/components/creator/dialogs/room-create/room-create.component.scss
similarity index 100%
rename from src/app/components/dialogs/room-create/room-create.component.scss
rename to src/app/components/creator/dialogs/room-create/room-create.component.scss
diff --git a/src/app/components/dialogs/room-create/room-create.component.spec.ts b/src/app/components/creator/dialogs/room-create/room-create.component.spec.ts
similarity index 100%
rename from src/app/components/dialogs/room-create/room-create.component.spec.ts
rename to src/app/components/creator/dialogs/room-create/room-create.component.spec.ts
diff --git a/src/app/components/dialogs/room-create/room-create.component.ts b/src/app/components/creator/dialogs/room-create/room-create.component.ts
similarity index 84%
rename from src/app/components/dialogs/room-create/room-create.component.ts
rename to src/app/components/creator/dialogs/room-create/room-create.component.ts
index f5909202a16e3c765ed580dd834078e18b387b56..0deb11e1311c7c4c04ded77aa41b576796032d2a 100644
--- a/src/app/components/dialogs/room-create/room-create.component.ts
+++ b/src/app/components/creator/dialogs/room-create/room-create.component.ts
@@ -1,10 +1,10 @@
 import { Component, Inject, OnInit } from '@angular/core';
-import { RoomService } from '../../../services/http/room.service';
-import { Room } from '../../../models/room';
+import { RoomService } from '../../../../services/http/room.service';
+import { Room } from '../../../../models/room';
 import { Router } from '@angular/router';
-import { NotificationService } from '../../../services/util/notification.service';
+import { NotificationService } from '../../../../services/util/notification.service';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
-import { ContentService} from "../../../services/http/content.service";
+import { ContentService} from "../../../../services/http/content.service";
 
 @Component({
   selector: 'app-room-create',
diff --git a/src/app/components/dialogs/room-delete/room-delete.component.html b/src/app/components/creator/dialogs/room-delete/room-delete.component.html
similarity index 100%
rename from src/app/components/dialogs/room-delete/room-delete.component.html
rename to src/app/components/creator/dialogs/room-delete/room-delete.component.html
diff --git a/src/app/components/dialogs/room-delete/room-delete.component.scss b/src/app/components/creator/dialogs/room-delete/room-delete.component.scss
similarity index 100%
rename from src/app/components/dialogs/room-delete/room-delete.component.scss
rename to src/app/components/creator/dialogs/room-delete/room-delete.component.scss
diff --git a/src/app/components/dialogs/room-delete/room-delete.component.spec.ts b/src/app/components/creator/dialogs/room-delete/room-delete.component.spec.ts
similarity index 100%
rename from src/app/components/dialogs/room-delete/room-delete.component.spec.ts
rename to src/app/components/creator/dialogs/room-delete/room-delete.component.spec.ts
diff --git a/src/app/components/dialogs/room-delete/room-delete.component.ts b/src/app/components/creator/dialogs/room-delete/room-delete.component.ts
similarity index 79%
rename from src/app/components/dialogs/room-delete/room-delete.component.ts
rename to src/app/components/creator/dialogs/room-delete/room-delete.component.ts
index 21d11cf71d417c34054bd75006765bc2ad5fc5fe..8d6b6c84d5933055dae5bd5467179e098e237431 100644
--- a/src/app/components/dialogs/room-delete/room-delete.component.ts
+++ b/src/app/components/creator/dialogs/room-delete/room-delete.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 '../../../services/util/notification.service';
+import { NotificationService } from '../../../../services/util/notification.service';
 import { RoomCreateComponent } from '../room-create/room-create.component';
-import { RoomService } from '../../../services/http/room.service';
-import { Room } from '../../../models/room';
+import { RoomService } from '../../../../services/http/room.service';
+import { Room } from '../../../../models/room';
 
 @Component({
   selector: 'app-room-delete',
diff --git a/src/app/components/dialogs/room-edit/room-edit.component.html b/src/app/components/creator/dialogs/room-edit/room-edit.component.html
similarity index 100%
rename from src/app/components/dialogs/room-edit/room-edit.component.html
rename to src/app/components/creator/dialogs/room-edit/room-edit.component.html
diff --git a/src/app/components/dialogs/room-edit/room-edit.component.scss b/src/app/components/creator/dialogs/room-edit/room-edit.component.scss
similarity index 100%
rename from src/app/components/dialogs/room-edit/room-edit.component.scss
rename to src/app/components/creator/dialogs/room-edit/room-edit.component.scss
diff --git a/src/app/components/dialogs/room-edit/room-edit.component.spec.ts b/src/app/components/creator/dialogs/room-edit/room-edit.component.spec.ts
similarity index 100%
rename from src/app/components/dialogs/room-edit/room-edit.component.spec.ts
rename to src/app/components/creator/dialogs/room-edit/room-edit.component.spec.ts
diff --git a/src/app/components/dialogs/room-edit/room-edit.component.ts b/src/app/components/creator/dialogs/room-edit/room-edit.component.ts
similarity index 79%
rename from src/app/components/dialogs/room-edit/room-edit.component.ts
rename to src/app/components/creator/dialogs/room-edit/room-edit.component.ts
index 99158d1596c2fa629620ac5f63b005e84102a20b..ab1ca500836f7de451e17549801b92b3324f4e7e 100644
--- a/src/app/components/dialogs/room-edit/room-edit.component.ts
+++ b/src/app/components/creator/dialogs/room-edit/room-edit.component.ts
@@ -1,9 +1,9 @@
 import { Component, Inject, OnInit } from '@angular/core';
-import { Room } from '../../../models/room';
-import { RoomService } from '../../../services/http/room.service';
+import { Room } from '../../../../models/room';
+import { RoomService } from '../../../../services/http/room.service';
 import { RoomCreateComponent } from '../room-create/room-create.component';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
-import { NotificationService } from '../../../services/util/notification.service';
+import { NotificationService } from '../../../../services/util/notification.service';
 import { Router } from '@angular/router';
 
 @Component({
diff --git a/src/app/components/pages/home-creator-page/home-creator-page.component.html b/src/app/components/creator/home-creator-page/home-creator-page.component.html
similarity index 100%
rename from src/app/components/pages/home-creator-page/home-creator-page.component.html
rename to src/app/components/creator/home-creator-page/home-creator-page.component.html
diff --git a/src/app/components/pages/home-creator-page/home-creator-page.component.scss b/src/app/components/creator/home-creator-page/home-creator-page.component.scss
similarity index 100%
rename from src/app/components/pages/home-creator-page/home-creator-page.component.scss
rename to src/app/components/creator/home-creator-page/home-creator-page.component.scss
diff --git a/src/app/components/pages/home-creator-page/home-creator-page.component.spec.ts b/src/app/components/creator/home-creator-page/home-creator-page.component.spec.ts
similarity index 100%
rename from src/app/components/pages/home-creator-page/home-creator-page.component.spec.ts
rename to src/app/components/creator/home-creator-page/home-creator-page.component.spec.ts
diff --git a/src/app/components/pages/home-creator-page/home-creator-page.component.ts b/src/app/components/creator/home-creator-page/home-creator-page.component.ts
similarity index 85%
rename from src/app/components/pages/home-creator-page/home-creator-page.component.ts
rename to src/app/components/creator/home-creator-page/home-creator-page.component.ts
index 965d3dd0c2905a460c6b121d6de18e266ba69631..86ff695fdb649b0fa0735d976a4787e952c3784c 100644
--- a/src/app/components/pages/home-creator-page/home-creator-page.component.ts
+++ b/src/app/components/creator/home-creator-page/home-creator-page.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import { MatDialog } from '@angular/material';
-import { RoomCreateComponent } from '../../dialogs/room-create/room-create.component';
+import { RoomCreateComponent } from '../dialogs/room-create/room-create.component';
 
 @Component({
   selector: 'app-home-creator-page',
diff --git a/src/app/components/fragments/markdown-toolbar/markdown-toolbar.component.html b/src/app/components/creator/markdown-toolbar/markdown-toolbar.component.html
similarity index 100%
rename from src/app/components/fragments/markdown-toolbar/markdown-toolbar.component.html
rename to src/app/components/creator/markdown-toolbar/markdown-toolbar.component.html
diff --git a/src/app/components/fragments/markdown-toolbar/markdown-toolbar.component.scss b/src/app/components/creator/markdown-toolbar/markdown-toolbar.component.scss
similarity index 100%
rename from src/app/components/fragments/markdown-toolbar/markdown-toolbar.component.scss
rename to src/app/components/creator/markdown-toolbar/markdown-toolbar.component.scss
diff --git a/src/app/components/fragments/markdown-toolbar/markdown-toolbar.component.spec.ts b/src/app/components/creator/markdown-toolbar/markdown-toolbar.component.spec.ts
similarity index 100%
rename from src/app/components/fragments/markdown-toolbar/markdown-toolbar.component.spec.ts
rename to src/app/components/creator/markdown-toolbar/markdown-toolbar.component.spec.ts
diff --git a/src/app/components/fragments/markdown-toolbar/markdown-toolbar.component.ts b/src/app/components/creator/markdown-toolbar/markdown-toolbar.component.ts
similarity index 96%
rename from src/app/components/fragments/markdown-toolbar/markdown-toolbar.component.ts
rename to src/app/components/creator/markdown-toolbar/markdown-toolbar.component.ts
index f7204b8025d52fa1c79b08f12c070d094f43fec2..3b126cd3ece900ad71aa62472ec4b17cfc9a024f 100644
--- a/src/app/components/fragments/markdown-toolbar/markdown-toolbar.component.ts
+++ b/src/app/components/creator/markdown-toolbar/markdown-toolbar.component.ts
@@ -1,7 +1,7 @@
 import { Component, Input } from '@angular/core';
-import { MarkdownHelpDialogComponent } from '../../dialogs/markdown-help-dialog/markdown-help-dialog.component';
+import { MarkdownHelpDialogComponent } from '../dialogs/markdown-help-dialog/markdown-help-dialog.component';
 import { MatDialog } from '@angular/material';
-import { Data, GenericDataDialogComponent } from '../../dialogs/generic-data-dialog/generic-data-dialog.component';
+import { Data, GenericDataDialogComponent } from '../../shared/dialogs/generic-data-dialog/generic-data-dialog.component';
 
 @Component({
   selector: 'app-markdown-toolbar',
diff --git a/src/app/components/pages/room-creator-page/room-creator-page.component.html b/src/app/components/creator/room-creator-page/room-creator-page.component.html
similarity index 100%
rename from src/app/components/pages/room-creator-page/room-creator-page.component.html
rename to src/app/components/creator/room-creator-page/room-creator-page.component.html
diff --git a/src/app/components/pages/room-creator-page/room-creator-page.component.scss b/src/app/components/creator/room-creator-page/room-creator-page.component.scss
similarity index 100%
rename from src/app/components/pages/room-creator-page/room-creator-page.component.scss
rename to src/app/components/creator/room-creator-page/room-creator-page.component.scss
diff --git a/src/app/components/pages/room-creator-page/room-creator-page.component.spec.ts b/src/app/components/creator/room-creator-page/room-creator-page.component.spec.ts
similarity index 100%
rename from src/app/components/pages/room-creator-page/room-creator-page.component.spec.ts
rename to src/app/components/creator/room-creator-page/room-creator-page.component.spec.ts
diff --git a/src/app/components/pages/room-creator-page/room-creator-page.component.ts b/src/app/components/creator/room-creator-page/room-creator-page.component.ts
similarity index 91%
rename from src/app/components/pages/room-creator-page/room-creator-page.component.ts
rename to src/app/components/creator/room-creator-page/room-creator-page.component.ts
index 343bf84c8f72e1b0ebd337cdfd3c8cd3ab98eece..ccbe04375e9e6721fcf0136a42391d7dba2e2291 100644
--- a/src/app/components/pages/room-creator-page/room-creator-page.component.ts
+++ b/src/app/components/creator/room-creator-page/room-creator-page.component.ts
@@ -1,13 +1,13 @@
 import { Component, OnInit } from '@angular/core';
 import { RoomService } from '../../../services/http/room.service';
 import { ActivatedRoute } from '@angular/router';
-import { RoomPageComponent } from '../room-page/room-page.component';
+import { RoomPageComponent } from '../../shared/room-page/room-page.component';
 import { Room } from '../../../models/room';
 import { Location } from '@angular/common';
 import { NotificationService } from '../../../services/util/notification.service';
 import { MatDialog } from '@angular/material';
-import { RoomDeleteComponent } from '../../dialogs/room-delete/room-delete.component';
-import { RoomEditComponent } from '../../dialogs/room-edit/room-edit.component';
+import { RoomDeleteComponent } from '../dialogs/room-delete/room-delete.component';
+import { RoomEditComponent } from '../dialogs/room-edit/room-edit.component';
 
 @Component({
   selector: 'app-room-creator-page',
diff --git a/src/app/components/fragments/content-choice-participant/content-choice-participant.component.html b/src/app/components/participant/content-choice-participant/content-choice-participant.component.html
similarity index 100%
rename from src/app/components/fragments/content-choice-participant/content-choice-participant.component.html
rename to src/app/components/participant/content-choice-participant/content-choice-participant.component.html
diff --git a/src/app/components/fragments/content-choice-participant/content-choice-participant.component.scss b/src/app/components/participant/content-choice-participant/content-choice-participant.component.scss
similarity index 100%
rename from src/app/components/fragments/content-choice-participant/content-choice-participant.component.scss
rename to src/app/components/participant/content-choice-participant/content-choice-participant.component.scss
diff --git a/src/app/components/fragments/content-choice-participant/content-choice-participant.component.spec.ts b/src/app/components/participant/content-choice-participant/content-choice-participant.component.spec.ts
similarity index 100%
rename from src/app/components/fragments/content-choice-participant/content-choice-participant.component.spec.ts
rename to src/app/components/participant/content-choice-participant/content-choice-participant.component.spec.ts
diff --git a/src/app/components/fragments/content-choice-participant/content-choice-participant.component.ts b/src/app/components/participant/content-choice-participant/content-choice-participant.component.ts
similarity index 100%
rename from src/app/components/fragments/content-choice-participant/content-choice-participant.component.ts
rename to src/app/components/participant/content-choice-participant/content-choice-participant.component.ts
diff --git a/src/app/components/fragments/content-text-participant/content-text-participant.component.html b/src/app/components/participant/content-text-participant/content-text-participant.component.html
similarity index 100%
rename from src/app/components/fragments/content-text-participant/content-text-participant.component.html
rename to src/app/components/participant/content-text-participant/content-text-participant.component.html
diff --git a/src/app/components/fragments/content-text-participant/content-text-participant.component.scss b/src/app/components/participant/content-text-participant/content-text-participant.component.scss
similarity index 100%
rename from src/app/components/fragments/content-text-participant/content-text-participant.component.scss
rename to src/app/components/participant/content-text-participant/content-text-participant.component.scss
diff --git a/src/app/components/fragments/content-text-participant/content-text-participant.component.spec.ts b/src/app/components/participant/content-text-participant/content-text-participant.component.spec.ts
similarity index 100%
rename from src/app/components/fragments/content-text-participant/content-text-participant.component.spec.ts
rename to src/app/components/participant/content-text-participant/content-text-participant.component.spec.ts
diff --git a/src/app/components/fragments/content-text-participant/content-text-participant.component.ts b/src/app/components/participant/content-text-participant/content-text-participant.component.ts
similarity index 100%
rename from src/app/components/fragments/content-text-participant/content-text-participant.component.ts
rename to src/app/components/participant/content-text-participant/content-text-participant.component.ts
diff --git a/src/app/components/dialogs/answer-edit/answer-edit.component.html b/src/app/components/participant/dialogs/answer-edit/answer-edit.component.html
similarity index 100%
rename from src/app/components/dialogs/answer-edit/answer-edit.component.html
rename to src/app/components/participant/dialogs/answer-edit/answer-edit.component.html
diff --git a/src/app/components/dialogs/answer-edit/answer-edit.component.scss b/src/app/components/participant/dialogs/answer-edit/answer-edit.component.scss
similarity index 100%
rename from src/app/components/dialogs/answer-edit/answer-edit.component.scss
rename to src/app/components/participant/dialogs/answer-edit/answer-edit.component.scss
diff --git a/src/app/components/dialogs/answer-edit/answer-edit.component.spec.ts b/src/app/components/participant/dialogs/answer-edit/answer-edit.component.spec.ts
similarity index 100%
rename from src/app/components/dialogs/answer-edit/answer-edit.component.spec.ts
rename to src/app/components/participant/dialogs/answer-edit/answer-edit.component.spec.ts
diff --git a/src/app/components/dialogs/answer-edit/answer-edit.component.ts b/src/app/components/participant/dialogs/answer-edit/answer-edit.component.ts
similarity index 89%
rename from src/app/components/dialogs/answer-edit/answer-edit.component.ts
rename to src/app/components/participant/dialogs/answer-edit/answer-edit.component.ts
index c3627bd627dee4e3343a9dbd9361a67fc79a5e0f..9f68a995ddf1374736b292bcd093397a488bfab1 100644
--- a/src/app/components/dialogs/answer-edit/answer-edit.component.ts
+++ b/src/app/components/participant/dialogs/answer-edit/answer-edit.component.ts
@@ -1,5 +1,5 @@
 import { Component, Inject, OnInit } from '@angular/core';
-import { ContentChoiceCreatorComponent, DisplayAnswer } from '../../fragments/content-choice-creator/content-choice-creator.component';
+import { ContentChoiceCreatorComponent, DisplayAnswer } from '../../../creator/content-choice-creator/content-choice-creator.component';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
 
 @Component({
diff --git a/src/app/components/pages/home-participant-page/home-participant-page.component.html b/src/app/components/participant/home-participant-page/home-participant-page.component.html
similarity index 100%
rename from src/app/components/pages/home-participant-page/home-participant-page.component.html
rename to src/app/components/participant/home-participant-page/home-participant-page.component.html
diff --git a/src/app/components/pages/home-participant-page/home-participant-page.component.scss b/src/app/components/participant/home-participant-page/home-participant-page.component.scss
similarity index 100%
rename from src/app/components/pages/home-participant-page/home-participant-page.component.scss
rename to src/app/components/participant/home-participant-page/home-participant-page.component.scss
diff --git a/src/app/components/pages/home-participant-page/home-participant-page.component.spec.ts b/src/app/components/participant/home-participant-page/home-participant-page.component.spec.ts
similarity index 100%
rename from src/app/components/pages/home-participant-page/home-participant-page.component.spec.ts
rename to src/app/components/participant/home-participant-page/home-participant-page.component.spec.ts
diff --git a/src/app/components/pages/home-participant-page/home-participant-page.component.ts b/src/app/components/participant/home-participant-page/home-participant-page.component.ts
similarity index 100%
rename from src/app/components/pages/home-participant-page/home-participant-page.component.ts
rename to src/app/components/participant/home-participant-page/home-participant-page.component.ts
diff --git a/src/app/components/pages/room-participant-page/room-participant-page.component.html b/src/app/components/participant/room-participant-page/room-participant-page.component.html
similarity index 100%
rename from src/app/components/pages/room-participant-page/room-participant-page.component.html
rename to src/app/components/participant/room-participant-page/room-participant-page.component.html
diff --git a/src/app/components/pages/room-participant-page/room-participant-page.component.scss b/src/app/components/participant/room-participant-page/room-participant-page.component.scss
similarity index 100%
rename from src/app/components/pages/room-participant-page/room-participant-page.component.scss
rename to src/app/components/participant/room-participant-page/room-participant-page.component.scss
diff --git a/src/app/components/pages/room-participant-page/room-participant-page.component.spec.ts b/src/app/components/participant/room-participant-page/room-participant-page.component.spec.ts
similarity index 100%
rename from src/app/components/pages/room-participant-page/room-participant-page.component.spec.ts
rename to src/app/components/participant/room-participant-page/room-participant-page.component.spec.ts
diff --git a/src/app/components/pages/room-participant-page/room-participant-page.component.ts b/src/app/components/participant/room-participant-page/room-participant-page.component.ts
similarity index 100%
rename from src/app/components/pages/room-participant-page/room-participant-page.component.ts
rename to src/app/components/participant/room-participant-page/room-participant-page.component.ts
diff --git a/src/app/components/fragments/comment-list/comment-list.component.html b/src/app/components/shared/comment-list/comment-list.component.html
similarity index 100%
rename from src/app/components/fragments/comment-list/comment-list.component.html
rename to src/app/components/shared/comment-list/comment-list.component.html
diff --git a/src/app/components/fragments/comment-list/comment-list.component.scss b/src/app/components/shared/comment-list/comment-list.component.scss
similarity index 100%
rename from src/app/components/fragments/comment-list/comment-list.component.scss
rename to src/app/components/shared/comment-list/comment-list.component.scss
diff --git a/src/app/components/fragments/comment-list/comment-list.component.spec.ts b/src/app/components/shared/comment-list/comment-list.component.spec.ts
similarity index 100%
rename from src/app/components/fragments/comment-list/comment-list.component.spec.ts
rename to src/app/components/shared/comment-list/comment-list.component.spec.ts
diff --git a/src/app/components/fragments/comment-list/comment-list.component.ts b/src/app/components/shared/comment-list/comment-list.component.ts
similarity index 100%
rename from src/app/components/fragments/comment-list/comment-list.component.ts
rename to src/app/components/shared/comment-list/comment-list.component.ts
diff --git a/src/app/components/pages/content-carousel-page/content-carousel-page.component.html b/src/app/components/shared/content-carousel-page/content-carousel-page.component.html
similarity index 100%
rename from src/app/components/pages/content-carousel-page/content-carousel-page.component.html
rename to src/app/components/shared/content-carousel-page/content-carousel-page.component.html
diff --git a/src/app/components/pages/content-carousel-page/content-carousel-page.component.scss b/src/app/components/shared/content-carousel-page/content-carousel-page.component.scss
similarity index 100%
rename from src/app/components/pages/content-carousel-page/content-carousel-page.component.scss
rename to src/app/components/shared/content-carousel-page/content-carousel-page.component.scss
diff --git a/src/app/components/pages/content-carousel-page/content-carousel-page.component.spec.ts b/src/app/components/shared/content-carousel-page/content-carousel-page.component.spec.ts
similarity index 100%
rename from src/app/components/pages/content-carousel-page/content-carousel-page.component.spec.ts
rename to src/app/components/shared/content-carousel-page/content-carousel-page.component.spec.ts
diff --git a/src/app/components/pages/content-carousel-page/content-carousel-page.component.ts b/src/app/components/shared/content-carousel-page/content-carousel-page.component.ts
similarity index 100%
rename from src/app/components/pages/content-carousel-page/content-carousel-page.component.ts
rename to src/app/components/shared/content-carousel-page/content-carousel-page.component.ts
diff --git a/src/app/components/fragments/content-groups/content-groups.component.html b/src/app/components/shared/content-groups/content-groups.component.html
similarity index 100%
rename from src/app/components/fragments/content-groups/content-groups.component.html
rename to src/app/components/shared/content-groups/content-groups.component.html
diff --git a/src/app/components/fragments/content-groups/content-groups.component.scss b/src/app/components/shared/content-groups/content-groups.component.scss
similarity index 100%
rename from src/app/components/fragments/content-groups/content-groups.component.scss
rename to src/app/components/shared/content-groups/content-groups.component.scss
diff --git a/src/app/components/fragments/content-groups/content-groups.component.ts b/src/app/components/shared/content-groups/content-groups.component.ts
similarity index 100%
rename from src/app/components/fragments/content-groups/content-groups.component.ts
rename to src/app/components/shared/content-groups/content-groups.component.ts
diff --git a/src/app/components/fragments/content-list/content-list.component.html b/src/app/components/shared/content-list/content-list.component.html
similarity index 100%
rename from src/app/components/fragments/content-list/content-list.component.html
rename to src/app/components/shared/content-list/content-list.component.html
diff --git a/src/app/components/fragments/content-list/content-list.component.scss b/src/app/components/shared/content-list/content-list.component.scss
similarity index 100%
rename from src/app/components/fragments/content-list/content-list.component.scss
rename to src/app/components/shared/content-list/content-list.component.scss
diff --git a/src/app/components/fragments/content-list/content-list.component.spec.ts b/src/app/components/shared/content-list/content-list.component.spec.ts
similarity index 100%
rename from src/app/components/fragments/content-list/content-list.component.spec.ts
rename to src/app/components/shared/content-list/content-list.component.spec.ts
diff --git a/src/app/components/fragments/content-list/content-list.component.ts b/src/app/components/shared/content-list/content-list.component.ts
similarity index 95%
rename from src/app/components/fragments/content-list/content-list.component.ts
rename to src/app/components/shared/content-list/content-list.component.ts
index b90691fe010cfa3cc3cb4f59c57910b1c93e7694..e78ff1c122a20ae8b006ae9c6a7246ed5bfd49c7 100644
--- a/src/app/components/fragments/content-list/content-list.component.ts
+++ b/src/app/components/shared/content-list/content-list.component.ts
@@ -7,9 +7,9 @@ import { ContentText } from '../../../models/content-text';
 import { AnswerOption } from '../../../models/answer-option';
 import { ContentType } from '../../../models/content-type.enum';
 import { MatDialog } from '@angular/material';
-import { ContentChoiceCreatorComponent } from '../content-choice-creator/content-choice-creator.component';
-import { ContentLikertCreatorComponent } from '../content-likert-creator/content-likert-creator.component';
-import { ContentTextCreatorComponent } from '../content-text-creator/content-text-creator.component';
+import { ContentChoiceCreatorComponent } from '../../creator/content-choice-creator/content-choice-creator.component';
+import { ContentLikertCreatorComponent } from '../../creator/content-likert-creator/content-likert-creator.component';
+import { ContentTextCreatorComponent } from '../../creator/content-text-creator/content-text-creator.component';
 import { NotificationService } from '../../../services/util/notification.service';
 import { Room } from '../../../models/room';
 import { RoomService } from '../../../services/http/room.service';
diff --git a/src/app/components/dialogs/footer-login-dialog/footer-login-dialog.component.html b/src/app/components/shared/dialogs/footer-login-dialog/footer-login-dialog.component.html
similarity index 100%
rename from src/app/components/dialogs/footer-login-dialog/footer-login-dialog.component.html
rename to src/app/components/shared/dialogs/footer-login-dialog/footer-login-dialog.component.html
diff --git a/src/app/components/dialogs/footer-login-dialog/footer-login-dialog.component.scss b/src/app/components/shared/dialogs/footer-login-dialog/footer-login-dialog.component.scss
similarity index 100%
rename from src/app/components/dialogs/footer-login-dialog/footer-login-dialog.component.scss
rename to src/app/components/shared/dialogs/footer-login-dialog/footer-login-dialog.component.scss
diff --git a/src/app/components/dialogs/footer-login-dialog/footer-login-dialog.component.spec.ts b/src/app/components/shared/dialogs/footer-login-dialog/footer-login-dialog.component.spec.ts
similarity index 100%
rename from src/app/components/dialogs/footer-login-dialog/footer-login-dialog.component.spec.ts
rename to src/app/components/shared/dialogs/footer-login-dialog/footer-login-dialog.component.spec.ts
diff --git a/src/app/components/dialogs/footer-login-dialog/footer-login-dialog.component.ts b/src/app/components/shared/dialogs/footer-login-dialog/footer-login-dialog.component.ts
similarity index 88%
rename from src/app/components/dialogs/footer-login-dialog/footer-login-dialog.component.ts
rename to src/app/components/shared/dialogs/footer-login-dialog/footer-login-dialog.component.ts
index 281d27d3c1d8272d05a14abfa25bbb9e205275a9..1cdcd9887f7d41a57d609bdd1f262f81e546219d 100644
--- a/src/app/components/dialogs/footer-login-dialog/footer-login-dialog.component.ts
+++ b/src/app/components/shared/dialogs/footer-login-dialog/footer-login-dialog.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit, Inject } from '@angular/core';
-import { FooterComponent } from '../../fragments/footer/footer.component';
+import { FooterComponent } from '../../footer/footer.component';
 import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material';
 
 @Component({
diff --git a/src/app/components/dialogs/generic-data-dialog/generic-data-dialog.component.html b/src/app/components/shared/dialogs/generic-data-dialog/generic-data-dialog.component.html
similarity index 100%
rename from src/app/components/dialogs/generic-data-dialog/generic-data-dialog.component.html
rename to src/app/components/shared/dialogs/generic-data-dialog/generic-data-dialog.component.html
diff --git a/src/app/components/dialogs/generic-data-dialog/generic-data-dialog.component.scss b/src/app/components/shared/dialogs/generic-data-dialog/generic-data-dialog.component.scss
similarity index 100%
rename from src/app/components/dialogs/generic-data-dialog/generic-data-dialog.component.scss
rename to src/app/components/shared/dialogs/generic-data-dialog/generic-data-dialog.component.scss
diff --git a/src/app/components/dialogs/generic-data-dialog/generic-data-dialog.component.spec.ts b/src/app/components/shared/dialogs/generic-data-dialog/generic-data-dialog.component.spec.ts
similarity index 100%
rename from src/app/components/dialogs/generic-data-dialog/generic-data-dialog.component.spec.ts
rename to src/app/components/shared/dialogs/generic-data-dialog/generic-data-dialog.component.spec.ts
diff --git a/src/app/components/dialogs/generic-data-dialog/generic-data-dialog.component.ts b/src/app/components/shared/dialogs/generic-data-dialog/generic-data-dialog.component.ts
similarity index 100%
rename from src/app/components/dialogs/generic-data-dialog/generic-data-dialog.component.ts
rename to src/app/components/shared/dialogs/generic-data-dialog/generic-data-dialog.component.ts
diff --git a/src/app/components/dialogs/password-reset/password-reset.component.html b/src/app/components/shared/dialogs/password-reset/password-reset.component.html
similarity index 100%
rename from src/app/components/dialogs/password-reset/password-reset.component.html
rename to src/app/components/shared/dialogs/password-reset/password-reset.component.html
diff --git a/src/app/components/dialogs/password-reset/password-reset.component.scss b/src/app/components/shared/dialogs/password-reset/password-reset.component.scss
similarity index 100%
rename from src/app/components/dialogs/password-reset/password-reset.component.scss
rename to src/app/components/shared/dialogs/password-reset/password-reset.component.scss
diff --git a/src/app/components/dialogs/password-reset/password-reset.component.spec.ts b/src/app/components/shared/dialogs/password-reset/password-reset.component.spec.ts
similarity index 100%
rename from src/app/components/dialogs/password-reset/password-reset.component.spec.ts
rename to src/app/components/shared/dialogs/password-reset/password-reset.component.spec.ts
diff --git a/src/app/components/dialogs/password-reset/password-reset.component.ts b/src/app/components/shared/dialogs/password-reset/password-reset.component.ts
similarity index 91%
rename from src/app/components/dialogs/password-reset/password-reset.component.ts
rename to src/app/components/shared/dialogs/password-reset/password-reset.component.ts
index 9057d61477585fd84ef5c52fc8ba2eb7ee5eb362..ff2378684ec1305d9484eb63a1d7cb5928a8c75c 100644
--- a/src/app/components/dialogs/password-reset/password-reset.component.ts
+++ b/src/app/components/shared/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/dialogs/register/register.component.html b/src/app/components/shared/dialogs/register/register.component.html
similarity index 100%
rename from src/app/components/dialogs/register/register.component.html
rename to src/app/components/shared/dialogs/register/register.component.html
diff --git a/src/app/components/dialogs/register/register.component.scss b/src/app/components/shared/dialogs/register/register.component.scss
similarity index 100%
rename from src/app/components/dialogs/register/register.component.scss
rename to src/app/components/shared/dialogs/register/register.component.scss
diff --git a/src/app/components/dialogs/register/register.component.spec.ts b/src/app/components/shared/dialogs/register/register.component.spec.ts
similarity index 100%
rename from src/app/components/dialogs/register/register.component.spec.ts
rename to src/app/components/shared/dialogs/register/register.component.spec.ts
diff --git a/src/app/components/dialogs/register/register.component.ts b/src/app/components/shared/dialogs/register/register.component.ts
similarity index 93%
rename from src/app/components/dialogs/register/register.component.ts
rename to src/app/components/shared/dialogs/register/register.component.ts
index a34d2ed63fa5bab967644ef746a263a547911852..fb58693558c793ab18ede34cc6bc71806cd80361 100644
--- a/src/app/components/dialogs/register/register.component.ts
+++ b/src/app/components/shared/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/dialogs/user-activation/user-activation.component.html b/src/app/components/shared/dialogs/user-activation/user-activation.component.html
similarity index 100%
rename from src/app/components/dialogs/user-activation/user-activation.component.html
rename to src/app/components/shared/dialogs/user-activation/user-activation.component.html
diff --git a/src/app/components/dialogs/user-activation/user-activation.component.scss b/src/app/components/shared/dialogs/user-activation/user-activation.component.scss
similarity index 100%
rename from src/app/components/dialogs/user-activation/user-activation.component.scss
rename to src/app/components/shared/dialogs/user-activation/user-activation.component.scss
diff --git a/src/app/components/dialogs/user-activation/user-activation.component.ts b/src/app/components/shared/dialogs/user-activation/user-activation.component.ts
similarity index 88%
rename from src/app/components/dialogs/user-activation/user-activation.component.ts
rename to src/app/components/shared/dialogs/user-activation/user-activation.component.ts
index 8d59e8834bcf2753ae349d78371a2021386d23f2..9dae27d0f8831a4dffdf51e8307a91cb5c1441fc 100644
--- a/src/app/components/dialogs/user-activation/user-activation.component.ts
+++ b/src/app/components/shared/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/pages/feedback-barometer-page/feedback-barometer-page.component.html b/src/app/components/shared/feedback-barometer-page/feedback-barometer-page.component.html
similarity index 100%
rename from src/app/components/pages/feedback-barometer-page/feedback-barometer-page.component.html
rename to src/app/components/shared/feedback-barometer-page/feedback-barometer-page.component.html
diff --git a/src/app/components/pages/feedback-barometer-page/feedback-barometer-page.component.scss b/src/app/components/shared/feedback-barometer-page/feedback-barometer-page.component.scss
similarity index 100%
rename from src/app/components/pages/feedback-barometer-page/feedback-barometer-page.component.scss
rename to src/app/components/shared/feedback-barometer-page/feedback-barometer-page.component.scss
diff --git a/src/app/components/pages/feedback-barometer-page/feedback-barometer-page.component.spec.ts b/src/app/components/shared/feedback-barometer-page/feedback-barometer-page.component.spec.ts
similarity index 100%
rename from src/app/components/pages/feedback-barometer-page/feedback-barometer-page.component.spec.ts
rename to src/app/components/shared/feedback-barometer-page/feedback-barometer-page.component.spec.ts
diff --git a/src/app/components/pages/feedback-barometer-page/feedback-barometer-page.component.ts b/src/app/components/shared/feedback-barometer-page/feedback-barometer-page.component.ts
similarity index 100%
rename from src/app/components/pages/feedback-barometer-page/feedback-barometer-page.component.ts
rename to src/app/components/shared/feedback-barometer-page/feedback-barometer-page.component.ts
diff --git a/src/app/components/pages/footer-imprint/footer-imprint.component.html b/src/app/components/shared/footer-imprint/footer-imprint.component.html
similarity index 100%
rename from src/app/components/pages/footer-imprint/footer-imprint.component.html
rename to src/app/components/shared/footer-imprint/footer-imprint.component.html
diff --git a/src/app/components/pages/footer-imprint/footer-imprint.component.scss b/src/app/components/shared/footer-imprint/footer-imprint.component.scss
similarity index 100%
rename from src/app/components/pages/footer-imprint/footer-imprint.component.scss
rename to src/app/components/shared/footer-imprint/footer-imprint.component.scss
diff --git a/src/app/components/pages/footer-imprint/footer-imprint.component.spec.ts b/src/app/components/shared/footer-imprint/footer-imprint.component.spec.ts
similarity index 100%
rename from src/app/components/pages/footer-imprint/footer-imprint.component.spec.ts
rename to src/app/components/shared/footer-imprint/footer-imprint.component.spec.ts
diff --git a/src/app/components/pages/footer-imprint/footer-imprint.component.ts b/src/app/components/shared/footer-imprint/footer-imprint.component.ts
similarity index 100%
rename from src/app/components/pages/footer-imprint/footer-imprint.component.ts
rename to src/app/components/shared/footer-imprint/footer-imprint.component.ts
diff --git a/src/app/components/fragments/footer/footer.component.html b/src/app/components/shared/footer/footer.component.html
similarity index 100%
rename from src/app/components/fragments/footer/footer.component.html
rename to src/app/components/shared/footer/footer.component.html
diff --git a/src/app/components/fragments/footer/footer.component.scss b/src/app/components/shared/footer/footer.component.scss
similarity index 100%
rename from src/app/components/fragments/footer/footer.component.scss
rename to src/app/components/shared/footer/footer.component.scss
diff --git a/src/app/components/fragments/footer/footer.component.spec.ts b/src/app/components/shared/footer/footer.component.spec.ts
similarity index 100%
rename from src/app/components/fragments/footer/footer.component.spec.ts
rename to src/app/components/shared/footer/footer.component.spec.ts
diff --git a/src/app/components/fragments/footer/footer.component.ts b/src/app/components/shared/footer/footer.component.ts
similarity index 86%
rename from src/app/components/fragments/footer/footer.component.ts
rename to src/app/components/shared/footer/footer.component.ts
index b75fe3f6c3096b343fbd9e0175d086997f9dc22a..073362e642f6be5d108b77b907ebe331170e3fdf 100644
--- a/src/app/components/fragments/footer/footer.component.ts
+++ b/src/app/components/shared/footer/footer.component.ts
@@ -3,7 +3,7 @@ import { AuthenticationService } from '../../../services/http/authentication.ser
 import { NotificationService } from '../../../services/util/notification.service';
 import { Router } from '@angular/router';
 import { MatDialog } from '@angular/material';
-import { FooterLoginDialogComponent } from '../../dialogs/footer-login-dialog/footer-login-dialog.component';
+import { FooterLoginDialogComponent } from '../dialogs/footer-login-dialog/footer-login-dialog.component';
 
 @Component({
   selector: 'app-footer',
diff --git a/src/app/components/fragments/header/header.component.html b/src/app/components/shared/header/header.component.html
similarity index 100%
rename from src/app/components/fragments/header/header.component.html
rename to src/app/components/shared/header/header.component.html
diff --git a/src/app/components/fragments/header/header.component.scss b/src/app/components/shared/header/header.component.scss
similarity index 100%
rename from src/app/components/fragments/header/header.component.scss
rename to src/app/components/shared/header/header.component.scss
diff --git a/src/app/components/fragments/header/header.component.spec.ts b/src/app/components/shared/header/header.component.spec.ts
similarity index 100%
rename from src/app/components/fragments/header/header.component.spec.ts
rename to src/app/components/shared/header/header.component.spec.ts
diff --git a/src/app/components/fragments/header/header.component.ts b/src/app/components/shared/header/header.component.ts
similarity index 100%
rename from src/app/components/fragments/header/header.component.ts
rename to src/app/components/shared/header/header.component.ts
diff --git a/src/app/components/pages/login-page/login-page.component.html b/src/app/components/shared/login-page/login-page.component.html
similarity index 100%
rename from src/app/components/pages/login-page/login-page.component.html
rename to src/app/components/shared/login-page/login-page.component.html
diff --git a/src/app/components/pages/login-page/login-page.component.scss b/src/app/components/shared/login-page/login-page.component.scss
similarity index 100%
rename from src/app/components/pages/login-page/login-page.component.scss
rename to src/app/components/shared/login-page/login-page.component.scss
diff --git a/src/app/components/pages/login-page/login-page.component.spec.ts b/src/app/components/shared/login-page/login-page.component.spec.ts
similarity index 100%
rename from src/app/components/pages/login-page/login-page.component.spec.ts
rename to src/app/components/shared/login-page/login-page.component.spec.ts
diff --git a/src/app/components/pages/login-page/login-page.component.ts b/src/app/components/shared/login-page/login-page.component.ts
similarity index 77%
rename from src/app/components/pages/login-page/login-page.component.ts
rename to src/app/components/shared/login-page/login-page.component.ts
index fe504339c78e7332b7ffb2a311e1927e717234b1..f6eb0dc1c6acdc9c1f956bce9bfcf7769976bd4e 100644
--- a/src/app/components/pages/login-page/login-page.component.ts
+++ b/src/app/components/shared/login-page/login-page.component.ts
@@ -1,7 +1,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 { RegisterComponent } from '../dialogs/register/register.component';
+import { PasswordResetComponent } from '../dialogs/password-reset/password-reset.component';
 import { UserRole } from '../../../models/user-roles.enum';
 
 @Component({
@@ -9,7 +9,7 @@ import { UserRole } from '../../../models/user-roles.enum';
   templateUrl: './login-page.component.html',
   styleUrls: ['./login-page.component.scss']
 })
-export class LoginComponentPageComponent implements OnInit {
+export class LoginPageComponent implements OnInit {
   // Make UserRole available to the template
   UserRole = UserRole;
   username: string;
diff --git a/src/app/components/fragments/login/login.component.html b/src/app/components/shared/login/login.component.html
similarity index 100%
rename from src/app/components/fragments/login/login.component.html
rename to src/app/components/shared/login/login.component.html
diff --git a/src/app/components/fragments/login/login.component.scss b/src/app/components/shared/login/login.component.scss
similarity index 100%
rename from src/app/components/fragments/login/login.component.scss
rename to src/app/components/shared/login/login.component.scss
diff --git a/src/app/components/fragments/login/login.component.spec.ts b/src/app/components/shared/login/login.component.spec.ts
similarity index 100%
rename from src/app/components/fragments/login/login.component.spec.ts
rename to src/app/components/shared/login/login.component.spec.ts
diff --git a/src/app/components/fragments/login/login.component.ts b/src/app/components/shared/login/login.component.ts
similarity index 97%
rename from src/app/components/fragments/login/login.component.ts
rename to src/app/components/shared/login/login.component.ts
index 3cdca3e1081688aeb5e1b20aa785dc7e992033a2..d286de95ab5b6561a15194eda1ba0c329272a604 100644
--- a/src/app/components/fragments/login/login.component.ts
+++ b/src/app/components/shared/login/login.component.ts
@@ -6,7 +6,7 @@ import { ErrorStateMatcher, MatDialog } from '@angular/material';
 import { FormControl, FormGroupDirective, NgForm, Validators } from '@angular/forms';
 import { UserRole } from '../../../models/user-roles.enum';
 import { TranslateService } from '@ngx-translate/core';
-import { UserActivationComponent } from '../../dialogs/user-activation/user-activation.component';
+import { UserActivationComponent } from '../dialogs/user-activation/user-activation.component';
 
 export class LoginErrorStateMatcher implements ErrorStateMatcher {
   isErrorState(control: FormControl | null, form: FormGroupDirective | NgForm | null): boolean {
diff --git a/src/app/components/pages/page-not-found/page-not-found.component.html b/src/app/components/shared/page-not-found/page-not-found.component.html
similarity index 100%
rename from src/app/components/pages/page-not-found/page-not-found.component.html
rename to src/app/components/shared/page-not-found/page-not-found.component.html
diff --git a/src/app/components/pages/page-not-found/page-not-found.component.scss b/src/app/components/shared/page-not-found/page-not-found.component.scss
similarity index 100%
rename from src/app/components/pages/page-not-found/page-not-found.component.scss
rename to src/app/components/shared/page-not-found/page-not-found.component.scss
diff --git a/src/app/components/pages/page-not-found/page-not-found.component.spec.ts b/src/app/components/shared/page-not-found/page-not-found.component.spec.ts
similarity index 100%
rename from src/app/components/pages/page-not-found/page-not-found.component.spec.ts
rename to src/app/components/shared/page-not-found/page-not-found.component.spec.ts
diff --git a/src/app/components/pages/page-not-found/page-not-found.component.ts b/src/app/components/shared/page-not-found/page-not-found.component.ts
similarity index 100%
rename from src/app/components/pages/page-not-found/page-not-found.component.ts
rename to src/app/components/shared/page-not-found/page-not-found.component.ts
diff --git a/src/app/components/fragments/room-join/room-join.component.html b/src/app/components/shared/room-join/room-join.component.html
similarity index 100%
rename from src/app/components/fragments/room-join/room-join.component.html
rename to src/app/components/shared/room-join/room-join.component.html
diff --git a/src/app/components/fragments/room-join/room-join.component.scss b/src/app/components/shared/room-join/room-join.component.scss
similarity index 100%
rename from src/app/components/fragments/room-join/room-join.component.scss
rename to src/app/components/shared/room-join/room-join.component.scss
diff --git a/src/app/components/fragments/room-join/room-join.component.spec.ts b/src/app/components/shared/room-join/room-join.component.spec.ts
similarity index 100%
rename from src/app/components/fragments/room-join/room-join.component.spec.ts
rename to src/app/components/shared/room-join/room-join.component.spec.ts
diff --git a/src/app/components/fragments/room-join/room-join.component.ts b/src/app/components/shared/room-join/room-join.component.ts
similarity index 95%
rename from src/app/components/fragments/room-join/room-join.component.ts
rename to src/app/components/shared/room-join/room-join.component.ts
index f8199b4a3225fd6559605e8d568b421dc558233f..cbf78852815221015a3e07ca874e49bb39b2f4e5 100644
--- a/src/app/components/fragments/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 '../dialogs/register/register.component';
 import { FormControl, FormGroupDirective, NgForm, Validators } from '@angular/forms';
 import { ErrorStateMatcher } from '@angular/material';
 import { NotificationService } from '../../../services/util/notification.service';
diff --git a/src/app/components/fragments/room-list/room-list.component.html b/src/app/components/shared/room-list/room-list.component.html
similarity index 100%
rename from src/app/components/fragments/room-list/room-list.component.html
rename to src/app/components/shared/room-list/room-list.component.html
diff --git a/src/app/components/fragments/room-list/room-list.component.scss b/src/app/components/shared/room-list/room-list.component.scss
similarity index 100%
rename from src/app/components/fragments/room-list/room-list.component.scss
rename to src/app/components/shared/room-list/room-list.component.scss
diff --git a/src/app/components/fragments/room-list/room-list.component.spec.ts b/src/app/components/shared/room-list/room-list.component.spec.ts
similarity index 100%
rename from src/app/components/fragments/room-list/room-list.component.spec.ts
rename to src/app/components/shared/room-list/room-list.component.spec.ts
diff --git a/src/app/components/fragments/room-list/room-list.component.ts b/src/app/components/shared/room-list/room-list.component.ts
similarity index 100%
rename from src/app/components/fragments/room-list/room-list.component.ts
rename to src/app/components/shared/room-list/room-list.component.ts
diff --git a/src/app/components/pages/room-page/room-page.component.html b/src/app/components/shared/room-page/room-page.component.html
similarity index 100%
rename from src/app/components/pages/room-page/room-page.component.html
rename to src/app/components/shared/room-page/room-page.component.html
diff --git a/src/app/components/pages/room-page/room-page.component.scss b/src/app/components/shared/room-page/room-page.component.scss
similarity index 100%
rename from src/app/components/pages/room-page/room-page.component.scss
rename to src/app/components/shared/room-page/room-page.component.scss
diff --git a/src/app/components/pages/room-page/room-page.component.spec.ts b/src/app/components/shared/room-page/room-page.component.spec.ts
similarity index 100%
rename from src/app/components/pages/room-page/room-page.component.spec.ts
rename to src/app/components/shared/room-page/room-page.component.spec.ts
diff --git a/src/app/components/pages/room-page/room-page.component.ts b/src/app/components/shared/room-page/room-page.component.ts
similarity index 100%
rename from src/app/components/pages/room-page/room-page.component.ts
rename to src/app/components/shared/room-page/room-page.component.ts
diff --git a/src/app/components/fragments/statistics/statistics.component.html b/src/app/components/shared/statistics/statistics.component.html
similarity index 100%
rename from src/app/components/fragments/statistics/statistics.component.html
rename to src/app/components/shared/statistics/statistics.component.html
diff --git a/src/app/components/fragments/statistics/statistics.component.scss b/src/app/components/shared/statistics/statistics.component.scss
similarity index 100%
rename from src/app/components/fragments/statistics/statistics.component.scss
rename to src/app/components/shared/statistics/statistics.component.scss
diff --git a/src/app/components/fragments/statistics/statistics.component.spec.ts b/src/app/components/shared/statistics/statistics.component.spec.ts
similarity index 100%
rename from src/app/components/fragments/statistics/statistics.component.spec.ts
rename to src/app/components/shared/statistics/statistics.component.spec.ts
diff --git a/src/app/components/fragments/statistics/statistics.component.ts b/src/app/components/shared/statistics/statistics.component.ts
similarity index 100%
rename from src/app/components/fragments/statistics/statistics.component.ts
rename to src/app/components/shared/statistics/statistics.component.ts