diff --git a/components/Footer.tsx b/components/footer/Footer.tsx
similarity index 100%
rename from components/Footer.tsx
rename to components/footer/Footer.tsx
diff --git a/components/Header.tsx b/components/header/Header.tsx
similarity index 97%
rename from components/Header.tsx
rename to components/header/Header.tsx
index 25960bf..9d11edf 100644
--- a/components/Header.tsx
+++ b/components/header/Header.tsx
@@ -3,9 +3,9 @@ import React, { useState, useEffect } from "react";
 import Image from "next/image";
 import { useRouter } from "next/router";
 import "bootstrap-icons/font/bootstrap-icons.css";
-import SettingsModal from "./modales/settingsModal/SettingsModal";
+import SettingsModal from "./settingsModal/SettingsModal";
 import { useSelector } from "react-redux";
-import decodeToken from "../utils/decodeToken";
+import decodeToken from "../../utils/decodeToken";
 
 function Header() {
   const router = useRouter();
diff --git a/components/modales/settingsModal/SettingsModal.tsx b/components/header/settingsModal/SettingsModal.tsx
similarity index 99%
rename from components/modales/settingsModal/SettingsModal.tsx
rename to components/header/settingsModal/SettingsModal.tsx
index 1c8ca3f..29ed796 100644
--- a/components/modales/settingsModal/SettingsModal.tsx
+++ b/components/header/settingsModal/SettingsModal.tsx
@@ -1,4 +1,4 @@
-"use client"; // components/modales/settingsModal/SettingsModal.jsx
+"use client"; // components/header/settingsModal/SettingsModal.tsx
 import React, { useState, useEffect } from "react";
 import ReactModal from "react-modal";
 import "bootstrap-icons/font/bootstrap-icons.css";
diff --git a/components/modales/settingsModal/handlers/handleClearDatabase.ts b/components/header/settingsModal/handlers/handleClearDatabase.ts
similarity index 100%
rename from components/modales/settingsModal/handlers/handleClearDatabase.ts
rename to components/header/settingsModal/handlers/handleClearDatabase.ts
diff --git a/components/modales/settingsModal/handlers/handleReboot.ts b/components/header/settingsModal/handlers/handleReboot.ts
similarity index 100%
rename from components/modales/settingsModal/handlers/handleReboot.ts
rename to components/header/settingsModal/handlers/handleReboot.ts
diff --git a/components/modales/settingsModal/handlers/handleSetDateTime.ts b/components/header/settingsModal/handlers/handleSetDateTime.ts
similarity index 100%
rename from components/modales/settingsModal/handlers/handleSetDateTime.ts
rename to components/header/settingsModal/handlers/handleSetDateTime.ts
diff --git a/components/modales/settingsModal/handlers/handleSubmit.ts b/components/header/settingsModal/handlers/handleSubmit.ts
similarity index 100%
rename from components/modales/settingsModal/handlers/handleSubmit.ts
rename to components/header/settingsModal/handlers/handleSubmit.ts
diff --git a/components/settingsPageComponents/GeneralSettings.tsx b/components/main/settingsPageComponents/GeneralSettings.tsx
similarity index 92%
rename from components/settingsPageComponents/GeneralSettings.tsx
rename to components/main/settingsPageComponents/GeneralSettings.tsx
index 4cdf293..3b2cc35 100644
--- a/components/settingsPageComponents/GeneralSettings.tsx
+++ b/components/main/settingsPageComponents/GeneralSettings.tsx
@@ -1,9 +1,9 @@
 import React, { useState, useEffect } from "react";
 import { useSelector } from "react-redux";
-import handleClearDatabase from "../modales/settingsModal/handlers/handleClearDatabase";
-import handleReboot from "../modales/settingsModal/handlers/handleReboot";
-import handleSetDateTime from "../modales/settingsModal/handlers/handleSetDateTime";
-import handleSubmit from "../modales/settingsModal/handlers/handleSubmit";
+import handleClearDatabase from "../../header/settingsModal/handlers/handleReboot";
+import handleReboot from "../../header/settingsModal/handlers/handleReboot";
+import handleSetDateTime from "../../header/settingsModal/handlers/handleReboot";
+import handleSubmit from "../../header/settingsModal/handlers/handleReboot";
 
 const GeneralSettings = () => {
   const deviceName_Redux = useSelector((state) => state.variables.deviceName);
diff --git a/components/settingsPageComponents/OPCUAInterfaceSettings.tsx b/components/main/settingsPageComponents/OPCUAInterfaceSettings.tsx
similarity index 100%
rename from components/settingsPageComponents/OPCUAInterfaceSettings.tsx
rename to components/main/settingsPageComponents/OPCUAInterfaceSettings.tsx
diff --git a/components/Navigation.tsx b/components/navigation/Navigation.tsx
similarity index 100%
rename from components/Navigation.tsx
rename to components/navigation/Navigation.tsx
diff --git a/config/webVersion.ts b/config/webVersion.ts
index ed760b5..6fdf277 100644
--- a/config/webVersion.ts
+++ b/config/webVersion.ts
@@ -5,5 +5,5 @@
 2: Patch oder Hotfix (Bugfixes oder kleine Änderungen).
 
 */
-const webVersion = "1.6.12";
+const webVersion = "1.6.13";
 export default webVersion;
diff --git a/pages/_app.tsx b/pages/_app.tsx
index af4808a..8b33c73 100644
--- a/pages/_app.tsx
+++ b/pages/_app.tsx
@@ -1,9 +1,9 @@
 // pages/_app.tsx
 import { useEffect, useState } from "react";
 import { loadWindowVariables } from "../utils/loadWindowVariables";
-import Header from "../components/Header";
-import Navigation from "../components/Navigation";
-import Footer from "../components/Footer";
+import Header from "../components/header/Header";
+import Navigation from "../components/navigation/Navigation";
+import Footer from "../components/footer/Footer";
 import "../styles/globals.css";
 import { Provider } from "react-redux";
 import { setVariables } from "../redux/slices/variablesSlice";
diff --git a/pages/settings.tsx b/pages/settings.tsx
index e7f8362..eaff7f4 100644
--- a/pages/settings.tsx
+++ b/pages/settings.tsx
@@ -1,6 +1,6 @@
 import React, { useState } from "react";
-import GeneralSettings from "../components/settingsPageComponents/generalSettings";
-import OPCUAInterfaceSettings from "../components/settingsPageComponents/OPCUAInterfaceSettings";
+import GeneralSettings from "../components/main/settingsPageComponents/generalSettings";
+import OPCUAInterfaceSettings from "../components/main/settingsPageComponents/OPCUAInterfaceSettings";
 
 export default function Settings() {
   const [activeTab, setActiveTab] = useState("tab1");