diff --git a/MANIFEST.in b/MANIFEST.in
index 478d5ff1cf..fc0b03eaf2 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/account.xml b/account.xml
index 5c49971817..1ea085d8f8 100644
--- a/account.xml
+++ b/account.xml
@@ -6,22 +6,7 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.ui.view" id="configuration_view_form">
             <field name="model">account.configuration</field>
             <field name="inherit" ref="account.configuration_view_form"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <data>
-                    <xpath
-                        expr="/form"
-                        position="inside">
-                        <newline/>
-                        <label name="stock_journal"/>
-                        <field name="stock_journal"/>
-                        <label name="cost_price_counterpart_account"/>
-                        <field name="cost_price_counterpart_account"/>
-                        <newline/>
-                    </xpath>
-                </data>
-                ]]>
-            </field>
+            <field name="name">configuration_form</field>
         </record>
 
         <record model="ir.property" id="property_stock_journal">
diff --git a/configuration.xml b/configuration.xml
index 72e6fbb60d..ab61424d2e 100644
--- a/configuration.xml
+++ b/configuration.xml
@@ -1,20 +1,12 @@
-<?xml version="1.0" encoding="UTF-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. -->
 <tryton>
     <data>
         <record model="ir.ui.view" id="stock_configuration_form">
             <field name="model">stock.configuration</field>
             <field name="inherit" ref="stock.stock_configuration_view_form"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <data>
-                    <xpath expr="//field[@name='shipment_internal_sequence']"
-                        position="after">
-                        <label name="cost_price_counterpart_account"/>
-                        <field name="cost_price_counterpart_account"/>
-                    </xpath>
-                </data>
-                ]]>
-            </field>
+            <field name="name">stock_configuration_form</field>
         </record>
         <record model="ir.action.act_window.view" id="stock.act_stock_configuration_view1">
             <field name="view" ref="stock_configuration_form"/>
diff --git a/product.xml b/product.xml
index 219a3d716e..a9fa732bc3 100644
--- a/product.xml
+++ b/product.xml
@@ -6,39 +6,12 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.ui.view" id="update_cost_price_ask_form">
             <field name="model">product.update_cost_price.ask</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Update Cost Price" cursor="cost_price">
-                    <label name="product"/>
-                    <field name="product"/>
-                    <label name="cost_price"/>
-                    <field name="cost_price"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">update_cost_price_ask_form</field>
         </record>
         <record model="ir.ui.view" id="update_cost_price_show_move_form">
             <field name="model">product.update_cost_price.show_move</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Update Cost Price - Move">
-                    <label name="description"/>
-                    <field name="description" colspan="3"/>
-                    <label name="journal"/>
-                    <field name="journal"/>
-                    <newline/>
-                    <label name="amount"/>
-                    <field name="amount"/>
-                    <label name="price_difference"/>
-                    <field name="price_difference"/>
-                    <label name="stock_account"/>
-                    <field name="stock_account"/>
-                    <label name="counterpart"/>
-                    <field name="counterpart"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">update_cost_price_show_move_form</field>
         </record>
         <record model="ir.action.wizard" id="wizard_update_cost_price">
             <field name="name">Update Cost Price</field>
@@ -58,53 +31,13 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.ui.view" id="category_view_form">
             <field name="model">product.category</field>
             <field name="inherit" ref="product.category_view_form"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <data>
-                    <xpath
-                        expr="/form/notebook/page[@id='accounting']/field[@name='account_expense']"
-                        position="after">
-                        <label name="account_stock"/>
-                        <field name="account_stock"/>
-                        <newline/>
-                        <label name="account_stock_customer"/>
-                        <field name="account_stock_customer"/>
-                        <label name="account_stock_supplier"/>
-                        <field name="account_stock_supplier"/>
-                        <label name="account_stock_production"/>
-                        <field name="account_stock_production"/>
-                        <label name="account_stock_lost_found"/>
-                        <field name="account_stock_lost_found"/>
-                    </xpath>
-                </data>
-                ]]>
-            </field>
+            <field name="name">category_form</field>
         </record>
 
         <record model="ir.ui.view" id="template_view_form">
             <field name="model">product.template</field>
             <field name="inherit" ref="product.template_view_form"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <data>
