diff --git a/frontend/components/ClipboardApp.tsx b/frontend/components/ClipboardApp.tsx
index cf0580e..e000580 100644
--- a/frontend/components/ClipboardApp.tsx
+++ b/frontend/components/ClipboardApp.tsx
@@ -1,8 +1,8 @@
 "use client";
 import React, { useState, useRef, useCallback } from "react";
 import { Button } from "@/components/ui/button";
-import useRichTextToPlainText from "@/hooks/useRichTextToPlainText";
-import ShareCard from "./ClipboardApp/ShareCard";
+import useRichTextToPlainText from "../hooks/useRichTextToPlainText";
+import QRCodeComponent from "./ClipboardApp/ShareCard";
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
 import { useClipboardAppMessages } from "@/hooks/useClipboardAppMessages";
 import { usePageSetup } from "@/hooks/usePageSetup";
@@ -177,7 +177,7 @@ const ClipboardApp = () => {
             </CardTitle>
           </CardHeader>
           <CardContent>
-            <ShareCard RoomID={shareRoomId} shareLink={shareLink} />
+            <QRCodeComponent RoomID={shareRoomId} shareLink={shareLink} />
           </CardContent>
         </Card>
       )}
diff --git a/frontend/components/ClipboardApp/FileListDisplay.tsx b/frontend/components/ClipboardApp/FileListDisplay.tsx
index 5121389..d3b00a4 100644
--- a/frontend/components/ClipboardApp/FileListDisplay.tsx
+++ b/frontend/components/ClipboardApp/FileListDisplay.tsx
@@ -2,11 +2,11 @@ import React, { useState, useEffect, useRef } from "react";
 import { Button } from "@/components/ui/button";
 import { Download, Trash2 } from "lucide-react";
 import { Tooltip } from "@/components/Tooltip";
-import TransferProgress from "../self_define/TransferProgress";
+import TransferProgress from "@/components/ClipboardApp/TransferProgress";
 import { formatFileSize, generateFileId } from "@/lib/fileUtils";
-import { AutoPopupDialog } from "@/components/self_define/AutoPopupDialog";
+import { AutoPopupDialog } from "@/components/common/AutoPopupDialog";
 import { FileMeta, CustomFile, Progress } from "@/lib/types/file";
-import FileTransferButton from "../self_define/FileTransferButton";
+import FileTransferButton from "./FileTransferButton";
 import { getDictionary } from "@/lib/dictionary";
 import { useLocale } from "@/hooks/useLocale";
 import type { Messages } from "@/types/messages";
diff --git a/frontend/components/self_define/FileTransferButton.tsx b/frontend/components/ClipboardApp/FileTransferButton.tsx
similarity index 100%
rename from frontend/components/self_define/FileTransferButton.tsx
rename to frontend/components/ClipboardApp/FileTransferButton.tsx
diff --git a/frontend/components/self_define/file-upload-handler.tsx b/frontend/components/ClipboardApp/FileUploadHandler.tsx
similarity index 100%
rename from frontend/components/self_define/file-upload-handler.tsx
rename to frontend/components/ClipboardApp/FileUploadHandler.tsx
diff --git a/frontend/components/ClipboardApp/RetrieveTabPanel.tsx b/frontend/components/ClipboardApp/RetrieveTabPanel.tsx
index 5fd43f5..3418956 100644
--- a/frontend/components/ClipboardApp/RetrieveTabPanel.tsx
+++ b/frontend/components/ClipboardApp/RetrieveTabPanel.tsx
@@ -5,7 +5,7 @@ import RichTextEditor from "@/components/Editor/RichTextEditor";
 import {
   ReadClipboardButton,
   WriteClipboardButton,
-} from "@/components/self_define/clipboard_btn";
+} from "@/components/common/clipboard_btn";
 import FileListDisplay from "@/components/ClipboardApp/FileListDisplay";
 import type { Messages } from "@/types/messages";
 import type { FileMeta } from "@/lib/types/file";
diff --git a/frontend/components/ClipboardApp/SendTabPanel.tsx b/frontend/components/ClipboardApp/SendTabPanel.tsx
index dcd7c46..71675b5 100644
--- a/frontend/components/ClipboardApp/SendTabPanel.tsx
+++ b/frontend/components/ClipboardApp/SendTabPanel.tsx
@@ -5,8 +5,8 @@ import RichTextEditor from "@/components/Editor/RichTextEditor";
 import {
   ReadClipboardButton,
   WriteClipboardButton,
-} from "@/components/self_define/clipboard_btn";
-import { FileUploadHandler } from "@/components/self_define/file-upload-handler";
+} from "@/components/common/clipboard_btn";
+import { FileUploadHandler } from "@/components/ClipboardApp/FileUploadHandler";
 import FileListDisplay from "@/components/ClipboardApp/FileListDisplay";
 import AnimatedButton from "@/components/ui/AnimatedButton";
 import type { Messages } from "@/types/messages";
diff --git a/frontend/components/ClipboardApp/ShareCard.tsx b/frontend/components/ClipboardApp/ShareCard.tsx
index a4f78b6..5a6ae04 100755
--- a/frontend/components/ClipboardApp/ShareCard.tsx
+++ b/frontend/components/ClipboardApp/ShareCard.tsx
@@ -3,7 +3,7 @@ import { QRCodeSVG } from 'qrcode.react';
 import { Input } from '@/components/ui/input';
 import { Button } from '@/components/ui/button';
 import { Copy, Download, Check } from 'lucide-react';
-import { WriteClipboardButton } from '../self_define/clipboard_btn';
+import { WriteClipboardButton } from '../common/clipboard_btn';
 
 import { getDictionary } from '@/lib/dictionary';
 import { useLocale } from '@/hooks/useLocale';
diff --git a/frontend/components/self_define/TransferProgress.tsx b/frontend/components/ClipboardApp/TransferProgress.tsx
similarity index 100%
rename from frontend/components/self_define/TransferProgress.tsx
rename to frontend/components/ClipboardApp/TransferProgress.tsx
diff --git a/frontend/components/self_define/AutoPopupDialog.tsx b/frontend/components/common/AutoPopupDialog.tsx
similarity index 100%
rename from frontend/components/self_define/AutoPopupDialog.tsx
rename to frontend/components/common/AutoPopupDialog.tsx
diff --git a/frontend/components/self_define/clipboard_btn.tsx b/frontend/components/common/clipboard_btn.tsx
similarity index 100%
rename from frontend/components/self_define/clipboard_btn.tsx
rename to frontend/components/common/clipboard_btn.tsx