diff --git a/addons/mass_mailing/static/src/js/mass_mailing_editor.js b/addons/mass_mailing/static/src/js/mass_mailing_snippets.js
similarity index 100%
rename from addons/mass_mailing/static/src/js/mass_mailing_editor.js
rename to addons/mass_mailing/static/src/js/mass_mailing_snippets.js
diff --git a/addons/website/static/lib/jQuery.transfo.js b/addons/web_editor/static/lib/jQuery.transfo.js
similarity index 100%
rename from addons/website/static/lib/jQuery.transfo.js
rename to addons/web_editor/static/lib/jQuery.transfo.js
diff --git a/addons/web_editor/static/src/js/editor/transcoder.js b/addons/web_editor/static/src/js/backend/convert_inline.js
similarity index 100%
rename from addons/web_editor/static/src/js/editor/transcoder.js
rename to addons/web_editor/static/src/js/backend/convert_inline.js
diff --git a/addons/web_editor/static/src/js/backend/fields.js b/addons/web_editor/static/src/js/backend/field_html.js
similarity index 100%
rename from addons/web_editor/static/src/js/backend/fields.js
rename to addons/web_editor/static/src/js/backend/field_html.js
diff --git a/addons/web_editor/static/src/js/widgets/ace.js b/addons/web_editor/static/src/js/common/ace.js
similarity index 100%
rename from addons/web_editor/static/src/js/widgets/ace.js
rename to addons/web_editor/static/src/js/common/ace.js
diff --git a/addons/web_editor/static/src/js/base.js b/addons/web_editor/static/src/js/wysiwyg/fonts.js
similarity index 100%
rename from addons/web_editor/static/src/js/base.js
rename to addons/web_editor/static/src/js/wysiwyg/fonts.js
diff --git a/addons/web/static/src/js/widgets/colorpicker.js b/addons/web_editor/static/src/js/wysiwyg/widgets/colorpicker_dialog.js
similarity index 100%
rename from addons/web/static/src/js/widgets/colorpicker.js
rename to addons/web_editor/static/src/js/wysiwyg/widgets/colorpicker_dialog.js
diff --git a/addons/web_editor/static/src/js/widgets/widgets.js b/addons/web_editor/static/src/js/wysiwyg/widgets/media.js
similarity index 100%
rename from addons/web_editor/static/src/js/widgets/widgets.js
rename to addons/web_editor/static/src/js/wysiwyg/widgets/media.js
diff --git a/addons/web_editor/static/src/js/editor/snippets.editor.js b/addons/web_editor/static/src/js/wysiwyg_snippets/snippets.editor.js
similarity index 100%
rename from addons/web_editor/static/src/js/editor/snippets.editor.js
rename to addons/web_editor/static/src/js/wysiwyg_snippets/snippets.editor.js
diff --git a/addons/web_editor/static/src/js/editor/snippets.options.js b/addons/web_editor/static/src/js/wysiwyg_snippets/snippets.options.js
similarity index 100%
rename from addons/web_editor/static/src/js/editor/snippets.options.js
rename to addons/web_editor/static/src/js/wysiwyg_snippets/snippets.options.js
diff --git a/addons/web/static/src/xml/colorpicker.xml b/addons/web_editor/static/src/xml/wysiwyg_colorpicker.xml
similarity index 100%
rename from addons/web/static/src/xml/colorpicker.xml
rename to addons/web_editor/static/src/xml/wysiwyg_colorpicker.xml
diff --git a/addons/web_editor/static/tests/web_editor_tests.js b/addons/web_editor/static/tests/field_html_tests.js
similarity index 100%
rename from addons/web_editor/static/tests/web_editor_tests.js
rename to addons/web_editor/static/tests/field_html_tests.js
diff --git a/addons/web_editor/static/src/js/content/body_manager.js b/addons/website/static/src/js/content/body_manager.js
similarity index 100%
rename from addons/web_editor/static/src/js/content/body_manager.js
rename to addons/website/static/src/js/content/body_manager.js
diff --git a/addons/web_editor/static/src/js/editor/editor.js b/addons/website/static/src/js/editor/editor_menu.js
similarity index 100%
rename from addons/web_editor/static/src/js/editor/editor.js
rename to addons/website/static/src/js/editor/editor_menu.js
diff --git a/addons/web_editor/static/src/js/editor/translator.js b/addons/website/static/src/js/editor/editor_menu_translate.js
similarity index 100%
rename from addons/web_editor/static/src/js/editor/translator.js
rename to addons/website/static/src/js/editor/editor_menu_translate.js
diff --git a/addons/website/static/src/js/editor/editor.js b/addons/website/static/src/js/editor/widget_link.js
similarity index 100%
rename from addons/website/static/src/js/editor/editor.js
rename to addons/website/static/src/js/editor/widget_link.js
diff --git a/addons/web_editor/static/src/xml/translator.xml b/addons/website/static/src/xml/translator.xml
similarity index 100%
rename from addons/web_editor/static/src/xml/translator.xml
rename to addons/website/static/src/xml/translator.xml
diff --git a/addons/mass_mailing/static/src/css/mass_mailing_popup.css b/addons/website_mass_mailing/static/src/css/website_mass_mailing_popup.css
similarity index 100%
rename from addons/mass_mailing/static/src/css/mass_mailing_popup.css
rename to addons/website_mass_mailing/static/src/css/website_mass_mailing_popup.css