diff --git a/kontor-angular/src/app/media/media-actor/media-actor-list/media-actor-list.component.css b/kontor-angular/src/app/kontor/media/media-actors/media-actors.component.css
similarity index 100%
rename from kontor-angular/src/app/media/media-actor/media-actor-list/media-actor-list.component.css
rename to kontor-angular/src/app/kontor/media/media-actors/media-actors.component.css
diff --git a/kontor-angular/src/app/kontor/media/media-actors/media-actors.component.html b/kontor-angular/src/app/kontor/media/media-actors/media-actors.component.html
new file mode 100644
index 0000000..3904b79
--- /dev/null
+++ b/kontor-angular/src/app/kontor/media/media-actors/media-actors.component.html
@@ -0,0 +1 @@
+<p>media-actors works!</p>
diff --git a/kontor-angular/src/app/media/media-file/media-file-list/media-file-list.component.spec.ts b/kontor-angular/src/app/kontor/media/media-actors/media-actors.component.spec.ts
similarity index 51%
rename from kontor-angular/src/app/media/media-file/media-file-list/media-file-list.component.spec.ts
rename to kontor-angular/src/app/kontor/media/media-actors/media-actors.component.spec.ts
index 331bea0..1448ea4 100644
--- a/kontor-angular/src/app/media/media-file/media-file-list/media-file-list.component.spec.ts
+++ b/kontor-angular/src/app/kontor/media/media-actors/media-actors.component.spec.ts
@@ -1,18 +1,18 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { MediaFileListComponent } from './media-file-list.component';
+import { MediaActorsComponent } from './media-actors.component';
 
-describe('MediaFileListComponent', () => {
-  let component: MediaFileListComponent;
-  let fixture: ComponentFixture<MediaFileListComponent>;
+describe('MediaActorsComponent', () => {
+  let component: MediaActorsComponent;
+  let fixture: ComponentFixture<MediaActorsComponent>;
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [MediaFileListComponent]
+      imports: [MediaActorsComponent]
     })
     .compileComponents();
 
-    fixture = TestBed.createComponent(MediaFileListComponent);
+    fixture = TestBed.createComponent(MediaActorsComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });
diff --git a/kontor-angular/src/app/kontor/media/media-actors/media-actors.component.ts b/kontor-angular/src/app/kontor/media/media-actors/media-actors.component.ts
new file mode 100644
index 0000000..8fbb7f8
--- /dev/null
+++ b/kontor-angular/src/app/kontor/media/media-actors/media-actors.component.ts
@@ -0,0 +1,11 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'app-media-actors',
+  imports: [],
+  templateUrl: './media-actors.component.html',
+  styleUrl: './media-actors.component.css'
+})
+export class MediaActorsComponent {
+
+}
diff --git a/kontor-angular/src/app/media/media-file/media-file-list/media-file-list.component.css b/kontor-angular/src/app/kontor/media/media-files/media-files.component.css
similarity index 100%
rename from kontor-angular/src/app/media/media-file/media-file-list/media-file-list.component.css
rename to kontor-angular/src/app/kontor/media/media-files/media-files.component.css
diff --git a/kontor-angular/src/app/kontor/media/media-files/media-files.component.html b/kontor-angular/src/app/kontor/media/media-files/media-files.component.html
new file mode 100644
index 0000000..367cd62
--- /dev/null
+++ b/kontor-angular/src/app/kontor/media/media-files/media-files.component.html
@@ -0,0 +1 @@
+<p>media-files works!</p>
diff --git a/kontor-angular/src/app/media/media-video/media-video-list/media-video-list.component.spec.ts b/kontor-angular/src/app/kontor/media/media-files/media-files.component.spec.ts
similarity index 50%
rename from kontor-angular/src/app/media/media-video/media-video-list/media-video-list.component.spec.ts
rename to kontor-angular/src/app/kontor/media/media-files/media-files.component.spec.ts
index e18eb84..c8f1c9f 100644
--- a/kontor-angular/src/app/media/media-video/media-video-list/media-video-list.component.spec.ts
+++ b/kontor-angular/src/app/kontor/media/media-files/media-files.component.spec.ts
@@ -1,18 +1,18 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { MediaVideoListComponent } from './media-video-list.component';
+import { MediaFilesComponent } from './media-files.component';
 
