From 48e347ea5e88686bbf34261afef59204f10b2ea8 Mon Sep 17 00:00:00 2001
From: gray <gray.wen@outlook.com>
Date: Tue, 10 Dec 2024 17:23:33 +0800
Subject: [PATCH] optimize structure

---
 .../components/Chat/MemoizedChatMessage.tsx   |  9 ---
 src/FE/components/Search/index.ts             |  1 -
 src/FE/components/Spinner/index.ts            |  1 -
 src/FE/pages/_app.tsx                         |  5 +-
 .../_components/ChangeModel}/ChangeModel.tsx  |  7 +--
 .../_components/ChatError}/ChatError.tsx      |  1 -
 .../_components}/ChatIcon/ChatIcon.tsx        |  5 +-
 .../ChatMessage/ChangeModelAction.tsx         |  4 +-
 .../_components}/ChatMessage/ChatMessage.tsx  | 25 +++++---
 .../_components}/ChatMessage/CopyAction.tsx   |  2 +-
 .../_components}/ChatMessage/EditAction.tsx   |  3 +-
 .../ChatMessage/GenerateInformationAction.tsx | 33 ++++++----
 .../ChatMessage/PaginationAction.tsx          |  0
 .../ChatMessage/RegenerateAction.tsx          |  2 +-
 .../ChatMessage/ResponseMessage.tsx           | 18 ++----
 .../ChatMessage/ResponseMessageActions.tsx    | 18 ++----
 .../_components}/ChatMessage/UserMessage.tsx  | 15 ++---
 .../_components}/ChatMessage/index.ts         |  0
 .../_components}/Markdown/CodeBlock.tsx       |  0
 .../Markdown/MemoizedReactMarkdown.tsx        |  0
 .../_components}/Search/Search.tsx            |  2 +-
 .../_components}/Tips/Tips.tsx                |  0
 .../_components}/Files/FileServiceModal.tsx   |  0
 .../GlobalConfigs/GlobalConfigsModal.tsx      |  0
 .../InvitationCode/InvitationCodeModal.tsx    |  0
 .../LoginService/LoginServiceModal.tsx        |  0
 .../_components}/Messages/ChatMessage.tsx     | 63 ++++++++-----------
 .../ModelKeys/ConfigModelModal.tsx            |  4 +-
 .../_components}/ModelKeys/ModelKeysModal.tsx |  9 +--
 .../_components}/Models/AddModelModal.tsx     |  0
 .../_components}/Models/EditModelModal.tsx    |  0
 .../admin/_components}/Nav/Nav.tsx            |  0
 .../_components}/Pagiation/Pagiation.tsx      |  0
 .../PayService/PayServiceModal.tsx            |  0
 .../RequestLogs/RequestLogDetailsModal.tsx    |  0
 .../Users/EditUserBalanceModel.tsx            |  0
 .../_components}/Users/EditUserModelModal.tsx |  0
 .../Users/UserInitialConfigModal.tsx          |  0
 .../admin/_components}/Users/UserModal.tsx    |  0
 src/FE/pages/admin/file-service/index.tsx     |  2 +-
 src/FE/pages/admin/global-configs/index.tsx   |  2 +-
 src/FE/pages/admin/invitation-code/index.tsx  |  2 +-
 src/FE/pages/admin/layout/index.tsx           |  2 +-
 src/FE/pages/admin/login-service/index.tsx    |  2 +-
 src/FE/pages/admin/messages/index.tsx         |  2 +-
 src/FE/pages/admin/model-keys/index.tsx       |  4 +-
 src/FE/pages/admin/models/index.tsx           |  4 +-
 src/FE/pages/admin/pay-service/index.tsx      |  2 +-
 src/FE/pages/admin/request-logs/index.tsx     |  4 +-
 src/FE/pages/admin/user-config/index.tsx      |  2 +-
 src/FE/pages/admin/users/index.tsx            |  8 +--
 .../home/_components}/Button/CopyButton.tsx   |  0
 .../Button/SidebarActionButton.tsx            |  0
 .../home/_components}/Button/UploadButton.tsx |  2 +-
 .../home/_components}/Chat/AccountBalance.tsx |  2 +-
 .../home/_components}/Chat/Chat.tsx           | 12 +++-
 .../_components}/Chat/ChatButtonTooltip.tsx   |  0
 .../home/_components}/Chat/ChatInput.tsx      |  8 +--
 .../home/_components}/Chat/ChatLoader.tsx     |  0
 .../_components}/Chat/EnableNetworkSearch.tsx |  0
 .../_components/Chat/MemoizedChatMessage.tsx  | 10 +++
 .../home/_components}/Chat/ModelSelect.tsx    |  4 +-
 .../home/_components}/Chat/NoModel.tsx        |  2 +-
 .../home/_components}/Chat/PromptList.tsx     |  0
 .../_components}/Chat/SharedMessageModal.tsx  |  0
 .../home/_components}/Chat/SystemPrompt.tsx   |  0
 .../home/_components}/Chat/Temperature.tsx    |  2 +-
 .../home/_components}/Chat/VariableModal.tsx  |  0
 .../ChatSettings/ChatSettings.tsx             |  0
 .../ChatSettings/ChatSettingsBar.tsx          |  4 +-
 .../ChatSettings/SliderSetting.tsx            |  0
 .../_components}/Chatbar/Chatbar.context.tsx  |  0
 .../_components}/Chatbar/Chatbar.state.tsx    |  0
 .../home/_components}/Chatbar/Chatbar.tsx     |  4 +-
 .../_components}/Chatbar/ChatbarSettings.tsx  | 10 +--
 .../Chatbar/ClearConversations.tsx            |  2 +-
 .../_components}/Chatbar/Conversation.tsx     | 10 +--
 .../_components}/Chatbar/Conversations.tsx    |  2 +-
 .../_components}/HomeContent/HomeContent.tsx  | 15 +++--
 .../Modal/ChangePasswordModal.tsx             |  0
 .../_components}/Modal/UserBalanceModal.tsx   |  0
 .../_components}/ModeToggle/ModeTooggle.tsx   |  0
 .../PageNotFound/PageNotFound.tsx             |  0
 .../_components}/PasteUpload/PasteUpload.tsx  |  0
 .../_components}/Popover/DateTimePopover.tsx  |  0
 .../_components}/Popover/DeletePopover.tsx    |  0
 .../Promptbar/PromptBar.context.tsx           |  0
 .../Promptbar/Promptbar.state.tsx             |  0
 .../home/_components}/Promptbar/Promptbar.tsx |  4 +-
 .../Promptbar/components/Prompt.tsx           |  2 +-
 .../Promptbar/components/PromptModal.tsx      |  6 +-
 .../components/PromptbarSettings.tsx          |  0
 .../Promptbar/components/Prompts.tsx          |  0
 .../home/_components}/Promptbar/index.ts      |  0
 .../Settings/ApiKeyTabContent.tsx             |  6 +-
 .../_components}/Settings/SettingModal.tsx    |  0
 .../_components}/Sidebar/OpenCloseButton.tsx  |  0
 .../home/_components}/Sidebar/Sidebar.tsx     |  4 +-
 .../_components}/Sidebar/SidebarButton.tsx    |  0
 .../home/_components}/Sidebar/index.ts        |  0
 .../home/_components}/Spinner/Spinner.tsx     |  0
 .../home/_contents}/Home.context.ts           |  0
 src/FE/pages/home/index.tsx                   |  2 +-
 .../login/_components}/AccountLoginCard.tsx   |  0
 .../login/_components}/KeyCloakLogin.tsx      |  0
 .../login/_components}/PhoneLoginCard.tsx     |  0
 .../login/_components}/PhoneRegisterCard.tsx  |  0
 .../login/_components}/WeChatLogin.tsx        |  0
 .../login/_components}/WeChatLoginModal.tsx   |  2 +-
 src/FE/pages/login/_components/index.ts       | 13 ++++
 src/FE/pages/login/index.tsx                  | 13 ++--
 src/FE/pages/message/[id].tsx                 |  3 +-
 src/FE/pages/share/[id].tsx                   | 12 ++--
 .../Theme => providers}/ThemeProvider.tsx     |  0
 114 files changed, 208 insertions(+), 211 deletions(-)
 delete mode 100644 src/FE/components/Chat/MemoizedChatMessage.tsx
 delete mode 100644 src/FE/components/Search/index.ts
 delete mode 100644 src/FE/components/Spinner/index.ts
 rename src/FE/{components/Chat => pages/_components/ChangeModel}/ChangeModel.tsx (94%)
 rename src/FE/{components/Chat => pages/_components/ChatError}/ChatError.tsx (94%)
 rename src/FE/{components => pages/_components}/ChatIcon/ChatIcon.tsx (99%)
 rename src/FE/{components/Chat => pages/_components}/ChatMessage/ChangeModelAction.tsx (86%)
 rename src/FE/{components/Chat => pages/_components}/ChatMessage/ChatMessage.tsx (85%)
 rename src/FE/{components/Chat => pages/_components}/ChatMessage/CopyAction.tsx (96%)
 rename src/FE/{components/Chat => pages/_components}/ChatMessage/EditAction.tsx (93%)
 rename src/FE/{components/Chat => pages/_components}/ChatMessage/GenerateInformationAction.tsx (78%)
 rename src/FE/{components/Chat => pages/_components}/ChatMessage/PaginationAction.tsx (100%)
 rename src/FE/{components/Chat => pages/_components}/ChatMessage/RegenerateAction.tsx (94%)
 rename src/FE/{components/Chat => pages/_components}/ChatMessage/ResponseMessage.tsx (87%)
 rename src/FE/{components/Chat => pages/_components}/ChatMessage/ResponseMessageActions.tsx (91%)
 rename src/FE/{components/Chat => pages/_components}/ChatMessage/UserMessage.tsx (95%)
 rename src/FE/{components/Chat => pages/_components}/ChatMessage/index.ts (100%)
 rename src/FE/{components => pages/_components}/Markdown/CodeBlock.tsx (100%)
 rename src/FE/{components => pages/_components}/Markdown/MemoizedReactMarkdown.tsx (100%)
 rename src/FE/{components => pages/_components}/Search/Search.tsx (96%)
 rename src/FE/{components => pages/_components}/Tips/Tips.tsx (100%)
 rename src/FE/{components/Admin => pages/admin/_components}/Files/FileServiceModal.tsx (100%)
 rename src/FE/{components/Admin => pages/admin/_components}/GlobalConfigs/GlobalConfigsModal.tsx (100%)
 rename src/FE/{components/Admin => pages/admin/_components}/InvitationCode/InvitationCodeModal.tsx (100%)
 rename src/FE/{components/Admin => pages/admin/_components}/LoginService/LoginServiceModal.tsx (100%)
 rename src/FE/{components/Admin => pages/admin/_components}/Messages/ChatMessage.tsx (85%)
 rename src/FE/{components/Admin => pages/admin/_components}/ModelKeys/ConfigModelModal.tsx (98%)
 rename src/FE/{components/Admin => pages/admin/_components}/ModelKeys/ModelKeysModal.tsx (96%)
 rename src/FE/{components/Admin => pages/admin/_components}/Models/AddModelModal.tsx (100%)
 rename src/FE/{components/Admin => pages/admin/_components}/Models/EditModelModal.tsx (100%)
 rename src/FE/{components/Admin => pages/admin/_components}/Nav/Nav.tsx (100%)
 rename src/FE/{components/Admin => pages/admin/_components}/Pagiation/Pagiation.tsx (100%)
 rename src/FE/{components/Admin => pages/admin/_components}/PayService/PayServiceModal.tsx (100%)
 rename src/FE/{components/Admin => pages/admin/_components}/RequestLogs/RequestLogDetailsModal.tsx (100%)
 rename src/FE/{components/Admin => pages/admin/_components}/Users/EditUserBalanceModel.tsx (100%)
 rename src/FE/{components/Admin => pages/admin/_components}/Users/EditUserModelModal.tsx (100%)
 rename src/FE/{components/Admin => pages/admin/_components}/Users/UserInitialConfigModal.tsx (100%)
 rename src/FE/{components/Admin => pages/admin/_components}/Users/UserModal.tsx (100%)
 rename src/FE/{components => pages/home/_components}/Button/CopyButton.tsx (100%)
 rename src/FE/{components => pages/home/_components}/Button/SidebarActionButton.tsx (100%)
 rename src/FE/{components => pages/home/_components}/Button/UploadButton.tsx (96%)
 rename src/FE/{components => pages/home/_components}/Chat/AccountBalance.tsx (92%)
 rename src/FE/{components => pages/home/_components}/Chat/Chat.tsx (97%)
 rename src/FE/{components => pages/home/_components}/Chat/ChatButtonTooltip.tsx (100%)
 rename src/FE/{components => pages/home/_components}/Chat/ChatInput.tsx (97%)
 rename src/FE/{components => pages/home/_components}/Chat/ChatLoader.tsx (100%)
 rename src/FE/{components => pages/home/_components}/Chat/EnableNetworkSearch.tsx (100%)
 create mode 100644 src/FE/pages/home/_components/Chat/MemoizedChatMessage.tsx
 rename src/FE/{components => pages/home/_components}/Chat/ModelSelect.tsx (97%)
 rename src/FE/{components => pages/home/_components}/Chat/NoModel.tsx (91%)
 rename src/FE/{components => pages/home/_components}/Chat/PromptList.tsx (100%)
 rename src/FE/{components => pages/home/_components}/Chat/SharedMessageModal.tsx (100%)
 rename src/FE/{components => pages/home/_components}/Chat/SystemPrompt.tsx (100%)
 rename src/FE/{components => pages/home/_components}/Chat/Temperature.tsx (97%)
 rename src/FE/{components => pages/home/_components}/Chat/VariableModal.tsx (100%)
 rename src/FE/{components => pages/home/_components}/ChatSettings/ChatSettings.tsx (100%)
 rename src/FE/{components => pages/home/_components}/ChatSettings/ChatSettingsBar.tsx (92%)
 rename src/FE/{components => pages/home/_components}/ChatSettings/SliderSetting.tsx (100%)
 rename src/FE/{components => pages/home/_components}/Chatbar/Chatbar.context.tsx (100%)
 rename src/FE/{components => pages/home/_components}/Chatbar/Chatbar.state.tsx (100%)
 rename src/FE/{components => pages/home/_components}/Chatbar/Chatbar.tsx (95%)
 rename src/FE/{components => pages/home/_components}/Chatbar/ChatbarSettings.tsx (91%)
 rename src/FE/{components => pages/home/_components}/Chatbar/ClearConversations.tsx (94%)
 rename src/FE/{components => pages/home/_components}/Chatbar/Conversation.tsx (94%)
 rename src/FE/{components => pages/home/_components}/Chatbar/Conversations.tsx (94%)
 rename src/FE/{components => pages/home/_components}/HomeContent/HomeContent.tsx (96%)
 rename src/FE/{components => pages/home/_components}/Modal/ChangePasswordModal.tsx (100%)
 rename src/FE/{components => pages/home/_components}/Modal/UserBalanceModal.tsx (100%)
 rename src/FE/{components => pages/home/_components}/ModeToggle/ModeTooggle.tsx (100%)
 rename src/FE/{components => pages/home/_components}/PageNotFound/PageNotFound.tsx (100%)
 rename src/FE/{components => pages/home/_components}/PasteUpload/PasteUpload.tsx (100%)
 rename src/FE/{components => pages/home/_components}/Popover/DateTimePopover.tsx (100%)
 rename src/FE/{components => pages/home/_components}/Popover/DeletePopover.tsx (100%)
 rename src/FE/{components => pages/home/_components}/Promptbar/PromptBar.context.tsx (100%)
 rename src/FE/{components => pages/home/_components}/Promptbar/Promptbar.state.tsx (100%)
 rename src/FE/{components => pages/home/_components}/Promptbar/Promptbar.tsx (96%)
 rename src/FE/{components => pages/home/_components}/Promptbar/components/Prompt.tsx (97%)
 rename src/FE/{components => pages/home/_components}/Promptbar/components/PromptModal.tsx (97%)
 rename src/FE/{components => pages/home/_components}/Promptbar/components/PromptbarSettings.tsx (100%)
 rename src/FE/{components => pages/home/_components}/Promptbar/components/Prompts.tsx (100%)
 rename src/FE/{components => pages/home/_components}/Promptbar/index.ts (100%)
 rename src/FE/{components => pages/home/_components}/Settings/ApiKeyTabContent.tsx (95%)
 rename src/FE/{components => pages/home/_components}/Settings/SettingModal.tsx (100%)
 rename src/FE/{components => pages/home/_components}/Sidebar/OpenCloseButton.tsx (100%)
 rename src/FE/{components => pages/home/_components}/Sidebar/Sidebar.tsx (97%)
 rename src/FE/{components => pages/home/_components}/Sidebar/SidebarButton.tsx (100%)
 rename src/FE/{components => pages/home/_components}/Sidebar/index.ts (100%)
 rename src/FE/{components => pages/home/_components}/Spinner/Spinner.tsx (100%)
 rename src/FE/{contexts => pages/home/_contents}/Home.context.ts (100%)
 rename src/FE/{components/Login => pages/login/_components}/AccountLoginCard.tsx (100%)
 rename src/FE/{components/Login => pages/login/_components}/KeyCloakLogin.tsx (100%)
 rename src/FE/{components/Login => pages/login/_components}/PhoneLoginCard.tsx (100%)
 rename src/FE/{components/Login => pages/login/_components}/PhoneRegisterCard.tsx (100%)
 rename src/FE/{components/Login => pages/login/_components}/WeChatLogin.tsx (100%)
 rename src/FE/{components/Login => pages/login/_components}/WeChatLoginModal.tsx (95%)
 create mode 100644 src/FE/pages/login/_components/index.ts
 rename src/FE/{components/Theme => providers}/ThemeProvider.tsx (100%)

