diff --git a/src/features/dashboard/components/DashboardGrid.tsx b/src/features/dashboard/components/DashboardGrid.tsx
index 1d75e5b..1ac2c99 100644
--- a/src/features/dashboard/components/DashboardGrid.tsx
+++ b/src/features/dashboard/components/DashboardGrid.tsx
@@ -1,8 +1,8 @@
 import type { SystemHealthStatus } from "../../../types/types";
 import { useGetSystemHealth } from "../hooks/useGetSystemHealth";
-import CameraStatus from "./CameraStatus";
-import SystemOverview from "./SystemOverview";
-import SystemStatusCard from "./SystemStatusCard";
+import CameraStatus from "./cameraStatus/CameraStatus";
+import SystemHealthCard from "./systemHealth/SystemHealthCard";
+import SystemStatusCard from "./systemStatus/SystemStatusCard";
 
 const DashboardGrid = () => {
   const { query } = useGetSystemHealth();
@@ -37,7 +37,7 @@ const DashboardGrid = () => {
   return (
     <div className="grid grid-cols-1 md:grid-rows-2 md:grid-cols-2">
       <SystemStatusCard />
-      <SystemOverview
+      <SystemHealthCard
         startTime={startTime}
         uptime={uptime}
         statuses={statuses}
diff --git a/src/features/dashboard/components/CameraStatus.tsx b/src/features/dashboard/components/cameraStatus/CameraStatus.tsx
similarity index 82%
rename from src/features/dashboard/components/CameraStatus.tsx
rename to src/features/dashboard/components/cameraStatus/CameraStatus.tsx
index 18ecac7..8165e44 100644
--- a/src/features/dashboard/components/CameraStatus.tsx
+++ b/src/features/dashboard/components/cameraStatus/CameraStatus.tsx
@@ -1,7 +1,7 @@
-import type { SystemHealthStatus } from "../../../types/types";
-import Card from "../../../ui/Card";
-import StatusIndicators from "../../../ui/StatusIndicators";
-import { capitalize } from "../../../utils/utils";
+import type { SystemHealthStatus } from "../../../../types/types";
+import Card from "../../../../ui/Card";
+import StatusIndicators from "../../../../ui/StatusIndicators";
+import { capitalize } from "../../../../utils/utils";
 import CameraStatusGridItem from "./CameraStatusGridItem";
 
 type CameraStatusProps = {
diff --git a/src/features/dashboard/components/CameraStatusGridItem.tsx b/src/features/dashboard/components/cameraStatus/CameraStatusGridItem.tsx
similarity index 84%
rename from src/features/dashboard/components/CameraStatusGridItem.tsx
rename to src/features/dashboard/components/cameraStatus/CameraStatusGridItem.tsx
index 8217dc8..a75ae3d 100644
--- a/src/features/dashboard/components/CameraStatusGridItem.tsx
+++ b/src/features/dashboard/components/cameraStatus/CameraStatusGridItem.tsx
@@ -1,7 +1,7 @@
 import { useState } from "react";
-import type { SystemHealthStatus } from "../../../types/types";
-import { capitalize } from "../../../utils/utils";
-import SystemHealthModal from "./systemHealthModal/SystemHealthModal";
+import type { SystemHealthStatus } from "../../../../types/types";
+import { capitalize } from "../../../../utils/utils";
+import SystemHealthModal from "../systemHealth/systemHealthModal/SystemHealthModal";
 
 type CameraStatusGridItemProps = {
   title: string;
diff --git a/src/features/dashboard/components/statusGridItem/StatusGridItem.tsx b/src/features/dashboard/components/statusGridItem/StatusGridItem.tsx
index 05318b5..faa7032 100644
--- a/src/features/dashboard/components/statusGridItem/StatusGridItem.tsx
+++ b/src/features/dashboard/components/statusGridItem/StatusGridItem.tsx
@@ -2,7 +2,7 @@ import { useState } from "react";
 import type { SystemHealthStatus } from "../../../../types/types";
 import StatusIndicators from "../../../../ui/StatusIndicators";
 import { capitalize } from "../../../../utils/utils";
-import SystemHealthModal from "../systemHealthModal/SystemHealthModal";
+import SystemHealthModal from "../systemHealth/systemHealthModal/SystemHealthModal";
 
 type StatusGridItemProps = {
   title: string;
diff --git a/src/features/dashboard/components/SystemHealth.tsx b/src/features/dashboard/components/systemHealth/SystemHealth.tsx
similarity index 94%
rename from src/features/dashboard/components/SystemHealth.tsx
rename to src/features/dashboard/components/systemHealth/SystemHealth.tsx
index 1471947..3331bba 100644
--- a/src/features/dashboard/components/SystemHealth.tsx
+++ b/src/features/dashboard/components/systemHealth/SystemHealth.tsx
@@ -1,5 +1,5 @@
-import type { SystemHealthStatus } from "../../../types/types";
-import StatusGridItem from "./statusGridItem/StatusGridItem";
+import type { SystemHealthStatus } from "../../../../types/types";
+import StatusGridItem from "../statusGridItem/StatusGridItem";
 
 type SystemHealthProps = {
   startTime: string;
diff --git a/src/features/dashboard/components/SystemOverview.tsx b/src/features/dashboard/components/systemHealth/SystemHealthCard.tsx
similarity index 77%
rename from src/features/dashboard/components/SystemOverview.tsx
rename to src/features/dashboard/components/systemHealth/SystemHealthCard.tsx
index 418070e..22cc9a0 100644
--- a/src/features/dashboard/components/SystemOverview.tsx
+++ b/src/features/dashboard/components/systemHealth/SystemHealthCard.tsx
@@ -1,9 +1,9 @@
 import { faArrowsRotate } from "@fortawesome/free-solid-svg-icons";
-import Card from "../../../ui/Card";
-import CardHeader from "../../../ui/CardHeader";
+import Card from "../../../../ui/Card";
+import CardHeader from "../../../../ui/CardHeader";
 
 import SystemHealth from "./SystemHealth";
-import type { SystemHealthStatus } from "../../../types/types";
+import type { SystemHealthStatus } from "../../../../types/types";
 
 type SystemOverviewProps = {
   startTime: string;
@@ -15,7 +15,7 @@ type SystemOverviewProps = {
   refetch: () => void;
 };
 
-const SystemOverview = ({
+const SystemHealthCard = ({
   startTime,
   uptime,
   statuses,
@@ -39,4 +39,4 @@ const SystemOverview = ({
   );
 };
 
-export default SystemOverview;
+export default SystemHealthCard;
diff --git a/src/features/dashboard/components/systemHealthModal/SystemHealthModal.tsx b/src/features/dashboard/components/systemHealth/systemHealthModal/SystemHealthModal.tsx
similarity index 81%
rename from src/features/dashboard/components/systemHealthModal/SystemHealthModal.tsx
rename to src/features/dashboard/components/systemHealth/systemHealthModal/SystemHealthModal.tsx
index fb43cb2..eeebe0d 100644
--- a/src/features/dashboard/components/systemHealthModal/SystemHealthModal.tsx
+++ b/src/features/dashboard/components/systemHealth/systemHealthModal/SystemHealthModal.tsx
@@ -1,8 +1,8 @@
-import type { SystemHealthStatus } from "../../../../types/types";
-import Badge from "../../../../ui/Badge";
-import ModalComponent from "../../../../ui/ModalComponent";
-import StatusIndicators from "../../../../ui/StatusIndicators";
-import { capitalize } from "../../../../utils/utils";
+import type { SystemHealthStatus } from "../../../../../types/types";
+import Badge from "../../../../../ui/Badge";
+import ModalComponent from "../../../../../ui/ModalComponent";
+import StatusIndicators from "../../../../../ui/StatusIndicators";
+import { capitalize } from "../../../../../utils/utils";
 
 type SystemHealthModalProps = {
   isSystemHealthModalOpen: boolean;
diff --git a/src/features/dashboard/components/StatusItems/StatusItemCPU.tsx b/src/features/dashboard/components/systemStatus/StatusItems/StatusItemCPU.tsx
similarity index 100%
rename from src/features/dashboard/components/StatusItems/StatusItemCPU.tsx
rename to src/features/dashboard/components/systemStatus/StatusItems/StatusItemCPU.tsx
diff --git a/src/features/dashboard/components/StatusItems/StatusItemLocal.tsx b/src/features/dashboard/components/systemStatus/StatusItems/StatusItemLocal.tsx
similarity index 100%
rename from src/features/dashboard/components/StatusItems/StatusItemLocal.tsx
rename to src/features/dashboard/components/systemStatus/StatusItems/StatusItemLocal.tsx
diff --git a/src/features/dashboard/components/StatusItems/StatusItemThreads.tsx b/src/features/dashboard/components/systemStatus/StatusItems/StatusItemThreads.tsx
similarity index 100%
rename from src/features/dashboard/components/StatusItems/StatusItemThreads.tsx
rename to src/features/dashboard/components/systemStatus/StatusItems/StatusItemThreads.tsx
diff --git a/src/features/dashboard/components/StatusItems/StatusItemUTC.tsx b/src/features/dashboard/components/systemStatus/StatusItems/StatusItemUTC.tsx
similarity index 100%
rename from src/features/dashboard/components/StatusItems/StatusItemUTC.tsx
rename to src/features/dashboard/components/systemStatus/StatusItems/StatusItemUTC.tsx
diff --git a/src/features/dashboard/components/SystemStatusCard.tsx b/src/features/dashboard/components/systemStatus/SystemStatusCard.tsx
similarity index 86%
rename from src/features/dashboard/components/SystemStatusCard.tsx
rename to src/features/dashboard/components/systemStatus/SystemStatusCard.tsx
index e3307b4..db9322d 100644
--- a/src/features/dashboard/components/SystemStatusCard.tsx
+++ b/src/features/dashboard/components/systemStatus/SystemStatusCard.tsx
@@ -1,6 +1,6 @@
-import { useInfoSocket } from "../../../app/context/WebSocketContext";
-import Card from "../../../ui/Card";
-import CardHeader from "../../../ui/CardHeader";
+import { useInfoSocket } from "../../../../app/context/WebSocketContext";
+import Card from "../../../../ui/Card";
+import CardHeader from "../../../../ui/CardHeader";
 import StatusItemCPU from "./StatusItems/StatusItemCPU";
 import StatusItemLocal from "./StatusItems/StatusItemLocal";
 import StatusItemThreads from "./StatusItems/StatusItemThreads";
diff --git a/src/routes/index.tsx b/src/routes/index.tsx
index 301f601..3f2d9cb 100644
--- a/src/routes/index.tsx
+++ b/src/routes/index.tsx
@@ -6,9 +6,5 @@ export const Route = createFileRoute("/")({
 });
 
 function HomePage() {
-  return (
-    <div>
-      <DashboardGrid />
-    </div>
-  );
+  return <DashboardGrid />;
 }