diff --git a/addons/account_accountant/__openerp__.py b/addons/account_accountant/__openerp__.py
index ee43fbb41ae..dacd9813241 100644
--- a/addons/account_accountant/__openerp__.py
+++ b/addons/account_accountant/__openerp__.py
@@ -16,12 +16,12 @@ It assigns manager and user access rights to the Administrator for the accountin
     'website': 'https://www.odoo.com/page/accounting',
     'depends': ['account', 'web_tour'],
     'data': [
-        'security/account_security.xml',
-        'account_accountant_data.xml',
-        'views/account_accountant.xml',
-        'views/tour_views.xml'
+        'data/account_accountant_data.xml',
+        'data/account_accountant_tour.xml',
+        'security/account_accountant_security.xml',
+        'views/account_accountant_templates.xml',
     ],
-    'demo': ['account_accountant_demo.xml'],
+    'demo': ['data/account_accountant_demo.xml'],
     'test': [],
     'installable': True,
     'auto_install': False,
diff --git a/addons/account_accountant/account_accountant_data.xml b/addons/account_accountant/data/account_accountant_data.xml
similarity index 97%
rename from addons/account_accountant/account_accountant_data.xml
rename to addons/account_accountant/data/account_accountant_data.xml
index cb37789e2f0..921178125fa 100644
--- a/addons/account_accountant/account_accountant_data.xml
+++ b/addons/account_accountant/data/account_accountant_data.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
+<odoo>
         <!-- Rename root menu "Accounting" -->
         <!-- Top menu item -->
         <menuitem name="Accounting"
@@ -9,7 +8,6 @@
             sequence="40"/>
         <menuitem id="account.menu_account_config" name="Settings" parent="account.menu_finance_configuration" sequence="0" groups="base.group_system"/>
 
-    </data>
 
     <data noupdate="1">
 
@@ -24,4 +22,4 @@
 <p>The accounting features are fully integrated with other Odoo applications to automate all your processes: creation of customer invoices, control of supplier bills, point-of-sale integration, automated follow-ups, etc.</p>]]></field>
         </record>
     </data>
-</openerp>
+</odoo>
diff --git a/addons/account_accountant/account_accountant_demo.xml b/addons/account_accountant/data/account_accountant_demo.xml
similarity index 81%
rename from addons/account_accountant/account_accountant_demo.xml
rename to addons/account_accountant/data/account_accountant_demo.xml
index d0aa2f5ebe9..4670db59ac9 100644
--- a/addons/account_accountant/account_accountant_demo.xml
+++ b/addons/account_accountant/data/account_accountant_demo.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
+<odoo>
         <record id="base.user_demo" model="res.users">
             <field name="groups_id" eval="[(4, ref('account.group_account_user'))]"/>
         </record>
-    </data>
-</openerp>
+</odoo>
diff --git a/addons/account_accountant/views/tour_views.xml b/addons/account_accountant/data/account_accountant_tour.xml
similarity index 90%
rename from addons/account_accountant/views/tour_views.xml
rename to addons/account_accountant/data/account_accountant_tour.xml
index 9b3c20f325f..8b42e5e2a22 100644
--- a/addons/account_accountant/views/tour_views.xml
+++ b/addons/account_accountant/data/account_accountant_tour.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
+<data>
         <!-- Make the xmlid of menus required by the Accounting tour available in webclient -->
         <record id="account.menu_finance" model="ir.ui.menu">
             <field name="load_xmlid" eval="True"/>
@@ -8,5 +7,4 @@
         <record id="account.menu_finance_reports" model="ir.ui.menu">
             <field name="load_xmlid" eval="True"/>
         </record>
-    </data>
-</openerp>
+</data>
diff --git a/addons/account_accountant/security/account_security.xml b/addons/account_accountant/security/account_accountant_security.xml
similarity index 83%
rename from addons/account_accountant/security/account_security.xml
rename to addons/account_accountant/security/account_accountant_security.xml
index 0d6006fd9b0..1340e7abc94 100644
--- a/addons/account_accountant/security/account_security.xml
+++ b/addons/account_accountant/security/account_accountant_security.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
+<odoo>
         <record id="base.user_root" model="res.users">
             <field name="groups_id" eval="[(4, ref('account.group_account_manager')),(4, ref('account.group_account_user'))]"/>
         </record>
-
-    </data>
-</openerp>
+</odoo>
diff --git a/addons/account_accountant/views/account_accountant.xml b/addons/account_accountant/views/account_accountant_templates.xml
similarity index 88%
rename from addons/account_accountant/views/account_accountant.xml
rename to addons/account_accountant/views/account_accountant_templates.xml
index 174ddc5152c..a4dd88fe872 100644
--- a/addons/account_accountant/views/account_accountant.xml
+++ b/addons/account_accountant/views/account_accountant_templates.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
+<odoo>
         <template id="assets_backend" name="account assets" inherit_id="web.assets_backend">
             <xpath expr="." position="inside">
                 <script type="text/javascript" src="/account_accountant/static/src/js/tour.js"></script>
             </xpath>
         </template>
-    </data>
-</openerp>
+</odoo>