diff --git a/.gitignore b/.gitignore
index decede0..404f860 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,7 +9,8 @@
 .LSOverride
 
 # Icon must end with two \r
-Icon

+Icon
+
 
 # Thumbnails
 ._*
@@ -572,3 +573,4 @@ package-lock.json
 backend/alembic/**
 !backend/alembic/env.py
 !backend/alembic/script.py.mako
+!frontend/src/pages/app/resources/css/lib
\ No newline at end of file
diff --git a/frontend/src/ui/App.tsx b/frontend/src/App.tsx
similarity index 61%
rename from frontend/src/ui/App.tsx
rename to frontend/src/App.tsx
index 2712a2e..d403a77 100644
--- a/frontend/src/ui/App.tsx
+++ b/frontend/src/App.tsx
@@ -1,12 +1,12 @@
-import { MINIMUM_WIDTH } from "../core/config";
-import { isElectron } from "../electron/electron";
-import { ElectronTitleBar } from "./components/Electron";
-import useWindowSize from "./hooks/useWindowSize";
-import ChatScreen from "./screen/ChatScreen";
-import DownloadAppScreen from "./screen/DownloadAppScreen";
-import LoginScreen from "./screen/LoginScreen";
-import RegisterScreen from "./screen/RegisterScreen";
-import { useAppState } from "./state";
+import { MINIMUM_WIDTH } from "./pages/app/core/config";
+import { isElectron } from "./pages/app/electron/electron";
+import { ElectronTitleBar } from "./pages/app/ui/components/Electron";
+import useWindowSize from "./pages/app/ui/hooks/useWindowSize";
+import ChatScreen from "./pages/app/ui/screen/ChatScreen";
+import DownloadAppScreen from "./pages/app/ui/screen/DownloadAppScreen";
+import LoginScreen from "./pages/app/ui/screen/LoginScreen";
+import RegisterScreen from "./pages/app/ui/screen/RegisterScreen";
+import { useAppState } from "./pages/app/ui/state";
 import { useEffect } from "react";
 
 export default function App() {
diff --git a/frontend/src/main.tsx b/frontend/src/main.tsx
index b923780..572bfd4 100644
--- a/frontend/src/main.tsx
+++ b/frontend/src/main.tsx
@@ -8,11 +8,11 @@
 import './resources/css/style.scss';
 import "mdui/mdui.css";
 
-import "./utils/material";
-import "./core/init";
-import "./electron/electron";
+import "./pages/app/utils/material";
+import "./pages/app/core/init";
+import "./pages/app/electron/electron";
 import { createRoot } from 'react-dom/client';
-import App from './ui/App';
+import App from './App';
 import { StrictMode } from 'react';
 
 // Initialize React app
diff --git a/frontend/src/api/dmApi.ts b/frontend/src/pages/app/api/dmApi.ts
similarity index 100%
rename from frontend/src/api/dmApi.ts
rename to frontend/src/pages/app/api/dmApi.ts
diff --git a/frontend/src/api/profileApi.ts b/frontend/src/pages/app/api/profileApi.ts
similarity index 100%
rename from frontend/src/api/profileApi.ts
rename to frontend/src/pages/app/api/profileApi.ts
diff --git a/frontend/src/auth/api.ts b/frontend/src/pages/app/auth/api.ts
similarity index 100%
rename from frontend/src/auth/api.ts
rename to frontend/src/pages/app/auth/api.ts
diff --git a/frontend/src/auth/crypto.ts b/frontend/src/pages/app/auth/crypto.ts
similarity index 100%
rename from frontend/src/auth/crypto.ts
rename to frontend/src/pages/app/auth/crypto.ts
diff --git a/frontend/src/core/config.ts b/frontend/src/pages/app/core/config.ts
similarity index 100%
rename from frontend/src/core/config.ts
rename to frontend/src/pages/app/core/config.ts
diff --git a/frontend/src/core/init.ts b/frontend/src/pages/app/core/init.ts
similarity index 100%
rename from frontend/src/core/init.ts
rename to frontend/src/pages/app/core/init.ts
diff --git a/frontend/src/core/types.d.ts b/frontend/src/pages/app/core/types.d.ts
similarity index 100%
rename from frontend/src/core/types.d.ts
rename to frontend/src/pages/app/core/types.d.ts
diff --git a/frontend/src/core/websocket.ts b/frontend/src/pages/app/core/websocket.ts
similarity index 100%
rename from frontend/src/core/websocket.ts
rename to frontend/src/pages/app/core/websocket.ts
diff --git a/frontend/src/electron/electron.ts b/frontend/src/pages/app/electron/electron.ts
similarity index 100%
rename from frontend/src/electron/electron.ts
rename to frontend/src/pages/app/electron/electron.ts
diff --git a/frontend/src/resources/css/_auth.scss b/frontend/src/pages/app/resources/css/_auth.scss
similarity index 100%
rename from frontend/src/resources/css/_auth.scss
rename to frontend/src/pages/app/resources/css/_auth.scss
diff --git a/frontend/src/resources/css/_chat.scss b/frontend/src/pages/app/resources/css/_chat.scss
similarity index 100%
rename from frontend/src/resources/css/_chat.scss
rename to frontend/src/pages/app/resources/css/_chat.scss
diff --git a/frontend/src/resources/css/_download-app.scss b/frontend/src/pages/app/resources/css/_download-app.scss
similarity index 100%
rename from frontend/src/resources/css/_download-app.scss
rename to frontend/src/pages/app/resources/css/_download-app.scss
diff --git a/frontend/src/resources/css/_electron.scss b/frontend/src/pages/app/resources/css/_electron.scss
similarity index 100%
rename from frontend/src/resources/css/_electron.scss
rename to frontend/src/pages/app/resources/css/_electron.scss
diff --git a/frontend/src/resources/css/_panelchat.scss b/frontend/src/pages/app/resources/css/_panelchat.scss
similarity index 100%
rename from frontend/src/resources/css/_panelchat.scss
rename to frontend/src/pages/app/resources/css/_panelchat.scss
diff --git a/frontend/src/resources/css/_profile.scss b/frontend/src/pages/app/resources/css/_profile.scss
similarity index 100%
rename from frontend/src/resources/css/_profile.scss
rename to frontend/src/pages/app/resources/css/_profile.scss
diff --git a/frontend/src/resources/css/_settings.scss b/frontend/src/pages/app/resources/css/_settings.scss
similarity index 100%
rename from frontend/src/resources/css/_settings.scss
rename to frontend/src/pages/app/resources/css/_settings.scss
diff --git a/frontend/src/resources/css/common/_animations.scss b/frontend/src/pages/app/resources/css/common/_animations.scss
similarity index 100%
rename from frontend/src/resources/css/common/_animations.scss
rename to frontend/src/pages/app/resources/css/common/_animations.scss
diff --git a/frontend/src/resources/css/common/_colors.scss b/frontend/src/pages/app/resources/css/common/_colors.scss
similarity index 100%
rename from frontend/src/resources/css/common/_colors.scss
rename to frontend/src/pages/app/resources/css/common/_colors.scss
diff --git a/frontend/src/resources/css/common/_components.scss b/frontend/src/pages/app/resources/css/common/_components.scss
similarity index 100%
rename from frontend/src/resources/css/common/_components.scss
rename to frontend/src/pages/app/resources/css/common/_components.scss
diff --git a/frontend/src/resources/css/common/_material.scss b/frontend/src/pages/app/resources/css/common/_material.scss
similarity index 100%
rename from frontend/src/resources/css/common/_material.scss
rename to frontend/src/pages/app/resources/css/common/_material.scss
diff --git a/frontend/src/resources/css/dialogs/_reply.scss b/frontend/src/pages/app/resources/css/dialogs/_reply.scss
similarity index 100%
rename from frontend/src/resources/css/dialogs/_reply.scss
rename to frontend/src/pages/app/resources/css/dialogs/_reply.scss
diff --git a/frontend/src/resources/css/lib/fonts/material-symbols.scss b/frontend/src/pages/app/resources/css/lib/fonts/material-symbols.scss
similarity index 100%
rename from frontend/src/resources/css/lib/fonts/material-symbols.scss
rename to frontend/src/pages/app/resources/css/lib/fonts/material-symbols.scss
diff --git a/frontend/src/resources/css/lib/fonts/material-symbols.woff2 b/frontend/src/pages/app/resources/css/lib/fonts/material-symbols.woff2
similarity index 100%
rename from frontend/src/resources/css/lib/fonts/material-symbols.woff2
rename to frontend/src/pages/app/resources/css/lib/fonts/material-symbols.woff2
diff --git a/frontend/src/resources/css/lib/fonts/montserrat.scss b/frontend/src/pages/app/resources/css/lib/fonts/montserrat.scss
similarity index 100%
rename from frontend/src/resources/css/lib/fonts/montserrat.scss
rename to frontend/src/pages/app/resources/css/lib/fonts/montserrat.scss
diff --git a/frontend/src/resources/css/lib/fonts/montserrat/JTUSjIg1_i6t8kCHKm459W1hyyTh89ZNpQ.woff2 b/frontend/src/pages/app/resources/css/lib/fonts/montserrat/JTUSjIg1_i6t8kCHKm459W1hyyTh89ZNpQ.woff2
similarity index 100%
rename from frontend/src/resources/css/lib/fonts/montserrat/JTUSjIg1_i6t8kCHKm459W1hyyTh89ZNpQ.woff2
rename to frontend/src/pages/app/resources/css/lib/fonts/montserrat/JTUSjIg1_i6t8kCHKm459W1hyyTh89ZNpQ.woff2
diff --git a/frontend/src/resources/css/lib/fonts/montserrat/JTUSjIg1_i6t8kCHKm459WRhyyTh89ZNpQ.woff2 b/frontend/src/pages/app/resources/css/lib/fonts/montserrat/JTUSjIg1_i6t8kCHKm459WRhyyTh89ZNpQ.woff2
similarity index 100%
rename from frontend/src/resources/css/lib/fonts/montserrat/JTUSjIg1_i6t8kCHKm459WRhyyTh89ZNpQ.woff2
rename to frontend/src/pages/app/resources/css/lib/fonts/montserrat/JTUSjIg1_i6t8kCHKm459WRhyyTh89ZNpQ.woff2
diff --git a/frontend/src/resources/css/lib/fonts/montserrat/JTUSjIg1_i6t8kCHKm459WZhyyTh89ZNpQ.woff2 b/frontend/src/pages/app/resources/css/lib/fonts/montserrat/JTUSjIg1_i6t8kCHKm459WZhyyTh89ZNpQ.woff2
similarity index 100%
rename from frontend/src/resources/css/lib/fonts/montserrat/JTUSjIg1_i6t8kCHKm459WZhyyTh89ZNpQ.woff2
rename to frontend/src/pages/app/resources/css/lib/fonts/montserrat/JTUSjIg1_i6t8kCHKm459WZhyyTh89ZNpQ.woff2
diff --git a/frontend/src/resources/css/lib/fonts/montserrat/JTUSjIg1_i6t8kCHKm459WdhyyTh89ZNpQ.woff2 b/frontend/src/pages/app/resources/css/lib/fonts/montserrat/JTUSjIg1_i6t8kCHKm459WdhyyTh89ZNpQ.woff2
similarity index 100%
rename from frontend/src/resources/css/lib/fonts/montserrat/JTUSjIg1_i6t8kCHKm459WdhyyTh89ZNpQ.woff2
rename to frontend/src/pages/app/resources/css/lib/fonts/montserrat/JTUSjIg1_i6t8kCHKm459WdhyyTh89ZNpQ.woff2
diff --git a/frontend/src/resources/css/lib/fonts/montserrat/JTUSjIg1_i6t8kCHKm459WlhyyTh89Y.woff2 b/frontend/src/pages/app/resources/css/lib/fonts/montserrat/JTUSjIg1_i6t8kCHKm459WlhyyTh89Y.woff2
similarity index 100%
rename from frontend/src/resources/css/lib/fonts/montserrat/JTUSjIg1_i6t8kCHKm459WlhyyTh89Y.woff2
rename to frontend/src/pages/app/resources/css/lib/fonts/montserrat/JTUSjIg1_i6t8kCHKm459WlhyyTh89Y.woff2
diff --git a/frontend/src/resources/css/style.scss b/frontend/src/pages/app/resources/css/style.scss
similarity index 100%
rename from frontend/src/resources/css/style.scss
rename to frontend/src/pages/app/resources/css/style.scss
diff --git a/frontend/src/resources/images/default-avatar.png b/frontend/src/pages/app/resources/images/default-avatar.png
similarity index 100%
rename from frontend/src/resources/images/default-avatar.png
rename to frontend/src/pages/app/resources/images/default-avatar.png
diff --git a/frontend/src/resources/images/logo.png b/frontend/src/pages/app/resources/images/logo.png
similarity index 100%
rename from frontend/src/resources/images/logo.png
rename to frontend/src/pages/app/resources/images/logo.png
diff --git a/frontend/src/service-worker/service-worker.ts b/frontend/src/pages/app/service-worker/service-worker.ts
similarity index 100%
rename from frontend/src/service-worker/service-worker.ts
rename to frontend/src/pages/app/service-worker/service-worker.ts
diff --git a/frontend/src/ui/components/Alerts.tsx b/frontend/src/pages/app/ui/components/Alerts.tsx
similarity index 100%
rename from frontend/src/ui/components/Alerts.tsx
rename to frontend/src/pages/app/ui/components/Alerts.tsx
diff --git a/frontend/src/ui/components/Auth.tsx b/frontend/src/pages/app/ui/components/Auth.tsx
similarity index 100%
rename from frontend/src/ui/components/Auth.tsx
rename to frontend/src/pages/app/ui/components/Auth.tsx
diff --git a/frontend/src/ui/components/Electron.tsx b/frontend/src/pages/app/ui/components/Electron.tsx
similarity index 100%
rename from frontend/src/ui/components/Electron.tsx
rename to frontend/src/pages/app/ui/components/Electron.tsx
diff --git a/frontend/src/ui/components/chat/BottomAppBar.tsx b/frontend/src/pages/app/ui/components/chat/BottomAppBar.tsx
similarity index 100%
rename from frontend/src/ui/components/chat/BottomAppBar.tsx
rename to frontend/src/pages/app/ui/components/chat/BottomAppBar.tsx
diff --git a/frontend/src/ui/components/chat/ChatHeader.tsx b/frontend/src/pages/app/ui/components/chat/ChatHeader.tsx
similarity index 100%
rename from frontend/src/ui/components/chat/ChatHeader.tsx
rename to frontend/src/pages/app/ui/components/chat/ChatHeader.tsx
diff --git a/frontend/src/ui/components/chat/ChatInputWrapper.tsx b/frontend/src/pages/app/ui/components/chat/ChatInputWrapper.tsx
similarity index 100%
rename from frontend/src/ui/components/chat/ChatInputWrapper.tsx
rename to frontend/src/pages/app/ui/components/chat/ChatInputWrapper.tsx
diff --git a/frontend/src/ui/components/chat/ChatMainHeader.tsx b/frontend/src/pages/app/ui/components/chat/ChatMainHeader.tsx
similarity index 100%
rename from frontend/src/ui/components/chat/ChatMainHeader.tsx
rename to frontend/src/pages/app/ui/components/chat/ChatMainHeader.tsx
diff --git a/frontend/src/ui/components/chat/ChatMessages.tsx b/frontend/src/pages/app/ui/components/chat/ChatMessages.tsx
similarity index 100%
rename from frontend/src/ui/components/chat/ChatMessages.tsx
rename to frontend/src/pages/app/ui/components/chat/ChatMessages.tsx
diff --git a/frontend/src/ui/components/chat/ChatTabs.tsx b/frontend/src/pages/app/ui/components/chat/ChatTabs.tsx
similarity index 100%
rename from frontend/src/ui/components/chat/ChatTabs.tsx
rename to frontend/src/pages/app/ui/components/chat/ChatTabs.tsx
diff --git a/frontend/src/ui/components/chat/DMUsersList.tsx b/frontend/src/pages/app/ui/components/chat/DMUsersList.tsx
similarity index 100%
rename from frontend/src/ui/components/chat/DMUsersList.tsx
rename to frontend/src/pages/app/ui/components/chat/DMUsersList.tsx
diff --git a/frontend/src/ui/components/chat/LeftPanel.tsx b/frontend/src/pages/app/ui/components/chat/LeftPanel.tsx
similarity index 100%
rename from frontend/src/ui/components/chat/LeftPanel.tsx
rename to frontend/src/pages/app/ui/components/chat/LeftPanel.tsx
diff --git a/frontend/src/ui/components/chat/Message.tsx b/frontend/src/pages/app/ui/components/chat/Message.tsx
similarity index 100%
rename from frontend/src/ui/components/chat/Message.tsx
rename to frontend/src/pages/app/ui/components/chat/Message.tsx
diff --git a/frontend/src/ui/components/chat/MessageContextMenu.tsx b/frontend/src/pages/app/ui/components/chat/MessageContextMenu.tsx
similarity index 100%
rename from frontend/src/ui/components/chat/MessageContextMenu.tsx
rename to frontend/src/pages/app/ui/components/chat/MessageContextMenu.tsx
diff --git a/frontend/src/ui/components/chat/MessagePanelRenderer.tsx b/frontend/src/pages/app/ui/components/chat/MessagePanelRenderer.tsx
similarity index 100%
rename from frontend/src/ui/components/chat/MessagePanelRenderer.tsx
rename to frontend/src/pages/app/ui/components/chat/MessagePanelRenderer.tsx
diff --git a/frontend/src/ui/components/chat/ReplyMessageDialog.tsx b/frontend/src/pages/app/ui/components/chat/ReplyMessageDialog.tsx
similarity index 100%
rename from frontend/src/ui/components/chat/ReplyMessageDialog.tsx
rename to frontend/src/pages/app/ui/components/chat/ReplyMessageDialog.tsx
diff --git a/frontend/src/ui/components/chat/RightPanel.tsx b/frontend/src/pages/app/ui/components/chat/RightPanel.tsx
similarity index 100%
rename from frontend/src/ui/components/chat/RightPanel.tsx
rename to frontend/src/pages/app/ui/components/chat/RightPanel.tsx
diff --git a/frontend/src/ui/components/chat/UserProfileDialog.tsx b/frontend/src/pages/app/ui/components/chat/UserProfileDialog.tsx
similarity index 100%
rename from frontend/src/ui/components/chat/UserProfileDialog.tsx
rename to frontend/src/pages/app/ui/components/chat/UserProfileDialog.tsx
diff --git a/frontend/src/ui/components/core/Dialog.tsx b/frontend/src/pages/app/ui/components/core/Dialog.tsx
similarity index 100%
rename from frontend/src/ui/components/core/Dialog.tsx
rename to frontend/src/pages/app/ui/components/core/Dialog.tsx
diff --git a/frontend/src/ui/components/core/Quote.tsx b/frontend/src/pages/app/ui/components/core/Quote.tsx
similarity index 100%
rename from frontend/src/ui/components/core/Quote.tsx
rename to frontend/src/pages/app/ui/components/core/Quote.tsx
diff --git a/frontend/src/ui/components/core/RichTextArea.tsx b/frontend/src/pages/app/ui/components/core/RichTextArea.tsx
similarity index 100%
rename from frontend/src/ui/components/core/RichTextArea.tsx
rename to frontend/src/pages/app/ui/components/core/RichTextArea.tsx
diff --git a/frontend/src/ui/components/core/TextField.tsx b/frontend/src/pages/app/ui/components/core/TextField.tsx
similarity index 100%
rename from frontend/src/ui/components/core/TextField.tsx
rename to frontend/src/pages/app/ui/components/core/TextField.tsx
diff --git a/frontend/src/ui/components/core/animations/AnimatedHeight.tsx b/frontend/src/pages/app/ui/components/core/animations/AnimatedHeight.tsx
similarity index 100%
rename from frontend/src/ui/components/core/animations/AnimatedHeight.tsx
rename to frontend/src/pages/app/ui/components/core/animations/AnimatedHeight.tsx
diff --git a/frontend/src/ui/components/core/animations/AnimatedOpacity.tsx b/frontend/src/pages/app/ui/components/core/animations/AnimatedOpacity.tsx
similarity index 100%
rename from frontend/src/ui/components/core/animations/AnimatedOpacity.tsx
rename to frontend/src/pages/app/ui/components/core/animations/AnimatedOpacity.tsx
diff --git a/frontend/src/ui/components/core/animations/types.d.ts b/frontend/src/pages/app/ui/components/core/animations/types.d.ts
similarity index 100%
rename from frontend/src/ui/components/core/animations/types.d.ts
rename to frontend/src/pages/app/ui/components/core/animations/types.d.ts
diff --git a/frontend/src/ui/components/profile/CropperDialog.tsx b/frontend/src/pages/app/ui/components/profile/CropperDialog.tsx
similarity index 100%
rename from frontend/src/ui/components/profile/CropperDialog.tsx
rename to frontend/src/pages/app/ui/components/profile/CropperDialog.tsx
diff --git a/frontend/src/ui/components/profile/ImageCropper.tsx b/frontend/src/pages/app/ui/components/profile/ImageCropper.tsx
similarity index 100%
rename from frontend/src/ui/components/profile/ImageCropper.tsx
rename to frontend/src/pages/app/ui/components/profile/ImageCropper.tsx
diff --git a/frontend/src/ui/components/profile/ProfileDialog.tsx b/frontend/src/pages/app/ui/components/profile/ProfileDialog.tsx
similarity index 100%
rename from frontend/src/ui/components/profile/ProfileDialog.tsx
rename to frontend/src/pages/app/ui/components/profile/ProfileDialog.tsx
diff --git a/frontend/src/ui/components/settings/SettingsDialog.tsx b/frontend/src/pages/app/ui/components/settings/SettingsDialog.tsx
similarity index 100%
rename from frontend/src/ui/components/settings/SettingsDialog.tsx
rename to frontend/src/pages/app/ui/components/settings/SettingsDialog.tsx
diff --git a/frontend/src/ui/hooks/useChat.ts b/frontend/src/pages/app/ui/hooks/useChat.ts
similarity index 100%
rename from frontend/src/ui/hooks/useChat.ts
rename to frontend/src/pages/app/ui/hooks/useChat.ts
diff --git a/frontend/src/ui/hooks/useCombinedRefs.ts b/frontend/src/pages/app/ui/hooks/useCombinedRefs.ts
similarity index 100%
rename from frontend/src/ui/hooks/useCombinedRefs.ts
rename to frontend/src/pages/app/ui/hooks/useCombinedRefs.ts
diff --git a/frontend/src/ui/hooks/useDM.ts b/frontend/src/pages/app/ui/hooks/useDM.ts
similarity index 100%
rename from frontend/src/ui/hooks/useDM.ts
rename to frontend/src/pages/app/ui/hooks/useDM.ts
diff --git a/frontend/src/ui/hooks/useProfile.ts b/frontend/src/pages/app/ui/hooks/useProfile.ts
similarity index 100%
rename from frontend/src/ui/hooks/useProfile.ts
rename to frontend/src/pages/app/ui/hooks/useProfile.ts
diff --git a/frontend/src/ui/hooks/useWindowSize.ts b/frontend/src/pages/app/ui/hooks/useWindowSize.ts
similarity index 100%
rename from frontend/src/ui/hooks/useWindowSize.ts
rename to frontend/src/pages/app/ui/hooks/useWindowSize.ts
diff --git a/frontend/src/ui/panels/DMPanel.ts b/frontend/src/pages/app/ui/panels/DMPanel.ts
similarity index 100%
rename from frontend/src/ui/panels/DMPanel.ts
rename to frontend/src/pages/app/ui/panels/DMPanel.ts
diff --git a/frontend/src/ui/panels/MessagePanel.ts b/frontend/src/pages/app/ui/panels/MessagePanel.ts
similarity index 100%
rename from frontend/src/ui/panels/MessagePanel.ts
rename to frontend/src/pages/app/ui/panels/MessagePanel.ts
diff --git a/frontend/src/ui/panels/PublicChatPanel.ts b/frontend/src/pages/app/ui/panels/PublicChatPanel.ts
similarity index 100%
rename from frontend/src/ui/panels/PublicChatPanel.ts
rename to frontend/src/pages/app/ui/panels/PublicChatPanel.ts
diff --git a/frontend/src/ui/screen/ChatScreen.tsx b/frontend/src/pages/app/ui/screen/ChatScreen.tsx
similarity index 100%
rename from frontend/src/ui/screen/ChatScreen.tsx
rename to frontend/src/pages/app/ui/screen/ChatScreen.tsx
diff --git a/frontend/src/ui/screen/DownloadAppScreen.tsx b/frontend/src/pages/app/ui/screen/DownloadAppScreen.tsx
similarity index 100%
rename from frontend/src/ui/screen/DownloadAppScreen.tsx
rename to frontend/src/pages/app/ui/screen/DownloadAppScreen.tsx
diff --git a/frontend/src/ui/screen/LoginScreen.tsx b/frontend/src/pages/app/ui/screen/LoginScreen.tsx
similarity index 100%
rename from frontend/src/ui/screen/LoginScreen.tsx
rename to frontend/src/pages/app/ui/screen/LoginScreen.tsx
diff --git a/frontend/src/ui/screen/RegisterScreen.tsx b/frontend/src/pages/app/ui/screen/RegisterScreen.tsx
similarity index 100%
rename from frontend/src/ui/screen/RegisterScreen.tsx
rename to frontend/src/pages/app/ui/screen/RegisterScreen.tsx
diff --git a/frontend/src/ui/state.ts b/frontend/src/pages/app/ui/state.ts
similarity index 100%
rename from frontend/src/ui/state.ts
rename to frontend/src/pages/app/ui/state.ts
diff --git a/frontend/src/utils/crypto/asymmetric.ts b/frontend/src/pages/app/utils/crypto/asymmetric.ts
similarity index 93%
rename from frontend/src/utils/crypto/asymmetric.ts
rename to frontend/src/pages/app/utils/crypto/asymmetric.ts
index 09b8dfa..72bf39f 100644
--- a/frontend/src/utils/crypto/asymmetric.ts
+++ b/frontend/src/pages/app/utils/crypto/asymmetric.ts
@@ -1,5 +1,5 @@
 import nacl from "tweetnacl";
-import { hkdfExtractAndExpand } from "../crypto/kdf";
+import { hkdfExtractAndExpand } from "./kdf";
 
 export interface X25519KeyPair {
 	publicKey: Uint8Array;
diff --git a/frontend/src/utils/crypto/backup.ts b/frontend/src/pages/app/utils/crypto/backup.ts
similarity index 100%
rename from frontend/src/utils/crypto/backup.ts
rename to frontend/src/pages/app/utils/crypto/backup.ts
diff --git a/frontend/src/utils/crypto/kdf.ts b/frontend/src/pages/app/utils/crypto/kdf.ts
similarity index 100%
rename from frontend/src/utils/crypto/kdf.ts
rename to frontend/src/pages/app/utils/crypto/kdf.ts
diff --git a/frontend/src/utils/crypto/symmetric.ts b/frontend/src/pages/app/utils/crypto/symmetric.ts
similarity index 100%
rename from frontend/src/utils/crypto/symmetric.ts
rename to frontend/src/pages/app/utils/crypto/symmetric.ts
diff --git a/frontend/src/utils/material.ts b/frontend/src/pages/app/utils/material.ts
similarity index 100%
rename from frontend/src/utils/material.ts
rename to frontend/src/pages/app/utils/material.ts
diff --git a/frontend/src/utils/notification.ts b/frontend/src/pages/app/utils/notification.ts
similarity index 100%
rename from frontend/src/utils/notification.ts
rename to frontend/src/pages/app/utils/notification.ts
diff --git a/frontend/src/utils/push-notifications.ts b/frontend/src/pages/app/utils/push-notifications.ts
similarity index 100%
rename from frontend/src/utils/push-notifications.ts
rename to frontend/src/pages/app/utils/push-notifications.ts
diff --git a/frontend/src/utils/utils.ts b/frontend/src/pages/app/utils/utils.ts
similarity index 100%
rename from frontend/src/utils/utils.ts
rename to frontend/src/pages/app/utils/utils.ts