diff --git a/src/app/components/participant/_dialogs/answer-edit/answer-edit.component.html b/src/app/components/creator/_dialogs/answer-edit/answer-edit.component.html
similarity index 100%
rename from src/app/components/participant/_dialogs/answer-edit/answer-edit.component.html
rename to src/app/components/creator/_dialogs/answer-edit/answer-edit.component.html
diff --git a/src/app/components/participant/_dialogs/answer-edit/answer-edit.component.scss b/src/app/components/creator/_dialogs/answer-edit/answer-edit.component.scss
similarity index 100%
rename from src/app/components/participant/_dialogs/answer-edit/answer-edit.component.scss
rename to src/app/components/creator/_dialogs/answer-edit/answer-edit.component.scss
diff --git a/src/app/components/participant/_dialogs/answer-edit/answer-edit.component.spec.ts b/src/app/components/creator/_dialogs/answer-edit/answer-edit.component.spec.ts
similarity index 100%
rename from src/app/components/participant/_dialogs/answer-edit/answer-edit.component.spec.ts
rename to src/app/components/creator/_dialogs/answer-edit/answer-edit.component.spec.ts
diff --git a/src/app/components/participant/_dialogs/answer-edit/answer-edit.component.ts b/src/app/components/creator/_dialogs/answer-edit/answer-edit.component.ts
similarity index 89%
rename from src/app/components/participant/_dialogs/answer-edit/answer-edit.component.ts
rename to src/app/components/creator/_dialogs/answer-edit/answer-edit.component.ts
index 9f68a995ddf1374736b292bcd093397a488bfab1..54f8a3b59356a8cd82f551d4d39f3778683a1894 100644
--- a/src/app/components/participant/_dialogs/answer-edit/answer-edit.component.ts
+++ b/src/app/components/creator/_dialogs/answer-edit/answer-edit.component.ts
@@ -1,5 +1,5 @@
 import { Component, Inject, OnInit } from '@angular/core';
-import { ContentChoiceCreatorComponent, DisplayAnswer } from '../../../creator/content-choice-creator/content-choice-creator.component';
+import { ContentChoiceCreatorComponent, DisplayAnswer } from '../../content-choice-creator/content-choice-creator.component';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
 
 @Component({
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 8ccc928f3d4ff1f61263dcc6d67ea4bf7e81355c..c6d304ad2b15f86165face2bcbc340596f26cc1f 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
@@ -4,7 +4,7 @@ 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 '../../participant/_dialogs/answer-edit/answer-edit.component';
+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 { ContentDeleteComponent } from '../_dialogs/content-delete/content-delete.component';
diff --git a/src/app/components/creator/creator.module.ts b/src/app/components/creator/creator.module.ts
index 002e7c2f904e09b04e6365c37af0ecb396fe87f2..190bdb1ba9882d2b4162ffa6590f6675f8c246ce 100644
--- a/src/app/components/creator/creator.module.ts
+++ b/src/app/components/creator/creator.module.ts
@@ -14,7 +14,7 @@ import { EssentialsModule, HttpLoaderFactory} from '../essentials/essentials.mod
 import { RoomCreateComponent } from './_dialogs/room-create/room-create.component';
 import { RoomDeleteComponent } from './_dialogs/room-delete/room-delete.component';
 import { RoomEditComponent } from './_dialogs/room-edit/room-edit.component';
-import { AnswerEditComponent } from '../participant/_dialogs/answer-edit/answer-edit.component';
+import { AnswerEditComponent } from './_dialogs/answer-edit/answer-edit.component';
 import { ContentDeleteComponent } from './_dialogs/content-delete/content-delete.component';
 import { CreatorContentCarouselPageComponent } from './creator-content-carousel-page/creator-content-carousel-page.component';
 import { SharedModule } from '../shared/shared.module';
diff --git a/src/app/components/shared/shared.module.ts b/src/app/components/shared/shared.module.ts
index 07acba9c983a998f047ff814693cbd2f3ec20cf4..351f135643b1e49003a6d92ea6dc7ba3527ba5ae 100644
--- a/src/app/components/shared/shared.module.ts
+++ b/src/app/components/shared/shared.module.ts
@@ -12,7 +12,7 @@ import { RoomJoinComponent } from './room-join/room-join.component';
 import { RoomListComponent } from './room-list/room-list.component';
 import { RoomPageComponent } from './room-page/room-page.component';
 import { StatisticsComponent } from './statistics/statistics.component';
-import { AnswerEditComponent } from '../participant/_dialogs/answer-edit/answer-edit.component';
+import { AnswerEditComponent } from '../creator/_dialogs/answer-edit/answer-edit.component';
 import { ContentDeleteComponent } from '../creator/_dialogs/content-delete/content-delete.component';
 import { MarkdownHelpDialogComponent } from '../creator/_dialogs/markdown-help-dialog/markdown-help-dialog.component';
 import { GenericDataDialogComponent } from './_dialogs/generic-data-dialog/generic-data-dialog.component';