diff --git a/MANIFEST.in b/MANIFEST.in
index 07449ffdc7..05c3f792e3 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -5,6 +5,7 @@ include CHANGELOG
 include LICENSE
 include tryton.cfg
 include *.xml
+include view/*.xml
 include *.odt
 include locale/*.po
 include doc/*
diff --git a/carrier.xml b/carrier.xml
index b1e6c37b91..a8602bd509 100644
--- a/carrier.xml
+++ b/carrier.xml
@@ -6,75 +6,25 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.ui.view" id="carrier_view_form">
             <field name="model">carrier</field>
             <field name="inherit" ref="carrier.carrier_view_form"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <data>
-                    <xpath
-                        expr="/form/notebook/page[@id='carrier']/field[@name='carrier_cost_method']"
-                        position="after">
-                        <newline/>
-                        <label name="weight_uom"/>
-                        <field name="weight_uom"/>
-                        <label name="weight_currency"/>
-                        <field name="weight_currency"/>
-                        <field name="weight_price_list" colspan="4"/>
-                    </xpath>
-                </data>
-                ]]>
-            </field>
+            <field name="name">carrier_form</field>
         </record>
 
         <record model="ir.ui.view" id="carrier_view_form2">
             <field name="model">carrier</field>
             <field name="type">form</field>
             <field name="inherit" ref="carrier.carrier_view_form2"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <data>
-                    <xpath
-                        expr="/form/field[@name='carrier_cost_method']"
-                        position="after">
-                        <newline/>
-                        <label name="weight_uom"/>
-                        <field name="weight_uom"/>
-                        <label name="weight_currency"/>
-                        <field name="weight_currency"/>
-                        <field name="weight_price_list" colspan="4"/>
-                    </xpath>
-                </data>
-                ]]>
-            </field>
+            <field name="name">carrier_form2</field>
         </record>
 
         <record model="ir.ui.view" id="weight_price_list_view_form">
             <field name="model">carrier.weight_price_list</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Carrier Weight Price List">
-                    <label name="carrier"/>
-                    <field name="carrier"/>
-                    <newline/>
-                    <label name="weight"/>
-                    <field name="weight"/>
-                    <label name="price"/>
-                    <field name="price"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">weight_price_list_form</field>
         </record>
         <record model="ir.ui.view" id="weight_price_list_view_tree">
             <field name="model">carrier.weight_price_list</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Carrier Weight Price Lists">
-                    <field name="carrier"/>
-                    <field name="weight"/>
-                    <field name="price"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">weight_price_list_tree</field>
         </record>
     </data>
 </tryton>
diff --git a/setup.py b/setup.py
index c5e387d10a..afd6671564 100644
--- a/setup.py
+++ b/setup.py
@@ -45,7 +45,7 @@ setup(name='trytond_carrier_weight',
         ],
     package_data={
         'trytond.modules.carrier_weight': (info.get('xml', [])
-            + ['tryton.cfg', 'locale/*.po', 'tests/*.rst']),
+            + ['tryton.cfg', 'view/*.xml', 'locale/*.po', 'tests/*.rst']),
         },
     classifiers=[
         'Development Status :: 5 - Production/Stable',
diff --git a/view/carrier_form.xml b/view/carrier_form.xml
new file mode 100644
index 0000000000..0c318f9c40
--- /dev/null
+++ b/view/carrier_form.xml
@@ -0,0 +1,15 @@
+<?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='carrier']/field[@name='carrier_cost_method']"
+        position="after">
+        <newline/>
+        <label name="weight_uom"/>
+        <field name="weight_uom"/>
+        <label name="weight_currency"/>
+        <field name="weight_currency"/>
+        <field name="weight_price_list" colspan="4"/>
+    </xpath>
+</data>
diff --git a/view/carrier_form2.xml b/view/carrier_form2.xml
new file mode 100644
index 0000000000..cc4066dc2a
--- /dev/null
+++ b/view/carrier_form2.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. -->
+<data>
+    <xpath expr="/form/field[@name='carrier_cost_method']" position="after">
+        <newline/>
+        <label name="weight_uom"/>
+        <field name="weight_uom"/>
+        <label name="weight_currency"/>
+        <field name="weight_currency"/>
+        <field name="weight_price_list" colspan="4"/>
+    </xpath>
+</data>
diff --git a/view/weight_price_list_form.xml b/view/weight_price_list_form.xml
new file mode 100644
index 0000000000..9d0de9277c
--- /dev/null
+++ b/view/weight_price_list_form.xml
@@ -0,0 +1,12 @@
+<?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="Carrier Weight Price List">
+    <label name="carrier"/>
+    <field name="carrier"/>
+    <newline/>
+    <label name="weight"/>
+    <field name="weight"/>
+    <label name="price"/>
+    <field name="price"/>
+</form>
diff --git a/view/weight_price_list_tree.xml b/view/weight_price_list_tree.xml
new file mode 100644
index 0000000000..fe875639c8
--- /dev/null
+++ b/view/weight_price_list_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="Carrier Weight Price Lists">
+    <field name="carrier"/>
+    <field name="weight"/>
+    <field name="price"/>
+</tree>