diff --git a/addons/website/__manifest__.py b/addons/website/__manifest__.py
index 95e01e10745..252a2a343df 100644
--- a/addons/website/__manifest__.py
+++ b/addons/website/__manifest__.py
@@ -163,14 +163,11 @@
             'website/static/src/scss/website_visitor_views.scss',
             'website/static/src/scss/website.theme_install.scss',
             'website/static/src/js/backend/**/*',
-            'website/static/src/js/widget_iframe.js',
-            'website/static/src/js/theme_preview_kanban.js',
-            'website/static/src/js/theme_preview_form.js',
             'website/static/src/client_actions/*/*.js',
             ('remove', 'website/static/src/client_actions/website_preview/website_preview_test_mode.js'),
             'website/static/src/client_actions/*/*.scss',
-            'website/static/src/components/fields/fields.js',
-            'website/static/src/components/fields/fields.scss',
+            'website/static/src/components/fields/*.js',
+            'website/static/src/components/fields/*.scss',
             'website/static/src/components/fullscreen_indication/fullscreen_indication.js',
             'website/static/src/components/fullscreen_indication/fullscreen_indication.scss',
             'website/static/src/components/website_loader/website_loader.js',
@@ -261,14 +258,12 @@
             'website/static/src/client_actions/*/*.xml',
             'website/static/src/components/dialog/*.xml',
             'website/static/src/components/editor/editor.xml',
-            'website/static/src/components/fields/fields.xml',
+            'website/static/src/components/fields/*.xml',
             'website/static/src/components/translator/*.xml',
             'website/static/src/components/website_loader/*.xml',
             'website/static/src/components/views/*.xml',
             'website/static/src/systray_items/*.xml',
             'website/static/src/xml/website.backend.xml',
-            'website/static/src/xml/website_widget.xml',
-            'website/static/src/xml/theme_preview.xml',
             'website/static/src/js/backend/**/*',
         ],
         'website.test_bundle': [
diff --git a/addons/website/static/src/js/backend/redirect_field.js b/addons/website/static/src/components/fields/redirect_field.js
similarity index 100%
rename from addons/website/static/src/js/backend/redirect_field.js
rename to addons/website/static/src/components/fields/redirect_field.js
diff --git a/addons/website/static/src/js/backend/redirect_field.xml b/addons/website/static/src/components/fields/redirect_field.xml
similarity index 100%
rename from addons/website/static/src/js/backend/redirect_field.xml
rename to addons/website/static/src/components/fields/redirect_field.xml
diff --git a/addons/website/static/src/js/backend/res_config_settings.js b/addons/website/static/src/components/fields/res_config_settings.js
similarity index 100%
rename from addons/website/static/src/js/backend/res_config_settings.js
rename to addons/website/static/src/components/fields/res_config_settings.js
diff --git a/addons/website/static/src/xml/website.res_config_settings.xml b/addons/website/static/src/components/fields/res_config_settings.xml
similarity index 100%
rename from addons/website/static/src/xml/website.res_config_settings.xml
rename to addons/website/static/src/components/fields/res_config_settings.xml
diff --git a/addons/website/static/src/js/widget_iframe.js b/addons/website/static/src/components/fields/widget_iframe.js
similarity index 100%
rename from addons/website/static/src/js/widget_iframe.js
rename to addons/website/static/src/components/fields/widget_iframe.js
diff --git a/addons/website/static/src/xml/website_widget.xml b/addons/website/static/src/components/fields/widget_iframe.xml
similarity index 100%
rename from addons/website/static/src/xml/website_widget.xml
rename to addons/website/static/src/components/fields/widget_iframe.xml
diff --git a/addons/website/static/src/xml/theme_preview.xml b/addons/website/static/src/components/views/theme_preview.xml
similarity index 100%
rename from addons/website/static/src/xml/theme_preview.xml
rename to addons/website/static/src/components/views/theme_preview.xml
diff --git a/addons/website/static/src/js/theme_preview_form.js b/addons/website/static/src/components/views/theme_preview_form.js
similarity index 100%
rename from addons/website/static/src/js/theme_preview_form.js
rename to addons/website/static/src/components/views/theme_preview_form.js
diff --git a/addons/website/static/src/js/theme_preview_kanban.js b/addons/website/static/src/components/views/theme_preview_kanban.js
similarity index 100%
rename from addons/website/static/src/js/theme_preview_kanban.js
rename to addons/website/static/src/components/views/theme_preview_kanban.js