diff --git a/lib/widgets/chat_page/chat_box.dart b/lib/widgets/chat_page/composer/chat_box.dart
similarity index 97%
rename from lib/widgets/chat_page/chat_box.dart
rename to lib/widgets/chat_page/composer/chat_box.dart
index c1b8c5e..7f07de2 100644
--- a/lib/widgets/chat_page/chat_box.dart
+++ b/lib/widgets/chat_page/composer/chat_box.dart
@@ -8,8 +8,8 @@ import "package:hooks_riverpod/hooks_riverpod.dart";
 import "package:nexus/controllers/room_chat_controller.dart";
 import "package:nexus/models/relation_type.dart";
 import "package:nexus/models/room.dart";
-import "package:nexus/widgets/chat_page/mention_overlay.dart";
-import "package:nexus/widgets/chat_page/relation_preview.dart";
+import "package:nexus/widgets/chat_page/composer/mention_overlay.dart";
+import "package:nexus/widgets/chat_page/composer/relation_preview.dart";
 
 class ChatBox extends HookConsumerWidget {
   final Message? relatedMessage;
diff --git a/lib/widgets/chat_page/mention_overlay.dart b/lib/widgets/chat_page/composer/mention_overlay.dart
similarity index 100%
rename from lib/widgets/chat_page/mention_overlay.dart
rename to lib/widgets/chat_page/composer/mention_overlay.dart
diff --git a/lib/widgets/chat_page/relation_preview.dart b/lib/widgets/chat_page/composer/relation_preview.dart
similarity index 100%
rename from lib/widgets/chat_page/relation_preview.dart
rename to lib/widgets/chat_page/composer/relation_preview.dart
diff --git a/lib/widgets/chat_page/room_chat.dart b/lib/widgets/chat_page/room_chat.dart
index 1627573..bb19e03 100644
--- a/lib/widgets/chat_page/room_chat.dart
+++ b/lib/widgets/chat_page/room_chat.dart
@@ -13,12 +13,12 @@ import "package:nexus/helpers/extensions/better_when.dart";
 import "package:nexus/helpers/extensions/show_context_menu.dart";
 import "package:nexus/models/relation_type.dart";
 import "package:nexus/models/requests/report_request.dart";
-import "package:nexus/widgets/chat_page/chat_box.dart";
+import "package:nexus/widgets/chat_page/composer/chat_box.dart";
 import "package:nexus/widgets/chat_page/image_message.dart";
 import "package:nexus/widgets/chat_page/member_list.dart";
-import "package:nexus/widgets/chat_page/message_wrapper.dart";
+import "package:nexus/widgets/chat_page/wrappers/message_wrapper.dart";
 import "package:nexus/widgets/chat_page/room_appbar.dart";
-import "package:nexus/widgets/chat_page/text_message_wrapper.dart";
+import "package:nexus/widgets/chat_page/wrappers/text_message_wrapper.dart";
 import "package:nexus/widgets/chat_page/reply_widget.dart";
 import "package:nexus/widgets/form_text_input.dart";
 import "package:nexus/widgets/loading.dart";
diff --git a/lib/widgets/chat_page/message_wrapper.dart b/lib/widgets/chat_page/wrappers/message_wrapper.dart
similarity index 100%
rename from lib/widgets/chat_page/message_wrapper.dart
rename to lib/widgets/chat_page/wrappers/message_wrapper.dart
diff --git a/lib/widgets/chat_page/text_message_wrapper.dart b/lib/widgets/chat_page/wrappers/text_message_wrapper.dart
similarity index 98%
rename from lib/widgets/chat_page/text_message_wrapper.dart
rename to lib/widgets/chat_page/wrappers/text_message_wrapper.dart
index 814deb4..41bc01e 100644
--- a/lib/widgets/chat_page/text_message_wrapper.dart
+++ b/lib/widgets/chat_page/wrappers/text_message_wrapper.dart
@@ -3,7 +3,7 @@ import "package:flutter_chat_core/flutter_chat_core.dart";
 import "package:flutter_link_previewer/flutter_link_previewer.dart";
 import "package:nexus/models/room.dart";
 import "package:nexus/widgets/chat_page/html/html.dart";
-import "package:nexus/widgets/chat_page/message_wrapper.dart";
+import "package:nexus/widgets/chat_page/wrappers/message_wrapper.dart";
 import "package:nexus/widgets/chat_page/reply_widget.dart";
 
 class TextMessageWrapper extends StatelessWidget {