-describe('MediaVideoListComponent', () => {
-  let component: MediaVideoListComponent;
-  let fixture: ComponentFixture<MediaVideoListComponent>;
+describe('MediaFilesComponent', () => {
+  let component: MediaFilesComponent;
+  let fixture: ComponentFixture<MediaFilesComponent>;
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [MediaVideoListComponent]
+      imports: [MediaFilesComponent]
     })
     .compileComponents();
 
-    fixture = TestBed.createComponent(MediaVideoListComponent);
+    fixture = TestBed.createComponent(MediaFilesComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });
diff --git a/kontor-angular/src/app/kontor/media/media-files/media-files.component.ts b/kontor-angular/src/app/kontor/media/media-files/media-files.component.ts
new file mode 100644
index 0000000..58d983c
--- /dev/null
+++ b/kontor-angular/src/app/kontor/media/media-files/media-files.component.ts
@@ -0,0 +1,11 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'app-media-files',
+  imports: [],
+  templateUrl: './media-files.component.html',
+  styleUrl: './media-files.component.css'
+})
+export class MediaFilesComponent {
+
+}
diff --git a/kontor-angular/src/app/kontor/media/media-navigation/media-navigation.component.html b/kontor-angular/src/app/kontor/media/media-navigation/media-navigation.component.html
index cd3857f..846dd50 100644
--- a/kontor-angular/src/app/kontor/media/media-navigation/media-navigation.component.html
+++ b/kontor-angular/src/app/kontor/media/media-navigation/media-navigation.component.html
@@ -1,5 +1,5 @@
 <div class="subnav">
-  <a routerLink="/media/mediafiles" routerLinkActive="active">MediaFiles</a>
-  <a routerLink="/media/mediaactors" routerLinkActive="active">MediaActors</a>
-  <a routerLink="/media/mediavideos" routerLinkActive="active">MediaVideos</a>
+  <a routerLink="/media/file" routerLinkActive="active">MediaFiles</a>
+  <a routerLink="/media/actor" routerLinkActive="active">MediaActors</a>
+  <a routerLink="/media/video" routerLinkActive="active">MediaVideos</a>
 </div>
diff --git a/kontor-angular/src/app/kontor/media/media-section/media-section.routes.ts b/kontor-angular/src/app/kontor/media/media-section/media-section.routes.ts
index fbd256c..9311eed 100644
--- a/kontor-angular/src/app/kontor/media/media-section/media-section.routes.ts
+++ b/kontor-angular/src/app/kontor/media/media-section/media-section.routes.ts
@@ -1,19 +1,19 @@
 import { Routes } from "@angular/router";
-import { MediaFileListComponent } from "../../../media/media-file/media-file-list/media-file-list.component";
-import { MediaActorListComponent } from "../../../media/media-actor/media-actor-list/media-actor-list.component";
-import { MediaVideoListComponent } from "../../../media/media-video/media-video-list/media-video-list.component";
+import { MediaFilesComponent } from './../media-files/media-files.component';
+import { MediaActorsComponent } from '../media-actors/media-actors.component';
+import { MediaVideosComponent } from '../media-videos/media-videos.component';
 
 export const mediaRoutes: Routes = [
     { 
-        path: 'mediafiles', 
-        component: MediaFileListComponent
+        path: 'file', 
+        component: MediaFilesComponent
     },
     { 
-        path: 'mediaactors', 
-        component: MediaActorListComponent
+        path: 'actor', 
+        component: MediaActorsComponent
     },
     { 
-        path: 'mediavideos', 
-        component: MediaVideoListComponent
+        path: 'video', 
+        component: MediaVideosComponent
     },
 ];
\ No newline at end of file
diff --git a/kontor-angular/src/app/media/media-video/media-video-list/media-video-list.component.css b/kontor-angular/src/app/kontor/media/media-videos/media-videos.component.css
similarity index 100%
rename from kontor-angular/src/app/media/media-video/media-video-list/media-video-list.component.css
rename to kontor-angular/src/app/kontor/media/media-videos/media-videos.component.css
diff --git a/kontor-angular/src/app/kontor/media/media-videos/media-videos.component.html b/kontor-angular/src/app/kontor/media/media-videos/media-videos.component.html
new file mode 100644
index 0000000..2aaafcb
--- /dev/null
+++ b/kontor-angular/src/app/kontor/media/media-videos/media-videos.component.html
@@ -0,0 +1 @@
+<p>media-videos works!</p>
diff --git a/kontor-angular/src/app/media/media-actor/media-actor-list/media-actor-list.component.spec.ts b/kontor-angular/src/app/kontor/media/media-videos/media-videos.component.spec.ts
similarity index 50%
rename from kontor-angular/src/app/media/media-actor/media-actor-list/media-actor-list.component.spec.ts
rename to kontor-angular/src/app/kontor/media/media-videos/media-videos.component.spec.ts
index 1eae192..ccde24c 100644
--- a/kontor-angular/src/app/media/media-actor/media-actor-list/media-actor-list.component.spec.ts
+++ b/kontor-angular/src/app/kontor/media/media-videos/media-videos.component.spec.ts
@@ -1,18 +1,18 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { MediaActorListComponent } from './media-actor-list.component';
+import { MediaVideosComponent } from './media-videos.component';
 
