diff --git a/.env.development b/.env.development
index e69348e..1cb1bda 100644
--- a/.env.development
+++ b/.env.development
@@ -6,6 +6,6 @@ NEXT_PUBLIC_USE_MOCK_BACKEND_LOOP_START=false
 NEXT_PUBLIC_EXPORT_STATIC=false
 NEXT_PUBLIC_USE_CGI=false
 # App-Versionsnummer
-NEXT_PUBLIC_APP_VERSION=1.6.486
+NEXT_PUBLIC_APP_VERSION=1.6.487
 NEXT_PUBLIC_CPL_MODE=json   # json (Entwicklungsumgebung) oder jsSimulatedProd (CPL ->CGI-Interface-Simulator) oder production (CPL-> CGI-Interface Platzhalter)
 
diff --git a/.env.production b/.env.production
index f0d96a2..5075238 100644
--- a/.env.production
+++ b/.env.production
@@ -5,5 +5,5 @@ NEXT_PUBLIC_CPL_API_PATH=/CPL
 NEXT_PUBLIC_EXPORT_STATIC=true
 NEXT_PUBLIC_USE_CGI=true
 # App-Versionsnummer
-NEXT_PUBLIC_APP_VERSION=1.6.486
+NEXT_PUBLIC_APP_VERSION=1.6.487
 NEXT_PUBLIC_CPL_MODE=production
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 39b3a09..62b70d9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## [1.6.487] – 2025-06-27
+
+- refactor
+
+---
 ## [1.6.486] – 2025-06-27
 
 - refactor: rename einausgange to  digitalOtputs and digitalInputs
diff --git a/components/main/uebersicht/Baugruppentraeger.tsx b/components/main/dashboard/Baugruppentraeger.tsx
similarity index 100%
rename from components/main/uebersicht/Baugruppentraeger.tsx
rename to components/main/dashboard/Baugruppentraeger.tsx
diff --git a/components/main/uebersicht/Last20MessagesTable.tsx b/components/main/dashboard/Last20MessagesTable.tsx
similarity index 100%
rename from components/main/uebersicht/Last20MessagesTable.tsx
rename to components/main/dashboard/Last20MessagesTable.tsx
diff --git a/components/main/uebersicht/NetworkInfo.tsx b/components/main/dashboard/NetworkInfo.tsx
similarity index 55%
rename from components/main/uebersicht/NetworkInfo.tsx
rename to components/main/dashboard/NetworkInfo.tsx
index 14fab12..7794dfa 100644
--- a/components/main/uebersicht/NetworkInfo.tsx
+++ b/components/main/dashboard/NetworkInfo.tsx
@@ -39,59 +39,60 @@ const NetworkInfo: React.FC = () => {
   return (
     <div className="w-full flex-direction: row flex">
       <div className=" flex-grow flex justify-between items-center mt-1 bg-white p-2 rounded-lg shadow-md border border-gray-200 laptop:m-0 laptop:scale-y-75 2xl:scale-y-75">
-        <Image
-          src="/images/IP-icon.svg"
-          alt="IP Address"
-          width={24}
-          height={24}
-          className="w-6 text-littwin-blue"
-          priority
-        />
-        <div>
-          <p className="text-xs text-gray-500">IP-Adresse</p>
-          <p className="text-sm font-medium text-gray-700">{ip}</p>
+        <div className="flex items-center space-x-4">
+          <Image
+            src="/images/IP-icon.svg"
+            alt="IP Address"
+            width={24}
+            height={24}
+            className="w-6 text-littwin-blue"
+            priority
+          />
+          <div>
+            <p className="text-xs text-gray-500">IP-Adresse</p>
+            <p className="text-sm font-medium text-gray-700">{ip}</p>
+          </div>
         </div>
-      </div>
 
-      <div className="flex items-center space-x-4">
-        <Image
-          src="/images/subnet-mask.svg"
-          alt="subnet mask"
-          width={24}
-          height={24}
-          className="w-6"
-          priority
-        />
-        <div>
-          <p className="text-xs text-gray-500">Subnet-Maske</p>
-          <p className="text-sm font-medium text-gray-700">{subnet}</p>
+        <div className="flex items-center space-x-4">
+          <Image
+            src="/images/subnet-mask.svg"
+            alt="subnet mask"
+            width={24}
+            height={24}
+            className="w-6"
+            priority
+          />
+          <div>
+            <p className="text-xs text-gray-500">Subnet-Maske</p>
+            <p className="text-sm font-medium text-gray-700">{subnet}</p>
+          </div>
         </div>
-      </div>
 
-      <div className="flex items-center space-x-4">
-        <Image
-          src="/images/gateway.svg"
-          alt="gateway"
-          width={24}
-          height={24}
-          className="w-6"
-          priority
-        />
-        <div>
-          <p className="text-xs text-gray-500">Gateway</p>
-          <p className="text-sm font-medium text-gray-700">{gateway}</p>
+        <div className="flex items-center space-x-4">
+          <Image
+            src="/images/gateway.svg"
+            alt="gateway"
+            width={24}
+            height={24}
+            className="w-6"
+            priority
+          />
+          <div>
+            <p className="text-xs text-gray-500">Gateway</p>
+            <p className="text-sm font-medium text-gray-700">{gateway}</p>
+          </div>
         </div>
-      </div>
 
-      <div className="flex items-center space-x-4">
-        <div className="text-xs font-bold text-littwin-blue">OPC-UA</div>
-        <div>
-          <p className="text-xs text-gray-500">Status</p>
-          <p className="text-sm font-medium text-gray-700">{opcUaZustand}</p>
+        <div className="flex items-center space-x-4">
+          <div className="text-xs font-bold text-littwin-blue">OPC-UA</div>
+          <div>
+            <p className="text-xs text-gray-500">Status</p>
+            <p className="text-sm font-medium text-gray-700">{opcUaZustand}</p>
+          </div>
         </div>
-      </div>
-      {/* OPC UA Nodeset Name */}
-      {/* 
+        {/* OPC UA Nodeset Name */}
+        {/* 
        <div className="flex items-center space-x-4">
           <div>
             <p className="text-xs text-gray-500">Nodeset Name</p>
@@ -101,6 +102,7 @@ const NetworkInfo: React.FC = () => {
           </div>
         </div>
 */}
+      </div>
     </div>
   );
 };
