diff --git a/MANIFEST.in b/MANIFEST.in
index 97a95966de..25699556d2 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -6,6 +6,7 @@ include CHANGELOG
 include LICENSE
 include tryton.cfg
 include *.xml
+include view/*.xml
 include *.odt
 include locale/*.po
 include doc/*
diff --git a/location.xml b/location.xml
index 6789545296..a259918194 100644
--- a/location.xml
+++ b/location.xml
@@ -6,33 +6,12 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.ui.view" id="product_location_view_form">
             <field name="model">stock.product.location</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Product Location" cursor="product">
-                    <label name="sequence"/>
-                    <field name="sequence"/>
-                    <label name="product"/>
-                    <field name="product"/>
-                    <label name="warehouse"/>
-                    <field name="warehouse"/>
-                    <label name="location"/>
-                    <field name="location"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">product_location_form</field>
         </record>
         <record model="ir.ui.view" id="product_location_view_tree">
             <field name="model">stock.product.location</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Product Locations">
-                    <field name="product"/>
-                    <field name="warehouse"/>
-                    <field name="location"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">product_location_tree</field>
         </record>
     </data>
 </tryton>
diff --git a/product.xml b/product.xml
index 61307c8a0e..db4a307dda 100644
--- a/product.xml
+++ b/product.xml
@@ -6,19 +6,7 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.ui.view" id="product_view_form">
             <field name="model">product.product</field>
             <field name="inherit" ref="product.product_view_form"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <data>
-                    <xpath expr="/form/notebook/page[@id=&quot;general&quot;]"
-                        position="after">
-                        <page string="Default Locations" id="default_locations"
-                            states="{'invisible': ~Eval('type').in_(['goods', 'assets'])}">
-                            <field name="locations" colspan="4"/>
-                        </page>
-                    </xpath>
-                </data>
-                ]]>
-            </field>
+            <field name="name">product_form</field>
         </record>
     </data>
 </tryton>
diff --git a/setup.py b/setup.py
index 5c70c2cff4..9d41a36621 100644
--- a/setup.py
+++ b/setup.py
@@ -45,7 +45,7 @@ setup(name='trytond_stock_product_location',
         ],
     package_data={
         'trytond.modules.stock_product_location': (info.get('xml', [])
-            + ['tryton.cfg', 'locale/*.po', 'label.odt']),
+            + ['tryton.cfg', 'view/*.xml', 'locale/*.po', 'label.odt']),
         },
     classifiers=[
         'Development Status :: 5 - Production/Stable',
diff --git a/view/product_form.xml b/view/product_form.xml
new file mode 100644
index 0000000000..a1bf6c3f84
--- /dev/null
+++ b/view/product_form.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<data>
+    <xpath expr="/form/notebook/page[@id='general']" position="after">
+        <page string="Default Locations" id="default_locations"
+            states="{'invisible': ~Eval('type').in_(['goods', 'assets'])}">
+            <field name="locations" colspan="4"/>
+        </page>
+    </xpath>
+</data>
diff --git a/view/product_location_form.xml b/view/product_location_form.xml
new file mode 100644
index 0000000000..c8d3b10ccb
--- /dev/null
+++ b/view/product_location_form.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<form string="Product Location" cursor="product">
+    <label name="sequence"/>
+    <field name="sequence"/>
+    <label name="product"/>
+    <field name="product"/>
+    <label name="warehouse"/>
+    <field name="warehouse"/>
+    <label name="location"/>
+    <field name="location"/>
+</form>
diff --git a/view/product_location_tree.xml b/view/product_location_tree.xml
new file mode 100644
index 0000000000..1a7a480979
--- /dev/null
+++ b/view/product_location_tree.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<tree string="Product Locations">
+    <field name="product"/>
+    <field name="warehouse"/>
+    <field name="location"/>
+</tree>