diff --git a/webapp/src/components/partials/BootstrapAlert.vue b/webapp/src/components/BootstrapAlert.vue
similarity index 100%
rename from webapp/src/components/partials/BootstrapAlert.vue
rename to webapp/src/components/BootstrapAlert.vue
diff --git a/webapp/src/components/partials/DevInfo.vue b/webapp/src/components/DevInfo.vue
similarity index 97%
rename from webapp/src/components/partials/DevInfo.vue
rename to webapp/src/components/DevInfo.vue
index ce53af4..5c28f22 100644
--- a/webapp/src/components/partials/DevInfo.vue
+++ b/webapp/src/components/DevInfo.vue
@@ -40,7 +40,7 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
 import { BIconInfoSquare } from 'bootstrap-icons-vue';
-import BootstrapAlert from '@/components/partials/BootstrapAlert.vue';
+import BootstrapAlert from '@/components/BootstrapAlert.vue';
 
 declare interface DevInfoData {
     valid_data: boolean,
diff --git a/webapp/src/components/partials/EventLog.vue b/webapp/src/components/EventLog.vue
similarity index 100%
rename from webapp/src/components/partials/EventLog.vue
rename to webapp/src/components/EventLog.vue
diff --git a/webapp/src/components/partials/FirmwareInfo.vue b/webapp/src/components/FirmwareInfo.vue
similarity index 100%
rename from webapp/src/components/partials/FirmwareInfo.vue
rename to webapp/src/components/FirmwareInfo.vue
diff --git a/webapp/src/components/partials/FsInfo.vue b/webapp/src/components/FsInfo.vue
similarity index 100%
rename from webapp/src/components/partials/FsInfo.vue
rename to webapp/src/components/FsInfo.vue
diff --git a/webapp/src/components/partials/HardwareInfo.vue b/webapp/src/components/HardwareInfo.vue
similarity index 100%
rename from webapp/src/components/partials/HardwareInfo.vue
rename to webapp/src/components/HardwareInfo.vue
diff --git a/webapp/src/components/partials/InterfaceApInfo.vue b/webapp/src/components/InterfaceApInfo.vue
similarity index 100%
rename from webapp/src/components/partials/InterfaceApInfo.vue
rename to webapp/src/components/InterfaceApInfo.vue
diff --git a/webapp/src/components/partials/InterfaceNetworkInfo.vue b/webapp/src/components/InterfaceNetworkInfo.vue
similarity index 100%
rename from webapp/src/components/partials/InterfaceNetworkInfo.vue
rename to webapp/src/components/InterfaceNetworkInfo.vue
diff --git a/webapp/src/components/partials/InverterChannelInfo.vue b/webapp/src/components/InverterChannelInfo.vue
similarity index 100%
rename from webapp/src/components/partials/InverterChannelInfo.vue
rename to webapp/src/components/InverterChannelInfo.vue
diff --git a/webapp/src/components/partials/LimitSettingsCurrent.vue b/webapp/src/components/LimitSettingsCurrent.vue
similarity index 100%
rename from webapp/src/components/partials/LimitSettingsCurrent.vue
rename to webapp/src/components/LimitSettingsCurrent.vue
diff --git a/webapp/src/components/partials/MemoryInfo.vue b/webapp/src/components/MemoryInfo.vue
similarity index 96%
rename from webapp/src/components/partials/MemoryInfo.vue
rename to webapp/src/components/MemoryInfo.vue
index 402bc5b..7951801 100644
--- a/webapp/src/components/partials/MemoryInfo.vue
+++ b/webapp/src/components/MemoryInfo.vue
@@ -27,7 +27,7 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue';
-import FsInfo from "@/components/partials/FsInfo.vue";
+import FsInfo from "@/components/FsInfo.vue";
 
 export default defineComponent({
     components: {
diff --git a/webapp/src/components/partials/RadioInfo.vue b/webapp/src/components/RadioInfo.vue
similarity index 100%
rename from webapp/src/components/partials/RadioInfo.vue
rename to webapp/src/components/RadioInfo.vue
diff --git a/webapp/src/components/partials/WifiApInfo.vue b/webapp/src/components/WifiApInfo.vue
similarity index 100%
rename from webapp/src/components/partials/WifiApInfo.vue
rename to webapp/src/components/WifiApInfo.vue
diff --git a/webapp/src/components/partials/WifiStationInfo.vue b/webapp/src/components/WifiStationInfo.vue
similarity index 100%
rename from webapp/src/components/partials/WifiStationInfo.vue
rename to webapp/src/components/WifiStationInfo.vue
diff --git a/webapp/src/router/index.ts b/webapp/src/router/index.ts
index e30f6ee..2306552 100644
--- a/webapp/src/router/index.ts
+++ b/webapp/src/router/index.ts
@@ -1,18 +1,18 @@
 import { createWebHistory, createRouter, RouteRecordRaw } from 'vue-router';
-import HomeView from '@/components/HomeView.vue'
-import AboutView from '@/components/AboutView.vue'
-import NetworkInfoView from '@/components/NetworkInfoView.vue'
-import SystemInfoView from '@/components/SystemInfoView.vue'
-import NtpInfoView from '@/components/NtpInfoView.vue'
-import NetworkAdminView from '@/components/NetworkAdminView.vue'
-import NtpAdminView from '@/components/NtpAdminView.vue'
-import MqttAdminView from '@/components/MqttAdminView.vue'
-import MqttInfoView from '@/components/MqttInfoView.vue'
-import InverterAdminView from '@/components/InverterAdminView.vue'
-import DtuAdminView from '@/components/DtuAdminView.vue'
-import FirmwareUpgradeView from '@/components/FirmwareUpgradeView.vue'
-import ConfigAdminView from '@/components/ConfigAdminView.vue'
-import SecurityAdminView from '@/components/SecurityAdminView.vue'
+import HomeView from '@/views/HomeView.vue'
+import AboutView from '@/views/AboutView.vue'
+import NetworkInfoView from '@/views/NetworkInfoView.vue'
+import SystemInfoView from '@/views/SystemInfoView.vue'
+import NtpInfoView from '@/views/NtpInfoView.vue'
+import NetworkAdminView from '@/views/NetworkAdminView.vue'
+import NtpAdminView from '@/views/NtpAdminView.vue'
+import MqttAdminView from '@/views/MqttAdminView.vue'
+import MqttInfoView from '@/views/MqttInfoView.vue'
+import InverterAdminView from '@/views/InverterAdminView.vue'
+import DtuAdminView from '@/views/DtuAdminView.vue'
+import FirmwareUpgradeView from '@/views/FirmwareUpgradeView.vue'
+import ConfigAdminView from '@/views/ConfigAdminView.vue'
+import SecurityAdminView from '@/views/SecurityAdminView.vue'
 
 const routes: Array<RouteRecordRaw> = [
     {
diff --git a/webapp/src/components/AboutView.vue b/webapp/src/views/AboutView.vue
similarity index 100%
rename from webapp/src/components/AboutView.vue
rename to webapp/src/views/AboutView.vue
diff --git a/webapp/src/components/ConfigAdminView.vue b/webapp/src/views/ConfigAdminView.vue
similarity index 99%
rename from webapp/src/components/ConfigAdminView.vue
rename to webapp/src/views/ConfigAdminView.vue
index aacad9a..fc0ebeb 100644
--- a/webapp/src/components/ConfigAdminView.vue
+++ b/webapp/src/views/ConfigAdminView.vue
@@ -122,7 +122,7 @@ import {
     BIconCheckCircle
 } from 'bootstrap-icons-vue';
 import * as bootstrap from 'bootstrap';
-import BootstrapAlert from "@/components/partials/BootstrapAlert.vue";
+import BootstrapAlert from "@/components/BootstrapAlert.vue";
 
 export default defineComponent({
     components: {
diff --git a/webapp/src/components/DtuAdminView.vue b/webapp/src/views/DtuAdminView.vue
similarity index 98%
rename from webapp/src/components/DtuAdminView.vue
rename to webapp/src/views/DtuAdminView.vue
index 75a98b8..1ad449e 100644
--- a/webapp/src/components/DtuAdminView.vue
+++ b/webapp/src/views/DtuAdminView.vue
@@ -58,7 +58,7 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue';
-import BootstrapAlert from "@/components/partials/BootstrapAlert.vue";
+import BootstrapAlert from "@/components/BootstrapAlert.vue";
 
 export default defineComponent({
     components: {
diff --git a/webapp/src/components/FirmwareUpgradeView.vue b/webapp/src/views/FirmwareUpgradeView.vue
similarity index 100%
rename from webapp/src/components/FirmwareUpgradeView.vue
rename to webapp/src/views/FirmwareUpgradeView.vue
diff --git a/webapp/src/components/HomeView.vue b/webapp/src/views/HomeView.vue
similarity index 99%
rename from webapp/src/components/HomeView.vue
rename to webapp/src/views/HomeView.vue
index 4ed65ab..2e93b0b 100644
--- a/webapp/src/components/HomeView.vue
+++ b/webapp/src/views/HomeView.vue
@@ -337,10 +337,10 @@ import {
     BIconToggleOff,
     BIconArrowCounterclockwise
 } from 'bootstrap-icons-vue';
-import EventLog from '@/components/partials/EventLog.vue';
-import DevInfo from '@/components/partials/DevInfo.vue';
-import BootstrapAlert from '@/components/partials/BootstrapAlert.vue';
-import InverterChannelInfo from "@/components/partials/InverterChannelInfo.vue";
+import EventLog from '@/components/EventLog.vue';
+import DevInfo from '@/components/DevInfo.vue';
+import BootstrapAlert from '@/components/BootstrapAlert.vue';
+import InverterChannelInfo from "@/components/InverterChannelInfo.vue";
 
 declare interface Inverter {
     serial: number,
diff --git a/webapp/src/components/InverterAdminView.vue b/webapp/src/views/InverterAdminView.vue
similarity index 99%
rename from webapp/src/components/InverterAdminView.vue
rename to webapp/src/views/InverterAdminView.vue
index 3a00e95..6a6aebe 100644
--- a/webapp/src/components/InverterAdminView.vue
+++ b/webapp/src/views/InverterAdminView.vue
@@ -151,7 +151,7 @@ import {
     BIconPencil
 } from 'bootstrap-icons-vue';
 import * as bootstrap from 'bootstrap';
-import BootstrapAlert from "@/components/partials/BootstrapAlert.vue";
+import BootstrapAlert from "@/components/BootstrapAlert.vue";
 
 declare interface Inverter {
     id: string,
diff --git a/webapp/src/components/MqttAdminView.vue b/webapp/src/views/MqttAdminView.vue
similarity index 99%
rename from webapp/src/components/MqttAdminView.vue
rename to webapp/src/views/MqttAdminView.vue
index d501b15..2dad2ad 100644
--- a/webapp/src/components/MqttAdminView.vue
+++ b/webapp/src/views/MqttAdminView.vue
@@ -227,7 +227,7 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue';
-import BootstrapAlert from "@/components/partials/BootstrapAlert.vue";
+import BootstrapAlert from "@/components/BootstrapAlert.vue";
 
 export default defineComponent({
     components: {
diff --git a/webapp/src/components/MqttInfoView.vue b/webapp/src/views/MqttInfoView.vue
similarity index 100%
rename from webapp/src/components/MqttInfoView.vue
rename to webapp/src/views/MqttInfoView.vue
diff --git a/webapp/src/components/NetworkAdminView.vue b/webapp/src/views/NetworkAdminView.vue
similarity index 99%
rename from webapp/src/components/NetworkAdminView.vue
rename to webapp/src/views/NetworkAdminView.vue
index a4891b5..85fdfd4 100644
--- a/webapp/src/components/NetworkAdminView.vue
+++ b/webapp/src/views/NetworkAdminView.vue
@@ -113,7 +113,7 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue';
-import BootstrapAlert from "@/components/partials/BootstrapAlert.vue";
+import BootstrapAlert from "@/components/BootstrapAlert.vue";
 
 export default defineComponent({
     components: {
diff --git a/webapp/src/components/NetworkInfoView.vue b/webapp/src/views/NetworkInfoView.vue
similarity index 89%
rename from webapp/src/components/NetworkInfoView.vue
rename to webapp/src/views/NetworkInfoView.vue
index 4417df6..9d28e60 100644
--- a/webapp/src/components/NetworkInfoView.vue
+++ b/webapp/src/views/NetworkInfoView.vue
@@ -24,10 +24,10 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue';
-import WifiStationInfo from "./partials/WifiStationInfo.vue";
-import WifiApInfo from "./partials/WifiApInfo.vue";
-import InterfaceNetworkInfo from "./partials/InterfaceNetworkInfo.vue";
-import InterfaceApInfo from "./partials/InterfaceApInfo.vue";
+import WifiStationInfo from "@/components/WifiStationInfo.vue";
+import WifiApInfo from "@/components/WifiApInfo.vue";
+import InterfaceNetworkInfo from "@/components/InterfaceNetworkInfo.vue";
+import InterfaceApInfo from "@/components/InterfaceApInfo.vue";
 
 export default defineComponent({
     components: {
diff --git a/webapp/src/components/NtpAdminView.vue b/webapp/src/views/NtpAdminView.vue
similarity index 99%
rename from webapp/src/components/NtpAdminView.vue
rename to webapp/src/views/NtpAdminView.vue
index 83e2d71..d22b305 100644
--- a/webapp/src/components/NtpAdminView.vue
+++ b/webapp/src/views/NtpAdminView.vue
@@ -87,7 +87,7 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue';
-import BootstrapAlert from "@/components/partials/BootstrapAlert.vue";
+import BootstrapAlert from "@/components/BootstrapAlert.vue";
 
 export default defineComponent({
     components: {
diff --git a/webapp/src/components/NtpInfoView.vue b/webapp/src/views/NtpInfoView.vue
similarity index 100%
rename from webapp/src/components/NtpInfoView.vue
rename to webapp/src/views/NtpInfoView.vue
diff --git a/webapp/src/components/SecurityAdminView.vue b/webapp/src/views/SecurityAdminView.vue
similarity index 98%
rename from webapp/src/components/SecurityAdminView.vue
rename to webapp/src/views/SecurityAdminView.vue
index 6ae2374..760ff16 100644
--- a/webapp/src/components/SecurityAdminView.vue
+++ b/webapp/src/views/SecurityAdminView.vue
@@ -50,7 +50,7 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue';
-import BootstrapAlert from "@/components/partials/BootstrapAlert.vue";
+import BootstrapAlert from "@/components/BootstrapAlert.vue";
 
 export default defineComponent({
     components: {
diff --git a/webapp/src/components/SystemInfoView.vue b/webapp/src/views/SystemInfoView.vue
similarity index 93%
rename from webapp/src/components/SystemInfoView.vue
rename to webapp/src/views/SystemInfoView.vue
index 2891213..216b1ec 100644
--- a/webapp/src/components/SystemInfoView.vue
+++ b/webapp/src/views/SystemInfoView.vue
@@ -25,10 +25,10 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue';
-import HardwareInfo from "@/components/partials/HardwareInfo.vue";
-import FirmwareInfo from "@/components/partials/FirmwareInfo.vue";
-import MemoryInfo from "@/components/partials/MemoryInfo.vue";
-import RadioInfo from "@/components/partials/RadioInfo.vue";
+import HardwareInfo from "@/components/HardwareInfo.vue";
+import FirmwareInfo from "@/components/FirmwareInfo.vue";
+import MemoryInfo from "@/components/MemoryInfo.vue";
+import RadioInfo from "@/components/RadioInfo.vue";
 
 export default defineComponent({
     components: {