diff --git a/addons/website_form/__manifest__.py b/addons/website_form/__manifest__.py
index 8030db83be7..f1d0c0647df 100644
--- a/addons/website_form/__manifest__.py
+++ b/addons/website_form/__manifest__.py
@@ -12,7 +12,8 @@
         'data/mail_mail_data.xml',
         'views/assets.xml',
         'views/ir_model_views.xml',
-        'views/snippets.xml',
+        'views/snippets/snippets.xml',
+        'views/snippets/s_website_form.xml',
         'views/website_form_templates.xml',
     ],
     'installable': True,
diff --git a/addons/website_form/static/src/js/website_form.js b/addons/website_form/static/src/snippets/s_website_form/000.js
similarity index 100%
rename from addons/website_form/static/src/js/website_form.js
rename to addons/website_form/static/src/snippets/s_website_form/000.js
diff --git a/addons/website_form/static/src/scss/website_form.scss b/addons/website_form/static/src/snippets/s_website_form/000.scss
similarity index 100%
rename from addons/website_form/static/src/scss/website_form.scss
rename to addons/website_form/static/src/snippets/s_website_form/000.scss
diff --git a/addons/website_form/static/src/js/website_form_editor.js b/addons/website_form/static/src/snippets/s_website_form/options.js
similarity index 100%
rename from addons/website_form/static/src/js/website_form_editor.js
rename to addons/website_form/static/src/snippets/s_website_form/options.js
diff --git a/addons/website_form/views/assets.xml b/addons/website_form/views/assets.xml
index a9615d1ae27..11445b89b63 100644
--- a/addons/website_form/views/assets.xml
+++ b/addons/website_form/views/assets.xml
@@ -2,16 +2,9 @@
 <odoo>
     <data>
 
-        <template id="assets_frontend" name="Website Form Assets Frontend" inherit_id="website.assets_frontend">
-            <xpath expr="." position="inside">
-                <link rel="stylesheet" type="text/scss" href="/website_form/static/src/scss/website_form.scss"/>
-                <script type="text/javascript" src="/website_form/static/src/js/website_form.js"/>
-            </xpath>
-        </template>
-
         <template id="assets_editor" name="Website Form Editor Assets Editor" inherit_id="website.assets_editor">
             <xpath expr="." position="inside">
-                <script type="text/javascript" src="/website_form/static/src/js/website_form_editor.js"/>
+                <script type="text/javascript" src="/website_form/static/src/snippets/s_website_form/options.js"/>
                 <script type="text/javascript" src="/website_form/static/src/js/website_form_editor_registry.js"/>
             </xpath>
         </template>
