diff --git a/Hub/ui/src/App.vue b/Hub/ui/src/App.vue
index 26063b7..56e64c0 100644
--- a/Hub/ui/src/App.vue
+++ b/Hub/ui/src/App.vue
@@ -13,9 +13,9 @@ import Settings from './views/Settings.vue'
 import Setup from './views/Setup.vue'
 
 import { useConfig } from './api/useConfig'
-import { useAppStore } from './stores/app'
-import { useFleetStore } from './stores/fleet'
-import { useEventsStore } from './stores/events'
+import { useAppStore } from './stores/System/app'
+import { useFleetStore } from './stores/Fleet/fleet'
+import { useEventsStore } from './stores/Events/events'
 import { HoneyWireWS } from './services/ws'
 
 const { fetchConfig } = useConfig()
diff --git a/Hub/ui/src/components/dashboard/EventTable.vue b/Hub/ui/src/components/dashboard/EventTable.vue
index 83c67a6..3213c96 100644
--- a/Hub/ui/src/components/dashboard/EventTable.vue
+++ b/Hub/ui/src/components/dashboard/EventTable.vue
@@ -1,9 +1,9 @@
 <script setup>
 import { ref, computed, nextTick, watch } from 'vue'
 import { storeToRefs } from 'pinia'
-import { useAppStore } from '../../stores/app'
-import { useEventsStore } from '../../stores/events'
-import { useFleetStore } from '../../stores/fleet'
+import { useAppStore } from '../../stores/System/app'
+import { useEventsStore } from '../../stores/Events/events'
+import { useFleetStore } from '../../stores/Fleet/fleet'
 import { formatSensorId } from '../../utils/formatSensorId'
 
 
diff --git a/Hub/ui/src/components/dashboard/SeverityChart.vue b/Hub/ui/src/components/dashboard/SeverityChart.vue
index 62ef412..8303b93 100644
--- a/Hub/ui/src/components/dashboard/SeverityChart.vue
+++ b/Hub/ui/src/components/dashboard/SeverityChart.vue
@@ -2,9 +2,9 @@
 import { ref, onMounted, watch, onUnmounted } from 'vue'
 import { storeToRefs } from 'pinia'
 import Chart from 'chart.js/auto'
-import { useEventsStore } from '../../stores/events'
-import { useFleetStore } from '../../stores/fleet'
-import { useAppStore } from '../../stores/app'
+import { useEventsStore } from '../../stores/Events/events'
+import { useFleetStore } from '../../stores/Fleet/fleet'
+import { useAppStore } from '../../stores/System/app'
 import { getComputedRgb } from '../../utils/theme'
 import { baseTooltipConfig, applyChartTheme } from '../../utils/chartConfig'
 import BaseLegend from '../ui/feedback/BaseLegend.vue'
diff --git a/Hub/ui/src/components/dashboard/ThreatVelocity.vue b/Hub/ui/src/components/dashboard/ThreatVelocity.vue
index d79755f..6575221 100644
--- a/Hub/ui/src/components/dashboard/ThreatVelocity.vue
+++ b/Hub/ui/src/components/dashboard/ThreatVelocity.vue
@@ -2,9 +2,9 @@
 import { ref, onMounted, watch, onUnmounted, shallowRef, nextTick } from 'vue'
 import { storeToRefs } from 'pinia'
 import Chart from 'chart.js/auto'
-import { useAppStore } from '../../stores/app'
-import { useEventsStore } from '../../stores/events'
-import { useFleetStore } from '../../stores/fleet'
+import { useAppStore } from '../../stores/System/app'
+import { useEventsStore } from '../../stores/Events/events'
+import { useFleetStore } from '../../stores/Fleet/fleet'
 import { getComputedRgb, injectAlpha } from '../../utils/theme'
 import { baseTooltipConfig } from '../../utils/chartConfig'
 import BaseTimeFilter from '../ui/forms/BaseTimeFilter.vue'
diff --git a/Hub/ui/src/components/dashboard/TrafficFilters.vue b/Hub/ui/src/components/dashboard/TrafficFilters.vue
index a9bba61..43c44d9 100644
--- a/Hub/ui/src/components/dashboard/TrafficFilters.vue
+++ b/Hub/ui/src/components/dashboard/TrafficFilters.vue
@@ -1,7 +1,7 @@
 <script setup>
 import { ref, computed, nextTick, watch, onMounted } from 'vue'
 import { storeToRefs } from 'pinia'
