diff --git a/src/App.tsx b/src/App.tsx
index c5f77798..3e65f461 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -2,7 +2,7 @@ import React, {useState, useEffect} from "react"
 import {LeftSidebar} from "@/ui/Navigation/LeftSidebar.tsx"
 import {Homepage} from "@/ui/Homepage/Homepage.tsx"
 import {AppView} from "@/ui/Navigation/AppView.tsx"
-import {HostManager} from "@/ui/apps/Host Manager/HostManager.tsx"
+import {HostManager} from "@/ui/Apps/Host Manager/HostManager.tsx"
 import {TabProvider, useTabs} from "@/ui/Navigation/Tabs/TabContext.tsx"
 import {TopNavbar} from "@/ui/Navigation/TopNavbar.tsx";
 import { AdminSettings } from "@/ui/Admin/AdminSettings";
diff --git a/src/ui/apps/File Manager/FIleManagerTopNavbar.tsx b/src/ui/Apps/File Manager/FIleManagerTopNavbar.tsx
similarity index 100%
rename from src/ui/apps/File Manager/FIleManagerTopNavbar.tsx
rename to src/ui/Apps/File Manager/FIleManagerTopNavbar.tsx
diff --git a/src/ui/apps/File Manager/FileManager.tsx b/src/ui/Apps/File Manager/FileManager.tsx
similarity index 98%
rename from src/ui/apps/File Manager/FileManager.tsx
rename to src/ui/Apps/File Manager/FileManager.tsx
index ddb397b9..ac2edd2d 100644
--- a/src/ui/apps/File Manager/FileManager.tsx	
+++ b/src/ui/Apps/File Manager/FileManager.tsx	
@@ -1,11 +1,11 @@
 import React, {useState, useEffect, useRef} from "react";
-import {FileManagerLeftSidebar} from "@/ui/apps/File Manager/FileManagerLeftSidebar.tsx";
-import {FileManagerTabList} from "@/ui/apps/File Manager/FileManagerTabList.tsx";
-import {FileManagerHomeView} from "@/ui/apps/File Manager/FileManagerHomeView.tsx";
-import {FileManagerFileEditor} from "@/ui/apps/File Manager/FileManagerFileEditor.tsx";
-import {FileManagerOperations} from "@/ui/apps/File Manager/FileManagerOperations.tsx";
+import {FileManagerLeftSidebar} from "@/ui/Apps/File Manager/FileManagerLeftSidebar.tsx";
+import {FileManagerTabList} from "@/ui/Apps/File Manager/FileManagerTabList.tsx";
+import {FileManagerHomeView} from "@/ui/Apps/File Manager/FileManagerHomeView.tsx";
+import {FileManagerFileEditor} from "@/ui/Apps/File Manager/FileManagerFileEditor.tsx";
+import {FileManagerOperations} from "@/ui/Apps/File Manager/FileManagerOperations.tsx";
 import {Button} from '@/components/ui/button.tsx';
-import {FIleManagerTopNavbar} from "@/ui/apps/File Manager/FIleManagerTopNavbar.tsx";
+import {FIleManagerTopNavbar} from "@/ui/Apps/File Manager/FIleManagerTopNavbar.tsx";
 import {cn} from '@/lib/utils.ts';
 import {Save, RefreshCw, Settings, Trash2} from 'lucide-react';
 import {Separator} from '@/components/ui/separator.tsx';
diff --git a/src/ui/apps/File Manager/FileManagerFileEditor.tsx b/src/ui/Apps/File Manager/FileManagerFileEditor.tsx
similarity index 100%
rename from src/ui/apps/File Manager/FileManagerFileEditor.tsx
rename to src/ui/Apps/File Manager/FileManagerFileEditor.tsx
diff --git a/src/ui/apps/File Manager/FileManagerHomeView.tsx b/src/ui/Apps/File Manager/FileManagerHomeView.tsx
similarity index 100%
rename from src/ui/apps/File Manager/FileManagerHomeView.tsx
rename to src/ui/Apps/File Manager/FileManagerHomeView.tsx
diff --git a/src/ui/apps/File Manager/FileManagerLeftSidebar.tsx b/src/ui/Apps/File Manager/FileManagerLeftSidebar.tsx
similarity index 100%
rename from src/ui/apps/File Manager/FileManagerLeftSidebar.tsx
rename to src/ui/Apps/File Manager/FileManagerLeftSidebar.tsx
diff --git a/src/ui/apps/File Manager/FileManagerLeftSidebarFileViewer.tsx b/src/ui/Apps/File Manager/FileManagerLeftSidebarFileViewer.tsx
similarity index 100%
rename from src/ui/apps/File Manager/FileManagerLeftSidebarFileViewer.tsx
rename to src/ui/Apps/File Manager/FileManagerLeftSidebarFileViewer.tsx
diff --git a/src/ui/apps/File Manager/FileManagerOperations.tsx b/src/ui/Apps/File Manager/FileManagerOperations.tsx
similarity index 100%
rename from src/ui/apps/File Manager/FileManagerOperations.tsx
rename to src/ui/Apps/File Manager/FileManagerOperations.tsx
diff --git a/src/ui/apps/File Manager/FileManagerTabList.tsx b/src/ui/Apps/File Manager/FileManagerTabList.tsx
similarity index 100%
rename from src/ui/apps/File Manager/FileManagerTabList.tsx
rename to src/ui/Apps/File Manager/FileManagerTabList.tsx
diff --git a/src/ui/apps/Host Manager/HostManager.tsx b/src/ui/Apps/Host Manager/HostManager.tsx
similarity index 96%
rename from src/ui/apps/Host Manager/HostManager.tsx
rename to src/ui/Apps/Host Manager/HostManager.tsx
index c372d5c8..22a12b76 100644
--- a/src/ui/apps/Host Manager/HostManager.tsx	
+++ b/src/ui/Apps/Host Manager/HostManager.tsx	
@@ -1,8 +1,8 @@
 import React, {useState} from "react";