diff --git a/addons/website_form/views/snippets.xml b/addons/website_form/views/snippets.xml
deleted file mode 100644
index c8d6a488b56..00000000000
--- a/addons/website_form/views/snippets.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-        <template id="s_website_form" name="Form Builder">
-            <form action="/website_form/" method="post" class="s_website_form container-fluid mt32" enctype="multipart/form-data">
-                <div class="container">
-                    <div class="form-group row">
-                        <div class="offset-lg-3 offset-md-4 col-md-8 col-lg-7">
-                            <button class="btn btn-primary btn-lg o_website_form_send">Send</button>
-                            <span id="o_website_form_result"></span>
-                        </div>
-                    </div>
-                </div>
-            </form>
-        </template>
-
-        <template id="remove_external_snippets" inherit_id="website.external_snippets">
-            <xpath expr="//t[@t-install='website_form']" position="replace"/>
-        </template>
-
-        <template id="register_s_website_form" inherit_id="website.snippets" name="Snippet Form Builder">
-            <xpath expr="//t[@id='form_form_hook']" position="replace">
-                <t t-snippet="website_form.s_website_form" t-thumbnail="/website/static/src/img/snippets_thumbs/s_website_form.png"/>
-            </xpath>
-        </template>
-
-        <template id="snippet_options" inherit_id="website.snippet_options">
-            <xpath expr="//*[@t-set='so_snippet_addition_selector']" position="inside">, .s_website_form</xpath>
-            <xpath expr="//div" position="after">
-                <!-- Form -->
-                <div data-js="website_form_editor" data-selector=".s_website_form">
-                    <we-button data-website_form_model_modal="" data-no-preview="true">Change Form Parameters</we-button>
-                    <we-button data-website_form_field_modal="" data-no-preview="true">Add an existing field</we-button>
-                    <we-select string="Add a custom field" data-no-preview="true">
-                        <we-button data-website_form_custom_field="char">Text</we-button>
-                        <we-button data-website_form_custom_field="text">Long Text</we-button>
-                        <we-button data-website_form_custom_field="email">Email</we-button>
-                        <we-button data-website_form_custom_field="integer">Number</we-button>
-                        <we-button data-website_form_custom_field="float">Decimal Number</we-button>
-                        <we-button data-website_form_custom_field="boolean">Checkbox</we-button>
-                        <we-button data-website_form_custom_field="selection">Radio Buttons</we-button>
-                        <we-button data-website_form_custom_field="many2one">Selection</we-button>
-                        <we-button data-website_form_custom_field="one2many">Multiple Checkboxes</we-button>
-                        <we-button data-website_form_custom_field="date">Date</we-button>
-                        <we-button data-website_form_custom_field="datetime">Date &amp; Time</we-button>
-                        <we-button data-website_form_custom_field="binary">File Upload</we-button>
-                    </we-select>
-                </div>
-
-              <!-- Field -->
-              <div data-js='website_form_editor' data-selector=".form-field" data-drop-near=".form-field">
-                    <we-checkbox string="Hidden" data-no-preview="true"
-                                 data-select-class="o_website_form_field_hidden"/>
-              </div>
-
-              <!-- Add an option to display radio buttons / checkboxes horizontally or vertically -->
-              <div data-js='website_form_editor_choice_field_display' data-selector=".o_website_form_flex">
-                    <we-select string="Display" data-no-preview="true">
-                        <we-button data-website_form_choice_field_display="horizontal">Horizontal</we-button>
-                        <we-button data-website_form_choice_field_display="vertical">Vertical</we-button>
-                    </we-select>
-               </div>
-
-              <!-- Add move, duplicate and remove controllers to checkboxes and radio buttons -->
-              <div data-selector=".o_website_form_flex_item" data-drop-near=".o_website_form_flex_item"/>
-
-              <!-- Add move and remove controllers to select items -->
-              <div data-selector=".s_website_form .form-field.o_website_form_custom .o_website_form_select_item" data-drop-near=".o_website_form_select_item"/>
-
-              <!-- Required option for fields that are not required fields of the model -->
-              <div data-js='website_form_editor_field' data-selector=".form-field:not(.o_website_form_required)">
-                  <we-checkbox string="Required" data-no-preview="true"
-                               data-website_form_field_require=""
-                               data-select-class="o_website_form_required_custom"/>
-              </div>
-
-              <!-- Remove the duplicate options of model fields -->
-              <div data-js="website_form_editor_field_model" data-selector=".s_website_form .form-field:not(.o_website_form_custom)"/>
-
-              <!-- Remove the delete options of model required fields -->
-              <div data-js="website_form_editor_field_required" data-selector=".s_website_form .o_website_form_required"/>
-
-              <!-- Remove the duplicate options of radio and checkboxes of model fields -->
-              <div data-js="website_form_editor_field_x2many" data-selector=".s_website_form .form-field:not(.o_website_form_custom) .o_website_form_flex_item"/>
-
-              <!-- Transform the select inputs into editable constructs -->
-              <div data-js="website_form_editor_field_select" data-selector=".s_website_form .form-field:has(select)"/>
-
-              <!-- Remove the duplicate option of model select items -->
-              <div data-js="website_form_editor_field_x2many" data-selector=".s_website_form .form-field:not(.o_website_form_custom) .o_website_form_select_item" data-drop-near=".o_website_form_select_item"/>
-
-              <!-- Remove the delete options of the Submit button -->
-              <div data-js="website_form_editor_field_required" data-selector=".s_website_form .o_website_form_send"/>
-            </xpath>
-        </template>
-</odoo>
diff --git a/addons/website_form/views/snippets/s_website_form.xml b/addons/website_form/views/snippets/s_website_form.xml
new file mode 100644
index 00000000000..2c49bfccd62
--- /dev/null
+++ b/addons/website_form/views/snippets/s_website_form.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<template id="s_website_form" name="Form Builder">
+    <form action="/website_form/" method="post" class="s_website_form container-fluid mt32" enctype="multipart/form-data">
+        <div class="container">
+            <div class="form-group row">
+                <div class="offset-lg-3 offset-md-4 col-md-8 col-lg-7">
+                    <button class="btn btn-primary btn-lg o_website_form_send">Send</button>
+                    <span id="o_website_form_result"></span>
+                </div>
+            </div>
+        </div>
+    </form>
+</template>
+
+<template id="snippet_options" inherit_id="website.snippet_options">
+    <xpath expr="//*[@t-set='so_snippet_addition_selector']" position="inside">, .s_website_form</xpath>
+    <xpath expr="//div" position="after">
+        <!-- Form -->
+        <div data-js="website_form_editor" data-selector=".s_website_form">
+            <we-button data-website_form_model_modal="" data-no-preview="true">Change Form Parameters</we-button>
+            <we-button data-website_form_field_modal="" data-no-preview="true">Add an existing field</we-button>
+            <we-select string="Add a custom field" data-no-preview="true">
+                <we-button data-website_form_custom_field="char">Text</we-button>
+                <we-button data-website_form_custom_field="text">Long Text</we-button>
+                <we-button data-website_form_custom_field="email">Email</we-button>
+                <we-button data-website_form_custom_field="integer">Number</we-button>
+                <we-button data-website_form_custom_field="float">Decimal Number</we-button>
+                <we-button data-website_form_custom_field="boolean">Checkbox</we-button>
+                <we-button data-website_form_custom_field="selection">Radio Buttons</we-button>
+                <we-button data-website_form_custom_field="many2one">Selection</we-button>
+                <we-button data-website_form_custom_field="one2many">Multiple Checkboxes</we-button>
+                <we-button data-website_form_custom_field="date">Date</we-button>
+                <we-button data-website_form_custom_field="datetime">Date &amp; Time</we-button>
+                <we-button data-website_form_custom_field="binary">File Upload</we-button>
+            </we-select>
+        </div>
+
+        <!-- Field -->
+        <div data-js='website_form_editor' data-selector=".form-field" data-drop-near=".form-field">
+            <we-checkbox string="Hidden" data-no-preview="true"
+                            data-select-class="o_website_form_field_hidden"/>
+        </div>
+
+        <!-- Add an option to display radio buttons / checkboxes horizontally or vertically -->
+        <div data-js='website_form_editor_choice_field_display' data-selector=".o_website_form_flex">
+            <we-select string="Display" data-no-preview="true">
+                <we-button data-website_form_choice_field_display="horizontal">Horizontal</we-button>
+                <we-button data-website_form_choice_field_display="vertical">Vertical</we-button>
+            </we-select>
+        </div>
+
+        <!-- Add move, duplicate and remove controllers to checkboxes and radio buttons -->
+        <div data-selector=".o_website_form_flex_item" data-drop-near=".o_website_form_flex_item"/>
+
+        <!-- Add move and remove controllers to select items -->
+        <div data-selector=".s_website_form .form-field.o_website_form_custom .o_website_form_select_item" data-drop-near=".o_website_form_select_item"/>
+
+        <!-- Required option for fields that are not required fields of the model -->
+        <div data-js='website_form_editor_field' data-selector=".form-field:not(.o_website_form_required)">
+            <we-checkbox string="Required" data-no-preview="true"
+                        data-website_form_field_require=""
+                        data-select-class="o_website_form_required_custom"/>
+        </div>
+
+        <!-- Remove the duplicate options of model fields -->
+        <div data-js="website_form_editor_field_model" data-selector=".s_website_form .form-field:not(.o_website_form_custom)"/>
+
+        <!-- Remove the delete options of model required fields -->
+        <div data-js="website_form_editor_field_required" data-selector=".s_website_form .o_website_form_required"/>
+
+        <!-- Remove the duplicate options of radio and checkboxes of model fields -->
+        <div data-js="website_form_editor_field_x2many" data-selector=".s_website_form .form-field:not(.o_website_form_custom) .o_website_form_flex_item"/>
+
+        <!-- Transform the select inputs into editable constructs -->
+        <div data-js="website_form_editor_field_select" data-selector=".s_website_form .form-field:has(select)"/>
+
+        <!-- Remove the duplicate option of model select items -->
+        <div data-js="website_form_editor_field_x2many" data-selector=".s_website_form .form-field:not(.o_website_form_custom) .o_website_form_select_item" data-drop-near=".o_website_form_select_item"/>
+
+        <!-- Remove the delete options of the Submit button -->
+        <div data-js="website_form_editor_field_required" data-selector=".s_website_form .o_website_form_send"/>
+    </xpath>
+</template>
+
+<template id="assets_snippet_s_website_form_css_000" inherit_id="website.assets_frontend">
+    <xpath expr="//link[last()]" position="after">
+        <link rel="stylesheet" type="text/scss" href="/website_form/static/src/snippets/s_website_form/000.scss"/>
+    </xpath>
+</template>
+
+<template id="assets_snippet_s_website_form_js_000" inherit_id="website.assets_frontend">
+    <xpath expr="//script[last()]" position="after">
+        <script type="text/javascript" src="/website_form/static/src/snippets/s_website_form/000.js"/>
+    </xpath>
+</template>
+
+</odoo>
diff --git a/addons/website_form/views/snippets/snippets.xml b/addons/website_form/views/snippets/snippets.xml
new file mode 100644
index 00000000000..0e5283d398f
--- /dev/null
+++ b/addons/website_form/views/snippets/snippets.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<template id="remove_external_snippets" inherit_id="website.external_snippets">
+    <xpath expr="//t[@t-install='website_form']" position="replace"/>
+</template>
+
+<template id="snippets" inherit_id="website.snippets" name="Snippet Form Builder">
+    <xpath expr="//t[@id='form_form_hook']" position="replace">
+        <t t-snippet="website_form.s_website_form" t-thumbnail="/website/static/src/img/snippets_thumbs/s_website_form.png"/>
+    </xpath>
+</template>
+
+</odoo>