diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..df30947
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+
+.idea/
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
deleted file mode 100644
index 9bc42d2..0000000
--- a/.idea/workspace.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ChangeListManager">
-    <list default="true" id="e601b4a6-af0f-4558-b267-11e152fb4728" name="Changes" comment="">
-      <change afterPath="$PROJECT_DIR$/client/src/components/SettingsButton.jsx" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/client/src/store/useDashboardStore.jsx" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/client/package-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/client/package-lock.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/client/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/client/package.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/client/src/App.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/client/src/App.jsx" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/client/src/components/Canvas/CanvasComponents/AlertLevelWidget.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/client/src/components/Widgets/AlertLevelWidget.jsx" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/client/src/components/Canvas/CanvasComponents/FirstWidgetButton.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/client/src/components/Canvas/CanvasComponents/FirstWidgetButton.jsx" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/client/src/components/Canvas/CanvasComponents/SettingsButton.jsx" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/client/src/components/Canvas/CanvasComponents/Widget.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/client/src/components/Widgets/Widget.jsx" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/client/src/components/Canvas/CanvasComponents/WidgetMenu.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/client/src/components/Canvas/CanvasComponents/WidgetMenu.jsx" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/client/src/components/Canvas/views/Admin.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/client/src/components/Canvas/views/Admin.jsx" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/client/src/components/Canvas/views/Home.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/client/src/components/Canvas/views/Home.jsx" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/client/src/components/Canvas/views/HomeTabs/MyDashboard.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/client/src/components/Canvas/views/HomeTabs/MyDashboard.jsx" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/client/src/components/Canvas/views/Volcano.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/client/src/components/Canvas/views/Volcano.jsx" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/client/src/constants/widgetRegistry.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/client/src/constants/widgetRegistry.jsx" afterDir="false" />
-    </list>
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="ProjectColorInfo">{
-  &quot;associatedIndex&quot;: 7,
-  &quot;fromUser&quot;: false
-}</component>
-  <component name="ProjectId" id="3Cm41UmuQbyMzWIumGVSngrYAr7" />
-  <component name="ProjectViewState">
-    <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showLibraryContents" value="true" />
-  </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;ModuleVcsDetector.initialDetectionPerformed&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.typescript.service.memoryLimit.init&quot;: &quot;true&quot;,
-    &quot;codeWithMe.voiceChat.enabledByDefault&quot;: &quot;false&quot;,
-    &quot;git-widget-placeholder&quot;: &quot;20260605__1123__Hight__updates&quot;,
-    &quot;javascript.preferred.runtime.type.id&quot;: &quot;node&quot;,
-    &quot;last_opened_file_path&quot;: &quot;/Users/chight/Documents/Development/website-framework&quot;,
-    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
-    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
-    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
-    &quot;npm.build.executor&quot;: &quot;Run&quot;,
-    &quot;npm.dev.executor&quot;: &quot;Run&quot;,
-    &quot;ts.external.directory.path&quot;: &quot;/Users/chight/Applications/WebStorm.app/Contents/plugins/javascript-plugin/jsLanguageServicesImpl/external&quot;,
-    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
-  }
-}</component>
-  <component name="RecentsManager">
-    <key name="MoveFile.RECENT_KEYS">
-      <recent name="$PROJECT_DIR$/client/src/components/Widgets" />
-      <recent name="$PROJECT_DIR$/client/src/components" />
-    </key>
-  </component>
-  <component name="RunManager">
-    <configuration name="dev" type="js.build_tools.npm" nameIsGenerated="true">
-      <package-json value="$PROJECT_DIR$/client/package.json" />
-      <command value="run" />
-      <scripts>
-        <script value="dev" />
-      </scripts>
-      <node-interpreter value="project" />
-      <envs />
-      <method v="2" />
-    </configuration>
-  </component>
-  <component name="SharedIndexes">
-    <attachedChunks>
-      <set>
-        <option value="bundled-js-predefined-d6986cc7102b-3bd3a6803838-JavaScript-WS-261.22158.274" />
-      </set>
-    </attachedChunks>
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="e601b4a6-af0f-4558-b267-11e152fb4728" name="Changes" comment="" />
-      <created>1776977196451</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1776977196451</updated>
-      <workItem from="1776977197454" duration="13121000" />
-      <workItem from="1777909177585" duration="1804000" />
-      <workItem from="1779808433040" duration="66743000" />
-    </task>
-    <servers />
-  </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="3" />
-  </component>
-  <component name="Vcs.Log.Tabs.Properties">
-    <option name="RECENT_FILTERS">
-      <map>
-        <entry key="Branch">
-          <value>
-            <list>
-              <RecentGroup>
-                <option name="FILTER_VALUES">
-                  <option value="authentication" />
-                </option>
-              </RecentGroup>
-            </list>
-          </value>
-        </entry>
-      </map>
-    </option>
-    <option name="TAB_STATES">
-      <map>
-        <entry key="MAIN">
-          <value>
-            <State>
-              <option name="FILTERS">
-                <map>
-                  <entry key="branch">
-                    <value>
-                      <list>
-                        <option value="authentication" />
-                      </list>
-                    </value>
-                  </entry>
-                </map>
-              </option>
-            </State>
-          </value>
-        </entry>
-      </map>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/client/src/App.jsx b/client/src/App.jsx
index f53c024..6cf30e3 100644
--- a/client/src/App.jsx
+++ b/client/src/App.jsx
@@ -2,16 +2,16 @@ import 'leaflet/dist/leaflet.css';
 import { Routes, Route, Navigate, Outlet } from 'react-router-dom';
 import { useRecipe, Grid, GridItem, useDialog, Flex, Heading } from "@chakra-ui/react";
 import { createContext } from "react";
