diff --git a/addons/web_editor/static/src/js/backend.js b/addons/web_editor/static/src/js/backend/fields.js
similarity index 100%
rename from addons/web_editor/static/src/js/backend.js
rename to addons/web_editor/static/src/js/backend/fields.js
diff --git a/addons/web_editor/static/src/js/editor.js b/addons/web_editor/static/src/js/editor/editor.js
similarity index 100%
rename from addons/web_editor/static/src/js/editor.js
rename to addons/web_editor/static/src/js/editor/editor.js
diff --git a/addons/web_editor/static/src/js/rte.js b/addons/web_editor/static/src/js/editor/rte.js
similarity index 100%
rename from addons/web_editor/static/src/js/rte.js
rename to addons/web_editor/static/src/js/editor/rte.js
diff --git a/addons/web_editor/static/src/js/rte.summernote.js b/addons/web_editor/static/src/js/editor/rte.summernote.js
similarity index 100%
rename from addons/web_editor/static/src/js/rte.summernote.js
rename to addons/web_editor/static/src/js/editor/rte.summernote.js
diff --git a/addons/web_editor/static/src/js/snippets.editor.js b/addons/web_editor/static/src/js/editor/snippets.editor.js
similarity index 100%
rename from addons/web_editor/static/src/js/snippets.editor.js
rename to addons/web_editor/static/src/js/editor/snippets.editor.js
diff --git a/addons/web_editor/static/src/js/snippets.options.js b/addons/web_editor/static/src/js/editor/snippets.options.js
similarity index 100%
rename from addons/web_editor/static/src/js/snippets.options.js
rename to addons/web_editor/static/src/js/editor/snippets.options.js
diff --git a/addons/web_editor/static/src/js/summernote.js b/addons/web_editor/static/src/js/editor/summernote.js
similarity index 100%
rename from addons/web_editor/static/src/js/summernote.js
rename to addons/web_editor/static/src/js/editor/summernote.js
diff --git a/addons/web_editor/static/src/js/transcoder.js b/addons/web_editor/static/src/js/editor/transcoder.js
similarity index 100%
rename from addons/web_editor/static/src/js/transcoder.js
rename to addons/web_editor/static/src/js/editor/transcoder.js
diff --git a/addons/web_editor/static/src/js/translator.js b/addons/web_editor/static/src/js/editor/translator.js
similarity index 100%
rename from addons/web_editor/static/src/js/translator.js
rename to addons/web_editor/static/src/js/editor/translator.js
diff --git a/addons/web_editor/static/src/js/tour.rte.js b/addons/web_editor/static/src/js/tours/rte.js
similarity index 100%
rename from addons/web_editor/static/src/js/tour.rte.js
rename to addons/web_editor/static/src/js/tours/rte.js
diff --git a/addons/web_editor/static/src/js/ace.js b/addons/web_editor/static/src/js/widgets/ace.js
similarity index 100%
rename from addons/web_editor/static/src/js/ace.js
rename to addons/web_editor/static/src/js/widgets/ace.js
diff --git a/addons/web_editor/static/src/js/widgets.js b/addons/web_editor/static/src/js/widgets/widgets.js
similarity index 100%
rename from addons/web_editor/static/src/js/widgets.js
rename to addons/web_editor/static/src/js/widgets/widgets.js
diff --git a/addons/web_editor/views/editor.xml b/addons/web_editor/views/editor.xml
index 54e714314c8..7aa775a7b7d 100644
--- a/addons/web_editor/views/editor.xml
+++ b/addons/web_editor/views/editor.xml
@@ -43,7 +43,7 @@
         <script>odoo.website_next_define = 'summernote/<t t-esc="file" />';</script>
         <script type="text/javascript" t-attf-src="/web_editor/static/lib/summernote/src/js/{{ file }}.js"></script>
     </t>
