diff --git a/src/components/MessageInput/index.tsx b/src/components/MessageInput/index.tsx
index ef808764..3acebced 100644
--- a/src/components/MessageInput/index.tsx
+++ b/src/components/MessageInput/index.tsx
@@ -6,7 +6,7 @@ import { useLocalstorageState } from "rooks";
 import { plugins } from "./plugins";
 import { getMessageFromPlateValues, ParagraphInput } from "@/utils";
 import { Editor } from "./plate-ui/editor";
-import { MentionCombobox } from "./plate-ui/mention-combobox";
+import { MentionCombobox } from "./plate-ui/mention/combobox";
 
 import { EmojiInputPicker } from "./plate-ui/emoji-input-picker";
 import { MentionData, MessageWithMentions } from "@/types/message";
diff --git a/src/components/MessageInput/plate-ui/mention-combobox.tsx b/src/components/MessageInput/plate-ui/mention/combobox.tsx
similarity index 96%
rename from src/components/MessageInput/plate-ui/mention-combobox.tsx
rename to src/components/MessageInput/plate-ui/mention/combobox.tsx
index 8cb618bc..8003250e 100644
--- a/src/components/MessageInput/plate-ui/mention-combobox.tsx
+++ b/src/components/MessageInput/plate-ui/mention/combobox.tsx
@@ -2,7 +2,7 @@ import { ComboboxProps, Data, NoData } from "@udecode/plate-combobox";
 import { getPluginOptions, useEditorRef } from "@udecode/plate-common";
 import { ELEMENT_MENTION, getMentionOnSelectItem, MentionPlugin } from "@udecode/plate-mention";
 
-import { Combobox } from "./combobox";
+import { Combobox } from "../combobox";
 import User from "@/components/User";
 
 export interface MentionComboboxProps<TData extends Data = NoData>
diff --git a/src/components/MessageInput/plate-ui/mention-element.tsx b/src/components/MessageInput/plate-ui/mention/element.tsx
similarity index 100%
rename from src/components/MessageInput/plate-ui/mention-element.tsx
rename to src/components/MessageInput/plate-ui/mention/element.tsx
diff --git a/src/components/MessageInput/plate-ui/mention-input-element.tsx b/src/components/MessageInput/plate-ui/mention/input-element.tsx
similarity index 100%
rename from src/components/MessageInput/plate-ui/mention-input-element.tsx
rename to src/components/MessageInput/plate-ui/mention/input-element.tsx
diff --git a/src/components/MessageInput/plugins.ts b/src/components/MessageInput/plugins.ts
index 62fc93c9..cd57e472 100644
--- a/src/components/MessageInput/plugins.ts
+++ b/src/components/MessageInput/plugins.ts
@@ -12,8 +12,8 @@ import { createParagraphPlugin, ELEMENT_PARAGRAPH } from "@udecode/plate-paragra
 import { createTrailingBlockPlugin } from "@udecode/plate-trailing-block";
 
 import { EmojiCombobox } from "./plate-ui/emoji-input-picker/emoji-combobox";
-import { MentionElement } from "./plate-ui/mention-element";
-import { MentionInputElement } from "./plate-ui/mention-input-element";
+import { MentionElement } from "./plate-ui/mention/element";
+import { MentionInputElement } from "./plate-ui/mention/input-element";
 import { ParagraphElement } from "./plate-ui/paragraph-element";
 
 export const plugins = createPlugins(