diff --git a/src/main.tsx b/src/main.tsx
index f605e48d..462b2e63 100644
--- a/src/main.tsx
+++ b/src/main.tsx
@@ -1,14 +1,14 @@
 import {StrictMode} from 'react'
 import {createRoot} from 'react-dom/client'
 import './index.css'
-import App from './App.tsx'
+import DesktopApp from './ui/Desktop/DesktopApp.tsx'
 import {ThemeProvider} from "@/components/theme-provider"
 import './i18n/i18n' // Initialize i18n
 
 createRoot(document.getElementById('root')!).render(
     <StrictMode>
         <ThemeProvider defaultTheme="dark" storageKey="vite-ui-theme">
-            <App/>
+            <DesktopApp/>
         </ThemeProvider>
     </StrictMode>,
 )
diff --git a/src/ui/Admin/AdminSettings.tsx b/src/ui/Desktop/Admin/AdminSettings.tsx
similarity index 99%
rename from src/ui/Admin/AdminSettings.tsx
rename to src/ui/Desktop/Admin/AdminSettings.tsx
index ca1ab4f0..84fc379c 100644
--- a/src/ui/Admin/AdminSettings.tsx
+++ b/src/ui/Desktop/Admin/AdminSettings.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import {useSidebar} from "@/components/ui/sidebar";
+import {useSidebar} from "@/components/ui/sidebar.tsx";
 import {Separator} from "@/components/ui/separator.tsx";
 import {Button} from "@/components/ui/button.tsx";
 import {Alert, AlertDescription, AlertTitle} from "@/components/ui/alert.tsx";
diff --git a/src/ui/Apps/File Manager/FIleManagerTopNavbar.tsx b/src/ui/Desktop/Apps/File Manager/FIleManagerTopNavbar.tsx
similarity index 100%
rename from src/ui/Apps/File Manager/FIleManagerTopNavbar.tsx
rename to src/ui/Desktop/Apps/File Manager/FIleManagerTopNavbar.tsx
diff --git a/src/ui/Apps/File Manager/FileManager.tsx b/src/ui/Desktop/Apps/File Manager/FileManager.tsx
similarity index 97%
rename from src/ui/Apps/File Manager/FileManager.tsx
rename to src/ui/Desktop/Apps/File Manager/FileManager.tsx
index 85e33c00..b2d06587 100644
--- a/src/ui/Apps/File Manager/FileManager.tsx	
+++ b/src/ui/Desktop/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/Desktop/Apps/File Manager/FileManagerLeftSidebar.tsx";
+import {FileManagerTabList} from "@/ui/Desktop/Apps/File Manager/FileManagerTabList.tsx";
+import {FileManagerHomeView} from "@/ui/Desktop/Apps/File Manager/FileManagerHomeView.tsx";
+import {FileManagerFileEditor} from "@/ui/Desktop/Apps/File Manager/FileManagerFileEditor.tsx";
+import {FileManagerOperations} from "@/ui/Desktop/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/Desktop/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/Desktop/Apps/File Manager/FileManagerFileEditor.tsx
similarity index 100%
rename from src/ui/Apps/File Manager/FileManagerFileEditor.tsx
rename to src/ui/Desktop/Apps/File Manager/FileManagerFileEditor.tsx
diff --git a/src/ui/Apps/File Manager/FileManagerHomeView.tsx b/src/ui/Desktop/Apps/File Manager/FileManagerHomeView.tsx
similarity index 100%
rename from src/ui/Apps/File Manager/FileManagerHomeView.tsx
rename to src/ui/Desktop/Apps/File Manager/FileManagerHomeView.tsx
diff --git a/src/ui/Apps/File Manager/FileManagerLeftSidebar.tsx b/src/ui/Desktop/Apps/File Manager/FileManagerLeftSidebar.tsx
similarity index 100%
rename from src/ui/Apps/File Manager/FileManagerLeftSidebar.tsx
rename to src/ui/Desktop/Apps/File Manager/FileManagerLeftSidebar.tsx
diff --git a/src/ui/Apps/File Manager/FileManagerLeftSidebarFileViewer.tsx b/src/ui/Desktop/Apps/File Manager/FileManagerLeftSidebarFileViewer.tsx
similarity index 100%
rename from src/ui/Apps/File Manager/FileManagerLeftSidebarFileViewer.tsx
rename to src/ui/Desktop/Apps/File Manager/FileManagerLeftSidebarFileViewer.tsx
diff --git a/src/ui/Apps/File Manager/FileManagerOperations.tsx b/src/ui/Desktop/Apps/File Manager/FileManagerOperations.tsx
similarity index 100%
rename from src/ui/Apps/File Manager/FileManagerOperations.tsx
rename to src/ui/Desktop/Apps/File Manager/FileManagerOperations.tsx
diff --git a/src/ui/Apps/File Manager/FileManagerTabList.tsx b/src/ui/Desktop/Apps/File Manager/FileManagerTabList.tsx
similarity index 100%
rename from src/ui/Apps/File Manager/FileManagerTabList.tsx
rename to src/ui/Desktop/Apps/File Manager/FileManagerTabList.tsx
diff --git a/src/ui/Apps/Host Manager/HostManager.tsx b/src/ui/Desktop/Apps/Host Manager/HostManager.tsx
similarity index 95%
rename from src/ui/Apps/Host Manager/HostManager.tsx
rename to src/ui/Desktop/Apps/Host Manager/HostManager.tsx
index 9a53545e..41bdcef2 100644
--- a/src/ui/Apps/Host Manager/HostManager.tsx	
+++ b/src/ui/Desktop/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/Desktop/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/Desktop/Apps/Host Manager/HostManagerHostEditor.tsx";
 import {useSidebar} from "@/components/ui/sidebar.tsx";
 import {useTranslation} from "react-i18next";
 
