diff --git a/MANIFEST.in b/MANIFEST.in
index 44969c7156..18ce53ccc0 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -6,5 +6,6 @@ include CHANGELOG
 include LICENSE
 include tryton.cfg
 include *.xml
+include view/*.xml
 include *.odt
 include locale/*.po
diff --git a/product.xml b/product.xml
index 396a193278..a0e768d098 100644
--- a/product.xml
+++ b/product.xml
@@ -7,63 +7,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=&quot;childs&quot;]"
-                        position="before">
-                        <page string="Accounting" col="4" id="accounting">
-                            <separator string="Accounts" id="accounts" colspan="4"/>
-                            <label name="account_parent"/>
-                            <field name="account_parent"/>
-                            <newline/>
-                            <label name="account_revenue"/>
-                            <field name="account_revenue"/>
-                            <label name="account_expense"/>
-                            <field name="account_expense"/>
-                            <separator string="Taxes" id="taxes" colspan="4"/>
-                            <label name="taxes_parent"/>
-                            <field name="taxes_parent"/>
-                            <newline/>
-                            <field name="customer_taxes" colspan="2"/>
-                            <field name="supplier_taxes" colspan="2"/>
-                        </page>
-                    </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=&quot;general&quot;]"
-                        position="after">
-                        <page string="Accounting" col="4" id="accounting">
-                            <separator string="Accounts" id="accounts" colspan="4"/>
-                            <label name="account_category"/>
-                            <field name="account_category"/>
-                            <newline/>
-                            <label name="account_revenue"/>
-                            <field name="account_revenue"/>
-                            <label name="account_expense"/>
-                            <field name="account_expense"/>
-                            <separator string="Taxes" id="taxes" colspan="4"/>
-                            <label name="taxes_category"/>
-                            <field name="taxes_category"/>
-                            <newline/>
-                            <field name="customer_taxes" colspan="2"/>
-                            <field name="supplier_taxes" colspan="2"/>
-                        </page>
-                    </xpath>
-                </data>
-                ]]>
-            </field>
+            <field name="name">template_form</field>
         </record>
 
     </data>
diff --git a/setup.py b/setup.py
index 3657ba1d6a..ed4f557f9f 100644
--- a/setup.py
+++ b/setup.py
@@ -45,7 +45,7 @@ setup(name='trytond_account_product',
         ],
     package_data={
         'trytond.modules.account_product': (info.get('xml', [])
-            + ['tryton.cfg', 'locale/*.po']),
+            + ['tryton.cfg', 'view/*.xml', 'locale/*.po']),
         },
     classifiers=[
         'Development Status :: 5 - Production/Stable',
diff --git a/view/category_form.xml b/view/category_form.xml
new file mode 100644
index 0000000000..35812e0ffa
--- /dev/null
+++ b/view/category_form.xml
@@ -0,0 +1,25 @@
+<?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='childs']"
+        position="before">
+        <page string="Accounting" col="4" id="accounting">
+            <separator string="Accounts" id="accounts" colspan="4"/>
+            <label name="account_parent"/>
+            <field name="account_parent"/>
+            <newline/>
+            <label name="account_revenue"/>
+            <field name="account_revenue"/>
+            <label name="account_expense"/>
+            <field name="account_expense"/>
+            <separator string="Taxes" id="taxes" colspan="4"/>
+            <label name="taxes_parent"/>
+            <field name="taxes_parent"/>
+            <newline/>
+            <field name="customer_taxes" colspan="2"/>
+            <field name="supplier_taxes" colspan="2"/>
+        </page>
+    </xpath>
+</data>
diff --git a/view/template_form.xml b/view/template_form.xml
new file mode 100644
index 0000000000..382ebeb0ca
--- /dev/null
+++ b/view/template_form.xml
@@ -0,0 +1,25 @@
+<?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="Accounting" col="4" id="accounting">
+            <separator string="Accounts" id="accounts" colspan="4"/>
+            <label name="account_category"/>
+            <field name="account_category"/>
+            <newline/>
+            <label name="account_revenue"/>
+            <field name="account_revenue"/>
+            <label name="account_expense"/>
+            <field name="account_expense"/>
+            <separator string="Taxes" id="taxes" colspan="4"/>
+            <label name="taxes_category"/>
+            <field name="taxes_category"/>
+            <newline/>
+            <field name="customer_taxes" colspan="2"/>
+            <field name="supplier_taxes" colspan="2"/>
+        </page>
+    </xpath>
+</data>