Change the structure

frontend/src/pages/chat/ui/left/UnifiedChatsList.tsx

@@ -2,8 +2,7 @@ import { useState, useEffect, useCallback, useMemo } from "react";
 import { useUserStore } from "@/state/user";
 import { useChatStore } from "@/state/chat";
 import { useDM, type DMUser } from "@/pages/chat/hooks/useDM";
-import { fetchMessages } from "@/core/api/messaging";
-import { fetchUserPublicKey } from "@/core/api/dm";
+import api from "@/core/api";
 import { StatusBadge } from "@/core/components/StatusBadge";
 import type { Message } from "@/core/types";
 import { websocket } from "@/core/websocket";
@@ -52,7 +51,7 @@ export function UnifiedChatsList() {
         if (!user.authToken) return;
 
         try {
-            const messages = await fetchMessages(user.authToken, 1);
+            const { messages } = await api.chats.general.fetchMessages(user.authToken, 1);
             if (messages?.length > 0) {
                 const lastMessage = messages[messages.length - 1];
                 setLastMessages({ general: lastMessage });
@@ -160,7 +159,7 @@ export function UnifiedChatsList() {
             const authToken = useUserStore.getState().user.authToken;
             if (!authToken) return;
 
-            const publicKey = await fetchUserPublicKey(dmConversation.id, authToken);
+            const publicKey = await api.chats.dm.fetchUserPublicKey(dmConversation.id, authToken);
             if (!publicKey) {
                 console.error("Failed to get public key for user:", dmConversation.id);
                 return;

frontend/src/pages/chat/ui/left/UsernameSearch.tsx

@@ -1,7 +1,7 @@
 import { useState, useEffect, useRef } from "react";
 import { useUserStore } from "@/state/user";
 import { useChatStore } from "@/state/chat";
-import { searchUsers, fetchUserPublicKey } from "@/core/api/dm";
+import api from "@/core/api";
 import { StatusBadge } from "@/core/components/StatusBadge";
 import type { User } from "@/core/types";
 import { onlineStatusManager } from "@/core/onlineStatusManager";
@@ -45,7 +45,7 @@ export function UsernameSearch({ containerRef, headerRef, bottomAppBarRef }: Use
             const newTimeout = setTimeout(async () => {
                 if (user.authToken) {
                     try {
-                        const users = await searchUsers(searchQuery, user.authToken);
+                        const users = await api.user.search.searchUsers(searchQuery, user.authToken);
                         setSearchResults(users);
                     } catch (error) {
                         console.error("Search failed:", error);
@@ -118,7 +118,7 @@ export function UsernameSearch({ containerRef, headerRef, bottomAppBarRef }: Use
 
             let publicKey = searchUser.publicKey;
             if (!publicKey) {
-                const fetchedPublicKey = await fetchUserPublicKey(searchUser.id, user.authToken);
+                const fetchedPublicKey = await api.chats.dm.fetchUserPublicKey(searchUser.id, user.authToken);
                 publicKey = fetchedPublicKey;
             }
 

frontend/src/pages/chat/ui/left/settings/AccountPanel.tsx

@@ -1,6 +1,6 @@
 import { MaterialList, MaterialListItem } from "@/utils/material";
 import { useUserStore } from "@/state/user";
-import { deleteAccount } from "@/core/api/account";
+import api from "@/core/api";
 import { confirm } from "mdui/functions/confirm";
 import styles from "@/pages/chat/css/settings-dialog.module.scss";
 
@@ -23,7 +23,7 @@ export function AccountPanel({ onClose }: AccountPanelProps) {
                 cancelText: "Cancel"
             });
 
-            await deleteAccount(authToken);
+            await api.user.auth.deleteAccount(authToken);
             logout();
             onClose();
         } catch (error) {

frontend/src/pages/chat/ui/left/settings/ChangePasswordDialog.tsx

@@ -2,7 +2,7 @@ import { useState } from "react";
 import { StyledDialog } from "@/core/components/StyledDialog";
 import type { DialogProps } from "@/core/types";
 import { useUserStore } from "@/state/user";
-import { changePassword } from "@/core/api/account";
+import api from "@/core/api";
 import { MaterialButton, MaterialIconButton, MaterialSwitch, MaterialTextField } from "@/utils/material";
 import styles from "@/pages/chat/css/changePasswordDialog.module.scss";
 
@@ -29,7 +29,7 @@ export default function ChangePasswordDialog({ isOpen, onOpenChange }: DialogPro
                         if (!current || !next || next !== confirm) return;
                         setBusy(true);
                         try {
-                            await changePassword(user.authToken, user.currentUser?.username, current, next, logoutAll);
+                            await api.user.auth.changePassword(user.authToken, user.currentUser?.username, current, next, logoutAll);
                             setCurrent("");
                             setNext("");
                             setConfirm("");

frontend/src/pages/chat/ui/left/settings/DevicesPanel.tsx

@@ -2,7 +2,8 @@ import { useState, useEffect } from "react";
 import { useImmer } from "use-immer";
 import { MaterialList, MaterialListItem, MaterialButton, MaterialCircularProgress } from "@/utils/material";
 import { useUserStore } from "@/state/user";
-import { listDevices, revokeDevice, logoutAllOtherDevices, type DeviceInfo } from "@/core/api/account/devices";
+import api from "@/core/api";
+import type { DeviceInfo } from "@/core/api/user/devices";
 import { confirm } from "mdui/functions/confirm";
 import styles from "@/pages/chat/css/settings-dialog.module.scss";
 
@@ -24,7 +25,7 @@ export function DevicesPanel() {
         
         setDevicesLoading(true);
         try {
-            const deviceList = await listDevices(authToken);
+            const deviceList = await api.user.devices.list(authToken);
             updateDevices(deviceList);
         } catch (error) {
             console.error("Failed to load devices:", error);
@@ -48,7 +49,7 @@ export function DevicesPanel() {
                 draft.add(sessionId);
             });
 
-            await revokeDevice(authToken, sessionId);
+            await api.user.devices.revoke(authToken, sessionId);
             await loadDevices();
         } catch (error) {
             if (error !== "cancelled") {
@@ -72,7 +73,7 @@ export function DevicesPanel() {
                 cancelText: "Cancel"
             });
 
-            await logoutAllOtherDevices(authToken);
+            await api.user.devices.revokeAll(authToken);
             await loadDevices();
         } catch (error) {
             if (error !== "cancelled") {

frontend/src/pages/chat/ui/left/settings/NotificationsPanel.tsx

@@ -3,7 +3,7 @@ import { MaterialList, MaterialListItem, MaterialSwitch, type MDUISwitch } from
 import { useUserStore } from "@/state/user";
 import { initialize, subscribe, unsubscribe, isSupported } from "@/core/push-notifications/push-notifications";
 import { isElectron } from "@/core/electron/electron";
-import { unsubscribeFromPush } from "@/core/api/push";
+import api from "@/core/api";
 import styles from "@/pages/chat/css/settings-dialog.module.scss";
 
 export function NotificationsPanel() {
@@ -73,7 +73,7 @@ export function NotificationsPanel() {
                 }
 
                 // Then unsubscribe from server
-                await unsubscribeFromPush(authToken);
+                await api.push.subscription.unsubscribe(authToken);
 
                 // After unsubscribing, permission is still granted but we're not subscribed
                 // So we keep the state as disabled (false)