-                    <xpath
-                        expr="/form/notebook/page[@id='accounting']/field[@name='account_expense']"
-                        position="after">
-                        <label name="account_stock"/>
-                        <field name="account_stock"/>
-                        <newline/>
-                        <label name="account_stock_customer"/>
-                        <field name="account_stock_customer"/>
-                        <label name="account_stock_supplier"/>
-                        <field name="account_stock_supplier"/>
-                        <label name="account_stock_production"/>
-                        <field name="account_stock_production"/>
-                        <label name="account_stock_lost_found"/>
-                        <field name="account_stock_lost_found"/>
-                    </xpath>
-                </data>
-                ]]>
-            </field>
+            <field name="name">template_form</field>
         </record>
     </data>
 </tryton>
diff --git a/setup.py b/setup.py
index 9532fc2a23..a560f6e860 100644
--- a/setup.py
+++ b/setup.py
@@ -52,7 +52,7 @@ setup(name='trytond_account_stock_continental',
         ],
     package_data={
         'trytond.modules.account_stock_continental': (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/category_form.xml b/view/category_form.xml
new file mode 100644
index 0000000000..e6ab87bcab
--- /dev/null
+++ b/view/category_form.xml
@@ -0,0 +1,20 @@
+<?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='accounting']/field[@name='account_expense']"
+        position="after">
+        <label name="account_stock"/>
+        <field name="account_stock"/>
+        <newline/>
+        <label name="account_stock_customer"/>
+        <field name="account_stock_customer"/>
+        <label name="account_stock_supplier"/>
+        <field name="account_stock_supplier"/>
+        <label name="account_stock_production"/>
+        <field name="account_stock_production"/>
+        <label name="account_stock_lost_found"/>
+        <field name="account_stock_lost_found"/>
+    </xpath>
+</data>
diff --git a/view/configuration_form.xml b/view/configuration_form.xml
new file mode 100644
index 0000000000..34f3238fbd
--- /dev/null
+++ b/view/configuration_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. -->
+<data>
+    <xpath expr="/form" position="inside">
+        <newline/>
+        <label name="stock_journal"/>
+        <field name="stock_journal"/>
+        <label name="cost_price_counterpart_account"/>
+        <field name="cost_price_counterpart_account"/>
+        <newline/>
+    </xpath>
+</data>
diff --git a/view/stock_configuration_form.xml b/view/stock_configuration_form.xml
new file mode 100644
index 0000000000..c74d0b6814
--- /dev/null
+++ b/view/stock_configuration_form.xml
@@ -0,0 +1,10 @@
+<?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="//field[@name='shipment_internal_sequence']"
+        position="after">
+        <label name="cost_price_counterpart_account"/>
+        <field name="cost_price_counterpart_account"/>
+    </xpath>
+</data>
diff --git a/view/template_form.xml b/view/template_form.xml
new file mode 100644
index 0000000000..e6ab87bcab
--- /dev/null
+++ b/view/template_form.xml
@@ -0,0 +1,20 @@
+<?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='accounting']/field[@name='account_expense']"
+        position="after">
+        <label name="account_stock"/>
+        <field name="account_stock"/>
+        <newline/>
+        <label name="account_stock_customer"/>
+        <field name="account_stock_customer"/>
+        <label name="account_stock_supplier"/>
+        <field name="account_stock_supplier"/>
+        <label name="account_stock_production"/>
+        <field name="account_stock_production"/>
+        <label name="account_stock_lost_found"/>
+        <field name="account_stock_lost_found"/>
+    </xpath>
+</data>
diff --git a/view/update_cost_price_ask_form.xml b/view/update_cost_price_ask_form.xml
new file mode 100644
index 0000000000..744bc88c7b
--- /dev/null
+++ b/view/update_cost_price_ask_form.xml
@@ -0,0 +1,9 @@
+<?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="Update Cost Price" cursor="cost_price">
+    <label name="product"/>
+    <field name="product"/>
+    <label name="cost_price"/>
+    <field name="cost_price"/>
+</form>
diff --git a/view/update_cost_price_show_move_form.xml b/view/update_cost_price_show_move_form.xml
new file mode 100644
index 0000000000..36afcbe0a5
--- /dev/null
+++ b/view/update_cost_price_show_move_form.xml
@@ -0,0 +1,18 @@
+<?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="Update Cost Price - Move">
+    <label name="description"/>
+    <field name="description" colspan="3"/>
+    <label name="journal"/>
+    <field name="journal"/>
+    <newline/>
+    <label name="amount"/>
+    <field name="amount"/>
+    <label name="price_difference"/>
+    <field name="price_difference"/>
+    <label name="stock_account"/>
+    <field name="stock_account"/>
+    <label name="counterpart"/>
+    <field name="counterpart"/>
+</form>