-describe('MediaActorListComponent', () => {
-  let component: MediaActorListComponent;
-  let fixture: ComponentFixture<MediaActorListComponent>;
+describe('MediaVideosComponent', () => {
+  let component: MediaVideosComponent;
+  let fixture: ComponentFixture<MediaVideosComponent>;
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [MediaActorListComponent]
+      imports: [MediaVideosComponent]
     })
     .compileComponents();
 
-    fixture = TestBed.createComponent(MediaActorListComponent);
+    fixture = TestBed.createComponent(MediaVideosComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });
diff --git a/kontor-angular/src/app/kontor/media/media-videos/media-videos.component.ts b/kontor-angular/src/app/kontor/media/media-videos/media-videos.component.ts
new file mode 100644
index 0000000..5b1f52e
--- /dev/null
+++ b/kontor-angular/src/app/kontor/media/media-videos/media-videos.component.ts
@@ -0,0 +1,11 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'app-media-videos',
+  imports: [],
+  templateUrl: './media-videos.component.html',
+  styleUrl: './media-videos.component.css'
+})
+export class MediaVideosComponent {
+
+}
diff --git a/kontor-angular/src/app/media/media-actor/media-actor-list/media-actor-list.component.html b/kontor-angular/src/app/media/media-actor/media-actor-list/media-actor-list.component.html
deleted file mode 100644
index 43702b0..0000000
--- a/kontor-angular/src/app/media/media-actor/media-actor-list/media-actor-list.component.html
+++ /dev/null
@@ -1 +0,0 @@
-<p>media-actor-list works!</p>
diff --git a/kontor-angular/src/app/media/media-actor/media-actor-list/media-actor-list.component.ts b/kontor-angular/src/app/media/media-actor/media-actor-list/media-actor-list.component.ts
deleted file mode 100644
index f765de4..0000000
--- a/kontor-angular/src/app/media/media-actor/media-actor-list/media-actor-list.component.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  selector: 'app-media-actor-list',
-  imports: [],
-  templateUrl: './media-actor-list.component.html',
-  styleUrl: './media-actor-list.component.css'
-})
-export class MediaActorListComponent {
-
-}
diff --git a/kontor-angular/src/app/media/media-file/media-file-list/media-file-list.component.html b/kontor-angular/src/app/media/media-file/media-file-list/media-file-list.component.html
deleted file mode 100644
index 0c46e27..0000000
--- a/kontor-angular/src/app/media/media-file/media-file-list/media-file-list.component.html
+++ /dev/null
@@ -1 +0,0 @@
-<p>media-file-list works!</p>
diff --git a/kontor-angular/src/app/media/media-file/media-file-list/media-file-list.component.ts b/kontor-angular/src/app/media/media-file/media-file-list/media-file-list.component.ts
deleted file mode 100644
index f64918a..0000000
--- a/kontor-angular/src/app/media/media-file/media-file-list/media-file-list.component.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  selector: 'app-media-file-list',
-  imports: [],
-  templateUrl: './media-file-list.component.html',
-  styleUrl: './media-file-list.component.css'
-})
-export class MediaFileListComponent {
-
-}
diff --git a/kontor-angular/src/app/media/media-video/media-video-list/media-video-list.component.html b/kontor-angular/src/app/media/media-video/media-video-list/media-video-list.component.html
deleted file mode 100644
index ae42ba1..0000000
--- a/kontor-angular/src/app/media/media-video/media-video-list/media-video-list.component.html
+++ /dev/null
@@ -1 +0,0 @@
-<p>media-video-list works!</p>
diff --git a/kontor-angular/src/app/media/media-video/media-video-list/media-video-list.component.ts b/kontor-angular/src/app/media/media-video/media-video-list/media-video-list.component.ts
deleted file mode 100644
index bae8344..0000000
--- a/kontor-angular/src/app/media/media-video/media-video-list/media-video-list.component.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  selector: 'app-media-video-list',
-  imports: [],
-  templateUrl: './media-video-list.component.html',
-  styleUrl: './media-video-list.component.css'
-})
-export class MediaVideoListComponent {
-
-}