-import {HostManagerHostViewer} from "@/ui/apps/Host Manager/HostManagerHostViewer.tsx"
+import {HostManagerHostViewer} from "@/ui/Apps/Host Manager/HostManagerHostViewer.tsx"
 import {Tabs, TabsContent, TabsList, TabsTrigger} from "@/components/ui/tabs.tsx";
 import {Separator} from "@/components/ui/separator.tsx";
-import {HostManagerHostEditor} from "@/ui/apps/Host Manager/HostManagerHostEditor.tsx";
+import {HostManagerHostEditor} from "@/ui/Apps/Host Manager/HostManagerHostEditor.tsx";
 import {useSidebar} from "@/components/ui/sidebar.tsx";
 
 interface HostManagerProps {
diff --git a/src/ui/apps/Host Manager/HostManagerHostEditor.tsx b/src/ui/Apps/Host Manager/HostManagerHostEditor.tsx
similarity index 100%
rename from src/ui/apps/Host Manager/HostManagerHostEditor.tsx
rename to src/ui/Apps/Host Manager/HostManagerHostEditor.tsx
diff --git a/src/ui/apps/Host Manager/HostManagerHostViewer.tsx b/src/ui/Apps/Host Manager/HostManagerHostViewer.tsx
similarity index 100%
rename from src/ui/apps/Host Manager/HostManagerHostViewer.tsx
rename to src/ui/Apps/Host Manager/HostManagerHostViewer.tsx
diff --git a/src/ui/apps/Server/Server.tsx b/src/ui/Apps/Server/Server.tsx
similarity index 99%
rename from src/ui/apps/Server/Server.tsx
rename to src/ui/Apps/Server/Server.tsx
index 1b5c2f65..a53d3336 100644
--- a/src/ui/apps/Server/Server.tsx
+++ b/src/ui/Apps/Server/Server.tsx
@@ -5,7 +5,7 @@ import {Separator} from "@/components/ui/separator.tsx";
 import {Button} from "@/components/ui/button.tsx";
 import {Progress} from "@/components/ui/progress"
 import {Cpu, HardDrive, MemoryStick} from "lucide-react";
-import {Tunnel} from "@/ui/apps/Tunnel/Tunnel.tsx";
+import {Tunnel} from "@/ui/Apps/Tunnel/Tunnel.tsx";
 import {getServerStatusById, getServerMetricsById, ServerMetrics} from "@/ui/main-axios.ts";
 import {useTabs} from "@/ui/Navigation/Tabs/TabContext.tsx";
 
diff --git a/src/ui/apps/Terminal/Terminal.tsx b/src/ui/Apps/Terminal/Terminal.tsx
similarity index 100%
rename from src/ui/apps/Terminal/Terminal.tsx
rename to src/ui/Apps/Terminal/Terminal.tsx
diff --git a/src/ui/apps/Tunnel/Tunnel.tsx b/src/ui/Apps/Tunnel/Tunnel.tsx
similarity index 99%
rename from src/ui/apps/Tunnel/Tunnel.tsx
rename to src/ui/Apps/Tunnel/Tunnel.tsx
index 8904ae89..e900f0eb 100644
--- a/src/ui/apps/Tunnel/Tunnel.tsx
+++ b/src/ui/Apps/Tunnel/Tunnel.tsx
@@ -1,5 +1,5 @@
 import React, {useState, useEffect, useCallback} from "react";
-import {TunnelViewer} from "@/ui/apps/Tunnel/TunnelViewer.tsx";
+import {TunnelViewer} from "@/ui/Apps/Tunnel/TunnelViewer.tsx";
 import {getSSHHosts, getTunnelStatuses, connectTunnel, disconnectTunnel, cancelTunnel} from "@/ui/main-axios.ts";
 
 interface TunnelConnection {
diff --git a/src/ui/apps/Tunnel/TunnelObject.tsx b/src/ui/Apps/Tunnel/TunnelObject.tsx
similarity index 100%
rename from src/ui/apps/Tunnel/TunnelObject.tsx
rename to src/ui/Apps/Tunnel/TunnelObject.tsx
diff --git a/src/ui/apps/Tunnel/TunnelViewer.tsx b/src/ui/Apps/Tunnel/TunnelViewer.tsx
similarity index 100%
rename from src/ui/apps/Tunnel/TunnelViewer.tsx
rename to src/ui/Apps/Tunnel/TunnelViewer.tsx
diff --git a/src/ui/Navigation/AppView.tsx b/src/ui/Navigation/AppView.tsx
index 51117c69..c56a82c3 100644
--- a/src/ui/Navigation/AppView.tsx
+++ b/src/ui/Navigation/AppView.tsx
@@ -1,7 +1,7 @@
 import React, {useEffect, useRef, useState} from "react";
-import {Terminal} from "@/ui/apps/Terminal/Terminal.tsx";
-import {Server as ServerView} from "@/ui/apps/Server/Server.tsx";
-import {FileManager} from "@/ui/apps/File Manager/FileManager.tsx";
+import {Terminal} from "@/ui/Apps/Terminal/Terminal.tsx";
+import {Server as ServerView} from "@/ui/Apps/Server/Server.tsx";
+import {FileManager} from "@/ui/Apps/File Manager/FileManager.tsx";
 import {useTabs} from "@/ui/Navigation/Tabs/TabContext.tsx";
 import {ResizablePanelGroup, ResizablePanel, ResizableHandle} from '@/components/ui/resizable.tsx';
 import * as ResizablePrimitive from "react-resizable-panels";