diff --git a/src/app/app.routes.ts b/src/app/app.routes.ts
index d68355b..fff369b 100644
--- a/src/app/app.routes.ts
+++ b/src/app/app.routes.ts
@@ -3,8 +3,8 @@ import { LoginViewComponent } from "./components/login-view/login-view.component
 import { MitarbeiterverwaltungViewComponent } from "./components/mitarbeiterverwaltung-view/mitarbeiterverwaltung-view.component";
 import { EmployeeDetailComponent } from "./components/employee-detail/employee-detail.component";
 import { QualifikatonBearbeitenViewComponent } from "./components/qualifikaton-bearbeiten-view/qualifikaton-bearbeiten-view.component";
-import { AuthGuard } from "./data_layer/service/auth.service";
 import { MitarbeiterBearbeitenViewComponent } from "./components/mitarbeiter-bearbeiten-view/mitarbeiter-bearbeiten-view.component";
+import { AuthGuard } from "./service/auth.service";
 
 export const routes: Routes = [
   {
diff --git a/src/app/components/employee-list/employee-list.component.css b/src/app/components/employee-list/employee-list.component.css
deleted file mode 100644
index e69de29..0000000
diff --git a/src/app/components/employee-list/employee-list.component.html b/src/app/components/employee-list/employee-list.component.html
deleted file mode 100644
index 217b9d0..0000000
--- a/src/app/components/employee-list/employee-list.component.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<h1>LF10-Starter</h1>
-Wenn Sie in der EmployeeListComponent.ts ein gültiges Bearer-Token eintragen, sollten hier die Namen der in der Datenbank gespeicherten Mitarbeiter angezeigt werden!
-<ul>
-  @for(e of employees$ | async; track e.id) {
-    <li>
-      {{e.lastName }}, {{e.firstName}}
-    </li>
-  }
-</ul>
diff --git a/src/app/components/employee-list/employee-list.component.spec.ts b/src/app/components/employee-list/employee-list.component.spec.ts
deleted file mode 100644
index 081f497..0000000
--- a/src/app/components/employee-list/employee-list.component.spec.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { EmployeeListComponent } from './employee-list.component';
-
-describe('EmployeeListComponent', () => {
-  let component: EmployeeListComponent;
-  let fixture: ComponentFixture<EmployeeListComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [EmployeeListComponent]
-    })
-    .compileComponents();
-    
-    fixture = TestBed.createComponent(EmployeeListComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/components/employee-list/employee-list.component.ts b/src/app/components/employee-list/employee-list.component.ts
deleted file mode 100644
index 918dbc0..0000000
--- a/src/app/components/employee-list/employee-list.component.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-  import { Component } from '@angular/core';
-  import { CommonModule } from '@angular/common';
-  import {Observable, of} from "rxjs";
-  import {HttpClient, HttpHeaders} from "@angular/common/http";
-  import {Employee} from "../../data_layer/model/employee";
-
-  @Component({
-    selector: 'app-employee-list',
-    standalone: true,
-    imports: [CommonModule],
-    templateUrl: './employee-list.component.html',
-    styleUrl: './employee-list.component.css'
-  })
-  export class EmployeeListComponent {
-    bearer = 'eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICIzUFQ0dldiNno5MnlQWk1EWnBqT1U0RjFVN0lwNi1ELUlqQWVGczJPbGU0In0';
-    employees$: Observable<Employee[]>;
-
-    constructor(private http: HttpClient) {
-      this.employees$ = of([]);
-      this.fetchData();
-    }
-
-    fetchData() {
-      this.employees$ = this.http.get<Employee[]>('http://localhost:8089/employees', {
-        headers: new HttpHeaders()
-          .set('Content-Type', 'application/json')
-          .set('Authorization', `Bearer ${this.bearer}`)
-      });
-    }
-  }
diff --git a/src/app/components/mitarbeiterverwaltung-view/mitarbeiterverwaltung-view.component.html b/src/app/components/mitarbeiterverwaltung-view/mitarbeiterverwaltung-view.component.html
index 8136fb2..d450f2e 100644
--- a/src/app/components/mitarbeiterverwaltung-view/mitarbeiterverwaltung-view.component.html
+++ b/src/app/components/mitarbeiterverwaltung-view/mitarbeiterverwaltung-view.component.html
@@ -1,7 +1,8 @@
 <div class="container">
   <div class="header">
     <div class="dropdown position-absolute top-0 end-0 m-3">
-      <button class="btn align-items-center d-flex" type="button" id="userDropdown" data-bs-toggle="dropdown" aria-expanded="false">
+      <button class="btn align-items-center d-flex" type="button" id="userDropdown" data-bs-toggle="dropdown"
+        aria-expanded="false">
         <img src="user.svg" alt="User Icon" class="rounded-circle" style="width: 30px; height: 30px;">
       </button>
       <ul class="dropdown-menu dropdown-menu-end" aria-labelledby="userDropdown">
@@ -12,7 +13,7 @@
   </div>
 
   <div class="header-actions">
-    <div class="search-bar">a
+    <div class="search-bar">
       <input type="text" placeholder="Search employee">
       <button>Search</button>
     </div>
@@ -21,29 +22,31 @@
 
   <table class="employee-table">
     <thead>
-    <tr>
-      <th><span class="sortable">First Name</span></th>
-      <th><span class="sortable">Last Name</span></th>
-      <th>Street</th>
-      <th>Postcode</th>
-      <th>City</th>
-      <th>Phone</th>
-      <th>Actions</th>
-    </tr>
+      <tr>
+        <th><span class="sortable">First Name</span></th>
+        <th><span class="sortable">Last Name</span></th>
+        <th>Street</th>
+        <th>Postcode</th>
+        <th>City</th>
+        <th>Phone</th>
+        <th>Actions</th>
+      </tr>
     </thead>
     <tbody>
-    <tr *ngFor="let employee of employees">
-      <td>{{ employee.firstName }}</td>
-      <td>{{ employee.lastName }}</td>
-      <td>{{ employee.street }}</td>
-      <td>{{ employee.postcode }}</td>
-      <td>{{ employee.city }}</td>
-      <td>{{ employee.phone }}</td>
-      <td>
-        <button>Edit</button>
-        <button>Delete</button>
-      </td>
-    </tr>
+      @for (employee of employees | async; track employee) {
+      <tr>
+        <td>{{ employee.firstName }}</td>
+        <td>{{ employee.lastName }}</td>
+        <td>{{ employee.street }}</td>
+        <td>{{ employee.postcode }}</td>
+        <td>{{ employee.city }}</td>
+        <td>{{ employee.phone }}</td>
+        <td>
+          <button>Edit</button>
+          <button>Delete</button>
+        </td>
+      </tr>
+      }
     </tbody>
   </table>
 </div>
diff --git a/src/app/components/mitarbeiterverwaltung-view/mitarbeiterverwaltung-view.component.ts b/src/app/components/mitarbeiterverwaltung-view/mitarbeiterverwaltung-view.component.ts
index e50a6f6..5e94483 100644
--- a/src/app/components/mitarbeiterverwaltung-view/mitarbeiterverwaltung-view.component.ts
+++ b/src/app/components/mitarbeiterverwaltung-view/mitarbeiterverwaltung-view.component.ts
@@ -1,33 +1,22 @@
 import { Component, OnInit } from '@angular/core';
-import { EmployeeService } from '../../data_layer/service/mitarbeiter_data_service';
-import { Employee } from '../../data_layer/model/employee';
 import { CommonModule } from '@angular/common';
-import { HttpClientModule } from '@angular/common/http';
+import { Observable, of } from 'rxjs';
+import { EmployeeResponseDTO } from '../../models/mitarbeiter';
+import { EmployeeService } from '../../service/employee.service';
 
 @Component({
   selector: 'app-mitarbeiterverwaltung-view',
   templateUrl: './mitarbeiterverwaltung-view.component.html',
   styleUrls: ['./mitarbeiterverwaltung-view.component.css'],
   standalone: true,
-  imports: [CommonModule, HttpClientModule]
+  imports: [CommonModule]
 })
 export class MitarbeiterverwaltungViewComponent implements OnInit {
-  employees: Employee[] = [];
+  employees: Observable<Array<EmployeeResponseDTO>> = of([]);
 
   constructor(private employeeService: EmployeeService) {}
 
   ngOnInit(): void {
-    this.fetchEmployees();
-  }
-
-  fetchEmployees(): void {
-    this.employeeService.getAllEmployees().subscribe(
-      (data: Employee[]) => {
-        this.employees = data;
-      },
-      (error: any) => {
-        console.error('Error fetching employees', error);
-      }
-    );
+    this.employees = this.employeeService.getAllEmployees();
   }
 }
diff --git a/src/app/data_layer/model/employee.ts b/src/app/data_layer/model/employee.ts
deleted file mode 100644
index e930ff2..0000000
--- a/src/app/data_layer/model/employee.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-export class Employee {
-    constructor(
-        public id?: number,
-        public lastName?: string,
-        public firstName?: string,
-        public street?: string,
-        public postcode?: string,
-        public city?: string,
-        public phone?: string,
-        public skills?: []
-    ) {
-    }
-}
diff --git a/src/app/data_layer/service/mitarbeiter_data_service.ts b/src/app/data_layer/service/mitarbeiter_data_service.ts
deleted file mode 100644
index b11d57b..0000000
--- a/src/app/data_layer/service/mitarbeiter_data_service.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-// EmployeeService (data_layer/service/mitarbeiter_data_service.ts)
-import { Injectable } from '@angular/core';
-import { HttpClient, HttpHeaders } from '@angular/common/http';
-import { Observable } from 'rxjs';
-import { Employee } from '../model/employee';
-
-@Injectable({
-  providedIn: 'root'
-})
-export class EmployeeService {
-  private baseUrl = 'https://employee.szut.dev/api';
-  private bearerToken = 'eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICIzUFQ0dldiNno5MnlQWk1EWnBqT1U0RjFVN0lwNi1ELUlqQWVGczJPbGU0In0';
-
-  constructor(private http: HttpClient) {}
-
-  getAllEmployees(): Observable<Employee[]> {
-    const endpoint = `${this.baseUrl}/employees`;
-    const headers = new HttpHeaders({
-      'Authorization': `Bearer ${this.bearerToken}`,
-      'Content-Type': 'application/json'
-    });
-    return this.http.get<Employee[]>(endpoint, { headers });
-  }
-}
diff --git a/src/app/data_layer/service/qualifikationen_data_service.ts b/src/app/data_layer/service/qualifikationen_data_service.ts
deleted file mode 100644
index e69de29..0000000
diff --git a/src/app/data_layer/service/auth.service.ts b/src/app/service/auth.service.ts
similarity index 100%
rename from src/app/data_layer/service/auth.service.ts
rename to src/app/service/auth.service.ts