diff --git a/src/ui/Apps/Host Manager/HostManagerHostEditor.tsx b/src/ui/Desktop/Apps/Host Manager/HostManagerHostEditor.tsx
similarity index 99%
rename from src/ui/Apps/Host Manager/HostManagerHostEditor.tsx
rename to src/ui/Desktop/Apps/Host Manager/HostManagerHostEditor.tsx
index a00a15f0..0d9ce3c4 100644
--- a/src/ui/Apps/Host Manager/HostManagerHostEditor.tsx	
+++ b/src/ui/Desktop/Apps/Host Manager/HostManagerHostEditor.tsx	
@@ -13,7 +13,7 @@ import {
     FormMessage,
 } from "@/components/ui/form.tsx";
 import {Input} from "@/components/ui/input.tsx";
-import {ScrollArea} from "@/components/ui/scroll-area"
+import {ScrollArea} from "@/components/ui/scroll-area.tsx"
 import {Separator} from "@/components/ui/separator.tsx";
 import {Tabs, TabsContent, TabsList, TabsTrigger} from "@/components/ui/tabs.tsx";
 import React, {useEffect, useRef, useState} from "react";
diff --git a/src/ui/Apps/Host Manager/HostManagerHostViewer.tsx b/src/ui/Desktop/Apps/Host Manager/HostManagerHostViewer.tsx
similarity index 98%
rename from src/ui/Apps/Host Manager/HostManagerHostViewer.tsx
rename to src/ui/Desktop/Apps/Host Manager/HostManagerHostViewer.tsx
index 33574649..e50cf1cb 100644
--- a/src/ui/Apps/Host Manager/HostManagerHostViewer.tsx	
+++ b/src/ui/Desktop/Apps/Host Manager/HostManagerHostViewer.tsx	
@@ -1,11 +1,11 @@
 import React, {useState, useEffect, useMemo} from "react";
