diff --git a/addons/base_setup/__manifest__.py b/addons/base_setup/__manifest__.py
index 4c25bf1e427..6f19ed0dc85 100644
--- a/addons/base_setup/__manifest__.py
+++ b/addons/base_setup/__manifest__.py
@@ -19,14 +19,5 @@ Shows you a list of applications features to install from.
         ],
     'installable': True,
 
-    'assets': {
-        'web.assets_backend': [
-            'base_setup/static/src/scss/settings.scss',
-            'base_setup/static/src/js/**/*.js',
-        ],
-        'web.assets_qweb': [
-            'base_setup/static/src/xml/**/*',
-        ],
-    },
     'license': 'LGPL-3',
 }
diff --git a/addons/base_setup/static/src/js/demo_data_service.js b/addons/web/static/src/webclient/settings_form_view/widgets/demo_data_service.js
similarity index 100%
rename from addons/base_setup/static/src/js/demo_data_service.js
rename to addons/web/static/src/webclient/settings_form_view/widgets/demo_data_service.js
diff --git a/addons/base_setup/static/src/js/res_config_dev_tool.js b/addons/web/static/src/webclient/settings_form_view/widgets/res_config_dev_tool.js
similarity index 100%
rename from addons/base_setup/static/src/js/res_config_dev_tool.js
rename to addons/web/static/src/webclient/settings_form_view/widgets/res_config_dev_tool.js
diff --git a/addons/base_setup/static/src/xml/res_config_dev_tool.xml b/addons/web/static/src/webclient/settings_form_view/widgets/res_config_dev_tool.xml
similarity index 100%
rename from addons/base_setup/static/src/xml/res_config_dev_tool.xml
rename to addons/web/static/src/webclient/settings_form_view/widgets/res_config_dev_tool.xml
diff --git a/addons/base_setup/static/src/js/res_config_edition.js b/addons/web/static/src/webclient/settings_form_view/widgets/res_config_edition.js
similarity index 100%
rename from addons/base_setup/static/src/js/res_config_edition.js
rename to addons/web/static/src/webclient/settings_form_view/widgets/res_config_edition.js
diff --git a/addons/base_setup/static/src/xml/res_config_edition.xml b/addons/web/static/src/webclient/settings_form_view/widgets/res_config_edition.xml
similarity index 100%
rename from addons/base_setup/static/src/xml/res_config_edition.xml
rename to addons/web/static/src/webclient/settings_form_view/widgets/res_config_edition.xml
diff --git a/addons/base_setup/static/src/js/res_config_invite_users.js b/addons/web/static/src/webclient/settings_form_view/widgets/res_config_invite_users.js
similarity index 91%
rename from addons/base_setup/static/src/js/res_config_invite_users.js
rename to addons/web/static/src/webclient/settings_form_view/widgets/res_config_invite_users.js
index 91217fcf178..feea64095b0 100644
--- a/addons/base_setup/static/src/js/res_config_invite_users.js
+++ b/addons/web/static/src/webclient/settings_form_view/widgets/res_config_invite_users.js
@@ -30,7 +30,7 @@ class ResConfigInviteUsers extends Component {
      * @returns {boolean} true if the given email address is valid
      */
     validateEmail(email) {
-        const re = /^([a-z0-9][-a-z0-9_\+\.]*)@((?:[\w-]+\.)*\w[\w-]{0,66})\.([a-z]{2,63}(?:\.[a-z]{2})?)$/i;
+        const re = /^([a-z0-9][-a-z0-9_+.]*)@((?:[\w-]+\.)*\w[\w-]{0,66})\.([a-z]{2,63}(?:\.[a-z]{2})?)$/i;
         return re.test(email);
     }
 
@@ -54,7 +54,11 @@ class ResConfigInviteUsers extends Component {
             }
         }
         if (invalidEmails.length) {
-            throw new Error(`${_t("Invalid email address")}${ invalidEmails.length > 1 ? "es" : "" }: ${invalidEmails.join(", ")}`);
+            throw new Error(
+                `${_t("Invalid email address")}${
+                    invalidEmails.length > 1 ? "es" : ""
+                }: ${invalidEmails.join(", ")}`
+            );
         }
     }
 
diff --git a/addons/base_setup/static/src/xml/res_config_invite_users.xml b/addons/web/static/src/webclient/settings_form_view/widgets/res_config_invite_users.xml
similarity index 100%
rename from addons/base_setup/static/src/xml/res_config_invite_users.xml
rename to addons/web/static/src/webclient/settings_form_view/widgets/res_config_invite_users.xml
diff --git a/addons/base_setup/static/src/scss/settings.scss b/addons/web/static/src/webclient/settings_form_view/widgets/settings_widgets.scss
similarity index 100%
rename from addons/base_setup/static/src/scss/settings.scss
rename to addons/web/static/src/webclient/settings_form_view/widgets/settings_widgets.scss
diff --git a/addons/base_setup/static/src/js/user_invite_service.js b/addons/web/static/src/webclient/settings_form_view/widgets/user_invite_service.js
similarity index 100%
rename from addons/base_setup/static/src/js/user_invite_service.js
rename to addons/web/static/src/webclient/settings_form_view/widgets/user_invite_service.js