diff --git a/src/FE/components/Chat/MemoizedChatMessage.tsx b/src/FE/components/Chat/MemoizedChatMessage.tsx
deleted file mode 100644
index 8a95fd75..00000000
--- a/src/FE/components/Chat/MemoizedChatMessage.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-import { FC, memo } from 'react';
-
-import { ChatMessage, Props } from './ChatMessage';
-
-export const MemoizedChatMessage: FC<Props> = memo(
-  ChatMessage,
-  (prevProps, nextProps) =>
-    prevProps.message.content === nextProps.message.content,
-);
diff --git a/src/FE/components/Search/index.ts b/src/FE/components/Search/index.ts
deleted file mode 100644
index 85bb434b..00000000
--- a/src/FE/components/Search/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './Search';
diff --git a/src/FE/components/Spinner/index.ts b/src/FE/components/Spinner/index.ts
deleted file mode 100644
index f90663a5..00000000
--- a/src/FE/components/Spinner/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './Spinner';
diff --git a/src/FE/pages/_app.tsx b/src/FE/pages/_app.tsx
index 8c25e65d..04203d68 100644
--- a/src/FE/pages/_app.tsx
+++ b/src/FE/pages/_app.tsx
@@ -9,12 +9,11 @@ import { getUserInfo } from '@/utils/user';
 
 import { UserRole } from '@/types/adminApis';
 
-import { ThemeProvider } from '@/components/Theme/ThemeProvider';
-
 import ErrorPage from './_error';
 import AdminLayout from './admin/layout';
 import './globals.css';
 