diff --git a/components/main/uebersicht/VersionInfo.tsx b/components/main/dashboard/VersionInfo.tsx
similarity index 100%
rename from components/main/uebersicht/VersionInfo.tsx
rename to components/main/dashboard/VersionInfo.tsx
diff --git a/components/main/uebersicht/modulesStatus/Access1Status.tsx b/components/main/dashboard/modulesStatus/Access1Status.tsx
similarity index 100%
rename from components/main/uebersicht/modulesStatus/Access1Status.tsx
rename to components/main/dashboard/modulesStatus/Access1Status.tsx
diff --git a/components/main/uebersicht/modulesStatus/Access2Status.tsx b/components/main/dashboard/modulesStatus/Access2Status.tsx
similarity index 100%
rename from components/main/uebersicht/modulesStatus/Access2Status.tsx
rename to components/main/dashboard/modulesStatus/Access2Status.tsx
diff --git a/components/main/uebersicht/modulesStatus/CPLStatus.tsx b/components/main/dashboard/modulesStatus/CPLStatus.tsx
similarity index 100%
rename from components/main/uebersicht/modulesStatus/CPLStatus.tsx
rename to components/main/dashboard/modulesStatus/CPLStatus.tsx
diff --git a/components/main/uebersicht/modulesStatus/KabelModulStatus.tsx b/components/main/dashboard/modulesStatus/KabelModulStatus.tsx
similarity index 100%
rename from components/main/uebersicht/modulesStatus/KabelModulStatus.tsx
rename to components/main/dashboard/modulesStatus/KabelModulStatus.tsx
diff --git a/components/main/uebersicht/modulesStatus/XioPM1Status.tsx b/components/main/dashboard/modulesStatus/XioPM1Status.tsx
similarity index 100%
rename from components/main/uebersicht/modulesStatus/XioPM1Status.tsx
rename to components/main/dashboard/modulesStatus/XioPM1Status.tsx
diff --git a/components/main/uebersicht/modulesStatus/XioPM2Status.tsx b/components/main/dashboard/modulesStatus/XioPM2Status.tsx
similarity index 100%
rename from components/main/uebersicht/modulesStatus/XioPM2Status.tsx
rename to components/main/dashboard/modulesStatus/XioPM2Status.tsx
diff --git a/components/main/meldungen/DateRangePickerMeldungen.tsx b/components/main/reports/DateRangePickerMeldungen.tsx
similarity index 100%
rename from components/main/meldungen/DateRangePickerMeldungen.tsx
rename to components/main/reports/DateRangePickerMeldungen.tsx
diff --git a/package-lock.json b/package-lock.json
index 6789968..20eb1de 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "cpl-v4",
-  "version": "1.6.486",
+  "version": "1.6.487",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "cpl-v4",
-      "version": "1.6.486",
+      "version": "1.6.487",
       "dependencies": {
         "@fontsource/roboto": "^5.1.0",
         "@iconify-icons/ri": "^1.2.10",
diff --git a/package.json b/package.json
index b50dfaa..b2ea0e9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cpl-v4",
-  "version": "1.6.486",
+  "version": "1.6.487",
   "private": true,
   "scripts": {
     "dev": "next dev",
diff --git a/pages/dashboard.tsx b/pages/dashboard.tsx
index 72a899d..923a445 100644
--- a/pages/dashboard.tsx
+++ b/pages/dashboard.tsx
@@ -4,10 +4,10 @@ import "tailwindcss/tailwind.css";
 import "@fontsource/roboto";
 import "bootstrap-icons/font/bootstrap-icons.css";
 import { Icon } from "@iconify/react";
-import Last20MessagesTable from "../components/main/uebersicht/Last20MessagesTable";
-import NetworkInfo from "../components/main/uebersicht/NetworkInfo";
-import VersionInfo from "../components/main/uebersicht/VersionInfo";
-import Baugruppentraeger from "../components/main/uebersicht/Baugruppentraeger";
+import Last20MessagesTable from "../components/main/dashboard/Last20MessagesTable";
+import NetworkInfo from "../components/main/dashboard/NetworkInfo";
+import VersionInfo from "../components/main/dashboard/VersionInfo";
+import Baugruppentraeger from "../components/main/dashboard/Baugruppentraeger";
 import { getLast20MessagesThunk } from "../redux/thunks/getLast20MessagesThunk";
 import { useAppDispatch } from "../redux/store";
 
diff --git a/pages/meldungen.tsx b/pages/meldungen.tsx
index 90a014b..b5b852e 100644
--- a/pages/meldungen.tsx
+++ b/pages/meldungen.tsx
@@ -1,7 +1,7 @@
 "use client";
 // /pages/meldungen.tsx
 import React, { useState, useEffect } from "react";
-import DateRangePickerMeldungen from "@/components/main/meldungen/DateRangePickerMeldungen";
+import DateRangePickerMeldungen from "@/components/main/reports/DateRangePickerMeldungen";
 
 type Meldung = {
   t: string;