diff --git a/addons/mail/__manifest__.py b/addons/mail/__manifest__.py
index f5194319eea..517964025b6 100644
--- a/addons/mail/__manifest__.py
+++ b/addons/mail/__manifest__.py
@@ -185,7 +185,7 @@ For more specific needs, you may also assign custom-defined actions
             'web/static/src/legacy/utils.js',
 
             'mail/static/src/core/common/**/*',
-            'mail/static/src/core/public/**/*',
+            # 'mail/static/src/core/public/**/*',
             'mail/static/src/**/common/**/*',
             'mail/static/src/**/public/**/*',
             ('remove', 'mail/static/src/core/common/emoji_data.js'),
@@ -193,7 +193,7 @@ For more specific needs, you may also assign custom-defined actions
             # discuss (loaded last to fix dependencies)
             ('remove', 'mail/static/src/discuss/**/*'),
             'mail/static/src/discuss/core/common/**/*',
-            # 'mail/static/src/discuss/core/public/**/*',
+            'mail/static/src/discuss/core/public/**/*',
             'mail/static/src/discuss/**/common/**/*',
             'mail/static/src/discuss/**/public/**/*',
             ('remove', 'mail/static/src/discuss/**/*.dark.scss'),
diff --git a/addons/mail/static/src/discuss/call/public/discuss_public_patch.js b/addons/mail/static/src/discuss/call/public/discuss_public_patch.js
index 7b13751c2ac..2d41d3ad26f 100644
--- a/addons/mail/static/src/discuss/call/public/discuss_public_patch.js
+++ b/addons/mail/static/src/discuss/call/public/discuss_public_patch.js
@@ -1,6 +1,6 @@
 /* @odoo-module */
 
-import { DiscussPublic } from "@mail/core/public/discuss_public";
+import { DiscussPublic } from "@mail/discuss/core/public/discuss_public";
 import { useRtc } from "@mail/discuss/call/common/rtc_hook";
 
 import { browser } from "@web/core/browser/browser";
diff --git a/addons/mail/static/src/core/public/boot.js b/addons/mail/static/src/discuss/core/public/boot.js
similarity index 93%
rename from addons/mail/static/src/core/public/boot.js
rename to addons/mail/static/src/discuss/core/public/boot.js
index c57e38dc925..82b8d43f153 100644
--- a/addons/mail/static/src/core/public/boot.js
+++ b/addons/mail/static/src/discuss/core/public/boot.js
@@ -1,6 +1,6 @@
 /* @odoo-module */
 
-import { DiscussPublic } from "@mail/core/public/discuss_public";
+import { DiscussPublic } from "@mail/discuss/core/public/discuss_public";
 import { data } from "mail.discuss_public_template";
 
 import { Component, mount, whenReady } from "@odoo/owl";
diff --git a/addons/mail/static/src/core/public/context_service.js b/addons/mail/static/src/discuss/core/public/context_service.js
similarity index 100%
rename from addons/mail/static/src/core/public/context_service.js
rename to addons/mail/static/src/discuss/core/public/context_service.js
diff --git a/addons/mail/static/src/core/public/discuss_public.js b/addons/mail/static/src/discuss/core/public/discuss_public.js
similarity index 96%
rename from addons/mail/static/src/core/public/discuss_public.js
rename to addons/mail/static/src/discuss/core/public/discuss_public.js
index b4e861bd35b..684f4ac353b 100644
--- a/addons/mail/static/src/core/public/discuss_public.js
+++ b/addons/mail/static/src/discuss/core/public/discuss_public.js
@@ -2,7 +2,7 @@
 
 import { Discuss } from "@mail/core/common/discuss";
 import { useMessaging, useStore } from "@mail/core/common/messaging_hook";
-import { WelcomePage } from "@mail/core/public/welcome_page";
+import { WelcomePage } from "@mail/discuss/core/public/welcome_page";
 
 import { Component, useEffect, useState } from "@odoo/owl";
 
diff --git a/addons/mail/static/src/core/public/discuss_public.xml b/addons/mail/static/src/discuss/core/public/discuss_public.xml
similarity index 100%
rename from addons/mail/static/src/core/public/discuss_public.xml
rename to addons/mail/static/src/discuss/core/public/discuss_public.xml
diff --git a/addons/mail/static/src/core/public/root_widget.js b/addons/mail/static/src/discuss/core/public/root_widget.js
similarity index 91%
rename from addons/mail/static/src/core/public/root_widget.js
rename to addons/mail/static/src/discuss/core/public/root_widget.js
index 5eaa633a342..d8e940785c0 100644
--- a/addons/mail/static/src/core/public/root_widget.js
+++ b/addons/mail/static/src/discuss/core/public/root_widget.js
@@ -5,7 +5,7 @@
  */
 // need to wait for owl.Component.env to be set by new/public/boot before
 // we spawn the component adapter
-import "@mail/core/public/boot";
+import "@mail/discuss/core/public/boot";
 
 import { Component } from "@odoo/owl";
 
diff --git a/addons/mail/static/src/core/public/welcome_page.js b/addons/mail/static/src/discuss/core/public/welcome_page.js
similarity index 100%
rename from addons/mail/static/src/core/public/welcome_page.js
rename to addons/mail/static/src/discuss/core/public/welcome_page.js
diff --git a/addons/mail/static/src/core/public/welcome_page.xml b/addons/mail/static/src/discuss/core/public/welcome_page.xml
similarity index 98%
rename from addons/mail/static/src/core/public/welcome_page.xml
rename to addons/mail/static/src/discuss/core/public/welcome_page.xml
index 1c7ad250850..4b55e40ae9d 100644
--- a/addons/mail/static/src/core/public/welcome_page.xml
+++ b/addons/mail/static/src/discuss/core/public/welcome_page.xml
@@ -20,7 +20,7 @@
                 <div class="position-absolute bottom-0">
                     <button class="btn fa-stack align-self-end p-0 m-3 rounded-circle fs-1 shadow" t-attf-class="{{ state.audioStream ? 'btn-dark' : 'btn-danger' }}" t-on-click="onClickMic">
                         <i class="fa fa-stack" t-attf-class="{{ state.audioStream ? 'fa-microphone-slash' : 'fa-microphone' }}"/>
-                    </button>                    
+                    </button>
                     <button class="btn fa-stack align-self-end p-0 m-3 rounded-circle fs-1 shadow" t-attf-class="{{ state.videoStream ? 'btn-dark' : 'btn-danger' }}" t-on-click="onClickVideo">
                         <i class="fa fa-camera fa-stack"/>
                     </button>