-    <script type="text/javascript" src="/web_editor/static/src/js/summernote.js" />
+    <script type="text/javascript" src="/web_editor/static/src/js/editor/summernote.js" />
     <script type="text/javascript">
         window.define = odoo.__define__;
         delete odoo.__define__;
@@ -61,7 +61,7 @@
 <template id="assets_common" inherit_id="web.assets_common" name="Web Editor Common Assets (used in backend interface and website)">
     <xpath expr="script[last()]" position="after">
         <script type="text/javascript" src="/web_editor/static/lib/vkbeautify/vkbeautify.0.99.00.beta.js"></script>
-        <script type="text/javascript" src="/web_editor/static/src/js/ace.js" />
+        <script type="text/javascript" src="/web_editor/static/src/js/widgets/ace.js" />
         <script type="text/javascript" src="/web_editor/static/src/js/base.js" />
         <script type="text/javascript" src="/web_editor/static/src/js/snippets.animation.js" />
     </xpath>
@@ -73,7 +73,7 @@
         <link rel="stylesheet" type="text/less" href="/web_editor/static/src/less/web_editor.backend.less"/>
     </xpath>
     <xpath expr="script[last()]" position="after">
-        <script type="text/javascript" src="/web_editor/static/src/js/backend.js" />
+        <script type="text/javascript" src="/web_editor/static/src/js/backend/fields.js" />
     </xpath>
 </template>
 
@@ -90,15 +90,15 @@
     <link rel="stylesheet" type="text/less" href="/web_editor/static/src/less/web_editor.ui.components.less"/>
 
     <script type="text/javascript" src="/web_editor/static/lib/nearest/jquery.nearest.js"/>
-    <script type="text/javascript" src="/web_editor/static/src/js/editor.js"/>
-    <script type="text/javascript" src="/web_editor/static/src/js/rte.js"/>
-    <script type="text/javascript" src="/web_editor/static/src/js/rte.summernote.js"/>
-    <script type="text/javascript" src="/web_editor/static/src/js/widgets.js"/>
-    <script type="text/javascript" src="/web_editor/static/src/js/snippets.editor.js"/>
-    <script type="text/javascript" src="/web_editor/static/src/js/snippets.options.js"/>
-    <script type="text/javascript" src="/web_editor/static/src/js/tour.rte.js"/>
-    <script type="text/javascript" src="/web_editor/static/src/js/transcoder.js"></script>
-    <script type="text/javascript" src="/web_editor/static/src/js/translator.js"></script>
+    <script type="text/javascript" src="/web_editor/static/src/js/editor/editor.js"/>
+    <script type="text/javascript" src="/web_editor/static/src/js/editor/rte.js"/>
+    <script type="text/javascript" src="/web_editor/static/src/js/editor/rte.summernote.js"/>
+    <script type="text/javascript" src="/web_editor/static/src/js/widgets/widgets.js"/>
+    <script type="text/javascript" src="/web_editor/static/src/js/editor/snippets.editor.js"/>
+    <script type="text/javascript" src="/web_editor/static/src/js/editor/snippets.options.js"/>
+    <script type="text/javascript" src="/web_editor/static/src/js/tours/rte.js"/>
+    <script type="text/javascript" src="/web_editor/static/src/js/editor/transcoder.js"></script>
+    <script type="text/javascript" src="/web_editor/static/src/js/editor/translator.js"></script>
 </template>
 
 <template id="webclient_bootstrap" inherit_id="web.webclient_bootstrap">