+import { ThemeProvider } from '@/providers/ThemeProvider';
 import 'katex/dist/katex.min.css';
 
 function App({ Component, pageProps }: AppProps<{}> | any) {
@@ -25,7 +24,7 @@ function App({ Component, pageProps }: AppProps<{}> | any) {
 
   useEffect(() => {
     setIsClient(true);
-    document.title = "Chats";
+    document.title = 'Chats';
   }, []);
 
   const isAdmin = () => {
diff --git a/src/FE/components/Chat/ChangeModel.tsx b/src/FE/pages/_components/ChangeModel/ChangeModel.tsx
similarity index 94%
rename from src/FE/components/Chat/ChangeModel.tsx
rename to src/FE/pages/_components/ChangeModel/ChangeModel.tsx
index 1e142c7e..71022853 100644
--- a/src/FE/components/Chat/ChangeModel.tsx
+++ b/src/FE/pages/_components/ChangeModel/ChangeModel.tsx
@@ -5,10 +5,9 @@ import useTranslation from '@/hooks/useTranslation';
 import { AdminModelDto } from '@/types/adminApis';
 import { feModelProviders } from '@/types/model';
 
-import ChatIcon from '@/components/ChatIcon/ChatIcon';
+import ChatIcon from '@/pages/_components/ChatIcon/ChatIcon';
 import { IconChevronDown } from '@/components/Icons';
-import Search from '@/components/Search';
-import { Button } from '@/components/ui/button';
+import Search from '@/pages/_components/Search/Search';
 import {
   DropdownMenu,
   DropdownMenuContent,
@@ -21,7 +20,7 @@ import {
   DropdownMenuTrigger,
 } from '@/components/ui/dropdown-menu';
 
-import { HomeContext } from '@/contexts/Home.context';
+import { HomeContext } from '@/pages/home/_contents/Home.context';
 import { cn } from '@/lib/utils';
 
 const ChangeModel = ({
diff --git a/src/FE/components/Chat/ChatError.tsx b/src/FE/pages/_components/ChatError/ChatError.tsx
similarity index 94%
rename from src/FE/components/Chat/ChatError.tsx
rename to src/FE/pages/_components/ChatError/ChatError.tsx
index d6f42778..0bde22cf 100644
--- a/src/FE/components/Chat/ChatError.tsx
+++ b/src/FE/pages/_components/ChatError/ChatError.tsx
@@ -1,6 +1,5 @@
 import useTranslation from '@/hooks/useTranslation';
 
-import { IconError } from '@/components/Icons';
 import { Alert, AlertDescription } from '@/components/ui/alert';
 
 interface Props {
diff --git a/src/FE/components/ChatIcon/ChatIcon.tsx b/src/FE/pages/_components/ChatIcon/ChatIcon.tsx
similarity index 99%
rename from src/FE/components/ChatIcon/ChatIcon.tsx
rename to src/FE/pages/_components/ChatIcon/ChatIcon.tsx
index cf12780b..5d3f3ba5 100644
--- a/src/FE/components/ChatIcon/ChatIcon.tsx
+++ b/src/FE/pages/_components/ChatIcon/ChatIcon.tsx
@@ -1,9 +1,10 @@
+import useTranslation from '@/hooks/useTranslation';
+
+import { feModelProviders } from '@/types/model';
 
 import { IconShare } from '@/components/Icons';
-import useTranslation from '@/hooks/useTranslation';
 
 import { cn } from '@/lib/utils';
-import { feModelProviders } from '@/types/model';
 
 interface Props {
   providerId: number;
diff --git a/src/FE/components/Chat/ChatMessage/ChangeModelAction.tsx b/src/FE/pages/_components/ChatMessage/ChangeModelAction.tsx
similarity index 86%
rename from src/FE/components/Chat/ChatMessage/ChangeModelAction.tsx
rename to src/FE/pages/_components/ChatMessage/ChangeModelAction.tsx
index a23d0a5f..f6be5937 100644
--- a/src/FE/components/Chat/ChatMessage/ChangeModelAction.tsx
+++ b/src/FE/pages/_components/ChatMessage/ChangeModelAction.tsx
@@ -1,7 +1,7 @@
 import useTranslation from '@/hooks/useTranslation';
 
-import ChangeModel from '@/components/Chat/ChangeModel';
-import Tips from '@/components/Tips/Tips';
+import ChangeModel from '@/pages/_components/ChangeModel/ChangeModel';
+import Tips from '@/pages/_components/Tips/Tips';
 
 interface Props {
   hidden?: boolean;
diff --git a/src/FE/components/Chat/ChatMessage/ChatMessage.tsx b/src/FE/pages/_components/ChatMessage/ChatMessage.tsx
similarity index 85%
rename from src/FE/components/Chat/ChatMessage/ChatMessage.tsx
rename to src/FE/pages/_components/ChatMessage/ChatMessage.tsx
index bcf04a90..41672bdd 100644
--- a/src/FE/components/Chat/ChatMessage/ChatMessage.tsx
+++ b/src/FE/pages/_components/ChatMessage/ChatMessage.tsx
@@ -1,13 +1,11 @@
-import { FC, memo, useContext } from 'react';
+import { FC, memo } from 'react';
 
-import { Message } from '@/types/chat';
+import { IChat, Message } from '@/types/chat';
 import { PropsMessage } from '@/types/components/chat';
 
-import { HomeContext } from '@/contexts/Home.context';
-
 import { IconRobot } from '@/components/Icons/index';
 
-import ChatError from '../ChatError';
+import ChatError from '../ChatError/ChatError';
 import ResponseMessage from './ResponseMessage';
 import ResponseMessageActions from './ResponseMessageActions';
 import UserMessage from './UserMessage';
@@ -23,7 +21,11 @@ export interface Props {
   modelName?: string;
   modelId?: number;
   lastMessageId: string;
+  currentChatMessageId: string;
   message: PropsMessage;
+  messageIsStreaming: boolean;
+  chatError: boolean;
+  selectChat: IChat;
   onChangeMessage?: (messageId: string) => void;
   onEdit?: (editedMessage: Message, parentId: string | null) => void;
   onRegenerate?: (modelId?: number) => void;
@@ -41,14 +43,14 @@ export const ChatMessage: FC<Props> = memo(
     modelId,
     lastMessageId,
     message,
+    messageIsStreaming,
+    currentChatMessageId,
+    chatError,
+    selectChat,
     onEdit,
     onChangeMessage,
     onRegenerate,
   }) => {
-    const {
-      state: { messageIsStreaming, currentChatMessageId, chatError },
-    } = useContext(HomeContext);
-
     return (
       <div className={'group md:px-4 text-gray-800 dark:text-gray-100'}>
         <div className="relative m-auto flex px-4 py-[10px] text-base md:max-w-2xl lg:max-w-2xl lg:px-0 xl:max-w-5xl">
@@ -59,6 +61,8 @@ export const ChatMessage: FC<Props> = memo(
           <div className="prose w-full dark:prose-invert rounded-r-md">
             {message.role === 'user' && (
               <UserMessage
+                selectChat={selectChat}
+                messageIsStreaming={messageIsStreaming}
                 message={message}
                 parentId={parentId}
                 currentSelectIndex={currentSelectIndex}
@@ -70,6 +74,7 @@ export const ChatMessage: FC<Props> = memo(
 
             {message.role === 'assistant' && (
               <ResponseMessage
+                messageIsStreaming={messageIsStreaming}
                 currentChatMessageId={currentChatMessageId}
                 message={message}
                 parentId={parentId}
@@ -85,7 +90,7 @@ export const ChatMessage: FC<Props> = memo(
 
             {message.role === 'assistant' && (
               <ResponseMessageActions
-                hidden={messageIsStreaming}
+                messageIsStreaming={messageIsStreaming}
                 readonly={readonly}
                 message={message}
                 lastMessageId={lastMessageId}
diff --git a/src/FE/components/Chat/ChatMessage/CopyAction.tsx b/src/FE/pages/_components/ChatMessage/CopyAction.tsx
similarity index 96%
rename from src/FE/components/Chat/ChatMessage/CopyAction.tsx
rename to src/FE/pages/_components/ChatMessage/CopyAction.tsx
index 64994c81..26b5afbe 100644
--- a/src/FE/components/Chat/ChatMessage/CopyAction.tsx
+++ b/src/FE/pages/_components/ChatMessage/CopyAction.tsx
@@ -3,7 +3,7 @@ import { useState } from 'react';
 import useTranslation from '@/hooks/useTranslation';
 
 import { IconCheck, IconCopy } from '@/components/Icons';
-import Tips from '@/components/Tips/Tips';
+import Tips from '@/pages/_components/Tips/Tips';
 import { Button } from '@/components/ui/button';
 
 import { cn } from '@/lib/utils';
diff --git a/src/FE/components/Chat/ChatMessage/EditAction.tsx b/src/FE/pages/_components/ChatMessage/EditAction.tsx
similarity index 93%
rename from src/FE/components/Chat/ChatMessage/EditAction.tsx
rename to src/FE/pages/_components/ChatMessage/EditAction.tsx
index 9679f897..c869d9fb 100644
--- a/src/FE/components/Chat/ChatMessage/EditAction.tsx
+++ b/src/FE/pages/_components/ChatMessage/EditAction.tsx
@@ -1,7 +1,8 @@
 import useTranslation from '@/hooks/useTranslation';
 
+import Tips from '@/pages/_components/Tips/Tips';
+
 import { IconEdit } from '@/components/Icons';
-import Tips from '@/components/Tips/Tips';
 import { Button } from '@/components/ui/button';
 
 interface Props {
diff --git a/src/FE/components/Chat/ChatMessage/GenerateInformationAction.tsx b/src/FE/pages/_components/ChatMessage/GenerateInformationAction.tsx
similarity index 78%
rename from src/FE/components/Chat/ChatMessage/GenerateInformationAction.tsx
rename to src/FE/pages/_components/ChatMessage/GenerateInformationAction.tsx
index 51576099..7b53e429 100644
--- a/src/FE/components/Chat/ChatMessage/GenerateInformationAction.tsx
+++ b/src/FE/pages/_components/ChatMessage/GenerateInformationAction.tsx
@@ -4,8 +4,9 @@ import { formatNumberAsMoney } from '@/utils/common';
 
 import { PropsMessage } from '@/types/components/chat';
 
+import Tips from '@/pages/_components/Tips/Tips';
+
 import { IconInfo } from '@/components/Icons';
-import Tips from '@/components/Tips/Tips';
 import { Button } from '@/components/ui/button';
 import { Label } from '@/components/ui/label';
 
@@ -32,7 +33,8 @@ export const GenerateInformationAction = (props: Props) => {
   const Render = () => {
     return (
       <Tips
-        className="h-[28px]" side="bottom"
+        className="h-[28px]"
+        side="bottom"
         trigger={
           <Button variant="ghost" className="p-1 m-0 h-auto">
             <IconInfo />
@@ -63,7 +65,9 @@ export const GenerateInformationAction = (props: Props) => {
                 />
                 <GenerateInformation
                   name={'response tokens'}
-                  value={`${(message.outputTokens - message.reasoningTokens).toLocaleString()}`}
+                  value={`${(
+                    message.outputTokens - message.reasoningTokens
+                  ).toLocaleString()}`}
                 />
                 {!!message.reasoningTokens && (
                   <GenerateInformation
@@ -76,20 +80,25 @@ export const GenerateInformationAction = (props: Props) => {
                   value={
                     message?.duration
                       ? (
-                          ((message.outputTokens - message.reasoningTokens) / (message?.duration || 0)) *
+                          ((message.outputTokens - message.reasoningTokens) /
+                            (message?.duration || 0)) *
                           1000
                         ).toFixed(2) + ' token/s'
                       : '-'
                   }
                 />
-                {!message.inputPrice.isZero() && (<GenerateInformation
-                  name={'prompt_price'}
-                  value={'￥' + formatNumberAsMoney(+message.inputPrice, 6)}
-                />)}
-                {!message.outputPrice.isZero() && (<GenerateInformation
-                  name={'response_price'}
-                  value={'￥' + formatNumberAsMoney(+message.outputPrice, 6)}
-                />)}
+                {!message.inputPrice.isZero() && (
+                  <GenerateInformation
+                    name={'prompt_price'}
+                    value={'￥' + formatNumberAsMoney(+message.inputPrice, 6)}
+                  />
+                )}
+                {!message.outputPrice.isZero() && (
+                  <GenerateInformation
+                    name={'response_price'}
+                    value={'￥' + formatNumberAsMoney(+message.outputPrice, 6)}
+                  />
+                )}
                 <GenerateInformation
                   name={'total_price'}
                   value={
diff --git a/src/FE/components/Chat/ChatMessage/PaginationAction.tsx b/src/FE/pages/_components/ChatMessage/PaginationAction.tsx
similarity index 100%
rename from src/FE/components/Chat/ChatMessage/PaginationAction.tsx
rename to src/FE/pages/_components/ChatMessage/PaginationAction.tsx
diff --git a/src/FE/components/Chat/ChatMessage/RegenerateAction.tsx b/src/FE/pages/_components/ChatMessage/RegenerateAction.tsx
similarity index 94%
rename from src/FE/components/Chat/ChatMessage/RegenerateAction.tsx
rename to src/FE/pages/_components/ChatMessage/RegenerateAction.tsx
index c05ece27..cbdaf6cd 100644
--- a/src/FE/components/Chat/ChatMessage/RegenerateAction.tsx
+++ b/src/FE/pages/_components/ChatMessage/RegenerateAction.tsx
@@ -1,7 +1,7 @@
 import useTranslation from '@/hooks/useTranslation';
 
 import { IconRefresh } from '@/components/Icons';
-import Tips from '@/components/Tips/Tips';
+import Tips from '@/pages/_components/Tips/Tips';
 import { Button } from '@/components/ui/button';
 
 interface Props {
diff --git a/src/FE/components/Chat/ChatMessage/ResponseMessage.tsx b/src/FE/pages/_components/ChatMessage/ResponseMessage.tsx
similarity index 87%
rename from src/FE/components/Chat/ChatMessage/ResponseMessage.tsx
rename to src/FE/pages/_components/ChatMessage/ResponseMessage.tsx
index a9afdb1d..a3864334 100644
--- a/src/FE/components/Chat/ChatMessage/ResponseMessage.tsx
+++ b/src/FE/pages/_components/ChatMessage/ResponseMessage.tsx
@@ -1,18 +1,16 @@
-import { useContext } from 'react';
+import { preprocessLaTeX } from '@/utils/chats';
 
 import { PropsMessage } from '@/types/components/chat';
 
-import { HomeContext } from '@/contexts/Home.context';
-
-import { CodeBlock } from '@/components/Markdown/CodeBlock';
-import { MemoizedReactMarkdown } from '@/components/Markdown/MemoizedReactMarkdown';
+import { CodeBlock } from '@/pages/_components/Markdown/CodeBlock';
+import { MemoizedReactMarkdown } from '@/pages/_components/Markdown/MemoizedReactMarkdown';
 
 import rehypeKatex from 'rehype-katex';
-import remarkMath from 'remark-math';
 import remarkGfm from 'remark-gfm';
-import { preprocessLaTeX } from '@/utils/chats';
+import remarkMath from 'remark-math';
 
 interface Props {
+  messageIsStreaming: boolean;
   currentChatMessageId: string;
   message: PropsMessage;
   parentId: string | null;
@@ -21,11 +19,7 @@ interface Props {
 }
 
 const ResponseMessage = (props: Props) => {
-  const {
-    state: { messageIsStreaming },
-  } = useContext(HomeContext);
-
-  const { message, currentChatMessageId } = props;
+  const { messageIsStreaming, message, currentChatMessageId } = props;
 
   return (
     <div className="pr-0">
diff --git a/src/FE/components/Chat/ChatMessage/ResponseMessageActions.tsx b/src/FE/pages/_components/ChatMessage/ResponseMessageActions.tsx
similarity index 91%
rename from src/FE/components/Chat/ChatMessage/ResponseMessageActions.tsx
rename to src/FE/pages/_components/ChatMessage/ResponseMessageActions.tsx
index b6171a55..3fe8ebe3 100644
--- a/src/FE/components/Chat/ChatMessage/ResponseMessageActions.tsx
+++ b/src/FE/pages/_components/ChatMessage/ResponseMessageActions.tsx
@@ -1,9 +1,5 @@
-import { useContext } from 'react';
-
 import { PropsMessage } from '@/types/components/chat';
 
-import { HomeContext } from '@/contexts/Home.context';
-
 import ChangeModelAction from './ChangeModelAction';
 import CopyAction from './CopyAction';
 import GenerateInformationAction from './GenerateInformationAction';
@@ -13,7 +9,6 @@ import RegenerateAction from './RegenerateAction';
 import { cn } from '@/lib/utils';
 
 interface Props {
-  hidden?: boolean;
   readonly?: boolean;
   message: PropsMessage;
   modelName?: string;
@@ -21,15 +16,12 @@ interface Props {
   lastMessageId: string | null;
   assistantCurrentSelectIndex: number;
   assistantChildrenIds: string[];
+  messageIsStreaming: boolean;
   onChangeMessage?: (messageId: string) => void;
   onRegenerate?: (modelId?: number) => void;
 }
 
 const ResponseMessageActions = (props: Props) => {
-  const {
-    state: { messageIsStreaming },
-  } = useContext(HomeContext);
-
   const {
     readonly,
     message,
@@ -40,12 +32,14 @@ const ResponseMessageActions = (props: Props) => {
     assistantChildrenIds,
     onChangeMessage,
     onRegenerate,
-    hidden,
+    messageIsStreaming,
   } = props;
 
   return (
     <>
-      {!hidden ? (
+      {messageIsStreaming ? (
+        <div className="h-9"></div>
+      ) : (
         <div className="flex gap-1 flex-wrap mt-1">
           <PaginationAction
             hidden={assistantChildrenIds.length <= 1}
@@ -82,8 +76,6 @@ const ResponseMessageActions = (props: Props) => {
             />
           </div>
         </div>
-      ) : (
-        <div className="h-9"></div>
       )}
     </>
   );
diff --git a/src/FE/components/Chat/ChatMessage/UserMessage.tsx b/src/FE/pages/_components/ChatMessage/UserMessage.tsx
similarity index 95%
rename from src/FE/components/Chat/ChatMessage/UserMessage.tsx
rename to src/FE/pages/_components/ChatMessage/UserMessage.tsx
index 446449b6..edf0a8b6 100644
--- a/src/FE/components/Chat/ChatMessage/UserMessage.tsx
+++ b/src/FE/pages/_components/ChatMessage/UserMessage.tsx
@@ -1,12 +1,10 @@
-import { useContext, useEffect, useRef, useState } from 'react';
+import { useEffect, useRef, useState } from 'react';
 
 import useTranslation from '@/hooks/useTranslation';
 
-import { Message } from '@/types/chat';
+import { IChat, Message } from '@/types/chat';
 import { PropsMessage } from '@/types/components/chat';
 
-import { HomeContext } from '@/contexts/Home.context';
-
 import { Button } from '@/components/ui/button';
 
 import CopyAction from './CopyAction';
@@ -14,19 +12,17 @@ import EditAction from './EditAction';
 import PaginationAction from './PaginationAction';
 
 interface Props {
-  hidden?: boolean;
   message: PropsMessage;
   parentId: string | null;
   currentSelectIndex: number;
   parentChildrenIds: string[];
+  selectChat: IChat;
+  messageIsStreaming: boolean;
   onChangeMessage?: (messageId: string) => void;
   onEdit?: (editedMessage: Message, parentId: string | null) => void;
 }
 
 const UserMessage = (props: Props) => {
-  const {
-    state: { selectChat, messageIsStreaming },
-  } = useContext(HomeContext);
   const { t } = useTranslation();
 
   const {
@@ -34,9 +30,10 @@ const UserMessage = (props: Props) => {
     parentId,
     currentSelectIndex,
     parentChildrenIds,
+    selectChat,
+    messageIsStreaming,
     onChangeMessage,
     onEdit,
-    hidden,
   } = props;
   const [isTyping, setIsTyping] = useState<boolean>(false);
   const [isEditing, setIsEditing] = useState<boolean>(false);
diff --git a/src/FE/components/Chat/ChatMessage/index.ts b/src/FE/pages/_components/ChatMessage/index.ts
similarity index 100%
rename from src/FE/components/Chat/ChatMessage/index.ts
rename to src/FE/pages/_components/ChatMessage/index.ts
diff --git a/src/FE/components/Markdown/CodeBlock.tsx b/src/FE/pages/_components/Markdown/CodeBlock.tsx
similarity index 100%
rename from src/FE/components/Markdown/CodeBlock.tsx
rename to src/FE/pages/_components/Markdown/CodeBlock.tsx
diff --git a/src/FE/components/Markdown/MemoizedReactMarkdown.tsx b/src/FE/pages/_components/Markdown/MemoizedReactMarkdown.tsx
similarity index 100%
rename from src/FE/components/Markdown/MemoizedReactMarkdown.tsx
rename to src/FE/pages/_components/Markdown/MemoizedReactMarkdown.tsx
diff --git a/src/FE/components/Search/Search.tsx b/src/FE/pages/_components/Search/Search.tsx
similarity index 96%
rename from src/FE/components/Search/Search.tsx
rename to src/FE/pages/_components/Search/Search.tsx
index f7f6be65..588555c9 100644
--- a/src/FE/components/Search/Search.tsx
+++ b/src/FE/pages/_components/Search/Search.tsx
@@ -2,7 +2,7 @@ import { FC, useContext, useRef, useState } from 'react';
 
 import useTranslation from '@/hooks/useTranslation';
 
-import { HomeContext } from '@/contexts/Home.context';
+import { HomeContext } from '@/pages/home/_contents/Home.context';
 
 import { IconX } from '@/components/Icons/index';
 
diff --git a/src/FE/components/Tips/Tips.tsx b/src/FE/pages/_components/Tips/Tips.tsx
similarity index 100%
rename from src/FE/components/Tips/Tips.tsx
rename to src/FE/pages/_components/Tips/Tips.tsx
diff --git a/src/FE/components/Admin/Files/FileServiceModal.tsx b/src/FE/pages/admin/_components/Files/FileServiceModal.tsx
similarity index 100%
rename from src/FE/components/Admin/Files/FileServiceModal.tsx
rename to src/FE/pages/admin/_components/Files/FileServiceModal.tsx
diff --git a/src/FE/components/Admin/GlobalConfigs/GlobalConfigsModal.tsx b/src/FE/pages/admin/_components/GlobalConfigs/GlobalConfigsModal.tsx
similarity index 100%
rename from src/FE/components/Admin/GlobalConfigs/GlobalConfigsModal.tsx
rename to src/FE/pages/admin/_components/GlobalConfigs/GlobalConfigsModal.tsx
diff --git a/src/FE/components/Admin/InvitationCode/InvitationCodeModal.tsx b/src/FE/pages/admin/_components/InvitationCode/InvitationCodeModal.tsx
similarity index 100%
rename from src/FE/components/Admin/InvitationCode/InvitationCodeModal.tsx
rename to src/FE/pages/admin/_components/InvitationCode/InvitationCodeModal.tsx
diff --git a/src/FE/components/Admin/LoginService/LoginServiceModal.tsx b/src/FE/pages/admin/_components/LoginService/LoginServiceModal.tsx
similarity index 100%
rename from src/FE/components/Admin/LoginService/LoginServiceModal.tsx
rename to src/FE/pages/admin/_components/LoginService/LoginServiceModal.tsx
diff --git a/src/FE/components/Admin/Messages/ChatMessage.tsx b/src/FE/pages/admin/_components/Messages/ChatMessage.tsx
similarity index 85%
rename from src/FE/components/Admin/Messages/ChatMessage.tsx
rename to src/FE/pages/admin/_components/Messages/ChatMessage.tsx
index c158dada..f52440b2 100644
--- a/src/FE/components/Admin/Messages/ChatMessage.tsx
+++ b/src/FE/pages/admin/_components/Messages/ChatMessage.tsx
@@ -1,27 +1,27 @@
-import { FC, memo, useState } from 'react';
+import { FC, memo } from 'react';
 
-import useTranslation from '@/hooks/useTranslation';
 
 import { preprocessLaTeX } from '@/utils/chats';
 
 import { Content, Message, Role } from '@/types/chat';
 
+import CopyAction from '@/pages/_components/ChatMessage/CopyAction';
+import GenerateInformationAction from '@/pages/_components/ChatMessage/GenerateInformationAction';
+import { CodeBlock } from '@/pages/_components/Markdown/CodeBlock';
+import { MemoizedReactMarkdown } from '@/pages/_components/Markdown/MemoizedReactMarkdown';
+
 import {
   IconChevronLeft,
   IconChevronRight,
   IconRobot,
   IconUser,
 } from '@/components/Icons/index';
-import { CodeBlock } from '@/components/Markdown/CodeBlock';
-import { MemoizedReactMarkdown } from '@/components/Markdown/MemoizedReactMarkdown';
 import { Button } from '@/components/ui/button';
 
 import Decimal from 'decimal.js';
 import rehypeKatex from 'rehype-katex';
 import remarkGfm from 'remark-gfm';
 import remarkMath from 'remark-math';
-import CopyAction from '@/components/Chat/ChatMessage/CopyAction';
-import GenerateInformationAction from '@/components/Chat/ChatMessage/GenerateInformationAction';
 
 interface PropsMessage {
   id: string;
@@ -37,7 +37,6 @@ interface PropsMessage {
 }
 
 export interface Props {
-  id: string;
   isLastMessage: boolean;
   parentId: string | null;
   childrenIds: string[];
@@ -54,7 +53,6 @@ export interface Props {
 
 export const ChatMessage: FC<Props> = memo(
   ({
-    id,
     isLastMessage,
     parentChildrenIds,
     assistantChildrenIds,
@@ -64,26 +62,13 @@ export const ChatMessage: FC<Props> = memo(
     message,
     onChangeMessage,
   }) => {
-    const [messagedCopied, setMessageCopied] = useState(false);
-    const { t } = useTranslation();
-
-    const copyOnClick = () => {
-      if (!navigator.clipboard) return;
-
-      navigator.clipboard.writeText(message.content.text || '').then(() => {
-        setMessageCopied(true);
-        setTimeout(() => {
-          setMessageCopied(false);
-        }, 2000);
-      });
-    };
-
     return (
       <div
-        className={`group md:px-4 ${message.role === 'assistant'
-          ? 'text-gray-800 dark:text-gray-100'
-          : 'text-gray-800 dark:text-gray-100'
-          }`}
+        className={`group md:px-4 ${
+          message.role === 'assistant'
+            ? 'text-gray-800 dark:text-gray-100'
+            : 'text-gray-800 dark:text-gray-100'
+        }`}
         style={{ overflowWrap: 'anywhere' }}
       >
         <div className="relative m-auto flex px-4 py-[10px] text-base md:max-w-2xl lg:max-w-2xl lg:px-0 xl:max-w-5xl">
@@ -112,10 +97,12 @@ export const ChatMessage: FC<Props> = memo(
                       ))}
                   </div>
                   <div
-                    className={`prose whitespace-pre-wrap dark:prose-invert ${message.content?.fileIds && message.content.fileIds.length > 0
-                      ? 'mt-2'
-                      : ''
-                      }`}
+                    className={`prose whitespace-pre-wrap dark:prose-invert ${
+                      message.content?.fileIds &&
+                      message.content.fileIds.length > 0
+                        ? 'mt-2'
+                        : ''
+                    }`}
                   >
                     {message.content.text}
                   </div>
@@ -139,8 +126,9 @@ export const ChatMessage: FC<Props> = memo(
                           <IconChevronLeft />
                         </Button>
                         <span className="font-bold">
-                          {`${currentSelectIndex + 1}/${parentChildrenIds.length
-                            }`}
+                          {`${currentSelectIndex + 1}/${
+                            parentChildrenIds.length
+                          }`}
                         </span>
                         <Button
                           variant="ghost"
@@ -246,8 +234,9 @@ export const ChatMessage: FC<Props> = memo(
                         <IconChevronLeft />
                       </Button>
                       <span className="font-bold">
-                        {`${assistantCurrentSelectIndex + 1}/${assistantChildrenIds.length
-                          }`}
+                        {`${assistantCurrentSelectIndex + 1}/${
+                          assistantChildrenIds.length
+                        }`}
                       </span>
                       <Button
                         variant="ghost"
@@ -268,8 +257,9 @@ export const ChatMessage: FC<Props> = memo(
                     </div>
                   )}
                   <div
-                    className={`flex gap-1 ${isLastMessage ? 'visible' : 'invisible'
-                      } group-hover:visible focus:visible`}
+                    className={`flex gap-1 ${
+                      isLastMessage ? 'visible' : 'invisible'
+                    } group-hover:visible focus:visible`}
                   >
                     <CopyAction text={message.content.text} />
                     <GenerateInformationAction message={message} />
@@ -287,4 +277,3 @@ export const ChatMessage: FC<Props> = memo(
     );
   },
 );
-ChatMessage.displayName = 'ChatMessage';
diff --git a/src/FE/components/Admin/ModelKeys/ConfigModelModal.tsx b/src/FE/pages/admin/_components/ModelKeys/ConfigModelModal.tsx
similarity index 98%
rename from src/FE/components/Admin/ModelKeys/ConfigModelModal.tsx
rename to src/FE/pages/admin/_components/ModelKeys/ConfigModelModal.tsx
index 25c810a8..30a5d0cb 100644
--- a/src/FE/components/Admin/ModelKeys/ConfigModelModal.tsx
+++ b/src/FE/pages/admin/_components/ModelKeys/ConfigModelModal.tsx
@@ -6,8 +6,8 @@ import useTranslation from '@/hooks/useTranslation';
 import { DBModelProvider } from '@/types/model';
 
 import { IconInfo } from '@/components/Icons';
-import Spinner from '@/components/Spinner';
-import Tips from '@/components/Tips/Tips';
+import Spinner from '@/pages/home/_components/Spinner/Spinner';
+import Tips from '@/pages/_components/Tips/Tips';
 import { Badge } from '@/components/ui/badge';
 import { Button } from '@/components/ui/button';
 import {
diff --git a/src/FE/components/Admin/ModelKeys/ModelKeysModal.tsx b/src/FE/pages/admin/_components/ModelKeys/ModelKeysModal.tsx
similarity index 96%
rename from src/FE/components/Admin/ModelKeys/ModelKeysModal.tsx
rename to src/FE/pages/admin/_components/ModelKeys/ModelKeysModal.tsx
index 34eab153..25b278e6 100644
--- a/src/FE/components/Admin/ModelKeys/ModelKeysModal.tsx
+++ b/src/FE/pages/admin/_components/ModelKeys/ModelKeysModal.tsx
@@ -1,21 +1,17 @@
-import { Label } from '@radix-ui/react-dropdown-menu';
-import React, { useEffect, useState } from 'react';
+import React, { useEffect } from 'react';
 import { useForm } from 'react-hook-form';
 import toast from 'react-hot-toast';
 
 import useTranslation from '@/hooks/useTranslation';
 
 import {
-  AutoCreateModelResult,
   GetModelKeysResult,
   ModelProviderInitialConfig,
   PostModelKeysParams,
 } from '@/types/adminApis';
 import { feModelProviders } from '@/types/model';
 
-import { IconInfo } from '@/components/Icons';
-import Spinner from '@/components/Spinner';
-import Tips from '@/components/Tips/Tips';
+import Spinner from '@/pages/home/_components/Spinner/Spinner';
 import { Button } from '@/components/ui/button';
 import {
   Dialog,
@@ -32,7 +28,6 @@ import FormTextarea from '@/components/ui/form/textarea';
 import {
   deleteModelKeys,
   getModelProviderInitialConfig,
-  postAutoCreateModels,
   postModelKeys,
   putModelKeys,
 } from '@/apis/adminApis';
diff --git a/src/FE/components/Admin/Models/AddModelModal.tsx b/src/FE/pages/admin/_components/Models/AddModelModal.tsx
similarity index 100%
rename from src/FE/components/Admin/Models/AddModelModal.tsx
rename to src/FE/pages/admin/_components/Models/AddModelModal.tsx
diff --git a/src/FE/components/Admin/Models/EditModelModal.tsx b/src/FE/pages/admin/_components/Models/EditModelModal.tsx
similarity index 100%
rename from src/FE/components/Admin/Models/EditModelModal.tsx
rename to src/FE/pages/admin/_components/Models/EditModelModal.tsx
diff --git a/src/FE/components/Admin/Nav/Nav.tsx b/src/FE/pages/admin/_components/Nav/Nav.tsx
similarity index 100%
rename from src/FE/components/Admin/Nav/Nav.tsx
rename to src/FE/pages/admin/_components/Nav/Nav.tsx
diff --git a/src/FE/components/Admin/Pagiation/Pagiation.tsx b/src/FE/pages/admin/_components/Pagiation/Pagiation.tsx
similarity index 100%
rename from src/FE/components/Admin/Pagiation/Pagiation.tsx
rename to src/FE/pages/admin/_components/Pagiation/Pagiation.tsx
diff --git a/src/FE/components/Admin/PayService/PayServiceModal.tsx b/src/FE/pages/admin/_components/PayService/PayServiceModal.tsx
similarity index 100%
rename from src/FE/components/Admin/PayService/PayServiceModal.tsx
rename to src/FE/pages/admin/_components/PayService/PayServiceModal.tsx
diff --git a/src/FE/components/Admin/RequestLogs/RequestLogDetailsModal.tsx b/src/FE/pages/admin/_components/RequestLogs/RequestLogDetailsModal.tsx
similarity index 100%
rename from src/FE/components/Admin/RequestLogs/RequestLogDetailsModal.tsx
rename to src/FE/pages/admin/_components/RequestLogs/RequestLogDetailsModal.tsx
diff --git a/src/FE/components/Admin/Users/EditUserBalanceModel.tsx b/src/FE/pages/admin/_components/Users/EditUserBalanceModel.tsx
similarity index 100%
rename from src/FE/components/Admin/Users/EditUserBalanceModel.tsx
rename to src/FE/pages/admin/_components/Users/EditUserBalanceModel.tsx
diff --git a/src/FE/components/Admin/Users/EditUserModelModal.tsx b/src/FE/pages/admin/_components/Users/EditUserModelModal.tsx
similarity index 100%
rename from src/FE/components/Admin/Users/EditUserModelModal.tsx
rename to src/FE/pages/admin/_components/Users/EditUserModelModal.tsx
diff --git a/src/FE/components/Admin/Users/UserInitialConfigModal.tsx b/src/FE/pages/admin/_components/Users/UserInitialConfigModal.tsx
similarity index 100%
rename from src/FE/components/Admin/Users/UserInitialConfigModal.tsx
rename to src/FE/pages/admin/_components/Users/UserInitialConfigModal.tsx
diff --git a/src/FE/components/Admin/Users/UserModal.tsx b/src/FE/pages/admin/_components/Users/UserModal.tsx
similarity index 100%
rename from src/FE/components/Admin/Users/UserModal.tsx
rename to src/FE/pages/admin/_components/Users/UserModal.tsx
diff --git a/src/FE/pages/admin/file-service/index.tsx b/src/FE/pages/admin/file-service/index.tsx
index a0b5b3bf..4c602fa0 100644
--- a/src/FE/pages/admin/file-service/index.tsx
+++ b/src/FE/pages/admin/file-service/index.tsx
@@ -4,7 +4,7 @@ import useTranslation from '@/hooks/useTranslation';
 
 import { GetFileServicesResult } from '@/types/adminApis';
 
-import { FileServiceModal } from '@/components/Admin/Files/FileServiceModal';
+import { FileServiceModal } from '@/pages/admin/_components/Files/FileServiceModal';
 import { Button } from '@/components/ui/button';
 import { Card } from '@/components/ui/card';
 import {
diff --git a/src/FE/pages/admin/global-configs/index.tsx b/src/FE/pages/admin/global-configs/index.tsx
index 4a9d69cd..5a1e61c6 100644
--- a/src/FE/pages/admin/global-configs/index.tsx
+++ b/src/FE/pages/admin/global-configs/index.tsx
@@ -4,7 +4,7 @@ import useTranslation from '@/hooks/useTranslation';
 
 import { GetConfigsResult } from '@/types/adminApis';
 
-import { GlobalConfigsModal } from '@/components/Admin/GlobalConfigs/GlobalConfigsModal';
+import { GlobalConfigsModal } from '@/pages/admin/_components/GlobalConfigs/GlobalConfigsModal';
 import { Button } from '@/components/ui/button';
 import { Card } from '@/components/ui/card';
 import {
diff --git a/src/FE/pages/admin/invitation-code/index.tsx b/src/FE/pages/admin/invitation-code/index.tsx
index b6cefa87..0bf82aea 100644
--- a/src/FE/pages/admin/invitation-code/index.tsx
+++ b/src/FE/pages/admin/invitation-code/index.tsx
@@ -4,7 +4,7 @@ import useTranslation from '@/hooks/useTranslation';
 
 import { GetInvitationCodeResult } from '@/types/adminApis';
 
-import { InvitationCodeModal } from '@/components/Admin/InvitationCode/InvitationCodeModal';
+import { InvitationCodeModal } from '@/pages/admin/_components/InvitationCode/InvitationCodeModal';
 import { Button } from '@/components/ui/button';
 import { Card } from '@/components/ui/card';
 import {
diff --git a/src/FE/pages/admin/layout/index.tsx b/src/FE/pages/admin/layout/index.tsx
index 520d03cb..7ba43d36 100644
--- a/src/FE/pages/admin/layout/index.tsx
+++ b/src/FE/pages/admin/layout/index.tsx
@@ -6,7 +6,7 @@ import { useRouter } from 'next/router';
 
 import useTranslation from '@/hooks/useTranslation';
 
-import { Nav } from '@/components/Admin/Nav/Nav';
+import { Nav } from '@/pages/admin/_components/Nav/Nav';
 import {
   IconFiles,
   IconIdBadge,
diff --git a/src/FE/pages/admin/login-service/index.tsx b/src/FE/pages/admin/login-service/index.tsx
index 377a172e..cfe0fba4 100644
--- a/src/FE/pages/admin/login-service/index.tsx
+++ b/src/FE/pages/admin/login-service/index.tsx
@@ -6,7 +6,7 @@ import { DEFAULT_LANGUAGE } from '@/utils/settings';
 
 import { GetLoginServicesResult } from '@/types/adminApis';
 
-import { LoginServiceModal } from '@/components/Admin/LoginService/LoginServiceModal';
+import { LoginServiceModal } from '@/pages/admin/_components/LoginService/LoginServiceModal';
 import { Button } from '@/components/ui/button';
 import { Card } from '@/components/ui/card';
 import {
diff --git a/src/FE/pages/admin/messages/index.tsx b/src/FE/pages/admin/messages/index.tsx
index f2a704bf..29ec8197 100644
--- a/src/FE/pages/admin/messages/index.tsx
+++ b/src/FE/pages/admin/messages/index.tsx
@@ -7,7 +7,7 @@ import { DEFAULT_LANGUAGE } from '@/utils/settings';
 import { GetUserMessageResult } from '@/types/adminApis';
 import { PageResult, Paging } from '@/types/page';
 
-import PaginationContainer from '@/components/Admin/Pagiation/Pagiation';
+import PaginationContainer from '@/pages/admin/_components/Pagiation/Pagiation';
 import { Badge } from '@/components/ui/badge';
 import { Card } from '@/components/ui/card';
 import { Input } from '@/components/ui/input';
diff --git a/src/FE/pages/admin/model-keys/index.tsx b/src/FE/pages/admin/model-keys/index.tsx
index fdef4628..d6b26dba 100644
--- a/src/FE/pages/admin/model-keys/index.tsx
+++ b/src/FE/pages/admin/model-keys/index.tsx
@@ -6,8 +6,8 @@ import useTranslation from '@/hooks/useTranslation';
 import { GetModelKeysResult } from '@/types/adminApis';
 import { feModelProviders } from '@/types/model';
 
-import { ConfigModelModal } from '@/components/Admin/ModelKeys/ConfigModelModal';
-import { ModelKeysModal } from '@/components/Admin/ModelKeys/ModelKeysModal';
+import { ConfigModelModal } from '@/pages/admin/_components/ModelKeys/ConfigModelModal';
+import { ModelKeysModal } from '@/pages/admin/_components/ModelKeys/ModelKeysModal';
 import { Button } from '@/components/ui/button';
 import { Card } from '@/components/ui/card';
 import {
diff --git a/src/FE/pages/admin/models/index.tsx b/src/FE/pages/admin/models/index.tsx
index 24cbafa1..c398826c 100644
--- a/src/FE/pages/admin/models/index.tsx
+++ b/src/FE/pages/admin/models/index.tsx
@@ -6,8 +6,8 @@ import { formatNumberAsMoney } from '@/utils/common';
 
 import { AdminModelDto, GetModelKeysResult } from '@/types/adminApis';
 
-import { AddModelModal } from '@/components/Admin/Models/AddModelModal';
-import { EditModelModal } from '@/components/Admin/Models/EditModelModal';
+import { AddModelModal } from '@/pages/admin/_components/Models/AddModelModal';
+import { EditModelModal } from '@/pages/admin/_components/Models/EditModelModal';
 import { Button } from '@/components/ui/button';
 import { Card } from '@/components/ui/card';
 import {
diff --git a/src/FE/pages/admin/pay-service/index.tsx b/src/FE/pages/admin/pay-service/index.tsx
index 0a76bef1..52601a34 100644
--- a/src/FE/pages/admin/pay-service/index.tsx
+++ b/src/FE/pages/admin/pay-service/index.tsx
@@ -4,7 +4,7 @@ import useTranslation from '@/hooks/useTranslation';
 
 import { GetPayServicesResult } from '@/types/adminApis';
 
-import { PayServiceModal } from '@/components/Admin/PayService/PayServiceModal';
+import { PayServiceModal } from '@/pages/admin/_components/PayService/PayServiceModal';
 import { Button } from '@/components/ui/button';
 import { Card } from '@/components/ui/card';
 import {
diff --git a/src/FE/pages/admin/request-logs/index.tsx b/src/FE/pages/admin/request-logs/index.tsx
index 89fe9c83..aa2d6bf7 100644
--- a/src/FE/pages/admin/request-logs/index.tsx
+++ b/src/FE/pages/admin/request-logs/index.tsx
@@ -6,8 +6,8 @@ import { GetRequestLogsListResult } from '@/types/adminApis';
 import { PageResult, Paging } from '@/types/page';
 import { StatusCodeColor } from '@/types/statusCode';
 
-import PaginationContainer from '@/components/Admin/Pagiation/Pagiation';
-import { RequestLogDetailsModal } from '@/components/Admin/RequestLogs/RequestLogDetailsModal';
+import PaginationContainer from '@/pages/admin/_components/Pagiation/Pagiation';
+import { RequestLogDetailsModal } from '@/pages/admin/_components/RequestLogs/RequestLogDetailsModal';
 import { Card } from '@/components/ui/card';
 import { Input } from '@/components/ui/input';
 import {
diff --git a/src/FE/pages/admin/user-config/index.tsx b/src/FE/pages/admin/user-config/index.tsx
index dfbe5400..1c23dcdd 100644
--- a/src/FE/pages/admin/user-config/index.tsx
+++ b/src/FE/pages/admin/user-config/index.tsx
@@ -4,7 +4,7 @@ import useTranslation from '@/hooks/useTranslation';
 
 import { AdminModelDto, GetUserInitialConfigResult } from '@/types/adminApis';
 
-import { UserInitialConfigModal } from '@/components/Admin/Users/UserInitialConfigModal';
+import { UserInitialConfigModal } from '@/pages/admin/_components/Users/UserInitialConfigModal';
 import { Button } from '@/components/ui/button';
 import { Card } from '@/components/ui/card';
 import {
diff --git a/src/FE/pages/admin/users/index.tsx b/src/FE/pages/admin/users/index.tsx
index f6f6bdad..a9146a86 100644
--- a/src/FE/pages/admin/users/index.tsx
+++ b/src/FE/pages/admin/users/index.tsx
@@ -6,10 +6,10 @@ import useTranslation from '@/hooks/useTranslation';
 import { GetUsersResult } from '@/types/adminApis';
 import { PageResult, Paging } from '@/types/page';
 
-import PaginationContainer from '@/components/Admin/Pagiation/Pagiation';
-import { EditUserBalanceModal } from '@/components/Admin/Users/EditUserBalanceModel';
-import { EditUserModelModal } from '@/components/Admin/Users/EditUserModelModal';
-import { UserModal } from '@/components/Admin/Users/UserModal';
+import PaginationContainer from '@/pages/admin/_components/Pagiation/Pagiation';
+import { EditUserBalanceModal } from '@/pages/admin/_components/Users/EditUserBalanceModel';
+import { EditUserModelModal } from '@/pages/admin/_components/Users/EditUserModelModal';
+import { UserModal } from '@/pages/admin/_components/Users/UserModal';
 import { Badge } from '@/components/ui/badge';
 import { Button } from '@/components/ui/button';
 import { Card } from '@/components/ui/card';
diff --git a/src/FE/components/Button/CopyButton.tsx b/src/FE/pages/home/_components/Button/CopyButton.tsx
similarity index 100%
rename from src/FE/components/Button/CopyButton.tsx
rename to src/FE/pages/home/_components/Button/CopyButton.tsx
diff --git a/src/FE/components/Button/SidebarActionButton.tsx b/src/FE/pages/home/_components/Button/SidebarActionButton.tsx
similarity index 100%
rename from src/FE/components/Button/SidebarActionButton.tsx
rename to src/FE/pages/home/_components/Button/SidebarActionButton.tsx
diff --git a/src/FE/components/Button/UploadButton.tsx b/src/FE/pages/home/_components/Button/UploadButton.tsx
similarity index 96%
rename from src/FE/components/Button/UploadButton.tsx
rename to src/FE/pages/home/_components/Button/UploadButton.tsx
index 3f7ac976..6bc49918 100644
--- a/src/FE/components/Button/UploadButton.tsx
+++ b/src/FE/pages/home/_components/Button/UploadButton.tsx
@@ -5,7 +5,7 @@ import { checkFileSizeCanUpload, uploadFile } from '@/utils/uploadFile';
 import { ImageDef } from '@/types/chat';
 import { ChatModelFileConfig } from '@/types/model';
 
-import { Button } from '../ui/button';
+import { Button } from '../../../../components/ui/button';
 
 interface Props {
   onSuccessful?: (def: ImageDef) => void;
diff --git a/src/FE/components/Chat/AccountBalance.tsx b/src/FE/pages/home/_components/Chat/AccountBalance.tsx
similarity index 92%
rename from src/FE/components/Chat/AccountBalance.tsx
rename to src/FE/pages/home/_components/Chat/AccountBalance.tsx
index a69aa3c5..b8dd3ac7 100644
--- a/src/FE/components/Chat/AccountBalance.tsx
+++ b/src/FE/pages/home/_components/Chat/AccountBalance.tsx
@@ -4,7 +4,7 @@ import useTranslation from '@/hooks/useTranslation';
 
 import { formatRMB } from '@/utils/common';
 
-import { HomeContext } from '@/contexts/Home.context';
+import { HomeContext } from '@/pages/home/_contents/Home.context';
 
 import { getUserBalanceOnly } from '@/apis/clientApis';
 
diff --git a/src/FE/components/Chat/Chat.tsx b/src/FE/pages/home/_components/Chat/Chat.tsx
similarity index 97%
rename from src/FE/components/Chat/Chat.tsx
rename to src/FE/pages/home/_components/Chat/Chat.tsx
index 841fb68b..61ab571d 100644
--- a/src/FE/components/Chat/Chat.tsx
+++ b/src/FE/pages/home/_components/Chat/Chat.tsx
@@ -17,9 +17,10 @@ import { getUserSession } from '@/utils/user';
 import { ChatBody, Content, ContentRequest, Message, Role } from '@/types/chat';
 import { Prompt } from '@/types/prompt';
 
-import { ModeToggle } from '@/components/ModeToggle/ModeTooggle';
+import { ModeToggle } from '@/pages/home/_components/ModeToggle/ModeTooggle';
+import { HomeContext } from '@/pages/home/_contents/Home.context';
 
-import ChangeModel from './ChangeModel';
+import ChangeModel from '../../../_components/ChangeModel/ChangeModel';
 import { ChatInput } from './ChatInput';
 import EnableNetworkSearch from './EnableNetworkSearch';
 import { MemoizedChatMessage } from './MemoizedChatMessage';
@@ -29,7 +30,6 @@ import { SystemPrompt } from './SystemPrompt';
 import { TemperatureSlider } from './Temperature';
 
 import { getChat, postChats, putUserChatModel } from '@/apis/clientApis';
-import { HomeContext } from '@/contexts/Home.context';
 import { cn } from '@/lib/utils';
 import Decimal from 'decimal.js';
 import { v4 as uuidv4 } from 'uuid';
@@ -47,6 +47,8 @@ export const Chat = memo(() => {
       prompts,
       userModelConfig,
       settings,
+      messageIsStreaming,
+      currentChatMessageId,
       chatError,
     },
     handleUpdateSelectMessage,
@@ -474,6 +476,7 @@ export const Chat = memo(() => {
                 }
                 return (
                   <MemoizedChatMessage
+                    selectChat={selectChat}
                     key={current.id + index}
                     modelName={current.modelName}
                     modelId={current.modelId}
@@ -500,6 +503,9 @@ export const Chat = memo(() => {
                       inputPrice: new Decimal(current.inputPrice || 0),
                       outputPrice: new Decimal(current.outputPrice || 0),
                     }}
+                    messageIsStreaming={messageIsStreaming}
+                    currentChatMessageId={currentChatMessageId}
+                    chatError={chatError}
                     onChangeMessage={(messageId) => {
                       handleUpdateSelectMessage(messageId);
                     }}
diff --git a/src/FE/components/Chat/ChatButtonTooltip.tsx b/src/FE/pages/home/_components/Chat/ChatButtonTooltip.tsx
similarity index 100%
rename from src/FE/components/Chat/ChatButtonTooltip.tsx
rename to src/FE/pages/home/_components/Chat/ChatButtonTooltip.tsx
diff --git a/src/FE/components/Chat/ChatInput.tsx b/src/FE/pages/home/_components/Chat/ChatInput.tsx
similarity index 97%
rename from src/FE/components/Chat/ChatInput.tsx
rename to src/FE/pages/home/_components/Chat/ChatInput.tsx
index 87f260e1..3ea4c4a7 100644
--- a/src/FE/components/Chat/ChatInput.tsx
+++ b/src/FE/pages/home/_components/Chat/ChatInput.tsx
@@ -19,7 +19,7 @@ import { AdminModelDto } from '@/types/adminApis';
 import { Content, ImageDef, Message } from '@/types/chat';
 import { Prompt } from '@/types/prompt';
 
-import UploadButton from '@/components/Button/UploadButton';
+import UploadButton from '@/pages/home/_components/Button/UploadButton';
 import {
   IconArrowDown,
   IconCircleX,
@@ -28,15 +28,15 @@ import {
   IconSend,
   IconStopFilled,
 } from '@/components/Icons/index';
-import PasteUpload from '@/components/PasteUpload/PasteUpload';
+import PasteUpload from '@/pages/home/_components/PasteUpload/PasteUpload';
 
-import { Button } from '../ui/button';
+import { Button } from '../../../../components/ui/button';
 import { PromptList } from './PromptList';
 import { VariableModal } from './VariableModal';
 
 import { defaultFileConfig } from '@/apis/adminApis';
 import { getUserPromptDetail } from '@/apis/clientApis';
-import { HomeContext } from '@/contexts/Home.context';
+import { HomeContext } from '@/pages/home/_contents/Home.context';
 
 interface Props {
   onSend: (message: Message) => void;
diff --git a/src/FE/components/Chat/ChatLoader.tsx b/src/FE/pages/home/_components/Chat/ChatLoader.tsx
similarity index 100%
rename from src/FE/components/Chat/ChatLoader.tsx
rename to src/FE/pages/home/_components/Chat/ChatLoader.tsx
diff --git a/src/FE/components/Chat/EnableNetworkSearch.tsx b/src/FE/pages/home/_components/Chat/EnableNetworkSearch.tsx
similarity index 100%
rename from src/FE/components/Chat/EnableNetworkSearch.tsx
rename to src/FE/pages/home/_components/Chat/EnableNetworkSearch.tsx
diff --git a/src/FE/pages/home/_components/Chat/MemoizedChatMessage.tsx b/src/FE/pages/home/_components/Chat/MemoizedChatMessage.tsx
new file mode 100644
index 00000000..2a87879d
--- /dev/null
+++ b/src/FE/pages/home/_components/Chat/MemoizedChatMessage.tsx
@@ -0,0 +1,10 @@
+import { FC, memo } from 'react';
+
+import { ChatMessage, Props } from '../../../_components/ChatMessage';
+
+export const MemoizedChatMessage: FC<Props> = memo(
+  ChatMessage,
+  (prevProps, nextProps) =>
+    prevProps.message.content === nextProps.message.content &&
+    prevProps.messageIsStreaming === nextProps.messageIsStreaming,
+);
diff --git a/src/FE/components/Chat/ModelSelect.tsx b/src/FE/pages/home/_components/Chat/ModelSelect.tsx
similarity index 97%
rename from src/FE/components/Chat/ModelSelect.tsx
rename to src/FE/pages/home/_components/Chat/ModelSelect.tsx
index 1bc843de..40021b4f 100644
--- a/src/FE/components/Chat/ModelSelect.tsx
+++ b/src/FE/pages/home/_components/Chat/ModelSelect.tsx
@@ -12,10 +12,10 @@ import {
   SelectItem,
   SelectTrigger,
   SelectValue,
-} from '../ui/select';
+} from '../../../../components/ui/select';
 
 import { getModelUsage } from '@/apis/clientApis';
-import { HomeContext } from '@/contexts/Home.context';
+import { HomeContext } from '@/pages/home/_contents/Home.context';
 
 export const ModelSelect = () => {
   const { t } = useTranslation();
diff --git a/src/FE/components/Chat/NoModel.tsx b/src/FE/pages/home/_components/Chat/NoModel.tsx
similarity index 91%
rename from src/FE/components/Chat/NoModel.tsx
rename to src/FE/pages/home/_components/Chat/NoModel.tsx
index 0bb7c01b..71c21130 100644
--- a/src/FE/components/Chat/NoModel.tsx
+++ b/src/FE/pages/home/_components/Chat/NoModel.tsx
@@ -1,6 +1,6 @@
 import useTranslation from '@/hooks/useTranslation';
 
-import { IconModelSearch } from '../Icons';
+import { IconModelSearch } from '../../../../components/Icons';
 
 const NoModel = () => {
   const { t } = useTranslation();
diff --git a/src/FE/components/Chat/PromptList.tsx b/src/FE/pages/home/_components/Chat/PromptList.tsx
similarity index 100%
rename from src/FE/components/Chat/PromptList.tsx
rename to src/FE/pages/home/_components/Chat/PromptList.tsx
diff --git a/src/FE/components/Chat/SharedMessageModal.tsx b/src/FE/pages/home/_components/Chat/SharedMessageModal.tsx
similarity index 100%
rename from src/FE/components/Chat/SharedMessageModal.tsx
rename to src/FE/pages/home/_components/Chat/SharedMessageModal.tsx
diff --git a/src/FE/components/Chat/SystemPrompt.tsx b/src/FE/pages/home/_components/Chat/SystemPrompt.tsx
similarity index 100%
rename from src/FE/components/Chat/SystemPrompt.tsx
rename to src/FE/pages/home/_components/Chat/SystemPrompt.tsx
diff --git a/src/FE/components/Chat/Temperature.tsx b/src/FE/pages/home/_components/Chat/Temperature.tsx
similarity index 97%
rename from src/FE/components/Chat/Temperature.tsx
rename to src/FE/pages/home/_components/Chat/Temperature.tsx
index 6553bbee..6b6e370f 100644
--- a/src/FE/components/Chat/Temperature.tsx
+++ b/src/FE/pages/home/_components/Chat/Temperature.tsx
@@ -4,7 +4,7 @@ import useTranslation from '@/hooks/useTranslation';
 
 import { Slider } from '@/components/ui/slider';
 
-import { HomeContext } from '@/contexts/Home.context';
+import { HomeContext } from '@/pages/home/_contents/Home.context';
 import { cn } from '@/lib/utils';
 
 interface Props {
diff --git a/src/FE/components/Chat/VariableModal.tsx b/src/FE/pages/home/_components/Chat/VariableModal.tsx
similarity index 100%
rename from src/FE/components/Chat/VariableModal.tsx
rename to src/FE/pages/home/_components/Chat/VariableModal.tsx
diff --git a/src/FE/components/ChatSettings/ChatSettings.tsx b/src/FE/pages/home/_components/ChatSettings/ChatSettings.tsx
similarity index 100%
rename from src/FE/components/ChatSettings/ChatSettings.tsx
rename to src/FE/pages/home/_components/ChatSettings/ChatSettings.tsx
diff --git a/src/FE/components/ChatSettings/ChatSettingsBar.tsx b/src/FE/pages/home/_components/ChatSettings/ChatSettingsBar.tsx
similarity index 92%
rename from src/FE/components/ChatSettings/ChatSettingsBar.tsx
rename to src/FE/pages/home/_components/ChatSettings/ChatSettingsBar.tsx
index 2d932f50..eefd2ceb 100644
--- a/src/FE/components/ChatSettings/ChatSettingsBar.tsx
+++ b/src/FE/pages/home/_components/ChatSettings/ChatSettingsBar.tsx
@@ -1,8 +1,8 @@
 import { useContext, useEffect, useState } from 'react';
 
-import { HomeContext } from '@/contexts/Home.context';
+import { HomeContext } from '@/pages/home/_contents/Home.context';
 
-import { IconX } from '../Icons';
+import { IconX } from '../../../../components/Icons';
 import ChatSettings from './ChatSettings';
 import SliderSetting from './SliderSetting';
 
diff --git a/src/FE/components/ChatSettings/SliderSetting.tsx b/src/FE/pages/home/_components/ChatSettings/SliderSetting.tsx
similarity index 100%
rename from src/FE/components/ChatSettings/SliderSetting.tsx
rename to src/FE/pages/home/_components/ChatSettings/SliderSetting.tsx
diff --git a/src/FE/components/Chatbar/Chatbar.context.tsx b/src/FE/pages/home/_components/Chatbar/Chatbar.context.tsx
similarity index 100%
rename from src/FE/components/Chatbar/Chatbar.context.tsx
rename to src/FE/pages/home/_components/Chatbar/Chatbar.context.tsx
diff --git a/src/FE/components/Chatbar/Chatbar.state.tsx b/src/FE/pages/home/_components/Chatbar/Chatbar.state.tsx
similarity index 100%
rename from src/FE/components/Chatbar/Chatbar.state.tsx
rename to src/FE/pages/home/_components/Chatbar/Chatbar.state.tsx
diff --git a/src/FE/components/Chatbar/Chatbar.tsx b/src/FE/pages/home/_components/Chatbar/Chatbar.tsx
similarity index 95%
rename from src/FE/components/Chatbar/Chatbar.tsx
rename to src/FE/pages/home/_components/Chatbar/Chatbar.tsx
index 2701aa2e..e083435e 100644
--- a/src/FE/components/Chatbar/Chatbar.tsx
+++ b/src/FE/pages/home/_components/Chatbar/Chatbar.tsx
@@ -7,14 +7,14 @@ import { removeSelectChatId, saveSelectChatId } from '@/utils/chats';
 
 import { ChatResult } from '@/types/clientApis';
 
-import Sidebar from '@/components/Sidebar';
+import Sidebar from '@/pages/home/_components/Sidebar';
 
 import ChatbarContext from './Chatbar.context';
 import { ChatbarInitialState, initialState } from './Chatbar.state';
 import { ChatBarSettings } from './ChatbarSettings';
 import { Conversations } from './Conversations';
 
-import { HomeContext } from '@/contexts/Home.context';
+import { HomeContext } from '@/pages/home/_contents/Home.context';
 
 export const Chatbar = () => {
   const { t } = useTranslation();
diff --git a/src/FE/components/Chatbar/ChatbarSettings.tsx b/src/FE/pages/home/_components/Chatbar/ChatbarSettings.tsx
similarity index 91%
rename from src/FE/components/Chatbar/ChatbarSettings.tsx
rename to src/FE/pages/home/_components/Chatbar/ChatbarSettings.tsx
index 713af4d9..1f98f5f9 100644
--- a/src/FE/components/Chatbar/ChatbarSettings.tsx
+++ b/src/FE/pages/home/_components/Chatbar/ChatbarSettings.tsx
@@ -17,10 +17,10 @@ import {
   IconSettingsCog,
   IconUser,
 } from '@/components/Icons/index';
-import { ChangePasswordModal } from '@/components/Modal/ChangePasswordModal';
-import UserBalanceModal from '@/components/Modal/UserBalanceModal';
-import { SettingModal } from '@/components/Settings/SettingModal';
-import { SidebarButton } from '@/components/Sidebar/SidebarButton';
+import { ChangePasswordModal } from '@/pages/home/_components/Modal/ChangePasswordModal';
+import UserBalanceModal from '@/pages/home/_components/Modal/UserBalanceModal';
+import { SettingModal } from '@/pages/home/_components/Settings/SettingModal';
+import { SidebarButton } from '@/pages/home/_components/Sidebar/SidebarButton';
 import {
   Popover,
   PopoverContent,
@@ -29,7 +29,7 @@ import {
 import { Separator } from '@/components/ui/separator';
 
 import { getUserBalanceOnly } from '@/apis/clientApis';
-import { HomeContext } from '@/contexts/Home.context';
+import { HomeContext } from '@/pages/home/_contents/Home.context';
 
 export const ChatBarSettings = () => {
   const router = useRouter();
diff --git a/src/FE/components/Chatbar/ClearConversations.tsx b/src/FE/pages/home/_components/Chatbar/ClearConversations.tsx
similarity index 94%
rename from src/FE/components/Chatbar/ClearConversations.tsx
rename to src/FE/pages/home/_components/Chatbar/ClearConversations.tsx
index 1989ac88..cb0acead 100644
--- a/src/FE/components/Chatbar/ClearConversations.tsx
+++ b/src/FE/pages/home/_components/Chatbar/ClearConversations.tsx
@@ -3,7 +3,7 @@ import { FC, useState } from 'react';
 import useTranslation from '@/hooks/useTranslation';
 
 import { IconCheck, IconTrash, IconX } from '@/components/Icons/index';
-import { SidebarButton } from '@/components/Sidebar/SidebarButton';
+import { SidebarButton } from '@/pages/home/_components/Sidebar/SidebarButton';
 
 interface Props {
   onClearConversations: () => void;
diff --git a/src/FE/components/Chatbar/Conversation.tsx b/src/FE/pages/home/_components/Chatbar/Conversation.tsx
similarity index 94%
rename from src/FE/components/Chatbar/Conversation.tsx
rename to src/FE/pages/home/_components/Chatbar/Conversation.tsx
index f2d11585..480c72eb 100644
--- a/src/FE/components/Chatbar/Conversation.tsx
+++ b/src/FE/pages/home/_components/Chatbar/Conversation.tsx
@@ -12,10 +12,10 @@ import useTranslation from '@/hooks/useTranslation';
 import { ChatResult } from '@/types/clientApis';
 import { DBModelProvider } from '@/types/model';
 
-import SidebarActionButton from '@/components/Button/SidebarActionButton';
-import { SharedMessageModal } from '@/components/Chat/SharedMessageModal';
-import ChatIcon from '@/components/ChatIcon/ChatIcon';
-import ChatbarContext from '@/components/Chatbar/Chatbar.context';
+import SidebarActionButton from '@/pages/home/_components/Button/SidebarActionButton';
+import { SharedMessageModal } from '@/pages/home/_components/Chat/SharedMessageModal';
+import ChatIcon from '@/pages/_components/ChatIcon/ChatIcon';
+import ChatbarContext from '@/pages/home/_components/Chatbar/Chatbar.context';
 import {
   IconCheck,
   IconDots,
@@ -33,7 +33,7 @@ import {
 } from '@/components/ui/dropdown-menu';
 
 import { deleteChats, putChats } from '@/apis/clientApis';
-import { HomeContext } from '@/contexts/Home.context';
+import { HomeContext } from '@/pages/home/_contents/Home.context';
 
 interface Props {
   chat: ChatResult;
diff --git a/src/FE/components/Chatbar/Conversations.tsx b/src/FE/pages/home/_components/Chatbar/Conversations.tsx
similarity index 94%
rename from src/FE/components/Chatbar/Conversations.tsx
rename to src/FE/pages/home/_components/Chatbar/Conversations.tsx
index 2c552378..d6d09323 100644
--- a/src/FE/components/Chatbar/Conversations.tsx
+++ b/src/FE/pages/home/_components/Chatbar/Conversations.tsx
@@ -4,7 +4,7 @@ import useTranslation from '@/hooks/useTranslation';
 
 import { ChatResult } from '@/types/clientApis';
 
-import { HomeContext } from '@/contexts/Home.context';
+import { HomeContext } from '@/pages/home/_contents/Home.context';
 
 import { Button } from '@/components/ui/button';
 
diff --git a/src/FE/components/HomeContent/HomeContent.tsx b/src/FE/pages/home/_components/HomeContent/HomeContent.tsx
similarity index 96%
rename from src/FE/components/HomeContent/HomeContent.tsx
rename to src/FE/pages/home/_components/HomeContent/HomeContent.tsx
index 49b60c72..6835cf2d 100644
--- a/src/FE/components/HomeContent/HomeContent.tsx
+++ b/src/FE/pages/home/_components/HomeContent/HomeContent.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useRef } from 'react';
+import { useEffect } from 'react';
 
 import { useRouter } from 'next/router';
 
@@ -12,7 +12,6 @@ import {
 } from '@/utils/chats';
 import { getSelectMessages } from '@/utils/message';
 import { getStorageModelId, setStorageModelId } from '@/utils/model';
-import { formatPrompt } from '@/utils/promptVariable';
 import { getSettings, saveSettings } from '@/utils/settings';
 import { Settings } from '@/utils/settings';
 import { getLoginUrl, getUserInfo, getUserSession } from '@/utils/user';
@@ -22,11 +21,11 @@ import { DEFAULT_TEMPERATURE, IChat, Role } from '@/types/chat';
 import { ChatMessage } from '@/types/chatMessage';
 import { ChatResult, GetChatsParams } from '@/types/clientApis';
 
-import { Chat } from '@/components/Chat/Chat';
-import ChatSettingsBar from '@/components/ChatSettings/ChatSettingsBar';
-import { Chatbar } from '@/components/Chatbar/Chatbar';
-import PromptBar from '@/components/Promptbar';
-import Spinner from '@/components/Spinner';
+import { Chat } from '@/pages/home/_components/Chat/Chat';
+import ChatSettingsBar from '@/pages/home/_components/ChatSettings/ChatSettingsBar';
+import { Chatbar } from '@/pages/home/_components/Chatbar/Chatbar';
+import PromptBar from '@/pages/home/_components/Promptbar';
+import Spinner from '@/pages/home/_components/Spinner/Spinner';
 
 import {
   getChatsByPaging,
@@ -41,7 +40,7 @@ import {
   HomeContext,
   HomeInitialState,
   initialState,
-} from '@/contexts/Home.context';
+} from '@/pages/home/_contents/Home.context';
 import Decimal from 'decimal.js';
 import { v4 as uuidv4 } from 'uuid';
 
diff --git a/src/FE/components/Modal/ChangePasswordModal.tsx b/src/FE/pages/home/_components/Modal/ChangePasswordModal.tsx
similarity index 100%
rename from src/FE/components/Modal/ChangePasswordModal.tsx
rename to src/FE/pages/home/_components/Modal/ChangePasswordModal.tsx
diff --git a/src/FE/components/Modal/UserBalanceModal.tsx b/src/FE/pages/home/_components/Modal/UserBalanceModal.tsx
similarity index 100%
rename from src/FE/components/Modal/UserBalanceModal.tsx
rename to src/FE/pages/home/_components/Modal/UserBalanceModal.tsx
diff --git a/src/FE/components/ModeToggle/ModeTooggle.tsx b/src/FE/pages/home/_components/ModeToggle/ModeTooggle.tsx
similarity index 100%
rename from src/FE/components/ModeToggle/ModeTooggle.tsx
rename to src/FE/pages/home/_components/ModeToggle/ModeTooggle.tsx
diff --git a/src/FE/components/PageNotFound/PageNotFound.tsx b/src/FE/pages/home/_components/PageNotFound/PageNotFound.tsx
similarity index 100%
rename from src/FE/components/PageNotFound/PageNotFound.tsx
rename to src/FE/pages/home/_components/PageNotFound/PageNotFound.tsx
diff --git a/src/FE/components/PasteUpload/PasteUpload.tsx b/src/FE/pages/home/_components/PasteUpload/PasteUpload.tsx
similarity index 100%
rename from src/FE/components/PasteUpload/PasteUpload.tsx
rename to src/FE/pages/home/_components/PasteUpload/PasteUpload.tsx
diff --git a/src/FE/components/Popover/DateTimePopover.tsx b/src/FE/pages/home/_components/Popover/DateTimePopover.tsx
similarity index 100%
rename from src/FE/components/Popover/DateTimePopover.tsx
rename to src/FE/pages/home/_components/Popover/DateTimePopover.tsx
diff --git a/src/FE/components/Popover/DeletePopover.tsx b/src/FE/pages/home/_components/Popover/DeletePopover.tsx
similarity index 100%
rename from src/FE/components/Popover/DeletePopover.tsx
rename to src/FE/pages/home/_components/Popover/DeletePopover.tsx
diff --git a/src/FE/components/Promptbar/PromptBar.context.tsx b/src/FE/pages/home/_components/Promptbar/PromptBar.context.tsx
similarity index 100%
rename from src/FE/components/Promptbar/PromptBar.context.tsx
rename to src/FE/pages/home/_components/Promptbar/PromptBar.context.tsx
diff --git a/src/FE/components/Promptbar/Promptbar.state.tsx b/src/FE/pages/home/_components/Promptbar/Promptbar.state.tsx
similarity index 100%
rename from src/FE/components/Promptbar/Promptbar.state.tsx
rename to src/FE/pages/home/_components/Promptbar/Promptbar.state.tsx
diff --git a/src/FE/components/Promptbar/Promptbar.tsx b/src/FE/pages/home/_components/Promptbar/Promptbar.tsx
similarity index 96%
rename from src/FE/components/Promptbar/Promptbar.tsx
rename to src/FE/pages/home/_components/Promptbar/Promptbar.tsx
index df0089df..bc0ac466 100644
--- a/src/FE/components/Promptbar/Promptbar.tsx
+++ b/src/FE/pages/home/_components/Promptbar/Promptbar.tsx
@@ -7,10 +7,10 @@ import { useCreateReducer } from '@/hooks/useCreateReducer';
 
 import { Prompt, PromptSlim } from '@/types/prompt';
 
-import { HomeContext } from '@/contexts/Home.context';
+import { HomeContext } from '@/pages/home/_contents/Home.context';
 
 import { Prompts } from './components/Prompts';
-import Sidebar from '@/components/Sidebar';
+import Sidebar from '@/pages/home/_components/Sidebar';
 
 import PromptbarContext from './PromptBar.context';
 import { PromptbarInitialState, initialState } from './Promptbar.state';
diff --git a/src/FE/components/Promptbar/components/Prompt.tsx b/src/FE/pages/home/_components/Promptbar/components/Prompt.tsx
similarity index 97%
rename from src/FE/components/Promptbar/components/Prompt.tsx
rename to src/FE/pages/home/_components/Promptbar/components/Prompt.tsx
index c7b4d480..799a77ee 100644
--- a/src/FE/components/Promptbar/components/Prompt.tsx
+++ b/src/FE/pages/home/_components/Promptbar/components/Prompt.tsx
@@ -2,7 +2,7 @@ import { MouseEventHandler, useContext, useEffect, useState } from 'react';
 
 import { Prompt, PromptSlim } from '@/types/prompt';
 
-import SidebarActionButton from '@/components/Button/SidebarActionButton';
+import SidebarActionButton from '@/pages/home/_components/Button/SidebarActionButton';
 import {
   IconBulbFilled,
   IconCheck,
diff --git a/src/FE/components/Promptbar/components/PromptModal.tsx b/src/FE/pages/home/_components/Promptbar/components/PromptModal.tsx
similarity index 97%
rename from src/FE/components/Promptbar/components/PromptModal.tsx
rename to src/FE/pages/home/_components/Promptbar/components/PromptModal.tsx
index a5d77ca4..dab59137 100644
--- a/src/FE/components/Promptbar/components/PromptModal.tsx
+++ b/src/FE/pages/home/_components/Promptbar/components/PromptModal.tsx
@@ -9,9 +9,9 @@ import { UserRole } from '@/types/adminApis';
 import { DEFAULT_TEMPERATURE } from '@/types/chat';
 import { Prompt } from '@/types/prompt';
 
-import { TemperatureSlider } from '@/components/Chat/Temperature';
+import { TemperatureSlider } from '@/pages/home/_components/Chat/Temperature';
 import { IconInfo } from '@/components/Icons';
-import Tips from '@/components/Tips/Tips';
+import Tips from '@/pages/_components/Tips/Tips';
 import { Button } from '@/components/ui/button';
 import {
   Dialog,
@@ -24,7 +24,7 @@ import FormInput from '@/components/ui/form/input';
 import FormSwitch from '@/components/ui/form/switch';
 import FormTextarea from '@/components/ui/form/textarea';
 
-import { HomeContext } from '@/contexts/Home.context';
+import { HomeContext } from '@/pages/home/_contents/Home.context';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { z } from 'zod';
 
diff --git a/src/FE/components/Promptbar/components/PromptbarSettings.tsx b/src/FE/pages/home/_components/Promptbar/components/PromptbarSettings.tsx
similarity index 100%
rename from src/FE/components/Promptbar/components/PromptbarSettings.tsx
rename to src/FE/pages/home/_components/Promptbar/components/PromptbarSettings.tsx
diff --git a/src/FE/components/Promptbar/components/Prompts.tsx b/src/FE/pages/home/_components/Promptbar/components/Prompts.tsx
similarity index 100%
rename from src/FE/components/Promptbar/components/Prompts.tsx
rename to src/FE/pages/home/_components/Promptbar/components/Prompts.tsx
diff --git a/src/FE/components/Promptbar/index.ts b/src/FE/pages/home/_components/Promptbar/index.ts
similarity index 100%
rename from src/FE/components/Promptbar/index.ts
rename to src/FE/pages/home/_components/Promptbar/index.ts
diff --git a/src/FE/components/Settings/ApiKeyTabContent.tsx b/src/FE/pages/home/_components/Settings/ApiKeyTabContent.tsx
similarity index 95%
rename from src/FE/components/Settings/ApiKeyTabContent.tsx
rename to src/FE/pages/home/_components/Settings/ApiKeyTabContent.tsx
index ca5d9c98..3790c9dc 100644
--- a/src/FE/components/Settings/ApiKeyTabContent.tsx
+++ b/src/FE/pages/home/_components/Settings/ApiKeyTabContent.tsx
@@ -9,9 +9,9 @@ import { getApiUrl } from '@/utils/common';
 
 import { GetUserApiKeyResult } from '@/types/clientApis';
 
-import CopyButton from '@/components/Button/CopyButton';
-import DateTimePopover from '@/components/Popover/DateTimePopover';
-import DeletePopover from '@/components/Popover/DeletePopover';
+import CopyButton from '@/pages/home/_components/Button/CopyButton';
+import DateTimePopover from '@/pages/home/_components/Popover/DateTimePopover';
+import DeletePopover from '@/pages/home/_components/Popover/DeletePopover';
 import { Button } from '@/components/ui/button';
 import { Card, CardContent } from '@/components/ui/card';
 import { Input } from '@/components/ui/input';
diff --git a/src/FE/components/Settings/SettingModal.tsx b/src/FE/pages/home/_components/Settings/SettingModal.tsx
similarity index 100%
rename from src/FE/components/Settings/SettingModal.tsx
rename to src/FE/pages/home/_components/Settings/SettingModal.tsx
diff --git a/src/FE/components/Sidebar/OpenCloseButton.tsx b/src/FE/pages/home/_components/Sidebar/OpenCloseButton.tsx
similarity index 100%
rename from src/FE/components/Sidebar/OpenCloseButton.tsx
rename to src/FE/pages/home/_components/Sidebar/OpenCloseButton.tsx
diff --git a/src/FE/components/Sidebar/Sidebar.tsx b/src/FE/pages/home/_components/Sidebar/Sidebar.tsx
similarity index 97%
rename from src/FE/components/Sidebar/Sidebar.tsx
rename to src/FE/pages/home/_components/Sidebar/Sidebar.tsx
index 5eb5e62a..206a88c5 100644
--- a/src/FE/components/Sidebar/Sidebar.tsx
+++ b/src/FE/pages/home/_components/Sidebar/Sidebar.tsx
@@ -8,8 +8,8 @@ import {
   IconSearch,
   IconSquarePlus,
 } from '@/components/Icons/index';
-import Search from '@/components/Search';
-import Tips from '@/components/Tips/Tips';
+import Search from '@/pages/_components/Search/Search';
+import Tips from '@/pages/_components/Tips/Tips';
 import { Button } from '@/components/ui/button';
 
 import { cn } from '@/lib/utils';
diff --git a/src/FE/components/Sidebar/SidebarButton.tsx b/src/FE/pages/home/_components/Sidebar/SidebarButton.tsx
similarity index 100%
rename from src/FE/components/Sidebar/SidebarButton.tsx
rename to src/FE/pages/home/_components/Sidebar/SidebarButton.tsx
diff --git a/src/FE/components/Sidebar/index.ts b/src/FE/pages/home/_components/Sidebar/index.ts
similarity index 100%
rename from src/FE/components/Sidebar/index.ts
rename to src/FE/pages/home/_components/Sidebar/index.ts
diff --git a/src/FE/components/Spinner/Spinner.tsx b/src/FE/pages/home/_components/Spinner/Spinner.tsx
similarity index 100%
rename from src/FE/components/Spinner/Spinner.tsx
rename to src/FE/pages/home/_components/Spinner/Spinner.tsx
diff --git a/src/FE/contexts/Home.context.ts b/src/FE/pages/home/_contents/Home.context.ts
similarity index 100%
rename from src/FE/contexts/Home.context.ts
rename to src/FE/pages/home/_contents/Home.context.ts
diff --git a/src/FE/pages/home/index.tsx b/src/FE/pages/home/index.tsx
index eca169bb..4a2b53bc 100644
--- a/src/FE/pages/home/index.tsx
+++ b/src/FE/pages/home/index.tsx
@@ -1,6 +1,6 @@
 import Head from 'next/head';
 
-import HomeContent from '@/components/HomeContent/HomeContent';
+import HomeContent from '@/pages/home/_components/HomeContent/HomeContent';
 
 const Home = () => {
   return (
diff --git a/src/FE/components/Login/AccountLoginCard.tsx b/src/FE/pages/login/_components/AccountLoginCard.tsx
similarity index 100%
rename from src/FE/components/Login/AccountLoginCard.tsx
rename to src/FE/pages/login/_components/AccountLoginCard.tsx
diff --git a/src/FE/components/Login/KeyCloakLogin.tsx b/src/FE/pages/login/_components/KeyCloakLogin.tsx
similarity index 100%
rename from src/FE/components/Login/KeyCloakLogin.tsx
rename to src/FE/pages/login/_components/KeyCloakLogin.tsx
diff --git a/src/FE/components/Login/PhoneLoginCard.tsx b/src/FE/pages/login/_components/PhoneLoginCard.tsx
similarity index 100%
rename from src/FE/components/Login/PhoneLoginCard.tsx
rename to src/FE/pages/login/_components/PhoneLoginCard.tsx
diff --git a/src/FE/components/Login/PhoneRegisterCard.tsx b/src/FE/pages/login/_components/PhoneRegisterCard.tsx
similarity index 100%
rename from src/FE/components/Login/PhoneRegisterCard.tsx
rename to src/FE/pages/login/_components/PhoneRegisterCard.tsx
diff --git a/src/FE/components/Login/WeChatLogin.tsx b/src/FE/pages/login/_components/WeChatLogin.tsx
similarity index 100%
rename from src/FE/components/Login/WeChatLogin.tsx
rename to src/FE/pages/login/_components/WeChatLogin.tsx
diff --git a/src/FE/components/Login/WeChatLoginModal.tsx b/src/FE/pages/login/_components/WeChatLoginModal.tsx
similarity index 95%
rename from src/FE/components/Login/WeChatLoginModal.tsx
rename to src/FE/pages/login/_components/WeChatLoginModal.tsx
index f2b68d0f..8e059cba 100644
--- a/src/FE/components/Login/WeChatLoginModal.tsx
+++ b/src/FE/pages/login/_components/WeChatLoginModal.tsx
@@ -2,7 +2,7 @@ import { useEffect } from 'react';
 
 import useExternal from '@/hooks/useExternal';
 
-import Spinner from '@/components/Spinner';
+import Spinner from '@/pages/home/_components/Spinner/Spinner';
 import { Dialog, DialogContent } from '@/components/ui/dialog';
 
 const WeChatLoginModal = (props: {
diff --git a/src/FE/pages/login/_components/index.ts b/src/FE/pages/login/_components/index.ts
new file mode 100644
index 00000000..4521b8b9
--- /dev/null
+++ b/src/FE/pages/login/_components/index.ts
@@ -0,0 +1,13 @@
+import AccountLoginCard from './AccountLoginCard';
+import KeyCloakLogin from './KeyCloakLogin';
+import PhoneLoginCard from './PhoneLoginCard';
+import PhoneRegisterCard from './PhoneRegisterCard';
+import WeChatLogin from './WeChatLogin';
+
+export {
+  AccountLoginCard,
+  KeyCloakLogin,
+  PhoneLoginCard,
+  PhoneRegisterCard,
+  WeChatLogin,
+};
diff --git a/src/FE/pages/login/index.tsx b/src/FE/pages/login/index.tsx
index 4deb82f4..f186403f 100644
--- a/src/FE/pages/login/index.tsx
+++ b/src/FE/pages/login/index.tsx
@@ -8,14 +8,17 @@ import { LoginConfigsResult } from '@/types/clientApis';
 import { SiteInfoConfig } from '@/types/config';
 import { LoginType } from '@/types/user';
 
-import AccountLoginCard from '@/components/Login/AccountLoginCard';
-import KeyCloakLogin from '@/components/Login/KeyCloakLogin';
-import PhoneLoginCard from '@/components/Login/PhoneLoginCard';
-import PhoneRegisterCard from '@/components/Login/PhoneRegisterCard';
-import WeChatLogin from '@/components/Login/WeChatLogin';
 import { Button } from '@/components/ui/button';
 import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/components/ui/tabs';
 
+import {
+  AccountLoginCard,
+  KeyCloakLogin,
+  PhoneLoginCard,
+  PhoneRegisterCard,
+  WeChatLogin,
+} from './_components';
+
 import { getLoginProviders, getSiteInfo } from '@/apis/clientApis';
 
 enum TabKeys {
diff --git a/src/FE/pages/message/[id].tsx b/src/FE/pages/message/[id].tsx
index 33364fee..77689a1c 100644
--- a/src/FE/pages/message/[id].tsx
+++ b/src/FE/pages/message/[id].tsx
@@ -7,7 +7,7 @@ import { getSelectMessages } from '@/utils/message';
 import { GetMessageDetailsResult } from '@/types/adminApis';
 import { ChatMessage } from '@/types/chatMessage';
 
-import { ChatMessage as ChatMessageComponent } from '@/components/Admin/Messages/ChatMessage';
+import { ChatMessage as ChatMessageComponent } from '@/pages/admin/_components/Messages/ChatMessage';
 
 import { getMessageDetails } from '@/apis/adminApis';
 import Decimal from 'decimal.js';
@@ -89,7 +89,6 @@ export default function MessageDetails() {
                 (x) => x === current.id,
               )}
               isLastMessage={selectMessages.length - 1 === index}
-              id={current.id!}
               key={current.id + index}
               parentId={current.parentId}
               onChangeMessage={(messageId: string) => {
diff --git a/src/FE/pages/share/[id].tsx b/src/FE/pages/share/[id].tsx
index c0aaddeb..c06f722e 100644
--- a/src/FE/pages/share/[id].tsx
+++ b/src/FE/pages/share/[id].tsx
@@ -1,22 +1,23 @@
 import { useEffect, useState } from 'react';
 
 import Link from 'next/link';
-import { NextRouter, useRouter } from 'next/router';
+import { useRouter } from 'next/router';
 
 import useTranslation from '@/hooks/useTranslation';
 
+import { getQueryId } from '@/utils/common';
 import { getSelectMessages } from '@/utils/message';
 
 import { GetMessageDetailsResult } from '@/types/adminApis';
 import { ChatMessage } from '@/types/chatMessage';
 
-import { ChatMessage as ChatMessageComponent } from '@/components/Admin/Messages/ChatMessage';
-import PageNotFound from '@/components/PageNotFound/PageNotFound';
+import { ChatMessage as ChatMessageComponent } from '@/pages/admin/_components/Messages/ChatMessage';
+import PageNotFound from '@/pages/home/_components/PageNotFound/PageNotFound';
+
 import { Button } from '@/components/ui/button';
 
 import { getShareMessage } from '@/apis/adminApis';
 import Decimal from 'decimal.js';
-import { getQueryId } from '@/utils/common';
 
 export default function ShareMessage() {
   const { t } = useTranslation();
@@ -26,8 +27,6 @@ export default function ShareMessage() {
   const [loading, setLoading] = useState(true);
   const [currentMessages, setCurrentMessages] = useState<ChatMessage[]>([]);
 
-
-
   useEffect(() => {
     setLoading(true);
     if (!router.isReady) return;
@@ -79,7 +78,6 @@ export default function ShareMessage() {
                     (x) => x === current.id,
                   )}
                   isLastMessage={selectMessages.length - 1 === index}
-                  id={current.id!}
                   key={current.id + index}
                   parentId={current.parentId}
                   onChangeMessage={(messageId: string) => {
diff --git a/src/FE/components/Theme/ThemeProvider.tsx b/src/FE/providers/ThemeProvider.tsx
similarity index 100%
rename from src/FE/components/Theme/ThemeProvider.tsx
rename to src/FE/providers/ThemeProvider.tsx