-import Login from "@/Login.jsx";
-import Sidebar from "./components/Sidebar/Sidebar.jsx";
-import DialogPopup from "@/components/Canvas/CanvasComponents/DialogPopup.jsx";
-import Header from "@/components/Header/Header.jsx";
-import Home from "./components/Canvas/views/Home.jsx";
-import RegionalMap from "./components/Canvas/views/RegionalMap.jsx";
-import Volcano from "@/components/Canvas/views/Volcano.jsx";
-import GlobalMap from "./components/Canvas/views/GlobalMap.jsx";
-import Admin from "./components/Canvas/views/Admin.jsx";
-import MyDashboard from "./components/Canvas/views/HomeTabs/MyDashboard.jsx";
+import Login from "@/pages/auth/Login.jsx";
+import Sidebar from "./components/layout/Sidebar.jsx";
+import DialogPopup from "@/components/dashboard/DialogPopup.jsx";
+import Header from "@/components/layout/Header.jsx";
+import Home from "./pages/home/Home.jsx";
+import RegionalMap from "./pages/maps/RegionalMap.jsx";
+import Volcano from "@/pages/volcano/Volcano.jsx";
+import GlobalMap from "./pages/maps/GlobalMap.jsx";
+import Admin from "./pages/admin/Admin.jsx";
+import MyDashboard from "./pages/home/tabs/MyDashboard.jsx";
 
 function AppFoundation() {
   const recipe = useRecipe({ key: "dashboard" });
diff --git a/client/src/components/Canvas/CanvasComponents/CanvasHeaderTabs.jsx b/client/src/components/dashboard/CanvasHeaderTabs.jsx
similarity index 100%
rename from client/src/components/Canvas/CanvasComponents/CanvasHeaderTabs.jsx
rename to client/src/components/dashboard/CanvasHeaderTabs.jsx
diff --git a/client/src/components/Canvas/CanvasComponents/DialogPopup.jsx b/client/src/components/dashboard/DialogPopup.jsx
similarity index 100%
rename from client/src/components/Canvas/CanvasComponents/DialogPopup.jsx
rename to client/src/components/dashboard/DialogPopup.jsx
diff --git a/client/src/components/Canvas/CanvasComponents/DropDownMenu.jsx b/client/src/components/dashboard/DropDownMenu.jsx
similarity index 100%
rename from client/src/components/Canvas/CanvasComponents/DropDownMenu.jsx
rename to client/src/components/dashboard/DropDownMenu.jsx
diff --git a/client/src/components/Canvas/CanvasComponents/SearchBar.jsx b/client/src/components/dashboard/SearchBar.jsx
similarity index 100%
rename from client/src/components/Canvas/CanvasComponents/SearchBar.jsx
rename to client/src/components/dashboard/SearchBar.jsx
diff --git a/client/src/components/SettingsButton.jsx b/client/src/components/dashboard/SettingsButton.jsx
similarity index 96%
rename from client/src/components/SettingsButton.jsx
rename to client/src/components/dashboard/SettingsButton.jsx
index 2534117..1ed500f 100644
--- a/client/src/components/SettingsButton.jsx
+++ b/client/src/components/dashboard/SettingsButton.jsx
@@ -13,21 +13,21 @@ import {
     HStack
 } from "@chakra-ui/react";
 import { Settings, Plus, LayoutGrid, Move, Save, X } from 'lucide-react';
-import { useDashboardStore } from "../store/useDashboardStore.jsx";
-import { WIDGET_REGISTRY } from "../constants/widgetRegistry.jsx";
+import { useDashboardStore } from "../../store/useDashboardStore.jsx";
+import { WIDGET_REGISTRY } from "../../constants/widgetRegistry.jsx";
 
 export function SettingsButton() {
-    // 1. ☁️ Store connections
+    // 1. ☁Store connections
     const isEditing = useDashboardStore(state => state.isEditing);
     const enterEditMode = useDashboardStore(state => state.enterEditMode);
     const saveEdit = useDashboardStore(state => state.saveEdit);
     const cancelEdit = useDashboardStore(state => state.cancelEdit);
     const addWidget = useDashboardStore(state => state.addWidget);
 
-    // 2. 🎛️ Local state to control the Widget Library popup independently of the dropdown
+    // 2. Local state to control the Widget Library popup independently of the dropdown
     const [isLibraryOpen, setIsLibraryOpen] = useState(false);
 
-    // 3. 🧠 Categorize widgets for the tabs
+    // 3. Categorize widgets for the tabs
     const categorizedWidgets = useMemo(() => {
         return Object.entries(WIDGET_REGISTRY).reduce((acc, [id, widget]) => {
             const cat = widget.category || 'General';
diff --git a/client/src/components/Canvas/CanvasComponents/CancelButton.jsx b/client/src/components/deprecated/CancelButton.jsx
similarity index 100%
rename from client/src/components/Canvas/CanvasComponents/CancelButton.jsx
rename to client/src/components/deprecated/CancelButton.jsx
diff --git a/client/src/components/Canvas/Canvas.jsx b/client/src/components/deprecated/Canvas.jsx
similarity index 100%
rename from client/src/components/Canvas/Canvas.jsx
rename to client/src/components/deprecated/Canvas.jsx
diff --git a/client/src/components/Canvas/CanvasComponents/CustomResizeHandle.jsx b/client/src/components/deprecated/CustomResizeHandle.jsx
similarity index 100%
rename from client/src/components/Canvas/CanvasComponents/CustomResizeHandle.jsx
rename to client/src/components/deprecated/CustomResizeHandle.jsx
diff --git a/client/src/components/Dashboard.jsx b/client/src/components/deprecated/Dashboard.jsx
similarity index 100%
rename from client/src/components/Dashboard.jsx
rename to client/src/components/deprecated/Dashboard.jsx
diff --git a/client/src/components/Canvas/CanvasComponents/DeleteAllButton.jsx b/client/src/components/deprecated/DeleteAllButton.jsx
similarity index 100%
rename from client/src/components/Canvas/CanvasComponents/DeleteAllButton.jsx
rename to client/src/components/deprecated/DeleteAllButton.jsx
diff --git a/client/src/components/Canvas/CanvasComponents/FirstWidgetButton.jsx b/client/src/components/deprecated/FirstWidgetButton.jsx
similarity index 97%
rename from client/src/components/Canvas/CanvasComponents/FirstWidgetButton.jsx
rename to client/src/components/deprecated/FirstWidgetButton.jsx
index a874d98..6ec7295 100644
--- a/client/src/components/Canvas/CanvasComponents/FirstWidgetButton.jsx
+++ b/client/src/components/deprecated/FirstWidgetButton.jsx
@@ -1,5 +1,4 @@
 import { Box, Menu, Portal } from '@chakra-ui/react'
-import WidgetMenu from './WidgetMenu';
 import AlertLevel from "@/components/Widgets/AlertLevelWidget.jsx";
 
 export default function FirstWidgetButton({ appendWidget }) {
diff --git a/client/src/components/Canvas/CanvasComponents/SaveButton.jsx b/client/src/components/deprecated/SaveButton.jsx
similarity index 100%
rename from client/src/components/Canvas/CanvasComponents/SaveButton.jsx
rename to client/src/components/deprecated/SaveButton.jsx
diff --git a/client/src/components/Canvas/CanvasComponents/WidgetMenu.jsx b/client/src/components/deprecated/WidgetMenu.jsx
similarity index 93%
rename from client/src/components/Canvas/CanvasComponents/WidgetMenu.jsx
rename to client/src/components/deprecated/WidgetMenu.jsx
index 0e1d8f4..e834a47 100644
--- a/client/src/components/Canvas/CanvasComponents/WidgetMenu.jsx
+++ b/client/src/components/deprecated/WidgetMenu.jsx
@@ -1,5 +1,5 @@
 import { Menu, Portal } from "@chakra-ui/react";
-import AlertLevel from "../../Widgets/AlertLevelWidget.jsx";
+import AlertLevel from "../Widgets/AlertLevelWidget.jsx";
 
 export default function WidgetMenu({appendWidget, triggerItem, positioning}) {
   return (
diff --git a/client/src/components/ui/tooltip.jsx b/client/src/components/deprecated/tooltip.jsx
similarity index 100%
rename from client/src/components/ui/tooltip.jsx
rename to client/src/components/deprecated/tooltip.jsx
diff --git a/client/src/components/Header/Header.jsx b/client/src/components/layout/Header.jsx
similarity index 100%
rename from client/src/components/Header/Header.jsx
rename to client/src/components/layout/Header.jsx
diff --git a/client/src/components/Sidebar/Sidebar.jsx b/client/src/components/layout/Sidebar.jsx
similarity index 95%
rename from client/src/components/Sidebar/Sidebar.jsx
rename to client/src/components/layout/Sidebar.jsx
index 590f909..1ca6b77 100644
--- a/client/src/components/Sidebar/Sidebar.jsx
+++ b/client/src/components/layout/Sidebar.jsx
@@ -1,8 +1,8 @@
 import { useSlotRecipe, Box, Button, IconButton } from "@chakra-ui/react";
-import { ColorModeButton } from "@/components/ui/color-mode";
+import { ColorModeButton } from "@/components/ui/color-mode.jsx";
 import { useState } from "react";
 import { NavLink } from "react-router-dom";
-import Tooltip from "../Canvas/CanvasComponents/Tooltip.jsx";
+import Tooltip from "../ui/Tooltip.jsx";
 import { Mountain, House, Earth, MapPin, ShieldUser, Menu } from 'lucide-react';
 
 const SIDEBAR_DEFAULT_BUTTONS = [
diff --git a/client/src/components/Header/UserAvatarMenu.jsx b/client/src/components/layout/UserAvatarMenu.jsx
similarity index 100%
rename from client/src/components/Header/UserAvatarMenu.jsx
rename to client/src/components/layout/UserAvatarMenu.jsx
diff --git a/client/src/components/Canvas/CanvasComponents/MapButtonControls.jsx b/client/src/components/maps/MapButtonControls.jsx
similarity index 100%
rename from client/src/components/Canvas/CanvasComponents/MapButtonControls.jsx
rename to client/src/components/maps/MapButtonControls.jsx
diff --git a/client/src/components/Canvas/CanvasComponents/MapSettingsButton.jsx b/client/src/components/maps/MapSettingsButton.jsx
similarity index 100%
rename from client/src/components/Canvas/CanvasComponents/MapSettingsButton.jsx
rename to client/src/components/maps/MapSettingsButton.jsx
diff --git a/client/src/components/Canvas/CanvasComponents/Tooltip.jsx b/client/src/components/ui/Tooltip.jsx
similarity index 100%
rename from client/src/components/Canvas/CanvasComponents/Tooltip.jsx
rename to client/src/components/ui/Tooltip.jsx
diff --git a/client/src/components/Canvas/views/Admin.jsx b/client/src/pages/admin/Admin.jsx
similarity index 75%
rename from client/src/components/Canvas/views/Admin.jsx
rename to client/src/pages/admin/Admin.jsx
index cab2e12..987c841 100644
--- a/client/src/components/Canvas/views/Admin.jsx
+++ b/client/src/pages/admin/Admin.jsx
@@ -1,12 +1,12 @@
 import { Flex, Tabs, HStack } from '@chakra-ui/react';
-import { MEDataEntry } from './AdminTabs/MEDataEntry';
-import { ProjectCollector } from './AdminTabs/ProjectCollector';
-import { NASApplication } from './AdminTabs/NASApplication';
-import { IVANS } from './AdminTabs/IVANS'
-import { SearchBar } from "../CanvasComponents/SearchBar";
-import { SettingsButton } from "../../SettingsButton.jsx";
-import { CanvasHeaderTabs } from '../CanvasComponents/CanvasHeaderTabs';
-import { ADMIN_TABS } from '@/constants/viewKeys';
+import { MEDataEntry } from './tabs/MEDataEntry.jsx';
+import { ProjectCollector } from './tabs/ProjectCollector.jsx';
+import { NASApplication } from './tabs/NASApplication.jsx';
+import { IVANS } from './tabs/IVANS.jsx'
+import { SearchBar } from "../../components/dashboard/SearchBar.jsx";
+import { SettingsButton } from "../../components/dashboard/SettingsButton.jsx";
+import { CanvasHeaderTabs } from '../../components/dashboard/CanvasHeaderTabs.jsx';
+import { ADMIN_TABS } from '@/constants/viewKeys.js';
 
 // TODO - refactor this. Currently Admin doesn't use onEditWidgets or appendWidget
 export default function Admin({ view, onChangeView, onEditWidgets, appendWidget }) {
diff --git a/client/src/components/Canvas/views/AdminTabs/IVANS.jsx b/client/src/pages/admin/tabs/IVANS.jsx
similarity index 100%
rename from client/src/components/Canvas/views/AdminTabs/IVANS.jsx
rename to client/src/pages/admin/tabs/IVANS.jsx
diff --git a/client/src/components/Canvas/views/AdminTabs/MEDataEntry.jsx b/client/src/pages/admin/tabs/MEDataEntry.jsx
similarity index 99%
rename from client/src/components/Canvas/views/AdminTabs/MEDataEntry.jsx
rename to client/src/pages/admin/tabs/MEDataEntry.jsx
index f3ee9ba..57d6745 100644
--- a/client/src/components/Canvas/views/AdminTabs/MEDataEntry.jsx
+++ b/client/src/pages/admin/tabs/MEDataEntry.jsx
@@ -1,6 +1,6 @@
 import { useState } from 'react';
 import { Box, Button, ButtonGroup, Text, Input, List, Field, Stack, SimpleGrid, HStack, Table, Checkbox, createListCollection } from "@chakra-ui/react"
-import DropDownMenu from "../../CanvasComponents/DropDownMenu"
+import DropDownMenu from "../../../components/dashboard/DropDownMenu.jsx"
 import { useForm } from 'react-hook-form';
 
 const startYear = 1970;
diff --git a/client/src/components/Canvas/views/AdminTabs/NASApplication.jsx b/client/src/pages/admin/tabs/NASApplication.jsx
similarity index 100%
rename from client/src/components/Canvas/views/AdminTabs/NASApplication.jsx
rename to client/src/pages/admin/tabs/NASApplication.jsx
diff --git a/client/src/components/Canvas/views/AdminTabs/ProjectCollector.jsx b/client/src/pages/admin/tabs/ProjectCollector.jsx
similarity index 100%
rename from client/src/components/Canvas/views/AdminTabs/ProjectCollector.jsx
rename to client/src/pages/admin/tabs/ProjectCollector.jsx
diff --git a/client/src/components/Canvas/views/Account.jsx b/client/src/pages/auth/Account.jsx
similarity index 100%
rename from client/src/components/Canvas/views/Account.jsx
rename to client/src/pages/auth/Account.jsx
diff --git a/client/src/Login.jsx b/client/src/pages/auth/Login.jsx
similarity index 100%
rename from client/src/Login.jsx
rename to client/src/pages/auth/Login.jsx
diff --git a/client/src/components/Canvas/views/Personal.jsx b/client/src/pages/auth/Personal.jsx
similarity index 100%
rename from client/src/components/Canvas/views/Personal.jsx
rename to client/src/pages/auth/Personal.jsx
diff --git a/client/src/components/Canvas/views/Security.jsx b/client/src/pages/auth/Security.jsx
similarity index 100%
rename from client/src/components/Canvas/views/Security.jsx
rename to client/src/pages/auth/Security.jsx
diff --git a/client/src/components/Canvas/views/Home.jsx b/client/src/pages/home/Home.jsx
similarity index 94%
rename from client/src/components/Canvas/views/Home.jsx
rename to client/src/pages/home/Home.jsx
index cd3c1df..8816dbf 100644
--- a/client/src/components/Canvas/views/Home.jsx
+++ b/client/src/pages/home/Home.jsx
@@ -1,7 +1,7 @@
 import { HStack, Flex, Box } from "@chakra-ui/react";
 import { NavLink, Outlet, useLocation } from "react-router-dom";
-import { SearchBar } from "../CanvasComponents/SearchBar";
-import { SettingsButton } from "../../SettingsButton.jsx";
+import { SearchBar } from "../../components/dashboard/SearchBar.jsx";
+import { SettingsButton } from "../../components/dashboard/SettingsButton.jsx";
 
 export default function Home() {
   const location = useLocation();
diff --git a/client/src/components/Canvas/views/HomeTabs/DailyActivity.jsx b/client/src/pages/home/tabs/DailyActivity.jsx
similarity index 100%
rename from client/src/components/Canvas/views/HomeTabs/DailyActivity.jsx
rename to client/src/pages/home/tabs/DailyActivity.jsx
diff --git a/client/src/components/Canvas/views/HomeTabs/Gas.jsx b/client/src/pages/home/tabs/Gas.jsx
similarity index 100%
rename from client/src/components/Canvas/views/HomeTabs/Gas.jsx
rename to client/src/pages/home/tabs/Gas.jsx
diff --git a/client/src/components/Canvas/views/HomeTabs/MyDashboard.jsx b/client/src/pages/home/tabs/MyDashboard.jsx
similarity index 100%
rename from client/src/components/Canvas/views/HomeTabs/MyDashboard.jsx
rename to client/src/pages/home/tabs/MyDashboard.jsx
diff --git a/client/src/components/Canvas/views/HomeTabs/RemoteSensing.jsx b/client/src/pages/home/tabs/RemoteSensing.jsx
similarity index 100%
rename from client/src/components/Canvas/views/HomeTabs/RemoteSensing.jsx
rename to client/src/pages/home/tabs/RemoteSensing.jsx
diff --git a/client/src/components/Canvas/views/HomeTabs/Seismic.jsx b/client/src/pages/home/tabs/Seismic.jsx
similarity index 100%
rename from client/src/components/Canvas/views/HomeTabs/Seismic.jsx
rename to client/src/pages/home/tabs/Seismic.jsx
diff --git a/client/src/components/Canvas/views/GlobalMap.jsx b/client/src/pages/maps/GlobalMap.jsx
similarity index 82%
rename from client/src/components/Canvas/views/GlobalMap.jsx
rename to client/src/pages/maps/GlobalMap.jsx
index 7b0f7af..7222a89 100644
--- a/client/src/components/Canvas/views/GlobalMap.jsx
+++ b/client/src/pages/maps/GlobalMap.jsx
@@ -1,7 +1,7 @@
 import React from "react";
 import { MapContainer, TileLayer, Marker, Popup } from "react-leaflet";
-import MapButtonControls from "../CanvasComponents/MapButtonControls";
-import MapSettingsButton from "../CanvasComponents/MapSettingsButton";
+import MapButtonControls from "../../components/maps/MapButtonControls.jsx";
+import MapSettingsButton from "../../components/maps/MapSettingsButton.jsx";
 
 export default function GlobalMap() {
   const position = [45.61142478054226, -122.49630033167544]; // [latitude, longitude]
diff --git a/client/src/components/Canvas/views/RegionalMap.jsx b/client/src/pages/maps/RegionalMap.jsx
similarity index 100%
rename from client/src/components/Canvas/views/RegionalMap.jsx
rename to client/src/pages/maps/RegionalMap.jsx
diff --git a/client/src/components/Canvas/views/Volcano.jsx b/client/src/pages/volcano/Volcano.jsx
similarity index 72%
rename from client/src/components/Canvas/views/Volcano.jsx
rename to client/src/pages/volcano/Volcano.jsx
index ddb8e4a..681d0bb 100644
--- a/client/src/components/Canvas/views/Volcano.jsx
+++ b/client/src/pages/volcano/Volcano.jsx
@@ -1,14 +1,14 @@
 import { Box, Text, Heading, DataList, Flex, HStack, Tabs } from '@chakra-ui/react';
 import { MapContainer, TileLayer, Marker, Popup } from "react-leaflet";
-import { CanvasHeaderTabs } from '../CanvasComponents/CanvasHeaderTabs';
-import { VOLCANO_TABS } from '@/constants/viewKeys';
-import { VolcanoHome } from './VolcanoTabs/VolcanoHome';
-import { PartnerData } from './VolcanoTabs/PartnerData';
-import { Reports } from './VolcanoTabs/Reports';
-import { OfficialInstitutions } from './VolcanoTabs/OfficialInstitutions';
-import { SocialMedia } from './VolcanoTabs/SocialMedia';
-import { SearchBar } from "../CanvasComponents/SearchBar";
-import { SettingsButton } from "../../SettingsButton.jsx";
+import { CanvasHeaderTabs } from '../../components/dashboard/CanvasHeaderTabs.jsx';
+import { VOLCANO_TABS } from '@/constants/viewKeys.js';
+import { VolcanoHome } from './tabs/VolcanoHome.jsx';
+import { PartnerData } from './tabs/PartnerData.jsx';
+import { Reports } from './tabs/Reports.jsx';
+import { OfficialInstitutions } from './tabs/OfficialInstitutions.jsx';
+import { SocialMedia } from './tabs/SocialMedia.jsx';
+import { SearchBar } from "../../components/dashboard/SearchBar.jsx";
+import { SettingsButton } from "../../components/dashboard/SettingsButton.jsx";
 
 export default function Volcano() {
     return (
diff --git a/client/src/components/Canvas/views/VolcanoTabs/OfficialInstitutions.jsx b/client/src/pages/volcano/tabs/OfficialInstitutions.jsx
similarity index 100%
rename from client/src/components/Canvas/views/VolcanoTabs/OfficialInstitutions.jsx
rename to client/src/pages/volcano/tabs/OfficialInstitutions.jsx
diff --git a/client/src/components/Canvas/views/VolcanoTabs/PartnerData.jsx b/client/src/pages/volcano/tabs/PartnerData.jsx
similarity index 100%
rename from client/src/components/Canvas/views/VolcanoTabs/PartnerData.jsx
rename to client/src/pages/volcano/tabs/PartnerData.jsx
diff --git a/client/src/components/Canvas/views/VolcanoTabs/Reports.jsx b/client/src/pages/volcano/tabs/Reports.jsx
similarity index 100%
rename from client/src/components/Canvas/views/VolcanoTabs/Reports.jsx
rename to client/src/pages/volcano/tabs/Reports.jsx
diff --git a/client/src/components/Canvas/views/VolcanoTabs/SocialMedia.jsx b/client/src/pages/volcano/tabs/SocialMedia.jsx
similarity index 100%
rename from client/src/components/Canvas/views/VolcanoTabs/SocialMedia.jsx
rename to client/src/pages/volcano/tabs/SocialMedia.jsx
diff --git a/client/src/components/Canvas/views/VolcanoTabs/VolcanoHome.jsx b/client/src/pages/volcano/tabs/VolcanoHome.jsx
similarity index 100%
rename from client/src/components/Canvas/views/VolcanoTabs/VolcanoHome.jsx
rename to client/src/pages/volcano/tabs/VolcanoHome.jsx