-import {Card, CardContent} from "@/components/ui/card";
-import {Button} from "@/components/ui/button";
-import {Badge} from "@/components/ui/badge";
-import {ScrollArea} from "@/components/ui/scroll-area";
-import {Input} from "@/components/ui/input";
-import {Accordion, AccordionContent, AccordionItem, AccordionTrigger} from "@/components/ui/accordion";
-import {Tooltip, TooltipContent, TooltipProvider, TooltipTrigger} from "@/components/ui/tooltip";
+import {Card, CardContent} from "@/components/ui/card.tsx";
+import {Button} from "@/components/ui/button.tsx";
+import {Badge} from "@/components/ui/badge.tsx";
+import {ScrollArea} from "@/components/ui/scroll-area.tsx";
+import {Input} from "@/components/ui/input.tsx";
+import {Accordion, AccordionContent, AccordionItem, AccordionTrigger} from "@/components/ui/accordion.tsx";
+import {Tooltip, TooltipContent, TooltipProvider, TooltipTrigger} from "@/components/ui/tooltip.tsx";
 import {getSSHHosts, deleteSSHHost, bulkImportSSHHosts} from "@/ui/main-axios.ts";
 import {toast} from "sonner";
 import {useTranslation} from "react-i18next";
diff --git a/src/ui/Apps/Server/Server.tsx b/src/ui/Desktop/Apps/Server/Server.tsx
similarity index 98%
rename from src/ui/Apps/Server/Server.tsx
rename to src/ui/Desktop/Apps/Server/Server.tsx
index 413c0a78..b58b3410 100644
--- a/src/ui/Apps/Server/Server.tsx
+++ b/src/ui/Desktop/Apps/Server/Server.tsx
@@ -1,13 +1,13 @@
 import React from "react";
-import {useSidebar} from "@/components/ui/sidebar";
+import {useSidebar} from "@/components/ui/sidebar.tsx";
 import {Status, StatusIndicator} from "@/components/ui/shadcn-io/status";
 import {Separator} from "@/components/ui/separator.tsx";
 import {Button} from "@/components/ui/button.tsx";
-import {Progress} from "@/components/ui/progress"
+import {Progress} from "@/components/ui/progress.tsx"
 import {Cpu, HardDrive, MemoryStick} from "lucide-react";
-import {Tunnel} from "@/ui/Apps/Tunnel/Tunnel.tsx";
+import {Tunnel} from "@/ui/Desktop/Apps/Tunnel/Tunnel.tsx";
 import {getServerStatusById, getServerMetricsById, type ServerMetrics} from "@/ui/main-axios.ts";
