diff --git a/dashboard/src/App/routes.js b/dashboard/src/App/routes.js
index 3066972..e7f6055 100644
--- a/dashboard/src/App/routes.js
+++ b/dashboard/src/App/routes.js
@@ -2,8 +2,8 @@ import { Container, Row, Col, Navbar, Nav } from "react-bootstrap";
 import { Routes as RRoutes, Route, Link, BrowserRouter, Layout } from "react-router-dom";
 import "bootstrap/dist/css/bootstrap.min.css";
 import "./App.css";
-import Dashboard from "../Dashboard";
-import Log from "../Log";
+import Dashboard from "../components/Dashboard";
+import Log from "../components/Log";
 import Settings from "../Settings";
 
 function Routes() {
diff --git a/dashboard/src/Dashboard/JssteStatus/index.js b/dashboard/src/components/JssteStatus/index.js
similarity index 100%
rename from dashboard/src/Dashboard/JssteStatus/index.js
rename to dashboard/src/components/JssteStatus/index.js
diff --git a/dashboard/src/Dashboard/appStatus/index.js b/dashboard/src/components/appStatus/index.js
similarity index 100%
rename from dashboard/src/Dashboard/appStatus/index.js
rename to dashboard/src/components/appStatus/index.js
diff --git a/dashboard/src/Dashboard/configStatus/index.js b/dashboard/src/components/configStatus/index.js
similarity index 100%
rename from dashboard/src/Dashboard/configStatus/index.js
rename to dashboard/src/components/configStatus/index.js
diff --git a/dashboard/src/Dashboard/logStatus/index.js b/dashboard/src/components/logStatus/index.js
similarity index 100%
rename from dashboard/src/Dashboard/logStatus/index.js
rename to dashboard/src/components/logStatus/index.js
diff --git a/dashboard/src/Dashboard/websrvStatus/index.js b/dashboard/src/components/websrvStatus/index.js
similarity index 100%
rename from dashboard/src/Dashboard/websrvStatus/index.js
rename to dashboard/src/components/websrvStatus/index.js
diff --git a/dashboard/src/Dashboard/Dashboard.css b/dashboard/src/pages/Dashboard/Dashboard.css
similarity index 100%
rename from dashboard/src/Dashboard/Dashboard.css
rename to dashboard/src/pages/Dashboard/Dashboard.css
diff --git a/dashboard/src/Dashboard/index.js b/dashboard/src/pages/Dashboard/index.js
similarity index 57%
rename from dashboard/src/Dashboard/index.js
rename to dashboard/src/pages/Dashboard/index.js
index 9fb1552..6302885 100644
--- a/dashboard/src/Dashboard/index.js
+++ b/dashboard/src/pages/Dashboard/index.js
@@ -1,11 +1,11 @@
 import { Stack, Card, Alert } from "react-bootstrap";
 import "bootstrap/dist/css/bootstrap.min.css";
 import "./Dashboard.css";
-import JssteStatus from "./JssteStatus";
-import WebsrvStatus from "./websrvStatus";
-import AppStatus from "./appStatus";
-import ConfigStatus from "./configStatus";
-import LogStatus from "./logStatus";
+import JssteStatus from "../../components/JssteStatus";
+import WebsrvStatus from "../../components/websrvStatus";
+import AppStatus from "../../components/appStatus";
+import ConfigStatus from "../../components/configStatus";
+import LogStatus from "../../components/logStatus";
 
 function Dashboard() {
   return (
diff --git a/dashboard/src/Dashboard/jsste_status.css b/dashboard/src/pages/Dashboard/jsste_status.css
similarity index 100%
rename from dashboard/src/Dashboard/jsste_status.css
rename to dashboard/src/pages/Dashboard/jsste_status.css
diff --git a/dashboard/src/Log/index.js b/dashboard/src/pages/Log/index.js
similarity index 100%
rename from dashboard/src/Log/index.js
rename to dashboard/src/pages/Log/index.js