diff --git a/frontend/src/app/modules/challenges/challenges-routing.module.ts b/frontend/src/app/modules/challenges/challenges-routing.module.ts
index a39ade1a7..07e2310f9 100644
--- a/frontend/src/app/modules/challenges/challenges-routing.module.ts
+++ b/frontend/src/app/modules/challenges/challenges-routing.module.ts
@@ -2,12 +2,17 @@ import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 
 import { ChallengesTestPageComponent } from './challenges-test-page/challenges-test-page.component';
+import { EditorQuestionComponent } from './editor-question/editor-question.component';
 
 const routes: Routes = [
     {
-        path: '',
+        path: 'test',
         component: ChallengesTestPageComponent,
     },
+    {
+        path: 'question',
+        component: EditorQuestionComponent,
+    },
 ];
 
 @NgModule({
diff --git a/frontend/src/app/modules/challenges/challenges.module.ts b/frontend/src/app/modules/challenges/challenges.module.ts
index a37b4c276..8e14be3cc 100644
--- a/frontend/src/app/modules/challenges/challenges.module.ts
+++ b/frontend/src/app/modules/challenges/challenges.module.ts
@@ -3,10 +3,17 @@ import { SharedModule } from '@shared/shared.module';
 
 import { ChallengesDropdownSelectComponent } from './challenges-dropdown-select/challenges-dropdown-select.component';
 import { ChallengesTestPageComponent } from './challenges-test-page/challenges-test-page.component';
+import { EditorQuestionComponent } from './editor-question/editor-question.component';
+import { StepsOfProgressComponent } from './steps-of-progress/steps-of-progress.component';
 import { ChallengesRoutingModule } from './challenges-routing.module';
 
 @NgModule({
-    declarations: [ChallengesTestPageComponent, ChallengesDropdownSelectComponent],
+    declarations: [
+        StepsOfProgressComponent,
+        ChallengesTestPageComponent,
+        ChallengesDropdownSelectComponent,
+        EditorQuestionComponent,
+    ],
     imports: [SharedModule, ChallengesRoutingModule],
 })
 export class ChallengesModule {}
diff --git a/frontend/src/app/shared/components/editor-question/editor-question.component.html b/frontend/src/app/modules/challenges/editor-question/editor-question.component.html
similarity index 100%
rename from frontend/src/app/shared/components/editor-question/editor-question.component.html
rename to frontend/src/app/modules/challenges/editor-question/editor-question.component.html
diff --git a/frontend/src/app/shared/components/editor-question/editor-question.component.sass b/frontend/src/app/modules/challenges/editor-question/editor-question.component.sass
similarity index 100%
rename from frontend/src/app/shared/components/editor-question/editor-question.component.sass
rename to frontend/src/app/modules/challenges/editor-question/editor-question.component.sass
diff --git a/frontend/src/app/shared/components/editor-question/editor-question.component.ts b/frontend/src/app/modules/challenges/editor-question/editor-question.component.ts
similarity index 100%
rename from frontend/src/app/shared/components/editor-question/editor-question.component.ts
rename to frontend/src/app/modules/challenges/editor-question/editor-question.component.ts
diff --git a/frontend/src/app/shared/components/steps-of-progress/steps-of-progress.component.html b/frontend/src/app/modules/challenges/steps-of-progress/steps-of-progress.component.html
similarity index 100%
rename from frontend/src/app/shared/components/steps-of-progress/steps-of-progress.component.html
rename to frontend/src/app/modules/challenges/steps-of-progress/steps-of-progress.component.html
diff --git a/frontend/src/app/shared/components/steps-of-progress/steps-of-progress.component.sass b/frontend/src/app/modules/challenges/steps-of-progress/steps-of-progress.component.sass
similarity index 100%
rename from frontend/src/app/shared/components/steps-of-progress/steps-of-progress.component.sass
rename to frontend/src/app/modules/challenges/steps-of-progress/steps-of-progress.component.sass
diff --git a/frontend/src/app/shared/components/steps-of-progress/steps-of-progress.component.ts b/frontend/src/app/modules/challenges/steps-of-progress/steps-of-progress.component.ts
similarity index 100%
rename from frontend/src/app/shared/components/steps-of-progress/steps-of-progress.component.ts
rename to frontend/src/app/modules/challenges/steps-of-progress/steps-of-progress.component.ts
diff --git a/frontend/src/app/shared/components/challenge/challenge.component.html b/frontend/src/app/modules/main/challenge/challenge.component.html
similarity index 100%
rename from frontend/src/app/shared/components/challenge/challenge.component.html
rename to frontend/src/app/modules/main/challenge/challenge.component.html
diff --git a/frontend/src/app/shared/components/challenge/challenge.component.sass b/frontend/src/app/modules/main/challenge/challenge.component.sass
similarity index 100%
rename from frontend/src/app/shared/components/challenge/challenge.component.sass
rename to frontend/src/app/modules/main/challenge/challenge.component.sass
diff --git a/frontend/src/app/shared/components/challenge/challenge.component.ts b/frontend/src/app/modules/main/challenge/challenge.component.ts
similarity index 100%
rename from frontend/src/app/shared/components/challenge/challenge.component.ts
rename to frontend/src/app/modules/main/challenge/challenge.component.ts
diff --git a/frontend/src/app/shared/components/filtering-section/filtering-section.component.html b/frontend/src/app/modules/main/filtering-section/filtering-section.component.html
similarity index 100%
rename from frontend/src/app/shared/components/filtering-section/filtering-section.component.html
rename to frontend/src/app/modules/main/filtering-section/filtering-section.component.html
diff --git a/frontend/src/app/shared/components/filtering-section/filtering-section.component.sass b/frontend/src/app/modules/main/filtering-section/filtering-section.component.sass
similarity index 100%
rename from frontend/src/app/shared/components/filtering-section/filtering-section.component.sass
rename to frontend/src/app/modules/main/filtering-section/filtering-section.component.sass
diff --git a/frontend/src/app/shared/components/filtering-section/filtering-section.component.ts b/frontend/src/app/modules/main/filtering-section/filtering-section.component.ts
similarity index 100%
rename from frontend/src/app/shared/components/filtering-section/filtering-section.component.ts
rename to frontend/src/app/modules/main/filtering-section/filtering-section.component.ts
diff --git a/frontend/src/app/modules/main/main.module.ts b/frontend/src/app/modules/main/main.module.ts
index bc1321f07..0b4b74421 100644
--- a/frontend/src/app/modules/main/main.module.ts
+++ b/frontend/src/app/modules/main/main.module.ts
@@ -1,11 +1,14 @@
 import { NgModule } from '@angular/core';
 import { SharedModule } from '@shared/shared.module';
 
+import { ChallengeComponent } from './challenge/challenge.component';
+import { FilteringSectionComponent } from './filtering-section/filtering-section.component';
 import { MainComponent } from './main-page/main-page.component';
+import { SuggestedChallengeComponent } from './suggested-challenge/suggested-challenge.component';
 import { MainRoutingModule } from './main-routing.module';
 
 @NgModule({
-    declarations: [MainComponent],
+    declarations: [MainComponent, SuggestedChallengeComponent, FilteringSectionComponent, ChallengeComponent],
     imports: [SharedModule, MainRoutingModule],
 })
 export class MainModule {}
diff --git a/frontend/src/app/shared/components/suggested-challenge/suggested-challenge.component.html b/frontend/src/app/modules/main/suggested-challenge/suggested-challenge.component.html
similarity index 100%
rename from frontend/src/app/shared/components/suggested-challenge/suggested-challenge.component.html
rename to frontend/src/app/modules/main/suggested-challenge/suggested-challenge.component.html
diff --git a/frontend/src/app/shared/components/suggested-challenge/suggested-challenge.component.sass b/frontend/src/app/modules/main/suggested-challenge/suggested-challenge.component.sass
similarity index 100%
rename from frontend/src/app/shared/components/suggested-challenge/suggested-challenge.component.sass
rename to frontend/src/app/modules/main/suggested-challenge/suggested-challenge.component.sass
diff --git a/frontend/src/app/shared/components/suggested-challenge/suggested-challenge.component.ts b/frontend/src/app/modules/main/suggested-challenge/suggested-challenge.component.ts
similarity index 100%
rename from frontend/src/app/shared/components/suggested-challenge/suggested-challenge.component.ts
rename to frontend/src/app/modules/main/suggested-challenge/suggested-challenge.component.ts
diff --git a/frontend/src/app/shared/shared.module.ts b/frontend/src/app/shared/shared.module.ts
index 78df398b7..fc420f7a7 100644
--- a/frontend/src/app/shared/shared.module.ts
+++ b/frontend/src/app/shared/shared.module.ts
@@ -14,21 +14,16 @@ import { TabsetConfig, TabsModule } from 'ngx-bootstrap/tabs';
 import { MarkdownModule } from 'ngx-markdown';
 import { MonacoEditorModule } from 'ngx-monaco-editor-v2';
 
-import { ChallengeComponent } from './components/challenge/challenge.component';
 import { CodeEditorComponent } from './components/code-editor/code-editor.component';
 import { ConfirmationModalComponent } from './components/confirmation-modal/confirmation-modal.component';
 import { CustomInputComponent } from './components/custom-input/custom-input.component';
 import { DropdownSelectComponent } from './components/dropdown-select/dropdown-select.component';
-import { EditorQuestionComponent } from './components/editor-question/editor-question.component';
-import { FilteringSectionComponent } from './components/filtering-section/filtering-section.component';
 import { GeneralModalComponent } from './components/general-modal/general-modal.component';
 import { HeaderComponent } from './components/header/header.component';
 import { LoadingSpinnerComponent } from './components/loading-spinner/loading-spinner.component';
 import { NotFoundComponent } from './components/not-found/not-found.component';
 import { PieChartComponent } from './components/pie-chart/pie-chart.component';
 import { ProgressBarComponent } from './components/progress-bar/progress-bar.component';
-import { StepsOfProgressComponent } from './components/steps-of-progress/steps-of-progress.component';
-import { SuggestedChallengeComponent } from './components/suggested-challenge/suggested-challenge.component';
 
 @NgModule({
     imports: [
@@ -51,16 +46,11 @@ import { SuggestedChallengeComponent } from './components/suggested-challenge/su
         ConfirmationModalComponent,
         GeneralModalComponent,
         DropdownSelectComponent,
-        SuggestedChallengeComponent,
         CustomInputComponent,
         CodeEditorComponent,
-        ChallengeComponent,
-        FilteringSectionComponent,
         PieChartComponent,
         ProgressBarComponent,
         HeaderComponent,
-        StepsOfProgressComponent,
-        EditorQuestionComponent,
     ],
     exports: [
         CommonModule,
@@ -75,17 +65,14 @@ import { SuggestedChallengeComponent } from './components/suggested-challenge/su
         ConfirmationModalComponent,
         GeneralModalComponent,
         DropdownSelectComponent,
-        SuggestedChallengeComponent,
         CustomInputComponent,
-        ChallengeComponent,
-        FilteringSectionComponent,
         PieChartComponent,
         ProgressBarComponent,
         HeaderComponent,
-        StepsOfProgressComponent,
-        EditorQuestionComponent,
         NgbModule,
         TabsModule,
+        MarkdownModule,
+        AngularMarkdownEditorModule,
     ],
     providers: [TabsetConfig],
 })