diff --git a/src/app/components/creator/content-choice-creator/content-choice-creator.component.ts b/src/app/components/creator/content-choice-creator/content-choice-creator.component.ts
index 0fa11b1554c8035e3085689fd98e7eccbf1879d9..9856b24dc76b6dc6b67f2eed65efc4b0847fb372 100644
--- a/src/app/components/creator/content-choice-creator/content-choice-creator.component.ts
+++ b/src/app/components/creator/content-choice-creator/content-choice-creator.component.ts
@@ -6,7 +6,7 @@ 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 { ContentType } from '../../../models/content-type.enum';
-import { ContentListComponent } from '../../shared/content-list/content-list.component';
+import { ContentListComponent } from '../content-list/content-list.component';
 import { ContentDeleteComponent } from '../_dialogs/content-delete/content-delete.component';
 import { TranslateService } from '@ngx-translate/core';
 
diff --git a/src/app/components/creator/content-creator/content-creator.component.ts b/src/app/components/creator/content-creator/content-creator.component.ts
index 0fbf4eeb84633a16e1fde6a43adf0bcad7221435..9b85bdc627f32214e7e0240cdb3b8292a3cdf6b7 100644
--- a/src/app/components/creator/content-creator/content-creator.component.ts
+++ b/src/app/components/creator/content-creator/content-creator.component.ts
@@ -2,7 +2,7 @@ import { Component, Inject, Input, OnInit } from '@angular/core';
 import { ContentText } from '../../../models/content-text';
 import { FormControl } from '@angular/forms';
 import { MAT_DIALOG_DATA, MatDialog, MatDialogRef } from '@angular/material';
-import { ContentListComponent } from '../../shared/content-list/content-list.component';
+import { ContentListComponent } from '../content-list/content-list.component';
 import { Room } from '../../../models/room';
 import { TranslateService } from '@ngx-translate/core';
 
diff --git a/src/app/components/creator/content-likert-creator/content-likert-creator.component.ts b/src/app/components/creator/content-likert-creator/content-likert-creator.component.ts
index 3e3fe901050d98f1036bf65521f216c35cc4e6ee..3988c302907eece61fc706ae52907ec3eddba281 100644
--- a/src/app/components/creator/content-likert-creator/content-likert-creator.component.ts
+++ b/src/app/components/creator/content-likert-creator/content-likert-creator.component.ts
@@ -6,7 +6,7 @@ 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 '../../shared/content-list/content-list.component';
+import { ContentListComponent } from '../content-list/content-list.component';
 import { ContentDeleteComponent } from '../_dialogs/content-delete/content-delete.component';
 import { FormControl } from '@angular/forms';
 import { Observable } from 'rxjs/Observable';
diff --git a/src/app/components/shared/content-list/content-list.component.html b/src/app/components/creator/content-list/content-list.component.html
similarity index 100%
rename from src/app/components/shared/content-list/content-list.component.html
rename to src/app/components/creator/content-list/content-list.component.html
diff --git a/src/app/components/shared/content-list/content-list.component.scss b/src/app/components/creator/content-list/content-list.component.scss
similarity index 100%
rename from src/app/components/shared/content-list/content-list.component.scss
rename to src/app/components/creator/content-list/content-list.component.scss
diff --git a/src/app/components/shared/content-list/content-list.component.spec.ts b/src/app/components/creator/content-list/content-list.component.spec.ts
similarity index 100%
rename from src/app/components/shared/content-list/content-list.component.spec.ts
rename to src/app/components/creator/content-list/content-list.component.spec.ts
diff --git a/src/app/components/shared/content-list/content-list.component.ts b/src/app/components/creator/content-list/content-list.component.ts
similarity index 95%
rename from src/app/components/shared/content-list/content-list.component.ts
rename to src/app/components/creator/content-list/content-list.component.ts
index 48f292171e3955692033072d5af95076572f8f02..6477738afe35cc63355accde0d941199abccd77c 100644
--- a/src/app/components/shared/content-list/content-list.component.ts
+++ b/src/app/components/creator/content-list/content-list.component.ts
@@ -8,9 +8,9 @@ import { AnswerOption } from '../../../models/answer-option';
 import { ContentType } from '../../../models/content-type.enum';
 import { ContentGroup } from '../../../models/content-group';
 import { MatDialog } from '@angular/material';
