diff --git a/addons/calendar/__manifest__.py b/addons/calendar/__manifest__.py
index c9b612747fe..a1809d8c915 100644
--- a/addons/calendar/__manifest__.py
+++ b/addons/calendar/__manifest__.py
@@ -39,7 +39,7 @@ If you need to manage your meetings, you should install the CRM module.
     'auto_install': False,
     'assets': {
         'web.assets_backend': [
-            'calendar/static/src/models/*/*.js',
+            'calendar/static/src/models/*.js',
             'calendar/static/src/scss/calendar.scss',
             'calendar/static/src/js/base_calendar.js',
             'calendar/static/src/js/calendar_renderer.js',
diff --git a/addons/calendar/static/src/models/activity/activity.js b/addons/calendar/static/src/models/activity.js
similarity index 97%
rename from addons/calendar/static/src/models/activity/activity.js
rename to addons/calendar/static/src/models/activity.js
index a2fc3e1786f..891baf8956a 100644
--- a/addons/calendar/static/src/models/activity/activity.js
+++ b/addons/calendar/static/src/models/activity.js
@@ -3,7 +3,7 @@
 import { addFields, patchModelMethods, patchRecordMethods } from '@mail/model/model_core';
 import { attr } from '@mail/model/model_field';
 // ensure that the model definition is loaded before the patch
-import '@mail/models/activity/activity';
+import '@mail/models/activity';
 
 addFields('Activity', {
     calendar_event_id: attr({ default: false }),
diff --git a/addons/calendar/static/src/models/activity_view/activity_view.js b/addons/calendar/static/src/models/activity_view.js
similarity index 93%
rename from addons/calendar/static/src/models/activity_view/activity_view.js
rename to addons/calendar/static/src/models/activity_view.js
index b7c7ff78f8b..48bbe929be9 100644
--- a/addons/calendar/static/src/models/activity_view/activity_view.js
+++ b/addons/calendar/static/src/models/activity_view.js
@@ -2,7 +2,7 @@
 
 import { patchRecordMethods } from '@mail/model/model_core';
 // ensure that the model definition is loaded before the patch
-import '@mail/models/activity_view/activity_view';
+import '@mail/models/activity_view';
 
 import Dialog from 'web.Dialog';
 
diff --git a/addons/crm_livechat/__manifest__.py b/addons/crm_livechat/__manifest__.py
index a12ae3c817c..d43908c47ea 100644
--- a/addons/crm_livechat/__manifest__.py
+++ b/addons/crm_livechat/__manifest__.py
@@ -17,10 +17,10 @@
     'license': 'LGPL-3',
     'assets': {
         'mail.assets_discuss_public': [
-            'crm_livechat/static/src/models/*/*.js',
+            'crm_livechat/static/src/models/*.js',
         ],
         'web.assets_backend': [
-            'crm_livechat/static/src/models/*/*.js',
+            'crm_livechat/static/src/models/*.js',
         ],
     },
 }
diff --git a/addons/crm_livechat/static/src/models/messaging_initializer/messaging_initializer.js b/addons/crm_livechat/static/src/models/messaging_initializer.js
similarity index 89%
rename from addons/crm_livechat/static/src/models/messaging_initializer/messaging_initializer.js
rename to addons/crm_livechat/static/src/models/messaging_initializer.js
index da8f6baf2af..3210719b5ba 100644
--- a/addons/crm_livechat/static/src/models/messaging_initializer/messaging_initializer.js
+++ b/addons/crm_livechat/static/src/models/messaging_initializer.js
@@ -3,7 +3,7 @@
 import { patchRecordMethods } from '@mail/model/model_core';
 import { insert } from '@mail/model/model_field_command';
 // ensure that the model definition is loaded before the patch
-import '@mail/models/messaging_initializer/messaging_initializer';
+import '@mail/models/messaging_initializer';
 
 patchRecordMethods('MessagingInitializer', {
     /**
diff --git a/addons/hr/__manifest__.py b/addons/hr/__manifest__.py
index a243ee70e60..7025ef46b80 100644
--- a/addons/hr/__manifest__.py
+++ b/addons/hr/__manifest__.py
@@ -50,7 +50,7 @@
     'auto_install': False,
     'assets': {
         'mail.assets_discuss_public': [
-            'hr/static/src/models/*/*.js',
+            'hr/static/src/models/*.js',
         ],
         'web.assets_backend': [
             'hr/static/src/scss/hr.scss',
@@ -61,7 +61,7 @@
             'hr/static/src/js/standalone_m2o_avatar_employee.js',
             'hr/static/src/js/user_menu.js',
             'hr/static/src/js/work_permit_upload.js',
-            'hr/static/src/models/*/*.js',
+            'hr/static/src/models/*.js',
         ],
         'web.assets_qweb': [
             'hr/static/src/xml/*.xml',
diff --git a/addons/hr/static/src/models/employee/employee.js b/addons/hr/static/src/models/employee.js
similarity index 100%
rename from addons/hr/static/src/models/employee/employee.js
rename to addons/hr/static/src/models/employee.js
diff --git a/addons/hr/static/src/models/messaging/messaging.js b/addons/hr/static/src/models/messaging.js
similarity index 95%
rename from addons/hr/static/src/models/messaging/messaging.js
rename to addons/hr/static/src/models/messaging.js
index 23937802afc..0ac64a70dc3 100644
--- a/addons/hr/static/src/models/messaging/messaging.js
+++ b/addons/hr/static/src/models/messaging.js
@@ -2,7 +2,7 @@
 
 import { patchRecordMethods } from '@mail/model/model_core';
 // ensure that the model definition is loaded before the patch
-import '@mail/models/messaging/messaging';
+import '@mail/models/messaging';
 
 patchRecordMethods('Messaging', {
     /**
diff --git a/addons/hr/static/src/models/partner/partner.js b/addons/hr/static/src/models/partner.js
similarity index 97%
rename from addons/hr/static/src/models/partner/partner.js
rename to addons/hr/static/src/models/partner.js
index 7fea3f883ba..db2de354622 100644
--- a/addons/hr/static/src/models/partner/partner.js
+++ b/addons/hr/static/src/models/partner.js
@@ -3,7 +3,7 @@
 import { addFields, addRecordMethods, patchRecordMethods } from '@mail/model/model_core';
 import { attr, one } from '@mail/model/model_field';
 // ensure that the model definition is loaded before the patch
-import '@mail/models/partner/partner';
+import '@mail/models/partner';
 
 addRecordMethods('Partner', {
     /**
diff --git a/addons/hr/static/src/models/user/user.js b/addons/hr/static/src/models/user.js
similarity index 90%
rename from addons/hr/static/src/models/user/user.js
rename to addons/hr/static/src/models/user.js
index ce162fbf64b..8e59adae956 100644
--- a/addons/hr/static/src/models/user/user.js
+++ b/addons/hr/static/src/models/user.js
@@ -3,7 +3,7 @@
 import { addFields } from '@mail/model/model_core';
 import { one } from '@mail/model/model_field';
 // ensure that the model definition is loaded before the patch
-import '@mail/models/user/user';
+import '@mail/models/user';
 
 addFields('User', {
     /**
diff --git a/addons/hr_holidays/__manifest__.py b/addons/hr_holidays/__manifest__.py
index c380798da01..491a2e81717 100644
--- a/addons/hr_holidays/__manifest__.py
+++ b/addons/hr_holidays/__manifest__.py
@@ -64,11 +64,11 @@ A synchronization with an internal agenda (Meetings of the CRM module) is also p
     'assets': {
         'mail.assets_discuss_public': [
             'hr_holidays/static/src/components/*/*',
-            'hr_holidays/static/src/models/*/*.js',
+            'hr_holidays/static/src/models/*.js',
         ],
         'web.assets_backend': [
             'hr_holidays/static/src/js/**/*.js',
-            'hr_holidays/static/src/models/*/*.js',
+            'hr_holidays/static/src/models/*.js',
             'hr_holidays/static/src/components/*/*.scss',
             'hr_holidays/static/src/dashboard/**/*.js',
             'hr_holidays/static/src/dashboard/**/*.scss',
diff --git a/addons/hr_holidays/static/src/models/partner/partner.js b/addons/hr_holidays/static/src/models/partner.js
similarity index 98%
rename from addons/hr_holidays/static/src/models/partner/partner.js
rename to addons/hr_holidays/static/src/models/partner.js
index 9329c589038..fae6e2ff173 100644
--- a/addons/hr_holidays/static/src/models/partner/partner.js
+++ b/addons/hr_holidays/static/src/models/partner.js
@@ -4,7 +4,7 @@ import { addFields, addRecordMethods, patchModelMethods, patchRecordMethods } fr
 import { attr } from '@mail/model/model_field';
 import { clear } from '@mail/model/model_field_command';
 // ensure that the model definition is loaded before the patch
-import '@mail/models/partner/partner';
+import '@mail/models/partner';
 
 import { str_to_date } from 'web.time';
 
diff --git a/addons/im_livechat/__manifest__.py b/addons/im_livechat/__manifest__.py
index 6cb1c7185e0..bce84372102 100644
--- a/addons/im_livechat/__manifest__.py
+++ b/addons/im_livechat/__manifest__.py
@@ -44,13 +44,13 @@ Help your customers with this chat, and analyse their feedback.
     'assets': {
         'mail.assets_discuss_public': [
             'im_livechat/static/src/components/*/*',
-            'im_livechat/static/src/models/*/*.js',
+            'im_livechat/static/src/models/*.js',
         ],
         'web.assets_backend': [
             'im_livechat/static/src/js/im_livechat_channel_form_view.js',
             'im_livechat/static/src/js/im_livechat_channel_form_controller.js',
             'im_livechat/static/src/components/*/*.js',
-            'im_livechat/static/src/models/*/*.js',
+            'im_livechat/static/src/models/*.js',
             'im_livechat/static/src/scss/im_livechat_history.scss',
             'im_livechat/static/src/scss/im_livechat_form.scss',
         ],
diff --git a/addons/im_livechat/static/src/models/chat_window/chat_window.js b/addons/im_livechat/static/src/models/chat_window.js
similarity index 92%
rename from addons/im_livechat/static/src/models/chat_window/chat_window.js
rename to addons/im_livechat/static/src/models/chat_window.js
index c4ce2b40fe4..ea5b6346738 100644
--- a/addons/im_livechat/static/src/models/chat_window/chat_window.js
+++ b/addons/im_livechat/static/src/models/chat_window.js
@@ -2,7 +2,7 @@
 
 import { patchRecordMethods } from '@mail/model/model_core';
 // ensure that the model definition is loaded before the patch
-import '@mail/models/chat_window/chat_window';
+import '@mail/models/chat_window';
 
 patchRecordMethods('ChatWindow', {
     /**
diff --git a/addons/im_livechat/static/src/models/discuss/discuss.js b/addons/im_livechat/static/src/models/discuss.js
similarity index 94%
rename from addons/im_livechat/static/src/models/discuss/discuss.js
rename to addons/im_livechat/static/src/models/discuss.js
index bc70abb3caa..0fd5f8238e0 100644
--- a/addons/im_livechat/static/src/models/discuss/discuss.js
+++ b/addons/im_livechat/static/src/models/discuss.js
@@ -3,7 +3,7 @@
 import { addFields, patchRecordMethods } from '@mail/model/model_core';
 import { one } from '@mail/model/model_field';
 // ensure that the model definition is loaded before the patch
-import '@mail/models/discuss/discuss';
+import '@mail/models/discuss';
 
 patchRecordMethods('Discuss', {
     /**
diff --git a/addons/im_livechat/static/src/models/discuss_sidebar_category/discuss_sidebar_category.js b/addons/im_livechat/static/src/models/discuss_sidebar_category.js
similarity index 87%
rename from addons/im_livechat/static/src/models/discuss_sidebar_category/discuss_sidebar_category.js
rename to addons/im_livechat/static/src/models/discuss_sidebar_category.js
index 6b0402ae0f7..fd34017603b 100644
--- a/addons/im_livechat/static/src/models/discuss_sidebar_category/discuss_sidebar_category.js
+++ b/addons/im_livechat/static/src/models/discuss_sidebar_category.js
@@ -3,7 +3,7 @@
 import { addFields, patchIdentifyingFields } from '@mail/model/model_core';
 import { one } from '@mail/model/model_field';
 // ensure that the model definition is loaded before the patch
-import '@mail/models/discuss_sidebar_category/discuss_sidebar_category';
+import '@mail/models/discuss_sidebar_category';
 
 addFields('DiscussSidebarCategory', {
     discussAsLivechat: one('Discuss', {
diff --git a/addons/im_livechat/static/src/models/discuss_sidebar_category_item/discuss_sidebar_category_item.js b/addons/im_livechat/static/src/models/discuss_sidebar_category_item.js
similarity index 94%
rename from addons/im_livechat/static/src/models/discuss_sidebar_category_item/discuss_sidebar_category_item.js
rename to addons/im_livechat/static/src/models/discuss_sidebar_category_item.js
index 4d882e929c8..dd8515f12cc 100644
--- a/addons/im_livechat/static/src/models/discuss_sidebar_category_item/discuss_sidebar_category_item.js
+++ b/addons/im_livechat/static/src/models/discuss_sidebar_category_item.js
@@ -2,7 +2,7 @@
 
 import { patchRecordMethods } from '@mail/model/model_core';
 // ensure that the model definition is loaded before the patch
-import '@mail/models/discuss_sidebar_category_item/discuss_sidebar_category_item';
+import '@mail/models/discuss_sidebar_category_item';
 
 patchRecordMethods('DiscussSidebarCategoryItem', {
     /**
diff --git a/addons/im_livechat/static/src/models/message/message.js b/addons/im_livechat/static/src/models/message.js
similarity index 95%
rename from addons/im_livechat/static/src/models/message/message.js
rename to addons/im_livechat/static/src/models/message.js
index 071f2db36ef..b72fcfc63e3 100644
--- a/addons/im_livechat/static/src/models/message/message.js
+++ b/addons/im_livechat/static/src/models/message.js
@@ -3,7 +3,7 @@
 import { patchModelMethods } from '@mail/model/model_core';
 import { insertAndReplace } from '@mail/model/model_field_command';
 // ensure the model definition is loaded before the patch
-import '@mail/models/message/message';
+import '@mail/models/message';
 
 patchModelMethods('Message', {
     /**
diff --git a/addons/im_livechat/static/src/models/messaging/messaging.js b/addons/im_livechat/static/src/models/messaging.js
similarity index 90%
rename from addons/im_livechat/static/src/models/messaging/messaging.js
rename to addons/im_livechat/static/src/models/messaging.js
index 904541d2eab..0453edb6a7d 100644
--- a/addons/im_livechat/static/src/models/messaging/messaging.js
+++ b/addons/im_livechat/static/src/models/messaging.js
@@ -3,7 +3,7 @@
 import { addFields } from '@mail/model/model_core';
 import { many } from '@mail/model/model_field';
 // ensure that the model definition is loaded before the patch
-import '@mail/models/messaging/messaging';
+import '@mail/models/messaging';
 
 addFields('Messaging', {
     /**
diff --git a/addons/im_livechat/static/src/models/messaging_initializer/messaging_initializer.js b/addons/im_livechat/static/src/models/messaging_initializer.js
similarity index 95%
rename from addons/im_livechat/static/src/models/messaging_initializer/messaging_initializer.js
rename to addons/im_livechat/static/src/models/messaging_initializer.js
index f76444638c5..1f7a4f2e918 100644
--- a/addons/im_livechat/static/src/models/messaging_initializer/messaging_initializer.js
+++ b/addons/im_livechat/static/src/models/messaging_initializer.js
@@ -3,7 +3,7 @@
 import { patchRecordMethods } from '@mail/model/model_core';
 import { insert, insertAndReplace } from '@mail/model/model_field_command';
 // ensure that the model definition is loaded before the patch
-import '@mail/models/messaging_initializer/messaging_initializer';
+import '@mail/models/messaging_initializer';
 
 patchRecordMethods('MessagingInitializer', {
     /**
diff --git a/addons/im_livechat/static/src/models/messaging_notification_handler/messaging_notification_handler.js b/addons/im_livechat/static/src/models/messaging_notification_handler.js
similarity index 96%
rename from addons/im_livechat/static/src/models/messaging_notification_handler/messaging_notification_handler.js
rename to addons/im_livechat/static/src/models/messaging_notification_handler.js
index 31bdda1c8d9..07137e97bf2 100644
--- a/addons/im_livechat/static/src/models/messaging_notification_handler/messaging_notification_handler.js
+++ b/addons/im_livechat/static/src/models/messaging_notification_handler.js
@@ -2,7 +2,7 @@
 
 import { patchRecordMethods } from '@mail/model/model_core';
 // ensure that the model definition is loaded before the patch
-import '@mail/models/messaging_notification_handler/messaging_notification_handler';
+import '@mail/models/messaging_notification_handler';
 
 patchRecordMethods('MessagingNotificationHandler', {
     /**
diff --git a/addons/im_livechat/static/src/models/mobile_messaging_navbar_view/mobile_messaging_navbar_view.js b/addons/im_livechat/static/src/models/mobile_messaging_navbar_view.js
similarity index 87%
rename from addons/im_livechat/static/src/models/mobile_messaging_navbar_view/mobile_messaging_navbar_view.js
rename to addons/im_livechat/static/src/models/mobile_messaging_navbar_view.js
index be26bf92e80..be305ee7b62 100644
--- a/addons/im_livechat/static/src/models/mobile_messaging_navbar_view/mobile_messaging_navbar_view.js
+++ b/addons/im_livechat/static/src/models/mobile_messaging_navbar_view.js
@@ -2,7 +2,7 @@
 
 import { patchRecordMethods } from '@mail/model/model_core';
 // ensure that the model definition is loaded before the patch
-import '@mail/models/mobile_messaging_navbar_view/mobile_messaging_navbar_view';
+import '@mail/models/mobile_messaging_navbar_view';
 
 patchRecordMethods('MobileMessagingNavbarView', {
     /**
diff --git a/addons/im_livechat/static/src/models/notification_list_view/notification_list_view.js b/addons/im_livechat/static/src/models/notification_list_view.js
similarity index 81%
rename from addons/im_livechat/static/src/models/notification_list_view/notification_list_view.js
rename to addons/im_livechat/static/src/models/notification_list_view.js
index 7679c784300..a00d6164097 100644
--- a/addons/im_livechat/static/src/models/notification_list_view/notification_list_view.js
+++ b/addons/im_livechat/static/src/models/notification_list_view.js
@@ -2,7 +2,7 @@
 
 import { patchRecordMethods } from '@mail/model/model_core';
 import { replace } from '@mail/model/model_field_command';
-import '@mail/models/notification_list_view/notification_list_view'; // ensure the model definition is loaded before the patch
+import '@mail/models/notification_list_view'; // ensure the model definition is loaded before the patch
 
 patchRecordMethods('NotificationListView', {
     /**
diff --git a/addons/im_livechat/static/src/models/partner/partner.js b/addons/im_livechat/static/src/models/partner.js
similarity index 96%
rename from addons/im_livechat/static/src/models/partner/partner.js
rename to addons/im_livechat/static/src/models/partner.js
index db724b865c4..8a06dae65b3 100644
--- a/addons/im_livechat/static/src/models/partner/partner.js
+++ b/addons/im_livechat/static/src/models/partner.js
@@ -4,7 +4,7 @@ import { addFields, addModelMethods, patchModelMethods } from '@mail/model/model
 import { attr } from '@mail/model/model_field';
 
 // ensure that the model definition is loaded before the patch
-import '@mail/models/partner/partner';
+import '@mail/models/partner';
 
 let nextPublicId = -1;
 
diff --git a/addons/im_livechat/static/src/models/thread/thread.js b/addons/im_livechat/static/src/models/thread.js
similarity index 99%
rename from addons/im_livechat/static/src/models/thread/thread.js
rename to addons/im_livechat/static/src/models/thread.js
index 2bce92aff8c..3a64de81f81 100644
--- a/addons/im_livechat/static/src/models/thread/thread.js
+++ b/addons/im_livechat/static/src/models/thread.js
@@ -4,7 +4,7 @@ import { addFields, addRecordMethods, patchModelMethods, patchRecordMethods } fr
 import { one } from '@mail/model/model_field';
 import { clear, insert, link, replace, unlink } from '@mail/model/model_field_command';
 // ensure that the model definition is loaded before the patch
-import '@mail/models/thread/thread';
+import '@mail/models/thread';
 
 addFields('Thread', {
     /**
diff --git a/addons/mail/__manifest__.py b/addons/mail/__manifest__.py
index 6b47bc14cc9..8ea94ac444e 100644
--- a/addons/mail/__manifest__.py
+++ b/addons/mail/__manifest__.py
@@ -81,7 +81,7 @@
             'mail/static/src/js/emojis.js',
             'mail/static/src/js/utils.js',
             'mail/static/src/model/*.js',
-            'mail/static/src/models/*/*.js',
+            'mail/static/src/models/*.js',
             'mail/static/src/public/*',
             'mail/static/src/services/messaging/messaging.js',
             'mail/static/src/utils/*/*.js',
@@ -124,7 +124,7 @@
             'mail/static/src/components/*/*.js',
             'mail/static/src/components/*/*.scss',
             'mail/static/src/model/*.js',
-            'mail/static/src/models/*/*.js',
+            'mail/static/src/models/*.js',
             'mail/static/src/services/*/*.js',
             'mail/static/src/webclient/commands/*.js',
             'mail/static/src/widgets/*/*.js',
@@ -151,7 +151,6 @@
             'mail/static/tests/webclient/commands/*.js',
             'mail/static/src/components/*/tests/*.js',
             'mail/static/src/model/tests/**/*.js',
-            'mail/static/src/models/*/tests/*.js',
             'mail/static/src/utils/*/tests/*.js',
             'mail/static/src/widgets/*/tests/*.js',
         ],
diff --git a/addons/mail/static/src/components/chat_window_manager/tests/chat_window_manager_tests.js b/addons/mail/static/src/components/chat_window_manager/tests/chat_window_manager_tests.js
index 5564ac7f178..ea2c957ba60 100644
--- a/addons/mail/static/src/components/chat_window_manager/tests/chat_window_manager_tests.js
+++ b/addons/mail/static/src/components/chat_window_manager/tests/chat_window_manager_tests.js
@@ -234,7 +234,7 @@ QUnit.test('open chat from "new message" chat window should open chat in place o
     /**
      * InnerWith computation uses following info:
      * ([mocked] global window width: @see `mail/static/src/utils/test_utils.js:start()` method)
-     * (others: @see mail/static/src/models/chat_window_manager/chat_window_manager.js:visual)
+     * (others: @see mail/static/src/models/chat_window_manager.js:visual)
      *
      * - chat window width: 325px
      * - start/end/between gap width: 10px/10px/5px
@@ -868,7 +868,7 @@ QUnit.test('focus next visible chat window when closing current chat window with
     /**
      * computation uses following info:
      * ([mocked] global window width: @see `mail/static/src/utils/test_utils.js:start()` method)
-     * (others: @see mail/static/src/models/chat_window_manager/chat_window_manager.js:visual)
+     * (others: @see mail/static/src/models/chat_window_manager.js:visual)
      *
      * - chat window width: 325px
      * - start/end/between gap width: 10px/10px/5px
@@ -1062,7 +1062,7 @@ QUnit.test('open 2 different chat windows: enough screen width [REQUIRE FOCUS]',
     /**
      * computation uses following info:
      * ([mocked] global window width: @see `mail/static/src/utils/test_utils.js:start()` method)
-     * (others: @see mail/static/src/models/chat_window_manager/chat_window_manager.js:visual)
+     * (others: @see mail/static/src/models/chat_window_manager.js:visual)
      *
      * - chat window width: 325px
      * - start/end/between gap width: 10px/10px/5px
@@ -1280,7 +1280,7 @@ QUnit.test('open 2 folded chat windows: check shift operations are available', a
     /**
      * computation uses following info:
      * ([mocked] global window width: 900px)
-     * (others: @see `mail/static/src/models/chat_window_manager/chat_window_manager.js:visual`)
+     * (others: @see `mail/static/src/models/chat_window_manager.js:visual`)
      *
      * - chat window width: 325px
      * - start/end/between gap width: 10px/10px/5px
@@ -1406,7 +1406,7 @@ QUnit.test('open 3 different chat windows: not enough screen width', async funct
     /**
      * computation uses following info:
      * ([mocked] global window width: 900px)
-     * (others: @see `mail/static/src/models/chat_window_manager/chat_window_manager.js:visual`)
+     * (others: @see `mail/static/src/models/chat_window_manager.js:visual`)
      *
      * - chat window width: 325px
      * - start/end/between gap width: 10px/10px/5px
@@ -1665,7 +1665,7 @@ QUnit.test('chat window: TAB cycle with 3 open chat windows [REQUIRE FOCUS]', as
     /**
      * InnerWith computation uses following info:
      * ([mocked] global window width: @see `mail/static/src/utils/test_utils.js:start()` method)
-     * (others: @see mail/static/src/models/chat_window_manager/chat_window_manager.js:visual)
+     * (others: @see mail/static/src/models/chat_window_manager.js:visual)
      *
      * - chat window width: 325px
      * - start/end/between gap width: 10px/10px/5px
@@ -2064,7 +2064,7 @@ QUnit.test('chat window does not fetch messages if hidden', async function (asse
     /**
      * computation uses following info:
      * ([mocked] global window width: 900px)
-     * (others: @see `mail/static/src/models/chat_window_manager/chat_window_manager.js:visual`)
+     * (others: @see `mail/static/src/models/chat_window_manager.js:visual`)
      *
      * - chat window width: 325px
      * - start/end/between gap width: 10px/10px/5px
diff --git a/addons/mail/static/src/models/activity/activity.js b/addons/mail/static/src/models/activity.js
similarity index 100%
rename from addons/mail/static/src/models/activity/activity.js
rename to addons/mail/static/src/models/activity.js
diff --git a/addons/mail/static/src/models/activity_box_view/activity_box_view.js b/addons/mail/static/src/models/activity_box_view.js
similarity index 100%
rename from addons/mail/static/src/models/activity_box_view/activity_box_view.js
rename to addons/mail/static/src/models/activity_box_view.js
diff --git a/addons/mail/static/src/models/activity_mark_done_popover_view/activity_mark_done_popover_view.js b/addons/mail/static/src/models/activity_mark_done_popover_view.js
similarity index 100%
rename from addons/mail/static/src/models/activity_mark_done_popover_view/activity_mark_done_popover_view.js
rename to addons/mail/static/src/models/activity_mark_done_popover_view.js
diff --git a/addons/mail/static/src/models/activity_type/activity_type.js b/addons/mail/static/src/models/activity_type.js
similarity index 100%
rename from addons/mail/static/src/models/activity_type/activity_type.js
rename to addons/mail/static/src/models/activity_type.js
diff --git a/addons/mail/static/src/models/activity_view/activity_view.js b/addons/mail/static/src/models/activity_view.js
similarity index 100%
rename from addons/mail/static/src/models/activity_view/activity_view.js
rename to addons/mail/static/src/models/activity_view.js
diff --git a/addons/mail/static/src/models/attachment/attachment.js b/addons/mail/static/src/models/attachment.js
similarity index 100%
rename from addons/mail/static/src/models/attachment/attachment.js
rename to addons/mail/static/src/models/attachment.js
diff --git a/addons/mail/static/src/models/attachment_box_view/attachment_box_view.js b/addons/mail/static/src/models/attachment_box_view.js
similarity index 100%
rename from addons/mail/static/src/models/attachment_box_view/attachment_box_view.js
rename to addons/mail/static/src/models/attachment_box_view.js
diff --git a/addons/mail/static/src/models/attachment_card/attachment_card.js b/addons/mail/static/src/models/attachment_card.js
similarity index 100%
rename from addons/mail/static/src/models/attachment_card/attachment_card.js
rename to addons/mail/static/src/models/attachment_card.js
diff --git a/addons/mail/static/src/models/attachment_delete_confirm_view/attachment_delete_confirm_view.js b/addons/mail/static/src/models/attachment_delete_confirm_view.js
similarity index 100%
rename from addons/mail/static/src/models/attachment_delete_confirm_view/attachment_delete_confirm_view.js
rename to addons/mail/static/src/models/attachment_delete_confirm_view.js
diff --git a/addons/mail/static/src/models/attachment_image/attachment_image.js b/addons/mail/static/src/models/attachment_image.js
similarity index 100%
rename from addons/mail/static/src/models/attachment_image/attachment_image.js
rename to addons/mail/static/src/models/attachment_image.js
diff --git a/addons/mail/static/src/models/attachment_list/attachment_list.js b/addons/mail/static/src/models/attachment_list.js
similarity index 100%
rename from addons/mail/static/src/models/attachment_list/attachment_list.js
rename to addons/mail/static/src/models/attachment_list.js
diff --git a/addons/mail/static/src/models/attachment_viewer/attachment_viewer.js b/addons/mail/static/src/models/attachment_viewer.js
similarity index 100%
rename from addons/mail/static/src/models/attachment_viewer/attachment_viewer.js
rename to addons/mail/static/src/models/attachment_viewer.js
diff --git a/addons/mail/static/src/models/canned_response/canned_response.js b/addons/mail/static/src/models/canned_response.js
similarity index 100%
rename from addons/mail/static/src/models/canned_response/canned_response.js
rename to addons/mail/static/src/models/canned_response.js
diff --git a/addons/mail/static/src/models/channel_command/channel_command.js b/addons/mail/static/src/models/channel_command.js
similarity index 100%
rename from addons/mail/static/src/models/channel_command/channel_command.js
rename to addons/mail/static/src/models/channel_command.js
diff --git a/addons/mail/static/src/models/channel_invitation_form/channel_invitation_form.js b/addons/mail/static/src/models/channel_invitation_form.js
similarity index 100%
rename from addons/mail/static/src/models/channel_invitation_form/channel_invitation_form.js
rename to addons/mail/static/src/models/channel_invitation_form.js
diff --git a/addons/mail/static/src/models/chat_window/chat_window.js b/addons/mail/static/src/models/chat_window.js
similarity index 100%
rename from addons/mail/static/src/models/chat_window/chat_window.js
rename to addons/mail/static/src/models/chat_window.js
diff --git a/addons/mail/static/src/models/chat_window_manager/chat_window_manager.js b/addons/mail/static/src/models/chat_window_manager.js
similarity index 100%
rename from addons/mail/static/src/models/chat_window_manager/chat_window_manager.js
rename to addons/mail/static/src/models/chat_window_manager.js
diff --git a/addons/mail/static/src/models/chatter/chatter.js b/addons/mail/static/src/models/chatter.js
similarity index 100%
rename from addons/mail/static/src/models/chatter/chatter.js
rename to addons/mail/static/src/models/chatter.js
diff --git a/addons/mail/static/src/models/clock/clock.js b/addons/mail/static/src/models/clock.js
similarity index 100%
rename from addons/mail/static/src/models/clock/clock.js
rename to addons/mail/static/src/models/clock.js
diff --git a/addons/mail/static/src/models/clock_watcher/clock_watcher.js b/addons/mail/static/src/models/clock_watcher.js
similarity index 100%
rename from addons/mail/static/src/models/clock_watcher/clock_watcher.js
rename to addons/mail/static/src/models/clock_watcher.js
diff --git a/addons/mail/static/src/models/composer/composer.js b/addons/mail/static/src/models/composer.js
similarity index 100%
rename from addons/mail/static/src/models/composer/composer.js
rename to addons/mail/static/src/models/composer.js
diff --git a/addons/mail/static/src/models/composer_view/composer_view.js b/addons/mail/static/src/models/composer_view.js
similarity index 100%
rename from addons/mail/static/src/models/composer_view/composer_view.js
rename to addons/mail/static/src/models/composer_view.js
diff --git a/addons/mail/static/src/models/country/country.js b/addons/mail/static/src/models/country.js
similarity index 100%
rename from addons/mail/static/src/models/country/country.js
rename to addons/mail/static/src/models/country.js
diff --git a/addons/mail/static/src/models/delete_message_confirm_view/delete_message_confirm_view.js b/addons/mail/static/src/models/delete_message_confirm_view.js
similarity index 100%
rename from addons/mail/static/src/models/delete_message_confirm_view/delete_message_confirm_view.js
rename to addons/mail/static/src/models/delete_message_confirm_view.js
diff --git a/addons/mail/static/src/models/device/device.js b/addons/mail/static/src/models/device.js
similarity index 100%
rename from addons/mail/static/src/models/device/device.js
rename to addons/mail/static/src/models/device.js
diff --git a/addons/mail/static/src/models/dialog/dialog.js b/addons/mail/static/src/models/dialog.js
similarity index 100%
rename from addons/mail/static/src/models/dialog/dialog.js
rename to addons/mail/static/src/models/dialog.js
diff --git a/addons/mail/static/src/models/dialog_manager/dialog_manager.js b/addons/mail/static/src/models/dialog_manager.js
similarity index 100%
rename from addons/mail/static/src/models/dialog_manager/dialog_manager.js
rename to addons/mail/static/src/models/dialog_manager.js
diff --git a/addons/mail/static/src/models/discuss/discuss.js b/addons/mail/static/src/models/discuss.js
similarity index 100%
rename from addons/mail/static/src/models/discuss/discuss.js
rename to addons/mail/static/src/models/discuss.js
diff --git a/addons/mail/static/src/models/discuss_public_view/discuss_public_view.js b/addons/mail/static/src/models/discuss_public_view.js
similarity index 100%
rename from addons/mail/static/src/models/discuss_public_view/discuss_public_view.js
rename to addons/mail/static/src/models/discuss_public_view.js
diff --git a/addons/mail/static/src/models/discuss_sidebar_category/discuss_sidebar_category.js b/addons/mail/static/src/models/discuss_sidebar_category.js
similarity index 100%
rename from addons/mail/static/src/models/discuss_sidebar_category/discuss_sidebar_category.js
rename to addons/mail/static/src/models/discuss_sidebar_category.js
diff --git a/addons/mail/static/src/models/discuss_sidebar_category_item/discuss_sidebar_category_item.js b/addons/mail/static/src/models/discuss_sidebar_category_item.js
similarity index 100%
rename from addons/mail/static/src/models/discuss_sidebar_category_item/discuss_sidebar_category_item.js
rename to addons/mail/static/src/models/discuss_sidebar_category_item.js
diff --git a/addons/mail/static/src/models/discuss_view/discuss_view.js b/addons/mail/static/src/models/discuss_view.js
similarity index 100%
rename from addons/mail/static/src/models/discuss_view/discuss_view.js
rename to addons/mail/static/src/models/discuss_view.js
diff --git a/addons/mail/static/src/models/emoji_list_view/emoji_list_view.js b/addons/mail/static/src/models/emoji_list_view.js
similarity index 100%
rename from addons/mail/static/src/models/emoji_list_view/emoji_list_view.js
rename to addons/mail/static/src/models/emoji_list_view.js
diff --git a/addons/mail/static/src/models/file_uploader/file_uploader.js b/addons/mail/static/src/models/file_uploader.js
similarity index 100%
rename from addons/mail/static/src/models/file_uploader/file_uploader.js
rename to addons/mail/static/src/models/file_uploader.js
diff --git a/addons/mail/static/src/models/follower/follower.js b/addons/mail/static/src/models/follower.js
similarity index 100%
rename from addons/mail/static/src/models/follower/follower.js
rename to addons/mail/static/src/models/follower.js
diff --git a/addons/mail/static/src/models/follower_subtype/follower_subtype.js b/addons/mail/static/src/models/follower_subtype.js
similarity index 100%
rename from addons/mail/static/src/models/follower_subtype/follower_subtype.js
rename to addons/mail/static/src/models/follower_subtype.js
diff --git a/addons/mail/static/src/models/follower_subtype_list/follower_subtype_list.js b/addons/mail/static/src/models/follower_subtype_list.js
similarity index 100%
rename from addons/mail/static/src/models/follower_subtype_list/follower_subtype_list.js
rename to addons/mail/static/src/models/follower_subtype_list.js
diff --git a/addons/mail/static/src/models/guest/guest.js b/addons/mail/static/src/models/guest.js
similarity index 100%
rename from addons/mail/static/src/models/guest/guest.js
rename to addons/mail/static/src/models/guest.js
diff --git a/addons/mail/static/src/models/locale/locale.js b/addons/mail/static/src/models/locale.js
similarity index 100%
rename from addons/mail/static/src/models/locale/locale.js
rename to addons/mail/static/src/models/locale.js
diff --git a/addons/mail/static/src/models/mail_template/mail_template.js b/addons/mail/static/src/models/mail_template.js
similarity index 100%
rename from addons/mail/static/src/models/mail_template/mail_template.js
rename to addons/mail/static/src/models/mail_template.js
diff --git a/addons/mail/static/src/models/media_preview/media_preview.js b/addons/mail/static/src/models/media_preview.js
similarity index 100%
rename from addons/mail/static/src/models/media_preview/media_preview.js
rename to addons/mail/static/src/models/media_preview.js
diff --git a/addons/mail/static/src/models/message/message.js b/addons/mail/static/src/models/message.js
similarity index 100%
rename from addons/mail/static/src/models/message/message.js
rename to addons/mail/static/src/models/message.js
diff --git a/addons/mail/static/src/models/message_action_list/message_action_list.js b/addons/mail/static/src/models/message_action_list.js
similarity index 100%
rename from addons/mail/static/src/models/message_action_list/message_action_list.js
rename to addons/mail/static/src/models/message_action_list.js
diff --git a/addons/mail/static/src/models/message_in_reply_to_view/message_in_reply_to_view.js b/addons/mail/static/src/models/message_in_reply_to_view.js
similarity index 100%
rename from addons/mail/static/src/models/message_in_reply_to_view/message_in_reply_to_view.js
rename to addons/mail/static/src/models/message_in_reply_to_view.js
diff --git a/addons/mail/static/src/models/message_list_view/message_list_view.js b/addons/mail/static/src/models/message_list_view.js
similarity index 100%
rename from addons/mail/static/src/models/message_list_view/message_list_view.js
rename to addons/mail/static/src/models/message_list_view.js
diff --git a/addons/mail/static/src/models/message_reaction_group/message_reaction_group.js b/addons/mail/static/src/models/message_reaction_group.js
similarity index 100%
rename from addons/mail/static/src/models/message_reaction_group/message_reaction_group.js
rename to addons/mail/static/src/models/message_reaction_group.js
diff --git a/addons/mail/static/src/models/message_seen_indicator/message_seen_indicator.js b/addons/mail/static/src/models/message_seen_indicator.js
similarity index 100%
rename from addons/mail/static/src/models/message_seen_indicator/message_seen_indicator.js
rename to addons/mail/static/src/models/message_seen_indicator.js
diff --git a/addons/mail/static/src/models/message_view/message_view.js b/addons/mail/static/src/models/message_view.js
similarity index 100%
rename from addons/mail/static/src/models/message_view/message_view.js
rename to addons/mail/static/src/models/message_view.js
diff --git a/addons/mail/static/src/models/messaging/messaging.js b/addons/mail/static/src/models/messaging.js
similarity index 100%
rename from addons/mail/static/src/models/messaging/messaging.js
rename to addons/mail/static/src/models/messaging.js
diff --git a/addons/mail/static/src/models/messaging_initializer/messaging_initializer.js b/addons/mail/static/src/models/messaging_initializer.js
similarity index 100%
rename from addons/mail/static/src/models/messaging_initializer/messaging_initializer.js
rename to addons/mail/static/src/models/messaging_initializer.js
diff --git a/addons/mail/static/src/models/messaging_menu/messaging_menu.js b/addons/mail/static/src/models/messaging_menu.js
similarity index 100%
rename from addons/mail/static/src/models/messaging_menu/messaging_menu.js
rename to addons/mail/static/src/models/messaging_menu.js
diff --git a/addons/mail/static/src/models/messaging_notification_handler/messaging_notification_handler.js b/addons/mail/static/src/models/messaging_notification_handler.js
similarity index 100%
rename from addons/mail/static/src/models/messaging_notification_handler/messaging_notification_handler.js
rename to addons/mail/static/src/models/messaging_notification_handler.js
diff --git a/addons/mail/static/src/models/mobile_messaging_navbar_view/mobile_messaging_navbar_view.js b/addons/mail/static/src/models/mobile_messaging_navbar_view.js
similarity index 100%
rename from addons/mail/static/src/models/mobile_messaging_navbar_view/mobile_messaging_navbar_view.js
rename to addons/mail/static/src/models/mobile_messaging_navbar_view.js
diff --git a/addons/mail/static/src/models/notification/notification.js b/addons/mail/static/src/models/notification.js
similarity index 100%
rename from addons/mail/static/src/models/notification/notification.js
rename to addons/mail/static/src/models/notification.js
diff --git a/addons/mail/static/src/models/notification_group/notification_group.js b/addons/mail/static/src/models/notification_group.js
similarity index 100%
rename from addons/mail/static/src/models/notification_group/notification_group.js
rename to addons/mail/static/src/models/notification_group.js
diff --git a/addons/mail/static/src/models/notification_group_view/notification_group_view.js b/addons/mail/static/src/models/notification_group_view.js
similarity index 100%
rename from addons/mail/static/src/models/notification_group_view/notification_group_view.js
rename to addons/mail/static/src/models/notification_group_view.js
diff --git a/addons/mail/static/src/models/notification_list_view/notification_list_view.js b/addons/mail/static/src/models/notification_list_view.js
similarity index 100%
rename from addons/mail/static/src/models/notification_list_view/notification_list_view.js
rename to addons/mail/static/src/models/notification_list_view.js
diff --git a/addons/mail/static/src/models/notification_request_view/notification_request_view.js b/addons/mail/static/src/models/notification_request_view.js
similarity index 100%
rename from addons/mail/static/src/models/notification_request_view/notification_request_view.js
rename to addons/mail/static/src/models/notification_request_view.js
diff --git a/addons/mail/static/src/models/partner/partner.js b/addons/mail/static/src/models/partner.js
similarity index 100%
rename from addons/mail/static/src/models/partner/partner.js
rename to addons/mail/static/src/models/partner.js
diff --git a/addons/mail/static/src/models/popover_view/popover_view.js b/addons/mail/static/src/models/popover_view.js
similarity index 100%
rename from addons/mail/static/src/models/popover_view/popover_view.js
rename to addons/mail/static/src/models/popover_view.js
diff --git a/addons/mail/static/src/models/record/record.js b/addons/mail/static/src/models/record.js
similarity index 100%
rename from addons/mail/static/src/models/record/record.js
rename to addons/mail/static/src/models/record.js
diff --git a/addons/mail/static/src/models/rtc/rtc.js b/addons/mail/static/src/models/rtc.js
similarity index 100%
rename from addons/mail/static/src/models/rtc/rtc.js
rename to addons/mail/static/src/models/rtc.js
diff --git a/addons/mail/static/src/models/rtc_call_participant_card/rtc_call_participant_card.js b/addons/mail/static/src/models/rtc_call_participant_card.js
similarity index 100%
rename from addons/mail/static/src/models/rtc_call_participant_card/rtc_call_participant_card.js
rename to addons/mail/static/src/models/rtc_call_participant_card.js
diff --git a/addons/mail/static/src/models/rtc_call_viewer/rtc_call_viewer.js b/addons/mail/static/src/models/rtc_call_viewer.js
similarity index 100%
rename from addons/mail/static/src/models/rtc_call_viewer/rtc_call_viewer.js
rename to addons/mail/static/src/models/rtc_call_viewer.js
diff --git a/addons/mail/static/src/models/rtc_configuration_menu/rtc_configuration_menu.js b/addons/mail/static/src/models/rtc_configuration_menu.js
similarity index 100%
rename from addons/mail/static/src/models/rtc_configuration_menu/rtc_configuration_menu.js
rename to addons/mail/static/src/models/rtc_configuration_menu.js
diff --git a/addons/mail/static/src/models/rtc_controller/rtc_controller.js b/addons/mail/static/src/models/rtc_controller.js
similarity index 100%
rename from addons/mail/static/src/models/rtc_controller/rtc_controller.js
rename to addons/mail/static/src/models/rtc_controller.js
diff --git a/addons/mail/static/src/models/rtc_layout_menu/rtc_layout_menu.js b/addons/mail/static/src/models/rtc_layout_menu.js
similarity index 100%
rename from addons/mail/static/src/models/rtc_layout_menu/rtc_layout_menu.js
rename to addons/mail/static/src/models/rtc_layout_menu.js
diff --git a/addons/mail/static/src/models/rtc_option_list/rtc_option_list.js b/addons/mail/static/src/models/rtc_option_list.js
similarity index 100%
rename from addons/mail/static/src/models/rtc_option_list/rtc_option_list.js
rename to addons/mail/static/src/models/rtc_option_list.js
diff --git a/addons/mail/static/src/models/rtc_peer_notification/rtc_peer_notification.js b/addons/mail/static/src/models/rtc_peer_notification.js
similarity index 100%
rename from addons/mail/static/src/models/rtc_peer_notification/rtc_peer_notification.js
rename to addons/mail/static/src/models/rtc_peer_notification.js
diff --git a/addons/mail/static/src/models/rtc_session/rtc_session.js b/addons/mail/static/src/models/rtc_session.js
similarity index 100%
rename from addons/mail/static/src/models/rtc_session/rtc_session.js
rename to addons/mail/static/src/models/rtc_session.js
diff --git a/addons/mail/static/src/models/sound_effect/sound_effect.js b/addons/mail/static/src/models/sound_effect.js
similarity index 100%
rename from addons/mail/static/src/models/sound_effect/sound_effect.js
rename to addons/mail/static/src/models/sound_effect.js
diff --git a/addons/mail/static/src/models/sound_effects/sound_effects.js b/addons/mail/static/src/models/sound_effects.js
similarity index 100%
rename from addons/mail/static/src/models/sound_effects/sound_effects.js
rename to addons/mail/static/src/models/sound_effects.js
diff --git a/addons/mail/static/src/models/suggested_recipient_info/suggested_recipient_info.js b/addons/mail/static/src/models/suggested_recipient_info.js
similarity index 100%
rename from addons/mail/static/src/models/suggested_recipient_info/suggested_recipient_info.js
rename to addons/mail/static/src/models/suggested_recipient_info.js
diff --git a/addons/mail/static/src/models/thread/thread.js b/addons/mail/static/src/models/thread.js
similarity index 100%
rename from addons/mail/static/src/models/thread/thread.js
rename to addons/mail/static/src/models/thread.js
diff --git a/addons/mail/static/src/models/thread_cache/thread_cache.js b/addons/mail/static/src/models/thread_cache.js
similarity index 100%
rename from addons/mail/static/src/models/thread_cache/thread_cache.js
rename to addons/mail/static/src/models/thread_cache.js
diff --git a/addons/mail/static/src/models/thread_needaction_preview_view/thread_needaction_preview_view.js b/addons/mail/static/src/models/thread_needaction_preview_view.js
similarity index 100%
rename from addons/mail/static/src/models/thread_needaction_preview_view/thread_needaction_preview_view.js
rename to addons/mail/static/src/models/thread_needaction_preview_view.js
diff --git a/addons/mail/static/src/models/thread_partner_seen_info/thread_partner_seen_info.js b/addons/mail/static/src/models/thread_partner_seen_info.js
similarity index 100%
rename from addons/mail/static/src/models/thread_partner_seen_info/thread_partner_seen_info.js
rename to addons/mail/static/src/models/thread_partner_seen_info.js
diff --git a/addons/mail/static/src/models/thread_preview_view/thread_preview_view.js b/addons/mail/static/src/models/thread_preview_view.js
similarity index 100%
rename from addons/mail/static/src/models/thread_preview_view/thread_preview_view.js
rename to addons/mail/static/src/models/thread_preview_view.js
diff --git a/addons/mail/static/src/models/thread_view/thread_view.js b/addons/mail/static/src/models/thread_view.js
similarity index 100%
rename from addons/mail/static/src/models/thread_view/thread_view.js
rename to addons/mail/static/src/models/thread_view.js
diff --git a/addons/mail/static/src/models/thread_view_topbar/thread_view_topbar.js b/addons/mail/static/src/models/thread_view_topbar.js
similarity index 100%
rename from addons/mail/static/src/models/thread_view_topbar/thread_view_topbar.js
rename to addons/mail/static/src/models/thread_view_topbar.js
diff --git a/addons/mail/static/src/models/thread_view/thread_viewer.js b/addons/mail/static/src/models/thread_viewer.js
similarity index 100%
rename from addons/mail/static/src/models/thread_view/thread_viewer.js
rename to addons/mail/static/src/models/thread_viewer.js
diff --git a/addons/mail/static/src/models/user/user.js b/addons/mail/static/src/models/user.js
similarity index 100%
rename from addons/mail/static/src/models/user/user.js
rename to addons/mail/static/src/models/user.js
diff --git a/addons/mail/static/src/models/user_setting/user_setting.js b/addons/mail/static/src/models/user_setting.js
similarity index 100%
rename from addons/mail/static/src/models/user_setting/user_setting.js
rename to addons/mail/static/src/models/user_setting.js
diff --git a/addons/mail/static/src/models/volume_setting/volume_setting.js b/addons/mail/static/src/models/volume_setting.js
similarity index 100%
rename from addons/mail/static/src/models/volume_setting/volume_setting.js
rename to addons/mail/static/src/models/volume_setting.js
diff --git a/addons/mail/static/src/models/welcome_view/welcome_view.js b/addons/mail/static/src/models/welcome_view.js
similarity index 100%
rename from addons/mail/static/src/models/welcome_view/welcome_view.js
rename to addons/mail/static/src/models/welcome_view.js
diff --git a/addons/mail/static/tests/clock_watcher_qunit_tests.js b/addons/mail/static/tests/clock_watcher_qunit_tests.js
index 2676d8dba9e..f9f08a24888 100644
--- a/addons/mail/static/tests/clock_watcher_qunit_tests.js
+++ b/addons/mail/static/tests/clock_watcher_qunit_tests.js
@@ -3,7 +3,7 @@
 import { addFields, patchIdentifyingFields } from '@mail/model/model_core';
 import { one } from '@mail/model/model_field';
 // ensure that the model definition is loaded before the patch
-import '@mail/models/clock_watcher/clock_watcher';
+import '@mail/models/clock_watcher';
 
 patchIdentifyingFields('ClockWatcher', identifyingFields => {
     identifyingFields[0].push('qunitTestOwner');
diff --git a/addons/mail/static/tests/composer_view_qunit_tests.js b/addons/mail/static/tests/composer_view_qunit_tests.js
index b8d24cf4544..ea3e1971d03 100644
--- a/addons/mail/static/tests/composer_view_qunit_tests.js
+++ b/addons/mail/static/tests/composer_view_qunit_tests.js
@@ -4,7 +4,7 @@ import { addFields, patchIdentifyingFields, patchRecordMethods } from '@mail/mod
 import { one } from '@mail/model/model_field';
 import { replace } from '@mail/model/model_field_command';
 // ensure that the model definition is loaded before the patch
-import '@mail/models/composer_view/composer_view';
+import '@mail/models/composer_view';
 
 patchRecordMethods('ComposerView', {
     _computeComposer() {
diff --git a/addons/mail/static/tests/message_view_qunit_tests.js b/addons/mail/static/tests/message_view_qunit_tests.js
index 92a22f4b21b..f14f97066de 100644
--- a/addons/mail/static/tests/message_view_qunit_tests.js
+++ b/addons/mail/static/tests/message_view_qunit_tests.js
@@ -3,7 +3,7 @@
 import { addFields, patchIdentifyingFields } from '@mail/model/model_core';
 import { one } from '@mail/model/model_field';
 // ensure that the model definition is loaded before the patch
-import '@mail/models/message_view/message_view';
+import '@mail/models/message_view';
 
 addFields('MessageView', {
     qunitTest: one('QUnitTest', {
diff --git a/addons/mail/static/tests/notification_list_view_qunit_tests.js b/addons/mail/static/tests/notification_list_view_qunit_tests.js
index 541798247a1..d51f6420e12 100644
--- a/addons/mail/static/tests/notification_list_view_qunit_tests.js
+++ b/addons/mail/static/tests/notification_list_view_qunit_tests.js
@@ -2,7 +2,7 @@
 
 import { addFields, patchIdentifyingFields, patchRecordMethods } from '@mail/model/model_core';
 import { one } from '@mail/model/model_field';
-import '@mail/models/notification_list_view/notification_list_view'; // ensure the model definition is loaded before the patch
+import '@mail/models/notification_list_view'; // ensure the model definition is loaded before the patch
 
 addFields('NotificationListView', {
     qunitTestOwner: one('QUnitTest', {
diff --git a/addons/mail/static/tests/thread_viewer_qunit_tests.js b/addons/mail/static/tests/thread_viewer_qunit_tests.js
index c8969c5bcba..abc74f86648 100644
--- a/addons/mail/static/tests/thread_viewer_qunit_tests.js
+++ b/addons/mail/static/tests/thread_viewer_qunit_tests.js
@@ -3,7 +3,7 @@
 import { addFields, patchIdentifyingFields } from '@mail/model/model_core';
 import { one } from '@mail/model/model_field';
 // ensure that the model definition is loaded before the patch
-import '@mail/models/thread_view/thread_viewer';
+import '@mail/models/thread_viewer';
 
 addFields('ThreadViewer', {
     qunitTest: one('QUnitTest', {
diff --git a/addons/mail_bot/__manifest__.py b/addons/mail_bot/__manifest__.py
index 1cc4c89de57..7bd98bb20fc 100644
--- a/addons/mail_bot/__manifest__.py
+++ b/addons/mail_bot/__manifest__.py
@@ -21,17 +21,17 @@
     ],
     'assets': {
         'mail.assets_discuss_public': [
-            'mail_bot/static/src/models/*/*.js',
+            'mail_bot/static/src/models/*.js',
         ],
         'web.assets_backend': [
-            'mail_bot/static/src/models/*/*.js',
+            'mail_bot/static/src/models/*.js',
             'mail_bot/static/src/scss/odoobot_style.scss',
         ],
         'web.tests_assets': [
-            'mail_bot/static/tests/**/*',
+            'mail_bot/static/tests/helpers/*.js',
         ],
         'web.qunit_suite_tests': [
-            'mail_bot/static/src/models/*/tests/*.js',
+            'mail_bot/static/tests/*.js',
         ],
     },
     'license': 'LGPL-3',
diff --git a/addons/mail_bot/static/src/models/messaging_initializer/messaging_initializer.js b/addons/mail_bot/static/src/models/messaging_initializer.js
similarity index 92%
rename from addons/mail_bot/static/src/models/messaging_initializer/messaging_initializer.js
rename to addons/mail_bot/static/src/models/messaging_initializer.js
index 7937281c44f..aae87035d44 100644
--- a/addons/mail_bot/static/src/models/messaging_initializer/messaging_initializer.js
+++ b/addons/mail_bot/static/src/models/messaging_initializer.js
@@ -2,7 +2,7 @@
 
 import { addRecordMethods, patchRecordMethods } from '@mail/model/model_core';
 // ensure that the model definition is loaded before the patch
-import '@mail/models/messaging_initializer/messaging_initializer';
+import '@mail/models/messaging_initializer';
 
 addRecordMethods('MessagingInitializer', {
     /**
diff --git a/addons/sms/__manifest__.py b/addons/sms/__manifest__.py
index 2ab152c5030..b690a9607c9 100644
--- a/addons/sms/__manifest__.py
+++ b/addons/sms/__manifest__.py
@@ -42,13 +42,13 @@ The service is provided by the In App Purchase Odoo platform.
     'assets': {
         'mail.assets_discuss_public': [
             'sms/static/src/components/*/*',
-            'sms/static/src/models/*/*.js',
+            'sms/static/src/models/*.js',
         ],
         'web.assets_backend': [
             'sms/static/src/js/fields_phone_widget.js',
             'sms/static/src/js/fields_sms_widget.js',
             'sms/static/src/components/*/*.js',
-            'sms/static/src/models/*/*.js',
+            'sms/static/src/models/*.js',
         ],
         'web.qunit_suite_tests': [
             'sms/static/tests/sms_widget_test.js',
diff --git a/addons/sms/static/src/models/message/message.js b/addons/sms/static/src/models/message.js
similarity index 94%
rename from addons/sms/static/src/models/message/message.js
rename to addons/sms/static/src/models/message.js
index 10e86433ade..b26a1b92e86 100644
--- a/addons/sms/static/src/models/message/message.js
+++ b/addons/sms/static/src/models/message.js
@@ -2,7 +2,7 @@
 
 import { patchRecordMethods } from '@mail/model/model_core';
 // ensure that the model definition is loaded before the patch
-import '@mail/models/message/message';
+import '@mail/models/message';
 
 patchRecordMethods('Message', {
     /**
diff --git a/addons/sms/static/src/models/notification_group/notification_group.js b/addons/sms/static/src/models/notification_group.js
similarity index 96%
rename from addons/sms/static/src/models/notification_group/notification_group.js
rename to addons/sms/static/src/models/notification_group.js
index 588ed1ceca5..c4a58b75a3a 100644
--- a/addons/sms/static/src/models/notification_group/notification_group.js
+++ b/addons/sms/static/src/models/notification_group.js
@@ -2,7 +2,7 @@
 
 import { patchRecordMethods } from '@mail/model/model_core';
 // ensure that the model definition is loaded before the patch
-import '@mail/models/notification_group/notification_group';
+import '@mail/models/notification_group';
 
 patchRecordMethods('NotificationGroup', {
     /**
diff --git a/addons/snailmail/__manifest__.py b/addons/snailmail/__manifest__.py
index 210e5746d56..f2c6d68851d 100644
--- a/addons/snailmail/__manifest__.py
+++ b/addons/snailmail/__manifest__.py
@@ -25,7 +25,7 @@ Allows users to send documents by post
     'assets': {
         'mail.assets_discuss_public': [
             'snailmail/static/src/components/*/*',
-            'snailmail/static/src/models/*/*.js',
+            'snailmail/static/src/models/*.js',
         ],
         'snailmail.report_assets_snailmail': [
             ('include', 'web._assets_helpers'),
@@ -36,7 +36,7 @@ Allows users to send documents by post
         'web.assets_backend': [
             'snailmail/static/src/components/*/*.js',
             'snailmail/static/src/components/*/*.scss',
-            'snailmail/static/src/models/*/*.js',
+            'snailmail/static/src/models/*.js',
         ],
         'web.tests_assets': [
             'snailmail/static/tests/**/*',
diff --git a/addons/snailmail/static/src/models/dialog/dialog.js b/addons/snailmail/static/src/models/dialog.js
similarity index 97%
rename from addons/snailmail/static/src/models/dialog/dialog.js
rename to addons/snailmail/static/src/models/dialog.js
index 66440316c0c..b03d0d3cc24 100644
--- a/addons/snailmail/static/src/models/dialog/dialog.js
+++ b/addons/snailmail/static/src/models/dialog.js
@@ -4,7 +4,7 @@ import { addFields, addRecordMethods, patchIdentifyingFields, patchRecordMethods
 import { one } from '@mail/model/model_field';
 import { clear, insertAndReplace, replace } from '@mail/model/model_field_command';
 // ensure that the model definition is loaded before the patch
-import '@mail/models/dialog/dialog';
+import '@mail/models/dialog';
 
 patchIdentifyingFields('Dialog', identifyingFields => {
     identifyingFields[0].push('messageViewOwnerAsSnailmailError');
diff --git a/addons/snailmail/static/src/models/message/message.js b/addons/snailmail/static/src/models/message.js
similarity index 98%
rename from addons/snailmail/static/src/models/message/message.js
rename to addons/snailmail/static/src/models/message.js
index 24d3776526c..e46488f3cd7 100644
--- a/addons/snailmail/static/src/models/message/message.js
+++ b/addons/snailmail/static/src/models/message.js
@@ -2,7 +2,7 @@
 
 import { addRecordMethods } from '@mail/model/model_core';
 // ensure that the model definition is loaded before the patch
-import '@mail/models/message/message';
+import '@mail/models/message';
 
 addRecordMethods('Message', {
     /**
diff --git a/addons/snailmail/static/src/models/message_view/message_view.js b/addons/snailmail/static/src/models/message_view.js
similarity index 97%
rename from addons/snailmail/static/src/models/message_view/message_view.js
rename to addons/snailmail/static/src/models/message_view.js
index 34d251699c5..e641858b000 100644
--- a/addons/snailmail/static/src/models/message_view/message_view.js
+++ b/addons/snailmail/static/src/models/message_view.js
@@ -4,7 +4,7 @@ import { addFields, patchRecordMethods } from '@mail/model/model_core';
 import { one } from '@mail/model/model_field';
 import { insertAndReplace } from '@mail/model/model_field_command';
 // ensure that the model definition is loaded before the patch
-import '@mail/models/message_view/message_view';
+import '@mail/models/message_view';
 
 addFields('MessageView', {
     snailmailErrorDialog: one('Dialog', {
diff --git a/addons/snailmail/static/src/models/messaging/messaging.js b/addons/snailmail/static/src/models/messaging.js
similarity index 95%
rename from addons/snailmail/static/src/models/messaging/messaging.js
rename to addons/snailmail/static/src/models/messaging.js
index 1533eef769c..88d87cae246 100644
--- a/addons/snailmail/static/src/models/messaging/messaging.js
+++ b/addons/snailmail/static/src/models/messaging.js
@@ -3,7 +3,7 @@
 import { addFields, addRecordMethods } from '@mail/model/model_core';
 import { attr } from '@mail/model/model_field';
 // ensure that the model definition is loaded before the patch
-import '@mail/models/messaging/messaging';
+import '@mail/models/messaging';
 
 addRecordMethods('Messaging', {
     async fetchSnailmailCreditsUrl() {
diff --git a/addons/snailmail/static/src/models/notification_group/notification_group.js b/addons/snailmail/static/src/models/notification_group.js
similarity index 96%
rename from addons/snailmail/static/src/models/notification_group/notification_group.js
rename to addons/snailmail/static/src/models/notification_group.js
index 8eb7d634257..736c446e84f 100644
--- a/addons/snailmail/static/src/models/notification_group/notification_group.js
+++ b/addons/snailmail/static/src/models/notification_group.js
@@ -2,7 +2,7 @@
 
 import { patchRecordMethods } from '@mail/model/model_core';
 // ensure that the model definition is loaded before the patch
-import '@mail/models/notification_group/notification_group';
+import '@mail/models/notification_group';
 
 patchRecordMethods('NotificationGroup', {
     /**
diff --git a/addons/snailmail/static/src/models/snailmail_error_view/snailmail_error_view.js b/addons/snailmail/static/src/models/snailmail_error_view.js
similarity index 100%
rename from addons/snailmail/static/src/models/snailmail_error_view/snailmail_error_view.js
rename to addons/snailmail/static/src/models/snailmail_error_view.js
diff --git a/addons/website_livechat/__manifest__.py b/addons/website_livechat/__manifest__.py
index aea0b1ef413..f195d41d501 100644
--- a/addons/website_livechat/__manifest__.py
+++ b/addons/website_livechat/__manifest__.py
@@ -23,7 +23,7 @@ Allow website visitors to chat with the collaborators. This module also brings a
     'assets': {
         'mail.assets_discuss_public': [
             'website_livechat/static/src/components/*/*',
-            'website_livechat/static/src/models/*/*.js',
+            'website_livechat/static/src/models/*.js',
         ],
         'web.assets_frontend': [
             'mail/static/src/js/utils.js',
@@ -38,14 +38,14 @@ Allow website visitors to chat with the collaborators. This module also brings a
         'web.assets_backend': [
             'website_livechat/static/src/components/*/*.js',
             'website_livechat/static/src/components/*/*.scss',
-            'website_livechat/static/src/models/*/*.js',
+            'website_livechat/static/src/models/*.js',
         ],
         'web.assets_tests': [
             'website_livechat/static/tests/tours/**/*',
         ],
         'web.qunit_suite_tests': [
             'website_livechat/static/src/components/*/tests/*.js',
-            'website_livechat/static/src/models/*/tests/*.js',
+            'website_livechat/static/tests/*.js',
             'website_livechat/static/tests/helpers/*.js',
         ],
         'web.assets_qweb': [
diff --git a/addons/website_livechat/static/src/models/messaging_notification_handler/messaging_notification_handler.js b/addons/website_livechat/static/src/models/messaging_notification_handler.js
similarity index 91%
rename from addons/website_livechat/static/src/models/messaging_notification_handler/messaging_notification_handler.js
rename to addons/website_livechat/static/src/models/messaging_notification_handler.js
index 987263b6204..13b50e9425a 100644
--- a/addons/website_livechat/static/src/models/messaging_notification_handler/messaging_notification_handler.js
+++ b/addons/website_livechat/static/src/models/messaging_notification_handler.js
@@ -2,7 +2,7 @@
 
 import { patchRecordMethods } from '@mail/model/model_core';
 // ensure that the model definition is loaded before the patch
-import '@mail/models/messaging_notification_handler/messaging_notification_handler';
+import '@mail/models/messaging_notification_handler';
 
 patchRecordMethods('MessagingNotificationHandler', {
     /**
diff --git a/addons/website_livechat/static/src/models/thread/thread.js b/addons/website_livechat/static/src/models/thread.js
similarity index 95%
rename from addons/website_livechat/static/src/models/thread/thread.js
rename to addons/website_livechat/static/src/models/thread.js
index 41e944cf4cf..5cdf13d21eb 100644
--- a/addons/website_livechat/static/src/models/thread/thread.js
+++ b/addons/website_livechat/static/src/models/thread.js
@@ -4,7 +4,7 @@ import { addFields, patchModelMethods } from '@mail/model/model_core';
 import { one } from '@mail/model/model_field';
 import { insert, unlink } from '@mail/model/model_field_command';
 // ensure that the model definition is loaded before the patch
-import '@mail/models/thread/thread';
+import '@mail/models/thread';
 
 patchModelMethods('Thread', {
     /**
diff --git a/addons/website_livechat/static/src/models/visitor/visitor.js b/addons/website_livechat/static/src/models/visitor.js
similarity index 100%
rename from addons/website_livechat/static/src/models/visitor/visitor.js
rename to addons/website_livechat/static/src/models/visitor.js
diff --git a/addons/website_slides/__manifest__.py b/addons/website_slides/__manifest__.py
index 614a22f7101..86856915fe5 100644
--- a/addons/website_slides/__manifest__.py
+++ b/addons/website_slides/__manifest__.py
@@ -70,7 +70,7 @@ Featuring
             'website_slides/static/src/scss/slide_views.scss',
             'website_slides/static/src/js/slide_category_one2many.js',
             'website_slides/static/src/js/rating_field_backend.js',
-            'website_slides/static/src/models/*/*.js',
+            'website_slides/static/src/models/*.js',
         ],
         'web.assets_frontend': [
             'website_slides/static/src/scss/website_slides.scss',
diff --git a/addons/website_slides/static/src/models/activity_view/activity_view.js b/addons/website_slides/static/src/models/activity_view.js
similarity index 96%
rename from addons/website_slides/static/src/models/activity_view/activity_view.js
rename to addons/website_slides/static/src/models/activity_view.js
index 3bf51ca9ece..34a6b1a14b7 100644
--- a/addons/website_slides/static/src/models/activity_view/activity_view.js
+++ b/addons/website_slides/static/src/models/activity_view.js
@@ -2,7 +2,7 @@
 
 import { addRecordMethods } from '@mail/model/model_core';
 // ensure that the model definition is loaded before the patch
-import '@mail/models/activity_view/activity_view';
+import '@mail/models/activity_view';
 
 addRecordMethods('ActivityView', {
     /**