-import {useTabs} from "@/ui/Navigation/Tabs/TabContext.tsx";
+import {useTabs} from "@/ui/Desktop/Navigation/Tabs/TabContext.tsx";
 import {useTranslation} from 'react-i18next';
 
 interface ServerProps {
diff --git a/src/ui/Apps/Terminal/Terminal.tsx b/src/ui/Desktop/Apps/Terminal/Terminal.tsx
similarity index 100%
rename from src/ui/Apps/Terminal/Terminal.tsx
rename to src/ui/Desktop/Apps/Terminal/Terminal.tsx
diff --git a/src/ui/Apps/Tunnel/Tunnel.tsx b/src/ui/Desktop/Apps/Tunnel/Tunnel.tsx
similarity index 99%
rename from src/ui/Apps/Tunnel/Tunnel.tsx
rename to src/ui/Desktop/Apps/Tunnel/Tunnel.tsx
index e900f0eb..6c45bca8 100644
--- a/src/ui/Apps/Tunnel/Tunnel.tsx
+++ b/src/ui/Desktop/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/Desktop/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/Desktop/Apps/Tunnel/TunnelObject.tsx
similarity index 100%
rename from src/ui/Apps/Tunnel/TunnelObject.tsx
rename to src/ui/Desktop/Apps/Tunnel/TunnelObject.tsx
diff --git a/src/ui/Apps/Tunnel/TunnelViewer.tsx b/src/ui/Desktop/Apps/Tunnel/TunnelViewer.tsx
similarity index 100%
rename from src/ui/Apps/Tunnel/TunnelViewer.tsx
rename to src/ui/Desktop/Apps/Tunnel/TunnelViewer.tsx
diff --git a/src/App.tsx b/src/ui/Desktop/DesktopApp.tsx
similarity index 93%
rename from src/App.tsx
rename to src/ui/Desktop/DesktopApp.tsx
index 2894ede1..fb72cd8a 100644
--- a/src/App.tsx
+++ b/src/ui/Desktop/DesktopApp.tsx
@@ -1,13 +1,13 @@
 import React, {useState, useEffect} from "react"
-import {LeftSidebar} from "@/ui/Navigation/LeftSidebar.tsx"
+import {LeftSidebar} from "@/ui/Desktop/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 {TabProvider, useTabs} from "@/ui/Navigation/Tabs/TabContext.tsx"
-import {TopNavbar} from "@/ui/Navigation/TopNavbar.tsx";
-import { AdminSettings } from "@/ui/Admin/AdminSettings";
-import { UserProfile } from "@/ui/User/UserProfile.tsx";
-import { Toaster } from "@/components/ui/sonner";
+import {AppView} from "@/ui/Desktop/Navigation/AppView.tsx"
+import {HostManager} from "@/ui/Desktop/Apps/Host Manager/HostManager.tsx"
+import {TabProvider, useTabs} from "@/ui/Desktop/Navigation/Tabs/TabContext.tsx"
+import {TopNavbar} from "@/ui/Desktop/Navigation/TopNavbar.tsx";
+import { AdminSettings } from "@/ui/Desktop/Admin/AdminSettings.tsx";
+import { UserProfile } from "@/ui/Desktop/User/UserProfile.tsx";
+import { Toaster } from "@/components/ui/sonner.tsx";
 import { getUserInfo } from "@/ui/main-axios.ts";
 
 function getCookie(name: string) {
@@ -217,7 +217,7 @@ function AppContent() {
     )
 }
 
-function App() {
+function DesktopApp() {
     return (
         <TabProvider>
             <AppContent />
@@ -225,4 +225,4 @@ function App() {
     );
 }
 
-export default App
\ No newline at end of file
+export default DesktopApp
\ No newline at end of file
diff --git a/src/ui/Homepage/Homepage.tsx b/src/ui/Desktop/Homepage/Homepage.tsx
similarity index 100%
rename from src/ui/Homepage/Homepage.tsx
rename to src/ui/Desktop/Homepage/Homepage.tsx
diff --git a/src/ui/Homepage/HomepageAlertCard.tsx b/src/ui/Desktop/Homepage/HomepageAlertCard.tsx
similarity index 100%
rename from src/ui/Homepage/HomepageAlertCard.tsx
rename to src/ui/Desktop/Homepage/HomepageAlertCard.tsx
diff --git a/src/ui/Homepage/HomepageAlertManager.tsx b/src/ui/Desktop/Homepage/HomepageAlertManager.tsx
similarity index 100%
rename from src/ui/Homepage/HomepageAlertManager.tsx
rename to src/ui/Desktop/Homepage/HomepageAlertManager.tsx
diff --git a/src/ui/Homepage/HomepageAuth.tsx b/src/ui/Desktop/Homepage/HomepageAuth.tsx
similarity index 100%
rename from src/ui/Homepage/HomepageAuth.tsx
rename to src/ui/Desktop/Homepage/HomepageAuth.tsx
diff --git a/src/ui/Homepage/HompageUpdateLog.tsx b/src/ui/Desktop/Homepage/HompageUpdateLog.tsx
similarity index 100%
rename from src/ui/Homepage/HompageUpdateLog.tsx
rename to src/ui/Desktop/Homepage/HompageUpdateLog.tsx
diff --git a/src/ui/Navigation/AppView.tsx b/src/ui/Desktop/Navigation/AppView.tsx
similarity index 99%
rename from src/ui/Navigation/AppView.tsx
rename to src/ui/Desktop/Navigation/AppView.tsx
index c56a82c3..95c55333 100644
--- a/src/ui/Navigation/AppView.tsx
+++ b/src/ui/Desktop/Navigation/AppView.tsx
@@ -1,8 +1,8 @@
 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 {useTabs} from "@/ui/Navigation/Tabs/TabContext.tsx";
+import {Terminal} from "@/ui/Desktop/Apps/Terminal/Terminal.tsx";
+import {Server as ServerView} from "@/ui/Desktop/Apps/Server/Server.tsx";
+import {FileManager} from "@/ui/Desktop/Apps/File Manager/FileManager.tsx";
+import {useTabs} from "@/ui/Desktop/Navigation/Tabs/TabContext.tsx";
 import {ResizablePanelGroup, ResizablePanel, ResizableHandle} from '@/components/ui/resizable.tsx';
 import * as ResizablePrimitive from "react-resizable-panels";
 import {useSidebar} from "@/components/ui/sidebar.tsx";
diff --git a/src/ui/Navigation/Hosts/FolderCard.tsx b/src/ui/Desktop/Navigation/Hosts/FolderCard.tsx
similarity index 97%
rename from src/ui/Navigation/Hosts/FolderCard.tsx
rename to src/ui/Desktop/Navigation/Hosts/FolderCard.tsx
index b4c473cb..d4c64d21 100644
--- a/src/ui/Navigation/Hosts/FolderCard.tsx
+++ b/src/ui/Desktop/Navigation/Hosts/FolderCard.tsx
@@ -2,7 +2,7 @@ import React, {useState} from "react";
 import {CardTitle} from "@/components/ui/card.tsx";
 import {ChevronDown, Folder} from "lucide-react";
 import {Button} from "@/components/ui/button.tsx";
-import {Host} from "@/ui/Navigation/Hosts/Host.tsx";
+import {Host} from "@/ui/Desktop/Navigation/Hosts/Host.tsx";
 import {Separator} from "@/components/ui/separator.tsx";
 
 interface SSHHost {
diff --git a/src/ui/Navigation/Hosts/Host.tsx b/src/ui/Desktop/Navigation/Hosts/Host.tsx
similarity index 98%
rename from src/ui/Navigation/Hosts/Host.tsx
rename to src/ui/Desktop/Navigation/Hosts/Host.tsx
index c4c76763..930bf57b 100644
--- a/src/ui/Navigation/Hosts/Host.tsx
+++ b/src/ui/Desktop/Navigation/Hosts/Host.tsx
@@ -3,7 +3,7 @@ import {Status, StatusIndicator} from "@/components/ui/shadcn-io/status";
 import {Button} from "@/components/ui/button.tsx";
 import {ButtonGroup} from "@/components/ui/button-group.tsx";
 import {Server, Terminal} from "lucide-react";
-import {useTabs} from "@/ui/Navigation/Tabs/TabContext.tsx";
+import {useTabs} from "@/ui/Desktop/Navigation/Tabs/TabContext.tsx";
 import {getServerStatusById} from "@/ui/main-axios.ts";
 
 interface SSHHost {
diff --git a/src/ui/Navigation/LeftSidebar.tsx b/src/ui/Desktop/Navigation/LeftSidebar.tsx
similarity index 99%
rename from src/ui/Navigation/LeftSidebar.tsx
rename to src/ui/Desktop/Navigation/LeftSidebar.tsx
index cdc25b26..28e35d97 100644
--- a/src/ui/Navigation/LeftSidebar.tsx
+++ b/src/ui/Desktop/Navigation/LeftSidebar.tsx
@@ -31,7 +31,7 @@ import {
     SheetTitle,
     SheetTrigger,
     SheetClose
-} from "@/components/ui/sheet";
+} from "@/components/ui/sheet.tsx";
 import {Checkbox} from "@/components/ui/checkbox.tsx";
 import {Input} from "@/components/ui/input.tsx";
 import {Label} from "@/components/ui/label.tsx";
@@ -47,9 +47,9 @@ import {
     TableRow,
 } from "@/components/ui/table.tsx";
 import {Card} from "@/components/ui/card.tsx";
-import {FolderCard} from "@/ui/Navigation/Hosts/FolderCard.tsx";
+import {FolderCard} from "@/ui/Desktop/Navigation/Hosts/FolderCard.tsx";
 import {getSSHHosts} from "@/ui/main-axios.ts";
-import {useTabs} from "@/ui/Navigation/Tabs/TabContext.tsx";
+import {useTabs} from "@/ui/Desktop/Navigation/Tabs/TabContext.tsx";
 import { deleteAccount } from "@/ui/main-axios.ts";
 
 interface SSHHost {
diff --git a/src/ui/Navigation/Tabs/Tab.tsx b/src/ui/Desktop/Navigation/Tabs/Tab.tsx
similarity index 100%
rename from src/ui/Navigation/Tabs/Tab.tsx
rename to src/ui/Desktop/Navigation/Tabs/Tab.tsx
diff --git a/src/ui/Navigation/Tabs/TabContext.tsx b/src/ui/Desktop/Navigation/Tabs/TabContext.tsx
similarity index 100%
rename from src/ui/Navigation/Tabs/TabContext.tsx
rename to src/ui/Desktop/Navigation/Tabs/TabContext.tsx
diff --git a/src/ui/Navigation/TopNavbar.tsx b/src/ui/Desktop/Navigation/TopNavbar.tsx
similarity index 99%
rename from src/ui/Navigation/TopNavbar.tsx
rename to src/ui/Desktop/Navigation/TopNavbar.tsx
index 50904763..d2df9f4a 100644
--- a/src/ui/Navigation/TopNavbar.tsx
+++ b/src/ui/Desktop/Navigation/TopNavbar.tsx
@@ -1,9 +1,9 @@
 import React, {useState} from "react";
-import {useSidebar} from "@/components/ui/sidebar";
+import {useSidebar} from "@/components/ui/sidebar.tsx";
 import {Button} from "@/components/ui/button.tsx";
 import {ChevronDown, ChevronUpIcon, Hammer} from "lucide-react";
-import {Tab} from "@/ui/Navigation/Tabs/Tab.tsx";
-import {useTabs} from "@/ui/Navigation/Tabs/TabContext.tsx";
+import {Tab} from "@/ui/Desktop/Navigation/Tabs/Tab.tsx";
+import {useTabs} from "@/ui/Desktop/Navigation/Tabs/TabContext.tsx";
 import {
     Accordion,
     AccordionContent,
diff --git a/src/ui/User/PasswordReset.tsx b/src/ui/Desktop/User/PasswordReset.tsx
similarity index 100%
rename from src/ui/User/PasswordReset.tsx
rename to src/ui/Desktop/User/PasswordReset.tsx
diff --git a/src/ui/User/TOTPSetup.tsx b/src/ui/Desktop/User/TOTPSetup.tsx
similarity index 100%
rename from src/ui/User/TOTPSetup.tsx
rename to src/ui/Desktop/User/TOTPSetup.tsx
diff --git a/src/ui/User/UserProfile.tsx b/src/ui/Desktop/User/UserProfile.tsx
similarity index 97%
rename from src/ui/User/UserProfile.tsx
rename to src/ui/Desktop/User/UserProfile.tsx
index 2f165472..8fdc0d31 100644
--- a/src/ui/User/UserProfile.tsx
+++ b/src/ui/Desktop/User/UserProfile.tsx
@@ -6,12 +6,12 @@ import {Label} from "@/components/ui/label.tsx";
 import {Alert, AlertDescription, AlertTitle} from "@/components/ui/alert.tsx";
 import {Tabs, TabsContent, TabsList, TabsTrigger} from "@/components/ui/tabs.tsx";
 import {User, Shield, Key, AlertCircle} from "lucide-react";
-import {TOTPSetup} from "@/ui/User/TOTPSetup.tsx";
+import {TOTPSetup} from "@/ui/Desktop/User/TOTPSetup.tsx";
 import {getUserInfo} from "@/ui/main-axios.ts";
 import {toast} from "sonner";
-import {PasswordReset} from "@/ui/User/PasswordReset.tsx";
+import {PasswordReset} from "@/ui/Desktop/User/PasswordReset.tsx";
 import {useTranslation} from "react-i18next";
-import {LanguageSwitcher} from "@/components/LanguageSwitcher";
+import {LanguageSwitcher} from "@/components/LanguageSwitcher.tsx";
 
 interface UserProfileProps {
     isTopbarOpen?: boolean;
diff --git a/src/ui/Mobile/Apps/Terminal/Terminal.tsx b/src/ui/Mobile/Apps/Terminal/Terminal.tsx
new file mode 100644
index 00000000..e69de29b
diff --git a/src/ui/Mobile/MobileApp.tsx b/src/ui/Mobile/MobileApp.tsx
new file mode 100644
index 00000000..e69de29b