diff --git a/addons/website/static/src/js/website.backend.js b/addons/website/static/src/js/backend/button.js
similarity index 100%
rename from addons/website/static/src/js/website.backend.js
rename to addons/website/static/src/js/backend/button.js
diff --git a/addons/website/static/src/js/website.backendDashboard.js b/addons/website/static/src/js/backend/dashboard.js
similarity index 100%
rename from addons/website/static/src/js/website.backendDashboard.js
rename to addons/website/static/src/js/backend/dashboard.js
diff --git a/addons/website/static/src/js/website.share.js b/addons/website/static/src/js/content/share.js
similarity index 100%
rename from addons/website/static/src/js/website.share.js
rename to addons/website/static/src/js/content/share.js
diff --git a/addons/website/static/src/js/website.snippets.animation.js b/addons/website/static/src/js/content/snippets.animation.js
similarity index 100%
rename from addons/website/static/src/js/website.snippets.animation.js
rename to addons/website/static/src/js/content/snippets.animation.js
diff --git a/addons/website/static/src/js/website.zoomodoo.js b/addons/website/static/src/js/content/zoomodoo.js
similarity index 100%
rename from addons/website/static/src/js/website.zoomodoo.js
rename to addons/website/static/src/js/content/zoomodoo.js
diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/editor/editor.js
similarity index 100%
rename from addons/website/static/src/js/website.editor.js
rename to addons/website/static/src/js/editor/editor.js
diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/editor/snippets.options.js
similarity index 100%
rename from addons/website/static/src/js/website.snippets.editor.js
rename to addons/website/static/src/js/editor/snippets.options.js
diff --git a/addons/website/static/src/js/website.contentMenu.js b/addons/website/static/src/js/menu/content.js
similarity index 100%
rename from addons/website/static/src/js/website.contentMenu.js
rename to addons/website/static/src/js/menu/content.js
diff --git a/addons/website/static/src/js/website.mobile.js b/addons/website/static/src/js/menu/mobile_view.js
similarity index 100%
rename from addons/website/static/src/js/website.mobile.js
rename to addons/website/static/src/js/menu/mobile_view.js
diff --git a/addons/website/static/src/js/web_planner_website.js b/addons/website/static/src/js/menu/planner.js
similarity index 100%
rename from addons/website/static/src/js/web_planner_website.js
rename to addons/website/static/src/js/menu/planner.js
diff --git a/addons/website/static/src/js/website.seo.js b/addons/website/static/src/js/menu/seo.js
similarity index 100%
rename from addons/website/static/src/js/website.seo.js
rename to addons/website/static/src/js/menu/seo.js
diff --git a/addons/website/static/src/js/website.translator.js b/addons/website/static/src/js/menu/translate.js
similarity index 100%
rename from addons/website/static/src/js/website.translator.js
rename to addons/website/static/src/js/menu/translate.js
diff --git a/addons/website/static/src/js/website.tour.banner.js b/addons/website/static/src/js/tours/banner.js
similarity index 100%
rename from addons/website/static/src/js/website.tour.banner.js
rename to addons/website/static/src/js/tours/banner.js
diff --git a/addons/website/static/src/js/website.tour.rte.js b/addons/website/static/src/js/tours/rte.js
similarity index 100%
rename from addons/website/static/src/js/website.tour.rte.js
rename to addons/website/static/src/js/tours/rte.js
diff --git a/addons/website/static/src/js/website.ace.js b/addons/website/static/src/js/widgets/ace.js
similarity index 100%
rename from addons/website/static/src/js/website.ace.js
rename to addons/website/static/src/js/widgets/ace.js
diff --git a/addons/website/static/src/js/website.theme.js b/addons/website/static/src/js/widgets/theme.js
similarity index 100%
rename from addons/website/static/src/js/website.theme.js
rename to addons/website/static/src/js/widgets/theme.js
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index b9d6fbadf8c..3eec786a5ce 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -3,9 +3,9 @@
 <!-- Assets -->
 <template id="assets_backend" inherit_id="web.assets_backend" name="Website Backend Assets (used in backend interface)">
     <xpath expr="//script[last()]" position="after">
-        <script type="text/javascript" src="/website/static/src/js/website.backend.js"></script>
+        <script type="text/javascript" src="/website/static/src/js/backend/button.js"></script>
         <script type="text/javascript" src="/website/static/src/js/website.tour.rte.js"></script>