-import { useFleetStore } from '../../stores/fleet'
+import { useFleetStore } from '../../stores/Fleet/fleet'
 import BaseMeatballMenu from '../ui/navigation/BaseMeatballMenu.vue'
 import BaseStatusDot from '../ui/feedback/BaseStatusDot.vue'
 
diff --git a/Hub/ui/src/components/dashboard/UptimeHeatmap.vue b/Hub/ui/src/components/dashboard/UptimeHeatmap.vue
index 4efc1d9..2d4c228 100644
--- a/Hub/ui/src/components/dashboard/UptimeHeatmap.vue
+++ b/Hub/ui/src/components/dashboard/UptimeHeatmap.vue
@@ -1,7 +1,7 @@
 <script setup>
 import { ref, computed, nextTick, watch, onMounted, onUnmounted } from 'vue'
 import { storeToRefs } from 'pinia'
-import { useFleetStore } from '../../stores/fleet'
+import { useFleetStore } from '../../stores/Fleet/fleet'
 import BaseTimeFilter from '../ui/forms/BaseTimeFilter.vue'
 import BaseWidget from '../ui/layout/BaseWidget.vue'
 import BaseLegend from '../ui/feedback/BaseLegend.vue'
diff --git a/Hub/ui/src/components/layout/Header.vue b/Hub/ui/src/components/layout/Header.vue
index 0bab46a..d66da30 100644
--- a/Hub/ui/src/components/layout/Header.vue
+++ b/Hub/ui/src/components/layout/Header.vue
@@ -1,7 +1,7 @@
 <script setup>
 import { storeToRefs } from 'pinia'
-import { useAppStore } from '../../stores/app'
-import { useEventsStore } from '../../stores/events'
+import { useAppStore } from '../../stores/System/app'
+import { useEventsStore } from '../../stores/Events/events'
 
 const appStore = useAppStore()
 const eventsStore = useEventsStore()
diff --git a/Hub/ui/src/components/layout/Sidebar.vue b/Hub/ui/src/components/layout/Sidebar.vue
index 6de436a..e103404 100644
--- a/Hub/ui/src/components/layout/Sidebar.vue
+++ b/Hub/ui/src/components/layout/Sidebar.vue
@@ -1,7 +1,7 @@
 <script setup>
 import { storeToRefs } from 'pinia'
-import { useAppStore } from '../../stores/app'
-import { useEventsStore } from '../../stores/events'
+import { useAppStore } from '../../stores/System/app'
+import { useEventsStore } from '../../stores/Events/events'
 
 const appStore = useAppStore()
 const eventsStore = useEventsStore()
diff --git a/Hub/ui/src/stores/events.js b/Hub/ui/src/stores/Events/events.js
similarity index 99%
rename from Hub/ui/src/stores/events.js
rename to Hub/ui/src/stores/Events/events.js
index e48dad9..7652adf 100644
--- a/Hub/ui/src/stores/events.js
+++ b/Hub/ui/src/stores/Events/events.js
@@ -1,7 +1,7 @@
 import { defineStore } from 'pinia'
 import { ref, computed } from 'vue'
