diff --git a/addons/mail/static/src/discuss/attachment_model_patch.js b/addons/mail/static/src/discuss/core/attachment_model_patch.js
similarity index 100%
rename from addons/mail/static/src/discuss/attachment_model_patch.js
rename to addons/mail/static/src/discuss/core/attachment_model_patch.js
diff --git a/addons/mail/static/src/discuss/call_settings.js b/addons/mail/static/src/discuss/core/call_settings.js
similarity index 100%
rename from addons/mail/static/src/discuss/call_settings.js
rename to addons/mail/static/src/discuss/core/call_settings.js
diff --git a/addons/mail/static/src/discuss/call_settings.xml b/addons/mail/static/src/discuss/core/call_settings.xml
similarity index 100%
rename from addons/mail/static/src/discuss/call_settings.xml
rename to addons/mail/static/src/discuss/core/call_settings.xml
diff --git a/addons/mail/static/src/discuss/channel_commands.js b/addons/mail/static/src/discuss/core/channel_commands.js
similarity index 100%
rename from addons/mail/static/src/discuss/channel_commands.js
rename to addons/mail/static/src/discuss/core/channel_commands.js
diff --git a/addons/mail/static/src/discuss/channel_invitation.js b/addons/mail/static/src/discuss/core/channel_invitation.js
similarity index 100%
rename from addons/mail/static/src/discuss/channel_invitation.js
rename to addons/mail/static/src/discuss/core/channel_invitation.js
diff --git a/addons/mail/static/src/discuss/channel_invitation.scss b/addons/mail/static/src/discuss/core/channel_invitation.scss
similarity index 100%
rename from addons/mail/static/src/discuss/channel_invitation.scss
rename to addons/mail/static/src/discuss/core/channel_invitation.scss
diff --git a/addons/mail/static/src/discuss/channel_invitation.xml b/addons/mail/static/src/discuss/core/channel_invitation.xml
similarity index 100%
rename from addons/mail/static/src/discuss/channel_invitation.xml
rename to addons/mail/static/src/discuss/core/channel_invitation.xml
diff --git a/addons/mail/static/src/discuss/channel_member_list.js b/addons/mail/static/src/discuss/core/channel_member_list.js
similarity index 100%
rename from addons/mail/static/src/discuss/channel_member_list.js
rename to addons/mail/static/src/discuss/core/channel_member_list.js
diff --git a/addons/mail/static/src/discuss/channel_member_list.scss b/addons/mail/static/src/discuss/core/channel_member_list.scss
similarity index 100%
rename from addons/mail/static/src/discuss/channel_member_list.scss
rename to addons/mail/static/src/discuss/core/channel_member_list.scss
diff --git a/addons/mail/static/src/discuss/channel_member_list.xml b/addons/mail/static/src/discuss/core/channel_member_list.xml
similarity index 100%
rename from addons/mail/static/src/discuss/channel_member_list.xml
rename to addons/mail/static/src/discuss/core/channel_member_list.xml
diff --git a/addons/mail/static/src/discuss/discuss_patch.js b/addons/mail/static/src/discuss/core/discuss_patch.js
similarity index 85%
rename from addons/mail/static/src/discuss/discuss_patch.js
rename to addons/mail/static/src/discuss/core/discuss_patch.js
index 4ee83b4c6a3..9ee304550a2 100644
--- a/addons/mail/static/src/discuss/discuss_patch.js
+++ b/addons/mail/static/src/discuss/core/discuss_patch.js
@@ -1,8 +1,8 @@
 /* @odoo-module */
 
-import { CallSettings } from "@mail/discuss/call_settings";
-import { ChannelInvitation } from "@mail/discuss/channel_invitation";
-import { ChannelMemberList } from "@mail/discuss/channel_member_list";
+import { CallSettings } from "@mail/discuss/core/call_settings";
+import { ChannelInvitation } from "@mail/discuss/core/channel_invitation";
+import { ChannelMemberList } from "@mail/discuss/core/channel_member_list";
 import { Discuss } from "@mail/discuss_app/discuss";
 import { useRef } from "@odoo/owl";
 import { usePopover } from "@web/core/popover/popover_hook";
diff --git a/addons/mail/static/src/discuss/discuss_patch.scss b/addons/mail/static/src/discuss/core/discuss_patch.scss
similarity index 100%
rename from addons/mail/static/src/discuss/discuss_patch.scss
rename to addons/mail/static/src/discuss/core/discuss_patch.scss
diff --git a/addons/mail/static/src/discuss/discuss_patch.xml b/addons/mail/static/src/discuss/core/discuss_patch.xml
similarity index 100%
rename from addons/mail/static/src/discuss/discuss_patch.xml
rename to addons/mail/static/src/discuss/core/discuss_patch.xml
diff --git a/addons/mail/static/src/discuss/suggestion_service_patch.js b/addons/mail/static/src/discuss/core/suggestion_service_patch.js
similarity index 100%
rename from addons/mail/static/src/discuss/suggestion_service_patch.js
rename to addons/mail/static/src/discuss/core/suggestion_service_patch.js
diff --git a/addons/mail/static/src/discuss/thread_service_patch.js b/addons/mail/static/src/discuss/core/thread_service_patch.js
similarity index 100%
rename from addons/mail/static/src/discuss/thread_service_patch.js
rename to addons/mail/static/src/discuss/core/thread_service_patch.js
diff --git a/addons/mail/static/src/discuss/web/chat_window_patch.js b/addons/mail/static/src/discuss/web/chat_window_patch.js
index 97314323c47..d20b49d7904 100644
--- a/addons/mail/static/src/discuss/web/chat_window_patch.js
+++ b/addons/mail/static/src/discuss/web/chat_window_patch.js
@@ -1,8 +1,8 @@
 /* @odoo-module */
 
-import { CallSettings } from "@mail/discuss/call_settings";
-import { ChannelInvitation } from "@mail/discuss/channel_invitation";
-import { ChannelMemberList } from "@mail/discuss/channel_member_list";
+import { CallSettings } from "@mail/discuss/core/call_settings";
+import { ChannelInvitation } from "@mail/discuss/core/channel_invitation";
+import { ChannelMemberList } from "@mail/discuss/core/channel_member_list";
 import { ChatWindow } from "@mail/web/chat_window/chat_window";
 import { patch } from "@web/core/utils/patch";
 import { _t } from "@web/core/l10n/translation";