-        <script type="text/javascript" src="/website/static/src/js/website.backendDashboard.js"></script>
+        <script type="text/javascript" src="/website/static/src/js/backend/dashboard.js"></script>
         <link rel="stylesheet" href="/website/static/src/less/website.backendDashboard.less"/>
     </xpath>
 </template>
@@ -24,9 +24,9 @@
     </xpath>
     <xpath expr="//script[last()]" position="after">
         <script type="text/javascript" src="/website/static/src/js/website.js"></script>
-        <script type="text/javascript" src="/website/static/src/js/website.share.js"></script>
-        <script type="text/javascript" src="/website/static/src/js/website.snippets.animation.js"></script>
-        <script type="text/javascript" src="/website/static/src/js/website.zoomodoo.js"></script>
+        <script type="text/javascript" src="/website/static/src/js/content/share.js"></script>
+        <script type="text/javascript" src="/website/static/src/js/content/snippets.animation.js"></script>
+        <script type="text/javascript" src="/website/static/src/js/content/zoomodoo.js"></script>
     </xpath>
 </template>
 
@@ -35,20 +35,20 @@
 
     <link rel="stylesheet" type="text/less" href="/website/static/src/less/website.edit_mode.less"/>
 
-    <script type="text/javascript" src="/website/static/src/js/website.tour.rte.js"></script>
+    <script type="text/javascript" src="/website/static/src/js/tours/rte.js"></script>
 
-    <script type="text/javascript" src="/website/static/src/js/website.editor.js"></script>
+    <script type="text/javascript" src="/website/static/src/js/editor/editor.js"></script>
     <script type="text/javascript" src="/website/static/lib/jQuery.transfo.js"></script>
-    <script type="text/javascript" src="/website/static/src/js/website.mobile.js"></script>
-    <script type="text/javascript" src="/website/static/src/js/website.seo.js"></script>
-    <script type="text/javascript" src="/website/static/src/js/website.tour.banner.js"></script>
-    <script type="text/javascript" src="/website/static/src/js/website.ace.js"></script>
-    <script type="text/javascript" src="/website/static/src/js/website.translator.js"></script>
-    <script type="text/javascript" src="/website/static/src/js/website.theme.js"></script>
-    <script type="text/javascript" src="/website/static/src/js/web_planner_website.js"></script>
-    <script type="text/javascript" src="/website/static/src/js/website.contentMenu.js"></script>
+    <script type="text/javascript" src="/website/static/src/js/menu/mobile_view.js"></script>
+    <script type="text/javascript" src="/website/static/src/js/menu/seo.js"></script>
+    <script type="text/javascript" src="/website/static/src/js/tours/banner.js"></script>
+    <script type="text/javascript" src="/website/static/src/js/widgets/ace.js"></script>
+    <script type="text/javascript" src="/website/static/src/js/menu/translate.js"></script>
+    <script type="text/javascript" src="/website/static/src/js/widgets/theme.js"></script>
+    <script type="text/javascript" src="/website/static/src/js/menu/planner.js"></script>
+    <script type="text/javascript" src="/website/static/src/js/menu/content.js"></script>
 
-    <script type="text/javascript" src="/website/static/src/js/website.snippets.editor.js"></script>
+    <script type="text/javascript" src="/website/static/src/js/editor/snippets.options.js"></script>
     <script type="text/javascript" src="/website/static/src/js/website.snippets.gallery.js"></script>
 </template>
 
@@ -129,7 +129,7 @@
             <script type="text/javascript">
                 odoo.session_info = {
                     is_superuser: <t t-esc="json.dumps(request.env.user._is_superuser())"/>,
-                    is_system: <t t-esc="json.dumps(request.env.user._is_system())"/>,  
+                    is_system: <t t-esc="json.dumps(request.env.user._is_system())"/>,
                     is_frontend: true,
                     translationURL: '/website/translations',
                     is_website_user: <t t-esc="json.dumps(request.env.user.id == request.website.user_id.id)" />,