-import { useFleetStore } from './fleet'
-import { useAppStore } from './app'
+import { useFleetStore } from '../Fleet/fleet'
+import { useAppStore } from '../System/app'
 
 /**
  * Events Store (Telemetry State)
diff --git a/Hub/ui/src/stores/FLEETJS_ARCHITECTURE.md b/Hub/ui/src/stores/Fleet/FLEETJS_ARCHITECTURE.md
similarity index 100%
rename from Hub/ui/src/stores/FLEETJS_ARCHITECTURE.md
rename to Hub/ui/src/stores/Fleet/FLEETJS_ARCHITECTURE.md
diff --git a/Hub/ui/src/stores/fleet.js b/Hub/ui/src/stores/Fleet/fleet.js
similarity index 99%
rename from Hub/ui/src/stores/fleet.js
rename to Hub/ui/src/stores/Fleet/fleet.js
index f2013a8..82361b1 100644
--- a/Hub/ui/src/stores/fleet.js
+++ b/Hub/ui/src/stores/Fleet/fleet.js
@@ -1,6 +1,6 @@
 import { defineStore } from 'pinia'
 import { ref, computed } from 'vue'
-import { api } from '../api/client'
+import { api } from '../../api/client'
 
 export const useFleetStore = defineStore('fleet', () => {
   // --- 1. AUTHORITATIVE BACKEND SNAPSHOT STATE ---
diff --git a/Hub/ui/src/stores/APPJS_ARCHITECTURE.md b/Hub/ui/src/stores/System/APPJS_ARCHITECTURE.md
similarity index 100%
rename from Hub/ui/src/stores/APPJS_ARCHITECTURE.md
rename to Hub/ui/src/stores/System/APPJS_ARCHITECTURE.md
diff --git a/Hub/ui/src/stores/app.js b/Hub/ui/src/stores/System/app.js
similarity index 99%
rename from Hub/ui/src/stores/app.js
rename to Hub/ui/src/stores/System/app.js
index 415eed9..5f334c5 100644
--- a/Hub/ui/src/stores/app.js
+++ b/Hub/ui/src/stores/System/app.js
@@ -1,6 +1,6 @@
 import { defineStore } from 'pinia'
 import { ref, computed } from 'vue'
-import { api } from '../api/client'
+import { api } from '../../api/client'
 
 export const useAppStore = defineStore('app', () => {
   // ==========================================
diff --git a/Hub/ui/src/views/FleetView.vue b/Hub/ui/src/views/FleetView.vue
index a4c6b58..e37c673 100644
--- a/Hub/ui/src/views/FleetView.vue
+++ b/Hub/ui/src/views/FleetView.vue
@@ -1,7 +1,7 @@
 <script setup>
 import { ref, computed, onMounted, nextTick } from 'vue'
-import { useAppStore } from '../stores/app'
-import { useFleetStore } from '../stores/fleet'
+import { useAppStore } from '../stores/System/app'
+import { useFleetStore } from '../stores/Fleet/fleet'
 import PageHeader from '../components/ui/layout/PageHeader.vue'
 import BaseWidget from '../components/ui/layout/BaseWidget.vue'
 import BaseStatusDot from '../components/ui/feedback/BaseStatusDot.vue'
diff --git a/Hub/ui/src/views/Login.vue b/Hub/ui/src/views/Login.vue
index 72f3a4a..0b9ba34 100644
--- a/Hub/ui/src/views/Login.vue
+++ b/Hub/ui/src/views/Login.vue
@@ -1,6 +1,6 @@
 <script setup>
 import { ref } from 'vue'
-import { useAppStore } from '../stores/app'
+import { useAppStore } from '../stores/System/app'
 import BaseInput from '../components/ui/forms/BaseInput.vue'
 import BaseButton from '../components/ui/forms/BaseButton.vue'
 import BaseCard from '../components/ui/layout/BaseCard.vue'
diff --git a/Hub/ui/src/views/NodeDetailView.vue b/Hub/ui/src/views/NodeDetailView.vue
index 7aaa0c9..63c4ee9 100644
--- a/Hub/ui/src/views/NodeDetailView.vue
+++ b/Hub/ui/src/views/NodeDetailView.vue
@@ -1,8 +1,8 @@
 <script setup>
 import { ref, watch, computed, onMounted, nextTick } from 'vue'
-import { useAppStore } from '../stores/app'
-import { useFleetStore } from '../stores/fleet'
-import { useEventsStore } from '../stores/events'
+import { useAppStore } from '../stores/System/app'
+import { useFleetStore } from '../stores/Fleet/fleet'
+import { useEventsStore } from '../stores/Events/events'
 import { useConfig } from '../api/useConfig'
 import BaseButton from '../components/ui/forms/BaseButton.vue'
 import BaseStatusDot from '../components/ui/feedback/BaseStatusDot.vue'
diff --git a/Hub/ui/src/views/Settings.vue b/Hub/ui/src/views/Settings.vue
index e805a99..ca955d1 100644
--- a/Hub/ui/src/views/Settings.vue
+++ b/Hub/ui/src/views/Settings.vue
@@ -1,6 +1,6 @@
 <script setup>
 import { ref, watch, computed } from 'vue'
-import { useAppStore } from '../stores/app'
+import { useAppStore } from '../stores/System/app'
 import { useConfig } from '../api/useConfig'
 import BaseButton from '../components/ui/forms/BaseButton.vue'
 import BaseInput from '../components/ui/forms/BaseInput.vue'
diff --git a/Hub/ui/src/views/Setup.vue b/Hub/ui/src/views/Setup.vue
index 77f9dea..f321dbf 100644
--- a/Hub/ui/src/views/Setup.vue
+++ b/Hub/ui/src/views/Setup.vue
@@ -1,6 +1,6 @@
 <script setup>
 import { ref, onMounted } from 'vue'
-import { useAppStore } from '../stores/app'
+import { useAppStore } from '../stores/System/app'
 import BaseInput from '../components/ui/forms/BaseInput.vue'
 import BaseButton from '../components/ui/forms/BaseButton.vue'
 import BaseCard from '../components/ui/layout/BaseCard.vue'