-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 { 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 { NotificationService } from '../../../services/util/notification.service';
 import { Room } from '../../../models/room';
 import { RoomService } from '../../../services/http/room.service';
diff --git a/src/app/components/creator/content-text-creator/content-text-creator.component.ts b/src/app/components/creator/content-text-creator/content-text-creator.component.ts
index 7bc53c6401a0337143f71b75787e34cf0e78f22c..37e18da98a7932f0a6835b18eb378fc3b4c9f3b8 100644
--- a/src/app/components/creator/content-text-creator/content-text-creator.component.ts
+++ b/src/app/components/creator/content-text-creator/content-text-creator.component.ts
@@ -3,7 +3,7 @@ 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 '../../shared/content-list/content-list.component';
+import { ContentListComponent } from '../content-list/content-list.component';
 import { ContentDeleteComponent } from '../_dialogs/content-delete/content-delete.component';
 import { TranslateService } from '@ngx-translate/core';
 
diff --git a/src/app/components/creator/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
index 20842d4118faefd2742b161c58937c1ef0c99c60..67040e3049ab5eac4341792cf44e1e184f3b964d 100644
--- a/src/app/components/creator/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,7 +6,7 @@ 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 '../../shared/content-list/content-list.component';
+import { ContentListComponent } from '../content-list/content-list.component';
 import { ContentDeleteComponent } from '../_dialogs/content-delete/content-delete.component';
 import { FormControl } from '@angular/forms';
 import { Observable } from 'rxjs/Observable';
diff --git a/src/app/components/creator/creator-routing.module.ts b/src/app/components/creator/creator-routing.module.ts
index 43d2ef941a2683ea09e0ab2318e9697f68e5d4ac..cd09cdd33ddcb268c2806a2cd60a8e0111449d25 100644
--- a/src/app/components/creator/creator-routing.module.ts
+++ b/src/app/components/creator/creator-routing.module.ts
@@ -8,7 +8,7 @@ import { ContentCreatePageComponent } from './content-create-page/content-create
 import { StatisticsComponent } from '../shared/statistics/statistics.component';
 import { CommentListComponent } from '../shared/comment-list/comment-list.component';
 import { FeedbackBarometerPageComponent } from '../shared/feedback-barometer-page/feedback-barometer-page.component';
-import { ContentListComponent } from '../shared/content-list/content-list.component';
+import { ContentListComponent } from './content-list/content-list.component';
 
 const routes: Routes = [
   {
diff --git a/src/app/components/creator/creator.module.ts b/src/app/components/creator/creator.module.ts
index 9de8e65a7b80ee6cbf60cf3aec75c4dcba91cb83..4430128da1da0af28607c00235cb5f51f94c80dc 100644
--- a/src/app/components/creator/creator.module.ts
+++ b/src/app/components/creator/creator.module.ts
@@ -21,6 +21,7 @@ import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 import { HttpClient } from '@angular/common/http';
 import { TranslateHttpLoader } from '@ngx-translate/http-loader';
 import { ContentCreatorComponent } from './content-creator/content-creator.component';
+import { ContentListComponent } from './content-list/content-list.component';
 
 @NgModule({
   imports: [
@@ -50,7 +51,8 @@ import { ContentCreatorComponent } from './content-creator/content-creator.compo
     RoomCreateComponent,
     RoomDeleteComponent,
     RoomEditComponent,
-    ContentCreatorComponent
+    ContentCreatorComponent,
+    ContentListComponent
   ],
   entryComponents: [
     RoomCreateComponent,
diff --git a/src/app/components/shared/shared.module.ts b/src/app/components/shared/shared.module.ts
index 351f135643b1e49003a6d92ea6dc7ba3527ba5ae..e3af5fe5779c31ab60e5885079ae21b5fc2c59a9 100644
--- a/src/app/components/shared/shared.module.ts
+++ b/src/app/components/shared/shared.module.ts
@@ -2,7 +2,6 @@ import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { CommentListComponent } from './comment-list/comment-list.component';
 import { ContentGroupsComponent } from './content-groups/content-groups.component';
-import { ContentListComponent } from './content-list/content-list.component';
 import { FeedbackBarometerPageComponent } from './feedback-barometer-page/feedback-barometer-page.component';
 import { FooterComponent } from './footer/footer.component';
 import { FooterImprintComponent } from './footer-imprint/footer-imprint.component';
@@ -32,7 +31,6 @@ import { SharedRoutingModule } from './shared-routing.module';
     RoomPageComponent,
     RoomListComponent,
     ContentGroupsComponent,
-    ContentListComponent,
     HeaderComponent,
     AnswerEditComponent,
     ContentDeleteComponent,
@@ -52,7 +50,6 @@ import { SharedRoutingModule } from './shared-routing.module';
     RoomPageComponent,
     RoomListComponent,
     ContentGroupsComponent,
-    ContentListComponent,
     HeaderComponent,
     AnswerEditComponent,
     ContentDeleteComponent,