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 100%
rename from addons/account_accountant/account_accountant_data.xml
rename to addons/account_accountant/data/account_accountant_data.xml
diff --git a/addons/account_accountant/account_accountant_demo.xml b/addons/account_accountant/data/account_accountant_demo.xml
similarity index 100%
rename from addons/account_accountant/account_accountant_demo.xml
rename to addons/account_accountant/data/account_accountant_demo.xml
diff --git a/addons/account_accountant/views/tour_views.xml b/addons/account_accountant/data/account_accountant_tour.xml
similarity index 100%
rename from addons/account_accountant/views/tour_views.xml
rename to addons/account_accountant/data/account_accountant_tour.xml
diff --git a/addons/account_accountant/security/account_security.xml b/addons/account_accountant/security/account_accountant_security.xml
similarity index 100%
rename from addons/account_accountant/security/account_security.xml
rename to addons/account_accountant/security/account_accountant_security.xml
diff --git a/addons/account_accountant/views/account_accountant.xml b/addons/account_accountant/views/account_accountant_templates.xml
similarity index 100%
rename from addons/account_accountant/views/account_accountant.xml
rename to addons/account_accountant/views/account_accountant_templates.xml